@blocklet/sdk 1.17.7-beta-20251223-090654-55d57623 → 1.17.7-beta-20251225-073259-cb6ecf68

package/lib/config.d.ts

@@ -155,7 +155,7 @@ declare const _default: {
         componentRemoved: string;
         envUpdate: string;
     };
-    fetchBlockletJs: (type?: "js" | "json") => Promise<any>;
+    fetchBlockletJs: (type?: "js" | "json") => Promise<string | Record<string, any>>;
     getBlockletJs: (pageGroup?: string, pathPrefix?: string, source?: string) => string;
     getBlockletSettings: () => {
         theme: {

package/lib/config.js

@@ -21,6 +21,7 @@ const constant_2 = require("@blocklet/constant");
 const util_1 = require("@blocklet/env/lib/util");
 const util_2 = require("@blocklet/meta/lib/util");
 const base32_1 = require("@abtnode/util/lib/base32");
+const sleep_1 = __importDefault(require("@abtnode/util/lib/sleep"));
 const security_1 = require("./security");
 const version_1 = require("./version");
 const notification_1 = __importDefault(require("./service/notification"));
@@ -339,46 +340,68 @@ const blockletSettings = {
     federated: null,
     enableBlacklist: false,
 };
+// Single-flight 模式：并发调用共享同一个 Promise，只请求一次
+let _pendingBlockletRequest = null;
+const _requestBlockletJson = async () => {
+    const componentDid = process.env.BLOCKLET_COMPONENT_DID;
+    const appUrl = `https://${(0, base32_1.encode)(env.appPid)}.${constant_1.DEFAULT_DID_DOMAIN}`;
+    const { mountPoint } = componentStore.find((x) => x.did === componentDid);
+    const url = (0, ufo_1.joinURL)(appUrl, mountPoint === '/' ? '' : mountPoint, '__blocklet__.js?type=json');
+    const res = await axios_1.default.get(url, {
+        timeout: 8000,
+        headers: {
+            'User-Agent': `BlockletSDK/${version_1.version}`,
+        },
+    });
+    // 解析响应数据（原 type='json' 的解析逻辑）
+    let data;
+    try {
+        data = typeof res.data === 'string' ? JSON.parse(res.data) : res.data;
+    }
+    catch (e) {
+        throw new Error('Invalid blocklet.json response');
+    }
+    if (typeof data !== 'object') {
+        throw new Error('Invalid blocklet.json data');
+    }
+    logger.info(`Fetch blocklet.json succeed: ${componentDid} from ${appUrl}`);
+    return data;
+};
+const _getBlockletData = () => {
+    if (_pendingBlockletRequest) {
+        return _pendingBlockletRequest;
+    }
+    _pendingBlockletRequest = (async () => {
+        try {
+            return await _requestBlockletJson();
+        }
+        finally {
+            _pendingBlockletRequest = null;
+        }
+    })();
+    return _pendingBlockletRequest;
+};
 const fetchBlockletJs = async (type = 'js') => {
     const componentDid = process.env.BLOCKLET_COMPONENT_DID;
     const appUrl = `https://${(0, base32_1.encode)(env.appPid)}.${constant_1.DEFAULT_DID_DOMAIN}`;
     try {
-        const { mountPoint } = componentStore.find((x) => x.did === componentDid);
-        const url = (0, ufo_1.joinURL)(appUrl, mountPoint === '/' ? '' : mountPoint, `__blocklet__.js?nocache=1&t=${Date.now()}${type === 'json' ? '&type=json' : ''}`);
-        const res = await axios_1.default.get(url, {
-            timeout: 8000,
-            headers: {
-                'User-Agent': `BlockletSDK/${version_1.version}`,
-            },
-        });
+        const data = await _getBlockletData();
         if (type === 'js') {
-            if (typeof res.data === 'string' && res.data.startsWith('window.blocklet')) {
-                blockletJs = res.data;
-                logger.info(`Fetch blocklet.${type} succeed: ${componentDid} from ${appUrl}`);
-                return res.data;
-            }
-            throw new Error('Invalid blocklet.js');
-        }
-        else {
-            let data;
-            try {
-                data = typeof res.data === 'string' ? JSON.parse(res.data) : res.data;
-            }
-            catch (e) {
-                throw new Error('Invalid blocklet.json response');
-            }
-            if (typeof data === 'object') {
-                blockletSettings.theme = {
-                    ...DEFAULT_THEME_SETTINGS,
-                    ...(data.theme || {}),
-                    light: (0, theme_1.merge)(DEFAULT_THEME_SETTINGS.light, data.theme?.light || {}),
-                    dark: (0, theme_1.merge)(DEFAULT_THEME_SETTINGS.dark, data.theme?.dark || {}),
-                };
-                logger.info(`Fetch blocklet.${type} succeed: ${componentDid} from ${appUrl}`);
-                return data;
-            }
-            throw new Error('Invalid blocklet.json data');
+            // 从 JSON 数据生成 JS 字符串（模拟服务端 parseResponse 的格式）
+            const envStr = Object.entries(data)
+                .map(([key, value]) => `${key}: ${JSON.stringify(value)}`)
+                .join(',');
+            const jsStr = `window.blocklet = {${envStr}};`;
+            blockletJs = jsStr;
+            return jsStr;
         }
+        blockletSettings.theme = {
+            ...DEFAULT_THEME_SETTINGS,
+            ...(data.theme || {}),
+            light: (0, theme_1.merge)(DEFAULT_THEME_SETTINGS.light, data.theme?.light || {}),
+            dark: (0, theme_1.merge)(DEFAULT_THEME_SETTINGS.dark, data.theme?.dark || {}),
+        };
+        return data;
     }
     catch (err) {
         logger.error(`Fetch blocklet.${type} failed: ${componentDid} from ${appUrl}`, err.message);
@@ -390,7 +413,7 @@ const fetchBlockletData = async () => {
         if (!blockletClient) {
             blockletClient = new blocklet_1.BlockletService();
         }
-        const { blocklet } = await blockletClient.getBlocklet();
+        const { blocklet } = await blockletClient.getBlocklet(false, true);
         blockletSettings.federated = blocklet.settings?.federated;
         blockletSettings.enableBlacklist = blocklet.settings?.session?.enableBlacklist;
         return blocklet;
@@ -405,9 +428,11 @@ const getBlockletSettings = () => {
 };
 exports.getBlockletSettings = getBlockletSettings;
 const refreshBlockletContext = (0, throttle_1.default)(async () => {
+    // 避免多个组件间同时触发
+    await (0, sleep_1.default)(Math.floor(Math.random() * 701) + 300);
     // FIXME: @zhanghan 理论上应该将 fetchBlockletJs 改造为使用 fetchBlockletData，暂时先不改动这个逻辑，避免带来破坏性变更
     await Promise.all([fetchBlockletJs('js'), fetchBlockletJs('json'), fetchBlockletData()]);
-}, 3000, { trailing: true });
+}, 5000, { trailing: true });
 // Page group is dynamic, so we need to create it on the fly
 const normalize = (prefix) => `/${prefix}/`.replace(/\/+/g, '/');
 const getBlockletJs = (pageGroup = '', pathPrefix = '', source = blockletJs) => {

package/lib/service/blocklet.js

@@ -25,7 +25,7 @@ const user_1 = require("../util/user");
 const VERSION = version_1.version; // version of notification sdk
 const isNotNullOrUndefined = (x) => ![null, undefined].includes(x);
 const fixUserAvatar = (user) => {
-    if (user.avatar) {
+    if (user?.avatar) {
         user.avatar = (0, user_1.fixAvatar)(user.avatar);
     }
     return user;

package/lib/service/notification.js

@@ -232,7 +232,7 @@ const initClient = () => {
             });
             [...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 } = {}) => {
+                const handler = (0, debounce_1.default)(async ({ status, response } = {}) => {
                     debug('componentChannel.on', { event, status, response });
                     if (status === 'ok') {
                         const { data, sender, time } = response;
@@ -267,7 +267,8 @@ const initClient = () => {
                         emitError(response);
                         console.error('Component channel error', { status, response });
                     }
-                });
+                }, 3000);
+                componentChannel.on(event, handler);
             });
             appPublicChannel.on(notification_1.NOTIFICATION_TYPES.HI, ({ status, response } = {}) => {
                 debug('appPublicChannel.on', { event: notification_1.NOTIFICATION_TYPES.HI, status, response });

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.7-beta-20251223-090654-55d57623",
+  "version": "1.17.7-beta-20251225-073259-cb6ecf68",
   "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.7-beta-20251223-090654-55d57623",
-    "@abtnode/db-cache": "1.17.7-beta-20251223-090654-55d57623",
-    "@abtnode/util": "1.17.7-beta-20251223-090654-55d57623",
+    "@abtnode/constant": "1.17.7-beta-20251225-073259-cb6ecf68",
+    "@abtnode/db-cache": "1.17.7-beta-20251225-073259-cb6ecf68",
+    "@abtnode/util": "1.17.7-beta-20251225-073259-cb6ecf68",
     "@arcblock/did": "^1.27.15",
     "@arcblock/did-connect-js": "^1.27.15",
     "@arcblock/did-ext": "^1.27.15",
     "@arcblock/jwt": "^1.27.15",
     "@arcblock/ws": "^1.27.15",
-    "@blocklet/constant": "1.17.7-beta-20251223-090654-55d57623",
-    "@blocklet/env": "1.17.7-beta-20251223-090654-55d57623",
+    "@blocklet/constant": "1.17.7-beta-20251225-073259-cb6ecf68",
+    "@blocklet/env": "1.17.7-beta-20251225-073259-cb6ecf68",
     "@blocklet/error": "^0.3.5",
-    "@blocklet/meta": "1.17.7-beta-20251223-090654-55d57623",
-    "@blocklet/server-js": "1.17.7-beta-20251223-090654-55d57623",
+    "@blocklet/meta": "1.17.7-beta-20251225-073259-cb6ecf68",
+    "@blocklet/server-js": "1.17.7-beta-20251225-073259-cb6ecf68",
     "@blocklet/theme": "^3.2.19",
     "@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": "00a82b6f4ef5818d6ec37d74be404031c693247c"
+  "gitHead": "16715912460ed534e1e023d7e968714e3990051d"
 }