@onekeyfe/hd-core 1.1.4-alpha.1 → 1.1.4-alpha.2

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;AAClC,OAAO,EAAY,6BAA6B,EAAoB,MAAM,wBAAwB,CAAC;AA6BnG,OAAO,EAEL,WAAW,EAWZ,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,UAAU,CAAC;AAE7D,OAAO,eAAe,MAAM,2BAA2B,CAAC;AAMxD,KAAK,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;AAsCtD,eAAO,MAAM,OAAO,YAAmB,WAAW,WAAW,WAAW,iBA2DvE,CAAC;AAqiBF,eAAO,MAAM,MAAM,YAAa,WAAW,cAAc,MAAM,SA2E9D,CAAC;AA2KF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IAC5C,OAAO,CAAC,YAAY,CAAsB;IAG1C,OAAO,CAAC,qBAAqB,CAA4B;IAEzD,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,OAAO,CAAC,cAAc;IAWhB,aAAa,CAAC,OAAO,EAAE,WAAW;IAqDxC,OAAO;CAGR;AAED,eAAO,MAAM,QAAQ,YAGpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAIzB,CAAC;AAMF,eAAO,MAAM,IAAI,aACL,eAAe,aACd,GAAG,WACL,6BAA6B,8BAoBvC,CAAC;AAEF,eAAO,MAAM,eAAe;SAKrB,eAAe,CAAC,KAAK,CAAC;eAChB,GAAG;;UASf,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AACA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAY,6BAA6B,EAAoB,MAAM,wBAAwB,CAAC;AAmCnG,OAAO,EAEL,WAAW,EAWZ,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,UAAU,CAAC;AAE7D,OAAO,eAAe,MAAM,2BAA2B,CAAC;AAMxD,KAAK,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;AAsCtD,eAAO,MAAM,OAAO,YAAmB,WAAW,WAAW,WAAW,iBA2DvE,CAAC;AAkmBF,eAAO,MAAM,MAAM,YAAa,WAAW,cAAc,MAAM,SA2E9D,CAAC;AA2KF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IAC5C,OAAO,CAAC,YAAY,CAAsB;IAG1C,OAAO,CAAC,qBAAqB,CAA4B;IAEzD,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,OAAO,CAAC,cAAc;IAWhB,aAAa,CAAC,OAAO,EAAE,WAAW;IAqDxC,OAAO;CAGR;AAED,eAAO,MAAM,QAAQ,YAGpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAIzB,CAAC;AAMF,eAAO,MAAM,IAAI,aACL,eAAe,aACd,GAAG,WACL,6BAA6B,8BAoBvC,CAAC;AAEF,eAAO,MAAM,eAAe;SAKrB,eAAe,CAAC,KAAK,CAAC;eAChB,GAAG;;UASf,CAAC"}

package/dist/device/DeviceCommands.d.ts

