@onekeyfe/hd-core 1.2.0-alpha.60 → 1.2.0-alpha.61

package/__tests__/uiPromiseRegistry.test.ts

@@ -1,6 +1,10 @@
 import { createDeferred } from '@onekeyfe/hd-shared';
 
-import { findUiPromiseForResponse, rejectUiPromises } from '../src/core/uiPromiseRegistry';
+import {
+  consumeUiPromise,
+  findUiPromiseForResponse,
+  rejectUiPromises,
+} from '../src/core/uiPromiseRegistry';
 import { UI_RESPONSE } from '../src/events';
 
 import type { UiPromise, UiPromiseResponse } from '../src/events';
@@ -17,6 +21,20 @@ const asRegistry = (promises: UiPromise<typeof UI_RESPONSE.RECEIVE_PIN>[]) =>
   promises as UiPromise<UiPromiseResponse['type']>[];
 
 describe('UI response promise correlation', () => {
+  test('consumes a rejected UI promise and normalizes its callback error', async () => {
+    const pending = createDeferred<string>();
+    const onFulfilled = jest.fn();
+    const onRejected = jest.fn();
+
+    consumeUiPromise(pending.promise, onFulfilled, onRejected);
+    pending.reject('cancelled' as unknown as Error);
+    await Promise.resolve();
+
+    expect(onFulfilled).not.toHaveBeenCalled();
+    expect(onRejected).toHaveBeenCalledWith(expect.any(Error));
+    expect(onRejected.mock.calls[0][0].message).toBe('cancelled');
+  });
+
   test('matches a sensitive response by type, interactionId and deviceId', () => {
     const deviceA = createPinPromise('interaction-a', 'device-a');
     const deviceB = createPinPromise('interaction-b', 'device-b');

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;AA+BlC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAsB1C,OAAO,eAAe,MAAM,2BAA2B,CAAC;AAYxD,OAAO,KAAK,EAAE,eAAe,EAAyB,MAAM,UAAU,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAmD,MAAM,WAAW,CAAC;AAI9F,OAAO,KAAK,EACV,6BAA6B,EAG9B,MAAM,wBAAwB,CAAC;AAWhC,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;AAgE7D,eAAO,MAAM,OAAO,YAAmB,WAAW,WAAW,WAAW,iBAoFvE,CAAC;AA82BF,eAAO,MAAM,MAAM,YAAa,WAAW,cAAc,MAAM,SAkF9D,CAAC;AAmGF,eAAO,MAAM,qBAAqB,gFAejC,CAAC;AAwKF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IAC5C,OAAO,CAAC,cAAc,CAAoB;IAE1C,SAAgB,aAAa,EAAE,MAAM,CAAC;IAEtC,OAAO,CAAC,YAAY,CAAsB;IAE1C,OAAO,CAAC,cAAc,CAAC,CAAgB;IAGvC,OAAO,CAAC,qBAAqB,CAA4B;IAEzD,OAAO,CAAC,iBAAiB,CAAoB;;IAS7C,OAAO,CAAC,cAAc;IAoBhB,aAAa,CAAC,OAAO,EAAE,WAAW;IAuExC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YAOV,gBAAgB;CAiC/B;AAED,eAAO,MAAM,QAAQ,YAIpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAYzB,CAAC;AAMF,eAAO,MAAM,IAAI,aACL,eAAe,aACd,GAAG,WACL,6BAA6B,8BAiBvC,CAAC;AAEF,eAAO,MAAM,eAAe;SAKrB,eAAe,CAAC,KAAK,CAAC;eAChB,GAAG;;UASf,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AACA,OAAO,YAAY,MAAM,QAAQ,CAAC;AA+BlC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAsB1C,OAAO,eAAe,MAAM,2BAA2B,CAAC;AAYxD,OAAO,KAAK,EAAE,eAAe,EAAyB,MAAM,UAAU,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAmD,MAAM,WAAW,CAAC;AAI9F,OAAO,KAAK,EACV,6BAA6B,EAG9B,MAAM,wBAAwB,CAAC;AAWhC,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;AAgE7D,eAAO,MAAM,OAAO,YAAmB,WAAW,WAAW,WAAW,iBAoFvE,CAAC;AA82BF,eAAO,MAAM,MAAM,YAAa,WAAW,cAAc,MAAM,SAkF9D,CAAC;AAoGF,eAAO,MAAM,qBAAqB,gFAejC,CAAC;AAiLF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IAC5C,OAAO,CAAC,cAAc,CAAoB;IAE1C,SAAgB,aAAa,EAAE,MAAM,CAAC;IAEtC,OAAO,CAAC,YAAY,CAAsB;IAE1C,OAAO,CAAC,cAAc,CAAC,CAAgB;IAGvC,OAAO,CAAC,qBAAqB,CAA4B;IAEzD,OAAO,CAAC,iBAAiB,CAAoB;;IAS7C,OAAO,CAAC,cAAc;IAoBhB,aAAa,CAAC,OAAO,EAAE,WAAW;IAuExC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YAOV,gBAAgB;CAiC/B;AAED,eAAO,MAAM,QAAQ,YAIpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAYzB,CAAC;AAMF,eAAO,MAAM,IAAI,aACL,eAAe,aACd,GAAG,WACL,6BAA6B,8BAiBvC,CAAC;AAEF,eAAO,MAAM,eAAe;SAKrB,eAAe,CAAC,KAAK,CAAC;eAChB,GAAG;;UASf,CAAC"}

package/dist/core/uiPromiseRegistry.d.ts

@@ -1,5 +1,6 @@
 import type { UiPromise, UiPromiseResponse } from '../events/ui-promise';
 import type { UiResponseEvent } from '../events/ui-response';
+export declare const consumeUiPromise: <T>(promise: Promise<T>, onFulfilled: (value: T) => void, onRejected: (error: Error) => void) => void;
 export declare const rejectUiPromises: (uiPromises: UiPromise<UiPromiseResponse['type']>[], error: Error) => void;
 export declare const findUiPromiseForResponse: (uiPromises: UiPromise<UiPromiseResponse['type']>[], response: UiResponseEvent) => UiPromise<"ui-receive_pin" | "ui-receive_passphrase" | "ui-receive_select-device-in-bootloader-for-web-device" | "ui-receive_select-device-for-switch-firmware-web-device" | "device-disconnect"> | undefined;
 //# sourceMappingURL=uiPromiseRegistry.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"uiPromiseRegistry.d.ts","sourceRoot":"","sources":["../../src/core/uiPromiseRegistry.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,eAAO,MAAM,gBAAgB,eACf,UAAU,iBAAiB,CAAC,MAAM,CAAC,CAAC,EAAE,SAC3C,KAAK,SAKb,CAAC;AASF,eAAO,MAAM,wBAAwB,eACvB,UAAU,iBAAiB,CAAC,MAAM,CAAC,CAAC,EAAE,YACxC,eAAe,kNA0B1B,CAAC"}
+{"version":3,"file":"uiPromiseRegistry.d.ts","sourceRoot":"","sources":["../../src/core/uiPromiseRegistry.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAK7D,eAAO,MAAM,gBAAgB,sDAEA,IAAI,sBACX,KAAK,KAAK,IAAI,SAKnC,CAAC;AAEF,eAAO,MAAM,gBAAgB,eACf,UAAU,iBAAiB,CAAC,MAAM,CAAC,CAAC,EAAE,SAC3C,KAAK,SAKb,CAAC;AASF,eAAO,MAAM,wBAAwB,eACvB,UAAU,iBAAiB,CAAC,MAAM,CAAC,CAAC,EAAE,YACxC,eAAe,kNA0B1B,CAAC"}

package/dist/index.js

@@ -61400,6 +61400,12 @@ class RequestQueue {
     }
 }
 
+const normalizeUiPromiseError = (error) => error instanceof Error ? error : new Error(String(error));
+const consumeUiPromise = (promise, onFulfilled, onRejected) => {
+    promise.then(onFulfilled, error => {
+        onRejected(normalizeUiPromiseError(error));
+    });
+};
 const rejectUiPromises = (uiPromises, error) => {
     for (const uiPromise of uiPromises) {
         uiPromise.reject(error);
@@ -62370,7 +62376,7 @@ const onTransportDeviceDisconnectHandler = (event) => {
     device.markTransportDisconnected();
     DevicePool.emitter.emit(DEVICE.DISCONNECT, device);
 };
-const onDevicePinHandler = (...[device, type, callback]) => __awaiter(void 0, void 0, void 0, function* () {
+const onDevicePinHandler = (...[device, type, callback]) => {
     Log.log('request Input PIN');
     const uiPromise = createUiPromise(UI_RESPONSE.RECEIVE_PIN, device);
     postMessage(createUiMessage(UI_REQUEST.REQUEST_PIN, {
@@ -62378,9 +62384,8 @@ const onDevicePinHandler = (...[device, type, callback]) => __awaiter(void 0, vo
         type,
         responseCorrelation: uiPromise.responseCorrelation,
     }));
-    const uiResp = yield uiPromise.promise;
-    callback(null, uiResp.payload);
-});
+    consumeUiPromise(uiPromise.promise, uiResp => callback(null, uiResp.payload), error => callback(error, ''));
+};
 const onDeviceButtonHandler = (...[device, request]) => {
     postMessage(createDeviceMessage(DEVICE.BUTTON, Object.assign(Object.assign({}, request), { device: device.toMessageObject() })));
     if (request.code === 'ButtonRequest_PinEntry' || request.code === 'ButtonRequest_AttachPin') {
@@ -62401,19 +62406,20 @@ const onDeviceFeaturesHandler = (...[_, features]) => {
 const onDeviceStateHandler = (...[_, stateEvent]) => {
     postMessage(createDeviceMessage(DEVICE.STATE, stateEvent));
 };
-const onDevicePassphraseHandler = (...[device, requestPayload, callback]) => __awaiter(void 0, void 0, void 0, function* () {
+const onDevicePassphraseHandler = (...[device, requestPayload, callback]) => {
     Log.debug('onDevicePassphraseHandler');
     const uiPromise = createUiPromise(UI_RESPONSE.RECEIVE_PASSPHRASE, device);
     postMessage(createUiMessage(UI_REQUEST.REQUEST_PASSPHRASE, Object.assign(Object.assign({ device: device.toMessageObject(), passphraseState: device.passphraseState, existsAttachPinUser: requestPayload.existsAttachPinUser, deviceOnly: requestPayload.deviceOnly, source: requestPayload.source, reason: requestPayload.reason, expectedPassphraseState: requestPayload.expectedPassphraseState }, (requestPayload.interaction ? { interaction: requestPayload.interaction } : {})), { responseCorrelation: uiPromise.responseCorrelation })));
-    const uiResp = yield uiPromise.promise;
-    const { value, passphraseOnDevice, save, attachPinOnDevice } = uiResp.payload;
-    callback({
-        passphrase: value.normalize('NFKD'),
-        passphraseOnDevice,
-        attachPinOnDevice,
-        cache: save,
-    });
-});
+    consumeUiPromise(uiPromise.promise, uiResp => {
+        const { value, passphraseOnDevice, save, attachPinOnDevice } = uiResp.payload;
+        callback({
+            passphrase: value.normalize('NFKD'),
+            passphraseOnDevice,
+            attachPinOnDevice,
+            cache: save,
+        });
+    }, error => callback({}, error));
+};
 const onEmptyPassphraseHandler = (...[_, , callback]) => {
     Log.debug('onEmptyPassphraseHandler');
     callback({ passphrase: '' });
@@ -62433,24 +62439,22 @@ const onEnterPinOnDeviceHandler = (...[device, pinType, metadata]) => {
 const onPinOnDeviceCompleteHandler = (...[_, metadata]) => {
     postMessage(createUiMessage(UI_REQUEST.CLOSE_UI_PIN_WINDOW, metadata));
 };
-const onSelectDeviceInBootloaderForWebDeviceHandler = (...[device, callback]) => __awaiter(void 0, void 0, void 0, function* () {
+const onSelectDeviceInBootloaderForWebDeviceHandler = (...[device, callback]) => {
     Log.debug('onSelectDeviceInBootloaderForWebDeviceHandler');
     const uiPromise = createUiPromise(UI_RESPONSE.SELECT_DEVICE_IN_BOOTLOADER_FOR_WEB_DEVICE, device);
     postMessage(createUiMessage(UI_REQUEST.REQUEST_DEVICE_IN_BOOTLOADER_FOR_WEB_DEVICE, {
         device: device.toMessageObject(),
     }));
-    const uiResp = yield uiPromise.promise;
-    callback(null, uiResp.payload.deviceId);
-});
-const onSelectDeviceForSwitchFirmwareWebDeviceHandler = (...[device, callback]) => __awaiter(void 0, void 0, void 0, function* () {
+    consumeUiPromise(uiPromise.promise, uiResp => callback(null, uiResp.payload.deviceId), error => callback(error, ''));
+};
+const onSelectDeviceForSwitchFirmwareWebDeviceHandler = (...[device, callback]) => {
     Log.debug('onSelectDeviceForSwitchFirmwareWebDeviceHandler');
     const uiPromise = createUiPromise(UI_RESPONSE.SELECT_DEVICE_FOR_SWITCH_FIRMWARE_WEB_DEVICE, device);
     postMessage(createUiMessage(UI_REQUEST.REQUEST_DEVICE_FOR_SWITCH_FIRMWARE_WEB_DEVICE, {
         device: device.toMessageObject(),
     }));
-    const uiResp = yield uiPromise.promise;
-    callback(null, uiResp.payload.deviceId);
-});
+    consumeUiPromise(uiPromise.promise, uiResp => callback(null, uiResp.payload.deviceId), error => callback(error, ''));
+};
 const postMessage = (message) => {
     if (!_core) {
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.0-alpha.60",
+  "version": "1.2.0-alpha.61",
   "description": "Core processes and APIs for communicating with OneKey hardware devices.",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.2.0-alpha.60",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.60",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.61",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.61",
     "axios": "1.15.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -44,5 +44,5 @@
     "@types/w3c-web-usb": "^1.0.10",
     "@types/web-bluetooth": "^0.0.21"
   },
-  "gitHead": "bde29baa04ac87453fd0eff54fd1cafe905f0ec8"
+  "gitHead": "19c6dc68cec2250bab703e802209ec7be586521d"
 }

package/src/core/index.ts

@@ -54,7 +54,7 @@ import {
 import TransportManager from '../data-manager/TransportManager';
 import DeviceConnector from '../device/DeviceConnector';
 import RequestQueue from './RequestQueue';
-import { findUiPromiseForResponse, rejectUiPromises } from './uiPromiseRegistry';
+import { consumeUiPromise, findUiPromiseForResponse, rejectUiPromises } from './uiPromiseRegistry';
 import { registerHardwareUiEventListeners } from './deviceEventRegistration';
 import { getSynchronize } from '../utils/getSynchronize';
 import { runMethodWithUnlockPolicy } from '../protocols/protocol-v2/unlockPolicyRunner';
@@ -1273,7 +1273,7 @@ const onTransportDeviceDisconnectHandler = (event: TransportDeviceDisconnectEven
   DevicePool.emitter.emit(DEVICE.DISCONNECT, device);
 };
 
-const onDevicePinHandler = async (...[device, type, callback]: DeviceEvents['pin']) => {
+const onDevicePinHandler = (...[device, type, callback]: DeviceEvents['pin']) => {
   Log.log('request Input PIN');
   // create ui promise
   const uiPromise = createUiPromise(UI_RESPONSE.RECEIVE_PIN, device);
@@ -1285,10 +1285,11 @@ const onDevicePinHandler = async (...[device, type, callback]: DeviceEvents['pin
       responseCorrelation: uiPromise.responseCorrelation,
     })
   );
-  // wait for pin
-  const uiResp = await uiPromise.promise;
-  // callback.apply(null, [null, pin]);
-  callback(null, uiResp.payload);
+  consumeUiPromise(
+    uiPromise.promise,
+    uiResp => callback(null, uiResp.payload),
+    error => callback(error, '')
+  );
 };
 
 export const onDeviceButtonHandler = (...[device, request]: [...DeviceEvents['button']]) => {
@@ -1316,7 +1317,7 @@ const onDeviceStateHandler = (...[_, stateEvent]: [...DeviceEvents['state']]) =>
   postMessage(createDeviceMessage(DEVICE.STATE, stateEvent));
 };
 
-const onDevicePassphraseHandler = async (
+const onDevicePassphraseHandler = (
   ...[device, requestPayload, callback]: DeviceEvents['passphrase']
 ) => {
   Log.debug('onDevicePassphraseHandler');
@@ -1334,16 +1335,19 @@ const onDevicePassphraseHandler = async (
       responseCorrelation: uiPromise.responseCorrelation,
     })
   );
-  // wait for passphrase
-  const uiResp = await uiPromise.promise;
-  const { value, passphraseOnDevice, save, attachPinOnDevice } = uiResp.payload;
-  // send as PassphrasePromptResponse
-  callback({
-    passphrase: value.normalize('NFKD'),
-    passphraseOnDevice,
-    attachPinOnDevice,
-    cache: save,
-  });
+  consumeUiPromise(
+    uiPromise.promise,
+    uiResp => {
+      const { value, passphraseOnDevice, save, attachPinOnDevice } = uiResp.payload;
+      callback({
+        passphrase: value.normalize('NFKD'),
+        passphraseOnDevice,
+        attachPinOnDevice,
+        cache: save,
+      });
+    },
+    error => callback({}, error)
+  );
 };
 
 const onEmptyPassphraseHandler = (...[_, , callback]: DeviceEvents['passphrase']) => {
@@ -1408,7 +1412,7 @@ const onPinOnDeviceCompleteHandler = (
   postMessage(createUiMessage(UI_REQUEST.CLOSE_UI_PIN_WINDOW, metadata));
 };
 
-const onSelectDeviceInBootloaderForWebDeviceHandler = async (
+const onSelectDeviceInBootloaderForWebDeviceHandler = (
   ...[device, callback]: [...DeviceEvents['select_device_in_bootloader_for_web_device']]
 ) => {
   Log.debug('onSelectDeviceInBootloaderForWebDeviceHandler');
@@ -1418,11 +1422,14 @@ const onSelectDeviceInBootloaderForWebDeviceHandler = async (
       device: device.toMessageObject() as KnownDevice,
     })
   );
-  const uiResp = await uiPromise.promise;
-  callback(null, uiResp.payload.deviceId);
+  consumeUiPromise(
+    uiPromise.promise,
+    uiResp => callback(null, uiResp.payload.deviceId),
+    error => callback(error, '')
+  );
 };
 
-const onSelectDeviceForSwitchFirmwareWebDeviceHandler = async (
+const onSelectDeviceForSwitchFirmwareWebDeviceHandler = (
   ...[device, callback]: [...DeviceEvents['select_device_for_switch_firmware_web_device']]
 ) => {
   Log.debug('onSelectDeviceForSwitchFirmwareWebDeviceHandler');
@@ -1435,8 +1442,11 @@ const onSelectDeviceForSwitchFirmwareWebDeviceHandler = async (
       device: device.toMessageObject() as KnownDevice,
     })
   );
-  const uiResp = await uiPromise.promise;
-  callback(null, uiResp.payload.deviceId);
+  consumeUiPromise(
+    uiPromise.promise,
+    uiResp => callback(null, uiResp.payload.deviceId),
+    error => callback(error, '')
+  );
 };
 
 /**

package/src/core/uiPromiseRegistry.ts

@@ -3,6 +3,19 @@ import { UI_RESPONSE } from '../events/ui-response';
 import type { UiPromise, UiPromiseResponse } from '../events/ui-promise';
 import type { UiResponseEvent } from '../events/ui-response';
 
+const normalizeUiPromiseError = (error: unknown) =>
+  error instanceof Error ? error : new Error(String(error));
+
+export const consumeUiPromise = <T>(
+  promise: Promise<T>,
+  onFulfilled: (value: T) => void,
+  onRejected: (error: Error) => void
+) => {
+  promise.then(onFulfilled, error => {
+    onRejected(normalizeUiPromiseError(error));
+  });
+};
+
 export const rejectUiPromises = (
   uiPromises: UiPromise<UiPromiseResponse['type']>[],
   error: Error