Merge branch 'dev' into fix-add-device-issue

libs/common/src/context/request-context.ts

@@ -0,0 +1,8 @@
+import { AsyncLocalStorage } from 'async_hooks';
+
+export interface RequestContextStore {
+  requestId?: string;
+  userId?: string;
+}
+
+export const requestContext = new AsyncLocalStorage<RequestContextStore>();

libs/common/src/database/database.module.ts

@@ -43,73 +43,83 @@ import { SubspaceProductAllocationEntity } from '../modules/space/entities/subsp
 import { SubspaceEntity } from '../modules/space/entities/subspace/subspace.entity';
 import { TagEntity } from '../modules/space/entities/tag.entity';
 import { ClientEntity } from '../modules/client/entities';
+import { TypeOrmWinstonLogger } from '@app/common/logger/services/typeorm.logger';
+import { createLogger } from 'winston';
+import { winstonLoggerOptions } from '../logger/services/winston.logger';
 @Module({
   imports: [
     TypeOrmModule.forRootAsync({
       imports: [ConfigModule],
       inject: [ConfigService],
-      useFactory: (configService: ConfigService) => ({
-        name: 'default',
-        type: 'postgres',
-        host: configService.get('DB_HOST'),
-        port: configService.get('DB_PORT'),
-        username: configService.get('DB_USER'),
-        password: configService.get('DB_PASSWORD'),
-        database: configService.get('DB_NAME'),
-        entities: [
-          NewTagEntity,
-          ProjectEntity,
-          UserEntity,
-          UserSessionEntity,
-          UserOtpEntity,
-          ProductEntity,
-          DeviceUserPermissionEntity,
-          DeviceEntity,
-          PermissionTypeEntity,
-          CommunityEntity,
-          SpaceEntity,
-          SpaceLinkEntity,
-          SubspaceEntity,
-          TagEntity,
-          UserSpaceEntity,
-          DeviceUserPermissionEntity,
-          RoleTypeEntity,
-          UserNotificationEntity,
-          DeviceNotificationEntity,
-          RegionEntity,
-          TimeZoneEntity,
-          VisitorPasswordEntity,
-          DeviceStatusLogEntity,
-          SceneEntity,
-          SceneIconEntity,
-          SceneDeviceEntity,
-          SpaceModelEntity,
-          SubspaceModelEntity,
-          TagModel,
-          InviteUserEntity,
-          InviteUserSpaceEntity,
-          InviteSpaceEntity,
-          AutomationEntity,
-          SpaceModelProductAllocationEntity,
-          SubspaceModelProductAllocationEntity,
-          SpaceProductAllocationEntity,
-          SubspaceProductAllocationEntity,
-          ClientEntity,
-        ],
-        namingStrategy: new SnakeNamingStrategy(),
-        synchronize: Boolean(JSON.parse(configService.get('DB_SYNC'))),
-        logging: false,
-        extra: {
-          charset: 'utf8mb4',
-          max: 20, // set pool max size
-          idleTimeoutMillis: 5000, // close idle clients after 5 second
-          connectionTimeoutMillis: 12_000, // return an error after 11 second if connection could not be established
-          maxUses: 7500, // close (and replace) a connection after it has been used 7500 times (see below for discussion)
-        },
-        continuationLocalStorage: true,
-        ssl: Boolean(JSON.parse(configService.get('DB_SSL'))),
-      }),
+      useFactory: (configService: ConfigService) => {
+        const winstonLogger = createLogger(winstonLoggerOptions);
+        const typeOrmLogger = new TypeOrmWinstonLogger(winstonLogger);
+        return {
+          name: 'default',
+          type: 'postgres',
+          host: configService.get('DB_HOST'),
+          port: configService.get('DB_PORT'),
+          username: configService.get('DB_USER'),
+          password: configService.get('DB_PASSWORD'),
+          database: configService.get('DB_NAME'),
+          entities: [
+            NewTagEntity,
+            ProjectEntity,
+            UserEntity,
+            UserSessionEntity,
+            UserOtpEntity,
+            ProductEntity,
+            DeviceUserPermissionEntity,
+            DeviceEntity,
+            PermissionTypeEntity,
+            CommunityEntity,
+            SpaceEntity,
+            SpaceLinkEntity,
+            SubspaceEntity,
+            TagEntity,
+            UserSpaceEntity,
+            DeviceUserPermissionEntity,
+            RoleTypeEntity,
+            UserNotificationEntity,
+            DeviceNotificationEntity,
+            RegionEntity,
+            TimeZoneEntity,
+            VisitorPasswordEntity,
+            DeviceStatusLogEntity,
+            SceneEntity,
+            SceneIconEntity,
+            SceneDeviceEntity,
+            SpaceModelEntity,
+            SubspaceModelEntity,
+            TagModel,
+            InviteUserEntity,
+            InviteUserSpaceEntity,
+            InviteSpaceEntity,
+            AutomationEntity,
+            SpaceModelProductAllocationEntity,
+            SubspaceModelProductAllocationEntity,
+            SpaceProductAllocationEntity,
+            SubspaceProductAllocationEntity,
+            ClientEntity,
+          ],
+          namingStrategy: new SnakeNamingStrategy(),
+          synchronize: Boolean(JSON.parse(configService.get('DB_SYNC'))),
+          logging: ['query', 'error', 'warn', 'schema', 'migration'],
+
+          logger: typeOrmLogger,
+          extra: {
+            charset: 'utf8mb4',
+            max: 20, // set pool max size
+            idleTimeoutMillis: 5000, // close idle clients after 5 second
+            connectionTimeoutMillis: 12_000, // return an error after 11 second if connection could not be established
+            maxUses: 7500, // close (and replace) a connection after it has been used 7500 times (see below for discussion)
+          },
+          continuationLocalStorage: true,
+          ssl: Boolean(JSON.parse(configService.get('DB_SSL'))),
+        };
+      },
     }),
   ],
+  providers: [TypeOrmWinstonLogger],
 })
 export class DatabaseModule {}

