@onekeyfe/hd-transport-electron 1.2.0-alpha.154 → 1.2.0-alpha.155

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

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import { WebContents } from 'electron';
 import { Characteristic, Peripheral } from '@stoprocent/noble';
 import { OneKeyDeviceInfoBase } from '@onekeyfe/hd-transport';
+import { EBleDisconnectReason } from '@onekeyfe/hd-shared';
 
 interface DeviceInfo extends OneKeyDeviceInfoBase {
     id: string;
@@ -24,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;
 }
 
@@ -32,6 +32,7 @@ interface Logger {
  * Desktop API types for Electron preload script
  * These types define the core interface for Noble BLE communication
  */
+
 interface NobleBleWriteOptions {
     pacingDelayMs?: number;
 }
@@ -56,9 +57,16 @@ interface NobleBleAPI {
         id: string;
         mtu: number;
     }) => void) => () => void;
+    /**
+     * Fires whenever a BLE link drops. `reason` distinguishes a real peripheral
+     * drop from the main process freeing an idle link on its keep-alive timer;
+     * it is optional so an older host bridge that omits it still type-checks
+     * (absent is treated as a real drop by consumers).
+     */
     onDeviceDisconnected: (callback: (device: {
         id: string;
         name: string;
+        reason?: EBleDisconnectReason;
     }) => void) => () => void;
     checkAvailability: () => Promise<{
         available: boolean;

package/dist/index.js

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

package/dist/{noble-ble-handler-26159b70.js → noble-ble-handler-e8b87173.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-40be8e99.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,18 +336,12 @@ 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,
                 name: deviceName,
+                reason: hdShared.EBleDisconnectReason.IdleKeepAlive,
             });
         })
             .catch(error => {
@@ -364,7 +357,7 @@ function armIdleDisconnect(deviceId, ms = BLE_IDLE_DISCONNECT_MS, reason = 'idle
 }
 function cleanupDevice(deviceId, webContents, options = {}) {
     var _a;
-    const { cleanupConnection = true, cleanupDiscoveredCache = false, sendDisconnectEvent = false, cancelOperations = true, reason = 'unknown', } = options;
+    const { cleanupConnection = true, cleanupDiscoveredCache = false, sendDisconnectEvent = false, cancelOperations = true, reason = 'unknown', disconnectReason = hdShared.EBleDisconnectReason.DeviceDisconnected, } = options;
     logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Starting device cleanup', {
         deviceId,
         reason,
@@ -401,6 +394,7 @@ function cleanupDevice(deviceId, webContents, options = {}) {
         broadcastToAllWebContents(hdShared.EOneKeyBleMessageKeys.BLE_DEVICE_DISCONNECTED, {
             id: deviceId,
             name: deviceName,
+            reason: disconnectReason,
         });
     }
     logger === null || logger === void 0 ? void 0 : logger.info('[NobleBLE] Device cleanup completed', { deviceId, reason });
@@ -415,7 +409,6 @@ function handleDeviceDisconnect(deviceId, webContents) {
     });
     cleanupDevice(deviceId, webContents, {
         cleanupConnection: true,
-        cleanupDiscoveredCache: true,
         sendDisconnectEvent: true,
         cancelOperations: true,
         reason: 'auto-disconnect',
@@ -1183,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',
@@ -1402,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":"AA8BA,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;AAwnDD,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/desktop-api.d.ts

@@ -1,3 +1,4 @@
+import type { EBleDisconnectReason } from '@onekeyfe/hd-shared';
 export interface NobleBleWriteOptions {
     pacingDelayMs?: number;
 }
@@ -25,6 +26,7 @@ export interface NobleBleAPI {
     onDeviceDisconnected: (callback: (device: {
         id: string;
         name: string;
+        reason?: EBleDisconnectReason;
     }) => void) => () => void;
     checkAvailability: () => Promise<{
         available: boolean;

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,oBAAoB;IACnC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,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;IAGzC,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACjE,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,EAAE,OAAO,CAAC,EAAE,oBAAoB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrF,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":"AAKA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAGhE,MAAM,WAAW,oBAAoB;IACnC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,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;IAGzC,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACjE,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,EAAE,OAAO,CAAC,EAAE,oBAAoB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrF,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;IAOvF,oBAAoB,EAAE,CACpB,QAAQ,EAAE,CAAC,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,oBAAoB,CAAA;KAAE,KAAK,IAAI,KACpF,MAAM,IAAI,CAAC;IAChB,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

@@ -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.154",
+  "version": "1.2.0-alpha.155",
   "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.154",
-    "@onekeyfe/hd-shared": "1.2.0-alpha.154",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.154",
+    "@onekeyfe/hd-core": "1.2.0-alpha.155",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.155",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.155",
     "@stoprocent/noble": "2.3.16",
     "p-retry": "^4.6.2"
   },
@@ -36,5 +36,5 @@
     "electron": "^25.0.0",
     "typescript": "^5.3.3"
   },
-  "gitHead": "0b81bf264b2b33e00550b1008264c02e0a049b68"
+  "gitHead": "922cb4e29b2d89511c9b67c25840294335cb8005"
 }

package/src/noble-ble-handler.ts

@@ -6,6 +6,7 @@
 /* eslint-disable @typescript-eslint/no-var-requires, import/no-extraneous-dependencies */
 
 import {
+  EBleDisconnectReason,
   EOneKeyBleMessageKeys,
   ERRORS,
   HardwareErrorCode,
@@ -89,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;
 
@@ -266,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) {
@@ -283,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')
@@ -348,6 +337,12 @@ interface DeviceCleanupOptions {
   cleanupDiscoveredCache?: boolean;
   /** Whether to send disconnect event */
   sendDisconnectEvent?: boolean;
+  /**
+   * Why the link went down, forwarded to renderers on BLE_DEVICE_DISCONNECTED.
+   * Defaults to a real peripheral drop; the keep-alive path overrides it so
+   * consumers can tell an internal idle release from a device that left.
+   */
+  disconnectReason?: EBleDisconnectReason;
   /** Whether to cancel ongoing operations */
   cancelOperations?: boolean;
   /** Cleanup reason (for logging) */
@@ -403,26 +398,17 @@ 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:
+          // we reclaimed the link ourselves and have no evidence the device
+          // left, so consumers must not mark it disconnected. The in-flight
+          // call still fails, via the renderer dropping its device state.
           broadcastToAllWebContents(EOneKeyBleMessageKeys.BLE_DEVICE_DISCONNECTED, {
             id: deviceId,
             name: deviceName,
+            reason: EBleDisconnectReason.IdleKeepAlive,
           });
         })
         .catch(error => {
@@ -452,6 +438,7 @@ function cleanupDevice(
     sendDisconnectEvent = false,
     cancelOperations = true,
     reason = 'unknown',
+    disconnectReason = EBleDisconnectReason.DeviceDisconnected,
   } = options;
 
   logger?.info('[NobleBLE] Starting device cleanup', {
@@ -501,6 +488,7 @@ function cleanupDevice(
     broadcastToAllWebContents(EOneKeyBleMessageKeys.BLE_DEVICE_DISCONNECTED, {
       id: deviceId,
       name: deviceName,
+      reason: disconnectReason,
     });
   }
 
@@ -520,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',
@@ -1612,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',
@@ -1949,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/desktop-api.ts

@@ -3,6 +3,8 @@
  * These types define the core interface for Noble BLE communication
  */
 
+import type { EBleDisconnectReason } from '@onekeyfe/hd-shared';
+
 // Noble BLE API interface - core BLE functionality
 export interface NobleBleWriteOptions {
   pacingDelayMs?: number;
@@ -21,7 +23,15 @@ export interface NobleBleAPI {
   write: (uuid: string, data: string, options?: NobleBleWriteOptions) => 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;
+  /**
+   * Fires whenever a BLE link drops. `reason` distinguishes a real peripheral
+   * drop from the main process freeing an idle link on its keep-alive timer;
+   * it is optional so an older host bridge that omits it still type-checks
+   * (absent is treated as a real drop by consumers).
+   */
+  onDeviceDisconnected: (
+    callback: (device: { id: string; name: string; reason?: EBleDisconnectReason }) => void
+  ) => () => void;
   checkAvailability: () => Promise<{
     available: boolean;
     state: string;

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