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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (37) hide show
  1. package/dist/{chunk-H7BZ2C6J.js → chunk-BAGEFFFY.js} +13 -45
  2. package/dist/chunk-BAGEFFFY.js.map +1 -0
  3. package/dist/{chunk-T5HIQPNG.js → chunk-SZZF623R.js} +55 -155
  4. package/dist/chunk-SZZF623R.js.map +1 -0
  5. package/dist/{chunk-AYA6FQES.mjs → chunk-U63HTLGJ.mjs} +12 -44
  6. package/dist/chunk-U63HTLGJ.mjs.map +1 -0
  7. package/dist/{chunk-KTRQZ5AJ.mjs → chunk-YA4BWFTZ.mjs} +55 -155
  8. package/dist/chunk-YA4BWFTZ.mjs.map +1 -0
  9. package/dist/errors.d.mts +207 -1
  10. package/dist/errors.d.ts +207 -1
  11. package/dist/errors.js +2 -8
  12. package/dist/errors.js.map +1 -1
  13. package/dist/errors.mjs +3 -9
  14. package/dist/index.d.mts +104 -588
  15. package/dist/index.d.ts +104 -588
  16. package/dist/index.js +85 -662
  17. package/dist/index.js.map +1 -1
  18. package/dist/index.mjs +76 -653
  19. package/dist/index.mjs.map +1 -1
  20. package/dist/{ui-events-DdttFKj9.d.ts → ui-events-Cb7haAeE.d.mts} +3 -37
  21. package/dist/{ui-events-DdttFKj9.d.mts → ui-events-Cb7haAeE.d.ts} +3 -37
  22. package/dist/ui-events.d.mts +1 -1
  23. package/dist/ui-events.d.ts +1 -1
  24. package/dist/ui-events.js +2 -3
  25. package/dist/ui-events.js.map +1 -1
  26. package/dist/ui-events.mjs +1 -2
  27. package/package.json +2 -2
  28. package/dist/chunk-AYA6FQES.mjs.map +0 -1
  29. package/dist/chunk-DB4JOPZO.mjs +0 -74
  30. package/dist/chunk-DB4JOPZO.mjs.map +0 -1
  31. package/dist/chunk-H7BZ2C6J.js.map +0 -1
  32. package/dist/chunk-KTRQZ5AJ.mjs.map +0 -1
  33. package/dist/chunk-T5HIQPNG.js.map +0 -1
  34. package/dist/chunk-YLCHSNXO.js +0 -74
  35. package/dist/chunk-YLCHSNXO.js.map +0 -1
  36. package/dist/errors-BgJ4kzRx.d.mts +0 -276
  37. package/dist/errors-BgJ4kzRx.d.ts +0 -276
package/dist/index.mjs CHANGED
@@ -1,6 +1,9 @@
1
1
  import {
2
+ HardwareErrorCode,
3
+ ORPHAN_ELIGIBLE_ERROR_CODES,
4
+ createHwkError,
2
5
  enrichErrorMessage
3
- } from "./chunk-DB4JOPZO.mjs";
6
+ } from "./chunk-YA4BWFTZ.mjs";
4
7
  import {
5
8
  UI_EVENT,
6
9
  UI_REQUEST,
@@ -10,39 +13,19 @@ import {
10
13
  UI_REQUEST_TIMEOUT_TAG,
11
14
  UI_RESPONSE,
12
15
  UiRequestRegistry
13
- } from "./chunk-AYA6FQES.mjs";
14
- import {
15
- HardwareErrorCode,
16
- ORPHAN_ELIGIBLE_ERROR_CODES,
17
- createHwkError,
18
- defaultOriginForCode,
19
- defaultRecoveryForCode,
20
- isHwkRecoveryHint,
21
- operationMayHaveCompletedParams
22
- } from "./chunk-KTRQZ5AJ.mjs";
16
+ } from "./chunk-U63HTLGJ.mjs";
23
17
 
24
18
  // src/types/response.ts
25
19
  function success(payload) {
26
20
  return { success: true, payload };
27
21
  }
