@onekeyfe/hwk-ledger-adapter 1.1.26-alpha.4 → 1.1.26-alpha.6

package/dist/index.d.mts

@@ -590,4 +590,11 @@ declare function setDebugEnabled(value: boolean): void;
 /** Returns the current debug-enabled state. */
 declare function isDebugEnabled(): boolean;
 
-export { AppManager, type DeviceActionState, type DmkDiscoveredDevice, DmkTransport, LedgerAdapter, LedgerConnectorBase, type LedgerConnectorBaseOptions, LedgerDeviceManager, type LedgerFailure, SignerBtc, type SignerBtcAddress, SignerEth, type SignerEvmAddress, type SignerEvmSignature, SignerManager, SignerSol, type TransportFactory, deviceActionToPromise, isDebugEnabled, isDeviceLockedError, ledgerFailure, mapLedgerError, setDebugEnabled };
+/**
+ * Extract the stable 4-digit HEX identifier from a Ledger BLE device name.
+ * e.g., "Nano X 123A" -> "123A", "Ledger Nano X AB12" -> "AB12"
+ * Returns undefined if no valid HEX suffix found.
+ */
+declare function extractBleHexId(name?: string): string | undefined;
+
+export { AppManager, type DeviceActionState, type DmkDiscoveredDevice, DmkTransport, LedgerAdapter, LedgerConnectorBase, type LedgerConnectorBaseOptions, LedgerDeviceManager, type LedgerFailure, SignerBtc, type SignerBtcAddress, SignerEth, type SignerEvmAddress, type SignerEvmSignature, SignerManager, SignerSol, type TransportFactory, deviceActionToPromise, extractBleHexId, isDebugEnabled, isDeviceLockedError, ledgerFailure, mapLedgerError, setDebugEnabled };

package/dist/index.d.ts

@@ -590,4 +590,11 @@ declare function setDebugEnabled(value: boolean): void;
 /** Returns the current debug-enabled state. */
 declare function isDebugEnabled(): boolean;
 
-export { AppManager, type DeviceActionState, type DmkDiscoveredDevice, DmkTransport, LedgerAdapter, LedgerConnectorBase, type LedgerConnectorBaseOptions, LedgerDeviceManager, type LedgerFailure, SignerBtc, type SignerBtcAddress, SignerEth, type SignerEvmAddress, type SignerEvmSignature, SignerManager, SignerSol, type TransportFactory, deviceActionToPromise, isDebugEnabled, isDeviceLockedError, ledgerFailure, mapLedgerError, setDebugEnabled };
+/**
+ * Extract the stable 4-digit HEX identifier from a Ledger BLE device name.
+ * e.g., "Nano X 123A" -> "123A", "Ledger Nano X AB12" -> "AB12"
+ * Returns undefined if no valid HEX suffix found.
+ */
+declare function extractBleHexId(name?: string): string | undefined;
+
+export { AppManager, type DeviceActionState, type DmkDiscoveredDevice, DmkTransport, LedgerAdapter, LedgerConnectorBase, type LedgerConnectorBaseOptions, LedgerDeviceManager, type LedgerFailure, SignerBtc, type SignerBtcAddress, SignerEth, type SignerEvmAddress, type SignerEvmSignature, SignerManager, SignerSol, type TransportFactory, deviceActionToPromise, extractBleHexId, isDebugEnabled, isDeviceLockedError, ledgerFailure, mapLedgerError, setDebugEnabled };

package/dist/index.js

