@onekeyfe/hd-web-sdk 0.1.53 → 0.1.54

package/build/onekey-js-sdk.js

@@ -4277,6 +4277,10 @@ const inject = ({
       connectId,
       method: 'firmwareUpdate'
     })),
+    firmwareUpdateV2: (connectId, params) => call(Object.assign(Object.assign({}, params), {
+      connectId,
+      method: 'firmwareUpdateV2'
+    })),
     requestWebUsbDevice: () => call({
       method: 'requestWebUsbDevice'
     }),
@@ -14616,6 +14620,10 @@ const LoggerMap = {
 
 const getLogger = key => LoggerMap[key];
 
+const wait = ms => new Promise(resolve => {
+  setTimeout(resolve, ms);
+});
+
 const getReleaseStatus = (releases, currentVersion) => {
   const newVersions = releases.filter(r => semver__default["default"].gt(r.version.join('.'), currentVersion));
 
@@ -14842,6 +14850,7 @@ const UI_REQUEST$1 = {
   LOCATION_PERMISSION: 'ui-location_permission',
   LOCATION_SERVICE_PERMISSION: 'ui-location_service_permission',
   FIRMWARE_PROGRESS: 'ui-firmware-progress',
+  FIRMWARE_TIP: 'ui-firmware-tip',
   NOT_IN_BOOTLOADER: 'ui-device_not_in_bootloader_mode'
 };
 
@@ -15515,7 +15524,8 @@ const UI_REQUEST = {
   FIRMWARE_NOT_SUPPORTED: 'ui-device_firmware_unsupported',
   FIRMWARE_NOT_COMPATIBLE: 'ui-device_firmware_not_compatible',
   FIRMWARE_NOT_INSTALLED: 'ui-device_firmware_not_installed',
-  NOT_USE_ONEKEY_DEVICE: 'ui-device_please_use_onekey_device'
+  NOT_USE_ONEKEY_DEVICE: 'ui-device_please_use_onekey_device',
+  FIRMWARE_TIP: 'ui-firmware-tip'
 };
 
 const pkg = __webpack_require__(2391);
@@ -16913,7 +16923,7 @@ const getBinary = ({
     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'no firmware found for this device');
   }
 
-  if (version && !semver__default["default"].eq(releaseInfo.version, version)) {
+  if (version && !semver__default["default"].eq(releaseInfo.version.join('.'), version.join('.'))) {
     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'firmware version mismatch');
   }
 
@@ -16962,6 +16972,15 @@ const postProgressMessage = (device, progress, postMessage) => {
   }));
 };
 
