xcraft-core-busclient 5.0.3 → 5.1.1

package/index.js

@@ -402,6 +402,9 @@ class BusClient extends EventEmitter {
     let busConfig = this._busConfig;
     if (!busConfig) {
       busConfig = xEtc.load('xcraft-core-bus');
+    } else if (!busConfig.hasOwnProperty('clientKeepAlive')) {
+      const {clientKeepAlive} = xEtc.load('xcraft-core-bus');
+      busConfig.clientKeepAlive = clientKeepAlive;
     }
 
     /* The TLS certificate is ignored in case of unix socket use */
@@ -420,6 +423,10 @@ class BusClient extends EventEmitter {
 
     const options = {
       timeout: busConfig.timeout,
+      clientKeepAlive:
+        typeof busConfig.clientKeepAlive === 'string'
+          ? parseInt(busConfig.clientKeepAlive)
+          : busConfig.clientKeepAlive,
       noForwarding: busConfig.noForwarding,
     };
     if (busConfig.caPath) {
@@ -448,16 +455,24 @@ class BusClient extends EventEmitter {
   stop(callback) {
     xLog.verb(`Stopping for ${this._orcName || 'greathall'}...`);
 
-    const unsubscribe = this._subscribeClose((err) => {
-      unsubscribe();
-      if (callback) {
-        callback(err);
-      }
-    });
+    const isConnected = this._connected;
+
+    if (isConnected) {
+      const unsubscribe = this._subscribeClose((err) => {
+        unsubscribe();
+        if (callback) {
+          callback(err);
+        }
+      });
+    }
 
     this._connected = false;
     this._subSocket.stop();
     this._pushSocket.stop();
+
+    if (!isConnected && callback) {
+      callback();
+    }
   }
 
   /**
@@ -566,13 +581,13 @@ class BusClient extends EventEmitter {
   }
 }
 
-exports.newResponse = function (moduleName, orcName, routing) {
+exports.newResponse = function (moduleName, orcName, routing, dataContext) {
   let self = null;
   if (this instanceof BusClient) {
     self = this;
   }
 
-  return new Resp(self, moduleName, orcName, routing);
+  return new Resp(self, moduleName, orcName, routing, dataContext);
 };
 
 exports.initGlobal = function () {

package/lib/command.js

@@ -38,19 +38,22 @@ Command.prototype.retry = function (msg) {
  * @param {string} which - Orc name or greathall.
  * @param {function(err, results)} [finishHandler] - Callback.
  * @param {Object} options - Options like forceNested.
+ * @param {Object} msgContext - Message context.
  */
 Command.prototype.send = function (
   cmd,
   data,
   which,
   finishHandler,
-  options = {}
+  options = {},
+  msgContext
 ) {
   if (!which) {
     which = this._busClient.getOrcName() || 'greathall';
   }
 
   let busMessage = data;
+
   if (!data || !data._xcraftMessage) {
     busMessage = this.newMessage(cmd, which);
     busMessage.data = data;
@@ -59,6 +62,10 @@ Command.prototype.send = function (
     this._busClient.patchMessage(busMessage);
   }
 
+  if (msgContext) {
+    busMessage.context = msgContext;
+  }
+
   if (!busMessage.arp) {
     const {appId, appArgs} = require('xcraft-core-host');
     const {tribe} = appArgs();

package/lib/events.js

@@ -153,8 +153,9 @@ Events.prototype.heartbeat = function () {
  * @param {Object} [data] - Payload.
  * @param {boolean} [serialize] - Stringify the object.
  * @param {string} [routing] - Router info (ee or axon).
+ * @param {Object} [msgContext] - Message context.
  */
-Events.prototype.send = function (topic, data, serialize, routing) {
+Events.prototype.send = function (topic, data, serialize, routing, msgContext) {
   if (!this._busClient.isServerSide()) {
     const err = new Error('only the server can send events');
     xLog.err(err.stack);
@@ -199,6 +200,10 @@ Events.prototype.send = function (topic, data, serialize, routing) {
     isActivity = routing.activity;
   }
 
+  if (msgContext) {
+    busMessage.context = msgContext;
+  }
+
   /* Reduce noise... */
   if (topic !== this._prevTopic) {
     xLog.verb('client send notification(s) on topic:' + topic);

package/lib/resp.js

@@ -2,15 +2,25 @@
 
 const watt = require('gigawatts');
 
+const injectDataContext = (data, ctx) => {
+  for (const [k, v] of ctx) {
+    data[k] = v;
+  }
+};
 class Events {
-  constructor(busClient, log, orcName, routing) {
+  constructor(busClient, log, orcName, routing, msgContext) {
     this._busClient = busClient;
     this._orcName = orcName;
     this._routing = routing;
+    this._msgContext = msgContext;
 
     this.status = (this._busClient && this._busClient.events.status) || {};
   }
 
+  set msgContext(value) {
+    this._msgContext = value;
+  }
+
   get routing() {
     return this._routing;
   }
@@ -83,16 +93,22 @@ class Events {
       this._fixTopic(topic),
       data,
       serialize,
-      routing
+      routing,
+      this._msgContext
     );
   }
 }
 
 class Command {
-  constructor(busClient, log, orcName) {
+  constructor(busClient, log, orcName, msgContext) {
     this._log = log;
     this._busClient = busClient;
     this._orcName = orcName;
+    this._msgContext = msgContext;
+  }
+
+  set msgContext(value) {
+    this._msgContext = value;
   }
 
   retry(msg) {
@@ -111,7 +127,14 @@ class Command {
     }
 
     const orcName = (data && data.$orcName) || this._orcName;
-    this._busClient.command.send(cmd, data, orcName, finishHandler, options);
+    this._busClient.command.send(
+      cmd,
+      data,
+      orcName,
+      finishHandler,
+      options,
+      this._msgContext
+    );
   }
 
   send(cmd, data, finishHandler) {
@@ -124,11 +147,16 @@ class Command {
 }
 
 class Resp {
-  constructor(busClient, moduleName, orcName, routing = null) {
+  constructor(
+    busClient,
+    moduleName,
+    orcName,
+    routing = null,
+    msgContext = null
+  ) {
     this._busClient = busClient;
     this._cmdNames = {};
     this._orcName = orcName;
-
     /* Add a way for sending with the token server instead of an orcName */
     if (orcName === 'token') {
       const token = this._busClient.getToken();
@@ -141,12 +169,17 @@ class Resp {
     }
 
     this.log = require('xcraft-core-log')(moduleName, this);
-    this.events = new Events(busClient, this.log, orcName, routing);
-    this.command = new Command(busClient, this.log, orcName);
+    this.events = new Events(busClient, this.log, orcName, routing, msgContext);
+    this.command = new Command(busClient, this.log, orcName, msgContext);
 
     watt.wrapAll(this, 'connect', 'stop');
   }
 
+  set msgContext(value) {
+    this.events.msgContext = value;
+    this.command.msgContext = value;
+  }
+
   _makeCmdNames() {
     if (!this._busClient) {
       return {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xcraft-core-busclient",
-  "version": "5.0.3",
+  "version": "5.1.1",
   "description": "Xcraft bus client",
   "main": "index.js",
   "engines": {