@onekeyfe/hd-core 0.1.57 → 0.1.58

package/dist/api/FirmwareUpdateV2.d.ts

@@ -10,7 +10,7 @@ export default class FirmwareUpdate extends BaseMethod<Params> {
     checkPromise: Deferred<any> | null;
     init(): void;
     postTipMessage: (message: string) => void;
-    checkDeviceToBootloader(): void;
+    checkDeviceToBootloader(connectId: string | undefined): void;
     isEnteredManuallyBoot(features: Features): boolean;
     isSupportResourceUpdate(features: Features, updateType: string): boolean;
     run(): Promise<import("packages/hd-transport/dist").Success>;

package/dist/api/FirmwareUpdateV2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FirmwareUpdateV2.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV2.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAIT,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAO1C,OAAO,KAAK,EAAe,QAAQ,EAAE,MAAM,UAAU,CAAC;AAItD,aAAK,MAAM,GAAG;IACZ,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,EAAE,UAAU,GAAG,KAAK,CAAC;CAChC,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,UAAU,CAAC,MAAM,CAAC;IAC5D,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,IAAI;IAoCJ,cAAc,YAAa,MAAM,UAS/B;IAEF,uBAAuB;IA6BvB,qBAAqB,CAAC,QAAQ,EAAE,QAAQ;IAUxC,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM;IAUxD,GAAG;CA4FV"}
+{"version":3,"file":"FirmwareUpdateV2.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV2.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAIT,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAO1C,OAAO,KAAK,EAAe,QAAQ,EAAE,MAAM,UAAU,CAAC;AAItD,aAAK,MAAM,GAAG;IACZ,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,EAAE,UAAU,GAAG,KAAK,CAAC;CAChC,CAAC;AAIF,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,UAAU,CAAC,MAAM,CAAC;IAC5D,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,IAAI;IAoCJ,cAAc,YAAa,MAAM,UAS/B;IAEF,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS;IA6CrD,qBAAqB,CAAC,QAAQ,EAAE,QAAQ;IAUxC,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM;IAUxD,GAAG;CA4FV"}

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":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,OAAO,EAAU,WAAW,EAA+B,MAAM,cAAc,CAAC;AAChF,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;AAyCnF,eAAO,MAAM,cAAc,eAAsB,MAAM,kBAKtD,CAAC;AAEF,eAAO,MAAM,cAAc,eACb,UAAU,GAAG,KAAK,aACnB,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,eACD,MAAM,cAAc,qBAgDlC,CAAC;AAmCF,eAAO,MAAM,cAAc,cAAqB,SAAS,YAAY,MAAM,QAAQ,WAAW,qBAY7F,CAAC;AAEF,eAAO,MAAM,eAAe,cACf,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,UACN,WAAW,qBA4BpB,CAAC"}
+{"version":3,"file":"uploadFirmware.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/uploadFirmware.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,OAAO,EAAU,WAAW,EAA+B,MAAM,cAAc,CAAC;AAChF,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;AAyCnF,eAAO,MAAM,cAAc,eAAsB,MAAM,kBAKtD,CAAC;AAEF,eAAO,MAAM,cAAc,eACb,UAAU,GAAG,KAAK,aACnB,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,eACD,MAAM,cAAc,qBAgDlC,CAAC;AAmCF,eAAO,MAAM,cAAc,cAAqB,SAAS,YAAY,MAAM,QAAQ,WAAW,qBAY7F,CAAC;AAEF,eAAO,MAAM,eAAe,cACf,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,UACN,WAAW,qBAwBpB,CAAC"}

package/dist/core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AACA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAqBlC,OAAO,EACL,WAAW,EAYZ,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,UAAU,CAAC;AAE7D,OAAO,eAAe,MAAM,2BAA2B,CAAC;AA2BxD,eAAO,MAAM,OAAO,YAAmB,WAAW,iBA0PjD,CAAC;AAgLF,eAAO,MAAM,MAAM,0CAkBlB,CAAC;AA8IF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IACtC,aAAa,CAAC,OAAO,EAAE,WAAW;IA8CxC,OAAO;CAGR;AAED,eAAO,MAAM,QAAQ,YAGpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAIzB,CAAC;AAMF,eAAO,MAAM,IAAI,aAAoB,eAAe,aAAa,GAAG,8BAmBnE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AACA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAqBlC,OAAO,EACL,WAAW,EAYZ,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,UAAU,CAAC;AAE7D,OAAO,eAAe,MAAM,2BAA2B,CAAC;AA2BxD,eAAO,MAAM,OAAO,YAAmB,WAAW,iBA+PjD,CAAC;AAgLF,eAAO,MAAM,MAAM,0CAkBlB,CAAC;AA8IF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IACtC,aAAa,CAAC,OAAO,EAAE,WAAW;IA8CxC,OAAO;CAGR;AAED,eAAO,MAAM,QAAQ,YAGpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAIzB,CAAC;AAMF,eAAO,MAAM,IAAI,aAAoB,eAAe,aAAa,GAAG,8BAmBnE,CAAC"}

