@onekeyfe/hd-transport-electron 1.2.2-alpha.100 → 1.2.2-alpha.101

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

package/dist/index.d.ts

@@ -25,6 +25,7 @@ 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;
 }
 
@@ -36,6 +37,17 @@ interface Logger {
 interface NobleBleWriteOptions {
     pacingDelayMs?: number;
 }
+type NobleBleIpcErrorPayload = {
+    name: string;
+    message: string;
+    errorCode: number;
+    params?: unknown;
+};
+type NobleBleIpcErrorResponse = {
+    type: 'NobleBleIpcError';
+    success: false;
+    error: NobleBleIpcErrorPayload;
+};
 interface NobleBleAPI {
     enumerate: () => Promise<{
         id: string;
@@ -81,4 +93,4 @@ interface DesktopAPI {
 
 declare function initNobleBleSupport(webContents: WebContents): Promise<void>;
 
-export { CharacteristicPair, DesktopAPI, DeviceInfo, Logger, NobleBleAPI, NobleBleWriteOptions, NobleModule, initNobleBleSupport };
+export { CharacteristicPair, DesktopAPI, DeviceInfo, Logger, NobleBleAPI, NobleBleIpcErrorPayload, NobleBleIpcErrorResponse, NobleBleWriteOptions, NobleModule, initNobleBleSupport };

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C,cAAc,SAAS,CAAC;AAGxB,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAEzF,wBAAsB,mBAAmB,CAAC,WAAW,EAAE,WAAW,iBAGjE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C,cAAc,SAAS,CAAC;AAGxB,YAAY,EACV,UAAU,EACV,WAAW,EACX,uBAAuB,EACvB,wBAAwB,EACxB,oBAAoB,GACrB,MAAM,qBAAqB,CAAC;AAE7B,wBAAsB,mBAAmB,CAAC,WAAW,EAAE,WAAW,iBAGjE"}

package/dist/index.js

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

package/dist/{noble-ble-handler-e8b87173.js → noble-ble-handler-0b455c4f.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-b37d926c.js');
+var index = require('./index-d51c7da6.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;
@@ -87,10 +96,44 @@ function softRefreshSubscription(params) {
 }
 
 const NOBLE_BLE_TARGETED_SCAN_TIMEOUT_MS = 5000;
-const NOBLE_BLE_CONNECTION_TIMEOUT_MS = 10000;
+const NOBLE_BLE_SUBSCRIBE_TIMEOUT_MS = 10000;
 
 let noble = null;
 let logger = null;
+function createNobleBleConnectionError(error, messagePrefix = '') {
+    const errorMessage = error.message;
+    const isInvalidMacOsBond = error.nativeErrorCode === 14 && error.nativeErrorDomain === 'CBErrorDomain';
+    if (isInvalidMacOsBond) {
+        const nativeErrorMessage = `${messagePrefix}${errorMessage}`;
+        return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleBondInvalid, `${hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.BleBondInvalid]} (${nativeErrorMessage})`, {
+            nativeErrorMessage,
+        });
+    }
+    return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, `${messagePrefix}${errorMessage}`);
+}
+function createNobleBleIpcErrorResponse(error) {
+    const candidate = error;
+    const errorCode = typeof (candidate === null || candidate === void 0 ? void 0 : candidate.errorCode) === 'number' ? candidate.errorCode : hdShared.HardwareErrorCode.UnknownError;
+    const message = typeof (candidate === null || candidate === void 0 ? void 0 : candidate.message) === 'string' ? candidate.message : String(error !== null && error !== void 0 ? error : 'Unknown error');
+    const name = typeof (candidate === null || candidate === void 0 ? void 0 : candidate.name) === 'string' ? candidate.name : 'Error';
+    let params;
+    if ((candidate === null || candidate === void 0 ? void 0 : candidate.params) !== undefined) {
+        try {
+            const serializedParams = JSON.stringify(candidate.params);
+            params = serializedParams === undefined ? undefined : JSON.parse(serializedParams);
+        }
+        catch (_a) {
+            params = undefined;
+        }
+    }
+    return {
+        type: 'NobleBleIpcError',
+        success: false,
+        error: Object.assign({ name,
+            message,
+            errorCode }, (params !== undefined ? { params } : {})),
+    };
+}
 const bluetoothState = {
     available: false,
     unsupported: false,
@@ -116,7 +159,8 @@ const DEVICE_SCAN_TIMEOUT = 5000;
 const DEVICE_CHECK_INTERVAL = 500;
 const SERVICE_DISCOVERY_TIMEOUT = 10000;
 const BLE_CLEANUP_TIMEOUT = 250;
-const BLE_IDLE_DISCONNECT_MS = 3 * 60000;
+const BLE_DISCONNECT_CONFIRM_TIMEOUT_MS = 3000;
+const BLE_IDLE_DISCONNECT_MS = 20000;
 const BLE_BUSY_BACKSTOP_MS = 10 * 60000;
 const BLE_PACKET_SIZE_FALLBACK = 192;
 const BLE_PACKET_SIZE_MAXIMUM = 244;
@@ -242,6 +286,7 @@ 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'));
@@ -251,7 +296,6 @@ function initializeNoble() {
                     resolve();
                     return;
                 }
-                setupPersistentStateListener();
                 const timeout = setTimeout(() => {
                     reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Bluetooth initialization timeout'));
                 }, BLUETOOTH_INIT_TIMEOUT);
@@ -336,7 +380,14 @@ 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 = disconnectDevice(deviceId)
+        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))
             .then(() => {
             broadcastToAllWebContents(hdShared.EOneKeyBleMessageKeys.BLE_DEVICE_DISCONNECTED, {
                 id: deviceId,
@@ -409,6 +460,7 @@ function handleDeviceDisconnect(deviceId, webContents) {
     });
     cleanupDevice(deviceId, webContents, {
         cleanupConnection: true,
+        cleanupDiscoveredCache: true,
         sendDisconnectEvent: true,
         cancelOperations: true,
         reason: 'auto-disconnect',
@@ -432,13 +484,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 });
@@ -545,7 +598,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();
@@ -590,18 +643,37 @@ function transmitHexDataToDevice(deviceId, hexData, options) {
         }
     });
 }
+const BLE_COLD_CONNECT_SCAN_TIMEOUT_MS = 1500;
+const SERVICE_DISCOVERY_MAX_ATTEMPTS = 2;
+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;
+    var _a, _b, _c;
     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: ((_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) || [],
+            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) || [],
         });
     }
 }
