@sera4/essentia 1.1.38 → 1.1.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sera4/essentia",
-  "version": "1.1.38",
+  "version": "1.1.39",
   "description": "A library of utilities for Teleporte Web Services",
   "main": "index.js",
   "type": "module",

package/queue/index.js

@@ -309,29 +309,7 @@ class S4Queue {
    * @param {Object} msg a JSON object as the message.
    */
   async publishDirectMessage(exchange, key, msg) {
-    const p = this.pubs[exchange];
-
-    if (!key) {
-      throw(new Error(`Direct message require a key`));
-    }
-
-    if (!p) {
-      throw(new Error(`No PUB for ${exchange} found`));
-    }
-
-    if (p.type !== 'direct') {
-      throw(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
-      }
-    }
-
-    return await p.publish({key, content});
+    return this.publishMessage(exchange, key, msg)
   }
 
   /**
@@ -341,20 +319,25 @@ class S4Queue {
    * @param {Object} msg a JSON object as the message.
    */
   async publishTopicMessage(exchange, topic, msg) {
-    const p = this.pubs[exchange];
+    return this.publishMessage(exchange, topic, msg)
+  }
 
-    if (!topic) {
-      throw(new Error(`Topic message require a topic`));
+  /**
+   * Publish a message to the exchange
+   * @param {String} exchange name of exchange
+   * @param {String} key name of the key or topic
+   * @param {Object} msg payload to be published
+   */
+  async publishMessage(exchange, key, msg) {
+    if (!key) {
+      throw(new Error(`Key argument not defined`));
     }
 
+    const p = this.pubs[exchange];
     if (!p) {
       throw(new Error(`No PUB for ${exchange} found`));
     }
 
-    if (p.type !== 'topic') {
-      throw(new Error(`PUB ${exchange} is not topic`));
-    }
-
     let content = msg;
     if (content.constructor !== ({}).constructor) {
       // if not in JSON format, let's make it so
@@ -363,7 +346,7 @@ class S4Queue {
       }
     }
 
-    return await p.publish({key: topic, content});
+    return await p.publish({key, content});
   }
 
   /**

package/queue/publisher.js

@@ -68,7 +68,7 @@ export class Publisher {
     logger.debug("Data", parcel);
 
     const content = Buffer.from(JSON.stringify(parcel));
-    const res = await this.channel.publish(this.exchange, msg.key, content, {persistent: true});
+    const res = await this.channel.publish(this.exchange.name, msg.key, content, {persistent: true});
 
     if (!res) {
       throw(new Error("Channel write buffer is full"));