@onekeyfe/hardware-cli 1.2.2-alpha.6 → 1.2.2-alpha.8

package/dist/transports/nobleBlePlugin.d.ts

@@ -1,2 +1,4 @@
+/// <reference types="node" />
 import type { LowlevelTransportSharedPlugin } from '@onekeyfe/hd-transport';
+export declare function resolveNobleProtocolV2PacketCapacity(mtu: number | null | undefined, platform?: NodeJS.Platform): number;
 export declare function createNobleBlePlugin(): LowlevelTransportSharedPlugin;

package/dist/transports/nobleBlePlugin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNobleBlePlugin = void 0;
+exports.createNobleBlePlugin = exports.resolveNobleProtocolV2PacketCapacity = void 0;
 const hd_shared_1 = require("@onekeyfe/hd-shared");
 const ONEKEY_SERVICE_UUIDS = [hd_shared_1.ONEKEY_SERVICE_UUID];
 const ONEKEY_SERVICE_UUID_ALIASES = (0, hd_shared_1.createKnownBleUuidAliases)(hd_shared_1.ONEKEY_SERVICE_UUID);
@@ -11,8 +11,22 @@ const DEVICE_SCAN_TIMEOUT = 8000;
 const CONNECTION_TIMEOUT = 8000;
 const SERVICE_DISCOVERY_TIMEOUT = 10000;
 const BLE_CLEANUP_TIMEOUT = 100;
-const BLE_PACKET_SIZE = 192;
+const BLE_PACKET_SIZE_FALLBACK = 192;
+const BLE_PACKET_SIZE_MAX = 244;
+const ATT_WRITE_HEADER_SIZE = 3;
 const BLE_ENCRYPTION_ERROR_PATTERNS = [/encryption is insufficient/i, /insufficient encryption/i];
+function resolveNobleProtocolV2PacketCapacity(mtu, platform = process.platform) {
+    if (typeof mtu !== 'number' || !Number.isFinite(mtu) || mtu <= 0) {
+        return BLE_PACKET_SIZE_FALLBACK;
+    }
+    const reportedCapacity = Math.floor(mtu);
+    const payloadCapacity = platform === 'linux' ? reportedCapacity - ATT_WRITE_HEADER_SIZE : reportedCapacity;
+    if (payloadCapacity <= 0) {
+        return BLE_PACKET_SIZE_FALLBACK;
+    }
+    return Math.min(payloadCapacity, BLE_PACKET_SIZE_MAX);
+}
+exports.resolveNobleProtocolV2PacketCapacity = resolveNobleProtocolV2PacketCapacity;
 let noble = null;
 let nobleReadyPromise = null;
 const discoveredDevices = new Map();