@@ -31,7 +31,7 @@ export declare const cancelDeviceInPrompt: (device: Device, expectResponse?: boo
     };
 } | {
     success: boolean;
-    error: 0 | 101 | 102 | 103 | 104 | 105 | 106 | 107 | 108 | 109 | 110 | 111 | 112 | 113 | 114 | 115 | 116 | 117 | 118 | 200 | 300 | 301 | 302 | 303 | 304 | 305 | 400 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 500 | 600 | 601 | 602 | 603 | 700 | 701 | 702 | 703 | 704 | 705 | 706 | 707 | 708 | 709 | 710 | 711 | 712 | 713 | 714 | 715 | 716 | 717 | 718 | 719 | 720 | 721 | 722 | 800 | 801 | 802 | 803 | 804 | 805 | 806 | 807 | 808 | 809 | 810 | 811 | 812 | 813 | 814 | 815 | 816 | 817 | 818 | 819 | 900 | 901 | 902;
+    error: 0 | 101 | 102 | 103 | 104 | 105 | 106 | 107 | 108 | 109 | 110 | 111 | 112 | 113 | 114 | 115 | 116 | 117 | 118 | 200 | 300 | 301 | 302 | 303 | 304 | 305 | 400 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 500 | 600 | 601 | 602 | 603 | 700 | 701 | 702 | 703 | 704 | 705 | 706 | 707 | 708 | 709 | 710 | 711 | 712 | 713 | 714 | 715 | 716 | 717 | 718 | 719 | 720 | 721 | 722 | 800 | 801 | 802 | 803 | 804 | 805 | 806 | 807 | 808 | 809 | 810 | 811 | 812 | 813 | 814 | 815 | 816 | 817 | 818 | 819 | 900 | 901 | 902;
     payload: {
         message: string;
     };
@@ -50,7 +50,7 @@ export declare const cancelDeviceWithInitialize: (device: Device) => Promise<{
     };
 } | {
     success: boolean;
-    error: 0 | 101 | 102 | 103 | 104 | 105 | 106 | 107 | 108 | 109 | 110 | 111 | 112 | 113 | 114 | 115 | 116 | 117 | 118 | 200 | 300 | 301 | 302 | 303 | 304 | 305 | 400 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 500 | 600 | 601 | 602 | 603 | 700 | 701 | 702 | 703 | 704 | 705 | 706 | 707 | 708 | 709 | 710 | 711 | 712 | 713 | 714 | 715 | 716 | 717 | 718 | 719 | 720 | 721 | 722 | 800 | 801 | 802 | 803 | 804 | 805 | 806 | 807 | 808 | 809 | 810 | 811 | 812 | 813 | 814 | 815 | 816 | 817 | 818 | 819 | 900 | 901 | 902;
+    error: 0 | 101 | 102 | 103 | 104 | 105 | 106 | 107 | 108 | 109 | 110 | 111 | 112 | 113 | 114 | 115 | 116 | 117 | 118 | 200 | 300 | 301 | 302 | 303 | 304 | 305 | 400 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 500 | 600 | 601 | 602 | 603 | 700 | 701 | 702 | 703 | 704 | 705 | 706 | 707 | 708 | 709 | 710 | 711 | 712 | 713 | 714 | 715 | 716 | 717 | 718 | 719 | 720 | 721 | 722 | 800 | 801 | 802 | 803 | 804 | 805 | 806 | 807 | 808 | 809 | 810 | 811 | 812 | 813 | 814 | 815 | 816 | 817 | 818 | 819 | 900 | 901 | 902;
     payload: {
         message: string;
     };
@@ -78,7 +78,7 @@ export declare class DeviceCommands {
         };
     } | {
         success: boolean;
-        error: 0 | 101 | 102 | 103 | 104 | 105 | 106 | 107 | 108 | 109 | 110 | 111 | 112 | 113 | 114 | 115 | 116 | 117 | 118 | 200 | 300 | 301 | 302 | 303 | 304 | 305 | 400 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 500 | 600 | 601 | 602 | 603 | 700 | 701 | 702 | 703 | 704 | 705 | 706 | 707 | 708 | 709 | 710 | 711 | 712 | 713 | 714 | 715 | 716 | 717 | 718 | 719 | 720 | 721 | 722 | 800 | 801 | 802 | 803 | 804 | 805 | 806 | 807 | 808 | 809 | 810 | 811 | 812 | 813 | 814 | 815 | 816 | 817 | 818 | 819 | 900 | 901 | 902;
+        error: 0 | 101 | 102 | 103 | 104 | 105 | 106 | 107 | 108 | 109 | 110 | 111 | 112 | 113 | 114 | 115 | 116 | 117 | 118 | 200 | 300 | 301 | 302 | 303 | 304 | 305 | 400 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 500 | 600 | 601 | 602 | 603 | 700 | 701 | 702 | 703 | 704 | 705 | 706 | 707 | 708 | 709 | 710 | 711 | 712 | 713 | 714 | 715 | 716 | 717 | 718 | 719 | 720 | 721 | 722 | 800 | 801 | 802 | 803 | 804 | 805 | 806 | 807 | 808 | 809 | 810 | 811 | 812 | 813 | 814 | 815 | 816 | 817 | 818 | 819 | 900 | 901 | 902;
         payload: {
             message: string;
         };
@@ -97,7 +97,7 @@ export declare class DeviceCommands {
         };
     } | {
         success: boolean;
-        error: 0 | 101 | 102 | 103 | 104 | 105 | 106 | 107 | 108 | 109 | 110 | 111 | 112 | 113 | 114 | 115 | 116 | 117 | 118 | 200 | 300 | 301 | 302 | 303 | 304 | 305 | 400 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 500 | 600 | 601 | 602 | 603 | 700 | 701 | 702 | 703 | 704 | 705 | 706 | 707 | 708 | 709 | 710 | 711 | 712 | 713 | 714 | 715 | 716 | 717 | 718 | 719 | 720 | 721 | 722 | 800 | 801 | 802 | 803 | 804 | 805 | 806 | 807 | 808 | 809 | 810 | 811 | 812 | 813 | 814 | 815 | 816 | 817 | 818 | 819 | 900 | 901 | 902;
+        error: 0 | 101 | 102 | 103 | 104 | 105 | 106 | 107 | 108 | 109 | 110 | 111 | 112 | 113 | 114 | 115 | 116 | 117 | 118 | 200 | 300 | 301 | 302 | 303 | 304 | 305 | 400 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 500 | 600 | 601 | 602 | 603 | 700 | 701 | 702 | 703 | 704 | 705 | 706 | 707 | 708 | 709 | 710 | 711 | 712 | 713 | 714 | 715 | 716 | 717 | 718 | 719 | 720 | 721 | 722 | 800 | 801 | 802 | 803 | 804 | 805 | 806 | 807 | 808 | 809 | 810 | 811 | 812 | 813 | 814 | 815 | 816 | 817 | 818 | 819 | 900 | 901 | 902;
         payload: {
             message: string;
         };

package/dist/index.d.ts

@@ -2863,7 +2863,7 @@ declare class DeviceCommands {
         };
     } | {
         success: boolean;
-        error: 0 | 101 | 102 | 103 | 104 | 105 | 106 | 107 | 108 | 109 | 110 | 111 | 112 | 113 | 114 | 115 | 116 | 117 | 118 | 200 | 300 | 301 | 302 | 303 | 304 | 305 | 400 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 500 | 600 | 601 | 602 | 603 | 700 | 701 | 702 | 703 | 704 | 705 | 706 | 707 | 708 | 709 | 710 | 711 | 712 | 713 | 714 | 715 | 716 | 717 | 718 | 719 | 720 | 721 | 722 | 800 | 801 | 802 | 803 | 804 | 805 | 806 | 807 | 808 | 809 | 810 | 811 | 812 | 813 | 814 | 815 | 816 | 817 | 818 | 819 | 900 | 901 | 902;
+        error: 0 | 101 | 102 | 103 | 104 | 105 | 106 | 107 | 108 | 109 | 110 | 111 | 112 | 113 | 114 | 115 | 116 | 117 | 118 | 200 | 300 | 301 | 302 | 303 | 304 | 305 | 400 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 500 | 600 | 601 | 602 | 603 | 700 | 701 | 702 | 703 | 704 | 705 | 706 | 707 | 708 | 709 | 710 | 711 | 712 | 713 | 714 | 715 | 716 | 717 | 718 | 719 | 720 | 721 | 722 | 800 | 801 | 802 | 803 | 804 | 805 | 806 | 807 | 808 | 809 | 810 | 811 | 812 | 813 | 814 | 815 | 816 | 817 | 818 | 819 | 900 | 901 | 902;
         payload: {
             message: string;
         };
@@ -2882,7 +2882,7 @@ declare class DeviceCommands {
         };
     } | {
         success: boolean;
-        error: 0 | 101 | 102 | 103 | 104 | 105 | 106 | 107 | 108 | 109 | 110 | 111 | 112 | 113 | 114 | 115 | 116 | 117 | 118 | 200 | 300 | 301 | 302 | 303 | 304 | 305 | 400 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 500 | 600 | 601 | 602 | 603 | 700 | 701 | 702 | 703 | 704 | 705 | 706 | 707 | 708 | 709 | 710 | 711 | 712 | 713 | 714 | 715 | 716 | 717 | 718 | 719 | 720 | 721 | 722 | 800 | 801 | 802 | 803 | 804 | 805 | 806 | 807 | 808 | 809 | 810 | 811 | 812 | 813 | 814 | 815 | 816 | 817 | 818 | 819 | 900 | 901 | 902;
+        error: 0 | 101 | 102 | 103 | 104 | 105 | 106 | 107 | 108 | 109 | 110 | 111 | 112 | 113 | 114 | 115 | 116 | 117 | 118 | 200 | 300 | 301 | 302 | 303 | 304 | 305 | 400 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 500 | 600 | 601 | 602 | 603 | 700 | 701 | 702 | 703 | 704 | 705 | 706 | 707 | 708 | 709 | 710 | 711 | 712 | 713 | 714 | 715 | 716 | 717 | 718 | 719 | 720 | 721 | 722 | 800 | 801 | 802 | 803 | 804 | 805 | 806 | 807 | 808 | 809 | 810 | 811 | 812 | 813 | 814 | 815 | 816 | 817 | 818 | 819 | 900 | 901 | 902;
         payload: {
             message: string;
         };

package/dist/index.js

@@ -25699,6 +25699,30 @@ const wait = (ms) => new Promise(resolve => {
     setTimeout(resolve, ms);
 });
 
+const findDefectiveBatchDevice = (features) => {
+    if (!features)
+        return;
+    const { onekey_serial: onekeySerial, se_ver: seVer } = features;
+    if (!onekeySerial)
+        return;
+    const versionNum = +onekeySerial.slice(5);
+    if (Number.isNaN(versionNum))
+        return;
+    return versionNum >= 21032200001 && versionNum <= 21032201500 && seVer === '1.1.0.2';
+};
+const getDefectiveDeviceInfo = (features) => {
+    if (!findDefectiveBatchDevice(features))
+        return null;
+    const serialNo = getDeviceUUID(features);
+    const deviceType = getDeviceType(features);
+    const seVersion = features.se_ver;
+    return {
+        serialNo,
+        seVersion,
+        deviceType: deviceType || 'Unknown',
+    };
+};
+
 const CORE_EVENT = 'CORE_EVENT';
 const parseMessage = (messageData) => {
     const { data } = messageData;
@@ -38559,28 +38583,48 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
             const versionRange = getMethodVersionRange(device.features, type => method.getVersionRange()[type]);
             if (device.features) {
                 yield DataManager.checkAndReloadData();
+                if (findDefectiveBatchDevice(device.features)) {
+                    const defectiveInfo = getDefectiveDeviceInfo(device.features);
+                    if (defectiveInfo) {
+                        throw hdShared.createDefectiveFirmwareError(defectiveInfo.serialNo, defectiveInfo.seVersion || 'Unknown', defectiveInfo.deviceType, method.connectId, method.deviceId);
+                    }
+                }
                 const newVersionStatus = DataManager.getFirmwareStatus(device.features);
                 const bleVersionStatus = DataManager.getBLEFirmwareStatus(device.features);
+                const currentFirmwareVersion = getDeviceFirmwareVersion(device.features).join('.');
+                const currentBleVersion = getDeviceBLEFirmwareVersion(device.features).join('.');
                 if ((newVersionStatus === 'required' || bleVersionStatus === 'required') &&
                     method.skipForceUpdateCheck === false) {
-                    throw hdShared.createNewFirmwareForceUpdateHardwareError(method.connectId, method.deviceId);
+                    const currentVersions = {
+                        firmware: currentFirmwareVersion,
+                        ble: currentBleVersion,
+                    };
+                    if (newVersionStatus === 'required' && bleVersionStatus === 'required') {
+                        throw hdShared.createNewFirmwareForceUpdateHardwareError(method.connectId, method.deviceId, 'both', currentVersions);
+                    }
+                    else if (newVersionStatus === 'required') {
+                        throw hdShared.createNewFirmwareForceUpdateHardwareError(method.connectId, method.deviceId, 'firmware', currentVersions);
+                    }
+                    else {
+                        throw hdShared.createNewFirmwareForceUpdateHardwareError(method.connectId, method.deviceId, 'ble', currentVersions);
+                    }
                 }
                 if (versionRange) {
-                    const currentVersion = getDeviceFirmwareVersion(device.features).join('.');
-                    if (semver__default["default"].valid(versionRange.min) && semver__default["default"].lt(currentVersion, versionRange.min)) {
+                    if (semver__default["default"].valid(versionRange.min) &&
+                        semver__default["default"].lt(currentFirmwareVersion, versionRange.min)) {
                         if (newVersionStatus === 'none' || newVersionStatus === 'valid') {
-                            throw hdShared.createNewFirmwareUnReleaseHardwareError(currentVersion, versionRange.min);
+                            throw hdShared.createNewFirmwareUnReleaseHardwareError(currentFirmwareVersion, versionRange.min, method.name);
                         }
-                        return Promise.reject(hdShared.createNeedUpgradeFirmwareHardwareError(currentVersion, versionRange.min));
+                        return Promise.reject(hdShared.createNeedUpgradeFirmwareHardwareError(currentFirmwareVersion, versionRange.min, method.name));
                     }
                     if (versionRange.max &&
                         semver__default["default"].valid(versionRange.max) &&
-                        semver__default["default"].gte(currentVersion, versionRange.max)) {
-                        return Promise.reject(hdShared.createDeprecatedHardwareError(currentVersion, versionRange.max));
+                        semver__default["default"].gte(currentFirmwareVersion, versionRange.max)) {
+                        return Promise.reject(hdShared.createDeprecatedHardwareError(currentFirmwareVersion, versionRange.max, method.name));
                     }
                 }
                 else if (method.strictCheckDeviceSupport) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotSupportMethod);
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotSupportMethod, `Method '${method.name}' is not supported by this device`);
                 }
             }
             const unexpectedMode = device.hasUnexpectedMode(method.allowDeviceMode, method.requireDeviceMode);

