xcraft-core-busclient 5.2.0 → 5.3.0

package/.eslintrc.js

@@ -3,7 +3,6 @@
 module.exports = {
   root: true,
   parserOptions: {
-    ecmaVersion: 7,
     sourceType: 'module',
     ecmaFeatures: {
       jsx: true,
@@ -11,18 +10,30 @@ module.exports = {
   },
   env: {
     browser: true,
+    es2022: true,
     mocha: true,
     node: true,
-    es6: true,
   },
-  parser: 'babel-eslint',
-  plugins: ['react', 'babel'],
-  extends: ['prettier', 'eslint:recommended', 'plugin:react/recommended'],
+  plugins: ['react', 'babel', 'jsdoc'],
+  extends: [
+    'prettier',
+    'eslint:recommended',
+    'plugin:react/recommended',
+    'plugin:jsdoc/recommended',
+  ],
   rules: {
     // Other rules
     'no-console': 'off',
-    'valid-jsdoc': ['error', {requireReturn: false}],
     'eqeqeq': 'error',
     'react/display-name': 'off',
+    'no-unused-vars': [
+      'error',
+      {
+        vars: 'all',
+        args: 'none',
+        ignoreRestSiblings: true,
+        destructuredArrayIgnorePattern: '^_',
+      },
+    ],
   },
 };

package/.zou-flow

@@ -1,3 +1,2 @@
 [update-version]
-	freezed = true
 	package-json = package.json

package/index.js

@@ -99,7 +99,7 @@ class BusClient extends EventEmitter {
        * as soon as possible.
        */
       const fromSocket = this[`_${from}Socket`];
-      if (fromSocket && fromSocket.isLocalOnly) {
+      if (fromSocket && fromSocket.isLocalOnly && !this._busConfig?.passive) {
         process.exitCode = 9;
         setTimeout(() => process.exit(), 10000);
         xLog.err('Exit the node, the socket is lost (max wait of 10s)');
@@ -205,7 +205,7 @@ class BusClient extends EventEmitter {
         }
 
         if (topic === 'greathall::bus.token.changed') {
-          this.emit('token.changed');
+          this.emit('token.changed', msg.data.busConfig);
           return;
         }
 
@@ -216,7 +216,8 @@ class BusClient extends EventEmitter {
           this.emit(
             'orcname.changed',
             msg.data.oldOrcName,
-            msg.data.newOrcName
+            msg.data.newOrcName,
+            msg.data.busConfig
           );
           return;
         }
@@ -314,12 +315,17 @@ class BusClient extends EventEmitter {
           xLog.warn(
             `reconnecting to the server has provided a new token: ${this._token} -> ${msg.data.token}`
           );
-          this.emit('token.changed');
+          this.emit('token.changed', this._busConfig);
         } else if (this._orcName && isNewOrcName) {
           xLog.warn(
             `reconnecting to the server has provided a new orcName: ${this._orcName} -> ${msg.data.orcName}`
           );
-          this.emit('orcname.changed', this._orcName, msg.data.orcName);
+          this.emit(
+            'orcname.changed',
+            this._orcName,
+            msg.data.orcName,
+            this._busConfig
+          );
         }
       }
 
@@ -533,28 +539,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

@@ -39,7 +39,13 @@ Events.prototype.catchAll = function (handler, proxy = false) {
  * @param {string} [orcName] - Subscriber orcName (internal use)
  * @return {function} unsubscribe function.
  */
-Events.prototype.subscribe = function (topic, handler, backend, orcName) {
+Events.prototype.subscribe = function (
+  topic,
+  handler,
+  backend,
+  orcName,
+  options
+) {
   if (!topic.includes('::')) {
     xLog.err(new Error().stack);
     throw new Error('namespace missing');
@@ -74,12 +80,16 @@ 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,
+    options?.xcraftRPC
+  );
   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 +135,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/lib/resp.js

@@ -32,7 +32,7 @@ class Events {
     this._busClient.events.catchAll(handler);
   }
 
-  subscribe(topic, handler) {
+  subscribe(topic, handler, xcraftRPC = false) {
     if (!this._busClient) {
       this._log.err('events.subscribe not available');
       return;
@@ -42,7 +42,8 @@ class Events {
       this._fixTopic(topic),
       handler,
       undefined,
-      this._orcName
+      this._orcName,
+      {xcraftRPC}
     );
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xcraft-core-busclient",
-  "version": "5.2.0",
+  "version": "5.3.0",
   "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",
@@ -37,7 +37,7 @@
   "devDependencies": {
     "prettier": "2.0.4",
     "xcraft-dev-prettier": "^2.0.0",
-    "xcraft-dev-rules": "^2.0.0"
+    "xcraft-dev-rules": "^4.1.0"
   },
   "prettier": "xcraft-dev-prettier"
 }