@onekeyfe/hd-shared 0.1.13 → 0.1.17

package/dist/HardwareError.d.ts

@@ -54,9 +54,11 @@ export declare const HardwareErrorCode: {
     readonly FirmwareError: 804;
     readonly ResponseUnexpectTypeError: 805;
     readonly BridgeNetworkError: 806;
+    readonly BridgeTimeoutError: 807;
 };
 export declare const HardwareErrorCodeMessage: HardwareErrorCodeMessageMapping;
 export declare const TypedError: (hardwareError: ErrorCodeUnion | string, message?: string | undefined) => HardwareError;
 export declare const serializeError: (payload: any) => any;
+export declare const CreateErrorByMessage: (message: string) => HardwareError;
 export {};
 //# 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;CAClB;AAED,aAAK,OAAO,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAE5C,aAAK,+BAA+B,GAAG;KAAG,CAAC,IAAI,OAAO,CAAC,OAAO,iBAAiB,CAAC,GAAG,MAAM;CAAE,CAAC;AAE5F,aAAK,cAAc,GAAG,OAAO,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAMxD,qBAAa,aAAc,SAAQ,KAAK;IACtC,SAAS,EAAE,cAAc,CAAkC;IAE3D,OAAO,SAAM;gBAED,aAAa,EAAE,cAAc,GAAG,MAAM;CAkBnD;AAED,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0KpB,CAAC;AAEX,eAAO,MAAM,wBAAwB,EAAE,+BAyE7B,CAAC;AAEX,eAAO,MAAM,UAAU,kBAAmB,cAAc,GAAG,MAAM,gDAKhE,CAAC;AAEF,eAAO,MAAM,cAAc,YAAa,GAAG,QAQ1C,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;CAClB;AAED,aAAK,OAAO,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAE5C,aAAK,+BAA+B,GAAG;KAAG,CAAC,IAAI,OAAO,CAAC,OAAO,iBAAiB,CAAC,GAAG,MAAM;CAAE,CAAC;AAE5F,aAAK,cAAc,GAAG,OAAO,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAOxD,qBAAa,aAAc,SAAQ,KAAK;IACtC,SAAS,EAAE,cAAc,CAAkC;IAE3D,OAAO,SAAM;gBAED,aAAa,EAAE,cAAc,GAAG,MAAM;CAkBnD;AAED,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+KpB,CAAC;AAEX,eAAO,MAAM,wBAAwB,EAAE,+BA0E7B,CAAC;AAEX,eAAO,MAAM,UAAU,kBAAmB,cAAc,GAAG,MAAM,gDAKhE,CAAC;AAEF,eAAO,MAAM,cAAc,YAAa,GAAG,QAQ1C,CAAC;AAEF,eAAO,MAAM,oBAAoB,YAAa,MAAM,KAAG,aAOtD,CAAC"}

package/dist/index.d.ts

@@ -63,10 +63,12 @@ declare const HardwareErrorCode: {
     readonly FirmwareError: 804;
     readonly ResponseUnexpectTypeError: 805;
     readonly BridgeNetworkError: 806;
+    readonly BridgeTimeoutError: 807;
 };
 declare const HardwareErrorCodeMessage: HardwareErrorCodeMessageMapping;
 declare const TypedError: (hardwareError: ErrorCodeUnion | string, message?: string | undefined) => HardwareError;
 declare const serializeError: (payload: any) => any;
+declare const CreateErrorByMessage: (message: string) => HardwareError;
 
 type HardwareError$1_IHardwareError = IHardwareError;
 type HardwareError$1_HardwareError = HardwareError;
@@ -75,6 +77,7 @@ declare const HardwareError$1_HardwareErrorCode: typeof HardwareErrorCode;
 declare const HardwareError$1_HardwareErrorCodeMessage: typeof HardwareErrorCodeMessage;
 declare const HardwareError$1_TypedError: typeof TypedError;
 declare const HardwareError$1_serializeError: typeof serializeError;