package/dist/device/DeviceCommands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceCommands.d.ts","sourceRoot":"","sources":["../../src/device/DeviceCommands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAe,MAAM,wBAAwB,CAAC;AAK/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGvC,aAAK,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;AACxC,aAAK,UAAU,GAAG,MAAM,WAAW,CAAC;AACpC,oBAAY,oBAAoB,CAAC,CAAC,SAAS,UAAU,IAAI;IACvD,IAAI,EAAE,CAAC,CAAC;IACR,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;CACzB,CAAC;AACF,aAAK,oBAAoB,GAAG;KACzB,CAAC,IAAI,MAAM,WAAW,GAAG,oBAAoB,CAAC,CAAC,CAAC;CAClD,CAAC;AACF,oBAAY,sBAAsB,GAAG,oBAAoB,CAAC,MAAM,WAAW,CAAC,CAAC;AAE7E,oBAAY,wBAAwB,GAAG;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAcF,qBAAa,cAAc;IACzB,MAAM,EAAE,MAAM,CAAC;IAEf,SAAS,EAAE,SAAS,CAAC;IAErB,MAAM,EAAE,MAAM,CAAC;IAEf,QAAQ,EAAE,OAAO,CAAC;IAElB,WAAW,CAAC,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAE9C,kBAAkB,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;gBAE/B,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAOpC,OAAO,CAAC,aAAa,EAAE,OAAO;IAU9B,IAAI,CACR,IAAI,EAAE,UAAU,EAChB,GAAG,GAAE,sBAAsB,CAAC,SAAS,CAAM,GAC1C,OAAO,CAAC,sBAAsB,CAAC;IAkBlC,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,UAAU,EAAE,EACpD,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,CAAC,EACV,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAE3C,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,UAAU,EAClD,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,CAAC,EACV,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAuC7B,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,CAAC,EAAE,sBAAsB,CAAC,SAAS,CAAC;IAK3E,kBAAkB,CAChB,GAAG,EAAE,sBAAsB,EAC3B,QAAQ,EAAE,UAAU,GACnB,OAAO,CAAC,sBAAsB,CAAC;IAuGlC,UAAU,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,oBAAoB;IAwB/C,iBAAiB;CA2BlB;AAED,oBAAY,SAAS,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC"}
+{"version":3,"file":"DeviceCommands.d.ts","sourceRoot":"","sources":["../../src/device/DeviceCommands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAe,MAAM,wBAAwB,CAAC;AAK/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGvC,aAAK,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;AACxC,aAAK,UAAU,GAAG,MAAM,WAAW,CAAC;AACpC,oBAAY,oBAAoB,CAAC,CAAC,SAAS,UAAU,IAAI;IACvD,IAAI,EAAE,CAAC,CAAC;IACR,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;CACzB,CAAC;AACF,aAAK,oBAAoB,GAAG;KACzB,CAAC,IAAI,MAAM,WAAW,GAAG,oBAAoB,CAAC,CAAC,CAAC;CAClD,CAAC;AACF,oBAAY,sBAAsB,GAAG,oBAAoB,CAAC,MAAM,WAAW,CAAC,CAAC;AAE7E,oBAAY,wBAAwB,GAAG;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAcF,qBAAa,cAAc;IACzB,MAAM,EAAE,MAAM,CAAC;IAEf,SAAS,EAAE,SAAS,CAAC;IAErB,MAAM,EAAE,MAAM,CAAC;IAEf,QAAQ,EAAE,OAAO,CAAC;IAElB,WAAW,CAAC,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAE9C,kBAAkB,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;gBAE/B,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAOpC,OAAO,CAAC,aAAa,EAAE,OAAO;IAU9B,IAAI,CACR,IAAI,EAAE,UAAU,EAChB,GAAG,GAAE,sBAAsB,CAAC,SAAS,CAAM,GAC1C,OAAO,CAAC,sBAAsB,CAAC;IAkBlC,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,UAAU,EAAE,EACpD,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,CAAC,EACV,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAE3C,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,UAAU,EAClD,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,CAAC,EACV,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAuC7B,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,CAAC,EAAE,sBAAsB,CAAC,SAAS,CAAC;IAK3E,kBAAkB,CAChB,GAAG,EAAE,sBAAsB,EAC3B,QAAQ,EAAE,UAAU,GACnB,OAAO,CAAC,sBAAsB,CAAC;IAgHlC,UAAU,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,oBAAoB;IAwB/C,iBAAiB;CA2BlB;AAED,oBAAY,SAAS,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC"}

package/dist/index.js

@@ -842,6 +842,10 @@ 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');
 };
 
