@blocklet/sdk 1.17.2-beta-20251111-114226-13276e42 → 1.17.2-beta-20251113-121338-9c917e68

package/lib/service/notification.d.ts

@@ -1,6 +1,7 @@
 import { EventEmitter } from 'node:events';
 import { TNotification, TNotificationInput, TSendOptions } from '../types/notification';
 type $TSFixMe = any;
+export declare const getConnectionToken: () => string;
 export declare const getSender: () => {
     appDid: string;
     wallet: import("@ocap/wallet").WalletObject<string>;
@@ -30,17 +31,15 @@ declare const doSendMail: (receiver: string | string[], notification: TNotificat
 export declare const broadcast: (notification: TNotificationInput, options?: TSendOptions) => Promise<any>;
 export declare const _eventBus: EventEmitter<[never]>;
 export declare const _emitter: EventEmitter<[never]>;
+export declare const cleanup: () => void;
 export declare const ensureClient: () => Promise<void>;
-export declare const cleanup: () => Promise<void>;
 export declare const on: (event: string, cb?: $TSFixMe) => Promise<EventEmitter<[never]>>;
 export declare const off: any;
 export declare const _message: {
     on: (event: string, cb: $TSFixMe) => Promise<EventEmitter<[never]>>;
     off: any;
 };
-export { doSendToUser as sendToUser };
-export { doSendMail as sendToMail };
-export { doSendToRelay as sendToRelay };
+export { doSendMail as sendToMail, doSendToRelay as sendToRelay, doSendToUser as sendToUser };
 declare const _default: {
     sendToUser: (receiver: string | string[], notification: TNotificationInput, options?: TSendOptions) => Promise<any>;
     sendToRelay: (topic: string, event: string, data: any) => Promise<any>;
@@ -52,5 +51,6 @@ declare const _default: {
         on: (event: string, cb: $TSFixMe) => Promise<EventEmitter<[never]>>;
         off: any;
     };
+    initClient: () => Promise<void>;
 };
 export default _default;

package/lib/service/notification.js

@@ -36,24 +36,45 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendToRelay = exports.sendToMail = exports.sendToUser = exports._message = exports.off = exports.on = exports.cleanup = exports.ensureClient = exports._emitter = exports._eventBus = exports.broadcast = exports.getSender = void 0;
+exports.sendToUser = exports.sendToRelay = exports.sendToMail = exports._message = exports.off = exports.on = exports.ensureClient = exports.cleanup = exports._emitter = exports._eventBus = exports.broadcast = exports.getSender = exports.getConnectionToken = void 0;
 /* eslint-disable no-console */
 /* eslint-disable @typescript-eslint/naming-convention */
 const Jwt = __importStar(require("@arcblock/jwt"));
-const debug_1 = __importDefault(require("debug"));
-const node_events_1 = require("node:events");
 const ws_1 = require("@arcblock/ws");
-const util_1 = require("@blocklet/meta/lib/util");
-const channel_1 = require("@blocklet/meta/lib/channel");
 const constant_1 = require("@blocklet/constant");
+const channel_1 = require("@blocklet/meta/lib/channel");
+const util_1 = require("@blocklet/meta/lib/util");
+const debug_1 = __importDefault(require("debug"));
+const debounce_1 = __importDefault(require("lodash/debounce"));
+const node_events_1 = require("node:events");
 const check_blocklet_env_1 = require("../util/check-blocklet-env");
-const send_notification_1 = require("../util/send-notification");
 const constants_1 = require("../util/constants");
-const wallet_1 = require("../wallet");
-const notification_1 = require("../validators/notification");
 const parse_docker_endpoint_1 = require("../util/parse-docker-endpoint");
-const socket_1 = require("../util/socket");
+const send_notification_1 = require("../util/send-notification");
+const notification_1 = require("../validators/notification");
+const wallet_1 = require("../wallet");
 const debug = (0, debug_1.default)('@blocklet/sdk:notification');
+let client = null;
+let connectionToken = null;
+let connectionTokenTimer = null;
+let initPromise = null; // 全局 Promise，确保多次调用时等待同一个初始化过程
+const refreshConnectionToken = async (force = false) => {
+    // don't refresh token if client is closed
+    if (!force && connectionToken === null && connectionTokenTimer === null) {
+        return;
+    }
+    const accessWallet = (0, wallet_1.getAccessWallet)();
+    connectionToken = await accessWallet.signJWT({});
+    // refresh token in 12 hours
+    if (connectionTokenTimer) {
+        clearTimeout(connectionTokenTimer);
+    }
+    connectionTokenTimer = setTimeout(refreshConnectionToken, process.env.NODE_ENV === 'test' ? 1000 * 3 : 1000 * 60 * 60);
+    console.log('refresh connection token', Jwt.decode(connectionToken));
+};
+const debouncedRefreshConnectionToken = (0, debounce_1.default)(refreshConnectionToken, 300);
+const getConnectionToken = () => connectionToken;
+exports.getConnectionToken = getConnectionToken;
 const getSender = () => {
     const wallet = (0, wallet_1.getWallet)();
     const accessWallet = (0, wallet_1.getAccessWallet)();
@@ -128,165 +149,163 @@ const ensureErrorListener = () => {
     messageEmitter.on('error', noop);
     exports._eventBus.on('error', noop);
 };
-let client = null;
-let reconnectTimer = null;
-let reconnectAttempts = 0;
-const MAX_RECONNECT_ATTEMPTS = process.env.NODE_ENV === 'test' ? 5 : 30;
-const RECONNECT_DELAY_MS = process.env.NODE_ENV === 'test' ? 500 : 2000;
-const reconnect = () => {
-    // Schedule reconnection (only once even if multiple channels fail)
-    if (!reconnectTimer) {
-        // Check retry limit
-        if (reconnectAttempts >= MAX_RECONNECT_ATTEMPTS) {
-            console.error(`Max reconnection attempts (${MAX_RECONNECT_ATTEMPTS}) reached. Stopping reconnection.`);
-            return;
-        }
-        reconnectAttempts += 1;
-        console.log(`Scheduling reconnection attempt ${reconnectAttempts}/${MAX_RECONNECT_ATTEMPTS}...`);
-        reconnectTimer = setTimeout(async () => {
-            reconnectTimer = null;
-            // eslint-disable-next-line no-use-before-define, @typescript-eslint/no-use-before-define
-            await initClient();
-        }, RECONNECT_DELAY_MS);
-    }
-};
-const joinChannelErrorHandler = (name, type, emitters) => (err) => {
+const joinChannelErrorHandler = (name, type, emitters) => async (err) => {
     const msg = `join ${name || 'channel'} ${type || 'error'}${err?.message ? ': ' : ''}${err?.message || ''}`;
     console.error(msg);
     (emitters || [emitter]).forEach((x) => x.emit('error', { message: msg }));
-    // On any join error/timeout, cleanup client and schedule reconnect with fresh token
+    await debouncedRefreshConnectionToken();
+};
+const initClient = () => {
+    // 如果正在初始化，返回同一个 Promise 等待完成
+    if (initPromise) {
+        return initPromise;
+    }
+    // 如果已经初始化完成，直接返回
     if (client) {
-        console.log(`Cleaning up client due to ${name} join error, will reconnect with fresh token...`);
-        (0, socket_1.safeDisconnect)(client).finally(() => {
-            client = null;
-            reconnect();
-        });
+        return Promise.resolve();
     }
-};
-const joinSuccessHandler = () => {
-    reconnectAttempts = 0;
-};
-const initClient = async () => {
-    if (!client) {
-        ensureErrorListener();
-        const accessWallet = (0, wallet_1.getAccessWallet)();
-        const componentDid = process.env.BLOCKLET_COMPONENT_DID;
-        const appDid = process.env.BLOCKLET_APP_PID;
-        const { publicKey: pk } = accessWallet;
-        // Generate one token and reuse it for connection and all channels
-        const token = await accessWallet.signJWT({});
-        // Build URL with query parameters directly
-        const baseUrl = `ws://${(0, parse_docker_endpoint_1.getServerHost)()}:${process.env.ABT_NODE_SERVICE_PORT}${constants_1.SERVICE_PREFIX}/websocket`;
-        const url = `${baseUrl}?token=${encodeURIComponent(token)}&pk=${encodeURIComponent(pk)}`;
-        client = new ws_1.WsClient(url, {
-            heartbeatIntervalMs: 10 * 1000,
-        });
-        client.connect();
-        const messageChannel = client.channel(accessWallet.address, () => ({ token, pk }));
-        const appPublicChannel = client.channel((0, channel_1.getAppPublicChannel)(appDid), () => ({ token, pk }));
-        const componentChannel = client.channel((0, channel_1.getComponentChannel)(appDid, componentDid), () => ({
-            token,
-            pk,
-            apiKey: process.env.BLOCKLET_COMPONENT_API_KEY,
-        }));
-        const eventBusChannel = client.channel((0, channel_1.getEventBusChannel)(appDid), () => ({ token, pk }));
-        messageChannel
-            .join()
-            .receive('ok', joinSuccessHandler)
-            .receive('error', joinChannelErrorHandler('message channel', 'error', [messageEmitter, emitter]))
-            .receive('timeout', joinChannelErrorHandler('message channel', 'timeout', [messageEmitter, emitter]));
-        appPublicChannel
-            .join()
-            .receive('ok', joinSuccessHandler)
-            .receive('error', joinChannelErrorHandler('app public channel', 'error'))
-            .receive('timeout', joinChannelErrorHandler('app public channel', 'timeout'));
-        componentChannel
-            .join()
-            .receive('ok', joinSuccessHandler)
-            .receive('error', joinChannelErrorHandler('app component channel', 'error'))
-            .receive('timeout', joinChannelErrorHandler('app component channel', 'timeout'));
-        eventBusChannel
-            .join()
-            .receive('ok', joinSuccessHandler)
-            .receive('error', joinChannelErrorHandler('eventbus channel', 'error'))
-            .receive('timeout', joinChannelErrorHandler('eventbus channel', 'timeout'));
-        messageChannel.on('message', ({ status, response } = {}) => {
-            debug('messageChannel.on', { status, response });
-            if (status === 'ok') {
-                messageEmitter.emit(response.type, response);
-                if (response.type === notification_1.NOTIFICATION_TYPES.HI) {
-                    emitter.emit(response.type, response);
+    // 创建新的初始化 Promise
+    initPromise = (async () => {
+        try {
+            ensureErrorListener();
+            const accessWallet = (0, wallet_1.getAccessWallet)();
+            const componentDid = process.env.BLOCKLET_COMPONENT_DID;
+            const appDid = process.env.BLOCKLET_APP_PID;
+            const { publicKey: pk } = accessWallet;
+            await refreshConnectionToken(true);
+            // Build URL with query parameters directly
+            const baseUrl = `ws://${(0, parse_docker_endpoint_1.getServerHost)()}:${process.env.ABT_NODE_SERVICE_PORT}${constants_1.SERVICE_PREFIX}/websocket`;
+            const url = `${baseUrl}?token=${encodeURIComponent(connectionToken)}&pk=${encodeURIComponent(pk)}`;
+            client = new ws_1.WsClient(url, {
+                heartbeatIntervalMs: 10 * 1000,
+            });
+            client.connect();
+            const messageChannel = client.channel(accessWallet.address, () => ({ token: connectionToken, pk }));
+            const appPublicChannel = client.channel((0, channel_1.getAppPublicChannel)(appDid), () => ({ token: connectionToken, pk }));
+            const componentChannel = client.channel((0, channel_1.getComponentChannel)(appDid, componentDid), () => ({
+                token: connectionToken,
+                pk,
+                apiKey: process.env.BLOCKLET_COMPONENT_API_KEY,
+            }));
+            const eventBusChannel = client.channel((0, channel_1.getEventBusChannel)(appDid), () => ({ token: connectionToken, pk }));
+            messageChannel
+                .join()
+                .receive('error', joinChannelErrorHandler('message channel', 'error', [messageEmitter, emitter]))
+                .receive('timeout', joinChannelErrorHandler('message channel', 'timeout', [messageEmitter, emitter]));
+            appPublicChannel
+                .join()
+                .receive('error', joinChannelErrorHandler('app public channel', 'error'))
+                .receive('timeout', joinChannelErrorHandler('app public channel', 'timeout'));
+            componentChannel
+                .join()
+                .receive('error', joinChannelErrorHandler('app component channel', 'error'))
+                .receive('timeout', joinChannelErrorHandler('app component channel', 'timeout'));
+            eventBusChannel
+                .join()
+                .receive('error', joinChannelErrorHandler('eventbus channel', 'error'))
+                .receive('timeout', joinChannelErrorHandler('eventbus channel', 'timeout'));
+            messageChannel.on('message', ({ status, response } = {}) => {
+                debug('messageChannel.on', { status, response });
+                if (status === 'ok') {
+                    messageEmitter.emit(response.type, response);
+                    if (response.type === notification_1.NOTIFICATION_TYPES.HI) {
+                        emitter.emit(response.type, response);
+                    }
                 }
-            }
-            else {
-                emitError(response);
-                console.error('Message channel error', { status, response });
-            }
-        });
-        eventBusChannel.on('event', ({ status, response } = {}) => {
-            debug('eventBusChannel.on', { status, response });
-            if (status === 'ok') {
-                // ignore events from self
-                if (response.source !== process.env.BLOCKLET_COMPONENT_DID) {
-                    exports._eventBus.emit('event', response);
+                else {
+                    emitError(response);
+                    console.error('Message channel error', { status, response });
                 }
-            }
-            else {
-                exports._eventBus.emit('error', response);
-                console.error('Event channel error', { status, response });
-            }
-        });
-        [...Object.keys(constant_1.BlockletInternalEvents), ...Object.keys(constant_1.TeamEvents)].forEach((key) => {
-            const event = constant_1.BlockletInternalEvents[key] || constant_1.TeamEvents[key];
-            componentChannel.on(event, async ({ status, response } = {}) => {
-                debug('componentChannel.on', { event, status, response });
+            });
+            eventBusChannel.on('event', ({ status, response } = {}) => {
+                debug('eventBusChannel.on', { status, response });
                 if (status === 'ok') {
-                    const { data, sender, time } = response;
-                    if (!time || new Date(time).getTime() < new Date(process.env.BLOCKLET_START_AT).getTime()) {
-                        return;
+                    // ignore events from self
+                    if (response.source !== process.env.BLOCKLET_COMPONENT_DID) {
+                        exports._eventBus.emit('event', response);
                     }
-                    // verify sender is server
-                    const tolerance = 600;
-                    if (!(await Jwt.verify(sender.token, process.env.ABT_NODE_PK, { tolerance }))) {
-                        const message = `verify sender failed in internal events. event: ${event}, sender: ${JSON.stringify({
-                            sender,
-                            decode: Jwt.decode(sender.token),
-                            now: Date.now(),
-                            ABT_NODE_PK: process.env.ABT_NODE_PK,
-                        })}`;
-                        emitError({ message });
-                        console.error(message);
-                        return;
+                }
+                else {
+                    exports._eventBus.emit('error', response);
+                    console.error('Event channel error', { status, response });
+                }
+            });
+            [...Object.keys(constant_1.BlockletInternalEvents), ...Object.keys(constant_1.TeamEvents)].forEach((key) => {
+                const event = constant_1.BlockletInternalEvents[key] || constant_1.TeamEvents[key];
+                componentChannel.on(event, async ({ status, response } = {}) => {
+                    debug('componentChannel.on', { event, status, response });
+                    if (status === 'ok') {
+                        const { data, sender, time } = response;
+                        if (!time || new Date(time).getTime() < new Date(process.env.BLOCKLET_START_AT).getTime()) {
+                            return;
+                        }
+                        // verify sender is server
+                        const tolerance = 600;
+                        if (!(await Jwt.verify(sender.token, process.env.ABT_NODE_PK, { tolerance }))) {
+                            const message = `verify sender failed in internal events. event: ${event}, sender: ${JSON.stringify({
+                                sender,
+                                decode: Jwt.decode(sender.token),
+                                now: Date.now(),
+                                ABT_NODE_PK: process.env.ABT_NODE_PK,
+                            })}`;
+                            emitError({ message });
+                            console.error(message);
+                            return;
+                        }
+                        emitter.emit(event, data);
+                        // Emit team events to event bus
+                        if (constant_1.TeamEvents[key]) {
+                            exports._eventBus.emit('event', {
+                                id: (0, util_1.nanoid)(),
+                                time: new Date().toISOString(),
+                                type: `blocklet.${event}`,
+                                data: { object: data.user },
+                            });
+                        }
                     }
-                    emitter.emit(event, data);
-                    // Emit team events to event bus
-                    if (constant_1.TeamEvents[key]) {
-                        exports._eventBus.emit('event', {
-                            id: (0, util_1.nanoid)(),
-                            time: new Date().toISOString(),
-                            type: `blocklet.${event}`,
-                            data: { object: data.user },
-                        });
+                    else {
+                        emitError(response);
+                        console.error('Component channel error', { status, response });
                     }
+                });
+            });
+            appPublicChannel.on(notification_1.NOTIFICATION_TYPES.HI, ({ status, response } = {}) => {
+                debug('appPublicChannel.on', { event: notification_1.NOTIFICATION_TYPES.HI, status, response });
+                if (status === 'ok') {
+                    emitter.emit(notification_1.NOTIFICATION_TYPES.HI, response);
                 }
                 else {
-                    emitError(response);
-                    console.error('Component channel error', { status, response });
+                    emitter.emit('error', response);
+                    console.error('App public channel error', { status, response });
                 }
             });
-        });
-        appPublicChannel.on(notification_1.NOTIFICATION_TYPES.HI, ({ status, response } = {}) => {
-            debug('appPublicChannel.on', { event: notification_1.NOTIFICATION_TYPES.HI, status, response });
-            if (status === 'ok') {
-                emitter.emit(notification_1.NOTIFICATION_TYPES.HI, response);
-            }
-            else {
-                emitter.emit('error', response);
-                console.error('App public channel error', { status, response });
-            }
-        });
+        }
+        catch (err) {
+            initPromise = null; // 清除 Promise 以便重试
+            console.warn('Failed to init notification service', err);
+            throw err;
+        }
+    })();
+    return initPromise;
+};
+const cleanup = () => {
+    try {
+        if (connectionTokenTimer) {
+            clearTimeout(connectionTokenTimer);
+            connectionTokenTimer = null;
+        }
+        if (client) {
+            client.disconnect();
+            client = null;
+        }
+        connectionToken = null;
+        initPromise = null;
+    }
+    catch (err) {
+        console.warn('Failed to cleanup notification service', err);
     }
 };
+exports.cleanup = cleanup;
 const ensureClient = async () => {
     if (process.env.BLOCKLET_MODE === 'test') {
         return;
@@ -296,18 +315,6 @@ const ensureClient = async () => {
     }
 };
 exports.ensureClient = ensureClient;
-const cleanup = async () => {
-    if (reconnectTimer) {
-        clearTimeout(reconnectTimer);
-        reconnectTimer = null;
-    }
-    if (client) {
-        await (0, socket_1.safeDisconnect)(client);
-        client = null;
-    }
-    reconnectAttempts = 0;
-};
-exports.cleanup = cleanup;
 const on = async (event, cb) => {
     try {
         await (0, exports.ensureClient)();
@@ -339,4 +346,5 @@ exports.default = {
     on: exports.on,
     off: exports.off,
     _message: exports._message,
+    initClient,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.2-beta-20251111-114226-13276e42",
+  "version": "1.17.2-beta-20251113-121338-9c917e68",
   "description": "graphql client to read/write data on abt node",
   "homepage": "https://www.arcblock.io/docs/blocklet-sdk-nodejs",
   "main": "lib/index.js",
@@ -26,20 +26,20 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.17.2-beta-20251111-114226-13276e42",
-    "@abtnode/db-cache": "1.17.2-beta-20251111-114226-13276e42",
-    "@abtnode/util": "1.17.2-beta-20251111-114226-13276e42",
+    "@abtnode/constant": "1.17.2-beta-20251113-121338-9c917e68",
+    "@abtnode/db-cache": "1.17.2-beta-20251113-121338-9c917e68",
+    "@abtnode/util": "1.17.2-beta-20251113-121338-9c917e68",
     "@arcblock/did": "^1.27.4",
     "@arcblock/did-connect-js": "^1.27.4",
     "@arcblock/did-ext": "^1.27.4",
     "@arcblock/jwt": "^1.27.4",
     "@arcblock/ws": "^1.27.4",
-    "@blocklet/constant": "1.17.2-beta-20251111-114226-13276e42",
-    "@blocklet/env": "1.17.2-beta-20251111-114226-13276e42",
+    "@blocklet/constant": "1.17.2-beta-20251113-121338-9c917e68",
+    "@blocklet/env": "1.17.2-beta-20251113-121338-9c917e68",
     "@blocklet/error": "^0.3.2",
-    "@blocklet/meta": "1.17.2-beta-20251111-114226-13276e42",
-    "@blocklet/server-js": "1.17.2-beta-20251111-114226-13276e42",
-    "@blocklet/theme": "^3.2.2",
+    "@blocklet/meta": "1.17.2-beta-20251113-121338-9c917e68",
+    "@blocklet/server-js": "1.17.2-beta-20251113-121338-9c917e68",
+    "@blocklet/theme": "^3.2.3",
     "@did-connect/authenticator": "^2.2.8",
     "@did-connect/handler": "^2.2.8",
     "@nedb/core": "^2.1.5",
@@ -82,5 +82,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.6.3"
   },
-  "gitHead": "3a85bab76a65b0f04427f9a7e74e8d4fcbcdd3f1"
+  "gitHead": "82362ffba5d50f01774b257b9cd8143adeb7a898"
 }