@saihu/common 1.1.79 → 1.1.80

package/dist/decorators/index.d.ts

@@ -1,2 +1,3 @@
 export * from './saihu-subscribe.decorator';
+export * from './operlog.decorator';
 //# sourceMappingURL=index.d.ts.map

package/dist/decorators/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/decorators/index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/decorators/index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qBAAqB,CAAC"}

package/dist/decorators/index.js

@@ -15,3 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./saihu-subscribe.decorator"), exports);
+__exportStar(require("./operlog.decorator"), exports);

package/dist/decorators/operlog.decorator.d.ts

@@ -0,0 +1,7 @@
+export declare const OPERLOG_KEY = "operlog";
+/**
+ * Decorator to enable operation logging for specific endpoints
+ * @param enabled - Whether to enable logging for this endpoint (default: true)
+ */
+export declare const LogOperation: (enabled?: boolean) => import("@nestjs/common").CustomDecorator<string>;
+//# sourceMappingURL=operlog.decorator.d.ts.map

package/dist/decorators/operlog.decorator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"operlog.decorator.d.ts","sourceRoot":"","sources":["../../src/decorators/operlog.decorator.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,WAAW,YAAY,CAAC;AAErC;;;GAGG;AACH,eAAO,MAAM,YAAY,GAAI,UAAS,OAAc,qDACjB,CAAC"}

package/dist/decorators/operlog.decorator.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LogOperation = exports.OPERLOG_KEY = void 0;
+const common_1 = require("@nestjs/common");
+exports.OPERLOG_KEY = 'operlog';
+/**
+ * Decorator to enable operation logging for specific endpoints
+ * @param enabled - Whether to enable logging for this endpoint (default: true)
+ */
+const LogOperation = (enabled = true) => (0, common_1.SetMetadata)(exports.OPERLOG_KEY, enabled);
+exports.LogOperation = LogOperation;

