@blocklet/sdk 1.17.0-beta-20251103-104515-e4795f0f → 1.17.0-beta-20251104-112713-e947b159

package/lib/component/index.js

@@ -50,12 +50,34 @@ const Util = __importStar(require("./util"));
 const component_api_1 = __importDefault(require("../util/component-api"));
 const parse_docker_endpoint_1 = require("../util/parse-docker-endpoint");
 const debug = (0, debug_1.default)('@blocklet/sdk:component');
+const getComponent = (name) => {
+    const item = (0, config_1.getComponents)().find((x) => [x.title, x.name, x.did].includes(name));
+    return item;
+};
+const getComponentWebEndpoint = (keyword) => {
+    const item = getComponent(keyword);
+    const endpoint = item ? item.webEndpoint : '';
+    return (0, parse_docker_endpoint_1.parseDockerComponentEndpoint)(endpoint, item);
+};
+exports.getComponentWebEndpoint = getComponentWebEndpoint;
 // eslint-disable-next-line require-await
-const doCall = async ({ url, headers = {}, ...options }, retryOptions = {}) => (0, p_retry_1.default)(async () => {
+const doCall = ({ url, componentName, callPath, headers = {}, ...options }, retryOptions = {}) => (0, p_retry_1.default)(async () => {
     const startTime = Date.now();
+    let realUrl = url;
+    if (componentName && callPath) {
+        const component = getComponent(componentName);
+        if (!component) {
+            throw new Error(`can not find component ${componentName}`);
+        }
+        const baseURL = (0, parse_docker_endpoint_1.parseDockerComponentEndpoint)(component.webEndpoint, component);
+        if (!baseURL) {
+            throw new Error(`can not find web endpoint for ${componentName}`);
+        }
+        realUrl = (0, ufo_1.joinURL)(baseURL, callPath);
+    }
     try {
         const res = await (0, component_api_1.default)({
-            url,
+            url: realUrl,
             timeout: 60 * 1000,
             ...options,
             headers,
@@ -76,6 +98,13 @@ const doCall = async ({ url, headers = {}, ...options }, retryOptions = {}) => (
         if (error.response && error.response.status < 500 && error.response.status >= 400) {
             throw new p_retry_1.default.AbortError(error);
         }
+        // Do not retry if getaddrinfo ENOTFOUND
+        if (error.message &&
+            (error.message.includes('getaddrinfo ENOTFOUND') || error.message.includes('timeout of'))) {
+            // 如果加载时间超过 maxTime，则缩短下次加载时间到 maxTime
+            (0, config_1.reduceNextLoadTime)(1000);
+            throw new p_retry_1.default.AbortError(error);
+        }
         throw error;
     }
 }, {
@@ -86,34 +115,16 @@ const doCall = async ({ url, headers = {}, ...options }, retryOptions = {}) => (
     maxTimeout: retryOptions.maxTimeout || 5000,
     onFailedAttempt: retryOptions.onFailedAttempt || noop_1.default,
 });
-const getComponent = (name) => {
-    const item = (0, config_1.getComponents)().find((x) => [x.title, x.name, x.did].includes(name));
-    return item;
-};
-const getComponentWebEndpoint = (keyword) => {
-    const item = getComponent(keyword);
-    const endpoint = item ? item.webEndpoint : '';
-    return (0, parse_docker_endpoint_1.parseDockerComponentEndpoint)(endpoint, item);
-};
-exports.getComponentWebEndpoint = getComponentWebEndpoint;
 const call = async ({ name, method = 'POST', path: _path, ...options }, retryOptions = {}) => {
     if (!name) {
         throw new Error('component.call: name is required');
     }
-    const component = getComponent(name);
-    if (!component) {
-        throw new Error(`can not find component ${name}`);
-    }
-    const baseURL = (0, parse_docker_endpoint_1.parseDockerComponentEndpoint)(component.webEndpoint, component);
-    if (!baseURL) {
-        throw new Error(`can not find web endpoint for ${name}`);
-    }
-    const url = (0, ufo_1.joinURL)(baseURL, _path);
     try {
-        const resp = await doCall({ url, method, ...options }, retryOptions);
+        const resp = await doCall({ url: '', componentName: name, callPath: _path, method, ...options }, retryOptions);
         return resp;
     }
     catch (error) {
+        const component = getComponent(name);
         if (component.status !== constant_1.BlockletStatus.running) {
             throw new Error(`component ${name} is not running`);
         }

package/lib/config.d.ts

@@ -1,6 +1,9 @@
 import { EventEmitter } from 'events';
 import { TComponentInternalInfo } from '@blocklet/meta/lib/blocklet';
 declare const events: EventEmitter<[never]>;
+declare const configSettings: {
+    loadFileTimeout: number;
+};
 declare const Events: {
     componentAdded: string;
     componentUpdated: string;
@@ -60,6 +63,7 @@ type MountPoint = TComponentInternalInfo & {
 type TComponent = MountPoint;
 type TComponents = Array<TComponent>;
 declare const componentStore: TComponents;
+declare const reduceNextLoadTime: (maxTime: number) => void;
 declare const getComponents: () => TComponents;
 declare const _handleComponentUpdateOld: (data: {
     components: TComponents;
@@ -93,7 +97,7 @@ declare const getBlockletSettings: () => {
 };
 declare const getBlockletJs: (pageGroup?: string, pathPrefix?: string, source?: string) => string;
 export { logger, setLogger, env, componentStore as components, getComponents, MountPoint, // @deprecated, for backward compatibility
-TComponent, events, Events, getBlockletJs, _handleComponentUpdateOld, _handleAppConfigUpdate, _handleAppSettingUpdate, _handleComponentInstalled, _handleComponentUpdated, _handleComponentStarted, _handleComponentStopped, _handleComponentRemoved, _handleComponentConfigUpdate, getBlockletSettings, };
+TComponent, events, Events, getBlockletJs, _handleComponentUpdateOld, _handleAppConfigUpdate, _handleAppSettingUpdate, _handleComponentInstalled, _handleComponentUpdated, _handleComponentStarted, _handleComponentStopped, _handleComponentRemoved, _handleComponentConfigUpdate, reduceNextLoadTime, getBlockletSettings, configSettings, };
 declare const _default: {
     logger: {
         info: {
@@ -162,5 +166,9 @@ declare const _default: {
         federated: any;
         enableBlacklist: boolean;
     };
+    reduceNextLoadTime: (maxTime: number) => void;
+    configSettings: {
+        loadFileTimeout: number;
+    };
 };
 export default _default;

package/lib/config.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBlockletSettings = exports._handleComponentConfigUpdate = exports._handleComponentRemoved = exports._handleComponentStopped = exports._handleComponentStarted = exports._handleComponentUpdated = exports._handleComponentInstalled = exports._handleAppSettingUpdate = exports._handleAppConfigUpdate = exports._handleComponentUpdateOld = exports.getBlockletJs = exports.Events = exports.events = exports.getComponents = exports.components = exports.env = exports.setLogger = exports.logger = void 0;
+exports.configSettings = exports.getBlockletSettings = exports.reduceNextLoadTime = exports._handleComponentConfigUpdate = exports._handleComponentRemoved = exports._handleComponentStopped = exports._handleComponentStarted = exports._handleComponentUpdated = exports._handleComponentInstalled = exports._handleAppSettingUpdate = exports._handleAppConfigUpdate = exports._handleComponentUpdateOld = exports.getBlockletJs = exports.Events = exports.events = exports.getComponents = exports.components = exports.env = exports.setLogger = exports.logger = void 0;
 /* eslint-disable prettier/prettier */
 /* eslint-disable no-console */
 const path_1 = __importDefault(require("path"));
@@ -29,6 +29,10 @@ const blocklet_1 = require("./service/blocklet");
 const debug = (0, debug_1.default)('@blocklet/sdk:config');
 const events = new events_1.EventEmitter();
 exports.events = events;
+const configSettings = {
+    loadFileTimeout: 120000,
+};
+exports.configSettings = configSettings;
 let blockletClient;
 const Events = {
     componentAdded: 'componentAdded',
@@ -73,9 +77,10 @@ const appDataDir = process.env.BLOCKLET_APP_DATA_DIR;
 let appEnvFromDisk = {};
 let envFromDisk = {};
 let componentsFromDisk;
+let configFile;
 if (appDataDir) {
     try {
-        const configFile = path_1.default.join(appDataDir, constant_1.APP_CONFIG_FILE_PATH);
+        configFile = path_1.default.join(appDataDir, constant_1.APP_CONFIG_FILE_PATH);
         if (fs_1.default.existsSync(configFile)) {
             let configRaw = fs_1.default.readFileSync(configFile).toString();
             if (process.env.DOCKER_HOST_SERVER_DIR && process.env.DOCKER_CONTAINER_SERVER_DIR) {
@@ -134,7 +139,53 @@ const initComponentStore = () => {
 };
 const componentStore = initComponentStore();
 exports.components = componentStore;
-const getComponents = () => componentStore;
+let lastLoadTime = 0;
+// 缩短下次加载时间到 maxTime, 如果已经快到时间了, 不变更
+const reduceNextLoadTime = (maxTime) => {
+    if (typeof maxTime !== 'number' || maxTime < 0) {
+        throw new Error('maxTime must be a positive number');
+    }
+    const now = Date.now();
+    // 计算自上次加载以来经过的时间
+    const elapsed = now - lastLoadTime;
+    const remaining = configSettings.loadFileTimeout - elapsed;
+    // 如果剩余时间已经比 maxTime 短，说明快要重新加载了，忽略
+    if (remaining <= maxTime)
+        return;
+    // 根据最新的 maxTime 调整 lastLoadTime，使得下次加载提前触发
+    lastLoadTime = now - (configSettings.loadFileTimeout - maxTime);
+};
+exports.reduceNextLoadTime = reduceNextLoadTime;
+const getComponents = () => {
+    const now = Date.now();
+    if (now - lastLoadTime < configSettings.loadFileTimeout) {
+        return componentStore;
+    }
+    lastLoadTime = now;
+    try {
+        if (configFile && fs_1.default.existsSync(configFile)) {
+            let configRaw = fs_1.default.readFileSync(configFile).toString();
+            if (process.env.DOCKER_HOST_SERVER_DIR && process.env.DOCKER_CONTAINER_SERVER_DIR) {
+                configRaw = configRaw.replace(new RegExp(process.env.DOCKER_HOST_SERVER_DIR, 'g'), process.env.DOCKER_CONTAINER_SERVER_DIR);
+            }
+            const config = JSON.parse(configRaw);
+            componentsFromDisk = config.components;
+            const componentsMap = {};
+            for (const component of componentsFromDisk) {
+                componentsMap[component.did] = component;
+            }
+            componentStore.length = 0;
+            for (const component of componentsFromDisk) {
+                componentStore.push(component);
+            }
+            _fillWebEndpoint(componentStore);
+        }
+    }
+    catch (error) {
+        logger.error(error);
+    }
+    return componentStore;
+};
 exports.getComponents = getComponents;
 const updateComponentStoreInDocker = (components) => {
     if (!components || !components.length) {
@@ -413,12 +464,15 @@ exports.default = {
     setLogger,
     env,
     getComponents,
+    // @deprecated, no safe, please use getComponents
     get components() {
-        return componentStore;
+        return getComponents();
     },
     events,
     Events,
     fetchBlockletJs,
     getBlockletJs,
     getBlockletSettings,
+    reduceNextLoadTime,
+    configSettings,
 };

package/lib/middlewares/auth.d.ts

@@ -14,4 +14,4 @@ declare const authMiddleware: {
     }, res: Response, next: NextFunction) => Promise<void>;
     getServiceClient: () => BlockletService;
 };
-export { authMiddleware };
+export { authMiddleware, authMiddleware as auth };

package/lib/middlewares/auth.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.authMiddleware = void 0;
+exports.auth = exports.authMiddleware = void 0;
 const lru_cache_1 = require("lru-cache");
 const blocklet_1 = require("../service/blocklet");
 const login_1 = require("../util/login");
@@ -75,4 +75,5 @@ const authMiddleware = ({ roles, permissions, kyc, methods, getClient = getServi
     };
 };
 exports.authMiddleware = authMiddleware;
+exports.auth = authMiddleware;
 authMiddleware.getServiceClient = getServiceClient;

package/lib/middlewares/session.d.ts

@@ -11,4 +11,4 @@ type SessionOptions = {
 declare const sessionMiddleware: (options?: SessionOptions) => (req: Request & {
     user?: SessionUser;
 }, res: Response, next: NextFunction) => Promise<void>;
-export { sessionMiddleware };
+export { sessionMiddleware, sessionMiddleware as session };

package/lib/middlewares/session.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sessionMiddleware = void 0;
+exports.session = exports.sessionMiddleware = void 0;
 const get_token_from_req_1 = require("@abtnode/util/lib/get-token-from-req");
 const service_api_1 = __importDefault(require("../util/service-api"));
 const login_1 = require("../util/login");
@@ -73,3 +73,4 @@ const sessionMiddleware = (options = {}) => {
     };
 };
 exports.sessionMiddleware = sessionMiddleware;
+exports.session = sessionMiddleware;

package/lib/middlewares/user.d.ts

@@ -3,4 +3,4 @@ import { SessionUser } from '../util/login';
 declare const userMiddleware: () => (req: Request & {
     user?: SessionUser;
 }, res: Response, next: NextFunction) => void;
-export { userMiddleware };
+export { userMiddleware, userMiddleware as user };

package/lib/middlewares/user.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.userMiddleware = void 0;
+exports.user = exports.userMiddleware = void 0;
 const util_1 = require("util");
 const login_1 = require("../util/login");
 const userMiddleware = (0, util_1.deprecate)(() => (req, res, next) => {
@@ -17,3 +17,4 @@ const userMiddleware = (0, util_1.deprecate)(() => (req, res, next) => {
     next();
 }, 'user middleware is deprecated, please use session middleware for better security');
 exports.userMiddleware = userMiddleware;
+exports.user = userMiddleware;

package/lib/service/notification.d.ts

@@ -31,6 +31,7 @@ export declare const broadcast: (notification: TNotificationInput, options?: TSe
 export declare const _eventBus: EventEmitter<[never]>;
 export declare const _emitter: EventEmitter<[never]>;
 export declare const ensureClient: () => Promise<void>;
+export declare const cleanup: () => void;
 export declare const on: (event: string, cb?: $TSFixMe) => Promise<EventEmitter<[never]>>;
 export declare const off: any;
 export declare const _message: {

package/lib/service/notification.js

@@ -36,7 +36,8 @@ 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.ensureClient = exports._emitter = exports._eventBus = exports.broadcast = exports.getSender = void 0;
+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;
+/* eslint-disable no-console */
 /* eslint-disable @typescript-eslint/naming-convention */
 const Jwt = __importStar(require("@arcblock/jwt"));
 const debug_1 = __importDefault(require("debug"));
@@ -111,8 +112,11 @@ const broadcast = async (notification, options = {}) => {
 exports.broadcast = broadcast;
 const noop = () => { };
 const emitter = new node_events_1.EventEmitter();
+emitter.setMaxListeners(0);
 const messageEmitter = new node_events_1.EventEmitter();
+messageEmitter.setMaxListeners(0);
 exports._eventBus = new node_events_1.EventEmitter(); // for event bus
+exports._eventBus.setMaxListeners(0);
 exports._emitter = emitter; // export internal emitter for testing
 const emitError = (error) => {
     messageEmitter.emit('error', error);
@@ -123,12 +127,48 @@ 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 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
+    if (client) {
+        console.log(`Cleaning up client due to ${name} join error, will reconnect with fresh token...`);
+        try {
+            client.disconnect();
+        }
+        catch (e) {
+            console.error('Error disconnecting client:', e);
+        }
+        client = null;
+        reconnect();
+    }
+};
+const joinSuccessHandler = () => {
+    reconnectAttempts = 0;
 };
-let client = null;
 const initClient = async () => {
     if (!client) {
         ensureErrorListener();
@@ -155,18 +195,22 @@ const initClient = async () => {
         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 } = {}) => {
@@ -255,6 +299,18 @@ const ensureClient = async () => {
     }
 };
 exports.ensureClient = ensureClient;
+const cleanup = () => {
+    if (reconnectTimer) {
+        clearTimeout(reconnectTimer);
+        reconnectTimer = null;
+    }
+    if (client) {
+        client.disconnect();
+        client = null;
+    }
+    reconnectAttempts = 0;
+};
+exports.cleanup = cleanup;
 const on = async (event, cb) => {
     await (0, exports.ensureClient)();
     return emitter.on(event, cb);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.0-beta-20251103-104515-e4795f0f",
+  "version": "1.17.0-beta-20251104-112713-e947b159",
   "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.0-beta-20251103-104515-e4795f0f",
-    "@abtnode/db-cache": "1.17.0-beta-20251103-104515-e4795f0f",
-    "@abtnode/util": "1.17.0-beta-20251103-104515-e4795f0f",
+    "@abtnode/constant": "1.17.0-beta-20251104-112713-e947b159",
+    "@abtnode/db-cache": "1.17.0-beta-20251104-112713-e947b159",
+    "@abtnode/util": "1.17.0-beta-20251104-112713-e947b159",
     "@arcblock/did": "^1.27.1",
     "@arcblock/did-connect-js": "^1.27.1",
     "@arcblock/did-ext": "^1.27.1",
     "@arcblock/jwt": "^1.27.1",
     "@arcblock/ws": "^1.27.1",
-    "@blocklet/constant": "1.17.0-beta-20251103-104515-e4795f0f",
-    "@blocklet/env": "1.17.0-beta-20251103-104515-e4795f0f",
+    "@blocklet/constant": "1.17.0-beta-20251104-112713-e947b159",
+    "@blocklet/env": "1.17.0-beta-20251104-112713-e947b159",
     "@blocklet/error": "^0.3.0",
-    "@blocklet/meta": "1.17.0-beta-20251103-104515-e4795f0f",
-    "@blocklet/server-js": "1.17.0-beta-20251103-104515-e4795f0f",
+    "@blocklet/meta": "1.17.0-beta-20251104-112713-e947b159",
+    "@blocklet/server-js": "1.17.0-beta-20251104-112713-e947b159",
     "@blocklet/theme": "^3.1.54",
     "@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": "2fb9b7f6dbf45b407a82ac676955b4ede1c6b347"
+  "gitHead": "66c9180952f1dab415ff16b3ccd8eafd61baabf9"
 }