@saihu/common 1.1.49 → 1.1.51

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 = "oper_log_queue";
+export declare const OPER_LOG_QUEUE = "q.oper.log.created.im-id";
 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":"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"}
+{"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"}

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 = 'oper_log_queue';
+exports.OPER_LOG_QUEUE = 'q.oper.log.created.im-id';
 exports.OPER_LOG_EXCHANGE = 'oper_log_exchange';

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,6 +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;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,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

@@ -23,6 +23,7 @@ __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");

package/package.json

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