@onekeyfe/hd-transport-web-device 1.1.34-alpha.1 → 1.1.34-alpha.2

package/dist/electron-ble-transport.d.ts

@@ -37,6 +37,7 @@ export default class ElectronBleTransport {
         path: string;
     }>;
     release(id: string): Promise<void>;
+    disconnect(id: string): Promise<void>;
     private handleNotificationData;
     call(uuid: string, name: string, data: Record<string, unknown>): Promise<import("@onekeyfe/hd-transport").MessageFromOneKey>;
     private processNotificationPacket;

package/dist/electron-ble-transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"electron-ble-transport.d.ts","sourceRoot":"","sources":["../src/electron-ble-transport.ts"],"names":[],"mappings":";AAAA,OAAO,SAAkD,MAAM,wBAAwB,CAAC;AASxF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AAEvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAKlE,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,UAAU,CAAC,EAAE,UAAU,CAAC;KACzB;CACF;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AASF,MAAM,CAAC,OAAO,OAAO,oBAAoB;IACvC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,IAAI,SAA0B;IAE9B,UAAU,UAAS;IAEnB,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAExC,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;IAGvB,OAAO,CAAC,gBAAgB,CAA0B;IAGlD,OAAO,CAAC,WAAW,CAAsE;IAGzF,OAAO,CAAC,oBAAoB,CAAsC;IAGlE,OAAO,CAAC,kBAAkB,CAAsC;IAGhE,OAAO,CAAC,oBAAoB;IAmC5B,OAAO,CAAC,kBAAkB;IAmB1B,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,YAAY;IAexC,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,MAAM;IAEA,SAAS,IAAI,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAcpD,OAAO,CAAC,KAAK,EAAE,eAAe;;;;IA8E9B,OAAO,CAAC,EAAE,EAAE,MAAM;IAwBxB,OAAO,CAAC,sBAAsB;IA2BxB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IA2EpE,OAAO,CAAC,yBAAyB;CAyDlC"}
+{"version":3,"file":"electron-ble-transport.d.ts","sourceRoot":"","sources":["../src/electron-ble-transport.ts"],"names":[],"mappings":";AAAA,OAAO,SAAkD,MAAM,wBAAwB,CAAC;AASxF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AAEvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAKlE,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,UAAU,CAAC,EAAE,UAAU,CAAC;KACzB;CACF;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AASF,MAAM,CAAC,OAAO,OAAO,oBAAoB;IACvC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,IAAI,SAA0B;IAE9B,UAAU,UAAS;IAEnB,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAExC,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;IAGvB,OAAO,CAAC,gBAAgB,CAA0B;IAGlD,OAAO,CAAC,WAAW,CAAsE;IAGzF,OAAO,CAAC,oBAAoB,CAAsC;IAGlE,OAAO,CAAC,kBAAkB,CAAsC;IAGhE,OAAO,CAAC,oBAAoB;IAmC5B,OAAO,CAAC,kBAAkB;IAmB1B,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,YAAY;IAexC,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,MAAM;IAEA,SAAS,IAAI,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAcpD,OAAO,CAAC,KAAK,EAAE,eAAe;;;;IA4F9B,OAAO,CAAC,EAAE,EAAE,MAAM;IAoBlB,UAAU,CAAC,EAAE,EAAE,MAAM;IAsB3B,OAAO,CAAC,sBAAsB;IA2BxB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IA2EpE,OAAO,CAAC,yBAAyB;CAyDlC"}

package/dist/index.d.ts

@@ -75,6 +75,7 @@ declare class ElectronBleTransport {
         path: string;
     }>;
     release(id: string): Promise<void>;
+    disconnect(id: string): Promise<void>;
     private handleNotificationData;
     call(uuid: string, name: string, data: Record<string, unknown>): Promise<transport.MessageFromOneKey>;
     private processNotificationPacket;

package/dist/index.js

@@ -461,6 +461,7 @@ class ElectronBleTransport {
             if (forceCleanRunPromise && this.runPromise) {
                 this.runPromise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleForceCleanRunPromise));
             }
