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

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { IHardwareWallet, IConnector, TransportType, IUiHandler, UiResponseEvent, DeviceInfo, Response, ChainCapability, EvmGetAddressParams, EvmAddress, ProgressCallback, EvmSignTxParams, EvmSignedTx, EvmSignMsgParams, EvmSignature, EvmSignTypedDataParams, BtcGetAddressParams, BtcAddress, BtcGetPublicKeyParams, BtcPublicKey, BtcSignTxParams, BtcSignedTx, BtcSignPsbtParams, BtcSignedPsbt, BtcSignMsgParams, BtcSignature, SolGetAddressParams, SolAddress, SolSignTxParams, SolSignedTx, SolSignMsgParams, SolSignature, TronGetAddressParams, TronAddress, TronSignTxParams, TronSignedTx, TronSignMsgParams, TronSignature, HardwareEventMap, DeviceEventListener, ChainForFingerprint, ConnectionType, DeviceDescriptor, ConnectorDevice, ConnectorSession, ConnectorEventType, ConnectorEventMap, DeviceChangeEvent, Failure, HardwareErrorCode } from '@onekeyfe/hwk-adapter-core';
+import { IHardwareWallet, IConnector, TransportType, UiResponseEvent, DeviceInfo, Response, ChainCapability, EvmGetAddressParams, EvmAddress, ProgressCallback, EvmSignTxParams, EvmSignedTx, EvmSignMsgParams, EvmSignature, EvmSignTypedDataParams, BtcGetAddressParams, BtcAddress, BtcGetPublicKeyParams, BtcPublicKey, BtcSignTxParams, BtcSignedTx, BtcSignPsbtParams, BtcSignedPsbt, BtcSignMsgParams, BtcSignature, SolGetAddressParams, SolAddress, SolSignTxParams, SolSignedTx, SolSignMsgParams, SolSignature, TronGetAddressParams, TronAddress, TronSignTxParams, TronSignedTx, TronSignMsgParams, TronSignature, HardwareEventMap, DeviceEventListener, ChainForFingerprint, ConnectionType, DeviceDescriptor, ConnectorDevice, ConnectorSession, ConnectorEventType, ConnectorEventMap, DeviceChangeEvent, Failure, HardwareErrorCode } from '@onekeyfe/hwk-adapter-core';
 import { DeviceManagementKit, DeviceActionState as DeviceActionState$1, DiscoveredDevice, ExecuteDeviceActionReturnType } from '@ledgerhq/device-management-kit';
 import { Address, Signature, SignerEth as SignerEth$1, TypedData } from '@ledgerhq/device-signer-kit-ethereum';
 import { SignerBtc as SignerBtc$1 } from '@ledgerhq/device-signer-kit-bitcoin';
