@rxdi/rabbitmq-pubsub 0.7.227 → 0.7.229

package/dist/common.d.ts

@@ -17,7 +17,7 @@ export interface IQueueNameConfig {
     globalPrefetch?: boolean;
     name: string;
     dlq: string;
-    dlx: string;
+    exchange: string;
     strictName?: boolean;
     arguments?: {
         [key: string]: any;
@@ -26,13 +26,13 @@ export interface IQueueNameConfig {
 export declare class DefaultQueueNameConfig implements IQueueNameConfig {
     name: string;
     dlq: string;
-    dlx: string;
+    exchange: string;
     constructor(name: string);
 }
 export declare class DefaultPubSubQueueConfig implements IQueueNameConfig {
     name: string;
     dlq: string;
-    dlx: string;
+    exchange: string;
     constructor(name: string);
 }
 export declare function asQueueNameConfig(config: IQueueNameConfig | string): IQueueNameConfig;
@@ -41,3 +41,4 @@ export interface IDeadLetterMessage<T> {
     data: T;
     error: Error;
 }
+export declare const createQueueConfig: (name: string, options?: Partial<IQueueNameConfig>) => IQueueNameConfig;

package/dist/common.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultPubSubQueueConfig = exports.DefaultQueueNameConfig = void 0;
+exports.createQueueConfig = exports.DefaultPubSubQueueConfig = exports.DefaultQueueNameConfig = void 0;
 exports.asQueueNameConfig = asQueueNameConfig;
 exports.asPubSubQueueNameConfig = asPubSubQueueNameConfig;
 class DefaultQueueNameConfig {
     constructor(name) {
         this.name = name;
         this.dlq = `${name}.DLQ`;
-        this.dlx = `${this.dlq}.Exchange`;
+        this.exchange = `${this.dlq}.Exchange`;
     }
 }
 exports.DefaultQueueNameConfig = DefaultQueueNameConfig;
@@ -15,7 +15,7 @@ class DefaultPubSubQueueConfig {
     constructor(name) {
         this.name = name;
         this.dlq = "";
-        this.dlx = `${name}.DLQ.Exchange`;
+        this.exchange = `${name}.Exchange`;
     }
 }
 exports.DefaultPubSubQueueConfig = DefaultPubSubQueueConfig;
@@ -32,7 +32,17 @@ function asPubSubQueueNameConfig(config) {
 function isQueueNameConfig(config) {
     if (config.name &&
         config.dlq &&
-        config.dlx) {
+        config.exchange) {
         return true;
     }
 }
+const createQueueConfig = (name, options) => {
+    const defaultConfig = {
+        prefetch: 1,
+        globalPrefetch: true,
+        strictName: true,
+    };
+    const finalOptions = Object.assign(Object.assign({}, defaultConfig), options);
+    return Object.assign(Object.assign({ name, dlq: `${name}.DLQ`, exchange: `${name}.Exchange` }, finalOptions), { arguments: Object.assign({ 'x-dead-letter-exchange': `${name}.DLQ`, 'x-dead-letter-routing-key': `${name}.DLQ` }, finalOptions.arguments) });
+};
+exports.createQueueConfig = createQueueConfig;

package/dist/consumer.js

@@ -63,10 +63,10 @@ class RabbitMqConsumer {
     }
     getChannelSetup(channel, queueConfig) {
         return [
-            channel.assertQueue(queueConfig.name, this.getQueueSettings(queueConfig.dlx)),
+            channel.assertQueue(queueConfig.name, this.getQueueSettings(queueConfig.exchange)),
             channel.assertQueue(queueConfig.dlq, this.getDLSettings()),
-            channel.assertExchange(queueConfig.dlx, "fanout", this.getDLSettings()),
-            channel.bindQueue(queueConfig.dlq, queueConfig.dlx, "*"),
+            channel.assertExchange(queueConfig.exchange, "fanout", this.getDLSettings()),
+            channel.bindQueue(queueConfig.dlq, queueConfig.exchange, "*"),
         ];
     }
     getQueueSettings(deadletterExchangeName) {

package/dist/index.d.ts

@@ -3,4 +3,4 @@ export { RabbitMqConsumer, IRabbitMqConsumerDisposer } from "./consumer";
 export { RabbitMqProducer } from "./producer";
 export { RabbitMqPublisher } from "./publisher";
 export { RabbitMqSubscriber, IRabbitMqSubscriberDisposer } from "./subscriber";
-export { IQueueNameConfig, IDeadLetterMessage } from "./common";
+export { IQueueNameConfig, IDeadLetterMessage, createQueueConfig } from "./common";

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RabbitMqSubscriber = exports.RabbitMqPublisher = exports.RabbitMqProducer = exports.RabbitMqConsumer = exports.RabbitMqSingletonConnectionFactory = exports.RabbitMqConnectionFactory = void 0;
+exports.createQueueConfig = exports.RabbitMqSubscriber = exports.RabbitMqPublisher = exports.RabbitMqProducer = exports.RabbitMqConsumer = exports.RabbitMqSingletonConnectionFactory = exports.RabbitMqConnectionFactory = void 0;
 var connectionFactory_1 = require("./connectionFactory");
 Object.defineProperty(exports, "RabbitMqConnectionFactory", { enumerable: true, get: function () { return connectionFactory_1.RabbitMqConnectionFactory; } });
 Object.defineProperty(exports, "RabbitMqSingletonConnectionFactory", { enumerable: true, get: function () { return connectionFactory_1.RabbitMqSingletonConnectionFactory; } });
@@ -12,3 +12,5 @@ var publisher_1 = require("./publisher");
 Object.defineProperty(exports, "RabbitMqPublisher", { enumerable: true, get: function () { return publisher_1.RabbitMqPublisher; } });
 var subscriber_1 = require("./subscriber");
 Object.defineProperty(exports, "RabbitMqSubscriber", { enumerable: true, get: function () { return subscriber_1.RabbitMqSubscriber; } });
+var common_1 = require("./common");
+Object.defineProperty(exports, "createQueueConfig", { enumerable: true, get: function () { return common_1.createQueueConfig; } });

package/dist/producer.js

@@ -21,7 +21,7 @@ class RabbitMqProducer {
     publish(queue, message, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const queueConfig = (0, common_1.asQueueNameConfig)(queue);
-            const settings = this.getQueueSettings(queueConfig.dlx);
+            const settings = this.getQueueSettings(queueConfig.exchange);
             const connection = yield this.connectionFactory.create();
             const channel = yield connection.createChannel();
             if (options === null || options === void 0 ? void 0 : options.prefetch) {

package/dist/publisher.js

@@ -28,12 +28,12 @@ class RabbitMqPublisher {
                     channel.prefetch(options.prefetch, options.globalPrefetch);
                 }
                 yield this.setupChannel(channel, queueConfig);
-                channel.publish(queueConfig.dlx, '', this.getMessageBuffer(message));
-                this.logger.trace("message sent to exchange '%s' (%j)", queueConfig.dlx, message);
+                channel.publish(queueConfig.exchange, '', this.getMessageBuffer(message));
+                this.logger.trace("message sent to exchange '%s' (%j)", queueConfig.exchange, message);
                 return channel.close();
             }
             catch (e) {
-                this.logger.error("unable to send message to exchange '%j' {%j}", queueConfig.dlx, message);
+                this.logger.error("unable to send message to exchange '%j' {%j}", queueConfig.exchange, message);
                 throw new Error('Unable to send message');
             }
         });
@@ -46,7 +46,7 @@ class RabbitMqPublisher {
         return Buffer.from(JSON.stringify(message), 'utf8');
     }
     getChannelSetup(channel, queueConfig) {
-        return [channel.assertExchange(queueConfig.dlx, 'fanout', this.getSettings())];
+        return [channel.assertExchange(queueConfig.exchange, 'fanout', this.getSettings())];
     }
     getSettings() {
         return {

package/dist/subscriber.js

@@ -29,7 +29,7 @@ class RabbitMqSubscriber {
             this.logger.trace("got channel for queue '%s'", queueConfig.name);
             const queueName = yield this.setupChannel(channel, Object.assign(Object.assign({}, queueConfig), options));
             this.logger.debug("queue name generated for subscription queue '(%s)' is '(%s)'", queueConfig.name, queueName);
-            const queConfig = Object.assign(Object.assign({}, queueConfig), { dlq: queueName });
+            const queConfig = Object.assign(Object.assign(Object.assign({}, queueConfig), options), { dlq: queueName });
             return this.subscribeToChannel(channel, queConfig, action);
         });
     }
@@ -41,6 +41,7 @@ class RabbitMqSubscriber {
         return __awaiter(this, void 0, void 0, function* () {
             this.logger.trace("subscribing to queue '%s'", queueConfig.name);
             const opts = yield channel.consume(queueConfig.dlq, (message) => __awaiter(this, void 0, void 0, function* () {
+                var _a, _b;
                 let msg = this.getMessageObject(message);
                 this.logger.trace("message arrived from queue '%s' (%j)", queueConfig.name, msg);
                 try {
@@ -51,8 +52,11 @@ class RabbitMqSubscriber {
                 }
                 catch (err) {
                     this.logger.error(err, "message processing failed from queue '%j' (%j)", queueConfig, msg);
-                    // channel.nack(message, false, false);
-                    channel.publish(queueConfig.dlx, '', Buffer.from(JSON.stringify({
+                    const exchange = (_a = queueConfig === null || queueConfig === void 0 ? void 0 : queueConfig.arguments) === null || _a === void 0 ? void 0 : _a['x-dead-letter-exchange'];
+                    if (!exchange) {
+                        return channel.nack(message, false, false);
+                    }
+                    channel.publish(exchange || queueConfig.exchange, ((_b = queueConfig.arguments) === null || _b === void 0 ? void 0 : _b['x-dead-letter-routing-key']) || '', Buffer.from(JSON.stringify({
                         data: msg,
                         error: {
                             message: err.message,
@@ -74,9 +78,9 @@ class RabbitMqSubscriber {
     }
     getChannelSetup(channel, queueConfig) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield channel.assertExchange(queueConfig.dlx, "fanout", this.getDLSettings());
+            yield channel.assertExchange(queueConfig.exchange, "fanout", this.getDLSettings());
             let result = yield channel.assertQueue(queueConfig.strictName ? queueConfig.name : queueConfig.dlq, this.getQueueSettings(queueConfig.arguments));
-            yield channel.bindQueue(result.queue, queueConfig.dlx, "");
+            yield channel.bindQueue(result.queue, queueConfig.exchange, "");
             return result.queue;
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rxdi/rabbitmq-pubsub",
-  "version": "0.7.227",
+  "version": "0.7.229",
   "description": "A graphql-subscriptions PubSub Engine using RabbitMQ",
   "main": "dist/index.js",
   "repository": {