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

package/dist/index.js

@@ -76,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":
@@ -191,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 };
@@ -870,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) {
@@ -2027,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 {