@onekeyfe/hd-core 1.1.16-alpha.7 → 1.1.16

package/dist/api/firmware/FirmwareUpdateBaseMethod.d.ts

@@ -4,6 +4,7 @@ import { RebootType } from '@onekeyfe/hd-transport';
 import { IFirmwareUpdateTipMessage, IFirmwareUpdateProgressType } from '../../events/ui-request';
 import { BaseMethod } from '../BaseMethod';
 import { PROTO } from '../../constants';
+import type { TypedResponseMessage } from '../../device/DeviceCommands';
 export declare class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
     checkPromise: Deferred<any> | null;
     init(): void;
@@ -25,7 +26,7 @@ export declare class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params>
         processedSize?: number;
         totalSize?: number;
     }): Promise<number>;
-    emmcFileWriteWithRetry(filePath: string, chunkLength: number, offset: number, chunk: ArrayBuffer | Buffer, overwrite: boolean, progress: number | null): Promise<import("../../device/DeviceCommands").TypedResponseMessage<"EmmcFile"> | undefined>;
+    emmcFileWriteWithRetry(filePath: string, chunkLength: number, offset: number, chunk: ArrayBuffer | Buffer, overwrite: boolean, progress: number | null): Promise<TypedResponseMessage<"EmmcFile"> | undefined>;
     reboot(rebootType: RebootType): Promise<import("@onekeyfe/hd-transport").Success>;
 }
 //# sourceMappingURL=FirmwareUpdateBaseMethod.d.ts.map

package/dist/api/firmware/FirmwareUpdateBaseMethod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FirmwareUpdateBaseMethod.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/FirmwareUpdateBaseMethod.ts"],"names":[],"mappings":";AAAA,OAAO,EAEL,QAAQ,EAKT,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAGpD,OAAO,EAIL,yBAAyB,EACzB,2BAA2B,EAC5B,MAAM,yBAAyB,CAAC;AAMjC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAKxC,qBAAa,wBAAwB,CAAC,MAAM,CAAE,SAAQ,UAAU,CAAC,MAAM,CAAC;IACtE,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,IAAI,IAAI,IAAI;IAEZ,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IAInB,cAAc,IAAI,OAAO;IASzB,cAAc,YAAa,yBAAyB,UASlD;IAMF,qBAAqB,SAAU,UAAU,GAAG,KAAK,GAAG,YAAY,GAAG,UAAU,UAM3E;IAMF,mBAAmB,aAAc,MAAM,gBAAgB,2BAA2B,UAQhF;YAEY,qCAAqC;IAkBnD,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS;YAmFvC,4BAA4B;IAuBpC,mBAAmB;IA8CnB,uBAAuB,CAAC,EAAE,IAAI,EAAE,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;IAgBlD,8BAA8B,CAAC,IAAI,EAAE,MAAM;IAW3C,uBAAuB,CAAC,EAC5B,OAAO,EACP,QAAQ,EACR,aAAa,EACb,SAAS,GACV,EAAE,KAAK,CAAC,cAAc,GAAG;QACxB,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB;IA4CK,sBAAsB,CAC1B,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,WAAW,GAAG,MAAM,EAC3B,SAAS,EAAE,OAAO,EAClB,QAAQ,EAAE,MAAM,GAAG,IAAI;IAwEnB,MAAM,CAAC,UAAU,EAAE,UAAU;CAsBpC"}
+{"version":3,"file":"FirmwareUpdateBaseMethod.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/FirmwareUpdateBaseMethod.ts"],"names":[],"mappings":";AAAA,OAAO,EAEL,QAAQ,EAKT,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAGpD,OAAO,EAIL,yBAAyB,EACzB,2BAA2B,EAC5B,MAAM,yBAAyB,CAAC;AAMjC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAexE,qBAAa,wBAAwB,CAAC,MAAM,CAAE,SAAQ,UAAU,CAAC,MAAM,CAAC;IACtE,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,IAAI,IAAI,IAAI;IAEZ,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IAInB,cAAc,IAAI,OAAO;IASzB,cAAc,YAAa,yBAAyB,UASlD;IAMF,qBAAqB,SAAU,UAAU,GAAG,KAAK,GAAG,YAAY,GAAG,UAAU,UAM3E;IAMF,mBAAmB,aAAc,MAAM,gBAAgB,2BAA2B,UAQhF;YAEY,qCAAqC;IAkBnD,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS;YAmFvC,4BAA4B;IAuBpC,mBAAmB;IA8CnB,uBAAuB,CAAC,EAAE,IAAI,EAAE,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;IA6BlD,8BAA8B,CAAC,IAAI,EAAE,MAAM;IAW3C,uBAAuB,CAAC,EAC5B,OAAO,EACP,QAAQ,EACR,aAAa,EACb,SAAS,GACV,EAAE,KAAK,CAAC,cAAc,GAAG;QACxB,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB;IA4CK,sBAAsB,CAC1B,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,WAAW,GAAG,MAAM,EAC3B,SAAS,EAAE,OAAO,EAClB,QAAQ,EAAE,MAAM,GAAG,IAAI;IAwEnB,MAAM,CAAC,UAAU,EAAE,UAAU;CAsBpC"}

