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

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, createDeferred } from '@onekeyfe/hd-shared';
+import { EBleDisconnectReason, HardwareErrorCode, createDeferred } from '@onekeyfe/hd-shared';
 import EventEmitter from 'events';
 
 import ElectronBleTransport from '../src/electron-ble-transport';
@@ -134,6 +134,30 @@ const configureTransport = (
   return transport;
 };
 
+/**
+ * Wire the mock so acquire()'s Protocol V2 probe gets an answer. Without it
+ * detectProtocol throws and the test never reaches the disconnect behaviour.
+ */
+const echoProtocolV2 = (nobleBle: ReturnType<typeof createNobleBle>, deviceId: string) => {
+  let notificationHandler: ((id: string, data: string) => void) | undefined;
+  nobleBle.onNotification.mockImplementation(handler => {
+    notificationHandler = handler;
+    return jest.fn();
+  });
+  let responseSeq = 0;
+  nobleBle.write.mockImplementation(() => {
+    responseSeq += 1;
+    const response = ProtocolV2.encodeFrame(
+      schemas,
+      'Success',
+      { message: 'ok' },
+      { router: PROTOCOL_V2_CHANNEL_BLE_UART, seq: responseSeq }
+    );
+    setTimeout(() => notificationHandler?.(deviceId, bytesToHex(response)), 0);
+    return Promise.resolve();
+  });
+};
+
 describe('ElectronBleTransport protocol detection', () => {
   afterEach(() => {
     delete (global as any).window;
@@ -624,21 +648,19 @@ describe('ElectronBleTransport protocol detection', () => {
     }
   });
 
-  test('ignores a delayed disconnect event from the previous BLE connection', async () => {
-    const device = { id: 'delayed-disconnect-pro2-id', name: 'OneKey Pro 2' };
+  test('subscribes to host disconnects once for the transport lifetime', async () => {
+    // The previous design registered a listener inside every acquire() and
+    // overwrote the cleanup entry without disposing the old one, so each
+    // acquire leaked a live handler and a delayed event from a superseded
+    // connection could tear down the current one. One transport-lifetime
+    // subscription removes that whole class of bug.
+    const device = { id: 'single-subscription-pro2-id', name: 'OneKey Pro 2' };
     const nobleBle = createNobleBle(device);
     let notificationHandler: ((deviceId: string, data: string) => void) | undefined;
-    const disconnectHandlers: Array<
-      (disconnectedDevice: { id: string; name: string | null }) => void
-    > = [];
     nobleBle.onNotification.mockImplementation(handler => {
       notificationHandler = handler;
       return jest.fn();
     });
-    nobleBle.onDeviceDisconnected.mockImplementation(handler => {
-      disconnectHandlers.push(handler);
-      return jest.fn();
-    });
     let responseSeq = 0;
     nobleBle.write.mockImplementation(() => {
       responseSeq += 1;
@@ -654,14 +676,15 @@ describe('ElectronBleTransport protocol detection', () => {
     const bleTransport = configureTransport(nobleBle);
 
     try {
+      expect(nobleBle.onDeviceDisconnected).toHaveBeenCalledTimes(1);
+
       await bleTransport.acquire({ uuid: device.id, expectedProtocol: 'V2' });
       await bleTransport.acquire({ uuid: device.id, expectedProtocol: 'V2' });
 
-      disconnectHandlers[0]?.(device);
-
+      expect(nobleBle.onDeviceDisconnected).toHaveBeenCalledTimes(1);
       expect(bleTransport.getProtocolType(device.id)).toBe('V2');
       await expect(
-        bleTransport.call(device.id, 'Ping', { message: 'after-stale-disconnect' })
+        bleTransport.call(device.id, 'Ping', { message: 'after-reacquire' })
       ).resolves.toEqual({
         type: 'Success',
         message: { message: 'ok' },
@@ -671,6 +694,95 @@ describe('ElectronBleTransport protocol detection', () => {
     }
   });
 
+  test('reports a device that drops after a logical release (OK-60486)', async () => {
+    // A logical release keeps the native link alive for the keep-alive window.
+    // A drop during that window must still reach consumers, or the UI keeps
+    // showing the device as connected forever.
+    const device = { id: 'idle-drop-pro2-id', name: 'OneKey Pro 2' };
+    const nobleBle = createNobleBle(device);
+    const emitter = new EventEmitter();
+    let disconnectHandler:
+      | ((d: { id: string; name: string; reason?: EBleDisconnectReason }) => void)
+      | undefined;
+    nobleBle.onDeviceDisconnected.mockImplementation(handler => {
+      disconnectHandler = handler;
+      return jest.fn();
+    });
+    echoProtocolV2(nobleBle, device.id);
+    const transportDisconnect = jest.fn();
+    emitter.on('transport-device-disconnect', transportDisconnect);
+    const bleTransport = configureTransport(nobleBle, emitter);
+
+    await bleTransport.acquire({ uuid: device.id, expectedProtocol: 'V2' });
+    await bleTransport.release(device.id);
+
+    disconnectHandler?.({ ...device, reason: EBleDisconnectReason.DeviceDisconnected });
+
+    expect(transportDisconnect).toHaveBeenCalledWith({
+      id: device.id,
+      connectId: device.id,
+      name: device.name,
+    });
+  });
+
+  test('reports an idle keep-alive release as a device disconnect', async () => {
+    // The main process reclaims idle links on its own timer. That is still a
+    // closed link, and consumers track link liveness, so it is reported like
+    // any other drop. Nothing reconnects on its own, so the state settles once
+    // until the user acts.
+    const device = { id: 'keep-alive-pro2-id', name: 'OneKey Pro 2' };
+    const nobleBle = createNobleBle(device);
+    const emitter = new EventEmitter();
+    let disconnectHandler:
+      | ((d: { id: string; name: string; reason?: EBleDisconnectReason }) => void)
+      | undefined;
+    nobleBle.onDeviceDisconnected.mockImplementation(handler => {
+      disconnectHandler = handler;
+      return jest.fn();
+    });
+    echoProtocolV2(nobleBle, device.id);
+    const transportDisconnect = jest.fn();
+    emitter.on('transport-device-disconnect', transportDisconnect);
+    const bleTransport = configureTransport(nobleBle, emitter);
+
+    await bleTransport.acquire({ uuid: device.id, expectedProtocol: 'V2' });
+    disconnectHandler?.({ ...device, reason: EBleDisconnectReason.IdleKeepAlive });
+
+    expect(transportDisconnect).toHaveBeenCalledWith({
+      id: device.id,
+      connectId: device.id,
+      name: device.name,
+    });
+    // The link really is gone, so cached link state must be dropped too.
+    expect(bleTransport.getProtocolType(device.id)).toBeUndefined();
+  });
+
+  test('treats a disconnect with no reason as a real device drop', async () => {
+    // An older host bridge does not send `reason`; defaulting to "device left"
+    // preserves the pre-existing behaviour rather than silently ignoring it.
+    const device = { id: 'legacy-host-pro2-id', name: 'OneKey Pro 2' };
+    const nobleBle = createNobleBle(device);
+    const emitter = new EventEmitter();
+    let disconnectHandler: ((d: { id: string; name: string }) => void) | undefined;
+    nobleBle.onDeviceDisconnected.mockImplementation(handler => {
+      disconnectHandler = handler;
+      return jest.fn();
+    });
+    echoProtocolV2(nobleBle, device.id);
+    const transportDisconnect = jest.fn();
+    emitter.on('transport-device-disconnect', transportDisconnect);
+    const bleTransport = configureTransport(nobleBle, emitter);
+
+    await bleTransport.acquire({ uuid: device.id, expectedProtocol: 'V2' });
+    disconnectHandler?.(device);
+
+    expect(transportDisconnect).toHaveBeenCalledWith({
+      id: device.id,
+      connectId: device.id,
+      name: device.name,
+    });
+  });
+
   test('preserves the active Protocol V2 link when the same schema is configured again', async () => {
     const device = { id: 'stable-schema-pro2-id', name: 'OneKey Pro 2' };
     const nobleBle = createNobleBle(device);

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

@@ -38,12 +38,13 @@ export default class ElectronBleTransport {
     private warnedMissingRelease;
     private notificationCleanups;
     private mtuCleanups;
-    private disconnectCleanups;
+    private hostDisconnectCleanup?;
     private notificationTokens;
     private nextNotificationToken;
     private handleBluetoothError;
     private cleanupDeviceState;
     init(logger: any, emitter?: EventEmitter): void;
+    private subscribeHostDisconnects;
     configure(signedData: any): void;
     configureProtocolV2(signedData: any): void;
     listen(): Promise<OneKeyDeviceInfo[]>;

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;IAChC,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B,CAAC;AAiCF,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;IAGnE,OAAO,CAAC,mBAAmB,CAAqB;IAEhD,OAAO,CAAC,UAAU,CAAkC;IAEpD,OAAO,CAAC,sBAAsB,CAAkC;IAEhE,OAAO,CAAC,SAAS,CAAsE;IAEvF,OAAO,CAAC,YAAY,CAAoD;IAExE,OAAO,CAAC,aAAa,CAAwC;IAE7D,OAAO,CAAC,eAAe,CAAgD;IAEvE,OAAO,CAAC,eAAe,CAmBpB;IAGH,OAAO,CAAC,oBAAoB,CAAS;IAErC,OAAO,CAAC,oBAAoB,CAAsC;IAElE,OAAO,CAAC,WAAW,CAAsC;IAEzD,OAAO,CAAC,kBAAkB,CAAsC;IAEhE,OAAO,CAAC,kBAAkB,CAAkC;IAE5D,OAAO,CAAC,qBAAqB,CAAK;IAElC,OAAO,CAAC,oBAAoB;IA+B5B,OAAO,CAAC,kBAAkB;IAuC1B,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;IAiBxC,OAAO,CAAC,KAAK,EAAE,eAAe;;;;;;;;;;;IAqG9B,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,OAAO;IAY7D,UAAU,CAAC,EAAE,EAAE,MAAM;YAKb,aAAa;YAiBb,cAAc;IAwB5B,OAAO,CAAC,2BAA2B;IAUnC,OAAO,CAAC,4BAA4B;IAOpC,OAAO,CAAC,kBAAkB;YAMZ,cAAc;IAoD5B,OAAO,CAAC,8BAA8B;YAgBxB,iCAAiC;YAwBjC,eAAe;YAkBf,eAAe;YAuBf,SAAS;YAST,wBAAwB;IAKtC,OAAO,CAAC,uBAAuB;IAc/B,OAAO,CAAC,qBAAqB;IAU7B,OAAO,CAAC,oBAAoB;IAqB5B,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;IAuB1B,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;YAatD,cAAc;YAqFd,cAAc;IA0B5B,OAAO,CAAC,uBAAuB;IAyC/B,OAAO,CAAC,6BAA6B;IA4CrC,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":"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"}

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 import * as _onekeyfe_hd_transport from '@onekeyfe/hd-transport';
 import _onekeyfe_hd_transport__default, { ProtocolV2UsbTransportBase, AcquireInput, TransportCallOptions, ProtocolV2Schemas, ProtocolV2CallContext, ProtocolType, OneKeyDeviceInfoBase, OneKeyDeviceInfo } from '@onekeyfe/hd-transport';
+import EventEmitter from 'events';
 import { Deferred } from '@onekeyfe/hd-shared';
 import { DesktopAPI } from '@onekeyfe/hd-transport-electron';
-import EventEmitter from 'events';
 
 /**
  * Device information with path and WebUSB device instance
@@ -42,6 +42,7 @@ declare class WebUsbTransport extends ProtocolV2UsbTransportBase<string> {
     configured: boolean;
     Log?: any;
     usb?: USB;
+    emitter?: EventEmitter;
     /**
      * Cached list of connected devices
      * This is essential for maintaining device references between operations
@@ -54,7 +55,12 @@ declare class WebUsbTransport extends ProtocolV2UsbTransportBase<string> {
     /**
      * Initialize WebUSB transport
      */
-    init(logger: any): void;
+    init(logger: any, emitter?: EventEmitter): void;
+    /**
+     * Announce that a USB device left. Called from the module-scoped disconnect
+     * listener, which is why it is public rather than inlined.
+     */
+    emitDeviceDisconnect(path: string, device?: USBDevice): void;
     /**
      * Protocol type is a property of the physical device keyed by USB serial number.
      * It can only change across a device reboot (e.g. normal ↔ bootloader mode), and
@@ -223,12 +229,26 @@ declare class ElectronBleTransport {
     private warnedMissingRelease;
     private notificationCleanups;
     private mtuCleanups;
-    private disconnectCleanups;
+    /**
+     * 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?;
     private notificationTokens;
     private nextNotificationToken;
     private handleBluetoothError;
     private cleanupDeviceState;
     init(logger: any, emitter?: EventEmitter): void;
+    /**
+     * 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;
     configure(signedData: any): void;
     configureProtocolV2(signedData: any): void;
     listen(): Promise<OneKeyDeviceInfo[]>;

package/dist/index.js

@@ -68,6 +68,7 @@ function registerActiveWebUsbTransport(instance, usb) {
         if (!path)
             return;
         activeWebUsbTransport === null || activeWebUsbTransport === void 0 ? void 0 : activeWebUsbTransport.markProtocolStale(path);
+        activeWebUsbTransport === null || activeWebUsbTransport === void 0 ? void 0 : activeWebUsbTransport.emitDeviceDisconnect(path, event.device);
     });
 }
 class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
@@ -91,8 +92,9 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
         this.endpointId = ENDPOINT_ID;
         this.interfaceId = INTERFACE_ID;
     }
-    init(logger) {
+    init(logger, emitter) {
         this.Log = logger;
+        this.emitter = emitter;
         const { usb } = navigator;
         if (!usb) {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'WebUSB is not supported by current browsers');
@@ -100,6 +102,14 @@ class WebUsbTransport extends transport.ProtocolV2UsbTransportBase {
         this.usb = usb;
         registerActiveWebUsbTransport(this, usb);
     }
+    emitDeviceDisconnect(path, device) {
+        var _a, _b;
+        (_a = this.emitter) === null || _a === void 0 ? void 0 : _a.emit(transport.TRANSPORT_EVENT.DEVICE_DISCONNECT, {
+            name: (_b = device === null || device === void 0 ? void 0 : device.productName) !== null && _b !== void 0 ? _b : '',
+            id: path,
+            connectId: path,
+        });
+    }
     markProtocolStale(path) {
         this.staleProtocolPaths.add(path);
         this.probedDeviceObjects.delete(path);
@@ -839,7 +849,6 @@ class ElectronBleTransport {
         this.warnedMissingRelease = false;
         this.notificationCleanups = new Map();
         this.mtuCleanups = new Map();
-        this.disconnectCleanups = new Map();
         this.notificationTokens = new Map();
         this.nextNotificationToken = 1;
     }
@@ -899,11 +908,6 @@ class ElectronBleTransport {
             mtuCleanup();
             this.mtuCleanups.delete(deviceId);
         }
-        const disconnectCleanup = this.disconnectCleanups.get(deviceId);
-        if (disconnectCleanup) {
-            disconnectCleanup();
-            this.disconnectCleanups.delete(deviceId);
-        }
     }
     init(logger, emitter) {
         var _a, _b;
@@ -912,8 +916,26 @@ class ElectronBleTransport {
         if (!((_a = window.desktopApi) === null || _a === void 0 ? void 0 : _a.nobleBle)) {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Noble BLE API is not available. Please ensure you are running in Electron with Noble support.');
         }
+        this.subscribeHostDisconnects();
         (_b = this.Log) === null || _b === void 0 ? void 0 : _b.debug('[Electron BLE] Transport initialized');
     }
+    subscribeHostDisconnects() {
+        var _a, _b, _c;
+        (_a = this.hostDisconnectCleanup) === null || _a === void 0 ? void 0 : _a.call(this);
+        this.hostDisconnectCleanup = (_c = (_b = window.desktopApi) === null || _b === void 0 ? void 0 : _b.nobleBle) === null || _c === void 0 ? void 0 : _c.onDeviceDisconnected((disconnectedDevice) => {
+            var _a, _b, _c;
+            const uuid = disconnectedDevice === null || disconnectedDevice === void 0 ? void 0 : disconnectedDevice.id;
+            if (!uuid)
+                return;
+            this.cleanupDeviceState(uuid);
+            (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug('[Electron BLE] Device link dropped:', uuid, (_b = disconnectedDevice.reason) !== null && _b !== void 0 ? _b : hdShared.EBleDisconnectReason.DeviceDisconnected);
+            (_c = this.emitter) === null || _c === void 0 ? void 0 : _c.emit(transport.TRANSPORT_EVENT.DEVICE_DISCONNECT, {
+                name: disconnectedDevice.name,
+                id: uuid,
+                connectId: uuid,
+            });
+        });
+    }
     configure(signedData) {
         this._messages = parseConfigure(signedData);
         this.configured = true;
@@ -1004,7 +1026,6 @@ class ElectronBleTransport {
                 yield this.refreshBlePacketCapacity(uuid);
                 const cleanup = this.createNotificationSubscription(uuid);
                 this.notificationCleanups.set(uuid, cleanup);
-                const connectionToken = this.notificationTokens.get(uuid);
                 const protocolType = yield this.detectProtocol(uuid, expectedProtocol, protocolHint);
                 if (protocolType === 'V2') {
                     (_c = this.Log) === null || _c === void 0 ? void 0 : _c.debug('[Electron BLE] Protocol V2 write configured', {
@@ -1013,19 +1034,6 @@ class ElectronBleTransport {
                         packetCapacity: (_d = this.devicePacketCapacities.get(uuid)) !== null && _d !== void 0 ? _d : BLE_PACKET_SIZE_FALLBACK,
                     });
                 }
-                const disconnectCleanup = window.desktopApi.nobleBle.onDeviceDisconnected((disconnectedDevice) => {
-                    var _a;
-                    if (disconnectedDevice.id === uuid &&
-                        this.notificationTokens.get(uuid) === connectionToken) {
-                        this.cleanupDeviceState(uuid);
-                        (_a = this.emitter) === null || _a === void 0 ? void 0 : _a.emit(transport.TRANSPORT_EVENT.DEVICE_DISCONNECT, {
-                            name: disconnectedDevice.name,
-                            id: disconnectedDevice.id,
-                            connectId: disconnectedDevice.id,
-                        });
-                    }
-                });
-                this.disconnectCleanups.set(uuid, disconnectCleanup);
                 return Object.assign(Object.assign({}, toBleDescriptor({ id: device.id, name: device.name }, protocolType)), { uuid });
             }
             catch (error) {

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;
@@ -21,12 +23,14 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     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;

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

package/src/electron-ble-transport.ts

@@ -11,6 +11,7 @@ import transport, {
   writeProtocolV2BleFrame,
 } from '@onekeyfe/hd-transport';
 import {
+  EBleDisconnectReason,
   ERRORS,
   HardwareErrorCode,
   HardwareErrorCodeMessage,
@@ -144,7 +145,15 @@ 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();
 
@@ -212,12 +221,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) {
@@ -231,9 +234,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;
@@ -330,7 +372,6 @@ export default class ElectronBleTransport {
 
       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') {
@@ -341,23 +382,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,

package/src/webusb.ts

@@ -8,6 +8,7 @@ import transport, {
   PROTOCOL_V2_FRAME_MAX_BYTES,
   ProtocolV2LinkError,
   ProtocolV2UsbTransportBase,
+  TRANSPORT_EVENT,
   probeProtocolV2 as probeProtocolV2Helper,
 } from '@onekeyfe/hd-transport';
 import {
@@ -21,6 +22,7 @@ import {
 } from '@onekeyfe/hd-shared';
 import ByteBuffer from 'bytebuffer';
 
+import type EventEmitter from 'events';
 import type {
   AcquireInput,
   OneKeyDeviceInfoBase,
@@ -87,6 +89,10 @@ function registerActiveWebUsbTransport(instance: WebUsbTransport, usb: USB) {
     const path = resolveOneKeyUsbDevicePath(event.device);
     if (!path) return;
     activeWebUsbTransport?.markProtocolStale(path);
+    // WebUSB has no device-list poller behind it, so this event is the only
+    // signal that the device is gone. Without it consumers never see a
+    // DEVICE.DISCONNECT for USB (OK-60486).
+    activeWebUsbTransport?.emitDeviceDisconnect(path, event.device);
   });
 }
 
@@ -134,6 +140,8 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
 
   usb?: USB;
 
+  emitter?: EventEmitter;
+
   /**
    * Cached list of connected devices
    * This is essential for maintaining device references between operations
@@ -157,8 +165,9 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
   /**
    * Initialize WebUSB transport
    */
-  init(logger: any) {
+  init(logger: any, emitter?: EventEmitter) {
     this.Log = logger;
+    this.emitter = emitter;
 
     const { usb } = navigator;
     if (!usb) {
@@ -171,6 +180,18 @@ export default class WebUsbTransport extends ProtocolV2UsbTransportBase<string>
     registerActiveWebUsbTransport(this, usb);
   }
 
+  /**
+   * Announce that a USB device left. Called from the module-scoped disconnect
+   * listener, which is why it is public rather than inlined.
+   */
+  emitDeviceDisconnect(path: string, device?: USBDevice) {
+    this.emitter?.emit(TRANSPORT_EVENT.DEVICE_DISCONNECT, {
+      name: device?.productName ?? '',
+      id: path,
+      connectId: path,
+    });
+  }
+
   /**
    * Protocol type is a property of the physical device keyed by USB serial number.
    * It can only change across a device reboot (e.g. normal ↔ bootloader mode), and