@onekeyfe/hd-shared 1.1.19-alpha.7 → 1.1.19

package/dist/HardwareError.d.ts

@@ -1,3 +1,4 @@
+import { EFirmwareType } from './firmwareType';
 export interface IHardwareError {
     errorCode: ValueOf<typeof HardwareErrorCode>;
     message?: string;
@@ -118,13 +119,24 @@ export declare const TypedError: (hardwareError: ErrorCodeUnion | string, messag
 export declare const serializeError: (payload: any) => any;
 export declare const CreateErrorByMessage: (message: string) => HardwareError;
 export declare const CreateHardwareErrorByBridgeError: (raw: string) => HardwareError;
-declare const createNewFirmwareUnReleaseHardwareError: (currentVersion: string, requireVersion: string, methodName?: string) => HardwareError;
-declare const createNeedUpgradeFirmwareHardwareError: (currentVersion: string, requireVersion: string, methodName?: string) => HardwareError;
+declare const createNewFirmwareUnReleaseHardwareError: ({ currentVersion, requireVersion, methodName, firmwareType, }: {
+    currentVersion: string;
+    requireVersion: string;
+    methodName?: string | undefined;
+    firmwareType?: EFirmwareType | undefined;
+}) => HardwareError;
+declare const createNeedUpgradeFirmwareHardwareError: ({ currentVersion, requireVersion, methodName, firmwareType, }: {
+    currentVersion: string;
+    requireVersion: string;
+    methodName?: string | undefined;
+    firmwareType?: EFirmwareType | undefined;
+}) => HardwareError;
 declare const createNewFirmwareForceUpdateHardwareError: (connectId: string | undefined, deviceId: string | undefined, versionTypes?: ('firmware' | 'ble')[], 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 createDeviceNotSupportMethodError: (methodName: string, firmwareType: EFirmwareType) => HardwareError;
+export { createNewFirmwareUnReleaseHardwareError, createNeedUpgradeFirmwareHardwareError, createNewFirmwareForceUpdateHardwareError, createDeprecatedHardwareError, createDefectiveFirmwareError, createDeviceNotSupportMethodError, };
 //# 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;AAsCxD,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+YpB,CAAC;AAEX,eAAO,MAAM,wBAAwB,EAAE,+BA0I7B,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;AAGF,eAAO,MAAM,gCAAgC,QAAS,MAAM,KAAG,aAQ9D,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,iBACb,CAAC,UAAU,GAAG,KAAK,CAAC,EAAE,oBACnB;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,kBAsBF,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,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,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;AAsCxD,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+YpB,CAAC;AAEX,eAAO,MAAM,wBAAwB,EAAE,+BA0I7B,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;AAGF,eAAO,MAAM,gCAAgC,QAAS,MAAM,KAAG,aAQ9D,CAAC;AAEF,QAAA,MAAM,uCAAuC;oBAM3B,MAAM;oBACN,MAAM;;;mBAcvB,CAAC;AAEF,QAAA,MAAM,sCAAsC;oBAM1B,MAAM;oBACN,MAAM;;;mBAcvB,CAAC;AAEF,QAAA,MAAM,yCAAyC,cAClC,MAAM,GAAG,SAAS,YACnB,MAAM,GAAG,SAAS,iBACb,CAAC,UAAU,GAAG,KAAK,CAAC,EAAE,oBACnB;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,kBAsBF,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,QAAA,MAAM,iCAAiC,eAAgB,MAAM,gBAAgB,aAAa,kBAItF,CAAC;AAEL,OAAO,EACL,uCAAuC,EACvC,sCAAsC,EACtC,yCAAyC,EACzC,6BAA6B,EAC7B,4BAA4B,EAC5B,iCAAiC,GAClC,CAAC"}

package/dist/index.d.ts

@@ -41,6 +41,11 @@ type Deferred<T, I = any, D = any> = {
 };
 declare function createDeferred<T, I = any, D = any>(arg?: I, data?: D): Deferred<T, I, D>;
 
+declare enum EFirmwareType {
+    Universal = "universal",
+    BitcoinOnly = "bitcoinonly"
+}
+
 interface IHardwareError {
     errorCode: ValueOf<typeof HardwareErrorCode>;
     message?: string;
@@ -161,20 +166,32 @@ declare const TypedError: (hardwareError: ErrorCodeUnion | string, message?: str
 declare const serializeError: (payload: any) => any;
 declare const CreateErrorByMessage: (message: string) => HardwareError;
 declare const CreateHardwareErrorByBridgeError: (raw: string) => HardwareError;
-declare const createNewFirmwareUnReleaseHardwareError: (currentVersion: string, requireVersion: string, methodName?: string) => HardwareError;
-declare const createNeedUpgradeFirmwareHardwareError: (currentVersion: string, requireVersion: string, methodName?: string) => HardwareError;
+declare const createNewFirmwareUnReleaseHardwareError: ({ currentVersion, requireVersion, methodName, firmwareType, }: {
+    currentVersion: string;
+    requireVersion: string;
+    methodName?: string | undefined;
+    firmwareType?: EFirmwareType | undefined;
+}) => HardwareError;
+declare const createNeedUpgradeFirmwareHardwareError: ({ currentVersion, requireVersion, methodName, firmwareType, }: {
+    currentVersion: string;
+    requireVersion: string;
+    methodName?: string | undefined;
+    firmwareType?: EFirmwareType | undefined;
+}) => HardwareError;
 declare const createNewFirmwareForceUpdateHardwareError: (connectId: string | undefined, deviceId: string | undefined, versionTypes?: ('firmware' | 'ble')[], 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 createDeviceNotSupportMethodError: (methodName: string, firmwareType: EFirmwareType) => 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;
+declare const HardwareError$1_createDeviceNotSupportMethodError: typeof createDeviceNotSupportMethodError;
 type HardwareError$1_IHardwareError = IHardwareError;
 type HardwareError$1_HardwareError = HardwareError;
 declare const HardwareError$1_HardwareError: typeof HardwareError;
@@ -191,6 +208,7 @@ declare namespace HardwareError$1 {
     HardwareError$1_createNewFirmwareForceUpdateHardwareError as createNewFirmwareForceUpdateHardwareError,
     HardwareError$1_createDeprecatedHardwareError as createDeprecatedHardwareError,
     HardwareError$1_createDefectiveFirmwareError as createDefectiveFirmwareError,
+    HardwareError$1_createDeviceNotSupportMethodError as createDeviceNotSupportMethodError,
     HardwareError$1_IHardwareError as IHardwareError,
     HardwareError$1_HardwareError as HardwareError,
     HardwareError$1_HardwareErrorCode as HardwareErrorCode,
@@ -214,9 +232,4 @@ declare enum EDeviceType {
     Pro = "pro"
 }
 
-declare enum EFirmwareType {
-    Universal = "universal",
-    BitcoinOnly = "bitcoinonly"
-}
-
-export { CreateErrorByMessage, CreateHardwareErrorByBridgeError, 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, CreateHardwareErrorByBridgeError, 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, createDeviceNotSupportMethodError, createNeedUpgradeFirmwareHardwareError, createNewFirmwareForceUpdateHardwareError, createNewFirmwareUnReleaseHardwareError, isHeaderChunk, isOnekeyDevice, serializeError, wait };

package/dist/index.js

@@ -118,6 +118,12 @@ function createDeferred(arg, data) {
     };
 }
 
+exports.EFirmwareType = void 0;
+(function (EFirmwareType) {
+    EFirmwareType["Universal"] = "universal";
+    EFirmwareType["BitcoinOnly"] = "bitcoinonly";
+})(exports.EFirmwareType || (exports.EFirmwareType = {}));
+
 function fillStringWithArguments(value, object) {
     if (typeof value !== 'string')
         return value;
@@ -409,11 +415,17 @@ const CreateHardwareErrorByBridgeError = (raw) => {
     }
     return TypedError(HardwareErrorCode.BridgeNetworkError, msg);
 };
-const createNewFirmwareUnReleaseHardwareError = (currentVersion, requireVersion, methodName) => {
+const createNewFirmwareUnReleaseHardwareError = ({ currentVersion, requireVersion, methodName, firmwareType, }) => {
+    if ((methodName === null || methodName === void 0 ? void 0 : methodName.startsWith('btc')) === false && firmwareType === exports.EFirmwareType.BitcoinOnly) {
+        return createDeviceNotSupportMethodError(methodName !== null && methodName !== void 0 ? methodName : '', firmwareType);
+    }
     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 createNeedUpgradeFirmwareHardwareError = ({ currentVersion, requireVersion, methodName, firmwareType, }) => {
+    if ((methodName === null || methodName === void 0 ? void 0 : methodName.startsWith('btc')) === false && firmwareType === exports.EFirmwareType.BitcoinOnly) {
+        return createDeviceNotSupportMethodError(methodName !== null && methodName !== void 0 ? methodName : '', firmwareType);
+    }
     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 });
 };
@@ -452,6 +464,10 @@ const createDefectiveFirmwareError = (serialNo, seVersion, deviceType, connectId
         deviceId,
     });
 };
+const createDeviceNotSupportMethodError = (methodName, firmwareType) => TypedError(HardwareErrorCode.DeviceNotSupportMethod, `Device not support this method`, {
+    firmwareType: firmwareType.toString(),
+    method: methodName,
+});
 
 var HardwareError$1 = /*#__PURE__*/Object.freeze({
     __proto__: null,
@@ -466,7 +482,8 @@ var HardwareError$1 = /*#__PURE__*/Object.freeze({
     createNeedUpgradeFirmwareHardwareError: createNeedUpgradeFirmwareHardwareError,
     createNewFirmwareForceUpdateHardwareError: createNewFirmwareForceUpdateHardwareError,
     createDeprecatedHardwareError: createDeprecatedHardwareError,
-    createDefectiveFirmwareError: createDefectiveFirmwareError
+    createDefectiveFirmwareError: createDefectiveFirmwareError,
+    createDeviceNotSupportMethodError: createDeviceNotSupportMethodError
 });
 
 const wait = (ms) => new Promise(resolve => {
@@ -484,12 +501,6 @@ exports.EDeviceType = void 0;
     EDeviceType["Pro"] = "pro";
 })(exports.EDeviceType || (exports.EDeviceType = {}));
 
-exports.EFirmwareType = void 0;
-(function (EFirmwareType) {
-    EFirmwareType["Universal"] = "universal";
-    EFirmwareType["BitcoinOnly"] = "bitcoinonly";
-})(exports.EFirmwareType || (exports.EFirmwareType = {}));
-
 exports.CreateErrorByMessage = CreateErrorByMessage;
 exports.CreateHardwareErrorByBridgeError = CreateHardwareErrorByBridgeError;
 exports.ERRORS = HardwareError$1;
@@ -504,6 +515,7 @@ exports.TypedError = TypedError;
 exports.createDefectiveFirmwareError = createDefectiveFirmwareError;
 exports.createDeferred = createDeferred;
 exports.createDeprecatedHardwareError = createDeprecatedHardwareError;
+exports.createDeviceNotSupportMethodError = createDeviceNotSupportMethodError;
 exports.createNeedUpgradeFirmwareHardwareError = createNeedUpgradeFirmwareHardwareError;
 exports.createNewFirmwareForceUpdateHardwareError = createNewFirmwareForceUpdateHardwareError;
 exports.createNewFirmwareUnReleaseHardwareError = createNewFirmwareUnReleaseHardwareError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-shared",
-  "version": "1.1.19-alpha.7",
+  "version": "1.1.19",
   "description": "Hardware SDK's shared tool library",
   "keywords": [
     "Hardware-SDK",
@@ -25,5 +25,5 @@
     "lint": "eslint .",
     "lint:fix": "eslint . --fix"
   },
-  "gitHead": "504674573f593077641b55779804b6895e1b942b"
+  "gitHead": "f2d2ffc4876893522aca023969b1d1701def571c"
 }

package/src/HardwareError.ts

@@ -1,3 +1,5 @@
+import { EFirmwareType } from './firmwareType';
+
 export interface IHardwareError {
   errorCode: ValueOf<typeof HardwareErrorCode>;
   message?: string;
@@ -663,11 +665,21 @@ export const CreateHardwareErrorByBridgeError = (raw: string): HardwareError =>
   return TypedError(HardwareErrorCode.BridgeNetworkError, msg);
 };
 
-const createNewFirmwareUnReleaseHardwareError = (
-  currentVersion: string,
-  requireVersion: string,
-  methodName?: string
-) => {
+const createNewFirmwareUnReleaseHardwareError = ({
+  currentVersion,
+  requireVersion,
+  methodName,
+  firmwareType,
+}: {
+  currentVersion: string;
+  requireVersion: string;
+  methodName?: string;
+  firmwareType?: EFirmwareType;
+}) => {
+  if (methodName?.startsWith('btc') === false && firmwareType === EFirmwareType.BitcoinOnly) {
+    return createDeviceNotSupportMethodError(methodName ?? '', firmwareType);
+  }
+
   const methodInfo = methodName ? ` for method '${methodName}'` : '';
   return TypedError(
     HardwareErrorCode.NewFirmwareUnRelease,
@@ -676,11 +688,21 @@ const createNewFirmwareUnReleaseHardwareError = (
   );
 };
 
-const createNeedUpgradeFirmwareHardwareError = (
-  currentVersion: string,
-  requireVersion: string,
-  methodName?: string
-) => {
+const createNeedUpgradeFirmwareHardwareError = ({
+  currentVersion,
+  requireVersion,
+  methodName,
+  firmwareType,
+}: {
+  currentVersion: string;
+  requireVersion: string;
+  methodName?: string;
+  firmwareType?: EFirmwareType;
+}) => {
+  if (methodName?.startsWith('btc') === false && firmwareType === EFirmwareType.BitcoinOnly) {
+    return createDeviceNotSupportMethodError(methodName ?? '', firmwareType);
+  }
+
   const methodInfo = methodName ? ` for method '${methodName}'` : '';
   return TypedError(
     HardwareErrorCode.CallMethodNeedUpgradeFirmware,
@@ -751,10 +773,17 @@ const createDefectiveFirmwareError = (
   });
 };
 
+const createDeviceNotSupportMethodError = (methodName: string, firmwareType: EFirmwareType) =>
+  TypedError(HardwareErrorCode.DeviceNotSupportMethod, `Device not support this method`, {
+    firmwareType: firmwareType.toString(),
+    method: methodName,
+  });
+
 export {
   createNewFirmwareUnReleaseHardwareError,
   createNeedUpgradeFirmwareHardwareError,
   createNewFirmwareForceUpdateHardwareError,
   createDeprecatedHardwareError,
   createDefectiveFirmwareError,
+  createDeviceNotSupportMethodError,
 };