@onekeyfe/hd-core 0.2.30 → 0.2.32

package/dist/api/FirmwareUpdateV2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FirmwareUpdateV2.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV2.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAIT,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAO1C,OAAO,KAAK,EAAe,QAAQ,EAAE,MAAM,UAAU,CAAC;AAItD,aAAK,MAAM,GAAG;IACZ,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,EAAE,UAAU,GAAG,KAAK,CAAC;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAIF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,UAAU,CAAC,MAAM,CAAC;IAC9D,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,IAAI;IAsCJ,cAAc,YAAa,MAAM,UAS/B;IAEF,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS;IA6CrD,qBAAqB,CAAC,QAAQ,EAAE,QAAQ;IAUxC,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM;IAc9D,gCAAgC,CAAC,QAAQ,CAAC,EAAE,QAAQ;IAwB9C,GAAG;CAiGV"}
+{"version":3,"file":"FirmwareUpdateV2.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV2.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAIT,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAO1C,OAAO,KAAK,EAAe,QAAQ,EAAE,MAAM,UAAU,CAAC;AAItD,aAAK,MAAM,GAAG;IACZ,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,EAAE,UAAU,GAAG,KAAK,CAAC;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAIF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,UAAU,CAAC,MAAM,CAAC;IAC9D,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,IAAI;IAsCJ,cAAc,YAAa,MAAM,UAS/B;IAEF,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS;IAkDrD,qBAAqB,CAAC,QAAQ,EAAE,QAAQ;IAUxC,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM;IAc9D,gCAAgC,CAAC,QAAQ,CAAC,EAAE,QAAQ;IAwB9C,GAAG;CAiGV"}

