@onekeyfe/hd-web-sdk 0.1.1 → 0.1.2

package/build/onekey-js-sdk.js

@@ -4782,6 +4782,7 @@ const ERROR_CODES = {
   Device_UnexpectedMode: '',
   Device_CallInProgress: '',
   Device_InitializeFailed: '',
+  Device_Interrupted: 'The device is performing other operations',
   Not_Use_Onekey_Device: 'Please use onekey device',
   Runtime: '',
   Init_NotInitialized: 'Init_NotInitialized',
@@ -4833,7 +4834,7 @@ const colors = {
 };
 const MAX_ENTRIES = 100;
 
-class Log$5 {
+class Log$6 {
   constructor(prefix, enabled) {
     this.prefix = prefix;
     this.enabled = enabled;
@@ -4895,7 +4896,7 @@ class Log$5 {
 const _logs = {};
 
 const initLog = (prefix, enabled) => {
-  const instance = new Log$5(prefix, !!enabled);
+  const instance = new Log$6(prefix, !!enabled);
   _logs[prefix] = instance;
   return instance;
 };
@@ -14074,7 +14075,7 @@ DataManager.getTransportStatus = localVersion => {
   return isLatest ? 'valid' : 'outdated';
 };
 
-const Log$4 = initLog('Transport');
+const Log$5 = initLog('Transport');
 
 class TransportManager {
   static load() {
@@ -14087,24 +14088,24 @@ class TransportManager {
     return __awaiter(this, void 0, void 0, function* () {
       try {
         const env = DataManager.getSettings('env');
-        Log$4.debug('Initializing transports');
+        Log$5.debug('Initializing transports');
 
         if (env === 'react-native') {
           if (!this.reactNativeInit) {
             yield this.transport.init();
             this.reactNativeInit = true;
           } else {
-            Log$4.debug('React Native Do Not Initializing transports');
+            Log$5.debug('React Native Do Not Initializing transports');
           }
         } else {
           yield this.transport.init();
         }
 
-        Log$4.debug('Configuring transports');
+        Log$5.debug('Configuring transports');
         yield this.transport.configure(JSON.stringify(this.defaultMessages));
-        Log$4.debug('Configuring transports done');
+        Log$5.debug('Configuring transports done');
       } catch (error) {
-        Log$4.debug('Initializing transports error: ', error);
+        Log$5.debug('Initializing transports error: ', error);
       }
     });
   }
@@ -14208,7 +14209,8 @@ const createUiMessage = (type, payload) => ({
 const IFRAME = {
   INIT: 'iframe-init',
   INIT_BRIDGE: 'iframe-init-bridge',
-  CALL: 'iframe-call'
+  CALL: 'iframe-call',
+  CANCEL: 'iframe-cancel'
 };
 
 const createIFrameMessage = (type, payload) => ({
@@ -14271,7 +14273,7 @@ const assertType = (res, resType) => {
   }
 };
 
-const Log$3 = initLog('DeviceCommands');
+const Log$4 = initLog('DeviceCommands');
 
 class DeviceCommands {
   constructor(device, mainId) {
@@ -14282,8 +14284,16 @@ class DeviceCommands {
   }
 
   dispose() {
+    var _a, _b;
+
     this.disposed = true;
+
+    if (this._cancelableRequest) {
+      this._cancelableRequest();
+    }
+
     this._cancelableRequest = undefined;
+    (_b = (_a = this.transport).cancel) === null || _b === void 0 ? void 0 : _b.call(_a);
   }
 
   call(type, msg = {}) {
@@ -14294,10 +14304,10 @@ class DeviceCommands {
         const promise = this.transport.call(this.mainId, type, msg);
         this.callPromise = promise;
         const res = yield promise;
-        Log$3.debug('[DeviceCommands] [call] Received', res.type);
+        Log$4.debug('[DeviceCommands] [call] Received', res.type);
         return res;
       } catch (error) {
-        Log$3.debug('[DeviceCommands] [call] Received error', error);
+        Log$4.debug('[DeviceCommands] [call] Received error', error);
         throw error;
       }
     });
@@ -14521,7 +14531,7 @@ const parseRunOptions = options => {
   return options;
 };
 
-const Log$2 = initLog('Device');
+const Log$3 = initLog('Device');
 
 class Device extends events.exports {
   constructor(descriptor) {
@@ -14533,7 +14543,6 @@ class Device extends events.exports {
     this.unavailableCapabilities = {};
     this.instance = 0;
     this.internalState = [];
-    this.loaded = false;
     this.needReloadDevice = false;
     this.keepSession = false;
     this.originalDescriptor = descriptor;
@@ -14608,10 +14617,10 @@ class Device extends events.exports {
         if (env === 'react-native') {
           const res = yield (_a = this.deviceConnector) === null || _a === void 0 ? void 0 : _a.acquire(this.originalDescriptor.id);
           this.mainId = (_b = res.uuid) !== null && _b !== void 0 ? _b : '';
-          Log$2.debug('Expected uuid:', this.mainId);
+          Log$3.debug('Expected uuid:', this.mainId);
         } else {
           this.mainId = yield (_c = this.deviceConnector) === null || _c === void 0 ? void 0 : _c.acquire(this.originalDescriptor.path, this.originalDescriptor.session);
-          Log$2.debug('Expected session id:', this.mainId);
+          Log$3.debug('Expected session id:', this.mainId);
         }
 
         this.updateDescriptor({
@@ -14660,7 +14669,7 @@ class Device extends events.exports {
             session: null
           });
         } catch (err) {
-          Log$2.error('[Device] release error: ', err);
+          Log$3.error('[Device] release error: ', err);
         } finally {
           this.needReloadDevice = true;
         }
@@ -14732,11 +14741,21 @@ class Device extends events.exports {
     }
   }
 
+  updateFromCache(device) {
+    this.mainId = device.mainId;
+    this.commands = device.commands;
+    this.updateDescriptor(device.originalDescriptor);
+
+    if (device.features) {
+      this._updateFeatures(device.features);
+    }
+  }
+
   run(fn, options) {
     return __awaiter(this, void 0, void 0, function* () {
       if (this.runPromise) {
-        Log$2.error('[Device] run error:', 'Device is running');
-        throw TypedError('Device_CallInProgress');
+        this.interruption();
+        Log$3.debug('[Device] run error:', 'Device is running, but will cancel previous operate');
       }
 
       options = parseRunOptions(options);
@@ -14768,14 +14787,10 @@ class Device extends events.exports {
         yield fn();
       }
 
-      if (this.loaded && this.features) {
-        yield this.getFeatures();
-      }
-
       if (!this.keepSession && typeof options.keepSession !== 'boolean' || options.keepSession === false) {
         this.keepSession = false;
         yield this.release();
-        Log$2.debug('release device, mainId: ', this.mainId);
+        Log$3.debug('release device, mainId: ', this.mainId);
       }
 
       if (this.runPromise) {
@@ -14783,13 +14798,19 @@ class Device extends events.exports {
       }
 
       this.runPromise = null;
-
-      if (!this.loaded) {
-        this.loaded = true;
-      }
     });
   }
 
+  interruption() {
+    if (this.commands) {
+      this.commands.dispose();
+    }
+
+    if (this.runPromise) {
+      this.runPromise.reject(TypedError('Device_Interrupted'));
+    }
+  }
+
   getMode() {
     var _a, _b, _c;
 
@@ -14867,6 +14888,9 @@ class Device extends events.exports {
 
 }
 
+const cacheDeviceMap = new Map();
+const Log$2 = initLog('DeviceList');
+
 class DeviceList extends events.exports {
   constructor() {
     super(...arguments);
@@ -14888,7 +14912,7 @@ class DeviceList extends events.exports {
       try {
         for (var descriptorList_1 = __asyncValues(descriptorList), descriptorList_1_1; descriptorList_1_1 = yield descriptorList_1.next(), !descriptorList_1_1.done;) {
           const descriptor = descriptorList_1_1.value;
-          const device = Device.fromDescriptor(descriptor);
+          let device = Device.fromDescriptor(descriptor);
           device.deviceConnector = this.connector;
           yield device.connect();
           yield device.initialize();
@@ -14897,7 +14921,16 @@ class DeviceList extends events.exports {
 
           if (device.features) {
             const uuid = getDeviceUUID(device.features);
+
+            if (cacheDeviceMap.has(uuid)) {
+              const cache = cacheDeviceMap.get(uuid);
+              cache === null || cache === void 0 ? void 0 : cache.updateFromCache(device);
+              device = cache;
+              Log$2.debug('use cache device: ', uuid);
+            }
+
             this.devices[uuid] = device;
+            cacheDeviceMap.set(uuid, device);
           }
         }
       } catch (e_1_1) {
@@ -18498,6 +18531,8 @@ let _uiPromises = [];
 
 let _callPromise;
 
+const deviceCacheMap = new Map();
+
 const callAPI = message => __awaiter(void 0, void 0, void 0, function* () {
   var _a, _b;
 
@@ -18680,13 +18715,44 @@ function initDeviceForBle(method) {
     return initDevice(method);
   }
 
-  const device = Device.fromDescriptor({
-    id: method.connectId
-  });
+  let device;
+
+  if (deviceCacheMap.has(method.connectId)) {
+    device = deviceCacheMap.get(method.connectId);
+  } else {
+    device = Device.fromDescriptor({
+      id: method.connectId
+    });
+    deviceCacheMap.set(method.connectId, device);
+  }
+
   device.deviceConnector = _connector;
   return device;
 }
 
+const cancel = connectId => {
+  const env = DataManager.getSettings('env');
+
+  if (connectId) {
+    let device;
+
+    if (env === 'react-native') {
+      device = initDeviceForBle({
+        connectId
+      });
+    } else {
+      device = initDevice({
+        connectId
+      });
+    }
+
+    device === null || device === void 0 ? void 0 : device.interruption();
+  }
+
+  cleanup();
+  closePopup();
+};
+
 const cleanup = () => {
   _uiPromises = [];
   Log.debug('Cleanup...');
@@ -18770,6 +18836,12 @@ class Core extends events.exports {
             const response = yield callAPI(message);
             return response;
           }
+
+        case IFRAME.CANCEL:
+          {
+            cancel(message.payload.connectId);
+            break;
+          }
       }
 
       return Promise.resolve(message);
@@ -44452,7 +44524,15 @@ const uiResponse = response => {
   });
 };
 
-const cancel = () => {};
+const cancel = connectId => {
+  sendMessage({
+    event: dist/* IFRAME.CANCEL */.Bg.CANCEL,
+    type: dist/* IFRAME.CANCEL */.Bg.CANCEL,
+    payload: {
+      connectId
+    }
+  });
+};
 
 const createJSBridge = messageEvent => {
   if (messageEvent.origin !== origin) {