@onekeyfe/hd-web-sdk 0.1.49 → 0.1.51

package/build/onekey-js-sdk.js

@@ -14779,6 +14779,7 @@ const UI_REQUEST$1 = {
   REQUEST_PIN: 'ui-request_pin',
   INVALID_PIN: 'ui-invalid_pin',
   REQUEST_BUTTON: 'ui-button',
+  REQUEST_PASSPHRASE: 'ui-request_passphrase',
   REQUEST_PASSPHRASE_ON_DEVICE: 'ui-request_passphrase_on_device',
   CLOSE_UI_WINDOW: 'ui-close_window',
   BLUETOOTH_PERMISSION: 'ui-bluetooth_permission',
@@ -14818,7 +14819,8 @@ const createResponseMessage = (id, success, payload) => ({
 });
 
 const UI_RESPONSE = {
-  RECEIVE_PIN: 'ui-receive_pin'
+  RECEIVE_PIN: 'ui-receive_pin',
+  RECEIVE_PASSPHRASE: 'ui-receive_passphrase'
 };
 
 const createUiResponse = (type, payload) => ({
@@ -14977,7 +14979,6 @@ class DevicePool extends events.exports {
         }
       }
 
-      Log$7.debug('get devices result : ', devices, deviceList);
       console.log('device poll -> connected: ', this.connectedPool);
       console.log('device poll -> disconnected: ', this.disconnectPool);
       yield this._checkDevicePool(initOptions);
@@ -15309,11 +15310,11 @@ class DeviceCommands {
   _commonCall(type, msg) {
     return __awaiter(this, void 0, void 0, function* () {
       const resp = yield this.call(type, msg);
-      return this._filterCommonTypes(resp);
+      return this._filterCommonTypes(resp, type);
     });
   }
 
-  _filterCommonTypes(res) {
+  _filterCommonTypes(res, callType) {
     Log$5.debug('_filterCommonTypes: ', res);
 
     if (res.type === 'Failure') {
@@ -15343,6 +15344,10 @@ class DeviceCommands {
         error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlindSignDisabled);
       }
 
+      if (code === 'Failure_UnexpectedMessage' && callType === 'PassphraseAck') {
+        error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.UnexpectPassphrase);
+      }
+
       if (error) {
         return Promise.reject(error);
       }
@@ -15384,9 +15389,17 @@ class DeviceCommands {
     }
 
     if (res.type === 'PassphraseRequest') {
-      return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotSupportPassphrase, 'Device not support passphrase', {
-        require: '2.4.0'
-      }));
+      return this._promptPassphrase().then(response => {
+        const {
+          passphrase,
+          passphraseOnDevice
+        } = response;
+        return !passphraseOnDevice ? this._commonCall('PassphraseAck', {
+          passphrase
+        }) : this._commonCall('PassphraseAck', {
+          on_device: true
+        });
+      });
     }
 
     if (res.type === 'Deprecated_PassphraseStateRequest') ;
@@ -15414,6 +15427,26 @@ class DeviceCommands {
     });
   }
 
