@autofleet/rabbit 3.4.0-beta.3 → 3.4.0-beta.5

package/dist/index.js

@@ -717,6 +717,7 @@ class RabbitMq {
     }
     async consumeFromRabbitOld(queue, callback, options) {
         const optionsWithDefaults = { ...consts_1.DEFAULT_OPTIONS, ...options };
+        debug('rabbit: consumeFromRabbitOld', { queue });
         RabbitMq.validateName('queue', queue);
         this.saveConsumerOld(queue, callback, options);
         const uniqueId = (0, node_crypto_1.randomUUID)();
@@ -808,6 +809,12 @@ class RabbitMq {
     // TODO: [QUORUM-PHASE-3] Delete all the function under this line (getNewChannelOld, getConnectionOld, assertQueueOld, setupQueueOld, saveConsumerOld)
     async getNewChannelOld({ name = (0, utils_1.rand)().toString(), onClose = null, options = {}, connection, }) {
         let localConnection;
+        if (connection === this.oldPublishConnection) {
+            debug('rabbit: getConnectionOld publish', { connection });
+        }
+        else if (connection === this.oldConsumeConnection) {
+            debug('rabbit: getConnectionOld consume', { connection });
+        }
         try {
             localConnection = await this.getConnectionOld(connection);
         }
@@ -815,8 +822,11 @@ class RabbitMq {
             logger_1.default.error(`rabbit: error on get connection for new channel ${name} `, { e });
             throw e;
         }
+        if (!localConnection) {
+            throw new Error(`rabbit: couldnt get connection for new channel ${name}`);
+        }
         debug('rabbit: getNewChannelOld', { localConnection });
-        const channel = localConnection.createChannel({ ...options });
+        const channel = localConnection?.createChannel({ ...options });
         (0, events_1.once)(channel, 'close').then((args) => {
             logger_1.default.error(`rabbit: channel ${name} closed`);
             onClose?.(args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.4.0-beta.3",
+  "version": "3.4.0-beta.5",
   "description": "",
   "main": "dist/index.js",
   "engines": {

package/src/index.ts

@@ -970,6 +970,7 @@ class RabbitMq implements IAfRabbitMq {
 
   private async consumeFromRabbitOld(queue: string, callback: CallbackFunction, options?: ConsumeOptions): Promise<any> {
     const optionsWithDefaults = { ...DEFAULT_OPTIONS, ...options };
+    debug('rabbit: consumeFromRabbitOld', { queue });
     RabbitMq.validateName('queue', queue);
     this.saveConsumerOld(queue, callback, options);
     const uniqueId = randomUUID();
@@ -1077,14 +1078,24 @@ class RabbitMq implements IAfRabbitMq {
     name = rand().toString(), onClose = null, options = {}, connection,
   }: newChannelOpts) {
     let localConnection!: AmqpConnectionManager;
+    if (connection === this.oldPublishConnection) {
+      debug('rabbit: getConnectionOld publish', { connection });
+    } else if (connection === this.oldConsumeConnection) {
+      debug('rabbit: getConnectionOld consume', { connection });
+    }
     try {
       localConnection = await this.getConnectionOld(connection);
     } catch (e) {
       logger.error(`rabbit: error on get connection for new channel ${name} `, { e });
       throw e;
     }
+
+    if (!localConnection) {
+      throw new Error(`rabbit: couldnt get connection for new channel ${name}`);
+    }
+
     debug('rabbit: getNewChannelOld', { localConnection });
-    const channel = localConnection.createChannel({ ...options });
+    const channel = localConnection?.createChannel({ ...options });
     once(channel, 'close').then((args) => {
       logger.error(`rabbit: channel ${name} closed`);
       onClose?.(args);