@rxdi/graphql-rabbitmq-subscriptions 0.7.191 → 0.7.193

package/dist/amqp-pubsub.d.ts

@@ -15,6 +15,7 @@ export declare class AmqpPubSub {
     private triggerTransform;
     private unsubscribeChannelMap;
     private logger;
+    private pendingSubscriptions;
     constructor(options?: PubSubRabbitMQBusOptions);
     publish(trigger: string, payload: any, config?: IQueueNameConfig): Promise<void>;
     subscribe<T>(trigger: string, onMessage: (m: T) => Promise<void>, options?: Partial<IQueueNameConfig>): Promise<number>;

package/dist/amqp-pubsub.js

@@ -19,6 +19,8 @@ class AmqpPubSub {
         this.subsRefsMap = {};
         this.currentSubscriptionId = 0;
         this.unsubscribeChannelMap = {};
+        // Track in-progress subscriptions to prevent race conditions
+        this.pendingSubscriptions = {};
         this.triggerTransform = options.triggerTransform || ((trigger) => trigger);
         const config = options.config || { host: '127.0.0.1', port: 5672 };
         const { logger } = options;
@@ -45,15 +47,34 @@ class AmqpPubSub {
                 this.logger.trace("subscriber exist, adding triggerName '%s' to saved list.", triggerName);
                 return id;
             }
+            // Check if there's already a pending subscription for this trigger
+            if (this.pendingSubscriptions[triggerName]) {
+                this.logger.trace("subscription in progress for '%s', waiting for it to complete", triggerName);
+                try {
+                    const disposer = yield this.pendingSubscriptions[triggerName];
+                    this.subsRefsMap[triggerName] = [...(this.subsRefsMap[triggerName] || []), id];
+                    this.unsubscribeChannelMap[triggerName] = disposer;
+                    return id;
+                }
+                catch (err) {
+                    this.logger.error(err, "failed to receive message from queue '%s'", triggerName);
+                    return id;
+                }
+            }
             this.logger.trace("trying to subscribe to queue '%s'", triggerName);
+            // Create the subscription promise and store it immediately
+            const subscriptionPromise = this.consumer.subscribe(triggerName, (msg) => this.onMessage(triggerName, msg), options);
+            this.pendingSubscriptions[triggerName] = subscriptionPromise;
             try {
-                const disposer = yield this.consumer.subscribe(triggerName, (msg) => this.onMessage(triggerName, msg), options);
+                const disposer = yield subscriptionPromise;
                 this.subsRefsMap[triggerName] = [...(this.subsRefsMap[triggerName] || []), id];
-                this.unsubscribeChannelMap[id] = disposer;
+                this.unsubscribeChannelMap[triggerName] = disposer;
+                // Clean up pending subscription
+                delete this.pendingSubscriptions[triggerName];
                 return id;
             }
             catch (err) {
-                this.logger.error(err, "failed to recieve message from queue '%s'", triggerName);
+                this.logger.error(err, "failed to receive message from queue '%s'", triggerName);
                 return id;
             }
         });
@@ -68,13 +89,15 @@ class AmqpPubSub {
         let newRefs;
         if (refs.length === 1) {
             newRefs = [];
-            if (typeof this.unsubscribeChannelMap[subId] === 'function') {
-                this.unsubscribeChannelMap[subId]()
+            if (typeof this.unsubscribeChannelMap[triggerName] === 'function') {
+                this.unsubscribeChannelMap[triggerName]()
                     .then(() => {
                     this.logger.trace("cancelled channel from subscribing to queue '%s'", triggerName);
+                    delete this.unsubscribeChannelMap[triggerName];
                 })
                     .catch((err) => {
                     this.logger.error(err, "channel cancellation failed from queue '%j'", triggerName);
+                    delete this.unsubscribeChannelMap[triggerName];
                 });
             }
         }
@@ -83,6 +106,9 @@ class AmqpPubSub {
             if (index !== -1) {
                 newRefs = [...refs.slice(0, index), ...refs.slice(index + 1)];
             }
+            else {
+                newRefs = refs;
+            }
             this.logger.trace("removing triggerName from listening '%s' ", triggerName);
         }
         this.subsRefsMap[triggerName] = newRefs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rxdi/graphql-rabbitmq-subscriptions",
-  "version": "0.7.191",
+  "version": "0.7.193",
   "description": "A graphql-subscriptions PubSub Engine using RabbitMQ",
   "main": "dist/index.js",
   "repository": {
@@ -24,7 +24,7 @@
     "lint": "tslint ./src/**/*.ts"
   },
   "dependencies": {
-    "@rxdi/rabbitmq-pubsub": "^0.7.190",
+    "@rxdi/rabbitmq-pubsub": "^0.7.192",
     "graphql-subscriptions": "^3.0.0"
   },
   "devDependencies": {