@onekeyfe/hd-shared 1.1.4-alpha.2 → 1.1.4-alpha.3

package/dist/HardwareError.d.ts

@@ -55,7 +55,7 @@ export declare const HardwareErrorCode: {
     readonly NewFirmwareForceUpdate: 414;
     readonly DeviceNotSupportMethod: 415;
     readonly ForbiddenKeyPath: 416;
-    readonly DefectiveFirmware: 417;
+    readonly RepeatUnlocking: 417;
     readonly NetworkError: 500;
     readonly TransportNotConfigured: 600;
     readonly TransportCallInProgress: 601;
@@ -112,13 +112,9 @@ export declare const HardwareErrorCodeMessage: HardwareErrorCodeMessageMapping;
 export declare const TypedError: (hardwareError: ErrorCodeUnion | string, message?: string, params?: any) => HardwareError;
 export declare const serializeError: (payload: any) => any;
 export declare const CreateErrorByMessage: (message: string) => HardwareError;
-declare const createNewFirmwareUnReleaseHardwareError: (currentVersion: string, requireVersion: string, methodName?: string) => HardwareError;
-declare const createNeedUpgradeFirmwareHardwareError: (currentVersion: string, requireVersion: string, methodName?: string) => HardwareError;
-declare const createNewFirmwareForceUpdateHardwareError: (connectId: string | undefined, deviceId: string | undefined, versionType?: 'firmware' | 'ble' | 'both', currentVersions?: {
-    firmware?: string;
-    ble?: string;
-}) => HardwareError;
-declare const createDeprecatedHardwareError: (currentVersion: string, deprecatedVersion: string, methodName?: string) => HardwareError;
-declare const createDefectiveFirmwareError: (serialNo: string, seVersion: string, deviceType: string, connectId?: string, deviceId?: string) => HardwareError;
-export { createNewFirmwareUnReleaseHardwareError, createNeedUpgradeFirmwareHardwareError, createNewFirmwareForceUpdateHardwareError, createDeprecatedHardwareError, createDefectiveFirmwareError, };
+declare const createNewFirmwareUnReleaseHardwareError: (currentVersion: string, requireVersion: string) => HardwareError;
+declare const createNeedUpgradeFirmwareHardwareError: (currentVersion: string, requireVersion: string) => HardwareError;
+declare const createNewFirmwareForceUpdateHardwareError: (connectId: string | undefined, deviceId: string | undefined) => HardwareError;
+declare const createDeprecatedHardwareError: (currentVersion: string, deprecatedVersion: string) => HardwareError;
+export { createNewFirmwareUnReleaseHardwareError, createNeedUpgradeFirmwareHardwareError, createNewFirmwareForceUpdateHardwareError, createDeprecatedHardwareError, };
 //# sourceMappingURL=HardwareError.d.ts.map

package/dist/HardwareError.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HardwareError.d.ts","sourceRoot":"","sources":["../src/HardwareError.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,OAAO,CAAC,OAAO,iBAAiB,CAAC,CAAC;IAC7C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,GAAG,CAAC;CACd;AAED,KAAK,OAAO,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAE5C,KAAK,+BAA+B,GAAG;KAAG,CAAC,IAAI,OAAO,CAAC,OAAO,iBAAiB,CAAC,GAAG,MAAM;CAAE,CAAC;AAE5F,KAAK,cAAc,GAAG,OAAO,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAOxD,qBAAa,aAAc,SAAQ,KAAK;IACtC,SAAS,EAAE,cAAc,CAAkC;IAE3D,OAAO,SAAM;IAEb,MAAM,EAAE,GAAG,CAAM;gBAEL,aAAa,EAAE,cAAc,GAAG,MAAM;CAmBnD;AAED,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyXpB,CAAC;AAEX,eAAO,MAAM,wBAAwB,EAAE,+BAqI7B,CAAC;AAEX,eAAO,MAAM,UAAU,kBACN,cAAc,GAAG,MAAM,YAC5B,MAAM,WACP,GAAG,kBAMb,CAAC;AAEF,eAAO,MAAM,cAAc,YAAa,GAAG,QAe1C,CAAC;AAEF,eAAO,MAAM,oBAAoB,YAAa,MAAM,KAAG,aAOtD,CAAC;AAEF,QAAA,MAAM,uCAAuC,mBAC3B,MAAM,kBACN,MAAM,eACT,MAAM,kBAQpB,CAAC;AAEF,QAAA,MAAM,sCAAsC,mBAC1B,MAAM,kBACN,MAAM,eACT,MAAM,kBAQpB,CAAC;AAEF,QAAA,MAAM,yCAAyC,cAClC,MAAM,GAAG,SAAS,YACnB,MAAM,GAAG,SAAS,gBACd,UAAU,GAAG,KAAK,GAAG,MAAM,oBACvB;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,kBAwCF,CAAC;AAEF,QAAA,MAAM,6BAA6B,mBACjB,MAAM,qBACH,MAAM,eACZ,MAAM,kBAQpB,CAAC;AAEF,QAAA,MAAM,4BAA4B,aACtB,MAAM,aACL,MAAM,cACL,MAAM,cACN,MAAM,aACP,MAAM,kBAWlB,CAAC;AAEF,OAAO,EACL,uCAAuC,EACvC,sCAAsC,EACtC,yCAAyC,EACzC,6BAA6B,EAC7B,4BAA4B,GAC7B,CAAC"}
+{"version":3,"file":"HardwareError.d.ts","sourceRoot":"","sources":["../src/HardwareError.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,OAAO,CAAC,OAAO,iBAAiB,CAAC,CAAC;IAC7C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,GAAG,CAAC;CACd;AAED,KAAK,OAAO,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAE5C,KAAK,+BAA+B,GAAG;KAAG,CAAC,IAAI,OAAO,CAAC,OAAO,iBAAiB,CAAC,GAAG,MAAM;CAAE,CAAC;AAE5F,KAAK,cAAc,GAAG,OAAO,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAOxD,qBAAa,aAAc,SAAQ,KAAK;IACtC,SAAS,EAAE,cAAc,CAAkC;IAE3D,OAAO,SAAM;IAEb,MAAM,EAAE,GAAG,CAAM;gBAEL,aAAa,EAAE,cAAc,GAAG,MAAM;CAmBnD;AAED,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyXpB,CAAC;AAEX,eAAO,MAAM,wBAAwB,EAAE,+BAqI7B,CAAC;AAEX,eAAO,MAAM,UAAU,kBACN,cAAc,GAAG,MAAM,YAC5B,MAAM,WACP,GAAG,kBAMb,CAAC;AAEF,eAAO,MAAM,cAAc,YAAa,GAAG,QAe1C,CAAC;AAEF,eAAO,MAAM,oBAAoB,YAAa,MAAM,KAAG,aAOtD,CAAC;AAEF,QAAA,MAAM,uCAAuC,mBAAoB,MAAM,kBAAkB,MAAM,kBAK5F,CAAC;AAEJ,QAAA,MAAM,sCAAsC,mBAAoB,MAAM,kBAAkB,MAAM,kBAK3F,CAAC;AAEJ,QAAA,MAAM,yCAAyC,cAClC,MAAM,GAAG,SAAS,YACnB,MAAM,GAAG,SAAS,kBAM3B,CAAC;AAEJ,QAAA,MAAM,6BAA6B,mBAAoB,MAAM,qBAAqB,MAAM,kBAKrF,CAAC;AAEJ,OAAO,EACL,uCAAuC,EACvC,sCAAsC,EACtC,yCAAyC,EACzC,6BAA6B,GAC9B,CAAC"}

package/dist/index.d.ts

@@ -97,7 +97,7 @@ declare const HardwareErrorCode: {
     readonly NewFirmwareForceUpdate: 414;
     readonly DeviceNotSupportMethod: 415;
     readonly ForbiddenKeyPath: 416;
-    readonly DefectiveFirmware: 417;
+    readonly RepeatUnlocking: 417;
     readonly NetworkError: 500;
     readonly TransportNotConfigured: 600;
     readonly TransportCallInProgress: 601;
@@ -154,20 +154,15 @@ declare const HardwareErrorCodeMessage: HardwareErrorCodeMessageMapping;
 declare const TypedError: (hardwareError: ErrorCodeUnion | string, message?: string, params?: any) => HardwareError;
 declare const serializeError: (payload: any) => any;
 declare const CreateErrorByMessage: (message: string) => HardwareError;
-declare const createNewFirmwareUnReleaseHardwareError: (currentVersion: string, requireVersion: string, methodName?: string) => HardwareError;
-declare const createNeedUpgradeFirmwareHardwareError: (currentVersion: string, requireVersion: string, methodName?: string) => HardwareError;
-declare const createNewFirmwareForceUpdateHardwareError: (connectId: string | undefined, deviceId: string | undefined, versionType?: 'firmware' | 'ble' | 'both', currentVersions?: {
-    firmware?: string;
-    ble?: string;
-}) => HardwareError;
-declare const createDeprecatedHardwareError: (currentVersion: string, deprecatedVersion: string, methodName?: string) => HardwareError;
-declare const createDefectiveFirmwareError: (serialNo: string, seVersion: string, deviceType: string, connectId?: string, deviceId?: string) => HardwareError;
+declare const createNewFirmwareUnReleaseHardwareError: (currentVersion: string, requireVersion: string) => HardwareError;
+declare const createNeedUpgradeFirmwareHardwareError: (currentVersion: string, requireVersion: string) => HardwareError;
+declare const createNewFirmwareForceUpdateHardwareError: (connectId: string | undefined, deviceId: string | undefined) => HardwareError;
+declare const createDeprecatedHardwareError: (currentVersion: string, deprecatedVersion: string) => HardwareError;
 
 declare const HardwareError$1_createNewFirmwareUnReleaseHardwareError: typeof createNewFirmwareUnReleaseHardwareError;
 declare const HardwareError$1_createNeedUpgradeFirmwareHardwareError: typeof createNeedUpgradeFirmwareHardwareError;
 declare const HardwareError$1_createNewFirmwareForceUpdateHardwareError: typeof createNewFirmwareForceUpdateHardwareError;
 declare const HardwareError$1_createDeprecatedHardwareError: typeof createDeprecatedHardwareError;
-declare const HardwareError$1_createDefectiveFirmwareError: typeof createDefectiveFirmwareError;
 type HardwareError$1_IHardwareError = IHardwareError;
 type HardwareError$1_HardwareError = HardwareError;
 declare const HardwareError$1_HardwareError: typeof HardwareError;
@@ -182,7 +177,6 @@ declare namespace HardwareError$1 {
     HardwareError$1_createNeedUpgradeFirmwareHardwareError as createNeedUpgradeFirmwareHardwareError,
     HardwareError$1_createNewFirmwareForceUpdateHardwareError as createNewFirmwareForceUpdateHardwareError,
     HardwareError$1_createDeprecatedHardwareError as createDeprecatedHardwareError,
-    HardwareError$1_createDefectiveFirmwareError as createDefectiveFirmwareError,
     HardwareError$1_IHardwareError as IHardwareError,
     HardwareError$1_HardwareError as HardwareError,
     HardwareError$1_HardwareErrorCode as HardwareErrorCode,
@@ -210,4 +204,4 @@ declare enum EFirmwareType {
     BitcoinOnly = "bitcoinonly"
 }
 
-export { CreateErrorByMessage, Deferred, EDeviceType, EFirmwareType, EOneKeyBleMessageKeys, HardwareError$1 as ERRORS, HardwareError, HardwareErrorCode, HardwareErrorCodeMessage, IHardwareError, ONEKEY_NOTIFY_CHARACTERISTIC_UUID, ONEKEY_SERVICE_UUID, ONEKEY_WEBUSB_FILTER, ONEKEY_WRITE_CHARACTERISTIC_UUID, TypedError, createDefectiveFirmwareError, createDeferred, createDeprecatedHardwareError, createNeedUpgradeFirmwareHardwareError, createNewFirmwareForceUpdateHardwareError, createNewFirmwareUnReleaseHardwareError, isHeaderChunk, isOnekeyDevice, serializeError, wait };
+export { CreateErrorByMessage, Deferred, EDeviceType, EFirmwareType, EOneKeyBleMessageKeys, HardwareError$1 as ERRORS, HardwareError, HardwareErrorCode, HardwareErrorCodeMessage, IHardwareError, ONEKEY_NOTIFY_CHARACTERISTIC_UUID, ONEKEY_SERVICE_UUID, ONEKEY_WEBUSB_FILTER, ONEKEY_WRITE_CHARACTERISTIC_UUID, TypedError, createDeferred, createDeprecatedHardwareError, createNeedUpgradeFirmwareHardwareError, createNewFirmwareForceUpdateHardwareError, createNewFirmwareUnReleaseHardwareError, isHeaderChunk, isOnekeyDevice, serializeError, wait };

package/dist/index.js

@@ -187,7 +187,7 @@ const HardwareErrorCode = {
     NewFirmwareForceUpdate: 414,
     DeviceNotSupportMethod: 415,
     ForbiddenKeyPath: 416,
-    DefectiveFirmware: 417,
+    RepeatUnlocking: 417,
     NetworkError: 500,
     TransportNotConfigured: 600,
     TransportCallInProgress: 601,
@@ -281,7 +281,7 @@ const HardwareErrorCodeMessage = {
     [HardwareErrorCode.UseDesktopToUpdateFirmware]: 'Please use OneKey desktop client to update the firmware',
     [HardwareErrorCode.DeviceNotSupportMethod]: 'Device not support this method',
     [HardwareErrorCode.ForbiddenKeyPath]: 'Forbidden key path',
-    [HardwareErrorCode.DefectiveFirmware]: 'Device firmware is defective, please update immediately',
+    [HardwareErrorCode.RepeatUnlocking]: 'Repeat unlocking',
     [HardwareErrorCode.NetworkError]: 'Network request error',
     [HardwareErrorCode.TransportNotConfigured]: 'Transport not configured',
     [HardwareErrorCode.TransportCallInProgress]: 'Transport call in progress',
@@ -364,67 +364,10 @@ const CreateErrorByMessage = (message) => {
     }
     return new HardwareError(message);
 };
-const createNewFirmwareUnReleaseHardwareError = (currentVersion, requireVersion, methodName) => {
-    const methodInfo = methodName ? ` for method '${methodName}'` : '';
-    return TypedError(HardwareErrorCode.NewFirmwareUnRelease, `Device firmware version is too low${methodInfo}, please update to the latest version`, { current: currentVersion, require: requireVersion, method: methodName });
-};
-const createNeedUpgradeFirmwareHardwareError = (currentVersion, requireVersion, methodName) => {
-    const methodInfo = methodName ? ` for method '${methodName}'` : '';
-    return TypedError(HardwareErrorCode.CallMethodNeedUpgradeFirmware, `Device firmware version is too low${methodInfo}, please update to ${requireVersion}`, { current: currentVersion, require: requireVersion, method: methodName });
-};
-const createNewFirmwareForceUpdateHardwareError = (connectId, deviceId, versionType, currentVersions) => {
-    let message = 'Device firmware version is too low, please update to the latest version';
-    if (versionType === 'firmware') {
-        const currentFirmware = (currentVersions === null || currentVersions === void 0 ? void 0 : currentVersions.firmware)
-            ? ` (current: ${currentVersions.firmware})`
-            : '';
-        message = `Device firmware version is too low${currentFirmware}, please update the firmware to the latest version`;
-    }
-    else if (versionType === 'ble') {
-        const currentBle = (currentVersions === null || currentVersions === void 0 ? void 0 : currentVersions.ble) ? ` (current: ${currentVersions.ble})` : '';
-        message = `Device BLE firmware version is too low${currentBle}, please update the BLE firmware to the latest version`;
-    }
-    else if (versionType === 'both') {
-        const currentFirmware = (currentVersions === null || currentVersions === void 0 ? void 0 : currentVersions.firmware)
-            ? ` firmware: ${currentVersions.firmware}`
-            : '';
-        const currentBle = (currentVersions === null || currentVersions === void 0 ? void 0 : currentVersions.ble) ? ` BLE: ${currentVersions.ble}` : '';
-        const currentInfo = currentFirmware || currentBle
-            ? ` (current -${currentFirmware}${currentFirmware && currentBle ? ',' : ''}${currentBle})`
-            : '';
-        message = `Device firmware and BLE firmware versions are too low${currentInfo}, please update both to the latest versions`;
-    }
-    else if ((currentVersions === null || currentVersions === void 0 ? void 0 : currentVersions.firmware) || (currentVersions === null || currentVersions === void 0 ? void 0 : currentVersions.ble)) {
-        const currentFirmware = (currentVersions === null || currentVersions === void 0 ? void 0 : currentVersions.firmware)
-            ? ` firmware: ${currentVersions.firmware}`
-            : '';
-        const currentBle = (currentVersions === null || currentVersions === void 0 ? void 0 : currentVersions.ble) ? ` BLE: ${currentVersions.ble}` : '';
-        const currentInfo = currentFirmware || currentBle
-            ? ` (current -${currentFirmware}${currentFirmware && currentBle ? ',' : ''}${currentBle})`
-            : '';
-        message = `Device firmware version is too low${currentInfo}, please update to the latest version`;
-    }
-    return TypedError(HardwareErrorCode.NewFirmwareForceUpdate, message, {
-        connectId,
-        deviceId,
-        versionType,
-        currentVersions,
-    });
-};
-const createDeprecatedHardwareError = (currentVersion, deprecatedVersion, methodName) => {
-    const methodInfo = methodName ? ` Method '${methodName}'` : 'This method';
-    return TypedError(HardwareErrorCode.CallMethodDeprecated, `Device firmware version is too high. ${methodInfo} has been deprecated in ${deprecatedVersion}`, { current: currentVersion, deprecated: deprecatedVersion, method: methodName });
-};
-const createDefectiveFirmwareError = (serialNo, seVersion, deviceType, connectId, deviceId) => {
-    const message = `Defective firmware detected (Serial: ${serialNo}, SE: ${seVersion}). Please update immediately.`;
-    return TypedError(HardwareErrorCode.DefectiveFirmware, message, {
-        serialNo,
-        seVersion,
-        deviceType,
-        connectId,
-        deviceId,
-    });
-};
+const createNewFirmwareUnReleaseHardwareError = (currentVersion, requireVersion) => TypedError(HardwareErrorCode.NewFirmwareUnRelease, 'Device firmware version is too low, please update to the latest version', { current: currentVersion, require: requireVersion });
+const createNeedUpgradeFirmwareHardwareError = (currentVersion, requireVersion) => TypedError(HardwareErrorCode.CallMethodNeedUpgradeFirmware, `Device firmware version is too low, please update to ${requireVersion}`, { current: currentVersion, require: requireVersion });
+const createNewFirmwareForceUpdateHardwareError = (connectId, deviceId) => TypedError(HardwareErrorCode.NewFirmwareForceUpdate, 'Device firmware version is too low, please update to the latest version', { connectId, deviceId });
+const createDeprecatedHardwareError = (currentVersion, deprecatedVersion) => TypedError(HardwareErrorCode.CallMethodDeprecated, `Device firmware version is too high, this method has been deprecated in ${deprecatedVersion}`, { current: currentVersion, deprecated: deprecatedVersion });
 
 var HardwareError$1 = /*#__PURE__*/Object.freeze({
     __proto__: null,
@@ -437,8 +380,7 @@ var HardwareError$1 = /*#__PURE__*/Object.freeze({
     createNewFirmwareUnReleaseHardwareError: createNewFirmwareUnReleaseHardwareError,
     createNeedUpgradeFirmwareHardwareError: createNeedUpgradeFirmwareHardwareError,
     createNewFirmwareForceUpdateHardwareError: createNewFirmwareForceUpdateHardwareError,
-    createDeprecatedHardwareError: createDeprecatedHardwareError,
-    createDefectiveFirmwareError: createDefectiveFirmwareError
+    createDeprecatedHardwareError: createDeprecatedHardwareError
 });
 
 const wait = (ms) => new Promise(resolve => {
@@ -472,7 +414,6 @@ exports.ONEKEY_SERVICE_UUID = ONEKEY_SERVICE_UUID;
 exports.ONEKEY_WEBUSB_FILTER = ONEKEY_WEBUSB_FILTER;
 exports.ONEKEY_WRITE_CHARACTERISTIC_UUID = ONEKEY_WRITE_CHARACTERISTIC_UUID;
 exports.TypedError = TypedError;
-exports.createDefectiveFirmwareError = createDefectiveFirmwareError;
 exports.createDeferred = createDeferred;
 exports.createDeprecatedHardwareError = createDeprecatedHardwareError;
 exports.createNeedUpgradeFirmwareHardwareError = createNeedUpgradeFirmwareHardwareError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-shared",
-  "version": "1.1.4-alpha.2",
+  "version": "1.1.4-alpha.3",
   "description": "Hardware SDK's shared tool library",
   "keywords": [
     "Hardware-SDK",
@@ -25,5 +25,5 @@
     "lint": "eslint .",
     "lint:fix": "eslint . --fix"
   },
-  "gitHead": "90589e2c51eb9bd54651d77da60695f4e5a2aa50"
+  "gitHead": "10e079a2aa02e79fe378be8af1c87e824c2e5872"
 }

package/src/HardwareError.ts

@@ -251,10 +251,10 @@ export const HardwareErrorCode = {
   ForbiddenKeyPath: 416,
 
   /**
-   * Defective firmware detected
-   * @params:{ serialNo: string?, seVersion: string?, deviceType: string? }
+   * Repeat unlocking
+   * all network get address by loop need repeat unlocking
    */
-  DefectiveFirmware: 417,
+  RepeatUnlocking: 417,
 
   /**
    * Netword request error
@@ -480,7 +480,7 @@ export const HardwareErrorCodeMessage: HardwareErrorCodeMessageMapping = {
     'Please use OneKey desktop client to update the firmware',
   [HardwareErrorCode.DeviceNotSupportMethod]: 'Device not support this method',
   [HardwareErrorCode.ForbiddenKeyPath]: 'Forbidden key path',
-  [HardwareErrorCode.DefectiveFirmware]: 'Device firmware is defective, please update immediately',
+  [HardwareErrorCode.RepeatUnlocking]: 'Repeat unlocking',
 
   /**
    * Network Errors
@@ -594,116 +594,40 @@ export const CreateErrorByMessage = (message: string): HardwareError => {
   return new HardwareError(message);
 };
 
-const createNewFirmwareUnReleaseHardwareError = (
-  currentVersion: string,
-  requireVersion: string,
-  methodName?: string
-) => {
-  const methodInfo = methodName ? ` for method '${methodName}'` : '';
-  return TypedError(
+const createNewFirmwareUnReleaseHardwareError = (currentVersion: string, requireVersion: string) =>
+  TypedError(
     HardwareErrorCode.NewFirmwareUnRelease,
-    `Device firmware version is too low${methodInfo}, please update to the latest version`,
-    { current: currentVersion, require: requireVersion, method: methodName }
+    'Device firmware version is too low, please update to the latest version',
+    { current: currentVersion, require: requireVersion }
   );
-};
 
-const createNeedUpgradeFirmwareHardwareError = (
-  currentVersion: string,
-  requireVersion: string,
-  methodName?: string
-) => {
-  const methodInfo = methodName ? ` for method '${methodName}'` : '';
-  return TypedError(
+const createNeedUpgradeFirmwareHardwareError = (currentVersion: string, requireVersion: string) =>
+  TypedError(
     HardwareErrorCode.CallMethodNeedUpgradeFirmware,
-    `Device firmware version is too low${methodInfo}, please update to ${requireVersion}`,
-    { current: currentVersion, require: requireVersion, method: methodName }
+    `Device firmware version is too low, please update to ${requireVersion}`,
+    { current: currentVersion, require: requireVersion }
   );
-};
 
 const createNewFirmwareForceUpdateHardwareError = (
   connectId: string | undefined,
-  deviceId: string | undefined,
-  versionType?: 'firmware' | 'ble' | 'both',
-  currentVersions?: {
-    firmware?: string;
-    ble?: string;
-  }
-) => {
-  let message = 'Device firmware version is too low, please update to the latest version';
-
-  if (versionType === 'firmware') {
-    const currentFirmware = currentVersions?.firmware
-      ? ` (current: ${currentVersions.firmware})`
-      : '';
-    message = `Device firmware version is too low${currentFirmware}, please update the firmware to the latest version`;
-  } else if (versionType === 'ble') {
-    const currentBle = currentVersions?.ble ? ` (current: ${currentVersions.ble})` : '';
-    message = `Device BLE firmware version is too low${currentBle}, please update the BLE firmware to the latest version`;
-  } else if (versionType === 'both') {
-    const currentFirmware = currentVersions?.firmware
-      ? ` firmware: ${currentVersions.firmware}`
-      : '';
-    const currentBle = currentVersions?.ble ? ` BLE: ${currentVersions.ble}` : '';
-    const currentInfo =
-      currentFirmware || currentBle
-        ? ` (current -${currentFirmware}${currentFirmware && currentBle ? ',' : ''}${currentBle})`
-        : '';
-    message = `Device firmware and BLE firmware versions are too low${currentInfo}, please update both to the latest versions`;
-  } else if (currentVersions?.firmware || currentVersions?.ble) {
-    const currentFirmware = currentVersions?.firmware
-      ? ` firmware: ${currentVersions.firmware}`
-      : '';
-    const currentBle = currentVersions?.ble ? ` BLE: ${currentVersions.ble}` : '';
-    const currentInfo =
-      currentFirmware || currentBle
-        ? ` (current -${currentFirmware}${currentFirmware && currentBle ? ',' : ''}${currentBle})`
-        : '';
-    message = `Device firmware version is too low${currentInfo}, please update to the latest version`;
-  }
-
-  return TypedError(HardwareErrorCode.NewFirmwareForceUpdate, message, {
-    connectId,
-    deviceId,
-    versionType,
-    currentVersions,
-  });
-};
+  deviceId: string | undefined
+) =>
+  TypedError(
+    HardwareErrorCode.NewFirmwareForceUpdate,
+    'Device firmware version is too low, please update to the latest version',
+    { connectId, deviceId }
+  );
 
-const createDeprecatedHardwareError = (
-  currentVersion: string,
-  deprecatedVersion: string,
-  methodName?: string
-) => {
-  const methodInfo = methodName ? ` Method '${methodName}'` : 'This method';
-  return TypedError(
+const createDeprecatedHardwareError = (currentVersion: string, deprecatedVersion: string) =>
+  TypedError(
     HardwareErrorCode.CallMethodDeprecated,
-    `Device firmware version is too high. ${methodInfo} has been deprecated in ${deprecatedVersion}`,
-    { current: currentVersion, deprecated: deprecatedVersion, method: methodName }
+    `Device firmware version is too high, this method has been deprecated in ${deprecatedVersion}`,
+    { current: currentVersion, deprecated: deprecatedVersion }
   );
-};
-
-const createDefectiveFirmwareError = (
-  serialNo: string,
-  seVersion: string,
-  deviceType: string,
-  connectId?: string,
-  deviceId?: string
-) => {
-  const message = `Defective firmware detected (Serial: ${serialNo}, SE: ${seVersion}). Please update immediately.`;
-
-  return TypedError(HardwareErrorCode.DefectiveFirmware, message, {
-    serialNo,
-    seVersion,
-    deviceType,
-    connectId,
-    deviceId,
-  });
-};
 
 export {
   createNewFirmwareUnReleaseHardwareError,
   createNeedUpgradeFirmwareHardwareError,
   createNewFirmwareForceUpdateHardwareError,
   createDeprecatedHardwareError,
-  createDefectiveFirmwareError,
 };