@onekeyfe/hwk-ledger-connector-ble 1.1.26-alpha.9 → 1.1.26-patch.2

package/dist/index.d.mts

@@ -1,13 +1,17 @@
-import { LedgerConnectorBase } from '@onekeyfe/hwk-ledger-adapter';
+import { LedgerConnectorBase, LedgerDeviceManager } from '@onekeyfe/hwk-ledger-adapter';
 import { DeviceDescriptor, IConnector } from '@onekeyfe/hwk-adapter-core';
 import { DeviceManagementKit } from '@ledgerhq/device-management-kit';
 
 interface LedgerBleConnectorOptions {
     dmk?: DeviceManagementKit;
+    /** Fresh-scan window for liveness probe (default 800ms; ~2+ adv intervals). */
+    livenessProbeTimeoutMs?: number;
 }
 declare class LedgerBleConnector extends LedgerConnectorBase {
+    private readonly _livenessProbeTimeoutMs;
     constructor(options?: LedgerBleConnectorOptions);
-    protected _resolveConnectId(descriptor: DeviceDescriptor): string;
+    /** BLE discovery uses a fresh scan window; enumerate cache is ignored. */
+    protected _discoverDescriptors(dm: LedgerDeviceManager): Promise<DeviceDescriptor[]>;
 }
 
 /**

package/dist/index.d.ts

@@ -1,13 +1,17 @@
-import { LedgerConnectorBase } from '@onekeyfe/hwk-ledger-adapter';
+import { LedgerConnectorBase, LedgerDeviceManager } from '@onekeyfe/hwk-ledger-adapter';
 import { DeviceDescriptor, IConnector } from '@onekeyfe/hwk-adapter-core';
 import { DeviceManagementKit } from '@ledgerhq/device-management-kit';
 
 interface LedgerBleConnectorOptions {
     dmk?: DeviceManagementKit;
+    /** Fresh-scan window for liveness probe (default 800ms; ~2+ adv intervals). */
+    livenessProbeTimeoutMs?: number;
 }
 declare class LedgerBleConnector extends LedgerConnectorBase {
+    private readonly _livenessProbeTimeoutMs;
     constructor(options?: LedgerBleConnectorOptions);
-    protected _resolveConnectId(descriptor: DeviceDescriptor): string;
+    /** BLE discovery uses a fresh scan window; enumerate cache is ignored. */
+    protected _discoverDescriptors(dm: LedgerDeviceManager): Promise<DeviceDescriptor[]>;
 }
 
 /**

package/dist/index.js

@@ -36,19 +36,72 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/LedgerBleConnector.ts
+var import_react_native = require("react-native");
 var import_hwk_ledger_adapter = require("@onekeyfe/hwk-ledger-adapter");
+var rnBleMetadataByPath = /* @__PURE__ */ new Map();
+function patchLedgerRnBleTransportMetadata(transport) {
+  const target = transport;
+  const original = target._mapDeviceToTransportDiscoveredDevice;
+  if (typeof original !== "function") {
+    return transport;
+  }
+  target._mapDeviceToTransportDiscoveredDevice = function patchedMapDevice(device, services) {
+    if (device.id) {
+      rnBleMetadataByPath.set(device.id, {
+        // RN BLE exposes the raw advertisement name separately from localName.
+        // Keep both for diagnostics/display, but do not use either as connectId.
+        bleName: device.name ?? void 0,
+        localName: device.localName ?? void 0,
+        rssi: device.rssi,
+        serviceUUIDs: device.serviceUUIDs,
+        isConnectable: device.isConnectable
+      });
+    }
+    const result = original.call(this, device, services);
+    if (!result.map) {
+      return result;
+    }
+    return result.map((mappedDevice) => ({
+      ...mappedDevice,
+      localName: device.localName || mappedDevice.localName
+    }));
+  };
+  return transport;
+}
 var LedgerBleConnector = class extends import_hwk_ledger_adapter.LedgerConnectorBase {
   constructor(options) {
     super(
       async () => {
         const { RNBleTransportFactory } = await import("@ledgerhq/device-transport-kit-react-native-ble");
-        return RNBleTransportFactory;
+        return ((args) => patchLedgerRnBleTransportMetadata(RNBleTransportFactory(args)));
       },
-      { connectionType: "ble", dmk: options?.dmk }
+      {
+        connectionType: "ble",
+        dmk: options?.dmk,
+        // iOS Core Bluetooth wedges ~30s on connect to non-advertising peripherals.
+        requirePreFlightScan: import_react_native.Platform.OS === "ios"
+      }
     );
+    this._livenessProbeTimeoutMs = options?.livenessProbeTimeoutMs ?? 800;
   }
-  _resolveConnectId(descriptor) {
-    return (0, import_hwk_ledger_adapter.extractBleHexId)(descriptor.name) || descriptor.path;
+  /** BLE discovery uses a fresh scan window; enumerate cache is ignored. */
+  async _discoverDescriptors(dm) {
+    const live = await dm.getLiveDevices(this._livenessProbeTimeoutMs);
+    return live.map((d) => {
+      const metadata = rnBleMetadataByPath.get(d.id);
+      return {
+        path: d.id,
+        type: d.deviceModel.model,
+        modelName: d.deviceModel.name,
+        name: metadata?.localName || d.name,
+        bleName: metadata?.bleName || d.name,
+        localName: metadata?.localName,
+        serviceUUIDs: metadata?.serviceUUIDs,
+        isConnectable: metadata?.isConnectable,
+        transport: d.transport,
+        rssi: d.rssi
+      };
+    });
   }
 };
 

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts","../src/LedgerBleConnector.ts"],"sourcesContent":["import { LedgerBleConnector } from './LedgerBleConnector';\n\nimport type { IConnector } from '@onekeyfe/hwk-adapter-core';\nimport type { DeviceManagementKit } from '@ledgerhq/device-management-kit';\nimport type { LedgerBleConnectorOptions } from './LedgerBleConnector';\n\nexport { LedgerBleConnector };\nexport type { LedgerBleConnectorOptions };\n\n/**\n * Create a LedgerBleConnector.\n *\n * @param dmk - Optional pre-built DMK instance. If omitted, the connector\n *              will lazily create one using `@ledgerhq/device-management-kit`\n *              and `@ledgerhq/device-transport-kit-react-native-ble`.\n */\nexport function createLedgerBleConnector(dmk?: DeviceManagementKit): IConnector {\n  return new LedgerBleConnector({ dmk });\n}\n","import { LedgerConnectorBase, extractBleHexId } from '@onekeyfe/hwk-ledger-adapter';\n\nimport type { DeviceDescriptor } from '@onekeyfe/hwk-adapter-core';\nimport type { DeviceManagementKit } from '@ledgerhq/device-management-kit';\n\nexport interface LedgerBleConnectorOptions {\n  dmk?: DeviceManagementKit;\n}\n\nexport class LedgerBleConnector extends LedgerConnectorBase {\n  constructor(options?: LedgerBleConnectorOptions) {\n    super(\n      async () => {\n        const { RNBleTransportFactory } = await import(\n          '@ledgerhq/device-transport-kit-react-native-ble'\n        );\n        return RNBleTransportFactory;\n      },\n      { connectionType: 'ble', dmk: options?.dmk }\n    );\n  }\n\n  protected override _resolveConnectId(descriptor: DeviceDescriptor): string {\n    return extractBleHexId(descriptor.name) || descriptor.path;\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,gCAAqD;AAS9C,IAAM,qBAAN,cAAiC,8CAAoB;AAAA,EAC1D,YAAY,SAAqC;AAC/C;AAAA,MACE,YAAY;AACV,cAAM,EAAE,sBAAsB,IAAI,MAAM,OACtC,iDACF;AACA,eAAO;AAAA,MACT;AAAA,MACA,EAAE,gBAAgB,OAAO,KAAK,SAAS,IAAI;AAAA,IAC7C;AAAA,EACF;AAAA,EAEmB,kBAAkB,YAAsC;AACzE,eAAO,2CAAgB,WAAW,IAAI,KAAK,WAAW;AAAA,EACxD;AACF;;;ADTO,SAAS,yBAAyB,KAAuC;AAC9E,SAAO,IAAI,mBAAmB,EAAE,IAAI,CAAC;AACvC;","names":[]}
+{"version":3,"sources":["../src/index.ts","../src/LedgerBleConnector.ts"],"sourcesContent":["import { LedgerBleConnector } from './LedgerBleConnector';\n\nimport type { IConnector } from '@onekeyfe/hwk-adapter-core';\nimport type { DeviceManagementKit } from '@ledgerhq/device-management-kit';\nimport type { LedgerBleConnectorOptions } from './LedgerBleConnector';\n\nexport { LedgerBleConnector };\nexport type { LedgerBleConnectorOptions };\n\n/**\n * Create a LedgerBleConnector.\n *\n * @param dmk - Optional pre-built DMK instance. If omitted, the connector\n *              will lazily create one using `@ledgerhq/device-management-kit`\n *              and `@ledgerhq/device-transport-kit-react-native-ble`.\n */\nexport function createLedgerBleConnector(dmk?: DeviceManagementKit): IConnector {\n  return new LedgerBleConnector({ dmk });\n}\n","import { Platform } from 'react-native';\nimport { LedgerConnectorBase } from '@onekeyfe/hwk-ledger-adapter';\n\nimport type { LedgerDeviceManager } from '@onekeyfe/hwk-ledger-adapter';\nimport type { DeviceDescriptor } from '@onekeyfe/hwk-adapter-core';\nimport type { DeviceManagementKit, TransportFactory } from '@ledgerhq/device-management-kit';\n\ntype RnBleRawDevice = {\n  id?: string;\n  name?: string | null;\n  localName?: string | null;\n  rssi?: number | null;\n  serviceUUIDs?: string[] | null;\n  isConnectable?: boolean | null;\n};\n\ntype RnBleTransportDiscoveredDevice = {\n  id?: string;\n  name?: string;\n  localName?: string;\n};\n\ntype RnBleMapResult = {\n  map?: (\n    fn: (device: RnBleTransportDiscoveredDevice) => RnBleTransportDiscoveredDevice\n  ) => RnBleMapResult;\n};\n\ntype RnBleTransportWithMapper = {\n  _mapDeviceToTransportDiscoveredDevice?: (\n    device: RnBleRawDevice,\n    services?: string[]\n  ) => RnBleMapResult;\n};\n\ntype RnBleMetadata = {\n  bleName?: string;\n  localName?: string;\n  rssi?: number | null;\n  serviceUUIDs?: string[] | null;\n  isConnectable?: boolean | null;\n};\n\nconst rnBleMetadataByPath = new Map<string, RnBleMetadata>();\n\nfunction patchLedgerRnBleTransportMetadata(transport: unknown): unknown {\n  const target = transport as RnBleTransportWithMapper;\n  const original = target._mapDeviceToTransportDiscoveredDevice;\n  if (typeof original !== 'function') {\n    return transport;\n  }\n\n  target._mapDeviceToTransportDiscoveredDevice = function patchedMapDevice(\n    this: RnBleTransportWithMapper,\n    device: RnBleRawDevice,\n    services?: string[]\n  ) {\n    if (device.id) {\n      rnBleMetadataByPath.set(device.id, {\n        // RN BLE exposes the raw advertisement name separately from localName.\n        // Keep both for diagnostics/display, but do not use either as connectId.\n        bleName: device.name ?? undefined,\n        localName: device.localName ?? undefined,\n        rssi: device.rssi,\n        serviceUUIDs: device.serviceUUIDs,\n        isConnectable: device.isConnectable,\n      });\n    }\n\n    const result = original.call(this, device, services);\n    if (!result.map) {\n      return result;\n    }\n    return result.map((mappedDevice: RnBleTransportDiscoveredDevice) => ({\n      ...mappedDevice,\n      localName: device.localName || mappedDevice.localName,\n    }));\n  };\n\n  return transport;\n}\n\nexport interface LedgerBleConnectorOptions {\n  dmk?: DeviceManagementKit;\n  /** Fresh-scan window for liveness probe (default 800ms; ~2+ adv intervals). */\n  livenessProbeTimeoutMs?: number;\n}\n\nexport class LedgerBleConnector extends LedgerConnectorBase {\n  private readonly _livenessProbeTimeoutMs: number;\n\n  constructor(options?: LedgerBleConnectorOptions) {\n    super(\n      async () => {\n        const { RNBleTransportFactory } = await import(\n          '@ledgerhq/device-transport-kit-react-native-ble'\n        );\n        return ((args: Parameters<TransportFactory>[0]) =>\n          patchLedgerRnBleTransportMetadata(RNBleTransportFactory(args))) as TransportFactory;\n      },\n      {\n        connectionType: 'ble',\n        dmk: options?.dmk,\n        // iOS Core Bluetooth wedges ~30s on connect to non-advertising peripherals.\n        requirePreFlightScan: Platform.OS === 'ios',\n      }\n    );\n    this._livenessProbeTimeoutMs = options?.livenessProbeTimeoutMs ?? 800;\n  }\n\n  /** BLE discovery uses a fresh scan window; enumerate cache is ignored. */\n  protected override async _discoverDescriptors(\n    dm: LedgerDeviceManager\n  ): Promise<DeviceDescriptor[]> {\n    const live = await dm.getLiveDevices(this._livenessProbeTimeoutMs);\n    return live.map(d => {\n      const metadata = rnBleMetadataByPath.get(d.id);\n      return {\n        path: d.id,\n        type: d.deviceModel.model,\n        modelName: d.deviceModel.name,\n        name: metadata?.localName || d.name,\n        bleName: metadata?.bleName || d.name,\n        localName: metadata?.localName,\n        serviceUUIDs: metadata?.serviceUUIDs,\n        isConnectable: metadata?.isConnectable,\n        transport: d.transport,\n        rssi: d.rssi,\n      };\n    });\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,0BAAyB;AACzB,gCAAoC;AA0CpC,IAAM,sBAAsB,oBAAI,IAA2B;AAE3D,SAAS,kCAAkC,WAA6B;AACtE,QAAM,SAAS;AACf,QAAM,WAAW,OAAO;AACxB,MAAI,OAAO,aAAa,YAAY;AAClC,WAAO;AAAA,EACT;AAEA,SAAO,wCAAwC,SAAS,iBAEtD,QACA,UACA;AACA,QAAI,OAAO,IAAI;AACb,0BAAoB,IAAI,OAAO,IAAI;AAAA;AAAA;AAAA,QAGjC,SAAS,OAAO,QAAQ;AAAA,QACxB,WAAW,OAAO,aAAa;AAAA,QAC/B,MAAM,OAAO;AAAA,QACb,cAAc,OAAO;AAAA,QACrB,eAAe,OAAO;AAAA,MACxB,CAAC;AAAA,IACH;AAEA,UAAM,SAAS,SAAS,KAAK,MAAM,QAAQ,QAAQ;AACnD,QAAI,CAAC,OAAO,KAAK;AACf,aAAO;AAAA,IACT;AACA,WAAO,OAAO,IAAI,CAAC,kBAAkD;AAAA,MACnE,GAAG;AAAA,MACH,WAAW,OAAO,aAAa,aAAa;AAAA,IAC9C,EAAE;AAAA,EACJ;AAEA,SAAO;AACT;AAQO,IAAM,qBAAN,cAAiC,8CAAoB;AAAA,EAG1D,YAAY,SAAqC;AAC/C;AAAA,MACE,YAAY;AACV,cAAM,EAAE,sBAAsB,IAAI,MAAM,OACtC,iDACF;AACA,gBAAQ,CAAC,SACP,kCAAkC,sBAAsB,IAAI,CAAC;AAAA,MACjE;AAAA,MACA;AAAA,QACE,gBAAgB;AAAA,QAChB,KAAK,SAAS;AAAA;AAAA,QAEd,sBAAsB,6BAAS,OAAO;AAAA,MACxC;AAAA,IACF;AACA,SAAK,0BAA0B,SAAS,0BAA0B;AAAA,EACpE;AAAA;AAAA,EAGA,MAAyB,qBACvB,IAC6B;AAC7B,UAAM,OAAO,MAAM,GAAG,eAAe,KAAK,uBAAuB;AACjE,WAAO,KAAK,IAAI,OAAK;AACnB,YAAM,WAAW,oBAAoB,IAAI,EAAE,EAAE;AAC7C,aAAO;AAAA,QACL,MAAM,EAAE;AAAA,QACR,MAAM,EAAE,YAAY;AAAA,QACpB,WAAW,EAAE,YAAY;AAAA,QACzB,MAAM,UAAU,aAAa,EAAE;AAAA,QAC/B,SAAS,UAAU,WAAW,EAAE;AAAA,QAChC,WAAW,UAAU;AAAA,QACrB,cAAc,UAAU;AAAA,QACxB,eAAe,UAAU;AAAA,QACzB,WAAW,EAAE;AAAA,QACb,MAAM,EAAE;AAAA,MACV;AAAA,IACF,CAAC;AAAA,EACH;AACF;;;ADnHO,SAAS,yBAAyB,KAAuC;AAC9E,SAAO,IAAI,mBAAmB,EAAE,IAAI,CAAC;AACvC;","names":[]}

package/dist/index.mjs

@@ -1,17 +1,70 @@
 // src/LedgerBleConnector.ts
-import { LedgerConnectorBase, extractBleHexId } from "@onekeyfe/hwk-ledger-adapter";
+import { Platform } from "react-native";
+import { LedgerConnectorBase } from "@onekeyfe/hwk-ledger-adapter";
+var rnBleMetadataByPath = /* @__PURE__ */ new Map();
+function patchLedgerRnBleTransportMetadata(transport) {
+  const target = transport;
+  const original = target._mapDeviceToTransportDiscoveredDevice;
+  if (typeof original !== "function") {
+    return transport;
+  }
+  target._mapDeviceToTransportDiscoveredDevice = function patchedMapDevice(device, services) {
+    if (device.id) {
+      rnBleMetadataByPath.set(device.id, {
+        // RN BLE exposes the raw advertisement name separately from localName.
+        // Keep both for diagnostics/display, but do not use either as connectId.
+        bleName: device.name ?? void 0,
+        localName: device.localName ?? void 0,
+        rssi: device.rssi,
+        serviceUUIDs: device.serviceUUIDs,
+        isConnectable: device.isConnectable
+      });
+    }
+    const result = original.call(this, device, services);
+    if (!result.map) {
+      return result;
+    }
+    return result.map((mappedDevice) => ({
+      ...mappedDevice,
+      localName: device.localName || mappedDevice.localName
+    }));
+  };
+  return transport;
+}
 var LedgerBleConnector = class extends LedgerConnectorBase {
   constructor(options) {
     super(
       async () => {
         const { RNBleTransportFactory } = await import("@ledgerhq/device-transport-kit-react-native-ble");
-        return RNBleTransportFactory;
+        return ((args) => patchLedgerRnBleTransportMetadata(RNBleTransportFactory(args)));
       },
-      { connectionType: "ble", dmk: options?.dmk }
+      {
+        connectionType: "ble",
+        dmk: options?.dmk,
+        // iOS Core Bluetooth wedges ~30s on connect to non-advertising peripherals.
+        requirePreFlightScan: Platform.OS === "ios"
+      }
     );
+    this._livenessProbeTimeoutMs = options?.livenessProbeTimeoutMs ?? 800;
   }
-  _resolveConnectId(descriptor) {
-    return extractBleHexId(descriptor.name) || descriptor.path;
+  /** BLE discovery uses a fresh scan window; enumerate cache is ignored. */
+  async _discoverDescriptors(dm) {
+    const live = await dm.getLiveDevices(this._livenessProbeTimeoutMs);
+    return live.map((d) => {
+      const metadata = rnBleMetadataByPath.get(d.id);
+      return {
+        path: d.id,
+        type: d.deviceModel.model,
+        modelName: d.deviceModel.name,
+        name: metadata?.localName || d.name,
+        bleName: metadata?.bleName || d.name,
+        localName: metadata?.localName,
+        serviceUUIDs: metadata?.serviceUUIDs,
+        isConnectable: metadata?.isConnectable,
+        transport: d.transport,
+        rssi: d.rssi
+      };
+    });
   }
 };
 

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/LedgerBleConnector.ts","../src/index.ts"],"sourcesContent":["import { LedgerConnectorBase, extractBleHexId } from '@onekeyfe/hwk-ledger-adapter';\n\nimport type { DeviceDescriptor } from '@onekeyfe/hwk-adapter-core';\nimport type { DeviceManagementKit } from '@ledgerhq/device-management-kit';\n\nexport interface LedgerBleConnectorOptions {\n  dmk?: DeviceManagementKit;\n}\n\nexport class LedgerBleConnector extends LedgerConnectorBase {\n  constructor(options?: LedgerBleConnectorOptions) {\n    super(\n      async () => {\n        const { RNBleTransportFactory } = await import(\n          '@ledgerhq/device-transport-kit-react-native-ble'\n        );\n        return RNBleTransportFactory;\n      },\n      { connectionType: 'ble', dmk: options?.dmk }\n    );\n  }\n\n  protected override _resolveConnectId(descriptor: DeviceDescriptor): string {\n    return extractBleHexId(descriptor.name) || descriptor.path;\n  }\n}\n","import { LedgerBleConnector } from './LedgerBleConnector';\n\nimport type { IConnector } from '@onekeyfe/hwk-adapter-core';\nimport type { DeviceManagementKit } from '@ledgerhq/device-management-kit';\nimport type { LedgerBleConnectorOptions } from './LedgerBleConnector';\n\nexport { LedgerBleConnector };\nexport type { LedgerBleConnectorOptions };\n\n/**\n * Create a LedgerBleConnector.\n *\n * @param dmk - Optional pre-built DMK instance. If omitted, the connector\n *              will lazily create one using `@ledgerhq/device-management-kit`\n *              and `@ledgerhq/device-transport-kit-react-native-ble`.\n */\nexport function createLedgerBleConnector(dmk?: DeviceManagementKit): IConnector {\n  return new LedgerBleConnector({ dmk });\n}\n"],"mappings":";AAAA,SAAS,qBAAqB,uBAAuB;AAS9C,IAAM,qBAAN,cAAiC,oBAAoB;AAAA,EAC1D,YAAY,SAAqC;AAC/C;AAAA,MACE,YAAY;AACV,cAAM,EAAE,sBAAsB,IAAI,MAAM,OACtC,iDACF;AACA,eAAO;AAAA,MACT;AAAA,MACA,EAAE,gBAAgB,OAAO,KAAK,SAAS,IAAI;AAAA,IAC7C;AAAA,EACF;AAAA,EAEmB,kBAAkB,YAAsC;AACzE,WAAO,gBAAgB,WAAW,IAAI,KAAK,WAAW;AAAA,EACxD;AACF;;;ACTO,SAAS,yBAAyB,KAAuC;AAC9E,SAAO,IAAI,mBAAmB,EAAE,IAAI,CAAC;AACvC;","names":[]}
+{"version":3,"sources":["../src/LedgerBleConnector.ts","../src/index.ts"],"sourcesContent":["import { Platform } from 'react-native';\nimport { LedgerConnectorBase } from '@onekeyfe/hwk-ledger-adapter';\n\nimport type { LedgerDeviceManager } from '@onekeyfe/hwk-ledger-adapter';\nimport type { DeviceDescriptor } from '@onekeyfe/hwk-adapter-core';\nimport type { DeviceManagementKit, TransportFactory } from '@ledgerhq/device-management-kit';\n\ntype RnBleRawDevice = {\n  id?: string;\n  name?: string | null;\n  localName?: string | null;\n  rssi?: number | null;\n  serviceUUIDs?: string[] | null;\n  isConnectable?: boolean | null;\n};\n\ntype RnBleTransportDiscoveredDevice = {\n  id?: string;\n  name?: string;\n  localName?: string;\n};\n\ntype RnBleMapResult = {\n  map?: (\n    fn: (device: RnBleTransportDiscoveredDevice) => RnBleTransportDiscoveredDevice\n  ) => RnBleMapResult;\n};\n\ntype RnBleTransportWithMapper = {\n  _mapDeviceToTransportDiscoveredDevice?: (\n    device: RnBleRawDevice,\n    services?: string[]\n  ) => RnBleMapResult;\n};\n\ntype RnBleMetadata = {\n  bleName?: string;\n  localName?: string;\n  rssi?: number | null;\n  serviceUUIDs?: string[] | null;\n  isConnectable?: boolean | null;\n};\n\nconst rnBleMetadataByPath = new Map<string, RnBleMetadata>();\n\nfunction patchLedgerRnBleTransportMetadata(transport: unknown): unknown {\n  const target = transport as RnBleTransportWithMapper;\n  const original = target._mapDeviceToTransportDiscoveredDevice;\n  if (typeof original !== 'function') {\n    return transport;\n  }\n\n  target._mapDeviceToTransportDiscoveredDevice = function patchedMapDevice(\n    this: RnBleTransportWithMapper,\n    device: RnBleRawDevice,\n    services?: string[]\n  ) {\n    if (device.id) {\n      rnBleMetadataByPath.set(device.id, {\n        // RN BLE exposes the raw advertisement name separately from localName.\n        // Keep both for diagnostics/display, but do not use either as connectId.\n        bleName: device.name ?? undefined,\n        localName: device.localName ?? undefined,\n        rssi: device.rssi,\n        serviceUUIDs: device.serviceUUIDs,\n        isConnectable: device.isConnectable,\n      });\n    }\n\n    const result = original.call(this, device, services);\n    if (!result.map) {\n      return result;\n    }\n    return result.map((mappedDevice: RnBleTransportDiscoveredDevice) => ({\n      ...mappedDevice,\n      localName: device.localName || mappedDevice.localName,\n    }));\n  };\n\n  return transport;\n}\n\nexport interface LedgerBleConnectorOptions {\n  dmk?: DeviceManagementKit;\n  /** Fresh-scan window for liveness probe (default 800ms; ~2+ adv intervals). */\n  livenessProbeTimeoutMs?: number;\n}\n\nexport class LedgerBleConnector extends LedgerConnectorBase {\n  private readonly _livenessProbeTimeoutMs: number;\n\n  constructor(options?: LedgerBleConnectorOptions) {\n    super(\n      async () => {\n        const { RNBleTransportFactory } = await import(\n          '@ledgerhq/device-transport-kit-react-native-ble'\n        );\n        return ((args: Parameters<TransportFactory>[0]) =>\n          patchLedgerRnBleTransportMetadata(RNBleTransportFactory(args))) as TransportFactory;\n      },\n      {\n        connectionType: 'ble',\n        dmk: options?.dmk,\n        // iOS Core Bluetooth wedges ~30s on connect to non-advertising peripherals.\n        requirePreFlightScan: Platform.OS === 'ios',\n      }\n    );\n    this._livenessProbeTimeoutMs = options?.livenessProbeTimeoutMs ?? 800;\n  }\n\n  /** BLE discovery uses a fresh scan window; enumerate cache is ignored. */\n  protected override async _discoverDescriptors(\n    dm: LedgerDeviceManager\n  ): Promise<DeviceDescriptor[]> {\n    const live = await dm.getLiveDevices(this._livenessProbeTimeoutMs);\n    return live.map(d => {\n      const metadata = rnBleMetadataByPath.get(d.id);\n      return {\n        path: d.id,\n        type: d.deviceModel.model,\n        modelName: d.deviceModel.name,\n        name: metadata?.localName || d.name,\n        bleName: metadata?.bleName || d.name,\n        localName: metadata?.localName,\n        serviceUUIDs: metadata?.serviceUUIDs,\n        isConnectable: metadata?.isConnectable,\n        transport: d.transport,\n        rssi: d.rssi,\n      };\n    });\n  }\n}\n","import { LedgerBleConnector } from './LedgerBleConnector';\n\nimport type { IConnector } from '@onekeyfe/hwk-adapter-core';\nimport type { DeviceManagementKit } from '@ledgerhq/device-management-kit';\nimport type { LedgerBleConnectorOptions } from './LedgerBleConnector';\n\nexport { LedgerBleConnector };\nexport type { LedgerBleConnectorOptions };\n\n/**\n * Create a LedgerBleConnector.\n *\n * @param dmk - Optional pre-built DMK instance. If omitted, the connector\n *              will lazily create one using `@ledgerhq/device-management-kit`\n *              and `@ledgerhq/device-transport-kit-react-native-ble`.\n */\nexport function createLedgerBleConnector(dmk?: DeviceManagementKit): IConnector {\n  return new LedgerBleConnector({ dmk });\n}\n"],"mappings":";AAAA,SAAS,gBAAgB;AACzB,SAAS,2BAA2B;AA0CpC,IAAM,sBAAsB,oBAAI,IAA2B;AAE3D,SAAS,kCAAkC,WAA6B;AACtE,QAAM,SAAS;AACf,QAAM,WAAW,OAAO;AACxB,MAAI,OAAO,aAAa,YAAY;AAClC,WAAO;AAAA,EACT;AAEA,SAAO,wCAAwC,SAAS,iBAEtD,QACA,UACA;AACA,QAAI,OAAO,IAAI;AACb,0BAAoB,IAAI,OAAO,IAAI;AAAA;AAAA;AAAA,QAGjC,SAAS,OAAO,QAAQ;AAAA,QACxB,WAAW,OAAO,aAAa;AAAA,QAC/B,MAAM,OAAO;AAAA,QACb,cAAc,OAAO;AAAA,QACrB,eAAe,OAAO;AAAA,MACxB,CAAC;AAAA,IACH;AAEA,UAAM,SAAS,SAAS,KAAK,MAAM,QAAQ,QAAQ;AACnD,QAAI,CAAC,OAAO,KAAK;AACf,aAAO;AAAA,IACT;AACA,WAAO,OAAO,IAAI,CAAC,kBAAkD;AAAA,MACnE,GAAG;AAAA,MACH,WAAW,OAAO,aAAa,aAAa;AAAA,IAC9C,EAAE;AAAA,EACJ;AAEA,SAAO;AACT;AAQO,IAAM,qBAAN,cAAiC,oBAAoB;AAAA,EAG1D,YAAY,SAAqC;AAC/C;AAAA,MACE,YAAY;AACV,cAAM,EAAE,sBAAsB,IAAI,MAAM,OACtC,iDACF;AACA,gBAAQ,CAAC,SACP,kCAAkC,sBAAsB,IAAI,CAAC;AAAA,MACjE;AAAA,MACA;AAAA,QACE,gBAAgB;AAAA,QAChB,KAAK,SAAS;AAAA;AAAA,QAEd,sBAAsB,SAAS,OAAO;AAAA,MACxC;AAAA,IACF;AACA,SAAK,0BAA0B,SAAS,0BAA0B;AAAA,EACpE;AAAA;AAAA,EAGA,MAAyB,qBACvB,IAC6B;AAC7B,UAAM,OAAO,MAAM,GAAG,eAAe,KAAK,uBAAuB;AACjE,WAAO,KAAK,IAAI,OAAK;AACnB,YAAM,WAAW,oBAAoB,IAAI,EAAE,EAAE;AAC7C,aAAO;AAAA,QACL,MAAM,EAAE;AAAA,QACR,MAAM,EAAE,YAAY;AAAA,QACpB,WAAW,EAAE,YAAY;AAAA,QACzB,MAAM,UAAU,aAAa,EAAE;AAAA,QAC/B,SAAS,UAAU,WAAW,EAAE;AAAA,QAChC,WAAW,UAAU;AAAA,QACrB,cAAc,UAAU;AAAA,QACxB,eAAe,UAAU;AAAA,QACzB,WAAW,EAAE;AAAA,QACb,MAAM,EAAE;AAAA,MACV;AAAA,IACF,CAAC;AAAA,EACH;AACF;;;ACnHO,SAAS,yBAAyB,KAAuC;AAC9E,SAAO,IAAI,mBAAmB,EAAE,IAAI,CAAC;AACvC;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hwk-ledger-connector-ble",
-  "version": "1.1.26-alpha.9",
+  "version": "1.1.26-patch.2",
   "description": "IConnector implementation for Ledger hardware wallets via React Native BLE",
   "author": "OneKey",
   "license": "MIT",
@@ -51,13 +51,16 @@
     "@ledgerhq/device-signer-kit-ethereum": "^1.9.0",
     "@ledgerhq/device-signer-kit-solana": "^1.7.0",
     "@ledgerhq/device-transport-kit-react-native-ble": "^1.0.0",
-    "@onekeyfe/hwk-adapter-core": "1.1.26-alpha.9",
-    "@onekeyfe/hwk-ledger-adapter": "1.1.26-alpha.9"
+    "@onekeyfe/hwk-adapter-core": "1.1.26-patch.2",
+    "@onekeyfe/hwk-ledger-adapter": "1.1.26-patch.2"
+  },
+  "peerDependencies": {
+    "react-native": "*"
   },
   "devDependencies": {
     "rimraf": "^5.0.0",
     "tsup": "^8.0.0",
     "typescript": "^5.4.0"
   },
-  "gitHead": "73b45490c5e909cca5724989b4d1317a58e28913"
+  "gitHead": "85eeac7fe16589ca6610d7543f6791d1b4bad516"
 }