@onekeyfe/hd-common-connect-sdk 1.1.34-alpha.2 → 1.1.34-alpha.3

package/__tests__/device-state-event.test.js

@@ -0,0 +1,97 @@
+import { CORE_EVENT, DEVICE, DEVICE_EVENT, initCore } from '@onekeyfe/hd-core';
+
+import HardwareCommonConnectSdk from '../src';
+
+jest.mock('@onekeyfe/hd-core', () => {
+  const actual = jest.requireActual('@onekeyfe/hd-core');
+  return {
+    __esModule: true,
+    ...actual,
+    default: ({ eventEmitter, init, dispose }) => ({
+      init,
+      dispose,
+      on: (type, listener) => eventEmitter.on(type, listener),
+      off: (type, listener) => eventEmitter.off(type, listener),
+      removeAllListeners: type => eventEmitter.removeAllListeners(type),
+    }),
+    initCore: jest.fn(),
+  };
+});
+
+describe('hd-common-connect-sdk device state events', () => {
+  test('forwards KnownDevice connect and disconnect payload wrappers to SDK consumers', async () => {
+    let handleCoreMessage;
+    const core = {
+      on: jest.fn((event, listener) => {
+        if (event === CORE_EVENT) {
+          handleCoreMessage = listener;
+        }
+      }),
+      dispose: jest.fn(),
+    };
+    initCore.mockResolvedValue(core);
+    const onConnect = jest.fn();
+    const onDisconnect = jest.fn();
+    HardwareCommonConnectSdk.on(DEVICE.CONNECT, onConnect);
+    HardwareCommonConnectSdk.on(DEVICE.DISCONNECT, onDisconnect);
+
+    await HardwareCommonConnectSdk.init({ env: 'lowlevel' });
+    const device = {
+      connectId: 'ble-connect-id',
+      serialNo: 'SERIAL-001',
+      uuid: 'SERIAL-001',
+      label: 'OneKey Test',
+    };
+    const payload = { device };
+
+    handleCoreMessage({
+      event: DEVICE_EVENT,
+      type: DEVICE.CONNECT,
+      payload,
+    });
+    handleCoreMessage({
+      event: DEVICE_EVENT,
+      type: DEVICE.DISCONNECT,
+      payload,
+    });
+
+    expect(onConnect).toHaveBeenCalledWith(payload);
+    expect(onDisconnect).toHaveBeenCalledWith(payload);
+    HardwareCommonConnectSdk.removeAllListeners(DEVICE.CONNECT);
+    HardwareCommonConnectSdk.removeAllListeners(DEVICE.DISCONNECT);
+    await HardwareCommonConnectSdk.dispose();
+  });
+
+  test('forwards Protocol V2 DEVICE.STATE payloads to SDK consumers', async () => {
+    let handleCoreMessage;
+    const core = {
+      on: jest.fn((event, listener) => {
+        if (event === CORE_EVENT) {
+          handleCoreMessage = listener;
+        }
+      }),
+      dispose: jest.fn(),
+    };
+    initCore.mockResolvedValue(core);
+    const listener = jest.fn();
+    HardwareCommonConnectSdk.on(DEVICE.STATE, listener);
+
+    await HardwareCommonConnectSdk.init({ env: 'webusb' });
+    const payload = {
+      connectId: 'connect-id',
+      revision: 1,
+      source: 'device-info',
+      changedKeys: ['protocolVersion'],
+      state: { protocol: 'V2', protocolVersion: 2 },
+    };
+    handleCoreMessage({
+      event: DEVICE_EVENT,
+      type: DEVICE.STATE,
+      payload,
+    });
+
+    expect(listener).toHaveBeenCalledWith(payload);
+    HardwareCommonConnectSdk.removeAllListeners(DEVICE.STATE);
+    await HardwareCommonConnectSdk.dispose();
+  });
+});

package/dist/index.js