package/dist/interceptors/operlog.interceptor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"operlog.interceptor.d.ts","sourceRoot":"","sources":["../../src/interceptors/operlog.interceptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EACf,gBAAgB,EAChB,WAAW,EAGZ,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAElC,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAKtE,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAIlE,qBACa,kBAAmB,YAAW,eAAe;IAMtD,OAAO,CAAC,SAAS;IACS,OAAO,CAAC,QAAQ,CAAC,eAAe;IAE1D,OAAO,CAAC,QAAQ,CAAC,OAAO;IAR1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuC;IAC9D,OAAO,CAAC,SAAS,CAAU;IAC3B,OAAO,CAAC,SAAS,CAAW;gBAGlB,SAAS,EAAE,SAAS,EACe,eAAe,EAAE,eAAe,EAE1D,OAAO,EAAE,mBAAmB;IAa/C,SAAS,CAAC,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC;IAqExE,OAAO,CAAC,WAAW;IAiCnB;;OAEG;IACH,OAAO,CAAC,gBAAgB;CAWzB"}
+{"version":3,"file":"operlog.interceptor.d.ts","sourceRoot":"","sources":["../../src/interceptors/operlog.interceptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EACf,gBAAgB,EAChB,WAAW,EAGZ,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAElC,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAKtE,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAKlE,qBACa,kBAAmB,YAAW,eAAe;IAMtD,OAAO,CAAC,SAAS;IACS,OAAO,CAAC,QAAQ,CAAC,eAAe;IAE1D,OAAO,CAAC,QAAQ,CAAC,OAAO;IAR1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuC;IAC9D,OAAO,CAAC,SAAS,CAAU;IAC3B,OAAO,CAAC,SAAS,CAAW;gBAGlB,SAAS,EAAE,SAAS,EACe,eAAe,EAAE,eAAe,EAE1D,OAAO,EAAE,mBAAmB;IAa/C,SAAS,CAAC,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC;IAgFxE,OAAO,CAAC,WAAW;IAiCnB;;OAEG;IACH,OAAO,CAAC,gBAAgB;CAWzB"}

package/dist/interceptors/operlog.interceptor.js

@@ -18,6 +18,7 @@ const common_1 = require("@nestjs/common");
 const core_1 = require("@nestjs/core");
 const operators_1 = require("rxjs/operators");
 const common_consts_1 = require("../consts/common.consts");
+const operlog_decorator_1 = require("../decorators/operlog.decorator");
 let OperlogInterceptor = OperlogInterceptor_1 = class OperlogInterceptor {
     constructor(reflector, rabbitmqService, options) {
         this.reflector = reflector;
@@ -35,6 +36,12 @@ let OperlogInterceptor = OperlogInterceptor_1 = class OperlogInterceptor {
     }
     intercept(context, next) {
         var _a;
+        // Check if the decorator is present and enabled
+        const isOperlogEnabled = this.reflector.getAllAndOverride(operlog_decorator_1.OPERLOG_KEY, [context.getHandler(), context.getClass()]);
+        // If decorator is not present or is disabled, skip logging
+        if (isOperlogEnabled !== true) {
+            return next.handle();
+        }
         if (!this.isEnabled) {
             return next.handle();
         }

package/dist/interfaces/options.interface.d.ts

@@ -1,21 +1,27 @@
-import { Type } from "@nestjs/common";
+import { Type } from '@nestjs/common';
 export interface CommonModuleOptions {
     /**
      * 模块名称
      */
     name: string;
     /**
-     * 是否开启权限校验
+     * 是否开启权限校验 (需要配置 redis)
      */
     usePerms?: boolean;
     /**
-     * 是否开启操作日志
+     * 是否开启操作日志 (需要配置 rabbitmq)
      */
     useOperlog?: boolean;
+    /**
+     * Redis 配置 (仅在 usePerms 为 true 时需要)
+     */
     redis?: {
         url: string;
         password: string;
     };
+    /**
+     * RabbitMQ 配置 (仅在 useOperlog 为 true 时需要)
+     */
     rabbitmq?: {
         url: string;
     };

package/dist/interfaces/options.interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"options.interface.d.ts","sourceRoot":"","sources":["../../src/interfaces/options.interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAEtC,MAAM,WAAW,mBAAmB;IAClC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE;QACN,GAAG,EAAE,MAAM,CAAC;QACZ,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IAEF,QAAQ,CAAC,EAAE;QACT,GAAG,EAAE,MAAM,CAAC;KACb,CAAC;IACF;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,wBAAwB;IACvC,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;IAChB,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,UAAU,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,mBAAmB,CAAC,GAAG,mBAAmB,CAAC;IACnF,QAAQ,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IACrB,WAAW,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB"}
+{"version":3,"file":"options.interface.d.ts","sourceRoot":"","sources":["../../src/interfaces/options.interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAEtC,MAAM,WAAW,mBAAmB;IAClC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,KAAK,CAAC,EAAE;QACN,GAAG,EAAE,MAAM,CAAC;QACZ,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IACF;;OAEG;IACH,QAAQ,CAAC,EAAE;QACT,GAAG,EAAE,MAAM,CAAC;KACb,CAAC;IACF;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,wBAAwB;IACvC,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;IAChB,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC;IACf,UAAU,EAAE,CACV,GAAG,IAAI,EAAE,GAAG,EAAE,KACX,OAAO,CAAC,mBAAmB,CAAC,GAAG,mBAAmB,CAAC;IACxD,QAAQ,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IACrB,WAAW,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB"}

package/dist/saihu-common.module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"saihu-common.module.d.ts","sourceRoot":"","sources":["../src/saihu-common.module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,aAAa,EAAY,MAAM,gBAAgB,CAAC;AAEjE,OAAO,EACL,wBAAwB,EACxB,mBAAmB,EACpB,MAAM,gCAAgC,CAAC;AAWxC,qBACa,iBAAiB;IAC5B,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,mBAAmB,GAAG,aAAa;IA6B3D,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,wBAAwB,GAAG,aAAa;IA0BrE,MAAM,CAAC,sBAAsB,IAAI,aAAa;CAa/C"}
+{"version":3,"file":"saihu-common.module.d.ts","sourceRoot":"","sources":["../src/saihu-common.module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,aAAa,EAAY,MAAM,gBAAgB,CAAC;AAEjE,OAAO,EACL,wBAAwB,EACxB,mBAAmB,EACpB,MAAM,gCAAgC,CAAC;AAWxC,qBACa,iBAAiB;IAC5B,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,mBAAmB,GAAG,aAAa;IA6B3D,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,wBAAwB,GAAG,aAAa;IAiCrE,MAAM,CAAC,sBAAsB,IAAI,aAAa;CAa/C"}

package/dist/saihu-common.module.js

@@ -30,18 +30,18 @@ let SaihuCommonModule = SaihuCommonModule_1 = class SaihuCommonModule {
                 provide: common_consts_1.RABBITMQ_SERVICE,
                 useClass: rabbitmq_service_1.RabbitmqServiceImpl,
             },
+            // Add OperlogInterceptor as a regular provider so it can be used manually
+            interceptors_1.OperlogInterceptor,
         ];
-        const useOperlog = options.useOperlog !== false;
-        if (useOperlog) {
-            providers.push({
-                provide: core_1.APP_INTERCEPTOR,
-                useClass: interceptors_1.OperlogInterceptor,
-            });
-        }
         return {
             module: SaihuCommonModule_1,
             providers,
-            exports: [common_consts_1.COMMON_MODULE_OPTIONS, common_consts_1.REDIS_SERVICE, common_consts_1.RABBITMQ_SERVICE],
+            exports: [
+                common_consts_1.COMMON_MODULE_OPTIONS,
+                common_consts_1.REDIS_SERVICE,
+                common_consts_1.RABBITMQ_SERVICE,
+                interceptors_1.OperlogInterceptor,
+            ],
             global: true,
         };
     }
@@ -60,12 +60,19 @@ let SaihuCommonModule = SaihuCommonModule_1 = class SaihuCommonModule {
                 provide: common_consts_1.RABBITMQ_SERVICE,
                 useClass: rabbitmq_service_1.RabbitmqServiceImpl,
             },
+            // Add OperlogInterceptor as a regular provider so it can be used manually
+            interceptors_1.OperlogInterceptor,
         ];
         return {
             module: SaihuCommonModule_1,
             imports: [config_1.ConfigModule, ...(options.imports || [])],
             providers,
-            exports: [common_consts_1.COMMON_MODULE_OPTIONS, common_consts_1.REDIS_SERVICE, common_consts_1.RABBITMQ_SERVICE],
+            exports: [
+                common_consts_1.COMMON_MODULE_OPTIONS,
+                common_consts_1.REDIS_SERVICE,
+                common_consts_1.RABBITMQ_SERVICE,
+                interceptors_1.OperlogInterceptor,
+            ],
             global: true, // 设置为全局模块
         };
     }

package/dist/services/redis.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"redis.service.d.ts","sourceRoot":"","sources":["../../src/services/redis.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EACZ,eAAe,EAGhB,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,qBACa,gBACX,YAAW,YAAY,EAAE,YAAY,EAAE,eAAe;IASpD,OAAO,CAAC,QAAQ,CAAC,aAAa;IAPhC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqC;IAC5D,OAAO,CAAC,WAAW,CAAoB;IACvC,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,SAAS,CAAkB;gBAIhB,aAAa,EAAE,mBAAmB;IAK/C,YAAY;IAIZ,UAAU;IAkCV,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAYtC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAW5D,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrC,eAAe;CAMhB"}
+{"version":3,"file":"redis.service.d.ts","sourceRoot":"","sources":["../../src/services/redis.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EACZ,eAAe,EAGhB,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,qBACa,gBACX,YAAW,YAAY,EAAE,YAAY,EAAE,eAAe;IASpD,OAAO,CAAC,QAAQ,CAAC,aAAa;IAPhC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqC;IAC5D,OAAO,CAAC,WAAW,CAAoB;IACvC,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,SAAS,CAAkB;gBAIhB,aAAa,EAAE,mBAAmB;IAM/C,YAAY;IAIZ,UAAU;IA0CV,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAYtC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAW5D,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrC,eAAe;CAMhB"}

package/dist/services/redis.service.js

@@ -26,13 +26,15 @@ let RedisServiceImpl = RedisServiceImpl_1 = class RedisServiceImpl {
         this.logger = new common_1.Logger(RedisServiceImpl_1.name);
         this.isInitialized = false;
         this.isEnabled = false;
-        this.isEnabled = commonOptions.usePerms !== false;
+        // Only enable Redis if usePerms is explicitly true
+        this.isEnabled = commonOptions.usePerms === true;
     }
     async onModuleInit() {
         await this.initialize();
     }
     async initialize() {
         if (!this.isEnabled) {
+            this.logger.log('Redis service disabled (usePerms is not enabled)');
             return;
         }
         if (this.isInitialized) {
@@ -40,16 +42,16 @@ let RedisServiceImpl = RedisServiceImpl_1 = class RedisServiceImpl {
         }
         try {
             if (!this.commonOptions.redis) {
-                this.logger.error('common Redis options not found');
-                throw new Error('common Redis options not found');
+                this.logger.error('Redis options not found. Redis is required when usePerms is true.');
+                throw new Error('Redis configuration is required when usePerms is enabled');
             }
             if (!this.commonOptions.redis.url) {
-                this.logger.error('common Redis url not found');
-                throw new Error('common Redis url not found');
+                this.logger.error('Redis url not found');
+                throw new Error('Redis url is required');
             }
             if (!this.commonOptions.redis.password) {
-                this.logger.error('common Redis password not found');
-                throw new Error('common Redis password not found');
+                this.logger.error('Redis password not found');
+                throw new Error('Redis password is required');
             }
             const url = this.commonOptions.redis.url;
             const password = this.commonOptions.redis.password;
@@ -57,10 +59,11 @@ let RedisServiceImpl = RedisServiceImpl_1 = class RedisServiceImpl {
                 password,
                 db: common_consts_1.REDIS_AUTH_DB,
             });
-            // this.logger.log('common Redis connected successfully');
+            this.logger.log('Redis connected successfully');
+            this.isInitialized = true;
         }
         catch (error) {
-            this.logger.error('common Failed to connect to Redis:', error);
+            this.logger.error('Failed to connect to Redis:', error);
             throw error;
         }
     }
@@ -89,7 +92,7 @@ let RedisServiceImpl = RedisServiceImpl_1 = class RedisServiceImpl {
         await this.redisClient.del(key);
     }
     onModuleDestroy() {
-        if (!this.isEnabled) {
+        if (!this.isEnabled || !this.redisClient) {
             return;
         }
         this.redisClient.disconnect();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saihu/common",
-  "version": "1.1.79",
+  "version": "1.1.80",
   "description": "Common utilities for NestJS applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",