@saihu/common 1.1.57 → 1.1.58

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/package.json

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