@onekeyfe/hd-transport-electron 1.2.2-alpha.5 → 1.2.2-alpha.7

package/dist/ble-packet-capacity.d.ts

@@ -1,2 +1,4 @@
+/// <reference types="node" />
+export declare function resolveNobleAttMtu(reportedMtu: number | null | undefined, platform?: NodeJS.Platform): number | undefined;
 export declare function resolveBlePacketCapacity(mtu: number | null | undefined, maximumPacketCapacity: number, fallbackPacketCapacity: number): number;
 //# sourceMappingURL=ble-packet-capacity.d.ts.map

package/dist/ble-packet-capacity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ble-packet-capacity.d.ts","sourceRoot":"","sources":["../src/ble-packet-capacity.ts"],"names":[],"mappings":"AAEA,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAC9B,qBAAqB,EAAE,MAAM,EAC7B,sBAAsB,EAAE,MAAM,GAC7B,MAAM,CAMR"}
+{"version":3,"file":"ble-packet-capacity.d.ts","sourceRoot":"","sources":["../src/ble-packet-capacity.ts"],"names":[],"mappings":";AAEA,wBAAgB,kBAAkB,CAChC,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACtC,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAC3C,MAAM,GAAG,SAAS,CASpB;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAC9B,qBAAqB,EAAE,MAAM,EAC7B,sBAAsB,EAAE,MAAM,GAC7B,MAAM,CAMR"}

package/dist/{index-a518d449.js → index-00297050.js}

@@ -32,7 +32,7 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
 
 function initNobleBleSupport(webContents) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { setupNobleBleHandlers } = yield Promise.resolve().then(function () { return require('./noble-ble-handler-56d2eab3.js'); });
+        const { setupNobleBleHandlers } = yield Promise.resolve().then(function () { return require('./noble-ble-handler-95c5cf0d.js'); });
         setupNobleBleHandlers(webContents);
     });
 }

package/dist/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-a518d449.js');
+var index = require('./index-00297050.js');
 
 
 

