@onekeyfe/hd-web-sdk 0.1.22 → 0.1.25

package/build/onekey-js-sdk.js

@@ -14468,6 +14468,8 @@ class DeviceCommands {
   }
 
   _filterCommonTypes(res) {
+    var _a;
+
     Log$4.debug('_filterCommonTypes: ', res);
 
     if (res.type === 'Failure') {
@@ -14506,6 +14508,10 @@ class DeviceCommands {
       return Promise.resolve(patchFeatures(res));
     }
 
+    if ((_a = this.device.features) === null || _a === void 0 ? void 0 : _a.passphrase_protection) {
+      return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotSupportPassphrase));
+    }
+
     if (res.type === 'ButtonRequest') {
       if (res.message.code === 'ButtonRequest_PassphraseEntry') {
         this.device.emit(DEVICE.PASSPHRASE_ON_DEVICE, this.device);
@@ -14573,7 +14579,7 @@ const UI_REQUEST = {
   FIRMWARE_NOT_INSTALLED: 'ui-device_firmware_not_installed',
   NOT_USE_ONEKEY_DEVICE: 'ui-device_please_use_onekey_device'
 };
-const DEFAULT_DOMAIN = `https://jssdk.onekey.so/`;
+const DEFAULT_DOMAIN = `https://jssdk.onekey.so/${"0.1.25"}/`;
 const DEFAULT_PRIORITY = 2;
 const initialSettings = {
   configSrc: './data/config.json',
@@ -14915,20 +14921,24 @@ class Device extends events.exports {
   _runInner(fn, options) {
     return __awaiter(this, void 0, void 0, function* () {
       if (!this.isUsedHere() || this.commands.disposed) {
-        yield this.acquire();
+        const env = DataManager.getSettings('env');
 
-        try {
-          if (fn) {
-            yield this.initialize();
-          }
-        } catch (error) {
-          this.runPromise = null;
+        if (env !== 'react-native') {
+          yield this.acquire();
 
-          if (error instanceof hdShared.HardwareError) {
-            return Promise.reject(error);
-          }
+          try {
+            if (fn) {
+              yield this.initialize();
+            }
+          } catch (error) {
+            this.runPromise = null;
 
-          return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceInitializeFailed, `Initialize failed: ${error.message}, code: ${error.code}`));
+            if (error instanceof hdShared.HardwareError) {
+              return Promise.reject(error);
+            }
+
+            return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceInitializeFailed, `Initialize failed: ${error.message}, code: ${error.code}`));
+          }
         }
       }
 
@@ -19159,7 +19169,7 @@ const callAPI = message => __awaiter(void 0, void 0, void 0, function* () {
   callApiQueue.push(method);
 
   if (callApiQueue.length > 1) {
-    Log.debug('should cancel the previous method execution: ', callApiQueue);
+    Log.debug('should cancel the previous method execution: ', callApiQueue.map(m => m.name));
   }
 
   if (pollingState[pollingId]) {
@@ -19270,11 +19280,11 @@ const callAPI = message => __awaiter(void 0, void 0, void 0, function* () {
       }
     }
 
-    const index = messageResponse && messageResponse.id ? callApiQueue.findIndex(m => m.responseID === messageResponse.id) : -1;
+    const index = method.responseID ? callApiQueue.findIndex(m => m.responseID === method.responseID) : -1;
 
     if (index > -1) {
       callApiQueue.splice(index, 1);
-      Log.debug('Remove the finished method from the queue： ', callApiQueue);
+      Log.debug('Remove the finished method from the queue： ', callApiQueue.map(m => m.name));
     }
 
     closePopup();
@@ -19419,7 +19429,7 @@ const ensureConnected = (method, pollingId) => __awaiter(void 0, void 0, void 0,
       } catch (error) {
         Log.debug('device error: ', error);
 
-        if ([hdShared.HardwareErrorCode.BlePermissionError, hdShared.HardwareErrorCode.BleLocationError, hdShared.HardwareErrorCode.BleDeviceNotBonded, hdShared.HardwareErrorCode.BleCharacteristicNotifyError].includes(error.errorCode)) {
+        if ([hdShared.HardwareErrorCode.BlePermissionError, hdShared.HardwareErrorCode.BleLocationError, hdShared.HardwareErrorCode.BleDeviceNotBonded, hdShared.HardwareErrorCode.BleCharacteristicNotifyError, hdShared.HardwareErrorCode.BleWriteCharacteristicError].includes(error.errorCode)) {
           reject(error);
           return;
         }
@@ -20865,6 +20875,7 @@ const HardwareErrorCode = {
   BleCharacteristicNotFound: 707,
   BleMonitorError: 708,
   BleCharacteristicNotifyError: 709,
+  BleWriteCharacteristicError: 710,
   RuntimeError: 800,
   PinInvalid: 801,
   PinCancelled: 802,
@@ -20915,6 +20926,7 @@ const HardwareErrorCodeMessage = {
   [HardwareErrorCode.BleCharacteristicNotFound]: 'BLEServiceNotFound: service not found',
   [HardwareErrorCode.BleMonitorError]: 'Monitor Error: characteristic not found',
   [HardwareErrorCode.BleCharacteristicNotifyError]: 'Characteristic Notify Error',
+  [HardwareErrorCode.BleWriteCharacteristicError]: 'Write Characteristic Error',
   [HardwareErrorCode.RuntimeError]: 'Runtime error',
   [HardwareErrorCode.PinInvalid]: 'Pin invalid',
   [HardwareErrorCode.PinCancelled]: 'Pin cancelled',
@@ -46156,7 +46168,7 @@ const src_init = async settings => {
 
   try {
     await init({ ..._settings,
-      version: "0.1.22"
+      version: "0.1.25"
     });
     return true;
   } catch (e) {
@@ -46166,14 +46178,20 @@ const src_init = async settings => {
 };
 
 const call = async params => {
-  src_Log.debug('call : ', params); // lazy load
+  src_Log.debug('call : ', params);
+  /**
+   * Try to recreate iframe if it's initialize failed
+   */
 
   if (!instance && !timeout) {
     _settings = (0,dist/* parseConnectSettings */._4)(_settings);
+    src_Log.debug("Try to recreate iframe if it's initialize failed: ", _settings);
 
     try {
-      src_init(_settings);
+      await src_init(_settings);
+      src_Log.debug('Recreate iframe success');
     } catch (error) {
+      src_Log.debug('Recreate iframe failed: ', error);
       return (0,dist/* createErrorMessage */.xG)(error);
     }
   }