@onekeyfe/hd-core 1.1.2-alpha.1 → 1.1.2-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 (62) hide show
  1. package/dist/api/BaseMethod.d.ts +2 -0
  2. package/dist/api/BaseMethod.d.ts.map +1 -1
  3. package/dist/api/allnetwork/AllNetworkGetAddress.d.ts +4 -28
  4. package/dist/api/allnetwork/AllNetworkGetAddress.d.ts.map +1 -1
  5. package/dist/api/allnetwork/AllNetworkGetAddressBase.d.ts +47 -0
  6. package/dist/api/allnetwork/AllNetworkGetAddressBase.d.ts.map +1 -0
  7. package/dist/api/allnetwork/AllNetworkGetAddressByLoop.d.ts +8 -0
  8. package/dist/api/allnetwork/AllNetworkGetAddressByLoop.d.ts.map +1 -0
  9. package/dist/api/btc/BTCGetPublicKey.d.ts.map +1 -1
  10. package/dist/api/cosmos/CosmosGetPublicKey.d.ts +1 -1
  11. package/dist/api/cosmos/CosmosGetPublicKey.d.ts.map +1 -1
  12. package/dist/api/device/DeviceUnlock.d.ts +0 -2
  13. package/dist/api/device/DeviceUnlock.d.ts.map +1 -1
  14. package/dist/api/evm/EVMGetPublicKey.d.ts +1 -0
  15. package/dist/api/evm/EVMGetPublicKey.d.ts.map +1 -1
  16. package/dist/api/index.d.ts +1 -0
  17. package/dist/api/index.d.ts.map +1 -1
  18. package/dist/core/RequestQueue.d.ts +4 -0
  19. package/dist/core/RequestQueue.d.ts.map +1 -1
  20. package/dist/core/index.d.ts +3 -2
  21. package/dist/core/index.d.ts.map +1 -1
  22. package/dist/device/Device.d.ts +4 -1
  23. package/dist/device/Device.d.ts.map +1 -1
  24. package/dist/device/DeviceCommands.d.ts +4 -4
  25. package/dist/events/call.d.ts +9 -0
  26. package/dist/events/call.d.ts.map +1 -1
  27. package/dist/events/core.d.ts +2 -2
  28. package/dist/events/core.d.ts.map +1 -1
  29. package/dist/events/iframe.d.ts +11 -1
  30. package/dist/events/iframe.d.ts.map +1 -1
  31. package/dist/index.d.ts +40 -12
  32. package/dist/index.d.ts.map +1 -1
  33. package/dist/index.js +390 -140
  34. package/dist/inject.d.ts +3 -0
  35. package/dist/inject.d.ts.map +1 -1
  36. package/dist/types/api/allNetworkGetAddress.d.ts +9 -2
  37. package/dist/types/api/allNetworkGetAddress.d.ts.map +1 -1
  38. package/dist/types/api/evmGetPublicKey.d.ts +1 -0
  39. package/dist/types/api/evmGetPublicKey.d.ts.map +1 -1
  40. package/dist/types/api/index.d.ts +2 -1
  41. package/dist/types/api/index.d.ts.map +1 -1
  42. package/package.json +4 -4
  43. package/src/api/BaseMethod.ts +3 -0
  44. package/src/api/allnetwork/AllNetworkGetAddress.ts +13 -407
  45. package/src/api/allnetwork/AllNetworkGetAddressBase.ts +473 -0
  46. package/src/api/allnetwork/AllNetworkGetAddressByLoop.ts +150 -0
  47. package/src/api/btc/BTCGetPublicKey.ts +13 -0
  48. package/src/api/cosmos/CosmosGetPublicKey.ts +1 -1
  49. package/src/api/device/DeviceUnlock.ts +1 -48
  50. package/src/api/evm/EVMGetPublicKey.ts +9 -3
  51. package/src/api/index.ts +1 -0
  52. package/src/core/RequestQueue.ts +26 -0
  53. package/src/core/index.ts +29 -3
  54. package/src/device/Device.ts +64 -0
  55. package/src/events/call.ts +10 -0
  56. package/src/events/core.ts +7 -1
  57. package/src/events/iframe.ts +12 -1
  58. package/src/index.ts +2 -1
  59. package/src/inject.ts +47 -0
  60. package/src/types/api/allNetworkGetAddress.ts +16 -2
  61. package/src/types/api/evmGetPublicKey.ts +1 -0
  62. package/src/types/api/index.ts +2 -1
package/dist/index.js CHANGED
@@ -26,6 +26,82 @@ var ByteBuffer__default = /*#__PURE__*/_interopDefaultLegacy(ByteBuffer);
26
26
  var BigNumber__default = /*#__PURE__*/_interopDefaultLegacy(BigNumber);
27
27
  var JSZip__default = /*#__PURE__*/_interopDefaultLegacy(JSZip);
28
28
 
