@onekeyfe/hardware-cli 1.2.2-alpha.1 → 1.2.2-alpha.100

package/dist/transports/nobleBlePlugin.js

@@ -20,7 +20,6 @@ const connectedDevices = new Map();
 const deviceCharacteristics = new Map();
 const notificationStates = new Map();
 const notificationGenerations = new Map();
-const disconnectListeners = new Map();
 function isOneKeyPeripheral(peripheral) {
     const serviceUuids = peripheral.advertisement?.serviceUuids;
     return ((0, hd_shared_1.hasOnekeyCommunicationService)(serviceUuids) &&
@@ -64,32 +63,11 @@ function clearNotificationState(deviceId, reason) {
     if (!state)
         return;
     notificationStates.delete(deviceId);
-    const error = reason instanceof Error ? reason : new Error(reason);
+    const error = new Error(reason);
     state.pendingReceivers.forEach(receiver => receiver.reject(error));
     state.pendingReceivers.clear();
     state.queue.length = 0;
 }
-function removeDisconnectListener(deviceId) {
-    const tracked = disconnectListeners.get(deviceId);
-    if (!tracked)
-        return;
-    tracked.peripheral.removeListener('disconnect', tracked.listener);
-    disconnectListeners.delete(deviceId);
-}
-function trackUnexpectedDisconnect(deviceId, peripheral) {
-    removeDisconnectListener(deviceId);
-    const listener = (reason) => {
-        removeDisconnectListener(deviceId);
-        if (connectedDevices.get(deviceId) !== peripheral)
-            return;
-        deviceCharacteristics.get(deviceId)?.notify.removeAllListeners('data');
-        connectedDevices.delete(deviceId);
-        deviceCharacteristics.delete(deviceId);
-        clearNotificationState(deviceId, hd_shared_1.ERRORS.TypedError(hd_shared_1.HardwareErrorCode.BleDeviceDisconnected, reason || `BLE device disconnected: ${deviceId}`));
-    };
-    disconnectListeners.set(deviceId, { peripheral, listener });
-    peripheral.on('disconnect', listener);
-}
 function waitForNobleCleanup(registerCallback) {
     return new Promise(resolve => {
         let completed = false;
@@ -302,7 +280,6 @@ function writeCharacteristic(characteristic, buffer, withoutResponse) {
 async function disconnectDevice(uuid) {
     const peripheral = connectedDevices.get(uuid);
     const characteristics = deviceCharacteristics.get(uuid);
-    removeDisconnectListener(uuid);
     clearNotificationState(uuid, `BLE device disconnected: ${uuid}`);
     if (characteristics) {
         characteristics.notify.removeAllListeners('data');
@@ -344,10 +321,8 @@ function createNobleBlePlugin() {
                 await subscribeNotifications(uuid, notificationState.generation, characteristics.notify);
                 connectedDevices.set(uuid, peripheral);
                 deviceCharacteristics.set(uuid, characteristics);
-                trackUnexpectedDisconnect(uuid, peripheral);
             }
             catch (error) {
-                removeDisconnectListener(uuid);
                 clearNotificationState(uuid, `BLE notification subscription failed: ${uuid}`);
                 if (characteristics) {
                     characteristics.notify.removeAllListeners('data');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hardware-cli",
-  "version": "1.2.2-alpha.1",
+  "version": "1.2.2-alpha.100",
   "description": "OneKey hardware wallet CLI for testing device communication",
   "author": "OneKey",
   "license": "Apache-2.0",
@@ -31,12 +31,12 @@
     "test": "jest"
   },
   "dependencies": {
-    "@onekeyfe/hd-common-connect-sdk": "1.2.2-alpha.1",
-    "@onekeyfe/hd-core": "1.2.2-alpha.1",
-    "@onekeyfe/hd-shared": "1.2.2-alpha.1",
-    "@onekeyfe/hd-transport-usb": "1.2.2-alpha.1",
+    "@onekeyfe/hd-common-connect-sdk": "1.2.2-alpha.100",
+    "@onekeyfe/hd-core": "1.2.2-alpha.100",
+    "@onekeyfe/hd-shared": "1.2.2-alpha.100",
+    "@onekeyfe/hd-transport-usb": "1.2.2-alpha.100",
     "@stoprocent/noble": "2.3.16",
     "commander": "^12.0.0"
   },
-  "gitHead": "66f45610d36e06a46ac82cd49a4b0e1a128f19d4"
+  "gitHead": "c40dad085297b0e3cc2020bd218c146dff6ed3e1"
 }

package/src/__tests__/noble-ble-plugin.test.ts

@@ -1,5 +1,4 @@
 import { EventEmitter } from 'events';
-import { HardwareErrorCode } from '@onekeyfe/hd-shared';
 
 type MockCharacteristic = EventEmitter & {
   uuid: string;
@@ -28,19 +27,18 @@ const createPeripheral = (id: string) => {
     uuid: '0001',
     discoverCharacteristics: jest.fn((_uuids, callback) => callback(null, [write, notify])),
   };
-  const peripheral = Object.assign(new EventEmitter(), {
-    id,
-    state: 'connected',
-    advertisement: {
-      localName: `OneKey Pro 2 ${id}`,
-      serviceUuids: ['0001'],
-    },
-    discoverServices: jest.fn((_uuids, callback) => callback(null, [service])),
-    connect: jest.fn(callback => callback()),
-    disconnect: jest.fn(callback => callback()),
-  });
   return {
-    peripheral,
+    peripheral: {
+      id,
+      state: 'connected',
+      advertisement: {
+        localName: `OneKey Pro 2 ${id}`,
+        serviceUuids: ['0001'],
+      },
+      discoverServices: jest.fn((_uuids, callback) => callback(null, [service])),
+      connect: jest.fn(callback => callback()),
+      disconnect: jest.fn(callback => callback()),
+    },
     service,
     write,
     notify,
@@ -179,38 +177,6 @@ describe('Noble BLE plugin notification routing', () => {
     expect(result).toBe('completed');
   });
 
-  test('rejects a pending receive when the peripheral disconnects unexpectedly', async () => {
-    const device = createPeripheral('device-a');
-    const noble = new EventEmitter() as EventEmitter & {
-      state: string;
-      startScanning: jest.Mock;
-      stopScanning: jest.Mock;
-    };
-    noble.state = 'poweredOn';
-    noble.startScanning = jest.fn((_services, _duplicates, callback) => {
-      callback?.();
-      noble.emit('discover', device.peripheral);
-    });
-    noble.stopScanning = jest.fn(callback => callback?.());
-    jest.doMock('@stoprocent/noble', () => noble);
-
-    const { createNobleBlePlugin } = await import('../transports/nobleBlePlugin');
-    const plugin = createNobleBlePlugin();
-    await plugin.init();
-    await plugin.connect('device-a');
-
-    const receive = plugin.receive('device-a');
-    device.peripheral.state = 'disconnected';
-    device.peripheral.emit('disconnect', 'Remote User Terminated Connection');
-
-    await expect(receive).rejects.toMatchObject({
-      errorCode: HardwareErrorCode.BleDeviceDisconnected,
-    });
-    await expect(plugin.receive('device-a')).rejects.toMatchObject({
-      errorCode: HardwareErrorCode.TransportNotFound,
-    });
-  });
-
   test('disconnects an untracked peripheral when service discovery fails', async () => {
     const device = createPeripheral('device-a');
     device.peripheral.discoverServices.mockImplementation((_uuids, callback) =>

package/src/transports/nobleBlePlugin.ts

@@ -43,11 +43,6 @@ type NobleNotificationState = {
   pendingReceivers: Set<NoblePendingReceiver>;
 };
 
-type NobleDisconnectListener = {
-  peripheral: Peripheral;
-  listener: (reason: string) => void;
-};
-
 const ONEKEY_SERVICE_UUIDS = [ONEKEY_SERVICE_UUID];
 const ONEKEY_SERVICE_UUID_ALIASES = createKnownBleUuidAliases(ONEKEY_SERVICE_UUID);
 const ONEKEY_WRITE_UUID_ALIASES = createKnownBleUuidAliases(ONEKEY_WRITE_CHARACTERISTIC_UUID);
@@ -68,7 +63,6 @@ const connectedDevices = new Map<string, Peripheral>();
 const deviceCharacteristics = new Map<string, CharacteristicPair>();
 const notificationStates = new Map<string, NobleNotificationState>();
 const notificationGenerations = new Map<string, number>();
-const disconnectListeners = new Map<string, NobleDisconnectListener>();
 
 function isOneKeyPeripheral(peripheral: Peripheral) {
   const serviceUuids = peripheral.advertisement?.serviceUuids;
@@ -114,45 +108,17 @@ function createNotificationState(deviceId: string) {
   return state;
 }
 
-function clearNotificationState(deviceId: string, reason: string | Error) {
+function clearNotificationState(deviceId: string, reason: string) {
   const state = notificationStates.get(deviceId);
   if (!state) return;
 
   notificationStates.delete(deviceId);
-  const error = reason instanceof Error ? reason : new Error(reason);
+  const error = new Error(reason);
   state.pendingReceivers.forEach(receiver => receiver.reject(error));
   state.pendingReceivers.clear();
   state.queue.length = 0;
 }
 
-function removeDisconnectListener(deviceId: string) {
-  const tracked = disconnectListeners.get(deviceId);
-  if (!tracked) return;
-  tracked.peripheral.removeListener('disconnect', tracked.listener);
-  disconnectListeners.delete(deviceId);
-}
-
-function trackUnexpectedDisconnect(deviceId: string, peripheral: Peripheral) {
-  removeDisconnectListener(deviceId);
-  const listener = (reason: string) => {
-    removeDisconnectListener(deviceId);
-    if (connectedDevices.get(deviceId) !== peripheral) return;
-
-    deviceCharacteristics.get(deviceId)?.notify.removeAllListeners('data');
-    connectedDevices.delete(deviceId);
-    deviceCharacteristics.delete(deviceId);
-    clearNotificationState(
-      deviceId,
-      ERRORS.TypedError(
-        HardwareErrorCode.BleDeviceDisconnected,
-        reason || `BLE device disconnected: ${deviceId}`
-      )
-    );
-  };
-  disconnectListeners.set(deviceId, { peripheral, listener });
-  peripheral.on('disconnect', listener);
-}
-
 function waitForNobleCleanup(registerCallback: (callback: () => void) => void) {
   return new Promise<void>(resolve => {
     let completed = false;
@@ -411,7 +377,6 @@ function writeCharacteristic(
 async function disconnectDevice(uuid: string) {
   const peripheral = connectedDevices.get(uuid);
   const characteristics = deviceCharacteristics.get(uuid);
-  removeDisconnectListener(uuid);
   clearNotificationState(uuid, `BLE device disconnected: ${uuid}`);
   if (characteristics) {
     characteristics.notify.removeAllListeners('data');
@@ -460,9 +425,7 @@ export function createNobleBlePlugin(): LowlevelTransportSharedPlugin {
         await subscribeNotifications(uuid, notificationState.generation, characteristics.notify);
         connectedDevices.set(uuid, peripheral);
         deviceCharacteristics.set(uuid, characteristics);
-        trackUnexpectedDisconnect(uuid, peripheral);
       } catch (error) {
-        removeDisconnectListener(uuid);
         clearNotificationState(uuid, `BLE notification subscription failed: ${uuid}`);
         if (characteristics) {
           characteristics.notify.removeAllListeners('data');