@@ -21,13 +21,12 @@ interface LedgerAdapterOptions {
  * - Translates IHardwareWallet method calls to connector.call() invocations
  * - Maps connector results/errors to our Response<T> format with enriched error messages
  * - Translates connector events to HardwareEventMap events
- * - Integrates with IUiHandler for permission flows
+ * - Emits `REQUEST_DEVICE_PERMISSION` for OS-level permission checks
  */
 declare class LedgerAdapter implements IHardwareWallet {
     readonly vendor: "ledger";
     private readonly connector;
     private readonly emitter;
-    private _uiHandler;
     private readonly _handleSelectDevice;
     private _discoveredDevices;
     private _sessions;
@@ -44,7 +43,6 @@ declare class LedgerAdapter implements IHardwareWallet {
     get activeTransport(): TransportType | null;
     getAvailableTransports(): TransportType[];
     switchTransport(_type: TransportType): Promise<void>;
-    setUiHandler(handler: Partial<IUiHandler>): void;
     init(_config?: unknown): Promise<void>;
     /**
      * Clear cached device/session state without tearing down the adapter.
@@ -149,10 +147,16 @@ declare class LedgerAdapter implements IHardwareWallet {
     /** Clear stale session, reconnect, and retry the call. */
     private _retryWithFreshConnection;
     /**
-     * Ensure device permission before proceeding.
-     * - No connectId (searchDevices): check environment-level permission
-     * - With connectId (business methods): check device-level permission
-     * If not granted, calls onDevicePermission so the consumer can request access.
+     * Ensure OS-level device permission (Bluetooth / USB) before proceeding.
+     *
+     * Emits `REQUEST_DEVICE_PERMISSION` and awaits the consumer's
+     * `RECEIVE_DEVICE_PERMISSION` reply (60s budget covers "probe → system
+     * prompt → user tap" plus a generous margin). If the consumer never wires
+     * a handler or never replies, the wait times out and the operation fails
+     * fast so scanners/callers don't hang silently.
+     *
+     * - No connectId (searchDevices): environment-level permission
+     * - With connectId (business methods): device-level permission
      */
     private _ensureDevicePermission;
     /**

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { IHardwareWallet, IConnector, TransportType, IUiHandler, UiResponseEvent, DeviceInfo, Response, ChainCapability, EvmGetAddressParams, EvmAddress, ProgressCallback, EvmSignTxParams, EvmSignedTx, EvmSignMsgParams, EvmSignature, EvmSignTypedDataParams, BtcGetAddressParams, BtcAddress, BtcGetPublicKeyParams, BtcPublicKey, BtcSignTxParams, BtcSignedTx, BtcSignPsbtParams, BtcSignedPsbt, BtcSignMsgParams, BtcSignature, SolGetAddressParams, SolAddress, SolSignTxParams, SolSignedTx, SolSignMsgParams, SolSignature, TronGetAddressParams, TronAddress, TronSignTxParams, TronSignedTx, TronSignMsgParams, TronSignature, HardwareEventMap, DeviceEventListener, ChainForFingerprint, ConnectionType, DeviceDescriptor, ConnectorDevice, ConnectorSession, ConnectorEventType, ConnectorEventMap, DeviceChangeEvent, Failure, HardwareErrorCode } from '@onekeyfe/hwk-adapter-core';
+import { IHardwareWallet, IConnector, TransportType, UiResponseEvent, DeviceInfo, Response, ChainCapability, EvmGetAddressParams, EvmAddress, ProgressCallback, EvmSignTxParams, EvmSignedTx, EvmSignMsgParams, EvmSignature, EvmSignTypedDataParams, BtcGetAddressParams, BtcAddress, BtcGetPublicKeyParams, BtcPublicKey, BtcSignTxParams, BtcSignedTx, BtcSignPsbtParams, BtcSignedPsbt, BtcSignMsgParams, BtcSignature, SolGetAddressParams, SolAddress, SolSignTxParams, SolSignedTx, SolSignMsgParams, SolSignature, TronGetAddressParams, TronAddress, TronSignTxParams, TronSignedTx, TronSignMsgParams, TronSignature, HardwareEventMap, DeviceEventListener, ChainForFingerprint, ConnectionType, DeviceDescriptor, ConnectorDevice, ConnectorSession, ConnectorEventType, ConnectorEventMap, DeviceChangeEvent, Failure, HardwareErrorCode } from '@onekeyfe/hwk-adapter-core';
 import { DeviceManagementKit, DeviceActionState as DeviceActionState$1, DiscoveredDevice, ExecuteDeviceActionReturnType } from '@ledgerhq/device-management-kit';
 import { Address, Signature, SignerEth as SignerEth$1, TypedData } from '@ledgerhq/device-signer-kit-ethereum';
 import { SignerBtc as SignerBtc$1 } from '@ledgerhq/device-signer-kit-bitcoin';
@@ -21,13 +21,12 @@ interface LedgerAdapterOptions {
  * - Translates IHardwareWallet method calls to connector.call() invocations
  * - Maps connector results/errors to our Response<T> format with enriched error messages
  * - Translates connector events to HardwareEventMap events
- * - Integrates with IUiHandler for permission flows
+ * - Emits `REQUEST_DEVICE_PERMISSION` for OS-level permission checks
  */
 declare class LedgerAdapter implements IHardwareWallet {
     readonly vendor: "ledger";
     private readonly connector;
     private readonly emitter;
-    private _uiHandler;
     private readonly _handleSelectDevice;
     private _discoveredDevices;
     private _sessions;
@@ -44,7 +43,6 @@ declare class LedgerAdapter implements IHardwareWallet {
     get activeTransport(): TransportType | null;
     getAvailableTransports(): TransportType[];
     switchTransport(_type: TransportType): Promise<void>;
-    setUiHandler(handler: Partial<IUiHandler>): void;
     init(_config?: unknown): Promise<void>;
     /**
      * Clear cached device/session state without tearing down the adapter.
@@ -149,10 +147,16 @@ declare class LedgerAdapter implements IHardwareWallet {
     /** Clear stale session, reconnect, and retry the call. */
     private _retryWithFreshConnection;
     /**
-     * Ensure device permission before proceeding.
-     * - No connectId (searchDevices): check environment-level permission
-     * - With connectId (business methods): check device-level permission
-     * If not granted, calls onDevicePermission so the consumer can request access.
+     * Ensure OS-level device permission (Bluetooth / USB) before proceeding.
+     *
+     * Emits `REQUEST_DEVICE_PERMISSION` and awaits the consumer's
+     * `RECEIVE_DEVICE_PERMISSION` reply (60s budget covers "probe → system
+     * prompt → user tap" plus a generous margin). If the consumer never wires
+     * a handler or never replies, the wait times out and the operation fails
+     * fast so scanners/callers don't hang silently.
+     *
+     * - No connectId (searchDevices): environment-level permission
+     * - With connectId (business methods): device-level permission
      */
     private _ensureDevicePermission;
     /**

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 };
@@ -225,7 +279,6 @@ var _LedgerAdapter = class _LedgerAdapter {
   constructor(connector, options) {
     this.vendor = "ledger";
     this.emitter = new import_hwk_adapter_core2.TypedEventEmitter();
-    this._uiHandler = null;
     // Device cache: tracks discovered devices from connector events
     this._discoveredDevices = /* @__PURE__ */ new Map();
     // Session tracking: maps connectId -> sessionId
@@ -291,12 +344,6 @@ var _LedgerAdapter = class _LedgerAdapter {
   async switchTransport(_type) {
   }
   // ---------------------------------------------------------------------------
-  // UI handler
-  // ---------------------------------------------------------------------------
-  setUiHandler(handler) {
-    this._uiHandler = handler;
-  }
-  // ---------------------------------------------------------------------------
   // Lifecycle
   // ---------------------------------------------------------------------------
   async init(_config) {
@@ -318,7 +365,6 @@ var _LedgerAdapter = class _LedgerAdapter {
     this._jobQueue.clear();
     this.unregisterEventListeners();
     this.connector.reset();
-    this._uiHandler = null;
     this._discoveredDevices.clear();
     this._sessions.clear();
     this.emitter.removeAllListeners();
@@ -864,33 +910,32 @@ var _LedgerAdapter = class _LedgerAdapter {
     return _LedgerAdapter._abortable(signal, this.connector.call(retrySessionId, method, params));
   }
   /**
-   * Ensure device permission before proceeding.
-   * - No connectId (searchDevices): check environment-level permission
-   * - With connectId (business methods): check device-level permission
-   * If not granted, calls onDevicePermission so the consumer can request access.
+   * Ensure OS-level device permission (Bluetooth / USB) before proceeding.
+   *
+   * Emits `REQUEST_DEVICE_PERMISSION` and awaits the consumer's
+   * `RECEIVE_DEVICE_PERMISSION` reply (60s budget covers "probe → system
+   * prompt → user tap" plus a generous margin). If the consumer never wires
+   * a handler or never replies, the wait times out and the operation fails
+   * fast so scanners/callers don't hang silently.
+   *
+   * - No connectId (searchDevices): environment-level permission
+   * - With connectId (business methods): device-level permission
    */
   async _ensureDevicePermission(connectId, deviceId) {
-    const transportType = "hid";
-    let granted = false;
-    let context;
-    if (this._uiHandler?.checkDevicePermission) {
-      try {
-        const result = await this._uiHandler.checkDevicePermission({
-          transportType,
-          connectId,
-          deviceId
-        });
-        granted = result.granted;
-        context = result.context;
-      } catch {
-        granted = false;
-      }
-    }
+    const transportType = this.activeTransport ?? "hid";
+    const waitPromise = this._uiRegistry.wait(
+      import_hwk_adapter_core2.UI_REQUEST.REQUEST_DEVICE_PERMISSION,
+      { timeoutMs: 6e4 }
+    );
+    this.emitter.emit(import_hwk_adapter_core2.UI_REQUEST.REQUEST_DEVICE_PERMISSION, {
+      type: import_hwk_adapter_core2.UI_REQUEST.REQUEST_DEVICE_PERMISSION,
+      payload: { transportType, connectId, deviceId }
+    });
+    const { granted } = await waitPromise;
     if (!granted) {
-      try {
-        await this._uiHandler?.onDevicePermission?.({ transportType, context });
-      } catch {
-      }
+      throw Object.assign(new Error("Device permission denied"), {
+        code: import_hwk_adapter_core2.HardwareErrorCode.DevicePermissionDenied
+      });
     }
   }
   /**
@@ -2027,35 +2072,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 {
@@ -2122,6 +2140,7 @@ var DmkTransport = class extends import_hw_transport.default {
 // src/connector/chains/tron.ts
 async function tronGetAddress(ctx, sessionId, params) {
   const path = normalizePath(params.path);
+  await _ensureTronAppOpen(ctx, sessionId);
   return withLegacyAppRetry(ctx, sessionId, "Tron", async (sid) => {
     const trx = await _createTrx(ctx, sid);
     if (params.showOnDevice) {
@@ -2146,6 +2165,7 @@ async function tronSignTransaction(ctx, sessionId, params) {
     );
   }
   const path = normalizePath(params.path);
+  await _ensureTronAppOpen(ctx, sessionId);
   return withLegacyAppRetry(ctx, sessionId, "Tron", async (sid) => {
     const trx = await _createTrx(ctx, sid);
     ctx.emit("ui-event", {
@@ -2166,6 +2186,7 @@ async function tronSignTransaction(ctx, sessionId, params) {
 }
 async function tronSignMessage(ctx, sessionId, params) {
   const path = normalizePath(params.path);
+  await _ensureTronAppOpen(ctx, sessionId);
   return withLegacyAppRetry(ctx, sessionId, "Tron", async (sid) => {
     const trx = await _createTrx(ctx, sid);
     ctx.emit("ui-event", {
@@ -2184,6 +2205,16 @@ async function _createTrx(ctx, sessionId) {
   const dmk = await ctx.getOrCreateDmk();
   return new import_hw_app_trx.default(new DmkTransport(dmk, sessionId));
 }
+async function _ensureTronAppOpen(ctx, sessionId) {
+  const dmk = await ctx.getOrCreateDmk();
+  const appManager = new AppManager(dmk);
+  await appManager.ensureAppOpen(sessionId, "Tron", () => {
+    ctx.emit("ui-event", {
+      type: import_hwk_adapter_core10.EConnectorInteraction.ConfirmOpenApp,
+      payload: { sessionId }
+    });
+  });
+}
 
 // src/connector/LedgerConnectorBase.ts
 async function defaultLedgerKitImporter(pkg) {