@onekeyfe/hwk-ledger-adapter 1.1.26-alpha.20 → 1.1.26-alpha.21

package/dist/index.d.mts

@@ -114,9 +114,9 @@ declare class LedgerAdapter implements IHardwareWallet {
     dispose(): Promise<void>;
     uiResponse(response: UiResponseEvent): void;
     searchDevices(options?: SearchDevicesOptions): Promise<DeviceInfo[]>;
-    /** Compact snapshot helpers for diagnostic logs. */
     private _snapshotSessions;
     private _snapshotDiscovered;
+    private _evictAllSessions;
     private static readonly MAX_BUSINESS_RETRY_BUDGET;
     private static readonly STUCK_APP_RETRY_DELAY_MS;
     private static readonly MAX_DOCONNECT_CONFIRMS;

package/dist/index.d.ts

@@ -114,9 +114,9 @@ declare class LedgerAdapter implements IHardwareWallet {
     dispose(): Promise<void>;
     uiResponse(response: UiResponseEvent): void;
     searchDevices(options?: SearchDevicesOptions): Promise<DeviceInfo[]>;
-    /** Compact snapshot helpers for diagnostic logs. */
     private _snapshotSessions;
     private _snapshotDiscovered;
+    private _evictAllSessions;
     private static readonly MAX_BUSINESS_RETRY_BUDGET;
     private static readonly STUCK_APP_RETRY_DELAY_MS;
     private static readonly MAX_DOCONNECT_CONFIRMS;

package/dist/index.js

@@ -347,6 +347,15 @@ function isAppNotInstalledError(err) {
   if (hasStatusCode(err, APP_NOT_INSTALLED_CODES)) return true;
   return false;
 }
+function isOutOfMemoryError(err) {
+  if (!err || typeof err !== "object") return false;
+  const e = err;
+  if (e._tag === "OutOfMemoryDAError") return true;
+  if (typeof e.message === "string" && /out of memory|not enough.*space|insufficient.*memory/i.test(e.message)) {
+    return true;
+  }
+  return false;
+}
 function isDeviceDisconnectedError(err) {
   if (!err || typeof err !== "object") return false;
   const e = err;
@@ -409,6 +418,8 @@ function mapLedgerError(err, opts) {
     code = import_hwk_adapter_core.HardwareErrorCode.WrongApp;
   } else if (isAppNotInstalledError(err)) {
     code = import_hwk_adapter_core.HardwareErrorCode.AppNotInstalled;
+  } else if (isOutOfMemoryError(err)) {
+    code = import_hwk_adapter_core.HardwareErrorCode.DeviceOutOfMemory;
   } else if (isDeviceDisconnectedError(err)) {
     code = import_hwk_adapter_core.HardwareErrorCode.DeviceDisconnected;
   } else if (isTimeoutError(err)) {
@@ -666,7 +677,6 @@ var _LedgerAdapter = class _LedgerAdapter {
     );
     return Array.from(this._discoveredDevices.values());
   }
-  /** Compact snapshot helpers for diagnostic logs. */
   _snapshotSessions() {
     return [...this._sessions.entries()].map(([connectId, sessionId]) => ({
       connectId,
@@ -681,6 +691,30 @@ var _LedgerAdapter = class _LedgerAdapter {
       serial: info.serialNumber
     }));
   }
+  // Enforce USB single-session invariant — see connectDevice.
+  async _evictAllSessions(reason) {
+    if (this._sessions.size === 0) return;
+    const stale = [...this._sessions.entries()];
+    debugLog(
+      "[SESS-DBG] evictAllSessions reason=",
+      reason,
+      "evicting=",
+      stale.map(([cid, sid]) => ({ connectId: cid, sessionId: sid }))
+    );
+    this._sessions.clear();
+    for (const [, sid] of stale) {
+      try {
+        await this.connector.disconnect(sid);
+      } catch (err) {
+        debugLog(
+          "[SESS-DBG] evictAllSessions disconnect failed sessionId=",
+          sid,
+          "err=",
+          err?.message
+        );
+      }
+    }
+  }
   static _createDeviceBusyError(method) {
     return Object.assign(new Error(`Ledger device is busy while calling ${method}`), {
       code: import_hwk_adapter_core2.HardwareErrorCode.DeviceBusy
@@ -701,6 +735,9 @@ var _LedgerAdapter = class _LedgerAdapter {
           code: import_hwk_adapter_core2.HardwareErrorCode.DeviceNotFound
         });
       }
+      if (!isLedgerBleConnectionType(this.connector.connectionType)) {
+        await this._evictAllSessions("connectDevice");
+      }
       await this._ensureDevicePermission(connectId);
       const session = await this.connector.connect(connectId);
       const prev = this._sessions.get(connectId);
@@ -1122,13 +1159,24 @@ var _LedgerAdapter = class _LedgerAdapter {
       return connectId;
     }
     if (!connectId && this._sessions.size > 0) {
+      if (!isLedgerBleConnectionType(this.connector.connectionType) && this._sessions.size > 1) {
+        debugLog(
+          "[SESS-DBG] ensureConnected ABORT multiple USB sessions present sessions=",
+          this._snapshotSessions()
+        );
+        throw Object.assign(
+          new Error(
+            "Ledger USB session invariant violated: more than one session is active. Please reconnect the device."
+          ),
+          { code: import_hwk_adapter_core2.HardwareErrorCode.DeviceOneDeviceOnly }
+        );
+      }
       const ambient = this._sessions.keys().next().value;
       debugLog(
         "[SESS-DBG] ensureConnected RESOLVED path=ambient-fallback chosenConnectId=",
         ambient,
         "sessionId=",
-        this._sessions.get(ambient),
-        "WARNING: caller passed empty connectId, routing to first session entry"
+        this._sessions.get(ambient)
       );
       return ambient;
     }
@@ -1692,7 +1740,7 @@ var _LedgerAdapter = class _LedgerAdapter {
     const tag = err && typeof err === "object" ? err._tag : void 0;
     if (err && typeof err === "object" && "code" in err && typeof err.code === "number") {
       const e = err;
-      const params = e.code === import_hwk_adapter_core2.HardwareErrorCode.DevicePermissionDenied && e.reason ? { permissionDeniedReason: e.reason } : void 0;
+      const params = e.code === import_hwk_adapter_core2.HardwareErrorCode.DevicePermissionDenied && e.reason ? { permissionDeniedReason: e.reason } : e.params;
       return ledgerFailure(e.code, e.message ?? "Unknown error", e.appName, tag, params);
     }
     const mapped = mapLedgerError(err);
@@ -1742,7 +1790,7 @@ _LedgerAdapter.MAX_DOCONNECT_CONFIRMS = 3;
 var LedgerAdapter = _LedgerAdapter;
 
 // src/connector/LedgerConnectorBase.ts
-var import_hwk_adapter_core12 = require("@onekeyfe/hwk-adapter-core");
+var import_hwk_adapter_core13 = require("@onekeyfe/hwk-adapter-core");
 
 // src/device/LedgerDeviceManager.ts
 var LedgerDeviceManager = class {
@@ -3158,6 +3206,7 @@ async function _createTrx(ctx, sessionId) {
 
 // src/device-apps/DeviceApps.ts
 var import_device_management_kit3 = require("@ledgerhq/device-management-kit");
+var import_hwk_adapter_core12 = require("@onekeyfe/hwk-adapter-core");
 var import_rxjs = require("rxjs");
 var INSTALL_TIMEOUT_MS = 5 * 6e4;
 var DeviceApps = class {
@@ -3223,6 +3272,72 @@ var DeviceApps = class {
       hwVersion: v.hwVersion
     };
   }
+  /**
+   * Pre-flight space check. Mirrors DMK's PredictOutOfMemoryTask using the
+   * data we already expose (listInstalled / listAvailable / getOsVersion).
+   * Fails fast with HardwareErrorCode.DeviceOutOfMemory before issuing the
+   * actual install — saves the user the time-to-fail of DMK's state machine.
+   */
+  async _assertEnoughSpace(appName) {
+    let osVersion;
+    let installed;
+    let available;
+    try {
+      [osVersion, installed, available] = await Promise.all([
+        this._fetchOsVersion(),
+        this.listInstalled(),
+        this.listAvailable()
+      ]);
+    } catch (err) {
+      debugLog("[DeviceApps] precheck skipped:", err?.message);
+      return;
+    }
+    if (installed.some((a) => a.versionName === appName)) return;
+    const target = available.find((a) => a.versionName === appName);
+    if (!target) return;
+    const capacity = getDeviceCapacity(osVersion.targetId);
+    if (!capacity) return;
+    const blockSize = capacity.getBlockSize(osVersion.seVersion);
+    const totalBlocks = Math.floor(capacity.memorySize / blockSize);
+    const blocks = (b) => Math.ceil((b ?? 0) / blockSize);
+    const usedBlocks = installed.reduce((sum, a) => sum + blocks(a.bytes), 0);
+    const neededBlocks = blocks(target.bytes);
+    debugLog(
+      "[DeviceApps] space check",
+      "targetId=",
+      osVersion.targetId.toString(16),
+      "memorySize=",
+      capacity.memorySize,
+      "blockSize=",
+      blockSize,
+      "usedBlocks=",
+      usedBlocks,
+      "neededBlocks=",
+      neededBlocks,
+      "totalBlocks=",
+      totalBlocks
+    );
+    if (usedBlocks + neededBlocks > totalBlocks) {
+      const usedBytes = usedBlocks * blockSize;
+      const neededBytes = neededBlocks * blockSize;
+      const freeBytes = Math.max(0, capacity.memorySize - usedBytes);
+      throw Object.assign(
+        new Error(
+          `Not enough space to install "${appName}": needs ${neededBytes} bytes, ${freeBytes} bytes free of ${capacity.memorySize}.`
+        ),
+        {
+          code: import_hwk_adapter_core12.HardwareErrorCode.DeviceOutOfMemory,
+          _tag: "OutOfMemoryDAError",
+          appName,
+          params: {
+            requiredBytes: neededBytes,
+            availableBytes: freeBytes,
+            totalBytes: capacity.memorySize
+          }
+        }
+      );
+    }
+  }
   // Sole sendCommand wrapper — surfaces unlock-device interaction through
   // the same onInteraction pipeline as the device-action methods.
   async _fetchOsVersion() {
@@ -3244,6 +3359,7 @@ var DeviceApps = class {
   async install(appName, onProgress, options) {
     if (!appName) throw new Error("DeviceApps.install: appName is required");
     debugLog("[DeviceApps] install:", appName);
+    await this._assertEnoughSpace(appName);
     const action = this._dmk.executeDeviceAction({
       sessionId: this._sessionId,
       deviceAction: new this._ledgerKit.InstallAppDeviceAction({
@@ -3284,6 +3400,34 @@ function applicationToMetadata(app) {
     isDevTools: app.isDevTools
   };
 }
+var DEVICE_CAPACITIES = [
+  // Nano S — block size 4K on fw<2.0, 2K on >=2.0. Default 4K (conservative).
+  {
+    mask: 823132160,
+    capacity: {
+      memorySize: 320 * 1024,
+      getBlockSize: (fw) => parseMajor(fw) >= 2 ? 2 * 1024 : 4 * 1024
+    }
+  },
+  // Nano S Plus
+  { mask: 856686592, capacity: { memorySize: 1533 * 1024, getBlockSize: () => 32 } },
+  // Nano X
+  { mask: 855638016, capacity: { memorySize: 2 * 1024 * 1024, getBlockSize: () => 4 * 1024 } },
+  // Stax
+  { mask: 857735168, capacity: { memorySize: 1533 * 1024, getBlockSize: () => 32 } },
+  // Flex
+  { mask: 858783744, capacity: { memorySize: 1533 * 1024, getBlockSize: () => 32 } },
+  // Apex / Nano Gen5
+  { mask: 859832320, capacity: { memorySize: 1533 * 1024, getBlockSize: () => 32 } }
+];
+function getDeviceCapacity(targetId) {
+  const masked = targetId & 4294901760;
+  return DEVICE_CAPACITIES.find((d) => d.mask === masked)?.capacity;
+}
+function parseMajor(version) {
+  const m = /^(\d+)/.exec(version);
+  return m ? Number(m[1]) : 0;
+}
 var GetOsVersionDeviceAction = class {
   constructor(_deps) {
     this._deps = _deps;
@@ -3398,7 +3542,7 @@ var METHOD_PREFIX_TO_APP_NAME = {
   tron: "Tron"
 };
 var HARDWARE_ERROR_CODE_VALUES = new Set(
-  Object.values(import_hwk_adapter_core12.HardwareErrorCode).filter((value) => typeof value === "number")
+  Object.values(import_hwk_adapter_core13.HardwareErrorCode).filter((value) => typeof value === "number")
 );
 var BLE_CONNECT_SCAN_TIMEOUT_MS = 1500;
 async function defaultLedgerKitImporter(pkg) {
@@ -3577,7 +3721,7 @@ var LedgerConnectorBase = class {
             `Ledger BLE connect did not return within ${HANG_CEILING_MS / 6e4}min \u2014 DMK hang fallback.`
           );
           err._tag = ERROR_TAG.BlePairingTimeout;
-          err.code = import_hwk_adapter_core12.HardwareErrorCode.BlePairingTimeout;
+          err.code = import_hwk_adapter_core13.HardwareErrorCode.BlePairingTimeout;
           reject(err);
         }, HANG_CEILING_MS);
       });
@@ -3610,7 +3754,7 @@ var LedgerConnectorBase = class {
         "Ledger device is not currently advertising. Wake up and unlock the device, keep it nearby, then try again."
       );
       err._tag = ERROR_TAG.DeviceNotAdvertising;
-      err.code = import_hwk_adapter_core12.HardwareErrorCode.DeviceNotFound;
+      err.code = import_hwk_adapter_core13.HardwareErrorCode.DeviceNotFound;
       throw err;
     };
     const doConnect = async (path) => {
@@ -3689,7 +3833,7 @@ var LedgerConnectorBase = class {
           "Ledger Bluetooth pairing failed. Make sure the device is unlocked and nearby, then try again."
         );
         wrapped._tag = ERROR_TAG.BleGattBondingFailed;
-        wrapped.code = import_hwk_adapter_core12.HardwareErrorCode.BlePairingTimeout;
+        wrapped.code = import_hwk_adapter_core13.HardwareErrorCode.BlePairingTimeout;
         wrapped.originalError = err;
         throw wrapped;
       }
@@ -3810,7 +3954,7 @@ var LedgerConnectorBase = class {
     this._unwatchSessionState(sessionId);
     this._signerManager?.invalidate(sessionId);
     this._cancellers.get(sessionId)?.({
-      code: import_hwk_adapter_core12.HardwareErrorCode.DeviceDisconnected,
+      code: import_hwk_adapter_core13.HardwareErrorCode.DeviceDisconnected,
       tag: "DeviceDisconnected",
       message: "Device disconnected"
     });
@@ -3827,14 +3971,14 @@ var LedgerConnectorBase = class {
     } catch (err) {
       if (isAppStuckByApdu(err)) {
         throw Object.assign(new Error("Ledger app is unresponsive"), {
-          code: import_hwk_adapter_core12.HardwareErrorCode.DeviceAppStuck,
+          code: import_hwk_adapter_core13.HardwareErrorCode.DeviceAppStuck,
           _tag: ERROR_TAG.DeviceAppStuck,
           originalError: err
         });
       }
       if (isTransportStuck(err)) {
         throw Object.assign(new Error("Device communication interrupted, please retry"), {
-          code: import_hwk_adapter_core12.HardwareErrorCode.TransportError,
+          code: import_hwk_adapter_core13.HardwareErrorCode.TransportError,
           _tag: ERROR_TAG.DeviceTransportStuck,
           originalError: err
         });