@onekeyfe/hd-web-sdk 0.1.18 → 0.1.21

package/build/onekey-js-sdk.js

@@ -14350,7 +14350,8 @@ const DEVICE = {
   PIN: 'pin',
   PASSPHRASE: 'passphrase',
   PASSPHRASE_ON_DEVICE: 'passphrase_on_device',
-  WORD: 'word'
+  WORD: 'word',
+  FEATURES: 'features'
 };
 
 const createDeviceMessage = (type, payload) => ({
@@ -14868,6 +14869,7 @@ class Device extends events.exports {
     feat.unlocked = feat.unlocked || true;
     this.features = feat;
     this.featuresNeedsReload = false;
+    this.emit(DEVICE.FEATURES, this, feat);
   }
 
   updateDescriptor(descriptor, forceUpdate = false) {
@@ -14923,6 +14925,11 @@ class Device extends events.exports {
           }
         } catch (error) {
           this.runPromise = null;
+
+          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}`));
         }
       }
@@ -15194,16 +15201,13 @@ class BaseMethod {
   checkFirmwareRelease() {
     if (!this.device || !this.device.features) return;
     const releaseInfo = getFirmwareReleaseInfo(this.device.features);
-
-    if (['outdated', 'required'].includes(releaseInfo.status)) {
-      this.postMessage(createFirmwareMessage(FIRMWARE.RELEASE_INFO, releaseInfo));
-    }
-
+    this.postMessage(createFirmwareMessage(FIRMWARE.RELEASE_INFO, Object.assign(Object.assign({}, releaseInfo), {
+      features: this.device.features
+    })));
     const bleReleaseInfo = getBleFirmwareReleaseInfo(this.device.features);
-
-    if (['outdated', 'required'].includes(bleReleaseInfo.status)) {
-      this.postMessage(createFirmwareMessage(FIRMWARE.BLE_RELEASE_INFO, bleReleaseInfo));
-    }
+    this.postMessage(createFirmwareMessage(FIRMWARE.BLE_RELEASE_INFO, Object.assign(Object.assign({}, bleReleaseInfo), {
+      features: this.device.features
+    })));
   }
 
   dispose() {}
@@ -15402,6 +15406,7 @@ class CipherKeyValue extends BaseMethod {
   init() {
     var _a;
 
+    this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
     this.hasBundle = !!((_a = this.payload) === null || _a === void 0 ? void 0 : _a.bundle);
     const payload = this.hasBundle ? this.payload : {
@@ -15679,6 +15684,7 @@ class BTCGetAddress extends BaseMethod {
   }
 
   init() {
+    this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
     this.hasBundle = Object.prototype.hasOwnProperty.call(this.payload, 'bundle');
     const payload = this.hasBundle ? this.payload : {
@@ -15762,6 +15768,7 @@ class BTCGetPublicKey extends BaseMethod {
   }
 
   init() {
+    this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
     this.hasBundle = Object.prototype.hasOwnProperty.call(this.payload, 'bundle');
     const payload = this.hasBundle ? this.payload : {
@@ -15836,6 +15843,7 @@ class BTCGetPublicKey extends BaseMethod {
 
 class BTCSignMessage extends BaseMethod {
   init() {
+    this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
     validateParams(this.payload, [{
       name: 'path',
@@ -16312,6 +16320,7 @@ var signtxLegacy = (typedCall, inputs, outputs, refTxsArray, options, coinName)
 
 class BTCSignTransaction extends BaseMethod {
   init() {
+    this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
     validateParams(this.payload, [{
       name: 'coin',
@@ -16486,6 +16495,7 @@ class BTCSignTransaction extends BaseMethod {
 
 class BTCVerifyMessage extends BaseMethod {
   init() {
+    this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
     validateParams(this.payload, [{
       name: 'address',
@@ -16914,6 +16924,7 @@ class EvmGetAddress extends BaseMethod {
   init() {
     var _a;
 
+    this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
     this.hasBundle = !!((_a = this.payload) === null || _a === void 0 ? void 0 : _a.bundle);
     const payload = this.hasBundle ? this.payload : {
@@ -16974,6 +16985,7 @@ class EVMGetPublicKey extends BaseMethod {
   init() {
     var _a;
 
+    this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
     this.hasBundle = !!((_a = this.payload) === null || _a === void 0 ? void 0 : _a.bundle);
     const payload = this.hasBundle ? this.payload : {
@@ -17023,6 +17035,7 @@ class EVMGetPublicKey extends BaseMethod {
 
 class EVMSignMessage$2 extends BaseMethod {
   init() {
+    this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
     validateParams(this.payload, [{
       name: 'path',
@@ -17054,6 +17067,7 @@ class EVMSignMessage$2 extends BaseMethod {
 
 class EVMSignMessageEIP712 extends BaseMethod {
   init() {
+    this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
     validateParams(this.payload, [{
       name: 'path',
@@ -17217,6 +17231,7 @@ class EVMSignTransaction extends BaseMethod {
   }
 
   init() {
+    this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
     validateParams(this.payload, [{
       name: 'path',
@@ -17458,6 +17473,7 @@ const getFieldType = (typeName, types) => {
 
 class EVMSignTypedData extends BaseMethod {
   init() {
+    this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
     validateParams(this.payload, [{
       name: 'path',
@@ -17681,6 +17697,7 @@ class EVMSignTypedData extends BaseMethod {
 
 class EVMSignMessage$1 extends BaseMethod {
   init() {
+    this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
     validateParams(this.payload, [{
       name: 'address',
@@ -17725,6 +17742,7 @@ class StarcoinGetAddress extends BaseMethod {
   init() {
     var _a;
 
+    this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
     this.hasBundle = !!((_a = this.payload) === null || _a === void 0 ? void 0 : _a.bundle);
     const payload = this.hasBundle ? this.payload : {
@@ -17781,6 +17799,7 @@ class StarcoinGetPublicKey extends BaseMethod {
   init() {
     var _a;
 
+    this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
     this.hasBundle = !!((_a = this.payload) === null || _a === void 0 ? void 0 : _a.bundle);
     const payload = this.hasBundle ? this.payload : {
@@ -17830,6 +17849,7 @@ class StarcoinGetPublicKey extends BaseMethod {
 
 class StarcoinSignMessage extends BaseMethod {
   init() {
+    this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
     validateParams(this.payload, [{
       name: 'path',
@@ -17861,6 +17881,7 @@ class StarcoinSignMessage extends BaseMethod {
 
 class StarcoinSignTransaction extends BaseMethod {
   init() {
+    this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
     validateParams(this.payload, [{
       name: 'path',
@@ -17892,6 +17913,7 @@ class StarcoinSignTransaction extends BaseMethod {
 
 class EVMSignMessage extends BaseMethod {
   init() {
+    this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
     validateParams(this.payload, [{
       name: 'publicKey',
@@ -17938,6 +17960,7 @@ class NEMGetAddress extends BaseMethod {
   init() {
     var _a;
 
+    this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
     this.hasBundle = !!((_a = this.payload) === null || _a === void 0 ? void 0 : _a.bundle);
     const payload = this.hasBundle ? this.payload : {
@@ -18191,6 +18214,7 @@ class NEMSignTransaction extends BaseMethod {
   }
 
   init() {
+    this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
     validateParams(this.payload, [{
       name: 'path',
@@ -18226,6 +18250,7 @@ class SolGetAddress extends BaseMethod {
   init() {
     var _a;
 
+    this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
     this.hasBundle = !!((_a = this.payload) === null || _a === void 0 ? void 0 : _a.bundle);
     const payload = this.hasBundle ? this.payload : {
@@ -18286,6 +18311,7 @@ class SolSignTransaction extends BaseMethod {
   init() {
     var _a;
 
+    this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
     this.hasBundle = !!((_a = this.payload) === null || _a === void 0 ? void 0 : _a.bundle);
     const payload = this.hasBundle ? this.payload : {
@@ -18355,6 +18381,7 @@ class StellarGetAddress extends BaseMethod {
   init() {
     var _a;
 
+    this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
     this.hasBundle = !!((_a = this.payload) === null || _a === void 0 ? void 0 : _a.bundle);
     const payload = this.hasBundle ? this.payload : {
@@ -18591,6 +18618,7 @@ class StellarSignTransaction extends BaseMethod {
   }
 
   init() {
+    this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
     validateParams(this.payload, [{
       name: 'path',
@@ -19154,9 +19182,8 @@ const callAPI = message => __awaiter(void 0, void 0, void 0, function* () {
   Log.debug('Call API - setDevice: ', device.mainId);
   (_a = method.setDevice) === null || _a === void 0 ? void 0 : _a.call(method, device);
   device.on(DEVICE.PIN, onDevicePinHandler);
-  device.on(DEVICE.BUTTON, (d, code) => {
-    onDeviceButtonHandler(d, code);
-  });
+  device.on(DEVICE.BUTTON, onDeviceButtonHandler);
+  device.on(DEVICE.FEATURES, onDeviceFeaturesHandler);
 
   try {
     const inner = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -19254,6 +19281,7 @@ const callAPI = message => __awaiter(void 0, void 0, void 0, function* () {
 
     closePopup();
     cleanup();
+    removeDeviceListener(device);
   }
 });
 
@@ -19337,7 +19365,7 @@ const ensureConnected = (method, pollingId) => __awaiter(void 0, void 0, void 0,
     return new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
       if (!pollingState[pollingId]) {
         Log.debug('EnsureConnected function stop, polling id: ', pollingId);
-        reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Polling stop'));
+        reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.PollingStop));
         return;
       }
 
@@ -19346,7 +19374,7 @@ const ensureConnected = (method, pollingId) => __awaiter(void 0, void 0, void 0,
       }
 
       timer = setTimeout(() => {
-        reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Polling timeout'));
+        reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.PollingTimeout));
       }, TIME_OUT);
       tryCount += 1;
       Log.debug('EnsureConnected function try count: ', tryCount, ' poll interval time: ', time);
@@ -19356,7 +19384,8 @@ const ensureConnected = (method, pollingId) => __awaiter(void 0, void 0, void 0,
       } catch (error) {
         Log.debug('device list error: ', error);
 
-        if (error.errorCode === hdShared.HardwareErrorCode.BridgeNotInstalled) {
+        if ([hdShared.HardwareErrorCode.BridgeNotInstalled, hdShared.HardwareErrorCode.BridgeTimeoutError].includes(error.errorCode)) {
+          _deviceList = undefined;
           reject(error);
           return;
         }
@@ -19392,7 +19421,7 @@ const ensureConnected = (method, pollingId) => __awaiter(void 0, void 0, void 0,
       } catch (error) {
         Log.debug('device error: ', error);
 
-        if (error.errorCode === hdShared.HardwareErrorCode.BlePermissionError) {
+        if ([hdShared.HardwareErrorCode.BlePermissionError, hdShared.HardwareErrorCode.BleLocationError, hdShared.HardwareErrorCode.BleDeviceNotBonded, hdShared.HardwareErrorCode.BleCharacteristicNotifyError].includes(error.errorCode)) {
           reject(error);
           return;
         }
@@ -19448,6 +19477,12 @@ const cleanup = () => {
   Log.debug('Cleanup...');
 };
 
+const removeDeviceListener = device => {
+  device.removeListener(DEVICE.PIN, onDevicePinHandler);
+  device.removeListener(DEVICE.BUTTON, onDeviceButtonHandler);
+  device.removeListener(DEVICE.FEATURES, onDeviceFeaturesHandler);
+};
+
 const closePopup = () => {
   postMessage(createUiMessage(UI_REQUEST$1.CLOSE_UI_WINDOW));
 };
@@ -19480,6 +19515,10 @@ const onDeviceButtonHandler = (...[device, request]) => {
   }
 };
 
+const onDeviceFeaturesHandler = (...[_, features]) => {
+  postMessage(createDeviceMessage(DEVICE.FEATURES, Object.assign({}, features)));
+};
+
 const postMessage = message => {
   _core.emit(CORE_EVENT, message);
 };
@@ -19604,8 +19643,8 @@ __webpack_unused_export__ = ({
 __webpack_unused_export__ = CORE_EVENT;
 __webpack_unused_export__ = Core;
 __webpack_unused_export__ = DEFAULT_PRIORITY;
-__webpack_unused_export__ = DEVICE;
-__webpack_unused_export__ = DEVICE_EVENT;
+exports.Td = DEVICE;
+exports.Fd = DEVICE_EVENT;
 __webpack_unused_export__ = DataManager;
 __webpack_unused_export__ = FIRMWARE;
 exports.SI = FIRMWARE_EVENT;
@@ -20835,7 +20874,9 @@ const HardwareErrorCode = {
   ResponseUnexpectTypeError: 805,
   BridgeNetworkError: 806,
   BridgeTimeoutError: 807,
-  BridgeNotInstalled: 808
+  BridgeNotInstalled: 808,
+  PollingTimeout: 809,
+  PollingStop: 810
 };
 const HardwareErrorCodeMessage = {
   [HardwareErrorCode.UnknownError]: 'Unknown error occurred. Check message property.',
@@ -20882,7 +20923,9 @@ const HardwareErrorCodeMessage = {
   [HardwareErrorCode.ResponseUnexpectTypeError]: 'Response type is not expected',
   [HardwareErrorCode.BridgeNetworkError]: 'Bridge network error',
   [HardwareErrorCode.BridgeTimeoutError]: 'Bridge network timeout',
-  [HardwareErrorCode.BridgeNotInstalled]: 'Bridge not installed'
+  [HardwareErrorCode.BridgeNotInstalled]: 'Bridge not installed',
+  [HardwareErrorCode.PollingTimeout]: 'Polling timeout',
+  [HardwareErrorCode.PollingStop]: 'Polling stop'
 };
 
 const TypedError = (hardwareError, message) => {
@@ -46018,6 +46061,13 @@ const handleMessage = async message => {
       eventEmitter.emit(message.event, message);
       break;
 
+    case dist/* DEVICE_EVENT */.Fd:
+      if (message.type === dist/* DEVICE.FEATURES */.Td.FEATURES) {
+        eventEmitter.emit(message.type, message.payload);
+      }
+
+      break;
+
     default:
       src_Log.log('No need to be captured message', message.event);
   }
@@ -46106,7 +46156,7 @@ const src_init = async settings => {
 
   try {
     await init({ ..._settings,
-      version: "0.1.18"
+      version: "0.1.21"
     });
     return true;
   } catch (e) {