Skip to content

Commit 25ac0d0

Browse files
wabicaiwabicai
authored
feat: update version 1.0.25 && optimize error message (#453)
* feat: update version 1.0.25 && optimize error message * fix: fix IFirmwareField error * chore: optimize name
1 parent 2a87b87 commit 25ac0d0

File tree

22 files changed

+73
-66
lines changed

22 files changed

+73
-66
lines changed

‎packages/connect-examples/electron-example/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "hardware-example",
33
"productName": "HardwareExample",
44
"executableName": "onekey-hardware-example",
5-
"version": "1.0.25-alpha.10",
5+
"version": "1.0.25",
66
"author": "OneKey",
77
"description": "End-to-end encrypted workspaces for teams",
88
"main": "dist/index.js",

‎packages/connect-examples/expo-example/locale/en-US.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,10 @@
136136
"message__search_device_and_connect_device": "Search device and connect device",
137137
"message__connection_type": "Connection Type",
138138
"message__use_webusb": "Use WebUSB",
139-
139+
"message__authorize_usb_device": "Authorize USB Device",
140+
"action__authorize_device": "Authorize Device",
141+
"title__authorize_usb_device": "Authorize USB Device",
142+
"content__authorize_usb_device_description": "Please connect and authorize your USB device to continue",
140143
"message__check_latest_ui_resource": "Check latest Ui resource...",
141144
"message__download_latest_ui_resource": "Download latest Ui resource...",
142145
"message__download_latest_ui_resource_success": "Download latest Ui resource success",

‎packages/connect-examples/expo-example/locale/zh-CN.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,10 @@
138138
"message__search_device_and_connect_device": "搜索设备并连接设备",
139139
"message__connection_type": "连接方式",
140140
"message__use_webusb": "使用 WebUSB",
141-
141+
"message__authorize_usb_device": "授权 USB 设备",
142+
"action__authorize_device": "授权设备",
143+
"title__authorize_usb_device": "授权 USB 设备",
144+
"content__authorize_usb_device_description": "请连接并授权您的 USB 设备以继续",
142145
"message__check_latest_ui_resource": "检查最新 UI 资源...",
143146
"message__download_latest_ui_resource": "下载最新 UI 资源中...",
144147
"message__download_latest_ui_resource_success": "下载最新 UI 资源成功",

‎packages/connect-examples/expo-example/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "expo-example",
3-
"version": "1.0.25-alpha.10",
3+
"version": "1.0.25",
44
"scripts": {
55
"start": "CONNECT_SRC=https://localhost:8087/ yarn expo start --dev-client",
66
"android": "yarn expo run:android",
@@ -19,10 +19,10 @@
1919
"@noble/ed25519": "^2.1.0",
2020
"@noble/hashes": "^1.3.3",
2121
"@noble/secp256k1": "^1.7.1",
22-
"@onekeyfe/hd-ble-sdk": "^1.0.25-alpha.10",
23-
"@onekeyfe/hd-common-connect-sdk": "^1.0.25-alpha.10",
24-
"@onekeyfe/hd-core": "^1.0.25-alpha.10",
25-
"@onekeyfe/hd-web-sdk": "^1.0.25-alpha.10",
22+
"@onekeyfe/hd-ble-sdk": "^1.0.25",
23+
"@onekeyfe/hd-common-connect-sdk": "^1.0.25",
24+
"@onekeyfe/hd-core": "^1.0.25",
25+
"@onekeyfe/hd-web-sdk": "^1.0.25",
2626
"@onekeyfe/react-native-ble-plx": "3.0.0",
2727
"@polkadot/util-crypto": "13.1.1",
2828
"@react-native-async-storage/async-storage": "1.21.0",

‎packages/connect-examples/expo-example/src/constants/connect.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
import { version } from '../../package.json';
1+
import packageJson from '../../package.json';
22

3-
export const CONNECT_SRC = process.env.CONNECT_SRC || `https://jssdk.onekey.so/${version}/`;
3+
export const CONNECT_SRC =
4+
process.env.CONNECT_SRC || `https://jssdk.onekey.so/${packageJson.version}/`;

‎packages/core/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@onekeyfe/hd-core",
3-
"version": "1.0.25-alpha.10",
3+
"version": "1.0.25",
44
"description": "> TODO: description",
55
"author": "OneKey",
66
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
2525
"url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
2626
},
2727
"dependencies": {
28-
"@onekeyfe/hd-shared": "^1.0.25-alpha.10",
29-
"@onekeyfe/hd-transport": "^1.0.25-alpha.10",
28+
"@onekeyfe/hd-shared": "^1.0.25",
29+
"@onekeyfe/hd-transport": "^1.0.25",
3030
"axios": "^0.27.2",
3131
"bignumber.js": "^9.0.2",
3232
"bytebuffer": "^5.0.1",

‎packages/core/src/api/FirmwareUpdateV3.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,8 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
228228
if (resourceBinary) {
229229
totalSize += resourceBinary.byteLength;
230230
}
231-
for (const resource of fwBinaryMap) {
232-
totalSize += resource.binary.byteLength;
231+
for (const fwbinary of fwBinaryMap) {
232+
totalSize += fwbinary.binary.byteLength;
233233
}
234234
if (bootloaderBinary) {
235235
totalSize += bootloaderBinary.byteLength;

‎packages/core/src/api/firmware/FirmwareUpdateBaseMethod.ts‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -306,9 +306,9 @@ export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
306306
let progress: number;
307307
if (totalSize !== undefined && processedSize !== undefined) {
308308
currentFileProcessed = processedSize + chunkEnd;
309-
progress = Math.floor((currentFileProcessed / totalSize) * 100);
309+
progress = Math.min(Math.floor((currentFileProcessed / totalSize) * 100), 100);
310310
} else {
311-
progress = Math.round(((i + 1) / totalChunks) * 100);
311+
progress = Math.min(Math.round(((i + 1) / totalChunks) * 100), 100);
312312
}
313313

314314
const writeRes = await this.emmcFileWriteWithRetry(
@@ -359,7 +359,7 @@ export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
359359
}
360360
throw ERRORS.TypedError(
361361
HardwareErrorCode.EmmcFileWriteFirmwareError,
362-
'emmc file write chunk once error'
362+
'transfer data error'
363363
);
364364
}
365365
return writeRes;
@@ -374,10 +374,7 @@ export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
374374
Log.error(`emmcWrite error: `, error);
375375
retryCount--;
376376
if (retryCount === 0) {
377-
throw ERRORS.TypedError(
378-
HardwareErrorCode.EmmcFileWriteFirmwareError,
379-
'emmc file write firmware error'
380-
);
377+
throw ERRORS.TypedError(HardwareErrorCode.EmmcFileWriteFirmwareError, error);
381378
}
382379
const env = DataManager.getSettings('env');
383380
if (DataManager.isBleConnect(env)) {

‎packages/core/src/api/firmware/getBinary.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { getDeviceType, httpRequest } from '../../utils';
55
import { DataManager } from '../../data-manager';
66
import { findLatestRelease } from '../../utils/release';
77
import { getFirmwareUpdateField } from '../../utils/deviceFeaturesUtils';
8-
import { FirmwareField } from '../../data-manager/DataManager';
8+
import { IFirmwareField } from '../../data-manager/DataManager';
99

1010
export interface GetInfoProps {
1111
features: Features;
@@ -78,12 +78,11 @@ export const getInfo = ({ features, updateType, targetVersion }: GetInfoProps) =
7878
}
7979
const { deviceMap } = DataManager;
8080

81-
const firmwareUpdateField: 'ble' | FirmwareField = getFirmwareUpdateField({
81+
const firmwareUpdateField: 'ble' | IFirmwareField = getFirmwareUpdateField({
8282
features,
8383
updateType,
8484
targetVersion,
8585
});
86-
8786
const releaseInfo = deviceMap?.[deviceType]?.[firmwareUpdateField] ?? [];
8887
return findLatestRelease(releaseInfo);
8988
};

‎packages/core/src/api/firmware/uploadFirmware.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ const emmcFileWriteWithRetry = async (
310310
throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, SESSION_ERROR);
311311
}
312312
}
313-
throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'emmc file write chunk once error');
313+
throw ERRORS.TypedError(HardwareErrorCode.EmmcFileWriteFirmwareError, 'transfer data error');
314314
}
315315
return writeRes;
316316
};
@@ -324,7 +324,10 @@ const emmcFileWriteWithRetry = async (
324324
Log.error(`emmcWrite error: `, error);
325325
retryCount--;
326326
if (retryCount === 0) {
327-
throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'emmc file write firmware error');
327+
throw ERRORS.TypedError(
328+
HardwareErrorCode.EmmcFileWriteFirmwareError,
329+
'transfer data error'
330+
);
328331
}
329332
const env = DataManager.getSettings('env');
330333
if (DataManager.isBleConnect(env)) {

0 commit comments

Comments
 (0)