@@ -11088,7 +11092,16 @@ 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 { code, message } = res.message;
             let error = null;
@@ -12458,7 +12471,7 @@ const getInfo = ({ features, updateType }) => {
     return findLatestRelease(releaseInfo);
 };
 
-const Log$3 = getLogger(exports.LoggerNames.Device);
+getLogger(exports.LoggerNames.Device);
 const postConfirmationMessage = (device) => {
     var _a;
     if ((_a = device.features) === null || _a === void 0 ? void 0 : _a.firmware_present) {
@@ -12562,12 +12575,7 @@ const updateResources = (typedCall, postMessage, device, source) => __awaiter(vo
         const name = fileName.split('/').pop();
         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;
         postProgressMessage(device, Math.floor(progress), postMessage);
@@ -12627,6 +12635,7 @@ class FirmwareUpdate$1 extends BaseMethod {
     }
 }
 
+const Log$3 = getLogger(exports.LoggerNames.Method);
 class FirmwareUpdate extends BaseMethod {
     constructor() {
         super(...arguments);
@@ -12660,21 +12669,33 @@ class FirmwareUpdate extends BaseMethod {
             this.params = Object.assign(Object.assign({}, this.params), { binary: payload.binary });
         }
     }
-    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;
-            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);
+            var _a, _b, _c, _d, _e, _f, _g;
+            if (isBleReconnect) {
+                yield this.device.acquire();
+                yield this.device.initialize();
+                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);
+                }
             }
