@onekeyfe/hd-web-sdk 0.1.57 → 0.1.58

package/build/onekey-js-sdk.js

@@ -6177,6 +6177,12 @@ const getPassphraseState = (features, commands) => __awaiter(void 0, void 0, voi
 const supportBatchPublicKey = features => {
   if (!features) return false;
   const currentVersion = getDeviceFirmwareVersion(features).join('.');
+  const deviceType = getDeviceType(features);
+
+  if (deviceType === 'touch' || deviceType === 'pro') {
+    return semver__default["default"].gte(currentVersion, '3.1.0');
+  }
+
   return semver__default["default"].gte(currentVersion, '2.6.0');
 };
 
@@ -16540,7 +16546,13 @@ class DeviceCommands {
   }
 
   _filterCommonTypes(res, callType) {
-    Log$6.debug('_filterCommonTypes: ', res);
+    try {
+      if (DataManager.getSettings('env') === 'react-native') {
+        Log$6.debug('_filterCommonTypes: ', JSON.stringify(res));
+      } else {
+        Log$6.debug('_filterCommonTypes: ', res);
+      }
+    } catch (error) {}
 
     if (res.type === 'Failure') {
       const {
@@ -18257,7 +18269,7 @@ const getInfo = ({
   return findLatestRelease(releaseInfo);
 };
 
-const Log$3 = getLogger(exports.d0.Device);
+getLogger(exports.d0.Device);
 
 const postConfirmationMessage = device => {
   var _a;
@@ -18394,12 +18406,7 @@ const updateResources = (typedCall, postMessage, device, source) => __awaiter(vo
 
     if (!file.dir && fileName.indexOf('__MACOSX') === -1 && name) {
       const data = yield file.async('arraybuffer');
-
-      try {
-        yield updateResource(typedCall, name, data);
-      } catch (error) {
-        Log$3.error(error);
-      }
+      yield updateResource(typedCall, name, data);
     }
 
     progress += stepProgress;
@@ -18485,6 +18492,8 @@ class FirmwareUpdate$1 extends BaseMethod {
 
 }
 
+const Log$3 = getLogger(exports.d0.Method);
+
 class FirmwareUpdate extends BaseMethod {
   constructor() {
     super(...arguments);
@@ -18536,25 +18545,37 @@ class FirmwareUpdate extends BaseMethod {
     }
   }
 
-  checkDeviceToBootloader() {
+  checkDeviceToBootloader(connectId) {
     this.checkPromise = hdShared.createDeferred();
+    const env = DataManager.getSettings('env');
+    const isBleReconnect = connectId && env === 'react-native';
+    Log$3.log('FirmwareUpdateV2 [checkDeviceToBootloader] isBleReconnect: ', isBleReconnect);
     const intervalTimer = setInterval(() => __awaiter(this, void 0, void 0, function* () {
-      var _a, _b, _c, _d;
+      var _a, _b, _c, _d, _e, _f, _g;
 
-      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 (isBleReconnect) {
+        yield this.device.acquire();
+        yield this.device.initialize();
 
-      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);
+        if ((_a = this.device.features) === null || _a === void 0 ? void 0 : _a.bootloader_mode) {
+          clearInterval(intervalTimer);
+          (_b = this.checkPromise) === null || _b === void 0 ? void 0 : _b.resolve(true);
+        }
+      } else {
+        const deviceDiff = yield (_c = this.device.deviceConnector) === null || _c === void 0 ? void 0 : _c.enumerate();
+        const devicesDescriptor = (_d = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) !== null && _d !== void 0 ? _d : [];
+        const {
+          deviceList
+        } = yield DevicePool.getDevices(devicesDescriptor, connectId);
+
+        if (deviceList.length === 1 && ((_f = (_e = deviceList[0]) === null || _e === void 0 ? void 0 : _e.features) === null || _f === void 0 ? void 0 : _f.bootloader_mode)) {
+          this.device.updateFromCache(deviceList[0]);
+          this.device.commands.disposed = false;
+          clearInterval(intervalTimer);
+          (_g = this.checkPromise) === null || _g === void 0 ? void 0 : _g.resolve(true);
+        }
       }
-    }), 2000);
+    }), isBleReconnect ? 3000 : 2000);
     setTimeout(() => {
       if (this.checkPromise) {
         clearInterval(intervalTimer);
@@ -18618,7 +18639,7 @@ class FirmwareUpdate extends BaseMethod {
           this.postTipMessage('AutoRebootToBootloader');
           yield commands.typedCall('DeviceBackToBoot', 'Success');
           this.postTipMessage('GoToBootloaderSuccess');
-          this.checkDeviceToBootloader();
+          this.checkDeviceToBootloader(this.payload.connectId);
 
           if (deviceType === 'classic') {
             DevicePool.clearDeviceCache(uuid);
@@ -22750,6 +22771,12 @@ const callAPI = message => __awaiter(void 0, void 0, void 0, function* () {
         const currentVersion = getDeviceFirmwareVersion(device.features).join('.');
 
         if (semver__default["default"].valid(versionRange.min) && semver__default["default"].lt(currentVersion, versionRange.min)) {
+          const newVersionUnReleased = DataManager.getFirmwareStatus(device.features);
+
+          if (newVersionUnReleased === 'none' || newVersionUnReleased === 'valid') {
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NewFirmwareUnRelease);
+          }
+
           return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodNeedUpgradeFirmware, `Device firmware version is too low, please update to ${versionRange.min}`, {
             current: currentVersion,
             require: versionRange.min
@@ -24628,6 +24655,7 @@ const HardwareErrorCode = {
   FirmwareUpdateLimitOneDevice: 409,
   FirmwareUpdateManuallyEnterBoot: 410,
   FirmwareUpdateAutoEnterBootFailure: 411,
+  NewFirmwareUnRelease: 412,
   NetworkError: 500,
   TransportNotConfigured: 600,
   TransportCallInProgress: 601,
@@ -24691,6 +24719,7 @@ const HardwareErrorCodeMessage = {
   [HardwareErrorCode.FirmwareUpdateLimitOneDevice]: 'Only one device can be connected during firmware upgrade',
   [HardwareErrorCode.FirmwareUpdateManuallyEnterBoot]: 'You need to manually enter boot',
   [HardwareErrorCode.FirmwareUpdateAutoEnterBootFailure]: 'Description Failed to automatically enter boot',
+  [HardwareErrorCode.NewFirmwareUnRelease]: 'new firmware has not been released yet',
   [HardwareErrorCode.NetworkError]: 'Network request error',
   [HardwareErrorCode.TransportNotConfigured]: 'Transport not configured',
   [HardwareErrorCode.TransportCallInProgress]: 'Transport call in progress',
@@ -46941,7 +46970,7 @@ try {
 /***/ ((module) => {
 
 "use strict";
-module.exports = JSON.parse('{"name":"@onekeyfe/hd-core","version":"0.1.57","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.57","@onekeyfe/hd-transport":"^0.1.57","axios":"^0.27.2","bignumber.js":"^9.0.2","jszip":"^3.10.1","parse-uri":"^1.0.7","semver":"^7.3.7"},"peerDependencies":{"@noble/hashes":"^1.1.3"},"devDependencies":{"@noble/hashes":"^1.1.3","@types/parse-uri":"^1.0.0","@types/semver":"^7.3.9"}}');
+module.exports = JSON.parse('{"name":"@onekeyfe/hd-core","version":"0.1.58","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.58","@onekeyfe/hd-transport":"^0.1.58","axios":"^0.27.2","bignumber.js":"^9.0.2","jszip":"^3.10.1","parse-uri":"^1.0.7","semver":"^7.3.7"},"peerDependencies":{"@noble/hashes":"^1.1.3"},"devDependencies":{"@noble/hashes":"^1.1.3","@types/parse-uri":"^1.0.0","@types/semver":"^7.3.9"}}');
 
 /***/ })
 
@@ -49468,7 +49497,7 @@ const src_init = async settings => {
 
   try {
     await init({ ..._settings,
-      version: "0.1.57"
+      version: "0.1.58"
     });
     return true;
   } catch (e) {