@onekeyfe/hd-web-sdk 0.1.12 → 0.1.13

package/build/onekey-js-sdk.js

@@ -4785,92 +4785,6 @@ function eventTargetAgnosticAddListener(emitter, name, listener, flags) {
   }
 }
 
-const colors = {
-  '@onekey/connect': 'color: #f4a742; background: #000;',
-  IFrame: 'color: #f4a742; background: #000;',
-  Core: 'color: #f4a742; background: #000;',
-  DescriptorStream: 'color: #77ab59; background: #000;',
-  DeviceList: 'color: #77ab59; background: #000;',
-  Device: 'color: #bada55; background: #000;',
-  DeviceCommands: 'color: #bada55; background: #000;',
-  DeviceConnector: 'color: #bada55; background: #000;',
-  Transport: 'color: #ffb6c1; background: #000;'
-};
-const MAX_ENTRIES = 100;
-
-class Log$6 {
-  constructor(prefix, enabled) {
-    this.prefix = prefix;
-    this.enabled = enabled;
-    this.messages = [];
-    this.css = typeof window !== 'undefined' && colors[prefix] ? colors[prefix] : '';
-  }
-
-  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) {
-      console.log(this.prefix, ...args);
-    }
-  }
-
-  error(...args) {
-    this.addMessage('error', this.prefix, ...args);
-
-    if (this.enabled) {
-      console.error(this.prefix, ...args);
-    }
-  }
-
-  warn(...args) {
-    this.addMessage('warn', this.prefix, ...args);
-
-    if (this.enabled) {
-      console.warn(this.prefix, ...args);
-    }
-  }
-
-  debug(...args) {
-    this.addMessage('debug', this.prefix, ...args);
-
-    if (this.enabled) {
-      if (this.css) {
-        console.log(`%c${this.prefix}`, this.css, ...args);
-      } else {
-        console.log(this.prefix, ...args);
-      }
-    }
-  }
-
-}
-
-const _logs = {};
-
-const initLog = (prefix, enabled) => {
-  const instance = new Log$6(prefix, !!enabled);
-  _logs[prefix] = instance;
-  return instance;
-};
-
-const enableLog = enabled => {
-  Object.keys(_logs).forEach(key => {
-    _logs[key].enabled = !!enabled;
-  });
-};
-
 const httpRequest$1 = (url, type = 'text') => __awaiter(void 0, void 0, void 0, function* () {
   const response = yield axios__default["default"].request({
     url,
@@ -14034,7 +13948,7 @@ DataManager.getTransportStatus = localVersion => {
   return isLatest ? 'valid' : 'outdated';
 };
 
-const Log$5 = initLog('Transport');
+const Log$5 = hdShared.initLog('Transport');
 
 class TransportManager {
   static load() {
@@ -14240,11 +14154,11 @@ const assertType = (res, resType) => {
   const splitResTypes = Array.isArray(resType) ? resType : resType.split('|');
 
   if (!splitResTypes.includes(res.type)) {
-    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `assertType: Response of unexpected type: ${res.type}. Should be ${resType}`);
+    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.ResponseUnexpectTypeError, `assertType: Response of unexpected type: ${res.type}. Should be ${resType}`);
   }
 };
 
-const Log$4 = initLog('DeviceCommands');
+const Log$4 = hdShared.initLog('DeviceCommands');
 
 class DeviceCommands {
   constructor(device, mainId) {
@@ -14268,8 +14182,10 @@ class DeviceCommands {
   }
 
   call(type, msg = {}) {
+    var _a, _b;
+
     return __awaiter(this, void 0, void 0, function* () {
-      console.log('[DeviceCommands] [call] Sending', type, this.transport);
+      console.log('[DeviceCommands] [call] Sending', type);
 
       try {
         const promise = this.transport.call(this.mainId, type, msg);
@@ -14279,6 +14195,14 @@ class DeviceCommands {
         return res;
       } catch (error) {
         Log$4.debug('[DeviceCommands] [call] Received error', error);
+
+        if (((_b = (_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.error) === 'device disconnected during action') {
+          return {
+            type: 'BridgeNetworkError',
+            message: {}
+          };
+        }
+
         throw error;
       }
     });
@@ -14296,7 +14220,16 @@ class DeviceCommands {
         assertType(response, resType);
       } catch (error) {
         console.log('DeviceCommands typedcall error: ', error);
-        throw error;
+
+        if (error instanceof hdShared.HardwareError) {
+          if (error.errorCode === hdShared.HardwareErrorCode.ResponseUnexpectTypeError) {
+            if (error.message.indexOf('BridgeNetworkError') > -1) {
+              throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BridgeNetworkError);
+            }
+          }
+        } else {
+          throw error;
+        }
       }
 
       return response;
@@ -14413,12 +14346,11 @@ const UI_REQUEST = {
   FIRMWARE_NOT_INSTALLED: 'ui-device_firmware_not_installed',
   NOT_USE_ONEKEY_DEVICE: 'ui-device_please_use_onekey_device'
 };
-const VERSION = '1.0.0-alpha.1';
-const DEFAULT_DOMAIN = `https://hardware-sdk.onekey.so/`;
+const DEFAULT_DOMAIN = `https://jssdk.onekey.so/`;
 const DEFAULT_PRIORITY = 2;
 const initialSettings = {
   configSrc: './data/config.json',
-  version: VERSION,
+  version: '',
   debug: false,
   priority: DEFAULT_PRIORITY,
   trustedHost: false,
@@ -14515,7 +14447,7 @@ const parseRunOptions = options => {
   return options;
 };
 
-const Log$3 = initLog('Device');
+const Log$3 = hdShared.initLog('Device');
 
 class Device extends events.exports {
   constructor(descriptor) {
@@ -14877,7 +14809,7 @@ class Device extends events.exports {
 }
 
 const cacheDeviceMap = new Map();
-const Log$2 = initLog('DeviceList');
+const Log$2 = hdShared.initLog('DeviceList');
 
 class DeviceList extends events.exports {
   constructor() {
@@ -18674,7 +18606,7 @@ const resolveAfter = (msec, value) => new Promise(resolve => {
   setTimeout(resolve, msec, value);
 });
 
-const Log$1 = initLog('DeviceConnector');
+const Log$1 = hdShared.initLog('DeviceConnector');
 
 const getDiff = (current, descriptors) => {
   const env = DataManager.getSettings('env');
@@ -18830,7 +18762,7 @@ class DeviceConnector {
 
 }
 
-const Log = initLog('Core');
+const Log = hdShared.initLog('Core');
 
 let _core;
 
@@ -18936,7 +18868,7 @@ const callAPI = message => __awaiter(void 0, void 0, void 0, function* () {
 
       try {
         const response = yield method.run();
-        Log.debug('Call API - Inner Method Run: ', device);
+        Log.debug('Call API - Inner Method Run: ');
         messageResponse = createResponseMessage(method.responseID, true, response);
         _callPromise === null || _callPromise === void 0 ? void 0 : _callPromise.resolve(messageResponse);
       } catch (error) {
@@ -19195,7 +19127,7 @@ const init = (settings, Transport) => __awaiter(void 0, void 0, void 0, function
       Log.error('DataManager.load error');
     }
 
-    enableLog(DataManager.getSettings('debug'));
+    hdShared.enableLog(DataManager.getSettings('debug'));
     initCore();
     initConnector();
     return _core;
@@ -19220,6 +19152,18 @@ const HardwareSdk = ({
   cancel
 });
 
+Object.defineProperty(exports, "yI", ({
+  enumerable: true,
+  get: function () {
+    return hdShared.enableLog;
+  }
+}));
+Object.defineProperty(exports, "KR", ({
+  enumerable: true,
+  get: function () {
+    return hdShared.initLog;
+  }
+}));
 __webpack_unused_export__ = ({
   enumerable: true,
   get: function () {
@@ -19245,7 +19189,6 @@ __webpack_unused_export__ = createResponseMessage;
 __webpack_unused_export__ = createUiMessage;
 __webpack_unused_export__ = createUiResponse;
 exports.ZP = HardwareSdk;
-exports.yI = enableLog;
 __webpack_unused_export__ = getDeviceLabel;
 __webpack_unused_export__ = getDeviceType;
 __webpack_unused_export__ = getDeviceTypeByBleName;
@@ -19257,7 +19200,6 @@ __webpack_unused_export__ = getScriptType;
 __webpack_unused_export__ = getTimeStamp;
 __webpack_unused_export__ = httpRequest;
 __webpack_unused_export__ = init;
-exports.KR = initLog;
 __webpack_unused_export__ = isValidVersionArray;
 __webpack_unused_export__ = isValidVersionString;
 __webpack_unused_export__ = normalizeVersionArray;
@@ -20445,7 +20387,9 @@ const HardwareErrorCode = {
   PinInvalid: 801,
   PinCancelled: 802,
   ActionCancelled: 803,
-  FirmwareError: 804
+  FirmwareError: 804,
+  ResponseUnexpectTypeError: 805,
+  BridgeNetworkError: 806
 };
 const HardwareErrorCodeMessage = {
   [HardwareErrorCode.UnknownError]: 'Unknown error occurred. Check message property.',
@@ -20486,7 +20430,9 @@ const HardwareErrorCodeMessage = {
   [HardwareErrorCode.PinInvalid]: 'Pin invalid',
   [HardwareErrorCode.PinCancelled]: 'Pin cancelled',
   [HardwareErrorCode.ActionCancelled]: 'Action cancelled by user',
-  [HardwareErrorCode.FirmwareError]: 'Firmware installation failed'
+  [HardwareErrorCode.FirmwareError]: 'Firmware installation failed',
+  [HardwareErrorCode.ResponseUnexpectTypeError]: 'Response type is not expected',
+  [HardwareErrorCode.BridgeNetworkError]: 'Bridge network error'
 };
 
 const TypedError = (hardwareError, message) => {
@@ -20526,13 +20472,137 @@ var HardwareError$1 = /*#__PURE__*/Object.freeze({
   TypedError: TypedError,
   serializeError: serializeError
 });
+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.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;
 
 /***/ }),
 
@@ -45675,7 +45745,9 @@ const src_init = async settings => {
   window.addEventListener('unload', src_dispose);
 
   try {
-    await init(_settings);
+    await init({ ..._settings,
+      version: "0.1.13"
+    });
     return true;
   } catch (e) {
     console.log('init error: ', e);