@onekeyfe/hd-core 0.2.29 → 0.2.31
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/FirmwareUpdateV2.d.ts.map +1 -1
- package/dist/api/device/DeviceUpdateBootloader.d.ts.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js +17 -17
- package/dist/types/api/deviceUpdateReboot.d.ts +1 -2
- package/dist/types/api/deviceUpdateReboot.d.ts.map +1 -1
- package/package.json +4 -4
- package/src/api/FirmwareUpdateV2.ts +10 -5
- package/src/api/device/DeviceUpdateBootloader.ts +8 -17
- package/src/types/api/deviceUpdateReboot.ts +1 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FirmwareUpdateV2.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV2.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAIT,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAO1C,OAAO,KAAK,EAAe,QAAQ,EAAE,MAAM,UAAU,CAAC;AAItD,aAAK,MAAM,GAAG;IACZ,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,EAAE,UAAU,GAAG,KAAK,CAAC;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAIF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,UAAU,CAAC,MAAM,CAAC;IAC9D,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,IAAI;IAsCJ,cAAc,YAAa,MAAM,UAS/B;IAEF,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS;
|
|
1
|
+
{"version":3,"file":"FirmwareUpdateV2.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV2.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAIT,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAO1C,OAAO,KAAK,EAAe,QAAQ,EAAE,MAAM,UAAU,CAAC;AAItD,aAAK,MAAM,GAAG;IACZ,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,EAAE,UAAU,GAAG,KAAK,CAAC;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAIF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,UAAU,CAAC,MAAM,CAAC;IAC9D,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,IAAI;IAsCJ,cAAc,YAAa,MAAM,UAS/B;IAEF,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS;IAkDrD,qBAAqB,CAAC,QAAQ,EAAE,QAAQ;IAUxC,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM;IAc9D,gCAAgC,CAAC,QAAQ,CAAC,EAAE,QAAQ;IAwB9C,GAAG;CAiGV"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeviceUpdateBootloader.d.ts","sourceRoot":"","sources":["../../../src/api/device/DeviceUpdateBootloader.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"DeviceUpdateBootloader.d.ts","sourceRoot":"","sources":["../../../src/api/device/DeviceUpdateBootloader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAQ3C,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,UAAU;IAC5D,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,IAAI;IAMJ,cAAc,YAAa,MAAM,UAS/B;IAEI,GAAG;CA4BV"}
|
package/dist/index.d.ts
CHANGED
|
@@ -361,7 +361,7 @@ declare type DeviceFlagsParams = {
|
|
|
361
361
|
};
|
|
362
362
|
declare function deviceFlags(connectId: string, params: CommonParams & DeviceFlagsParams): Response<Success$1>;
|
|
363
363
|
|
|
364
|
-
declare function deviceUpdateReboot(connectId: string): Response<
|
|
364
|
+
declare function deviceUpdateReboot(connectId: string): Response<boolean>;
|
|
365
365
|
|
|
366
366
|
declare type DeviceUploadResourceParams = {
|
|
367
367
|
suffix: string;
|
package/dist/index.js
CHANGED
|
@@ -13493,13 +13493,8 @@ class DeviceUpdateBootloader extends BaseMethod {
|
|
|
13493
13493
|
const resource = yield getSysResourceBinary(resourceUrl);
|
|
13494
13494
|
this.postTipMessage('DownloadLatestBootloaderResourceSuccess');
|
|
13495
13495
|
if (resource) {
|
|
13496
|
-
|
|
13497
|
-
|
|
13498
|
-
return yield Promise.resolve(true);
|
|
13499
|
-
}
|
|
13500
|
-
catch (e) {
|
|
13501
|
-
return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `update bootloader error, err: ${e}`));
|
|
13502
|
-
}
|
|
13496
|
+
yield updateBootloader(this.device.getCommands().typedCall.bind(this.device.getCommands()), this.postMessage, device, resource.binary);
|
|
13497
|
+
return Promise.resolve(true);
|
|
13503
13498
|
}
|
|
13504
13499
|
}
|
|
13505
13500
|
}
|
|
@@ -13601,24 +13596,29 @@ class FirmwareUpdateV2 extends BaseMethod {
|
|
|
13601
13596
|
const isBleReconnect = connectId && env === 'react-native';
|
|
13602
13597
|
Log$3.log('FirmwareUpdateV2 [checkDeviceToBootloader] isBleReconnect: ', isBleReconnect);
|
|
13603
13598
|
const intervalTimer = setInterval(() => __awaiter(this, void 0, void 0, function* () {
|
|
13604
|
-
var _a, _b, _c, _d, _e, _f, _g;
|
|
13599
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
13605
13600
|
if (isBleReconnect) {
|
|
13606
|
-
|
|
13607
|
-
|
|
13608
|
-
|
|
13609
|
-
|
|
13610
|
-
|
|
13601
|
+
try {
|
|
13602
|
+
yield ((_a = this.device.deviceConnector) === null || _a === void 0 ? void 0 : _a.acquire(this.device.originalDescriptor.id));
|
|
13603
|
+
yield this.device.initialize();
|
|
13604
|
+
if ((_b = this.device.features) === null || _b === void 0 ? void 0 : _b.bootloader_mode) {
|
|
13605
|
+
clearInterval(intervalTimer);
|
|
13606
|
+
(_c = this.checkPromise) === null || _c === void 0 ? void 0 : _c.resolve(true);
|
|
13607
|
+
}
|
|
13608
|
+
}
|
|
13609
|
+
catch (e) {
|
|
13610
|
+
Log$3.log('catch Bluetooth error when device is restarting: ', e);
|
|
13611
13611
|
}
|
|
13612
13612
|
}
|
|
13613
13613
|
else {
|
|
13614
|
-
const deviceDiff = yield ((
|
|
13615
|
-
const devicesDescriptor = (
|
|
13614
|
+
const deviceDiff = yield ((_d = this.device.deviceConnector) === null || _d === void 0 ? void 0 : _d.enumerate());
|
|
13615
|
+
const devicesDescriptor = (_e = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) !== null && _e !== void 0 ? _e : [];
|
|
13616
13616
|
const { deviceList } = yield DevicePool.getDevices(devicesDescriptor, connectId);
|
|
13617
|
-
if (deviceList.length === 1 && ((
|
|
13617
|
+
if (deviceList.length === 1 && ((_g = (_f = deviceList[0]) === null || _f === void 0 ? void 0 : _f.features) === null || _g === void 0 ? void 0 : _g.bootloader_mode)) {
|
|
13618
13618
|
this.device.updateFromCache(deviceList[0]);
|
|
13619
13619
|
this.device.commands.disposed = false;
|
|
13620
13620
|
clearInterval(intervalTimer);
|
|
13621
|
-
(
|
|
13621
|
+
(_h = this.checkPromise) === null || _h === void 0 ? void 0 : _h.resolve(true);
|
|
13622
13622
|
}
|
|
13623
13623
|
}
|
|
13624
13624
|
}), isBleReconnect ? 3000 : 2000);
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { Success } from '@onekeyfe/hd-transport';
|
|
2
1
|
import type { Response } from '../params';
|
|
3
|
-
export declare function deviceUpdateReboot(connectId: string): Response<
|
|
2
|
+
export declare function deviceUpdateReboot(connectId: string): Response<boolean>;
|
|
4
3
|
//# sourceMappingURL=deviceUpdateReboot.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deviceUpdateReboot.d.ts","sourceRoot":"","sources":["../../../src/types/api/deviceUpdateReboot.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"deviceUpdateReboot.d.ts","sourceRoot":"","sources":["../../../src/types/api/deviceUpdateReboot.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE1C,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@onekeyfe/hd-core",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.31",
|
|
4
4
|
"description": "> TODO: description",
|
|
5
5
|
"author": "OneKey",
|
|
6
6
|
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
|
|
@@ -24,8 +24,8 @@
|
|
|
24
24
|
"url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@onekeyfe/hd-shared": "^0.2.
|
|
28
|
-
"@onekeyfe/hd-transport": "^0.2.
|
|
27
|
+
"@onekeyfe/hd-shared": "^0.2.31",
|
|
28
|
+
"@onekeyfe/hd-transport": "^0.2.31",
|
|
29
29
|
"axios": "^0.27.2",
|
|
30
30
|
"bignumber.js": "^9.0.2",
|
|
31
31
|
"jszip": "^3.10.1",
|
|
@@ -42,5 +42,5 @@
|
|
|
42
42
|
"@types/semver": "^7.3.9",
|
|
43
43
|
"ripple-keypairs": "^1.1.4"
|
|
44
44
|
},
|
|
45
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "9ae75fd95c8e49abaafc4cbe9b341f375c6153b9"
|
|
46
46
|
}
|
|
@@ -90,11 +90,16 @@ export default class FirmwareUpdateV2 extends BaseMethod<Params> {
|
|
|
90
90
|
const intervalTimer: ReturnType<typeof setInterval> | undefined = setInterval(
|
|
91
91
|
async () => {
|
|
92
92
|
if (isBleReconnect) {
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
93
|
+
try {
|
|
94
|
+
await this.device.deviceConnector?.acquire(this.device.originalDescriptor.id);
|
|
95
|
+
await this.device.initialize();
|
|
96
|
+
if (this.device.features?.bootloader_mode) {
|
|
97
|
+
clearInterval(intervalTimer);
|
|
98
|
+
this.checkPromise?.resolve(true);
|
|
99
|
+
}
|
|
100
|
+
} catch (e) {
|
|
101
|
+
// ignore error because of device is not connected
|
|
102
|
+
Log.log('catch Bluetooth error when device is restarting: ', e);
|
|
98
103
|
}
|
|
99
104
|
} else {
|
|
100
105
|
const deviceDiff = await this.device.deviceConnector?.enumerate();
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Deferred } from '@onekeyfe/hd-shared';
|
|
2
2
|
import { UI_REQUEST } from '../../constants/ui-request';
|
|
3
3
|
import { BaseMethod } from '../BaseMethod';
|
|
4
4
|
import { getSysResourceBinary } from '../firmware/getBinary';
|
|
@@ -42,22 +42,13 @@ export default class DeviceUpdateBootloader extends BaseMethod {
|
|
|
42
42
|
const resource = await getSysResourceBinary(resourceUrl);
|
|
43
43
|
this.postTipMessage('DownloadLatestBootloaderResourceSuccess');
|
|
44
44
|
if (resource) {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
return await Promise.resolve(true);
|
|
53
|
-
} catch (e) {
|
|
54
|
-
return Promise.reject(
|
|
55
|
-
ERRORS.TypedError(
|
|
56
|
-
HardwareErrorCode.RuntimeError,
|
|
57
|
-
`update bootloader error, err: ${e}`
|
|
58
|
-
)
|
|
59
|
-
);
|
|
60
|
-
}
|
|
45
|
+
await updateBootloader(
|
|
46
|
+
this.device.getCommands().typedCall.bind(this.device.getCommands()),
|
|
47
|
+
this.postMessage,
|
|
48
|
+
device,
|
|
49
|
+
resource.binary
|
|
50
|
+
);
|
|
51
|
+
return Promise.resolve(true);
|
|
61
52
|
}
|
|
62
53
|
}
|
|
63
54
|
}
|