gemercheung 2 лет назад
Родитель
Сommit
93c28d7f8f

+ 1 - 2
src/common/envs/development.env

@@ -2,6 +2,7 @@ APP_PORT=8888
 SOCKET_NAME='socket-dev'
 SOCKET_PORT=8889
 SOCKET_PATH="/ws-sync"
+SOCKET_USE_MSPACK=1
 REDIS_HOST=127.0.0.1
 REDIS_PORT=6379
 REDIS_PASSWORD=redis9394
@@ -11,5 +12,3 @@ REDIS_PREFIX=chat
 WATCH_USER=4dage
 WATCH_PASSWORD=4dage168.
 TEMP_ROOM_VALID=3600
-DOTENV_SILENT=true
-DOTENV_FLOW_SILENT=true

+ 2 - 2
src/common/envs/production.env

@@ -2,6 +2,7 @@ APP_PORT=8888
 SOCKET_NAME='socket-prod'
 SOCKET_PORT=8889
 SOCKET_PATH="/ws-sync"
+SOCKET_USE_MSPACK=1
 REDIS_HOST=127.0.0.1
 REDIS_PORT=6379
 REDIS_PASSWORD=JK20220120JIK
@@ -11,5 +12,4 @@ REDIS_PREFIX=chat
 WATCH_USER=4dage
 WATCH_PASSWORD=4dage168.
 TEMP_ROOM_VALID=3600
-DOTENV_SILENT=true
-DOTENV_FLOW_SILENT=true
+

+ 5 - 2
src/room/room.service.ts

@@ -82,8 +82,11 @@ export class RoomService {
         await this.handleRoomStatusAction(socket);
       }
       // 压测试直接去除信息
-      if (!!socket.data.isBenmark && Role === 'leader') {
-        this.handleRoomDismiss(RoomId);
+      if (!!socket.data.isBenmark) {
+        if (Role === 'leader') {
+          this.handleRoomDismiss(RoomId);
+        }
+        this.userService.deleteRoomUser(RoomId, UserId);
       }
     }
   }

+ 9 - 5
src/socket/socket.gateway.ts

@@ -19,22 +19,26 @@ import { DelayService } from 'src/room/delay/delay.service';
 
 console.log('SOCKET_NAME', process.env.SOCKET_NAME);
 console.log('SOCKET_PATH', process.env.SOCKET_PATH);
+console.log('SOCKET_USE_MSPACK', process.env.SOCKET_USE_MSPACK);
+
 @WebSocketGateway(Number(process.env.SOCKET_PORT), {
   transports: ['websocket'],
   cors: '*',
   // namespace: "ws",
   // path: '/ws-sync',
   path: process.env.SOCKET_PATH,
-  // parser: require('socket.io-msgpack-parser'),
+  parser:
+    Number(process.env.SOCKET_USE_MSPACK) === 1
+      ? require('socket.io-msgpack-parser')
+      : '',
 })
 export class SocketGateway
-  implements OnGatewayInit, OnGatewayDisconnect, OnGatewayConnection
-{
+  implements OnGatewayInit, OnGatewayDisconnect, OnGatewayConnection {
   constructor(
     @InjectRedis() private readonly redis: Redis,
     private readonly roomService: RoomService,
-    private readonly delayService: DelayService,
-  ) {}
+    private readonly delayService: DelayService
+  ) { }
   public readonly logger = new Logger('socketGateway');
   @WebSocketServer() server: Server;
   // public _loginLimit = new Map<string, string>();