@blocklet/sdk 1.17.2-beta-20251112-085154-0103b877 → 1.17.2-beta-20251113-121338-9c917e68

package/lib/service/notification.js

@@ -57,7 +57,12 @@ const debug = (0, debug_1.default)('@blocklet/sdk:notification');
 let client = null;
 let connectionToken = null;
 let connectionTokenTimer = null;
-const refreshConnectionToken = async () => {
+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
@@ -150,121 +155,138 @@ const joinChannelErrorHandler = (name, type, emitters) => async (err) => {
     (emitters || [emitter]).forEach((x) => x.emit('error', { message: msg }));
     await debouncedRefreshConnectionToken();
 };
-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;
-        await refreshConnectionToken();
-        // 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);
+const initClient = () => {
+    // 如果正在初始化，返回同一个 Promise 等待完成
+    if (initPromise) {
+        return initPromise;
+    }
+    // 如果已经初始化完成，直接返回
+    if (client) {
+        return Promise.resolve();
+    }
+    // 创建新的初始化 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 {
@@ -277,6 +299,7 @@ const cleanup = () => {
             client = null;
         }
         connectionToken = null;
+        initPromise = null;
     }
     catch (err) {
         console.warn('Failed to cleanup notification service', err);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.2-beta-20251112-085154-0103b877",
+  "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,19 +26,19 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.17.2-beta-20251112-085154-0103b877",
-    "@abtnode/db-cache": "1.17.2-beta-20251112-085154-0103b877",
-    "@abtnode/util": "1.17.2-beta-20251112-085154-0103b877",
+    "@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-20251112-085154-0103b877",
-    "@blocklet/env": "1.17.2-beta-20251112-085154-0103b877",
+    "@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-20251112-085154-0103b877",
-    "@blocklet/server-js": "1.17.2-beta-20251112-085154-0103b877",
+    "@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",
@@ -82,5 +82,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.6.3"
   },
-  "gitHead": "78509a648488c741e93d33b743ea2f6d65535c34"
+  "gitHead": "82362ffba5d50f01774b257b9cd8143adeb7a898"
 }