@saihu/common 1.1.60 → 1.1.62

package/dist/consts/common.consts.d.ts

@@ -3,6 +3,6 @@ export declare const LOGIN_USER_KEY = "login_user:";
 export declare const COMMON_MODULE_OPTIONS = "COMMON_MODULE_OPTIONS";
 export declare const REDIS_SERVICE = "REDIS_SERVICE";
 export declare const RABBITMQ_SERVICE = "RABBITMQ_SERVICE";
-export declare const OPER_LOG_QUEUE = "q.oper.log.created.im-id";
+export declare const OPER_LOG_QUEUE = "oper_log_queue";
 export declare const OPER_LOG_EXCHANGE = "oper_log_exchange";
 //# sourceMappingURL=common.consts.d.ts.map

package/dist/consts/common.consts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.consts.d.ts","sourceRoot":"","sources":["../../src/consts/common.consts.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa,IAAI,CAAC;AAC/B,eAAO,MAAM,cAAc,gBAAgB,CAAC;AAC5C,eAAO,MAAM,qBAAqB,0BAA0B,CAAC;AAC7D,eAAO,MAAM,aAAa,kBAAkB,CAAC;AAC7C,eAAO,MAAM,gBAAgB,qBAAqB,CAAC;AACnD,eAAO,MAAM,cAAc,6BAA6B,CAAC;AACzD,eAAO,MAAM,iBAAiB,sBAAsB,CAAC"}
+{"version":3,"file":"common.consts.d.ts","sourceRoot":"","sources":["../../src/consts/common.consts.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,aAAa,IAAI,CAAC;AAC/B,eAAO,MAAM,cAAc,gBAAgB,CAAC;AAC5C,eAAO,MAAM,qBAAqB,0BAA0B,CAAC;AAC7D,eAAO,MAAM,aAAa,kBAAkB,CAAC;AAC7C,eAAO,MAAM,gBAAgB,qBAAqB,CAAC;AACnD,eAAO,MAAM,cAAc,mBAAmB,CAAC;AAC/C,eAAO,MAAM,iBAAiB,sBAAsB,CAAC"}

package/dist/consts/common.consts.js

@@ -6,5 +6,5 @@ exports.LOGIN_USER_KEY = 'login_user:';
 exports.COMMON_MODULE_OPTIONS = 'COMMON_MODULE_OPTIONS';
 exports.REDIS_SERVICE = 'REDIS_SERVICE';
 exports.RABBITMQ_SERVICE = 'RABBITMQ_SERVICE';
-exports.OPER_LOG_QUEUE = 'q.oper.log.created.im-id';
+exports.OPER_LOG_QUEUE = 'oper_log_queue';
 exports.OPER_LOG_EXCHANGE = 'oper_log_exchange';

package/dist/filters/base-error-rpc.filter.d.ts

@@ -1,7 +1,6 @@
 import { ArgumentsHost } from '@nestjs/common';
 import { BaseRpcExceptionFilter } from '@nestjs/microservices';
-import { BaseError } from '../dto/base-res.dto';
 export declare class BaseErrorRpcFilter extends BaseRpcExceptionFilter {
-    catch(exception: BaseError, host: ArgumentsHost): import("rxjs").Observable<any>;
+    catch(exception: any, host: ArgumentsHost): import("rxjs").Observable<any>;
 }
 //# sourceMappingURL=base-error-rpc.filter.d.ts.map

package/dist/filters/base-error-rpc.filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-error-rpc.filter.d.ts","sourceRoot":"","sources":["../../src/filters/base-error-rpc.filter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAS,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAgB,MAAM,uBAAuB,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,qBACa,kBAAmB,SAAQ,sBAAsB;IAC5D,KAAK,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa;CAWhD"}
+{"version":3,"file":"base-error-rpc.filter.d.ts","sourceRoot":"","sources":["../../src/filters/base-error-rpc.filter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAS,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAgB,MAAM,uBAAuB,CAAC;AAE7E,qBACa,kBAAmB,SAAQ,sBAAsB;IAC5D,KAAK,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,EAAE,aAAa;CA+B1C"}

package/dist/filters/base-error-rpc.filter.js

@@ -10,21 +10,36 @@ exports.BaseErrorRpcFilter = void 0;
 // @saihu/common/src/filters/base-error-rpc.filter.ts
 const common_1 = require("@nestjs/common");
 const microservices_1 = require("@nestjs/microservices");
-const base_res_dto_1 = require("../dto/base-res.dto");
 let BaseErrorRpcFilter = class BaseErrorRpcFilter extends microservices_1.BaseRpcExceptionFilter {
     catch(exception, host) {
         var _a;
-        // Wrap your BaseError into RpcException payload
-        const payload = {
-            code: exception.code,
-            msg: exception.message,
-            data: (_a = exception.data) !== null && _a !== void 0 ? _a : null,
-        };
-        // Delegate to the base filter with a proper RpcException
+        // Only transform for RPC
+        if (host.getType() !== 'rpc') {
+            return super.catch(exception, host);
+        }
+        // If it's already RpcException, pass through
+        if (exception instanceof microservices_1.RpcException) {
+            return super.catch(exception, host);
+        }
+        // Duck-type check for your BaseError shape
+        const isBaseErrorLike = ((exception === null || exception === void 0 ? void 0 : exception.name) === 'BaseError' ||
+            typeof (exception === null || exception === void 0 ? void 0 : exception.code) === 'number') &&
+            typeof (exception === null || exception === void 0 ? void 0 : exception.message) === 'string';
+        const payload = isBaseErrorLike
+            ? {
+                code: Number(exception.code) || 500,
+                msg: exception.message,
+                data: (_a = exception.data) !== null && _a !== void 0 ? _a : null,
+            }
+            : {
+                code: 500,
+                msg: 'Internal server error',
+                data: null,
+            };
         return super.catch(new microservices_1.RpcException(payload), host);
     }
 };
 exports.BaseErrorRpcFilter = BaseErrorRpcFilter;
 exports.BaseErrorRpcFilter = BaseErrorRpcFilter = __decorate([
-    (0, common_1.Catch)(base_res_dto_1.BaseError)
+    (0, common_1.Catch)() // <-- catch everything (not just BaseError)
 ], BaseErrorRpcFilter);

package/dist/filters/index.d.ts

@@ -1,4 +1,4 @@
 export * from './base-error.filter';
-export * from './validation-exception.filter';
 export * from './base-error-rpc.filter';
+export * from './validation-exception.filter';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/filters/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/filters/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,+BAA+B,CAAC"}

package/dist/filters/index.js

@@ -15,5 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./base-error.filter"), exports);
-__exportStar(require("./validation-exception.filter"), exports);
 __exportStar(require("./base-error-rpc.filter"), exports);
+__exportStar(require("./validation-exception.filter"), exports);

package/dist/logger/saihu-logger.service.js

@@ -6,18 +6,18 @@ class SaihuLogger {
         if (!context)
             return false;
         const hiddenContexts = [
-            // 'InstanceLoader',
-            // 'RoutesResolver',
-            // 'RouterExplorer',
-            // 'NestFactory',
-            // 'NestApplication',
-            // 'ClientProxy',
-            // 'NestMicroservice',
+            'InstanceLoader',
+            'RoutesResolver',
+            'RouterExplorer',
+            'NestFactory',
+            'NestApplication',
+            'ClientProxy',
+            'NestMicroservice',
             'AmqpConnection',
-            // 'MicroserviceConfiguration',
-            // 'RabbitMQModule',
-            // 'WebSocketsController',
-            // 'ExceptionsHandler', // ← Add this
+            'MicroserviceConfiguration',
+            'RabbitMQModule',
+            'WebSocketsController',
+            'ExceptionsHandler', // ← Add this
         ];
         return hiddenContexts.some((hidden) => context.includes(hidden));
     }

package/dist/messaging/topology.js

@@ -93,7 +93,7 @@ exports.ExchangeTypes = {
     [Exchanges.IM_DATA]: 'topic',
     [Exchanges.IM_INVENTORY]: 'topic',
     [Exchanges.MASTER_DATA]: 'topic',
-    [Exchanges.OPER_LOG_EXCHANGE]: 'topic',
+    [Exchanges.OPER_LOG_EXCHANGE]: 'direct',
     [Exchanges.IM_SALES_ORDER]: 'topic',
     [Exchanges.SCM_DATA]: 'topic',
     [Exchanges.IM_PROCUREMENT_ORDER_DLX]: 'topic',

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

@@ -1 +1 @@
-{"version":3,"file":"rabbitmq.service.d.ts","sourceRoot":"","sources":["../../src/services/rabbitmq.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EACZ,eAAe,EAGhB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAGlE,qBACa,mBACX,YAAW,eAAe,EAAE,YAAY,EAAE,eAAe;IAUvD,OAAO,CAAC,QAAQ,CAAC,OAAO;IAR1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;IAC/D,OAAO,CAAC,UAAU,CAAgC;IAClD,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,SAAS,CAAU;gBAIR,OAAO,EAAE,mBAAmB;IAKzC,YAAY;IAMZ,eAAe;IAIf,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA6BxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAY3B,cAAc,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;CAkBrD"}
+{"version":3,"file":"rabbitmq.service.d.ts","sourceRoot":"","sources":["../../src/services/rabbitmq.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EACZ,eAAe,EAGhB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAMtE,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAElE,qBACa,mBACX,YAAW,eAAe,EAAE,YAAY,EAAE,eAAe;IAUvD,OAAO,CAAC,QAAQ,CAAC,OAAO;IAR1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;IAC/D,OAAO,CAAC,UAAU,CAAgC;IAClD,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,SAAS,CAAU;gBAIR,OAAO,EAAE,mBAAmB;IAKzC,YAAY;IAMZ,eAAe;IAIf,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA6BxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAY3B,cAAc,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;CAkBrD"}

package/dist/services/rabbitmq.service.js

@@ -50,7 +50,6 @@ exports.RabbitmqServiceImpl = void 0;
 const common_1 = require("@nestjs/common");
 const amqp = __importStar(require("amqplib"));
 const common_consts_1 = require("../consts/common.consts");
-const messaging_1 = require("../messaging");
 let RabbitmqServiceImpl = RabbitmqServiceImpl_1 = class RabbitmqServiceImpl {
     constructor(options) {
         this.options = options;
@@ -111,7 +110,7 @@ let RabbitmqServiceImpl = RabbitmqServiceImpl_1 = class RabbitmqServiceImpl {
         }
         try {
             const messageBuffer = Buffer.from(JSON.stringify(message));
-            return this.channel.publish(messaging_1.Exchanges.OPER_LOG_EXCHANGE, messaging_1.RoutingKeys[messaging_1.Exchanges.OPER_LOG_EXCHANGE].OPER_LOG_CREATED, messageBuffer);
+            return this.channel.publish(common_consts_1.OPER_LOG_EXCHANGE, common_consts_1.OPER_LOG_QUEUE, messageBuffer);
         }
         catch (error) {
             this.logger.error('Failed to publish message to RabbitMQ:', error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saihu/common",
-  "version": "1.1.60",
+  "version": "1.1.62",
   "description": "Common utilities for NestJS applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -33,7 +33,6 @@
     "@nestjs/config": "^4.0.2",
     "@nestjs/core": "^11.1.1",
     "@nestjs/jwt": "^11.0.0",
-    "@nestjs/microservices": "^11.1.6",
     "amqp-connection-manager": "^5.0.0",
     "amqplib": "^0.10.9",
     "class-transformer": "^0.5.1",