@onekeyfe/hd-transport-web-device 1.2.2-alpha.100 → 1.2.2-alpha.11

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

@@ -73,8 +73,26 @@ const protocolV2Schema = {
         },
       },
     },
+    Failure: {
+      fields: {
+        code: {
+          type: 'FailureType',
+          id: 1,
+        },
+        message: {
+          type: 'string',
+          id: 2,
+        },
+      },
+    },
+    FailureType: {
+      values: {
+        Failure_ProcessError: 5,
+      },
+    },
     MessageType: {
       values: {
+        MessageType_Failure: 3,
         MessageType_ProtocolInfoRequest: 60200,
         MessageType_ProtocolInfo: 60201,
         MessageType_Ping: 60206,
@@ -327,7 +345,7 @@ describe('ElectronBleTransport protocol detection', () => {
     }
   });
 
-  test('reconnects Protocol V1 with a non-destructive GetFeatures probe', async () => {
+  test('reconnects a declared Protocol V1 device without probing again', async () => {
     const device = { id: 'classic-id', name: 'OneKey Classic' };
     const nobleBle = createNobleBle(device);
     let notificationHandler: ((deviceId: string, data: string) => void) | undefined;
@@ -360,7 +378,10 @@ describe('ElectronBleTransport protocol detection', () => {
           uuid: device.id,
         })
       );
-      expect(nobleBle.write).toHaveBeenCalledTimes(2);
+      // The first acquire probes because the protocol is unknown; the second
+      // declares V1 and must send nothing at all, leaving the first frame on
+      // the link to Core — which is what carries the wallet session.
+      expect(nobleBle.write).toHaveBeenCalledTimes(1);
       expect(nobleBle.write.mock.calls.every(([, hex]) => /^3f23230037/.test(hex))).toBe(true);
       expect(protocolV2Writer).not.toHaveBeenCalled();
     } finally {
@@ -373,19 +394,13 @@ describe('ElectronBleTransport protocol detection', () => {
     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();
-    });
+    // A declared V1 acquire writes nothing, so every write here belongs to the
+    // call under test and none of them is answered.
+    nobleBle.write.mockImplementation(() => Promise.resolve());
     const bleTransport = configureTransport(nobleBle);
 
     await bleTransport.acquire({ uuid: device.id, expectedProtocol: 'V1' });
@@ -464,6 +479,41 @@ describe('ElectronBleTransport protocol detection', () => {
     expect(transport.getProtocolType(device.id)).toBeUndefined();
   });
 
+  test('surfaces Protocol V2 link disabled while the initial V1 probe is active', async () => {
+    const device = { id: 'usb-priority-pro2-id', name: 'OneKey Pro 2' };
+    const nobleBle = createNobleBle(device);
+    let notificationHandler: ((deviceId: string, data: string) => void) | undefined;
+
+    nobleBle.onNotification.mockImplementation(handler => {
+      notificationHandler = handler;
+      return jest.fn();
+    });
+    nobleBle.write.mockImplementation(() => {
+      const response = ProtocolV2.encodeFrame(
+        schemas,
+        'Failure',
+        { code: 5, message: 'link disabled' },
+        { router: PROTOCOL_V2_CHANNEL_BLE_UART }
+      );
+      const splitAt = 4;
+      setTimeout(() => {
+        notificationHandler?.(device.id, bytesToHex(response.subarray(0, splitAt)));
+        notificationHandler?.(device.id, bytesToHex(response.subarray(splitAt)));
+      }, 0);
+      return Promise.resolve();
+    });
+    const transport = configureTransport(nobleBle);
+
+    await expect(transport.acquire({ uuid: device.id })).rejects.toMatchObject({
+      name: 'ProtocolV2LinkDisabledError',
+      failureCode: 'Failure_ProcessError',
+      firmwareMessage: 'link disabled',
+    });
+    expect(nobleBle.write).toHaveBeenCalledTimes(1);
+    expect(nobleBle.unsubscribe).toHaveBeenCalledWith(device.id);
+    expect(nobleBle.disconnect).toHaveBeenCalledWith(device.id);
+  });
+
   test('keeps a first expected Protocol V2 probe miss retryable', async () => {
     const device = { id: 'first-v2-id', name: 'OneKey Pro 2' };
     const nobleBle = createNobleBle(device);
@@ -500,6 +550,71 @@ describe('ElectronBleTransport protocol detection', () => {
     expect(transport.getProtocolType(device.id)).toBeUndefined();
   });
 
+  test('fails Protocol V2 acquire immediately when subscribe reports insufficient encryption', async () => {
+    const device = { id: 'stale-bond-pro2-id', name: 'OneKey Pro 2' };
+    const nobleBle = createNobleBle(device);
+    nobleBle.subscribe.mockRejectedValue(new Error('Encryption is insufficient'));
+    const transport = configureTransport(nobleBle);
+    const probe = jest.spyOn(transport as any, 'probeProtocolV2');
+
+    await expect(
+      transport.acquire({ uuid: device.id, expectedProtocol: 'V2' })
+    ).rejects.toMatchObject({
+      errorCode: HardwareErrorCode.BleDeviceBondError,
+    });
+
+    expect(probe).not.toHaveBeenCalled();
+    expect(nobleBle.unsubscribe).toHaveBeenCalledWith(device.id);
+    expect(nobleBle.disconnect).toHaveBeenCalledWith(device.id);
+  });
+
+  test('maps macOS CoreBluetooth peer-removed pairing failures to the precise error', async () => {
+    const device = { id: 'reset-pro2-macos-id', name: 'OneKey Pro 2' };
+    const nobleBle = createNobleBle(device);
+    nobleBle.connect.mockRejectedValue(
+      new Error('CBErrorDomain:14 Peer removed pairing information on the device side')
+    );
+    const transport = configureTransport(nobleBle);
+
+    await expect(
+      transport.acquire({ uuid: device.id, expectedProtocol: 'V2' })
+    ).rejects.toMatchObject({
+      errorCode: HardwareErrorCode.BlePeerRemovedPairingInformation,
+    });
+  });
+
+  test('does not classify a generic macOS connection failure as a stale bond', async () => {
+    const device = { id: 'offline-pro2-macos-id', name: 'OneKey Pro 2' };
+    const nobleBle = createNobleBle(device);
+    nobleBle.connect.mockRejectedValue(new Error('connection failed'));
+    const transport = configureTransport(nobleBle);
+
+    try {
+      await transport.acquire({ uuid: device.id, expectedProtocol: 'V2' });
+      throw new Error('Expected acquire to fail');
+    } catch (error) {
+      expect(error).toBeInstanceOf(Error);
+      expect((error as Error).message).toBe('connection failed');
+      expect((error as { errorCode?: unknown }).errorCode).toBeUndefined();
+    }
+  });
+
+  test('keeps stale-bond subscribe mapping out of Protocol V1 acquire', async () => {
+    const device = { id: 'classic-v1-id', name: 'OneKey Classic' };
+    const nobleBle = createNobleBle(device);
+    nobleBle.subscribe.mockRejectedValue(new Error('Encryption is insufficient'));
+    const transport = configureTransport(nobleBle);
+
+    try {
+      await transport.acquire({ uuid: device.id, expectedProtocol: 'V1' });
+      throw new Error('Expected Protocol V1 acquire to fail');
+    } catch (error) {
+      expect(error).toBeInstanceOf(Error);
+      expect((error as Error).message).toBe('Encryption is insufficient');
+      expect((error as { errorCode?: unknown }).errorCode).toBeUndefined();
+    }
+  });
+
   test('reports a stale bond when a previously confirmed Protocol V2 device stops responding', async () => {
     const device = { id: 'reset-pro2-id', name: 'OneKey Pro 2' };
     const nobleBle = createNobleBle(device);

package/__tests__/webusb-protocol-cache.test.ts

@@ -69,6 +69,38 @@ describe('WebUsbTransport protocol probe cache', () => {
     expect(webusb.detectProtocol).toHaveBeenCalledWith(path, 'V1', undefined);
   });
 
+  test('acquire reuses a previously confirmed protocol during explicit no-probe recovery', async () => {
+    const webusb = buildAcquirableTransport();
+    const path = 'pro-webusb';
+    webusb.deviceProtocol.set(path, 'V1');
+    webusb.confirmedDeviceProtocols.set(path, 'V2');
+    webusb.markProtocolStale(path);
+    webusb.detectProtocol = jest.fn();
+
+    await expect(
+      webusb.acquire({ path, expectedProtocol: 'V2', skipProtocolProbe: true })
+    ).resolves.toBe(path);
+
+    expect(webusb.detectProtocol).not.toHaveBeenCalled();
+    expect(webusb.deviceProtocol.get(path)).toBe('V2');
+    expect(webusb.staleProtocolPaths.has(path)).toBe(false);
+    expect(webusb.acquiredPaths.has(path)).toBe(true);
+  });
+
+  test('acquire rejects no-probe recovery without a previously confirmed protocol', async () => {
+    const webusb = buildAcquirableTransport();
+    const path = 'pro-webusb';
+    webusb.detectProtocol = jest.fn();
+
+    await expect(
+      webusb.acquire({ path, expectedProtocol: 'V2', skipProtocolProbe: true })
+    ).rejects.toThrow('previously confirmed protocol');
+
+    expect(webusb.detectProtocol).not.toHaveBeenCalled();
+    expect(webusb.deviceProtocol.has(path)).toBe(false);
+    expect(webusb.acquiredPaths.has(path)).toBe(false);
+  });
+
   test('forced protocol detection bypasses a valid cache and probes on the wire', async () => {
     const webusb = buildAcquirableTransport();
     const path = 'pro-webusb';

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

@@ -387,6 +387,13 @@ describe('WebUsbTransport Protocol V2 timeout recovery', () => {
       webusb.callProtocolV2(path, 'Ping', { message: 'short' }, { timeoutMs: 25 }),
     ]);
 
-    expect(readTimeouts).toEqual([1_000, 25]);
+    // Each call keeps its own budget instead of inheriting the other's. The
+    // queued one is a deadline, so it arrives with whatever the first call left
+    // of its 25ms — asserting the exact remainder makes this fail on a loaded
+    // machine, which is timing, not behaviour.
+    expect(readTimeouts).toHaveLength(2);
+    expect(readTimeouts[0]).toBe(1_000);
+    expect(readTimeouts[1]).toBeGreaterThan(0);
+    expect(readTimeouts[1]).toBeLessThanOrEqual(25);
   });
 });

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

@@ -41,6 +41,7 @@ export default class ElectronBleTransport {
     private hostDisconnectCleanup?;
     private notificationTokens;
     private nextNotificationToken;
+    private toStaleBondError;
     private handleBluetoothError;
     private cleanupDeviceState;
     init(logger: any, emitter?: EventEmitter): void;
@@ -78,6 +79,7 @@ export default class ElectronBleTransport {
     private createMtuSubscription;
     private writeProtocolV2Frame;
     private handleNotification;
+    private readProtocolV2LinkDisabledFailure;
     private handleProtocolV2Notification;
     private getProtocolV2FrameQueue;
     private resolveProtocolV2Frame;

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

@@ -19,6 +19,8 @@ declare class WebUsbTransport extends ProtocolV2UsbTransportBase<string> {
     private protocolV2SchemaSource;
     /** Per-path protocol type detected by active wire-level probe. */
     private deviceProtocol;
+    /** Protocols previously confirmed by an active response for this transport instance. */
+    private confirmedDeviceProtocols;
     private deviceProtocolHints;
     /**
      * Paths whose cached protocol must be re-probed on the next acquire (a USB
@@ -240,6 +242,7 @@ declare class ElectronBleTransport {
     private hostDisconnectCleanup?;
     private notificationTokens;
     private nextNotificationToken;
+    private toStaleBondError;
     private handleBluetoothError;
     private cleanupDeviceState;
     init(logger: any, emitter?: EventEmitter): void;
@@ -282,6 +285,7 @@ declare class ElectronBleTransport {
     private createMtuSubscription;
     private writeProtocolV2Frame;
     private handleNotification;
+    private readProtocolV2LinkDisabledFailure;
     private handleProtocolV2Notification;
     private getProtocolV2FrameQueue;
     private resolveProtocolV2Frame;

package/dist/index.js

@@ -79,6 +79,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
             logPrefix: 'ProtocolV2 WebUSB',
         });
         this.deviceProtocol = new Map();
+        this.confirmedDeviceProtocols = new Map();
         this.deviceProtocolHints = new Map();
         this.staleProtocolPaths = new Set();
         this.acquiredPaths = new Set();
@@ -182,7 +183,7 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
         });
     }
     acquire(input) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g;
         return __awaiter(this, void 0, void 0, function* () {
             if (!input.path)
                 return;
@@ -190,35 +191,53 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
                 yield this.rotateProtocolV2UsbGeneration(input.path, 'WebUSB transport acquired');
                 yield this.closeOpenDevice(input.path);
                 yield this.connect((_a = input.path) !== null && _a !== void 0 ? _a : '', true);
-                if (input.forceProtocolDetection) {
+                if (input.skipProtocolProbe) {
+                    if (!input.expectedProtocol) {
+                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'skipProtocolProbe requires an expected protocol');
+                    }
+                    if (this.confirmedDeviceProtocols.get(input.path) !== input.expectedProtocol) {
+                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'skipProtocolProbe requires a previously confirmed protocol for this WebUSB endpoint');
+                    }
+                    this.staleProtocolPaths.delete(input.path);
+                    this.deviceProtocol.set(input.path, input.expectedProtocol);
+                    const currentDevice = (_b = this.deviceList.find(d => d.path === input.path)) === null || _b === void 0 ? void 0 : _b.device;
+                    if (currentDevice) {
+                        this.probedDeviceObjects.set(input.path, currentDevice);
+                    }
+                }
+                else if (input.forceProtocolDetection) {
                     this.staleProtocolPaths.delete(input.path);
                     this.deviceProtocol.delete(input.path);
                     this.deviceProtocolHints.delete(input.path);
                 }
-                if (this.staleProtocolPaths.has(input.path)) {
+                if (!input.skipProtocolProbe && this.staleProtocolPaths.has(input.path)) {
                     this.staleProtocolPaths.delete(input.path);
                     this.deviceProtocol.delete(input.path);
                 }
-                if (this.deviceProtocol.has(input.path)) {
-                    const currentDevice = (_b = this.deviceList.find(d => d.path === input.path)) === null || _b === void 0 ? void 0 : _b.device;
+                if (!input.skipProtocolProbe && this.deviceProtocol.has(input.path)) {
+                    const currentDevice = (_c = this.deviceList.find(d => d.path === input.path)) === null || _c === void 0 ? void 0 : _c.device;
                     if (!currentDevice || currentDevice !== this.probedDeviceObjects.get(input.path)) {
                         this.deviceProtocol.delete(input.path);
                     }
                 }
                 const cachedProtocol = this.deviceProtocol.get(input.path);
-                if (cachedProtocol && input.expectedProtocol && cachedProtocol !== input.expectedProtocol) {
+                if (!input.skipProtocolProbe &&
+                    cachedProtocol &&
+                    input.expectedProtocol &&
+                    cachedProtocol !== input.expectedProtocol) {
                     this.deviceProtocol.delete(input.path);
                 }
                 if (!this.deviceProtocol.has(input.path)) {
-                    const usbDevice = (_c = this.deviceList.find(device => device.path === input.path)) === null || _c === void 0 ? void 0 : _c.device;
+                    const usbDevice = (_d = this.deviceList.find(device => device.path === input.path)) === null || _d === void 0 ? void 0 : _d.device;
                     const protocolHint = input.expectedProtocol
                         ? undefined
-                        : (_e = (_d = input.protocolHint) !== null && _d !== void 0 ? _d : this.deviceProtocolHints.get(input.path)) !== null && _e !== void 0 ? _e : hdShared.inferProtocolHintFromUsbId(usbDevice === null || usbDevice === void 0 ? void 0 : usbDevice.vendorId, usbDevice === null || usbDevice === void 0 ? void 0 : usbDevice.productId);
+                        : (_f = (_e = input.protocolHint) !== null && _e !== void 0 ? _e : this.deviceProtocolHints.get(input.path)) !== null && _f !== void 0 ? _f : hdShared.inferProtocolHintFromUsbId(usbDevice === null || usbDevice === void 0 ? void 0 : usbDevice.vendorId, usbDevice === null || usbDevice === void 0 ? void 0 : usbDevice.productId);
                     if (protocolHint) {
                         this.deviceProtocolHints.set(input.path, protocolHint);
                     }
-                    yield this.detectProtocol(input.path, input.expectedProtocol, protocolHint);
-                    const probedDevice = (_f = this.deviceList.find(d => d.path === input.path)) === null || _f === void 0 ? void 0 : _f.device;
+                    const detectedProtocol = yield this.detectProtocol(input.path, input.expectedProtocol, protocolHint);
+                    this.confirmedDeviceProtocols.set(input.path, detectedProtocol);
+                    const probedDevice = (_g = this.deviceList.find(d => d.path === input.path)) === null || _g === void 0 ? void 0 : _g.device;
                     if (probedDevice) {
                         this.probedDeviceObjects.set(input.path, probedDevice);
                     }
@@ -852,7 +871,30 @@ class ElectronBleTransport {
         this.notificationTokens = new Map();
         this.nextNotificationToken = 1;
     }
-    handleBluetoothError(error) {
+    toStaleBondError(error) {
+        var _a;
+        if (hdShared.isBleStaleBondHardwareError(error)) {
+            return error;
+        }
+        const errorMessage = error && typeof error === 'object' && 'message' in error
+            ? String((_a = error.message) !== null && _a !== void 0 ? _a : '')
+            : String(error !== null && error !== void 0 ? error : '');
+        if (!hdShared.isBleStaleBondErrorText(errorMessage)) {
+            return null;
+        }
+        const normalizedErrorMessage = errorMessage.toLowerCase();
+        return hdShared.ERRORS.TypedError(normalizedErrorMessage.includes('peer removed pairing information') ||
+            normalizedErrorMessage.includes('cberrordomain:14')
+            ? hdShared.HardwareErrorCode.BlePeerRemovedPairingInformation
+            : hdShared.HardwareErrorCode.BleDeviceBondError, errorMessage);
+    }
+    handleBluetoothError(error, mapProtocolV2StaleBond = false) {
+        if (mapProtocolV2StaleBond) {
+            const staleBondError = this.toStaleBondError(error);
+            if (staleBondError) {
+                throw staleBondError;
+            }
+        }
         if (error && typeof error === 'object') {
             if ('code' in error) {
                 if (error.code === hdShared.HardwareErrorCode.BlePoweredOff) {
@@ -983,6 +1025,9 @@ class ElectronBleTransport {
         var _a, _b, _c, _d, _e, _f, _g;
         return __awaiter(this, void 0, void 0, function* () {
             const { uuid, forceCleanRunPromise, expectedProtocol } = input;
+            const shouldMapProtocolV2StaleBond = expectedProtocol
+                ? expectedProtocol === 'V2'
+                : this.confirmedProtocolV2.has(uuid);
             if (!uuid) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleRequiredUUID);
             }
@@ -1014,7 +1059,7 @@ class ElectronBleTransport {
                     this.connectedDevices.add(uuid);
                 }
                 catch (error) {
-                    this.handleBluetoothError(error);
+                    this.handleBluetoothError(error, shouldMapProtocolV2StaleBond);
                 }
                 const mtuCleanup = this.createMtuSubscription(uuid);
                 if (mtuCleanup) {
@@ -1022,7 +1067,12 @@ class ElectronBleTransport {
                 }
                 this.v1Buffers.set(uuid, { buffer: [], bufferLength: 0 });
                 this.v2Assemblers.set(uuid, new transport.ProtocolV2FrameAssembler(transport.PROTOCOL_V2_BLE_FRAME_MAX_BYTES));
-                yield window.desktopApi.nobleBle.subscribe(uuid);
+                try {
+                    yield window.desktopApi.nobleBle.subscribe(uuid);
+                }
+                catch (error) {
+                    this.handleBluetoothError(error, shouldMapProtocolV2StaleBond);
+                }
                 yield this.refreshBlePacketCapacity(uuid);
                 const cleanup = this.createNotificationSubscription(uuid);
                 this.notificationCleanups.set(uuid, cleanup);
@@ -1128,12 +1178,9 @@ class ElectronBleTransport {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             if (expectedProtocol === 'V1') {
-                if (yield this.probeProtocolV1(uuid)) {
-                    this.deviceProtocol.set(uuid, 'V1');
-                    (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug(`[Electron BLE] detectProtocol: uuid=${uuid} -> V1 (expected)`);
-                    return 'V1';
-                }
-                throw this.createProtocolMismatchError(expectedProtocol, uuid);
+                this.deviceProtocol.set(uuid, 'V1');
+                (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug(`[Electron BLE] detectProtocol: uuid=${uuid} -> V1 (expected, no probe)`);
+                return 'V1';
             }
             if (expectedProtocol === 'V2') {
                 if (yield this.probeProtocolV2(uuid)) {
@@ -1211,6 +1258,9 @@ class ElectronBleTransport {
             catch (error) {
                 this.clearProbeProtocol(uuid, 'V1');
                 (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug('[Electron BLE] Protocol V1 GetFeatures probe failed:', error);
+                if (transport.isProtocolV2LinkDisabledError(error)) {
+                    throw error;
+                }
                 return false;
             }
         });
@@ -1233,6 +1283,7 @@ class ElectronBleTransport {
                     (_a = this.v2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
                     this.resetProtocolV2Frames(uuid);
                 },
+                shouldRethrow: error => hdShared.isBleStaleBondHardwareError(error) || transport.isProtocolV2LinkDisabledError(error),
             });
             if (!detected) {
                 this.clearProbeProtocol(uuid, 'V2');
@@ -1247,7 +1298,16 @@ class ElectronBleTransport {
             if (!nobleBle) {
                 throw new Error('Noble BLE API not available');
             }
-            yield nobleBle.write(uuid, hexData, { pacingDelayMs: 0 });
+            try {
+                yield nobleBle.write(uuid, hexData, { pacingDelayMs: 0 });
+            }
+            catch (error) {
+                const staleBondError = this.toStaleBondError(error);
+                if (staleBondError) {
+                    throw staleBondError;
+                }
+                throw error;
+            }
         });
     }
     refreshBlePacketCapacity(uuid) {
@@ -1316,8 +1376,27 @@ class ElectronBleTransport {
             this.handleProtocolV2Notification(deviceId, hexData);
             return;
         }
+        const linkDisabledError = this.readProtocolV2LinkDisabledFailure(deviceId, hexData);
+        if (linkDisabledError) {
+            if (this.runPromise && this.runPromiseDeviceId === deviceId) {
+                this.runPromise.reject(linkDisabledError);
+            }
+            return;
+        }
         this.handleProtocolV1Notification(deviceId, hexData);
     }
+    readProtocolV2LinkDisabledFailure(deviceId, hexData) {
+        if (!this._messages || !this._messagesV2)
+            return undefined;
+        const assembler = this.v2Assemblers.get(deviceId);
+        if (!assembler)
+            return undefined;
+        return transport.detectProtocolV2LinkDisabledError({
+            schemas: { protocolV1: this._messages, protocolV2: this._messagesV2 },
+            assembler,
+            bytes: transport.hexToBytes(hexData),
+        });
+    }
     handleProtocolV2Notification(deviceId, hexData) {
         var _a;
         try {

package/dist/webusb.d.ts

@@ -13,6 +13,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     messagesV2: ReturnType<typeof transport.parseConfigure> | undefined;
     private protocolV2SchemaSource;
     private deviceProtocol;
+    private confirmedDeviceProtocols;
     private deviceProtocolHints;
     private staleProtocolPaths;
     private acquiredPaths;

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":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-web-device",
-  "version": "1.2.2-alpha.100",
+  "version": "1.2.2-alpha.11",
   "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.100",
-    "@onekeyfe/hd-transport": "1.2.2-alpha.100"
+    "@onekeyfe/hd-shared": "1.2.2-alpha.11",
+    "@onekeyfe/hd-transport": "1.2.2-alpha.11"
   },
   "devDependencies": {
-    "@onekeyfe/hd-transport-electron": "1.2.2-alpha.100",
+    "@onekeyfe/hd-transport-electron": "1.2.2-alpha.11",
     "@types/w3c-web-usb": "^1.0.6",
     "@types/web-bluetooth": "^0.0.17"
   },
-  "gitHead": "c40dad085297b0e3cc2020bd218c146dff6ed3e1"
+  "gitHead": "8928100acb893d72361eb74422d5e2a0f7af77d8"
 }

package/src/electron-ble-transport.ts

@@ -6,7 +6,9 @@ import transport, {
   ProtocolV2LinkManager,
   TRANSPORT_EVENT,
   bytesToHex,
+  detectProtocolV2LinkDisabledError,
   hexToBytes,
+  isProtocolV2LinkDisabledError,
   probeProtocolV2 as probeProtocolV2Helper,
   writeProtocolV2BleFrame,
 } from '@onekeyfe/hd-transport';
@@ -16,6 +18,8 @@ import {
   HardwareErrorCode,
   HardwareErrorCodeMessage,
   createDeferred,
+  isBleStaleBondErrorText,
+  isBleStaleBondHardwareError,
   isHeaderChunk,
 } from '@onekeyfe/hd-shared';
 
@@ -159,7 +163,34 @@ export default class ElectronBleTransport {
 
   private nextNotificationToken = 1;
 
-  private handleBluetoothError(error: any): never {
+  private toStaleBondError(error: unknown): Error | null {
+    if (isBleStaleBondHardwareError(error)) {
+      return error as Error;
+    }
+    const errorMessage =
+      error && typeof error === 'object' && 'message' in error
+        ? String((error as { message?: unknown }).message ?? '')
+        : String(error ?? '');
+    if (!isBleStaleBondErrorText(errorMessage)) {
+      return null;
+    }
+    const normalizedErrorMessage = errorMessage.toLowerCase();
+    return ERRORS.TypedError(
+      normalizedErrorMessage.includes('peer removed pairing information') ||
+        normalizedErrorMessage.includes('cberrordomain:14')
+        ? HardwareErrorCode.BlePeerRemovedPairingInformation
+        : HardwareErrorCode.BleDeviceBondError,
+      errorMessage
+    );
+  }
+
+  private handleBluetoothError(error: any, mapProtocolV2StaleBond = false): never {
+    if (mapProtocolV2StaleBond) {
+      const staleBondError = this.toStaleBondError(error);
+      if (staleBondError) {
+        throw staleBondError;
+      }
+    }
     if (error && typeof error === 'object') {
       if ('code' in error) {
         if (error.code === HardwareErrorCode.BlePoweredOff) {
@@ -320,6 +351,9 @@ export default class ElectronBleTransport {
 
   async acquire(input: BleAcquireInput) {
     const { uuid, forceCleanRunPromise, expectedProtocol } = input;
+    const shouldMapProtocolV2StaleBond = expectedProtocol
+      ? expectedProtocol === 'V2'
+      : this.confirmedProtocolV2.has(uuid);
 
     if (!uuid) {
       throw ERRORS.TypedError(HardwareErrorCode.BleRequiredUUID);
@@ -356,7 +390,7 @@ export default class ElectronBleTransport {
         await window.desktopApi.nobleBle.connect(uuid);
         this.connectedDevices.add(uuid);
       } catch (error) {
-        this.handleBluetoothError(error);
+        this.handleBluetoothError(error, shouldMapProtocolV2StaleBond);
       }
 
       const mtuCleanup = this.createMtuSubscription(uuid);
@@ -367,7 +401,11 @@ export default class ElectronBleTransport {
       this.v1Buffers.set(uuid, { buffer: [], bufferLength: 0 });
       this.v2Assemblers.set(uuid, new ProtocolV2FrameAssembler(PROTOCOL_V2_BLE_FRAME_MAX_BYTES));
 
-      await window.desktopApi.nobleBle.subscribe(uuid);
+      try {
+        await window.desktopApi.nobleBle.subscribe(uuid);
+      } catch (error) {
+        this.handleBluetoothError(error, shouldMapProtocolV2StaleBond);
+      }
       await this.refreshBlePacketCapacity(uuid);
 
       const cleanup = this.createNotificationSubscription(uuid);
@@ -487,13 +525,20 @@ export default class ElectronBleTransport {
     expectedProtocol?: ProtocolType,
     protocolHint?: ProtocolType
   ): Promise<ProtocolType> {
+    // A declared V1 is taken at face value, as the React Native transport
+    // already does on iOS: the caller reads the protocol off its own device
+    // record, so probing re-asks a question that is already answered and adds a
+    // round trip to every cold connect. It also fails in a way that costs the
+    // session: a device whose protocol session has stalled ignores the probe
+    // frame, and the timeout became a protocol-mismatch error that stopped Core
+    // from ever sending Initialize — the one frame such a device still answers,
+    // and how it gets revived. A declared V2 keeps probing, matching iOS, so a
+    // USB-priority "link disabled" surfaces here rather than as an unmapped
+    // error later. An undeclared protocol still goes through full detection.
     if (expectedProtocol === 'V1') {
-      if (await this.probeProtocolV1(uuid)) {
-        this.deviceProtocol.set(uuid, 'V1');
-        this.Log?.debug(`[Electron BLE] detectProtocol: uuid=${uuid} -> V1 (expected)`);
-        return 'V1';
-      }
-      throw this.createProtocolMismatchError(expectedProtocol, uuid);
+      this.deviceProtocol.set(uuid, 'V1');
+      this.Log?.debug(`[Electron BLE] detectProtocol: uuid=${uuid} -> V1 (expected, no probe)`);
+      return 'V1';
     }
 
     if (expectedProtocol === 'V2') {
@@ -588,6 +633,9 @@ export default class ElectronBleTransport {
     } catch (error) {
       this.clearProbeProtocol(uuid, 'V1');
       this.Log?.debug('[Electron BLE] Protocol V1 GetFeatures probe failed:', error);
+      if (isProtocolV2LinkDisabledError(error)) {
+        throw error;
+      }
       return false;
     }
   }
@@ -608,6 +656,8 @@ export default class ElectronBleTransport {
         this.v2Assemblers.get(uuid)?.reset();
         this.resetProtocolV2Frames(uuid);
       },
+      shouldRethrow: error =>
+        isBleStaleBondHardwareError(error) || isProtocolV2LinkDisabledError(error),
     });
     if (!detected) {
       this.clearProbeProtocol(uuid, 'V2');
@@ -621,7 +671,15 @@ export default class ElectronBleTransport {
       throw new Error('Noble BLE API not available');
     }
 
-    await nobleBle.write(uuid, hexData, { pacingDelayMs: 0 });
+    try {
+      await nobleBle.write(uuid, hexData, { pacingDelayMs: 0 });
+    } catch (error) {
+      const staleBondError = this.toStaleBondError(error);
+      if (staleBondError) {
+        throw staleBondError;
+      }
+      throw error;
+    }
   }
 
   private async refreshBlePacketCapacity(uuid: string): Promise<void> {
@@ -695,9 +753,29 @@ export default class ElectronBleTransport {
       this.handleProtocolV2Notification(deviceId, hexData);
       return;
     }
+    const linkDisabledError = this.readProtocolV2LinkDisabledFailure(deviceId, hexData);
+    if (linkDisabledError) {
+      if (this.runPromise && this.runPromiseDeviceId === deviceId) {
+        this.runPromise.reject(linkDisabledError);
+      }
+      return;
+    }
     this.handleProtocolV1Notification(deviceId, hexData);
   }
 
+  private readProtocolV2LinkDisabledFailure(deviceId: string, hexData: string) {
+    if (!this._messages || !this._messagesV2) return undefined;
+
+    const assembler = this.v2Assemblers.get(deviceId);
+    if (!assembler) return undefined;
+
+    return detectProtocolV2LinkDisabledError({
+      schemas: { protocolV1: this._messages, protocolV2: this._messagesV2 },
+      assembler,
+      bytes: hexToBytes(hexData),
+    });
+  }
+
   private handleProtocolV2Notification(deviceId: string, hexData: string): void {
     try {
       const bytes = hexToBytes(hexData);

package/src/webusb.ts

@@ -107,6 +107,9 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
   /** Per-path protocol type detected by active wire-level probe. */
   private deviceProtocol: Map<string, ProtocolType> = new Map();
 
+  /** Protocols previously confirmed by an active response for this transport instance. */
+  private confirmedDeviceProtocols: Map<string, ProtocolType> = new Map();
+
   private deviceProtocolHints: Map<string, ProtocolType> = new Map();
 
   /**
@@ -309,7 +312,26 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
       await this.rotateProtocolV2UsbGeneration(input.path, 'WebUSB transport acquired');
       await this.closeOpenDevice(input.path);
       await this.connect(input.path ?? '', true);
-      if (input.forceProtocolDetection) {
+      if (input.skipProtocolProbe) {
+        if (!input.expectedProtocol) {
+          throw ERRORS.TypedError(
+            HardwareErrorCode.RuntimeError,
+            'skipProtocolProbe requires an expected protocol'
+          );
+        }
+        if (this.confirmedDeviceProtocols.get(input.path) !== input.expectedProtocol) {
+          throw ERRORS.TypedError(
+            HardwareErrorCode.RuntimeError,
+            'skipProtocolProbe requires a previously confirmed protocol for this WebUSB endpoint'
+          );
+        }
+        this.staleProtocolPaths.delete(input.path);
+        this.deviceProtocol.set(input.path, input.expectedProtocol);
+        const currentDevice = this.deviceList.find(d => d.path === input.path)?.device;
+        if (currentDevice) {
+          this.probedDeviceObjects.set(input.path, currentDevice);
+        }
+      } else if (input.forceProtocolDetection) {
         // Explicit recovery/discovery (e.g. detectDeviceConnectProtocol) must
         // probe on the wire regardless of any cached result — the cached
         // binding may be exactly what the caller is trying to recover from.
@@ -317,13 +339,13 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
         this.deviceProtocol.delete(input.path);
         this.deviceProtocolHints.delete(input.path);
       }
-      if (this.staleProtocolPaths.has(input.path)) {
+      if (!input.skipProtocolProbe && this.staleProtocolPaths.has(input.path)) {
         // The device disconnected (possibly rebooting into another mode) since
         // the protocol was probed — drop the cache so it is re-probed below.
         this.staleProtocolPaths.delete(input.path);
         this.deviceProtocol.delete(input.path);
       }
-      if (this.deviceProtocol.has(input.path)) {
+      if (!input.skipProtocolProbe && this.deviceProtocol.has(input.path)) {
         const currentDevice = this.deviceList.find(d => d.path === input.path)?.device;
         if (!currentDevice || currentDevice !== this.probedDeviceObjects.get(input.path)) {
           // The OS re-enumerated the device since the probe (a replug/reboot we
@@ -333,7 +355,12 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
         }
       }
       const cachedProtocol = this.deviceProtocol.get(input.path);
-      if (cachedProtocol && input.expectedProtocol && cachedProtocol !== input.expectedProtocol) {
+      if (
+        !input.skipProtocolProbe &&
+        cachedProtocol &&
+        input.expectedProtocol &&
+        cachedProtocol !== input.expectedProtocol
+      ) {
         // The caller expects a different protocol than the cached probe result;
         // the cache is stale — drop it and re-probe on the wire below.
         this.deviceProtocol.delete(input.path);
@@ -348,7 +375,12 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
         if (protocolHint) {
           this.deviceProtocolHints.set(input.path, protocolHint);
         }
-        await this.detectProtocol(input.path, input.expectedProtocol, protocolHint);
+        const detectedProtocol = await this.detectProtocol(
+          input.path,
+          input.expectedProtocol,
+          protocolHint
+        );
+        this.confirmedDeviceProtocols.set(input.path, detectedProtocol);
         const probedDevice = this.deviceList.find(d => d.path === input.path)?.device;
         if (probedDevice) {
           this.probedDeviceObjects.set(input.path, probedDevice);