gemercheung 3 năm trước cách đây
mục cha
commit
7c740acc7e
5 tập tin đã thay đổi với 858 bổ sung6480 xóa
  1. 1 1
      .env.development
  2. 0 5833
      package-lock.json
  3. 0 2
      package.json
  4. 8 4
      src/controller/syncDeviceController.js
  5. 849 640
      yarn.lock

+ 1 - 1
.env.development

@@ -2,7 +2,7 @@ PORT=12001
 SOCKET_PORT=12001
 CONTAINER_NAME='socket-chat-IM'
 VOLUME_DIR=./data
-REDIS_HOST=127.0.0.1
+REDIS_HOST=192.168.10.235
 REDIS_PORT=6379
 REDIS_DB=10
 REDIS_PASSWORD=redis9394

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 5833
package-lock.json


+ 0 - 2
package.json

@@ -19,7 +19,6 @@
     "@socket.io/sticky": "^1.0.1",
     "axios": "^0.27.2",
     "bcrypt": "^5.0.1",
-    "bcryptjs": "^2.4.3",
     "dotenv-flow": "^3.2.0",
     "eiows": "^3.7.3",
     "elastic-apm-node": "^3.31.0",
@@ -32,7 +31,6 @@
     "socket.io-msgpack-parser": "^3.0.1",
     "socket.io-prometheus-v3": "^1.0.3",
     "tls-sig-api-v2": "^1.0.2",
-    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.4.0",
     "winston": "^3.4.0",
     "winston-elasticsearch": "^0.16.1"
   },

+ 8 - 4
src/controller/syncDeviceController.js

@@ -37,20 +37,24 @@ export class SyncDeviceController extends BasicController {
     this.socket.on(EVENT.clientSyncAction, (data) => {
       this.socket.broadcast.to(this.room.syncId).emit(EVENT.clientSyncAction, data);
     });
-    this.socket.on(EVENT.changeVoiceStatus, async ({ status, user }) => {
+    this.socket.on(EVENT.changeVoiceStatus, async ({ status }) => {
       try {
+        const current = await this.room.currentUser();
         const updateUser = {
-          ...user,
+          ...current,
+          onlineStatus: 1,
           voiceStatus: status,
         };
+
+        
         const isUpdate = await updateRoomUser(this.room.roomId, this.room.userId, updateUser);
         const AllRoomUsers = await getAllRoomUsers(this.room.roomId);
-        // this.logger.info("changeVoiceStatus", { roomId: this.room.roomId, data, AllRoomUsers: AllRoomUsers.length });
+        this.logger.info("changeVoiceStatus", { roomId: this.room.roomId, updateUser, AllRoomUsers: AllRoomUsers.length });
         this.socket.broadcast.to(this.room.roomId).emit(EVENT.changeVoiceStatus, {
           user: updateUser,
           roomsPerson: AllRoomUsers,
         });
-        this.socket.broadcast.to(this.room.syncId).emit(EVENT.changeVoiceStatus, { 
+        this.socket.broadcast.to(this.room.syncId).emit(EVENT.changeVoiceStatus, {
           user: updateUser,
           roomsPerson: AllRoomUsers,
         });

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 849 - 640
yarn.lock