libs/common/src/logger/logger.module.ts

@@ -0,0 +1,12 @@
+// src/common/logger/logger.module.ts
+import { Module } from '@nestjs/common';
+import { WinstonModule } from 'nest-winston';
+import { winstonLoggerOptions } from './services/winston.logger';
+import { TypeOrmWinstonLogger } from './services/typeorm.logger';
+
+@Module({
+  imports: [WinstonModule.forRoot(winstonLoggerOptions)],
+  providers: [TypeOrmWinstonLogger],
+  exports: [TypeOrmWinstonLogger],
+})
+export class LoggerModule {}

libs/common/src/logger/services/typeorm.logger.ts

@@ -0,0 +1,72 @@
+import { Logger as WinstonLogger } from 'winston';
+import { Logger as TypeOrmLogger } from 'typeorm';
+import { requestContext } from '@app/common/context/request-context';
+
+const ERROR_THRESHOLD = 2000;
+
+export class TypeOrmWinstonLogger implements TypeOrmLogger {
+  constructor(private readonly logger: WinstonLogger) {}
+
+  private getContext() {
+    const context = requestContext.getStore();
+    return {
+      requestId: context?.requestId ?? 'N/A',
+      userId: context?.userId ?? null,
+    };
+  }
+
+  private extractTable(query: string): string {
+    const match =
+      query.match(/from\s+["`]?(\w+)["`]?/i) ||
+      query.match(/into\s+["`]?(\w+)["`]?/i);
+    return match?.[1] ?? 'unknown';
+  }
+
+  logQuery(query: string, parameters?: any[]) {
+    const context = this.getContext();
+    this.logger.debug(`[DB][QUERY] ${query}`, {
+      ...context,
+      table: this.extractTable(query),
+      parameters,
+    });
+  }
+
+  logQueryError(error: string | Error, query: string, parameters?: any[]) {
+    const context = this.getContext();
+    this.logger.error(`[DB][ERROR] ${query}`, {
+      ...context,
+      table: this.extractTable(query),
+      parameters,
+      error,
+    });
+  }
+
+  logQuerySlow(time: number, query: string, parameters?: any[]) {
+    const context = this.getContext();
+    const severity = time > ERROR_THRESHOLD ? 'error' : 'warn';
+    const label = severity === 'error' ? 'VERY SLOW' : 'SLOW';
+
+    this.logger[severity](`[DB][${label} > ${time}ms] ${query}`, {
+      ...context,
+      table: this.extractTable(query),
+      parameters,
+      duration: `${time}ms`,
+      severity,
+    });
+  }
+
+  logSchemaBuild(message: string) {
+    this.logger.info(`[DB][SCHEMA] ${message}`);
+  }
+
+  logMigration(message: string) {
+    this.logger.info(`[DB][MIGRATION] ${message}`);
+  }
+
+  log(level: 'log' | 'info' | 'warn', message: any) {
+    this.logger.log({
+      level,
+      message: `[DB] ${message}`,
+    });
+  }
+}

libs/common/src/logger/services/winston.logger.ts

@@ -2,6 +2,8 @@ import { utilities as nestWinstonModuleUtilities } from 'nest-winston';
 import * as winston from 'winston';
 
 export const winstonLoggerOptions: winston.LoggerOptions = {
+  level:
+    process.env.AZURE_POSTGRESQL_DATABASE === 'development' ? 'debug' : 'error',
   transports: [
     new winston.transports.Console({
       format: winston.format.combine(

libs/common/src/middleware/request-context.middleware.ts

@@ -0,0 +1,14 @@
+import { Injectable, NestMiddleware } from '@nestjs/common';
+import { requestContext } from '../context/request-context';
+import { v4 as uuidv4 } from 'uuid';
+
+@Injectable()
+export class RequestContextMiddleware implements NestMiddleware {
+  use(req: any, res: any, next: () => void) {
+    const context = {
+      requestId: req.headers['x-request-id'] || uuidv4(),
+    };
+
+    requestContext.run(context, () => next());
+  }
+}

src/app.module.ts

@@ -33,7 +33,7 @@ import { ClientModule } from './client/client.module';
 import { DeviceCommissionModule } from './commission-device/commission-device.module';
 import { PowerClampModule } from './power-clamp/power-clamp.module';
 import { WinstonModule } from 'nest-winston';
-import { winstonLoggerOptions } from './common/filters/http-exception/logger/winston.logger';
+import { winstonLoggerOptions } from '../libs/common/src/logger/services/winston.logger';
 @Module({
   imports: [
     ConfigModule.forRoot({

src/main.ts

@@ -7,6 +7,9 @@ import { ValidationPipe } from '@nestjs/common';
 import { json, urlencoded } from 'body-parser';
 import { SeederService } from '@app/common/seed/services/seeder.service';
 import { HttpExceptionFilter } from './common/filters/http-exception/http-exception.filter';
+import { Logger } from '@nestjs/common';
+import { WINSTON_MODULE_NEST_PROVIDER } from 'nest-winston';
+import { RequestContextMiddleware } from '@app/common/middleware/request-context.middleware';
 
 async function bootstrap() {
   const app = await NestFactory.create(AppModule);
@@ -18,6 +21,8 @@ async function bootstrap() {
   app.use(urlencoded({ limit: '1mb', extended: true }));
   app.useGlobalFilters(new HttpExceptionFilter());
 
+  app.use(new RequestContextMiddleware().use);
+
   app.use(
     rateLimit({
       windowMs: 5 * 60 * 1000,
@@ -43,14 +48,16 @@ async function bootstrap() {
   );
 
   const seederService = app.get(SeederService);
+  const logger = app.get<Logger>(WINSTON_MODULE_NEST_PROVIDER);
+
   try {
     await seederService.seed();
-    console.log('Seeding complete!');
+    logger.log('Seeding complete!');
   } catch (error) {
-    console.error('Seeding failed!', error);
+    logger.error('Seeding failed!', error.stack || error);
   }
 
-  console.log('Starting auth at port ...', process.env.PORT || 4000);
+  logger.log('Starting auth at port ...', process.env.PORT || 4000);
   await app.listen(process.env.PORT || 4000);
 }
 bootstrap();