@onekeyfe/hd-ble-sdk 0.1.43 → 0.1.46

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAuBA,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;AAyHpE,QAAA,MAAM,cAAc,qCAOlB,CAAC;AAEH,eAAe,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAuBA,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;AA4HpE,QAAA,MAAM,cAAc,qCAOlB,CAAC;AAEH,eAAe,cAAc,CAAC"}

package/dist/index.js

@@ -1,6 +1,15 @@
-import HardwareSdk, { getLogger, LoggerNames, parseConnectSettings, IFRAME, createUiMessage, UI_REQUEST, createErrorMessage, enableLog, initCore, CORE_EVENT, setLoggerPostMessage, UI_EVENT, LOG_EVENT, DEVICE_EVENT, DEVICE, FIRMWARE_EVENT } from '@onekeyfe/hd-core';
-import { ERRORS, HardwareErrorCode, createDeferred } from '@onekeyfe/hd-shared';
-import ReactNativeTransport from '@onekeyfe/hd-transport-react-native';
+'use strict';
+
+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 }; }
+
+var HardwareSdk__default = /*#__PURE__*/_interopDefaultLegacy(HardwareSdk);
+var ReactNativeTransport__default = /*#__PURE__*/_interopDefaultLegacy(ReactNativeTransport);
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -504,46 +513,46 @@ function eventTargetAgnosticAddListener(emitter, name, listener, flags) {
 }
 
 const eventEmitter = new events.exports();
-const Log = getLogger(LoggerNames.HdBleSdk);
+const Log = HardwareSdk.getLogger(HardwareSdk.LoggerNames.HdBleSdk);
 let _core;
-let _settings = parseConnectSettings();
+let _settings = HardwareSdk.parseConnectSettings();
 let _messageID = 0;
 const messagePromises = {};
 const dispose = () => {
     eventEmitter.removeAllListeners();
-    _settings = parseConnectSettings();
+    _settings = HardwareSdk.parseConnectSettings();
 };
 const uiResponse = (response) => {
     if (!_core) {
-        throw ERRORS.TypedError(HardwareErrorCode.NotInitialized);
+        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NotInitialized);
     }
     const { type, payload } = response;
