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

package/dist/index.d.mts

@@ -166,14 +166,10 @@ declare class LedgerAdapter implements IHardwareWallet {
     private errorToFailure;
     private deviceConnectHandler;
     private deviceDisconnectHandler;
-    private uiRequestHandler;
-    private uiEventHandler;
+    private uiEventForwarder;
     private registerEventListeners;
     private unregisterEventListeners;
-    private handleUiEvent;
     private connectorDeviceToDeviceInfo;
-    private extractDeviceInfoFromPayload;
-    private unknownDevice;
 }
 
 /**
@@ -276,6 +272,12 @@ declare class LedgerConnectorBase implements IConnector {
     private _resetSignersAndSessions;
     private _resetAll;
     protected _emit<K extends ConnectorEventType>(event: K, data: ConnectorEventMap[K]): void;
+    /**
+     * Return a per-call ctx with the chain's Ledger app name pre-bound to
+     * wrapError, so chain handlers don't need to repeat `{ defaultAppName: 'X' }`
+     * at every catch site. Falls through unchanged for unknown methods.
+     */
+    private _ctxForMethod;
     private _wrapError;
 }
 
@@ -540,9 +542,16 @@ declare class AppManager {
      * 5. Poll until the device confirms the target app is running.
      */
     /**
-     * @param onConfirmOnDevice Called after OpenAppCommand succeeds —
-     *   the device is now showing a confirmation prompt to the user.
-     *   NOT called if the app is already open or if the app is not installed.
+     * @param onConfirmOnDevice Called BEFORE OpenAppCommand is issued — the
+     *   device is about to display "Open <app>" on screen and wait for the
+     *   user's button press. UI consumers should show their "open app" prompt
+     *   in response. NOT called when the target app is already open (no user
+     *   interaction needed in that case).
+     *
+     * Important: OpenAppCommand is blocking. It does not resolve until the user
+     *   has physically confirmed on the device, so anything that runs AFTER
+     *   `await this._openApp(...)` lands AFTER the prompt is already gone.
+     *   Hence the callback must fire BEFORE that await.
      */
     ensureAppOpen(sessionId: string, targetAppName: string, onConfirmOnDevice?: () => void): Promise<void>;
     private _getCurrentApp;
@@ -567,6 +576,14 @@ type LedgerFailure = Omit<Failure, 'payload'> & {
         appName?: string;
     };
 };
+interface WrapErrorOptions {
+    /**
+     * Fallback app name when the raw error doesn't carry `appName` itself
+     * (DMK signer errors don't). Used by mapLedgerError so downstream
+     * AppNotOpen / WrongApp / AppTooOld toasts can interpolate `{appName}`.
+     */
+    defaultAppName?: string;
+}
 /**
  * Structurally compatible with `Failure`; writes `appName` only when provided,
  * so `'appName' in payload` is a reliable "has info" signal for consumers.
@@ -575,10 +592,11 @@ declare function ledgerFailure(code: HardwareErrorCode, error: string, appName?:
 /** Check if an error (or any error in its chain) represents a locked Ledger device. */
 declare function isDeviceLockedError(err: unknown): boolean;
 /**
- * Map a Ledger DMK error to a HardwareErrorCode and human-readable message
- * with actionable recovery information for the caller.
+ * Map a Ledger DMK error to a HardwareErrorCode and human-readable message.
+ * `opts.defaultAppName` fills `appName` when the raw error doesn't carry it
+ * (DMK signer errors don't).
  */
-declare function mapLedgerError(err: unknown): {
+declare function mapLedgerError(err: unknown, opts?: WrapErrorOptions): {
     code: HardwareErrorCode;
     message: string;
     appName?: string;

package/dist/index.d.ts

@@ -166,14 +166,10 @@ declare class LedgerAdapter implements IHardwareWallet {
     private errorToFailure;
     private deviceConnectHandler;
     private deviceDisconnectHandler;
-    private uiRequestHandler;
-    private uiEventHandler;
+    private uiEventForwarder;
     private registerEventListeners;
     private unregisterEventListeners;
-    private handleUiEvent;
     private connectorDeviceToDeviceInfo;
-    private extractDeviceInfoFromPayload;
-    private unknownDevice;
 }
 
 /**
@@ -276,6 +272,12 @@ declare class LedgerConnectorBase implements IConnector {
     private _resetSignersAndSessions;
     private _resetAll;
     protected _emit<K extends ConnectorEventType>(event: K, data: ConnectorEventMap[K]): void;
+    /**
+     * Return a per-call ctx with the chain's Ledger app name pre-bound to
+     * wrapError, so chain handlers don't need to repeat `{ defaultAppName: 'X' }`
+     * at every catch site. Falls through unchanged for unknown methods.
+     */
+    private _ctxForMethod;
     private _wrapError;
 }
 
@@ -540,9 +542,16 @@ declare class AppManager {
      * 5. Poll until the device confirms the target app is running.
      */
     /**
-     * @param onConfirmOnDevice Called after OpenAppCommand succeeds —
-     *   the device is now showing a confirmation prompt to the user.
-     *   NOT called if the app is already open or if the app is not installed.
+     * @param onConfirmOnDevice Called BEFORE OpenAppCommand is issued — the
+     *   device is about to display "Open <app>" on screen and wait for the
+     *   user's button press. UI consumers should show their "open app" prompt
+     *   in response. NOT called when the target app is already open (no user
+     *   interaction needed in that case).
+     *
+     * Important: OpenAppCommand is blocking. It does not resolve until the user
+     *   has physically confirmed on the device, so anything that runs AFTER
+     *   `await this._openApp(...)` lands AFTER the prompt is already gone.
+     *   Hence the callback must fire BEFORE that await.
      */
     ensureAppOpen(sessionId: string, targetAppName: string, onConfirmOnDevice?: () => void): Promise<void>;
     private _getCurrentApp;
@@ -567,6 +576,14 @@ type LedgerFailure = Omit<Failure, 'payload'> & {
         appName?: string;
     };
 };
+interface WrapErrorOptions {
+    /**
+     * Fallback app name when the raw error doesn't carry `appName` itself
+     * (DMK signer errors don't). Used by mapLedgerError so downstream
+     * AppNotOpen / WrongApp / AppTooOld toasts can interpolate `{appName}`.
+     */
+    defaultAppName?: string;
+}
 /**
  * Structurally compatible with `Failure`; writes `appName` only when provided,
  * so `'appName' in payload` is a reliable "has info" signal for consumers.
@@ -575,10 +592,11 @@ declare function ledgerFailure(code: HardwareErrorCode, error: string, appName?:
 /** Check if an error (or any error in its chain) represents a locked Ledger device. */
 declare function isDeviceLockedError(err: unknown): boolean;
 /**
- * Map a Ledger DMK error to a HardwareErrorCode and human-readable message
- * with actionable recovery information for the caller.
+ * Map a Ledger DMK error to a HardwareErrorCode and human-readable message.
+ * `opts.defaultAppName` fills `appName` when the raw error doesn't carry it
+ * (DMK signer errors don't).
  */
-declare function mapLedgerError(err: unknown): {
+declare function mapLedgerError(err: unknown, opts?: WrapErrorOptions): {
     code: HardwareErrorCode;
     message: string;
     appName?: string;