@onekeyfe/hd-transport-electron 1.2.0-alpha.157 → 1.2.0-alpha.159

package/dist/{index-fe6d3919.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-c88e98df.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;
@@ -31,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;
 }
@@ -55,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-fe6d3919.js');
+var index = require('./index-b37d926c.js');
 
 
 

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

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./index-fe6d3919.js');
+var index = require('./index-b37d926c.js');
 var hdShared = require('@onekeyfe/hd-shared');
 var pRetry = require('p-retry');
 
@@ -341,6 +341,7 @@ function armIdleDisconnect(deviceId, ms = BLE_IDLE_DISCONNECT_MS, reason = 'idle
             broadcastToAllWebContents(hdShared.EOneKeyBleMessageKeys.BLE_DEVICE_DISCONNECTED, {
                 id: deviceId,
                 name: deviceName,
+                reason: hdShared.EBleDisconnectReason.IdleKeepAlive,
             });
         })
             .catch(error => {
@@ -356,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,
@@ -393,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 });

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;AA0EhE,wBAAgB,+BAA+B,CAAC,OAAO,CAAC,EAAE,oBAAoB,UAI7E;AA8lDD,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":"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/package.json

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

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,
@@ -336,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) */
@@ -394,9 +401,14 @@ function armIdleDisconnect(
       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 => {
@@ -426,6 +438,7 @@ function cleanupDevice(
     sendDisconnectEvent = false,
     cancelOperations = true,
     reason = 'unknown',
+    disconnectReason = EBleDisconnectReason.DeviceDisconnected,
   } = options;
 
   logger?.info('[NobleBLE] Starting device cleanup', {
@@ -475,6 +488,7 @@ function cleanupDevice(
     broadcastToAllWebContents(EOneKeyBleMessageKeys.BLE_DEVICE_DISCONNECTED, {
       id: deviceId,
       name: deviceName,
+      reason: disconnectReason,
     });
   }
 

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;