@onekeyfe/hd-web-sdk 0.0.4 → 0.0.7

package/build/onekey-js-sdk.js

@@ -5006,6 +5006,24 @@ const getDeviceType = features => {
   const serialNo = features.serial_no;
   const miniFlag = serialNo.slice(0, 2);
   if (miniFlag.toLowerCase() === 'mi') return 'mini';
+  if (miniFlag.toLowerCase() === 'tc') return 'touch';
+  return 'classic';
+};
+
+const getDeviceTypeByBleName = name => {
+  if (!name) return 'classic';
+  if (name.startsWith('MI')) return 'mini';
+  if (name.startsWith('T')) return 'touch';
+  return 'classic';
+};
+
+const getDeviceTypeByDeviceId = deviceId => {
+  if (!deviceId) {
+    return 'classic';
+  }
+
+  const miniFlag = deviceId.slice(0, 2);
+  if (miniFlag.toLowerCase() === 'mi') return 'mini';
   return 'classic';
 };
 
@@ -5045,6 +5063,126 @@ const getDeviceBLEFirmwareVersion = features => {
   return features.ble_ver.split('.');
 };
 
+const HD_HARDENED = 0x80000000;
+
+const toHardened = n => (n | HD_HARDENED) >>> 0;
+
+const fromHardened = n => (n & ~HD_HARDENED) >>> 0;
+
+const PATH_NOT_VALID = TypedError('Method_InvalidParameter', 'Not a valid path');
+const PATH_NEGATIVE_VALUES = TypedError('Method_InvalidParameter', 'Path cannot contain negative values');
+
+const getHDPath = path => {
+  const parts = path.toLowerCase().split('/');
+  if (parts[0] !== 'm') throw PATH_NOT_VALID;
+  return parts.filter(p => p !== 'm' && p !== '').map(p => {
+    let hardened = false;
+
+    if (p.substr(p.length - 1) === "'") {
+      hardened = true;
+      p = p.substr(0, p.length - 1);
+    }
+
+    let n = parseInt(p);
+
+    if (Number.isNaN(n)) {
+      throw PATH_NOT_VALID;
+    } else if (n < 0) {
+      throw PATH_NEGATIVE_VALUES;
+    }
+
+    if (hardened) {
+      n = toHardened(n);
+    }
+
+    return n;
+  });
+};
+
+const isMultisigPath = path => Array.isArray(path) && path[0] === toHardened(48);
+
+const isSegwitPath = path => Array.isArray(path) && path[0] === toHardened(49);
+
+const getScriptType = path => {
+  if (!Array.isArray(path) || path.length < 1) return 'SPENDADDRESS';
+  const p1 = fromHardened(path[0]);
+
+  switch (p1) {
+    case 48:
+      return 'SPENDMULTISIG';
+
+    case 49:
+      return 'SPENDP2SHWITNESS';
+
+    case 84:
+      return 'SPENDWITNESS';
+
+    default:
+      return 'SPENDADDRESS';
+  }
+};
+
+const getOutputScriptType = path => {
+  if (!Array.isArray(path) || path.length < 1) return 'PAYTOADDRESS';
+
+  if (path[0] === 49) {
+    return 'PAYTOP2SHWITNESS';
+  }
+
+  const p = fromHardened(path[0]);
+
+  switch (p) {
+    case 48:
+      return 'PAYTOMULTISIG';
+
+    case 49:
+      return 'PAYTOP2SHWITNESS';
+
+    case 84:
+      return 'PAYTOWITNESS';
+
+    default:
+      return 'PAYTOADDRESS';
+  }
+};
+
+const serializedPath = path => {
+  const pathStr = path.map(p => {
+    if (p & HD_HARDENED) {
+      return `${p & ~HD_HARDENED}'`;
+    }
+
+    return p;
+  }).join('/');
+  return `m/${pathStr}`;
+};
+
+const validatePath = (path, length = 0, base = false) => {
+  let valid;
+
+  if (typeof path === 'string') {
+    valid = getHDPath(path);
+  } else if (Array.isArray(path)) {
+    valid = path.map(p => {
+      const n = parseInt(p);
+
+      if (Number.isNaN(n)) {
+        throw PATH_NOT_VALID;
+      } else if (n < 0) {
+        throw PATH_NEGATIVE_VALUES;
+      }
+
+      return n;
+    });
+  } else {
+    valid = undefined;
+  }
+
+  if (!valid) throw PATH_NOT_VALID;
+  if (length > 0 && valid.length < length) throw PATH_NOT_VALID;
+  return base ? valid.splice(0, 3) : valid;
+};
+
 var nested = {
   BinanceGetAddress: {
     fields: {
@@ -13949,7 +14087,9 @@ const UI_REQUEST$1 = {
   REQUEST_PIN: 'ui-request_pin',
   INVALID_PIN: 'ui-invalid_pin',
   REQUEST_BUTTON: 'ui-button',
-  CLOSE_UI_WINDOW: 'ui-close_window'
+  CLOSE_UI_WINDOW: 'ui-close_window',
+  BLUETOOTH_PERMISSION: 'ui-bluetooth_permission',
+  LOCATION_PERMISSION: 'ui-location_permission'
 };
 
 const createUiMessage = (type, payload) => ({
@@ -14715,10 +14855,14 @@ class SearchDevices extends BaseMethod {
       const env = DataManager.getSettings('env');
 
       if (env === 'react-native') {
-        return devicesDescriptor.map(device => Object.assign(Object.assign({}, device), {
-          connectId: device.id,
-          deviceType: 'classic'
-        }));
+        return devicesDescriptor.map(device => {
+          var _a;
+
+          return Object.assign(Object.assign({}, device), {
+            connectId: device.id,
+            deviceType: getDeviceTypeByBleName((_a = device.name) !== null && _a !== void 0 ? _a : '')
+          });
+        });
       }
 
       const devices = [];
@@ -14762,126 +14906,6 @@ class GetFeatures extends BaseMethod {
 
 }
 
-const HD_HARDENED = 0x80000000;
-
-const toHardened = n => (n | HD_HARDENED) >>> 0;
-
-const fromHardened = n => (n & ~HD_HARDENED) >>> 0;
-
-const PATH_NOT_VALID = TypedError('Method_InvalidParameter', 'Not a valid path');
-const PATH_NEGATIVE_VALUES = TypedError('Method_InvalidParameter', 'Path cannot contain negative values');
-
-const getHDPath = path => {
-  const parts = path.toLowerCase().split('/');
-  if (parts[0] !== 'm') throw PATH_NOT_VALID;
-  return parts.filter(p => p !== 'm' && p !== '').map(p => {
-    let hardened = false;
-
-    if (p.substr(p.length - 1) === "'") {
-      hardened = true;
-      p = p.substr(0, p.length - 1);
-    }
-
-    let n = parseInt(p);
-
-    if (Number.isNaN(n)) {
-      throw PATH_NOT_VALID;
-    } else if (n < 0) {
-      throw PATH_NEGATIVE_VALUES;
-    }
-
-    if (hardened) {
-      n = toHardened(n);
-    }
-
-    return n;
-  });
-};
-
-const isMultisigPath = path => Array.isArray(path) && path[0] === toHardened(48);
-
-const isSegwitPath = path => Array.isArray(path) && path[0] === toHardened(49);
-
-const getScriptType = path => {
-  if (!Array.isArray(path) || path.length < 1) return 'SPENDADDRESS';
-  const p1 = fromHardened(path[0]);
-
-  switch (p1) {
-    case 48:
-      return 'SPENDMULTISIG';
-
-    case 49:
-      return 'SPENDP2SHWITNESS';
-
-    case 84:
-      return 'SPENDWITNESS';
-
-    default:
-      return 'SPENDADDRESS';
-  }
-};
-
-const getOutputScriptType = path => {
-  if (!Array.isArray(path) || path.length < 1) return 'PAYTOADDRESS';
-
-  if (path[0] === 49) {
-    return 'PAYTOP2SHWITNESS';
-  }
-
-  const p = fromHardened(path[0]);
-
-  switch (p) {
-    case 48:
-      return 'PAYTOMULTISIG';
-
-    case 49:
-      return 'PAYTOP2SHWITNESS';
-
-    case 84:
-      return 'PAYTOWITNESS';
-
-    default:
-      return 'PAYTOADDRESS';
-  }
-};
-
-const serializedPath = path => {
-  const pathStr = path.map(p => {
-    if (p & HD_HARDENED) {
-      return `${p & ~HD_HARDENED}'`;
-    }
-
-    return p;
-  }).join('/');
-  return `m/${pathStr}`;
-};
-
-const validatePath = (path, length = 0, base = false) => {
-  let valid;
-
-  if (typeof path === 'string') {
-    valid = getHDPath(path);
-  } else if (Array.isArray(path)) {
-    valid = path.map(p => {
-      const n = parseInt(p);
-
-      if (Number.isNaN(n)) {
-        throw PATH_NOT_VALID;
-      } else if (n < 0) {
-        throw PATH_NEGATIVE_VALUES;
-      }
-
-      return n;
-    });
-  } else {
-    valid = undefined;
-  }
-
-  if (!valid) throw PATH_NOT_VALID;
-  if (length > 0 && valid.length < length) throw PATH_NOT_VALID;
-  return base ? valid.splice(0, 3) : valid;
-};
-
 const hasHexPrefix = str => str.slice(0, 2).toLowerCase() === '0x';
 
 const stripHexPrefix = str => hasHexPrefix(str) ? str.slice(2) : str;
@@ -15295,8 +15319,8 @@ class BTCGetPublicKey extends BaseMethod {
 
   init() {
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
-    const hasBundle = Object.prototype.hasOwnProperty.call(this.payload, 'bundle');
-    const payload = hasBundle ? this.payload : {
+    this.hasBundle = Object.prototype.hasOwnProperty.call(this.payload, 'bundle');
+    const payload = this.hasBundle ? this.payload : {
       bundle: [this.payload]
     };
     validateParams(payload, [{
@@ -17303,7 +17327,7 @@ let _uiPromises = [];
 let _callPromise;
 
 const callAPI = message => __awaiter(void 0, void 0, void 0, function* () {
-  var _a;
+  var _a, _b;
 
   if (!message.id || !message.payload || message.type !== IFRAME.CALL) {
     return Promise.reject(TypedError('Method_InvalidParameter', 'onCall: message.id or message.payload is missing'));
@@ -17325,7 +17349,10 @@ const callAPI = message => __awaiter(void 0, void 0, void 0, function* () {
       const response = yield method.run();
       return createResponseMessage(method.responseID, true, response);
     } catch (error) {
-      return createResponseMessage(method.responseID, false, error);
+      return createResponseMessage(method.responseID, false, {
+        code: error.code,
+        error: (_a = error.message) !== null && _a !== void 0 ? _a : error
+      });
     }
   }
 
@@ -17349,7 +17376,7 @@ const callAPI = message => __awaiter(void 0, void 0, void 0, function* () {
   }
 
   Log.debug('Call API - setDevice: ', device);
-  (_a = method.setDevice) === null || _a === void 0 ? void 0 : _a.call(method, device);
+  (_b = method.setDevice) === null || _b === void 0 ? void 0 : _b.call(method, device);
   device.on(DEVICE.PIN, onDevicePinHandler);
   device.on(DEVICE.BUTTON, (d, code) => {
     onDeviceButtonHandler(d, code);
@@ -17384,7 +17411,13 @@ const callAPI = message => __awaiter(void 0, void 0, void 0, function* () {
     const deviceRun = () => device.run(inner);
 
     _callPromise = create(deviceRun);
-    return yield _callPromise.promise;
+
+    try {
+      return yield _callPromise.promise;
+    } catch (e) {
+      console.log('Device Run Error: ', e);
+      return createResponseMessage(method.responseID, false, e.message);
+    }
   } catch (error) {
     messageResponse = createResponseMessage(method.responseID, false, error);
     _callPromise === null || _callPromise === void 0 ? void 0 : _callPromise.reject(TypedError('Call_API', error));
@@ -17525,6 +17558,13 @@ class Core extends events.exports {
             break;
           }
 
+        case UI_REQUEST$1.BLUETOOTH_PERMISSION:
+        case UI_REQUEST$1.LOCATION_PERMISSION:
+          {
+            postMessage(message);
+            break;
+          }
+
         case IFRAME.CALL:
           {
             const response = yield callAPI(message);
@@ -17559,7 +17599,7 @@ const init = (settings, Transport) => __awaiter(void 0, void 0, void 0, function
     try {
       yield DataManager.load(settings);
       initTransport(Transport);
-    } catch (_b) {
+    } catch (_c) {
       Log.error('DataManager.load error');
     }
 
@@ -17616,12 +17656,14 @@ __webpack_unused_export__ = createUiMessage;
 __webpack_unused_export__ = createUiResponse;
 exports.ZP = HardwareSdk;
 exports.yI = enableLog;
-__webpack_unused_export__ = getDeviceBLEFirmwareVersion;
-__webpack_unused_export__ = getDeviceFirmwareVersion;
 __webpack_unused_export__ = getDeviceLabel;
 __webpack_unused_export__ = getDeviceType;
+__webpack_unused_export__ = getDeviceTypeByBleName;
+__webpack_unused_export__ = getDeviceTypeByDeviceId;
 __webpack_unused_export__ = getDeviceUUID;
 __webpack_unused_export__ = getEnv;
+__webpack_unused_export__ = getHDPath;
+__webpack_unused_export__ = getScriptType;
 __webpack_unused_export__ = getTimeStamp;
 __webpack_unused_export__ = httpRequest;
 __webpack_unused_export__ = init;
@@ -17877,6 +17919,7 @@ const MESSAGE_TOP_CHAR = 0x003f;
 const MESSAGE_HEADER_BYTE = 0x23;
 const HEADER_SIZE = 1 + 1 + 4 + 2;
 const BUFFER_SIZE = 63;
+const COMMON_HEADER_SIZE = 6;
 
 const readHeader = buffer => {
   const typeId = buffer.readUint16();
@@ -18645,6 +18688,7 @@ var index = {
   parseConfigure
 };
 exports.BUFFER_SIZE = BUFFER_SIZE;
+exports.COMMON_HEADER_SIZE = COMMON_HEADER_SIZE;
 exports.HEADER_SIZE = HEADER_SIZE;
 exports.MESSAGE_HEADER_BYTE = MESSAGE_HEADER_BYTE;
 exports.MESSAGE_TOP_CHAR = MESSAGE_TOP_CHAR;