+const postProgressTip = (device, message, postMessage) => {
+  postMessage(createUiMessage(UI_REQUEST$1.FIRMWARE_TIP, {
+    device: device.toMessageObject(),
+    data: {
+      message
+    }
+  }));
+};
+
 const uploadFirmware = (updateType, typedCall, postMessage, device, {
   payload
 }) => __awaiter(void 0, void 0, void 0, function* () {
@@ -16969,8 +16988,10 @@ const uploadFirmware = (updateType, typedCall, postMessage, device, {
 
   if (((_a = device.features) === null || _a === void 0 ? void 0 : _a.major_version) === 1) {
     postConfirmationMessage(device);
+    postProgressTip(device, 'ConfirmOnDevice', postMessage);
     const eraseCommand = updateType === 'firmware' ? 'FirmwareErase' : 'FirmwareErase_ex';
     yield typedCall(eraseCommand, 'Success', {});
+    postProgressTip(device, 'FirmwareEraseSuccess', postMessage);
     postProgressMessage(device, 0, postMessage);
     const {
       message
@@ -16983,10 +17004,12 @@ const uploadFirmware = (updateType, typedCall, postMessage, device, {
 
   if (((_b = device.features) === null || _b === void 0 ? void 0 : _b.major_version) === 2) {
     postConfirmationMessage(device);
+    postProgressTip(device, 'ConfirmOnDevice', postMessage);
     const length = payload.byteLength;
     let response = yield typedCall('FirmwareErase', ['FirmwareRequest', 'Success'], {
       length
     });
+    postProgressTip(device, 'FirmwareEraseSuccess', postMessage);
 
     while (response.type !== 'Success') {
       const start = response.message.offset;
@@ -17009,7 +17032,7 @@ const uploadFirmware = (updateType, typedCall, postMessage, device, {
   throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'uploadFirmware: unknown major_version');
 });
 
-class FirmwareUpdate extends BaseMethod {
+class FirmwareUpdate$1 extends BaseMethod {
   init() {
     this.allowDeviceMode = [UI_REQUEST.BOOTLOADER, UI_REQUEST.INITIALIZE];
     this.requireDeviceMode = [UI_REQUEST.BOOTLOADER];
@@ -17083,6 +17106,157 @@ class FirmwareUpdate extends BaseMethod {
 
 }
 
+class FirmwareUpdate extends BaseMethod {
+  constructor() {
+    super(...arguments);
+    this.checkPromise = null;
+
+    this.postTipMessage = message => {
+      this.postMessage(createUiMessage(UI_REQUEST.FIRMWARE_TIP, {
+        device: this.device.toMessageObject(),
+        data: {
+          message
+        }
+      }));
+    };
+  }
+
+  init() {
+    this.allowDeviceMode = [UI_REQUEST.BOOTLOADER, UI_REQUEST.INITIALIZE];
+    this.requireDeviceMode = [];
+    this.useDevicePassphraseState = false;
+    const {
+      payload
+    } = this;
+    validateParams(payload, [{
+      name: 'version',
+      type: 'array'
+    }, {
+      name: 'binary',
+      type: 'buffer'
+    }]);
+
+    if (!payload.updateType) {
+      throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodInvalidParameter, 'updateType is required');
+    }
+
+    this.params = {
+      updateType: payload.updateType
+    };
+
+    if ('version' in payload) {
+      this.params = Object.assign(Object.assign({}, this.params), {
+        version: payload.version
+      });
+    }
+
+    if ('binary' in payload) {
+      this.params = Object.assign(Object.assign({}, this.params), {
+        binary: payload.binary
+      });
+    }
+  }
+
+  checkDeviceToBootloader() {
+    this.checkPromise = hdShared.createDeferred();
+    const intervalTimer = setInterval(() => __awaiter(this, void 0, void 0, function* () {
+      var _a, _b, _c, _d;
+
+      const deviceDiff = yield (_a = this.device.deviceConnector) === null || _a === void 0 ? void 0 : _a.enumerate();
+      const devicesDescriptor = (_b = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) !== null && _b !== void 0 ? _b : [];
+      const {
+        deviceList
+      } = yield DevicePool.getDevices(devicesDescriptor, this.connectId);
+      console.log('device list: ', deviceList);
+
+      if (deviceList.length === 1 && ((_c = deviceList[0].features) === null || _c === void 0 ? void 0 : _c.bootloader_mode)) {
+        this.device.updateFromCache(deviceList[0]);
+        this.device.commands.disposed = false;
+        clearInterval(intervalTimer);
+        (_d = this.checkPromise) === null || _d === void 0 ? void 0 : _d.resolve(true);
+      }
+    }), 2000);
+    setTimeout(() => {
+      if (this.checkPromise) {
+        clearInterval(intervalTimer);
+        this.checkPromise.reject(new Error());
+      }
+    }, 30000);
+  }
+
+  run() {
+    var _a, _b;
+
+    return __awaiter(this, void 0, void 0, function* () {
+      const {
+        device,
+        params
+      } = this;
+      const {
+        features,
+        commands
+      } = device;
+
+      if (!(features === null || features === void 0 ? void 0 : features.bootloader_mode)) {
+        const uuid = getDeviceUUID(features);
+        const deviceType = getDeviceType(features);
+
+        if (deviceType === 'mini') {
+          return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceUnexpectedBootloaderMode));
+        }
+
+        try {
+          this.postTipMessage('AutoRebootToBootloader');
+          yield commands.typedCall('BixinReboot', 'Success');
+          this.postTipMessage('GoToBootloaderSuccess');
+          this.checkDeviceToBootloader();
+
+          if (deviceType === 'classic') {
+            DevicePool.clearDeviceCache(uuid);
+          }
+
+          delete DevicePool.devicesCache[''];
+          yield (_a = this.checkPromise) === null || _a === void 0 ? void 0 : _a.promise;
+          this.checkPromise = null;
+          yield wait(1500);
+        } catch (e) {
+          console.log('auto go to bootloader mode failed: ', e);
+          return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'go to bootloader mode failed'));
+        }
+      }
+
+      let binary;
+
+      try {
+        if (params.binary) {
+          binary = this.params.binary;
+        } else {
+          if (!device.features) {
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'no features found for this device');
+          }
+
+          this.postTipMessage('DownloadFirmware');
+          const firmware = yield getBinary({
+            features: device.features,
+            version: params.version,
+            updateType: params.updateType
+          });
+          binary = firmware.binary;
+          this.postTipMessage('DownloadFirmwareSuccess');
+        }
+      } catch (err) {
+        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateDownloadFailed, (_b = err.message) !== null && _b !== void 0 ? _b : err);
+      }
+
+      yield this.device.acquire();
+      return uploadFirmware(params.updateType, this.device.getCommands().typedCall.bind(this.device.getCommands()), this.postMessage, device, {
+        payload: binary
+      });
+    });
+  }
+
+}
+
 const Log$2 = getLogger(exports.d0.Method);
 
 class RequestWebUsbDevice extends BaseMethod {
@@ -20841,7 +21015,8 @@ var ApiMethods = /*#__PURE__*/Object.freeze({
   deviceSupportFeatures: DeviceSupportFeatures,
   deviceVerify: DeviceVerify,
   deviceWipe: DeviceWipe,
-  firmwareUpdate: FirmwareUpdate,
+  firmwareUpdate: FirmwareUpdate$1,
+  firmwareUpdateV2: FirmwareUpdate,
   requestWebUsbDevice: RequestWebUsbDevice,
   batchGetPublicKey: BatchGetPublicKey,
   cipherKeyValue: CipherKeyValue,
@@ -21296,7 +21471,7 @@ function initDevice(method) {
   } else if (allDevices.length === 1) {
     [device] = allDevices;
   } else if (allDevices.length > 1) {
-    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.SelectDevice);
+    throw hdShared.ERRORS.TypedError(method.name === 'firmwareUpdateV2' ? hdShared.HardwareErrorCode.FirmwareUpdateLimitOneDevice : hdShared.HardwareErrorCode.SelectDevice);
   }
 
   if (!device) {
@@ -21399,7 +21574,7 @@ const ensureConnected = (method, pollingId) => __awaiter(void 0, void 0, void 0,
       } catch (error) {
         Log.debug('device error: ', error);
 
-        if ([hdShared.HardwareErrorCode.BlePermissionError, hdShared.HardwareErrorCode.BleLocationError, hdShared.HardwareErrorCode.BleLocationServicesDisabled, hdShared.HardwareErrorCode.BleDeviceNotBonded, hdShared.HardwareErrorCode.BleCharacteristicNotifyError, hdShared.HardwareErrorCode.BleWriteCharacteristicError, hdShared.HardwareErrorCode.BleAlreadyConnected].includes(error.errorCode)) {
+        if ([hdShared.HardwareErrorCode.BlePermissionError, hdShared.HardwareErrorCode.BleLocationError, hdShared.HardwareErrorCode.BleLocationServicesDisabled, hdShared.HardwareErrorCode.BleDeviceNotBonded, hdShared.HardwareErrorCode.BleCharacteristicNotifyError, hdShared.HardwareErrorCode.BleWriteCharacteristicError, hdShared.HardwareErrorCode.BleAlreadyConnected, hdShared.HardwareErrorCode.FirmwareUpdateLimitOneDevice].includes(error.errorCode)) {
           reject(error);
           return;
         }
@@ -21747,6 +21922,7 @@ __webpack_unused_export__ = safeThrowError;
 exports.hZ = setLoggerPostMessage;
 __webpack_unused_export__ = versionCompare;
 __webpack_unused_export__ = versionSplit;
+__webpack_unused_export__ = wait;
 
 /***/ }),
 
@@ -22997,6 +23173,7 @@ const HardwareErrorCode = {
   FirmwareUpdateDownloadFailed: 406,
   CallMethodNeedUpgradeFirmware: 407,
   CallMethodDeprecated: 408,
+  FirmwareUpdateLimitOneDevice: 409,
   NetworkError: 500,
   TransportNotConfigured: 600,
   TransportCallInProgress: 601,
@@ -23057,6 +23234,7 @@ const HardwareErrorCodeMessage = {
   [HardwareErrorCode.FirmwareUpdateDownloadFailed]: 'Firmware update download failed',
   [HardwareErrorCode.CallMethodNeedUpgradeFirmware]: 'Call method need upgrade firmware',
   [HardwareErrorCode.CallMethodDeprecated]: 'Call method is deprecated',
+  [HardwareErrorCode.FirmwareUpdateLimitOneDevice]: 'Only one device can be connected during firmware upgrade',
   [HardwareErrorCode.NetworkError]: 'Network request error',
   [HardwareErrorCode.TransportNotConfigured]: 'Transport not configured',
   [HardwareErrorCode.TransportCallInProgress]: 'Transport call in progress',
@@ -46478,7 +46656,7 @@ try {
 /***/ ((module) => {
 
 "use strict";
-module.exports = JSON.parse('{"name":"@onekeyfe/hd-core","version":"0.1.53","description":"> TODO: description","author":"OneKey","homepage":"https://github.com/OneKeyHQ/hardware-js-sdk#readme","license":"ISC","main":"dist/index.js","types":"dist/index.d.ts","repository":{"type":"git","url":"git+https://github.com/OneKeyHQ/hardware-js-sdk.git"},"publishConfig":{"access":"public"},"scripts":{"dev":"rimraf dist && rollup -c ../../build/rollup.config.js -w","build":"rimraf dist && rollup -c ../../build/rollup.config.js","lint":"eslint .","lint:fix":"eslint . --fix"},"bugs":{"url":"https://github.com/OneKeyHQ/hardware-js-sdk/issues"},"dependencies":{"@onekeyfe/hd-shared":"^0.1.53","@onekeyfe/hd-transport":"^0.1.53","axios":"^0.27.2","bignumber.js":"^9.0.2","js-sha256":"^0.9.0","js-sha3":"^0.8.0","parse-uri":"^1.0.7","semver":"^7.3.7"},"devDependencies":{"@types/parse-uri":"^1.0.0","@types/semver":"^7.3.9"}}');
+module.exports = JSON.parse('{"name":"@onekeyfe/hd-core","version":"0.1.54","description":"> TODO: description","author":"OneKey","homepage":"https://github.com/OneKeyHQ/hardware-js-sdk#readme","license":"ISC","main":"dist/index.js","types":"dist/index.d.ts","repository":{"type":"git","url":"git+https://github.com/OneKeyHQ/hardware-js-sdk.git"},"publishConfig":{"access":"public"},"scripts":{"dev":"rimraf dist && rollup -c ../../build/rollup.config.js -w","build":"rimraf dist && rollup -c ../../build/rollup.config.js","lint":"eslint .","lint:fix":"eslint . --fix"},"bugs":{"url":"https://github.com/OneKeyHQ/hardware-js-sdk/issues"},"dependencies":{"@onekeyfe/hd-shared":"^0.1.54","@onekeyfe/hd-transport":"^0.1.54","axios":"^0.27.2","bignumber.js":"^9.0.2","js-sha256":"^0.9.0","js-sha3":"^0.8.0","parse-uri":"^1.0.7","semver":"^7.3.7"},"devDependencies":{"@types/parse-uri":"^1.0.0","@types/semver":"^7.3.9"}}');
 
 /***/ })
 
@@ -49010,7 +49188,7 @@ const src_init = async settings => {
 
   try {
     await init({ ..._settings,
-      version: "0.1.53"
+      version: "0.1.54"
     });
     return true;
   } catch (e) {