xcraft-core-busclient 5.5.1 → 5.7.0

package/index.js

@@ -9,6 +9,8 @@ const {
 } = require('xcraft-core-transport');
 const {v4: uuidV4} = require('uuid');
 
+const fse = require('fs-extra');
+const path = require('node:path');
 const xLog = require('xcraft-core-log')(moduleName, null);
 const xUtils = require('xcraft-core-utils');
 
@@ -18,6 +20,8 @@ const Resp = require('./lib/resp.js');
 let globalBusClient = null;
 
 class BusClient extends EventEmitter {
+  #lastErrorReason = null;
+
   constructor(busConfig, subscriptions) {
     super();
 
@@ -59,6 +63,10 @@ class BusClient extends EventEmitter {
     this._onConnectSubscribers = {};
 
     const onClosed = (err) => {
+      if (err && err?.code !== 'Z_BUF_ERROR') {
+        this.#lastErrorReason = err.code || err.message || err;
+      }
+
       if (!this._subClosed || !this._pushClosed) {
         return;
       }
@@ -283,6 +291,10 @@ class BusClient extends EventEmitter {
     });
   }
 
+  get lastErrorReason() {
+    return this.#lastErrorReason;
+  }
+
   _updateCommandsRegistry(registry, token) {
     this._commandsRegistry = registry;
     this._commandsRegistryTime = new Date().toISOString();
@@ -369,6 +381,21 @@ class BusClient extends EventEmitter {
     return this._onConnectSubscribers[key].unsubscribe;
   }
 
+  #tryToLoadClientKeys(xHost, hordeId) {
+    const keyPath = path.join(
+      xHost.realmsStorePath,
+      `${hordeId}@${xHost.variantId}-key.pem`
+    );
+    const certPath = path.join(
+      xHost.realmsStorePath,
+      `${hordeId}@${xHost.variantId}-cert.pem`
+    );
+
+    return fse.existsSync(keyPath) && fse.existsSync(certPath)
+      ? {keyPath, certPath}
+      : null;
+  }
+
   /**
    * Connect the client to the buses.
    *
@@ -446,14 +473,39 @@ class BusClient extends EventEmitter {
           : busConfig.clientKeepAlive,
       noForwarding: busConfig.noForwarding,
     };
-    if (busConfig.caPath) {
-      if (!path.isAbsolute(busConfig.caPath)) {
-        options.caPath = path.join(resourcesPath, busConfig.caPath);
+
+    if (
+      busConfig.gatekeeper &&
+      busConfig.hordeId &&
+      !busConfig.keyPath &&
+      !busConfig.certPath
+    ) {
+      const keys = this.#tryToLoadClientKeys(xHost, busConfig.hordeId);
+      if (keys) {
+        const {keyPath, certPath} = keys;
+        busConfig.keyPath = keyPath;
+        busConfig.certPath = certPath;
+        xEtc.saveRun('xcraft-core-busclient', busConfig);
       } else {
-        options.caPath = busConfig.caPath;
+        xLog.err(
+          `Missing client certificate for ${busConfig.hordeId}@${xHost.variantId}`
+        );
       }
     }
 
+    ['caPath', 'keyPath', 'certPath']
+      .filter((key) => busConfig[key])
+      .forEach((key) => {
+        if (
+          !busConfig[key].startsWith('base64:') &&
+          !path.isAbsolute(busConfig[key])
+        ) {
+          options[key] = path.join(resourcesPath, busConfig[key]);
+        } else {
+          options[key] = busConfig[key];
+        }
+      });
+
     this._subSocket.connect(backend, {
       port: parseInt(busConfig.notifierPort),
       host: busConfig.host,

package/lib/command.js

@@ -18,12 +18,13 @@ class Command {
     this._routingKey = tribe ? `${appId}-${tribe}` : appId;
 
     this._push
-      .on('close', (err) => this.#onNetworkError(err))
-      .on('error', (err) => this.#onNetworkError(err))
-      .on('reconnect attempt', (err) => this.#onNetworkError(err));
+      .on('close', (err) => this.#onNetworkChange(err))
+      .on('error', (err) => this.#onNetworkChange(err))
+      .on('connect', (err) => this.#onNetworkChange(err))
+      .on('reconnect attempt', (err) => this.#onNetworkChange(err));
   }
 
-  #onNetworkError(err) {
+  #onNetworkChange(err) {
     for (const {cmd, unsub, callback} of Command.#unsubList.values()) {
       unsub();
       if (callback) {

package/lib/events.js

@@ -156,6 +156,7 @@ class Events {
    * @param {boolean} [serialize] - Stringify the object.
    * @param {string} [routing] - Router info (ee or axon).
    * @param {object} [msgContext] - Message context.
+   * @returns {boolean} true if sent
    */
   send(topic, data, serialize, routing, msgContext) {
     if (!this._busClient.isServerSide()) {
@@ -211,13 +212,15 @@ class Events {
       this._prevTopic = topic;
     }
 
-    notifier.send(topic, busMessage);
+    const sent = notifier.send(topic, busMessage);
 
     if (isActivity) {
       topic += '.activity';
       busMessage = this._busClient.newMessage(topic, which);
       notifier.send(topic, busMessage);
     }
+
+    return sent;
   }
 
   status = {

package/lib/resp.js

@@ -86,7 +86,7 @@ class Events {
       }
     }
 
-    this._busClient.events.send(
+    return this._busClient.events.send(
       this._fixTopic(topic),
       data,
       serialize,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xcraft-core-busclient",
-  "version": "5.5.1",
+  "version": "5.7.0",
   "description": "Xcraft bus client",
   "main": "index.js",
   "engines": {
@@ -19,6 +19,7 @@
     "url": "git+https://github.com/Xcraft-Inc/xcraft-core-busclient.git"
   },
   "dependencies": {
+    "fs-extra": "^9.1.0",
     "gigawatts": "^4.0.1",
     "uuid": "^8.3.2",
     "xcraft-core-bus": "^5.0.0",