@onekeyfe/hd-core 1.1.18-alpha.1 → 1.1.18

package/dist/index.js

@@ -24930,54 +24930,7 @@ const findLatestRelease = (releases) => {
 };
 
 var _a$1;
-const FIRMWARE_FIELDS = [
-    'firmware',
-    'firmware-v2',
-    'firmware-v7',
-    'firmware-btc-v7',
-];
-const FIRMWARE_FIELD_TYPE_MAP = {
-    firmware: hdShared.EFirmwareType.Universal,
-    'firmware-v2': hdShared.EFirmwareType.Universal,
-    'firmware-v7': hdShared.EFirmwareType.Universal,
-    'firmware-btc-v7': hdShared.EFirmwareType.BitcoinOnly,
-};
-function getFirmwareTypeFromField(firmwareField) {
-    const firmwareType = FIRMWARE_FIELD_TYPE_MAP[firmwareField];
-    if (firmwareType === undefined) {
-        return hdShared.EFirmwareType.Universal;
-    }
-    return firmwareType;
-}
 class DataManager {
-    static enrichFirmwareReleaseInfo(deviceData) {
-        if (!deviceData || typeof deviceData !== 'object') {
-            return {
-                firmware: [],
-                ble: [],
-            };
-        }
-        const enrichedData = Object.assign({}, deviceData);
-        FIRMWARE_FIELDS.forEach(field => {
-            const releases = enrichedData[field];
-            if (!releases || !Array.isArray(releases) || releases.length === 0) {
-                return;
-            }
-            try {
-                enrichedData[field] = releases.map(release => {
-                    if (!release || typeof release !== 'object' || !!release.firmwareType) {
-                        return release;
-                    }
-                    const firmwareType = getFirmwareTypeFromField(field);
-                    return Object.assign(Object.assign({}, release), { firmwareType });
-                });
-            }
-            catch (error) {
-                console.error(`Error enriching firmware field "${field}":`, error);
-            }
-        });
-        return enrichedData;
-    }
     static load(settings) {
         return __awaiter(this, void 0, void 0, function* () {
             this.settings = settings;
@@ -24992,12 +24945,12 @@ class DataManager {
                     timeout: 7000,
                 });
                 this.deviceMap = {
-                    [hdShared.EDeviceType.Classic]: this.enrichFirmwareReleaseInfo(data.classic),
-                    [hdShared.EDeviceType.Classic1s]: this.enrichFirmwareReleaseInfo(data.classic1s),
-                    [hdShared.EDeviceType.ClassicPure]: this.enrichFirmwareReleaseInfo(data.classicpure),
-                    [hdShared.EDeviceType.Mini]: this.enrichFirmwareReleaseInfo(data.mini),
-                    [hdShared.EDeviceType.Touch]: this.enrichFirmwareReleaseInfo(data.touch),
-                    [hdShared.EDeviceType.Pro]: this.enrichFirmwareReleaseInfo(data.pro),
+                    [hdShared.EDeviceType.Classic]: data.classic,
+                    [hdShared.EDeviceType.Classic1s]: data.classic1s,
+                    [hdShared.EDeviceType.ClassicPure]: data.classicpure,
+                    [hdShared.EDeviceType.Mini]: data.mini,
+                    [hdShared.EDeviceType.Touch]: data.touch,
+                    [hdShared.EDeviceType.Pro]: data.pro,
                 };
                 this.assets = {
                     bridge: data.bridge,
@@ -25068,12 +25021,11 @@ DataManager.messages = {
     v1: MessagesLegacyV1JSON,
 };
 DataManager.lastCheckTimestamp = 0;
-DataManager.getFirmwareStatus = (features, firmwareType) => {
+DataManager.getFirmwareStatus = (features) => {
     var _b, _c;
     const deviceType = getDeviceType(features);
     if (deviceType === hdShared.EDeviceType.Unknown)
         return 'unknown';
-    const deviceFirmwareType = getFirmwareType(features);
     const deviceFirmwareVersion = getDeviceFirmwareVersion(features);
     if (features.firmware_present === false) {
         return 'none';
@@ -25081,19 +25033,12 @@ DataManager.getFirmwareStatus = (features, firmwareType) => {
     if (DeviceModelToTypes.model_mini.includes(deviceType) && features.bootloader_mode) {
         return 'unknown';
     }
-    const firmwareUpdateField = getFirmwareUpdateField({
-        features,
-        updateType: 'firmware',
-        firmwareType,
-    });
+    const firmwareUpdateField = getFirmwareUpdateField({ features, updateType: 'firmware' });
     const targetDeviceConfigList = (_c = (_b = _a$1.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b[firmwareUpdateField]) !== null && _c !== void 0 ? _c : [];
-    let currentVersion = deviceFirmwareVersion.join('.');
-    if (targetDeviceConfigList.length > 0 && deviceFirmwareType !== firmwareType) {
-        currentVersion = '0.0.0';
-    }
+    const currentVersion = deviceFirmwareVersion.join('.');
     return getReleaseStatus(targetDeviceConfigList, currentVersion);
 };
-DataManager.getSysResourcesLatestRelease = ({ features, forcedUpdateRes, firmwareType, }) => {
+DataManager.getSysResourcesLatestRelease = (features, forcedUpdateRes) => {
     var _b, _c, _d;
     const deviceType = getDeviceType(features);
     const deviceFirmwareVersion = getDeviceFirmwareVersion(features);
@@ -25102,7 +25047,6 @@ DataManager.getSysResourcesLatestRelease = ({ features, forcedUpdateRes, firmwar
     const firmwareUpdateField = getFirmwareUpdateField({
         features,
         updateType: 'firmware',
-        firmwareType,
     });
     const targetDeviceConfigList = (_c = (_b = _a$1.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b[firmwareUpdateField]) !== null && _c !== void 0 ? _c : [];
     const currentVersion = deviceFirmwareVersion.join('.');
@@ -25111,7 +25055,7 @@ DataManager.getSysResourcesLatestRelease = ({ features, forcedUpdateRes, firmwar
         : semver__default["default"].gt(item.version.join('.'), currentVersion) && !!item.resource);
     return (_d = findLatestRelease(targetDeviceConfig)) === null || _d === void 0 ? void 0 : _d.resource;
 };
-DataManager.getSysFullResource = (features, firmwareType) => {
+DataManager.getSysFullResource = (features) => {
     var _b, _c, _d;
     const deviceType = getDeviceType(features);
     if (deviceType === hdShared.EDeviceType.Unknown)
@@ -25121,13 +25065,12 @@ DataManager.getSysFullResource = (features, firmwareType) => {
     const firmwareUpdateField = getFirmwareUpdateField({
         features,
         updateType: 'firmware',
-        firmwareType,
     });
     const targetDeviceConfigList = (_c = (_b = _a$1.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b[firmwareUpdateField]) !== null && _c !== void 0 ? _c : [];
     const targetDeviceConfig = targetDeviceConfigList.filter(item => !!item.fullResource);
     return (_d = findLatestRelease(targetDeviceConfig)) === null || _d === void 0 ? void 0 : _d.fullResource;
 };
-DataManager.getBootloaderResource = (features, firmwareType) => {
+DataManager.getBootloaderResource = (features) => {
     var _b, _c, _d;
     const deviceType = getDeviceType(features);
     if (deviceType === hdShared.EDeviceType.Unknown)
@@ -25137,7 +25080,6 @@ DataManager.getBootloaderResource = (features, firmwareType) => {
     const firmwareUpdateField = getFirmwareUpdateField({
         features,
         updateType: 'firmware',
-        firmwareType,
     });
     const targetDeviceConfigList = (_c = (_b = _a$1.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b[firmwareUpdateField]) !== null && _c !== void 0 ? _c : [];
     if (targetDeviceConfigList.length === 0) {
@@ -25146,7 +25088,7 @@ DataManager.getBootloaderResource = (features, firmwareType) => {
     const targetDeviceConfig = targetDeviceConfigList.filter(item => !!item.bootloaderResource);
     return (_d = findLatestRelease(targetDeviceConfig)) === null || _d === void 0 ? void 0 : _d.bootloaderResource;
 };
-DataManager.getBootloaderTargetVersion = (features, firmwareType) => {
+DataManager.getBootloaderTargetVersion = (features) => {
     var _b, _c, _d, _e;
     const deviceType = getDeviceType(features);
     if (deviceType === hdShared.EDeviceType.Unknown)
@@ -25154,13 +25096,12 @@ DataManager.getBootloaderTargetVersion = (features, firmwareType) => {
     const firmwareUpdateField = getFirmwareUpdateField({
         features,
         updateType: 'firmware',
-        firmwareType,
     });
     const targetDeviceConfigList = (_c = (_b = _a$1.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b[firmwareUpdateField]) !== null && _c !== void 0 ? _c : [];
     const targetDeviceConfig = targetDeviceConfigList.filter(item => !!item.bootloaderResource);
     return (_e = (_d = targetDeviceConfig === null || targetDeviceConfig === void 0 ? void 0 : targetDeviceConfig[0]) === null || _d === void 0 ? void 0 : _d.bootloaderVersion) !== null && _e !== void 0 ? _e : undefined;
 };
-DataManager.getBootloaderRelatedFirmwareVersion = (features, firmwareType) => {
+DataManager.getBootloaderRelatedFirmwareVersion = (features) => {
     var _b, _c, _d, _e;
     const deviceType = getDeviceType(features);
     if (deviceType === hdShared.EDeviceType.Unknown)
@@ -25170,13 +25111,12 @@ DataManager.getBootloaderRelatedFirmwareVersion = (features, firmwareType) => {
     const firmwareUpdateField = getFirmwareUpdateField({
         features,
         updateType: 'firmware',
-        firmwareType,
     });
     const targetDeviceConfigList = (_c = (_b = _a$1.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b[firmwareUpdateField]) !== null && _c !== void 0 ? _c : [];
     const targetDeviceConfig = targetDeviceConfigList.filter(item => !!item.bootloaderRelatedFirmwareVersion);
     return (_e = (_d = targetDeviceConfig === null || targetDeviceConfig === void 0 ? void 0 : targetDeviceConfig[0]) === null || _d === void 0 ? void 0 : _d.bootloaderRelatedFirmwareVersion) !== null && _e !== void 0 ? _e : undefined;
 };
-DataManager.getFirmwareChangelog = (features, firmwareType) => {
+DataManager.getFirmwareChangelog = (features) => {
     var _b, _c;
     const deviceType = getDeviceType(features);
     if (deviceType === hdShared.EDeviceType.Unknown)
@@ -25185,7 +25125,6 @@ DataManager.getFirmwareChangelog = (features, firmwareType) => {
     const firmwareUpdateField = getFirmwareUpdateField({
         features,
         updateType: 'firmware',
-        firmwareType,
     });
     const targetDeviceConfigList = (_c = (_b = _a$1.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b[firmwareUpdateField]) !== null && _c !== void 0 ? _c : [];
     if (features.firmware_present === false ||
@@ -25195,7 +25134,7 @@ DataManager.getFirmwareChangelog = (features, firmwareType) => {
     const currentVersion = deviceFirmwareVersion.join('.');
     return getReleaseChangelog(targetDeviceConfigList, currentVersion);
 };
-DataManager.getFirmwareLatestRelease = (features, firmwareType) => {
+DataManager.getFirmwareLatestRelease = (features) => {
     var _b, _c;
     const deviceType = getDeviceType(features);
     if (deviceType === hdShared.EDeviceType.Unknown)
@@ -25203,14 +25142,13 @@ DataManager.getFirmwareLatestRelease = (features, firmwareType) => {
     const firmwareUpdateField = getFirmwareUpdateField({
         features,
         updateType: 'firmware',
-        firmwareType,
     });
     const targetDeviceConfigList = (_c = (_b = _a$1.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b[firmwareUpdateField]) !== null && _c !== void 0 ? _c : [];
     const target = findLatestRelease(targetDeviceConfigList);
     if (!target)
         return target;
     if (!target.resource) {
-        const resource = _a$1.getSysResourcesLatestRelease({ features, firmwareType });
+        const resource = _a$1.getSysResourcesLatestRelease(features);
         return Object.assign(Object.assign({}, target), { resource });
     }
     return target;
@@ -25409,35 +25347,28 @@ const supportModifyHomescreen = (features) => {
     }
     return { support: semver__default["default"].gte(currentVersion, '3.4.0') };
 };
-const getLatestFirmwareField = (firmwareType) => {
-    if (firmwareType === 'bitcoinonly') {
-        return `firmware-btc-v7`;
-    }
-    return `firmware-v7`;
-};
-const getFirmwareUpdateField = ({ features, updateType, targetVersion, firmwareType, }) => {
+const getFirmwareUpdateField = ({ features, updateType, targetVersion, }) => {
     const deviceType = getDeviceType(features);
     const deviceFirmwareVersion = getDeviceFirmwareVersion(features);
     if (updateType === 'ble') {
         return 'ble';
     }
-    const latestFirmwareField = getLatestFirmwareField(firmwareType);
     if (DeviceModelToTypes.model_mini.includes(deviceType)) {
-        return latestFirmwareField;
+        return 'firmware-v7';
     }
     if (deviceType === hdShared.EDeviceType.Touch) {
         if (targetVersion) {
             if (semver__default["default"].eq(targetVersion, '4.0.0'))
                 return 'firmware-v2';
             if (semver__default["default"].gt(targetVersion, '4.0.0'))
-                return latestFirmwareField;
+                return 'firmware-v7';
         }
         if (semver__default["default"].lt(deviceFirmwareVersion.join('.'), '3.4.0'))
             return 'firmware';
-        return latestFirmwareField;
+        return 'firmware-v7';
     }
     if (deviceType === hdShared.EDeviceType.Pro) {
-        return latestFirmwareField;
+        return 'firmware-v7';
     }
     return 'firmware';
 };
@@ -25619,20 +25550,20 @@ function isEnteredManuallyBoot(features, updateType) {
     return isMini || isBoot183ClassicUpBle;
 }
 
-function checkNeedUpdateBootForTouch(features, firmwareType) {
+function checkNeedUpdateBootForTouch(features) {
     const deviceType = getDeviceType(features);
     if (!DeviceModelToTypes.model_touch.includes(deviceType))
         return false;
     const currentVersion = getDeviceFirmwareVersion(features).join('.');
     const bootloaderVersion = getDeviceBootloaderVersion(features).join('.');
-    const targetBootloaderVersion = DataManager.getBootloaderTargetVersion(features, firmwareType);
+    const targetBootloaderVersion = DataManager.getBootloaderTargetVersion(features);
     if (!targetBootloaderVersion)
         return false;
     return (semver__default["default"].gte(currentVersion, '3.2.0') &&
         semver__default["default"].gte(currentVersion, '4.1.0') &&
         semver__default["default"].lte(bootloaderVersion, targetBootloaderVersion.join('.')));
 }
-function checkNeedUpdateBootForClassicAndMini({ features, willUpdateFirmware, firmwareType, }) {
+function checkNeedUpdateBootForClassicAndMini(features, willUpdateFirmware) {
     const deviceType = getDeviceType(features);
     if (!DeviceModelToTypes.model_mini.includes(deviceType))
         return false;
@@ -25640,11 +25571,11 @@ function checkNeedUpdateBootForClassicAndMini({ features, willUpdateFirmware, fi
         return false;
     const currentVersion = getDeviceFirmwareVersion(features).join('.');
     const bootloaderVersion = getDeviceBootloaderVersion(features).join('.');
-    const targetBootloaderVersion = DataManager.getBootloaderTargetVersion(features, firmwareType);
+    const targetBootloaderVersion = DataManager.getBootloaderTargetVersion(features);
     if (targetBootloaderVersion && semver__default["default"].gte(bootloaderVersion, targetBootloaderVersion.join('.'))) {
         return false;
     }
-    const bootloaderRelatedFirmwareVersion = DataManager.getBootloaderRelatedFirmwareVersion(features, firmwareType);
+    const bootloaderRelatedFirmwareVersion = DataManager.getBootloaderRelatedFirmwareVersion(features);
     if (!bootloaderRelatedFirmwareVersion)
         return false;
     return shouldUpdateBootloaderForClassicAndMini({
@@ -27514,10 +27445,10 @@ class DeviceList extends events.exports {
     }
 }
 
-const getFirmwareReleaseInfo = (features, firmwareType) => {
-    const firmwareStatus = DataManager.getFirmwareStatus(features, firmwareType);
-    const changelog = DataManager.getFirmwareChangelog(features, firmwareType);
-    const release = DataManager.getFirmwareLatestRelease(features, firmwareType);
+const getFirmwareReleaseInfo = (features) => {
+    const firmwareStatus = DataManager.getFirmwareStatus(features);
+    const changelog = DataManager.getFirmwareChangelog(features);
+    const release = DataManager.getFirmwareLatestRelease(features);
     const bootloaderMode = !!features.bootloader_mode;
     return {
         status: firmwareStatus,
@@ -27538,8 +27469,8 @@ const getBleFirmwareReleaseInfo = (features) => {
         bootloaderMode,
     };
 };
-const getBootloaderReleaseInfo = ({ features, willUpdateFirmwareVersion, firmwareType, }) => {
-    const release = DataManager.getFirmwareLatestRelease(features, firmwareType);
+const getBootloaderReleaseInfo = (features, willUpdateFirmwareVersion) => {
+    const release = DataManager.getFirmwareLatestRelease(features);
     const changelog = [release === null || release === void 0 ? void 0 : release.bootloaderChangelog].filter(item => item != null &&
         typeof item === 'object' &&
         Object.prototype.hasOwnProperty.call(item, 'zh-CN') &&
@@ -27548,14 +27479,10 @@ const getBootloaderReleaseInfo = ({ features, willUpdateFirmwareVersion, firmwar
     let shouldUpdate = false;
     const deviceType = getDeviceType(features);
     if (DeviceModelToTypes.model_mini.includes(deviceType)) {
-        shouldUpdate = !!checkNeedUpdateBootForClassicAndMini({
-            features,
-            willUpdateFirmware: willUpdateFirmwareVersion,
-            firmwareType,
-        });
+        shouldUpdate = !!checkNeedUpdateBootForClassicAndMini(features, willUpdateFirmwareVersion);
     }
     else if (DeviceModelToTypes.model_touch.includes(deviceType)) {
-        shouldUpdate = checkNeedUpdateBootForTouch(features, firmwareType);
+        shouldUpdate = checkNeedUpdateBootForTouch(features);
     }
     return {
         status: shouldUpdate ? 'outdated' : 'valid',
@@ -27599,8 +27526,7 @@ class BaseMethod {
     checkFirmwareRelease() {
         if (!this.device || !this.device.features)
             return;
-        const firmwareType = getFirmwareType(this.device.features);
-        const releaseInfo = getFirmwareReleaseInfo(this.device.features, firmwareType);
+        const releaseInfo = getFirmwareReleaseInfo(this.device.features);
         this.postMessage(createFirmwareMessage(FIRMWARE.RELEASE_INFO, Object.assign(Object.assign({}, releaseInfo), { device: this.device.toMessageObject() })));
         const bleReleaseInfo = getBleFirmwareReleaseInfo(this.device.features);
         this.postMessage(createFirmwareMessage(FIRMWARE.BLE_RELEASE_INFO, Object.assign(Object.assign({}, bleReleaseInfo), { device: this.device.toMessageObject() })));
@@ -27800,12 +27726,8 @@ class CheckFirmwareRelease extends BaseMethod {
         this.skipForceUpdateCheck = true;
     }
     run() {
-        var _a;
-        const payload = this.payload;
         if (this.device.features) {
-            const deviceFirmwareType = getFirmwareType(this.device.features);
-            const firmwareType = (_a = payload.firmwareType) !== null && _a !== void 0 ? _a : deviceFirmwareType;
-            const releaseInfo = getFirmwareReleaseInfo(this.device.features, firmwareType);
+            const releaseInfo = getFirmwareReleaseInfo(this.device.features);
             return Promise.resolve(releaseInfo);
         }
         return Promise.resolve(null);
@@ -27946,20 +27868,12 @@ class CheckBootloaderRelease extends BaseMethod {
         this.skipForceUpdateCheck = true;
     }
     run() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.device.features) {
                 return null;
             }
             const { features } = this.device;
-            const payload = this.payload;
-            const deviceFirmwareType = getFirmwareType(features);
-            const firmwareType = (_a = payload.firmwareType) !== null && _a !== void 0 ? _a : deviceFirmwareType;
-            const releaseInfo = getBootloaderReleaseInfo({
-                features,
-                willUpdateFirmwareVersion: payload.willUpdateFirmwareVersion,
-                firmwareType,
-            });
+            const releaseInfo = getBootloaderReleaseInfo(features, this.payload.willUpdateFirmwareVersion);
             return Promise.resolve(releaseInfo);
         });
     }
@@ -27975,14 +27889,11 @@ class CheckAllFirmwareRelease extends BaseMethod {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const { features } = this.device;
-            const { checkBridgeRelease, firmwareType: firmwareTypeParams } = this
-                .payload;
+            const { checkBridgeRelease } = this.payload;
             if (!features) {
                 return Promise.resolve(null);
             }
-            const deviceFirmwareType = getFirmwareType(features);
-            const firmwareType = firmwareTypeParams !== null && firmwareTypeParams !== void 0 ? firmwareTypeParams : deviceFirmwareType;
-            const firmwareRelease = getFirmwareReleaseInfo(features, firmwareType);
+            const firmwareRelease = getFirmwareReleaseInfo(features);
             const currentFirmwareVersion = getDeviceFirmwareVersion(features).join('.');
             const willUpdateFirmwareVersion = (_b = (_a = firmwareRelease.release) === null || _a === void 0 ? void 0 : _a.version) === null || _b === void 0 ? void 0 : _b.join('.');
             const deviceType = getDeviceType(features);
@@ -27995,11 +27906,7 @@ class CheckAllFirmwareRelease extends BaseMethod {
                     willUpdateFirmwareVersion,
                 });
             }
-            const bootloaderRelease = getBootloaderReleaseInfo({
-                features,
-                willUpdateFirmwareVersion,
-                firmwareType,
-            });
+            const bootloaderRelease = getBootloaderReleaseInfo(features, willUpdateFirmwareVersion);
             const bleFirmwareReleaseInfo = getBleFirmwareReleaseInfo(features);
             return {
                 firmware: firmwareRelease,
@@ -28645,13 +28552,8 @@ class DeviceWipe extends BaseMethod {
     }
 }
 
-const getBinary = ({ features, updateType, version, isUpdateBootloader, firmwareType, }) => __awaiter(void 0, void 0, void 0, function* () {
-    const releaseInfo = getInfo({
-        features,
-        updateType,
-        targetVersion: version === null || version === void 0 ? void 0 : version.join('.'),
-        firmwareType,
-    });
+const getBinary = ({ features, updateType, version, isUpdateBootloader, }) => __awaiter(void 0, void 0, void 0, function* () {
+    const releaseInfo = getInfo({ features, updateType, targetVersion: version === null || version === void 0 ? void 0 : version.join('.') });
     if (!releaseInfo) {
         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'no firmware found for this device');
     }
@@ -28688,7 +28590,7 @@ const getSysResourceBinary = (url) => __awaiter(void 0, void 0, void 0, function
         binary: fw,
     };
 });
-const getInfo = ({ features, updateType, targetVersion, firmwareType }) => {
+const getInfo = ({ features, updateType, targetVersion }) => {
     var _a, _b;
     const deviceType = getDeviceType(features);
     if (deviceType === 'unknown') {
@@ -28699,7 +28601,6 @@ const getInfo = ({ features, updateType, targetVersion, firmwareType }) => {
         features,
         updateType,
         targetVersion,
-        firmwareType,
     });
     const releaseInfo = (_b = (_a = deviceMap === null || deviceMap === void 0 ? void 0 : deviceMap[deviceType]) === null || _a === void 0 ? void 0 : _a[firmwareUpdateField]) !== null && _b !== void 0 ? _b : [];
     return findLatestRelease(releaseInfo);
@@ -29042,19 +28943,15 @@ class DeviceFullyUploadResource extends BaseMethod {
         return isTouchMode && semver__default["default"].gte(currentVersion, '3.4.0');
     }
     run() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const { device } = this;
             const { features } = device;
-            const payload = this.payload;
-            const deviceFirmwareType = getFirmwareType(features);
-            const firmwareType = (_a = payload.firmwareType) !== null && _a !== void 0 ? _a : deviceFirmwareType;
             if (!(features === null || features === void 0 ? void 0 : features.bootloader_mode) && features) {
                 if (features) {
                     let { binary } = this.payload;
                     if (!binary) {
                         this.postTipMessage('CheckLatestUiResource');
-                        const resourceUrl = DataManager.getSysFullResource(features, firmwareType);
+                        const resourceUrl = DataManager.getSysFullResource(features);
                         if (resourceUrl) {
                             this.postTipMessage('DownloadLatestUiResource');
                             const resource = yield getSysResourceBinary(resourceUrl);
@@ -29418,14 +29315,12 @@ class DeviceUpdateBootloader extends FirmwareUpdateBaseMethod {
             return true;
         });
     }
-    updateTouchBootloader({ device, features, firmwareType, }) {
+    updateTouchBootloader(device, features) {
         return __awaiter(this, void 0, void 0, function* () {
             let { binary } = this.payload;
             if (!binary) {
                 this.postTipMessage(exports.FirmwareUpdateTipMessage.CheckLatestUiResource);
-                const resourceUrl = features
-                    ? DataManager.getBootloaderResource(features, firmwareType)
-                    : null;
+                const resourceUrl = features ? DataManager.getBootloaderResource(features) : null;
                 if (resourceUrl) {
                     this.postTipMessage(exports.FirmwareUpdateTipMessage.DownloadLatestBootloaderResource);
                     const resource = yield getSysResourceBinary(resourceUrl);
@@ -29449,16 +29344,12 @@ class DeviceUpdateBootloader extends FirmwareUpdateBaseMethod {
         });
     }
     run() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const { device } = this;
             const { features } = device;
-            const payload = this.payload;
             const deviceType = getDeviceType(features);
-            const deviceFirmwareType = getFirmwareType(features);
-            const firmwareType = (_a = payload.firmwareType) !== null && _a !== void 0 ? _a : deviceFirmwareType;
             if (DeviceModelToTypes.model_touch.includes(deviceType)) {
-                return this.updateTouchBootloader({ device, features, firmwareType });
+                return this.updateTouchBootloader(device, features);
             }
             return Promise.resolve(true);
         });
@@ -29650,7 +29541,6 @@ class FirmwareUpdate extends BaseMethod {
                         features: device.features,
                         version: params.version,
                         updateType: params.updateType,
-                        firmwareType: hdShared.EFirmwareType.Universal,
                     });
                     binary = firmware.binary;
                     this.postTipMessage('DownloadFirmwareSuccess');
@@ -29694,7 +29584,6 @@ class FirmwareUpdateV2 extends BaseMethod {
             { name: 'binary', type: 'buffer' },
             { name: 'forcedUpdateRes', type: 'boolean' },
             { name: 'platform', type: 'string', required: true },
-            { name: 'firmwareType', type: 'string' },
         ]);
         if (!payload.updateType) {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodInvalidParameter, 'updateType is required');
@@ -29705,7 +29594,7 @@ class FirmwareUpdateV2 extends BaseMethod {
             isUpdateBootloader: payload.isUpdateBootloader,
         };
         if ('version' in payload) {
-            this.params = Object.assign(Object.assign({}, this.params), { version: payload.version, firmwareType: payload.firmwareType });
+            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 });
@@ -29826,7 +29715,7 @@ class FirmwareUpdateV2 extends BaseMethod {
         const currentVersion = getDeviceFirmwareVersion(features).join('.');
         return isTouchMode && semver__default["default"].gte(currentVersion, '3.2.0');
     }
-    checkVersionForCopyTouchResource(features, firmwareType) {
+    checkVersionForCopyTouchResource(features) {
         var _a;
         if (!features)
             return;
@@ -29834,7 +29723,7 @@ class FirmwareUpdateV2 extends BaseMethod {
         const currentVersion = getDeviceFirmwareVersion(features).join('.');
         const targetVersion = (_a = this.params.version) === null || _a === void 0 ? void 0 : _a.join('.');
         const { updateType } = this.params;
-        const releaseInfo = getInfo({ features, updateType, firmwareType });
+        const releaseInfo = getInfo({ features, updateType });
         if (!releaseInfo)
             return;
         const { fullResourceRange } = releaseInfo;
@@ -29850,14 +29739,12 @@ class FirmwareUpdateV2 extends BaseMethod {
         }
     }
     run() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         return __awaiter(this, void 0, void 0, function* () {
             const { device, params } = this;
             const { features, commands } = device;
             const deviceType = getDeviceType(features);
-            const deviceFirmwareType = getFirmwareType(device.features);
-            const firmwareType = (_a = params.firmwareType) !== null && _a !== void 0 ? _a : deviceFirmwareType;
-            this.checkVersionForCopyTouchResource(features, firmwareType);
+            this.checkVersionForCopyTouchResource(features);
             if (!(features === null || features === void 0 ? void 0 : features.bootloader_mode) && features) {
                 const uuid = getDeviceUUID(features);
                 if (this.isEnteredManuallyBoot(features)) {
@@ -29865,11 +29752,7 @@ class FirmwareUpdateV2 extends BaseMethod {
                 }
                 if (features && this.isSupportResourceUpdate(features, params.updateType)) {
                     this.postTipMessage('CheckLatestUiResource');
-                    const resourceUrl = DataManager.getSysResourcesLatestRelease({
-                        features,
-                        forcedUpdateRes: params.forcedUpdateRes,
-                        firmwareType,
-                    });
+                    const resourceUrl = DataManager.getSysResourcesLatestRelease(features, params.forcedUpdateRes);
                     if (resourceUrl) {
                         this.postTipMessage('DownloadLatestUiResource');
                         const resource = yield getSysResourceBinary(resourceUrl);
@@ -29879,7 +29762,7 @@ class FirmwareUpdateV2 extends BaseMethod {
                         }
                     }
                 }
-                (_c = (_b = this.device) === null || _b === void 0 ? void 0 : _b.commands) === null || _c === void 0 ? void 0 : _c.checkDisposed();
+                (_b = (_a = this.device) === null || _a === void 0 ? void 0 : _a.commands) === null || _b === void 0 ? void 0 : _b.checkDisposed();
                 try {
                     this.postTipMessage('AutoRebootToBootloader');
                     const bootRes = yield commands.typedCall('DeviceBackToBoot', 'Success');
@@ -29892,9 +29775,9 @@ class FirmwareUpdateV2 extends BaseMethod {
                         DevicePool.clearDeviceCache(uuid);
                     }
                     delete DevicePool.devicesCache[''];
-                    yield ((_d = this.checkPromise) === null || _d === void 0 ? void 0 : _d.promise);
+                    yield ((_c = this.checkPromise) === null || _c === void 0 ? void 0 : _c.promise);
                     this.checkPromise = null;
-                    (_f = (_e = this.device) === null || _e === void 0 ? void 0 : _e.commands) === null || _f === void 0 ? void 0 : _f.checkDisposed();
+                    (_e = (_d = this.device) === null || _d === void 0 ? void 0 : _d.commands) === null || _e === void 0 ? void 0 : _e.checkDisposed();
                     const isTouch = DeviceModelToTypes.model_touch.includes(deviceType);
                     yield wait(isTouch ? 3000 : 1500);
                 }
@@ -29921,16 +29804,15 @@ class FirmwareUpdateV2 extends BaseMethod {
                         version: params.version,
                         updateType: params.updateType,
                         isUpdateBootloader: params.isUpdateBootloader,
-                        firmwareType,
                     });
                     binary = firmware.binary;
                     this.postTipMessage('DownloadFirmwareSuccess');
                 }
             }
             catch (err) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateDownloadFailed, (_g = err.message) !== null && _g !== void 0 ? _g : err);
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateDownloadFailed, (_f = err.message) !== null && _f !== void 0 ? _f : err);
             }
-            (_j = (_h = this.device) === null || _h === void 0 ? void 0 : _h.commands) === null || _j === void 0 ? void 0 : _j.checkDisposed();
+            (_h = (_g = this.device) === null || _g === void 0 ? void 0 : _g.commands) === null || _h === void 0 ? void 0 : _h.checkDisposed();
             yield this.device.acquire();
             const response = yield uploadFirmware(params.updateType, this.device.getCommands().typedCall.bind(this.device.getCommands()), this.postMessage, device, { payload: binary, rebootOnSuccess: true });
             if (this.connectId) {
@@ -29963,7 +29845,6 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
             { name: 'forcedUpdateRes', type: 'boolean' },
             { name: 'bootloaderVersion', type: 'array' },
             { name: 'bootloaderBinary', type: 'buffer' },
-            { name: 'firmwareType', type: 'string' },
             { name: 'platform', type: 'string' },
         ]);
         this.params = {
@@ -29975,12 +29856,11 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
             bootloaderBinary: payload.bootloaderBinary,
             firmwareVersion: payload.firmwareVersion,
             resourceBinary: payload.resourceBinary,
-            firmwareType: payload.firmwareType,
             platform: payload.platform,
         };
     }
     run() {
-        var _a, _b;
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const { device } = this;
             const { features } = device;
@@ -29990,20 +29870,18 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
             if (!features) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Device features not available');
             }
-            const deviceFirmwareType = getFirmwareType(features);
-            const firmwareType = (_a = this.params.firmwareType) !== null && _a !== void 0 ? _a : deviceFirmwareType;
             let resourceBinary = null;
             let fwBinaryMap = [];
             let bootloaderBinary = null;
             try {
                 this.postTipMessage(exports.FirmwareUpdateTipMessage.StartDownloadFirmware);
-                resourceBinary = yield this.prepareResourceBinary(firmwareType);
-                fwBinaryMap = yield this.prepareFirmwareAndBleBinary(firmwareType);
-                bootloaderBinary = yield this.prepareBootloaderBinary(firmwareType);
+                resourceBinary = yield this.prepareResourceBinary();
+                fwBinaryMap = yield this.prepareFirmwareAndBleBinary();
+                bootloaderBinary = yield this.prepareBootloaderBinary();
                 this.postTipMessage(exports.FirmwareUpdateTipMessage.FinishDownloadFirmware);
             }
             catch (err) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateDownloadFailed, (_b = err.message) !== null && _b !== void 0 ? _b : err);
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateDownloadFailed, (_a = err.message) !== null && _a !== void 0 ? _a : err);
             }
             if (!bootloaderBinary && fwBinaryMap.length === 0) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateDownloadFailed, 'No firmware to update');
@@ -30028,7 +29906,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'bootloader version needs to be updated');
         }
     }
-    prepareResourceBinary(firmwareType) {
+    prepareResourceBinary() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.params.resourceBinary) {
                 return this.params.resourceBinary;
@@ -30036,11 +29914,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
             const { features } = this.device;
             if (!features)
                 return null;
-            const resourceUrl = DataManager.getSysResourcesLatestRelease({
-                features,
-                forcedUpdateRes: this.params.forcedUpdateRes,
-                firmwareType,
-            });
+            const resourceUrl = DataManager.getSysResourcesLatestRelease(features, this.params.forcedUpdateRes);
             if (resourceUrl) {
                 const resource = (yield getSysResourceBinary(resourceUrl)).binary;
                 return resource;
@@ -30049,7 +29923,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
             return null;
         });
     }
-    prepareBootloaderBinary(firmwareType) {
+    prepareBootloaderBinary() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.params.bootloaderBinary) {
                 return this.params.bootloaderBinary;
@@ -30058,7 +29932,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
             if (!features)
                 return null;
             if (this.params.bootloaderVersion) {
-                const bootResourceUrl = DataManager.getBootloaderResource(features, firmwareType);
+                const bootResourceUrl = DataManager.getBootloaderResource(features);
                 if (bootResourceUrl) {
                     const bootBinary = (yield getSysResourceBinary(bootResourceUrl)).binary;
                     return bootBinary;
@@ -30067,7 +29941,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
             return null;
         });
     }
-    prepareFirmwareAndBleBinary(firmwareType) {
+    prepareFirmwareAndBleBinary() {
         return __awaiter(this, void 0, void 0, function* () {
             const fwBinaryMap = [];
             if (this.params.firmwareBinary) {
@@ -30084,7 +29958,6 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
                         version: this.params.firmwareVersion,
                         updateType: 'firmware',
                         isUpdateBootloader: false,
-                        firmwareType,
                     })).binary;
                     fwBinaryMap.push({
                         fileName: 'firmware.bin',
@@ -30105,7 +29978,6 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
                         features,
                         version: this.params.bleVersion,
                         updateType: 'ble',
-                        firmwareType,
                     });
                     fwBinaryMap.push({
                         fileName: 'ble-firmware.bin',
@@ -33158,8 +33030,12 @@ class EVMSignTypedData extends BaseMethod {
             return false;
         let biggerLimit = 1024;
         const currentVersion = getDeviceFirmwareVersion(this.device.features).join('.');
+        const currentDeviceType = getDeviceType(this.device.features);
         const supportBiggerDataVersion = '4.4.0';
-        if (semver__default["default"].gte(currentVersion, supportBiggerDataVersion)) {
+        const supportBiggerData = DeviceModelToTypes.model_classic1s.includes(currentDeviceType) ||
+            (DeviceModelToTypes.model_touch.includes(currentDeviceType) &&
+                semver__default["default"].gte(currentVersion, supportBiggerDataVersion));
+        if (supportBiggerData) {
             biggerLimit = 1536;
         }
         const startIndex = data.startsWith('0x') ? 2 : 0;
@@ -39461,8 +39337,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                         throw hdShared.createDefectiveFirmwareError(defectiveInfo.serialNo, defectiveInfo.seVersion || 'Unknown', defectiveInfo.deviceType, method.connectId, method.deviceId);
                     }
                 }
-                const deviceFirmwareType = getFirmwareType(device.features);
-                const newVersionStatus = DataManager.getFirmwareStatus(device.features, deviceFirmwareType);
+                const newVersionStatus = DataManager.getFirmwareStatus(device.features);
                 const bleVersionStatus = DataManager.getBLEFirmwareStatus(device.features);
                 const currentFirmwareVersion = getDeviceFirmwareVersion(device.features).join('.');
                 const currentBleVersion = getDeviceBLEFirmwareVersion(device.features).join('.');