package/dist/api/firmware/uploadFirmware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uploadFirmware.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/uploadFirmware.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAQjD,OAAO,EAEL,WAAW,EAIZ,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAwB,MAAM,6BAA6B,CAAC;AA4DnF,eAAO,MAAM,cAAc,eAAsB,MAAM,kBAKtD,CAAC;AAEF,eAAO,MAAM,cAAc,eACb,UAAU,GAAG,KAAK,aACnB,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM;;sBAsFf,CAAC;AAkNF,eAAO,MAAM,cAAc,cACd,SAAS,YACV,MAAM,QACV,WAAW,mBACA,MAAM,IAAI,qBAc5B,CAAC;AAEF,eAAO,MAAM,eAAe,cACf,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,UACN,WAAW,qBAwBpB,CAAC;AAEF,eAAO,MAAM,gBAAgB,cAChB,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,UACN,WAAW,qBAUpB,CAAC"}
+{"version":3,"file":"uploadFirmware.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/uploadFirmware.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAQjD,OAAO,EAEL,WAAW,EAIZ,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAwB,MAAM,6BAA6B,CAAC;AAqEnF,eAAO,MAAM,cAAc,eAAsB,MAAM,kBAKtD,CAAC;AAEF,eAAO,MAAM,cAAc,eACb,UAAU,GAAG,KAAK,aACnB,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM;;sBAsFf,CAAC;AA+NF,eAAO,MAAM,cAAc,cACd,SAAS,YACV,MAAM,QACV,WAAW,mBACA,MAAM,IAAI,qBAc5B,CAAC;AAEF,eAAO,MAAM,eAAe,cACf,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,UACN,WAAW,qBAwBpB,CAAC;AAEF,eAAO,MAAM,gBAAgB,cAChB,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,UACN,WAAW,qBAUpB,CAAC"}

package/dist/index.js