@@ -586,8 +586,9 @@ var getTransport = function (env) { return __awaiter(void 0, void 0, void 0, fun
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                if (env === 'desktop-web-ble')
+                if (env === 'desktop-web-ble') {
                     return [2 /*return*/, hdTransportWebDevice.ElectronBleTransport];
+                }
                 if (env === 'webusb' || env === 'desktop-webusb')
                     return [2 /*return*/, hdTransportWebDevice.WebUsbTransport];
                 if (env === 'lowlevel')
@@ -626,13 +627,17 @@ var cancel = function (connectId) {
         return;
     _core.handleMessage({ event: HardwareSdk.IFRAME.CANCEL, type: HardwareSdk.IFRAME.CANCEL, payload: { connectId: connectId } });
 };
+var cancelOperation = function (operationId) {
+    _core === null || _core === void 0 ? void 0 : _core.cancelOperation(operationId);
+};
 function handleMessage(message) {
     var event = message.event;
     if (!_core) {
         return;
     }
+    var blockLog = HardwareSdk.getLogBlockLabel(message);
     if (event !== HardwareSdk.LOG_EVENT) {
-        Log.debug('hd-common-connect-sdk handleMessage', message);
+        Log.debug('hd-common-connect-sdk handleMessage', blockLog !== null && blockLog !== void 0 ? blockLog : message);
     }
     switch (event) {
         case HardwareSdk.UI_EVENT:
@@ -645,7 +650,13 @@ function handleMessage(message) {
             eventEmitter.emit(message.event, message);
             break;
         case HardwareSdk.DEVICE_EVENT:
-            if ([HardwareSdk.DEVICE.CONNECT, HardwareSdk.DEVICE.DISCONNECT, HardwareSdk.DEVICE.FEATURES, HardwareSdk.DEVICE.SUPPORT_FEATURES].includes(message.type)) {
+            if ([
+                HardwareSdk.DEVICE.CONNECT,
+                HardwareSdk.DEVICE.DISCONNECT,
+                HardwareSdk.DEVICE.FEATURES,
+                HardwareSdk.DEVICE.STATE,
+                HardwareSdk.DEVICE.SUPPORT_FEATURES,
+            ].includes(message.type)) {
                 eventEmitter.emit(message.type, message.payload);
             }
             break;
@@ -713,12 +724,13 @@ var init = function (settings, _, plugin) { return __awaiter(void 0, void 0, voi
     });
 }); };
 var call = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var response, error_2;
+    var blockLog, response, error_2;
     var _a, _b, _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
             case 0:
-                Log.debug('call: ', params);
+                blockLog = HardwareSdk.getLogBlockLabel(params);
+                Log.debug('call: ', blockLog !== null && blockLog !== void 0 ? blockLog : params);
                 _d.label = 1;
             case 1:
                 _d.trys.push([1, 3, , 4]);
@@ -756,6 +768,7 @@ var HardwareCommonConnectSdk = HardwareSdk__default["default"]({
     init: init,
     call: call,
     cancel: cancel,
+    cancelOperation: cancelOperation,
     dispose: dispose,
     uiResponse: uiResponse,
     updateSettings: updateSettings,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-common-connect-sdk",
-  "version": "1.1.34-alpha.2",
+  "version": "1.1.34-alpha.3",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "ISC",
@@ -20,13 +20,13 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-core": "1.1.34-alpha.2",
-    "@onekeyfe/hd-shared": "1.1.34-alpha.2",
-    "@onekeyfe/hd-transport-emulator": "1.1.34-alpha.2",
-    "@onekeyfe/hd-transport-http": "1.1.34-alpha.2",
-    "@onekeyfe/hd-transport-lowlevel": "1.1.34-alpha.2",
-    "@onekeyfe/hd-transport-usb": "1.1.34-alpha.2",
-    "@onekeyfe/hd-transport-web-device": "1.1.34-alpha.2"
+    "@onekeyfe/hd-core": "1.1.34-alpha.3",
+    "@onekeyfe/hd-shared": "1.1.34-alpha.3",
+    "@onekeyfe/hd-transport-emulator": "1.1.34-alpha.3",
+    "@onekeyfe/hd-transport-http": "1.1.34-alpha.3",
+    "@onekeyfe/hd-transport-lowlevel": "1.1.34-alpha.3",
+    "@onekeyfe/hd-transport-usb": "1.1.34-alpha.3",
+    "@onekeyfe/hd-transport-web-device": "1.1.34-alpha.3"
   },
-  "gitHead": "dee167c35d191f3f4e02c4cb6228e1f926f929ec"
+  "gitHead": "3688bc8495eeb2ffd5616270d13fa29e8967623a"
 }

package/src/index.ts

@@ -13,6 +13,7 @@ import HardwareSdk, {
   createUiMessage,
   enableLog,
   executeCallback,
+  getLogBlockLabel,
   getLogger,
   initCore,
   parseConnectSettings,
@@ -38,7 +39,9 @@ const eventEmitter = new EventEmitter();
 const Log = getLogger(LoggerNames.HdCommonConnectSdk);
 
 const getTransport = async (env: ConnectSettings['env']) => {
-  if (env === 'desktop-web-ble') return ElectronBleTransport;
+  if (env === 'desktop-web-ble') {
+    return ElectronBleTransport;
+  }
   if (env === 'webusb' || env === 'desktop-webusb') return WebUsbTransport;
   if (env === 'lowlevel') return LowlevelTransport;
   if (env === 'node-usb') {
@@ -76,14 +79,19 @@ const cancel = (connectId?: string) => {
   _core.handleMessage({ event: IFRAME.CANCEL, type: IFRAME.CANCEL, payload: { connectId } });
 };
 
+const cancelOperation = (operationId: string) => {
+  _core?.cancelOperation(operationId);
+};
+
 function handleMessage(message: CoreMessage) {
   const { event } = message;
   if (!_core) {
     return;
   }
 
+  const blockLog = getLogBlockLabel(message);
   if (event !== LOG_EVENT) {
-    Log.debug('hd-common-connect-sdk handleMessage', message);
+    Log.debug('hd-common-connect-sdk handleMessage', blockLog ?? message);
   }
   switch (event) {
     case UI_EVENT:
@@ -98,7 +106,13 @@ function handleMessage(message: CoreMessage) {
     case DEVICE_EVENT:
       if (
         (
-          [DEVICE.CONNECT, DEVICE.DISCONNECT, DEVICE.FEATURES, DEVICE.SUPPORT_FEATURES] as string[]
+          [
+            DEVICE.CONNECT,
+            DEVICE.DISCONNECT,
+            DEVICE.FEATURES,
+            DEVICE.STATE,
+            DEVICE.SUPPORT_FEATURES,
+          ] as string[]
         ).includes(message.type)
       ) {
         eventEmitter.emit(message.type, message.payload);
@@ -157,7 +171,8 @@ const init = async (
 };
 
 const call = async (params: any) => {
-  Log.debug('call: ', params);
+  const blockLog = getLogBlockLabel(params);
+  Log.debug('call: ', blockLog ?? params);
 
   try {
     const response = await postMessage({ event: IFRAME.CALL, type: IFRAME.CALL, payload: params });
@@ -194,6 +209,7 @@ const HardwareCommonConnectSdk = HardwareSdk({
   init,
   call,
   cancel,
+  cancelOperation,
   dispose,
   uiResponse,
   updateSettings,