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

package/dist/webusb.d.ts

@@ -1,5 +1,7 @@
 /// <reference types="w3c-web-usb" />
+/// <reference types="node" />
 import transport, { ProtocolV2UsbTransportBase } from '@onekeyfe/hd-transport';
+import type EventEmitter from 'events';
 import type { AcquireInput, OneKeyDeviceInfoBase, ProtocolType, ProtocolV2CallContext, ProtocolV2Schemas, TransportCallOptions } from '@onekeyfe/hd-transport';
 export interface DeviceInfo extends OneKeyDeviceInfoBase {
     path: string;
@@ -11,19 +13,26 @@ 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;
+    private probedDeviceObjects;
     private deviceEndpoints;
     name: string;
     stopped: boolean;
     configured: boolean;
     Log?: any;
     usb?: USB;
+    emitter?: EventEmitter;
     deviceList: Array<DeviceInfo>;
     configurationId: number;
     endpointId: number;
     interfaceId: number;
     constructor();
-    init(logger: any): void;
+    init(logger: any, emitter?: EventEmitter): void;
+    emitDeviceDisconnect(path: string, device?: USBDevice): void;
+    markProtocolStale(path: string): void;
     configure(signedData: any): void;
     configureProtocolV2(signedData: any): void;
     promptDeviceAccess(): Promise<USBDevice | null>;
@@ -40,6 +49,7 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     connectToDevice(path: string, first: boolean): Promise<void>;
     private closeOpenDevice;
     private clearEndpointHalt;
+    private assertAcquired;
     post(session: string, name: string, data: Record<string, unknown>): Promise<void>;
     private getErrorMessage;
     private isRetryablePacketIoError;

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.0-alpha.99",
+  "version": "1.2.0",
   "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.99",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.99"
+    "@onekeyfe/hd-shared": "1.2.0",
+    "@onekeyfe/hd-transport": "1.2.0"
   },
   "devDependencies": {
-    "@onekeyfe/hd-transport-electron": "1.2.0-alpha.99",
+    "@onekeyfe/hd-transport-electron": "1.2.0",
     "@types/w3c-web-usb": "^1.0.6",
     "@types/web-bluetooth": "^0.0.17"
   },
-  "gitHead": "8924c0e509f84675a2c33c0062166967f5bcb2d0"
+  "gitHead": "cc51df0a415bead21304ad1d8bc92b5312c91344"
 }

package/src/electron-ble-transport.ts

@@ -6,19 +6,23 @@ import transport, {
   ProtocolV2LinkManager,
   TRANSPORT_EVENT,
   bytesToHex,
+  detectProtocolV2LinkDisabledError,
   hexToBytes,
+  isProtocolV2LinkDisabledError,
   probeProtocolV2 as probeProtocolV2Helper,
   writeProtocolV2BleFrame,
 } from '@onekeyfe/hd-transport';
 import {
+  EBleDisconnectReason,
   ERRORS,
   HardwareErrorCode,
   HardwareErrorCodeMessage,
   createDeferred,
+  isBleStaleBondErrorText,
+  isBleStaleBondHardwareError,
   isHeaderChunk,
 } from '@onekeyfe/hd-shared';
 
-import { createTransportCallLog, shouldSuppressHighVolumeCallLog } from './transportLog';
 import { resolveBlePacketCapacity } from './ble-packet-capacity';
 
 import type { Deferred } from '@onekeyfe/hd-shared';
@@ -52,10 +56,6 @@ interface PacketProcessResult {
   error?: string;
 }
 
