@onekeyfe/hd-transport-web-device 1.2.0-alpha.32 → 1.2.0-alpha.34

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

@@ -1,5 +1,5 @@
 import transport, { PROTOCOL_V2_CHANNEL_BLE_UART, bytesToHex } from '@onekeyfe/hd-transport';
-import { HardwareErrorCode } from '@onekeyfe/hd-shared';
+import { HardwareErrorCode, createDeferred } from '@onekeyfe/hd-shared';
 import EventEmitter from 'events';
 
 import ElectronBleTransport from '../src/electron-ble-transport';
@@ -11,6 +11,9 @@ const protocolV1Schema = {
     Initialize: {
       fields: {},
     },
+    GetFeatures: {
+      fields: {},
+    },
     Success: {
       fields: {
         message: {
@@ -23,6 +26,7 @@ const protocolV1Schema = {
       values: {
         MessageType_Initialize: 1,
         MessageType_Success: 2,
+        MessageType_GetFeatures: 55,
       },
     },
   },
@@ -238,7 +242,7 @@ describe('ElectronBleTransport protocol detection', () => {
     }
   });
 
-  test('detects Protocol V1 when device responds to Initialize', async () => {
+  test('reconnects Protocol V1 with a non-destructive GetFeatures probe', async () => {
     const device = { id: 'classic-id', name: 'OneKey Classic' };
     const nobleBle = createNobleBle(device);
     let notificationHandler: ((deviceId: string, data: string) => void) | undefined;
@@ -252,7 +256,7 @@ describe('ElectronBleTransport protocol detection', () => {
       return jest.fn();
     });
     nobleBle.write.mockImplementation(() => {
-      // Respond to first write (V1 Initialize probe) with V1 Success
+      // The first write is the V1 GetFeatures probe; answer with a V1 Success response.
       setTimeout(() => notificationHandler?.(device.id, v1ResponseHex), 0);
       return Promise.resolve();
     });
@@ -266,12 +270,100 @@ describe('ElectronBleTransport protocol detection', () => {
         })
       );
       expect(transport.getProtocolType(device.id)).toBe('V1');
+      await expect(transport.acquire({ uuid: device.id, expectedProtocol: 'V1' })).resolves.toEqual(
+        expect.objectContaining({
+          uuid: device.id,
+        })
+      );
+      expect(nobleBle.write).toHaveBeenCalledTimes(2);
+      expect(nobleBle.write.mock.calls.every(([, hex]) => /^3f23230037/.test(hex))).toBe(true);
       expect(protocolV2Writer).not.toHaveBeenCalled();
     } finally {
       await transport.release(device.id);
     }
   });
 
+  test('invalidates and disconnects a Protocol V1 link after a response timeout', async () => {
+    const device = { id: 'classic-timeout-id', name: 'OneKey Classic' };
+    const nobleBle = createNobleBle(device);
+    let notificationHandler: ((deviceId: string, data: string) => void) | undefined;
+    const v1ResponseHex = '3f23230002000000040a026f6b';
+    let writeCount = 0;
+
+    nobleBle.onNotification.mockImplementation(handler => {
+      notificationHandler = handler;
+      return jest.fn();
+    });
+    nobleBle.write.mockImplementation(() => {
+      writeCount += 1;
+      if (writeCount === 1) {
+        setTimeout(() => notificationHandler?.(device.id, v1ResponseHex), 0);
+      }
+      return Promise.resolve();
+    });
+    const bleTransport = configureTransport(nobleBle);
+
+    await bleTransport.acquire({ uuid: device.id, expectedProtocol: 'V1' });
+    await expect(
+      bleTransport.call(device.id, 'Initialize', {}, { timeoutMs: 5 })
+    ).rejects.toMatchObject({ errorCode: HardwareErrorCode.BleTimeoutError });
+
+    expect(nobleBle.unsubscribe).toHaveBeenCalledWith(device.id);
+    expect(nobleBle.disconnect).toHaveBeenCalledWith(device.id);
+    expect(bleTransport.getProtocolType(device.id)).toBeUndefined();
+  });
+
+  test('keeps another device V2 reader when force-cleaning a V1 call', async () => {
+    const device = { id: 'classic-force-clean-id', name: 'OneKey Classic' };
+    const nobleBle = createNobleBle(device);
+    let notificationHandler: ((deviceId: string, data: string) => void) | undefined;
+    const v1ResponseHex = '3f23230002000000040a026f6b';
+    nobleBle.onNotification.mockImplementation(handler => {
+      notificationHandler = handler;
+      return jest.fn();
+    });
+    nobleBle.write.mockImplementation(() => {
+      setTimeout(() => notificationHandler?.(device.id, v1ResponseHex), 0);
+      return Promise.resolve();
+    });
+    const bleTransport = configureTransport(nobleBle) as any;
+    const activeV1Call = createDeferred<string>();
+    const otherDeviceReader = createDeferred<Uint8Array>();
+    activeV1Call.promise.catch(() => undefined);
+    otherDeviceReader.promise.catch(() => undefined);
+    bleTransport.runPromise = activeV1Call;
+    bleTransport.v2FramePromises.set('device-b', otherDeviceReader);
+
+    await bleTransport.acquire({
+      uuid: device.id,
+      expectedProtocol: 'V1',
+      forceCleanRunPromise: true,
+    });
+
+    expect(bleTransport.v2FramePromises.get('device-b')).toBe(otherDeviceReader);
+    await bleTransport.release(device.id);
+  });
+
+  test('rejects a pending V2 reader when its device frame state resets', async () => {
+    const nobleBle = createNobleBle();
+    const bleTransport = configureTransport(nobleBle) as any;
+    const reader = createDeferred<Uint8Array>();
+    bleTransport.v2FramePromises.set('device-a', reader);
+    const result = Promise.race([
+      reader.promise.then(
+        () => 'resolved',
+        () => 'rejected'
+      ),
+      new Promise(resolve => {
+        setTimeout(() => resolve('pending'), 20);
+      }),
+    ]);
+
+    bleTransport.resetProtocolV2Frames('device-a');
+
+    await expect(result).resolves.toBe('rejected');
+  });
+
   test('throws when both protocol probes fail', async () => {
     const device = { id: 'dead-device-id', name: 'Unknown Device' };
     const nobleBle = createNobleBle(device);

package/__tests__/webusb-protocol-v2-timeout.test.ts

@@ -96,6 +96,24 @@ describe('WebUsbTransport Protocol V2 timeout recovery', () => {
     expect(webusb.deviceProtocol.get(path)).toBe('V2');
   });
 
+  test('allows legacy WebUSB Initialize up to the Node USB probe timeout', async () => {
+    const webusb = new WebUsbTransport() as any;
+    const path = 'pro-webusb';
+    webusb.messages = {};
+    webusb.callProtocolV1 = jest.fn().mockResolvedValue({});
+
+    await expect(webusb.probeProtocolV1(path)).resolves.toBe(true);
+
+    expect(webusb.callProtocolV1).toHaveBeenCalledWith(
+      path,
+      'Initialize',
+      {},
+      {
+        timeoutMs: 5000,
+      }
+    );
+  });
+
   test('retries an expected Protocol V2 probe once after resetting the connection', async () => {
     const webusb = new WebUsbTransport() as any;
     const path = 'pro2-webusb';
@@ -117,6 +135,7 @@ describe('WebUsbTransport Protocol V2 timeout recovery', () => {
     webusb.probeProtocolV1 = jest.fn();
     webusb.probeProtocolV2 = jest.fn().mockResolvedValue(false);
     webusb.resetConnectionAfterProbe = jest.fn().mockResolvedValue(undefined);
+    webusb.closeConnectionAfterProbe = jest.fn().mockResolvedValue(undefined);
 
     await expect(webusb.detectProtocol(path, 'V2')).rejects.toThrow(
       'Protocol V2 probe timeout after 2 attempts'
@@ -124,10 +143,40 @@ describe('WebUsbTransport Protocol V2 timeout recovery', () => {
 
     expect(webusb.probeProtocolV2).toHaveBeenCalledTimes(2);
     expect(webusb.probeProtocolV1).not.toHaveBeenCalled();
-    expect(webusb.resetConnectionAfterProbe).toHaveBeenCalledTimes(2);
+    expect(webusb.resetConnectionAfterProbe).toHaveBeenCalledTimes(1);
+    expect(webusb.closeConnectionAfterProbe).toHaveBeenCalledTimes(1);
     expect(webusb.deviceProtocol.has(path)).toBe(false);
   });
 
+  test('closes the reopened device when acquire exhausts the expected Protocol V2 probe', async () => {
+    const webusb = new WebUsbTransport() as any;
+    const path = 'pro2-webusb';
+    const device = {
+      opened: false,
+      releaseInterface: jest.fn().mockResolvedValue(undefined),
+      close: jest.fn().mockImplementation(() => {
+        device.opened = false;
+        return Promise.resolve();
+      }),
+    };
+    webusb.deviceList = [{ path, device }];
+    webusb.Log = { debug: jest.fn() };
+    webusb.rotateProtocolV2UsbGeneration = jest.fn().mockResolvedValue(undefined);
+    webusb.connect = jest.fn().mockImplementation(() => {
+      device.opened = true;
+      return Promise.resolve();
+    });
+    webusb.detectProtocol = jest.fn().mockRejectedValue(new Error('terminal probe failure'));
+
+    await expect(webusb.acquire({ path, expectedProtocol: 'V2' })).rejects.toThrow(
+      'terminal probe failure'
+    );
+
+    expect(device.releaseInterface).toHaveBeenCalledTimes(1);
+    expect(device.close).toHaveBeenCalledTimes(1);
+    expect(device.opened).toBe(false);
+  });
+
   test('invalidates and resets the cached connection before another call can start', async () => {
     const webusb = new WebUsbTransport() as any;
     const path = 'pro2-webusb';

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

@@ -12,6 +12,7 @@ export type BleAcquireInput = {
     uuid: string;
     forceCleanRunPromise?: boolean;
     expectedProtocol?: ProtocolType;
+    protocolHint?: ProtocolType;
 };
 export default class ElectronBleTransport {
     private _messages;
@@ -20,6 +21,7 @@ export default class ElectronBleTransport {
     name: string;
     configured: boolean;
     runPromise: Deferred<Uint8Array | string> | null;
+    private runPromiseDeviceId;
     Log?: any;
     emitter?: EventEmitter;
     private connectedDevices;
@@ -68,7 +70,6 @@ export default class ElectronBleTransport {
     private handleProtocolV2Notification;
     private getProtocolV2FrameQueue;
     private resolveProtocolV2Frame;
-    private rejectAllProtocolV2Frames;
     private resetProtocolV2Frames;
     private rejectProtocolV2Frames;
     private readProtocolV2Frame;

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":";AAsBA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EACV,gBAAgB,EAChB,YAAY,EAEZ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AAIvC,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;IAC/B,gBAAgB,CAAC,EAAE,YAAY,CAAC;CACjC,CAAC;AAoCF,MAAM,CAAC,OAAO,OAAO,oBAAoB;IACvC,OAAO,CAAC,SAAS,CAA0D;IAE3E,OAAO,CAAC,WAAW,CAA0D;IAE7E,OAAO,CAAC,6BAA6B,CAAqB;IAE1D,IAAI,SAA0B;IAE9B,UAAU,UAAS;IAEnB,UAAU,EAAE,QAAQ,CAAC,UAAU,GAAG,MAAM,CAAC,GAAG,IAAI,CAAQ;IAExD,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;IAEvB,OAAO,CAAC,gBAAgB,CAA0B;IAElD,OAAO,CAAC,cAAc,CAAwC;IAE9D,OAAO,CAAC,mBAAmB,CAAwC;IAEnE,OAAO,CAAC,SAAS,CAAsE;IAEvF,OAAO,CAAC,YAAY,CAAoD;IAExE,OAAO,CAAC,aAAa,CAAwC;IAE7D,OAAO,CAAC,eAAe,CAAgD;IAEvE,OAAO,CAAC,eAAe,CAmBpB;IAEH,OAAO,CAAC,oBAAoB,CAAsC;IAElE,OAAO,CAAC,kBAAkB,CAAsC;IAEhE,OAAO,CAAC,kBAAkB,CAAkC;IAE5D,OAAO,CAAC,qBAAqB,CAAK;IAElC,OAAO,CAAC,oBAAoB;IA+B5B,OAAO,CAAC,kBAAkB;IA0B1B,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,YAAY;IAcxC,SAAS,CAAC,UAAU,EAAE,GAAG;IAKzB,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAgB7B,MAAM;IAIN,SAAS,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAqBxC,OAAO,CAAC,KAAK,EAAE,eAAe;;;;;;;;;;;IAoF9B,OAAO,CAAC,EAAE,EAAE,MAAM;YAUV,aAAa;IAe3B,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,4BAA4B;IAOpC,OAAO,CAAC,kBAAkB;YAMZ,cAAc;IA+C5B,OAAO,CAAC,8BAA8B;YAgBxB,iCAAiC;YAqCjC,eAAe;YAgBf,eAAe;YAuBf,SAAS;IASvB,OAAO,CAAC,oBAAoB;IAmB5B,OAAO,CAAC,kBAAkB;IAwB1B,OAAO,CAAC,4BAA4B;IAkBpC,OAAO,CAAC,uBAAuB;IAS/B,OAAO,CAAC,sBAAsB;IAU9B,OAAO,CAAC,yBAAyB;IAQjC,OAAO,CAAC,qBAAqB;IAK7B,OAAO,CAAC,sBAAsB;YAShB,mBAAmB;IAiBjC,OAAO,CAAC,4BAA4B;IAgB9B,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;YA2BlB,cAAc;YAuEd,cAAc;IA0B5B,OAAO,CAAC,uBAAuB;IAyC/B,OAAO,CAAC,6BAA6B;IAsCrC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;CAGxD"}
+{"version":3,"file":"electron-ble-transport.d.ts","sourceRoot":"","sources":["../src/electron-ble-transport.ts"],"names":[],"mappings":";AAsBA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EACV,gBAAgB,EAChB,YAAY,EAEZ,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AAIvC,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;IAC/B,gBAAgB,CAAC,EAAE,YAAY,CAAC;IAChC,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC;AAoCF,MAAM,CAAC,OAAO,OAAO,oBAAoB;IACvC,OAAO,CAAC,SAAS,CAA0D;IAE3E,OAAO,CAAC,WAAW,CAA0D;IAE7E,OAAO,CAAC,6BAA6B,CAAqB;IAE1D,IAAI,SAA0B;IAE9B,UAAU,UAAS;IAEnB,UAAU,EAAE,QAAQ,CAAC,UAAU,GAAG,MAAM,CAAC,GAAG,IAAI,CAAQ;IAExD,OAAO,CAAC,kBAAkB,CAAuB;IAEjD,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;IAEvB,OAAO,CAAC,gBAAgB,CAA0B;IAElD,OAAO,CAAC,cAAc,CAAwC;IAE9D,OAAO,CAAC,mBAAmB,CAAwC;IAEnE,OAAO,CAAC,SAAS,CAAsE;IAEvF,OAAO,CAAC,YAAY,CAAoD;IAExE,OAAO,CAAC,aAAa,CAAwC;IAE7D,OAAO,CAAC,eAAe,CAAgD;IAEvE,OAAO,CAAC,eAAe,CAmBpB;IAEH,OAAO,CAAC,oBAAoB,CAAsC;IAElE,OAAO,CAAC,kBAAkB,CAAsC;IAEhE,OAAO,CAAC,kBAAkB,CAAkC;IAE5D,OAAO,CAAC,qBAAqB,CAAK;IAElC,OAAO,CAAC,oBAAoB;IA+B5B,OAAO,CAAC,kBAAkB;IA+B1B,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,YAAY;IAcxC,SAAS,CAAC,UAAU,EAAE,GAAG;IAKzB,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAgB7B,MAAM;IAIN,SAAS,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAqBxC,OAAO,CAAC,KAAK,EAAE,eAAe;;;;;;;;;;;IAsF9B,OAAO,CAAC,EAAE,EAAE,MAAM;YAUV,aAAa;IAe3B,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,4BAA4B;IAOpC,OAAO,CAAC,kBAAkB;YAMZ,cAAc;IA+C5B,OAAO,CAAC,8BAA8B;YAgBxB,iCAAiC;YA8CjC,eAAe;YAkBf,eAAe;YAuBf,SAAS;IASvB,OAAO,CAAC,oBAAoB;IAmB5B,OAAO,CAAC,kBAAkB;IAwB1B,OAAO,CAAC,4BAA4B;IAkBpC,OAAO,CAAC,uBAAuB;IAS/B,OAAO,CAAC,sBAAsB;IAU9B,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,sBAAsB;YAShB,mBAAmB;IAiBjC,OAAO,CAAC,4BAA4B;IAqB9B,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;YA2BlB,cAAc;YAqFd,cAAc;IA0B5B,OAAO,CAAC,uBAAuB;IAyC/B,OAAO,CAAC,6BAA6B;IAsCrC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;CAGxD"}

package/dist/index.d.ts

@@ -107,6 +107,7 @@ declare class WebUsbTransport extends ProtocolV2UsbTransportBase<string> {
     private transferOutOnce;
     private transferInWithRetry;
     private transferInOnce;
+    private closeConnectionAfterProbe;
     private resetConnectionAfterProbe;
     private withProtocolReadTimeout;
     private probeProtocolV1;
@@ -154,12 +155,13 @@ type BleAcquireInput = {
     uuid: string;
     forceCleanRunPromise?: boolean;
     expectedProtocol?: ProtocolType;
+    protocolHint?: ProtocolType;
 };
 /**
  * Desktop Electron BLE transport with automatic Protocol V1/V2 detection.
  *
  * Protocol V1 devices continue using chunked packets. Protocol V2 is detected
- * after a Protocol V1 Initialize timeout by probing Protocol V2 Ping.
+ * after a Protocol V1 GetFeatures timeout by probing Protocol V2 Ping.
  */
 declare class ElectronBleTransport {
     private _messages;
@@ -168,6 +170,7 @@ declare class ElectronBleTransport {
     name: string;
     configured: boolean;
     runPromise: Deferred<Uint8Array | string> | null;
+    private runPromiseDeviceId;
     Log?: any;
     emitter?: EventEmitter;
     private connectedDevices;
@@ -216,7 +219,6 @@ declare class ElectronBleTransport {
     private handleProtocolV2Notification;
     private getProtocolV2FrameQueue;
     private resolveProtocolV2Frame;
-    private rejectAllProtocolV2Frames;
     private resetProtocolV2Frames;
     private rejectProtocolV2Frames;
     private readProtocolV2Frame;

package/dist/index.js

@@ -59,7 +59,8 @@ const REPORT_ID = transport.PROTOCOL_V1_REPORT_ID;
 const HEADER_LENGTH = transport.PROTOCOL_V1_MESSAGE_HEADER_SIZE;
 const PACKET_IO_MAX_RETRIES = 3;
 const PACKET_IO_RETRY_DELAY = 300;
-const PROTOCOL_PROBE_TIMEOUT = 1000;
+const PROTOCOL_V1_PROBE_TIMEOUT = 5000;
+const PROTOCOL_V2_PROBE_TIMEOUT = 1000;
 const EXPECTED_PROTOCOL_V2_PROBE_ATTEMPTS = 2;
 function inferProtocolHintFromDeviceName$1(name) {
     return /\bpro\s*2\b/i.test(name !== null && name !== void 0 ? name : '') ? 'V2' : undefined;
@@ -155,7 +156,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
         });
     }
     acquire(input) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             if (!input.path)
                 return;
@@ -166,7 +167,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                 const deviceName = (_b = this.deviceList.find(device => device.path === input.path)) === null || _b === void 0 ? void 0 : _b.device.productName;
                 const protocolHint = input.expectedProtocol
                     ? undefined
-                    : (_c = this.deviceProtocolHints.get(input.path)) !== null && _c !== void 0 ? _c : inferProtocolHintFromDeviceName$1(deviceName);
+                    : (_d = (_c = input.protocolHint) !== null && _c !== void 0 ? _c : this.deviceProtocolHints.get(input.path)) !== null && _d !== void 0 ? _d : inferProtocolHintFromDeviceName$1(deviceName);
                 if (protocolHint) {
                     this.deviceProtocolHints.set(input.path, protocolHint);
                 }
@@ -175,6 +176,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
             }
             catch (e) {
                 this.Log.debug('acquire error: ', e instanceof Error ? `${e.name}: ${e.message}` : String(e));
+                yield this.closeOpenDevice(input.path);
                 throw e;
             }
         });
@@ -196,7 +198,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                     this.deviceProtocol.set(path, 'V1');
                     return 'V1';
                 }
-                yield this.resetConnectionAfterProbe(path);
+                yield this.closeConnectionAfterProbe(path);
                 throw this.createProtocolMismatchError(expectedProtocol);
             }
             if (expectedProtocol === 'V2') {
@@ -205,22 +207,30 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                         this.deviceProtocol.set(path, 'V2');
                         return 'V2';
                     }
-                    yield this.resetConnectionAfterProbe(path);
                     if (attempt < EXPECTED_PROTOCOL_V2_PROBE_ATTEMPTS) {
+                        yield this.resetConnectionAfterProbe(path);
                         (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug(`[WebUsbTransport] Protocol V2 probe timed out, retrying ${attempt + 1}/${EXPECTED_PROTOCOL_V2_PROBE_ATTEMPTS}`);
                     }
+                    else {
+                        yield this.closeConnectionAfterProbe(path);
+                    }
                 }
                 this.deviceProtocol.delete(path);
                 throw this.createProtocolProbeTimeoutError(expectedProtocol, EXPECTED_PROTOCOL_V2_PROBE_ATTEMPTS);
             }
             const probeOrder = protocolHint === 'V2' || this.deviceProtocol.get(path) === 'V2' ? ['V2', 'V1'] : ['V1', 'V2'];
-            for (const protocol of probeOrder) {
+            for (const [index, protocol] of probeOrder.entries()) {
                 const detected = protocol === 'V1' ? yield this.probeProtocolV1(path) : yield this.probeProtocolV2(path);
                 if (detected) {
                     this.deviceProtocol.set(path, protocol);
                     return protocol;
                 }
-                yield this.resetConnectionAfterProbe(path);
+                if (index < probeOrder.length - 1) {
+                    yield this.resetConnectionAfterProbe(path);
+                }
+                else {
+                    yield this.closeConnectionAfterProbe(path);
+                }
             }
             this.deviceProtocol.delete(path);
             throw this.createProtocolDetectionError();
@@ -509,27 +519,15 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
             return this.getTransferInData(result);
         });
     }
-    resetConnectionAfterProbe(path) {
-        var _a;
+    closeConnectionAfterProbe(path) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.rotateProtocolV2UsbGeneration(path, 'WebUSB protocol probe reset');
-            try {
-                const device = yield this.findDevice(path);
-                if (device.opened) {
-                    const endpoints = this.deviceEndpoints.get(path);
-                    const ifaceNum = (_a = endpoints === null || endpoints === void 0 ? void 0 : endpoints.interfaceNumber) !== null && _a !== void 0 ? _a : this.interfaceId;
-                    try {
-                        yield device.releaseInterface(ifaceNum);
-                    }
-                    catch (error) {
-                        this.Log.debug('[WebUsbTransport] releaseInterface after protocol probe error:', error);
-                    }
-                    yield device.close();
-                }
-            }
-            catch (error) {
-                this.Log.debug('[WebUsbTransport] close after protocol probe error:', error);
-            }
+            yield this.closeOpenDevice(path);
+        });
+    }
+    resetConnectionAfterProbe(path) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.closeConnectionAfterProbe(path);
             yield this.getConnectedDevices();
             yield this.connect(path, false);
         });
@@ -577,7 +575,9 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                 return false;
             }
             try {
-                yield this.callProtocolV1(path, 'Initialize', {}, { timeoutMs: PROTOCOL_PROBE_TIMEOUT });
+                yield this.callProtocolV1(path, 'Initialize', {}, {
+                    timeoutMs: PROTOCOL_V1_PROBE_TIMEOUT,
+                });
                 return true;
             }
             catch (_error) {
@@ -592,7 +592,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
             }
             return transport.probeProtocolV2({
                 call: (name, data, options) => this.callProtocolV2(path, name, data, options),
-                timeoutMs: PROTOCOL_PROBE_TIMEOUT,
+                timeoutMs: PROTOCOL_V2_PROBE_TIMEOUT,
                 logger: this.Log,
                 logPrefix: 'ProtocolV2 WebUSB',
             });
@@ -747,6 +747,7 @@ class ElectronBleTransport {
         this.name = 'ElectronBleTransport';
         this.configured = false;
         this.runPromise = null;
+        this.runPromiseDeviceId = null;
         this.connectedDevices = new Set();
         this.deviceProtocol = new Map();
         this.deviceProtocolHints = new Map();
@@ -819,6 +820,11 @@ class ElectronBleTransport {
         this.v2Assemblers.delete(deviceId);
         this.resetProtocolV2Frames(deviceId);
         this.notificationTokens.delete(deviceId);
+        if (this.runPromise && this.runPromiseDeviceId === deviceId) {
+            this.runPromise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected));
+            this.runPromise = null;
+            this.runPromiseDeviceId = null;
+        }
         const notifyCleanup = this.notificationCleanups.get(deviceId);
         if (notifyCleanup) {
             notifyCleanup();
@@ -887,7 +893,7 @@ class ElectronBleTransport {
         });
     }
     acquire(input) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
             const { uuid, forceCleanRunPromise, expectedProtocol } = input;
             if (!uuid) {
@@ -899,8 +905,8 @@ class ElectronBleTransport {
             if (forceCleanRunPromise && this.runPromise) {
                 const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleForceCleanRunPromise);
                 this.runPromise.reject(error);
-                this.rejectAllProtocolV2Frames(error);
                 this.runPromise = null;
+                this.runPromiseDeviceId = null;
             }
             try {
                 if (!((_a = window.desktopApi) === null || _a === void 0 ? void 0 : _a.nobleBle)) {
@@ -912,7 +918,7 @@ class ElectronBleTransport {
                 }
                 const protocolHint = expectedProtocol
                     ? undefined
-                    : (_b = this.deviceProtocolHints.get(uuid)) !== null && _b !== void 0 ? _b : inferProtocolHintFromDeviceName(device.name);
+                    : (_c = (_b = input.protocolHint) !== null && _b !== void 0 ? _b : this.deviceProtocolHints.get(uuid)) !== null && _c !== void 0 ? _c : inferProtocolHintFromDeviceName(device.name);
                 if (protocolHint) {
                     this.deviceProtocolHints.set(uuid, protocolHint);
                 }
@@ -928,6 +934,7 @@ class ElectronBleTransport {
                 yield window.desktopApi.nobleBle.subscribe(uuid);
                 const cleanup = this.createNotificationSubscription(uuid);
                 this.notificationCleanups.set(uuid, cleanup);
+                const protocolType = yield this.detectProtocol(uuid, expectedProtocol, protocolHint);
                 const disconnectCleanup = window.desktopApi.nobleBle.onDeviceDisconnected((disconnectedDevice) => {
                     var _a;
                     if (disconnectedDevice.id === uuid) {
@@ -940,19 +947,18 @@ class ElectronBleTransport {
                     }
                 });
                 this.disconnectCleanups.set(uuid, disconnectCleanup);
-                const protocolType = yield this.detectProtocol(uuid, expectedProtocol, protocolHint);
                 return Object.assign(Object.assign({}, toBleDescriptor({ id: device.id, name: device.name }, protocolType)), { uuid });
             }
             catch (error) {
-                (_c = this.Log) === null || _c === void 0 ? void 0 : _c.error('[Electron BLE] acquire failed:', error);
+                (_d = this.Log) === null || _d === void 0 ? void 0 : _d.error('[Electron BLE] acquire failed:', error);
                 try {
-                    if (((_d = window.desktopApi) === null || _d === void 0 ? void 0 : _d.nobleBle) && this.connectedDevices.has(uuid)) {
+                    if (((_e = window.desktopApi) === null || _e === void 0 ? void 0 : _e.nobleBle) && this.connectedDevices.has(uuid)) {
                         yield window.desktopApi.nobleBle.unsubscribe(uuid);
                         yield window.desktopApi.nobleBle.disconnect(uuid);
                     }
                 }
                 catch (cleanupError) {
-                    (_e = this.Log) === null || _e === void 0 ? void 0 : _e.debug('[Electron BLE] acquire cleanup failed:', cleanupError);
+                    (_f = this.Log) === null || _f === void 0 ? void 0 : _f.debug('[Electron BLE] acquire cleanup failed:', cleanupError);
                 }
                 this.cleanupDeviceState(uuid);
                 throw error;
@@ -994,7 +1000,7 @@ class ElectronBleTransport {
         return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol mismatch: expected ${expected}, but device did not respond to expected protocol`);
     }
     createProtocolDetectionError() {
-        return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleTimeoutError, 'Unable to detect BLE protocol: device did not respond to Protocol V1 Initialize or Protocol V2 Ping');
+        return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleTimeoutError, 'Unable to detect BLE protocol: device did not respond to Protocol V1 GetFeatures or Protocol V2 Ping');
     }
     clearProbeProtocol(uuid, protocol) {
         if (this.deviceProtocol.get(uuid) === protocol) {
@@ -1052,16 +1058,17 @@ class ElectronBleTransport {
         });
     }
     resetProbeStateAfterProtocolProbe(uuid, protocol) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         return __awaiter(this, void 0, void 0, function* () {
             yield this.protocolV2Links.invalidateLink(uuid, `Reset notify state after Protocol ${protocol} probe`);
             this.v1Buffers.set(uuid, { buffer: [], bufferLength: 0 });
             (_a = this.v2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
             this.resetProtocolV2Frames(uuid);
-            if (this.runPromise) {
+            if (this.runPromise && this.runPromiseDeviceId === uuid) {
                 const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleForceCleanRunPromise);
                 this.runPromise.reject(error);
                 this.runPromise = null;
+                this.runPromiseDeviceId = null;
             }
             const notifyCleanup = this.notificationCleanups.get(uuid);
             if (notifyCleanup) {
@@ -1076,10 +1083,19 @@ class ElectronBleTransport {
                 (_d = this.Log) === null || _d === void 0 ? void 0 : _d.debug(`[Electron BLE] unsubscribe after Protocol ${protocol} probe failed:`, error);
             }
             try {
-                yield ((_f = (_e = window.desktopApi) === null || _e === void 0 ? void 0 : _e.nobleBle) === null || _f === void 0 ? void 0 : _f.subscribe(uuid));
+                yield ((_f = (_e = window.desktopApi) === null || _e === void 0 ? void 0 : _e.nobleBle) === null || _f === void 0 ? void 0 : _f.disconnect(uuid));
             }
             catch (error) {
-                (_g = this.Log) === null || _g === void 0 ? void 0 : _g.debug(`[Electron BLE] resubscribe after Protocol ${protocol} probe failed:`, error);
+                (_g = this.Log) === null || _g === void 0 ? void 0 : _g.debug(`[Electron BLE] disconnect after Protocol ${protocol} probe failed:`, error);
+            }
+            this.connectedDevices.delete(uuid);
+            try {
+                yield ((_j = (_h = window.desktopApi) === null || _h === void 0 ? void 0 : _h.nobleBle) === null || _j === void 0 ? void 0 : _j.connect(uuid));
+                this.connectedDevices.add(uuid);
+                yield ((_l = (_k = window.desktopApi) === null || _k === void 0 ? void 0 : _k.nobleBle) === null || _l === void 0 ? void 0 : _l.subscribe(uuid));
+            }
+            catch (error) {
+                (_m = this.Log) === null || _m === void 0 ? void 0 : _m.debug(`[Electron BLE] reconnect after Protocol ${protocol} probe failed:`, error);
                 throw error;
             }
             const cleanup = this.createNotificationSubscription(uuid);
@@ -1094,12 +1110,12 @@ class ElectronBleTransport {
             }
             try {
                 this.deviceProtocol.set(uuid, 'V1');
-                yield this.callProtocolV1(uuid, 'Initialize', {}, { timeoutMs: PROTOCOL_PROBE_TIMEOUT_MS });
+                yield this.callProtocolV1(uuid, 'GetFeatures', {}, { timeoutMs: PROTOCOL_PROBE_TIMEOUT_MS });
                 return true;
             }
             catch (error) {
                 this.clearProbeProtocol(uuid, 'V1');
-                (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug('[Electron BLE] Protocol V1 Initialize probe failed:', error);
+                (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug('[Electron BLE] Protocol V1 GetFeatures probe failed:', error);
                 return false;
             }
         });
@@ -1160,7 +1176,7 @@ class ElectronBleTransport {
             if (this.deviceProtocol.get(deviceId) === 'V2') {
                 this.rejectProtocolV2Frames(deviceId, error);
             }
-            else if (this.runPromise) {
+            else if (this.runPromise && this.runPromiseDeviceId === deviceId) {
                 this.runPromise.reject(error);
             }
             return;
@@ -1212,16 +1228,8 @@ class ElectronBleTransport {
         }
         this.getProtocolV2FrameQueue(uuid).push(frame);
     }
-    rejectAllProtocolV2Frames(error) {
-        this.v2FrameQueues.clear();
-        for (const framePromise of this.v2FramePromises.values()) {
-            framePromise.reject(error);
-        }
-        this.v2FramePromises.clear();
-    }
     resetProtocolV2Frames(uuid) {
-        this.v2FrameQueues.delete(uuid);
-        this.v2FramePromises.delete(uuid);
+        this.rejectProtocolV2Frames(uuid, new Error(`Protocol V2 frame state reset for ${uuid}`));
     }
     rejectProtocolV2Frames(uuid, error) {
         this.v2FrameQueues.delete(uuid);
@@ -1254,12 +1262,15 @@ class ElectronBleTransport {
         const result = this.processProtocolV1Notification(deviceId, hexData);
         if (result.error) {
             (_a = this.Log) === null || _a === void 0 ? void 0 : _a.error('[Electron BLE] Protocol V1 packet processing error:', result.error);
-            if (this.runPromise) {
+            if (this.runPromise && this.runPromiseDeviceId === deviceId) {
                 this.runPromise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleWriteCharacteristicError));
             }
             return;
         }
-        if (result.isComplete && result.completePacket && this.runPromise) {
+        if (result.isComplete &&
+            result.completePacket &&
+            this.runPromise &&
+            this.runPromiseDeviceId === deviceId) {
             this.runPromise.resolve(result.completePacket);
         }
     }
@@ -1298,6 +1309,7 @@ class ElectronBleTransport {
             const runPromise = hdShared.createDeferred();
             runPromise.promise.catch(() => undefined);
             this.runPromise = runPromise;
+            this.runPromiseDeviceId = uuid;
             const messages = this._messages;
             const buffers = ProtocolV1.encodeTransportPackets(messages, name, data);
             let timeout;
@@ -1336,6 +1348,17 @@ class ElectronBleTransport {
             }
             catch (e) {
                 (_b = this.Log) === null || _b === void 0 ? void 0 : _b.error('[Electron BLE] Protocol V1 call error:', e);
+                const isProbeTimeout = name === 'GetFeatures' && (options === null || options === void 0 ? void 0 : options.timeoutMs) === PROTOCOL_PROBE_TIMEOUT_MS;
+                if ((e === null || e === void 0 ? void 0 : e.errorCode) === hdShared.HardwareErrorCode.BleTimeoutError) {
+                    this.v1Buffers.set(uuid, { buffer: [], bufferLength: 0 });
+                    const notifyCleanup = this.notificationCleanups.get(uuid);
+                    notifyCleanup === null || notifyCleanup === void 0 ? void 0 : notifyCleanup();
+                    this.notificationCleanups.delete(uuid);
+                    this.notificationTokens.delete(uuid);
+                    if (!isProbeTimeout) {
+                        yield this.releaseNative(uuid);
+                    }
+                }
                 throw e;
             }
             finally {
@@ -1343,6 +1366,7 @@ class ElectronBleTransport {
                     clearTimeout(timeout);
                 if (this.runPromise === runPromise) {
                     this.runPromise = null;
+                    this.runPromiseDeviceId = null;
                 }
             }
         });

package/dist/webusb.d.ts

@@ -50,6 +50,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     private transferOutOnce;
     private transferInWithRetry;
     private transferInOnce;
+    private closeConnectionAfterProbe;
     private resetConnectionAfterProbe;
     private withProtocolReadTimeout;
     private probeProtocolV1;

package/dist/webusb.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webusb.d.ts","sourceRoot":"","sources":["../src/webusb.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webusb.d.ts","sourceRoot":"","sources":["../src/webusb.ts"],"names":[],"mappings":";AACA,OAAO,SAAS,EAAE,EAQhB,0BAA0B,EAE3B,MAAM,wBAAwB,CAAC;AAYhC,OAAO,KAAK,EACV,YAAY,EACZ,oBAAoB,EACpB,YAAY,EACZ,qBAAqB,EACrB,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AA0BhC,MAAM,WAAW,UAAW,SAAQ,oBAAoB;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,SAAS,CAAC;IAClB,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAaD,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,0BAA0B,CAAC,MAAM,CAAC;IAC7E,QAAQ,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAGlE,UAAU,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEpE,OAAO,CAAC,sBAAsB,CAAqB;IAGnD,OAAO,CAAC,cAAc,CAAwC;IAE9D,OAAO,CAAC,mBAAmB,CAAwC;IAGnE,OAAO,CAAC,eAAe,CAA2C;IAElE,IAAI,SAAqB;IAEzB,OAAO,UAAS;IAEhB,UAAU,UAAS;IAEnB,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,GAAG,CAAC,EAAE,GAAG,CAAC;IAMV,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAM;IAEnC,eAAe,SAAoB;IAEnC,UAAU,SAAe;IAEzB,WAAW,SAAgB;;IAa3B,IAAI,CAAC,MAAM,EAAE,GAAG;IAgBhB,SAAS,CAAC,UAAU,EAAE,GAAG;IASzB,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAsB7B,kBAAkB;IAmBlB,SAAS;IAQT,mBAAmB;IAiCnB,OAAO,CAAC,KAAK,EAAE,YAAY;IA8BjC,OAAO,CAAC,2BAA2B;IAOnC,OAAO,CAAC,+BAA+B;IAOvC,OAAO,CAAC,4BAA4B;YAOtB,cAAc;IAmEtB,UAAU,CAAC,IAAI,EAAE,MAAM;IAwBvB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;IAkB1C,OAAO,CAAC,iBAAiB;IAiCnB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;YAgCpC,eAAe;YAkBf,iBAAiB;IAezB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAIvE,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,wBAAwB;YAalB,yBAAyB;IAiCvC,OAAO,CAAC,iBAAiB;IAUzB,OAAO,CAAC,aAAa;YASP,oBAAoB;YA2BpB,eAAe;YAaf,mBAAmB;YA2CnB,cAAc;YAWd,yBAAyB;YAKzB,yBAAyB;YAMzB,uBAAuB;YA0CvB,eAAe;YAoBf,eAAe;IAgBvB,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;YA8BlB,cAAc;YAkCd,cAAc;IAYtB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;IAgD5C,OAAO,CAAC,IAAI,EAAE,MAAM;IAQ1B,SAAS,CAAC,uBAAuB,IAAI,iBAAiB;IAUtD,SAAS,CAAC,sBAAsB;cAIhB,wBAAwB,CACtC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,qBAAqB,GAC9B,OAAO,CAAC,IAAI,CAAC;cAIA,uBAAuB,CACrC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,qBAAqB,GAC9B,OAAO,CAAC,UAAU,CAAC;cASN,4BAA4B,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1F,SAAS,CAAC,8BAA8B,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAKrE,SAAS,CAAC,+BAA+B,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,KAAK;IAWjF,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;CAGxD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-web-device",
-  "version": "1.2.0-alpha.32",
+  "version": "1.2.0-alpha.34",
   "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.0-alpha.32",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.32"
+    "@onekeyfe/hd-shared": "1.2.0-alpha.34",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.34"
   },
   "devDependencies": {
-    "@onekeyfe/hd-transport-electron": "1.2.0-alpha.32",
+    "@onekeyfe/hd-transport-electron": "1.2.0-alpha.34",
     "@types/w3c-web-usb": "^1.0.6",
     "@types/web-bluetooth": "^0.0.17"
   },
-  "gitHead": "468888b93df8b147a512f63a8cbdc40ca1c5c1cf"
+  "gitHead": "07f10b4c9fab177da7c36d976ec18b075492b57f"
 }

package/src/electron-ble-transport.ts

@@ -42,6 +42,7 @@ export type BleAcquireInput = {
   uuid: string;
   forceCleanRunPromise?: boolean;
   expectedProtocol?: ProtocolType;
+  protocolHint?: ProtocolType;
 };
 
 interface PacketProcessResult {
@@ -76,7 +77,7 @@ const PROTOCOL_V2_PROBE_TIMEOUT_MS = 5000;
  * Desktop Electron BLE transport with automatic Protocol V1/V2 detection.
  *
  * Protocol V1 devices continue using chunked packets. Protocol V2 is detected
- * after a Protocol V1 Initialize timeout by probing Protocol V2 Ping.
+ * after a Protocol V1 GetFeatures timeout by probing Protocol V2 Ping.
  */
 export default class ElectronBleTransport {
   private _messages: ReturnType<typeof transport.parseConfigure> | undefined;
@@ -91,6 +92,8 @@ export default class ElectronBleTransport {
 
   runPromise: Deferred<Uint8Array | string> | null = null;
 
+  private runPromiseDeviceId: string | null = null;
+
   Log?: any;
 
   emitter?: EventEmitter;
@@ -181,6 +184,11 @@ export default class ElectronBleTransport {
     this.v2Assemblers.delete(deviceId);
     this.resetProtocolV2Frames(deviceId);
     this.notificationTokens.delete(deviceId);
+    if (this.runPromise && this.runPromiseDeviceId === deviceId) {
+      this.runPromise.reject(ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected));
+      this.runPromise = null;
+      this.runPromiseDeviceId = null;
+    }
 
     const notifyCleanup = this.notificationCleanups.get(deviceId);
     if (notifyCleanup) {
@@ -269,8 +277,8 @@ export default class ElectronBleTransport {
     if (forceCleanRunPromise && this.runPromise) {
       const error = ERRORS.TypedError(HardwareErrorCode.BleForceCleanRunPromise);
       this.runPromise.reject(error);
-      this.rejectAllProtocolV2Frames(error);
       this.runPromise = null;
+      this.runPromiseDeviceId = null;
     }
 
     try {
@@ -284,7 +292,9 @@ export default class ElectronBleTransport {
       }
       const protocolHint = expectedProtocol
         ? undefined
-        : this.deviceProtocolHints.get(uuid) ?? inferProtocolHintFromDeviceName(device.name);
+        : input.protocolHint ??
+          this.deviceProtocolHints.get(uuid) ??
+          inferProtocolHintFromDeviceName(device.name);
       if (protocolHint) {
         this.deviceProtocolHints.set(uuid, protocolHint);
       }
@@ -304,6 +314,8 @@ export default class ElectronBleTransport {
       const cleanup = this.createNotificationSubscription(uuid);
       this.notificationCleanups.set(uuid, cleanup);
 
+      const protocolType = await this.detectProtocol(uuid, expectedProtocol, protocolHint);
+
       const disconnectCleanup = window.desktopApi.nobleBle.onDeviceDisconnected(
         (disconnectedDevice: any) => {
           if (disconnectedDevice.id === uuid) {
@@ -318,8 +330,6 @@ export default class ElectronBleTransport {
       );
       this.disconnectCleanups.set(uuid, disconnectCleanup);
 
-      const protocolType = await this.detectProtocol(uuid, expectedProtocol, protocolHint);
-
       return {
         ...toBleDescriptor({ id: device.id, name: device.name }, protocolType),
         uuid,
@@ -374,7 +384,7 @@ export default class ElectronBleTransport {
   private createProtocolDetectionError() {
     return ERRORS.TypedError(
       HardwareErrorCode.BleTimeoutError,
-      'Unable to detect BLE protocol: device did not respond to Protocol V1 Initialize or Protocol V2 Ping'
+      'Unable to detect BLE protocol: device did not respond to Protocol V1 GetFeatures or Protocol V2 Ping'
     );
   }
 
@@ -455,10 +465,11 @@ export default class ElectronBleTransport {
     this.v1Buffers.set(uuid, { buffer: [], bufferLength: 0 });
     this.v2Assemblers.get(uuid)?.reset();
     this.resetProtocolV2Frames(uuid);
-    if (this.runPromise) {
+    if (this.runPromise && this.runPromiseDeviceId === uuid) {
       const error = ERRORS.TypedError(HardwareErrorCode.BleForceCleanRunPromise);
       this.runPromise.reject(error);
       this.runPromise = null;
+      this.runPromiseDeviceId = null;
     }
 
     const notifyCleanup = this.notificationCleanups.get(uuid);
@@ -474,9 +485,17 @@ export default class ElectronBleTransport {
       this.Log?.debug(`[Electron BLE] unsubscribe after Protocol ${protocol} probe failed:`, error);
     }
     try {
+      await window.desktopApi?.nobleBle?.disconnect(uuid);
+    } catch (error) {
+      this.Log?.debug(`[Electron BLE] disconnect after Protocol ${protocol} probe failed:`, error);
+    }
+    this.connectedDevices.delete(uuid);
+    try {
+      await window.desktopApi?.nobleBle?.connect(uuid);
+      this.connectedDevices.add(uuid);
       await window.desktopApi?.nobleBle?.subscribe(uuid);
     } catch (error) {
-      this.Log?.debug(`[Electron BLE] resubscribe after Protocol ${protocol} probe failed:`, error);
+      this.Log?.debug(`[Electron BLE] reconnect after Protocol ${protocol} probe failed:`, error);
       throw error;
     }
 
@@ -491,11 +510,13 @@ export default class ElectronBleTransport {
 
     try {
       this.deviceProtocol.set(uuid, 'V1');
-      await this.callProtocolV1(uuid, 'Initialize', {}, { timeoutMs: PROTOCOL_PROBE_TIMEOUT_MS });
+      // GetFeatures identifies Protocol V1 without resetting an existing wallet
+      // session before Core has a chance to restore a hidden wallet.
+      await this.callProtocolV1(uuid, 'GetFeatures', {}, { timeoutMs: PROTOCOL_PROBE_TIMEOUT_MS });
       return true;
     } catch (error) {
       this.clearProbeProtocol(uuid, 'V1');
-      this.Log?.debug('[Electron BLE] Protocol V1 Initialize probe failed:', error);
+      this.Log?.debug('[Electron BLE] Protocol V1 GetFeatures probe failed:', error);
       return false;
     }
   }
@@ -557,7 +578,7 @@ export default class ElectronBleTransport {
       const error = ERRORS.TypedError(HardwareErrorCode.BleDeviceBondedCanceled);
       if (this.deviceProtocol.get(deviceId) === 'V2') {
         this.rejectProtocolV2Frames(deviceId, error);
-      } else if (this.runPromise) {
+      } else if (this.runPromise && this.runPromiseDeviceId === deviceId) {
         this.runPromise.reject(error);
       }
       return;
@@ -612,17 +633,8 @@ export default class ElectronBleTransport {
     this.getProtocolV2FrameQueue(uuid).push(frame);
   }
 
-  private rejectAllProtocolV2Frames(error: Error) {
-    this.v2FrameQueues.clear();
-    for (const framePromise of this.v2FramePromises.values()) {
-      framePromise.reject(error);
-    }
-    this.v2FramePromises.clear();
-  }
-
   private resetProtocolV2Frames(uuid: string) {
-    this.v2FrameQueues.delete(uuid);
-    this.v2FramePromises.delete(uuid);
+    this.rejectProtocolV2Frames(uuid, new Error(`Protocol V2 frame state reset for ${uuid}`));
   }
 
   private rejectProtocolV2Frames(uuid: string, error: Error) {
@@ -656,13 +668,18 @@ export default class ElectronBleTransport {
 
     if (result.error) {
       this.Log?.error('[Electron BLE] Protocol V1 packet processing error:', result.error);
-      if (this.runPromise) {
+      if (this.runPromise && this.runPromiseDeviceId === deviceId) {
         this.runPromise.reject(ERRORS.TypedError(HardwareErrorCode.BleWriteCharacteristicError));
       }
       return;
     }
 
-    if (result.isComplete && result.completePacket && this.runPromise) {
+    if (
+      result.isComplete &&
+      result.completePacket &&
+      this.runPromise &&
+      this.runPromiseDeviceId === deviceId
+    ) {
       this.runPromise.resolve(result.completePacket);
     }
   }
@@ -716,6 +733,7 @@ export default class ElectronBleTransport {
     const runPromise = createDeferred<Uint8Array | string>();
     runPromise.promise.catch(() => undefined);
     this.runPromise = runPromise;
+    this.runPromiseDeviceId = uuid;
     const messages = this._messages;
     const buffers = ProtocolV1.encodeTransportPackets(messages, name, data);
     let timeout: ReturnType<typeof setTimeout> | undefined;
@@ -760,11 +778,24 @@ export default class ElectronBleTransport {
       return check.call(jsonData);
     } catch (e) {
       this.Log?.error('[Electron BLE] Protocol V1 call error:', e);
+      const isProbeTimeout =
+        name === 'GetFeatures' && options?.timeoutMs === PROTOCOL_PROBE_TIMEOUT_MS;
+      if ((e as { errorCode?: unknown })?.errorCode === HardwareErrorCode.BleTimeoutError) {
+        this.v1Buffers.set(uuid, { buffer: [], bufferLength: 0 });
+        const notifyCleanup = this.notificationCleanups.get(uuid);
+        notifyCleanup?.();
+        this.notificationCleanups.delete(uuid);
+        this.notificationTokens.delete(uuid);
+        if (!isProbeTimeout) {
+          await this.releaseNative(uuid);
+        }
+      }
       throw e;
     } finally {
       if (timeout) clearTimeout(timeout);
       if (this.runPromise === runPromise) {
         this.runPromise = null;
+        this.runPromiseDeviceId = null;
       }
     }
   }

package/src/webusb.ts

@@ -41,7 +41,11 @@ const REPORT_ID = PROTOCOL_V1_REPORT_ID;
 const HEADER_LENGTH = PROTOCOL_V1_MESSAGE_HEADER_SIZE;
 const PACKET_IO_MAX_RETRIES = 3;
 const PACKET_IO_RETRY_DELAY = 300;
-const PROTOCOL_PROBE_TIMEOUT = 1000;
+// Legacy devices can take longer to answer Initialize after a WebUSB reset.
+// Keep this aligned with Node USB so a slow Protocol V1 response is not
+// misreported as a protocol mismatch during acquire.
+const PROTOCOL_V1_PROBE_TIMEOUT = 5000;
+const PROTOCOL_V2_PROBE_TIMEOUT = 1000;
 const EXPECTED_PROTOCOL_V2_PROBE_ATTEMPTS = 2;
 function inferProtocolHintFromDeviceName(name?: string | null): ProtocolType | undefined {
   return /\bpro\s*2\b/i.test(name ?? '') ? 'V2' : undefined;
@@ -233,7 +237,9 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
         .productName;
       const protocolHint = input.expectedProtocol
         ? undefined
-        : this.deviceProtocolHints.get(input.path) ?? inferProtocolHintFromDeviceName(deviceName);
+        : input.protocolHint ??
+          this.deviceProtocolHints.get(input.path) ??
+          inferProtocolHintFromDeviceName(deviceName);
       if (protocolHint) {
         this.deviceProtocolHints.set(input.path, protocolHint);
       }
@@ -241,6 +247,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
       return await Promise.resolve(input.path);
     } catch (e) {
       this.Log.debug('acquire error: ', e instanceof Error ? `${e.name}: ${e.message}` : String(e));
+      await this.closeOpenDevice(input.path);
       throw e;
     }
   }
@@ -281,7 +288,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
         this.deviceProtocol.set(path, 'V1');
         return 'V1';
       }
-      await this.resetConnectionAfterProbe(path);
+      await this.closeConnectionAfterProbe(path);
       throw this.createProtocolMismatchError(expectedProtocol);
     }
 
@@ -291,13 +298,15 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
           this.deviceProtocol.set(path, 'V2');
           return 'V2';
         }
-        await this.resetConnectionAfterProbe(path);
         if (attempt < EXPECTED_PROTOCOL_V2_PROBE_ATTEMPTS) {
+          await this.resetConnectionAfterProbe(path);
           this.Log?.debug(
             `[WebUsbTransport] Protocol V2 probe timed out, retrying ${
               attempt + 1
             }/${EXPECTED_PROTOCOL_V2_PROBE_ATTEMPTS}`
           );
+        } else {
+          await this.closeConnectionAfterProbe(path);
         }
       }
       this.deviceProtocol.delete(path);
@@ -312,17 +321,21 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     const probeOrder: ProtocolType[] =
       protocolHint === 'V2' || this.deviceProtocol.get(path) === 'V2' ? ['V2', 'V1'] : ['V1', 'V2'];
 
-    for (const protocol of probeOrder) {
+    for (const [index, protocol] of probeOrder.entries()) {
       const detected =
         protocol === 'V1' ? await this.probeProtocolV1(path) : await this.probeProtocolV2(path);
       if (detected) {
         this.deviceProtocol.set(path, protocol);
         return protocol;
       }
-      // A timed-out WebUSB transferIn cannot be cancelled in place. Closing and
-      // reopening the device guarantees the next protocol probe cannot consume a
-      // late response from the previous protocol generation.
-      await this.resetConnectionAfterProbe(path);
+      if (index < probeOrder.length - 1) {
+        // A timed-out WebUSB transferIn cannot be cancelled in place. Closing and
+        // reopening the device guarantees the next protocol probe cannot consume a
+        // late response from the previous protocol generation.
+        await this.resetConnectionAfterProbe(path);
+      } else {
+        await this.closeConnectionAfterProbe(path);
+      }
     }
 
     this.deviceProtocol.delete(path);
@@ -645,25 +658,13 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     return this.getTransferInData(result);
   }
 
-  private async resetConnectionAfterProbe(path: string) {
+  private async closeConnectionAfterProbe(path: string) {
     await this.rotateProtocolV2UsbGeneration(path, 'WebUSB protocol probe reset');
+    await this.closeOpenDevice(path);
+  }
 
-    try {
-      const device = await this.findDevice(path);
-      if (device.opened) {
-        const endpoints = this.deviceEndpoints.get(path);
-        const ifaceNum = endpoints?.interfaceNumber ?? this.interfaceId;
-        try {
-          await device.releaseInterface(ifaceNum);
-        } catch (error) {
-          this.Log.debug('[WebUsbTransport] releaseInterface after protocol probe error:', error);
-        }
-        await device.close();
-      }
-    } catch (error) {
-      this.Log.debug('[WebUsbTransport] close after protocol probe error:', error);
-    }
-
+  private async resetConnectionAfterProbe(path: string) {
+    await this.closeConnectionAfterProbe(path);
     await this.getConnectedDevices();
     await this.connect(path, false);
   }
@@ -716,7 +717,14 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     }
 
     try {
-      await this.callProtocolV1(path, 'Initialize', {}, { timeoutMs: PROTOCOL_PROBE_TIMEOUT });
+      await this.callProtocolV1(
+        path,
+        'Initialize',
+        {},
+        {
+          timeoutMs: PROTOCOL_V1_PROBE_TIMEOUT,
+        }
+      );
       return true;
     } catch (_error) {
       return false;
@@ -730,7 +738,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
 
     return probeProtocolV2Helper({
       call: (name, data, options) => this.callProtocolV2(path, name, data, options),
-      timeoutMs: PROTOCOL_PROBE_TIMEOUT,
+      timeoutMs: PROTOCOL_V2_PROBE_TIMEOUT,
       logger: this.Log,
       logPrefix: 'ProtocolV2 WebUSB',
     });