package/dist/api/device/DeviceUpdateBootloader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceUpdateBootloader.d.ts","sourceRoot":"","sources":["../../../src/api/device/DeviceUpdateBootloader.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE1E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAQ3C,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,UAAU;IAC5D,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,IAAI;IAMJ,cAAc,YAAa,MAAM,UAS/B;IAEI,GAAG;CA4BV"}
+{"version":3,"file":"DeviceUpdateBootloader.d.ts","sourceRoot":"","sources":["../../../src/api/device/DeviceUpdateBootloader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAQ3C,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,UAAU;IAC5D,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,IAAI;IAMJ,cAAc,YAAa,MAAM,UAS/B;IAEI,GAAG;CA4BV"}

package/dist/core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AACA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAqBlC,OAAO,EACL,WAAW,EAYZ,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,UAAU,CAAC;AAE7D,OAAO,eAAe,MAAM,2BAA2B,CAAC;AA4BxD,eAAO,MAAM,OAAO,YAAmB,WAAW,iBA+PjD,CAAC;AAqMF,eAAO,MAAM,MAAM,0CAkBlB,CAAC;AA8IF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IACtC,aAAa,CAAC,OAAO,EAAE,WAAW;IA8CxC,OAAO;CAGR;AAED,eAAO,MAAM,QAAQ,YAGpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAIzB,CAAC;AAMF,eAAO,MAAM,IAAI,aAAoB,eAAe,aAAa,GAAG,8BAmBnE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AACA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAqBlC,OAAO,EACL,WAAW,EAYZ,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,UAAU,CAAC;AAE7D,OAAO,eAAe,MAAM,2BAA2B,CAAC;AA4BxD,eAAO,MAAM,OAAO,YAAmB,WAAW,iBAkQjD,CAAC;AAqMF,eAAO,MAAM,MAAM,0CAkBlB,CAAC;AAoJF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IACtC,aAAa,CAAC,OAAO,EAAE,WAAW;IA8CxC,OAAO;CAGR;AAED,eAAO,MAAM,QAAQ,YAGpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAIzB,CAAC;AAMF,eAAO,MAAM,IAAI,aAAoB,eAAe,aAAa,GAAG,8BAmBnE,CAAC"}

package/dist/index.d.ts

@@ -10,6 +10,7 @@ interface CommonParams {
     pollIntervalTime?: number;
     timeout?: number;
     passphraseState?: string;
+    useEmptyPassphrase?: boolean;
     initSession?: boolean;
 }
 declare type Params<T> = CommonParams & T & {

package/dist/index.js

@@ -13596,24 +13596,29 @@ class FirmwareUpdateV2 extends BaseMethod {
         const isBleReconnect = connectId && env === 'react-native';
         Log$3.log('FirmwareUpdateV2 [checkDeviceToBootloader] isBleReconnect: ', isBleReconnect);
         const intervalTimer = setInterval(() => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g;
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             if (isBleReconnect) {
-                yield this.device.acquire();
-                yield this.device.initialize();
-                if ((_a = this.device.features) === null || _a === void 0 ? void 0 : _a.bootloader_mode) {
-                    clearInterval(intervalTimer);
-                    (_b = this.checkPromise) === null || _b === void 0 ? void 0 : _b.resolve(true);
+                try {
+                    yield ((_a = this.device.deviceConnector) === null || _a === void 0 ? void 0 : _a.acquire(this.device.originalDescriptor.id));
+                    yield this.device.initialize();
+                    if ((_b = this.device.features) === null || _b === void 0 ? void 0 : _b.bootloader_mode) {
+                        clearInterval(intervalTimer);
+                        (_c = this.checkPromise) === null || _c === void 0 ? void 0 : _c.resolve(true);
+                    }
+                }
+                catch (e) {
+                    Log$3.log('catch Bluetooth error when device is restarting: ', e);
                 }
             }
             else {
-                const deviceDiff = yield ((_c = this.device.deviceConnector) === null || _c === void 0 ? void 0 : _c.enumerate());
-                const devicesDescriptor = (_d = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) !== null && _d !== void 0 ? _d : [];
+                const deviceDiff = yield ((_d = this.device.deviceConnector) === null || _d === void 0 ? void 0 : _d.enumerate());
+                const devicesDescriptor = (_e = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) !== null && _e !== void 0 ? _e : [];
                 const { deviceList } = yield DevicePool.getDevices(devicesDescriptor, connectId);
-                if (deviceList.length === 1 && ((_f = (_e = deviceList[0]) === null || _e === void 0 ? void 0 : _e.features) === null || _f === void 0 ? void 0 : _f.bootloader_mode)) {
+                if (deviceList.length === 1 && ((_g = (_f = deviceList[0]) === null || _f === void 0 ? void 0 : _f.features) === null || _g === void 0 ? void 0 : _g.bootloader_mode)) {
                     this.device.updateFromCache(deviceList[0]);
                     this.device.commands.disposed = false;
                     clearInterval(intervalTimer);
-                    (_g = this.checkPromise) === null || _g === void 0 ? void 0 : _g.resolve(true);
+                    (_h = this.checkPromise) === null || _h === void 0 ? void 0 : _h.resolve(true);
                 }
             }
         }), isBleReconnect ? 3000 : 2000);
@@ -18408,7 +18413,7 @@ 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, onDevicePassphraseHandler);
+    device.on(DEVICE.PASSPHRASE, message.payload.useEmptyPassphrase ? onEmptyPassphraseHandler : onDevicePassphraseHandler);
     device.on(DEVICE.PASSPHRASE_ON_DEVICE, onEnterPassphraseOnDeviceHandler);
     device.on(DEVICE.FEATURES, onDeviceFeaturesHandler);
     try {
@@ -18712,7 +18717,9 @@ const cancel = (connectId) => {
 const checkPassphraseSafety = (method, features) => {
     if (!method.useDevicePassphraseState)
         return;
-    if ((features === null || features === void 0 ? void 0 : features.passphrase_protection) === true && !method.payload.passphraseState) {
+    if ((features === null || features === void 0 ? void 0 : features.passphrase_protection) === true &&
+        (method.payload.passphraseState == null || method.payload.passphraseState === '') &&
+        !method.payload.useEmptyPassphrase) {
         DevicePool.clearDeviceCache(method.payload.connectId);
         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceOpenedPassphrase);
     }
@@ -18726,11 +18733,7 @@ const cleanup = () => {
     Log.debug('Cleanup...');
 };
 const removeDeviceListener = (device) => {
-    device.removeListener(DEVICE.PIN, onDevicePinHandler);
-    device.removeListener(DEVICE.BUTTON, onDeviceButtonHandler);
-    device.removeListener(DEVICE.PASSPHRASE, onDevicePassphraseHandler);
-    device.removeListener(DEVICE.PASSPHRASE_ON_DEVICE, onEnterPassphraseOnDeviceHandler);
-    device.removeListener(DEVICE.FEATURES, onDeviceFeaturesHandler);
+    device.removeAllListeners();
     DevicePool.emitter.removeListener(DEVICE.CONNECT, onDeviceConnectHandler);
 };
 const closePopup = () => {
@@ -18786,6 +18789,10 @@ const onDevicePassphraseHandler = (...[device, callback]) => __awaiter(void 0, v
         cache: save,
     });
 });
+const onEmptyPassphraseHandler = (...[_, callback]) => {
+    Log.debug('onEmptyPassphraseHandler');
+    callback({ passphrase: '' });
+};
 const onEnterPassphraseOnDeviceHandler = (...[device]) => {
     postMessage(createUiMessage(UI_REQUEST$1.REQUEST_PASSPHRASE_ON_DEVICE, {
         device: device.toMessageObject(),

package/dist/types/params.d.ts

@@ -4,6 +4,7 @@ export interface CommonParams {
     pollIntervalTime?: number;
     timeout?: number;
     passphraseState?: string;
+    useEmptyPassphrase?: boolean;
     initSession?: boolean;
 }
 export declare type Params<T> = CommonParams & T & {

package/dist/types/params.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"params.d.ts","sourceRoot":"","sources":["../../src/types/params.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,WAAW,CAAC,EAAE,OAAO,CAAC;IAItB,UAAU,CAAC,EAAE,MAAM,CAAC;IAIpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAI1B,OAAO,CAAC,EAAE,MAAM,CAAC;IAIjB,eAAe,CAAC,EAAE,MAAM,CAAC;IAIzB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,oBAAY,MAAM,CAAC,CAAC,IAAI,YAAY,GAAG,CAAC,GAAG;IAAE,MAAM,CAAC,EAAE,SAAS,CAAA;CAAE,CAAC;AAElE,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,KAAK,CAAC;IACf,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACpD;AAED,MAAM,WAAW,OAAO,CAAC,CAAC;IACxB,OAAO,EAAE,IAAI,CAAC;IACd,OAAO,EAAE,CAAC,CAAC;CACZ;AAED,oBAAY,QAAQ,CAAC,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC"}
+{"version":3,"file":"params.d.ts","sourceRoot":"","sources":["../../src/types/params.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,WAAW,CAAC,EAAE,OAAO,CAAC;IAItB,UAAU,CAAC,EAAE,MAAM,CAAC;IAIpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAI1B,OAAO,CAAC,EAAE,MAAM,CAAC;IAIjB,eAAe,CAAC,EAAE,MAAM,CAAC;IAIzB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAI7B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,oBAAY,MAAM,CAAC,CAAC,IAAI,YAAY,GAAG,CAAC,GAAG;IAAE,MAAM,CAAC,EAAE,SAAS,CAAA;CAAE,CAAC;AAElE,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,KAAK,CAAC;IACf,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACpD;AAED,MAAM,WAAW,OAAO,CAAC,CAAC;IACxB,OAAO,EAAE,IAAI,CAAC;IACd,OAAO,EAAE,CAAC,CAAC;CACZ;AAED,oBAAY,QAAQ,CAAC,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.2.30",
+  "version": "0.2.32",
   "description": "> TODO: description",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -24,8 +24,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^0.2.30",
-    "@onekeyfe/hd-transport": "^0.2.30",
+    "@onekeyfe/hd-shared": "^0.2.32",
+    "@onekeyfe/hd-transport": "^0.2.32",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "jszip": "^3.10.1",
@@ -42,5 +42,5 @@
     "@types/semver": "^7.3.9",
     "ripple-keypairs": "^1.1.4"
   },
-  "gitHead": "ef7e66f72ac394b8c4faa35d65a3d3d9f6cd4846"
+  "gitHead": "361f104ba3c7c74eaf3916e71e9790aaf373a11b"
 }

package/src/api/FirmwareUpdateV2.ts

@@ -90,11 +90,16 @@ export default class FirmwareUpdateV2 extends BaseMethod<Params> {
     const intervalTimer: ReturnType<typeof setInterval> | undefined = setInterval(
       async () => {
         if (isBleReconnect) {
-          await this.device.acquire();
-          await this.device.initialize();
-          if (this.device.features?.bootloader_mode) {
-            clearInterval(intervalTimer);
-            this.checkPromise?.resolve(true);
+          try {
+            await this.device.deviceConnector?.acquire(this.device.originalDescriptor.id);
+            await this.device.initialize();
+            if (this.device.features?.bootloader_mode) {
+              clearInterval(intervalTimer);
+              this.checkPromise?.resolve(true);
+            }
+          } catch (e) {
+            // ignore error because of device is not connected
+            Log.log('catch Bluetooth error when device is restarting: ', e);
           }
         } else {
           const deviceDiff = await this.device.deviceConnector?.enumerate();

package/src/api/device/DeviceUpdateBootloader.ts

@@ -1,4 +1,4 @@
-import { ERRORS, HardwareErrorCode, Deferred } from '@onekeyfe/hd-shared';
+import { Deferred } from '@onekeyfe/hd-shared';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { BaseMethod } from '../BaseMethod';
 import { getSysResourceBinary } from '../firmware/getBinary';

package/src/core/index.ts

@@ -133,7 +133,10 @@ export const callAPI = async (message: CoreMessage) => {
 
   device.on(DEVICE.PIN, onDevicePinHandler);
   device.on(DEVICE.BUTTON, onDeviceButtonHandler);
-  device.on(DEVICE.PASSPHRASE, onDevicePassphraseHandler);
+  device.on(
+    DEVICE.PASSPHRASE,
+    message.payload.useEmptyPassphrase ? onEmptyPassphraseHandler : onDevicePassphraseHandler
+  );
   device.on(DEVICE.PASSPHRASE_ON_DEVICE, onEnterPassphraseOnDeviceHandler);
   device.on(DEVICE.FEATURES, onDeviceFeaturesHandler);
 
@@ -540,7 +543,11 @@ export const cancel = (connectId?: string) => {
 const checkPassphraseSafety = (method: BaseMethod, features?: Features) => {
   if (!method.useDevicePassphraseState) return;
 
-  if (features?.passphrase_protection === true && !method.payload.passphraseState) {
+  if (
+    features?.passphrase_protection === true &&
+    (method.payload.passphraseState == null || method.payload.passphraseState === '') &&
+    !method.payload.useEmptyPassphrase
+  ) {
     DevicePool.clearDeviceCache(method.payload.connectId);
     throw ERRORS.TypedError(HardwareErrorCode.DeviceOpenedPassphrase);
   }
@@ -557,11 +564,7 @@ const cleanup = () => {
 };
 
 const removeDeviceListener = (device: Device) => {
-  device.removeListener(DEVICE.PIN, onDevicePinHandler);
-  device.removeListener(DEVICE.BUTTON, onDeviceButtonHandler);
-  device.removeListener(DEVICE.PASSPHRASE, onDevicePassphraseHandler);
-  device.removeListener(DEVICE.PASSPHRASE_ON_DEVICE, onEnterPassphraseOnDeviceHandler);
-  device.removeListener(DEVICE.FEATURES, onDeviceFeaturesHandler);
+  device.removeAllListeners();
   DevicePool.emitter.removeListener(DEVICE.CONNECT, onDeviceConnectHandler);
   // DevicePool.emitter.removeListener(DEVICE.DISCONNECT, onDeviceDisconnectHandler);
 };
@@ -641,6 +644,12 @@ const onDevicePassphraseHandler = async (...[device, callback]: DeviceEvents['pa
   });
 };
 
+const onEmptyPassphraseHandler = (...[_, callback]: DeviceEvents['passphrase']) => {
+  Log.debug('onEmptyPassphraseHandler');
+  // send as PassphrasePromptResponse
+  callback({ passphrase: '' });
+};
+
 const onEnterPassphraseOnDeviceHandler = (
   ...[device]: [...DeviceEvents['passphrase_on_device']]
 ) => {

package/src/types/params.ts

@@ -16,6 +16,10 @@ export interface CommonParams {
    * passphrase state
    */
   passphraseState?: string;
+  /**
+   * Use empty passphrase
+   */
+  useEmptyPassphrase?: boolean;
   /**
    * Every init session
    */