-function inferProtocolHintFromDeviceName(name?: string | null): ProtocolType | undefined {
-  return /\bpro\s*2\b/i.test(name ?? '') ? 'V2' : undefined;
-}
-
 const toBleDescriptor = (
   device: { id: string; name: string | null },
   protocolType?: ProtocolType
@@ -72,7 +72,7 @@ const toBleDescriptor = (
 const BLE_PACKET_SIZE_FALLBACK = 192;
 const BLE_PACKET_SIZE_MAXIMUM = 244;
 const BLE_WRITE_DELAY_MS = 5;
-const PROTOCOL_PROBE_TIMEOUT_MS = 1000;
+const PROTOCOL_PROBE_TIMEOUT_MS = 3000;
 const PROTOCOL_V2_PROBE_TIMEOUT_MS = 5000;
 
 /**
@@ -106,6 +106,9 @@ export default class ElectronBleTransport {
 
   private deviceProtocolHints: Map<string, ProtocolType> = new Map();
 
+  /** Endpoints that answered a V2 probe in this transport lifetime. Survives disconnect. */
+  private confirmedProtocolV2 = new Set<string>();
+
   private deviceMtus: Map<string, number> = new Map();
 
   private devicePacketCapacities: Map<string, number> = new Map();
@@ -146,13 +149,47 @@ export default class ElectronBleTransport {
 
   private mtuCleanups: Map<string, () => void> = new Map();
 
-  private disconnectCleanups: Map<string, () => void> = new Map();
+  /**
+   * Transport-lifetime subscription to host BLE disconnects.
+   *
+   * This must NOT be scoped to acquire()/release(): a logical release keeps the
+   * native link alive for the keep-alive window, so a device that drops while
+   * idle would otherwise go unobserved and consumers would never learn it left
+   * (OK-60486).
+   */
+  private hostDisconnectCleanup?: () => void;
 
   private notificationTokens: Map<string, number> = new Map();
 
   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) {
@@ -214,12 +251,6 @@ export default class ElectronBleTransport {
       mtuCleanup();
       this.mtuCleanups.delete(deviceId);
     }
-
-    const disconnectCleanup = this.disconnectCleanups.get(deviceId);
-    if (disconnectCleanup) {
-      disconnectCleanup();
-      this.disconnectCleanups.delete(deviceId);
-    }
   }
 
   init(logger: any, emitter?: EventEmitter) {
@@ -233,9 +264,48 @@ export default class ElectronBleTransport {
       );
     }
 
+    this.subscribeHostDisconnects();
+
     this.Log?.debug('[Electron BLE] Transport initialized');
   }
 
+  /**
+   * One host subscription for the whole transport lifetime. init() can run
+   * again after an SDK reset, so drop the previous listener first rather than
+   * stacking duplicates.
+   */
+  private subscribeHostDisconnects() {
+    this.hostDisconnectCleanup?.();
+    this.hostDisconnectCleanup = window.desktopApi?.nobleBle?.onDeviceDisconnected(
+      (disconnectedDevice: { id: string; name: string; reason?: EBleDisconnectReason }) => {
+        const uuid = disconnectedDevice?.id;
+        if (!uuid) return;
+
+        // The link is gone, so renderer-side state must go with it; the next
+        // acquire reconnects from scratch.
+        this.cleanupDeviceState(uuid);
+
+        // Every link drop is reported, including the main process reclaiming
+        // an idle link on its keep-alive timer: consumers track whether a BLE
+        // link is live, not whether the peripheral is theoretically in range,
+        // and a link we closed ourselves is still a closed link. Nothing
+        // reconnects on its own, so this settles once until the user acts.
+        // `reason` is carried for diagnostics only — behaviour is uniform.
+        this.Log?.debug(
+          '[Electron BLE] Device link dropped:',
+          uuid,
+          disconnectedDevice.reason ?? EBleDisconnectReason.DeviceDisconnected
+        );
+
+        this.emitter?.emit(TRANSPORT_EVENT.DEVICE_DISCONNECT, {
+          name: disconnectedDevice.name,
+          id: uuid,
+          connectId: uuid,
+        });
+      }
+    );
+  }
+
   configure(signedData: any) {
     this._messages = parseConfigure(signedData);
     this.configured = true;
@@ -270,10 +340,6 @@ export default class ElectronBleTransport {
       this.Log?.debug(`[Electron BLE] enumerate found ${devices.length} device(s):`);
       for (const dev of devices) {
         this.Log?.debug(`[Electron BLE]   id="${dev.id}" name="${dev.name}"`);
-        const protocolHint = inferProtocolHintFromDeviceName(dev.name);
-        if (protocolHint) {
-          this.deviceProtocolHints.set(dev.id, protocolHint);
-        }
       }
       return devices.map(device => toBleDescriptor(device));
     } catch (error) {
@@ -284,6 +350,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);
@@ -311,9 +380,7 @@ export default class ElectronBleTransport {
       }
       const protocolHint = expectedProtocol
         ? undefined
-        : input.protocolHint ??
-          this.deviceProtocolHints.get(uuid) ??
-          inferProtocolHintFromDeviceName(device.name);
+        : input.protocolHint ?? this.deviceProtocolHints.get(uuid);
       if (protocolHint) {
         this.deviceProtocolHints.set(uuid, protocolHint);
       }
@@ -322,7 +389,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);
@@ -333,12 +400,15 @@ 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);
       this.notificationCleanups.set(uuid, cleanup);
-      const connectionToken = this.notificationTokens.get(uuid);
 
       const protocolType = await this.detectProtocol(uuid, expectedProtocol, protocolHint);
       if (protocolType === 'V2') {
@@ -349,23 +419,6 @@ export default class ElectronBleTransport {
         });
       }
 
-      const disconnectCleanup = window.desktopApi.nobleBle.onDeviceDisconnected(
-        (disconnectedDevice: any) => {
-          if (
-            disconnectedDevice.id === uuid &&
-            this.notificationTokens.get(uuid) === connectionToken
-          ) {
-            this.cleanupDeviceState(uuid);
-            this.emitter?.emit(TRANSPORT_EVENT.DEVICE_DISCONNECT, {
-              name: disconnectedDevice.name,
-              id: disconnectedDevice.id,
-              connectId: disconnectedDevice.id,
-            });
-          }
-        }
-      );
-      this.disconnectCleanups.set(uuid, disconnectCleanup);
-
       return {
         ...toBleDescriptor({ id: device.id, name: device.name }, protocolType),
         uuid,
@@ -443,9 +496,12 @@ export default class ElectronBleTransport {
     }
   }
 
