@sera4/essentia 1.0.35 → 1.0.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sera4/essentia",
-  "version": "1.0.35",
+  "version": "1.0.37",
   "description": "A library of utilities for Teleporte Web Services",
   "main": "index.js",
   "scripts": {

package/queue/index.js

@@ -29,6 +29,7 @@ class S4Queue {
    */
   async testConnection() {
     if (!this.isConnected()) {
+      this.connectionTestChannel = null;
       throw("queue service not connected")
     }
 
@@ -72,12 +73,16 @@ class S4Queue {
       amqp.connect(options.connectionUrl, socketOptions, (err, conn) => {
 
         if (err) {
-          return reject(err);
+          logger.error("Error while connecting", err)
+          logger.error("Attempting again in", this.retry, "seconds");
+          return setTimeout(() => this.openConnection(options), this.retry * 1000);
         }
 
         this.connection = conn;
         if (!this.connection) {
           return reject(new Error("Failed to obtain connection"));
+        } else {
+          this.updatePubsAndSubsConnectionRef(conn);
         }
 
         this.connection.on("error", (err) => {
@@ -91,8 +96,8 @@ class S4Queue {
           logger.error("connection closed");
           this.connection = null;
           if (err) {
-            logger.debug("connection closed due to error:", err);
-            logger.debug("Reconnecting in", this.retry, "seconds");
+            logger.error("connection closed due to error:", err);
+            logger.error("Reconnecting in", this.retry, "seconds");
             setTimeout(() => this.openConnection(options), this.retry * 1000);
           } else {
             // If there was no error, it is us who closed
@@ -289,6 +294,28 @@ class S4Queue {
     return await p.publish({key: topic, content});
   }
 
+  /**
+   * Binds an exchange to a queue
+   * @param {String} exchange the name of the exchange.
+   * @param {String} queue the name of the queue.
+   * @param {pattern} (optional) pattern for routing key
+  */
+  async bindQueueToExchange(exchange, queue, pattern) {
+    const p = this.pubs[exchange];
+
+    if (!p) {
+      throw(new Error(`No PUB for ${exchange} found`));
+    }
+
+    if (!queue) {
+      throw(new Error(`Binding a queue requires a queue name`));
+    }
+
+    return await p.bindQueue(queue, pattern)
+  }
+
+
+
   /**
    * Adds a listener for a specific key.
    * If a subscriber that was regitered was found
@@ -305,6 +332,29 @@ class S4Queue {
       }
     });
   }
+
+  /**
+   * Updates the connection reference to all the previously
+   * registered publishers and subscribers.
+   * After we successfully establish a connection and register pubs/subs,
+   * it's possible for the connection to break. This object will try
+   * to re-establish a new connection every 3 seconds (or whatever configuration is set)
+   * and if a new connection is established, we need to pass that connection to
+   * all our pubs/subs, otherwise they'll be operating with old/stale references
+   * @param {Object} connRef a new connection reference to the AMQP service
+   */
+  updatePubsAndSubsConnectionRef(connRef) {
+    Object.keys(this.pubs).forEach(k => {
+      logger.debug(`Updating publisher ${k} with a new connection object`);
+      const p = this.pubs[k];
+      p.init(connRef);
+    });
+    Object.keys(this.subs).forEach(k => {
+      logger.debug(`Updating subscriber ${k} with a new connection object`);
+      const s = this.subs[k];
+      s.init(connRef);
+    });
+  }
 }
 
 module.exports = new S4Queue();

package/queue/publisher.js

@@ -80,8 +80,12 @@ class Publisher {
 
     return parcel.tracking_id;
   }
+
+  async bindQueue(queue, pattern, args) {
+    await this.channel.bindQueue(queue, this.exchange, pattern, args)
+  }
 }
 
 module.exports = {
   Publisher
-}
+}