@autofleet/rabbit 3.4.0-beta.7 → 3.4.0-beta.9

package/dist/index.js

@@ -209,15 +209,15 @@ class RabbitMq {
         this.oldPublishConnection = {
             connection: null,
             creatingConnection: false,
-            connectionCreatedEventName: 'publishConnectionCreated',
-            connectionFailedEventName: 'publishConnectionFailed',
+            connectionCreatedEventName: 'oldPublishConnectionCreated',
+            connectionFailedEventName: 'oldPublishConnectionFailed',
             blockReconnect: false,
         };
         this.oldConsumeConnection = {
             connection: null,
             creatingConnection: false,
-            connectionCreatedEventName: 'consumeConnectionCreated',
-            connectionFailedEventName: 'consumeConnectionFailed',
+            connectionCreatedEventName: 'oldConsumeConnectionCreated',
+            connectionFailedEventName: 'oldConsumeConnectionFailed',
             blockReconnect: false,
         };
         this.oldCreatingConnection = false;
@@ -677,6 +677,26 @@ class RabbitMq {
     }
     // TODO: [QUORUM-PHASE-2] After changing the publish from old to new change from the old to the new implementation
     async isConnected() {
+        debug('rabbit: start old is connected');
+        const oldConsumeConnection = await this.getConnectionOld(this.oldConsumeConnection);
+        const oldPublishConnection = await this.getConnectionOld(this.oldPublishConnection);
+        const oldIsConnected = oldConsumeConnection.isConnected() && oldPublishConnection.isConnected();
+        if (!oldIsConnected) {
+            logger_1.default.error('rabbit: isConnected - false');
+            return false;
+        }
+        const oldChannel = await this.assertChannelOld({ connection: this.oldPublishConnection });
+        try {
+            await Promise.all([
+                oldChannel.waitForConnect(),
+                ...this.oldConsumers.map((c) => oldChannel.checkQueue(c.queue)),
+            ]);
+        }
+        catch (e) {
+            logger_1.default.error('rabbit: isConnected - false');
+            return false;
+        }
+        logger_1.default.debug('rabbit: old isConnected - true');
         debug('rabbit: start is connected');
         const consumeConnection = await this.getConnectionOld(this.oldConsumeConnection);
         const publishConnection = await this.getConnectionOld(this.oldPublishConnection);

package/package.json

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

package/src/index.ts

@@ -258,15 +258,15 @@ class RabbitMq implements IAfRabbitMq {
     this.oldPublishConnection = {
       connection: null,
       creatingConnection: false,
-      connectionCreatedEventName: 'publishConnectionCreated',
-      connectionFailedEventName: 'publishConnectionFailed',
+      connectionCreatedEventName: 'oldPublishConnectionCreated',
+      connectionFailedEventName: 'oldPublishConnectionFailed',
       blockReconnect: false,
     };
     this.oldConsumeConnection = {
       connection: null,
       creatingConnection: false,
-      connectionCreatedEventName: 'consumeConnectionCreated',
-      connectionFailedEventName: 'consumeConnectionFailed',
+      connectionCreatedEventName: 'oldConsumeConnectionCreated',
+      connectionFailedEventName: 'oldConsumeConnectionFailed',
       blockReconnect: false,
     };
     this.oldCreatingConnection = false;
@@ -928,6 +928,26 @@ class RabbitMq implements IAfRabbitMq {
 
   // TODO: [QUORUM-PHASE-2] After changing the publish from old to new change from the old to the new implementation
   async isConnected() : Promise<boolean> {
+    debug('rabbit: start old is connected');
+    const oldConsumeConnection = await this.getConnectionOld(this.oldConsumeConnection);
+    const oldPublishConnection = await this.getConnectionOld(this.oldPublishConnection);
+    const oldIsConnected = oldConsumeConnection.isConnected() && oldPublishConnection.isConnected();
+    if (!oldIsConnected) {
+      logger.error('rabbit: isConnected - false');
+      return false;
+    }
+    const oldChannel: any = await this.assertChannelOld({ connection: this.oldPublishConnection });
+    try {
+      await Promise.all([
+        oldChannel.waitForConnect(),
+        ...this.oldConsumers.map((c: AfConsumer) => oldChannel.checkQueue(c.queue)),
+      ]);
+    } catch (e) {
+      logger.error('rabbit: isConnected - false');
+      return false;
+    }
+    logger.debug('rabbit: old isConnected - true');
+
     debug('rabbit: start is connected');
     const consumeConnection = await this.getConnectionOld(this.oldConsumeConnection);
     const publishConnection = await this.getConnectionOld(this.oldPublishConnection);