@arcblock/event-hub 1.28.9 → 1.29.0

package/package.json

@@ -3,14 +3,41 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.28.9",
+  "version": "1.29.0",
   "description": "A nodejs module for local and remote Inter Process Event",
-  "main": "lib/index.js",
+  "type": "module",
+  "main": "./lib/index.cjs",
+  "module": "./esm/index.mjs",
+  "types": "./esm/index.d.mts",
+  "exports": {
+    ".": {
+      "types": "./esm/index.d.mts",
+      "import": "./esm/index.mjs",
+      "default": "./lib/index.cjs"
+    },
+    "./single": {
+      "types": "./esm/single.d.mts",
+      "import": "./esm/single.mjs",
+      "default": "./lib/single.cjs"
+    },
+    "./lib/*.js": {
+      "types": "./esm/*.d.mts",
+      "import": "./esm/*.mjs",
+      "default": "./lib/*.cjs"
+    },
+    "./lib/*": {
+      "types": "./esm/*.d.mts",
+      "import": "./esm/*.mjs",
+      "default": "./lib/*.cjs"
+    }
+  },
   "files": [
     "lib",
-    "single.js"
+    "esm"
   ],
   "scripts": {
+    "build": "tsdown",
+    "prebuild": "rm -rf lib esm",
     "lint": "biome check",
     "lint:fix": "biome check --write",
     "test": "bun test",
@@ -23,9 +50,9 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@arcblock/did": "1.28.9",
-    "@arcblock/jwt": "1.28.9",
-    "@ocap/wallet": "1.28.9",
+    "@arcblock/did": "1.29.0",
+    "@arcblock/jwt": "1.29.0",
+    "@ocap/wallet": "1.29.0",
     "amp-message": "~0.1.2",
     "axon": "^2.0.3"
   },

package/lib/client-fallback.js

@@ -1,13 +0,0 @@
-const { EventEmitter } = require('node:events');
-
-class Client extends EventEmitter {
-  broadcast(...args) {
-    return this.emit(...args);
-  }
-
-  off(event) {
-    this.removeAllListeners(event);
-  }
-}
-
-module.exports = Client;

package/lib/client.js