package/dist/utils/findDefectiveBatchDevice.d.ts

@@ -1,3 +1,8 @@
 import type { Features } from '../types';
 export declare const findDefectiveBatchDevice: (features: Features) => boolean | undefined;
+export declare const getDefectiveDeviceInfo: (features: Features) => {
+    serialNo: string;
+    seVersion: string | undefined;
+    deviceType: import("../types").IDeviceType;
+} | null;
 //# sourceMappingURL=findDefectiveBatchDevice.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"findDefectiveBatchDevice.d.ts","sourceRoot":"","sources":["../../src/utils/findDefectiveBatchDevice.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEzC,eAAO,MAAM,wBAAwB,aAAc,QAAQ,wBAO1D,CAAC"}
+{"version":3,"file":"findDefectiveBatchDevice.d.ts","sourceRoot":"","sources":["../../src/utils/findDefectiveBatchDevice.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAWzC,eAAO,MAAM,wBAAwB,aAAc,QAAQ,wBAU1D,CAAC;AAKF,eAAO,MAAM,sBAAsB,aAAc,QAAQ;;;;QAWxD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.1.4-alpha.1",
+  "version": "1.1.4-alpha.2",
   "description": "> TODO: description",
   "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.4-alpha.1",
-    "@onekeyfe/hd-transport": "^1.1.4-alpha.1",
+    "@onekeyfe/hd-shared": "^1.1.4-alpha.2",
+    "@onekeyfe/hd-transport": "^1.1.2",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -46,5 +46,5 @@
     "@types/web-bluetooth": "^0.0.21",
     "ripple-keypairs": "^1.1.4"
   },
-  "gitHead": "445b0a1622293e2e19ccb7d9e62cc43cd906eef1"
+  "gitHead": "90589e2c51eb9bd54651d77da60695f4e5a2aa50"
 }

