@ukeyfe/hardware-core 2.0.1 → 2.0.2
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.
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { FirmwareUpdateBaseMethod } from './firmware/FirmwareUpdateBaseMethod';
|
|
2
2
|
import type { FirmwareUpdateV3Params } from '../types/api/firmwareUpdate';
|
|
3
3
|
import type { Deferred } from '@ukeyfe/hardware-shared';
|
|
4
|
-
export declare const MIN_UPDATE_V3_BOOTLOADER_VERSION = "
|
|
4
|
+
export declare const MIN_UPDATE_V3_BOOTLOADER_VERSION = "2.8.0";
|
|
5
5
|
export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareUpdateV3Params> {
|
|
6
6
|
checkPromise: Deferred<any> | null;
|
|
7
7
|
private isSwitchFirmware;
|
package/dist/index.js
CHANGED
|
@@ -25682,12 +25682,12 @@ const getFirmwareUpdateField = ({ features, updateType, targetVersion, firmwareT
|
|
|
25682
25682
|
}
|
|
25683
25683
|
if (deviceType === hardwareShared.EDeviceType.Touch) {
|
|
25684
25684
|
if (targetVersion) {
|
|
25685
|
-
if (semver__default["default"].eq(targetVersion, '
|
|
25685
|
+
if (semver__default["default"].eq(targetVersion, '4.0.0'))
|
|
25686
25686
|
return 'firmware-v2';
|
|
25687
|
-
if (semver__default["default"].gt(targetVersion, '
|
|
25687
|
+
if (semver__default["default"].gt(targetVersion, '4.0.0'))
|
|
25688
25688
|
return latestFirmwareField;
|
|
25689
25689
|
}
|
|
25690
|
-
if (semver__default["default"].lt(deviceFirmwareVersion.join('.'), '
|
|
25690
|
+
if (semver__default["default"].lt(deviceFirmwareVersion.join('.'), '3.4.0'))
|
|
25691
25691
|
return 'firmware';
|
|
25692
25692
|
return latestFirmwareField;
|
|
25693
25693
|
}
|
|
@@ -25709,13 +25709,13 @@ const getFirmwareUpdateFieldArray = (features, updateType) => {
|
|
|
25709
25709
|
}
|
|
25710
25710
|
if (deviceType === 'touch') {
|
|
25711
25711
|
const currentVersion = getDeviceFirmwareVersion(features).join('.');
|
|
25712
|
-
if (semver__default["default"].gt(currentVersion, '
|
|
25712
|
+
if (semver__default["default"].gt(currentVersion, '4.0.0')) {
|
|
25713
25713
|
return ['firmware-v8', 'firmware'];
|
|
25714
25714
|
}
|
|
25715
|
-
if (semver__default["default"].gte(currentVersion, '
|
|
25715
|
+
if (semver__default["default"].gte(currentVersion, '4.0.0')) {
|
|
25716
25716
|
return ['firmware-v2', 'firmware'];
|
|
25717
25717
|
}
|
|
25718
|
-
if (!currentVersion || semver__default["default"].lt(currentVersion, '
|
|
25718
|
+
if (!currentVersion || semver__default["default"].lt(currentVersion, '3.0.0')) {
|
|
25719
25719
|
return ['firmware-v8', 'firmware-v2', 'firmware'];
|
|
25720
25720
|
}
|
|
25721
25721
|
return ['firmware'];
|
|
@@ -29179,7 +29179,7 @@ const getInfo = ({ features, updateType, targetVersion, firmwareType }) => {
|
|
|
29179
29179
|
return findLatestRelease(releaseInfo);
|
|
29180
29180
|
};
|
|
29181
29181
|
|
|
29182
|
-
const NEW_BOOT_UPRATE_FIRMWARE_VERSION = '
|
|
29182
|
+
const NEW_BOOT_UPRATE_FIRMWARE_VERSION = '2.4.5';
|
|
29183
29183
|
const SESSION_ERROR$1 = 'session not found';
|
|
29184
29184
|
const FIRMWARE_UPDATE_CONFIRM$1 = 'Firmware install confirmed';
|
|
29185
29185
|
const Log$8 = getLogger(exports.LoggerNames.Method);
|
|
@@ -29230,7 +29230,7 @@ const uploadFirmware = (updateType, typedCall, postMessage, device, { payload, r
|
|
|
29230
29230
|
if (isFirmware && !isUpdateBootloader) {
|
|
29231
29231
|
const newFeatures = yield typedCall('GetFeatures', 'Features', {});
|
|
29232
29232
|
const deviceBootloaderVersion = getDeviceBootloaderVersion(newFeatures.message).join('.');
|
|
29233
|
-
const supportUpgradeFileHeader = semver__default["default"].gte(deviceBootloaderVersion, '
|
|
29233
|
+
const supportUpgradeFileHeader = semver__default["default"].gte(deviceBootloaderVersion, '2.1.0');
|
|
29234
29234
|
Log$8.debug('supportUpgradeFileHeader:', supportUpgradeFileHeader);
|
|
29235
29235
|
if (supportUpgradeFileHeader) {
|
|
29236
29236
|
const HEADER_SIZE = 1024;
|
|
@@ -30487,7 +30487,7 @@ class FirmwareUpdateV2 extends BaseMethod {
|
|
|
30487
30487
|
}
|
|
30488
30488
|
|
|
30489
30489
|
const Log$4 = getLogger(exports.LoggerNames.Method);
|
|
30490
|
-
const MIN_UPDATE_V3_BOOTLOADER_VERSION = '
|
|
30490
|
+
const MIN_UPDATE_V3_BOOTLOADER_VERSION = '2.8.0';
|
|
30491
30491
|
class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
|
|
30492
30492
|
constructor() {
|
|
30493
30493
|
super(...arguments);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ukeyfe/hardware-core",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.2",
|
|
4
4
|
"description": "Core processes and APIs for communicating with UKey hardware devices.",
|
|
5
5
|
"author": "UKey",
|
|
6
6
|
"homepage": "https://github.com/UKeyHQ/hardware-js-sdk#readme",
|
|
@@ -25,8 +25,8 @@
|
|
|
25
25
|
"url": "https://github.com/UKeyHQ/hardware-js-sdk/issues"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@ukeyfe/hardware-shared": "2.0.
|
|
29
|
-
"@ukeyfe/hardware-transport": "2.0.
|
|
28
|
+
"@ukeyfe/hardware-shared": "2.0.2",
|
|
29
|
+
"@ukeyfe/hardware-transport": "2.0.2",
|
|
30
30
|
"axios": "1.12.2",
|
|
31
31
|
"bignumber.js": "^9.0.2",
|
|
32
32
|
"bytebuffer": "^5.0.1",
|
|
@@ -44,5 +44,5 @@
|
|
|
44
44
|
"@types/w3c-web-usb": "^1.0.10",
|
|
45
45
|
"@types/web-bluetooth": "^0.0.21"
|
|
46
46
|
},
|
|
47
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "81ddb68e310972be6195205a101391d174a983bd"
|
|
48
48
|
}
|
|
@@ -25,7 +25,7 @@ import type { TypedResponseMessage } from '../device/DeviceCommands';
|
|
|
25
25
|
|
|
26
26
|
const Log = getLogger(LoggerNames.Method);
|
|
27
27
|
|
|
28
|
-
export const MIN_UPDATE_V3_BOOTLOADER_VERSION = '
|
|
28
|
+
export const MIN_UPDATE_V3_BOOTLOADER_VERSION = '2.8.0';
|
|
29
29
|
|
|
30
30
|
/**
|
|
31
31
|
* FirmwareUpdateV3 flow
|
|
@@ -24,7 +24,7 @@ import type { CoreMessage, IFirmwareUpdateProgressType } from '../../events';
|
|
|
24
24
|
import type { Success } from '@ukeyfe/hardware-transport';
|
|
25
25
|
import type { Device } from '../../device/Device';
|
|
26
26
|
|
|
27
|
-
const NEW_BOOT_UPRATE_FIRMWARE_VERSION = '
|
|
27
|
+
const NEW_BOOT_UPRATE_FIRMWARE_VERSION = '2.4.5';
|
|
28
28
|
const SESSION_ERROR = 'session not found';
|
|
29
29
|
const FIRMWARE_UPDATE_CONFIRM = 'Firmware install confirmed';
|
|
30
30
|
|
|
@@ -117,7 +117,7 @@ export const uploadFirmware = async (
|
|
|
117
117
|
if (isFirmware && !isUpdateBootloader) {
|
|
118
118
|
const newFeatures = await typedCall('GetFeatures', 'Features', {});
|
|
119
119
|
const deviceBootloaderVersion = getDeviceBootloaderVersion(newFeatures.message).join('.');
|
|
120
|
-
const supportUpgradeFileHeader = semver.gte(deviceBootloaderVersion, '
|
|
120
|
+
const supportUpgradeFileHeader = semver.gte(deviceBootloaderVersion, '2.1.0');
|
|
121
121
|
Log.debug('supportUpgradeFileHeader:', supportUpgradeFileHeader);
|
|
122
122
|
|
|
123
123
|
if (supportUpgradeFileHeader) {
|
|
@@ -267,11 +267,11 @@ export const getFirmwareUpdateField = ({
|
|
|
267
267
|
|
|
268
268
|
if (deviceType === EDeviceType.Touch) {
|
|
269
269
|
if (targetVersion) {
|
|
270
|
-
if (semver.eq(targetVersion, '
|
|
271
|
-
if (semver.gt(targetVersion, '
|
|
270
|
+
if (semver.eq(targetVersion, '4.0.0')) return 'firmware-v2';
|
|
271
|
+
if (semver.gt(targetVersion, '4.0.0')) return latestFirmwareField;
|
|
272
272
|
}
|
|
273
273
|
|
|
274
|
-
if (semver.lt(deviceFirmwareVersion.join('.'), '
|
|
274
|
+
if (semver.lt(deviceFirmwareVersion.join('.'), '3.4.0')) return 'firmware';
|
|
275
275
|
|
|
276
276
|
return latestFirmwareField;
|
|
277
277
|
}
|
|
@@ -305,13 +305,13 @@ export const getFirmwareUpdateFieldArray = (
|
|
|
305
305
|
|
|
306
306
|
if (deviceType === 'touch') {
|
|
307
307
|
const currentVersion = getDeviceFirmwareVersion(features).join('.');
|
|
308
|
-
if (semver.gt(currentVersion, '
|
|
308
|
+
if (semver.gt(currentVersion, '4.0.0')) {
|
|
309
309
|
return ['firmware-v8', 'firmware'];
|
|
310
310
|
}
|
|
311
|
-
if (semver.gte(currentVersion, '
|
|
311
|
+
if (semver.gte(currentVersion, '4.0.0')) {
|
|
312
312
|
return ['firmware-v2', 'firmware'];
|
|
313
313
|
}
|
|
314
|
-
if (!currentVersion || semver.lt(currentVersion, '
|
|
314
|
+
if (!currentVersion || semver.lt(currentVersion, '3.0.0')) {
|
|
315
315
|
return ['firmware-v8', 'firmware-v2', 'firmware'];
|
|
316
316
|
}
|
|
317
317
|
return ['firmware'];
|