@blocklet/sdk 1.17.1 → 1.17.2-beta-20251110-023854-e91dad6f

package/lib/service/notification.d.ts

@@ -31,7 +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 cleanup: () => Promise<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

@@ -52,6 +52,7 @@ 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 debug = (0, debug_1.default)('@blocklet/sdk:notification');
 const getSender = () => {
     const wallet = (0, wallet_1.getWallet)();
@@ -156,14 +157,10 @@ const joinChannelErrorHandler = (name, type, emitters) => (err) => {
     // 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();
+        (0, socket_1.safeDisconnect)(client).finally(() => {
+            client = null;
+            reconnect();
+        });
     }
 };
 const joinSuccessHandler = () => {
@@ -299,13 +296,13 @@ const ensureClient = async () => {
     }
 };
 exports.ensureClient = ensureClient;
-const cleanup = () => {
+const cleanup = async () => {
     if (reconnectTimer) {
         clearTimeout(reconnectTimer);
         reconnectTimer = null;
     }
     if (client) {
-        client.disconnect();
+        await (0, socket_1.safeDisconnect)(client);
         client = null;
     }
     reconnectAttempts = 0;

package/lib/util/socket.d.ts

@@ -0,0 +1,2 @@
+import type { Socket } from 'phoenix';
+export declare function safeDisconnect(socket: Socket): Promise<void>;

package/lib/util/socket.js

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.safeDisconnect = safeDisconnect;
+/* eslint-disable no-await-in-loop */
+/* eslint-disable no-console */
+async function safeDisconnect(socket) {
+    try {
+        if (!socket)
+            return;
+        const conn = socket.conn ?? socket.socket?.conn ?? null;
+        if (!conn) {
+            socket.conn = null;
+            return;
+        }
+        let state = conn.readyState;
+        // 0: CONNECTING, 1: OPEN, 2: CLOSING, 3: CLOSED
+        if (state === 0) {
+            let attempts = 0;
+            const MAX_ATTEMPTS = 10;
+            while (conn.readyState === 0 && attempts < MAX_ATTEMPTS) {
+                console.warn(`[safeDisconnect] Connection still CONNECTING, waiting before disconnect... attempts: ${attempts} / ${MAX_ATTEMPTS}`);
+                await new Promise((resolve) => {
+                    setTimeout(resolve, 300);
+                });
+                attempts += 1;
+                if (conn.readyState !== 0)
+                    break;
+            }
+            if (conn.readyState === 0) {
+                console.warn('[safeDisconnect] Connection still CONNECTING after 10 attempts, skipping disconnect to avoid crash.');
+                return;
+            }
+            state = conn.readyState;
+            console.log(`[safeDisconnect] Connection state changed to ${state} after waiting ${attempts * 300}ms`);
+        }
+        if (state === 1 || state === 2) {
+            try {
+                // Phoenix 的 disconnect 本身是异步 teardown
+                await new Promise((resolve) => {
+                    socket?.disconnect?.(() => resolve());
+                    // fallback：防止回调永远不触发
+                    setTimeout(resolve, 1500);
+                });
+            }
+            catch (err) {
+                console.warn('[safeDisconnect] socket.disconnect threw', err);
+                try {
+                    conn.close();
+                }
+                catch (closeErr) {
+                    console.warn('[safeDisconnect] conn.close threw', closeErr);
+                }
+            }
+        }
+        else if (state === 3) {
+            console.log('[safeDisconnect] Already CLOSED');
+        }
+        // 最后兜底清理引用
+        if (socket) {
+            socket.conn = null;
+        }
+    }
+    catch (err) {
+        console.error('[safeDisconnect] Unexpected error', err);
+    }
+}

package/lib/version.d.ts

@@ -1,4 +1,4 @@
-declare const version = "1.17.1";
+declare const version = "1.17.2";
 export { version };
 declare const _default: {
     version: string;

package/lib/version.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
-const version = '1.17.1';
+const version = '1.17.2';
 exports.version = version;
 exports.default = { version };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.17.1",
+  "version": "1.17.2-beta-20251110-023854-e91dad6f",
   "description": "graphql client to read/write data on abt node",
   "homepage": "https://www.arcblock.io/docs/blocklet-sdk-nodejs",
   "main": "lib/index.js",
@@ -26,26 +26,26 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.17.1",
-    "@abtnode/db-cache": "1.17.1",
-    "@abtnode/util": "1.17.1",
-    "@arcblock/did": "^1.27.3",
-    "@arcblock/did-connect-js": "^1.27.3",
-    "@arcblock/did-ext": "^1.27.3",
-    "@arcblock/jwt": "^1.27.3",
-    "@arcblock/ws": "^1.27.3",
-    "@blocklet/constant": "1.17.1",
-    "@blocklet/env": "1.17.1",
+    "@abtnode/constant": "1.17.2-beta-20251110-023854-e91dad6f",
+    "@abtnode/db-cache": "1.17.2-beta-20251110-023854-e91dad6f",
+    "@abtnode/util": "1.17.2-beta-20251110-023854-e91dad6f",
+    "@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-20251110-023854-e91dad6f",
+    "@blocklet/env": "1.17.2-beta-20251110-023854-e91dad6f",
     "@blocklet/error": "^0.3.2",
-    "@blocklet/meta": "1.17.1",
-    "@blocklet/server-js": "1.17.1",
-    "@blocklet/theme": "^3.2.0",
+    "@blocklet/meta": "1.17.2-beta-20251110-023854-e91dad6f",
+    "@blocklet/server-js": "1.17.2-beta-20251110-023854-e91dad6f",
+    "@blocklet/theme": "^3.2.2",
     "@did-connect/authenticator": "^2.2.8",
     "@did-connect/handler": "^2.2.8",
     "@nedb/core": "^2.1.5",
-    "@ocap/mcrypto": "^1.27.3",
-    "@ocap/util": "^1.27.3",
-    "@ocap/wallet": "^1.27.3",
+    "@ocap/mcrypto": "^1.27.4",
+    "@ocap/util": "^1.27.4",
+    "@ocap/wallet": "^1.27.4",
     "axios": "^1.7.9",
     "cheerio": "1.0.0-rc.12",
     "debug": "^4.4.1",
@@ -82,5 +82,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.6.3"
   },
-  "gitHead": "0d57fbc64a22fd09267166b26af46dd84e545287"
+  "gitHead": "272f9aeb4b24eba471c5a9f9a5b4a883e3249bbb"
 }