@onekeyfe/hd-ble-sdk 0.1.14 → 0.1.18

package/dist/index.d.ts.map

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

package/dist/index.js

@@ -513,7 +513,7 @@ function eventTargetAgnosticAddListener(emitter, name, listener, flags) {
 }
 
 const eventEmitter = new events.exports();
-const Log = HardwareSdk.initLog('@onekey/hd-ble-sdk');
+const Log = HardwareSdk.getLogger(HardwareSdk.LoggerNames.HdBleSdk);
 let _core;
 let _settings = HardwareSdk.parseConnectSettings();
 let _messageID = 0;
@@ -539,12 +539,18 @@ function handleMessage(message) {
     if (!_core) {
         return;
     }
-    Log.debug('hd-ble-sdk handleMessage', message);
+    if (event !== HardwareSdk.LOG_EVENT) {
+        Log.debug('hd-ble-sdk handleMessage', message);
+    }
     switch (event) {
         case HardwareSdk.UI_EVENT:
             eventEmitter.emit(message.event, message);
             eventEmitter.emit(message.type, message.payload);
             break;
+        case HardwareSdk.LOG_EVENT:
+        case HardwareSdk.FIRMWARE_EVENT:
+            eventEmitter.emit(message.event, message);
+            break;
         default:
             Log.log('No need to be captured message', message.event);
     }
@@ -570,6 +576,7 @@ const init = (settings) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         _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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-ble-sdk",
-  "version": "0.1.14",
+  "version": "0.1.18",
   "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.14",
-    "@onekeyfe/hd-shared": "^0.1.14",
-    "@onekeyfe/hd-transport-react-native": "^0.1.14"
+    "@onekeyfe/hd-core": "^0.1.18",
+    "@onekeyfe/hd-shared": "^0.1.18",
+    "@onekeyfe/hd-transport-react-native": "^0.1.18"
   },
-  "gitHead": "216fee1795067013da0d68f4fc25f583509bb509"
+  "gitHead": "eebfd1dd46b146c64a8bfda691dc4d8402fa105b"
 }

package/src/index.ts

@@ -2,7 +2,6 @@ import EventEmitter from 'events';
 import HardwareSdk, {
   ConnectSettings,
   enableLog,
-  initLog,
   parseConnectSettings,
   initCore,
   Core,
@@ -14,12 +13,17 @@ import HardwareSdk, {
   UI_EVENT,
   UiResponseEvent,
   UI_REQUEST,
+  LOG_EVENT,
+  getLogger,
+  LoggerNames,
+  setLoggerPostMessage,
+  FIRMWARE_EVENT,
 } from '@onekeyfe/hd-core';
 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');
+const Log = getLogger(LoggerNames.HdBleSdk);
 
 let _core: Core | undefined;
 let _settings = parseConnectSettings();
@@ -50,14 +54,20 @@ function handleMessage(message: CoreMessage) {
   if (!_core) {
     return;
   }
-  Log.debug('hd-ble-sdk handleMessage', message);
 
+  if (event !== LOG_EVENT) {
+    Log.debug('hd-ble-sdk handleMessage', message);
+  }
   switch (event) {
     case UI_EVENT:
       // pass UI event up
       eventEmitter.emit(message.event, message);
       eventEmitter.emit(message.type, message.payload);
       break;
+    case LOG_EVENT:
+    case FIRMWARE_EVENT:
+      eventEmitter.emit(message.event, message);
+      break;
     default:
       Log.log('No need to be captured message', message.event);
   }
@@ -84,11 +94,13 @@ const init = async (settings: Partial<ConnectSettings>) => {
   _settings = { ..._settings, ...settings, env: 'react-native' };
 
   enableLog(!!settings.debug);
+
   Log.debug('init');
 
   try {
     _core = await initCore(_settings, ReactNativeTransport);
     _core?.on(CORE_EVENT, handleMessage);
+    setLoggerPostMessage(handleMessage);
 
     return true;
   } catch (error) {