@saihu/common 1.1.48 → 1.1.50

package/dist/decorators/index.d.ts

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

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

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

package/dist/decorators/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./saihu-subscribe.decorator"), exports);

package/dist/decorators/saihu-subscribe.decorator.d.ts

@@ -0,0 +1,12 @@
+import type { MessageHandlerOptions } from '@golevelup/nestjs-rabbitmq';
+type SaihuSubscribeProps = Omit<MessageHandlerOptions, 'connection' | 'queue' | 'routingKey'> & {
+    /** Defaults to 'core' */
+    connection?: string;
+    /** Your service slug, e.g. 'im-accounting' */
+    service: string;
+    /** Single routing key string (recommended). If you pass an array, we’ll use the first to name the queue. */
+    routingKey: string | string[];
+};
+export declare function SaihuSubscribe(props: SaihuSubscribeProps): MethodDecorator;
+export {};
+//# sourceMappingURL=saihu-subscribe.decorator.d.ts.map

package/dist/decorators/saihu-subscribe.decorator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"saihu-subscribe.decorator.d.ts","sourceRoot":"","sources":["../../src/decorators/saihu-subscribe.decorator.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAGxE,KAAK,mBAAmB,GAAG,IAAI,CAC7B,qBAAqB,EACrB,YAAY,GAAG,OAAO,GAAG,YAAY,CACtC,GAAG;IACF,yBAAyB;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,8CAA8C;IAC9C,OAAO,EAAE,MAAM,CAAC;IAChB,4GAA4G;IAC5G,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAC/B,CAAC;AAuCF,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,GAAG,eAAe,CA2C1E"}

package/dist/decorators/saihu-subscribe.decorator.js

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SaihuSubscribe = SaihuSubscribe;
+// libs/common/src/rabbit/saihu-subscribe.decorator.ts
+const nestjs_rabbitmq_1 = require("@golevelup/nestjs-rabbitmq");
+const topology_1 = require("../messaging/topology");
+// --- helpers ---
+function enumKeyFromValue(enm, val) {
+    return Object.keys(enm).find((k) => enm[k] === val);
+}
+function deriveDlxExchange(exchangeValue) {
+    const key = enumKeyFromValue(topology_1.Exchanges, exchangeValue);
+    if (!key)
+        return undefined;
+    return topology_1.Exchanges[`${key}_DLX`];
+}
+function deriveDlxRoutingKey(exchangeValue, routingKey) {
+    try {
+        const group = topology_1.RoutingKeys[exchangeValue];
+        const entry = Object.entries(group || {}).find(([, v]) => v === routingKey);
+        const logicalKey = entry === null || entry === void 0 ? void 0 : entry[0];
+        if (!logicalKey)
+            return routingKey;
+        const dlxExchange = deriveDlxExchange(exchangeValue);
+        if (!dlxExchange)
+            return routingKey;
+        const dlxGroup = topology_1.RoutingKeys[dlxExchange];
+        return (dlxGroup === null || dlxGroup === void 0 ? void 0 : dlxGroup[logicalKey]) || routingKey;
+    }
+    catch (_a) {
+        return routingKey;
+    }
+}
+// --- main decorator ---
+function SaihuSubscribe(props) {
+    var _a, _b;
+    const defaults = {
+        connection: 'core',
+        queueOptions: { durable: true },
+        errorHandler: (ch, msg) => ch.nack(msg, false, false),
+    };
+    // choose one routing key for queue naming if an array is provided
+    const rk = Array.isArray(props.routingKey)
+        ? props.routingKey[0]
+        : props.routingKey;
+    const merged = {
+        ...defaults,
+        ...props,
+        routingKey: props.routingKey, // keep original (string or string[])
+        queue: (0, topology_1.q)(props.service, rk),
+        queueOptions: {
+            ...(defaults.queueOptions || {}),
+            ...(props.queueOptions || {}),
+            arguments: {
+                ...(((_a = defaults.queueOptions) === null || _a === void 0 ? void 0 : _a.arguments) || {}),
+                ...(((_b = props.queueOptions) === null || _b === void 0 ? void 0 : _b.arguments) || {}),
+            },
+        },
+    };
+    // Auto-DLX (respect explicit overrides)
+    const args = merged.queueOptions.arguments || {};
+    const hasExplicitDLX = 'x-dead-letter-exchange' in args || 'x-dead-letter-routing-key' in args;
+    if (!hasExplicitDLX && merged.exchange && rk) {
+        const dlxExchange = deriveDlxExchange(merged.exchange);
+        const dlxRoutingKey = deriveDlxRoutingKey(merged.exchange, rk);
+        if (dlxExchange) {
+            args['x-dead-letter-exchange'] = dlxExchange;
+            args['x-dead-letter-routing-key'] = dlxRoutingKey;
+        }
+        merged.queueOptions.arguments = args;
+    }
+    return (0, nestjs_rabbitmq_1.RabbitSubscribe)(merged);
+}

