@onekeyfe/hd-ble-sdk 1.1.34-alpha.1 → 1.1.34-alpha.3

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

@@ -0,0 +1,15 @@
+import { readFileSync } from 'fs';
+import { resolve } from 'path';
+
+describe('hd-ble-sdk device state events', () => {
+  test('forwards DEVICE.STATE to React Native SDK consumers', () => {
+    const source = readFileSync(resolve(__dirname, '../src/index.ts'), 'utf8');
+    const deviceEventHandler = source.slice(
+      source.indexOf('case DEVICE_EVENT:'),
+      source.indexOf('case IFRAME.CALLBACK:')
+    );
+
+    expect(deviceEventHandler).toContain('DEVICE.STATE');
+    expect(deviceEventHandler).toContain('eventEmitter.emit(message.type, message.payload)');
+  });
+});

package/dist/index.d.ts.map

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

package/dist/index.js

@@ -539,6 +539,9 @@ const cancel = (connectId) => {
         return;
     _core.handleMessage({ event: HardwareSdk.IFRAME.CANCEL, type: HardwareSdk.IFRAME.CANCEL, payload: { connectId } });
 };
+const cancelOperation = (operationId) => {
+    _core === null || _core === void 0 ? void 0 : _core.cancelOperation(operationId);
+};
 function handleMessage(message) {
     var _a;
     const { event, type } = message;
@@ -571,7 +574,13 @@ function handleMessage(message) {
             eventEmitter.emit(message.event, message);
             break;
         case HardwareSdk.DEVICE_EVENT:
-            if ([HardwareSdk.DEVICE.CONNECT, HardwareSdk.DEVICE.DISCONNECT, HardwareSdk.DEVICE.FEATURES, HardwareSdk.DEVICE.SUPPORT_FEATURES].includes(message.type)) {
+            if ([
+                HardwareSdk.DEVICE.CONNECT,
+                HardwareSdk.DEVICE.DISCONNECT,
+                HardwareSdk.DEVICE.FEATURES,
+                HardwareSdk.DEVICE.STATE,
+                HardwareSdk.DEVICE.SUPPORT_FEATURES,
+            ].includes(message.type)) {
                 eventEmitter.emit(message.type, message.payload);
             }
             break;
@@ -615,11 +624,12 @@ const init = (settings) => __awaiter(void 0, void 0, void 0, function* () {
 });
 const call = (params) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b, _c;
-    Log.debug('call: ', params);
+    const logBlockLabel = HardwareSdk.getLogBlockLabel(params);
+    Log.debug('call: ', logBlockLabel ? { method: logBlockLabel, payload: '[REDACTED]' } : params);
     try {
         const response = yield postMessage({ event: HardwareSdk.IFRAME.CALL, type: HardwareSdk.IFRAME.CALL, payload: params });
         if (response) {
-            Log.debug('response: ', response);
+            Log.debug('response: ', logBlockLabel ? { method: logBlockLabel, payload: '[REDACTED]' } : response);
             if (!response.success) {
                 if (((_a = response.payload) === null || _a === void 0 ? void 0 : _a.code) === hdShared.HardwareErrorCode.BlePermissionError) {
                     postMessage(HardwareSdk.createUiMessage(HardwareSdk.UI_REQUEST.BLUETOOTH_PERMISSION), false);
@@ -647,6 +657,7 @@ const HardwareBleSdk = HardwareSdk__default["default"]({
     init,
     call,
     cancel,
+    cancelOperation,
     dispose,
     uiResponse,
     updateSettings,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-ble-sdk",
-  "version": "1.1.34-alpha.1",
+  "version": "1.1.34-alpha.3",
   "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": "1.1.34-alpha.1",
-    "@onekeyfe/hd-shared": "1.1.34-alpha.1",
-    "@onekeyfe/hd-transport-react-native": "1.1.34-alpha.1"
+    "@onekeyfe/hd-core": "1.1.34-alpha.3",
+    "@onekeyfe/hd-shared": "1.1.34-alpha.3",
+    "@onekeyfe/hd-transport-react-native": "1.1.34-alpha.3"
   },
-  "gitHead": "e017f56235eae6eab82f1c687699a4204f3173f9"
+  "gitHead": "3688bc8495eeb2ffd5616270d13fa29e8967623a"
 }

package/src/index.ts

@@ -13,6 +13,7 @@ import HardwareSdk, {
   createUiMessage,
   enableLog,
   executeCallback,
+  getLogBlockLabel,
   getLogger,
   initCore,
   parseConnectSettings,
@@ -50,6 +51,10 @@ const cancel = (connectId?: string) => {
   _core.handleMessage({ event: IFRAME.CANCEL, type: IFRAME.CANCEL, payload: { connectId } });
 };
 
+const cancelOperation = (operationId: string) => {
+  _core?.cancelOperation(operationId);
+};
+
 function handleMessage(message: CoreMessage) {
   const { event, type } = message;
   if (!_core) {
@@ -84,7 +89,13 @@ function handleMessage(message: CoreMessage) {
     case DEVICE_EVENT:
       if (
         (
-          [DEVICE.CONNECT, DEVICE.DISCONNECT, DEVICE.FEATURES, DEVICE.SUPPORT_FEATURES] as string[]
+          [
+            DEVICE.CONNECT,
+            DEVICE.DISCONNECT,
+            DEVICE.FEATURES,
+            DEVICE.STATE,
+            DEVICE.SUPPORT_FEATURES,
+          ] as string[]
         ).includes(message.type)
       ) {
         eventEmitter.emit(message.type, message.payload);
@@ -138,12 +149,16 @@ const init = async (settings: Partial<ConnectSettings>) => {
 };
 
 const call = async (params: any) => {
-  Log.debug('call: ', params);
+  const logBlockLabel = getLogBlockLabel(params);
+  Log.debug('call: ', logBlockLabel ? { method: logBlockLabel, payload: '[REDACTED]' } : params);
 
   try {
     const response = await postMessage({ event: IFRAME.CALL, type: IFRAME.CALL, payload: params });
     if (response) {
-      Log.debug('response: ', response);
+      Log.debug(
+        'response: ',
+        logBlockLabel ? { method: logBlockLabel, payload: '[REDACTED]' } : response
+      );
 
       if (!response.success) {
         if (response.payload?.code === HardwareErrorCode.BlePermissionError) {
@@ -179,6 +194,7 @@ const HardwareBleSdk = HardwareSdk({
   init,
   call,
   cancel,
+  cancelOperation,
   dispose,
   uiResponse,
   updateSettings,