@onekeyfe/hd-transport-electron 1.2.0-alpha.69 → 1.2.0-alpha.70

package/dist/{index-bd1cfdb6.js → index-84fea839.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-7ac9c43d.js'); });
+        const { setupNobleBleHandlers } = yield Promise.resolve().then(function () { return require('./noble-ble-handler-a0b2f06d.js'); });
         setupNobleBleHandlers(webContents);
     });
 }

package/dist/index.d.ts

@@ -6,7 +6,6 @@ interface DeviceInfo extends OneKeyDeviceInfoBase {
     id: string;
     name: string;
     state: string;
-    mtu?: number;
 }
 interface CharacteristicPair {
     write: Characteristic;
@@ -39,7 +38,6 @@ interface NobleBleAPI {
     getDevice: (uuid: string) => Promise<{
         id: string;
         name: string;
-        mtu?: number;
     } | null>;
     connect: (uuid: string) => Promise<void>;
     disconnect: (uuid: string) => Promise<void>;
@@ -47,10 +45,6 @@ interface NobleBleAPI {
     unsubscribe: (uuid: string) => Promise<void>;
     write: (uuid: string, data: string) => Promise<void>;
     onNotification: (callback: (deviceId: string, data: string) => void) => () => void;
-    onMtuChanged?: (callback: (device: {
-        id: string;
-        mtu: number;
-    }) => void) => () => void;
     onDeviceDisconnected: (callback: (device: {
         id: string;
         name: string;

package/dist/index.js

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

package/dist/{noble-ble-handler-7ac9c43d.js → noble-ble-handler-a0b2f06d.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-bd1cfdb6.js');
+var index = require('./index-84fea839.js');
 var hdShared = require('@onekeyfe/hd-shared');
 var pRetry = require('p-retry');
 
@@ -8,14 +8,6 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var pRetry__default = /*#__PURE__*/_interopDefaultLegacy(pRetry);
 
-const BLE_ATT_HEADER_BYTES = 3;
-function resolveBlePacketCapacity(mtu, maximumPacketCapacity, fallbackPacketCapacity) {
-    if (typeof mtu !== 'number' || !Number.isFinite(mtu) || mtu <= BLE_ATT_HEADER_BYTES) {
-        return fallbackPacketCapacity;
-    }
-    return Math.min(maximumPacketCapacity, Math.floor(mtu) - BLE_ATT_HEADER_BYTES);
-}
-
 function safeLog(logger, level, message, ...args) {
     if (logger) {
         logger[level](message, ...args);
@@ -106,7 +98,6 @@ const notificationCallbacks = new Map();
 const subscribedDevices = new Map();
 const subscriptionOperations = new Map();
 const deviceDisconnectListeners = new Map();
-const deviceMtuListeners = new Map();
 const ONEKEY_SERVICE_UUIDS = [hdShared.ONEKEY_SERVICE_UUID];
 const ONEKEY_SERVICE_UUID_ALIASES = hdShared.createKnownBleUuidAliases(hdShared.ONEKEY_SERVICE_UUID);
 const ONEKEY_WRITE_UUID_ALIASES = hdShared.createKnownBleUuidAliases(hdShared.ONEKEY_WRITE_CHARACTERISTIC_UUID);
@@ -116,8 +107,8 @@ const DEVICE_SCAN_TIMEOUT = 5000;
 const DEVICE_CHECK_INTERVAL = 500;
 const SERVICE_DISCOVERY_TIMEOUT = 10000;
 const BLE_CLEANUP_TIMEOUT = 250;
-const BLE_PACKET_SIZE_FALLBACK = 192;
-const BLE_PACKET_SIZE_MAXIMUM = 244;
+const BLE_PACKET_SIZE = 192;
+const UNIFIED_WRITE_DELAY = 5;
 const RETRY_CONFIG = { MAX_ATTEMPTS: 15, WRITE_TIMEOUT: 2000 };
 const IS_WINDOWS = process.platform === 'win32';
 const ABORTABLE_WRITE_ERROR_PATTERNS = [
@@ -309,11 +300,6 @@ function cleanupDevice(deviceId, webContents, options = {}) {
             disconnectEntry.peripheral.removeListener('disconnect', disconnectEntry.listener);
             deviceDisconnectListeners.delete(deviceId);
         }
-        const mtuEntry = deviceMtuListeners.get(deviceId);
-        if (mtuEntry) {
-            mtuEntry.peripheral.removeListener('mtu', mtuEntry.listener);
-            deviceMtuListeners.delete(deviceId);
-        }
         connectedDevices.delete(deviceId);
         deviceCharacteristics.delete(deviceId);
         notificationCallbacks.delete(deviceId);
@@ -357,25 +343,8 @@ function setupDisconnectListener(peripheral, deviceId, webContents) {
     };
     deviceDisconnectListeners.set(deviceId, { peripheral, listener });
     peripheral.on('disconnect', listener);
-    setupMtuListener(peripheral, deviceId, webContents);
-}
-function setupMtuListener(peripheral, deviceId, webContents) {
-    const existing = deviceMtuListeners.get(deviceId);
-    if (existing) {
-        existing.peripheral.removeListener('mtu', existing.listener);
-    }
-    const listener = (mtu) => {
-        if (!Number.isFinite(mtu) || mtu <= 0)
-            return;
-        webContents.send(hdShared.EOneKeyBleMessageKeys.NOBLE_BLE_MTU_CHANGED, {
-            id: deviceId,
-            mtu,
-        });
-    };
-    deviceMtuListeners.set(deviceId, { peripheral, listener });
-    peripheral.on('mtu', listener);
 }
-function writeCharacteristicWithoutResponse(deviceId, writeCharacteristic, buffer) {
+function writeCharacteristicWithAck(deviceId, writeCharacteristic, buffer) {
     return index.__awaiter(this, void 0, void 0, function* () {
         return new Promise((resolve, reject) => {
             writeCharacteristic.write(buffer, true, (error) => {
@@ -407,7 +376,7 @@ function attemptWindowsWriteUntilPaired(deviceId, doGetWriteCharacteristic, payl
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Write characteristic not available for ${deviceId}`);
             }
             try {
-                yield writeCharacteristicWithoutResponse(deviceId, latestWrite, payload);
+                yield writeCharacteristicWithAck(deviceId, latestWrite, payload);
             }
             catch (e) {
                 const errorMessage = e instanceof Error ? e.message : String(e);
@@ -475,37 +444,44 @@ function transmitHexDataToDevice(deviceId, hexData) {
         }
         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);
         if (!IS_WINDOWS || pairedDevices.has(deviceId)) {
             const writeCharacteristic = doGetWriteCharacteristic();
             if (!writeCharacteristic) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleCharacteristicNotFound, `Write characteristic not available for ${deviceId}`);
             }
-            if (toBuffer.length <= packetCapacity) {
-                yield writeCharacteristicWithoutResponse(deviceId, writeCharacteristic, toBuffer);
+            if (toBuffer.length <= BLE_PACKET_SIZE) {
+                yield hdShared.wait(UNIFIED_WRITE_DELAY);
+                yield writeCharacteristicWithAck(deviceId, writeCharacteristic, toBuffer);
                 return;
             }
             for (let offset = 0; offset < toBuffer.length;) {
-                const chunkSize = Math.min(packetCapacity, toBuffer.length - offset);
+                const chunkSize = Math.min(BLE_PACKET_SIZE, toBuffer.length - offset);
                 const chunk = toBuffer.subarray(offset, offset + chunkSize);
                 offset += chunkSize;
                 const latest = doGetWriteCharacteristic();
                 if (!latest) {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleCharacteristicNotFound, `Write characteristic not available for ${deviceId}`);
                 }
-                yield writeCharacteristicWithoutResponse(deviceId, latest, chunk);
+                yield writeCharacteristicWithAck(deviceId, latest, chunk);
+                if (offset < toBuffer.length) {
+                    yield hdShared.wait(UNIFIED_WRITE_DELAY);
+                }
             }
             return;
         }
-        if (toBuffer.length <= packetCapacity) {
+        if (toBuffer.length <= BLE_PACKET_SIZE) {
+            yield hdShared.wait(UNIFIED_WRITE_DELAY);
             yield attemptWindowsWriteUntilPaired(deviceId, doGetWriteCharacteristic, toBuffer, 'single');
             return;
         }
         for (let offset = 0, idx = 0; offset < toBuffer.length; idx++) {
-            const chunkSize = Math.min(packetCapacity, toBuffer.length - offset);
+            const chunkSize = Math.min(BLE_PACKET_SIZE, toBuffer.length - offset);
             const chunk = toBuffer.subarray(offset, offset + chunkSize);
             offset += chunkSize;
             yield attemptWindowsWriteUntilPaired(deviceId, doGetWriteCharacteristic, chunk, `chunk-${idx + 1}`);
+            if (offset < toBuffer.length) {
+                yield hdShared.wait(UNIFIED_WRITE_DELAY);
+            }
         }
     });
 }
@@ -682,12 +658,22 @@ 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 } : {}));
+        return {
+            commType: 'electron-ble',
+            id: peripheral.id,
+            name: deviceName,
+            state: peripheral.state || 'disconnected',
+        };
     }
     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 } : {}));
+        return {
+            commType: 'electron-ble',
+            id: connectedPeripheral.id,
+            name: deviceName,
+            state: connectedPeripheral.state || 'connected',
+        };
     }
     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":"AA+BA,OAAO,KAAK,EAAsB,WAAW,EAAE,MAAM,UAAU,CAAC;AA++ChE,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAyJpE"}
+{"version":3,"file":"noble-ble-handler.d.ts","sourceRoot":"","sources":["../src/noble-ble-handler.ts"],"names":[],"mappings":"AA8BA,OAAO,KAAK,EAAsB,WAAW,EAAE,MAAM,UAAU,CAAC;AAi9ChE,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAyJpE"}

package/dist/types/desktop-api.d.ts

@@ -6,7 +6,6 @@ export interface NobleBleAPI {
     getDevice: (uuid: string) => Promise<{
         id: string;
         name: string;
-        mtu?: number;
     } | null>;
     connect: (uuid: string) => Promise<void>;
     disconnect: (uuid: string) => Promise<void>;
@@ -14,10 +13,6 @@ export interface NobleBleAPI {
     unsubscribe: (uuid: string) => Promise<void>;
     write: (uuid: string, data: string) => Promise<void>;
     onNotification: (callback: (deviceId: string, data: string) => void) => () => void;
-    onMtuChanged?: (callback: (device: {
-        id: string;
-        mtu: number;
-    }) => void) => () => void;
     onDeviceDisconnected: (callback: (device: {
         id: string;
         name: string;

package/dist/types/desktop-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"desktop-api.d.ts","sourceRoot":"","sources":["../../src/types/desktop-api.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC,CAAC;IACzD,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC,CAAC;IACxF,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5C,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrD,cAAc,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,KAAK,MAAM,IAAI,CAAC;IACnF,YAAY,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,KAAK,MAAM,IAAI,CAAC;IACvF,oBAAoB,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,KAAK,MAAM,IAAI,CAAC;IAC/F,iBAAiB,EAAE,MAAM,OAAO,CAAC;QAC/B,SAAS,EAAE,OAAO,CAAC;QACnB,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,OAAO,CAAC;QACrB,WAAW,EAAE,OAAO,CAAC;KACtB,CAAC,CAAC;CACJ;AAGD,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,EAAE,WAAW,CAAC;CACxB"}
+{"version":3,"file":"desktop-api.d.ts","sourceRoot":"","sources":["../../src/types/desktop-api.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC,CAAC;IACzD,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC,CAAC;IAC1E,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5C,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrD,cAAc,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,KAAK,MAAM,IAAI,CAAC;IACnF,oBAAoB,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,KAAK,MAAM,IAAI,CAAC;IAC/F,iBAAiB,EAAE,MAAM,OAAO,CAAC;QAC/B,SAAS,EAAE,OAAO,CAAC;QACnB,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,OAAO,CAAC;QACrB,WAAW,EAAE,OAAO,CAAC;KACtB,CAAC,CAAC;CACJ;AAGD,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,EAAE,WAAW,CAAC;CACxB"}

package/dist/types/noble-extended.d.ts

@@ -4,7 +4,6 @@ export interface DeviceInfo extends OneKeyDeviceInfoBase {
     id: string;
     name: string;
     state: string;
-    mtu?: number;
 }
 export interface CharacteristicPair {
     write: Characteristic;

package/dist/types/noble-extended.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"noble-extended.d.ts","sourceRoot":"","sources":["../../src/types/noble-extended.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAGnE,MAAM,WAAW,UAAW,SAAQ,oBAAoB;IACtD,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAGD,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,cAAc,CAAC;IACtB,MAAM,EAAE,cAAc,CAAC;CACxB;AAGD,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,CACX,YAAY,EAAE,MAAM,EAAE,EACtB,eAAe,EAAE,OAAO,EACxB,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,KAAK,IAAI,GACjC,IAAI,CAAC;IACR,YAAY,CAAC,QAAQ,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;IAC1C,EAAE,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IAClE,EAAE,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,GAAG,IAAI,CAAC;IACxE,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IAC9E,cAAc,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,GAAG,IAAI,CAAC;CACrF;AAGD,MAAM,WAAW,MAAM;IACrB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC5C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC7C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;CAC9C;AAGD,wBAAgB,OAAO,CACrB,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,EACjC,OAAO,EAAE,MAAM,EACf,GAAG,IAAI,EAAE,GAAG,EAAE,GACb,IAAI,CAMN"}
+{"version":3,"file":"noble-extended.d.ts","sourceRoot":"","sources":["../../src/types/noble-extended.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAGnE,MAAM,WAAW,UAAW,SAAQ,oBAAoB;IACtD,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAGD,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,cAAc,CAAC;IACtB,MAAM,EAAE,cAAc,CAAC;CACxB;AAGD,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,CACX,YAAY,EAAE,MAAM,EAAE,EACtB,eAAe,EAAE,OAAO,EACxB,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,KAAK,IAAI,GACjC,IAAI,CAAC;IACR,YAAY,CAAC,QAAQ,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;IAC1C,EAAE,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IAClE,EAAE,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,GAAG,IAAI,CAAC;IACxE,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI,CAAC;IAC9E,cAAc,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,GAAG,IAAI,CAAC;CACrF;AAGD,MAAM,WAAW,MAAM;IACrB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC5C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC7C,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;CAC9C;AAGD,wBAAgB,OAAO,CACrB,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,EACjC,OAAO,EAAE,MAAM,EACf,GAAG,IAAI,EAAE,GAAG,EAAE,GACb,IAAI,CAMN"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-electron",
-  "version": "1.2.0-alpha.69",
+  "version": "1.2.0-alpha.70",
   "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.0-alpha.69",
-    "@onekeyfe/hd-shared": "1.2.0-alpha.69",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.69",
+    "@onekeyfe/hd-core": "1.2.0-alpha.70",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.70",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.70",
     "@stoprocent/noble": "2.3.16",
     "p-retry": "^4.6.2"
   },
@@ -36,5 +36,5 @@
     "electron": "^25.0.0",
     "typescript": "^5.3.3"
   },
-  "gitHead": "c6baed25917e3c3f027f83dfc23cde85400de558"
+  "gitHead": "d86b033cf970f97e060c49fe4cf618f38b9ce666"
 }

package/src/noble-ble-handler.ts

@@ -21,7 +21,6 @@ import {
 } from '@onekeyfe/hd-shared';
 import pRetry from 'p-retry';
 
-import { resolveBlePacketCapacity } from './ble-packet-capacity';
 import { safeLog } from './types/noble-extended';
 import { runBleCallbackOperation, softRefreshSubscription } from './ble-ops';
 import {
@@ -66,10 +65,6 @@ const deviceDisconnectListeners = new Map<
   string,
   { peripheral: Peripheral; listener: () => void }
 >();
-const deviceMtuListeners = new Map<
-  string,
-  { peripheral: Peripheral; listener: (mtu: number) => void }
->();
 
 // Windows-only response watchdog state moved to utils/windows-ble-recovery
 
@@ -91,8 +86,8 @@ const SERVICE_DISCOVERY_TIMEOUT = 10000; // 10 seconds for service discovery
 const BLE_CLEANUP_TIMEOUT = 250;
 
 // Write-related constants
-const BLE_PACKET_SIZE_FALLBACK = 192;
-const BLE_PACKET_SIZE_MAXIMUM = 244;
+const BLE_PACKET_SIZE = 192;
+const UNIFIED_WRITE_DELAY = 5;
 const RETRY_CONFIG = { MAX_ATTEMPTS: 15, WRITE_TIMEOUT: 2000 } as const;
 const IS_WINDOWS = process.platform === 'win32';
 const ABORTABLE_WRITE_ERROR_PATTERNS = [
@@ -369,11 +364,6 @@ function cleanupDevice(
       disconnectEntry.peripheral.removeListener('disconnect', disconnectEntry.listener);
       deviceDisconnectListeners.delete(deviceId);
     }
-    const mtuEntry = deviceMtuListeners.get(deviceId);
-    if (mtuEntry) {
-      mtuEntry.peripheral.removeListener('mtu', mtuEntry.listener);
-      deviceMtuListeners.delete(deviceId);
-    }
     connectedDevices.delete(deviceId);
     deviceCharacteristics.delete(deviceId);
     notificationCallbacks.delete(deviceId);
@@ -433,33 +423,11 @@ function setupDisconnectListener(
   };
   deviceDisconnectListeners.set(deviceId, { peripheral, listener });
   peripheral.on('disconnect', listener);
-  setupMtuListener(peripheral, deviceId, webContents);
-}
-
-function setupMtuListener(
-  peripheral: Peripheral,
-  deviceId: string,
-  webContents: WebContents
-): void {
-  const existing = deviceMtuListeners.get(deviceId);
-  if (existing) {
-    existing.peripheral.removeListener('mtu', existing.listener);
-  }
-
-  const listener = (mtu: number) => {
-    if (!Number.isFinite(mtu) || mtu <= 0) return;
-    webContents.send(EOneKeyBleMessageKeys.NOBLE_BLE_MTU_CHANGED, {
-      id: deviceId,
-      mtu,
-    });
-  };
-  deviceMtuListeners.set(deviceId, { peripheral, listener });
-  peripheral.on('mtu', listener);
 }
 
 // ===== Write helpers (inline) =====
 
-async function writeCharacteristicWithoutResponse(
+async function writeCharacteristicWithAck(
   deviceId: string,
   writeCharacteristic: Characteristic,
   buffer: Buffer
@@ -507,7 +475,7 @@ async function attemptWindowsWriteUntilPaired(
     }
 
     try {
-      await writeCharacteristicWithoutResponse(deviceId, latestWrite, payload);
+      await writeCharacteristicWithAck(deviceId, latestWrite, payload);
     } catch (e) {
       const errorMessage = e instanceof Error ? e.message : String(e);
       logger?.error('[BLE-Write] Windows write error', {
@@ -591,11 +559,6 @@ async function transmitHexDataToDevice(deviceId: string, hexData: string): Promi
 
   const toBuffer = Buffer.from(hexData, 'hex');
   const doGetWriteCharacteristic = () => deviceCharacteristics.get(deviceId)?.write;
-  const packetCapacity = resolveBlePacketCapacity(
-    peripheral.mtu,
-    BLE_PACKET_SIZE_MAXIMUM,
-    BLE_PACKET_SIZE_FALLBACK
-  );
 
   if (!IS_WINDOWS || pairedDevices.has(deviceId)) {
     // macOS / Linux or already paired on Windows: direct write
@@ -606,13 +569,14 @@ async function transmitHexDataToDevice(deviceId: string, hexData: string): Promi
         `Write characteristic not available for ${deviceId}`
       );
     }
-    if (toBuffer.length <= packetCapacity) {
-      await writeCharacteristicWithoutResponse(deviceId, writeCharacteristic, toBuffer);
+    if (toBuffer.length <= BLE_PACKET_SIZE) {
+      await wait(UNIFIED_WRITE_DELAY);
+      await writeCharacteristicWithAck(deviceId, writeCharacteristic, toBuffer);
       return;
     }
     // chunked
     for (let offset = 0; offset < toBuffer.length; ) {
-      const chunkSize = Math.min(packetCapacity, toBuffer.length - offset);
+      const chunkSize = Math.min(BLE_PACKET_SIZE, toBuffer.length - offset);
       const chunk = toBuffer.subarray(offset, offset + chunkSize);
       offset += chunkSize;
       const latest = doGetWriteCharacteristic();
@@ -622,19 +586,23 @@ async function transmitHexDataToDevice(deviceId: string, hexData: string): Promi
           `Write characteristic not available for ${deviceId}`
         );
       }
-      await writeCharacteristicWithoutResponse(deviceId, latest, chunk);
+      await writeCharacteristicWithAck(deviceId, latest, chunk);
+      if (offset < toBuffer.length) {
+        await wait(UNIFIED_WRITE_DELAY);
+      }
     }
     return;
   }
 
   // Windows unpaired path: use loop
-  if (toBuffer.length <= packetCapacity) {
+  if (toBuffer.length <= BLE_PACKET_SIZE) {
+    await wait(UNIFIED_WRITE_DELAY);
     await attemptWindowsWriteUntilPaired(deviceId, doGetWriteCharacteristic, toBuffer, 'single');
     return;
   }
   // chunked loop
   for (let offset = 0, idx = 0; offset < toBuffer.length; idx++) {
-    const chunkSize = Math.min(packetCapacity, toBuffer.length - offset);
+    const chunkSize = Math.min(BLE_PACKET_SIZE, toBuffer.length - offset);
     const chunk = toBuffer.subarray(offset, offset + chunkSize);
     offset += chunkSize;
     await attemptWindowsWriteUntilPaired(
@@ -643,6 +611,9 @@ async function transmitHexDataToDevice(deviceId: string, hexData: string): Promi
       chunk,
       `chunk-${idx + 1}`
     );
+    if (offset < toBuffer.length) {
+      await wait(UNIFIED_WRITE_DELAY);
+    }
   }
 }
 
@@ -864,7 +835,6 @@ function getDevice(deviceId: string): DeviceInfo | null {
       id: peripheral.id,
       name: deviceName,
       state: peripheral.state || 'disconnected',
-      ...(typeof peripheral.mtu === 'number' ? { mtu: peripheral.mtu } : {}),
     };
   }
 
@@ -877,7 +847,6 @@ function getDevice(deviceId: string): DeviceInfo | null {
       id: connectedPeripheral.id,
       name: deviceName,
       state: connectedPeripheral.state || 'connected',
-      ...(typeof connectedPeripheral.mtu === 'number' ? { mtu: connectedPeripheral.mtu } : {}),
     };
   }
 

package/src/types/desktop-api.ts

@@ -6,14 +6,13 @@
 // Noble BLE API interface - core BLE functionality
 export interface NobleBleAPI {
   enumerate: () => Promise<{ id: string; name: string }[]>;
-  getDevice: (uuid: string) => Promise<{ id: string; name: string; mtu?: number } | null>;
+  getDevice: (uuid: string) => Promise<{ id: string; name: string } | null>;
   connect: (uuid: string) => Promise<void>;
   disconnect: (uuid: string) => Promise<void>;
   subscribe: (uuid: string) => Promise<void>;
   unsubscribe: (uuid: string) => Promise<void>;
   write: (uuid: string, data: string) => Promise<void>;
   onNotification: (callback: (deviceId: string, data: string) => void) => () => void;
-  onMtuChanged?: (callback: (device: { id: string; mtu: number }) => void) => () => void;
   onDeviceDisconnected: (callback: (device: { id: string; name: string }) => void) => () => void;
   checkAvailability: () => Promise<{
     available: boolean;

package/src/types/noble-extended.ts

@@ -11,7 +11,6 @@ export interface DeviceInfo extends OneKeyDeviceInfoBase {
   id: string;
   name: string;
   state: string;
-  mtu?: number;
 }
 
 // Characteristic pair interface

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

@@ -1,2 +0,0 @@
-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 +0,0 @@
-{"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"}

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

@@ -1,13 +0,0 @@
-import { resolveBlePacketCapacity } from '../ble-packet-capacity';
-
-describe('resolveBlePacketCapacity', () => {
-  test('uses ATT MTU payload capacity with an upper bound', () => {
-    expect(resolveBlePacketCapacity(247, 244, 192)).toBe(244);
-    expect(resolveBlePacketCapacity(185, 244, 192)).toBe(182);
-  });
-
-  test('preserves the compatibility fallback when MTU is unavailable', () => {
-    expect(resolveBlePacketCapacity(null, 244, 192)).toBe(192);
-    expect(resolveBlePacketCapacity(undefined, 244, 192)).toBe(192);
-  });
-});

package/src/ble-packet-capacity.ts

@@ -1,13 +0,0 @@
-const BLE_ATT_HEADER_BYTES = 3;
-
-export function resolveBlePacketCapacity(
-  mtu: number | null | undefined,
-  maximumPacketCapacity: number,
-  fallbackPacketCapacity: number
-): number {
-  if (typeof mtu !== 'number' || !Number.isFinite(mtu) || mtu <= BLE_ATT_HEADER_BYTES) {
-    return fallbackPacketCapacity;
-  }
-
-  return Math.min(maximumPacketCapacity, Math.floor(mtu) - BLE_ATT_HEADER_BYTES);
-}