package/src/core/index.ts

@@ -3,17 +3,19 @@ import EventEmitter from 'events';
 import { Features, LowlevelTransportSharedPlugin, OneKeyDeviceInfo } from '@onekeyfe/hd-transport';
 import {
   createDeferred,
-  createDeprecatedHardwareError,
-  createNeedUpgradeFirmwareHardwareError,
-  createNewFirmwareForceUpdateHardwareError,
-  createNewFirmwareUnReleaseHardwareError,
   Deferred,
   ERRORS,
   HardwareError,
   HardwareErrorCode,
+  createDeprecatedHardwareError,
+  createNeedUpgradeFirmwareHardwareError,
+  createNewFirmwareForceUpdateHardwareError,
+  createNewFirmwareUnReleaseHardwareError,
+  createDefectiveFirmwareError,
 } from '@onekeyfe/hd-shared';
 import {
   getDeviceFirmwareVersion,
+  getDeviceBLEFirmwareVersion,
   enableLog,
   getLogger,
   LoggerNames,
@@ -21,6 +23,10 @@ import {
   wait,
   getMethodVersionRange,
 } from '../utils';
+import {
+  findDefectiveBatchDevice,
+  getDefectiveDeviceInfo,
+} from '../utils/findDefectiveBatchDevice';
 import { supportNewPassphrase } from '../utils/deviceFeaturesUtils';
 import { Device, DeviceEvents, InitOptions, RunOptions } from '../device/Device';
 import { DeviceList } from '../device/DeviceList';
@@ -251,35 +257,96 @@ const onCallDevice = async (
 
       if (device.features) {
         await DataManager.checkAndReloadData();
+
+        // 检测故障固件设备
+        if (findDefectiveBatchDevice(device.features)) {
+          const defectiveInfo = getDefectiveDeviceInfo(device.features);
+          if (defectiveInfo) {
+            throw createDefectiveFirmwareError(
+              defectiveInfo.serialNo,
+              defectiveInfo.seVersion || 'Unknown',
+              defectiveInfo.deviceType,
+              method.connectId,
+              method.deviceId
+            );
+          }
+        }
+
         const newVersionStatus = DataManager.getFirmwareStatus(device.features);
         const bleVersionStatus = DataManager.getBLEFirmwareStatus(device.features);
+
+        const currentFirmwareVersion = getDeviceFirmwareVersion(device.features).join('.');
+        const currentBleVersion = getDeviceBLEFirmwareVersion(device.features).join('.');
         if (
           (newVersionStatus === 'required' || bleVersionStatus === 'required') &&
           method.skipForceUpdateCheck === false
         ) {
-          throw createNewFirmwareForceUpdateHardwareError(method.connectId, method.deviceId);
+          // Get current version information for error reporting
+          const currentVersions = {
+            firmware: currentFirmwareVersion,
+            ble: currentBleVersion,
+          };
+
+          // Provide more specific error message based on which version check failed
+          if (newVersionStatus === 'required' && bleVersionStatus === 'required') {
+            throw createNewFirmwareForceUpdateHardwareError(
+              method.connectId,
+              method.deviceId,
+              'both',
+              currentVersions
+            );
+          } else if (newVersionStatus === 'required') {
+            throw createNewFirmwareForceUpdateHardwareError(
+              method.connectId,
+              method.deviceId,
+              'firmware',
+              currentVersions
+            );
+          } else {
+            throw createNewFirmwareForceUpdateHardwareError(
+              method.connectId,
+              method.deviceId,
+              'ble',
+              currentVersions
+            );
+          }
         }
 
         if (versionRange) {
-          const currentVersion = getDeviceFirmwareVersion(device.features).join('.');
-          if (semver.valid(versionRange.min) && semver.lt(currentVersion, versionRange.min)) {
+          if (
+            semver.valid(versionRange.min) &&
+            semver.lt(currentFirmwareVersion, versionRange.min)
+          ) {
             if (newVersionStatus === 'none' || newVersionStatus === 'valid') {
-              throw createNewFirmwareUnReleaseHardwareError(currentVersion, versionRange.min);
+              throw createNewFirmwareUnReleaseHardwareError(
+                currentFirmwareVersion,
+                versionRange.min,
+                method.name
+              );
             }
 
             return Promise.reject(
-              createNeedUpgradeFirmwareHardwareError(currentVersion, versionRange.min)
+              createNeedUpgradeFirmwareHardwareError(
+                currentFirmwareVersion,
+                versionRange.min,
+                method.name
+              )
             );
           }
           if (
             versionRange.max &&
             semver.valid(versionRange.max) &&
-            semver.gte(currentVersion, versionRange.max)
+            semver.gte(currentFirmwareVersion, versionRange.max)
           ) {
-            return Promise.reject(createDeprecatedHardwareError(currentVersion, versionRange.max));
+            return Promise.reject(
+              createDeprecatedHardwareError(currentFirmwareVersion, versionRange.max, method.name)
+            );
           }
         } else if (method.strictCheckDeviceSupport) {
-          throw ERRORS.TypedError(HardwareErrorCode.DeviceNotSupportMethod);
+          throw ERRORS.TypedError(
+            HardwareErrorCode.DeviceNotSupportMethod,
+            `Method '${method.name}' is not supported by this device`
+          );
         }
       }
 

package/src/utils/findDefectiveBatchDevice.ts

@@ -1,10 +1,39 @@
+import { EDeviceType } from '@onekeyfe/hd-shared';
 import type { Features } from '../types';
+import { getDeviceUUID, getDeviceType } from './deviceInfoUtils';
 
+/**
+ * 检测故障固件设备
+ * 检测规则：
+ * - 序列号范围：21032200001 到 21032201500 (从 onekey_serial 字段提取)
+ * - SE版本为 1.1.0.2
+ *
+ * 对齐之前版本的检测逻辑
+ */
 export const findDefectiveBatchDevice = (features: Features) => {
   if (!features) return;
+
   const { onekey_serial: onekeySerial, se_ver: seVer } = features;
   if (!onekeySerial) return;
+
   const versionNum = +onekeySerial.slice(5);
   if (Number.isNaN(versionNum)) return;
+
   return versionNum >= 21032200001 && versionNum <= 21032201500 && seVer === '1.1.0.2';
 };
+
+/**
+ * 获取故障设备的详细信息
+ */
+export const getDefectiveDeviceInfo = (features: Features) => {
+  if (!findDefectiveBatchDevice(features)) return null;
+  const serialNo = getDeviceUUID(features);
+  const deviceType = getDeviceType(features);
+  const seVersion = features.se_ver;
+
+  return {
+    serialNo,
+    seVersion,
+    deviceType: deviceType || 'Unknown',
+  };
+};