@saihu/common 1.1.62 → 1.1.63

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

@@ -1,6 +1,7 @@
 import { ArgumentsHost } from '@nestjs/common';
 import { BaseRpcExceptionFilter } from '@nestjs/microservices';
 export declare class BaseErrorRpcFilter extends BaseRpcExceptionFilter {
+    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;AAE7E,qBACa,kBAAmB,SAAQ,sBAAsB;IAC5D,KAAK,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,EAAE,aAAa;CA+B1C"}
+{"version":3,"file":"base-error-rpc.filter.d.ts","sourceRoot":"","sources":["../../src/filters/base-error-rpc.filter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAiB,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAgB,MAAM,uBAAuB,CAAC;AAG7E,qBACa,kBAAmB,SAAQ,sBAAsB;IAC5D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuC;IAE9D,KAAK,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,EAAE,aAAa;CAwC1C"}

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

@@ -5,41 +5,56 @@ 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");
-let BaseErrorRpcFilter = class BaseErrorRpcFilter extends microservices_1.BaseRpcExceptionFilter {
+const base_res_dto_1 = require("../dto/base-res.dto");
+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;
-        // Only transform for RPC
-        if (host.getType() !== 'rpc') {
-            return super.catch(exception, host);
-        }
-        // If it's already RpcException, pass through
+        // Skip if already an RpcException
         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,
+        // Check if it's a BaseError using duck-typing
+        // This is more reliable than instanceof for serialized errors
+        const isBaseErrorLike = exception &&
+            typeof exception === 'object' &&
+            exception.name === 'BaseError' &&
+            typeof exception.code === 'number' &&
+            typeof exception.message === 'string';
+        if (isBaseErrorLike || exception instanceof base_res_dto_1.BaseError) {
+            const payload = {
+                code: exception.code,
                 msg: exception.message,
                 data: (_a = exception.data) !== null && _a !== void 0 ? _a : null,
-            }
-            : {
-                code: 500,
-                msg: 'Internal server error',
-                data: null,
             };
+            this.logger.log(`BaseError caught: [${payload.code}] ${payload.msg}`);
+            return super.catch(new microservices_1.RpcException(payload), host);
+        }
+        // Handle all other errors
+        this.logger.error('Unhandled RPC error:', {
+            name: exception === null || exception === void 0 ? void 0 : exception.name,
+            message: exception === null || exception === void 0 ? void 0 : exception.message,
+            code: exception === null || exception === void 0 ? void 0 : exception.code,
+            stack: exception === null || exception === void 0 ? void 0 : exception.stack,
+        });
+        const payload = {
+            code: 500,
+            msg: (exception === null || exception === void 0 ? void 0 : exception.message) || '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)() // <-- catch everything (not just BaseError)
+exports.BaseErrorRpcFilter = BaseErrorRpcFilter = BaseErrorRpcFilter_1 = __decorate([
+    (0, common_1.Catch)() // Catch everything
 ], BaseErrorRpcFilter);

package/package.json

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