@@ -28608,8 +28608,14 @@ const getInfo = ({ features, updateType, targetVersion }) => {
 
 const NEW_BOOT_UPRATE_FIRMWARE_VERSION = '2.4.5';
 const SESSION_ERROR$1 = 'session not found';
-const FIRMWARE_UPDATE_CONFIRM = 'Firmware install confirmed';
+const FIRMWARE_UPDATE_CONFIRM$1 = 'Firmware install confirmed';
 const Log$8 = getLogger(exports.LoggerNames.Method);
+const isDeviceDisconnectedError$1 = (error) => {
+    const message = error instanceof Error ? error.message : String(error !== null && error !== void 0 ? error : '');
+    return (message.includes('device was disconnected') ||
+        message.includes('transferIn') ||
+        message.includes('USBDevice'));
+};
 const postConfirmationMessage = (device) => {
     var _a;
     if ((_a = device.features) === null || _a === void 0 ? void 0 : _a.firmware_present) {
@@ -28723,12 +28729,27 @@ const newTouchUpdateProcess = (updateType, postMessage, device, { payload }, reb
     postProgressTip(device, 'ConfirmOnDevice', postMessage);
     postProgressTip(device, 'InstallingFirmware', postMessage);
     typedCall = device.getCommands().typedCall.bind(device.getCommands());
-    const response = yield typedCall('FirmwareUpdateEmmc', 'Success', {
-        path: filePath,
-        reboot_on_success: rebootOnSuccess,
-    });
+    let response;
+    try {
+        response = yield typedCall('FirmwareUpdateEmmc', 'Success', {
+            path: filePath,
+            reboot_on_success: rebootOnSuccess,
+        });
+    }
+    catch (error) {
+        if (isDeviceDisconnectedError$1(error)) {
+            Log$8.log('Rebooting device');
+            response = {
+                type: 'Success',
+                message: { message: FIRMWARE_UPDATE_CONFIRM$1 },
+            };
+        }
+        else {
+            throw error;
+        }
+    }
     if (response.type === 'Success' &&
-        ((_a = response === null || response === void 0 ? void 0 : response.message) === null || _a === void 0 ? void 0 : _a.message) === FIRMWARE_UPDATE_CONFIRM) {
+        ((_a = response === null || response === void 0 ? void 0 : response.message) === null || _a === void 0 ? void 0 : _a.message) === FIRMWARE_UPDATE_CONFIRM$1) {
         const timeout = 2 * 60 * 1000;
         const startTime = Date.now();
         const isBleReconnect = DataManager.isBleConnect(env);
@@ -28949,6 +28970,13 @@ class DeviceFullyUploadResource extends BaseMethod {
 
 const Log$7 = getLogger(exports.LoggerNames.Method);
 const SESSION_ERROR = 'session not found';
+const FIRMWARE_UPDATE_CONFIRM = 'Firmware install confirmed';
+const isDeviceDisconnectedError = (error) => {
+    const message = error instanceof Error ? error.message : String(error !== null && error !== void 0 ? error : '');
+    return (message.includes('device was disconnected') ||
+        message.includes('transferIn') ||
+        message.includes('USBDevice'));
+};
 class FirmwareUpdateBaseMethod extends BaseMethod {
     constructor() {
         super(...arguments);
@@ -29118,10 +29146,25 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
     startEmmcFirmwareUpdate({ path }) {
         return __awaiter(this, void 0, void 0, function* () {
             const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
-            const updaeteResponse = yield typedCall('FirmwareUpdateEmmc', 'Success', {
-                path,
-                reboot_on_success: true,
-            });
+            let updaeteResponse;
+            try {
+                updaeteResponse = yield typedCall('FirmwareUpdateEmmc', 'Success', {
+                    path,
+                    reboot_on_success: true,
+                });
+            }
+            catch (error) {
+                if (isDeviceDisconnectedError(error)) {
+                    Log$7.log('Rebooting device');
+                    updaeteResponse = {
+                        type: 'Success',
+                        message: { message: FIRMWARE_UPDATE_CONFIRM },
+                    };
+                }
+                else {
+                    throw error;
+                }
+            }
             if (updaeteResponse.type !== 'Success') {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError, 'firmware update error');
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.1.16-alpha.7",
+  "version": "1.1.16",
   "description": "Core processes and APIs for communicating with OneKey hardware devices.",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.1.16-alpha.7",
-    "@onekeyfe/hd-transport": "1.1.16-alpha.7",
+    "@onekeyfe/hd-shared": "1.1.16",
+    "@onekeyfe/hd-transport": "1.1.16",
     "axios": "1.12.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -46,5 +46,5 @@
     "@types/web-bluetooth": "^0.0.21",
     "ripple-keypairs": "^1.3.1"
   },
-  "gitHead": "9958a3e9b7de4c270a0fe57cd100ff4b02b6243a"
+  "gitHead": "9c63b9bac888ffc9f14a05c6431a072bd65e41d2"
 }

package/src/api/firmware/FirmwareUpdateBaseMethod.ts

@@ -24,9 +24,20 @@ import { DataManager } from '../../data-manager';
 import { BaseMethod } from '../BaseMethod';
 import { DEVICE } from '../../events';
 import { PROTO } from '../../constants';
+import type { TypedResponseMessage } from '../../device/DeviceCommands';
 
 const Log = getLogger(LoggerNames.Method);
 const SESSION_ERROR = 'session not found';
+const FIRMWARE_UPDATE_CONFIRM = 'Firmware install confirmed';
+
+const isDeviceDisconnectedError = (error: unknown) => {
+  const message = error instanceof Error ? error.message : String(error ?? '');
+  return (
+    message.includes('device was disconnected') ||
+    message.includes('transferIn') ||
+    message.includes('USBDevice')
+  );
+};
 
 export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
   checkPromise: Deferred<any> | null = null;
@@ -255,10 +266,23 @@ export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
    */
   async startEmmcFirmwareUpdate({ path }: { path: string }) {
     const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
-    const updaeteResponse = await typedCall('FirmwareUpdateEmmc', 'Success', {
-      path,
-      reboot_on_success: true,
-    });
+    let updaeteResponse: TypedResponseMessage<'Success'>;
+    try {
+      updaeteResponse = await typedCall('FirmwareUpdateEmmc', 'Success', {
+        path,
+        reboot_on_success: true,
+      });
+    } catch (error) {
+      if (isDeviceDisconnectedError(error)) {
+        Log.log('Rebooting device');
+        updaeteResponse = {
+          type: 'Success',
+          message: { message: FIRMWARE_UPDATE_CONFIRM },
+        };
+      } else {
+        throw error;
+      }
+    }
     if (updaeteResponse.type !== 'Success') {
       throw ERRORS.TypedError(HardwareErrorCode.FirmwareError, 'firmware update error');
     }

package/src/api/firmware/uploadFirmware.ts

@@ -31,6 +31,15 @@ const FIRMWARE_UPDATE_CONFIRM = 'Firmware install confirmed';
 
 const Log = getLogger(LoggerNames.Method);
 
+const isDeviceDisconnectedError = (error: unknown) => {
+  const message = error instanceof Error ? error.message : String(error ?? '');
+  return (
+    message.includes('device was disconnected') ||
+    message.includes('transferIn') ||
+    message.includes('USBDevice')
+  );
+};
+
 const postConfirmationMessage = (device: Device) => {
   // only if firmware is already installed. fresh device does not require button confirmation
   if (device.features?.firmware_present) {
@@ -220,10 +229,23 @@ const newTouchUpdateProcess = async (
   postProgressTip(device, 'InstallingFirmware', postMessage);
   typedCall = device.getCommands().typedCall.bind(device.getCommands());
   // Firmware Update
-  const response = await typedCall('FirmwareUpdateEmmc', 'Success', {
-    path: filePath,
-    reboot_on_success: rebootOnSuccess,
-  });
+  let response: TypedResponseMessage<'Success'>;
+  try {
+    response = await typedCall('FirmwareUpdateEmmc', 'Success', {
+      path: filePath,
+      reboot_on_success: rebootOnSuccess,
+    });
+  } catch (error) {
+    if (isDeviceDisconnectedError(error)) {
+      Log.log('Rebooting device');
+      response = {
+        type: 'Success',
+        message: { message: FIRMWARE_UPDATE_CONFIRM },
+      } as TypedResponseMessage<'Success'>;
+    } else {
+      throw error;
+    }
+  }
 
   if (
     response.type === 'Success' &&