+            let step = 'getDevice';
             try {
                 if (!((_a = window.desktopApi) === null || _a === void 0 ? void 0 : _a.nobleBle)) {
                     throw new Error('Noble BLE API not available');
@@ -469,6 +470,7 @@ class ElectronBleTransport {
                 if (!device) {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound, `Device ${uuid} not found`);
                 }
+                step = 'connect';
                 try {
                     yield window.desktopApi.nobleBle.connect(uuid);
                     this.connectedDevices.add(uuid);
@@ -477,6 +479,7 @@ class ElectronBleTransport {
                     this.handleBluetoothError(error);
                 }
                 this.dataBuffers.set(uuid, { buffer: [], bufferLength: 0 });
+                step = 'subscribe';
                 yield window.desktopApi.nobleBle.subscribe(uuid);
                 const cleanup = window.desktopApi.nobleBle.onNotification((deviceId, data) => {
                     if (deviceId === uuid) {
@@ -487,6 +490,9 @@ class ElectronBleTransport {
                 const disconnectCleanup = window.desktopApi.nobleBle.onDeviceDisconnected((disconnectedDevice) => {
                     var _a;
                     if (disconnectedDevice.id === uuid) {
+                        if (this.runPromise) {
+                            this.runPromise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected));
+                        }
                         this.cleanupDeviceState(uuid);
                         (_a = this.emitter) === null || _a === void 0 ? void 0 : _a.emit('device-disconnect', {
                             name: disconnectedDevice.name,
@@ -505,6 +511,9 @@ class ElectronBleTransport {
             }
             catch (error) {
                 (_c = this.Log) === null || _c === void 0 ? void 0 : _c.error('[Transport] Noble BLE acquire failed:', error);
+                if (step === 'subscribe') {
+                    yield this.disconnect(uuid);
+                }
                 throw error;
             }
         });
@@ -512,23 +521,33 @@ class ElectronBleTransport {
     release(id) {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
+            this.cleanupDeviceState(id);
             try {
-                if (this.connectedDevices.has(id)) {
-                    if ((_a = window.desktopApi) === null || _a === void 0 ? void 0 : _a.nobleBle) {
-                        yield window.desktopApi.nobleBle.unsubscribe(id);
-                    }
-                    if ((_b = window.desktopApi) === null || _b === void 0 ? void 0 : _b.nobleBle) {
-                        yield window.desktopApi.nobleBle.disconnect(id);
-                    }
-                    this.cleanupDeviceState(id);
-                }
+                yield ((_c = (_b = (_a = window.desktopApi) === null || _a === void 0 ? void 0 : _a.nobleBle) === null || _b === void 0 ? void 0 : _b.release) === null || _c === void 0 ? void 0 : _c.call(_b, id));
             }
-            catch (error) {
-                (_c = this.Log) === null || _c === void 0 ? void 0 : _c.error('[Transport] Noble BLE release failed:', error);
-                this.cleanupDeviceState(id);
+            catch (_d) {
             }
         });
     }
+    disconnect(id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const bounded = (ms, run) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    yield Promise.race([
+                        Promise.resolve(run()),
+                        new Promise(resolve => {
+                            setTimeout(resolve, ms);
+                        }),
+                    ]);
+                }
+                catch (_a) {
+                }
+            });
+            yield bounded(2000, () => { var _a, _b; return (_b = (_a = window.desktopApi) === null || _a === void 0 ? void 0 : _a.nobleBle) === null || _b === void 0 ? void 0 : _b.unsubscribe(id); });
+            yield bounded(3000, () => { var _a, _b; return (_b = (_a = window.desktopApi) === null || _a === void 0 ? void 0 : _a.nobleBle) === null || _b === void 0 ? void 0 : _b.disconnect(id); });
+            this.cleanupDeviceState(id);
+        });
+    }
     handleNotificationData(deviceId, hexData) {
         var _a, _b;
         if (hexData === 'PAIRING_REJECTED') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-web-device",
-  "version": "1.1.34-alpha.1",
+  "version": "1.1.34-alpha.2",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
@@ -20,13 +20,13 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.1.34-alpha.1",
-    "@onekeyfe/hd-transport": "1.1.34-alpha.1"
+    "@onekeyfe/hd-shared": "1.1.34-alpha.2",
+    "@onekeyfe/hd-transport": "1.1.34-alpha.2"
   },
   "devDependencies": {
-    "@onekeyfe/hd-transport-electron": "1.1.34-alpha.1",
+    "@onekeyfe/hd-transport-electron": "1.1.34-alpha.2",
     "@types/w3c-web-usb": "^1.0.6",
     "@types/web-bluetooth": "^0.0.17"
   },
-  "gitHead": "e017f56235eae6eab82f1c687699a4204f3173f9"
+  "gitHead": "dee167c35d191f3f4e02c4cb6228e1f926f929ec"
 }

package/src/electron-ble-transport.ts

@@ -162,6 +162,9 @@ export default class ElectronBleTransport {
       this.runPromise.reject(ERRORS.TypedError(HardwareErrorCode.BleForceCleanRunPromise));
     }
 
+    // `step` pins down where a failed acquire died (subscribe = the
+    // encryption-gated characteristic, the broken-OS-bond signature).
+    let step = 'getDevice';
     try {
       if (!window.desktopApi?.nobleBle) {
         throw new Error('Noble BLE API not available');
@@ -174,6 +177,7 @@ export default class ElectronBleTransport {
       }
 
       // Connect to device
+      step = 'connect';
       try {
         await window.desktopApi.nobleBle.connect(uuid);
         this.connectedDevices.add(uuid);
@@ -185,6 +189,7 @@ export default class ElectronBleTransport {
       this.dataBuffers.set(uuid, { buffer: [], bufferLength: 0 });
 
       // Subscribe to notifications
+      step = 'subscribe';
       await window.desktopApi.nobleBle.subscribe(uuid);
 
       // Set up notification listener
@@ -201,6 +206,10 @@ export default class ElectronBleTransport {
       const disconnectCleanup = window.desktopApi.nobleBle.onDeviceDisconnected(
         (disconnectedDevice: any) => {
           if (disconnectedDevice.id === uuid) {
+            // Fail a call blocked on a dead link instead of hanging.
+            if (this.runPromise) {
+              this.runPromise.reject(ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected));
+            }
             this.cleanupDeviceState(uuid);
 
             // Trigger disconnect event
@@ -224,31 +233,54 @@ export default class ElectronBleTransport {
       return { uuid, path: uuid };
     } catch (error) {
       this.Log?.error('[Transport] Noble BLE acquire failed:', error);
+      if (step === 'subscribe') {
+        // Broken-bond signature: tear the link down so the next attempt
+        // cold-connects and macOS can re-negotiate the bond.
+        await this.disconnect(uuid);
+      }
       throw error;
     }
   }
 
   async release(id: string) {
+    // Logical release only — the link and subscription stay up for reuse; the
+    // main process idle timer does the physical disconnect. Hard teardown is
+    // `disconnect()`. Renderer listeners must still go, or the next acquire's
+    // fresh listeners would double-process every packet.
+    this.cleanupDeviceState(id);
+    // Signal logical end-of-operation so the main process starts its 60s idle
+    // countdown (during a run it holds the long busy backstop instead). Best-
+    // effort: the idle/backstop timer still bounds the link if this never lands.
     try {
-      if (this.connectedDevices.has(id)) {
-        // Unsubscribe from notifications
-        if (window.desktopApi?.nobleBle) {
-          await window.desktopApi.nobleBle.unsubscribe(id);
-        }
-
-        // Disconnect device
-        if (window.desktopApi?.nobleBle) {
-          await window.desktopApi.nobleBle.disconnect(id);
-        }
+      await window.desktopApi?.nobleBle?.release?.(id);
+    } catch {
+      // ignore — timers in the main process still bound the link
+    }
+  }
 
-        // Clean up all device state
-        this.cleanupDeviceState(id);
+  /**
+   * Hard teardown for the SDK's error-recovery path (DeviceConnector
+   * .disconnect); normal release() deliberately does not come here.
+   */
+  async disconnect(id: string) {
+    // Independent best-effort steps, each time-boxed: on a wedged link the
+    // underlying noble callbacks can simply never fire, and this is the
+    // error-RECOVERY path — it must never hang the retry ladder.
+    const bounded = async (ms: number, run: () => Promise<unknown> | undefined) => {
+      try {
+        await Promise.race([
+          Promise.resolve(run()),
+          new Promise<void>(resolve => {
+            setTimeout(resolve, ms);
+          }),
+        ]);
+      } catch {
+        // ignore — recovery path, best effort
       }
-    } catch (error) {
-      this.Log?.error('[Transport] Noble BLE release failed:', error);
-      // Clean up local state even if release fails
-      this.cleanupDeviceState(id);
-    }
+    };
+    await bounded(2000, () => window.desktopApi?.nobleBle?.unsubscribe(id));
+    await bounded(3000, () => window.desktopApi?.nobleBle?.disconnect(id));
+    this.cleanupDeviceState(id);
   }
 
   // Handle notification data from Noble BLE