@onekeyfe/hwk-ledger-connector-webhid 1.1.26 → 1.1.27-alpha.31

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { LedgerConnectorBase, LedgerDeviceManager } from '@onekeyfe/hwk-ledger-adapter';
-import { IConnector, DeviceDescriptor } from '@onekeyfe/hwk-adapter-core';
+import { LedgerConnectorBase } from '@onekeyfe/hwk-ledger-adapter';
+import { DeviceDescriptor, IConnector } from '@onekeyfe/hwk-adapter-core';
 import { DeviceManagementKit } from '@ledgerhq/device-management-kit';
 
 interface LedgerWebHidConnectorOptions {
@@ -14,10 +14,16 @@ interface LedgerWebHidConnectorOptions {
  * IConnector implementation for Ledger hardware wallets via WebHID.
  *
  * Extends LedgerConnectorBase with the WebHID transport factory.
+ * Overrides connectId resolution to handle BLE devices that may appear
+ * via a WebHID+BLE combo transport.
  */
-declare class LedgerWebHidConnector extends LedgerConnectorBase implements IConnector {
+declare class LedgerWebHidConnector extends LedgerConnectorBase {
     constructor(options?: LedgerWebHidConnectorOptions);
-    protected _discoverDescriptors(dm: LedgerDeviceManager): Promise<DeviceDescriptor[]>;
+    /**
+     * Override connectId resolution for BLE devices discovered via WebHID+BLE combo.
+     * For USB devices, the DMK path (ephemeral UUID) is used as-is.
+     */
+    protected _resolveConnectId(descriptor: DeviceDescriptor): string;
 }
 
 /**

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { LedgerConnectorBase, LedgerDeviceManager } from '@onekeyfe/hwk-ledger-adapter';
-import { IConnector, DeviceDescriptor } from '@onekeyfe/hwk-adapter-core';
+import { LedgerConnectorBase } from '@onekeyfe/hwk-ledger-adapter';
+import { DeviceDescriptor, IConnector } from '@onekeyfe/hwk-adapter-core';
 import { DeviceManagementKit } from '@ledgerhq/device-management-kit';
 
 interface LedgerWebHidConnectorOptions {
@@ -14,10 +14,16 @@ interface LedgerWebHidConnectorOptions {
  * IConnector implementation for Ledger hardware wallets via WebHID.
  *
  * Extends LedgerConnectorBase with the WebHID transport factory.
+ * Overrides connectId resolution to handle BLE devices that may appear
+ * via a WebHID+BLE combo transport.
  */
-declare class LedgerWebHidConnector extends LedgerConnectorBase implements IConnector {
+declare class LedgerWebHidConnector extends LedgerConnectorBase {
     constructor(options?: LedgerWebHidConnectorOptions);
-    protected _discoverDescriptors(dm: LedgerDeviceManager): Promise<DeviceDescriptor[]>;
+    /**
+     * Override connectId resolution for BLE devices discovered via WebHID+BLE combo.
+     * For USB devices, the DMK path (ephemeral UUID) is used as-is.
+     */
+    protected _resolveConnectId(descriptor: DeviceDescriptor): string;
 }
 
 /**

package/dist/index.js

@@ -37,49 +37,25 @@ module.exports = __toCommonJS(index_exports);
 
 // src/LedgerWebHidConnector.ts
 var import_hwk_ledger_adapter = require("@onekeyfe/hwk-ledger-adapter");
-var webHidMetadataByPath = /* @__PURE__ */ new Map();
-function patchLedgerWebHidTransportMetadata(transport) {
-  const target = transport;
-  const original = target.mapHIDDeviceToTransportDiscoveredDevice;
-  if (typeof original !== "function") {
-    return transport;
-  }
-  target.mapHIDDeviceToTransportDiscoveredDevice = function patchedMapHidDevice(device) {
-    const mappedDevice = original.call(this, device);
-    if (mappedDevice.id) {
-      webHidMetadataByPath.set(mappedDevice.id, {
-        vendor: device.vendorId,
-        product: device.productId,
-        productName: device.productName,
-        serialNumber: device.serialNumber
-      });
-    }
-    return mappedDevice;
-  };
-  return transport;
-}
 var LedgerWebHidConnector = class extends import_hwk_ledger_adapter.LedgerConnectorBase {
   constructor(options) {
     super(
       async () => {
         const { webHidTransportFactory } = await import("@ledgerhq/device-transport-kit-web-hid");
-        return ((args) => patchLedgerWebHidTransportMetadata(webHidTransportFactory(args)));
+        return webHidTransportFactory;
       },
       { connectionType: "usb", dmk: options?.dmk }
     );
   }
-  async _discoverDescriptors(dm) {
-    const descriptors = await super._discoverDescriptors(dm);
-    return descriptors.map((d) => {
-      const metadata = webHidMetadataByPath.get(d.path);
-      return {
-        ...d,
-        vendor: metadata?.vendor ?? d.vendor,
-        product: metadata?.product ?? d.product,
-        productName: metadata?.productName ?? d.productName,
-        serialNumber: metadata?.serialNumber ?? d.serialNumber
-      };
-    });
+  /**
+   * Override connectId resolution for BLE devices discovered via WebHID+BLE combo.
+   * For USB devices, the DMK path (ephemeral UUID) is used as-is.
+   */
+  _resolveConnectId(descriptor) {
+    if ((0, import_hwk_ledger_adapter.isLedgerDmkBleTransport)(descriptor.transport)) {
+      return (0, import_hwk_ledger_adapter.extractBleHexId)(descriptor.name) || "";
+    }
+    return descriptor.path;
   }
 };
 

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts","../src/LedgerWebHidConnector.ts"],"sourcesContent":["import { LedgerWebHidConnector } from './LedgerWebHidConnector';\n\nimport type { IConnector } from '@onekeyfe/hwk-adapter-core';\nimport type { DeviceManagementKit } from '@ledgerhq/device-management-kit';\nimport type { LedgerWebHidConnectorOptions } from './LedgerWebHidConnector';\n\nexport { LedgerWebHidConnector };\nexport type { LedgerWebHidConnectorOptions };\n\n/**\n * Create a LedgerWebHidConnector.\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-web-hid`.\n */\nexport function createLedgerWebHidConnector(dmk?: DeviceManagementKit): IConnector {\n  return new LedgerWebHidConnector({ dmk });\n}\n","import { LedgerConnectorBase } from '@onekeyfe/hwk-ledger-adapter';\n\nimport type { LedgerDeviceManager } from '@onekeyfe/hwk-ledger-adapter';\nimport type { DeviceDescriptor, IConnector } from '@onekeyfe/hwk-adapter-core';\nimport type { DeviceManagementKit, TransportFactory } from '@ledgerhq/device-management-kit';\n\ntype WebHidRawDevice = {\n  vendorId?: number;\n  productId?: number;\n  productName?: string;\n  serialNumber?: string;\n};\n\ntype WebHidTransportDiscoveredDevice = {\n  id?: string;\n  name?: string;\n};\n\ntype WebHidTransportWithMapper = {\n  mapHIDDeviceToTransportDiscoveredDevice?: (\n    device: WebHidRawDevice\n  ) => WebHidTransportDiscoveredDevice;\n};\n\ntype WebHidMetadata = {\n  vendor?: number;\n  product?: number;\n  productName?: string;\n  serialNumber?: string;\n};\n\nconst webHidMetadataByPath = new Map<string, WebHidMetadata>();\n\nfunction patchLedgerWebHidTransportMetadata(transport: unknown): unknown {\n  const target = transport as WebHidTransportWithMapper;\n  const original = target.mapHIDDeviceToTransportDiscoveredDevice;\n  if (typeof original !== 'function') {\n    return transport;\n  }\n\n  target.mapHIDDeviceToTransportDiscoveredDevice = function patchedMapHidDevice(\n    this: WebHidTransportWithMapper,\n    device: WebHidRawDevice\n  ) {\n    const mappedDevice = original.call(this, device);\n    if (mappedDevice.id) {\n      webHidMetadataByPath.set(mappedDevice.id, {\n        vendor: device.vendorId,\n        product: device.productId,\n        productName: device.productName,\n        serialNumber: device.serialNumber,\n      });\n    }\n    return mappedDevice;\n  };\n\n  return transport;\n}\n\nexport interface LedgerWebHidConnectorOptions {\n  /**\n   * Pre-built DMK instance. If not provided, a DMK will be created\n   * lazily on first use via `@ledgerhq/device-management-kit` and\n   * `@ledgerhq/device-transport-kit-web-hid`.\n   */\n  dmk?: DeviceManagementKit;\n}\n\n/**\n * IConnector implementation for Ledger hardware wallets via WebHID.\n *\n * Extends LedgerConnectorBase with the WebHID transport factory.\n */\nexport class LedgerWebHidConnector extends LedgerConnectorBase implements IConnector {\n  constructor(options?: LedgerWebHidConnectorOptions) {\n    super(\n      async () => {\n        const { webHidTransportFactory } = await import('@ledgerhq/device-transport-kit-web-hid');\n        return ((args: Parameters<TransportFactory>[0]) =>\n          patchLedgerWebHidTransportMetadata(webHidTransportFactory(args))) as TransportFactory;\n      },\n      { connectionType: 'usb', dmk: options?.dmk }\n    );\n  }\n\n  protected override async _discoverDescriptors(\n    dm: LedgerDeviceManager\n  ): Promise<DeviceDescriptor[]> {\n    const descriptors = await super._discoverDescriptors(dm);\n    return descriptors.map(d => {\n      const metadata = webHidMetadataByPath.get(d.path);\n      return {\n        ...d,\n        vendor: metadata?.vendor ?? d.vendor,\n        product: metadata?.product ?? d.product,\n        productName: metadata?.productName ?? d.productName,\n        serialNumber: metadata?.serialNumber ?? d.serialNumber,\n      };\n    });\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,gCAAoC;AA+BpC,IAAM,uBAAuB,oBAAI,IAA4B;AAE7D,SAAS,mCAAmC,WAA6B;AACvE,QAAM,SAAS;AACf,QAAM,WAAW,OAAO;AACxB,MAAI,OAAO,aAAa,YAAY;AAClC,WAAO;AAAA,EACT;AAEA,SAAO,0CAA0C,SAAS,oBAExD,QACA;AACA,UAAM,eAAe,SAAS,KAAK,MAAM,MAAM;AAC/C,QAAI,aAAa,IAAI;AACnB,2BAAqB,IAAI,aAAa,IAAI;AAAA,QACxC,QAAQ,OAAO;AAAA,QACf,SAAS,OAAO;AAAA,QAChB,aAAa,OAAO;AAAA,QACpB,cAAc,OAAO;AAAA,MACvB,CAAC;AAAA,IACH;AACA,WAAO;AAAA,EACT;AAEA,SAAO;AACT;AAgBO,IAAM,wBAAN,cAAoC,8CAA0C;AAAA,EACnF,YAAY,SAAwC;AAClD;AAAA,MACE,YAAY;AACV,cAAM,EAAE,uBAAuB,IAAI,MAAM,OAAO,wCAAwC;AACxF,gBAAQ,CAAC,SACP,mCAAmC,uBAAuB,IAAI,CAAC;AAAA,MACnE;AAAA,MACA,EAAE,gBAAgB,OAAO,KAAK,SAAS,IAAI;AAAA,IAC7C;AAAA,EACF;AAAA,EAEA,MAAyB,qBACvB,IAC6B;AAC7B,UAAM,cAAc,MAAM,MAAM,qBAAqB,EAAE;AACvD,WAAO,YAAY,IAAI,OAAK;AAC1B,YAAM,WAAW,qBAAqB,IAAI,EAAE,IAAI;AAChD,aAAO;AAAA,QACL,GAAG;AAAA,QACH,QAAQ,UAAU,UAAU,EAAE;AAAA,QAC9B,SAAS,UAAU,WAAW,EAAE;AAAA,QAChC,aAAa,UAAU,eAAe,EAAE;AAAA,QACxC,cAAc,UAAU,gBAAgB,EAAE;AAAA,MAC5C;AAAA,IACF,CAAC;AAAA,EACH;AACF;;;ADpFO,SAAS,4BAA4B,KAAuC;AACjF,SAAO,IAAI,sBAAsB,EAAE,IAAI,CAAC;AAC1C;","names":[]}
+{"version":3,"sources":["../src/index.ts","../src/LedgerWebHidConnector.ts"],"sourcesContent":["import { LedgerWebHidConnector } from './LedgerWebHidConnector';\n\nimport type { IConnector } from '@onekeyfe/hwk-adapter-core';\nimport type { DeviceManagementKit } from '@ledgerhq/device-management-kit';\nimport type { LedgerWebHidConnectorOptions } from './LedgerWebHidConnector';\n\nexport { LedgerWebHidConnector };\nexport type { LedgerWebHidConnectorOptions };\n\n/**\n * Create a LedgerWebHidConnector.\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-web-hid`.\n */\nexport function createLedgerWebHidConnector(dmk?: DeviceManagementKit): IConnector {\n  return new LedgerWebHidConnector({ dmk });\n}\n","import {\n  LedgerConnectorBase,\n  extractBleHexId,\n  isLedgerDmkBleTransport,\n} 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 LedgerWebHidConnectorOptions {\n  /**\n   * Pre-built DMK instance. If not provided, a DMK will be created\n   * lazily on first use via `@ledgerhq/device-management-kit` and\n   * `@ledgerhq/device-transport-kit-web-hid`.\n   */\n  dmk?: DeviceManagementKit;\n}\n\n/**\n * IConnector implementation for Ledger hardware wallets via WebHID.\n *\n * Extends LedgerConnectorBase with the WebHID transport factory.\n * Overrides connectId resolution to handle BLE devices that may appear\n * via a WebHID+BLE combo transport.\n */\nexport class LedgerWebHidConnector extends LedgerConnectorBase {\n  constructor(options?: LedgerWebHidConnectorOptions) {\n    super(\n      async () => {\n        const { webHidTransportFactory } = await import('@ledgerhq/device-transport-kit-web-hid');\n        return webHidTransportFactory;\n      },\n      { connectionType: 'usb', dmk: options?.dmk }\n    );\n  }\n\n  /**\n   * Override connectId resolution for BLE devices discovered via WebHID+BLE combo.\n   * For USB devices, the DMK path (ephemeral UUID) is used as-is.\n   */\n  protected override _resolveConnectId(descriptor: DeviceDescriptor): string {\n    if (isLedgerDmkBleTransport(descriptor.transport)) {\n      return extractBleHexId(descriptor.name) || '';\n    }\n    return descriptor.path;\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,gCAIO;AAqBA,IAAM,wBAAN,cAAoC,8CAAoB;AAAA,EAC7D,YAAY,SAAwC;AAClD;AAAA,MACE,YAAY;AACV,cAAM,EAAE,uBAAuB,IAAI,MAAM,OAAO,wCAAwC;AACxF,eAAO;AAAA,MACT;AAAA,MACA,EAAE,gBAAgB,OAAO,KAAK,SAAS,IAAI;AAAA,IAC7C;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA,EAMmB,kBAAkB,YAAsC;AACzE,YAAI,mDAAwB,WAAW,SAAS,GAAG;AACjD,iBAAO,2CAAgB,WAAW,IAAI,KAAK;AAAA,IAC7C;AACA,WAAO,WAAW;AAAA,EACpB;AACF;;;AD9BO,SAAS,4BAA4B,KAAuC;AACjF,SAAO,IAAI,sBAAsB,EAAE,IAAI,CAAC;AAC1C;","names":[]}

package/dist/index.mjs

@@ -1,48 +1,28 @@
 // src/LedgerWebHidConnector.ts
-import { LedgerConnectorBase } from "@onekeyfe/hwk-ledger-adapter";
-var webHidMetadataByPath = /* @__PURE__ */ new Map();
-function patchLedgerWebHidTransportMetadata(transport) {
-  const target = transport;
-  const original = target.mapHIDDeviceToTransportDiscoveredDevice;
-  if (typeof original !== "function") {
-    return transport;
-  }
-  target.mapHIDDeviceToTransportDiscoveredDevice = function patchedMapHidDevice(device) {
-    const mappedDevice = original.call(this, device);
-    if (mappedDevice.id) {
-      webHidMetadataByPath.set(mappedDevice.id, {
-        vendor: device.vendorId,
-        product: device.productId,
-        productName: device.productName,
-        serialNumber: device.serialNumber
-      });
-    }
-    return mappedDevice;
-  };
-  return transport;
-}
+import {
+  LedgerConnectorBase,
+  extractBleHexId,
+  isLedgerDmkBleTransport
+} from "@onekeyfe/hwk-ledger-adapter";
 var LedgerWebHidConnector = class extends LedgerConnectorBase {
   constructor(options) {
     super(
       async () => {
         const { webHidTransportFactory } = await import("@ledgerhq/device-transport-kit-web-hid");
-        return ((args) => patchLedgerWebHidTransportMetadata(webHidTransportFactory(args)));
+        return webHidTransportFactory;
       },
       { connectionType: "usb", dmk: options?.dmk }
     );
   }
-  async _discoverDescriptors(dm) {
-    const descriptors = await super._discoverDescriptors(dm);
-    return descriptors.map((d) => {
-      const metadata = webHidMetadataByPath.get(d.path);
-      return {
-        ...d,
-        vendor: metadata?.vendor ?? d.vendor,
-        product: metadata?.product ?? d.product,
-        productName: metadata?.productName ?? d.productName,
-        serialNumber: metadata?.serialNumber ?? d.serialNumber
-      };
-    });
+  /**
+   * Override connectId resolution for BLE devices discovered via WebHID+BLE combo.
+   * For USB devices, the DMK path (ephemeral UUID) is used as-is.
+   */
+  _resolveConnectId(descriptor) {
+    if (isLedgerDmkBleTransport(descriptor.transport)) {
+      return extractBleHexId(descriptor.name) || "";
+    }
+    return descriptor.path;
   }
 };
 

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/LedgerWebHidConnector.ts","../src/index.ts"],"sourcesContent":["import { LedgerConnectorBase } from '@onekeyfe/hwk-ledger-adapter';\n\nimport type { LedgerDeviceManager } from '@onekeyfe/hwk-ledger-adapter';\nimport type { DeviceDescriptor, IConnector } from '@onekeyfe/hwk-adapter-core';\nimport type { DeviceManagementKit, TransportFactory } from '@ledgerhq/device-management-kit';\n\ntype WebHidRawDevice = {\n  vendorId?: number;\n  productId?: number;\n  productName?: string;\n  serialNumber?: string;\n};\n\ntype WebHidTransportDiscoveredDevice = {\n  id?: string;\n  name?: string;\n};\n\ntype WebHidTransportWithMapper = {\n  mapHIDDeviceToTransportDiscoveredDevice?: (\n    device: WebHidRawDevice\n  ) => WebHidTransportDiscoveredDevice;\n};\n\ntype WebHidMetadata = {\n  vendor?: number;\n  product?: number;\n  productName?: string;\n  serialNumber?: string;\n};\n\nconst webHidMetadataByPath = new Map<string, WebHidMetadata>();\n\nfunction patchLedgerWebHidTransportMetadata(transport: unknown): unknown {\n  const target = transport as WebHidTransportWithMapper;\n  const original = target.mapHIDDeviceToTransportDiscoveredDevice;\n  if (typeof original !== 'function') {\n    return transport;\n  }\n\n  target.mapHIDDeviceToTransportDiscoveredDevice = function patchedMapHidDevice(\n    this: WebHidTransportWithMapper,\n    device: WebHidRawDevice\n  ) {\n    const mappedDevice = original.call(this, device);\n    if (mappedDevice.id) {\n      webHidMetadataByPath.set(mappedDevice.id, {\n        vendor: device.vendorId,\n        product: device.productId,\n        productName: device.productName,\n        serialNumber: device.serialNumber,\n      });\n    }\n    return mappedDevice;\n  };\n\n  return transport;\n}\n\nexport interface LedgerWebHidConnectorOptions {\n  /**\n   * Pre-built DMK instance. If not provided, a DMK will be created\n   * lazily on first use via `@ledgerhq/device-management-kit` and\n   * `@ledgerhq/device-transport-kit-web-hid`.\n   */\n  dmk?: DeviceManagementKit;\n}\n\n/**\n * IConnector implementation for Ledger hardware wallets via WebHID.\n *\n * Extends LedgerConnectorBase with the WebHID transport factory.\n */\nexport class LedgerWebHidConnector extends LedgerConnectorBase implements IConnector {\n  constructor(options?: LedgerWebHidConnectorOptions) {\n    super(\n      async () => {\n        const { webHidTransportFactory } = await import('@ledgerhq/device-transport-kit-web-hid');\n        return ((args: Parameters<TransportFactory>[0]) =>\n          patchLedgerWebHidTransportMetadata(webHidTransportFactory(args))) as TransportFactory;\n      },\n      { connectionType: 'usb', dmk: options?.dmk }\n    );\n  }\n\n  protected override async _discoverDescriptors(\n    dm: LedgerDeviceManager\n  ): Promise<DeviceDescriptor[]> {\n    const descriptors = await super._discoverDescriptors(dm);\n    return descriptors.map(d => {\n      const metadata = webHidMetadataByPath.get(d.path);\n      return {\n        ...d,\n        vendor: metadata?.vendor ?? d.vendor,\n        product: metadata?.product ?? d.product,\n        productName: metadata?.productName ?? d.productName,\n        serialNumber: metadata?.serialNumber ?? d.serialNumber,\n      };\n    });\n  }\n}\n","import { LedgerWebHidConnector } from './LedgerWebHidConnector';\n\nimport type { IConnector } from '@onekeyfe/hwk-adapter-core';\nimport type { DeviceManagementKit } from '@ledgerhq/device-management-kit';\nimport type { LedgerWebHidConnectorOptions } from './LedgerWebHidConnector';\n\nexport { LedgerWebHidConnector };\nexport type { LedgerWebHidConnectorOptions };\n\n/**\n * Create a LedgerWebHidConnector.\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-web-hid`.\n */\nexport function createLedgerWebHidConnector(dmk?: DeviceManagementKit): IConnector {\n  return new LedgerWebHidConnector({ dmk });\n}\n"],"mappings":";AAAA,SAAS,2BAA2B;AA+BpC,IAAM,uBAAuB,oBAAI,IAA4B;AAE7D,SAAS,mCAAmC,WAA6B;AACvE,QAAM,SAAS;AACf,QAAM,WAAW,OAAO;AACxB,MAAI,OAAO,aAAa,YAAY;AAClC,WAAO;AAAA,EACT;AAEA,SAAO,0CAA0C,SAAS,oBAExD,QACA;AACA,UAAM,eAAe,SAAS,KAAK,MAAM,MAAM;AAC/C,QAAI,aAAa,IAAI;AACnB,2BAAqB,IAAI,aAAa,IAAI;AAAA,QACxC,QAAQ,OAAO;AAAA,QACf,SAAS,OAAO;AAAA,QAChB,aAAa,OAAO;AAAA,QACpB,cAAc,OAAO;AAAA,MACvB,CAAC;AAAA,IACH;AACA,WAAO;AAAA,EACT;AAEA,SAAO;AACT;AAgBO,IAAM,wBAAN,cAAoC,oBAA0C;AAAA,EACnF,YAAY,SAAwC;AAClD;AAAA,MACE,YAAY;AACV,cAAM,EAAE,uBAAuB,IAAI,MAAM,OAAO,wCAAwC;AACxF,gBAAQ,CAAC,SACP,mCAAmC,uBAAuB,IAAI,CAAC;AAAA,MACnE;AAAA,MACA,EAAE,gBAAgB,OAAO,KAAK,SAAS,IAAI;AAAA,IAC7C;AAAA,EACF;AAAA,EAEA,MAAyB,qBACvB,IAC6B;AAC7B,UAAM,cAAc,MAAM,MAAM,qBAAqB,EAAE;AACvD,WAAO,YAAY,IAAI,OAAK;AAC1B,YAAM,WAAW,qBAAqB,IAAI,EAAE,IAAI;AAChD,aAAO;AAAA,QACL,GAAG;AAAA,QACH,QAAQ,UAAU,UAAU,EAAE;AAAA,QAC9B,SAAS,UAAU,WAAW,EAAE;AAAA,QAChC,aAAa,UAAU,eAAe,EAAE;AAAA,QACxC,cAAc,UAAU,gBAAgB,EAAE;AAAA,MAC5C;AAAA,IACF,CAAC;AAAA,EACH;AACF;;;ACpFO,SAAS,4BAA4B,KAAuC;AACjF,SAAO,IAAI,sBAAsB,EAAE,IAAI,CAAC;AAC1C;","names":[]}
+{"version":3,"sources":["../src/LedgerWebHidConnector.ts","../src/index.ts"],"sourcesContent":["import {\n  LedgerConnectorBase,\n  extractBleHexId,\n  isLedgerDmkBleTransport,\n} 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 LedgerWebHidConnectorOptions {\n  /**\n   * Pre-built DMK instance. If not provided, a DMK will be created\n   * lazily on first use via `@ledgerhq/device-management-kit` and\n   * `@ledgerhq/device-transport-kit-web-hid`.\n   */\n  dmk?: DeviceManagementKit;\n}\n\n/**\n * IConnector implementation for Ledger hardware wallets via WebHID.\n *\n * Extends LedgerConnectorBase with the WebHID transport factory.\n * Overrides connectId resolution to handle BLE devices that may appear\n * via a WebHID+BLE combo transport.\n */\nexport class LedgerWebHidConnector extends LedgerConnectorBase {\n  constructor(options?: LedgerWebHidConnectorOptions) {\n    super(\n      async () => {\n        const { webHidTransportFactory } = await import('@ledgerhq/device-transport-kit-web-hid');\n        return webHidTransportFactory;\n      },\n      { connectionType: 'usb', dmk: options?.dmk }\n    );\n  }\n\n  /**\n   * Override connectId resolution for BLE devices discovered via WebHID+BLE combo.\n   * For USB devices, the DMK path (ephemeral UUID) is used as-is.\n   */\n  protected override _resolveConnectId(descriptor: DeviceDescriptor): string {\n    if (isLedgerDmkBleTransport(descriptor.transport)) {\n      return extractBleHexId(descriptor.name) || '';\n    }\n    return descriptor.path;\n  }\n}\n","import { LedgerWebHidConnector } from './LedgerWebHidConnector';\n\nimport type { IConnector } from '@onekeyfe/hwk-adapter-core';\nimport type { DeviceManagementKit } from '@ledgerhq/device-management-kit';\nimport type { LedgerWebHidConnectorOptions } from './LedgerWebHidConnector';\n\nexport { LedgerWebHidConnector };\nexport type { LedgerWebHidConnectorOptions };\n\n/**\n * Create a LedgerWebHidConnector.\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-web-hid`.\n */\nexport function createLedgerWebHidConnector(dmk?: DeviceManagementKit): IConnector {\n  return new LedgerWebHidConnector({ dmk });\n}\n"],"mappings":";AAAA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAqBA,IAAM,wBAAN,cAAoC,oBAAoB;AAAA,EAC7D,YAAY,SAAwC;AAClD;AAAA,MACE,YAAY;AACV,cAAM,EAAE,uBAAuB,IAAI,MAAM,OAAO,wCAAwC;AACxF,eAAO;AAAA,MACT;AAAA,MACA,EAAE,gBAAgB,OAAO,KAAK,SAAS,IAAI;AAAA,IAC7C;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA,EAMmB,kBAAkB,YAAsC;AACzE,QAAI,wBAAwB,WAAW,SAAS,GAAG;AACjD,aAAO,gBAAgB,WAAW,IAAI,KAAK;AAAA,IAC7C;AACA,WAAO,WAAW;AAAA,EACpB;AACF;;;AC9BO,SAAS,4BAA4B,KAAuC;AACjF,SAAO,IAAI,sBAAsB,EAAE,IAAI,CAAC;AAC1C;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hwk-ledger-connector-webhid",
-  "version": "1.1.26",
+  "version": "1.1.27-alpha.31",
   "description": "IConnector implementation for Ledger hardware wallets via WebHID (DMK)",
   "author": "OneKey",
   "license": "MIT",
@@ -49,13 +49,13 @@
     "@ledgerhq/device-signer-kit-ethereum": "^1.9.0",
     "@ledgerhq/device-signer-kit-solana": "^1.7.0",
     "@ledgerhq/device-transport-kit-web-hid": "^1.0.0",
-    "@onekeyfe/hwk-adapter-core": "1.1.26",
-    "@onekeyfe/hwk-ledger-adapter": "1.1.26"
+    "@onekeyfe/hwk-adapter-core": "1.1.27-alpha.31",
+    "@onekeyfe/hwk-ledger-adapter": "1.1.27-alpha.31"
   },
   "devDependencies": {
     "rimraf": "^5.0.0",
     "tsup": "^8.0.0",
     "typescript": "^5.4.0"
   },
-  "gitHead": "25f2737f5e9d357764fb82f558b024f763cdd30d"
+  "gitHead": "73a8ecbc0e5e47038966b2f9a5ab30dc2f947d8f"
 }