29
+ /******************************************************************************
30
+ Copyright (c) Microsoft Corporation.
31
+
32
+ Permission to use, copy, modify, and/or distribute this software for any
33
+ purpose with or without fee is hereby granted.
34
+
35
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
36
+ REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
37
+ AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
38
+ INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
39
+ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
40
+ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
41
+ PERFORMANCE OF THIS SOFTWARE.
42
+ ***************************************************************************** */
43
+
44
+ function __rest(s, e) {
45
+ var t = {};
46
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
47
+ t[p] = s[p];
48
+ if (s != null && typeof Object.getOwnPropertySymbols === "function")
49
+ for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
50
+ if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
51
+ t[p[i]] = s[p[i]];
52
+ }
53
+ return t;
54
+ }
55
+
56
+ function __awaiter(thisArg, _arguments, P, generator) {
57
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
58
+ return new (P || (P = Promise))(function (resolve, reject) {
59
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
60
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
61
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
62
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
63
+ });
64
+ }
65
+
66
+ function __values(o) {
67
+ var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
68
+ if (m) return m.call(o);
69
+ if (o && typeof o.length === "number") return {
70
+ next: function () {
71
+ if (o && i >= o.length) o = void 0;
72
+ return { value: o && o[i++], done: !o };
73
+ }
74
+ };
75
+ throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
76
+ }
77
+
78
+ function __asyncValues(o) {
79
+ if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
80
+ var m = o[Symbol.asyncIterator], i;
81
+ return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
82
+ function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
83
+ function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
84
+ }
85
+
86
+ typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
87
+ var e = new Error(message);
88
+ return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
89
+ };
90
+
91
+ const callbackManager = new Map();
92
+ const generateCallbackId = () => `callback_${Date.now()}_${Math.random().toString(36).substring(2, 11)}`;
93
+ const registerCallback = (id, callback) => {
94
+ callbackManager.set(id, callback);
95
+ };
96
+ const executeCallback = (id, ...args) => {
97
+ const callback = callbackManager.get(id);
98
+ if (callback) {
99
+ callback(...args);
100
+ }
101
+ };
102
+ const cleanupCallback = (id) => {
103
+ callbackManager.delete(id);
104
+ };
29
105
  const inject = ({ call, cancel, dispose, eventEmitter, init, updateSettings, switchTransport, uiResponse, }) => {
30
106
  const api = Object.assign({ on: (type, fn) => {
31
107
  eventEmitter.on(type, fn);
@@ -77,6 +153,20 @@ const createCoreApi = (call) => ({
77
153
  getNextU2FCounter: (connectId, params) => call(Object.assign(Object.assign({}, params), { connectId, method: 'getNextU2FCounter' })),
78
154
  setU2FCounter: (connectId, params) => call(Object.assign(Object.assign({}, params), { connectId, method: 'setU2FCounter' })),
79
155
  allNetworkGetAddress: (connectId, deviceId, params) => call(Object.assign(Object.assign({}, params), { connectId, deviceId, method: 'allNetworkGetAddress' })),
156
+ allNetworkGetAddressByLoop: (connectId, deviceId, params) => {
157
+ const { onLoopItemResponse, onAllItemsResponse } = params, restParams = __rest(params, ["onLoopItemResponse", "onAllItemsResponse"]);
158
+ const callbackId = generateCallbackId();
159
+ registerCallback(callbackId, onLoopItemResponse);
160
+ const callbackIdFinish = generateCallbackId();
161
+ registerCallback(callbackIdFinish, (data) => {
162
+ onAllItemsResponse === null || onAllItemsResponse === void 0 ? void 0 : onAllItemsResponse(data);
163
+ cleanupCallback(callbackIdFinish);
164
+ cleanupCallback(callbackId);
165
+ });
166
+ return call(Object.assign(Object.assign({}, restParams), { connectId,
167
+ deviceId, method: 'allNetworkGetAddressByLoop', callbackId,
168
+ callbackIdFinish }));
169
+ },
80
170
  evmGetAddress: (connectId, deviceId, params) => call(Object.assign(Object.assign({}, params), { connectId, deviceId, method: 'evmGetAddress' })),
81
171
  evmGetPublicKey: (connectId, deviceId, params) => call(Object.assign(Object.assign({}, params), { connectId, deviceId, method: 'evmGetPublicKey' })),
82
172
  evmSignMessage: (connectId, deviceId, params) => call(Object.assign(Object.assign({}, params), { connectId, deviceId, method: 'evmSignMessage' })),
@@ -684,68 +774,6 @@ const topLevelInject = () => {
684
774
  return api;
685
775
  };
686
776
 
687
- /******************************************************************************
688
- Copyright (c) Microsoft Corporation.
689
-
690
- Permission to use, copy, modify, and/or distribute this software for any
691
- purpose with or without fee is hereby granted.
692
-
693
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
694
- REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
695
- AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
696
- INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
697
- LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
698
- OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
699
- PERFORMANCE OF THIS SOFTWARE.
700
- ***************************************************************************** */
701
-
702
- function __rest(s, e) {
703
- var t = {};
704
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
705
- t[p] = s[p];
706
- if (s != null && typeof Object.getOwnPropertySymbols === "function")
707
- for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
708
- if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
709
- t[p[i]] = s[p[i]];
710
- }
711
- return t;
712
- }
713
-
714
- function __awaiter(thisArg, _arguments, P, generator) {
715
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
716
- return new (P || (P = Promise))(function (resolve, reject) {
717
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
718
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
719
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
720
- step((generator = generator.apply(thisArg, _arguments || [])).next());
721
- });
722
- }
723
-
724
- function __values(o) {
725
- var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
726
- if (m) return m.call(o);
727
- if (o && typeof o.length === "number") return {
728
- next: function () {
729
- if (o && i >= o.length) o = void 0;
730
- return { value: o && o[i++], done: !o };
731
- }
732
- };
733
- throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
734
- }
735
-
736
- function __asyncValues(o) {
737
- if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
738
- var m = o[Symbol.asyncIterator], i;
739
- return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
740
- function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
741
- function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
742
- }
743
-
744
- typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
745
- var e = new Error(message);
746
- return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
747
- };
748
-
749
777
  const LOG_EVENT = 'LOG_EVENT';
750
778
  const LOG = {
751
779
  OUTPUT: 'log-output',
@@ -25798,6 +25826,7 @@ const IFRAME = {
25798
25826
  CALL: 'iframe-call',
25799
25827
  CANCEL: 'iframe-cancel',
25800
25828
  SWITCH_TRANSPORT: 'iframe-switch-transport',
25829
+ CALLBACK: 'iframe-callback',
25801
25830
  };
25802
25831
  const createIFrameMessage = (type, payload) => ({
25803
25832
  event: UI_EVENT,
@@ -26691,6 +26720,15 @@ class Device extends events.exports {
26691
26720
  const env = DataManager.getSettings('env');
26692
26721
  if ((this.isUsedHere() && !this.keepSession && this.mainId) ||
26693
26722
  (this.mainId && DataManager.isBleConnect(env))) {
26723
+ if (this.pendingCallbackPromise) {
26724
+ try {
26725
+ Log$a.debug('Waiting for callback tasks to complete before releasing device (in release method)');
26726
+ yield this.pendingCallbackPromise.promise;
26727
+ }
26728
+ catch (error) {
26729
+ Log$a.error('Error waiting for callback tasks in release method:', error);
26730
+ }
26731
+ }
26694
26732
  if (this.commands) {
26695
26733
  this.commands.dispose(false);
26696
26734
  if (this.commands.callPromise) {
@@ -27071,6 +27109,44 @@ class Device extends events.exports {
27071
27109
  return res.message;
27072
27110
  });
27073
27111
  }
27112
+ supportUnlockVersionRange() {
27113
+ return {
27114
+ pro: {
27115
+ min: '4.15.0',
27116
+ },
27117
+ };
27118
+ }
27119
+ unlockDevice() {
27120
+ var _a;
27121
+ return __awaiter(this, void 0, void 0, function* () {
27122
+ const firmwareVersion = (_a = getDeviceFirmwareVersion(this.features)) === null || _a === void 0 ? void 0 : _a.join('.');
27123
+ const versionRange = getMethodVersionRange(this.features, type => this.supportUnlockVersionRange()[type]);
27124
+ if (versionRange && semver__default["default"].gte(firmwareVersion, versionRange.min)) {
27125
+ const res = yield this.commands.typedCall('UnLockDevice', 'UnLockDeviceResponse');
27126
+ if (this.features) {
27127
+ this.features.unlocked = res.message.unlocked == null ? null : res.message.unlocked;
27128
+ this.features.unlocked_attach_pin =
27129
+ res.message.unlocked_attach_pin == null ? undefined : res.message.unlocked_attach_pin;
27130
+ this.features.passphrase_protection =
27131
+ res.message.passphrase_protection == null ? null : res.message.passphrase_protection;
27132
+ return Promise.resolve(this.features);
27133
+ }
27134
+ const featuresRes = yield this.commands.typedCall('GetFeatures', 'Features');
27135
+ return Promise.resolve(featuresRes.message);
27136
+ }
27137
+ const { type } = yield this.commands.typedCall('GetAddress', 'Address', {
27138
+ address_n: [toHardened(44), toHardened(1), toHardened(0), 0, 0],
27139
+ coin_name: 'Testnet',
27140
+ script_type: 'SPENDADDRESS',
27141
+ show_display: false,
27142
+ });
27143
+ if (type === 'CallMethodError') {
27144
+ throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'unlock device error');
27145
+ }
27146
+ const res = yield this.commands.typedCall('GetFeatures', 'Features');
27147
+ return Promise.resolve(res.message);
27148
+ });
27149
+ }
27074
27150
  checkPassphraseStateSafety(passphraseState, useEmptyPassphrase, skipPassphraseCheck) {
27075
27151
  return __awaiter(this, void 0, void 0, function* () {
27076
27152
  if (!this.features)
@@ -28643,42 +28719,9 @@ class DeviceUnlock extends BaseMethod {
28643
28719
  init() {
28644
28720
  this.useDevicePassphraseState = false;
28645
28721
  }
28646
- supportUnlockVersionRange() {
28647
- return {
28648
- pro: {
28649
- min: '4.15.0',
28650
- },
28651
- };
28652
- }
28653
28722
  run() {
28654
- var _a;
28655
28723
  return __awaiter(this, void 0, void 0, function* () {
28656
- const firmwareVersion = (_a = getDeviceFirmwareVersion(this.device.features)) === null || _a === void 0 ? void 0 : _a.join('.');
28657
- const versionRange = getMethodVersionRange(this.device.features, type => this.supportUnlockVersionRange()[type]);
28658
- if (versionRange && semver__default["default"].gte(firmwareVersion, versionRange.min)) {
28659
- const res = yield this.device.commands.typedCall('UnLockDevice', 'UnLockDeviceResponse');
28660
- if (this.device.features) {
28661
- this.device.features.unlocked = res.message.unlocked == null ? null : res.message.unlocked;
28662
- this.device.features.unlocked_attach_pin =
28663
- res.message.unlocked_attach_pin == null ? undefined : res.message.unlocked_attach_pin;
28664
- this.device.features.passphrase_protection =
28665
- res.message.passphrase_protection == null ? null : res.message.passphrase_protection;
28666
- return Promise.resolve(this.device.features);
28667
- }
28668
- const featuresRes = yield this.device.commands.typedCall('GetFeatures', 'Features');
28669
- return Promise.resolve(featuresRes.message);
28670
- }
28671
- const { type } = yield this.device.commands.typedCall('GetAddress', 'Address', {
28672
- address_n: [toHardened(44), toHardened(1), toHardened(0), 0, 0],
28673
- coin_name: 'Testnet',
28674
- script_type: 'SPENDADDRESS',
28675
- show_display: false,
28676
- });
28677
- if (type === 'CallMethodError') {
28678
- throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Get the passphrase state error');
28679
- }
28680
- const res = yield this.device.commands.typedCall('GetFeatures', 'Features');
28681
- return Promise.resolve(res.message);
28724
+ return this.device.unlockDevice();
28682
28725
  });
28683
28726
  }
28684
28727
  }
@@ -30041,12 +30084,18 @@ const networkConfigMap = {
30041
30084
  methodName: 'neoGetAddress',
30042
30085
  },
30043
30086
  };
30044
- class AllNetworkGetAddress extends BaseMethod {
30087
+ class AllNetworkGetAddressBase extends BaseMethod {
30088
+ constructor() {
30089
+ super(...arguments);
30090
+ this.abortController = null;
30091
+ }
30045
30092
  init() {
30093
+ var _a, _b;
30046
30094
  this.checkDeviceId = true;
30047
30095
  this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
30096
+ this.useDevicePassphraseState = false;
30048
30097
  validateParams(this.payload, [{ name: 'bundle', type: 'array' }]);
30049
- this.payload.bundle.forEach((batch) => {
30098
+ (_b = (_a = this.payload) === null || _a === void 0 ? void 0 : _a.bundle) === null || _b === void 0 ? void 0 : _b.forEach((batch) => {
30050
30099
  validateParams(batch, [
30051
30100
  { name: 'path', required: true },
30052
30101
  { name: 'network', type: 'string', required: true },
@@ -30086,6 +30135,23 @@ class AllNetworkGetAddress extends BaseMethod {
30086
30135
  try {
30087
30136
  method.init();
30088
30137
  (_a = method.setDevice) === null || _a === void 0 ? void 0 : _a.call(method, this.device);
30138
+ method.context = this.context;
30139
+ const onSignalAbort = () => {
30140
+ var _a;
30141
+ (_a = this.abortController) === null || _a === void 0 ? void 0 : _a.abort(hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]);
30142
+ };
30143
+ const _onDeviceButtonHandler = (...[device, request]) => {
30144
+ if (request.code === 'ButtonRequest_PinEntry' ||
30145
+ request.code === 'ButtonRequest_AttachPin') {
30146
+ onSignalAbort();
30147
+ }
30148
+ else {
30149
+ onDeviceButtonHandler(device, request);
30150
+ }
30151
+ };
30152
+ this.device.on(DEVICE.BUTTON, _onDeviceButtonHandler);
30153
+ this.device.on(DEVICE.PIN, onSignalAbort);
30154
+ this.device.on(DEVICE.PASSPHRASE, onSignalAbort);
30089
30155
  preCheckDeviceSupport(this.device, method);
30090
30156
  const response = yield method.run();
30091
30157
  if (!Array.isArray(response) || response.length === 0) {
@@ -30112,45 +30178,21 @@ class AllNetworkGetAddress extends BaseMethod {
30112
30178
  });
30113
30179
  }
30114
30180
  run() {
30115
- var _a, _b;
30181
+ var _a;
30116
30182
  return __awaiter(this, void 0, void 0, function* () {
30117
- const responses = [];
30118
- const resultMap = {};
30119
- const { bundle } = this.payload;
30120
- const methodGroups = bundle
30121
- .map((param, index) => this.generateMethodName({
30122
- network: param.network,
30123
- payload: param,
30124
- originalIndex: index,
30125
- }))
30126
- .reduce((acc, cur) => {
30127
- if (!acc[cur.methodName]) {
30128
- acc[cur.methodName] = [];
30129
- }
30130
- acc[cur.methodName].push(cur);
30131
- return acc;
30132
- }, {});
30133
- let i = 0;
30134
- for (const [methodName, params] of Object.entries(methodGroups)) {
30135
- const methodParams = {
30136
- bundle: params.map(param => (Object.assign({}, param.params))),
30137
- };
30138
- const response = yield this.callMethod(methodName, methodParams);
30139
- for (let i = 0; i < params.length; i++) {
30140
- const { _originRequestParams, _originalIndex } = params[i];
30141
- const responseKey = `${_originalIndex}`;
30142
- resultMap[responseKey] = Object.assign(Object.assign({}, _originRequestParams), response[i]);
30183
+ if (!((_a = this.device.features) === null || _a === void 0 ? void 0 : _a.unlocked)) {
30184
+ const features = yield this.device.unlockDevice();
30185
+ if (features.passphrase_protection) {
30186
+ yield this.device.checkPassphraseStateSafety();
30143
30187
  }
30144
- if (((_b = (_a = this.payload) === null || _a === void 0 ? void 0 : _a.bundle) === null || _b === void 0 ? void 0 : _b.length) > 1) {
30145
- const progress = Math.round(((i + 1) / this.payload.bundle.length) * 100);
30146
- this.postMessage(createUiMessage(UI_REQUEST.DEVICE_PROGRESS, { progress }));
30147
- }
30148
- i++;
30149
- }
30150
- for (let i = 0; i < bundle.length; i++) {
30151
- responses.push(resultMap[i]);
30152
30188
  }
30153
- return Promise.resolve(responses);
30189
+ this.abortController = new AbortController();
30190
+ return Promise.resolve(this.getAllNetworkAddress()).catch(e => {
30191
+ if (e instanceof hdShared.HardwareError && e.errorCode === hdShared.HardwareErrorCode.RepeatUnlocking) {
30192
+ throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RepeatUnlocking, e.message);
30193
+ }
30194
+ throw e;
30195
+ });
30154
30196
  });
30155
30197
  }
30156
30198
  }
@@ -30171,10 +30213,7 @@ function handleSkippableHardwareError(e, device, method) {
30171
30213
  let error;
30172
30214
  if (e instanceof hdShared.HardwareError && e.errorCode !== hdShared.HardwareErrorCode.RuntimeError) {
30173
30215
  const { errorCode } = e;
30174
- if (errorCode === hdShared.HardwareErrorCode.CallMethodInvalidParameter) {
30175
- error = e;
30176
- }
30177
- else if (errorCode === hdShared.HardwareErrorCode.CallMethodNeedUpgradeFirmware) {
30216
+ if (errorCode === hdShared.HardwareErrorCode.CallMethodNeedUpgradeFirmware) {
30178
30217
  error = e;
30179
30218
  }
30180
30219
  else if (errorCode === hdShared.HardwareErrorCode.DeviceNotSupportMethod) {
@@ -30200,6 +30239,162 @@ function handleSkippableHardwareError(e, device, method) {
30200
30239
  return error;
30201
30240
  }
30202
30241
 
30242
+ class AllNetworkGetAddress extends AllNetworkGetAddressBase {
30243
+ getAllNetworkAddress() {
30244
+ var _a, _b, _c, _d;
30245
+ return __awaiter(this, void 0, void 0, function* () {
30246
+ const responses = [];
30247
+ const resultMap = {};
30248
+ const { bundle } = this.payload;
30249
+ const methodGroups = bundle
30250
+ .map((param, index) => this.generateMethodName({
30251
+ network: param.network,
30252
+ payload: param,
30253
+ originalIndex: index,
30254
+ }))
30255
+ .reduce((acc, cur) => {
30256
+ if (!acc[cur.methodName]) {
30257
+ acc[cur.methodName] = [];
30258
+ }
30259
+ acc[cur.methodName].push(cur);
30260
+ return acc;
30261
+ }, {});
30262
+ let i = 0;
30263
+ for (const [methodName, params] of Object.entries(methodGroups)) {
30264
+ const methodParams = {
30265
+ bundle: params.map(param => (Object.assign({}, param.params))),
30266
+ };
30267
+ if ((_a = this.abortController) === null || _a === void 0 ? void 0 : _a.signal.aborted) {
30268
+ throw new Error(hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]);
30269
+ }
30270
+ const response = yield this.callMethod(methodName, methodParams);
30271
+ if ((_b = this.abortController) === null || _b === void 0 ? void 0 : _b.signal.aborted) {
30272
+ throw new Error(hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]);
30273
+ }
30274
+ for (let i = 0; i < params.length; i++) {
30275
+ const { _originRequestParams, _originalIndex } = params[i];
30276
+ const responseKey = `${_originalIndex}`;
30277
+ resultMap[responseKey] = Object.assign(Object.assign({}, _originRequestParams), response[i]);
30278
+ }
30279
+ if (((_d = (_c = this.payload) === null || _c === void 0 ? void 0 : _c.bundle) === null || _d === void 0 ? void 0 : _d.length) > 1) {
30280
+ const progress = Math.round(((i + 1) / this.payload.bundle.length) * 100);
30281
+ this.postMessage(createUiMessage(UI_REQUEST.DEVICE_PROGRESS, { progress }));
30282
+ }
30283
+ i++;
30284
+ }
30285
+ for (let i = 0; i < bundle.length; i++) {
30286
+ responses.push(resultMap[i]);
30287
+ }
30288
+ return Promise.resolve(responses);
30289
+ });
30290
+ }
30291
+ }
30292
+
30293
+ class AllNetworkGetAddressByLoop extends AllNetworkGetAddressBase {
30294
+ getAllNetworkAddress() {
30295
+ return __awaiter(this, void 0, void 0, function* () {
30296
+ const { callbackId, callbackIdFinish } = this.payload;
30297
+ if (!callbackId) {
30298
+ throw new Error('callbackId is required');
30299
+ }
30300
+ if (!callbackIdFinish) {
30301
+ throw new Error('callbackIdFinish is required');
30302
+ }
30303
+ const bundle = this.payload.bundle || [this.payload];
30304
+ const callbackPromise = this.processCallbacksInBackground(bundle, callbackId, callbackIdFinish);
30305
+ this.device.pendingCallbackPromise = hdShared.createDeferred(callbackPromise);
30306
+ if (this.context && this.payload.connectId) {
30307
+ this.context.registerCallbackTask(this.payload.connectId, this.device.pendingCallbackPromise);
30308
+ }
30309
+ return Promise.resolve([]);
30310
+ });
30311
+ }
30312
+ processCallbacksInBackground(bundle, callbackId, callbackIdFinish) {
30313
+ var _a, _b, _c;
30314
+ return __awaiter(this, void 0, void 0, function* () {
30315
+ try {
30316
+ const allResults = [];
30317
+ for (let i = 0; i < bundle.length; i++) {
30318
+ const item = bundle[i];
30319
+ if ((_a = this.abortController) === null || _a === void 0 ? void 0 : _a.signal.aborted) {
30320
+ throw new Error(hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]);
30321
+ }
30322
+ const methodParams = this.generateMethodName({
30323
+ network: item.network,
30324
+ payload: item,
30325
+ originalIndex: i,
30326
+ });
30327
+ const singleMethodParams = {
30328
+ bundle: [methodParams.params],
30329
+ };
30330
+ const response = yield this.callMethod(methodParams.methodName, singleMethodParams);
30331
+ if ((_b = this.abortController) === null || _b === void 0 ? void 0 : _b.signal.aborted) {
30332
+ throw new Error(hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]);
30333
+ }
30334
+ const singleResult = Object.assign(Object.assign({}, item), response[0]);
30335
+ allResults.push(singleResult);
30336
+ this.sendItemCallback(callbackId, singleResult, i);
30337
+ }
30338
+ this.sendFinishCallback({
30339
+ callbackId: callbackIdFinish,
30340
+ data: allResults,
30341
+ });
30342
+ }
30343
+ catch (error) {
30344
+ let errorCode = error.errorCode || error.code;
30345
+ let errorMessage = error.message;
30346
+ if (error instanceof hdShared.HardwareError) {
30347
+ errorCode = error.errorCode;
30348
+ errorMessage = error.message;
30349
+ }
30350
+ else if (error.message === hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]) {
30351
+ errorCode = hdShared.HardwareErrorCode.RepeatUnlocking;
30352
+ errorMessage = error.message;
30353
+ }
30354
+ else {
30355
+ const hardwareError = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, error.message);
30356
+ errorCode = hardwareError.errorCode;
30357
+ errorMessage = hardwareError.message;
30358
+ }
30359
+ this.sendFinishCallback({
30360
+ callbackId,
30361
+ error: {
30362
+ success: false,
30363
+ payload: {
30364
+ error: errorMessage,
30365
+ code: errorCode,
30366
+ },
30367
+ },
30368
+ });
30369
+ }
30370
+ finally {
30371
+ (_c = this.context) === null || _c === void 0 ? void 0 : _c.cancelCallbackTasks(this.payload.connectId);
30372
+ }
30373
+ });
30374
+ }
30375
+ sendFinishCallback({ callbackId, data, error, }) {
30376
+ this.postMessage({
30377
+ event: IFRAME.CALLBACK,
30378
+ type: IFRAME.CALLBACK,
30379
+ payload: {
30380
+ callbackId,
30381
+ data,
30382
+ error,
30383
+ },
30384
+ });
30385
+ }
30386
+ sendItemCallback(callbackId, data, itemIndex) {
30387
+ this.postMessage({
30388
+ event: IFRAME.CALLBACK,
30389
+ type: IFRAME.CALLBACK,
30390
+ payload: {
30391
+ callbackId,
30392
+ data: Object.assign(Object.assign({}, data), { index: itemIndex }),
30393
+ },
30394
+ });
30395
+ }
30396
+ }
30397
+
30203
30398
  var bitcoin = [
30204
30399
  {
30205
30400
  name: "Bitcoin",
@@ -30774,6 +30969,15 @@ class BTCGetPublicKey extends BaseMethod {
30774
30969
  }
30775
30970
  }
30776
30971
  catch (error) {
30972
+ if (error instanceof hdShared.HardwareError) {
30973
+ const { errorCode } = error;
30974
+ if (errorCode === hdShared.HardwareErrorCode.PinCancelled ||
30975
+ errorCode === hdShared.HardwareErrorCode.ActionCancelled ||
30976
+ errorCode === hdShared.HardwareErrorCode.ResponseUnexpectTypeError ||
30977
+ errorCode === hdShared.HardwareErrorCode.PinInvalid) {
30978
+ throw error;
30979
+ }
30980
+ }
30777
30981
  responses = [];
30778
30982
  for (let i = 0; i < this.params.length; i++) {
30779
30983
  const param = this.params[i];
@@ -31613,6 +31817,7 @@ class EVMGetPublicKey extends BaseMethod {
31613
31817
  constructor() {
31614
31818
  super(...arguments);
31615
31819
  this.hasBundle = false;
31820
+ this.confirmShowOnOneKey = false;
31616
31821
  this.useBatch = false;
31617
31822
  }
31618
31823
  init() {
@@ -31620,7 +31825,8 @@ class EVMGetPublicKey extends BaseMethod {
31620
31825
  this.checkDeviceId = true;
31621
31826
  this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
31622
31827
  this.hasBundle = !!((_a = this.payload) === null || _a === void 0 ? void 0 : _a.bundle);
31623
- this.useBatch = (_c = (_b = this.payload) === null || _b === void 0 ? void 0 : _b.bundle) === null || _c === void 0 ? void 0 : _c.every((item) => item.showOnOneKey !== true);
31828
+ this.confirmShowOnOneKey = (_c = (_b = this.payload) === null || _b === void 0 ? void 0 : _b.bundle) === null || _c === void 0 ? void 0 : _c.some((item) => !!item.showOnOneKey);
31829
+ this.useBatch = !this.confirmShowOnOneKey && this.hasBundle && this.payload.useBatch;
31624
31830
  const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };
31625
31831
  validateParams(payload, [{ name: 'bundle', type: 'array' }]);
31626
31832
  this.params = [];
@@ -31656,7 +31862,7 @@ class EVMGetPublicKey extends BaseMethod {
31656
31862
  var _a;
31657
31863
  return __awaiter(this, void 0, void 0, function* () {
31658
31864
  const responses = [];
31659
- if (this.useBatch && this.hasBundle && supportBatchPublicKey((_a = this.device) === null || _a === void 0 ? void 0 : _a.features)) {
31865
+ if (this.useBatch && supportBatchPublicKey((_a = this.device) === null || _a === void 0 ? void 0 : _a.features)) {
31660
31866
  try {
31661
31867
  const res = yield batchGetPublickeys(this.device, this.params, 'secp256k1', 60, {
31662
31868
  includeNode: false,
@@ -38113,6 +38319,7 @@ var ApiMethods = /*#__PURE__*/Object.freeze({
38113
38319
  promptWebDeviceAccess: PromptWebDeviceAccess,
38114
38320
  cipherKeyValue: CipherKeyValue,
38115
38321
  allNetworkGetAddress: AllNetworkGetAddress,
38322
+ allNetworkGetAddressByLoop: AllNetworkGetAddressByLoop,
38116
38323
  btcGetAddress: BTCGetAddress,
38117
38324
  btcGetPublicKey: BTCGetPublicKey,
38118
38325
  btcSignMessage: BTCSignMessage,
@@ -38325,6 +38532,7 @@ const Log$1 = getLogger(exports.LoggerNames.Core);
38325
38532
  class RequestQueue {
38326
38533
  constructor() {
38327
38534
  this.requestQueue = new Map();
38535
+ this.pendingCallbackTasks = new Map();
38328
38536
  this.generateRequestId = (method) => {
38329
38537
  if (method && method.responseID != null) {
38330
38538
  return method.responseID;
@@ -38401,6 +38609,28 @@ class RequestQueue {
38401
38609
  releaseTask(requestId) {
38402
38610
  this.requestQueue.delete(requestId);
38403
38611
  }
38612
+ registerPendingCallbackTask(connectId, callbackPromise) {
38613
+ this.pendingCallbackTasks.set(connectId, callbackPromise);
38614
+ callbackPromise.promise.finally(() => {
38615
+ Log$1.debug(`Callback task completed for connectId: ${connectId}`);
38616
+ this.pendingCallbackTasks.delete(connectId);
38617
+ });
38618
+ }
38619
+ waitForPendingCallbackTasks(connectId) {
38620
+ return __awaiter(this, void 0, void 0, function* () {
38621
+ const pendingTask = this.pendingCallbackTasks.get(connectId);
38622
+ if (pendingTask) {
38623
+ Log$1.debug(`Waiting for pending callback task to complete for connectId: ${connectId}`);
38624
+ yield pendingTask.promise;
38625
+ }
38626
+ });
38627
+ }
38628
+ cancelCallbackTasks(connectId) {
38629
+ const pendingTask = this.pendingCallbackTasks.get(connectId);
38630
+ if (pendingTask) {
38631
+ pendingTask.resolve();
38632
+ }
38633
+ }
38404
38634
  }
38405
38635
 
38406
38636
  const getMutex = () => {
@@ -38523,6 +38753,9 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
38523
38753
  Log.debug('passphrase state change, clear device cache');
38524
38754
  DevicePool.clearDeviceCache(method.payload.connectId);
38525
38755
  }
38756
+ if (method.connectId) {
38757
+ yield context.waitForCallbackTasks(method.connectId);
38758
+ }
38526
38759
  yield waitForPendingPromise(getPrePendingCallPromise, setPrePendingCallPromise);
38527
38760
  const task = requestQueue.createTask(method);
38528
38761
  let device;
@@ -38546,6 +38779,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
38546
38779
  }
38547
38780
  Log.debug('Call API - setDevice: ', device.mainId);
38548
38781
  (_b = method.setDevice) === null || _b === void 0 ? void 0 : _b.call(method, device);
38782
+ method.context = context;
38549
38783
  device.on(DEVICE.PIN, onDevicePinHandler);
38550
38784
  device.on(DEVICE.BUTTON, onDeviceButtonHandler);
38551
38785
  device.on(DEVICE.PASSPHRASE, message.payload.useEmptyPassphrase ? onEmptyPassphraseHandler : onDevicePassphraseHandler);
@@ -38553,6 +38787,9 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
38553
38787
  device.on(DEVICE.FEATURES, onDeviceFeaturesHandler);
38554
38788
  device.on(DEVICE.SELECT_DEVICE_IN_BOOTLOADER_FOR_WEB_DEVICE, onSelectDeviceInBootloaderForWebDeviceHandler);
38555
38789
  try {
38790
+ if (method.connectId) {
38791
+ yield context.waitForCallbackTasks(method.connectId);
38792
+ }
38556
38793
  yield waitForPendingPromise(getPrePendingCallPromise, setPrePendingCallPromise);
38557
38794
  const inner = () => __awaiter(void 0, void 0, void 0, function* () {
38558
38795
  var _c, _d, _e, _f, _g;
@@ -38890,6 +39127,7 @@ const cancel = (context, connectId) => {
38890
39127
  const { requestQueue, setPrePendingCallPromise } = context;
38891
39128
  if (connectId) {
38892
39129
  try {
39130
+ requestQueue.cancelCallbackTasks(connectId);
38893
39131
  const requestIds = requestQueue.getRequestTasksId();
38894
39132
  Log.debug(`Cancel Api connect requestQueues: length:${requestIds.length} requestIds:${requestIds.join(',')}`);
38895
39133
  const canceledDevices = [];
@@ -39070,6 +39308,11 @@ class Core extends events.exports {
39070
39308
  setPrePendingCallPromise: (promise) => {
39071
39309
  this.prePendingCallPromise = promise;
39072
39310
  },
39311
+ registerCallbackTask: (connectId, callbackPromise) => {
39312
+ this.requestQueue.registerPendingCallbackTask(connectId, callbackPromise);
39313
+ },
39314
+ waitForCallbackTasks: (connectId) => this.requestQueue.waitForPendingCallbackTasks(connectId),
39315
+ cancelCallbackTasks: (connectId) => this.requestQueue.cancelCallbackTasks(connectId),
39073
39316
  };
39074
39317
  }
39075
39318
  handleMessage(message) {
@@ -39111,6 +39354,11 @@ class Core extends events.exports {
39111
39354
  cancel(this.getCoreContext(), message.payload.connectId);
39112
39355
  break;
39113
39356
  }
39357
+ case IFRAME.CALLBACK: {
39358
+ Log.log('callback message: ', message);
39359
+ postMessage(message);
39360
+ break;
39361
+ }
39114
39362
  }
39115
39363
  return Promise.resolve(message);
39116
39364
  });
@@ -39209,6 +39457,7 @@ exports.UI_REQUEST = UI_REQUEST;
39209
39457
  exports.UI_RESPONSE = UI_RESPONSE;
39210
39458
  exports.checkNeedUpdateBootForClassicAndMini = checkNeedUpdateBootForClassicAndMini;
39211
39459
  exports.checkNeedUpdateBootForTouch = checkNeedUpdateBootForTouch;
39460
+ exports.cleanupCallback = cleanupCallback;
39212
39461
  exports.corsValidator = corsValidator;
39213
39462
  exports.createDeviceMessage = createDeviceMessage;
39214
39463
  exports.createErrorMessage = createErrorMessage;
@@ -39220,6 +39469,7 @@ exports.createUiMessage = createUiMessage;
39220
39469
  exports.createUiResponse = createUiResponse;
39221
39470
  exports["default"] = HardwareSdk;
39222
39471
  exports.enableLog = enableLog;
39472
+ exports.executeCallback = executeCallback;
39223
39473
  exports.getDeviceBLEFirmwareVersion = getDeviceBLEFirmwareVersion;
39224
39474
  exports.getDeviceBleName = getDeviceBleName;
39225
39475
  exports.getDeviceBoardloaderVersion = getDeviceBoardloaderVersion;