@onekeyfe/hd-transport-web-device 1.2.2-alpha.114 → 1.2.2-alpha.115

package/__tests__/electron-ble-transport.test.ts

@@ -205,12 +205,52 @@ describe('ElectronBleTransport protocol detection', () => {
     expect(nobleBle.disconnect).toHaveBeenCalledWith(device.id);
   });
 
-  test('sends a native disconnect even before acquire marks the device connected', async () => {
+  test('cancels a pending native connect acquire has not registered yet', async () => {
     const device = { id: 'pending-connect-id', name: 'OneKey Pro 2' };
     const nobleBle = createNobleBle(device);
+    // Never calls back: the field case the Core acquire deadline has to break.
+    nobleBle.connect.mockImplementation(
+      () =>
+        new Promise<void>(() => {
+          // intentionally never settles
+        })
+    );
+    const bleTransport = configureTransport(nobleBle) as any;
+
+    const pendingAcquire = bleTransport.acquire({ uuid: device.id, expectedProtocol: 'V2' });
+    pendingAcquire.catch(() => undefined);
+    await new Promise(resolve => {
+      setTimeout(resolve, 10);
+    });
+
+    // What the deadline / user abort calls. connectedDevices is still empty
+    // here, so this only works because the acquire is tracked as in flight.
+    await bleTransport.disconnect(device.id);
+
+    expect(nobleBle.unsubscribe).not.toHaveBeenCalled();
+    expect(nobleBle.disconnect).toHaveBeenCalledWith(device.id);
+  });
+
+  test('leaves a kept-alive link up when a released device is disconnected', async () => {
+    const device = { id: 'kept-alive-id', name: 'OneKey Pro 2' };
+    const nobleBle = createNobleBle(device);
+    const bleTransport = configureTransport(nobleBle) as any;
+
+    // No acquire in flight and nothing in connectedDevices: the link was
+    // released logically and belongs to the main-process keep-alive timer.
+    // The routine post-call cancel must not cost the next call a cold connect.
+    await bleTransport.disconnect(device.id);
+
+    expect(nobleBle.disconnect).not.toHaveBeenCalled();
+    expect(nobleBle.unsubscribe).not.toHaveBeenCalled();
+  });
+
+  test('forceNative disconnects a device the renderer no longer tracks', async () => {
+    const device = { id: 'presumed-dead-id', name: 'OneKey Pro 2' };
+    const nobleBle = createNobleBle(device);
     const bleTransport = configureTransport(nobleBle) as any;
 
-    await bleTransport.releaseNative(device.id);
+    await bleTransport.releaseNative(device.id, { forceNative: true });
 
     expect(nobleBle.unsubscribe).not.toHaveBeenCalled();
     expect(nobleBle.disconnect).toHaveBeenCalledWith(device.id);

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

@@ -25,6 +25,7 @@ export default class ElectronBleTransport {
     Log?: any;
     emitter?: EventEmitter;
     private connectedDevices;
+    private acquiringDevices;
     private deviceProtocol;
     private deviceProtocolHints;
     private deviceMtus;

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":"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"}
+{"version":3,"file":"electron-ble-transport.d.ts","sourceRoot":"","sources":["../src/electron-ble-transport.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -216,6 +216,14 @@ declare class ElectronBleTransport {
     Log?: any;
     emitter?: EventEmitter;
     private connectedDevices;
+    /**
+     * Devices whose acquire() is still in flight.
+     *
+     * A native connect that never calls back has not reached `connectedDevices`
+     * yet, so this is the only record that the renderer is still trying to own
+     * the link; `releaseNative()` needs it to cancel that pending connect.
+     */
+    private acquiringDevices;
     private deviceProtocol;
     private deviceProtocolHints;
     private deviceMtus;

package/dist/index.js

@@ -850,6 +850,7 @@ class ElectronBleTransport {
         this.runPromise = null;
         this.runPromiseDeviceId = null;
         this.connectedDevices = new Set();
+        this.acquiringDevices = new Set();
         this.deviceProtocol = new Map();
         this.deviceProtocolHints = new Map();
         this.deviceMtus = new Map();
@@ -875,7 +876,7 @@ class ElectronBleTransport {
                 this.rejectProtocolV2Frames(uuid, new Error(reason));
                 (_b = this.Log) === null || _b === void 0 ? void 0 : _b.debug('[Electron BLE] Protocol V2 link invalidated:', uuid, reason);
                 if (reason.startsWith('Protocol V2 link-fatal error:')) {
-                    yield this.releaseNative(uuid);
+                    yield this.releaseNative(uuid, { forceNative: true });
                 }
             }),
         });
@@ -1034,6 +1035,7 @@ class ElectronBleTransport {
                 this.runPromise = null;
                 this.runPromiseDeviceId = null;
             }
+            this.acquiringDevices.add(uuid);
             try {
                 if (!((_a = window.desktopApi) === null || _a === void 0 ? void 0 : _a.nobleBle)) {
                     throw new Error('Noble BLE API not available');
@@ -1100,6 +1102,9 @@ class ElectronBleTransport {
                 this.cleanupDeviceState(uuid);
                 this.handleBluetoothError(error);
             }
+            finally {
+                this.acquiringDevices.delete(uuid);
+            }
         });
     }
     release(id, _onclose, keepSession) {
@@ -1120,12 +1125,14 @@ class ElectronBleTransport {
             return this.releaseNative(id);
         });
     }
-    releaseNative(id) {
+    releaseNative(id, options) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            const rendererOwnsLink = this.connectedDevices.has(id) || this.acquiringDevices.has(id);
+            const shouldDisconnect = (options === null || options === void 0 ? void 0 : options.forceNative) === true || rendererOwnsLink;
             try {
                 const nobleBle = (_a = window.desktopApi) === null || _a === void 0 ? void 0 : _a.nobleBle;
-                if (nobleBle) {
+                if (nobleBle && shouldDisconnect) {
                     if (this.connectedDevices.has(id)) {
                         yield invokeNobleBle(nobleBle.unsubscribe(id)).catch(error => {
                             var _a;
@@ -1564,7 +1571,7 @@ class ElectronBleTransport {
                     this.notificationCleanups.delete(uuid);
                     this.notificationTokens.delete(uuid);
                     if (!isProbeTimeout) {
-                        yield this.releaseNative(uuid);
+                        yield this.releaseNative(uuid, { forceNative: true });
                     }
                 }
                 throw this.normalizeBluetoothError(e);

package/package.json

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

package/src/electron-ble-transport.ts

@@ -117,6 +117,15 @@ export default class ElectronBleTransport {
 
   private connectedDevices: Set<string> = new Set();
 
+  /**
+   * Devices whose acquire() is still in flight.
+   *
+   * A native connect that never calls back has not reached `connectedDevices`
+   * yet, so this is the only record that the renderer is still trying to own
+   * the link; `releaseNative()` needs it to cancel that pending connect.
+   */
+  private acquiringDevices: Set<string> = new Set();
+
   private deviceProtocol: Map<string, ProtocolType> = new Map();
 
   private deviceProtocolHints: Map<string, ProtocolType> = new Map();
@@ -149,7 +158,7 @@ export default class ElectronBleTransport {
       this.rejectProtocolV2Frames(uuid, new Error(reason));
       this.Log?.debug('[Electron BLE] Protocol V2 link invalidated:', uuid, reason);
       if (reason.startsWith('Protocol V2 link-fatal error:')) {
-        await this.releaseNative(uuid);
+        await this.releaseNative(uuid, { forceNative: true });
       }
     },
   });
@@ -363,6 +372,7 @@ export default class ElectronBleTransport {
       this.runPromiseDeviceId = null;
     }
 
+    this.acquiringDevices.add(uuid);
     try {
       if (!window.desktopApi?.nobleBle) {
         throw new Error('Noble BLE API not available');
@@ -434,6 +444,8 @@ export default class ElectronBleTransport {
       }
       this.cleanupDeviceState(uuid);
       this.handleBluetoothError(error);
+    } finally {
+      this.acquiringDevices.delete(uuid);
     }
   }
 
@@ -454,10 +466,23 @@ export default class ElectronBleTransport {
   }
 
   // Hard teardown, error paths only: a link presumed dead must not be reused.
-  private async releaseNative(id: string) {
+  //
+  // The native disconnect is sent while the renderer still owns the link, or is
+  // still trying to get it: a stuck acquire has not reached `connectedDevices`
+  // yet, and its pending native connect can only be cancelled from here, so the
+  // Core acquire deadline would otherwise be unable to terminate it.
+  //
+  // It is NOT sent for a device the renderer has already released logically.
+  // That link belongs to the main-process keep-alive timer, and dropping it on
+  // the routine post-call `cancel()` (Device.interruptionFromUser, no acquire
+  // held, empty request queue) costs a full cold reconnect on the very next
+  // operation — measured 2.93s on Pro and 17-26s on Pro 2.
+  private async releaseNative(id: string, options?: { forceNative?: boolean }) {
+    const rendererOwnsLink = this.connectedDevices.has(id) || this.acquiringDevices.has(id);
+    const shouldDisconnect = options?.forceNative === true || rendererOwnsLink;
     try {
       const nobleBle = window.desktopApi?.nobleBle;
-      if (nobleBle) {
+      if (nobleBle && shouldDisconnect) {
         if (this.connectedDevices.has(id)) {
           await invokeNobleBle(nobleBle.unsubscribe(id)).catch(error => {
             this.Log?.debug('[Electron BLE] release unsubscribe failed:', error);
@@ -970,7 +995,7 @@ export default class ElectronBleTransport {
         this.notificationCleanups.delete(uuid);
         this.notificationTokens.delete(uuid);
         if (!isProbeTimeout) {
-          await this.releaseNative(uuid);
+          await this.releaseNative(uuid, { forceNative: true });
         }
       }
       throw this.normalizeBluetoothError(e);