@@ -1,183 +0,0 @@
-const { EventEmitter } = require('node:events');
-const axon = require('axon');
-const roundrobin = require('axon/lib/plugins/round-robin');
-const queue = require('axon/lib/plugins/queue');
-const { fromSecretKey, WalletType } = require('@ocap/wallet');
-const { DidType, isEthereumType } = require('@arcblock/did');
-
-const { toTypeInfo } = require('@arcblock/did');
-
-const { RESERVED_EVENT_PREFIX, EVENT_AUTH, EVENT_AUTH_SUCCESS, EVENT_AUTH_FAIL } = require('./constant');
-
-const checkEvent = (event) => {
-  if (event.startsWith(RESERVED_EVENT_PREFIX)) {
-    throw new Error(`event cannot start with ${RESERVED_EVENT_PREFIX}`);
-  }
-};
-
-const getWallet = (appSk, type) => {
-  let t = type;
-  let sk = appSk;
-
-  if (isEthereumType(DidType(type))) {
-    sk = appSk.slice(0, 66);
-    t = WalletType(type);
-  }
-
-  return fromSecretKey(sk, t);
-};
-
-const defaultOpts = {
-  port: undefined,
-  hostname: '0.0.0.0',
-  autoConnect: false,
-  wallet: undefined,
-  did: undefined,
-  sk: undefined,
-};
-
-class Socket extends axon.SubEmitterSocket {
-  constructor(opts) {
-    super();
-
-    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', 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,
-        });
-      });
-
-      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 }));
-
-    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]);
-      }
-    };
-  }
-}
-
-class Client extends EventEmitter {
-  constructor(opts = {}) {
-    super();
-
-    if (!opts.port) {
-      throw new Error('port 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 = opts.wallet || getWallet(opts.sk, toTypeInfo(opts.did));
-    const did = opts.wallet ? opts.wallet.address : opts.did;
-
-    if (wallet.address !== did) {
-      throw new Error('did does not match the provided wallet/sk');
-    }
-
-    this.opts = Object.assign({}, defaultOpts, opts, { wallet, did });
-    this._client = new Socket(this.opts);
-    this._wallet = wallet;
-
-    this._bindEvent();
-
-    if (this.opts.autoConnect) {
-      this.connect();
-    }
-  }
-
-  connect() {
-    const { port, hostname } = this.opts;
-    this._client.connect(port, hostname);
-  }
-
-  close() {
-    this._client._authenticated = false;
-    this._client._pendingMessages = [];
-    this._client.close();
-  }
-
-  broadcast(event, data) {
-    checkEvent(event);
-    this._client.send(event, data);
-  }
-
-  on(name, fn) {
-    checkEvent(name);
-    super.on(name, fn);
-    this._client.on(name, fn);
-  }
-
-  off(name, fn) {
-    checkEvent(name);
-    this._client.off(name);
-
-    if (fn) {
-      super.off(name, fn);
-    } else {
-      super.removeAllListeners(name);
-    }
-  }
-
-  /**
-   * 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'));
-  }
-}
-
-module.exports = Client;

package/lib/constant.js

@@ -1,6 +0,0 @@
-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

@@ -1,26 +0,0 @@
-const Client = require('./client');
-const ClientFallback = require('./client-fallback');
-
-const port = Number(process.env.ABT_NODE_EVENT_PORT);
-const hostname = Number(process.env.ABT_NODE_EVENT_HOSTNAME) || '127.0.0.1';
-
-let did;
-let sk;
-
-if (process.env.BLOCKLET_APP_SK && process.env.BLOCKLET_APP_ID) {
-  sk = process.env.BLOCKLET_APP_SK;
-  did = process.env.BLOCKLET_APP_ID;
-} else if (process.env.ABT_NODE_SK && process.env.ABT_NODE_DID) {
-  sk = process.env.ABT_NODE_SK;
-  did = process.env.ABT_NODE_DID;
-}
-
-if (port && did && sk) {
-  module.exports = new Client({ port, hostname, did, sk, autoConnect: true });
-} else {
-  // export fallback Client because missing any of port / did / sk
-  module.exports = new ClientFallback();
-}
-
-module.exports.Client = Client;
-module.exports.ClientFallback = ClientFallback;

package/lib/rpc.js

@@ -1,119 +0,0 @@
-const axon = require('axon');
-const Message = require('amp-message');
-const { randomUUID } = require('node:crypto');
-
-class Client extends axon.Socket {
-  /**
-   * @param {number} port
-   * @param {string} host
-   */
-  constructor(port, host = '127.0.0.1') {
-    super();
-    this.port = port;
-    this.host = host;
-    this.online = false;
-    this.connectPromise = null;
-    // reqId -> { resolve, reject, to, errorPrefix? }
-    this.inflight = new Map();
-
-    this.on('connect', () => {
-      this.online = true;
-    });
-    this.on('reconnect attempt', () => {
-      this.online = false;
-    });
-    this.on('disconnect', () => {
-      this.online = false;
-    });
-    this.on('error', () => {
-      /* no-op */
-    });
-  }
-
-  onmessage() {
-    return (buf) => {
-      try {
-        const msg = new Message(buf);
-        const [event, data] = msg.args;
-
-        if (data && typeof data === 'object' && data.reqId) {
-          const entry = this.inflight.get(data.reqId);
-          if (entry) {
-            clearTimeout(entry.to);
-            this.inflight.delete(data.reqId);
-            if (data.ok === false) {
-              entry.reject(
-                new Error(entry.errorPrefix ? `${entry.errorPrefix}: ${data.error}` : data.error || 'request failed')
-              );
-            } else {
-              entry.resolve(data.data);
-            }
-            return; // 已消费
-          }
-        }
-        this.emit(event, data);
-      } catch (e) {
-        console.error('[axon] decode error', e);
-      }
-    };
-  }
-
-  sendEvent(event, data) {
-    const buf = this.pack([event, data]);
-    const s = this.socks[0];
-    if (s?.writable) s.write(buf);
-    else throw new Error('axon socket not writable/connected');
-  }
-
-  async ensureOnline() {
-    if (!this.port || !this.host) {
-      throw new Error('PORT and HOST must be set via constructor: new Client(port, host)');
-    }
-    if (!this.connectPromise) {
-      this.connectPromise = new Promise((resolve, reject) => {
-        this.connect(this.port, this.host, (err) => (err ? reject(err) : resolve(this)));
-      });
-    }
-    await this.connectPromise;
-    if (this.online) return this;
-    // 等到重连完成
-    await new Promise((r) => this.once('connect', r));
-    return this;
-  }
-
-  /**
-   * 通用 RPC：发送 event，等待响应（默认只按 reqId 匹配）
-   * @param {string} event           例如 'pm2/start'
-   * @param {object} payload         发送为 { reqId, payload }
-   * @param {object} [opts]
-   * @param {number} [opts.timeoutMs=120000]
-   * @param {string} [opts.respEvent]  // 可选：仅用于调试；匹配靠 reqId，不强依赖此项
-   * @param {string} [opts.errorPrefix] // 统一错误前缀
-   * @returns {Promise<any>}
-   */
-  async rpc(event, payload = {}, { timeoutMs = 120000, respEvent, errorPrefix } = {}) {
-    await this.ensureOnline();
-    const reqId = randomUUID();
-
-    return new Promise((resolve, reject) => {
-      const to = setTimeout(() => {
-        this.inflight.delete(reqId);
-        reject(new Error(`${errorPrefix || 'request'} timeout`));
-      }, timeoutMs);
-
-      this.inflight.set(reqId, { resolve, reject, to, errorPrefix });
-
-      this.sendEvent(event, { reqId, payload });
-
-      if (respEvent) {
-        const once = (data) => {
-          if (!data || data.reqId !== reqId) return;
-          this.off(respEvent, once);
-        };
-        this.on(respEvent, once);
-      }
-    });
-  }
-}
-
-module.exports = Client;

package/lib/server-abtnode.js

@@ -1,9 +0,0 @@
-const Server = require('./server');
-
-const port = Number(process.env.ABT_NODE_EVENT_PORT);
-const hostname = Number(process.env.ABT_NODE_EVENT_HOSTNAME) || '127.0.0.1';
-
-const server = new Server();
-server.bind(port, hostname);
-
-module.exports = server;

package/lib/server.js

@@ -1,155 +0,0 @@
-const axon = require('axon');
-const Message = require('amp-message');
-const JWT = require('@arcblock/jwt');
-const { EVENT_AUTH, EVENT_AUTH_SUCCESS, EVENT_AUTH_FAIL } = require('./constant');
-
-const getDid = (jwt) => jwt.iss.replace(/^did:abt:/, '');
-
-// 兼容 { reqId, payload } 或直接 payload
-function normalizeReq(input) {
-  if (input && typeof input === 'object' && ('payload' in input || 'reqId' in input)) {
-    const { reqId, payload } = input;
-    return { reqId, payload };
-  }
-  return { reqId: undefined, payload: input };
-}
-
-// 规范响应：默认 { ok: true, data }
-function normalizeRes(result) {
-  if (result && typeof result === 'object' && ('ok' in result || 'data' in result || 'error' in result)) {
-    return result;
-  }
-  return { ok: true, data: result };
-}
-
-class Server extends axon.Socket {
-  constructor(opts = {}) {
-    super();
-
-    this.jwt = opts?.jwt || JWT;
-
-    // 路由表：event -> { fn, authRequired }
-    this.handlers = new Map();
-
-    this.on('message', async (event, data, sock) => {
-      const route = this.handlers.get(event);
-
-      if (route) {
-        const { fn, authRequired } = route;
-        // 若该路由要求鉴权且当前连接未鉴权，则拒绝
-        if (authRequired && !sock.channel) {
-          console.error(`unauthenticated socket blocked for event "${event}"`);
-          return;
-        }
-
-        const { reqId, payload } = normalizeReq(data);
-
-        try {
-          const ctx = { sock, channel: sock.channel, event, server: this };
-          const result = await fn(payload, ctx);
-          const res = normalizeRes(result);
-          const replyEvent = `${event}:res`;
-
-          // 已鉴权：按 channel 投递；未鉴权：仅回当前 socket
-          if (sock.channel) {
-            this.send(replyEvent, { reqId, ...res }, sock.channel);
-          } else {
-            const buf = this.pack([replyEvent, { reqId, ...res }]);
-            if (sock.writable) sock.write(buf);
-          }
-        } catch (err) {
-          const replyEvent = `${event}:res`;
-          const payloadErr = { reqId, ok: false, error: err?.message || String(err) };
-          if (sock.channel) {
-            this.send(replyEvent, payloadErr, sock.channel);
-          } else {
-            const buf = this.pack([replyEvent, payloadErr]);
-            if (sock.writable) sock.write(buf);
-          }
-        }
-        return; // 路由事件已消费，不再广播
-      }
-
-      // 非路由事件：保持原有逻辑（必须已鉴权，否则跳过）
-      if (!sock.channel) {
-        console.error('skip message of unauthenticated socket');
-        return;
-      }
-      this.send(event, data, sock.channel);
-    });
-
-    this.on('connect', (socket) => {
-      console.log('event-hub client connected', socket._peername);
-    });
-    this.on('reconnect attempt', (socket) => {
-      console.log('event-hub client reconnect', socket._peername);
-    });
-    this.on('disconnect', (socket) => {
-      console.log('event-hub client disconnected', socket._peername);
-    });
-    this.on('drop', (args) => {
-      console.log('event-hub server drop message', args);
-    });
-    this.on('error', (err) => {
-      console.log('event-hub server error', err);
-    });
-  }
-
-  onmessage(sock) {
-    return (buf) => {
-      const msg = new Message(buf);
-      const [event, data] = msg.args;
-      if (event === EVENT_AUTH) {
-        // 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;
-      }
-
-      this.emit('message', event, data, sock);
-    };
-  }
-
-  send(event, data, channel) {
-    const { socks } = this;
-    const buf = this.pack([event, data]);
-
-    for (const sock of socks) {
-      if (sock.channel === channel && sock.writable) {
-        sock.write(buf);
-      }
-    }
-    return this;
-  }
-
-  /**
-   * 注册路由
-   * @param {string} event
-   * @param {(payload:any, ctx:{sock:any, channel?:string, event:string, server:Server})=>any|Promise<any>} handler
-   * @param {{authRequired?: boolean}} [opts] - 默认 true；设为 false 则该事件免鉴权
-   */
-  register(event, handler, opts = {}) {
-    const authRequired = opts.authRequired !== false; // 默认 true
-    this.handlers.set(event, { fn: handler, authRequired });
-    return this;
-  }
-}
-
-module.exports = Server;

package/single.js

@@ -1,3 +0,0 @@
-const Client = require('./lib/client-fallback');
-
-module.exports = new Client();