@@ -40,6 +40,7 @@ __export(index_exports, {
   SignerManager: () => SignerManager,
   SignerSol: () => SignerSol,
   deviceActionToPromise: () => deviceActionToPromise,
+  extractBleHexId: () => extractBleHexId,
   isDebugEnabled: () => isDebugEnabled,
   isDeviceLockedError: () => isDeviceLockedError,
   ledgerFailure: () => ledgerFailure,
@@ -75,6 +76,58 @@ function getEthAppErrorCode(err) {
   }
   return null;
 }
+function extractApduHex(err) {
+  if (!err || typeof err !== "object") return null;
+  const e = err;
+  if (typeof e.errorCode === "string" && /^[0-9a-f]+$/i.test(e.errorCode)) {
+    return e.errorCode.toLowerCase();
+  }
+  if (typeof e.statusCode === "number" && Number.isFinite(e.statusCode)) {
+    return e.statusCode.toString(16).padStart(4, "0");
+  }
+  if (typeof e.statusCode === "string" && /^[0-9a-f]+$/i.test(e.statusCode)) {
+    return e.statusCode.toLowerCase();
+  }
+  if (e.originalError != null) {
+    const nested = extractApduHex(e.originalError);
+    if (nested) return nested;
+  }
+  if (e.error != null && typeof e._tag === "string") {
+    const nested = extractApduHex(e.error);
+    if (nested) return nested;
+  }
+  return null;
+}
+function mapSolanaAppError(hex) {
+  switch (hex) {
+    case "6808":
+      return import_hwk_adapter_core.HardwareErrorCode.SolanaBlindSigningRequired;
+    default:
+      return null;
+  }
+}
+function mapTronAppError(hex) {
+  switch (hex) {
+    case "6a8d":
+      return import_hwk_adapter_core.HardwareErrorCode.TronCustomContractRequired;
+    case "6a8b":
+      return import_hwk_adapter_core.HardwareErrorCode.TronDataSigningRequired;
+    case "6a8c":
+      return import_hwk_adapter_core.HardwareErrorCode.TronSignByHashRequired;
+    default:
+      return null;
+  }
+}
+function mapBtcAppError(hex) {
+  switch (hex) {
+    case "b008":
+      return import_hwk_adapter_core.HardwareErrorCode.BtcWalletPolicyHmacMismatch;
+    case "b007":
+      return import_hwk_adapter_core.HardwareErrorCode.BtcUnexpectedState;
+    default:
+      return null;
+  }
+}
 function mapEthAppError(ethCode, lastStep) {
   switch (ethCode) {
     case "6a80":
@@ -190,8 +243,10 @@ function mapLedgerError(err) {
   } else {
     const ethCode = getEthAppErrorCode(err);
     const lastStep = err && typeof err === "object" ? err._lastStep : void 0;
-    const mapped = ethCode ? mapEthAppError(ethCode, lastStep) : null;
-    code = mapped ?? import_hwk_adapter_core.HardwareErrorCode.UnknownError;
+    const ethMapped = ethCode ? mapEthAppError(ethCode, lastStep) : null;
+    const apduHex = ethMapped ? null : extractApduHex(err);
+    const chainMapped = apduHex ? mapSolanaAppError(apduHex) ?? mapTronAppError(apduHex) ?? mapBtcAppError(apduHex) : null;
+    code = ethMapped ?? chainMapped ?? import_hwk_adapter_core.HardwareErrorCode.UnknownError;
   }
   const appName = err && typeof err === "object" ? err.appName : void 0;
   return { code, message: (0, import_hwk_adapter_core.enrichErrorMessage)(code, originalMessage), appName };
@@ -869,7 +924,7 @@ var _LedgerAdapter = class _LedgerAdapter {
    * If not granted, calls onDevicePermission so the consumer can request access.
    */
   async _ensureDevicePermission(connectId, deviceId) {
-    const transportType = "hid";
+    const transportType = this.activeTransport ?? "hid";
     let granted = false;
     let context;
     if (this._uiHandler?.checkDevicePermission) {
@@ -1597,7 +1652,7 @@ async function btcGetAddress(ctx, sessionId, params) {
     const { DefaultWallet, DefaultDescriptorTemplate } = await ctx.importLedgerKit(
       "@ledgerhq/device-signer-kit-bitcoin"
     );
-    const purpose = path.split("/")[0]?.replaceAll("'", "");
+    const purpose = path.split("/")[0]?.replace(/'/g, "");
     const template = _purposeToTemplate(purpose, DefaultDescriptorTemplate);
     const wallet = new DefaultWallet(path, template);
     debugLog("[LedgerConnector] btcGetAddress params:", {
@@ -1651,7 +1706,7 @@ async function btcSignTransaction(ctx, sessionId, params) {
       "@ledgerhq/device-signer-kit-bitcoin"
     );
     const path = normalizePath(params.path || "84'/0'/0'");
-    const purpose = path.split("/")[0]?.replaceAll("'", "");
+    const purpose = path.split("/")[0]?.replace(/'/g, "");
     const template = _purposeToTemplate(purpose, DefaultDescriptorTemplate);
     const wallet = new DefaultWallet(path, template);
     const signedTxHex = await btcSigner.signTransaction(wallet, params.psbt);
@@ -1675,7 +1730,7 @@ async function btcSignPsbt(ctx, sessionId, params) {
       "@ledgerhq/device-signer-kit-bitcoin"
     );
     const path = normalizePath(params.path || "84'/0'/0'");
-    const purpose = path.split("/")[0]?.replaceAll("'", "");
+    const purpose = path.split("/")[0]?.replace(/'/g, "");
     const template = _purposeToTemplate(purpose, DefaultDescriptorTemplate);
     const wallet = new DefaultWallet(path, template);
     const signatures = await btcSigner.signPsbt(wallet, params.psbt);
@@ -2026,35 +2081,8 @@ var AppManager = class {
 };
 
 // src/connector/chains/legacyAppRetry.ts
-var KNOWN_APP_CODES = {
-  Tron: /* @__PURE__ */ new Set([
-    27013,
-    // user denied
-    21781,
-    // device locked
-    27274,
-    // invalid BIP32 path
-    27275,
-    27276,
-    27277,
-    // app-specific data errors
-    27264,
-    // invalid data
-    27392,
-    // wrong parameter
-    26368
-    // wrong length
-  ])
-};
-function isLegacyWrongAppError(err, appName) {
-  if (isWrongAppError(err)) return true;
-  const msg = err instanceof Error ? err.message : "";
-  const match = msg.match(/0x([0-9a-fA-F]{4})/);
-  if (!match) return false;
-  const sw = parseInt(match[1], 16);
-  const knownCodes = KNOWN_APP_CODES[appName];
-  if (knownCodes?.has(sw)) return false;
-  return true;
+function isLegacyWrongAppError(err, _appName) {
+  return isWrongAppError(err);
 }
 async function withLegacyAppRetry(ctx, sessionId, appName, action) {
   try {
@@ -2593,6 +2621,13 @@ var LedgerConnectorBase = class {
     return error;
   }
 };
+
+// src/utils/bleIdentity.ts
+function extractBleHexId(name) {
+  if (!name) return void 0;
+  const match = name.match(/\b([0-9A-Fa-f]{4})$/);
+  return match ? match[1].toUpperCase() : void 0;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AppManager,
@@ -2605,6 +2640,7 @@ var LedgerConnectorBase = class {
   SignerManager,
   SignerSol,
   deviceActionToPromise,
+  extractBleHexId,
   isDebugEnabled,
   isDeviceLockedError,
   ledgerFailure,