@onekeyfe/hardware-cli 1.2.0-alpha.11 → 1.2.0-alpha.13

package/dist/transports/nobleBlePlugin.js

@@ -16,7 +16,6 @@ const CONNECTION_TIMEOUT = 8000;
 const SERVICE_DISCOVERY_TIMEOUT = 10000;
 const BLE_CLEANUP_TIMEOUT = 100;
 const BLE_PACKET_SIZE = 192;
-const BLE_WRITE_DELAY = 5;
 const BLE_ENCRYPTION_ERROR_PATTERNS = [/encryption is insufficient/i, /insufficient encryption/i];
 let noble = null;
 let nobleReadyPromise = null;
@@ -288,9 +287,9 @@ function subscribeNotifications(deviceId, generation, notifyCharacteristic) {
         throw hd_shared_1.ERRORS.TypedError(hd_shared_1.HardwareErrorCode.BleCharacteristicNotifyChangeFailure);
     });
 }
-function writeCharacteristic(characteristic, buffer) {
+function writeCharacteristic(characteristic, buffer, withoutResponse) {
     return new Promise((resolve, reject) => {
-        characteristic.write(buffer, true, (error) => {
+        characteristic.write(buffer, withoutResponse, (error) => {
             if (error) {
                 reject(error);
                 return;
@@ -359,10 +358,7 @@ function createNobleBlePlugin() {
             const buffer = Buffer.from(data, 'hex');
             for (let offset = 0; offset < buffer.length; offset += BLE_PACKET_SIZE) {
                 const chunk = buffer.subarray(offset, Math.min(offset + BLE_PACKET_SIZE, buffer.length));
-                await writeCharacteristic(characteristics.write, chunk);
-                if (offset + BLE_PACKET_SIZE < buffer.length) {
-                    await (0, hd_shared_1.wait)(BLE_WRITE_DELAY);
-                }
+                await writeCharacteristic(characteristics.write, chunk, true);
             }
         },
         async receive(uuid) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hardware-cli",
-  "version": "1.2.0-alpha.11",
+  "version": "1.2.0-alpha.13",
   "description": "OneKey hardware wallet CLI for testing device communication",
   "author": "OneKey",
   "license": "Apache-2.0",
@@ -30,12 +30,12 @@
     "test": "jest"
   },
   "dependencies": {
-    "@onekeyfe/hd-common-connect-sdk": "1.2.0-alpha.11",
-    "@onekeyfe/hd-core": "1.2.0-alpha.11",
-    "@onekeyfe/hd-shared": "1.2.0-alpha.11",
-    "@onekeyfe/hd-transport-usb": "1.2.0-alpha.11",
+    "@onekeyfe/hd-common-connect-sdk": "1.2.0-alpha.13",
+    "@onekeyfe/hd-core": "1.2.0-alpha.13",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.13",
+    "@onekeyfe/hd-transport-usb": "1.2.0-alpha.13",
     "@stoprocent/noble": "2.3.16",
     "commander": "^12.0.0"
   },
-  "gitHead": "05d3421ec00e07e99f6665e6436a612503e32dfc"
+  "gitHead": "a907a7ec140123107f6188b37550a7143f1e0d91"
 }

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

@@ -39,6 +39,7 @@ const createPeripheral = (id: string) => {
       connect: jest.fn(callback => callback()),
       disconnect: jest.fn(callback => callback()),
     },
+    write,
     notify,
   };
 };
@@ -110,4 +111,64 @@ describe('Noble BLE plugin notification routing', () => {
 
     expect(result).toBe('completed');
   });
+
+  test('uses withoutResponse for normal and high-volume writes', 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');
+
+    await plugin.send('device-a', 'aa');
+    await plugin.send('device-a', 'bb');
+
+    expect(device.write.write.mock.calls.map(([, withoutResponse]) => withoutResponse)).toEqual([
+      true,
+      true,
+    ]);
+  });
+
+  test('does not add a fixed delay between 192-byte writes', async () => {
+    const device = createPeripheral('device-a');
+    const noble = new EventEmitter() as EventEmitter & {
+      state: string;
+      startScanning: jest.Mock;
+      stopScanning: jest.Mock;
+    };
+    const wait = jest.fn(() => Promise.resolve());
+    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);
+    jest.doMock('@onekeyfe/hd-shared', () => ({
+      ...jest.requireActual('@onekeyfe/hd-shared'),
+      wait,
+    }));
+
+    const { createNobleBlePlugin } = await import('../transports/nobleBlePlugin');
+    const plugin = createNobleBlePlugin();
+    await plugin.init();
+    await plugin.connect('device-a');
+
+    await plugin.send('device-a', 'aa'.repeat(193));
+
+    expect(device.write.write).toHaveBeenCalledTimes(2);
+    expect(wait).not.toHaveBeenCalled();
+  });
 });

package/src/transports/nobleBlePlugin.ts

@@ -3,7 +3,6 @@ import {
   HardwareErrorCode,
   ONEKEY_SERVICE_UUID,
   isOnekeyDevice,
-  wait,
 } from '@onekeyfe/hd-shared';
 
 import type { LowLevelDevice, LowlevelTransportSharedPlugin } from '@onekeyfe/hd-transport';
@@ -54,7 +53,6 @@ const CONNECTION_TIMEOUT = 8_000;
 const SERVICE_DISCOVERY_TIMEOUT = 10_000;
 const BLE_CLEANUP_TIMEOUT = 100;
 const BLE_PACKET_SIZE = 192;
-const BLE_WRITE_DELAY = 5;
 const BLE_ENCRYPTION_ERROR_PATTERNS = [/encryption is insufficient/i, /insufficient encryption/i];
 
 let noble: NobleModule | null = null;
@@ -379,9 +377,13 @@ function subscribeNotifications(
     });
 }
 
-function writeCharacteristic(characteristic: Characteristic, buffer: Buffer) {
+function writeCharacteristic(
+  characteristic: Characteristic,
+  buffer: Buffer,
+  withoutResponse: boolean
+) {
   return new Promise<void>((resolve, reject) => {
-    characteristic.write(buffer, true, (error?: Error) => {
+    characteristic.write(buffer, withoutResponse, (error?: Error) => {
       if (error) {
         reject(error);
         return;
@@ -463,10 +465,7 @@ export function createNobleBlePlugin(): LowlevelTransportSharedPlugin {
       const buffer = Buffer.from(data, 'hex');
       for (let offset = 0; offset < buffer.length; offset += BLE_PACKET_SIZE) {
         const chunk = buffer.subarray(offset, Math.min(offset + BLE_PACKET_SIZE, buffer.length));
-        await writeCharacteristic(characteristics.write, chunk);
-        if (offset + BLE_PACKET_SIZE < buffer.length) {
-          await wait(BLE_WRITE_DELAY);
-        }
+        await writeCharacteristic(characteristics.write, chunk, true);
       }
     },