@onekeyfe/hwk-adapter-core 1.2.3-alpha.1 → 1.2.3-alpha.3

package/dist/index.mjs

@@ -10,7 +10,7 @@ import {
   UI_REQUEST_TIMEOUT_TAG,
   UI_RESPONSE,
   UiRequestRegistry
-} from "./chunk-KCIK56B5.mjs";
+} from "./chunk-ELC6PLKH.mjs";
 import {
   HardwareErrorCode,
   ORPHAN_ELIGIBLE_ERROR_CODES,
@@ -19,7 +19,7 @@ import {
   defaultRecoveryForCode,
   isHwkRecoveryHint,
   operationMayHaveCompletedParams
-} from "./chunk-72KOSYTH.mjs";
+} from "./chunk-E3UPXUN5.mjs";
 
 // src/types/response.ts
 function success(payload) {
@@ -76,10 +76,6 @@ var DEVICE = {
   DISCONNECT: "device-disconnect",
   CHANGED: "device-changed",
   FEATURES: "features",
-  /** Trezor transport binding, emitted only after matching the expected firmware device_id. */
-  TREZOR_CONNECTION_VERIFIED: "device-trezor-connection-verified",
-  /** Ledger BLE address repair, emitted only after matching the stored chain fingerprint. */
-  LEDGER_CONNECTION_VERIFIED: "device-ledger-connection-verified",
   /**
    * Trezor-only. Emitted after a successful THP handshake that minted or
    * refreshed pairing credentials. The host should persist `credentials`
@@ -99,7 +95,7 @@ var SDK = {
   DEVICE_UNRESPONSIVE: "device-unresponsive",
   DEVICE_RECOVERED: "device-recovered",
   DEVICE_INTERACTION: "device-interaction",
-  INTERACTION_ENDED: "interaction-ended"
+  OPERATION_ENDED: "operation-ended"
 };
 
 // src/utils/DeviceJobQueue.ts
@@ -130,12 +126,13 @@ var DeviceJobQueue = class {
       abortController: ac,
       startedAt: Date.now()
     };
-    this._jobs.set(jobToken, { deviceId });
+    this._jobs.set(jobToken, activeJob);
     const next = prev.catch(() => {
     }).then(async () => {
       if (this._generation !== gen) {
         throw this._generationCancelReasons.get(gen) ?? new Error("Job cancelled: queue was cleared");
       }
+      if (ac.signal.aborted) throw ac.signal.reason;
       this._active = activeJob;
       try {
         return await job(ac.signal);
@@ -151,31 +148,27 @@ var DeviceJobQueue = class {
     });
     return next;
   }
-  /** Cancel the active job. If `deviceId` is given, only cancels when it matches. */
-  cancelActive(deviceId) {
+  /** Cancel the running job. `reason` becomes signal.reason. */
+  cancelActive(deviceId, reason) {
     if (!this._active) return false;
     if (deviceId && this._active.deviceId !== deviceId) return false;
-    this._active.abortController.abort(new Error("Manually cancelled"));
+    this._active.abortController.abort(reason ?? new Error("Cancelled"));
     return true;
   }
-  /** Force cancel the active job. `reason` becomes signal.reason. */
-  forceCancelActive(deviceId, reason) {
-    if (!this._active) return false;
-    if (deviceId && this._active.deviceId !== deviceId) return false;
-    this._active.abortController.abort(reason ?? new Error("Force cancelled for recovery"));
-    return true;
-  }
-  /** Cancel the active job (alias for callers that previously needed multi-device cancel). */
-  cancelAllActive(reason) {
-    if (!this._active) return;
-    this._active.abortController.abort(reason ?? new Error("Cancelled by cancelAllActive"));
-  }
   /** Cancel the active job and invalidate queued jobs that have not started. */
   cancelActiveAndPending(deviceId, reason) {
-    if (deviceId && this._active && this._active.deviceId !== deviceId) {
-      return false;
+    const cancelReason = reason ?? new Error("Cancelled by cancelActiveAndPending");
+    if (deviceId) {
+      let cancelled = false;
+      for (const job of this._jobs.values()) {
+        if (job.deviceId === deviceId) {
+          job.abortController.abort(cancelReason);
+          cancelled = true;
+        }
+      }
+      return cancelled;
     }
-    this.clear(reason ?? new Error("Cancelled by cancelActiveAndPending"));
+    this.clear(cancelReason);
     return true;
   }
   /** Get info about the currently active job, or null if idle. */
@@ -188,10 +181,6 @@ var DeviceJobQueue = class {
       startedAt: this._active.startedAt
     };
   }
-  /** True if any job is currently running. */
-  isBusy() {
-    return this._jobs.size > 0;
-  }
   clear(reason) {
     const cancelledGeneration = this._generation;
     this._generation++;
@@ -210,22 +199,28 @@ var DeviceJobQueue = class {
 
 // src/utils/hardwareRuntimeId.ts
 import { bytesToHex as bytesToHex2, randomBytes } from "@noble/hashes/utils";
-var HARDWARE_RUNTIME_ID_PREFIX = "hwk:runtime:v1";
+var HARDWARE_RUNTIME_ID_PREFIX = "hwk:runtime";
 var RANDOM_ID_BYTES = 16;
 var RANDOM_ID_PATTERN = /^[0-9a-f]{32}$/;
+var KINDS = /* @__PURE__ */ new Set([
+  "operation",
+  "search-target",
+  "link"
+]);
 var VENDORS = /* @__PURE__ */ new Set(["trezor", "ledger", "keystone"]);
-var CONNECTION_TYPES = /* @__PURE__ */ new Set(["usb", "ble", "qr"]);
-function createNonce() {
-  return bytesToHex2(randomBytes(RANDOM_ID_BYTES));
+function create(kind, vendor) {
+  return `${HARDWARE_RUNTIME_ID_PREFIX}:${kind}:${vendor}:${bytesToHex2(
+    randomBytes(RANDOM_ID_BYTES)
+  )}`;
 }
-function createHardwareInteractionId(vendor) {
-  return `${HARDWARE_RUNTIME_ID_PREFIX}:interaction:${vendor}:${createNonce()}`;
+function createHardwareOperationId(vendor) {
+  return create("operation", vendor);
 }
-function createHardwareSearchTargetId(params) {
-  return `${HARDWARE_RUNTIME_ID_PREFIX}:search-target:${params.vendor}:${params.connectionType}:${createNonce()}`;
+function createHardwareSearchTargetId(vendor) {
+  return create("search-target", vendor);
 }
-function createHardwareConnectorSessionId(params) {
-  return `${HARDWARE_RUNTIME_ID_PREFIX}:connector-session:${params.vendor}:${params.connectionType}:${createNonce()}`;
+function createHardwareLinkId(vendor) {
+  return create("link", vendor);
 }
 function hasHardwareRuntimeIdPrefix(value) {
   return typeof value === "string" && value.startsWith(`${HARDWARE_RUNTIME_ID_PREFIX}:`);
@@ -233,50 +228,32 @@ function hasHardwareRuntimeIdPrefix(value) {
 function parseHardwareRuntimeId(value) {
   if (!hasHardwareRuntimeIdPrefix(value)) return void 0;
   const parts = value.split(":");
-  const kind = parts[3];
-  const vendor = parts[4];
-  if (!VENDORS.has(vendor)) return void 0;
-  if (kind === "interaction" && parts.length === 6 && RANDOM_ID_PATTERN.test(parts[5])) {
-    return {
-      kind,
-      vendor,
-      nonce: parts[5]
-    };
-  }
-  const connectionType = parts[5];
-  if ((kind === "search-target" || kind === "connector-session") && parts.length === 7 && CONNECTION_TYPES.has(connectionType) && RANDOM_ID_PATTERN.test(parts[6])) {
-    return {
-      kind,
-      vendor,
-      connectionType,
-      nonce: parts[6]
-    };
+  if (parts.length !== 5) return void 0;
+  const [, , kind, vendor, nonce] = parts;
+  if (!KINDS.has(kind) || !VENDORS.has(vendor) || !RANDOM_ID_PATTERN.test(nonce)) {
+    return void 0;
   }
-  return void 0;
-}
-function isHardwareInteractionId(value) {
-  return parseHardwareRuntimeId(value)?.kind === "interaction";
+  return { kind, vendor };
 }
-function isHardwareSearchTargetId(value) {
-  return parseHardwareRuntimeId(value)?.kind === "search-target";
+function isHardwareOperationId(value) {
+  return parseHardwareRuntimeId(value)?.kind === "operation";
 }
 
-// src/utils/InteractionRegistry.ts
-var INTERACTION_DEFAULT_TTL_MS = 6e5;
-var InteractionRegistry = class {
+// src/utils/OperationRegistry.ts
+var OPERATION_DEFAULT_TTL_MS = 6e5;
+var OperationRegistry = class {
   constructor(options) {
     this._active = /* @__PURE__ */ new Map();
     this._ended = /* @__PURE__ */ new Map();
     this._vendor = options.vendor;
-    this._ttlMs = options.ttlMs ?? INTERACTION_DEFAULT_TTL_MS;
+    this._ttlMs = options.ttlMs ?? OPERATION_DEFAULT_TTL_MS;
     this._onEnded = options.onEnded;
   }
   create(params) {
     const now = Date.now();
-    const interactionId = createHardwareInteractionId(this._vendor);
-    const interaction = {
-      interactionId,
-      searchTargetId: params.searchTargetId,
+    const operationId = createHardwareOperationId(this._vendor);
+    const operation = {
+      operationId,
       connectId: params.connectId,
       device: params.device,
       connectionKeys: Array.from(
@@ -289,35 +266,35 @@ var InteractionRegistry = class {
       createdAt: now,
       lastActiveAt: now
     };
-    const timer = this._createTimer(interactionId);
-    this._active.set(interactionId, { ...interaction, timer, retainCount: 0 });
-    return interaction;
+    const timer = this._createTimer(operationId);
+    this._active.set(operationId, { ...operation, timer, retainCount: 0 });
+    return operation;
   }
-  resolve(interactionId) {
-    const active = this._active.get(interactionId);
+  resolve(operationId) {
+    const active = this._active.get(operationId);
     if (!active) {
-      const ended = this._ended.get(interactionId);
+      const ended = this._ended.get(operationId);
       if (ended) {
         throw createHwkError({
-          code: 10113 /* InteractionEnded */,
-          message: `Hardware interaction has ended (${ended.reason})`,
-          params: { interactionId, reason: ended.reason }
+          code: 10113 /* OperationEnded */,
+          message: `Hardware operation has ended (${ended.reason})`,
+          params: { operationId, reason: ended.reason }
         });
       }
       throw createHwkError({
-        code: 10112 /* InteractionNotFound */,
-        message: "Hardware interaction was not found",
-        params: { interactionId }
+        code: 10112 /* OperationNotFound */,
+        message: "Hardware operation was not found",
+        params: { operationId }
       });
     }
     if (active.timer) clearTimeout(active.timer);
     active.lastActiveAt = Date.now();
-    active.timer = active.retainCount === 0 ? this._createTimer(interactionId) : void 0;
+    active.timer = active.retainCount === 0 ? this._createTimer(operationId) : void 0;
     return active;
   }
-  /** Keep an interaction alive while one device job is actively using it. */
-  retain(interactionId) {
-    const active = this.resolve(interactionId);
+  /** Keep an operation alive while one device job is actively using it. */
+  retain(operationId) {
+    const active = this.resolve(operationId);
     if (active.timer) clearTimeout(active.timer);
     active.timer = void 0;
     active.retainCount += 1;
@@ -325,31 +302,31 @@ var InteractionRegistry = class {
     return () => {
       if (released) return;
       released = true;
-      const current = this._active.get(interactionId);
+      const current = this._active.get(operationId);
       if (!current) return;
       current.retainCount = Math.max(0, current.retainCount - 1);
       current.lastActiveAt = Date.now();
       if (current.retainCount === 0) {
-        current.timer = this._createTimer(interactionId);
+        current.timer = this._createTimer(operationId);
       }
     };
   }
   /** Return active or tombstoned binding data without refreshing its TTL. */
-  find(interactionId) {
-    return this._active.get(interactionId) ?? this._ended.get(interactionId)?.interaction;
+  find(operationId) {
+    return this._active.get(operationId) ?? this._ended.get(operationId)?.operation;
   }
   findActiveByConnectionKey(connectionKey) {
     if (!connectionKey) return void 0;
     return [...this._active.values()].find(
-      (interaction) => interaction.connectionKeys.includes(connectionKey)
+      (operation) => operation.connectionKeys.includes(connectionKey)
     );
   }
   /** Replace the live transport binding after the same target was reconnected. */
-  rebind(interactionId, params) {
-    const active = this._active.get(interactionId);
+  rebind(operationId, params) {
+    const active = this._active.get(operationId);
     if (!active) {
-      this.resolve(interactionId);
-      throw new Error("Unreachable interaction rebind");
+      this.resolve(operationId);
+      throw new Error("Unreachable operation rebind");
     }
     if (active.timer) clearTimeout(active.timer);
     active.connectId = params.connectId;
@@ -358,42 +335,42 @@ var InteractionRegistry = class {
       new Set([params.connectId, ...params.connectionKeys ?? []].filter(Boolean))
     );
     active.lastActiveAt = Date.now();
-    active.timer = active.retainCount === 0 ? this._createTimer(interactionId) : void 0;
+    active.timer = active.retainCount === 0 ? this._createTimer(operationId) : void 0;
     return active;
   }
-  end(interactionId, reason) {
-    const active = this._active.get(interactionId);
+  end(operationId, reason) {
+    const active = this._active.get(operationId);
     if (!active) return void 0;
     if (active.timer) clearTimeout(active.timer);
-    this._active.delete(interactionId);
+    this._active.delete(operationId);
     this._rememberEnded(active, reason);
     this._onEnded?.(active, reason);
     return active;
   }
-  endByConnectionKey(connectionKey, reason, exceptInteractionId) {
+  endByConnectionKey(connectionKey, reason, exceptOperationId) {
     if (!connectionKey) return;
-    for (const interaction of [...this._active.values()]) {
-      if (interaction.interactionId === exceptInteractionId) continue;
-      if (interaction.connectionKeys.includes(connectionKey)) {
-        this.end(interaction.interactionId, reason);
+    for (const operation of [...this._active.values()]) {
+      if (operation.operationId === exceptOperationId) continue;
+      if (operation.connectionKeys.includes(connectionKey)) {
+        this.end(operation.operationId, reason);
       }
     }
   }
-  endAll(reason, exceptInteractionId) {
-    for (const interactionId of [...this._active.keys()]) {
-      if (interactionId === exceptInteractionId) continue;
-      this.end(interactionId, reason);
+  endAll(reason, exceptOperationId) {
+    for (const operationId of [...this._active.keys()]) {
+      if (operationId === exceptOperationId) continue;
+      this.end(operationId, reason);
     }
   }
-  _createTimer(interactionId) {
+  _createTimer(operationId) {
     const timer = setTimeout(() => {
-      this.end(interactionId, "timeout");
+      this.end(operationId, "timeout");
     }, this._ttlMs);
     timer.unref?.();
     return timer;
   }
-  _rememberEnded(interaction, reason) {
-    this._ended.set(interaction.interactionId, { reason, interaction });
+  _rememberEnded(operation, reason) {
+    this._ended.set(operation.operationId, { reason, operation });
     if (this._ended.size <= 100) return;
     const oldest = this._ended.keys().next().value;
     if (oldest) this._ended.delete(oldest);
@@ -401,40 +378,40 @@ var InteractionRegistry = class {
 };
 
 // src/utils/hardwareOperationTarget.ts
-function resolveHardwareOperationTarget(positionalTargetId, commonInteractionId, expectedVendor) {
+function resolveHardwareOperationTarget(positionalTargetId, commonOperationId, expectedVendor) {
   const normalizedPositionalTargetId = positionalTargetId ?? void 0;
-  const normalizedCommonInteractionId = commonInteractionId || void 0;
-  const positionalInteractionId = isHardwareInteractionId(normalizedPositionalTargetId) ? normalizedPositionalTargetId : void 0;
+  const normalizedCommonOperationId = commonOperationId || void 0;
+  const positionalOperationId = isHardwareOperationId(normalizedPositionalTargetId) ? normalizedPositionalTargetId : void 0;
   const parsedPositionalTarget = parseHardwareRuntimeId(normalizedPositionalTargetId);
-  const parsedCommonInteraction = parseHardwareRuntimeId(normalizedCommonInteractionId);
+  const parsedCommonOperation = parseHardwareRuntimeId(normalizedCommonOperationId);
   if (normalizedPositionalTargetId && hasHardwareRuntimeIdPrefix(normalizedPositionalTargetId) && !parsedPositionalTarget) {
     return failure(10002 /* InvalidParams */, "Invalid hardware operation target id");
   }
-  if (parsedPositionalTarget?.kind === "connector-session") {
+  if (parsedPositionalTarget?.kind === "link") {
     return failure(
       10002 /* InvalidParams */,
-      "Hardware connector session id cannot be used as an operation target"
+      "Hardware transport link id cannot be used as an operation target"
     );
   }
-  if (normalizedCommonInteractionId && parsedCommonInteraction?.kind !== "interaction") {
-    return failure(10002 /* InvalidParams */, "Invalid hardware interaction id");
+  if (normalizedCommonOperationId && parsedCommonOperation?.kind !== "operation") {
+    return failure(10002 /* InvalidParams */, "Invalid hardware operation id");
   }
-  if (expectedVendor && (parsedPositionalTarget && parsedPositionalTarget.vendor !== expectedVendor || parsedCommonInteraction && parsedCommonInteraction.vendor !== expectedVendor)) {
+  if (expectedVendor && (parsedPositionalTarget && parsedPositionalTarget.vendor !== expectedVendor || parsedCommonOperation && parsedCommonOperation.vendor !== expectedVendor)) {
     return failure(
       10002 /* InvalidParams */,
-      `Hardware interaction does not belong to ${expectedVendor}`
+      `Hardware operation does not belong to ${expectedVendor}`
     );
   }
-  if (positionalInteractionId && normalizedCommonInteractionId && positionalInteractionId !== normalizedCommonInteractionId) {
-    return failure(10002 /* InvalidParams */, "Conflicting hardware interaction ids", {
-      positionalInteractionId,
-      commonInteractionId: normalizedCommonInteractionId
+  if (positionalOperationId && normalizedCommonOperationId && positionalOperationId !== normalizedCommonOperationId) {
+    return failure(10002 /* InvalidParams */, "Conflicting hardware operation ids", {
+      positionalOperationId,
+      commonOperationId: normalizedCommonOperationId
     });
   }
-  const interactionId = normalizedCommonInteractionId ?? positionalInteractionId;
+  const operationId = normalizedCommonOperationId ?? positionalOperationId;
   return success({
-    interactionId,
-    targetId: interactionId ?? normalizedPositionalTargetId
+    operationId,
+    targetId: operationId ?? normalizedPositionalTargetId
   });
 }
 
@@ -815,7 +792,16 @@ var TypedEventEmitter = class {
 // src/utils/requestSaveDeviceBinding.ts
 async function requestSaveDeviceBinding(emitter, registry, binding, signal) {
   const type = UI_REQUEST.REQUEST_SAVE_DEVICE_BINDING;
-  if (!emitter.listenerCount(type)) return false;
+  const declined = (reason) => {
+    emitter.emit(UI_REQUEST.DEVICE_BINDING_STATUS, {
+      type: UI_REQUEST.DEVICE_BINDING_STATUS,
+      payload: { selectionRequestId: binding.selectionRequestId, status: "failed" }
+    });
+    return { saved: false, reason };
+  };
+  if (!emitter.listenerCount(type)) {
+    return declined("skipped");
+  }
   if (signal?.aborted) throw signal.reason;
   const requestId = registry.createRequestId();
   const pending = registry.wait(type, { requestId });
@@ -827,16 +813,13 @@ async function requestSaveDeviceBinding(emitter, registry, binding, signal) {
     const response = await pending;
     if (signal?.aborted) throw signal.reason;
     if (response?.saved !== true) {
-      throw createHwkError({
-        code: 1e4 /* UnknownError */,
-        message: "Verified device binding could not be saved"
-      });
+      return declined(response?.reason ?? "skipped");
     }
     emitter.emit(UI_REQUEST.DEVICE_BINDING_STATUS, {
       type: UI_REQUEST.DEVICE_BINDING_STATUS,
       payload: { selectionRequestId: binding.selectionRequestId, status: "saved" }
     });
-    return true;
+    return { saved: true };
   } catch (error) {
     emitter.emit(UI_REQUEST.DEVICE_BINDING_STATUS, {
       type: UI_REQUEST.DEVICE_BINDING_STATUS,
@@ -845,7 +828,8 @@ async function requestSaveDeviceBinding(emitter, registry, binding, signal) {
         status: signal?.aborted ? "cancelled" : "failed"
       }
     });
-    throw error;
+    if (signal?.aborted) throw error;
+    return { saved: false, reason: "skipped" };
   } finally {
     signal?.removeEventListener("abort", cancel);
     registry.cancel(type, requestId);
@@ -859,6 +843,7 @@ async function requestBleDeviceSelection({
   request,
   scan,
   signal,
+  allowUsbFallback = false,
   pollIntervalMs = 1500
 }) {
   const type = UI_REQUEST.REQUEST_SELECT_DEVICE;
@@ -870,7 +855,8 @@ async function requestBleDeviceSelection({
     });
   }
   const requestId = registry.createRequestId();
-  let { devices } = request;
+  let devices = allowUsbFallback ? request.devices.filter((device) => device.connectionType === "ble") : request.devices;
+  const publishedDevices = /* @__PURE__ */ new Map();
   let stopped = false;
   let timer;
   let wake;
@@ -887,10 +873,13 @@ async function requestBleDeviceSelection({
   const cancel = () => registry.cancel(type, requestId);
   const reply = registry.wait(type, { requestId }).finally(stop);
   void reply.catch(() => void 0);
-  const publish = () => emitter.emit(type, {
-    type,
-    payload: { ...request, devices, requestId, scanning: true }
-  });
+  const publish = () => {
+    for (const device of devices) publishedDevices.set(device.connectId, device);
+    emitter.emit(type, {
+      type,
+      payload: { ...request, devices, requestId, scanning: true }
+    });
+  };
   signal.addEventListener("abort", cancel, { once: true });
   let polling;
   try {
@@ -900,17 +889,22 @@ async function requestBleDeviceSelection({
       while (!stopped) {
         const snapshot = await scan();
         if (stopped || signal.aborted) return;
+        const usbFallback = allowUsbFallback ? snapshot.find((device2) => device2.connectionType === "usb") : void 0;
+        if (usbFallback) return usbFallback;
         devices = snapshot;
         publish();
         if (stopped) return;
         await waitForNextScan();
       }
     })();
-    const selected = await Promise.race([reply, polling.then(() => reply)]);
+    const userSelection = reply.then((selected) => publishedDevices.get(selected.sdkConnectId));
+    const device = await Promise.race([
+      userSelection,
+      polling.then((usbFallback) => usbFallback ?? userSelection)
+    ]);
     stop();
     await polling;
     if (signal.aborted) throw signal.reason;
-    const device = devices.find((candidate) => candidate.connectId === selected.sdkConnectId);
     if (!device) {
       throw createHwkError({
         code: 10100 /* DeviceNotFound */,
@@ -1253,9 +1247,9 @@ export {
   HARDWARE_METHOD_CATALOG,
   HARDWARE_RUNTIME_ID_PREFIX,
   HardwareErrorCode,
-  INTERACTION_DEFAULT_TTL_MS,
-  InteractionRegistry,
+  OPERATION_DEFAULT_TTL_MS,
   ORPHAN_ELIGIBLE_ERROR_CODES,
+  OperationRegistry,
   SDK,
   TypedEventEmitter,
   UI_EVENT,
@@ -1273,8 +1267,8 @@ export {
   compareSemver,
   createBridgedConnector,
   createCombinedConnector,
-  createHardwareConnectorSessionId,
-  createHardwareInteractionId,
+  createHardwareLinkId,
+  createHardwareOperationId,
   createHardwareSearchTargetId,
   createHwkError,
   defaultOriginForCode,
@@ -1290,8 +1284,7 @@ export {
   hasHardwareRuntimeIdPrefix,
   hexToBytes,
   isAllNetworkMethodName,
-  isHardwareInteractionId,
-  isHardwareSearchTargetId,
+  isHardwareOperationId,
   isHwkRecoveryHint,
   isKnownNonTargetHardwareVendor,
   operationMayHaveCompletedParams,