28
- function failure(code, error, params, origin, recovery) {
22
+ function failure(code, error, params) {
29
23
  return {
30
24
  success: false,
31
- payload: {
32
- error,
33
- code,
34
- ...origin !== void 0 ? { origin } : {},
35
- recovery: recovery ?? defaultRecoveryForCode(code),
36
- ...params ? { params } : {}
37
- }
25
+ payload: { error, code, ...params ? { params } : {} }
38
26
  };
39
27
  }
40
28
 
41
- // src/types/device.ts
42
- function resolveSearchTargetReusePolicy(device) {
43
- return device.capabilities?.persistentDeviceIdentity ? "reconnectable" : "current-discovery";
44
- }
45
-
46
29
  // src/types/fingerprint.ts
47
30
  import { sha256 } from "@noble/hashes/sha256";
48
31
  import { bytesToHex, utf8ToBytes } from "@noble/hashes/utils";
@@ -52,26 +35,11 @@ var CHAIN_FINGERPRINT_PATHS = {
52
35
  // Cointype 1 (testnet) is rejected by some Ledger BTC App configurations.
53
36
  btc: "m/44'/0'/0'",
54
37
  sol: "m/44'/501'/0'",
55
- tron: "m/44'/195'/0'/0/0",
56
- // Shielded UA (single Orchard receiver) derived from the transparent path.
57
- zcash: "m/44'/133'/0'/0/0"
38
+ tron: "m/44'/195'/0'/0/0"
58
39
  };
59
- function parseBip32MasterFingerprint(value) {
60
- if (typeof value !== "string") return void 0;
61
- const normalized = value.trim().toLowerCase();
62
- return /^[0-9a-f]{8}$/.test(normalized) ? normalized : void 0;
63
- }
64
- var MISSING_BIP32_MASTER_FINGERPRINT = "00000000";
65
- function parseWalletMasterFingerprint(value) {
66
- const fingerprint = parseBip32MasterFingerprint(value);
67
- return fingerprint === MISSING_BIP32_MASTER_FINGERPRINT ? void 0 : fingerprint;
68
- }
69
40
  function deriveDeviceFingerprint(value) {
70
41
  return bytesToHex(sha256(utf8ToBytes(value))).slice(0, 16);
71
42
  }
72
- function deriveWalletId(canonicalPublicMaterial) {
73
- return bytesToHex(sha256(utf8ToBytes(`onekey-hwk-wallet-id:v1:${canonicalPublicMaterial}`)));
74
- }
75
43
 
76
44
  // src/events/device.ts
77
45
  var DEVICE_EVENT = "DEVICE_EVENT";
@@ -98,8 +66,7 @@ var SDK = {
98
66
  DEVICE_STUCK: "device-stuck",
99
67
  DEVICE_UNRESPONSIVE: "device-unresponsive",
100
68
  DEVICE_RECOVERED: "device-recovered",
101
- DEVICE_INTERACTION: "device-interaction",
102
- OPERATION_ENDED: "operation-ended"
69
+ DEVICE_INTERACTION: "device-interaction"
103
70
  };
104
71
 
105
72
  // src/utils/DeviceJobQueue.ts
@@ -108,7 +75,6 @@ var DeviceJobQueue = class {
108
75
  this._tail = Promise.resolve();
109
76
  this._active = null;
110
77
  this._jobs = /* @__PURE__ */ new Map();
111
- this._cancelScopes = /* @__PURE__ */ new Map();
112
78
  /** Incremented on clear() so queued-but-not-yet-running jobs detect invalidation. */
113
79
  this._generation = 0;
114
80
  this._generationCancelReasons = /* @__PURE__ */ new Map();
@@ -131,13 +97,12 @@ var DeviceJobQueue = class {
131
97
  abortController: ac,
132
98
  startedAt: Date.now()
133
99
  };
134
- this._jobs.set(jobToken, activeJob);
100
+ this._jobs.set(jobToken, { deviceId });
135
101
  const next = prev.catch(() => {
136
102
  }).then(async () => {
137
103
  if (this._generation !== gen) {
138
104
  throw this._generationCancelReasons.get(gen) ?? new Error("Job cancelled: queue was cleared");
139
105
  }
140
- if (ac.signal.aborted) throw ac.signal.reason;
141
106
  this._active = activeJob;
142
107
  try {
143
108
  return await job(ac.signal);
@@ -153,52 +118,32 @@ var DeviceJobQueue = class {
153
118
  });
154
119
  return next;
155
120
  }
156
- /**
157
- * Holds a cancel across the gaps between a bundle's per-item jobs, when the queue is empty.
158
- * Callers must `release()` when the bundle ends.
159
- */
160
- createCancelScope(deviceId) {
161
- const scopeToken = {};
162
- const abortController = new AbortController();
163
- this._cancelScopes.set(scopeToken, { deviceId, abortController });
164
- return {
165
- signal: abortController.signal,
166
- release: () => {
167
- this._cancelScopes.delete(scopeToken);
168
- }
169
- };
121
+ /** Cancel the active job. If `deviceId` is given, only cancels when it matches. */
122
+ cancelActive(deviceId) {
123
+ if (!this._active) return false;
124
+ if (deviceId && this._active.deviceId !== deviceId) return false;
125
+ this._active.abortController.abort(new Error("Manually cancelled"));
126
+ return true;
170
127
  }
171
- /**
172
- * Cancels the running job only; `reason` becomes signal.reason. Adapters use
173
- * `cancelActiveAndPending`; this stays for a connector layer that stops only what is on the wire.
174
- */
175
- cancelActive(deviceId, reason) {
128
+ /** Force cancel the active job. `reason` becomes signal.reason. */
129
+ forceCancelActive(deviceId, reason) {
176
130
  if (!this._active) return false;
177
131
  if (deviceId && this._active.deviceId !== deviceId) return false;
178
- this._active.abortController.abort(reason ?? new Error("Cancelled"));
132
+ this._active.abortController.abort(reason ?? new Error("Force cancelled for recovery"));
179
133
  return true;
180
134
  }
181
- /**
182
- * Cancels the active job and unstarted queued jobs; returns whether anything was reached. Only
183
- * `undefined` means everything: an empty key matches nothing instead of tearing the queue down.
184
- */
135
+ /** Cancel the active job (alias for callers that previously needed multi-device cancel). */
136
+ cancelAllActive(reason) {
137
+ if (!this._active) return;
138
+ this._active.abortController.abort(reason ?? new Error("Cancelled by cancelAllActive"));
139
+ }
140
+ /** Cancel the active job and invalidate queued jobs that have not started. */
185
141
  cancelActiveAndPending(deviceId, reason) {
186
- const cancelReason = reason ?? new Error("Cancelled by cancelActiveAndPending");
187
- if (deviceId !== void 0) {
188
- let cancelled = false;
189
- const targets = [this._jobs, this._cancelScopes];
190
- for (const map of targets) {
191
- for (const target of map.values()) {
192
- if (target.deviceId !== deviceId) continue;
193
- target.abortController.abort(cancelReason);
194
- cancelled = true;
195
- }
196
- }
197
- return cancelled;
142
+ if (deviceId && this._active && this._active.deviceId !== deviceId) {
143
+ return false;
198
144
  }
199
- const reached = this._active !== null || this._jobs.size > 0 || this._cancelScopes.size > 0;
200
- this.clear(cancelReason);
201
- return reached;
145
+ this.clear(reason ?? new Error("Cancelled by cancelActiveAndPending"));
146
+ return true;
202
147
  }
203
148
  /** Get info about the currently active job, or null if idle. */
204
149
  getActiveJob(deviceId) {
@@ -210,6 +155,10 @@ var DeviceJobQueue = class {
210
155
  startedAt: this._active.startedAt
211
156
  };
212
157
  }
158
+ /** True if any job is currently running. */
159
+ isBusy() {
160
+ return this._jobs.size > 0;
161
+ }
213
162
  clear(reason) {
214
163
  const cancelledGeneration = this._generation;
215
164
  this._generation++;
@@ -223,219 +172,9 @@ var DeviceJobQueue = class {
223
172
  if (this._active) {
224
173
  this._active.abortController.abort(cancelReason);
225
174
  }
226
- for (const scope of this._cancelScopes.values()) {
227
- scope.abortController.abort(cancelReason);
228
- }
229
- }
230
- };
231
-
232
- // src/utils/hardwareRuntimeId.ts
233
- import { bytesToHex as bytesToHex2, randomBytes } from "@noble/hashes/utils";
234
- var HARDWARE_RUNTIME_ID_PREFIX = "hwk:runtime";
235
- var RANDOM_ID_BYTES = 16;
236
- var RANDOM_ID_PATTERN = /^[0-9a-f]{32}$/;
237
- var KINDS = /* @__PURE__ */ new Set([
238
- "operation",
239
- "search-target",
240
- "link"
241
- ]);
242
- var VENDORS = /* @__PURE__ */ new Set(["trezor", "ledger", "keystone"]);
243
- function create(kind, vendor) {
244
- return `${HARDWARE_RUNTIME_ID_PREFIX}:${kind}:${vendor}:${bytesToHex2(
245
- randomBytes(RANDOM_ID_BYTES)
246
- )}`;
247
- }
248
- function createHardwareOperationId(vendor) {
249
- return create("operation", vendor);
250
- }
251
- function createHardwareSearchTargetId(vendor) {
252
- return create("search-target", vendor);
253
- }
254
- function createHardwareLinkId(vendor) {
255
- return create("link", vendor);
256
- }
257
- function hasHardwareRuntimeIdPrefix(value) {
258
- return typeof value === "string" && value.startsWith(`${HARDWARE_RUNTIME_ID_PREFIX}:`);
259
- }
260
- function parseHardwareRuntimeId(value) {
261
- if (!hasHardwareRuntimeIdPrefix(value)) return void 0;
262
- const parts = value.split(":");
263
- if (parts.length !== 5) return void 0;
264
- const [, , kind, vendor, nonce] = parts;
265
- if (!KINDS.has(kind) || !VENDORS.has(vendor) || !RANDOM_ID_PATTERN.test(nonce)) {
266
- return void 0;
267
- }
268
- return { kind, vendor };
269
- }
270
- function isHardwareOperationId(value) {
271
- return parseHardwareRuntimeId(value)?.kind === "operation";
272
- }
273
-
274
- // src/utils/OperationRegistry.ts
275
- var OPERATION_DEFAULT_TTL_MS = 6e5;
276
- var uniqueKeys = (keys) => Array.from(new Set(keys.filter(Boolean)));
277
- var OperationRegistry = class {
278
- constructor(options) {
279
- this._active = /* @__PURE__ */ new Map();
280
- this._ended = /* @__PURE__ */ new Map();
281
- this._vendor = options.vendor;
282
- this._ttlMs = options.ttlMs ?? OPERATION_DEFAULT_TTL_MS;
283
- this._onEnded = options.onEnded;
284
- }
285
- create(params) {
286
- const now = Date.now();
287
- const operationId = createHardwareOperationId(this._vendor);
288
- const operation = {
289
- operationId,
290
- connectId: params.connectId,
291
- device: params.device,
292
- connectionType: params.connectionType,
293
- connectionKeys: uniqueKeys([
294
- params.searchTargetId,
295
- params.connectId,
296
- ...params.connectionKeys ?? []
297
- ]),
298
- createdAt: now,
299
- lastActiveAt: now
300
- };
301
- const timer = this._createTimer(operationId);
302
- this._active.set(operationId, { ...operation, timer, retainCount: 0 });
303
- return operation;
304
- }
305
- resolve(operationId) {
306
- const active = this._active.get(operationId);
307
- if (!active) {
308
- const ended = this._ended.get(operationId);
309
- if (ended) {
310
- throw createHwkError({
311
- code: 10113 /* OperationEnded */,
312
- message: `Hardware operation has ended (${ended.reason})`,
313
- params: { operationId, reason: ended.reason }
314
- });
315
- }
316
- throw createHwkError({
317
- code: 10112 /* OperationNotFound */,
318
- message: "Hardware operation was not found",
319
- params: { operationId }
320
- });
321
- }
322
- this._touch(active);
323
- return active;
324
- }
325
- /** Keep an operation alive while one device job is actively using it. */
326
- retain(operationId) {
327
- const active = this.resolve(operationId);
328
- active.retainCount += 1;
329
- this._touch(active);
330
- let released = false;
331
- return () => {
332
- if (released) return;
333
- released = true;
334
- const current = this._active.get(operationId);
335
- if (!current) return;
336
- current.retainCount = Math.max(0, current.retainCount - 1);
337
- this._touch(current);
338
- };
339
- }
340
- /** Return active or tombstoned binding data without refreshing its TTL. */
341
- find(operationId) {
342
- return this._active.get(operationId) ?? this._ended.get(operationId)?.operation;
343
- }
344
- findActiveByConnectionKey(connectionKey) {
345
- if (!connectionKey) return void 0;
346
- return [...this._active.values()].find(
347
- (operation) => operation.connectionKeys.includes(connectionKey)
348
- );
349
- }
350
- /** Replace the live transport binding after the same target was reconnected. */
351
- rebind(operationId, params) {
352
- const active = this.resolve(operationId);
353
- active.connectId = params.connectId;
354
- active.device = params.device;
355
- active.connectionType = params.connectionType;
356
- active.connectionKeys = uniqueKeys([params.connectId, ...params.connectionKeys ?? []]);
357
- this._touch(active);
358
- return active;
359
- }
360
- end(operationId, reason) {
361
- const active = this._active.get(operationId);
362
- if (!active) return void 0;
363
- if (active.timer) clearTimeout(active.timer);
364
- this._active.delete(operationId);
365
- this._rememberEnded(active, reason);
366
- this._onEnded?.(active, reason);
367
- return active;
368
- }
369
- endByConnectionKey(connectionKey, reason, exceptOperationId) {
370
- if (!connectionKey) return;
371
- for (const operation of [...this._active.values()]) {
372
- if (operation.operationId === exceptOperationId) continue;
373
- if (operation.connectionKeys.includes(connectionKey)) {
374
- this.end(operation.operationId, reason);
375
- }
376
- }
377
- }
378
- endAll(reason, exceptOperationId) {
379
- for (const operationId of [...this._active.keys()]) {
380
- if (operationId === exceptOperationId) continue;
381
- this.end(operationId, reason);
382
- }
383
- }
384
- _touch(active) {
385
- if (active.timer) clearTimeout(active.timer);
386
- active.lastActiveAt = Date.now();
387
- active.timer = active.retainCount === 0 ? this._createTimer(active.operationId) : void 0;
388
- }
389
- _createTimer(operationId) {
390
- const timer = setTimeout(() => {
391
- this.end(operationId, "timeout");
392
- }, this._ttlMs);
393
- timer.unref?.();
394
- return timer;
395
- }
396
- _rememberEnded(operation, reason) {
397
- this._ended.set(operation.operationId, { reason, operation });
398
- if (this._ended.size <= 100) return;
399
- const oldest = this._ended.keys().next().value;
400
- if (oldest) this._ended.delete(oldest);
401
175
  }
402
176
  };
403
177
 
404
- // src/utils/hardwareOperationTarget.ts
405
- function resolveHardwareOperationTarget(positionalTargetId, commonOperationId, expectedVendor) {
406
- const targetId = positionalTargetId ?? void 0;
407
- const commonId = commonOperationId || void 0;
408
- const parsedTarget = parseHardwareRuntimeId(targetId);
409
- const parsedCommon = parseHardwareRuntimeId(commonId);
410
- const positionalOperationId = parsedTarget?.kind === "operation" ? targetId : void 0;
411
- if (hasHardwareRuntimeIdPrefix(targetId) && !parsedTarget) {
412
- return failure(10002 /* InvalidParams */, "Invalid hardware operation target id");
413
- }
414
- if (parsedTarget?.kind === "link") {
415
- return failure(
416
- 10002 /* InvalidParams */,
417
- "Hardware transport link id cannot be used as an operation target"
418
- );
419
- }
420
- if (commonId && parsedCommon?.kind !== "operation") {
421
- return failure(10002 /* InvalidParams */, "Invalid hardware operation id");
422
- }
423
- if (expectedVendor && [parsedTarget, parsedCommon].some((parsed) => parsed && parsed.vendor !== expectedVendor)) {
424
- return failure(
425
- 10002 /* InvalidParams */,
426
- `Hardware operation does not belong to ${expectedVendor}`
427
- );
428
- }
429
- if (positionalOperationId && commonId && positionalOperationId !== commonId) {
430
- return failure(10002 /* InvalidParams */, "Conflicting hardware operation ids", {
431
- positionalOperationId,
432
- commonOperationId: commonId
433
- });
434
- }
435
- const operationId = commonId ?? positionalOperationId;
436
- return success({ operationId, targetId: operationId ?? targetId });
437
- }
438
-
439
178
  // src/types/connector.ts
440
179
  var EConnectorInteraction = /* @__PURE__ */ ((EConnectorInteraction2) => {
441
180
  EConnectorInteraction2["Searching"] = "searching";
@@ -451,7 +190,7 @@ function createBridgedConnector(vendor, connectionType, bridge) {
451
190
  return {
452
191
  connectionType,
453
192
  searchDevices: (options) => bridge.searchDevices({ vendor, options }),
454
- connect: (deviceId, options) => bridge.connect({ vendor, deviceId, ...options ? { options } : {} }),
193
+ connect: (deviceId) => bridge.connect({ vendor, deviceId }),
455
194
  disconnect: (sessionId) => bridge.disconnect({ vendor, sessionId }),
456
195
  call: (sessionId, method, callParams) => bridge.call({ vendor, sessionId, method, callParams }),
457
196
  cancel: (sessionId) => bridge.cancel({ vendor, sessionId }),
@@ -591,14 +330,11 @@ function createCombinedConnector(connectors) {
591
330
  if (mergeShared(data.credentials)) void broadcastCredentials();
592
331
  });
593
332
  }
594
- const onTransport = (child, transportType) => !transportType || child.connectionType === transportType;
595
333
  const searchDevices = async (options = {}) => {
596
- const selectedConnectors = connectors.map((child, index) => ({ child, index })).filter(({ child }) => onTransport(child, options.transportType));
597
- if (!selectedConnectors.length) return [];
598
334
  const perConnector = [];
599
- await new Promise((resolve, reject) => {
335
+ await new Promise((resolve) => {
600
336
  let finished = false;
601
- let remaining = selectedConnectors.length;
337
+ let remaining = connectors.length;
602
338
  let settleTimer;
603
339
  const finish = () => {
604
340
  if (finished) return;
@@ -606,20 +342,19 @@ function createCombinedConnector(connectors) {
606
342
  if (settleTimer) clearTimeout(settleTimer);
607
343
  resolve();
608
344
  };
609
- selectedConnectors.forEach(({ child, index }) => {
610
- void child.searchDevices(options.purpose ? { purpose: options.purpose } : void 0).then(
345
+ connectors.forEach((child, index) => {
346
+ void child.searchDevices().then(
611
347
  (devices) => devices.map((device) => ({
612
348
  ...device,
613
349
  connectionType: device.connectionType ?? child.connectionType
614
350
  }))
615
- ).catch((error) => {
616
- if (options.transportType) {
617
- finished = true;
618
- if (settleTimer) clearTimeout(settleTimer);
619
- reject(error);
620
- }
621
- return [];
622
- }).then((devices) => {
351
+ ).catch(
352
+ () => (
353
+ // A transport that can't scan (powered off, unauthorized, absent)
354
+ // must not fail the whole fused search.
355
+ []
356
+ )
357
+ ).then((devices) => {
623
358
  remaining -= 1;
624
359
  if (!finished) {
625
360
  perConnector.push({ index, devices });
@@ -636,9 +371,7 @@ function createCombinedConnector(connectors) {
636
371
  });
637
372
  });
638
373
  perConnector.sort((a, b) => a.index - b.index);
639
- for (const [id, owner] of deviceOwner) {
640
- if (onTransport(owner, options.transportType)) deviceOwner.delete(id);
641
- }
374
+ deviceOwner.clear();
642
375
  const merged = [];
643
376
  perConnector.forEach(({ index, devices }) => {
644
377
  for (const device of devices) {
@@ -648,12 +381,11 @@ function createCombinedConnector(connectors) {
648
381
  });
649
382
  return merged.sort((a, b) => rank(a) - rank(b));
650
383
  };
651
- const resolveOwner = async (deviceId, transportType) => {
652
- const cachedOwner = deviceId ? deviceOwner.get(deviceId) : void 0;
653
- if (cachedOwner && onTransport(cachedOwner, transportType)) {
654
- return { owner: cachedOwner, deviceId };
384
+ const resolveOwner = async (deviceId) => {
385
+ if (deviceId && deviceOwner.has(deviceId)) {
386
+ return { owner: deviceOwner.get(deviceId), deviceId };
655
387
  }
656
- const devices = await searchDevices({ waitForAll: Boolean(deviceId), transportType });
388
+ const devices = await searchDevices({ waitForAll: Boolean(deviceId) });
657
389
  if (deviceId) {
658
390
  const owner = deviceOwner.get(deviceId);
659
391
  if (!owner)
@@ -664,14 +396,13 @@ function createCombinedConnector(connectors) {
664
396
  if (!first) throw combinedDeviceNotFoundError("Combined connector: no devices found");
665
397
  return { owner: deviceOwner.get(first.connectId), deviceId: first.connectId };
666
398
  };
667
- const connectByExplicitId = async (deviceId, transportType) => {
399
+ const connectByExplicitId = async (deviceId) => {
668
400
  const cachedOwner = deviceOwner.get(deviceId);
669
- if (cachedOwner && onTransport(cachedOwner, transportType)) {
401
+ if (cachedOwner) {
670
402
  return { session: await cachedOwner.connect(deviceId), owner: cachedOwner };
671
403
  }
672
404
  let lastError;
673
405
  for (const child of connectors) {
674
- if (!onTransport(child, transportType)) continue;
675
406
  try {
676
407
  const session = await child.connect(deviceId);
677
408
  deviceOwner.set(deviceId, child);
@@ -693,15 +424,14 @@ function createCombinedConnector(connectors) {
693
424
  // Nominal value only — the per-device `connectionType` is authoritative
694
425
  // for a fused connector.
695
426
  connectionType: connectors[0].connectionType,
696
- availableTransports: [...new Set(connectors.map((child) => child.connectionType))],
697
- searchDevices: (options) => searchDevices(options),
698
- connect: async (deviceId, options) => {
427
+ searchDevices: (options) => searchDevices({ waitForAll: options?.waitForAll }),
428
+ connect: async (deviceId) => {
699
429
  let owner;
700
430
  let session;
701
431
  if (deviceId) {
702
- ({ session, owner } = await connectByExplicitId(deviceId, options?.transportType));
432
+ ({ session, owner } = await connectByExplicitId(deviceId));
703
433
  } else {
704
- const resolved = await resolveOwner(void 0, options?.transportType);
434
+ const resolved = await resolveOwner();
705
435
  owner = resolved.owner;
706
436
  session = await owner.connect(resolved.deviceId);
707
437
  }
@@ -723,11 +453,8 @@ function createCombinedConnector(connectors) {
723
453
  },
724
454
  cancel: async (sessionId) => {
725
455
  const owner = sessionOwner.get(sessionId);
726
- if (owner) {
727
- await owner.cancel(sessionId);
728
- return;
729
- }
730
- await Promise.all(connectors.map((child) => child.cancel(sessionId)));
456
+ if (!owner) return;
457
+ await owner.cancel(sessionId);
731
458
  },
732
459
  uiResponse: (response) => {
733
460
  for (const child of connectors) child.uiResponse(response);
@@ -810,147 +537,6 @@ var TypedEventEmitter = class {
810
537
  }
811
538
  };
812
539
 
813
- // src/utils/requestSaveDeviceBinding.ts
814
- async function requestSaveDeviceBinding(emitter, registry, binding, signal) {
815
- const type = UI_REQUEST.REQUEST_SAVE_DEVICE_BINDING;
816
- const emitStatus = (status) => emitter.emit(UI_REQUEST.DEVICE_BINDING_STATUS, {
817
- type: UI_REQUEST.DEVICE_BINDING_STATUS,
818
- payload: { selectionRequestId: binding.selectionRequestId, status }
819
- });
820
- const declined = (reason) => {
821
- emitStatus("failed");
822
- return { saved: false, reason };
823
- };
824
- if (!emitter.listenerCount(type)) {
825
- return declined("skipped");
826
- }
827
- if (signal?.aborted) throw signal.reason;
828
- const requestId = registry.createRequestId();
829
- const pending = registry.wait(type, { requestId, operationId: binding.operationId });
830
- void pending.catch(() => void 0);
831
- const cancel = () => registry.cancel(type, requestId);
832
- signal?.addEventListener("abort", cancel, { once: true });
833
- try {
834
- emitter.emit(type, { type, payload: { ...binding, requestId } });
835
- const response = await pending;
836
- if (signal?.aborted) throw signal.reason;
837
- if (response?.saved !== true) {
838
- return declined(response?.reason ?? "skipped");
839
- }
840
- emitStatus("saved");
841
- return { saved: true };
842
- } catch (error) {
843
- if (signal?.aborted) {
844
- emitStatus("cancelled");
845
- throw error;
846
- }
847
- return declined("skipped");
848
- } finally {
849
- signal?.removeEventListener("abort", cancel);
850
- registry.cancel(type, requestId);
851
- }
852
- }
853
-
854
- // src/utils/requestBleDeviceSelection.ts
855
- async function requestBleDeviceSelection({
856
- emitter,
857
- registry,
858
- request,
859
- scan,
860
- signal,
861
- allowUsbFallback = false,
862
- pollIntervalMs = 1500
863
- }) {
864
- const type = UI_REQUEST.REQUEST_SELECT_DEVICE;
865
- if (signal.aborted) throw signal.reason;
866
- if (!emitter.listenerCount(type)) {
867
- throw createHwkError({
868
- code: 10100 /* DeviceNotFound */,
869
- message: "Select a Bluetooth device before continuing"
870
- });
871
- }
872
- const requestId = registry.createRequestId();
873
- const { operationId } = request;
874
- let devices = allowUsbFallback ? request.devices.filter((device) => device.connectionType === "ble") : request.devices;
875
- const publishedDevices = /* @__PURE__ */ new Map();
876
- let stopped = false;
877
- let timer;
878
- let wake;
879
- const stop = () => {
880
- stopped = true;
881
- if (timer !== void 0) clearTimeout(timer);
882
- wake?.();
883
- };
884
- const waitForNextScan = () => new Promise((resolve) => {
885
- wake = resolve;
886
- timer = setTimeout(resolve, pollIntervalMs);
887
- if (stopped) resolve();
888
- });
889
- const cancel = () => registry.cancel(type, requestId);
890
- const reply = registry.wait(type, { requestId, operationId }).finally(stop);
891
- void reply.catch(() => void 0);
892
- const publish = () => {
893
- for (const device of devices) publishedDevices.set(device.connectId, device);
894
- emitter.emit(type, {
895
- type,
896
- payload: { ...request, devices, requestId, scanning: true }
897
- });
898
- };
899
- signal.addEventListener("abort", cancel, { once: true });
900
- const rescan = () => scan().catch((error) => {
901
- if (stopped || signal.aborted || devices.length) return void 0;
902
- throw error;
903
- });
904
- let polling;
905
- try {
906
- publish();
907
- polling = (async () => {
908
- await Promise.resolve();
909
- while (!stopped) {
910
- const snapshot = await rescan();
911
- if (stopped || signal.aborted) return;
912
- const usbFallback = allowUsbFallback ? snapshot?.find((device2) => device2.connectionType === "usb") : void 0;
913
- if (usbFallback) return usbFallback;
914
- if (snapshot) {
915
- devices = snapshot;
916
- publish();
917
- }
918
- await waitForNextScan();
919
- }
920
- })();
921
- const userSelection = reply.then((selected) => publishedDevices.get(selected.sdkConnectId));
922
- const device = await Promise.race([
923
- userSelection,
924
- polling.then((usbFallback) => usbFallback ?? userSelection)
925
- ]);
926
- stop();
927
- await polling;
928
- if (signal.aborted) throw signal.reason;
929
- if (!device) {
930
- throw createHwkError({
931
- code: 10100 /* DeviceNotFound */,
932
- message: "Selected Bluetooth device is no longer available"
933
- });
934
- }
935
- emitter.emit(UI_REQUEST.DEVICE_BINDING_STATUS, {
936
- type: UI_REQUEST.DEVICE_BINDING_STATUS,
937
- payload: { selectionRequestId: requestId, status: "verifying" }
938
- });
939
- return { device, requestId };
940
- } catch (error) {
941
- emitter.emit(UI_REQUEST.DEVICE_BINDING_STATUS, {
942
- type: UI_REQUEST.DEVICE_BINDING_STATUS,
943
- payload: { selectionRequestId: requestId, status: signal.aborted ? "cancelled" : "failed" }
944
- });
945
- throw error;
946
- } finally {
947
- stop();
948
- signal.removeEventListener("abort", cancel);
949
- registry.cancel(type, requestId);
950
- await polling?.catch(() => void 0);
951
- }
952
- }
953
-
954
540
  // src/utils/semver.ts
955
541
  function compareSemver(a, b) {
956
542
  const pa = a.split(".").map(Number);
@@ -978,86 +564,14 @@ function padHex64(hex) {
978
564
  function hexToBytes(hex) {
979
565
  return nobleHexToBytes(stripHex(hex));
980
566
  }
981
- function bytesToHex3(bytes) {
567
+ function bytesToHex2(bytes) {
982
568
  return nobleBytesToHex(bytes);
983
569
  }
984
570
 
985
- // src/utils/solanaOffchainMessage.ts
986
- var SOLANA_OFFCHAIN_SIGNING_DOMAIN = Uint8Array.of(
987
- 255,
988
- ...Array.from("solana offchain", (character) => character.charCodeAt(0))
989
- );
990
- var SOLANA_PUBLIC_KEY_LENGTH = 32;
991
- var MAX_SOLANA_OFFCHAIN_SIGNERS = 255;
992
- function compareBytes(a, b) {
993
- for (let index = 0; index < a.length; index += 1) {
994
- const difference = (a[index] ?? 0) - (b[index] ?? 0);
995
- if (difference !== 0) return difference;
996
- }
997
- return a.length - b.length;
998
- }
999
- function bytesEqual(a, b) {
1000
- return a.length === b.length && a.every((value, index) => value === b[index]);
1001
- }
1002
- function decodeUtf8Strict(bytes) {
1003
- return decodeURIComponent(
1004
- Array.from(bytes, (value) => `%${value.toString(16).padStart(2, "0")}`).join("")
1005
- );
1006
- }
1007
- function prepareSolanaOffchainMessageV1({
1008
- message,
1009
- requiredSigners
1010
- }) {
1011
- if (message.length === 0) {
1012
- throw new Error("Solana off-chain message cannot be empty");
1013
- }
1014
- if (requiredSigners.length === 0 || requiredSigners.length > MAX_SOLANA_OFFCHAIN_SIGNERS) {
1015
- throw new Error("Solana off-chain message requires between 1 and 255 signers");
1016
- }
1017
- let messageText;
1018
- try {
1019
- messageText = decodeUtf8Strict(message);
1020
- } catch {
1021
- throw new Error("Solana off-chain message must contain valid UTF-8");
1022
- }
1023
- const signerBytes = requiredSigners.map((signer, index) => {
1024
- let bytes;
1025
- try {
1026
- bytes = hexToBytes(signer);
1027
- } catch {
1028
- throw new Error(`Solana off-chain signer ${index} must be a hex public key`);
1029
- }
1030
- if (bytes.length !== SOLANA_PUBLIC_KEY_LENGTH) {
1031
- throw new Error(`Solana off-chain signer ${index} must be 32 bytes`);
1032
- }
1033
- return bytes;
1034
- });
1035
- signerBytes.sort(compareBytes);
1036
- if (signerBytes.some((bytes, index) => index > 0 && bytesEqual(signerBytes[index - 1], bytes))) {
1037
- throw new Error("Solana off-chain signers must be unique");
1038
- }
1039
- const signersOffset = SOLANA_OFFCHAIN_SIGNING_DOMAIN.length + 2;
1040
- const messageOffset = signersOffset + signerBytes.length * SOLANA_PUBLIC_KEY_LENGTH;
1041
- const serializedMessage = new Uint8Array(messageOffset + message.length);
1042
- serializedMessage.set(SOLANA_OFFCHAIN_SIGNING_DOMAIN);
1043
- serializedMessage.set([1, signerBytes.length], SOLANA_OFFCHAIN_SIGNING_DOMAIN.length);
1044
- signerBytes.forEach(
1045
- (signer, index) => serializedMessage.set(signer, signersOffset + index * SOLANA_PUBLIC_KEY_LENGTH)
1046
- );
1047
- serializedMessage.set(message, messageOffset);
1048
- return {
1049
- messageText,
1050
- requiredSigners: signerBytes.map(bytesToHex3),
1051
- serializedMessage
1052
- };
1053
- }
1054
-
1055
571
  // src/utils/deviceIdentity.ts
1056
572
  var ONEKEY_BLE_SERVICE_UUID = "00000001-0000-1000-8000-00805f9b34fb";
1057
573
  var TREZOR_BLE_SERVICE_UUID = "8c000001-a59b-4d58-a9ad-073df69fa1b1";
1058
574
  var LEDGER_USB_VENDOR_ID = 11415;
1059
- var KEYSTONE_USB_VENDOR_ID = 4617;
1060
- var KEYSTONE_USB_PRODUCT_ID = 12289;
1061
575
  var lower = (value) => value?.trim().toLowerCase() ?? "";
1062
576
  var hasServiceUuid = (input, uuid) => {
1063
577
  const expected = uuid.toLowerCase();
@@ -1080,11 +594,6 @@ function detectHardwareVendorFromDescriptor(input) {
1080
594
  if (typeof input.vendor === "number" && input.vendor === LEDGER_USB_VENDOR_ID || input.vendorId === LEDGER_USB_VENDOR_ID || manufacturerName.includes("ledger")) {
1081
595
  return "ledger";
1082
596
  }
1083
- const usbVendorId = typeof input.vendor === "number" ? input.vendor : input.vendorId;
1084
- const usbProductId = typeof input.product === "number" ? input.product : input.productId;
1085
- if (usbVendorId === KEYSTONE_USB_VENDOR_ID && usbProductId === KEYSTONE_USB_PRODUCT_ID || manufacturerName.includes("keystone")) {
1086
- return "keystone";
1087
- }
1088
597
  return void 0;
1089
598
  }
1090
599
  function isKnownNonTargetHardwareVendor(input, targetVendor) {
@@ -1108,62 +617,28 @@ async function batchCall(params, callFn, onProgress) {
1108
617
 
1109
618
  // src/utils/methodCatalog.ts
1110
619
  var HARDWARE_METHOD_CATALOG = {
1111
- evmGetAddress: { chain: "evm", allNetwork: true, replayAfterTransportFailure: "safe" },
1112
- evmSignTransaction: {
1113
- chain: "evm",
1114
- allNetwork: false,
1115
- replayAfterTransportFailure: "unsafe"
1116
- },
1117
- evmSignMessage: { chain: "evm", allNetwork: false, replayAfterTransportFailure: "unsafe" },
1118
- evmSignTypedData: { chain: "evm", allNetwork: false, replayAfterTransportFailure: "unsafe" },
1119
- btcGetAddress: { chain: "btc", allNetwork: true, replayAfterTransportFailure: "safe" },
1120
- btcGetPublicKey: { chain: "btc", allNetwork: true, replayAfterTransportFailure: "safe" },
1121
- btcSignTransaction: {
1122
- chain: "btc",
1123
- allNetwork: false,
1124
- replayAfterTransportFailure: "unsafe"
1125
- },
1126
- btcSignPsbt: { chain: "btc", allNetwork: false, replayAfterTransportFailure: "unsafe" },
1127
- btcSignMessage: { chain: "btc", allNetwork: false, replayAfterTransportFailure: "unsafe" },
1128
- btcGetMasterFingerprint: {
1129
- chain: "btc",
1130
- allNetwork: false,
1131
- replayAfterTransportFailure: "safe"
1132
- },
1133
- solGetAddress: { chain: "sol", allNetwork: true, replayAfterTransportFailure: "safe" },
1134
- solSignTransaction: {
1135
- chain: "sol",
1136
- allNetwork: false,
1137
- replayAfterTransportFailure: "unsafe"
1138
- },
1139
- solSignMessage: { chain: "sol", allNetwork: false, replayAfterTransportFailure: "unsafe" },
1140
- tronGetAddress: { chain: "tron", allNetwork: true, replayAfterTransportFailure: "safe" },
1141
- tronSignTransaction: {
1142
- chain: "tron",
1143
- allNetwork: false,
1144
- replayAfterTransportFailure: "unsafe"
1145
- },
1146
- tronSignMessage: { chain: "tron", allNetwork: false, replayAfterTransportFailure: "unsafe" },
1147
- zcashGetFullViewingKey: {
1148
- chain: "zcash",
1149
- allNetwork: false,
1150
- replayAfterTransportFailure: "safe"
1151
- },
1152
- zcashGetShieldedAddress: {
1153
- chain: "zcash",
1154
- allNetwork: false,
1155
- replayAfterTransportFailure: "safe"
1156
- }
620
+ evmGetAddress: { chain: "evm", allNetwork: true },
621
+ evmSignTransaction: { chain: "evm", allNetwork: false },
622
+ evmSignMessage: { chain: "evm", allNetwork: false },
623
+ evmSignTypedData: { chain: "evm", allNetwork: false },
624
+ btcGetAddress: { chain: "btc", allNetwork: true },
625
+ btcGetPublicKey: { chain: "btc", allNetwork: true },
626
+ btcSignTransaction: { chain: "btc", allNetwork: false },
627
+ btcSignPsbt: { chain: "btc", allNetwork: false },
628
+ btcSignMessage: { chain: "btc", allNetwork: false },
629
+ btcGetMasterFingerprint: { chain: "btc", allNetwork: false },
630
+ solGetAddress: { chain: "sol", allNetwork: true },
631
+ solSignTransaction: { chain: "sol", allNetwork: false },
632
+ solSignMessage: { chain: "sol", allNetwork: false },
633
+ tronGetAddress: { chain: "tron", allNetwork: true },
634
+ tronSignTransaction: { chain: "tron", allNetwork: false },
635
+ tronSignMessage: { chain: "tron", allNetwork: false }
1157
636
  };
1158
637
  var ALL_NETWORK_METHOD_NAMES = Object.entries(HARDWARE_METHOD_CATALOG).filter(([, metadata]) => metadata.allNetwork).map(([method]) => method);
1159
638
  var ALL_NETWORK_METHOD_SET = new Set(ALL_NETWORK_METHOD_NAMES);
1160
639
  function getHardwareMethodMetadata(method) {
1161
640
  return HARDWARE_METHOD_CATALOG[method];
1162
641
  }
1163
- var SAFE_NON_CHAIN_METHODS = /* @__PURE__ */ new Set(["getFeatures", "authenticateDevice"]);
1164
- function canReplayHardwareMethodAfterTransportFailure(method) {
1165
- return getHardwareMethodMetadata(method)?.replayAfterTransportFailure === "safe" || SAFE_NON_CHAIN_METHODS.has(method);
1166
- }
1167
642
  function isAllNetworkMethodName(method) {
1168
643
  return ALL_NETWORK_METHOD_SET.has(method);
1169
644
  }
@@ -1223,32 +698,6 @@ async function runAllNetworkGetAddress({
1223
698
  }
1224
699
  return success(responses);
1225
700
  }
1226
- function isUserRefusal(code) {
1227
- return code === 10005 /* UserAborted */ || code === 10001 /* UserRejected */ || code === 10401 /* PinCancelled */;
1228
- }
1229
- function isWalletSafetyFailure(code) {
1230
- const codes = [
1231
- 10106 /* DeviceMismatch */,
1232
- 10114 /* DeviceSearchMismatch */,
1233
- 10103 /* DeviceLocked */,
1234
- 10400 /* PinInvalid */,
1235
- 10404 /* PinMismatch */,
1236
- 10402 /* PassphraseRejected */,
1237
- 10403 /* PassphraseStateMismatch */,
1238
- 10405 /* PassphraseAlwaysOnDevice */
1239
- ];
1240
- return code !== void 0 && codes.includes(code);
1241
- }
1242
- function isConnectionLost(code) {
1243
- const codes = [
1244
- 10101 /* DeviceDisconnected */,
1245
- 10003 /* OperationTimeout */,
1246
- 10300 /* TransportError */,
1247
- 10113 /* OperationEnded */,
1248
- 10112 /* OperationNotFound */
1249
- ];
1250
- return code !== void 0 && codes.includes(code);
1251
- }
1252
701
  function buildUnsupportedMethodResponse(item) {
1253
702
  return {
1254
703
  ...item,
@@ -1282,12 +731,8 @@ export {
1282
731
  DeviceJobQueue,
1283
732
  EConnectorInteraction,
1284
733
  HARDWARE_METHOD_CATALOG,
1285
- HARDWARE_RUNTIME_ID_PREFIX,
1286
734
  HardwareErrorCode,
1287
- MISSING_BIP32_MASTER_FINGERPRINT,
1288
- OPERATION_DEFAULT_TTL_MS,
1289
735
  ORPHAN_ELIGIBLE_ERROR_CODES,
1290
- OperationRegistry,
1291
736
  SDK,
1292
737
  TypedEventEmitter,
1293
738
  UI_EVENT,
@@ -1300,45 +745,23 @@ export {
1300
745
  UiRequestRegistry,
1301
746
  batchCall,
1302
747
  buildUnsupportedMethodResponse,
1303
- bytesToHex3 as bytesToHex,
1304
- canReplayHardwareMethodAfterTransportFailure,
748
+ bytesToHex2 as bytesToHex,
1305
749
  compareSemver,
1306
750
  createBridgedConnector,
1307
751
  createCombinedConnector,
1308
- createHardwareLinkId,
1309
- createHardwareOperationId,
1310
- createHardwareSearchTargetId,
1311
752
  createHwkError,
1312
- defaultOriginForCode,
1313
- defaultRecoveryForCode,
1314
753
  deriveDeviceFingerprint,
1315
- deriveWalletId,
1316
754
  detectHardwareVendorFromDescriptor,
1317
755
  enrichErrorMessage,
1318
756
  ensure0x,
1319
757
  failure,
1320
758
  getAllNetworkMethodChain,
1321
759
  getHardwareMethodMetadata,
1322
- hasHardwareRuntimeIdPrefix,
1323
760
  hexToBytes,
1324
761
  isAllNetworkMethodName,
1325
- isConnectionLost,
1326
- isHardwareOperationId,
1327
- isHwkRecoveryHint,
1328
762
  isKnownNonTargetHardwareVendor,
1329
- isUserRefusal,
1330
- isWalletSafetyFailure,
1331
- operationMayHaveCompletedParams,
1332
763
  padHex64,
1333
- parseBip32MasterFingerprint,
1334
- parseHardwareRuntimeId,
1335
- parseWalletMasterFingerprint,
1336
- prepareSolanaOffchainMessageV1,
1337
764
  rehydrateConnectorError,
1338
- requestBleDeviceSelection,
1339
- requestSaveDeviceBinding,
1340
- resolveHardwareOperationTarget,
1341
- resolveSearchTargetReusePolicy,
1342
765
  runAllNetworkGetAddress,
1343
766
  serializeConnectorError,
1344
767
  stripHex,