update

nest-cli.json

@@ -3,6 +3,7 @@
   "collection": "@nestjs/schematics",
   "sourceRoot": "src",
   "compilerOptions": {
-    "deleteOutDir": true
+    "deleteOutDir": true,
+    "assets": ["common/envs/*"]
   }
 }

src/app.module.ts

@@ -1,7 +1,9 @@
 import { ConfigModule } from '@nestjs/config';
+import { getEnvPath } from './common/helper/env.helper';
+const envFilePath: string = getEnvPath(`${__dirname}/common/envs`);
 const config = ConfigModule.forRoot({
   isGlobal: true,
-  envFilePath: ['.env.development', '.env.production'],
+  envFilePath: envFilePath,
 });
 
 import { Module } from '@nestjs/common';

.env.development

@@ -1,15 +1,15 @@
-APP_PORT=8888
-SOCKET_NAME='socket-test'
-SOCKET_PORT=8889
-SOCKET_PATH="/ws-sync"
-REDIS_HOST=127.0.0.1
-REDIS_PORT=6379
-REDIS_PASSWORD=redis9394
-REDIS_DB=0
-REDIS_ADAPTER_DB=8
-REDIS_PREFIX=chat
-WATCH_USER=4dage
-WATCH_PASSWORD=4dage168.
-TEMP_ROOM_VALID=3600
-DOTENV_SILENT=true
-DOTENV_FLOW_SILENT=true
+APP_PORT=8888
+SOCKET_NAME='socket-test'
+SOCKET_PORT=8889
+SOCKET_PATH="/ws-sync"
+REDIS_HOST=127.0.0.1
+REDIS_PORT=6379
+REDIS_PASSWORD=redis9394
+REDIS_DB=0
+REDIS_ADAPTER_DB=8
+REDIS_PREFIX=chat
+WATCH_USER=4dage
+WATCH_PASSWORD=4dage168.
+TEMP_ROOM_VALID=3600
+DOTENV_SILENT=true
+DOTENV_FLOW_SILENT=true

src/common/envs/development.env

@@ -0,0 +1,15 @@
+APP_PORT=8888
+SOCKET_NAME='socket-dev'
+SOCKET_PORT=8889
+SOCKET_PATH="/ws-sync"
+REDIS_HOST=127.0.0.1
+REDIS_PORT=6379
+REDIS_PASSWORD=redis9394
+REDIS_DB=0
+REDIS_ADAPTER_DB=8
+REDIS_PREFIX=chat
+WATCH_USER=4dage
+WATCH_PASSWORD=4dage168.
+TEMP_ROOM_VALID=3600
+DOTENV_SILENT=true
+DOTENV_FLOW_SILENT=true

src/common/helper/env.helper.ts

@@ -0,0 +1,15 @@
+import { existsSync } from 'fs';
+import { resolve } from 'path';
+
+export function getEnvPath(dest: string): string {
+  const env: string | undefined = process.env.NODE_ENV;
+  const fallback: string = resolve(`${dest}/.env`);
+  const filename: string = env ? `${env}.env` : 'development.env';
+  let filePath: string = resolve(`${dest}/${filename}`);
+
+  if (!existsSync(filePath)) {
+    filePath = fallback;
+  }
+
+  return filePath;
+}

src/room/room.service.ts

@@ -133,7 +133,7 @@ export class RoomService {
         this._userId,
       );
       const isMax = await this.userService.isMaxRoom(RoomId);
-      console.log('isMaxRoom', isMax);
+      // console.log('isMaxRoom', isMax);
       if (isMax && Role !== 'leader' && !isExist) {
         this.logger.warn(`308:room-maxing`, 'join-error');
         socket.emit('manager-error', {

src/room/users/users.service.ts

@@ -24,7 +24,7 @@ export class UsersService {
     const config = await this.getRoomConfig(RoomId);
     const newMax = max ? max : config ? Number(config['limit']) : 50;
     const res = await this.redis.hvals(`kankan:socket:rooms:${RoomId}`);
-    console.log('newMax', res.length);
+    // console.log('newMax', res.length);
     return Promise.resolve(res.length >= newMax);
   }
   async isValidRoom(RoomId: string): Promise<boolean> {

src/socket/socket.gateway.ts

@@ -17,7 +17,8 @@ import { RoomService } from '../room/room.service';
 import { Logger } from '@nestjs/common';
 import { DelayService } from 'src/room/delay/delay.service';
 
-console.log('SOCKET_PATH-0', process.env.SOCKET_PATH);
+console.log('SOCKET_NAME', process.env.SOCKET_NAME);
+console.log('SOCKET_PATH', process.env.SOCKET_PATH);
 @WebSocketGateway(Number(process.env.SOCKET_PORT), {
   transports: ['websocket'],
   cors: '*',