@onekeyfe/hd-transport-electron 1.2.0-alpha.166 → 1.2.0-alpha.168

package/dist/{index-f4b406db.js → index-b37d926c.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-038532d9.js'); });
+        const { setupNobleBleHandlers } = yield Promise.resolve().then(function () { return require('./noble-ble-handler-e8b87173.js'); });
         setupNobleBleHandlers(webContents);
     });
 }

package/dist/index.d.ts

@@ -25,7 +25,6 @@ interface NobleModule {
 interface Logger {
     info(message: string, ...args: any[]): void;
     debug(message: string, ...args: any[]): void;
-    warn(message: string, ...args: any[]): void;
     error(message: string, ...args: any[]): void;
 }
 

package/dist/index.js

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

package/dist/{noble-ble-handler-038532d9.js → noble-ble-handler-e8b87173.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-f4b406db.js');
+var index = require('./index-b37d926c.js');
 var hdShared = require('@onekeyfe/hd-shared');
 var pRetry = require('p-retry');
 
@@ -116,8 +116,7 @@ const DEVICE_SCAN_TIMEOUT = 5000;
 const DEVICE_CHECK_INTERVAL = 500;
 const SERVICE_DISCOVERY_TIMEOUT = 10000;
 const BLE_CLEANUP_TIMEOUT = 250;
-const BLE_DISCONNECT_CONFIRM_TIMEOUT_MS = 3000;
-const BLE_IDLE_DISCONNECT_MS = 20000;
+const BLE_IDLE_DISCONNECT_MS = 3 * 60000;
 const BLE_BUSY_BACKSTOP_MS = 10 * 60000;
 const BLE_PACKET_SIZE_FALLBACK = 192;
 const BLE_PACKET_SIZE_MAXIMUM = 244;
@@ -243,7 +242,6 @@ function initializeNoble() {
         try {
             noble = require('@stoprocent/noble');
             logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Noble library loaded');
-            setupPersistentStateListener();
             yield new Promise((resolve, reject) => {
                 if (!noble) {
                     reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Noble not initialized'));
@@ -253,6 +251,7 @@ function initializeNoble() {
                     resolve();
                     return;
                 }
+                setupPersistentStateListener();
                 const timeout = setTimeout(() => {
                     reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Bluetooth initialization timeout'));
                 }, BLUETOOTH_INIT_TIMEOUT);
@@ -337,14 +336,7 @@ function armIdleDisconnect(deviceId, ms = BLE_IDLE_DISCONNECT_MS, reason = 'idle
         logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Keep-alive timeout, disconnecting device', { deviceId, reason });
         const peripheral = connectedDevices.get(deviceId);
         const deviceName = ((_a = peripheral === null || peripheral === void 0 ? void 0 : peripheral.advertisement) === null || _a === void 0 ? void 0 : _a.localName) || 'Unknown Device';
-        const pending = unsubscribeNotifications(deviceId)
-            .catch(error => {
-            logger === null || logger === void 0 ? void 0 : logger.warn('[NobleBLE] Keep-alive unsubscribe failed, disconnecting anyway', {
-                deviceId,
-                error: error instanceof Error ? error.message : String(error),
-            });
-        })
-            .then(() => disconnectDevice(deviceId))
+        const pending = disconnectDevice(deviceId)
             .then(() => {
             broadcastToAllWebContents(hdShared.EOneKeyBleMessageKeys.BLE_DEVICE_DISCONNECTED, {
                 id: deviceId,
@@ -396,10 +388,6 @@ function cleanupDevice(deviceId, webContents, options = {}) {
         pairedDevices.delete(deviceId);
     }
     if (cleanupDiscoveredCache) {
-        const evicted = discoveredDevices.get(deviceId);
-        if (evicted) {
-            stalePeripherals.set(deviceId, evicted);
-        }
         discoveredDevices.delete(deviceId);
     }
     if (sendDisconnectEvent) {
@@ -421,7 +409,6 @@ function handleDeviceDisconnect(deviceId, webContents) {
     });
     cleanupDevice(deviceId, webContents, {
         cleanupConnection: true,
-        cleanupDiscoveredCache: true,
         sendDisconnectEvent: true,
         cancelOperations: true,
         reason: 'auto-disconnect',
@@ -603,37 +590,18 @@ function transmitHexDataToDevice(deviceId, hexData, options) {
         }
     });
 }
-const BLE_COLD_CONNECT_SCAN_TIMEOUT_MS = 1500;
-const stalePeripherals = new Map();
-const bleNamesById = new Map();
-function rememberBleName(deviceId, name) {
-    const trimmed = name === null || name === void 0 ? void 0 : name.trim();
-    if (trimmed) {
-        bleNamesById.set(deviceId, trimmed);
-    }
-}
-function resolveBleName(deviceId) {
-    var _a, _b, _c, _d, _e, _f;
-    const live = ((_c = (_b = (_a = connectedDevices.get(deviceId)) === null || _a === void 0 ? void 0 : _a.advertisement) === null || _b === void 0 ? void 0 : _b.localName) === null || _c === void 0 ? void 0 : _c.trim()) ||
-        ((_f = (_e = (_d = discoveredDevices.get(deviceId)) === null || _d === void 0 ? void 0 : _d.advertisement) === null || _e === void 0 ? void 0 : _e.localName) === null || _f === void 0 ? void 0 : _f.trim());
-    return live || bleNamesById.get(deviceId);
-}
-function shouldConnectByIdFirst(deviceId) {
-    return hdShared.isPro2FamilyBleName(resolveBleName(deviceId));
-}
 function handleDeviceDiscovered(peripheral) {
-    var _a, _b, _c;
+    var _a, _b;
     if (!isOneKeyPeripheral(peripheral)) {
         return;
     }
     const isNewDevice = !discoveredDevices.has(peripheral.id);
     discoveredDevices.set(peripheral.id, peripheral);
-    rememberBleName(peripheral.id, (_a = peripheral.advertisement) === null || _a === void 0 ? void 0 : _a.localName);
     if (isNewDevice) {
         logger === null || logger === void 0 ? void 0 : logger.debug('[NobleBLE] OneKey BLE device discovered', {
             deviceId: peripheral.id,
-            name: ((_b = peripheral.advertisement) === null || _b === void 0 ? void 0 : _b.localName) || 'Unknown Device',
-            serviceUUIDs: ((_c = peripheral.advertisement) === null || _c === void 0 ? void 0 : _c.serviceUuids) || [],
+            name: ((_a = peripheral.advertisement) === null || _a === void 0 ? void 0 : _a.localName) || 'Unknown Device',
+            serviceUUIDs: ((_b = peripheral.advertisement) === null || _b === void 0 ? void 0 : _b.serviceUuids) || [],
         });
     }
 }
@@ -659,7 +627,7 @@ function waitForNobleScanStop(nobleInstance) {
         });
     });
 }
-function performTargetedScan(targetDeviceId, timeoutMs = NOBLE_BLE_TARGETED_SCAN_TIMEOUT_MS) {
+function performTargetedScan(targetDeviceId) {
     return index.__awaiter(this, void 0, void 0, function* () {
         if (!noble) {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Noble not available');
@@ -699,7 +667,7 @@ function performTargetedScan(targetDeviceId, timeoutMs = NOBLE_BLE_TARGETED_SCAN
             const timeoutId = setTimeout(() => {
                 logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Targeted scan timeout for device:', targetDeviceId);
                 finish(null).catch(reject);
-            }, timeoutMs);
+            }, NOBLE_BLE_TARGETED_SCAN_TIMEOUT_MS);
             nobleInstance.on('discover', onDiscover);
             nobleInstance.startScanning([], true, (error) => {
                 if (error) {
@@ -914,12 +882,7 @@ function forceReconnectPeripheral(peripheral, deviceId) {
             yield runBleCallbackOperation(callback => peripheral.disconnect(() => {
                 logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Force disconnect completed');
                 callback();
-            }), { timeoutMs: BLE_DISCONNECT_CONFIRM_TIMEOUT_MS, timeoutBehavior: 'resolve' });
-            if (peripheral.state === 'connected') {
-                logger === null || logger === void 0 ? void 0 : logger.warn('[NobleBLE] Reset disconnect did not confirm, reconnecting anyway', {
-                    deviceId,
-                });
-            }
+            }), { timeoutMs: BLE_CLEANUP_TIMEOUT, timeoutBehavior: 'resolve' });
         }
         yield runBleCallbackOperation(callback => peripheral.connect(callback), {
             timeoutMs: NOBLE_BLE_CONNECTION_TIMEOUT_MS,
@@ -1003,18 +966,23 @@ function discoverServicesAndCharacteristicsWithRetry(peripheral, deviceId) {
 }
 function setupConnectionAndDiscoverServices(peripheral, deviceId, webContents) {
     return index.__awaiter(this, void 0, void 0, function* () {
+        setupDisconnectListener(peripheral, deviceId, webContents);
         try {
-            yield forceReconnectPeripheral(peripheral, deviceId);
+            return yield discoverServicesAndCharacteristicsWithRetry(peripheral, deviceId);
         }
-        catch (resetError) {
-            logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Connection reset before discovery failed, continuing', resetError);
+        catch (initialError) {
+            logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Direct service discovery failed, retrying after reconnect', {
+                deviceId,
+                error: initialError,
+            });
         }
+        yield forceReconnectPeripheral(peripheral, deviceId);
         setupDisconnectListener(peripheral, deviceId, webContents);
         try {
             return yield discoverServicesAndCharacteristicsWithRetry(peripheral, deviceId);
         }
-        catch (discoveryError) {
-            logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Service discovery failed, attempting fresh scan...', discoveryError);
+        catch (reconnectError) {
+            logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Service discovery failed after reconnect, attempting fresh scan...', reconnectError);
             return freshScanAndDiscover(deviceId, webContents);
         }
     });
@@ -1074,7 +1042,7 @@ function tryDirectConnectById(deviceId) {
     });
 }
 function connectDevice(deviceId, webContents) {
-    var _a, _b, _c;
+    var _a;
     return index.__awaiter(this, void 0, void 0, function* () {
         logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Connect device request:', {
             deviceId,
@@ -1086,57 +1054,34 @@ function connectDevice(deviceId, webContents) {
         });
         let peripheral = (_a = discoveredDevices.get(deviceId)) !== null && _a !== void 0 ? _a : connectedDevices.get(deviceId);
         if (!peripheral) {
+            logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Device not discovered, attempting targeted scan for:', deviceId);
             if (!noble) {
                 yield initializeNoble();
             }
             if (!noble) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Noble not available');
             }
-            const byIdFirst = shouldConnectByIdFirst(deviceId);
-            logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Resolving device for cold connect', {
-                deviceId,
-                name: (_b = resolveBleName(deviceId)) !== null && _b !== void 0 ? _b : 'unknown',
-                strategy: byIdFirst ? 'connect-by-id-first' : 'scan-first',
-            });
-            const scanForPeripheral = () => index.__awaiter(this, void 0, void 0, function* () {
-                var _d;
-                try {
-                    return (_d = (yield performTargetedScan(deviceId, BLE_COLD_CONNECT_SCAN_TIMEOUT_MS))) !== null && _d !== void 0 ? _d : undefined;
-                }
-                catch (scanError) {
-                    logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Targeted scan failed', {
-                        deviceId,
-                        error: scanError instanceof Error ? scanError.message : String(scanError),
-                    });
-                    return undefined;
-                }
-            });
-            const connectById = () => index.__awaiter(this, void 0, void 0, function* () {
-                const found = yield tryDirectConnectById(deviceId);
-                if (found) {
-                    discoveredDevices.set(deviceId, found);
-                }
-                return found;
-            });
-            peripheral = byIdFirst ? yield connectById() : yield scanForPeripheral();
-            if (!peripheral) {
-                peripheral = byIdFirst ? yield scanForPeripheral() : yield connectById();
+            peripheral = yield tryDirectConnectById(deviceId);
+            if (peripheral) {
+                discoveredDevices.set(deviceId, peripheral);
             }
-            if (!peripheral) {
-                const stale = stalePeripherals.get(deviceId);
-                if (stale) {
-                    logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Falling back to the last known peripheral:', deviceId);
-                    peripheral = stale;
+        }
+        if (!peripheral) {
+            try {
+                const foundPeripheral = yield performTargetedScan(deviceId);
+                if (!foundPeripheral) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound, `Device ${deviceId} not found even after targeted scan`);
                 }
+                peripheral = foundPeripheral;
             }
-            else {
-                stalePeripherals.delete(deviceId);
+            catch (error) {
+                logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Targeted scan failed:', error);
+                throw error;
             }
         }
         if (!peripheral) {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound, `Device ${deviceId} not found`);
         }
-        rememberBleName(deviceId, (_c = peripheral.advertisement) === null || _c === void 0 ? void 0 : _c.localName);
         logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Connecting to device:', deviceId);
         if (peripheral.state === 'connected') {
             logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Device already connected, skipping connection step');
@@ -1231,15 +1176,11 @@ function disconnectDevice(deviceId) {
             deviceDisconnectListeners.delete(deviceId);
         }
         yield runBleCallbackOperation(callback => peripheral.disconnect(() => callback()), {
-            timeoutMs: BLE_DISCONNECT_CONFIRM_TIMEOUT_MS,
+            timeoutMs: BLE_CLEANUP_TIMEOUT,
             timeoutBehavior: 'resolve',
         });
-        if (peripheral.state === 'connected') {
-            logger === null || logger === void 0 ? void 0 : logger.warn('[NobleBLE] Physical disconnect did not confirm in time', { deviceId });
-        }
         cleanupDevice(deviceId, undefined, {
             cleanupConnection: true,
-            cleanupDiscoveredCache: true,
             sendDisconnectEvent: false,
             cancelOperations: true,
             reason: 'manual-disconnect',
@@ -1450,6 +1391,10 @@ function setupNobleBleHandlers(webContents) {
                     yield disconnectDevice(deviceId).catch(() => undefined);
                 }
                 yield stopScanning().catch(() => undefined);
+                if (noble && persistentStateListener) {
+                    noble.removeListener('stateChange', persistentStateListener);
+                    persistentStateListener = null;
+                }
                 cleanupNobleListeners();
                 discoveredDevices.clear();
                 safeLog(logger, 'info', 'Noble BLE cleanup completed');

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;AAkuDD,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":"AA+BA,OAAO,KAAK,EAA+B,WAAW,EAAE,MAAM,UAAU,CAAC;AAEzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AA0EhE,wBAAgB,+BAA+B,CAAC,OAAO,CAAC,EAAE,oBAAoB,UAI7E;AA2mDD,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAgMpE"}

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

@@ -22,7 +22,6 @@ export interface NobleModule {
 export interface Logger {
     info(message: string, ...args: any[]): void;
     debug(message: string, ...args: any[]): void;
-    warn(message: string, ...args: any[]): void;
     error(message: string, ...args: any[]): void;
 }
 export declare function safeLog(logger: Logger | null, level: 'info' | 'debug' | 'error', message: string, ...args: any[]): void;

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,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;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;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"}

package/package.json

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

package/src/noble-ble-handler.ts

@@ -16,7 +16,6 @@ import {
   createKnownBleUuidAliases,
   hasOnekeyCommunicationService,
   isOnekeyBluetoothDevice,
-  isPro2FamilyBleName,
   matchesKnownBleUuid,
   wait,
 } from '@onekeyfe/hd-shared';
@@ -91,18 +90,8 @@ const DEVICE_SCAN_TIMEOUT = 5000; // 5 seconds for device scanning
 const DEVICE_CHECK_INTERVAL = 500; // 500ms interval for periodic device checks
 const SERVICE_DISCOVERY_TIMEOUT = 10000; // 10 seconds for service discovery
 const BLE_CLEANUP_TIMEOUT = 250;
-// A physical teardown must actually reach the OS before the device can return
-// to a clean state; 250ms routinely declared success while CoreBluetooth was
-// still disconnecting, leaving no trace when the teardown never completed.
-const BLE_DISCONNECT_CONFIRM_TIMEOUT_MS = 3000;
 // Renderer release is logical only; this timer physically frees the device.
-// Keep it SHORT: the Classic 1S goes protocol-deaf when a link is dropped
-// after sitting idle for minutes (field logs 2026-08-19: every deaf window
-// followed a 3-minute-idle disconnect, while disconnects right after traffic
-// have never produced one across 6.5.0's per-call teardown history). A hot
-// disconnect ~20s after the last operation stays inside the proven-safe
-// pattern and also shrinks the window in which phones cannot see the device.
-const BLE_IDLE_DISCONNECT_MS = 20_000;
+const BLE_IDLE_DISCONNECT_MS = 3 * 60_000;
 // Ceiling while a call is in flight: no outstanding write, but not forever.
 const BLE_BUSY_BACKSTOP_MS = 10 * 60_000;
 
@@ -268,11 +257,6 @@ async function initializeNoble(): Promise<void> {
     noble = require('@stoprocent/noble') as NobleModule;
     logger?.info('[NobleBLE] Noble library loaded');
 
-    // Register the process-lifetime state listener before any early return:
-    // the poweredOn fast path below would otherwise skip it for the whole
-    // session, leaving poweredOff cache/state reconciliation dead.
-    setupPersistentStateListener();
-
     // Wait for Bluetooth to be ready
     await new Promise<void>((resolve, reject) => {
       if (!noble) {
@@ -285,6 +269,9 @@ async function initializeNoble(): Promise<void> {
         return;
       }
 
+      // Setup persistent state listener before initialization
+      setupPersistentStateListener();
+
       const timeout = setTimeout(() => {
         reject(
           ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'Bluetooth initialization timeout')
@@ -411,21 +398,7 @@ function armIdleDisconnect(
       logger?.info('[NobleBLE] Keep-alive timeout, disconnecting device', { deviceId, reason });
       const peripheral = connectedDevices.get(deviceId);
       const deviceName = peripheral?.advertisement?.localName || 'Unknown Device';
-      // Unsubscribe CCCD before dropping the link, matching every other
-      // teardown path: the 1S leaves its notify session half-open when the
-      // link drops without an unsubscribe and then ignores application
-      // protocol traffic on NEW links for tens of minutes (field log
-      // 2026-08-19: the lone unsubscribe-skipping idle teardown caused a
-      // 6-attempt reconnect loop; unsubscribe-first teardowns reconnected
-      // instantly).
-      const pending = unsubscribeNotifications(deviceId)
-        .catch(error => {
-          logger?.warn('[NobleBLE] Keep-alive unsubscribe failed, disconnecting anyway', {
-            deviceId,
-            error: error instanceof Error ? error.message : String(error),
-          });
-        })
-        .then(() => disconnectDevice(deviceId))
+      const pending = disconnectDevice(deviceId)
         .then(() => {
           // A call is still in flight here; it must reject, not hang.
           // Both 'idle' and 'busy-backstop' report IdleKeepAlive on purpose:
@@ -503,16 +476,8 @@ function cleanupDevice(
     pairedDevices.delete(deviceId);
   }
 
-  // 2. Clean up discovered cache (optional). A peripheral that has been
-  // through a disconnect is never preferred again — reconnecting it is what
-  // produces stale-session links — but it is kept aside as the last resort for
-  // a bonded device that stays silent, so eviction cannot turn a working
-  // reconnect into DeviceNotFound.
+  // 2. Clean up discovered cache (optional)
   if (cleanupDiscoveredCache) {
-    const evicted = discoveredDevices.get(deviceId);
-    if (evicted) {
-      stalePeripherals.set(deviceId, evicted);
-    }
     discoveredDevices.delete(deviceId);
   }
 
@@ -543,9 +508,6 @@ function handleDeviceDisconnect(deviceId: string, webContents: WebContents): voi
 
   cleanupDevice(deviceId, webContents, {
     cleanupConnection: true,
-    // Same stale-object hazard as manual disconnect: an externally dropped
-    // link invalidates the cached peripheral for the next reconnect.
-    cleanupDiscoveredCache: true,
     sendDisconnectEvent: true,
     cancelOperations: true,
     reason: 'auto-disconnect',
@@ -799,45 +761,6 @@ async function transmitHexDataToDevice(
 }
 
 // Handle discovered device (for general enumeration only)
-// A scan that finds nothing costs this much before the direct-connect
-// fallback runs. Every advertisement in the 6.5.0 control logs arrived within
-// 631ms, so this leaves ~2x headroom while keeping a miss cheap.
-const BLE_COLD_CONNECT_SCAN_TIMEOUT_MS = 1500;
-
-// Peripherals evicted by a disconnect, kept only as the fallback of last
-// resort in connectDevice (see cleanupDevice).
-const stalePeripherals = new Map<string, Peripheral>();
-
-// Advertised names, kept for the life of the process: device caches are purged
-// on every disconnect, but the family a device belongs to never changes and
-// decides which connection strategy is safe for it.
-const bleNamesById = new Map<string, string>();
-
-function rememberBleName(deviceId: string, name?: string | null): void {
-  const trimmed = name?.trim();
-  if (trimmed) {
-    bleNamesById.set(deviceId, trimmed);
-  }
-}
-
-function resolveBleName(deviceId: string): string | undefined {
-  const live =
-    connectedDevices.get(deviceId)?.advertisement?.localName?.trim() ||
-    discoveredDevices.get(deviceId)?.advertisement?.localName?.trim();
-  return live || bleNamesById.get(deviceId);
-}
-
-/**
- * Pro2/Neo connect by id first: they are unaffected by the stale-session
- * problem and advertise under Find My names a OneKey-filtered scan cannot
- * match. Everything else — Classic family, and any device whose name is not
- * known yet — scans first, because connecting by id can resolve a session the
- * device no longer serves (see setupConnectionAndDiscoverServices).
- */
-function shouldConnectByIdFirst(deviceId: string): boolean {
-  return isPro2FamilyBleName(resolveBleName(deviceId));
-}
-
 function handleDeviceDiscovered(peripheral: Peripheral): void {
   // Only process OneKey candidates for general discovery. Avoid logging every
   // ambient BLE peripheral; it makes Pro2 debugging hard to read.
@@ -847,7 +770,6 @@ function handleDeviceDiscovered(peripheral: Peripheral): void {
 
   const isNewDevice = !discoveredDevices.has(peripheral.id);
   discoveredDevices.set(peripheral.id, peripheral);
-  rememberBleName(peripheral.id, peripheral.advertisement?.localName);
   if (isNewDevice) {
     logger?.debug('[NobleBLE] OneKey BLE device discovered', {
       deviceId: peripheral.id,
@@ -882,10 +804,7 @@ async function waitForNobleScanStop(nobleInstance: NobleModule): Promise<void> {
 
 // Perform targeted scan for a specific device ID
 // Uses self-contained local listener pattern - no global state needed
-async function performTargetedScan(
-  targetDeviceId: string,
-  timeoutMs: number = NOBLE_BLE_TARGETED_SCAN_TIMEOUT_MS
-): Promise<Peripheral | null> {
+async function performTargetedScan(targetDeviceId: string): Promise<Peripheral | null> {
   if (!noble) {
     throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'Noble not available');
   }
@@ -930,7 +849,7 @@ async function performTargetedScan(
     const timeoutId = setTimeout(() => {
       logger?.info('[NobleBLE] Targeted scan timeout for device:', targetDeviceId);
       finish(null).catch(reject);
-    }, timeoutMs);
+    }, NOBLE_BLE_TARGETED_SCAN_TIMEOUT_MS);
 
     // Add local listener for this scan
     nobleInstance.on('discover', onDiscover);
@@ -1237,10 +1156,7 @@ async function forceReconnectPeripheral(peripheral: Peripheral, deviceId: string
     reason: 'force-reconnect',
   });
 
-  // Step 2: Force disconnect if connected. Wait for the teardown to be
-  // confirmed: reconnecting while CoreBluetooth is still closing the old link
-  // rebuilds the very stale-session state this reset exists to clear, and
-  // 250ms is not enough to prove a physical teardown on macOS.
+  // Step 2: Force disconnect if connected
   if (peripheral.state === 'connected') {
     await runBleCallbackOperation(
       callback =>
@@ -1248,13 +1164,8 @@ async function forceReconnectPeripheral(peripheral: Peripheral, deviceId: string
           logger?.info('[NobleBLE] Force disconnect completed');
           callback();
         }),
-      { timeoutMs: BLE_DISCONNECT_CONFIRM_TIMEOUT_MS, timeoutBehavior: 'resolve' }
+      { timeoutMs: BLE_CLEANUP_TIMEOUT, timeoutBehavior: 'resolve' }
     );
-    if (peripheral.state === 'connected') {
-      logger?.warn('[NobleBLE] Reset disconnect did not confirm, reconnecting anyway', {
-        deviceId,
-      });
-    }
   }
 
   // Step 3: Re-establish connection
@@ -1394,28 +1305,26 @@ async function setupConnectionAndDiscoverServices(
   deviceId: string,
   webContents: WebContents
 ): Promise<CharacteristicPair> {
-  // Reset the link before any protocol traffic reaches the device. 6.5.0 did
-  // this on every cold setup and never produced a protocol-deaf Classic 1S
-  // (control log 2026-08-20: 16/16 links answered within ~1s, including after
-  // a 15-minute idle). Demoting it to a discovery-failure fallback removed the
-  // reset entirely for this device, because discovery always succeeds: the link
-  // comes up, GATT resolves from cache, and the device then answers nothing on
-  // a session it no longer serves. Costs ~1.3s per cold setup; a kept-alive
-  // link with an intact subscription returns before reaching here, so reuse
-  // inside a workflow is unaffected.
+  setupDisconnectListener(peripheral, deviceId, webContents);
+
   try {
-    await forceReconnectPeripheral(peripheral, deviceId);
-  } catch (resetError) {
-    // A failed reset must not abort the attempt: discovery on the existing
-    // link, then the fresh-scan fallback, still have a chance to recover.
-    logger?.error('[NobleBLE] Connection reset before discovery failed, continuing', resetError);
+    return await discoverServicesAndCharacteristicsWithRetry(peripheral, deviceId);
+  } catch (initialError) {
+    logger?.info('[NobleBLE] Direct service discovery failed, retrying after reconnect', {
+      deviceId,
+      error: initialError,
+    });
   }
-  setupDisconnectListener(peripheral, deviceId, webContents);
 
+  await forceReconnectPeripheral(peripheral, deviceId);
+  setupDisconnectListener(peripheral, deviceId, webContents);
   try {
     return await discoverServicesAndCharacteristicsWithRetry(peripheral, deviceId);
-  } catch (discoveryError) {
-    logger?.error('[NobleBLE] Service discovery failed, attempting fresh scan...', discoveryError);
+  } catch (reconnectError) {
+    logger?.error(
+      '[NobleBLE] Service discovery failed after reconnect, attempting fresh scan...',
+      reconnectError
+    );
     return freshScanAndDiscover(deviceId, webContents);
   }
 }
@@ -1504,7 +1413,10 @@ async function connectDevice(deviceId: string, webContents: WebContents): Promis
   // enumerate clears the discovery map; a kept-alive link outlives it.
   let peripheral = discoveredDevices.get(deviceId) ?? connectedDevices.get(deviceId);
 
+  // If device not discovered, try a targeted scan for this specific device
   if (!peripheral) {
+    logger?.info('[NobleBLE] Device not discovered, attempting targeted scan for:', deviceId);
+
     // Initialize Noble if not already done
     if (!noble) {
       await initializeNoble();
@@ -1514,58 +1426,27 @@ async function connectDevice(deviceId: string, webContents: WebContents): Promis
       throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'Noble not available');
     }
 
-    // A live advertisement proves the device holds no link and will open a
-    // fresh session; connecting by id resolves through the OS cache instead
-    // and can hand back a session the device no longer serves (see
-    // setupConnectionAndDiscoverServices). Scanning is also the faster of the
-    // two when the device does advertise: ~96ms median against ~784ms for
-    // connect-by-id across the field logs. Pro2/Neo keep connect-by-id first
-    // because they are unaffected and may advertise under an unmatchable Find
-    // My name.
-    const byIdFirst = shouldConnectByIdFirst(deviceId);
-    logger?.info('[NobleBLE] Resolving device for cold connect', {
-      deviceId,
-      name: resolveBleName(deviceId) ?? 'unknown',
-      strategy: byIdFirst ? 'connect-by-id-first' : 'scan-first',
-    });
-
-    const scanForPeripheral = async () => {
-      try {
-        return (await performTargetedScan(deviceId, BLE_COLD_CONNECT_SCAN_TIMEOUT_MS)) ?? undefined;
-      } catch (scanError) {
-        logger?.info('[NobleBLE] Targeted scan failed', {
-          deviceId,
-          error: scanError instanceof Error ? scanError.message : String(scanError),
-        });
-        return undefined;
-      }
-    };
-
-    const connectById = async () => {
-      const found = await tryDirectConnectById(deviceId);
-      if (found) {
-        discoveredDevices.set(deviceId, found);
-      }
-      return found;
-    };
-
-    peripheral = byIdFirst ? await connectById() : await scanForPeripheral();
-    if (!peripheral) {
-      // The preferred route came up empty: not advertising (held elsewhere, or
-      // silent), or not reachable by id. Try the other one before giving up.
-      peripheral = byIdFirst ? await scanForPeripheral() : await connectById();
+    // Reaches a bonded device that is not advertising; else falls to the scan.
+    peripheral = await tryDirectConnectById(deviceId);
+    if (peripheral) {
+      discoveredDevices.set(deviceId, peripheral);
     }
-    if (!peripheral) {
-      // Neither route resolved a peripheral: a bonded device that has gone
-      // silent, or connect-by-id sitting in its cooldown. The evicted object is
-      // worse than a fresh one, but it beats failing the call outright.
-      const stale = stalePeripherals.get(deviceId);
-      if (stale) {
-        logger?.info('[NobleBLE] Falling back to the last known peripheral:', deviceId);
-        peripheral = stale;
+  }
+
+  if (!peripheral) {
+    // Perform a targeted scan to find the specific device
+    try {
+      const foundPeripheral = await performTargetedScan(deviceId);
+      if (!foundPeripheral) {
+        throw ERRORS.TypedError(
+          HardwareErrorCode.DeviceNotFound,
+          `Device ${deviceId} not found even after targeted scan`
+        );
       }
-    } else {
-      stalePeripherals.delete(deviceId);
+      peripheral = foundPeripheral;
+    } catch (error) {
+      logger?.error('[NobleBLE] Targeted scan failed:', error);
+      throw error;
     }
   }
 
@@ -1574,10 +1455,6 @@ async function connectDevice(deviceId: string, webContents: WebContents): Promis
     throw ERRORS.TypedError(HardwareErrorCode.DeviceNotFound, `Device ${deviceId} not found`);
   }
 
-  // Also covers the connect-by-id route, whose simulated discovery carries no
-  // service UUIDs and therefore never reaches handleDeviceDiscovered.
-  rememberBleName(deviceId, peripheral.advertisement?.localName);
-
   logger?.info('[NobleBLE] Connecting to device:', deviceId);
 
   // Check if device is already connected
@@ -1720,18 +1597,11 @@ async function disconnectDevice(deviceId: string): Promise<void> {
   }
 
   await runBleCallbackOperation(callback => peripheral.disconnect(() => callback()), {
-    timeoutMs: BLE_DISCONNECT_CONFIRM_TIMEOUT_MS,
+    timeoutMs: BLE_CLEANUP_TIMEOUT,
     timeoutBehavior: 'resolve',
   });
-  if (peripheral.state === 'connected') {
-    logger?.warn('[NobleBLE] Physical disconnect did not confirm in time', { deviceId });
-  }
   cleanupDevice(deviceId, undefined, {
     cleanupConnection: true,
-    // macOS returns zero GATT services when a previously-disconnected
-    // peripheral object is reconnected; drop the discovery cache so the next
-    // connect resolves a fresh peripheral (direct connect by id, or scan).
-    cleanupDiscoveredCache: true,
     sendDisconnectEvent: false,
     cancelOperations: true,
     reason: 'manual-disconnect',
@@ -2057,12 +1927,10 @@ export function setupNobleBleHandlers(webContents: WebContents): void {
         }
 
         await stopScanning().catch(() => undefined);
-        // persistentStateListener is process-lifetime, NOT per-window: this
-        // destroy handler also fires on a renderer soft restart, and removing
-        // the listener here permanently killed poweredOff/poweredOn
-        // reconciliation for the rest of the process (nothing re-registers it:
-        // initializeNoble early-returns once noble is loaded). The null-guard
-        // in setupPersistentStateListener keeps it deduped to one instance.
+        if (noble && persistentStateListener) {
+          noble.removeListener('stateChange', persistentStateListener);
+          persistentStateListener = null;
+        }
         cleanupNobleListeners();
         discoveredDevices.clear();
         safeLog(logger, 'info', 'Noble BLE cleanup completed');

package/src/types/noble-extended.ts

@@ -39,7 +39,6 @@ export interface NobleModule {
 export interface Logger {
   info(message: string, ...args: any[]): void;
   debug(message: string, ...args: any[]): void;
-  warn(message: string, ...args: any[]): void;
   error(message: string, ...args: any[]): void;
 }