@onekeyfe/hd-core 1.1.8 → 1.1.9
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/data-manager/DataManager.d.ts +1 -1
- package/dist/index.d.ts +3 -3
- package/dist/index.js +8 -8
- package/dist/types/settings.d.ts +1 -1
- package/dist/utils/deviceFeaturesUtils.d.ts +1 -1
- package/package.json +4 -4
- package/src/data-manager/DataManager.ts +1 -1
- package/src/types/settings.ts +1 -1
- package/src/utils/deviceFeaturesUtils.ts +9 -9
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { AssetsMap, ConnectSettings, DeviceTypeMap, Features, IDeviceBLEFirmwareStatus, IDeviceFirmwareStatus, ITransportStatus, IVersionArray } from '../types';
|
|
2
|
-
export type IFirmwareField = 'firmware' | 'firmware-v2' | 'firmware-
|
|
2
|
+
export type IFirmwareField = 'firmware' | 'firmware-v2' | 'firmware-v7';
|
|
3
3
|
export type MessageVersion = 'latest' | 'v1';
|
|
4
4
|
export default class DataManager {
|
|
5
5
|
static deviceMap: DeviceTypeMap;
|
package/dist/index.d.ts
CHANGED
|
@@ -215,7 +215,7 @@ type DeviceTypeMap = {
|
|
|
215
215
|
[k in IKnownDevice]: {
|
|
216
216
|
firmware: IFirmwareReleaseInfo[];
|
|
217
217
|
'firmware-v2'?: IFirmwareReleaseInfo[];
|
|
218
|
-
'firmware-
|
|
218
|
+
'firmware-v7'?: IFirmwareReleaseInfo[];
|
|
219
219
|
ble: IBLEFirmwareReleaseInfo[];
|
|
220
220
|
};
|
|
221
221
|
};
|
|
@@ -3120,7 +3120,7 @@ declare const getDeviceBLEFirmwareVersion: (features: Features) => IVersionArray
|
|
|
3120
3120
|
declare const getDeviceBootloaderVersion: (features: Features | undefined) => IVersionArray;
|
|
3121
3121
|
declare const getDeviceBoardloaderVersion: (features: Features) => IVersionArray;
|
|
3122
3122
|
|
|
3123
|
-
type IFirmwareField = 'firmware' | 'firmware-v2' | 'firmware-
|
|
3123
|
+
type IFirmwareField = 'firmware' | 'firmware-v2' | 'firmware-v7';
|
|
3124
3124
|
type MessageVersion = 'latest' | 'v1';
|
|
3125
3125
|
declare class DataManager {
|
|
3126
3126
|
static deviceMap: DeviceTypeMap;
|
|
@@ -3168,7 +3168,7 @@ declare const getFirmwareUpdateField: ({ features, updateType, targetVersion, }:
|
|
|
3168
3168
|
updateType: 'firmware' | 'ble';
|
|
3169
3169
|
targetVersion?: string | undefined;
|
|
3170
3170
|
}) => 'ble' | IFirmwareField;
|
|
3171
|
-
declare const getFirmwareUpdateFieldArray: (features: Features, updateType: 'firmware' | 'ble' | 'bootloader') => ('firmware' | 'ble' | 'firmware-v2' | 'firmware-
|
|
3171
|
+
declare const getFirmwareUpdateFieldArray: (features: Features, updateType: 'firmware' | 'ble' | 'bootloader') => ('firmware' | 'ble' | 'firmware-v2' | 'firmware-v7')[];
|
|
3172
3172
|
|
|
3173
3173
|
declare function checkNeedUpdateBootForTouch(features: Features): boolean;
|
|
3174
3174
|
declare function checkNeedUpdateBootForClassicAndMini(features: Features, willUpdateFirmware?: string): boolean;
|
package/dist/index.js
CHANGED
|
@@ -25169,21 +25169,21 @@ const getFirmwareUpdateField = ({ features, updateType, targetVersion, }) => {
|
|
|
25169
25169
|
return 'ble';
|
|
25170
25170
|
}
|
|
25171
25171
|
if (DeviceModelToTypes.model_mini.includes(deviceType)) {
|
|
25172
|
-
return 'firmware-
|
|
25172
|
+
return 'firmware-v7';
|
|
25173
25173
|
}
|
|
25174
25174
|
if (deviceType === hdShared.EDeviceType.Touch) {
|
|
25175
25175
|
if (targetVersion) {
|
|
25176
25176
|
if (semver__default["default"].eq(targetVersion, '4.0.0'))
|
|
25177
25177
|
return 'firmware-v2';
|
|
25178
25178
|
if (semver__default["default"].gt(targetVersion, '4.0.0'))
|
|
25179
|
-
return 'firmware-
|
|
25179
|
+
return 'firmware-v7';
|
|
25180
25180
|
}
|
|
25181
25181
|
if (semver__default["default"].lt(deviceFirmwareVersion.join('.'), '3.4.0'))
|
|
25182
25182
|
return 'firmware';
|
|
25183
|
-
return 'firmware-
|
|
25183
|
+
return 'firmware-v7';
|
|
25184
25184
|
}
|
|
25185
25185
|
if (deviceType === hdShared.EDeviceType.Pro) {
|
|
25186
|
-
return 'firmware-
|
|
25186
|
+
return 'firmware-v7';
|
|
25187
25187
|
}
|
|
25188
25188
|
return 'firmware';
|
|
25189
25189
|
};
|
|
@@ -25196,23 +25196,23 @@ const getFirmwareUpdateFieldArray = (features, updateType) => {
|
|
|
25196
25196
|
deviceType === 'classic1s' ||
|
|
25197
25197
|
deviceType === 'mini' ||
|
|
25198
25198
|
deviceType === 'classicpure') {
|
|
25199
|
-
return ['firmware-
|
|
25199
|
+
return ['firmware-v7'];
|
|
25200
25200
|
}
|
|
25201
25201
|
if (deviceType === 'touch') {
|
|
25202
25202
|
const currentVersion = getDeviceFirmwareVersion(features).join('.');
|
|
25203
25203
|
if (semver__default["default"].gt(currentVersion, '4.0.0')) {
|
|
25204
|
-
return ['firmware-
|
|
25204
|
+
return ['firmware-v7', 'firmware'];
|
|
25205
25205
|
}
|
|
25206
25206
|
if (semver__default["default"].gte(currentVersion, '4.0.0')) {
|
|
25207
25207
|
return ['firmware-v2', 'firmware'];
|
|
25208
25208
|
}
|
|
25209
25209
|
if (!currentVersion || semver__default["default"].lt(currentVersion, '3.0.0')) {
|
|
25210
|
-
return ['firmware-
|
|
25210
|
+
return ['firmware-v7', 'firmware-v2', 'firmware'];
|
|
25211
25211
|
}
|
|
25212
25212
|
return ['firmware'];
|
|
25213
25213
|
}
|
|
25214
25214
|
if (deviceType === 'pro') {
|
|
25215
|
-
return ['firmware-
|
|
25215
|
+
return ['firmware-v7'];
|
|
25216
25216
|
}
|
|
25217
25217
|
return ['firmware'];
|
|
25218
25218
|
};
|
package/dist/types/settings.d.ts
CHANGED
|
@@ -56,7 +56,7 @@ export type DeviceTypeMap = {
|
|
|
56
56
|
[k in IKnownDevice]: {
|
|
57
57
|
firmware: IFirmwareReleaseInfo[];
|
|
58
58
|
'firmware-v2'?: IFirmwareReleaseInfo[];
|
|
59
|
-
'firmware-
|
|
59
|
+
'firmware-v7'?: IFirmwareReleaseInfo[];
|
|
60
60
|
ble: IBLEFirmwareReleaseInfo[];
|
|
61
61
|
};
|
|
62
62
|
};
|
|
@@ -33,7 +33,7 @@ export declare const getFirmwareUpdateField: ({ features, updateType, targetVers
|
|
|
33
33
|
updateType: 'firmware' | 'ble';
|
|
34
34
|
targetVersion?: string | undefined;
|
|
35
35
|
}) => 'ble' | IFirmwareField;
|
|
36
|
-
export declare const getFirmwareUpdateFieldArray: (features: Features, updateType: 'firmware' | 'ble' | 'bootloader') => ('firmware' | 'ble' | 'firmware-v2' | 'firmware-
|
|
36
|
+
export declare const getFirmwareUpdateFieldArray: (features: Features, updateType: 'firmware' | 'ble' | 'bootloader') => ('firmware' | 'ble' | 'firmware-v2' | 'firmware-v7')[];
|
|
37
37
|
export declare function fixVersion(version: string): string;
|
|
38
38
|
export declare const fixFeaturesFirmwareVersion: (features: Features) => Features;
|
|
39
39
|
//# sourceMappingURL=deviceFeaturesUtils.d.ts.map
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@onekeyfe/hd-core",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.9",
|
|
4
4
|
"description": "> TODO: description",
|
|
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.9",
|
|
29
|
+
"@onekeyfe/hd-transport": "1.1.9",
|
|
30
30
|
"axios": "^0.27.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": "3a222a7fef017b55554a544dbdcbb1810c642d39"
|
|
50
50
|
}
|
|
@@ -25,7 +25,7 @@ import type {
|
|
|
25
25
|
import { DeviceModelToTypes } from '../types';
|
|
26
26
|
import { findLatestRelease, getReleaseChangelog, getReleaseStatus } from '../utils/release';
|
|
27
27
|
|
|
28
|
-
export type IFirmwareField = 'firmware' | 'firmware-v2' | 'firmware-
|
|
28
|
+
export type IFirmwareField = 'firmware' | 'firmware-v2' | 'firmware-v7';
|
|
29
29
|
|
|
30
30
|
export type MessageVersion = 'latest' | 'v1';
|
|
31
31
|
|
package/src/types/settings.ts
CHANGED
|
@@ -78,7 +78,7 @@ export type DeviceTypeMap = {
|
|
|
78
78
|
[k in IKnownDevice]: {
|
|
79
79
|
firmware: IFirmwareReleaseInfo[];
|
|
80
80
|
'firmware-v2'?: IFirmwareReleaseInfo[];
|
|
81
|
-
'firmware-
|
|
81
|
+
'firmware-v7'?: IFirmwareReleaseInfo[];
|
|
82
82
|
ble: IBLEFirmwareReleaseInfo[];
|
|
83
83
|
};
|
|
84
84
|
};
|
|
@@ -240,21 +240,21 @@ export const getFirmwareUpdateField = ({
|
|
|
240
240
|
}
|
|
241
241
|
|
|
242
242
|
if (DeviceModelToTypes.model_mini.includes(deviceType)) {
|
|
243
|
-
return 'firmware-
|
|
243
|
+
return 'firmware-v7';
|
|
244
244
|
}
|
|
245
245
|
|
|
246
246
|
if (deviceType === EDeviceType.Touch) {
|
|
247
247
|
if (targetVersion) {
|
|
248
248
|
if (semver.eq(targetVersion, '4.0.0')) return 'firmware-v2';
|
|
249
|
-
if (semver.gt(targetVersion, '4.0.0')) return 'firmware-
|
|
249
|
+
if (semver.gt(targetVersion, '4.0.0')) return 'firmware-v7';
|
|
250
250
|
}
|
|
251
251
|
|
|
252
252
|
if (semver.lt(deviceFirmwareVersion.join('.'), '3.4.0')) return 'firmware';
|
|
253
253
|
|
|
254
|
-
return 'firmware-
|
|
254
|
+
return 'firmware-v7';
|
|
255
255
|
}
|
|
256
256
|
if (deviceType === EDeviceType.Pro) {
|
|
257
|
-
return 'firmware-
|
|
257
|
+
return 'firmware-v7';
|
|
258
258
|
}
|
|
259
259
|
return 'firmware';
|
|
260
260
|
};
|
|
@@ -266,7 +266,7 @@ export const getFirmwareUpdateField = ({
|
|
|
266
266
|
export const getFirmwareUpdateFieldArray = (
|
|
267
267
|
features: Features,
|
|
268
268
|
updateType: 'firmware' | 'ble' | 'bootloader'
|
|
269
|
-
): ('firmware' | 'ble' | 'firmware-v2' | 'firmware-
|
|
269
|
+
): ('firmware' | 'ble' | 'firmware-v2' | 'firmware-v7')[] => {
|
|
270
270
|
const deviceType = getDeviceType(features);
|
|
271
271
|
if (updateType === 'ble') {
|
|
272
272
|
return ['ble'];
|
|
@@ -278,25 +278,25 @@ export const getFirmwareUpdateFieldArray = (
|
|
|
278
278
|
deviceType === 'mini' ||
|
|
279
279
|
deviceType === 'classicpure'
|
|
280
280
|
) {
|
|
281
|
-
return ['firmware-
|
|
281
|
+
return ['firmware-v7'];
|
|
282
282
|
}
|
|
283
283
|
|
|
284
284
|
if (deviceType === 'touch') {
|
|
285
285
|
const currentVersion = getDeviceFirmwareVersion(features).join('.');
|
|
286
286
|
if (semver.gt(currentVersion, '4.0.0')) {
|
|
287
|
-
return ['firmware-
|
|
287
|
+
return ['firmware-v7', 'firmware'];
|
|
288
288
|
}
|
|
289
289
|
if (semver.gte(currentVersion, '4.0.0')) {
|
|
290
290
|
return ['firmware-v2', 'firmware'];
|
|
291
291
|
}
|
|
292
292
|
if (!currentVersion || semver.lt(currentVersion, '3.0.0')) {
|
|
293
|
-
return ['firmware-
|
|
293
|
+
return ['firmware-v7', 'firmware-v2', 'firmware'];
|
|
294
294
|
}
|
|
295
295
|
return ['firmware'];
|
|
296
296
|
}
|
|
297
297
|
|
|
298
298
|
if (deviceType === 'pro') {
|
|
299
|
-
return ['firmware-
|
|
299
|
+
return ['firmware-v7'];
|
|
300
300
|
}
|
|
301
301
|
|
|
302
302
|
return ['firmware'];
|