+declare const HardwareError$1_CreateErrorByMessage: typeof CreateErrorByMessage;
 declare namespace HardwareError$1 {
   export {
     HardwareError$1_IHardwareError as IHardwareError,
@@ -83,39 +86,8 @@ declare namespace HardwareError$1 {
     HardwareError$1_HardwareErrorCodeMessage as HardwareErrorCodeMessage,
     HardwareError$1_TypedError as TypedError,
     HardwareError$1_serializeError as serializeError,
+    HardwareError$1_CreateErrorByMessage as CreateErrorByMessage,
   };
 }
 
-declare type LogMessage = {
-    level: string;
-    prefix: string;
-    message: any[];
-    timestamp: number;
-};
-declare type LoggerFn = (...data: any[]) => void;
-declare type LoggerMoreParams = (message?: any, ...optionalParams: any[]) => void;
-declare type Logger = {
-    debug: LoggerFn | LoggerMoreParams;
-    info: LoggerFn | LoggerMoreParams;
-    warn: LoggerFn | LoggerMoreParams;
-    error: LoggerFn | LoggerMoreParams;
-};
-declare class Log {
-    prefix: string;
-    enabled: boolean;
-    messages: LogMessage[];
-    logger?: Logger;
-    constructor(prefix: string, enabled: boolean, logger?: Logger);
-    addMessage(level: string, prefix: string, ...args: any[]): void;
-    log(...args: any[]): void;
-    error(...args: any[]): void;
-    warn(...args: any[]): void;
-    debug(...args: any[]): void;
-}
-declare const initLog: (prefix: string, enabled?: boolean | undefined, logger?: Logger | undefined) => Log;
-declare const enableLog: (enabled?: boolean | undefined) => void;
-declare const setOutsideLogger: (logger: Logger) => void;
-declare const enableLogByPrefix: (prefix: string, enabled: boolean) => void;
-declare const getLog: () => LogMessage[];
-
-export { Deferred, HardwareError$1 as ERRORS, HardwareError, HardwareErrorCode, HardwareErrorCodeMessage, IHardwareError, TypedError, createDeferred, enableLog, enableLogByPrefix, getLog, initLog, serializeError, setOutsideLogger };
+export { CreateErrorByMessage, Deferred, HardwareError$1 as ERRORS, HardwareError, HardwareErrorCode, HardwareErrorCodeMessage, IHardwareError, TypedError, createDeferred, serializeError };

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,UAAU,CAAC;AACzB,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAC"}

package/dist/index.js

@@ -55,6 +55,8 @@ function createDeferred(arg, data) {
 }
 
 function fillStringWithArguments(value, object) {
+    if (typeof value !== 'string')
+        return value;
     return value.replace(/\{([^}]+)\}/g, (_, arg) => object[arg] || '?');
 }
 class HardwareError extends Error {
@@ -121,6 +123,7 @@ const HardwareErrorCode = {
     FirmwareError: 804,
     ResponseUnexpectTypeError: 805,
     BridgeNetworkError: 806,
+    BridgeTimeoutError: 807,
 };
 const HardwareErrorCodeMessage = {
     [HardwareErrorCode.UnknownError]: 'Unknown error occurred. Check message property.',
@@ -164,6 +167,7 @@ const HardwareErrorCodeMessage = {
     [HardwareErrorCode.FirmwareError]: 'Firmware installation failed',
     [HardwareErrorCode.ResponseUnexpectTypeError]: 'Response type is not expected',
     [HardwareErrorCode.BridgeNetworkError]: 'Bridge network error',
+    [HardwareErrorCode.BridgeTimeoutError]: 'Bridge network timeout',
 };
 const TypedError = (hardwareError, message) => {
     if (typeof hardwareError === 'string') {
@@ -180,6 +184,14 @@ const serializeError = (payload) => {
     }
     return payload;
 };
+const CreateErrorByMessage = (message) => {
+    for (const code of Object.values(HardwareErrorCode)) {
+        if (HardwareErrorCodeMessage[code] === message) {
+            return TypedError(code);
+        }
+    }
+    return new HardwareError(message);
+};
 
 var HardwareError$1 = /*#__PURE__*/Object.freeze({
     __proto__: null,
@@ -187,118 +199,15 @@ var HardwareError$1 = /*#__PURE__*/Object.freeze({
     HardwareErrorCode: HardwareErrorCode,
     HardwareErrorCodeMessage: HardwareErrorCodeMessage,
     TypedError: TypedError,
-    serializeError: serializeError
+    serializeError: serializeError,
+    CreateErrorByMessage: CreateErrorByMessage
 });
 
-const MAX_ENTRIES = 100;
-class Log {
-    constructor(prefix, enabled, logger) {
-        this.prefix = prefix;
-        this.enabled = enabled;
-        this.messages = [];
-        if (logger) {
-            this.logger = logger;
-        }
-    }
-    addMessage(level, prefix, ...args) {
-        this.messages.push({
-            level,
-            prefix,
-            message: args,
-            timestamp: new Date().getTime(),
-        });
-        if (this.messages.length > MAX_ENTRIES) {
-            this.messages.shift();
-        }
-    }
-    log(...args) {
-        this.addMessage('log', this.prefix, ...args);
-        if (!this.enabled) {
-            return;
-        }
-        if (this.logger) {
-            this.logger.info(this.prefix, ...args);
-        }
-        else {
-            console.log(this.prefix, ...args);
-        }
-    }
-    error(...args) {
-        this.addMessage('error', this.prefix, ...args);
-        if (!this.enabled) {
-            return;
-        }
-        if (this.logger) {
-            this.logger.error(this.prefix, ...args);
-        }
-        else {
-            console.error(this.prefix, ...args);
-        }
-    }
-    warn(...args) {
-        this.addMessage('warn', this.prefix, ...args);
-        if (!this.enabled) {
-            return;
-        }
-        if (this.logger) {
-            this.logger.warn(this.prefix, ...args);
-        }
-        else {
-            console.warn(this.prefix, ...args);
-        }
-    }
-    debug(...args) {
-        this.addMessage('debug', this.prefix, ...args);
-        if (!this.enabled) {
-            return;
-        }
-        if (this.logger) {
-            this.logger.debug(this.prefix, ...args);
-        }
-        else {
-            console.log(this.prefix, ...args);
-        }
-    }
-}
-const _logs = {};
-const initLog = (prefix, enabled, logger) => {
-    const instance = new Log(prefix, !!enabled, logger);
-    _logs[prefix] = instance;
-    return instance;
-};
-const enableLog = (enabled) => {
-    Object.keys(_logs).forEach(key => {
-        _logs[key].enabled = !!enabled;
-    });
-};
-const setOutsideLogger = (logger) => {
-    Object.keys(_logs).forEach(key => {
-        _logs[key].logger = logger;
-    });
-};
-const enableLogByPrefix = (prefix, enabled) => {
-    if (_logs[prefix]) {
-        _logs[prefix].enabled = enabled;
-    }
-};
-const getLog = () => {
-    let logs = [];
-    Object.keys(_logs).forEach(key => {
-        logs = logs.concat(_logs[key].messages);
-    });
-    logs.sort((a, b) => a.timestamp - b.timestamp);
-    return logs;
-};
-
+exports.CreateErrorByMessage = CreateErrorByMessage;
 exports.ERRORS = HardwareError$1;
 exports.HardwareError = HardwareError;
 exports.HardwareErrorCode = HardwareErrorCode;
 exports.HardwareErrorCodeMessage = HardwareErrorCodeMessage;
 exports.TypedError = TypedError;
 exports.createDeferred = createDeferred;
-exports.enableLog = enableLog;
-exports.enableLogByPrefix = enableLogByPrefix;
-exports.getLog = getLog;
-exports.initLog = initLog;
 exports.serializeError = serializeError;
-exports.setOutsideLogger = setOutsideLogger;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-shared",
-  "version": "0.1.13",
+  "version": "0.1.17",
   "description": "Hardware SDK's shared tool library",
   "keywords": [
     "Hardware-SDK",
@@ -25,5 +25,5 @@
     "lint": "eslint .",
     "lint:fix": "eslint . --fix"
   },
-  "gitHead": "f69fd0696e38efbc838848fb361cb900043bb2ec"
+  "gitHead": "65350a66c7f2b1e80cb1d413ee56da4aef507fa3"
 }

package/src/HardwareError.ts

@@ -10,6 +10,7 @@ type HardwareErrorCodeMessageMapping = { [P in ValueOf<typeof HardwareErrorCode>
 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] || '?');
 }
 
@@ -208,6 +209,11 @@ export const HardwareErrorCode = {
    * bridge network error
    */
   BridgeNetworkError: 806,
+
+  /**
+   * Bridge network timeout
+   */
+  BridgeTimeoutError: 807,
 } as const;
 
 export const HardwareErrorCodeMessage: HardwareErrorCodeMessageMapping = {
@@ -283,6 +289,7 @@ export const HardwareErrorCodeMessage: HardwareErrorCodeMessageMapping = {
   [HardwareErrorCode.FirmwareError]: 'Firmware installation failed',
   [HardwareErrorCode.ResponseUnexpectTypeError]: 'Response type is not expected',
   [HardwareErrorCode.BridgeNetworkError]: 'Bridge network error',
+  [HardwareErrorCode.BridgeTimeoutError]: 'Bridge network timeout',
 } as const;
 
 export const TypedError = (hardwareError: ErrorCodeUnion | string, message?: string) => {
@@ -301,3 +308,12 @@ export const serializeError = (payload: any) => {
   }
   return payload;
 };
+
+export const CreateErrorByMessage = (message: string): HardwareError => {
+  for (const code of Object.values(HardwareErrorCode)) {
+    if (HardwareErrorCodeMessage[code] === message) {
+      return TypedError(code);
+    }
+  }
+  return new HardwareError(message);
+};

package/src/index.ts

@@ -1,4 +1,3 @@
 export * from './deferred';
 export * from './HardwareError';
-export * from './logger';
 export * as ERRORS from './HardwareError';

package/dist/logger.d.ts

@@ -1,33 +0,0 @@
-declare type LogMessage = {
-    level: string;
-    prefix: string;
-    message: any[];
-    timestamp: number;
-};
-declare type LoggerFn = (...data: any[]) => void;
-declare type LoggerMoreParams = (message?: any, ...optionalParams: any[]) => void;
-declare type Logger = {
-    debug: LoggerFn | LoggerMoreParams;
-    info: LoggerFn | LoggerMoreParams;
-    warn: LoggerFn | LoggerMoreParams;
-    error: LoggerFn | LoggerMoreParams;
-};
-declare class Log {
-    prefix: string;
-    enabled: boolean;
-    messages: LogMessage[];
-    logger?: Logger;
-    constructor(prefix: string, enabled: boolean, logger?: Logger);
-    addMessage(level: string, prefix: string, ...args: any[]): void;
-    log(...args: any[]): void;
-    error(...args: any[]): void;
-    warn(...args: any[]): void;
-    debug(...args: any[]): void;
-}
-export declare const initLog: (prefix: string, enabled?: boolean | undefined, logger?: Logger | undefined) => Log;
-export declare const enableLog: (enabled?: boolean | undefined) => void;
-export declare const setOutsideLogger: (logger: Logger) => void;
-export declare const enableLogByPrefix: (prefix: string, enabled: boolean) => void;
-export declare const getLog: () => LogMessage[];
-export {};
-//# sourceMappingURL=logger.d.ts.map

package/dist/logger.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA,aAAK,UAAU,GAAG;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,aAAK,QAAQ,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;AACzC,aAAK,gBAAgB,GAAG,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,GAAG,cAAc,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;AAE1E,aAAK,MAAM,GAAG;IACZ,KAAK,EAAE,QAAQ,GAAG,gBAAgB,CAAC;IACnC,IAAI,EAAE,QAAQ,GAAG,gBAAgB,CAAC;IAClC,IAAI,EAAE,QAAQ,GAAG,gBAAgB,CAAC;IAClC,KAAK,EAAE,QAAQ,GAAG,gBAAgB,CAAC;CACpC,CAAC;AAIF,cAAM,GAAG;IACP,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,OAAO,CAAC;IAEjB,QAAQ,EAAE,UAAU,EAAE,CAAC;IAEvB,MAAM,CAAC,EAAE,MAAM,CAAC;gBAEJ,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM;IAS7D,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE;IAYxD,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAYlB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAYpB,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAYnB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;CAWrB;AAID,eAAO,MAAM,OAAO,WAAY,MAAM,oEAIrC,CAAC;AAEF,eAAO,MAAM,SAAS,yCAIrB,CAAC;AAEF,eAAO,MAAM,gBAAgB,WAAY,MAAM,SAI9C,CAAC;AAEF,eAAO,MAAM,iBAAiB,WAAY,MAAM,WAAW,OAAO,SAIjE,CAAC;AAEF,eAAO,MAAM,MAAM,oBAOlB,CAAC"}

package/src/logger.ts

@@ -1,132 +0,0 @@
-type LogMessage = {
-  level: string;
-  prefix: string;
-  message: any[];
-  timestamp: number;
-};
-
-type LoggerFn = (...data: any[]) => void;
-type LoggerMoreParams = (message?: any, ...optionalParams: any[]) => void;
-
-type Logger = {
-  debug: LoggerFn | LoggerMoreParams;
-  info: LoggerFn | LoggerMoreParams;
-  warn: LoggerFn | LoggerMoreParams;
-  error: LoggerFn | LoggerMoreParams;
-};
-
-const MAX_ENTRIES = 100;
-
-class Log {
-  prefix: string;
-
-  enabled: boolean;
-
-  messages: LogMessage[];
-
-  logger?: Logger;
-
-  constructor(prefix: string, enabled: boolean, logger?: Logger) {
-    this.prefix = prefix;
-    this.enabled = enabled;
-    this.messages = [];
-    if (logger) {
-      this.logger = logger;
-    }
-  }
-
-  addMessage(level: string, prefix: string, ...args: any[]) {
-    this.messages.push({
-      level,
-      prefix,
-      message: args,
-      timestamp: new Date().getTime(),
-    });
-    if (this.messages.length > MAX_ENTRIES) {
-      this.messages.shift();
-    }
-  }
-
-  log(...args: any[]) {
-    this.addMessage('log', this.prefix, ...args);
-    if (!this.enabled) {
-      return;
-    }
-    if (this.logger) {
-      this.logger.info(this.prefix, ...args);
-    } else {
-      console.log(this.prefix, ...args);
-    }
-  }
-
-  error(...args: any[]) {
-    this.addMessage('error', this.prefix, ...args);
-    if (!this.enabled) {
-      return;
-    }
-    if (this.logger) {
-      this.logger.error(this.prefix, ...args);
-    } else {
-      console.error(this.prefix, ...args);
-    }
-  }
-
-  warn(...args: any[]) {
-    this.addMessage('warn', this.prefix, ...args);
-    if (!this.enabled) {
-      return;
-    }
-    if (this.logger) {
-      this.logger.warn(this.prefix, ...args);
-    } else {
-      console.warn(this.prefix, ...args);
-    }
-  }
-
-  debug(...args: any[]) {
-    this.addMessage('debug', this.prefix, ...args);
-    if (!this.enabled) {
-      return;
-    }
-    if (this.logger) {
-      this.logger.debug(this.prefix, ...args);
-    } else {
-      console.log(this.prefix, ...args);
-    }
-  }
-}
-
-const _logs: { [k: string]: Log } = {};
-
-export const initLog = (prefix: string, enabled?: boolean, logger?: Logger) => {
-  const instance = new Log(prefix, !!enabled, logger);
-  _logs[prefix] = instance;
-  return instance;
-};
-
-export const enableLog = (enabled?: boolean) => {
-  Object.keys(_logs).forEach(key => {
-    _logs[key].enabled = !!enabled;
-  });
-};
-
-export const setOutsideLogger = (logger: Logger) => {
-  Object.keys(_logs).forEach(key => {
-    _logs[key].logger = logger;
-  });
-};
-
-export const enableLogByPrefix = (prefix: string, enabled: boolean) => {
-  if (_logs[prefix]) {
-    _logs[prefix].enabled = enabled;
-  }
-};
-
-export const getLog = () => {
-  let logs: LogMessage[] = [];
-  Object.keys(_logs).forEach(key => {
-    logs = logs.concat(_logs[key].messages);
-  });
-  logs.sort((a, b) => a.timestamp - b.timestamp);
-  return logs;
-};