@sera4/essentia 1.0.23 → 1.0.25

package/package.json

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

package/queue/index.js

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

package/queue/publisher.js

@@ -59,29 +59,24 @@ class Publisher {
    * A tracking uuid for the message will be returned.
    */
   async publish(msg) {
-    return new Promise((resolve, reject) => {
+    if (!this.channel) {
+      throw(new Error(`No channel for ${this.name} to publish`));
+    }
+
+    const parcel = {
+      tracking_id: uuidv4(),
+      data: msg.content
+    }
+    logger.debug("Publishing message", parcel);
 
-      if (!this.channel) {
-        reject(new Error(`No channel for ${this.name} to publish`));
-      }
+    const content = Buffer.from(JSON.stringify(parcel));
+    const res = await this.channel.publish(this.exchange, msg.key, content, {persistent: true});
 
-      logger.debug("Publishing message", msg);
-      const parcel = {
-        tracking_id: uuidv4(),
-        data: msg.content
-      }
-      const content = Buffer.from(JSON.stringify(parcel));
+    if (!res) {
+      throw(new Error("Channel write buffer is full"));
+    }
 
-      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);
-        }
-      });
-    });
+    return parcel.tracking_id;
   }
 }
 

package/queue/subscriber.js

@@ -63,11 +63,18 @@ class Subscriber {
 
     this.channel.consume(this.queue, (msg) => {
       const { fields, content } = msg;
-      const payload = JSON.parse(content.toString());
+      let payload = null;
+      let error = null;
+      try {
+        payload = JSON.parse(content.toString());
+      } catch (e) {
+        logger.error("Failed to parse incomming message:", e);
+        error = e;
+      }
       logger.debug(`Got message from exchange '${fields.exchange}' with key '${fields.routingKey}'`);
       logger.debug("Content", payload);
       this.callbacks.forEach(cb => {
-        cb(payload);
+        cb(payload, error);
       });
       this.channel.ack(msg);
     }, { noAck: false });