@onekeyfe/hd-web-sdk 0.1.19 → 0.1.22

package/build/onekey-js-sdk.js

@@ -14531,9 +14531,7 @@ class DeviceCommands {
     }
 
     if (res.type === 'PassphraseRequest') {
-      return this._commonCall('PassphraseAck', {
-        passphrase: ''
-      });
+      return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotSupportPassphrase));
     }
 
     if (res.type === 'Deprecated_PassphraseStateRequest') ;
@@ -14925,6 +14923,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}`));
         }
       }
@@ -15196,16 +15199,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() {}
@@ -15404,6 +15404,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 : {
@@ -15681,6 +15682,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 : {
@@ -15764,6 +15766,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 : {
@@ -15838,6 +15841,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',
@@ -16314,6 +16318,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',
@@ -16488,6 +16493,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',
@@ -16916,6 +16922,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 : {
@@ -16976,6 +16983,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 : {
@@ -17025,6 +17033,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',
@@ -17056,6 +17065,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',
@@ -17219,6 +17229,7 @@ class EVMSignTransaction extends BaseMethod {
   }
 
   init() {
+    this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
     validateParams(this.payload, [{
       name: 'path',
@@ -17460,6 +17471,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',
@@ -17683,6 +17695,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',
@@ -17727,6 +17740,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 : {
@@ -17783,6 +17797,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 : {
@@ -17832,6 +17847,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',
@@ -17863,6 +17879,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',
@@ -17894,6 +17911,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',
@@ -17940,6 +17958,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 : {
@@ -18193,6 +18212,7 @@ class NEMSignTransaction extends BaseMethod {
   }
 
   init() {
+    this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
     validateParams(this.payload, [{
       name: 'path',
@@ -18228,6 +18248,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 : {
@@ -18288,6 +18309,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 : {
@@ -18357,6 +18379,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 : {
@@ -18593,6 +18616,7 @@ class StellarSignTransaction extends BaseMethod {
   }
 
   init() {
+    this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
     validateParams(this.payload, [{
       name: 'path',
@@ -19156,9 +19180,7 @@ 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 {
@@ -19257,6 +19279,7 @@ const callAPI = message => __awaiter(void 0, void 0, void 0, function* () {
 
     closePopup();
     cleanup();
+    removeDeviceListener(device);
   }
 });
 
@@ -19359,7 +19382,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;
         }
@@ -19395,7 +19419,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;
         }
@@ -19451,6 +19475,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));
 };
@@ -20809,6 +20839,7 @@ const HardwareErrorCode = {
   DeviceUnexpectedBootloaderMode: 108,
   DeviceInterruptedFromUser: 109,
   DeviceCheckDeviceIdError: 110,
+  DeviceNotSupportPassphrase: 111,
   NotInitialized: 200,
   IFrameNotInitialized: 300,
   IFrameAleradyInitialized: 301,
@@ -20858,6 +20889,7 @@ const HardwareErrorCodeMessage = {
   [HardwareErrorCode.DeviceInterruptedFromUser]: 'Device interrupted',
   [HardwareErrorCode.DeviceUnexpectedBootloaderMode]: 'Device should be in bootloader mode',
   [HardwareErrorCode.DeviceCheckDeviceIdError]: 'Device Id in the features is not same.',
+  [HardwareErrorCode.DeviceNotSupportPassphrase]: 'Device not support passphrase',
   [HardwareErrorCode.NotInitialized]: 'Not initialized',
   [HardwareErrorCode.IFrameNotInitialized]: 'IFrame not initialized',
   [HardwareErrorCode.IFrameAleradyInitialized]: 'IFrame alerady initialized',
@@ -46124,7 +46156,7 @@ const src_init = async settings => {
 
   try {
     await init({ ..._settings,
-      version: "0.1.19"
+      version: "0.1.22"
     });
     return true;
   } catch (e) {