@onekeyfe/hd-ble-sdk 0.1.5 → 0.1.6

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _onekeyfe_hd_core from '@onekeyfe/hd-core';
-import { Deferred } from '@onekeyfe/hd-core';
+import { Deferred } from '@onekeyfe/hd-shared';
 
 declare const messagePromises: {
     [key: number]: Deferred<any>;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAoB,EAYlB,QAAQ,EAMT,MAAM,mBAAmB,CAAC;AAa3B,eAAO,MAAM,eAAe,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAA;CAAO,CAAC;AA2GpE,QAAA,MAAM,cAAc,qCAOlB,CAAC;AAEH,eAAe,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAiBA,OAAO,EAA0B,QAAQ,EAAqB,MAAM,qBAAqB,CAAC;AAU1F,eAAO,MAAM,eAAe,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAA;CAAO,CAAC;AAwGpE,QAAA,MAAM,cAAc,qCAOlB,CAAC;AAEH,eAAe,cAAc,CAAC"}

package/dist/index.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var HardwareSdk = require('@onekeyfe/hd-core');
+var hdShared = require('@onekeyfe/hd-shared');
 var ReactNativeTransport = require('@onekeyfe/hd-transport-react-native');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -523,7 +524,7 @@ const dispose = () => {
 };
 const uiResponse = (response) => {
     if (!_core) {
-        throw HardwareSdk.ERRORS.TypedError('Init_NotInitialized');
+        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NotInitialized);
     }
     const { type, payload } = response;
     _core.handleMessage({ event: HardwareSdk.UI_EVENT, type, payload });
@@ -551,11 +552,11 @@ function handleMessage(message) {
 function postMessage(message, usePromise = true) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!_core) {
-            throw HardwareSdk.ERRORS.TypedError('Runtime', 'postMessage: _core not found');
+            throw hdShared.ERRORS.TypedError('postMessage: _core not found');
         }
         if (usePromise) {
             _messageID++;
-            messagePromises[_messageID] = HardwareSdk.create();
+            messagePromises[_messageID] = hdShared.createDeferred();
             const response = yield _core.handleMessage(Object.assign(Object.assign({}, message), { id: `${_messageID}` }));
             return response;
         }
@@ -584,17 +585,16 @@ const call = (params) => __awaiter(void 0, void 0, void 0, function* () {
         if (response) {
             Log.debug('response: ', response);
             if (!response.success) {
-                if ((typeof response.payload === 'string' && response.payload.includes(ReactNativeTransport.PERMISSION_ERROR)) ||
-                    ((_a = response.payload.error) === null || _a === void 0 ? void 0 : _a.includes(ReactNativeTransport.PERMISSION_ERROR))) {
+                if (((_a = response.payload) === null || _a === void 0 ? void 0 : _a.code) === hdShared.HardwareErrorCode.BlePermissionError) {
                     postMessage(HardwareSdk.createUiMessage(HardwareSdk.UI_REQUEST.BLUETOOTH_PERMISSION), false);
                 }
-                if ((_b = response.payload.error) === null || _b === void 0 ? void 0 : _b.includes(ReactNativeTransport.LOCATION_ERROR)) {
+                if (((_b = response.payload) === null || _b === void 0 ? void 0 : _b.code) === hdShared.HardwareErrorCode.BleLocationError) {
                     postMessage(HardwareSdk.createUiMessage(HardwareSdk.UI_REQUEST.LOCATION_PERMISSION), false);
                 }
             }
             return response;
         }
-        return HardwareSdk.createErrorMessage(HardwareSdk.ERRORS.TypedError('Call_NotResponse'));
+        return HardwareSdk.createErrorMessage(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodNotResponse));
     }
     catch (error) {
         Log.error('__call error: ', error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-ble-sdk",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "ISC",
@@ -20,8 +20,9 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-core": "^0.1.5",
-    "@onekeyfe/hd-transport-react-native": "^0.1.5"
+    "@onekeyfe/hd-core": "^0.1.6",
+    "@onekeyfe/hd-shared": "^0.1.6",
+    "@onekeyfe/hd-transport-react-native": "^0.1.6"
   },
-  "gitHead": "26a2b960d5e1917d3f2217cef449269200a1a376"
+  "gitHead": "ebe2789fa24cbfb798c9be445678e71e67e33d71"
 }

package/src/index.ts

@@ -10,18 +10,13 @@ import HardwareSdk, {
   createUiMessage,
   CORE_EVENT,
   CoreMessage,
-  ERRORS,
-  Deferred,
-  create as createDeferred,
   IFRAME,
   UI_EVENT,
   UiResponseEvent,
   UI_REQUEST,
 } from '@onekeyfe/hd-core';
-import ReactNativeTransport, {
-  PERMISSION_ERROR,
-  LOCATION_ERROR,
-} from '@onekeyfe/hd-transport-react-native';
+import { ERRORS, createDeferred, Deferred, HardwareErrorCode } from '@onekeyfe/hd-shared';
+import ReactNativeTransport from '@onekeyfe/hd-transport-react-native';
 
 const eventEmitter = new EventEmitter();
 const Log = initLog('@onekey/hd-ble-sdk');
@@ -39,7 +34,7 @@ const dispose = () => {
 
 const uiResponse = (response: UiResponseEvent) => {
   if (!_core) {
-    throw ERRORS.TypedError('Init_NotInitialized');
+    throw ERRORS.TypedError(HardwareErrorCode.NotInitialized);
   }
   const { type, payload } = response;
   _core.handleMessage({ event: UI_EVENT, type, payload });
@@ -70,7 +65,7 @@ function handleMessage(message: CoreMessage) {
 
 async function postMessage(message: CoreMessage, usePromise = true) {
   if (!_core) {
-    throw ERRORS.TypedError('Runtime', 'postMessage: _core not found');
+    throw ERRORS.TypedError('postMessage: _core not found');
   }
 
   if (usePromise) {
@@ -112,17 +107,14 @@ const call = async (params: any) => {
       Log.debug('response: ', response);
 
       if (!response.success) {
-        if (
-          (typeof response.payload === 'string' && response.payload.includes(PERMISSION_ERROR)) ||
-          response.payload.error?.includes(PERMISSION_ERROR)
-        ) {
+        if (response.payload?.code === HardwareErrorCode.BlePermissionError) {
           /**
            * Send message notification when there is no Bluetooth access permission
            */
           postMessage(createUiMessage(UI_REQUEST.BLUETOOTH_PERMISSION), false);
         }
 
-        if (response.payload.error?.includes(LOCATION_ERROR)) {
+        if (response.payload?.code === HardwareErrorCode.BleLocationError) {
           postMessage(createUiMessage(UI_REQUEST.LOCATION_PERMISSION), false);
         }
       }
@@ -130,7 +122,7 @@ const call = async (params: any) => {
       return response;
     }
 
-    return createErrorMessage(ERRORS.TypedError('Call_NotResponse'));
+    return createErrorMessage(ERRORS.TypedError(HardwareErrorCode.CallMethodNotResponse));
   } catch (error) {
     Log.error('__call error: ', error);
     return createErrorMessage(error);