xcraft-core-busclient 5.2.0 → 5.2.1

package/index.js

@@ -533,28 +533,28 @@ class BusClient extends EventEmitter {
   }
 
   registerEvents(topic, handler) {
-    const escapeTopic = xUtils.regex.toXcraftRegExpStr(topic);
+    const str = topic.str || xUtils.regex.toXcraftRegExpStr(topic);
+    const ids = topic.ids || extractIds(topic);
+    const reg = topic.reg || new RegExp(str);
 
-    if (this._eventsRegistry[escapeTopic]) {
+    if (this._eventsRegistry[str]) {
       xLog.info(`${topic} already registered, unsub and sub again`);
       this.unregisterEvents(topic);
     }
 
-    const re = new RegExp(escapeTopic);
-    const ids = extractIds(topic);
     const id = ids[ids.length - 1];
-    this._eventsCache.set(id, escapeTopic, re);
-    this._eventsRegistry[escapeTopic] = {
-      topic: re,
+    this._eventsCache.set(id, str, reg);
+    this._eventsRegistry[str] = {
+      topic: reg,
       handler,
-      unregister: () => this._unregister(id, escapeTopic),
+      unregister: () => this._unregister(id, str),
     };
   }
 
   unregisterEvents(topic) {
-    const escapeTopic = xUtils.regex.toXcraftRegExpStr(topic);
-    if (this._eventsRegistry[escapeTopic]) {
-      this._eventsRegistry[escapeTopic].unregister();
+    const str = topic.str || xUtils.regex.toXcraftRegExpStr(topic);
+    if (this._eventsRegistry[str]) {
+      this._eventsRegistry[str].unregister();
     }
   }
 

package/lib/command.js

@@ -8,6 +8,11 @@ var xLog = require('xcraft-core-log')(moduleName, null);
 function Command(busClient, pushSocket) {
   this._busClient = busClient;
   this._push = pushSocket;
+
+  const {appId, appArgs} = require('xcraft-core-host');
+  const {tribe} = appArgs();
+
+  this._routingKey = tribe ? `${appId}-${tribe}` : appId;
 }
 
 Command.prototype.connectedWith = function () {
@@ -67,11 +72,8 @@ Command.prototype.send = function (
   }
 
   if (!busMessage.arp) {
-    const {appId, appArgs} = require('xcraft-core-host');
-    const {tribe} = appArgs();
-    const routingKey = tribe ? `${appId}-${tribe}` : appId;
     let token = xBus.getToken();
-    let nodeName = routingKey;
+    let nodeName = this._routingKey;
     let {orcName} = busMessage;
     let nice = 0;
     let noForwarding = false;

package/lib/events.js

@@ -74,12 +74,11 @@ Events.prototype.subscribe = function (topic, handler, backend, orcName) {
   }
 
   this._handlers.set(topic, new Map([[id, handler]]));
-  this._sub.subscribe(topic, backend, orcName);
-
+  const topicCtx = this._sub.subscribe(topic, backend, orcName);
   const handlers = this._handlers.get(topic);
 
   /* register a pre-handler for deserialize object if needed */
-  this._busClient.registerEvents(topic, (msg) => {
+  this._busClient.registerEvents(topicCtx, (msg) => {
     /* FIXME: it's not safe. */
     if (msg.serialized) {
       msg.data = JSON.parse(msg.data, function (key, value) {
@@ -125,8 +124,8 @@ Events.prototype.unsubscribeAll = function (topic, backend, orcName) {
 
   xLog.verb('client removing handler on topic: ' + topic);
 
-  this._sub.unsubscribe(topic, backend, orcName);
-  this._busClient.unregisterEvents(topic);
+  const topicCtx = this._sub.unsubscribe(topic, backend, orcName);
+  this._busClient.unregisterEvents(topicCtx);
   this._handlers.delete(topic);
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xcraft-core-busclient",
-  "version": "5.2.0",
+  "version": "5.2.1",
   "description": "Xcraft bus client",
   "main": "index.js",
   "engines": {
@@ -25,7 +25,7 @@
     "xcraft-core-host": "^3.0.0",
     "xcraft-core-etc": "^3.0.0",
     "xcraft-core-log": "^2.0.0",
-    "xcraft-core-transport": "^4.2.0",
+    "xcraft-core-transport": "^4.5.0",
     "xcraft-core-utils": "^4.0.0"
   },
   "author": "Mathieu Schroeter & Samuel Loup",