@onekeyfe/hd-web-sdk 0.0.5 → 0.0.8

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';
 };
 
@@ -14069,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) => ({
@@ -14835,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 = [];
@@ -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));
@@ -17486,9 +17519,17 @@ const onDeviceButtonHandler = (...[device, request]) => {
   postMessage(createDeviceMessage(DEVICE.BUTTON, Object.assign(Object.assign({}, request), {
     device: device.toMessageObject()
   })));
-  postMessage(createUiMessage(UI_REQUEST$1.REQUEST_BUTTON, {
-    device: device.toMessageObject()
-  }));
+
+  if (request.code === 'ButtonRequest_PinEntry') {
+    postMessage(createUiMessage(UI_REQUEST$1.REQUEST_PIN, {
+      device: device.toMessageObject(),
+      type: 'ButtonRequest_PinEntry'
+    }));
+  } else {
+    postMessage(createUiMessage(UI_REQUEST$1.REQUEST_BUTTON, {
+      device: device.toMessageObject()
+    }));
+  }
 };
 
 const postMessage = message => {
@@ -17525,6 +17566,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 +17607,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');
     }
 
@@ -17618,6 +17666,8 @@ exports.ZP = HardwareSdk;
 exports.yI = enableLog;
 __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;
@@ -17877,6 +17927,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 +18696,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;