-        }), 2000);
+            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);
+                }
+            }
+        }), isBleReconnect ? 3000 : 2000);
         setTimeout(() => {
             if (this.checkPromise) {
                 clearInterval(intervalTimer);
@@ -12725,7 +12746,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);
                     }
@@ -15741,6 +15762,10 @@ const callAPI = (message) => __awaiter(void 0, void 0, void 0, function* () {
             if (versionRange && device.features) {
                 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 }));
                 }
                 if (versionRange.max &&

package/dist/utils/deviceFeaturesUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deviceFeaturesUtils.d.ts","sourceRoot":"","sources":["../../src/utils/deviceFeaturesUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EACV,QAAQ,EACR,aAAa,EACb,WAAW,EACX,YAAY,EACZ,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAElB,eAAO,MAAM,cAAc,4EAA0B,YAUpD,CAAC;AAEF,eAAO,MAAM,aAAa,4EAA0B,WAUnD,CAAC;AAEF,eAAO,MAAM,yBAAyB,4EAA0B,WACvC,CAAC;AAE1B,eAAO,MAAM,sBAAsB,iCAAoB,WAAW,GAAG,IAKpE,CAAC;AAEF,eAAO,MAAM,uBAAuB,qCAAwB,WAQ3D,CAAC;AAEF,eAAO,MAAM,aAAa,aAAc,QAAQ,WAM/C,CAAC;AAEF,eAAO,MAAM,cAAc,aAAc,QAAQ,WAOhD,CAAC;AAKF,eAAO,MAAM,wBAAwB,aAAc,QAAQ,GAAG,SAAS,kBAOtE,CAAC;AAKF,eAAO,MAAM,2BAA2B,aAAc,QAAQ,KAAG,aAAa,GAAG,IAQhF,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAAc,QAAQ,KAAG,kBAU9D,CAAC;AAEF,eAAO,MAAM,oBAAoB,4EAA0B,kBAW1D,CAAC;AAEF,eAAO,MAAM,kBAAkB,aAAoB,QAAQ,YAAY,cAAc,4BAUpF,CAAC;AAEF,eAAO,MAAM,qBAAqB,4EAA0B,OAY3D,CAAC"}
+{"version":3,"file":"deviceFeaturesUtils.d.ts","sourceRoot":"","sources":["../../src/utils/deviceFeaturesUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EACV,QAAQ,EACR,aAAa,EACb,WAAW,EACX,YAAY,EACZ,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAElB,eAAO,MAAM,cAAc,4EAA0B,YAUpD,CAAC;AAEF,eAAO,MAAM,aAAa,4EAA0B,WAUnD,CAAC;AAEF,eAAO,MAAM,yBAAyB,4EAA0B,WACvC,CAAC;AAE1B,eAAO,MAAM,sBAAsB,iCAAoB,WAAW,GAAG,IAKpE,CAAC;AAEF,eAAO,MAAM,uBAAuB,qCAAwB,WAQ3D,CAAC;AAEF,eAAO,MAAM,aAAa,aAAc,QAAQ,WAM/C,CAAC;AAEF,eAAO,MAAM,cAAc,aAAc,QAAQ,WAOhD,CAAC;AAKF,eAAO,MAAM,wBAAwB,aAAc,QAAQ,GAAG,SAAS,kBAOtE,CAAC;AAKF,eAAO,MAAM,2BAA2B,aAAc,QAAQ,KAAG,aAAa,GAAG,IAQhF,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAAc,QAAQ,KAAG,kBAU9D,CAAC;AAEF,eAAO,MAAM,oBAAoB,4EAA0B,kBAW1D,CAAC;AAEF,eAAO,MAAM,kBAAkB,aAAoB,QAAQ,YAAY,cAAc,4BAUpF,CAAC;AAEF,eAAO,MAAM,qBAAqB,4EAA0B,OAU3D,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.1.57",
+  "version": "0.1.58",
   "description": "> TODO: description",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -24,8 +24,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^0.1.57",
-    "@onekeyfe/hd-transport": "^0.1.57",
+    "@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",
@@ -40,5 +40,5 @@
     "@types/parse-uri": "^1.0.0",
     "@types/semver": "^7.3.9"
   },
-  "gitHead": "f443fdd58ca37c14228808ad712dc115cfe0ca50"
+  "gitHead": "bf3eba53bcfdb27466f20a7392970764bcb9237b"
 }

package/src/api/FirmwareUpdateV2.ts

@@ -12,7 +12,7 @@ import { validateParams } from './helpers/paramsValidator';
 import { DevicePool } from '../device/DevicePool';
 import { getBinary, getSysResourceBinary } from './firmware/getBinary';
 import { updateResources, uploadFirmware } from './firmware/uploadFirmware';
-import { getDeviceType, getDeviceUUID, wait } from '../utils';
+import { getDeviceType, getDeviceUUID, wait, getLogger, LoggerNames } from '../utils';
 import { createUiMessage } from '../events/ui-request';
 import type { KnownDevice, Features } from '../types';
 import { DataManager } from '../data-manager';
@@ -24,6 +24,8 @@ type Params = {
   updateType: 'firmware' | 'ble';
 };
 
+const Log = getLogger(LoggerNames.Method);
+
 export default class FirmwareUpdate extends BaseMethod<Params> {
   checkPromise: Deferred<any> | null = null;
 
@@ -74,25 +76,41 @@ export default class FirmwareUpdate extends BaseMethod<Params> {
     );
   };
 
-  checkDeviceToBootloader() {
+  checkDeviceToBootloader(connectId: string | undefined) {
     this.checkPromise = createDeferred();
+    const env = DataManager.getSettings('env');
+    const isBleReconnect = connectId && env === 'react-native';
 
-    // check device goto bootloader mode
-    const intervalTimer: ReturnType<typeof setInterval> | undefined = setInterval(async () => {
-      const deviceDiff = await this.device.deviceConnector?.enumerate();
-      const devicesDescriptor = deviceDiff?.descriptors ?? [];
-      const { deviceList } = await DevicePool.getDevices(devicesDescriptor, this.connectId);
-      console.log('device list: ', deviceList);
-      if (deviceList.length === 1 && deviceList[0].features?.bootloader_mode) {
-        // should update current device from cache
-        // because device was reboot and had some new requests
-        this.device.updateFromCache(deviceList[0]);
-        this.device.commands.disposed = false;
+    Log.log('FirmwareUpdateV2 [checkDeviceToBootloader] isBleReconnect: ', isBleReconnect);
 
-        clearInterval(intervalTimer);
-        this.checkPromise?.resolve(true);
-      }
-    }, 2000);
+    // check device goto bootloader mode
+    const intervalTimer: ReturnType<typeof setInterval> | undefined = setInterval(
+      async () => {
+        if (isBleReconnect) {
+          await this.device.acquire();
+          await this.device.initialize();
+          if (this.device.features?.bootloader_mode) {
+            clearInterval(intervalTimer);
+            this.checkPromise?.resolve(true);
+          }
+        } else {
+          const deviceDiff = await this.device.deviceConnector?.enumerate();
+          const devicesDescriptor = deviceDiff?.descriptors ?? [];
+          const { deviceList } = await DevicePool.getDevices(devicesDescriptor, connectId);
+
+          if (deviceList.length === 1 && deviceList[0]?.features?.bootloader_mode) {
+            // should update current device from cache
+            // because device was reboot and had some new requests
+            this.device.updateFromCache(deviceList[0]);
+            this.device.commands.disposed = false;
+
+            clearInterval(intervalTimer);
+            this.checkPromise?.resolve(true);
+          }
+        }
+      },
+      isBleReconnect ? 3000 : 2000
+    );
 
     // check goto bootloader mode timeout and throw error
     setTimeout(() => {
@@ -159,7 +177,7 @@ export default class FirmwareUpdate extends BaseMethod<Params> {
         this.postTipMessage('AutoRebootToBootloader');
         await commands.typedCall('DeviceBackToBoot', 'Success');
         this.postTipMessage('GoToBootloaderSuccess');
-        this.checkDeviceToBootloader();
+        this.checkDeviceToBootloader(this.payload.connectId);
 
         // force clean classic device cache so that the device can initialize again
         if (deviceType === 'classic') {

package/src/api/firmware/uploadFirmware.ts

@@ -174,11 +174,7 @@ export const updateResources = async (
     const name = fileName.split('/').pop();
     if (!file.dir && fileName.indexOf('__MACOSX') === -1 && name) {
       const data = await file.async('arraybuffer');
-      try {
-        await updateResource(typedCall, name, data);
-      } catch (error) {
-        Log.error(error);
-      }
+      await updateResource(typedCall, name, data);
     }
 
     progress += stepProgress;

package/src/core/index.ts

@@ -150,6 +150,11 @@ export const callAPI = async (message: CoreMessage) => {
       if (versionRange && device.features) {
         const currentVersion = getDeviceFirmwareVersion(device.features).join('.');
         if (semver.valid(versionRange.min) && semver.lt(currentVersion, versionRange.min)) {
+          const newVersionUnReleased = DataManager.getFirmwareStatus(device.features);
+          if (newVersionUnReleased === 'none' || newVersionUnReleased === 'valid') {
+            throw ERRORS.TypedError(HardwareErrorCode.NewFirmwareUnRelease);
+          }
+
           return Promise.reject(
             ERRORS.TypedError(
               HardwareErrorCode.CallMethodNeedUpgradeFirmware,

package/src/device/DeviceCommands.ts

@@ -144,7 +144,16 @@ export class DeviceCommands {
     res: DefaultMessageResponse,
     callType: MessageKey
   ): Promise<DefaultMessageResponse> {
-    Log.debug('_filterCommonTypes: ', res);
+    try {
+      if (DataManager.getSettings('env') === 'react-native') {
+        Log.debug('_filterCommonTypes: ', JSON.stringify(res));
+      } else {
+        Log.debug('_filterCommonTypes: ', res);
+      }
+    } catch (error) {
+      // ignore
+    }
+
     if (res.type === 'Failure') {
       const { code, message } = res.message as {
         code?: string | FailureType;

package/src/utils/deviceFeaturesUtils.ts

@@ -134,14 +134,12 @@ export const getPassphraseState = async (features: Features, commands: DeviceCom
 
 export const supportBatchPublicKey = (features?: Features): boolean => {
   if (!features) return false;
-
-  // TODO: support batch public key for touch
-  // const deviceType = getDeviceType(features);
-  // if (deviceType === 'touch' || deviceType === 'pro') {
-  //   return true;
-  // }
-
   const currentVersion = getDeviceFirmwareVersion(features).join('.');
 
+  const deviceType = getDeviceType(features);
+  if (deviceType === 'touch' || deviceType === 'pro') {
+    return semver.gte(currentVersion, '3.1.0');
+  }
+
   return semver.gte(currentVersion, '2.6.0');
 };