@saihu/common 1.1.54 → 1.1.56

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

@@ -1,7 +1,7 @@
 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>;
+    private readonly logger;
+    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":"AAAA,OAAO,EAAE,aAAa,EAAiB,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAgB,MAAM,uBAAuB,CAAC;AAE7E,qBACa,kBAAmB,SAAQ,sBAAsB;IAC5D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuC;IAE9D,KAAK,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,EAAE,aAAa;CAmC1C"}

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

@@ -5,26 +5,48 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var BaseErrorRpcFilter_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 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 {
+let BaseErrorRpcFilter = BaseErrorRpcFilter_1 = class BaseErrorRpcFilter extends microservices_1.BaseRpcExceptionFilter {
+    constructor() {
+        super(...arguments);
+        this.logger = new common_1.Logger(BaseErrorRpcFilter_1.name);
+    }
     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 handle RPC context
+        if (host.getType() !== 'rpc') {
+            return super.catch(exception, host);
+        }
+        // If it's already an RpcException, pass through
+        if (exception instanceof microservices_1.RpcException) {
+            return super.catch(exception, host);
+        }
+        // Log the original error for debugging
+        this.logger.error('RPC Error caught:', exception);
+        // Transform to standardized format
+        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 || 'Internal server error',
+                data: (_a = exception.data) !== null && _a !== void 0 ? _a : null,
+            }
+            : {
+                code: 500,
+                msg: (exception === null || exception === void 0 ? void 0 : exception.message) || 'Internal server error',
+                data: null,
+            };
+        // Always wrap in RpcException before passing to super
         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)
+exports.BaseErrorRpcFilter = BaseErrorRpcFilter = BaseErrorRpcFilter_1 = __decorate([
+    (0, common_1.Catch)()
 ], BaseErrorRpcFilter);

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]: 'direct',
+    [Exchanges.OPER_LOG_EXCHANGE]: 'topic',
     [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;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"}
+{"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"}

package/dist/services/rabbitmq.service.js

@@ -50,6 +50,7 @@ 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;
@@ -110,7 +111,7 @@ let RabbitmqServiceImpl = RabbitmqServiceImpl_1 = class RabbitmqServiceImpl {
         }
         try {
             const messageBuffer = Buffer.from(JSON.stringify(message));
-            return this.channel.publish(common_consts_1.OPER_LOG_EXCHANGE, common_consts_1.OPER_LOG_QUEUE, messageBuffer);
+            return this.channel.publish(messaging_1.Exchanges.OPER_LOG_EXCHANGE, messaging_1.RoutingKeys[messaging_1.Exchanges.OPER_LOG_EXCHANGE].OPER_LOG_CREATED, 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.54",
+  "version": "1.1.56",
   "description": "Common utilities for NestJS applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",