@onekeyfe/hd-core 1.2.0-alpha.15 → 1.2.0-alpha.16

package/__tests__/DeviceCommands.test.ts

@@ -1,6 +1,7 @@
 import { HardwareErrorCode } from '@onekeyfe/hd-shared';
 
 import { DeviceCommands } from '../src/device/DeviceCommands';
+import { DEVICE } from '../src/events';
 
 jest.mock('../src/data/config', () => ({
   getSDKVersion: jest.fn(() => '1.0.0'),
@@ -169,3 +170,79 @@ describe('DeviceCommands failure mapping', () => {
     });
   });
 });
+
+describe('DeviceCommands Protocol V2 interactive response compatibility', () => {
+  it('still auto-acks ButtonRequest when no hardware UI listener is registered', async () => {
+    const commands = createCommands();
+    commands.device = {
+      ...commands.device,
+      getCurrentDeviceType: jest.fn(() => 'pro2'),
+      setCancelableAction: jest.fn(),
+      emit: jest.fn(),
+      listenerCount: jest.fn(() => 0),
+    } as any;
+    commands._commonCall = jest.fn().mockResolvedValue({
+      type: 'Success',
+      message: {},
+    }) as any;
+
+    await expect(
+      commands._filterCommonTypes(
+        {
+          type: 'ButtonRequest',
+          message: { code: 'ButtonRequest_PinEntry' },
+        } as any,
+        'GetAddress'
+      )
+    ).resolves.toMatchObject({ type: 'Success' });
+
+    expect(commands.device.emit).toHaveBeenCalledWith(
+      DEVICE.BUTTON,
+      commands.device,
+      expect.objectContaining({ code: 'ButtonRequest_PinEntry' })
+    );
+    expect(commands._commonCall).toHaveBeenCalledWith('ButtonAck', {}, undefined);
+  });
+
+  it('rejects PassphraseRequest when the Pro2 UI listener is not registered', async () => {
+    const commands = createCommands();
+    commands.device = {
+      ...commands.device,
+      listenerCount: jest.fn(() => 0),
+    } as any;
+
+    await expect(
+      commands._filterCommonTypes(
+        {
+          type: 'PassphraseRequest',
+          message: { exists_attach_pin_user: true },
+        } as any,
+        'GetAddress'
+      )
+    ).rejects.toMatchObject({
+      errorCode: HardwareErrorCode.RuntimeError,
+      message: '_promptPassphrase: Passphrase callback not configured',
+    });
+  });
+
+  it('rejects PinMatrixRequest when the Pro2 UI listener is not registered', async () => {
+    const commands = createCommands();
+    commands.device = {
+      ...commands.device,
+      instanceId: 'pro2-test-device',
+      listenerCount: jest.fn(() => 0),
+    } as any;
+
+    await expect(
+      commands._filterCommonTypes(
+        {
+          type: 'PinMatrixRequest',
+          message: { type: 'PinMatrixRequestType_Current' },
+        } as any,
+        'GetAddress'
+      )
+    ).rejects.toMatchObject({
+      errorCode: HardwareErrorCode.RuntimeError,
+    });
+  });
+});

package/__tests__/DeviceEventRegistration.test.ts