package/dist/index.d.ts

@@ -6,5 +6,7 @@ export * from './auth';
 export * from './util';
 export * from './logger';
 export * from './messaging';
+export * from './decorators';
 export { SaihuCommonModule } from './saihu-common.module';
+export { BaseService } from './services/base.service';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAC;AACtB,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAC;AACtB,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC"}

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SaihuCommonModule = void 0;
+exports.BaseService = exports.SaihuCommonModule = void 0;
 __exportStar(require("./dto"), exports);
 __exportStar(require("./consts"), exports);
 __exportStar(require("./interceptors"), exports);
@@ -23,5 +23,8 @@ __exportStar(require("./auth"), exports);
 __exportStar(require("./util"), exports);
 __exportStar(require("./logger"), exports);
 __exportStar(require("./messaging"), exports);
+__exportStar(require("./decorators"), exports);
 var saihu_common_module_1 = require("./saihu-common.module");
 Object.defineProperty(exports, "SaihuCommonModule", { enumerable: true, get: function () { return saihu_common_module_1.SaihuCommonModule; } });
+var base_service_1 = require("./services/base.service");
+Object.defineProperty(exports, "BaseService", { enumerable: true, get: function () { return base_service_1.BaseService; } });

package/dist/services/base.service.d.ts

@@ -0,0 +1,7 @@
+import { Logger } from '@nestjs/common';
+export declare abstract class BaseService {
+    protected readonly logger: Logger;
+    protected readonly loggerError: Logger;
+    protected constructor(serviceName: string);
+}
+//# sourceMappingURL=base.service.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"base.service.d.ts","sourceRoot":"","sources":["../../src/services/base.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC,8BAAsB,WAAW;IAC/B,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAClC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAEvC,SAAS,aAAa,WAAW,EAAE,MAAM;CAI1C"}

package/dist/services/base.service.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseService = void 0;
+const common_1 = require("@nestjs/common");
+class BaseService {
+    constructor(serviceName) {
+        this.logger = new common_1.Logger(serviceName);
+        this.loggerError = new common_1.Logger(`SH-ERROR: ${serviceName}`);
+    }
+}
+exports.BaseService = BaseService;

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

