@arcblock/event-hub 1.25.6 → 1.26.1

package/lib/client.js

@@ -6,10 +6,9 @@ const queue = require('axon/lib/plugins/queue');
 const { fromSecretKey, WalletType } = require('@ocap/wallet');
 const { DidType, isEthereumType } = require('@arcblock/did');
 
-const JWT = require('@arcblock/jwt');
 const { toTypeInfo } = require('@arcblock/did');
 
-const { RESERVED_EVENT_PREFIX, EVENT_AUTH, EVENT_AUTH_FAIL } = require('./constant');
+const { RESERVED_EVENT_PREFIX, EVENT_AUTH, EVENT_AUTH_SUCCESS, EVENT_AUTH_FAIL } = require('./constant');
 
 const checkEvent = (event) => {
   if (event.startsWith(RESERVED_EVENT_PREFIX)) {
@@ -33,8 +32,8 @@ const defaultOpts = {
   port: undefined,
   hostname: '0.0.0.0',
   autoConnect: false,
+  wallet: undefined,
   did: undefined,
-  pk: undefined,
   sk: undefined,
 };
 
@@ -42,25 +41,59 @@ class Socket extends axon.SubEmitterSocket {
   constructor(opts) {
     super();
 
-    const wallet = getWallet(opts.sk, toTypeInfo(opts.did));
+    const wallet = opts.wallet || getWallet(opts.sk, toTypeInfo(opts.did));
+    this._authenticated = false;
+    this._pendingMessages = [];
+    this._wallet = wallet;
 
     this.sock.use((sock) => {
-      sock.on('connect', () => {
+      sock.on('connect', async () => {
+        this._authenticated = false;
+
+        // Use wallet.signJWT() so business can override it for remote signing
+        const token = await wallet.signJWT();
         sock.send(EVENT_AUTH, {
           pk: wallet.publicKey,
-          token: JWT.sign(wallet.address, wallet.secretKey),
+          token,
         });
+      });
 
-        sock.on(EVENT_AUTH_FAIL, ({ msg } = {}) => {
-          this.emit('error', { msg });
-          sock.close();
-        });
+      sock.on('close', () => {
+        this._authenticated = false;
+        this._pendingMessages = [];
       });
     });
 
+    // Listen for auth events on the SubEmitterSocket instance (this), not on raw sock
+    this.on(EVENT_AUTH_SUCCESS, () => {
+      this._authenticated = true;
+
+      // Send all pending messages after authentication
+      const pending = this._pendingMessages.slice();
+      this._pendingMessages = [];
+      pending.forEach(([event, data]) => this.sock.send(event, data));
+    });
+
+    this.on(EVENT_AUTH_FAIL, ({ msg } = {}) => {
+      this.emit('error', { msg });
+      this._authenticated = false;
+      this._pendingMessages = [];
+      this.sock.socks.forEach((s) => s.close());
+    });
+
     this.sock.use(queue());
     this.sock.use(roundrobin({ fallback: this.sock.enqueue }));
-    this.send = this.sock.send.bind(this.sock);
+
+    const originalSend = this.sock.send.bind(this.sock);
+    this.send = (event, data) => {
+      // Check both authentication AND connection status
+      const hasConnection = this.sock.socks && this.sock.socks.length > 0;
+      if (this._authenticated && hasConnection) {
+        originalSend(event, data);
+      } else {
+        this._pendingMessages.push([event, data]);
+      }
+    };
   }
 }
 
@@ -72,18 +105,27 @@ class Client extends EventEmitter {
       throw new Error('port should not be empty');
     }
 
-    if (!opts.did || !opts.sk) {
-      throw new Error('did, sk should not be empty');
+    if (!opts.wallet) {
+      if (!opts.did) {
+        throw new Error('did should not be empty when wallet is not provided');
+      }
+
+      // sk should be provided when wallet is not provided
+      if (!opts.sk) {
+        throw new Error('Either wallet or sk should be provided');
+      }
     }
 
-    const wallet = getWallet(opts.sk, toTypeInfo(opts.did));
+    const wallet = opts.wallet || getWallet(opts.sk, toTypeInfo(opts.did));
+    const did = opts.wallet ? opts.wallet.address : opts.did;
 
-    if (wallet.address !== opts.did) {
-      throw new Error('did, sk does not match');
+    if (wallet.address !== did) {
+      throw new Error('did does not match the provided wallet/sk');
     }
 
-    this.opts = Object.assign({}, defaultOpts, opts, { pk: wallet.publicKey });
+    this.opts = Object.assign({}, defaultOpts, opts, { wallet, did });
     this._client = new Socket(this.opts);
+    this._wallet = wallet;
 
     this._bindEvent();
 
@@ -98,6 +140,8 @@ class Client extends EventEmitter {
   }
 
   close() {
+    this._client._authenticated = false;
+    this._client._pendingMessages = [];
     this._client.close();
   }
 
@@ -123,6 +167,15 @@ class Client extends EventEmitter {
     }
   }
 
+  /**
+   * Get the wallet instance
+   * Business can override wallet.signJWT() for remote signing
+   * @returns {WalletObject}
+   */
+  getWallet() {
+    return this._wallet;
+  }
+
   _bindEvent() {
     this._client.on('error', this.emit.bind(this, 'error'));
   }

package/lib/constant.js

@@ -1,5 +1,6 @@
 module.exports = {
   RESERVED_EVENT_PREFIX: 'EVENT_HUB:',
   EVENT_AUTH: 'EVENT_HUB:AUTH',
+  EVENT_AUTH_SUCCESS: 'EVENT_HUB:AUTH_SUCCESS',
   EVENT_AUTH_FAIL: 'EVENT_HUB:AUTH_FAIL',
 };

package/lib/index.js

@@ -21,3 +21,6 @@ if (port && did && sk) {
   // export fallback Client because missing any of port / did / sk
   module.exports = new ClientFallback();
 }
+
+module.exports.Client = Client;
+module.exports.ClientFallback = ClientFallback;

package/lib/server.js

@@ -2,7 +2,7 @@
 const axon = require('axon');
 const Message = require('amp-message');
 const JWT = require('@arcblock/jwt');
-const { EVENT_AUTH, EVENT_AUTH_FAIL } = require('./constant');
+const { EVENT_AUTH, EVENT_AUTH_SUCCESS, EVENT_AUTH_FAIL } = require('./constant');
 
 const getDid = (jwt) => jwt.iss.replace(/^did:abt:/, '');
 
@@ -101,18 +101,26 @@ class Server extends axon.Socket {
       const msg = new Message(buf);
       const [event, data] = msg.args;
       if (event === EVENT_AUTH) {
-        try {
-          const { pk, token } = data;
-          if (!this.jwt.verify(token, pk)) {
-            throw new Error('token verify failed');
-          }
-          const did = getDid(this.jwt.decode(token));
-          sock.channel = did;
-        } catch (err) {
-          console.error(err);
-          const resBuf = this.pack([EVENT_AUTH_FAIL, { msg: err.message }]);
-          sock.write(resBuf);
-        }
+        // JWT.verify returns a Promise but is synchronously resolved (no await inside)
+        // We use .then() to handle it and send confirmation to client
+        const { pk, token } = data;
+        this.jwt
+          .verify(token, pk)
+          .then((valid) => {
+            if (!valid) {
+              throw new Error('token verify failed');
+            }
+            const did = getDid(this.jwt.decode(token));
+            sock.channel = did;
+            // Send authentication success confirmation
+            const successBuf = this.pack([EVENT_AUTH_SUCCESS, {}]);
+            sock.write(successBuf);
+          })
+          .catch((err) => {
+            console.error(err);
+            const resBuf = this.pack([EVENT_AUTH_FAIL, { msg: err.message }]);
+            sock.write(resBuf);
+          });
         return;
       }
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.25.6",
+  "version": "1.26.1",
   "description": "A nodejs module for local and remote Inter Process Event",
   "main": "lib/index.js",
   "files": [
@@ -19,9 +19,9 @@
   "dependencies": {
     "amp-message": "~0.1.2",
     "axon": "^2.0.3",
-    "@ocap/wallet": "1.25.6",
-    "@arcblock/jwt": "1.25.6",
-    "@arcblock/did": "1.25.6"
+    "@arcblock/did": "1.26.1",
+    "@arcblock/jwt": "1.26.1",
+    "@ocap/wallet": "1.26.1"
   },
   "devDependencies": {
     "jest": "^29.7.0"