@@ -362,6 +376,9 @@ function createNobleBlePlugin() {
         async disconnect(uuid) {
             await disconnectDevice(uuid);
         },
+        getProtocolV2PacketCapacity(uuid) {
+            return resolveNobleProtocolV2PacketCapacity(connectedDevices.get(uuid)?.mtu);
+        },
         async send(uuid, data, options) {
             const characteristics = deviceCharacteristics.get(uuid);
             if (!characteristics) {
@@ -369,8 +386,9 @@ function createNobleBlePlugin() {
             }
             const buffer = Buffer.from(data, 'hex');
             const withoutResponse = options?.withoutResponse ?? true;
-            for (let offset = 0; offset < buffer.length; offset += BLE_PACKET_SIZE) {
-                const chunk = buffer.subarray(offset, Math.min(offset + BLE_PACKET_SIZE, buffer.length));
+            const packetCapacity = resolveNobleProtocolV2PacketCapacity(connectedDevices.get(uuid)?.mtu);
+            for (let offset = 0; offset < buffer.length; offset += packetCapacity) {
+                const chunk = buffer.subarray(offset, Math.min(offset + packetCapacity, buffer.length));
                 await writeCharacteristic(characteristics.write, chunk, withoutResponse);
             }
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hardware-cli",
-  "version": "1.2.2-alpha.6",
+  "version": "1.2.2-alpha.8",
   "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.6",
-    "@onekeyfe/hd-core": "1.2.2-alpha.6",
-    "@onekeyfe/hd-shared": "1.2.2-alpha.6",
-    "@onekeyfe/hd-transport-usb": "1.2.2-alpha.6",
+    "@onekeyfe/hd-common-connect-sdk": "1.2.2-alpha.8",
+    "@onekeyfe/hd-core": "1.2.2-alpha.8",
+    "@onekeyfe/hd-shared": "1.2.2-alpha.8",
+    "@onekeyfe/hd-transport-usb": "1.2.2-alpha.8",
     "@stoprocent/noble": "2.3.16",
     "commander": "^12.0.0"
   },
-  "gitHead": "538d5371d9369747beabf68c5dc7a617531bace2"
+  "gitHead": "7a5d129ea1db0b3eb230e309ab29ed3e9e7f141e"
 }

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

@@ -31,6 +31,7 @@ const createPeripheral = (id: string) => {
   const peripheral = Object.assign(new EventEmitter(), {
     id,
     state: 'connected',
+    mtu: null as number | null,
     advertisement: {
       localName: `OneKey Pro 2 ${id}`,
       serviceUuids: ['0001'],
@@ -54,6 +55,15 @@ describe('Noble BLE plugin notification routing', () => {
     jest.clearAllMocks();
   });
 
+  test('normalizes the platform-specific Noble MTU to a safe write capacity', async () => {
+    const { resolveNobleProtocolV2PacketCapacity } = await import('../transports/nobleBlePlugin');
+
+    expect(resolveNobleProtocolV2PacketCapacity(null, 'darwin')).toBe(192);
+    expect(resolveNobleProtocolV2PacketCapacity(244, 'darwin')).toBe(244);
+    expect(resolveNobleProtocolV2PacketCapacity(247, 'linux')).toBe(244);
+    expect(resolveNobleProtocolV2PacketCapacity(512, 'win32')).toBe(244);
+  });
+
   test('does not enumerate Find My advertisements that expose FFFD', async () => {
     jest.useFakeTimers({ doNotFake: ['performance'] });
     const oneKey = createPeripheral('onekey-device');
@@ -376,6 +386,33 @@ describe('Noble BLE plugin notification routing', () => {
     expect(wait).not.toHaveBeenCalled();
   });
 
+  test('uses the connected peripheral write capacity without padding', async () => {
+    const device = createPeripheral('device-a');
+    device.peripheral.mtu = process.platform === 'linux' ? 247 : 244;
+    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'.repeat(245));
+
+    expect(plugin.getProtocolV2PacketCapacity?.('device-a')).toBe(244);
+    expect(device.write.write.mock.calls.map(([packet]) => packet.length)).toEqual([244, 1]);
+  });
+
   test('preserves a short final BLE packet without padding', async () => {
     const device = createPeripheral('device-a');
     const noble = new EventEmitter() as EventEmitter & {

package/src/transports/nobleBlePlugin.ts

@@ -58,9 +58,27 @@ const DEVICE_SCAN_TIMEOUT = 8_000;
 const CONNECTION_TIMEOUT = 8_000;
 const SERVICE_DISCOVERY_TIMEOUT = 10_000;
 const BLE_CLEANUP_TIMEOUT = 100;
-const BLE_PACKET_SIZE = 192;
+const BLE_PACKET_SIZE_FALLBACK = 192;
+const BLE_PACKET_SIZE_MAX = 244;
+const ATT_WRITE_HEADER_SIZE = 3;
 const BLE_ENCRYPTION_ERROR_PATTERNS = [/encryption is insufficient/i, /insufficient encryption/i];
 
+export function resolveNobleProtocolV2PacketCapacity(
+  mtu: number | null | undefined,
+  platform: NodeJS.Platform = process.platform
+) {
+  if (typeof mtu !== 'number' || !Number.isFinite(mtu) || mtu <= 0) {
+    return BLE_PACKET_SIZE_FALLBACK;
+  }
+  const reportedCapacity = Math.floor(mtu);
+  const payloadCapacity =
+    platform === 'linux' ? reportedCapacity - ATT_WRITE_HEADER_SIZE : reportedCapacity;
+  if (payloadCapacity <= 0) {
+    return BLE_PACKET_SIZE_FALLBACK;
+  }
+  return Math.min(payloadCapacity, BLE_PACKET_SIZE_MAX);
+}
+
 let noble: NobleModule | null = null;
 let nobleReadyPromise: Promise<void> | null = null;
 const discoveredDevices = new Map<string, Peripheral>();
@@ -479,6 +497,10 @@ export function createNobleBlePlugin(): LowlevelTransportSharedPlugin {
       await disconnectDevice(uuid);
     },
 
+    getProtocolV2PacketCapacity(uuid: string) {
+      return resolveNobleProtocolV2PacketCapacity(connectedDevices.get(uuid)?.mtu);
+    },
+
     async send(uuid: string, data: string, options?: { withoutResponse?: boolean }) {
       const characteristics = deviceCharacteristics.get(uuid);
       if (!characteristics) {
@@ -490,8 +512,9 @@ export function createNobleBlePlugin(): LowlevelTransportSharedPlugin {
 
       const buffer = Buffer.from(data, 'hex');
       const withoutResponse = options?.withoutResponse ?? true;
-      for (let offset = 0; offset < buffer.length; offset += BLE_PACKET_SIZE) {
-        const chunk = buffer.subarray(offset, Math.min(offset + BLE_PACKET_SIZE, buffer.length));
+      const packetCapacity = resolveNobleProtocolV2PacketCapacity(connectedDevices.get(uuid)?.mtu);
+      for (let offset = 0; offset < buffer.length; offset += packetCapacity) {
+        const chunk = buffer.subarray(offset, Math.min(offset + packetCapacity, buffer.length));
         await writeCharacteristic(characteristics.write, chunk, withoutResponse);
       }
     },