@@ -1,6 +1,6 @@
-import { OnModuleInit, OnModuleDestroy } from "@nestjs/common";
-import { CommonModuleOptions } from "../interfaces/options.interface";
-import { RabbitmqService } from "../interfaces/service.interface";
+import { OnModuleInit, OnModuleDestroy } from '@nestjs/common';
+import { CommonModuleOptions } from '../interfaces/options.interface';
+import { RabbitmqService } from '../interfaces/service.interface';
 export declare class RabbitmqServiceImpl implements RabbitmqService, OnModuleInit, OnModuleDestroy {
     private readonly options;
     private readonly logger;

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;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;CAcrD"}
+{"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

@@ -74,21 +74,21 @@ let RabbitmqServiceImpl = RabbitmqServiceImpl_1 = class RabbitmqServiceImpl {
         }
         try {
             if (!this.options.rabbitmq) {
-                this.logger.error("common RabbitMQ options not configured");
-                throw new Error("common RabbitMQ options not configured");
+                this.logger.error('common RabbitMQ options not configured');
+                throw new Error('common RabbitMQ options not configured');
             }
             if (!this.options.rabbitmq.url) {
-                this.logger.error("common RabbitMQ url not configured");
-                throw new Error("common RabbitMQ url not configured");
+                this.logger.error('common RabbitMQ url not configured');
+                throw new Error('common RabbitMQ url not configured');
             }
             const connectionString = this.options.rabbitmq.url;
             this.connection = await amqp.connect(connectionString);
             this.channel = await this.connection.createChannel();
             this.isInitialized = true;
-            this.logger.log("common RabbitMQ connected successfully");
+            // this.logger.log("common RabbitMQ connected successfully");
         }
         catch (error) {
-            this.logger.error("commonFailed to connect to RabbitMQ:", error);
+            this.logger.error('commonFailed to connect to RabbitMQ:', error);
             throw error;
         }
     }
@@ -105,7 +105,7 @@ let RabbitmqServiceImpl = RabbitmqServiceImpl_1 = class RabbitmqServiceImpl {
     }
     async publishMessage(message) {
         if (!this.channel) {
-            this.logger.error("RabbitMQ channel not initialized");
+            this.logger.error('RabbitMQ channel not initialized');
             return false;
         }
         try {
@@ -113,7 +113,7 @@ let RabbitmqServiceImpl = RabbitmqServiceImpl_1 = class RabbitmqServiceImpl {
             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);
+            this.logger.error('Failed to publish message to RabbitMQ:', error);
             return false;
         }
     }

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

@@ -1,6 +1,6 @@
-import { OnModuleInit, OnModuleDestroy } from "@nestjs/common";
-import { CommonModuleOptions } from "../interfaces/options.interface";
-import { RedisService } from "../interfaces/service.interface";
+import { OnModuleInit, OnModuleDestroy } from '@nestjs/common';
+import { CommonModuleOptions } from '../interfaces/options.interface';
+import { RedisService } from '../interfaces/service.interface';
 export declare class RedisServiceImpl implements RedisService, OnModuleInit, OnModuleDestroy {
     private readonly commonOptions;
     private readonly logger;

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;IAmCV,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;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"}

package/dist/services/redis.service.js

@@ -40,28 +40,27 @@ 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('common Redis options not found');
+                throw new Error('common Redis options not found');
             }
             if (!this.commonOptions.redis.url) {
-                this.logger.error("common Redis url not found");
-                throw new Error("common Redis url not found");
+                this.logger.error('common Redis url not found');
+                throw new Error('common Redis url not found');
             }
             if (!this.commonOptions.redis.password) {
-                this.logger.error("common Redis password not found");
-                throw new Error("common Redis password not found");
+                this.logger.error('common Redis password not found');
+                throw new Error('common Redis password not found');
             }
             const url = this.commonOptions.redis.url;
-            this.logger.log(`common Redis url: ${url}`);
             const password = this.commonOptions.redis.password;
             this.redisClient = new ioredis_1.default(url, {
                 password,
                 db: common_consts_1.REDIS_AUTH_DB,
             });
-            this.logger.log("common Redis connected successfully");
+            // this.logger.log('common Redis connected successfully');
         }
         catch (error) {
-            this.logger.error("common Failed to connect to Redis:", error);
+            this.logger.error('common Failed to connect to Redis:', error);
             throw error;
         }
     }
@@ -78,7 +77,7 @@ let RedisServiceImpl = RedisServiceImpl_1 = class RedisServiceImpl {
         }
     }
     async set(key, value, ttl) {
-        const serializedValue = typeof value === "object" ? JSON.stringify(value) : String(value);
+        const serializedValue = typeof value === 'object' ? JSON.stringify(value) : String(value);
         if (ttl) {
             await this.redisClient.setex(key, ttl, serializedValue);
         }

package/package.json

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