-    _core.handleMessage({ event: UI_EVENT, type, payload });
+    _core.handleMessage({ event: HardwareSdk.UI_EVENT, type, payload });
 };
 const cancel = (connectId) => {
     if (_core === undefined)
         return;
-    _core.handleMessage({ event: IFRAME.CANCEL, type: IFRAME.CANCEL, payload: { connectId } });
+    _core.handleMessage({ event: HardwareSdk.IFRAME.CANCEL, type: HardwareSdk.IFRAME.CANCEL, payload: { connectId } });
 };
 function handleMessage(message) {
     const { event } = message;
     if (!_core) {
         return;
     }
-    if (event !== LOG_EVENT) {
+    if (event !== HardwareSdk.LOG_EVENT) {
         Log.debug('hd-ble-sdk handleMessage', message);
     }
     switch (event) {
-        case UI_EVENT:
+        case HardwareSdk.UI_EVENT:
             eventEmitter.emit(message.event, message);
             eventEmitter.emit(message.type, message.payload);
             break;
-        case LOG_EVENT:
-        case FIRMWARE_EVENT:
+        case HardwareSdk.LOG_EVENT:
+        case HardwareSdk.FIRMWARE_EVENT:
             eventEmitter.emit(message.event, message);
             break;
-        case DEVICE_EVENT:
-            if ([DEVICE.CONNECT, DEVICE.DISCONNECT, DEVICE.FEATURES, DEVICE.SUPPORT_FEATURES].includes(message.type)) {
+        case HardwareSdk.DEVICE_EVENT:
+            if ([HardwareSdk.DEVICE.CONNECT, HardwareSdk.DEVICE.DISCONNECT, HardwareSdk.DEVICE.FEATURES, HardwareSdk.DEVICE.SUPPORT_FEATURES].includes(message.type)) {
                 eventEmitter.emit(message.type, message.payload);
             }
             break;
@@ -554,11 +563,11 @@ function handleMessage(message) {
 function postMessage(message, usePromise = true) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!_core) {
-            throw ERRORS.TypedError('postMessage: _core not found');
+            throw hdShared.ERRORS.TypedError('postMessage: _core not found');
         }
         if (usePromise) {
             _messageID++;
-            messagePromises[_messageID] = createDeferred();
+            messagePromises[_messageID] = hdShared.createDeferred();
             const response = yield _core.handleMessage(Object.assign(Object.assign({}, message), { id: `${_messageID}` }));
             return response;
         }
@@ -567,44 +576,47 @@ function postMessage(message, usePromise = true) {
 }
 const init = (settings) => __awaiter(void 0, void 0, void 0, function* () {
     _settings = Object.assign(Object.assign(Object.assign({}, _settings), settings), { env: 'react-native' });
-    enableLog(!!settings.debug);
+    HardwareSdk.enableLog(!!settings.debug);
     Log.debug('init');
     try {
-        _core = yield initCore(_settings, ReactNativeTransport);
-        _core === null || _core === void 0 ? void 0 : _core.on(CORE_EVENT, handleMessage);
-        setLoggerPostMessage(handleMessage);
+        _core = yield HardwareSdk.initCore(_settings, ReactNativeTransport__default["default"]);
+        _core === null || _core === void 0 ? void 0 : _core.on(HardwareSdk.CORE_EVENT, handleMessage);
+        HardwareSdk.setLoggerPostMessage(handleMessage);
         return true;
     }
     catch (error) {
-        Log.error(createErrorMessage(error));
+        Log.error(HardwareSdk.createErrorMessage(error));
         return false;
     }
 });
 const call = (params) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
+    var _a, _b, _c;
     Log.debug('call: ', params);
     try {
-        const response = yield postMessage({ event: IFRAME.CALL, type: IFRAME.CALL, payload: params });
+        const response = yield postMessage({ event: HardwareSdk.IFRAME.CALL, type: HardwareSdk.IFRAME.CALL, payload: params });
         if (response) {
             Log.debug('response: ', response);
             if (!response.success) {
-                if (((_a = response.payload) === null || _a === void 0 ? void 0 : _a.code) === HardwareErrorCode.BlePermissionError) {
-                    postMessage(createUiMessage(UI_REQUEST.BLUETOOTH_PERMISSION), false);
+                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) === null || _b === void 0 ? void 0 : _b.code) === hdShared.HardwareErrorCode.BleLocationError) {
+                    postMessage(HardwareSdk.createUiMessage(HardwareSdk.UI_REQUEST.LOCATION_PERMISSION), false);
                 }
-                if (((_b = response.payload) === null || _b === void 0 ? void 0 : _b.code) === HardwareErrorCode.BleLocationError) {
-                    postMessage(createUiMessage(UI_REQUEST.LOCATION_PERMISSION), false);
+                if (((_c = response.payload) === null || _c === void 0 ? void 0 : _c.code) === hdShared.HardwareErrorCode.BleLocationServicesDisabled) {
+                    postMessage(HardwareSdk.createUiMessage(HardwareSdk.UI_REQUEST.LOCATION_SERVICE_PERMISSION), false);
                 }
             }
             return response;
         }
-        return createErrorMessage(ERRORS.TypedError(HardwareErrorCode.CallMethodNotResponse));
+        return HardwareSdk.createErrorMessage(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodNotResponse));
     }
     catch (error) {
         Log.error('__call error: ', error);
-        return createErrorMessage(error);
+        return HardwareSdk.createErrorMessage(error);
     }
 });
-const HardwareBleSdk = HardwareSdk({
+const HardwareBleSdk = HardwareSdk__default["default"]({
     eventEmitter,
     init,
     call,
@@ -613,4 +625,5 @@ const HardwareBleSdk = HardwareSdk({
     uiResponse,
 });
 
-export { HardwareBleSdk as default, messagePromises };
+exports["default"] = HardwareBleSdk;
+exports.messagePromises = messagePromises;

package/package.json

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

package/src/index.ts

@@ -140,6 +140,9 @@ const call = async (params: any) => {
         if (response.payload?.code === HardwareErrorCode.BleLocationError) {
           postMessage(createUiMessage(UI_REQUEST.LOCATION_PERMISSION), false);
         }
+        if (response.payload?.code === HardwareErrorCode.BleLocationServicesDisabled) {
+          postMessage(createUiMessage(UI_REQUEST.LOCATION_SERVICE_PERMISSION), false);
+        }
       }
 
       return response;