@onekeyfe/hd-transport-web-device 1.2.0-alpha.183 → 1.2.0-alpha.185

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,
@@ -461,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);
@@ -497,6 +550,40 @@ 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('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/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

@@ -242,6 +242,7 @@ declare class ElectronBleTransport {
     private hostDisconnectCleanup?;
     private notificationTokens;
     private nextNotificationToken;
+    private toStaleBondError;
     private handleBluetoothError;
     private cleanupDeviceState;
     init(logger: any, emitter?: EventEmitter): void;
@@ -284,6 +285,7 @@ declare class ElectronBleTransport {
     private createMtuSubscription;
     private writeProtocolV2Frame;
     private handleNotification;
+    private readProtocolV2LinkDisabledFailure;
     private handleProtocolV2Notification;
     private getProtocolV2FrameQueue;
     private resolveProtocolV2Frame;

package/dist/index.js

@@ -821,7 +821,7 @@ function resolveBlePacketCapacity(mtu, maximumPacketCapacity, fallbackPacketCapa
     return Math.min(maximumPacketCapacity, Math.floor(mtu) - BLE_ATT_HEADER_BYTES);
 }
 
-const { parseConfigure, ProtocolV1, check } = transport__default["default"];
+const { parseConfigure, ProtocolV1, ProtocolV2, check } = transport__default["default"];
 const toBleDescriptor = (device, protocolType) => (Object.assign({ id: device.id, name: device.name, path: device.id, debug: false, commType: 'electron-ble' }, (protocolType ? { protocolType } : {})));
 const BLE_PACKET_SIZE_FALLBACK = 192;
 const BLE_PACKET_SIZE_MAXIMUM = 244;
@@ -871,7 +871,29 @@ 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')
+            ? 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) {
@@ -1002,6 +1024,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);
             }
@@ -1033,7 +1058,7 @@ class ElectronBleTransport {
                     this.connectedDevices.add(uuid);
                 }
                 catch (error) {
-                    this.handleBluetoothError(error);
+                    this.handleBluetoothError(error, shouldMapProtocolV2StaleBond);
                 }
                 const mtuCleanup = this.createMtuSubscription(uuid);
                 if (mtuCleanup) {
@@ -1041,7 +1066,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);
@@ -1227,6 +1257,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;
             }
         });
@@ -1249,6 +1282,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');
@@ -1263,7 +1297,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) {
@@ -1332,8 +1375,39 @@ 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) {
+        var _a, _b;
+        if (!this._messages || !this._messagesV2)
+            return undefined;
+        const assembler = this.v2Assemblers.get(deviceId);
+        if (!assembler)
+            return undefined;
+        try {
+            for (const frame of assembler.drain(transport.hexToBytes(hexData))) {
+                const response = check.call(ProtocolV2.decodeFrame({ protocolV1: this._messages, protocolV2: this._messagesV2 }, frame));
+                if (response.type === 'Failure') {
+                    const failureCode = (_a = response.message) === null || _a === void 0 ? void 0 : _a.code;
+                    const firmwareMessage = (_b = response.message) === null || _b === void 0 ? void 0 : _b.message;
+                    if (transport.isProtocolV2LinkDisabledFailure(failureCode, firmwareMessage)) {
+                        return transport.createProtocolV2LinkDisabledError(failureCode, firmwareMessage);
+                    }
+                }
+            }
+        }
+        catch (_c) {
+            assembler.reset();
+        }
+        return undefined;
+    }
     handleProtocolV2Notification(deviceId, hexData) {
         var _a;
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-web-device",
-  "version": "1.2.0-alpha.183",
+  "version": "1.2.0-alpha.185",
   "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.183",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.183"
+    "@onekeyfe/hd-shared": "1.2.0-alpha.185",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.185"
   },
   "devDependencies": {
-    "@onekeyfe/hd-transport-electron": "1.2.0-alpha.183",
+    "@onekeyfe/hd-transport-electron": "1.2.0-alpha.185",
     "@types/w3c-web-usb": "^1.0.6",
     "@types/web-bluetooth": "^0.0.17"
   },
-  "gitHead": "fd9b6e749495b0144e734dbe32c57cf483547349"
+  "gitHead": "dba45132513abeef33dc448824b4eaace74900ee"
 }

package/src/electron-ble-transport.ts

@@ -6,7 +6,10 @@ import transport, {
   ProtocolV2LinkManager,
   TRANSPORT_EVENT,
   bytesToHex,
+  createProtocolV2LinkDisabledError,
   hexToBytes,
+  isProtocolV2LinkDisabledError,
+  isProtocolV2LinkDisabledFailure,
   probeProtocolV2 as probeProtocolV2Helper,
   writeProtocolV2BleFrame,
 } from '@onekeyfe/hd-transport';
@@ -16,6 +19,8 @@ import {
   HardwareErrorCode,
   HardwareErrorCodeMessage,
   createDeferred,
+  isBleStaleBondErrorText,
+  isBleStaleBondHardwareError,
   isHeaderChunk,
 } from '@onekeyfe/hd-shared';
 
@@ -31,7 +36,7 @@ import type {
 } from '@onekeyfe/hd-transport';
 import type EventEmitter from 'events';
 
-const { parseConfigure, ProtocolV1, check } = transport;
+const { parseConfigure, ProtocolV1, ProtocolV2, check } = transport;
 
 declare global {
   interface Window {
@@ -159,7 +164,33 @@ 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')
+        ? 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);
@@ -595,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;
     }
   }
@@ -615,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');
@@ -628,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> {
@@ -702,9 +753,45 @@ 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;
+
+    try {
+      for (const frame of assembler.drain(hexToBytes(hexData))) {
+        const response = check.call(
+          ProtocolV2.decodeFrame(
+            { protocolV1: this._messages, protocolV2: this._messagesV2 },
+            frame
+          )
+        );
+        if (response.type === 'Failure') {
+          const failureCode = response.message?.code;
+          const firmwareMessage = response.message?.message;
+          if (isProtocolV2LinkDisabledFailure(failureCode, firmwareMessage)) {
+            return createProtocolV2LinkDisabledError(failureCode, firmwareMessage);
+          }
+        }
+      }
+    } catch {
+      // A normal Protocol V1 notification is not a Protocol V2 frame.
+      assembler.reset();
+    }
+    return undefined;
+  }
+
   private handleProtocolV2Notification(deviceId: string, hexData: string): void {
     try {
       const bytes = hexToBytes(hexData);