@@ -627,7 +699,7 @@ function waitForNobleScanStop(nobleInstance) {
         });
     });
 }
-function performTargetedScan(targetDeviceId) {
+function performTargetedScan(targetDeviceId, timeoutMs = NOBLE_BLE_TARGETED_SCAN_TIMEOUT_MS) {
     return index.__awaiter(this, void 0, void 0, function* () {
         if (!noble) {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Noble not available');
@@ -667,7 +739,7 @@ function performTargetedScan(targetDeviceId) {
             const timeoutId = setTimeout(() => {
                 logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Targeted scan timeout for device:', targetDeviceId);
                 finish(null).catch(reject);
-            }, NOBLE_BLE_TARGETED_SCAN_TIMEOUT_MS);
+            }, timeoutMs);
             nobleInstance.on('discover', onDiscover);
             nobleInstance.startScanning([], true, (error) => {
                 if (error) {
@@ -763,12 +835,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',
@@ -802,7 +876,7 @@ function discoverServicesAndCharacteristics(peripheral) {
         });
         const discoveryPromise = (() => index.__awaiter(this, void 0, void 0, function* () {
             const services = yield new Promise((resolve, reject) => {
-                peripheral.discoverServices([], (error, svc) => {
+                peripheral.discoverServices(ONEKEY_SERVICE_UUIDS, (error, svc) => {
                     if (error) {
                         logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Service discovery failed:', error);
                         reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleServiceNotFound, error.message));
@@ -813,7 +887,7 @@ function discoverServicesAndCharacteristics(peripheral) {
                 });
             });
             if (!services || services.length === 0) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleServiceNotFound, 'No services found');
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleServiceNotFound, 'No OneKey services found');
             }
             logger === null || logger === void 0 ? void 0 : logger.debug('[NobleBLE] services discovered', {
                 deviceId: peripheral.id,
@@ -884,9 +958,14 @@ function forceReconnectPeripheral(peripheral, deviceId) {
                 callback();
             }), { timeoutMs: BLE_CLEANUP_TIMEOUT, timeoutBehavior: 'resolve' });
         }
-        yield runBleCallbackOperation(callback => peripheral.connect(callback), {
-            timeoutMs: NOBLE_BLE_CONNECTION_TIMEOUT_MS,
-            timeoutBehavior: 'reject',
+        yield new Promise((resolve, reject) => {
+            peripheral.connect(error => {
+                if (error) {
+                    reject(createNobleBleConnectionError(error));
+                    return;
+                }
+                resolve();
+            });
         });
         logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Force reconnect successful');
         connectedDevices.set(deviceId, peripheral);
@@ -909,7 +988,7 @@ function freshScanAndDiscover(deviceId, webContents) {
         yield new Promise((resolve, reject) => {
             freshPeripheral.connect((error) => {
                 if (error) {
-                    reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, `Fresh peripheral connection failed: ${error.message}`));
+                    reject(createNobleBleConnectionError(error, 'Fresh peripheral connection failed: '));
                 }
                 else {
                     connectedDevices.set(deviceId, freshPeripheral);
@@ -930,11 +1009,11 @@ function discoverServicesAndCharacteristicsWithRetry(peripheral, deviceId) {
                 deviceId,
                 peripheralState: peripheral.state,
                 attempt: attemptNumber,
-                maxRetries: 5,
+                maxRetries: SERVICE_DISCOVERY_MAX_ATTEMPTS,
                 targetUUIDs: ONEKEY_SERVICE_UUIDS,
             });
             if (attemptNumber > 1) {
-                logger === null || logger === void 0 ? void 0 : logger.info(`[NobleBLE] Service discovery retry attempt ${attemptNumber}/5`);
+                logger === null || logger === void 0 ? void 0 : logger.info(`[NobleBLE] Service discovery retry attempt ${attemptNumber}/${SERVICE_DISCOVERY_MAX_ATTEMPTS}`);
             }
             if (peripheral.state !== 'connected') {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, `Device not connected: ${peripheral.state}`);
@@ -943,16 +1022,16 @@ function discoverServicesAndCharacteristicsWithRetry(peripheral, deviceId) {
                 return yield discoverServicesAndCharacteristics(peripheral);
             }
             catch (error) {
-                logger === null || logger === void 0 ? void 0 : logger.error(`[NobleBLE] No services found (attempt ${attemptNumber}/5)`);
-                if (attemptNumber < 5) {
-                    logger === null || logger === void 0 ? void 0 : logger.error(`[NobleBLE] Will retry service discovery (attempt ${attemptNumber + 1}/5)`);
+                logger === null || logger === void 0 ? void 0 : logger.error(`[NobleBLE] No services found (attempt ${attemptNumber}/${SERVICE_DISCOVERY_MAX_ATTEMPTS})`);
+                if (attemptNumber < SERVICE_DISCOVERY_MAX_ATTEMPTS) {
+                    logger === null || logger === void 0 ? void 0 : logger.error(`[NobleBLE] Will retry service discovery (attempt ${attemptNumber + 1}/${SERVICE_DISCOVERY_MAX_ATTEMPTS})`);
                 }
                 throw error;
             }
         }), {
-            retries: 4,
+            retries: SERVICE_DISCOVERY_MAX_ATTEMPTS - 1,
             factor: 1.5,
-            minTimeout: 1000,
+            minTimeout: 500,
             maxTimeout: 3000,
             onFailedAttempt: error => {
                 logger === null || logger === void 0 ? void 0 : logger.error(`[NobleBLE] Service discovery attempt ${error.attemptNumber} failed:`, {
@@ -966,23 +1045,27 @@ function discoverServicesAndCharacteristicsWithRetry(peripheral, deviceId) {
 }
 function setupConnectionAndDiscoverServices(peripheral, deviceId, webContents) {
     return index.__awaiter(this, void 0, void 0, function* () {
-        setupDisconnectListener(peripheral, deviceId, webContents);
         try {
-            return yield discoverServicesAndCharacteristicsWithRetry(peripheral, deviceId);
+            yield forceReconnectPeripheral(peripheral, deviceId);
         }
-        catch (initialError) {
-            logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Direct service discovery failed, retrying after reconnect', {
-                deviceId,
-                error: initialError,
-            });
+        catch (resetError) {
+            if (hdShared.isBleStaleBondHardwareError(resetError)) {
+                throw resetError;
+            }
+            logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Connection reset before discovery failed, continuing', resetError);
         }
-        yield forceReconnectPeripheral(peripheral, deviceId);
         setupDisconnectListener(peripheral, deviceId, webContents);
         try {
             return yield discoverServicesAndCharacteristicsWithRetry(peripheral, deviceId);
         }
-        catch (reconnectError) {
-            logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Service discovery failed after reconnect, attempting fresh scan...', reconnectError);
+        catch (discoveryError) {
+            if (peripheral.state === 'connected') {
+                logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Service discovery failed on a live link, dropping it before the fresh scan', discoveryError);
+                yield disconnectDevice(deviceId).catch(() => undefined);
+            }
+            else {
+                logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Service discovery failed, attempting fresh scan...', discoveryError);
+            }
             return freshScanAndDiscover(deviceId, webContents);
         }
     });
@@ -1042,7 +1125,7 @@ function tryDirectConnectById(deviceId) {
     });
 }
 function connectDevice(deviceId, webContents) {
-    var _a;
+    var _a, _b, _c;
     return index.__awaiter(this, void 0, void 0, function* () {
         logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Connect device request:', {
             deviceId,
@@ -1054,34 +1137,47 @@ 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');
             }
-            peripheral = yield tryDirectConnectById(deviceId);
-            if (peripheral) {
-                discoveredDevices.set(deviceId, peripheral);
-            }
-        }
-        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`);
+            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;
                 }
-                peripheral = foundPeripheral;
-            }
-            catch (error) {
-                logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Targeted scan failed:', error);
-                throw error;
+                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();
             }
         }
         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');
@@ -1123,27 +1219,11 @@ function connectDevice(deviceId, webContents) {
             return;
         }
         return new Promise((resolve, reject) => {
-            let connectionTimedOut = false;
-            const timeout = setTimeout(() => {
-                connectionTimedOut = true;
-                reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, 'Connection timeout'));
-            }, NOBLE_BLE_CONNECTION_TIMEOUT_MS);
             const connectedPeripheral = peripheral;
             connectedPeripheral.connect((error) => index.__awaiter(this, void 0, void 0, function* () {
-                clearTimeout(timeout);
-                if (connectionTimedOut) {
-                    if (!error) {
-                        try {
-                            connectedPeripheral.disconnect(() => undefined);
-                        }
-                        catch (_a) {
-                        }
-                    }
-                    return;
-                }
                 if (error) {
                     logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Connection failed:', error);
-                    reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, error.message));
+                    reject(createNobleBleConnectionError(error));
                     return;
                 }
                 logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Connected to device:', deviceId);
@@ -1156,9 +1236,9 @@ function connectDevice(deviceId, webContents) {
                 }
                 catch (setupError) {
                     logger === null || logger === void 0 ? void 0 : logger.error('[NobleBLE] Connection setup failed:', setupError);
-                    connectedPeripheral.disconnect(() => {
-                        reject(setupError);
-                    });
+                    disconnectDevice(deviceId)
+                        .catch(() => undefined)
+                        .then(() => reject(setupError));
                 }
             }));
         });
@@ -1176,11 +1256,15 @@ function disconnectDevice(deviceId) {
             deviceDisconnectListeners.delete(deviceId);
         }
         yield runBleCallbackOperation(callback => peripheral.disconnect(() => callback()), {
-            timeoutMs: BLE_CLEANUP_TIMEOUT,
+            timeoutMs: BLE_DISCONNECT_CONFIRM_TIMEOUT_MS,
             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',
@@ -1259,7 +1343,7 @@ function subscribeNotifications(deviceId, callback) {
                     timeoutBehavior: 'resolve',
                 });
                 yield runBleCallbackOperation(callback => notifyCharacteristic.subscribe(callback), {
-                    timeoutMs: NOBLE_BLE_CONNECTION_TIMEOUT_MS,
+                    timeoutMs: NOBLE_BLE_SUBSCRIBE_TIMEOUT_MS,
                     timeoutBehavior: 'reject',
                 });
                 notifyCharacteristic.on('data', (data) => {
@@ -1271,9 +1355,14 @@ function subscribeNotifications(deviceId, callback) {
                 });
             });
         }
+        const subscribeStartedAt = Date.now();
         try {
             yield rebuildAppSubscription(deviceId, notifyCharacteristic);
             subscribedDevices.set(deviceId, true);
+            logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Notification subscription active', {
+                deviceId,
+                ms: Date.now() - subscribeStartedAt,
+            });
         }
         finally {
             subscriptionOperations.set(deviceId, 'idle');
@@ -1286,7 +1375,14 @@ function setupNobleBleHandlers(webContents) {
         const { ipcMain } = require('electron');
         const handle = (channel, listener) => {
             ipcMain.removeHandler(channel);
-            ipcMain.handle(channel, listener);
+            ipcMain.handle(channel, (...args) => index.__awaiter(this, void 0, void 0, function* () {
+                try {
+                    return yield Promise.resolve(listener(...args));
+                }
+                catch (error) {
+                    return createNobleBleIpcErrorResponse(error);
+                }
+            }));
         };
         safeLog(logger, 'info', 'Setting up Noble BLE IPC handlers');
         handle(hdShared.EOneKeyBleMessageKeys.NOBLE_BLE_ENUMERATE, () => index.__awaiter(this, void 0, void 0, function* () {
@@ -1391,10 +1487,6 @@ 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');
@@ -1410,5 +1502,7 @@ function setupNobleBleHandlers(webContents) {
     }
 }
 
+exports.createNobleBleConnectionError = createNobleBleConnectionError;
+exports.createNobleBleIpcErrorResponse = createNobleBleIpcErrorResponse;
 exports.resolveNobleBleWritePacingDelay = resolveNobleBleWritePacingDelay;
 exports.setupNobleBleHandlers = setupNobleBleHandlers;

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

@@ -1,5 +1,12 @@
 import type { WebContents } from 'electron';
-import type { NobleBleWriteOptions } from './types/desktop-api';
+import type { NobleBleIpcErrorResponse, NobleBleWriteOptions } from './types/desktop-api';
+type NobleBleNativeError = Error & {
+    nativeErrorCode?: number;
+    nativeErrorDomain?: string;
+};
+export declare function createNobleBleConnectionError(error: NobleBleNativeError, messagePrefix?: string): import("@onekeyfe/hd-shared").HardwareError;
+export declare function createNobleBleIpcErrorResponse(error: unknown): NobleBleIpcErrorResponse;
 export declare function resolveNobleBleWritePacingDelay(options?: NobleBleWriteOptions): number;
 export declare function setupNobleBleHandlers(webContents: WebContents): void;
+export {};
 //# sourceMappingURL=noble-ble-handler.d.ts.map

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,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"}
+{"version":3,"file":"noble-ble-handler.d.ts","sourceRoot":"","sources":["../src/noble-ble-handler.ts"],"names":[],"mappings":"AAkCA,OAAO,KAAK,EAA+B,WAAW,EAAE,MAAM,UAAU,CAAC;AAEzE,OAAO,KAAK,EAAE,wBAAwB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAO1F,KAAK,mBAAmB,GAAG,KAAK,GAAG;IACjC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,mBAAmB,EAAE,aAAa,SAAK,+CAgB3F;AAED,wBAAgB,8BAA8B,CAAC,KAAK,EAAE,OAAO,GAAG,wBAAwB,CAgCvF;AA+ED,wBAAgB,+BAA+B,CAAC,OAAO,CAAC,EAAE,oBAAoB,UAI7E;AAuuDD,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI,CAwMpE"}

package/dist/noble-ble-timeouts.d.ts

@@ -1,3 +1,3 @@
 export declare const NOBLE_BLE_TARGETED_SCAN_TIMEOUT_MS = 5000;
-export declare const NOBLE_BLE_CONNECTION_TIMEOUT_MS = 10000;
+export declare const NOBLE_BLE_SUBSCRIBE_TIMEOUT_MS = 10000;
 //# sourceMappingURL=noble-ble-timeouts.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"noble-ble-timeouts.d.ts","sourceRoot":"","sources":["../src/noble-ble-timeouts.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,kCAAkC,OAAQ,CAAC;AACxD,eAAO,MAAM,+BAA+B,QAAS,CAAC"}
+{"version":3,"file":"noble-ble-timeouts.d.ts","sourceRoot":"","sources":["../src/noble-ble-timeouts.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,kCAAkC,OAAQ,CAAC;AACxD,eAAO,MAAM,8BAA8B,QAAS,CAAC"}

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

@@ -2,6 +2,17 @@ import type { EBleDisconnectReason } from '@onekeyfe/hd-shared';
 export interface NobleBleWriteOptions {
     pacingDelayMs?: number;
 }
+export type NobleBleIpcErrorPayload = {
+    name: string;
+    message: string;
+    errorCode: number;
+    params?: unknown;
+};
+export type NobleBleIpcErrorResponse = {
+    type: 'NobleBleIpcError';
+    success: false;
+    error: NobleBleIpcErrorPayload;
+};
 export interface NobleBleAPI {
     enumerate: () => Promise<{
         id: string;