-  private createProtocolMismatchError(expected: ProtocolType) {
+  private createProtocolMismatchError(expected: ProtocolType, uuid: string) {
+    // A generic Ping miss is not a bond failure. Only a later miss after this
+    // endpoint already answered V2, or a native encryption/pairing error, is.
+    const isStaleV2Bond = expected === 'V2' && this.confirmedProtocolV2.has(uuid);
     return ERRORS.TypedError(
-      HardwareErrorCode.RuntimeError,
+      isStaleV2Bond ? HardwareErrorCode.BleDeviceBondError : HardwareErrorCode.RuntimeError,
       `Device protocol mismatch: expected ${expected}, but device did not respond to expected protocol`
     );
   }
@@ -468,22 +524,30 @@ 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);
+      this.deviceProtocol.set(uuid, 'V1');
+      this.Log?.debug(`[Electron BLE] detectProtocol: uuid=${uuid} -> V1 (expected, no probe)`);
+      return 'V1';
     }
 
     if (expectedProtocol === 'V2') {
       if (await this.probeProtocolV2(uuid)) {
         this.deviceProtocol.set(uuid, 'V2');
+        this.confirmedProtocolV2.add(uuid);
         this.Log?.debug(`[Electron BLE] detectProtocol: uuid=${uuid} -> V2 (expected)`);
         return 'V2';
       }
-      throw this.createProtocolMismatchError(expectedProtocol);
+      throw this.createProtocolMismatchError(expectedProtocol, uuid);
     }
 
     // Protocol must be actively probed after connection. Name, PID, and descriptors only
@@ -494,13 +558,17 @@ export default class ElectronBleTransport {
     for (let i = 0; i < probeOrder.length; i += 1) {
       const protocol = probeOrder[i];
       if (i > 0) {
-        // Reset subscriptions and buffers after a failed probe before trying another protocol.
+        // Keep the physical BLE link while switching probes. Reconnecting here can
+        // summon a second OS pairing prompt for a device that is still onboarding.
         await this.resetProbeStateAfterProtocolProbe(uuid, probeOrder[i - 1]);
       }
       const detected =
         protocol === 'V1' ? await this.probeProtocolV1(uuid) : await this.probeProtocolV2(uuid);
       if (detected) {
         this.deviceProtocol.set(uuid, protocol);
+        if (protocol === 'V2') {
+          this.confirmedProtocolV2.add(uuid);
+        }
         this.Log?.debug(`[Electron BLE] detectProtocol: uuid=${uuid} -> ${protocol}`);
         return protocol;
       }
@@ -541,36 +609,13 @@ export default class ElectronBleTransport {
       this.runPromiseDeviceId = null;
     }
 
-    const notifyCleanup = this.notificationCleanups.get(uuid);
-    if (notifyCleanup) {
-      notifyCleanup();
-      this.notificationCleanups.delete(uuid);
-    }
-    this.notificationTokens.delete(uuid);
-
-    try {
-      await window.desktopApi?.nobleBle?.unsubscribe(uuid);
-    } catch (error) {
-      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);
-      await this.refreshBlePacketCapacity(uuid);
-    } catch (error) {
-      this.Log?.debug(`[Electron BLE] reconnect after Protocol ${protocol} probe failed:`, error);
-      throw error;
+    // A timed-out V1 probe retires its renderer notification token so a late V1
+    // response cannot satisfy the V2 probe. Install a fresh listener without
+    // touching the native GATT subscription or physical connection.
+    if (!this.notificationCleanups.has(uuid)) {
+      const cleanup = this.createNotificationSubscription(uuid);
+      this.notificationCleanups.set(uuid, cleanup);
     }
-
-    const cleanup = this.createNotificationSubscription(uuid);
-    this.notificationCleanups.set(uuid, cleanup);
   }
 
   private async probeProtocolV1(uuid: string) {
@@ -587,6 +632,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;
     }
   }
@@ -607,6 +655,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');
@@ -620,7 +670,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> {
@@ -694,9 +752,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);
@@ -806,16 +884,25 @@ export default class ElectronBleTransport {
         `Device protocol has not been detected for ${uuid}`
       );
     }
-    if (!shouldSuppressHighVolumeCallLog(name)) {
-      this.Log?.debug('transport call', createTransportCallLog(name, protocol, data));
-    }
-
     if (protocol === 'V2') {
       return this.callProtocolV2(uuid, name, data, options);
     }
     return this.callProtocolV1(uuid, name, data, options);
   }
 
+  async post(uuid: string, name: string, data: Record<string, unknown>) {
+    if (this.deviceProtocol.get(uuid) === 'V2') {
+      await this.protocolV2Links.sendFlowControl(
+        uuid,
+        () => this.createProtocolV2Adapter(uuid),
+        name,
+        data
+      );
+      return;
+    }
+    await this.callProtocolV1(uuid, name, data);
+  }
+
   private async callProtocolV1(
     uuid: string,
     name: string,