@onekeyfe/hd-core 1.1.2 → 1.1.3-alpha.0
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.
- package/dist/api/BaseMethod.d.ts +2 -0
- package/dist/api/BaseMethod.d.ts.map +1 -1
- package/dist/api/allnetwork/AllNetworkGetAddress.d.ts +4 -28
- package/dist/api/allnetwork/AllNetworkGetAddress.d.ts.map +1 -1
- package/dist/api/allnetwork/AllNetworkGetAddressBase.d.ts +47 -0
- package/dist/api/allnetwork/AllNetworkGetAddressBase.d.ts.map +1 -0
- package/dist/api/allnetwork/AllNetworkGetAddressByLoop.d.ts +8 -0
- package/dist/api/allnetwork/AllNetworkGetAddressByLoop.d.ts.map +1 -0
- package/dist/api/btc/BTCGetPublicKey.d.ts.map +1 -1
- package/dist/api/cosmos/CosmosGetPublicKey.d.ts +1 -1
- package/dist/api/cosmos/CosmosGetPublicKey.d.ts.map +1 -1
- package/dist/api/device/DeviceUnlock.d.ts +0 -2
- package/dist/api/device/DeviceUnlock.d.ts.map +1 -1
- package/dist/api/evm/EVMGetPublicKey.d.ts +1 -0
- package/dist/api/evm/EVMGetPublicKey.d.ts.map +1 -1
- package/dist/api/index.d.ts +1 -0
- package/dist/api/index.d.ts.map +1 -1
- package/dist/core/RequestQueue.d.ts +4 -0
- package/dist/core/RequestQueue.d.ts.map +1 -1
- package/dist/core/index.d.ts +3 -2
- package/dist/core/index.d.ts.map +1 -1
- package/dist/device/Device.d.ts +4 -1
- package/dist/device/Device.d.ts.map +1 -1
- package/dist/device/DeviceCommands.d.ts +4 -4
- package/dist/events/call.d.ts +9 -0
- package/dist/events/call.d.ts.map +1 -1
- package/dist/events/core.d.ts +2 -2
- package/dist/events/core.d.ts.map +1 -1
- package/dist/events/iframe.d.ts +11 -1
- package/dist/events/iframe.d.ts.map +1 -1
- package/dist/index.d.ts +40 -12
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +394 -140
- package/dist/inject.d.ts +3 -0
- package/dist/inject.d.ts.map +1 -1
- package/dist/types/api/allNetworkGetAddress.d.ts +9 -2
- package/dist/types/api/allNetworkGetAddress.d.ts.map +1 -1
- package/dist/types/api/evmGetPublicKey.d.ts +1 -0
- package/dist/types/api/evmGetPublicKey.d.ts.map +1 -1
- package/dist/types/api/index.d.ts +2 -1
- package/dist/types/api/index.d.ts.map +1 -1
- package/package.json +4 -4
- package/src/api/BaseMethod.ts +3 -0
- package/src/api/allnetwork/AllNetworkGetAddress.ts +14 -407
- package/src/api/allnetwork/AllNetworkGetAddressBase.ts +475 -0
- package/src/api/allnetwork/AllNetworkGetAddressByLoop.ts +151 -0
- package/src/api/btc/BTCGetPublicKey.ts +13 -0
- package/src/api/cosmos/CosmosGetPublicKey.ts +1 -1
- package/src/api/device/DeviceUnlock.ts +1 -48
- package/src/api/evm/EVMGetPublicKey.ts +9 -3
- package/src/api/index.ts +1 -0
- package/src/core/RequestQueue.ts +26 -0
- package/src/core/index.ts +29 -3
- package/src/device/Device.ts +64 -0
- package/src/events/call.ts +10 -0
- package/src/events/core.ts +7 -1
- package/src/events/iframe.ts +12 -1
- package/src/index.ts +2 -1
- package/src/inject.ts +47 -0
- package/src/types/api/allNetworkGetAddress.ts +16 -2
- package/src/types/api/evmGetPublicKey.ts +1 -0
- 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
|
-
|
|
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
|
|
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,24 @@ 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
|
+
console.log('=====>>>>> onSignalAbort');
|
|
30142
|
+
(_a = this.abortController) === null || _a === void 0 ? void 0 : _a.abort(hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]);
|
|
30143
|
+
};
|
|
30144
|
+
const _onDeviceButtonHandler = (...[device, request]) => {
|
|
30145
|
+
if (request.code === 'ButtonRequest_PinEntry' ||
|
|
30146
|
+
request.code === 'ButtonRequest_AttachPin') {
|
|
30147
|
+
onSignalAbort();
|
|
30148
|
+
}
|
|
30149
|
+
else {
|
|
30150
|
+
onDeviceButtonHandler(device, request);
|
|
30151
|
+
}
|
|
30152
|
+
};
|
|
30153
|
+
this.device.on(DEVICE.BUTTON, _onDeviceButtonHandler);
|
|
30154
|
+
this.device.on(DEVICE.PIN, onSignalAbort);
|
|
30155
|
+
this.device.on(DEVICE.PASSPHRASE, onSignalAbort);
|
|
30089
30156
|
preCheckDeviceSupport(this.device, method);
|
|
30090
30157
|
const response = yield method.run();
|
|
30091
30158
|
if (!Array.isArray(response) || response.length === 0) {
|
|
@@ -30112,45 +30179,22 @@ class AllNetworkGetAddress extends BaseMethod {
|
|
|
30112
30179
|
});
|
|
30113
30180
|
}
|
|
30114
30181
|
run() {
|
|
30115
|
-
var _a
|
|
30182
|
+
var _a;
|
|
30116
30183
|
return __awaiter(this, void 0, void 0, function* () {
|
|
30117
|
-
|
|
30118
|
-
|
|
30119
|
-
|
|
30120
|
-
|
|
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]);
|
|
30184
|
+
if (!((_a = this.device.features) === null || _a === void 0 ? void 0 : _a.unlocked)) {
|
|
30185
|
+
const features = yield this.device.unlockDevice();
|
|
30186
|
+
if (features.passphrase_protection) {
|
|
30187
|
+
yield this.device.checkPassphraseStateSafety();
|
|
30143
30188
|
}
|
|
30144
|
-
|
|
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]);
|
|
30189
|
+
this.postMessage(createUiMessage(UI_REQUEST.CLOSE_UI_PIN_WINDOW));
|
|
30152
30190
|
}
|
|
30153
|
-
|
|
30191
|
+
this.abortController = new AbortController();
|
|
30192
|
+
return this.getAllNetworkAddress().catch(e => {
|
|
30193
|
+
if (e instanceof hdShared.HardwareError && e.errorCode === hdShared.HardwareErrorCode.RepeatUnlocking) {
|
|
30194
|
+
throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RepeatUnlocking, e.message);
|
|
30195
|
+
}
|
|
30196
|
+
throw e;
|
|
30197
|
+
});
|
|
30154
30198
|
});
|
|
30155
30199
|
}
|
|
30156
30200
|
}
|
|
@@ -30171,10 +30215,7 @@ function handleSkippableHardwareError(e, device, method) {
|
|
|
30171
30215
|
let error;
|
|
30172
30216
|
if (e instanceof hdShared.HardwareError && e.errorCode !== hdShared.HardwareErrorCode.RuntimeError) {
|
|
30173
30217
|
const { errorCode } = e;
|
|
30174
|
-
if (errorCode === hdShared.HardwareErrorCode.
|
|
30175
|
-
error = e;
|
|
30176
|
-
}
|
|
30177
|
-
else if (errorCode === hdShared.HardwareErrorCode.CallMethodNeedUpgradeFirmware) {
|
|
30218
|
+
if (errorCode === hdShared.HardwareErrorCode.CallMethodNeedUpgradeFirmware) {
|
|
30178
30219
|
error = e;
|
|
30179
30220
|
}
|
|
30180
30221
|
else if (errorCode === hdShared.HardwareErrorCode.DeviceNotSupportMethod) {
|
|
@@ -30200,6 +30241,164 @@ function handleSkippableHardwareError(e, device, method) {
|
|
|
30200
30241
|
return error;
|
|
30201
30242
|
}
|
|
30202
30243
|
|
|
30244
|
+
class AllNetworkGetAddress extends AllNetworkGetAddressBase {
|
|
30245
|
+
getAllNetworkAddress() {
|
|
30246
|
+
var _a, _b, _c, _d;
|
|
30247
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
30248
|
+
const responses = [];
|
|
30249
|
+
const resultMap = {};
|
|
30250
|
+
const { bundle } = this.payload;
|
|
30251
|
+
const methodGroups = bundle
|
|
30252
|
+
.map((param, index) => this.generateMethodName({
|
|
30253
|
+
network: param.network,
|
|
30254
|
+
payload: param,
|
|
30255
|
+
originalIndex: index,
|
|
30256
|
+
}))
|
|
30257
|
+
.reduce((acc, cur) => {
|
|
30258
|
+
if (!acc[cur.methodName]) {
|
|
30259
|
+
acc[cur.methodName] = [];
|
|
30260
|
+
}
|
|
30261
|
+
acc[cur.methodName].push(cur);
|
|
30262
|
+
return acc;
|
|
30263
|
+
}, {});
|
|
30264
|
+
let i = 0;
|
|
30265
|
+
for (const [methodName, params] of Object.entries(methodGroups)) {
|
|
30266
|
+
const methodParams = {
|
|
30267
|
+
bundle: params.map(param => (Object.assign({}, param.params))),
|
|
30268
|
+
};
|
|
30269
|
+
if ((_a = this.abortController) === null || _a === void 0 ? void 0 : _a.signal.aborted) {
|
|
30270
|
+
throw new Error(hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]);
|
|
30271
|
+
}
|
|
30272
|
+
const response = yield this.callMethod(methodName, methodParams);
|
|
30273
|
+
if ((_b = this.abortController) === null || _b === void 0 ? void 0 : _b.signal.aborted) {
|
|
30274
|
+
throw new Error(hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]);
|
|
30275
|
+
}
|
|
30276
|
+
for (let i = 0; i < params.length; i++) {
|
|
30277
|
+
const { _originRequestParams, _originalIndex } = params[i];
|
|
30278
|
+
const responseKey = `${_originalIndex}`;
|
|
30279
|
+
resultMap[responseKey] = Object.assign(Object.assign({}, _originRequestParams), response[i]);
|
|
30280
|
+
}
|
|
30281
|
+
if (((_d = (_c = this.payload) === null || _c === void 0 ? void 0 : _c.bundle) === null || _d === void 0 ? void 0 : _d.length) > 1) {
|
|
30282
|
+
const progress = Math.round(((i + 1) / this.payload.bundle.length) * 100);
|
|
30283
|
+
this.postMessage(createUiMessage(UI_REQUEST.DEVICE_PROGRESS, { progress }));
|
|
30284
|
+
}
|
|
30285
|
+
i++;
|
|
30286
|
+
}
|
|
30287
|
+
for (let i = 0; i < bundle.length; i++) {
|
|
30288
|
+
responses.push(resultMap[i]);
|
|
30289
|
+
}
|
|
30290
|
+
this.abortController = null;
|
|
30291
|
+
return Promise.resolve(responses);
|
|
30292
|
+
});
|
|
30293
|
+
}
|
|
30294
|
+
}
|
|
30295
|
+
|
|
30296
|
+
class AllNetworkGetAddressByLoop extends AllNetworkGetAddressBase {
|
|
30297
|
+
getAllNetworkAddress() {
|
|
30298
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
30299
|
+
const { callbackId, callbackIdFinish } = this.payload;
|
|
30300
|
+
if (!callbackId) {
|
|
30301
|
+
throw new Error('callbackId is required');
|
|
30302
|
+
}
|
|
30303
|
+
if (!callbackIdFinish) {
|
|
30304
|
+
throw new Error('callbackIdFinish is required');
|
|
30305
|
+
}
|
|
30306
|
+
const bundle = this.payload.bundle || [this.payload];
|
|
30307
|
+
const callbackPromise = this.processCallbacksInBackground(bundle, callbackId, callbackIdFinish);
|
|
30308
|
+
this.device.pendingCallbackPromise = hdShared.createDeferred(callbackPromise);
|
|
30309
|
+
if (this.context && this.payload.connectId) {
|
|
30310
|
+
this.context.registerCallbackTask(this.payload.connectId, this.device.pendingCallbackPromise);
|
|
30311
|
+
}
|
|
30312
|
+
return Promise.resolve([]);
|
|
30313
|
+
});
|
|
30314
|
+
}
|
|
30315
|
+
processCallbacksInBackground(bundle, callbackId, callbackIdFinish) {
|
|
30316
|
+
var _a, _b, _c;
|
|
30317
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
30318
|
+
try {
|
|
30319
|
+
const allResults = [];
|
|
30320
|
+
for (let i = 0; i < bundle.length; i++) {
|
|
30321
|
+
const item = bundle[i];
|
|
30322
|
+
if ((_a = this.abortController) === null || _a === void 0 ? void 0 : _a.signal.aborted) {
|
|
30323
|
+
throw new Error(hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]);
|
|
30324
|
+
}
|
|
30325
|
+
const methodParams = this.generateMethodName({
|
|
30326
|
+
network: item.network,
|
|
30327
|
+
payload: item,
|
|
30328
|
+
originalIndex: i,
|
|
30329
|
+
});
|
|
30330
|
+
const singleMethodParams = {
|
|
30331
|
+
bundle: [methodParams.params],
|
|
30332
|
+
};
|
|
30333
|
+
const response = yield this.callMethod(methodParams.methodName, singleMethodParams);
|
|
30334
|
+
if ((_b = this.abortController) === null || _b === void 0 ? void 0 : _b.signal.aborted) {
|
|
30335
|
+
throw new Error(hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]);
|
|
30336
|
+
}
|
|
30337
|
+
const singleResult = Object.assign(Object.assign({}, item), response[0]);
|
|
30338
|
+
allResults.push(singleResult);
|
|
30339
|
+
this.sendItemCallback(callbackId, singleResult, i);
|
|
30340
|
+
}
|
|
30341
|
+
this.sendFinishCallback({
|
|
30342
|
+
callbackId: callbackIdFinish,
|
|
30343
|
+
data: allResults,
|
|
30344
|
+
});
|
|
30345
|
+
}
|
|
30346
|
+
catch (error) {
|
|
30347
|
+
let errorCode = error.errorCode || error.code;
|
|
30348
|
+
let errorMessage = error.message;
|
|
30349
|
+
if (error instanceof hdShared.HardwareError) {
|
|
30350
|
+
errorCode = error.errorCode;
|
|
30351
|
+
errorMessage = error.message;
|
|
30352
|
+
}
|
|
30353
|
+
else if (error.message === hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]) {
|
|
30354
|
+
errorCode = hdShared.HardwareErrorCode.RepeatUnlocking;
|
|
30355
|
+
errorMessage = error.message;
|
|
30356
|
+
}
|
|
30357
|
+
else {
|
|
30358
|
+
const hardwareError = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, error.message);
|
|
30359
|
+
errorCode = hardwareError.errorCode;
|
|
30360
|
+
errorMessage = hardwareError.message;
|
|
30361
|
+
}
|
|
30362
|
+
this.sendFinishCallback({
|
|
30363
|
+
callbackId,
|
|
30364
|
+
error: {
|
|
30365
|
+
success: false,
|
|
30366
|
+
payload: {
|
|
30367
|
+
error: errorMessage,
|
|
30368
|
+
code: errorCode,
|
|
30369
|
+
},
|
|
30370
|
+
},
|
|
30371
|
+
});
|
|
30372
|
+
}
|
|
30373
|
+
finally {
|
|
30374
|
+
(_c = this.context) === null || _c === void 0 ? void 0 : _c.cancelCallbackTasks(this.payload.connectId);
|
|
30375
|
+
this.abortController = null;
|
|
30376
|
+
}
|
|
30377
|
+
});
|
|
30378
|
+
}
|
|
30379
|
+
sendFinishCallback({ callbackId, data, error, }) {
|
|
30380
|
+
this.postMessage({
|
|
30381
|
+
event: IFRAME.CALLBACK,
|
|
30382
|
+
type: IFRAME.CALLBACK,
|
|
30383
|
+
payload: {
|
|
30384
|
+
callbackId,
|
|
30385
|
+
data,
|
|
30386
|
+
error,
|
|
30387
|
+
},
|
|
30388
|
+
});
|
|
30389
|
+
}
|
|
30390
|
+
sendItemCallback(callbackId, data, itemIndex) {
|
|
30391
|
+
this.postMessage({
|
|
30392
|
+
event: IFRAME.CALLBACK,
|
|
30393
|
+
type: IFRAME.CALLBACK,
|
|
30394
|
+
payload: {
|
|
30395
|
+
callbackId,
|
|
30396
|
+
data: Object.assign(Object.assign({}, data), { index: itemIndex }),
|
|
30397
|
+
},
|
|
30398
|
+
});
|
|
30399
|
+
}
|
|
30400
|
+
}
|
|
30401
|
+
|
|
30203
30402
|
var bitcoin = [
|
|
30204
30403
|
{
|
|
30205
30404
|
name: "Bitcoin",
|
|
@@ -30774,6 +30973,15 @@ class BTCGetPublicKey extends BaseMethod {
|
|
|
30774
30973
|
}
|
|
30775
30974
|
}
|
|
30776
30975
|
catch (error) {
|
|
30976
|
+
if (error instanceof hdShared.HardwareError) {
|
|
30977
|
+
const { errorCode } = error;
|
|
30978
|
+
if (errorCode === hdShared.HardwareErrorCode.PinCancelled ||
|
|
30979
|
+
errorCode === hdShared.HardwareErrorCode.ActionCancelled ||
|
|
30980
|
+
errorCode === hdShared.HardwareErrorCode.ResponseUnexpectTypeError ||
|
|
30981
|
+
errorCode === hdShared.HardwareErrorCode.PinInvalid) {
|
|
30982
|
+
throw error;
|
|
30983
|
+
}
|
|
30984
|
+
}
|
|
30777
30985
|
responses = [];
|
|
30778
30986
|
for (let i = 0; i < this.params.length; i++) {
|
|
30779
30987
|
const param = this.params[i];
|
|
@@ -31613,6 +31821,7 @@ class EVMGetPublicKey extends BaseMethod {
|
|
|
31613
31821
|
constructor() {
|
|
31614
31822
|
super(...arguments);
|
|
31615
31823
|
this.hasBundle = false;
|
|
31824
|
+
this.confirmShowOnOneKey = false;
|
|
31616
31825
|
this.useBatch = false;
|
|
31617
31826
|
}
|
|
31618
31827
|
init() {
|
|
@@ -31620,7 +31829,8 @@ class EVMGetPublicKey extends BaseMethod {
|
|
|
31620
31829
|
this.checkDeviceId = true;
|
|
31621
31830
|
this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
|
|
31622
31831
|
this.hasBundle = !!((_a = this.payload) === null || _a === void 0 ? void 0 : _a.bundle);
|
|
31623
|
-
this.
|
|
31832
|
+
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);
|
|
31833
|
+
this.useBatch = !this.confirmShowOnOneKey && this.hasBundle && this.payload.useBatch;
|
|
31624
31834
|
const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };
|
|
31625
31835
|
validateParams(payload, [{ name: 'bundle', type: 'array' }]);
|
|
31626
31836
|
this.params = [];
|
|
@@ -31656,7 +31866,7 @@ class EVMGetPublicKey extends BaseMethod {
|
|
|
31656
31866
|
var _a;
|
|
31657
31867
|
return __awaiter(this, void 0, void 0, function* () {
|
|
31658
31868
|
const responses = [];
|
|
31659
|
-
if (this.useBatch &&
|
|
31869
|
+
if (this.useBatch && supportBatchPublicKey((_a = this.device) === null || _a === void 0 ? void 0 : _a.features)) {
|
|
31660
31870
|
try {
|
|
31661
31871
|
const res = yield batchGetPublickeys(this.device, this.params, 'secp256k1', 60, {
|
|
31662
31872
|
includeNode: false,
|
|
@@ -38113,6 +38323,7 @@ var ApiMethods = /*#__PURE__*/Object.freeze({
|
|
|
38113
38323
|
promptWebDeviceAccess: PromptWebDeviceAccess,
|
|
38114
38324
|
cipherKeyValue: CipherKeyValue,
|
|
38115
38325
|
allNetworkGetAddress: AllNetworkGetAddress,
|
|
38326
|
+
allNetworkGetAddressByLoop: AllNetworkGetAddressByLoop,
|
|
38116
38327
|
btcGetAddress: BTCGetAddress,
|
|
38117
38328
|
btcGetPublicKey: BTCGetPublicKey,
|
|
38118
38329
|
btcSignMessage: BTCSignMessage,
|
|
@@ -38325,6 +38536,7 @@ const Log$1 = getLogger(exports.LoggerNames.Core);
|
|
|
38325
38536
|
class RequestQueue {
|
|
38326
38537
|
constructor() {
|
|
38327
38538
|
this.requestQueue = new Map();
|
|
38539
|
+
this.pendingCallbackTasks = new Map();
|
|
38328
38540
|
this.generateRequestId = (method) => {
|
|
38329
38541
|
if (method && method.responseID != null) {
|
|
38330
38542
|
return method.responseID;
|
|
@@ -38401,6 +38613,28 @@ class RequestQueue {
|
|
|
38401
38613
|
releaseTask(requestId) {
|
|
38402
38614
|
this.requestQueue.delete(requestId);
|
|
38403
38615
|
}
|
|
38616
|
+
registerPendingCallbackTask(connectId, callbackPromise) {
|
|
38617
|
+
this.pendingCallbackTasks.set(connectId, callbackPromise);
|
|
38618
|
+
callbackPromise.promise.finally(() => {
|
|
38619
|
+
Log$1.debug(`Callback task completed for connectId: ${connectId}`);
|
|
38620
|
+
this.pendingCallbackTasks.delete(connectId);
|
|
38621
|
+
});
|
|
38622
|
+
}
|
|
38623
|
+
waitForPendingCallbackTasks(connectId) {
|
|
38624
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
38625
|
+
const pendingTask = this.pendingCallbackTasks.get(connectId);
|
|
38626
|
+
if (pendingTask) {
|
|
38627
|
+
Log$1.debug(`Waiting for pending callback task to complete for connectId: ${connectId}`);
|
|
38628
|
+
yield pendingTask.promise;
|
|
38629
|
+
}
|
|
38630
|
+
});
|
|
38631
|
+
}
|
|
38632
|
+
cancelCallbackTasks(connectId) {
|
|
38633
|
+
const pendingTask = this.pendingCallbackTasks.get(connectId);
|
|
38634
|
+
if (pendingTask) {
|
|
38635
|
+
pendingTask.resolve();
|
|
38636
|
+
}
|
|
38637
|
+
}
|
|
38404
38638
|
}
|
|
38405
38639
|
|
|
38406
38640
|
const getMutex = () => {
|
|
@@ -38523,6 +38757,9 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
|
|
|
38523
38757
|
Log.debug('passphrase state change, clear device cache');
|
|
38524
38758
|
DevicePool.clearDeviceCache(method.payload.connectId);
|
|
38525
38759
|
}
|
|
38760
|
+
if (method.connectId) {
|
|
38761
|
+
yield context.waitForCallbackTasks(method.connectId);
|
|
38762
|
+
}
|
|
38526
38763
|
yield waitForPendingPromise(getPrePendingCallPromise, setPrePendingCallPromise);
|
|
38527
38764
|
const task = requestQueue.createTask(method);
|
|
38528
38765
|
let device;
|
|
@@ -38546,6 +38783,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
|
|
|
38546
38783
|
}
|
|
38547
38784
|
Log.debug('Call API - setDevice: ', device.mainId);
|
|
38548
38785
|
(_b = method.setDevice) === null || _b === void 0 ? void 0 : _b.call(method, device);
|
|
38786
|
+
method.context = context;
|
|
38549
38787
|
device.on(DEVICE.PIN, onDevicePinHandler);
|
|
38550
38788
|
device.on(DEVICE.BUTTON, onDeviceButtonHandler);
|
|
38551
38789
|
device.on(DEVICE.PASSPHRASE, message.payload.useEmptyPassphrase ? onEmptyPassphraseHandler : onDevicePassphraseHandler);
|
|
@@ -38553,6 +38791,9 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
|
|
|
38553
38791
|
device.on(DEVICE.FEATURES, onDeviceFeaturesHandler);
|
|
38554
38792
|
device.on(DEVICE.SELECT_DEVICE_IN_BOOTLOADER_FOR_WEB_DEVICE, onSelectDeviceInBootloaderForWebDeviceHandler);
|
|
38555
38793
|
try {
|
|
38794
|
+
if (method.connectId) {
|
|
38795
|
+
yield context.waitForCallbackTasks(method.connectId);
|
|
38796
|
+
}
|
|
38556
38797
|
yield waitForPendingPromise(getPrePendingCallPromise, setPrePendingCallPromise);
|
|
38557
38798
|
const inner = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
38558
38799
|
var _c, _d, _e, _f, _g;
|
|
@@ -38890,6 +39131,7 @@ const cancel = (context, connectId) => {
|
|
|
38890
39131
|
const { requestQueue, setPrePendingCallPromise } = context;
|
|
38891
39132
|
if (connectId) {
|
|
38892
39133
|
try {
|
|
39134
|
+
requestQueue.cancelCallbackTasks(connectId);
|
|
38893
39135
|
const requestIds = requestQueue.getRequestTasksId();
|
|
38894
39136
|
Log.debug(`Cancel Api connect requestQueues: length:${requestIds.length} requestIds:${requestIds.join(',')}`);
|
|
38895
39137
|
const canceledDevices = [];
|
|
@@ -39070,6 +39312,11 @@ class Core extends events.exports {
|
|
|
39070
39312
|
setPrePendingCallPromise: (promise) => {
|
|
39071
39313
|
this.prePendingCallPromise = promise;
|
|
39072
39314
|
},
|
|
39315
|
+
registerCallbackTask: (connectId, callbackPromise) => {
|
|
39316
|
+
this.requestQueue.registerPendingCallbackTask(connectId, callbackPromise);
|
|
39317
|
+
},
|
|
39318
|
+
waitForCallbackTasks: (connectId) => this.requestQueue.waitForPendingCallbackTasks(connectId),
|
|
39319
|
+
cancelCallbackTasks: (connectId) => this.requestQueue.cancelCallbackTasks(connectId),
|
|
39073
39320
|
};
|
|
39074
39321
|
}
|
|
39075
39322
|
handleMessage(message) {
|
|
@@ -39111,6 +39358,11 @@ class Core extends events.exports {
|
|
|
39111
39358
|
cancel(this.getCoreContext(), message.payload.connectId);
|
|
39112
39359
|
break;
|
|
39113
39360
|
}
|
|
39361
|
+
case IFRAME.CALLBACK: {
|
|
39362
|
+
Log.log('callback message: ', message);
|
|
39363
|
+
postMessage(message);
|
|
39364
|
+
break;
|
|
39365
|
+
}
|
|
39114
39366
|
}
|
|
39115
39367
|
return Promise.resolve(message);
|
|
39116
39368
|
});
|
|
@@ -39209,6 +39461,7 @@ exports.UI_REQUEST = UI_REQUEST;
|
|
|
39209
39461
|
exports.UI_RESPONSE = UI_RESPONSE;
|
|
39210
39462
|
exports.checkNeedUpdateBootForClassicAndMini = checkNeedUpdateBootForClassicAndMini;
|
|
39211
39463
|
exports.checkNeedUpdateBootForTouch = checkNeedUpdateBootForTouch;
|
|
39464
|
+
exports.cleanupCallback = cleanupCallback;
|
|
39212
39465
|
exports.corsValidator = corsValidator;
|
|
39213
39466
|
exports.createDeviceMessage = createDeviceMessage;
|
|
39214
39467
|
exports.createErrorMessage = createErrorMessage;
|
|
@@ -39220,6 +39473,7 @@ exports.createUiMessage = createUiMessage;
|
|
|
39220
39473
|
exports.createUiResponse = createUiResponse;
|
|
39221
39474
|
exports["default"] = HardwareSdk;
|
|
39222
39475
|
exports.enableLog = enableLog;
|
|
39476
|
+
exports.executeCallback = executeCallback;
|
|
39223
39477
|
exports.getDeviceBLEFirmwareVersion = getDeviceBLEFirmwareVersion;
|
|
39224
39478
|
exports.getDeviceBleName = getDeviceBleName;
|
|
39225
39479
|
exports.getDeviceBoardloaderVersion = getDeviceBoardloaderVersion;
|