@onekeyfe/hd-ble-sdk 1.2.8 → 1.2.10-alpha.2

package/__tests__/device-state-events.test.ts

@@ -1,8 +1,16 @@
 import { readFileSync } from 'fs';
 import { resolve } from 'path';
 import EventEmitter from 'events';
-import { CORE_EVENT, initCore } from '@onekeyfe/hd-core';
-import { createDeferred } from '@onekeyfe/hd-shared';
+import {
+  CORE_EVENT,
+  IFRAME,
+  LoggerNames,
+  UI_EVENT,
+  UI_REQUEST,
+  getLog,
+  initCore,
+} from '@onekeyfe/hd-core';
+import { HardwareErrorCode, createDeferred } from '@onekeyfe/hd-shared';
 
 import sdkExport, { messagePromises } from '../src';
 
@@ -57,6 +65,17 @@ describe('SDK request cleanup', () => {
     await sdk.dispose();
   });
 
+  test.each([
+    [HardwareErrorCode.BlePoweredOff, UI_REQUEST.BLUETOOTH_POWERED_OFF],
+    [HardwareErrorCode.BleUnsupported, UI_REQUEST.BLUETOOTH_UNSUPPORTED],
+    [HardwareErrorCode.BleLocationError, UI_REQUEST.LOCATION_PERMISSION],
+  ])('emits the adapter UI request for error %s', async (code, type) => {
+    const response = { success: false, payload: { code, error: 'Adapter unavailable' } };
+    core.handleMessage.mockResolvedValueOnce(response);
+    await expect(sdk.call({ method: 'searchDevices' })).resolves.toEqual(response);
+    expect(core.handleMessage).toHaveBeenNthCalledWith(2, expect.objectContaining({ type }));
+  });
+
   test('removes only the completed request when calls settle out of order', async () => {
     const first = createDeferred<unknown>();
     const second = createDeferred<unknown>();
@@ -72,6 +91,31 @@ describe('SDK request cleanup', () => {
     expect(Object.keys(messagePromises)).toHaveLength(0);
   });
 
+  test('keeps Monero and Zcash addresses out of the handled-message log', () => {
+    core.emit(CORE_EVENT, {
+      event: UI_EVENT,
+      type: UI_REQUEST.PREVIOUS_ADDRESS_RESULT,
+      payload: {
+        device: {},
+        method: 'moneroGetAddress',
+        data: { address: 'synthetic-xmr-address-marker', path: "m/44'/128'/0'" },
+      },
+    });
+    core.emit(CORE_EVENT, {
+      event: IFRAME.CALLBACK,
+      type: IFRAME.CALLBACK,
+      payload: {
+        callbackId: 'unregistered',
+        data: { network: 'zcash', success: true, payload: { ufvk: 'synthetic-ufvk-marker' } },
+      },
+    });
+
+    const logged = JSON.stringify(getLog().filter(entry => entry.prefix === LoggerNames.HdBleSdk));
+    expect(logged).toContain('moneroGetAddress');
+    expect(logged).toContain('unregistered');
+    expect(logged).not.toContain('synthetic-');
+  });
+
   test('waits for Core disposal and does not retain old listeners after reinitialization', async () => {
     const cleanup = createDeferred<void>();
     core.dispose.mockImplementationOnce(async () => {

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AASpD,eAAO,MAAM,eAAe,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAA;CAAO,CAAC;AA+JpE,QAAA,MAAM,cAAc,qCASlB,CAAC;AAEH,eAAe,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AASpD,eAAO,MAAM,eAAe,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAA;CAAO,CAAC;AAyKpE,QAAA,MAAM,cAAc,qCASlB,CAAC;AAEH,eAAe,cAAc,CAAC"}

package/dist/index.js

@@ -562,7 +562,8 @@ function handleMessage(message) {
                 });
             }
             else {
-                Log.debug('hd-ble-sdk handleMessage', JSON.stringify(message));
+                const blockLog = HardwareSdk.getLogBlockLabel(message);
+                Log.debug('hd-ble-sdk handleMessage', blockLog ? { event, type, method: blockLog } : JSON.stringify(HardwareSdk.getSafeLogPayload(message)));
             }
         }
         catch (error) {
@@ -632,7 +633,7 @@ const init = (settings) => __awaiter(void 0, void 0, void 0, function* () {
     }
 });
 const call = (params) => __awaiter(void 0, void 0, void 0, function* () {
-    var _b, _c, _d;
+    var _b, _c, _d, _e, _f;
     const blockLog = HardwareSdk.getLogBlockLabel(params);
     Log.debug('call: ', blockLog !== null && blockLog !== void 0 ? blockLog : params);
     try {
@@ -640,13 +641,19 @@ const call = (params) => __awaiter(void 0, void 0, void 0, function* () {
         if (response) {
             Log.debug('response: ', blockLog ? '[REDACTED]' : response);
             if (!response.success) {
-                if (((_b = response.payload) === null || _b === void 0 ? void 0 : _b.code) === hdShared.HardwareErrorCode.BlePermissionError) {
+                if (((_b = response.payload) === null || _b === void 0 ? void 0 : _b.code) === hdShared.HardwareErrorCode.BlePoweredOff) {
+                    postMessage(HardwareSdk.createUiMessage(HardwareSdk.UI_REQUEST.BLUETOOTH_POWERED_OFF), false);
+                }
+                if (((_c = response.payload) === null || _c === void 0 ? void 0 : _c.code) === hdShared.HardwareErrorCode.BleUnsupported) {
+                    postMessage(HardwareSdk.createUiMessage(HardwareSdk.UI_REQUEST.BLUETOOTH_UNSUPPORTED), false);
+                }
+                if (((_d = response.payload) === null || _d === void 0 ? void 0 : _d.code) === hdShared.HardwareErrorCode.BlePermissionError) {
                     postMessage(HardwareSdk.createUiMessage(HardwareSdk.UI_REQUEST.BLUETOOTH_PERMISSION), false);
                 }
-                if (((_c = response.payload) === null || _c === void 0 ? void 0 : _c.code) === hdShared.HardwareErrorCode.BleLocationError) {
+                if (((_e = response.payload) === null || _e === void 0 ? void 0 : _e.code) === hdShared.HardwareErrorCode.BleLocationError) {
                     postMessage(HardwareSdk.createUiMessage(HardwareSdk.UI_REQUEST.LOCATION_PERMISSION), false);
                 }
-                if (((_d = response.payload) === null || _d === void 0 ? void 0 : _d.code) === hdShared.HardwareErrorCode.BleLocationServicesDisabled) {
+                if (((_f = response.payload) === null || _f === void 0 ? void 0 : _f.code) === hdShared.HardwareErrorCode.BleLocationServicesDisabled) {
                     postMessage(HardwareSdk.createUiMessage(HardwareSdk.UI_REQUEST.LOCATION_SERVICE_PERMISSION), false);
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-ble-sdk",
-  "version": "1.2.8",
+  "version": "1.2.10-alpha.2",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "ISC",
@@ -21,9 +21,9 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-core": "1.2.8",
-    "@onekeyfe/hd-shared": "1.2.8",
-    "@onekeyfe/hd-transport-react-native": "1.2.8"
+    "@onekeyfe/hd-core": "1.2.10-alpha.2",
+    "@onekeyfe/hd-shared": "1.2.10-alpha.2",
+    "@onekeyfe/hd-transport-react-native": "1.2.10-alpha.2"
   },
-  "gitHead": "9f016278a7f395bf66b8502815dc63191e162fd3"
+  "gitHead": "2bcc72a43379abb005405f18f914330f3f2dbfd7"
 }

package/src/index.ts

@@ -15,6 +15,7 @@ import HardwareSdk, {
   executeCallback,
   getLogBlockLabel,
   getLogger,
+  getSafeLogPayload,
   initCore,
   parseConnectSettings,
   setLoggerPostMessage,
@@ -72,7 +73,11 @@ function handleMessage(message: CoreMessage) {
           progress: message?.payload?.progress,
         });
       } else {
-        Log.debug('hd-ble-sdk handleMessage', JSON.stringify(message));
+        const blockLog = getLogBlockLabel(message);
+        Log.debug(
+          'hd-ble-sdk handleMessage',
+          blockLog ? { event, type, method: blockLog } : JSON.stringify(getSafeLogPayload(message))
+        );
       }
     } catch (error) {
       // ignore
@@ -162,6 +167,12 @@ const call = async (params: any) => {
       Log.debug('response: ', blockLog ? '[REDACTED]' : response);
 
       if (!response.success) {
+        if (response.payload?.code === HardwareErrorCode.BlePoweredOff) {
+          postMessage(createUiMessage(UI_REQUEST.BLUETOOTH_POWERED_OFF), false);
+        }
+        if (response.payload?.code === HardwareErrorCode.BleUnsupported) {
+          postMessage(createUiMessage(UI_REQUEST.BLUETOOTH_UNSUPPORTED), false);
+        }
         if (response.payload?.code === HardwareErrorCode.BlePermissionError) {
           /**
            * Send message notification when there is no Bluetooth access permission