package/dist/{noble-ble-handler-56d2eab3.js → noble-ble-handler-95c5cf0d.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-a518d449.js');
+var index = require('./index-00297050.js');
 var hdShared = require('@onekeyfe/hd-shared');
 var pRetry = require('p-retry');
 
@@ -9,6 +9,15 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var pRetry__default = /*#__PURE__*/_interopDefaultLegacy(pRetry);
 
 const BLE_ATT_HEADER_BYTES = 3;
+function resolveNobleAttMtu(reportedMtu, platform = process.platform) {
+    if (typeof reportedMtu !== 'number' || !Number.isFinite(reportedMtu) || reportedMtu <= 0) {
+        return undefined;
+    }
+    const normalizedMtu = Math.floor(reportedMtu);
+    return platform === 'darwin' || platform === 'win32'
+        ? normalizedMtu + BLE_ATT_HEADER_BYTES
+        : normalizedMtu;
+}
 function resolveBlePacketCapacity(mtu, maximumPacketCapacity, fallbackPacketCapacity) {
     if (typeof mtu !== 'number' || !Number.isFinite(mtu) || mtu <= BLE_ATT_HEADER_BYTES) {
         return fallbackPacketCapacity;
@@ -441,13 +450,14 @@ function setupMtuListener(peripheral, deviceId, webContents) {
         existing.peripheral.removeListener('mtu', existing.listener);
     }
     const listener = (mtu) => {
-        if (!Number.isFinite(mtu) || mtu <= 0)
+        const normalizedMtu = resolveNobleAttMtu(mtu);
+        if (normalizedMtu === undefined)
             return;
         if (webContents.isDestroyed())
             return;
         webContents.send(hdShared.EOneKeyBleMessageKeys.NOBLE_BLE_MTU_CHANGED, {
             id: deviceId,
-            mtu,
+            mtu: normalizedMtu,
         });
     };
     deviceMtuListeners.set(deviceId, { peripheral, listener });
@@ -554,7 +564,7 @@ function transmitHexDataToDevice(deviceId, hexData, options) {
         armIdleDisconnect(deviceId, BLE_BUSY_BACKSTOP_MS, 'busy-backstop');
         const toBuffer = Buffer.from(hexData, 'hex');
         const doGetWriteCharacteristic = () => { var _a; return (_a = deviceCharacteristics.get(deviceId)) === null || _a === void 0 ? void 0 : _a.write; };
-        const packetCapacity = resolveBlePacketCapacity(peripheral.mtu, BLE_PACKET_SIZE_MAXIMUM, BLE_PACKET_SIZE_FALLBACK);
+        const packetCapacity = resolveBlePacketCapacity(resolveNobleAttMtu(peripheral.mtu), BLE_PACKET_SIZE_MAXIMUM, BLE_PACKET_SIZE_FALLBACK);
         const pacingDelayMs = resolveNobleBleWritePacingDelay(options);
         if (!IS_WINDOWS || pairedDevices.has(deviceId)) {
             const writeCharacteristic = doGetWriteCharacteristic();
@@ -791,12 +801,14 @@ function getDevice(deviceId) {
     const peripheral = discoveredDevices.get(deviceId);
     if (peripheral) {
         const deviceName = ((_a = peripheral.advertisement) === null || _a === void 0 ? void 0 : _a.localName) || 'Unknown Device';
-        return Object.assign({ commType: 'electron-ble', id: peripheral.id, name: deviceName, state: peripheral.state || 'disconnected' }, (typeof peripheral.mtu === 'number' ? { mtu: peripheral.mtu } : {}));
+        const mtu = resolveNobleAttMtu(peripheral.mtu);
+        return Object.assign({ commType: 'electron-ble', id: peripheral.id, name: deviceName, state: peripheral.state || 'disconnected' }, (mtu === undefined ? {} : { mtu }));
     }
     const connectedPeripheral = connectedDevices.get(deviceId);
     if (connectedPeripheral) {
         const deviceName = ((_b = connectedPeripheral.advertisement) === null || _b === void 0 ? void 0 : _b.localName) || 'Unknown Device';
-        return Object.assign({ commType: 'electron-ble', id: connectedPeripheral.id, name: deviceName, state: connectedPeripheral.state || 'connected' }, (typeof connectedPeripheral.mtu === 'number' ? { mtu: connectedPeripheral.mtu } : {}));
+        const mtu = resolveNobleAttMtu(connectedPeripheral.mtu);
+        return Object.assign({ commType: 'electron-ble', id: connectedPeripheral.id, name: deviceName, state: connectedPeripheral.state || 'connected' }, (mtu === undefined ? {} : { mtu }));
     }
     return {
         commType: 'electron-ble',

package/dist/noble-ble-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"noble-ble-handler.d.ts","sourceRoot":"","sources":["../src/noble-ble-handler.ts"],"names":[],"mappings":"AAgCA,OAAO,KAAK,EAA+B,WAAW,EAAE,MAAM,UAAU,CAAC;AAEzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAoFhE,wBAAgB,+BAA+B,CAAC,OAAO,CAAC,EAAE,oBAAoB,UAI7E;AAsvDD,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAkMpE"}
+{"version":3,"file":"noble-ble-handler.d.ts","sourceRoot":"","sources":["../src/noble-ble-handler.ts"],"names":[],"mappings":"AAgCA,OAAO,KAAK,EAA+B,WAAW,EAAE,MAAM,UAAU,CAAC;AAEzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAoFhE,wBAAgB,+BAA+B,CAAC,OAAO,CAAC,EAAE,oBAAoB,UAI7E;AAyvDD,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAkMpE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-electron",
-  "version": "1.2.2-alpha.5",
+  "version": "1.2.2-alpha.7",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
@@ -25,9 +25,9 @@
     "electron-log": ">=4.0.0"
   },
   "dependencies": {
-    "@onekeyfe/hd-core": "1.2.2-alpha.5",
-    "@onekeyfe/hd-shared": "1.2.2-alpha.5",
-    "@onekeyfe/hd-transport": "1.2.2-alpha.5",
+    "@onekeyfe/hd-core": "1.2.2-alpha.7",
+    "@onekeyfe/hd-shared": "1.2.2-alpha.7",
+    "@onekeyfe/hd-transport": "1.2.2-alpha.7",
     "@stoprocent/noble": "2.3.16",
     "p-retry": "^4.6.2"
   },
@@ -36,5 +36,5 @@
     "electron": "^25.0.0",
     "typescript": "^5.3.3"
   },
-  "gitHead": "82503995b10dd1e293941594239423e3c640973b"
+  "gitHead": "29b87f1c04fea60459d900ef1f61cb9f17eaa4d3"
 }

package/src/__tests__/ble-packet-capacity.test.ts

@@ -1,6 +1,13 @@
-import { resolveBlePacketCapacity } from '../ble-packet-capacity';
+import { resolveBlePacketCapacity, resolveNobleAttMtu } from '../ble-packet-capacity';
 
 describe('resolveBlePacketCapacity', () => {
+  test('normalizes Noble platform reports to ATT MTU', () => {
+    expect(resolveNobleAttMtu(244, 'darwin')).toBe(247);
+    expect(resolveNobleAttMtu(244, 'win32')).toBe(247);
+    expect(resolveNobleAttMtu(247, 'linux')).toBe(247);
+    expect(resolveNobleAttMtu(null, 'darwin')).toBeUndefined();
+  });
+
   test('uses ATT MTU payload capacity with an upper bound', () => {
     expect(resolveBlePacketCapacity(247, 244, 192)).toBe(244);
     expect(resolveBlePacketCapacity(185, 244, 192)).toBe(182);

package/src/ble-packet-capacity.ts

@@ -1,5 +1,19 @@
 const BLE_ATT_HEADER_BYTES = 3;
 
+export function resolveNobleAttMtu(
+  reportedMtu: number | null | undefined,
+  platform: NodeJS.Platform = process.platform
+): number | undefined {
+  if (typeof reportedMtu !== 'number' || !Number.isFinite(reportedMtu) || reportedMtu <= 0) {
+    return undefined;
+  }
+
+  const normalizedMtu = Math.floor(reportedMtu);
+  return platform === 'darwin' || platform === 'win32'
+    ? normalizedMtu + BLE_ATT_HEADER_BYTES
+    : normalizedMtu;
+}
+
 export function resolveBlePacketCapacity(
   mtu: number | null | undefined,
   maximumPacketCapacity: number,

package/src/noble-ble-handler.ts

@@ -22,7 +22,7 @@ import {
 } from '@onekeyfe/hd-shared';
 import pRetry from 'p-retry';
 
-import { resolveBlePacketCapacity } from './ble-packet-capacity';
+import { resolveBlePacketCapacity, resolveNobleAttMtu } from './ble-packet-capacity';
 import { safeLog } from './types/noble-extended';
 import { runBleCallbackOperation, softRefreshSubscription } from './ble-ops';
 import {
@@ -574,12 +574,13 @@ function setupMtuListener(
   }
 
   const listener = (mtu: number) => {
-    if (!Number.isFinite(mtu) || mtu <= 0) return;
+    const normalizedMtu = resolveNobleAttMtu(mtu);
+    if (normalizedMtu === undefined) return;
     // A kept-alive link can outlive the renderer this closure captured.
     if (webContents.isDestroyed()) return;
     webContents.send(EOneKeyBleMessageKeys.NOBLE_BLE_MTU_CHANGED, {
       id: deviceId,
-      mtu,
+      mtu: normalizedMtu,
     });
   };
   deviceMtuListeners.set(deviceId, { peripheral, listener });
@@ -727,7 +728,7 @@ async function transmitHexDataToDevice(
   const toBuffer = Buffer.from(hexData, 'hex');
   const doGetWriteCharacteristic = () => deviceCharacteristics.get(deviceId)?.write;
   const packetCapacity = resolveBlePacketCapacity(
-    peripheral.mtu,
+    resolveNobleAttMtu(peripheral.mtu),
     BLE_PACKET_SIZE_MAXIMUM,
     BLE_PACKET_SIZE_FALLBACK
   );
@@ -1047,12 +1048,13 @@ function getDevice(deviceId: string): DeviceInfo | null {
   const peripheral = discoveredDevices.get(deviceId);
   if (peripheral) {
     const deviceName = peripheral.advertisement?.localName || 'Unknown Device';
+    const mtu = resolveNobleAttMtu(peripheral.mtu);
     return {
       commType: 'electron-ble',
       id: peripheral.id,
       name: deviceName,
       state: peripheral.state || 'disconnected',
-      ...(typeof peripheral.mtu === 'number' ? { mtu: peripheral.mtu } : {}),
+      ...(mtu === undefined ? {} : { mtu }),
     };
   }
 
@@ -1060,12 +1062,13 @@ function getDevice(deviceId: string): DeviceInfo | null {
   const connectedPeripheral = connectedDevices.get(deviceId);
   if (connectedPeripheral) {
     const deviceName = connectedPeripheral.advertisement?.localName || 'Unknown Device';
+    const mtu = resolveNobleAttMtu(connectedPeripheral.mtu);
     return {
       commType: 'electron-ble',
       id: connectedPeripheral.id,
       name: deviceName,
       state: connectedPeripheral.state || 'connected',
-      ...(typeof connectedPeripheral.mtu === 'number' ? { mtu: connectedPeripheral.mtu } : {}),
+      ...(mtu === undefined ? {} : { mtu }),
     };
   }