@onekeyfe/hd-ble-sdk 1.2.8-alpha.6 → 1.2.8-alpha.9

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

@@ -1,8 +1,8 @@
 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, UI_REQUEST, initCore } from '@onekeyfe/hd-core';
+import { HardwareErrorCode, createDeferred } from '@onekeyfe/hd-shared';
 
 import sdkExport, { messagePromises } from '../src';
 
@@ -57,6 +57,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>();

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":"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;AAqKpE,QAAA,MAAM,cAAc,qCASlB,CAAC;AAEH,eAAe,cAAc,CAAC"}

package/dist/index.js

@@ -632,7 +632,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 +640,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-alpha.6",
+  "version": "1.2.8-alpha.9",
   "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-alpha.6",
-    "@onekeyfe/hd-shared": "1.2.8-alpha.6",
-    "@onekeyfe/hd-transport-react-native": "1.2.8-alpha.6"
+    "@onekeyfe/hd-core": "1.2.8-alpha.9",
+    "@onekeyfe/hd-shared": "1.2.8-alpha.9",
+    "@onekeyfe/hd-transport-react-native": "1.2.8-alpha.9"
   },
-  "gitHead": "eba2e870aaf79093ba41c67eb616f7239527a84b"
+  "gitHead": "37659eef6ee06b7aa07faeb8f791f884b1b3e890"
 }

package/src/index.ts

@@ -162,6 +162,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