@onekeyfe/hd-core 1.1.17 → 1.1.18-alpha.1
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 +4 -4
- package/dist/api/BaseMethod.d.ts.map +1 -1
- package/dist/api/CheckAllFirmwareRelease.d.ts +1 -1
- package/dist/api/CheckAllFirmwareRelease.d.ts.map +1 -1
- package/dist/api/CheckBootloaderRelease.d.ts.map +1 -1
- package/dist/api/CheckFirmwareRelease.d.ts.map +1 -1
- package/dist/api/FirmwareUpdate.d.ts +1 -1
- package/dist/api/FirmwareUpdate.d.ts.map +1 -1
- package/dist/api/FirmwareUpdateV2.d.ts +3 -2
- package/dist/api/FirmwareUpdateV2.d.ts.map +1 -1
- package/dist/api/FirmwareUpdateV3.d.ts +2 -2
- package/dist/api/FirmwareUpdateV3.d.ts.map +1 -1
- package/dist/api/allnetwork/AllNetworkGetAddressBase.d.ts +2 -2
- package/dist/api/allnetwork/AllNetworkGetAddressBase.d.ts.map +1 -1
- package/dist/api/device/DeviceFullyUploadResource.d.ts.map +1 -1
- package/dist/api/device/DeviceUpdateBootloader.d.ts +6 -1
- package/dist/api/device/DeviceUpdateBootloader.d.ts.map +1 -1
- package/dist/api/evm/EVMSignTypedData.d.ts.map +1 -1
- package/dist/api/firmware/getBinary.d.ts +6 -3
- package/dist/api/firmware/getBinary.d.ts.map +1 -1
- package/dist/api/firmware/releaseHelper.d.ts +7 -2
- package/dist/api/firmware/releaseHelper.d.ts.map +1 -1
- package/dist/api/firmware/updateBootloader.d.ts +7 -2
- package/dist/api/firmware/updateBootloader.d.ts.map +1 -1
- package/dist/api/sui/SuiSignTransaction.d.ts +1 -1
- package/dist/api/sui/SuiSignTransaction.d.ts.map +1 -1
- package/dist/core/index.d.ts.map +1 -1
- package/dist/data-manager/DataManager.d.ts +16 -9
- package/dist/data-manager/DataManager.d.ts.map +1 -1
- package/dist/index.d.ts +43 -21
- package/dist/index.js +200 -75
- package/dist/types/api/checkAllFirmwareRelease.d.ts +3 -1
- package/dist/types/api/checkAllFirmwareRelease.d.ts.map +1 -1
- package/dist/types/api/checkBootloaderRelease.d.ts +5 -2
- package/dist/types/api/checkBootloaderRelease.d.ts.map +1 -1
- package/dist/types/api/checkFirmwareRelease.d.ts +6 -2
- package/dist/types/api/checkFirmwareRelease.d.ts.map +1 -1
- package/dist/types/api/deviceFullyUploadResource.d.ts +6 -1
- package/dist/types/api/deviceFullyUploadResource.d.ts.map +1 -1
- package/dist/types/api/deviceUpdateBootloader.d.ts +6 -3
- package/dist/types/api/deviceUpdateBootloader.d.ts.map +1 -1
- package/dist/types/api/firmwareUpdate.d.ts +3 -1
- package/dist/types/api/firmwareUpdate.d.ts.map +1 -1
- package/dist/types/settings.d.ts +3 -0
- package/dist/types/settings.d.ts.map +1 -1
- package/dist/utils/deviceFeaturesUtils.d.ts +7 -5
- package/dist/utils/deviceFeaturesUtils.d.ts.map +1 -1
- package/dist/utils/release.d.ts +1 -1
- package/dist/utils/release.d.ts.map +1 -1
- package/package.json +4 -4
- package/src/api/BaseMethod.ts +17 -7
- package/src/api/CheckAllFirmwareRelease.ts +13 -6
- package/src/api/CheckBootloaderRelease.ts +13 -2
- package/src/api/CheckFirmwareRelease.ts +9 -2
- package/src/api/FirmwareUpdate.ts +7 -5
- package/src/api/FirmwareUpdateV2.ts +26 -14
- package/src/api/FirmwareUpdateV3.ts +29 -18
- package/src/api/allnetwork/AllNetworkGetAddressBase.ts +10 -11
- package/src/api/device/DeviceFullyUploadResource.ts +8 -2
- package/src/api/device/DeviceUpdateBootloader.ts +21 -5
- package/src/api/evm/EVMSignTypedData.ts +2 -8
- package/src/api/firmware/getBinary.ts +15 -4
- package/src/api/firmware/releaseHelper.ts +22 -11
- package/src/api/firmware/updateBootloader.ts +17 -9
- package/src/api/sui/SuiSignTransaction.ts +7 -1
- package/src/core/index.ts +3 -1
- package/src/data-manager/DataManager.ts +126 -22
- package/src/types/api/checkAllFirmwareRelease.ts +3 -1
- package/src/types/api/checkBootloaderRelease.ts +7 -3
- package/src/types/api/checkFirmwareRelease.ts +10 -2
- package/src/types/api/deviceFullyUploadResource.ts +7 -1
- package/src/types/api/deviceUpdateBootloader.ts +8 -4
- package/src/types/api/firmwareUpdate.ts +4 -1
- package/src/types/settings.ts +37 -0
- package/src/utils/deviceFeaturesUtils.ts +22 -10
- package/src/utils/release.ts +2 -1
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
import type { IBLEFirmwareReleaseInfo } from '../settings';
|
|
2
|
+
import type { EFirmwareType } from '@onekeyfe/hd-shared';
|
|
1
3
|
import type { CommonParams, Response } from '../params';
|
|
2
4
|
import type { IDeviceBLEFirmwareStatus, IDeviceFirmwareStatus } from '../device';
|
|
3
|
-
import { IBLEFirmwareReleaseInfo } from '../settings';
|
|
4
5
|
export type FirmwareRelease = {
|
|
5
6
|
shouldUpdate?: boolean;
|
|
6
7
|
status: IDeviceFirmwareStatus;
|
|
@@ -19,6 +20,7 @@ export type AllFirmwareRelease = {
|
|
|
19
20
|
};
|
|
20
21
|
export type CheckAllFirmwareReleaseParams = {
|
|
21
22
|
checkBridgeRelease?: boolean;
|
|
23
|
+
firmwareType?: EFirmwareType;
|
|
22
24
|
};
|
|
23
25
|
export declare function checkAllFirmwareRelease(connectId?: string, params?: CommonParams & CheckAllFirmwareReleaseParams): Response<AllFirmwareRelease>;
|
|
24
26
|
//# sourceMappingURL=checkAllFirmwareRelease.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkAllFirmwareRelease.d.ts","sourceRoot":"","sources":["../../../src/types/api/checkAllFirmwareRelease.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"checkAllFirmwareRelease.d.ts","sourceRoot":"","sources":["../../../src/types/api/checkAllFirmwareRelease.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,KAAK,EAAE,wBAAwB,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAEjF,MAAM,MAAM,eAAe,GAAG;IAC5B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,MAAM,EAAE,qBAAqB,CAAC;IAC9B,SAAS,CAAC,EAAE;QACV,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;KACjB,EAAE,CAAC;IACJ,OAAO,EAAE,wBAAwB,GAAG,uBAAuB,CAAC;IAC5D,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,eAAe,CAAC;IAC1B,GAAG,EAAE,eAAe,CAAC;IACrB,UAAU,CAAC,EAAE,eAAe,CAAC;IAC7B,MAAM,CAAC,EAAE,eAAe,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,YAAY,CAAC,EAAE,aAAa,CAAC;CAC9B,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAC7C,SAAS,CAAC,EAAE,MAAM,EAClB,MAAM,CAAC,EAAE,YAAY,GAAG,6BAA6B,GACpD,QAAQ,CAAC,kBAAkB,CAAC,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { EFirmwareType } from '@onekeyfe/hd-shared';
|
|
1
2
|
import type { CommonParams, Response } from '../params';
|
|
2
3
|
export type CheckBootloaderReleaseResponse = {
|
|
3
4
|
shouldUpdate: boolean;
|
|
@@ -5,7 +6,9 @@ export type CheckBootloaderReleaseResponse = {
|
|
|
5
6
|
release: string | undefined;
|
|
6
7
|
bootloaderMode: boolean;
|
|
7
8
|
} | null;
|
|
8
|
-
export
|
|
9
|
+
export type CheckBootloaderReleaseParams = {
|
|
9
10
|
willUpdateFirmwareVersion?: string;
|
|
10
|
-
|
|
11
|
+
firmwareType?: EFirmwareType;
|
|
12
|
+
};
|
|
13
|
+
export declare function checkBootloaderRelease(connectId?: string, params?: CommonParams & CheckBootloaderReleaseParams): Response<CheckBootloaderReleaseResponse>;
|
|
11
14
|
//# sourceMappingURL=checkBootloaderRelease.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkBootloaderRelease.d.ts","sourceRoot":"","sources":["../../../src/types/api/checkBootloaderRelease.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,8BAA8B,GAAG;IAC3C,YAAY,EAAE,OAAO,CAAC;IACtB,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC;IAC7B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,cAAc,EAAE,OAAO,CAAC;CACzB,GAAG,IAAI,CAAC;AAET,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAC5C,SAAS,CAAC,EAAE,MAAM,EAClB,MAAM,CAAC,EAAE,YAAY,GAAG
|
|
1
|
+
{"version":3,"file":"checkBootloaderRelease.d.ts","sourceRoot":"","sources":["../../../src/types/api/checkBootloaderRelease.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,8BAA8B,GAAG;IAC3C,YAAY,EAAE,OAAO,CAAC;IACtB,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC;IAC7B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,cAAc,EAAE,OAAO,CAAC;CACzB,GAAG,IAAI,CAAC;AAET,MAAM,MAAM,4BAA4B,GAAG;IACzC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,YAAY,CAAC,EAAE,aAAa,CAAC;CAC9B,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAC5C,SAAS,CAAC,EAAE,MAAM,EAClB,MAAM,CAAC,EAAE,YAAY,GAAG,4BAA4B,GACnD,QAAQ,CAAC,8BAA8B,CAAC,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
import type { IFirmwareReleaseInfo } from '../settings';
|
|
2
|
+
import type { EFirmwareType } from '@onekeyfe/hd-shared';
|
|
1
3
|
import type { Response } from '../params';
|
|
2
4
|
import type { IDeviceFirmwareStatus } from '../device';
|
|
3
|
-
import { IFirmwareReleaseInfo } from '../settings';
|
|
4
5
|
type FirmwareRelease = {
|
|
5
6
|
status: IDeviceFirmwareStatus;
|
|
6
7
|
changelog: {
|
|
@@ -10,6 +11,9 @@ type FirmwareRelease = {
|
|
|
10
11
|
release: IFirmwareReleaseInfo;
|
|
11
12
|
bootloaderMode: boolean;
|
|
12
13
|
};
|
|
13
|
-
export
|
|
14
|
+
export type CheckFirmwareReleaseParams = {
|
|
15
|
+
firmwareType?: EFirmwareType;
|
|
16
|
+
};
|
|
17
|
+
export declare function checkFirmwareRelease(connectId?: string, params?: CheckFirmwareReleaseParams): Response<FirmwareRelease>;
|
|
14
18
|
export {};
|
|
15
19
|
//# sourceMappingURL=checkFirmwareRelease.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkFirmwareRelease.d.ts","sourceRoot":"","sources":["../../../src/types/api/checkFirmwareRelease.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"checkFirmwareRelease.d.ts","sourceRoot":"","sources":["../../../src/types/api/checkFirmwareRelease.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAEvD,KAAK,eAAe,GAAG;IACrB,MAAM,EAAE,qBAAqB,CAAC;IAC9B,SAAS,EAAE;QACT,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;KACjB,EAAE,CAAC;IACJ,OAAO,EAAE,oBAAoB,CAAC;IAC9B,cAAc,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,YAAY,CAAC,EAAE,aAAa,CAAC;CAC9B,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAC1C,SAAS,CAAC,EAAE,MAAM,EAClB,MAAM,CAAC,EAAE,0BAA0B,GAClC,QAAQ,CAAC,eAAe,CAAC,CAAC"}
|
|
@@ -1,5 +1,10 @@
|
|
|
1
|
-
import { Success } from '@onekeyfe/hd-transport';
|
|
1
|
+
import type { Success } from '@onekeyfe/hd-transport';
|
|
2
|
+
import type { EFirmwareType } from '@onekeyfe/hd-shared';
|
|
2
3
|
import type { CommonParams, Response } from '../params';
|
|
4
|
+
export type DeviceFullyUploadResourceParams = {
|
|
5
|
+
binary?: ArrayBuffer;
|
|
6
|
+
firmwareType?: EFirmwareType;
|
|
7
|
+
};
|
|
3
8
|
export declare function deviceFullyUploadResource(connectId: string, params: CommonParams & {
|
|
4
9
|
binary?: ArrayBuffer;
|
|
5
10
|
}): Response<Success>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deviceFullyUploadResource.d.ts","sourceRoot":"","sources":["../../../src/types/api/deviceFullyUploadResource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"deviceFullyUploadResource.d.ts","sourceRoot":"","sources":["../../../src/types/api/deviceFullyUploadResource.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,+BAA+B,GAAG;IAC5C,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,YAAY,CAAC,EAAE,aAAa,CAAC;CAC9B,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,yBAAyB,CAC/C,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,YAAY,GAAG;IACrB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,GACA,QAAQ,CAAC,OAAO,CAAC,CAAC"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
-
import { Success } from '@onekeyfe/hd-transport';
|
|
1
|
+
import type { Success } from '@onekeyfe/hd-transport';
|
|
2
|
+
import type { EFirmwareType } from '@onekeyfe/hd-shared';
|
|
2
3
|
import type { Response } from '../params';
|
|
3
|
-
export
|
|
4
|
+
export type DeviceUpdateBootloaderParams = {
|
|
4
5
|
binary?: ArrayBuffer;
|
|
5
|
-
|
|
6
|
+
firmwareType?: EFirmwareType;
|
|
7
|
+
};
|
|
8
|
+
export declare function deviceUpdateBootloader(connectId: string, params?: DeviceUpdateBootloaderParams): Response<Success>;
|
|
6
9
|
//# sourceMappingURL=deviceUpdateBootloader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deviceUpdateBootloader.d.ts","sourceRoot":"","sources":["../../../src/types/api/deviceUpdateBootloader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"deviceUpdateBootloader.d.ts","sourceRoot":"","sources":["../../../src/types/api/deviceUpdateBootloader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE1C,MAAM,MAAM,4BAA4B,GAAG;IACzC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,YAAY,CAAC,EAAE,aAAa,CAAC;CAC9B,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAC5C,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,4BAA4B,GACpC,QAAQ,CAAC,OAAO,CAAC,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { EFirmwareType } from '@onekeyfe/hd-shared';
|
|
1
2
|
import type { PROTO } from '../../constants';
|
|
2
3
|
import type { Params, Response } from '../params';
|
|
3
4
|
type IUpdateType = 'firmware' | 'ble';
|
|
@@ -7,10 +8,10 @@ export interface FirmwareUpdateBinaryParams {
|
|
|
7
8
|
}
|
|
8
9
|
export interface FirmwareUpdateParams {
|
|
9
10
|
version?: number[];
|
|
10
|
-
btcOnly?: boolean;
|
|
11
11
|
updateType: IUpdateType;
|
|
12
12
|
forcedUpdateRes?: boolean;
|
|
13
13
|
isUpdateBootloader?: boolean;
|
|
14
|
+
firmwareType?: EFirmwareType;
|
|
14
15
|
}
|
|
15
16
|
export declare function firmwareUpdate(connectId: string | undefined, params: Params<FirmwareUpdateParams> & {
|
|
16
17
|
rebootOnSuccess?: boolean;
|
|
@@ -33,6 +34,7 @@ export interface FirmwareUpdateV3Params {
|
|
|
33
34
|
bootloaderBinary?: ArrayBuffer;
|
|
34
35
|
resourceBinary?: ArrayBuffer;
|
|
35
36
|
forcedUpdateRes?: boolean;
|
|
37
|
+
firmwareType?: EFirmwareType;
|
|
36
38
|
platform: IPlatform;
|
|
37
39
|
}
|
|
38
40
|
export declare function firmwareUpdateV3(connectId: string | undefined, params: Params<FirmwareUpdateV3Params>): Response<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"firmwareUpdate.d.ts","sourceRoot":"","sources":["../../../src/types/api/firmwareUpdate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAElD,KAAK,WAAW,GAAG,UAAU,GAAG,KAAK,CAAC;AAEtC,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,WAAW,CAAC;IACpB,UAAU,EAAE,WAAW,CAAC;CACzB;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,
|
|
1
|
+
{"version":3,"file":"firmwareUpdate.d.ts","sourceRoot":"","sources":["../../../src/types/api/firmwareUpdate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAElD,KAAK,WAAW,GAAG,UAAU,GAAG,KAAK,CAAC;AAEtC,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,WAAW,CAAC;IACpB,UAAU,EAAE,WAAW,CAAC;CACzB;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,EAAE,WAAW,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,YAAY,CAAC,EAAE,aAAa,CAAC;CAC9B;AAED,MAAM,CAAC,OAAO,UAAU,cAAc,CACpC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,MAAM,EAAE,MAAM,CAAC,oBAAoB,CAAC,GAAG;IAAE,eAAe,CAAC,EAAE,OAAO,CAAA;CAAE,GACnE,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAC3B,MAAM,CAAC,OAAO,UAAU,cAAc,CACpC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,MAAM,EAAE,MAAM,CAAC,0BAA0B,CAAC,GAAG;IAAE,eAAe,CAAC,EAAE,OAAO,CAAA;CAAE,GACzE,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAE3B,KAAK,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG,WAAW,CAAC;AACpE,KAAK,QAAQ,GAAG;IAAE,QAAQ,EAAE,SAAS,CAAA;CAAE,CAAC;AAExC,MAAM,CAAC,OAAO,UAAU,gBAAgB,CACtC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,MAAM,EAAE,MAAM,CAAC,oBAAoB,GAAG,QAAQ,CAAC,GAC9C,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAC3B,MAAM,CAAC,OAAO,UAAU,gBAAgB,CACtC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,MAAM,EAAE,MAAM,CAAC,0BAA0B,GAAG,QAAQ,CAAC,GACpD,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAE3B,MAAM,WAAW,sBAAsB;IACrC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,CAAC,EAAE,WAAW,CAAC;IAExB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,cAAc,CAAC,EAAE,WAAW,CAAC;IAE7B,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,gBAAgB,CAAC,EAAE,WAAW,CAAC;IAE/B,cAAc,CAAC,EAAE,WAAW,CAAC;IAC7B,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,YAAY,CAAC,EAAE,aAAa,CAAC;IAE7B,QAAQ,EAAE,SAAS,CAAC;CACrB;AAED,MAAM,CAAC,OAAO,UAAU,gBAAgB,CACtC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,MAAM,EAAE,MAAM,CAAC,sBAAsB,CAAC,GACrC,QAAQ,CAAC;IACV,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC,CAAC"}
|
package/dist/types/settings.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { EFirmwareType } from '@onekeyfe/hd-shared';
|
|
1
2
|
import type { IDeviceType } from './device';
|
|
2
3
|
export type transportEnv = 'node' | 'web' | 'webextension' | 'electron' | 'react-native' | 'webusb' | 'desktop-web-ble' | 'emulator' | 'lowlevel';
|
|
3
4
|
export type ConnectSettings = {
|
|
@@ -25,6 +26,7 @@ export type ILocale = 'zh-CN' | 'en-US';
|
|
|
25
26
|
export type IFirmwareReleaseInfo = {
|
|
26
27
|
required: boolean;
|
|
27
28
|
url: string;
|
|
29
|
+
firmwareType?: EFirmwareType;
|
|
28
30
|
resource?: string;
|
|
29
31
|
fullResource?: string;
|
|
30
32
|
fullResourceRange?: string[];
|
|
@@ -58,6 +60,7 @@ export type DeviceTypeMap = {
|
|
|
58
60
|
firmware: IFirmwareReleaseInfo[];
|
|
59
61
|
'firmware-v2'?: IFirmwareReleaseInfo[];
|
|
60
62
|
'firmware-v7'?: IFirmwareReleaseInfo[];
|
|
63
|
+
'firmware-btc-v7'?: IFirmwareReleaseInfo[];
|
|
61
64
|
ble: IBLEFirmwareReleaseInfo[];
|
|
62
65
|
};
|
|
63
66
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/types/settings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C,MAAM,MAAM,YAAY,GACpB,MAAM,GACN,KAAK,GACL,cAAc,GACd,UAAU,GACV,cAAc,GACd,QAAQ,GACR,iBAAiB,GACjB,UAAU,GACV,UAAU,CAAC;AACf,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IACrB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,GAAG,EAAE,YAAY,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAErD,MAAM,MAAM,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC;AAGxC,MAAM,MAAM,oBAAoB,GAAG;IACjC,QAAQ,EAAE,OAAO,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/types/settings.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { type EFirmwareType } from '@onekeyfe/hd-shared';
|
|
2
|
+
import { type IFirmwareField, type MessageVersion } from '../data-manager/DataManager';
|
|
3
|
+
import type { Device } from '../device/Device';
|
|
4
|
+
import type { DeviceCommands } from '../device/DeviceCommands';
|
|
2
5
|
import type { Features, SupportFeatureType } from '../types';
|
|
3
|
-
import { IFirmwareField, MessageVersion } from '../data-manager/DataManager';
|
|
4
|
-
import { Device } from '../device/Device';
|
|
5
6
|
export declare const getSupportMessageVersion: (features: Features | undefined) => {
|
|
6
7
|
messages: JSON;
|
|
7
8
|
messageVersion: MessageVersion;
|
|
@@ -28,12 +29,13 @@ export declare const supportBatchPublicKey: (features?: Features, options?: {
|
|
|
28
29
|
includeNode?: boolean;
|
|
29
30
|
}) => boolean;
|
|
30
31
|
export declare const supportModifyHomescreen: (features?: Features) => SupportFeatureType;
|
|
31
|
-
export declare const getFirmwareUpdateField: ({ features, updateType, targetVersion, }: {
|
|
32
|
+
export declare const getFirmwareUpdateField: ({ features, updateType, targetVersion, firmwareType, }: {
|
|
32
33
|
features: Features;
|
|
33
34
|
updateType: 'firmware' | 'ble';
|
|
34
35
|
targetVersion?: string | undefined;
|
|
36
|
+
firmwareType: EFirmwareType;
|
|
35
37
|
}) => 'ble' | IFirmwareField;
|
|
36
|
-
export declare const getFirmwareUpdateFieldArray: (features: Features, updateType: 'firmware' | 'ble' | 'bootloader') => ('
|
|
38
|
+
export declare const getFirmwareUpdateFieldArray: (features: Features, updateType: 'firmware' | 'ble' | 'bootloader') => ('ble' | IFirmwareField)[];
|
|
37
39
|
export declare function fixVersion(version: string): string;
|
|
38
40
|
export declare const fixFeaturesFirmwareVersion: (features: Features) => Features;
|
|
39
41
|
//# sourceMappingURL=deviceFeaturesUtils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deviceFeaturesUtils.d.ts","sourceRoot":"","sources":["../../src/utils/deviceFeaturesUtils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"deviceFeaturesUtils.d.ts","sourceRoot":"","sources":["../../src/utils/deviceFeaturesUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAe,KAAK,aAAa,EAA6B,MAAM,qBAAqB,CAAC;AAKjG,OAAoB,EAAE,KAAK,cAAc,EAAE,KAAK,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAMpG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAE7D,eAAO,MAAM,wBAAwB,aACzB,QAAQ,GAAG,SAAS,KAC7B;IAAE,QAAQ,EAAE,IAAI,CAAC;IAAC,cAAc,EAAE,cAAc,CAAA;CAiClD,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAAc,QAAQ,KAAG,kBAU9D,CAAC;AAEF,eAAO,MAAM,oBAAoB,cAAe,QAAQ,KAAG,kBAW1D,CAAC;AAEF,eAAO,MAAM,uCAAuC,WAC1C,MAAM,YACJ;IACR,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;;;;EAwCF,CAAC;AAEF,eAAO,MAAM,kBAAkB,aACnB,QAAQ,GAAG,SAAS,YACpB,cAAc,YACd;IACR,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,KACA,QAAQ;IACT,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,iBAAiB,EAAE,OAAO,GAAG,SAAS,CAAC;CACxC,CAiDA,CAAC;AAEF,eAAO,MAAM,qBAAqB,cACrB,QAAQ,YACT;IACR,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,KACA,OA4BF,CAAC;AAEF,eAAO,MAAM,uBAAuB,cAAe,QAAQ,KAAG,kBAU7D,CAAC;AAYF,eAAO,MAAM,sBAAsB;cAMvB,QAAQ;gBACN,UAAU,GAAG,KAAK;;kBAEhB,aAAa;MACzB,KAAK,GAAG,cA0BX,CAAC;AAMF,eAAO,MAAM,2BAA2B,aAC5B,QAAQ,cACN,UAAU,GAAG,KAAK,GAAG,YAAY,KAC5C,CAAC,KAAK,GAAG,cAAc,CAAC,EAkC1B,CAAC;AAEF,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,UASzC;AAED,eAAO,MAAM,0BAA0B,aAAc,QAAQ,KAAG,QAc/D,CAAC"}
|
package/dist/utils/release.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { IBLEFirmwareReleaseInfo, IDeviceFirmwareStatus, IFirmwareReleaseInfo, IVersionArray } from '../types';
|
|
1
|
+
import type { IBLEFirmwareReleaseInfo, IDeviceFirmwareStatus, IFirmwareReleaseInfo, IVersionArray } from '../types';
|
|
2
2
|
export declare const getReleaseStatus: (releases: (IFirmwareReleaseInfo | IBLEFirmwareReleaseInfo)[], currentVersion: string) => IDeviceFirmwareStatus;
|
|
3
3
|
export declare const getReleaseChangelog: (releases: (IFirmwareReleaseInfo | IBLEFirmwareReleaseInfo)[], currentVersion: string) => IFirmwareReleaseInfo['changelog'][];
|
|
4
4
|
export declare const findLatestRelease: <T extends {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"release.d.ts","sourceRoot":"","sources":["../../src/utils/release.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"release.d.ts","sourceRoot":"","sources":["../../src/utils/release.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,uBAAuB,EACvB,qBAAqB,EACrB,oBAAoB,EACpB,aAAa,EACd,MAAM,UAAU,CAAC;AAElB,eAAO,MAAM,gBAAgB,aACjB,CAAC,oBAAoB,GAAG,uBAAuB,CAAC,EAAE,kBAC5C,MAAM,KACrB,qBASF,CAAC;AAEF,eAAO,MAAM,mBAAmB,aACpB,CAAC,oBAAoB,GAAG,uBAAuB,CAAC,EAAE,kBAC5C,MAAM,KACrB,oBAAoB,CAAC,WAAW,CAAC,EAGnC,CAAC;AAEF,eAAO,MAAM,iBAAiB;;kCAU7B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@onekeyfe/hd-core",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.18-alpha.1",
|
|
4
4
|
"description": "Core processes and APIs for communicating with OneKey hardware devices.",
|
|
5
5
|
"author": "OneKey",
|
|
6
6
|
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
|
|
@@ -25,8 +25,8 @@
|
|
|
25
25
|
"url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@onekeyfe/hd-shared": "1.1.
|
|
29
|
-
"@onekeyfe/hd-transport": "1.1.
|
|
28
|
+
"@onekeyfe/hd-shared": "1.1.18-alpha.1",
|
|
29
|
+
"@onekeyfe/hd-transport": "1.1.18-alpha.1",
|
|
30
30
|
"axios": "1.12.2",
|
|
31
31
|
"bignumber.js": "^9.0.2",
|
|
32
32
|
"bytebuffer": "^5.0.1",
|
|
@@ -46,5 +46,5 @@
|
|
|
46
46
|
"@types/web-bluetooth": "^0.0.21",
|
|
47
47
|
"ripple-keypairs": "^1.3.1"
|
|
48
48
|
},
|
|
49
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "8f7733c7e746f2cec46b404dd8286ac78a8f7ab1"
|
|
50
50
|
}
|
package/src/api/BaseMethod.ts
CHANGED
|
@@ -1,18 +1,27 @@
|
|
|
1
1
|
import semver from 'semver';
|
|
2
2
|
import {
|
|
3
|
-
createNeedUpgradeFirmwareHardwareError,
|
|
4
3
|
ERRORS,
|
|
5
4
|
HardwareErrorCode,
|
|
5
|
+
createNeedUpgradeFirmwareHardwareError,
|
|
6
6
|
} from '@onekeyfe/hd-shared';
|
|
7
|
+
|
|
7
8
|
import { supportInputPinOnSoftware, supportModifyHomescreen } from '../utils/deviceFeaturesUtils';
|
|
8
9
|
import { createDeviceMessage } from '../events/device';
|
|
9
10
|
import { UI_REQUEST } from '../constants/ui-request';
|
|
10
|
-
import {
|
|
11
|
-
import DeviceConnector from '../device/DeviceConnector';
|
|
12
|
-
import { DeviceFirmwareRange, KnownDevice } from '../types';
|
|
13
|
-
import { CoreMessage, createFirmwareMessage, createUiMessage, DEVICE, FIRMWARE } from '../events';
|
|
11
|
+
import { DEVICE, FIRMWARE, createFirmwareMessage, createUiMessage } from '../events';
|
|
14
12
|
import { getBleFirmwareReleaseInfo, getFirmwareReleaseInfo } from './firmware/releaseHelper';
|
|
15
|
-
import {
|
|
13
|
+
import {
|
|
14
|
+
LoggerNames,
|
|
15
|
+
getDeviceFirmwareVersion,
|
|
16
|
+
getFirmwareType,
|
|
17
|
+
getLogger,
|
|
18
|
+
getMethodVersionRange,
|
|
19
|
+
} from '../utils';
|
|
20
|
+
|
|
21
|
+
import type { Device } from '../device/Device';
|
|
22
|
+
import type DeviceConnector from '../device/DeviceConnector';
|
|
23
|
+
import type { DeviceFirmwareRange, KnownDevice } from '../types';
|
|
24
|
+
import type { CoreMessage } from '../events';
|
|
16
25
|
import type { CoreContext } from '../core';
|
|
17
26
|
|
|
18
27
|
const Log = getLogger(LoggerNames.Method);
|
|
@@ -128,7 +137,8 @@ export abstract class BaseMethod<Params = undefined> {
|
|
|
128
137
|
|
|
129
138
|
checkFirmwareRelease() {
|
|
130
139
|
if (!this.device || !this.device.features) return;
|
|
131
|
-
const
|
|
140
|
+
const firmwareType = getFirmwareType(this.device.features);
|
|
141
|
+
const releaseInfo = getFirmwareReleaseInfo(this.device.features, firmwareType);
|
|
132
142
|
this.postMessage(
|
|
133
143
|
createFirmwareMessage(FIRMWARE.RELEASE_INFO, {
|
|
134
144
|
...releaseInfo,
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import { BaseMethod } from './BaseMethod';
|
|
2
2
|
import { UI_REQUEST } from '../constants/ui-request';
|
|
3
|
-
|
|
4
3
|
import {
|
|
5
4
|
getBleFirmwareReleaseInfo,
|
|
6
5
|
getBootloaderReleaseInfo,
|
|
7
6
|
getFirmwareReleaseInfo,
|
|
8
7
|
} from './firmware/releaseHelper';
|
|
9
8
|
import { getBridgeReleaseInfo } from '../utils/bridgeUpdate';
|
|
10
|
-
import {
|
|
9
|
+
import { getDeviceFirmwareVersion, getDeviceType, getFirmwareType } from '../utils';
|
|
10
|
+
|
|
11
|
+
import type {
|
|
11
12
|
AllFirmwareRelease,
|
|
12
13
|
CheckAllFirmwareReleaseParams,
|
|
13
14
|
} from '../types/api/checkAllFirmwareRelease';
|
|
14
|
-
import { getDeviceFirmwareVersion, getDeviceType } from '../utils';
|
|
15
15
|
|
|
16
16
|
export default class CheckAllFirmwareRelease extends BaseMethod {
|
|
17
17
|
init() {
|
|
@@ -22,13 +22,16 @@ export default class CheckAllFirmwareRelease extends BaseMethod {
|
|
|
22
22
|
|
|
23
23
|
async run() {
|
|
24
24
|
const { features } = this.device;
|
|
25
|
-
const { checkBridgeRelease } = this
|
|
25
|
+
const { checkBridgeRelease, firmwareType: firmwareTypeParams } = this
|
|
26
|
+
.payload as CheckAllFirmwareReleaseParams;
|
|
26
27
|
|
|
27
28
|
if (!features) {
|
|
28
29
|
return Promise.resolve(null);
|
|
29
30
|
}
|
|
30
31
|
|
|
31
|
-
const
|
|
32
|
+
const deviceFirmwareType = getFirmwareType(features);
|
|
33
|
+
const firmwareType = firmwareTypeParams ?? deviceFirmwareType;
|
|
34
|
+
const firmwareRelease = getFirmwareReleaseInfo(features, firmwareType);
|
|
32
35
|
|
|
33
36
|
const currentFirmwareVersion = getDeviceFirmwareVersion(features).join('.');
|
|
34
37
|
const willUpdateFirmwareVersion = firmwareRelease.release?.version?.join('.');
|
|
@@ -45,7 +48,11 @@ export default class CheckAllFirmwareRelease extends BaseMethod {
|
|
|
45
48
|
willUpdateFirmwareVersion,
|
|
46
49
|
});
|
|
47
50
|
}
|
|
48
|
-
const bootloaderRelease = getBootloaderReleaseInfo(
|
|
51
|
+
const bootloaderRelease = getBootloaderReleaseInfo({
|
|
52
|
+
features,
|
|
53
|
+
willUpdateFirmwareVersion,
|
|
54
|
+
firmwareType,
|
|
55
|
+
});
|
|
49
56
|
const bleFirmwareReleaseInfo = getBleFirmwareReleaseInfo(features);
|
|
50
57
|
|
|
51
58
|
return {
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { BaseMethod } from './BaseMethod';
|
|
2
|
-
|
|
3
2
|
import { UI_REQUEST } from '../constants/ui-request';
|
|
4
3
|
import { getBootloaderReleaseInfo } from './firmware/releaseHelper';
|
|
4
|
+
import { getFirmwareType } from '../utils';
|
|
5
|
+
|
|
6
|
+
import type { CheckBootloaderReleaseParams } from '../types/api/checkBootloaderRelease';
|
|
5
7
|
|
|
6
8
|
export default class CheckBootloaderRelease extends BaseMethod {
|
|
7
9
|
init() {
|
|
@@ -15,7 +17,16 @@ export default class CheckBootloaderRelease extends BaseMethod {
|
|
|
15
17
|
return null;
|
|
16
18
|
}
|
|
17
19
|
const { features } = this.device;
|
|
18
|
-
const
|
|
20
|
+
const payload = this.payload as CheckBootloaderReleaseParams;
|
|
21
|
+
|
|
22
|
+
const deviceFirmwareType = getFirmwareType(features);
|
|
23
|
+
const firmwareType = payload.firmwareType ?? deviceFirmwareType;
|
|
24
|
+
|
|
25
|
+
const releaseInfo = getBootloaderReleaseInfo({
|
|
26
|
+
features,
|
|
27
|
+
willUpdateFirmwareVersion: payload.willUpdateFirmwareVersion,
|
|
28
|
+
firmwareType,
|
|
29
|
+
});
|
|
19
30
|
return Promise.resolve(releaseInfo);
|
|
20
31
|
}
|
|
21
32
|
}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { BaseMethod } from './BaseMethod';
|
|
2
2
|
import { UI_REQUEST } from '../constants/ui-request';
|
|
3
|
-
|
|
4
3
|
import { getFirmwareReleaseInfo } from './firmware/releaseHelper';
|
|
4
|
+
import { getFirmwareType } from '../utils';
|
|
5
|
+
|
|
6
|
+
import type { CheckFirmwareReleaseParams } from '../types/api/checkFirmwareRelease';
|
|
5
7
|
|
|
6
8
|
export default class CheckFirmwareRelease extends BaseMethod {
|
|
7
9
|
init() {
|
|
@@ -15,8 +17,13 @@ export default class CheckFirmwareRelease extends BaseMethod {
|
|
|
15
17
|
}
|
|
16
18
|
|
|
17
19
|
run() {
|
|
20
|
+
const payload = this.payload as CheckFirmwareReleaseParams;
|
|
21
|
+
|
|
18
22
|
if (this.device.features) {
|
|
19
|
-
const
|
|
23
|
+
const deviceFirmwareType = getFirmwareType(this.device.features);
|
|
24
|
+
const firmwareType = payload.firmwareType ?? deviceFirmwareType;
|
|
25
|
+
|
|
26
|
+
const releaseInfo = getFirmwareReleaseInfo(this.device.features, firmwareType);
|
|
20
27
|
return Promise.resolve(releaseInfo);
|
|
21
28
|
}
|
|
22
29
|
return Promise.resolve(null);
|
|
@@ -1,24 +1,25 @@
|
|
|
1
1
|
import {
|
|
2
|
+
EFirmwareType,
|
|
2
3
|
ERRORS,
|
|
3
|
-
HardwareErrorCode,
|
|
4
4
|
HardwareError,
|
|
5
|
+
HardwareErrorCode,
|
|
5
6
|
createDeferred,
|
|
6
|
-
Deferred,
|
|
7
7
|
} from '@onekeyfe/hd-shared';
|
|
8
|
+
|
|
8
9
|
import { UI_REQUEST } from '../constants/ui-request';
|
|
9
10
|
import { BaseMethod } from './BaseMethod';
|
|
10
11
|
import { validateParams } from './helpers/paramsValidator';
|
|
11
12
|
import { getBinary } from './firmware/getBinary';
|
|
12
13
|
import { uploadFirmware } from './firmware/uploadFirmware';
|
|
13
14
|
import { createUiMessage } from '../events';
|
|
14
|
-
import { type KnownDevice
|
|
15
|
-
|
|
15
|
+
import { DeviceModelToTypes, type KnownDevice } from '../types';
|
|
16
16
|
import { isEnteredManuallyBoot } from './firmware/bootloaderHelper';
|
|
17
|
-
|
|
18
17
|
import { LoggerNames, getDeviceType, getDeviceUUID, getLogger, wait } from '../utils';
|
|
19
18
|
import { DataManager } from '../data-manager';
|
|
20
19
|
import { DevicePool } from '../device/DevicePool';
|
|
21
20
|
|
|
21
|
+
import type { Deferred } from '@onekeyfe/hd-shared';
|
|
22
|
+
|
|
22
23
|
type Params = {
|
|
23
24
|
binary?: ArrayBuffer;
|
|
24
25
|
version?: number[];
|
|
@@ -189,6 +190,7 @@ export default class FirmwareUpdate extends BaseMethod<Params> {
|
|
|
189
190
|
features: device.features,
|
|
190
191
|
version: params.version,
|
|
191
192
|
updateType: params.updateType,
|
|
193
|
+
firmwareType: EFirmwareType.Universal,
|
|
192
194
|
});
|
|
193
195
|
binary = firmware.binary;
|
|
194
196
|
this.postTipMessage('DownloadFirmwareSuccess');
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import {
|
|
2
|
-
|
|
3
|
-
Deferred,
|
|
2
|
+
type Deferred,
|
|
4
3
|
EDeviceType,
|
|
4
|
+
type EFirmwareType,
|
|
5
5
|
ERRORS,
|
|
6
6
|
HardwareError,
|
|
7
7
|
HardwareErrorCode,
|
|
8
|
+
createDeferred,
|
|
8
9
|
} from '@onekeyfe/hd-shared';
|
|
9
10
|
import semver from 'semver';
|
|
11
|
+
|
|
10
12
|
import { UI_REQUEST } from '../constants/ui-request';
|
|
11
13
|
import { BaseMethod } from './BaseMethod';
|
|
12
14
|
import { validateParams } from './helpers/paramsValidator';
|
|
@@ -14,20 +16,21 @@ import { DevicePool } from '../device/DevicePool';
|
|
|
14
16
|
import { getBinary, getInfo, getSysResourceBinary } from './firmware/getBinary';
|
|
15
17
|
import { updateResources, uploadFirmware } from './firmware/uploadFirmware';
|
|
16
18
|
import {
|
|
19
|
+
LoggerNames,
|
|
20
|
+
getDeviceFirmwareVersion,
|
|
17
21
|
getDeviceType,
|
|
18
22
|
getDeviceUUID,
|
|
19
|
-
|
|
23
|
+
getFirmwareType,
|
|
20
24
|
getLogger,
|
|
21
|
-
|
|
22
|
-
getDeviceFirmwareVersion,
|
|
25
|
+
wait,
|
|
23
26
|
} from '../utils';
|
|
24
|
-
import {
|
|
27
|
+
import { FirmwareUpdateTipMessage, createUiMessage } from '../events/ui-request';
|
|
25
28
|
import { DeviceModelToTypes } from '../types';
|
|
26
29
|
import { DataManager } from '../data-manager';
|
|
30
|
+
import { DEVICE } from '../events';
|
|
27
31
|
|
|
28
|
-
import type {
|
|
32
|
+
import type { Features, KnownDevice } from '../types';
|
|
29
33
|
import type { Device } from '../device/Device';
|
|
30
|
-
import { DEVICE } from '../events';
|
|
31
34
|
|
|
32
35
|
type Params = {
|
|
33
36
|
binary?: ArrayBuffer;
|
|
@@ -35,6 +38,7 @@ type Params = {
|
|
|
35
38
|
updateType: 'firmware' | 'ble';
|
|
36
39
|
forcedUpdateRes?: boolean;
|
|
37
40
|
isUpdateBootloader?: boolean;
|
|
41
|
+
firmwareType?: EFirmwareType;
|
|
38
42
|
};
|
|
39
43
|
|
|
40
44
|
const Log = getLogger(LoggerNames.Method);
|
|
@@ -55,6 +59,7 @@ export default class FirmwareUpdateV2 extends BaseMethod<Params> {
|
|
|
55
59
|
{ name: 'binary', type: 'buffer' },
|
|
56
60
|
{ name: 'forcedUpdateRes', type: 'boolean' },
|
|
57
61
|
{ name: 'platform', type: 'string', required: true },
|
|
62
|
+
{ name: 'firmwareType', type: 'string' },
|
|
58
63
|
]);
|
|
59
64
|
|
|
60
65
|
if (!payload.updateType) {
|
|
@@ -74,6 +79,7 @@ export default class FirmwareUpdateV2 extends BaseMethod<Params> {
|
|
|
74
79
|
this.params = {
|
|
75
80
|
...this.params,
|
|
76
81
|
version: payload.version,
|
|
82
|
+
firmwareType: payload.firmwareType,
|
|
77
83
|
};
|
|
78
84
|
}
|
|
79
85
|
|
|
@@ -246,14 +252,14 @@ export default class FirmwareUpdateV2 extends BaseMethod<Params> {
|
|
|
246
252
|
* Check the version number of Touch to determine if it
|
|
247
253
|
* needs to be upgraded via the desktop
|
|
248
254
|
*/
|
|
249
|
-
checkVersionForCopyTouchResource(features
|
|
255
|
+
checkVersionForCopyTouchResource(features: Features | undefined, firmwareType: EFirmwareType) {
|
|
250
256
|
if (!features) return;
|
|
251
257
|
const deviceType = getDeviceType(features);
|
|
252
258
|
const currentVersion = getDeviceFirmwareVersion(features).join('.');
|
|
253
259
|
const targetVersion = this.params.version?.join('.');
|
|
254
260
|
const { updateType } = this.params;
|
|
255
261
|
|
|
256
|
-
const releaseInfo = getInfo({ features, updateType });
|
|
262
|
+
const releaseInfo = getInfo({ features, updateType, firmwareType });
|
|
257
263
|
if (!releaseInfo) return;
|
|
258
264
|
const { fullResourceRange } = releaseInfo;
|
|
259
265
|
if (!fullResourceRange) return;
|
|
@@ -275,7 +281,10 @@ export default class FirmwareUpdateV2 extends BaseMethod<Params> {
|
|
|
275
281
|
const { features, commands } = device;
|
|
276
282
|
const deviceType = getDeviceType(features);
|
|
277
283
|
|
|
278
|
-
|
|
284
|
+
const deviceFirmwareType = getFirmwareType(device.features);
|
|
285
|
+
const firmwareType = params.firmwareType ?? deviceFirmwareType;
|
|
286
|
+
|
|
287
|
+
this.checkVersionForCopyTouchResource(features, firmwareType);
|
|
279
288
|
|
|
280
289
|
if (!features?.bootloader_mode && features) {
|
|
281
290
|
const uuid = getDeviceUUID(features);
|
|
@@ -287,10 +296,11 @@ export default class FirmwareUpdateV2 extends BaseMethod<Params> {
|
|
|
287
296
|
// check & upgrade firmware resource
|
|
288
297
|
if (features && this.isSupportResourceUpdate(features, params.updateType)) {
|
|
289
298
|
this.postTipMessage('CheckLatestUiResource');
|
|
290
|
-
const resourceUrl = DataManager.getSysResourcesLatestRelease(
|
|
299
|
+
const resourceUrl = DataManager.getSysResourcesLatestRelease({
|
|
291
300
|
features,
|
|
292
|
-
params.forcedUpdateRes
|
|
293
|
-
|
|
301
|
+
forcedUpdateRes: params.forcedUpdateRes,
|
|
302
|
+
firmwareType,
|
|
303
|
+
});
|
|
294
304
|
if (resourceUrl) {
|
|
295
305
|
this.postTipMessage('DownloadLatestUiResource');
|
|
296
306
|
const resource = await getSysResourceBinary(resourceUrl);
|
|
@@ -360,11 +370,13 @@ export default class FirmwareUpdateV2 extends BaseMethod<Params> {
|
|
|
360
370
|
);
|
|
361
371
|
}
|
|
362
372
|
this.postTipMessage('DownloadFirmware');
|
|
373
|
+
|
|
363
374
|
const firmware = await getBinary({
|
|
364
375
|
features: device.features,
|
|
365
376
|
version: params.version,
|
|
366
377
|
updateType: params.updateType,
|
|
367
378
|
isUpdateBootloader: params.isUpdateBootloader,
|
|
379
|
+
firmwareType,
|
|
368
380
|
});
|
|
369
381
|
binary = firmware.binary;
|
|
370
382
|
this.postTipMessage('DownloadFirmwareSuccess');
|