+  _promptPassphrase() {
+    return new Promise((resolve, reject) => {
+      if (this.device.listenerCount(DEVICE.PASSPHRASE) > 0) {
+        this._cancelableRequest = reject;
+        this.device.emit(DEVICE.PASSPHRASE, this.device, (response, error) => {
+          this._cancelableRequest = undefined;
+
+          if (error) {
+            reject(error);
+          } else {
+            resolve(response);
+          }
+        });
+      } else {
+        Log$5.error('[DeviceCommands] [call] Passphrase callback not configured, cancelling request');
+        reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, '_promptPassphrase: Passphrase callback not configured'));
+      }
+    });
+  }
+
 }
 
 const UI_REQUEST = {
@@ -15550,6 +15583,7 @@ class Device extends events.exports {
     this.needReloadDevice = false;
     this.keepSession = false;
     this.passphraseState = undefined;
+    this.skipPassphraseCheck = false;
     this.originalDescriptor = descriptor;
   }
 
@@ -15689,10 +15723,11 @@ class Device extends events.exports {
   getInternalState(_deviceId) {
     var _a, _b;
 
-    Log$4.debug('getInternalState session param: ', `device_id: ${_deviceId}`, `features.device_id: ${(_a = this.features) === null || _a === void 0 ? void 0 : _a.device_id}`, `passphraseState: ${this.passphraseState}`);
+    Log$4.debug('getInternalState session param: ', `device_id: ${_deviceId}`, `features.device_id: ${(_a = this.features) === null || _a === void 0 ? void 0 : _a.device_id}`, `passphraseState: ${this.passphraseState}`, `skipPassphraseCheck: ${this.skipPassphraseCheck}`);
     Log$4.debug('getInternalState session cache: ', deviceSessionCache);
     const deviceId = _deviceId || ((_b = this.features) === null || _b === void 0 ? void 0 : _b.device_id);
     if (!deviceId) return undefined;
+    if (this.skipPassphraseCheck) return deviceSessionCache[deviceId];
     if (!this.passphraseState) return undefined;
     const usePassKey = `${deviceId}@${this.passphraseState}`;
 
@@ -15712,7 +15747,11 @@ class Device extends events.exports {
 
     Log$4.debug('setInternalState session param: ', `state: ${state}`, `initSession: ${initSession}`, `device_id: ${(_a = this.features) === null || _a === void 0 ? void 0 : _a.device_id}`, `passphraseState: ${this.passphraseState}`);
     if (!this.features) return;
-    if (!this.passphraseState && !initSession) return;
+
+    if (!this.skipPassphraseCheck) {
+      if (!this.passphraseState && !initSession) return;
+    }
+
     let key = `${this.features.device_id}`;
 
     if (this.passphraseState) {
@@ -15745,6 +15784,7 @@ class Device extends events.exports {
     return __awaiter(this, void 0, void 0, function* () {
       Log$4.debug('initialize param:', options);
       this.passphraseState = options === null || options === void 0 ? void 0 : options.passphraseState;
+      this.skipPassphraseCheck = options === null || options === void 0 ? void 0 : options.skipPassphraseCheck;
 
       if (options === null || options === void 0 ? void 0 : options.initSession) {
         this.clearInternalState(options === null || options === void 0 ? void 0 : options.deviceId);
@@ -20847,6 +20887,7 @@ const Log = getLogger(exports.d0.Core);
 const parseInitOptions = method => ({
   initSession: method === null || method === void 0 ? void 0 : method.payload.initSession,
   passphraseState: method === null || method === void 0 ? void 0 : method.payload.passphraseState,
+  skipPassphraseCheck: method === null || method === void 0 ? void 0 : method.payload.skipPassphraseCheck,
   deviceId: method === null || method === void 0 ? void 0 : method.payload.deviceId
 });
 
@@ -20935,7 +20976,8 @@ const callAPI = message => __awaiter(void 0, void 0, void 0, function* () {
   (_a = method.setDevice) === null || _a === void 0 ? void 0 : _a.call(method, device);
   device.on(DEVICE.PIN, onDevicePinHandler);
   device.on(DEVICE.BUTTON, onDeviceButtonHandler);
-  device.on(DEVICE.PASSPHRASE_ON_DEVICE, onDevicePassphraseHandler);
+  device.on(DEVICE.PASSPHRASE, onDevicePassphraseHandler);
+  device.on(DEVICE.PASSPHRASE_ON_DEVICE, onEnterPassphraseOnDeviceHandler);
   device.on(DEVICE.FEATURES, onDeviceFeaturesHandler);
 
   try {
@@ -21000,12 +21042,14 @@ const callAPI = message => __awaiter(void 0, void 0, void 0, function* () {
           }));
         }
 
-        const passphraseState = yield device.checkPassphraseState();
-        checkPassphraseSafety(method, device.features);
+        if (!method.payload.skipPassphraseCheck) {
+          const passphraseState = yield device.checkPassphraseState();
+          checkPassphraseSafety(method, device.features);
 
-        if (passphraseState) {
-          DevicePool.clearDeviceCache(method.payload.connectId);
-          return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckPassphraseStateError));
+          if (passphraseState) {
+            DevicePool.clearDeviceCache(method.payload.connectId);
+            return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckPassphraseStateError));
+          }
         }
       }
 
@@ -21268,6 +21312,7 @@ const cancel = connectId => {
 
 const checkPassphraseSafety = (method, features) => {
   if (!method.useDevicePassphraseState) return;
+  if (method.payload.skipPassphraseCheck) return;
 
   if ((features === null || features === void 0 ? void 0 : features.passphrase_protection) === true && !method.payload.passphraseState) {
     DevicePool.clearDeviceCache(method.payload.connectId);
@@ -21288,7 +21333,8 @@ const cleanup = () => {
 const removeDeviceListener = device => {
   device.removeListener(DEVICE.PIN, onDevicePinHandler);
   device.removeListener(DEVICE.BUTTON, onDeviceButtonHandler);
-  device.removeListener(DEVICE.PASSPHRASE_ON_DEVICE, onDevicePassphraseHandler);
+  device.removeListener(DEVICE.PASSPHRASE, onDevicePassphraseHandler);
+  device.removeListener(DEVICE.PASSPHRASE_ON_DEVICE, onEnterPassphraseOnDeviceHandler);
   device.removeListener(DEVICE.FEATURES, onDeviceFeaturesHandler);
   DevicePool.emitter.removeListener(DEVICE.CONNECT, onDeviceConnectHandler);
 };
@@ -21345,7 +21391,27 @@ const onDeviceFeaturesHandler = (...[_, features]) => {
   postMessage(createDeviceMessage(DEVICE.FEATURES, Object.assign({}, features)));
 };
 
-const onDevicePassphraseHandler = (...[device]) => {
+const onDevicePassphraseHandler = (...[device, callback]) => __awaiter(void 0, void 0, void 0, function* () {
+  Log.debug('onDevicePassphraseHandler');
+  const uiPromise = createUiPromise(UI_RESPONSE.RECEIVE_PASSPHRASE, device);
+  postMessage(createUiMessage(UI_REQUEST$1.REQUEST_PASSPHRASE, {
+    device: device.toMessageObject(),
+    passphraseState: device.passphraseState
+  }));
+  const uiResp = yield uiPromise.promise;
+  const {
+    value,
+    passphraseOnDevice,
+    save
+  } = uiResp.payload;
+  callback({
+    passphrase: value.normalize('NFKD'),
+    passphraseOnDevice,
+    cache: save
+  });
+});
+
+const onEnterPassphraseOnDeviceHandler = (...[device]) => {
   postMessage(createUiMessage(UI_REQUEST$1.REQUEST_PASSPHRASE_ON_DEVICE, {
     device: device.toMessageObject(),
     passphraseState: device.passphraseState
@@ -21377,6 +21443,7 @@ class Core extends events.exports {
     return __awaiter(this, void 0, void 0, function* () {
       switch (message.type) {
         case UI_RESPONSE.RECEIVE_PIN:
+        case UI_RESPONSE.RECEIVE_PASSPHRASE:
           {
             const uiPromise = findUiPromise(message.type);
 
@@ -22820,7 +22887,8 @@ const HardwareErrorCode = {
   BridgeNotInstalled: 808,
   PollingTimeout: 809,
   PollingStop: 810,
-  BlindSignDisabled: 811
+  BlindSignDisabled: 811,
+  UnexpectPassphrase: 812
 };
 const HardwareErrorCodeMessage = {
   [HardwareErrorCode.UnknownError]: 'Unknown error occurred. Check message property.',
@@ -22879,7 +22947,8 @@ const HardwareErrorCodeMessage = {
   [HardwareErrorCode.BridgeNotInstalled]: 'Bridge not installed',
   [HardwareErrorCode.PollingTimeout]: 'Polling timeout',
   [HardwareErrorCode.PollingStop]: 'Polling stop',
-  [HardwareErrorCode.BlindSignDisabled]: 'Please confirm the BlindSign enabled'
+  [HardwareErrorCode.BlindSignDisabled]: 'Please confirm the BlindSign enabled',
+  [HardwareErrorCode.UnexpectPassphrase]: 'Unexpect passphrase'
 };
 
 const TypedError = (hardwareError, message, params) => {
@@ -45606,7 +45675,7 @@ try {
 /***/ ((module) => {
 
 "use strict";
-module.exports = JSON.parse('{"name":"@onekeyfe/hd-core","version":"0.1.49","description":"> TODO: description","author":"OneKey","homepage":"https://github.com/OneKeyHQ/hardware-js-sdk#readme","license":"ISC","main":"dist/index.js","types":"dist/index.d.ts","repository":{"type":"git","url":"git+https://github.com/OneKeyHQ/hardware-js-sdk.git"},"publishConfig":{"access":"public"},"scripts":{"dev":"rimraf dist && rollup -c ../../build/rollup.config.js -w","build":"rimraf dist && rollup -c ../../build/rollup.config.js","lint":"eslint .","lint:fix":"eslint . --fix"},"bugs":{"url":"https://github.com/OneKeyHQ/hardware-js-sdk/issues"},"dependencies":{"@onekeyfe/hd-shared":"^0.1.49","@onekeyfe/hd-transport":"^0.1.49","axios":"^0.27.2","bignumber.js":"^9.0.2","js-sha256":"^0.9.0","parse-uri":"^1.0.7","semver":"^7.3.7"},"devDependencies":{"@types/parse-uri":"^1.0.0","@types/semver":"^7.3.9"}}');
+module.exports = JSON.parse('{"name":"@onekeyfe/hd-core","version":"0.1.51","description":"> TODO: description","author":"OneKey","homepage":"https://github.com/OneKeyHQ/hardware-js-sdk#readme","license":"ISC","main":"dist/index.js","types":"dist/index.d.ts","repository":{"type":"git","url":"git+https://github.com/OneKeyHQ/hardware-js-sdk.git"},"publishConfig":{"access":"public"},"scripts":{"dev":"rimraf dist && rollup -c ../../build/rollup.config.js -w","build":"rimraf dist && rollup -c ../../build/rollup.config.js","lint":"eslint .","lint:fix":"eslint . --fix"},"bugs":{"url":"https://github.com/OneKeyHQ/hardware-js-sdk/issues"},"dependencies":{"@onekeyfe/hd-shared":"^0.1.51","@onekeyfe/hd-transport":"^0.1.51","axios":"^0.27.2","bignumber.js":"^9.0.2","js-sha256":"^0.9.0","parse-uri":"^1.0.7","semver":"^7.3.7"},"devDependencies":{"@types/parse-uri":"^1.0.0","@types/semver":"^7.3.9"}}');
 
 /***/ })
 
@@ -48138,7 +48207,7 @@ const src_init = async settings => {
 
   try {
     await init({ ..._settings,
-      version: "0.1.49"
+      version: "0.1.51"
     });
     return true;
   } catch (e) {