@sera4/essentia 1.0.21 → 1.0.22

package/index.js

@@ -10,4 +10,3 @@ module.exports = {
   healthCheck : require("./health"),
   queue : require("./queue")
 }
-//console.log(module.exports.formatter.formatError({ status: 200, error: ["error1"] }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sera4/essentia",
-  "version": "1.0.21",
+  "version": "1.0.22",
   "description": "A library of utilities for Teleporte Web Services",
   "main": "index.js",
   "scripts": {
@@ -29,6 +29,7 @@
     "async": "^2.6.1",
     "fast-safe-stringify": "^2.0.6",
     "git-rev": "^0.2.1",
+    "uuid": "^3.3.3",
     "winston": "^3.2.1",
     "winston-logstash": "^0.4.0"
   }

package/queue/index.js

@@ -148,31 +148,32 @@ class S4Queue {
    * @param {String} key the name of the routing key.
    * @param {Object} msg a JSON object as the message.
    */
-  publishDirectMessage(exchange, key, msg) {
-    const p = this.pubs[exchange];
-
-    if (!key) {
-      throw(new Error(`Direct message require a key`));
-    }
+  async publishDirectMessage(exchange, key, msg) {
+    return new Promise((resolve, reject) => {
+      const p = this.pubs[exchange];
 
-    if (!p) {
-      throw(new Error(`No PUB for ${exchange} found`));
-    }
+      if (!key) {
+        reject(new Error(`Direct message require a key`));
+      }
 
-    if (p.type !== 'direct') {
-      throw(new Error(`PUB ${exchange} is not direct`));
-    }
+      if (!p) {
+        reject(new Error(`No PUB for ${exchange} found`));
+      }
 
-    let content = msg;
-    if (content.constructor !== ({}).constructor) {
-      // if not in JSON format, let's make it so
-      content = {
-        msg: msg
+      if (p.type !== 'direct') {
+        reject(new Error(`PUB ${exchange} is not direct`));
       }
-    }
 
-    p.publish({key, content});
+      let content = msg;
+      if (content.constructor !== ({}).constructor) {
+        // if not in JSON format, let's make it so
+        content = {
+          msg: msg
+        }
+      }
 
+      return p.publish({key, content});
+    });
   }
 
   /**

package/queue/publisher.js

@@ -1,4 +1,5 @@
 const logger = require("./queue-logger");
+const uuidv4 = require("uuid/v4");
 
 /**
  * A publisher for AMQP service
@@ -6,7 +7,7 @@ const logger = require("./queue-logger");
 class Publisher {
 
   /**
-   * 
+   *
    * @param {String} exchange AMQP exchange name.
    * @param {String} type direct|fanout| etc (supported types by RabbitMQ).
    * @param {boolean} durable true if the messages should persist service restarts.
@@ -27,7 +28,7 @@ class Publisher {
    */
   async init (conn) {
     logger.debug(`Initializing PUB channel for ${this.name}`);
-    
+
     if(this.channel) {
       logger.warn(`PUB channel for ${this.name} already initialized`);
       return;
@@ -54,20 +55,31 @@ class Publisher {
 
   /**
    * Publishes a message to AMQP
-   * @param {Objecgt} msg A json object to be published to AMQP
+   * @param {Object} msg A json object to be published to AMQP.
+   * A tracking uuid for the message will be returned.
    */
-  publish(msg) {
-    if (!this.channel) {
-      throw(new Error(`No channel for ${this.name} to publish`));
-    }
-    logger.debug("Publishing message", msg);
-    const content = Buffer.from(JSON.stringify(msg.content));
-    this.channel.publish(this.exchange, msg.key, content, {persistent: true}, (err, ok) => {
-      if (err) {
-        logger.error(`An error occured publishing message to ${this.name}`);
-      } else {
-        logger.debug("Message delivered:", msg);
+  async publish(msg) {
+    return new Promise((resolve, reject) => {
+
+      if (!this.channel) {
+        reject(new Error(`No channel for ${this.name} to publish`));
       }
+
+      logger.debug("Publishing message", msg);
+      const content = {
+        tracking_id: uuidv4(),
+        data: Buffer.from(JSON.stringify(msg.content))
+      }
+
+      this.channel.publish(this.exchange, msg.key, content, {persistent: true}, (err, ok) => {
+        if (err) {
+          logger.error(`An error occured publishing message to ${this.name}`);
+          reject(err);
+        } else {
+          logger.debug("Message delivered:", msg);
+          resolve(content.tracking_id);
+        }
+      });
     });
   }
 }

package/queue/subscriber.js

@@ -29,11 +29,11 @@ class Subscriber {
    * Initializes the subscriber on the given connection.
    * During this call, the exchange and the queues are asserted
    * and bound via the key provided in the constructor.
-   * @param {Objecgt} conn aqmp connection object
+   * @param {Object} conn aqmp connection object
    */
   async init (conn) {
     logger.debug(`Initializing SUB channel for ${this.name}`);
-    
+
     if(this.channel) {
       logger.warn(`SUB channel for ${this.name} already initialized`);
       return;
@@ -57,10 +57,10 @@ class Subscriber {
     logger.debug(`Initialized SUB channel for ${this.name}`);
     await this.channel.assertExchange(this.exchange, this.type, {durable: this.durable});
     await this.channel.assertQueue(this.queue, { durable: this.durable });
-    
+
     logger.debug(`Binding queue ${this.queue} on ${this.exchange} exchange for ${this.key} key`);
     await this.channel.bindQueue(this.queue, this.exchange, this.key);
-    
+
     this.channel.consume(this.queue, (msg) => {
       const { fields, content } = msg;
       const payload = JSON.parse(content.toString());