@@ -14,11 +14,16 @@ const createDevice = (protocolV2: boolean) => ({
 });
 
 describe('hardware UI event registration', () => {
-  test('does not register hardware-originated UI events for Protocol V2 devices', () => {
+  test('keeps all interactive UI events for Protocol V2 devices during compatibility mode', () => {
     const device = createDevice(true);
 
-    expect(registerHardwareUiEventListeners(device as any, handlers)).toBe(false);
-    expect(device.on).not.toHaveBeenCalled();
+    expect(registerHardwareUiEventListeners(device as any, handlers)).toBe(true);
+    expect(device.on.mock.calls.map(([type]) => type)).toEqual([
+      DEVICE.PIN,
+      DEVICE.BUTTON,
+      DEVICE.PASSPHRASE,
+      DEVICE.PASSPHRASE_ON_DEVICE,
+    ]);
   });
 
   test('keeps the existing interactive event listeners for Protocol V1 devices', () => {

package/dist/api/allnetwork/AllNetworkGetAddressBase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AllNetworkGetAddressBase.d.ts","sourceRoot":"","sources":["../../../src/api/allnetwork/AllNetworkGetAddressBase.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAgB3C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EACV,iBAAiB,EACjB,uBAAuB,EACvB,oBAAoB,EACpB,QAAQ,EACT,MAAM,sCAAsC,CAAC;AAI9C,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,EAAE,MAAM,OAAO,CAAC;IAC1B,SAAS,CAAC,EAAE,CAAC,UAAU,EAAE,uBAAuB,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,KAAK,GAAG,CAAC;IAClG,kBAAkB,CAAC,EAAE,CAAC,MAAM,OAAO,CAAC,EAAE,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,CAAC,CAAC;AAEzF,MAAM,MAAM,gBAAgB,GAAG;KAC5B,CAAC,IAAI,YAAY,GAAG,aAAa;CACnC,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE;IAC3B,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,YAAY,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CAOrD,CAAC;AAiMF,KAAK,YAAY,GAAG;IAClB,UAAU,EAAE,MAAM,OAAO,CAAC;IAC1B,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,oBAAoB,EAAE,uBAAuB,CAAC;IAC9C,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,wBAAyB,SAAQ,UAAU,CACvE;IACE,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,EAAE,CACJ;IACC,eAAe,EAAE,eAAe,GAAG,IAAI,CAAQ;IAE/C,IAAI;IAkBJ,kBAAkB,CAAC,EACjB,OAAO,EACP,OAAO,EACP,aAAa,GACd,EAAE;QACD,OAAO,EAAE,QAAQ,CAAC;QAClB,OAAO,EAAE,uBAAuB,CAAC;QACjC,aAAa,EAAE,MAAM,CAAC;KACvB,GAAG,YAAY;IAqBV,UAAU,CACd,UAAU,EAAE,MAAM,OAAO,EACzB,MAAM,EAAE,GAAG,GAAG;QACZ,MAAM,EAAE,CAAC,GAAG,GAAG;YAAE,oBAAoB,EAAE,oBAAoB,CAAA;SAAE,CAAC,EAAE,CAAC;KAClE,EACD,eAAe,EAAE,MAAM;IAwHzB,QAAQ,CAAC,oBAAoB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAE9E,GAAG;CAuBV"}
+{"version":3,"file":"AllNetworkGetAddressBase.d.ts","sourceRoot":"","sources":["../../../src/api/allnetwork/AllNetworkGetAddressBase.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAe3C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EACV,iBAAiB,EACjB,uBAAuB,EACvB,oBAAoB,EACpB,QAAQ,EACT,MAAM,sCAAsC,CAAC;AAI9C,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,EAAE,MAAM,OAAO,CAAC;IAC1B,SAAS,CAAC,EAAE,CAAC,UAAU,EAAE,uBAAuB,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,KAAK,GAAG,CAAC;IAClG,kBAAkB,CAAC,EAAE,CAAC,MAAM,OAAO,CAAC,EAAE,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,CAAC,CAAC;AAEzF,MAAM,MAAM,gBAAgB,GAAG;KAC5B,CAAC,IAAI,YAAY,GAAG,aAAa;CACnC,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE;IAC3B,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,YAAY,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CAOrD,CAAC;AAiMF,KAAK,YAAY,GAAG;IAClB,UAAU,EAAE,MAAM,OAAO,CAAC;IAC1B,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,oBAAoB,EAAE,uBAAuB,CAAC;IAC9C,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,wBAAyB,SAAQ,UAAU,CACvE;IACE,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,EAAE,CACJ;IACC,eAAe,EAAE,eAAe,GAAG,IAAI,CAAQ;IAE/C,IAAI;IAkBJ,kBAAkB,CAAC,EACjB,OAAO,EACP,OAAO,EACP,aAAa,GACd,EAAE;QACD,OAAO,EAAE,QAAQ,CAAC;QAClB,OAAO,EAAE,uBAAuB,CAAC;QACjC,aAAa,EAAE,MAAM,CAAC;KACvB,GAAG,YAAY;IAqBV,UAAU,CACd,UAAU,EAAE,MAAM,OAAO,EACzB,MAAM,EAAE,GAAG,GAAG;QACZ,MAAM,EAAE,CAAC,GAAG,GAAG;YAAE,oBAAoB,EAAE,oBAAoB,CAAA;SAAE,CAAC,EAAE,CAAC;KAClE,EACD,eAAe,EAAE,MAAM;IAoHzB,QAAQ,CAAC,oBAAoB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAE9E,GAAG;CAuBV"}

package/dist/core/deviceEventRegistration.d.ts

@@ -6,6 +6,5 @@ export type HardwareUiEventHandlers = {
     passphrase: (...event: DeviceEvents[typeof DEVICE.PASSPHRASE]) => void;
     passphraseOnDevice: (...event: DeviceEvents[typeof DEVICE.PASSPHRASE_ON_DEVICE]) => void;
 };
-export declare const shouldRegisterHardwareUiEvents: (device: Pick<Device, 'isProtocolV2'>) => boolean;
-export declare function registerHardwareUiEventListeners(device: Pick<Device, 'isProtocolV2' | 'on'>, handlers: HardwareUiEventHandlers): boolean;
+export declare function registerHardwareUiEventListeners(device: Pick<Device, 'on'>, handlers: HardwareUiEventHandlers): boolean;
 //# sourceMappingURL=deviceEventRegistration.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"deviceEventRegistration.d.ts","sourceRoot":"","sources":["../../src/core/deviceEventRegistration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAE7D,MAAM,MAAM,uBAAuB,GAAG;IACpC,GAAG,EAAE,CAAC,GAAG,KAAK,EAAE,YAAY,CAAC,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;IACzD,MAAM,EAAE,CAAC,GAAG,KAAK,EAAE,YAAY,CAAC,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC;IAC/D,UAAU,EAAE,CAAC,GAAG,KAAK,EAAE,YAAY,CAAC,OAAO,MAAM,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC;IACvE,kBAAkB,EAAE,CAAC,GAAG,KAAK,EAAE,YAAY,CAAC,OAAO,MAAM,CAAC,oBAAoB,CAAC,KAAK,IAAI,CAAC;CAC1F,CAAC;AAEF,eAAO,MAAM,8BAA8B,WAAY,KAAK,MAAM,EAAE,cAAc,CAAC,YAC3D,CAAC;AAEzB,wBAAgB,gCAAgC,CAC9C,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC,EAC3C,QAAQ,EAAE,uBAAuB,WAWlC"}
+{"version":3,"file":"deviceEventRegistration.d.ts","sourceRoot":"","sources":["../../src/core/deviceEventRegistration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAE7D,MAAM,MAAM,uBAAuB,GAAG;IACpC,GAAG,EAAE,CAAC,GAAG,KAAK,EAAE,YAAY,CAAC,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;IACzD,MAAM,EAAE,CAAC,GAAG,KAAK,EAAE,YAAY,CAAC,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC;IAC/D,UAAU,EAAE,CAAC,GAAG,KAAK,EAAE,YAAY,CAAC,OAAO,MAAM,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC;IACvE,kBAAkB,EAAE,CAAC,GAAG,KAAK,EAAE,YAAY,CAAC,OAAO,MAAM,CAAC,oBAAoB,CAAC,KAAK,IAAI,CAAC;CAC1F,CAAC;AAEF,wBAAgB,gCAAgC,CAC9C,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,EAC1B,QAAQ,EAAE,uBAAuB,WAOlC"}

package/dist/index.js

@@ -48610,18 +48610,6 @@ class CipherKeyValue extends BaseMethod {
     }
 }
 
-const shouldRegisterHardwareUiEvents = (device) => !device.isProtocolV2();
-function registerHardwareUiEventListeners(device, handlers) {
-    if (!shouldRegisterHardwareUiEvents(device)) {
-        return false;
-    }
-    device.on(DEVICE.PIN, handlers.pin);
-    device.on(DEVICE.BUTTON, handlers.button);
-    device.on(DEVICE.PASSPHRASE, handlers.passphrase);
-    device.on(DEVICE.PASSPHRASE_ON_DEVICE, handlers.passphraseOnDevice);
-    return true;
-}
-
 const Mainnet = 'mainnet';
 const networkAliases = {
     tbtc: { name: 'btc', coin: 'Testnet' },
@@ -48889,11 +48877,9 @@ class AllNetworkGetAddressBase extends BaseMethod {
                         commandsInstanceId: (_c = this.device.commands) === null || _c === void 0 ? void 0 : _c.instanceId,
                     });
                 }
-                if (shouldRegisterHardwareUiEvents(this.device)) {
-                    this.device.on(DEVICE.BUTTON, buttonListener);
-                    this.device.on(DEVICE.PIN, onSignalAbort);
-                    this.device.on(DEVICE.PASSPHRASE, onSignalAbort);
-                }
+                this.device.on(DEVICE.BUTTON, buttonListener);
+                this.device.on(DEVICE.PIN, onSignalAbort);
+                this.device.on(DEVICE.PASSPHRASE, onSignalAbort);
                 preCheckDeviceSupport(this.device, method);
                 if (this.temporarySafetyCheckPrompted) {
                     method.temporarySafetyCheckPrompted = true;
@@ -48932,11 +48918,9 @@ class AllNetworkGetAddressBase extends BaseMethod {
                 }
             }
             finally {
-                if (shouldRegisterHardwareUiEvents(this.device)) {
-                    this.device.off(DEVICE.BUTTON, buttonListener);
-                    this.device.off(DEVICE.PIN, onSignalAbort);
-                    this.device.off(DEVICE.PASSPHRASE, onSignalAbort);
-                }
+                this.device.off(DEVICE.BUTTON, buttonListener);
+                this.device.off(DEVICE.PIN, onSignalAbort);
+                this.device.off(DEVICE.PASSPHRASE, onSignalAbort);
             }
             return result;
         });
@@ -58185,6 +58169,14 @@ class RequestQueue {
     }
 }
 
+function registerHardwareUiEventListeners(device, handlers) {
+    device.on(DEVICE.PIN, handlers.pin);
+    device.on(DEVICE.BUTTON, handlers.button);
+    device.on(DEVICE.PASSPHRASE, handlers.passphrase);
+    device.on(DEVICE.PASSPHRASE_ON_DEVICE, handlers.passphraseOnDevice);
+    return true;
+}
+
 const getMutex = () => {
     const DEFAULT_ID = Symbol();
     const locks = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.0-alpha.15",
+  "version": "1.2.0-alpha.16",
   "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.15",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.15",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.16",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.16",
     "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": "06dd8f9cba892bb66242e5a51038a7103fb05f09"
+  "gitHead": "2356d951f63a39a46bc995c2090348a383966175"
 }

package/src/api/allnetwork/AllNetworkGetAddressBase.ts

@@ -15,7 +15,6 @@ import { DEVICE, IFRAME, createUiMessage } from '../../events';
 import { isMethodVersionRangeUnsupported } from '../../utils';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { onDeviceButtonHandler } from '../../core';
-import { shouldRegisterHardwareUiEvents } from '../../core/deviceEventRegistration';
 import {
   completeRequestContext,
   createRequestContext,
@@ -365,13 +364,11 @@ export default abstract class AllNetworkGetAddressBase extends BaseMethod<
         });
       }
 
-      if (shouldRegisterHardwareUiEvents(this.device)) {
-        // pro pin event
-        this.device.on(DEVICE.BUTTON, buttonListener);
-        // classic pin event
-        this.device.on(DEVICE.PIN, onSignalAbort);
-        this.device.on(DEVICE.PASSPHRASE, onSignalAbort);
-      }
+      // pro pin event
+      this.device.on(DEVICE.BUTTON, buttonListener);
+      // classic pin event
+      this.device.on(DEVICE.PIN, onSignalAbort);
+      this.device.on(DEVICE.PASSPHRASE, onSignalAbort);
 
       preCheckDeviceSupport(this.device, method);
       if (this.temporarySafetyCheckPrompted) {
@@ -425,11 +422,9 @@ export default abstract class AllNetworkGetAddressBase extends BaseMethod<
         );
       }
     } finally {
-      if (shouldRegisterHardwareUiEvents(this.device)) {
-        this.device.off(DEVICE.BUTTON, buttonListener);
-        this.device.off(DEVICE.PIN, onSignalAbort);
-        this.device.off(DEVICE.PASSPHRASE, onSignalAbort);
-      }
+      this.device.off(DEVICE.BUTTON, buttonListener);
+      this.device.off(DEVICE.PIN, onSignalAbort);
+      this.device.off(DEVICE.PASSPHRASE, onSignalAbort);
     }
 
     return result;

package/src/core/deviceEventRegistration.ts

@@ -9,17 +9,10 @@ export type HardwareUiEventHandlers = {
   passphraseOnDevice: (...event: DeviceEvents[typeof DEVICE.PASSPHRASE_ON_DEVICE]) => void;
 };
 
-export const shouldRegisterHardwareUiEvents = (device: Pick<Device, 'isProtocolV2'>) =>
-  !device.isProtocolV2();
-
 export function registerHardwareUiEventListeners(
-  device: Pick<Device, 'isProtocolV2' | 'on'>,
+  device: Pick<Device, 'on'>,
   handlers: HardwareUiEventHandlers
 ) {
-  if (!shouldRegisterHardwareUiEvents(device)) {
-    return false;
-  }
-
   device.on(DEVICE.PIN, handlers.pin);
   device.on(DEVICE.BUTTON, handlers.button);
   device.on(DEVICE.PASSPHRASE, handlers.passphrase);