@onekeyfe/hd-common-connect-sdk 1.2.0-alpha.16 → 1.2.0-alpha.161

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/__tests__/device-state-events.test.ts

@@ -0,0 +1,11 @@
+import { readFileSync } from 'fs';
+import { resolve } from 'path';
+
+describe('hd-common-connect-sdk device state events', () => {
+  test('forwards the canonical DEVICE.STATE event to SDK consumers', () => {
+    const source = readFileSync(resolve(__dirname, '../src/index.ts'), 'utf8');
+
+    expect(source).toContain('DEVICE.STATE');
+    expect(source).toContain('eventEmitter.emit(message.type, message.payload)');
+  });
+});

package/dist/index.js

@@ -609,12 +609,26 @@ var _core;
 var _settings = HardwareSdk.parseConnectSettings();
 var _messageID = 0;
 var messagePromises = {};
-var dispose = function () {
+var dispose = function () { return __awaiter(void 0, void 0, void 0, function () {
+    var core;
     var _a;
-    eventEmitter.removeAllListeners();
-    (_a = _core === null || _core === void 0 ? void 0 : _core.dispose) === null || _a === void 0 ? void 0 : _a.call(_core);
-    _settings = HardwareSdk.parseConnectSettings();
-};
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                core = _core;
+                _core = undefined;
+                eventEmitter.removeAllListeners();
+                Object.keys(messagePromises).forEach(function (key) {
+                    delete messagePromises[Number(key)];
+                });
+                _settings = HardwareSdk.parseConnectSettings();
+                return [4 /*yield*/, ((_a = core === null || core === void 0 ? void 0 : core.dispose) === null || _a === void 0 ? void 0 : _a.call(core))];
+            case 1:
+                _b.sent();
+                return [2 /*return*/];
+        }
+    });
+}); };
 var uiResponse = function (response) {
     if (!_core) {
         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NotInitialized);
@@ -627,18 +641,11 @@ 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', blockLog !== null && blockLog !== void 0 ? blockLog : message);
-    }
     switch (event) {
         case HardwareSdk.UI_EVENT:
             // pass UI event up
@@ -650,7 +657,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;
@@ -732,7 +745,7 @@ var call = function (params) { return __awaiter(void 0, void 0, void 0, function
             case 2:
                 response = _d.sent();
                 if (response) {
-                    Log.debug('response: ', response);
+                    Log.debug('response: ', blockLog ? '[REDACTED]' : response);
                     if (!response.success) {
                         if (((_a = response.payload) === null || _a === void 0 ? void 0 : _a.code) === hdShared.HardwareErrorCode.BleUnsupported) {
                             postMessage(HardwareSdk.createUiMessage(HardwareSdk.UI_REQUEST.BLUETOOTH_UNSUPPORTED), false);
@@ -762,7 +775,6 @@ 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.2.0-alpha.16",
+  "version": "1.2.0-alpha.161",
   "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.2.0-alpha.16",
-    "@onekeyfe/hd-shared": "1.2.0-alpha.16",
-    "@onekeyfe/hd-transport-emulator": "1.2.0-alpha.16",
-    "@onekeyfe/hd-transport-http": "1.2.0-alpha.16",
-    "@onekeyfe/hd-transport-lowlevel": "1.2.0-alpha.16",
-    "@onekeyfe/hd-transport-usb": "1.2.0-alpha.16",
-    "@onekeyfe/hd-transport-web-device": "1.2.0-alpha.16"
+    "@onekeyfe/hd-core": "1.2.0-alpha.161",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.161",
+    "@onekeyfe/hd-transport-emulator": "1.2.0-alpha.161",
+    "@onekeyfe/hd-transport-http": "1.2.0-alpha.161",
+    "@onekeyfe/hd-transport-lowlevel": "1.2.0-alpha.161",
+    "@onekeyfe/hd-transport-usb": "1.2.0-alpha.161",
+    "@onekeyfe/hd-transport-web-device": "1.2.0-alpha.161"
   },
-  "gitHead": "2356d951f63a39a46bc995c2090348a383966175"
+  "gitHead": "06316117fc9a7ebaecea1ca583b2d105709361bf"
 }

package/src/index.ts

@@ -60,10 +60,15 @@ let _settings = parseConnectSettings();
 let _messageID = 0;
 export const messagePromises: { [key: number]: Deferred<any> } = {};
 
-const dispose = () => {
+const dispose = async () => {
+  const core = _core;
+  _core = undefined;
   eventEmitter.removeAllListeners();
-  _core?.dispose?.();
+  Object.keys(messagePromises).forEach(key => {
+    delete messagePromises[Number(key)];
+  });
   _settings = parseConnectSettings();
+  await core?.dispose?.();
 };
 
 const uiResponse = (response: UiResponseEvent) => {
@@ -79,20 +84,12 @@ 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', blockLog ?? message);
-  }
   switch (event) {
     case UI_EVENT:
       // pass UI event up
@@ -106,7 +103,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);
@@ -171,7 +174,7 @@ const call = async (params: any) => {
   try {
     const response = await postMessage({ event: IFRAME.CALL, type: IFRAME.CALL, payload: params });
     if (response) {
-      Log.debug('response: ', response);
+      Log.debug('response: ', blockLog ? '[REDACTED]' : response);
 
       if (!response.success) {
         if (response.payload?.code === HardwareErrorCode.BleUnsupported) {
@@ -203,7 +206,6 @@ const HardwareCommonConnectSdk = HardwareSdk({
   init,
   call,
   cancel,
-  cancelOperation,
   dispose,
   uiResponse,
   updateSettings,