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

package/dist/HardwareError.d.ts

@@ -55,7 +55,8 @@ export declare const HardwareErrorCode: {
     readonly NewFirmwareForceUpdate: 414;
     readonly DeviceNotSupportMethod: 415;
     readonly ForbiddenKeyPath: 416;
-    readonly DefectiveFirmware: 417;
+    readonly RepeatUnlocking: 417;
+    readonly DefectiveFirmware: 418;
     readonly NetworkError: 500;
     readonly TransportNotConfigured: 600;
     readonly TransportCallInProgress: 601;
@@ -114,7 +115,7 @@ 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?: {
+declare const createNewFirmwareForceUpdateHardwareError: (connectId: string | undefined, deviceId: string | undefined, versionTypes?: ('firmware' | 'ble')[], currentVersions?: {
     firmware?: string;
     ble?: string;
 }) => HardwareError;

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;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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8XpB,CAAC;AAEX,eAAO,MAAM,wBAAwB,EAAE,+BAsI7B,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,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"}

package/dist/index.d.ts

@@ -97,7 +97,8 @@ declare const HardwareErrorCode: {
     readonly NewFirmwareForceUpdate: 414;
     readonly DeviceNotSupportMethod: 415;
     readonly ForbiddenKeyPath: 416;
-    readonly DefectiveFirmware: 417;
+    readonly RepeatUnlocking: 417;
+    readonly DefectiveFirmware: 418;
     readonly NetworkError: 500;
     readonly TransportNotConfigured: 600;
     readonly TransportCallInProgress: 601;
@@ -156,7 +157,7 @@ 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?: {
+declare const createNewFirmwareForceUpdateHardwareError: (connectId: string | undefined, deviceId: string | undefined, versionTypes?: ('firmware' | 'ble')[], currentVersions?: {
     firmware?: string;
     ble?: string;
 }) => HardwareError;

package/dist/index.js

@@ -120,7 +120,34 @@ function createDeferred(arg, data) {
 function fillStringWithArguments(value, object) {
     if (typeof value !== 'string')
         return value;
-    return value.replace(/\{([^}]+)\}/g, (_, arg) => object[arg] || '?');
+    if (value.indexOf('{') === -1)
+        return value;
+    let result = '';
+    let i = 0;
+    const dict = object;
+    while (i < value.length) {
+        const open = value.indexOf('{', i);
+        if (open === -1) {
+            result += value.slice(i);
+            break;
+        }
+        const close = value.indexOf('}', open + 1);
+        if (close === -1) {
+            result += value.slice(i);
+            break;
+        }
+        result += value.slice(i, open);
+        const key = value.slice(open + 1, close);
+        if (key.length === 0) {
+            result += '{}';
+        }
+        else {
+            const replacement = dict[key];
+            result += replacement ? String(replacement) : '?';
+        }
+        i = close + 1;
+    }
+    return result;
 }
 class HardwareError extends Error {
     constructor(hardwareError) {
@@ -187,7 +214,8 @@ const HardwareErrorCode = {
     NewFirmwareForceUpdate: 414,
     DeviceNotSupportMethod: 415,
     ForbiddenKeyPath: 416,
-    DefectiveFirmware: 417,
+    RepeatUnlocking: 417,
+    DefectiveFirmware: 418,
     NetworkError: 500,
     TransportNotConfigured: 600,
     TransportCallInProgress: 601,
@@ -281,6 +309,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.RepeatUnlocking]: 'Repeat unlocking',
     [HardwareErrorCode.DefectiveFirmware]: 'Device firmware is defective, please update immediately',
     [HardwareErrorCode.NetworkError]: 'Network request error',
     [HardwareErrorCode.TransportNotConfigured]: 'Transport not configured',
@@ -372,42 +401,24 @@ const createNeedUpgradeFirmwareHardwareError = (currentVersion, requireVersion,
     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`;
-    }
+const createNewFirmwareForceUpdateHardwareError = (connectId, deviceId, versionTypes, currentVersions) => {
+    const types = versionTypes || [];
+    const typeMap = { firmware: 'firmware', ble: 'BLE firmware' };
+    const requiredTypes = types.filter(type => type in typeMap);
+    const getVersionInfo = () => {
+        const versions = [];
+        if (currentVersions === null || currentVersions === void 0 ? void 0 : currentVersions.firmware)
+            versions.push(`firmware version: ${currentVersions.firmware}`);
+        if (currentVersions === null || currentVersions === void 0 ? void 0 : currentVersions.ble)
+            versions.push(`BLE version: ${currentVersions.ble}`);
+        return versions.length > 0 ? ` (${versions.join(', ')})` : '';
+    };
+    const getTypeDescription = () => requiredTypes.map(type => typeMap[type]).join(' and ');
+    const message = `Device ${getTypeDescription()} version is too low. ${getVersionInfo()}`;
     return TypedError(HardwareErrorCode.NewFirmwareForceUpdate, message, {
         connectId,
         deviceId,
-        versionType,
+        versionTypes,
         currentVersions,
     });
 };

package/package.json

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

package/src/HardwareError.ts

@@ -12,7 +12,38 @@ type ErrorCodeUnion = ValueOf<typeof HardwareErrorCode>;
 
 function fillStringWithArguments(value: string, object: object) {
   if (typeof value !== 'string') return value;
-  return value.replace(/\{([^}]+)\}/g, (_, arg: string) => (object as unknown as any)[arg] || '?');
+  // Avoid regex with potential catastrophic backtracking by parsing manually in linear time
+  if (value.indexOf('{') === -1) return value;
+  let result = '';
+  let i = 0;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const dict = object as any;
+  while (i < value.length) {
+    const open = value.indexOf('{', i);
+    if (open === -1) {
+      result += value.slice(i);
+      break;
+    }
+    const close = value.indexOf('}', open + 1);
+    if (close === -1) {
+      // No matching closing brace; append the rest as-is
+      result += value.slice(i);
+      break;
+    }
+    // Append text before the placeholder
+    result += value.slice(i, open);
+    const key = value.slice(open + 1, close);
+    if (key.length === 0) {
+      // Keep '{}' unchanged to match original regex behavior
+      result += '{}';
+    } else {
+      const replacement = dict[key];
+      // Preserve original semantics: falsy values fallback to '?'
+      result += replacement ? String(replacement) : '?';
+    }
+    i = close + 1;
+  }
+  return result;
 }
 
 export class HardwareError extends Error {
@@ -250,11 +281,16 @@ export const HardwareErrorCode = {
    */
   ForbiddenKeyPath: 416,
 
+  /**
+   * Repeat unlocking
+   * all network get address by loop need repeat unlocking
+   */
+  RepeatUnlocking: 417,
+
   /**
    * Defective firmware detected
-   * @params:{ serialNo: string?, seVersion: string?, deviceType: string? }
    */
-  DefectiveFirmware: 417,
+  DefectiveFirmware: 418,
 
   /**
    * Netword request error
@@ -480,6 +516,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.RepeatUnlocking]: 'Repeat unlocking',
   [HardwareErrorCode.DefectiveFirmware]: 'Device firmware is defective, please update immediately',
 
   /**
@@ -623,48 +660,30 @@ const createNeedUpgradeFirmwareHardwareError = (
 const createNewFirmwareForceUpdateHardwareError = (
   connectId: string | undefined,
   deviceId: string | undefined,
-  versionType?: 'firmware' | 'ble' | 'both',
+  versionTypes?: ('firmware' | 'ble')[],
   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`;
-  }
+  const types = versionTypes || [];
+  const typeMap = { firmware: 'firmware', ble: 'BLE firmware' };
+  const requiredTypes = types.filter(type => type in typeMap);
+
+  const getVersionInfo = () => {
+    const versions = [];
+    if (currentVersions?.firmware) versions.push(`firmware version: ${currentVersions.firmware}`);
+    if (currentVersions?.ble) versions.push(`BLE version: ${currentVersions.ble}`);
+    return versions.length > 0 ? ` (${versions.join(', ')})` : '';
+  };
+
+  const getTypeDescription = () => requiredTypes.map(type => typeMap[type]).join(' and ');
+  const message = `Device ${getTypeDescription()} version is too low. ${getVersionInfo()}`;
 
   return TypedError(HardwareErrorCode.NewFirmwareForceUpdate, message, {
     connectId,
     deviceId,
-    versionType,
+    versionTypes,
     currentVersions,
   });
 };