@onekeyfe/hd-transport-react-native 1.1.20-alpha.0 → 1.1.20-alpha.2

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as transport from '@onekeyfe/hd-transport';
-import transport__default from '@onekeyfe/hd-transport';
-import { BleManager, Device, Characteristic } from 'react-native-ble-plx';
+import transport__default, { OneKeyDeviceInfoBase } from '@onekeyfe/hd-transport';
+import { Device, BleManager, Characteristic } from 'react-native-ble-plx';
 import { Deferred } from '@onekeyfe/hd-shared';
 import EventEmitter from 'events';
 
@@ -12,6 +12,7 @@ type BleAcquireInput = {
     forceCleanRunPromise?: boolean;
 };
 
+type IOneKeyDevice = OneKeyDeviceInfoBase & Device;
 declare class ReactNativeBleTransport {
     blePlxManager: BleManager | undefined;
     _messages: ReturnType<typeof transport__default.parseConfigure> | undefined;
@@ -27,7 +28,7 @@ declare class ReactNativeBleTransport {
     configure(signedData: any): void;
     listen(): void;
     getPlxManager(): Promise<BleManager>;
-    enumerate(): Promise<Device[]>;
+    enumerate(): Promise<IOneKeyDevice[]>;
     acquire(input: BleAcquireInput): Promise<{
         uuid: string;
     }>;
@@ -39,4 +40,4 @@ declare class ReactNativeBleTransport {
     cancel(): void;
 }
 
-export { ReactNativeBleTransport as default };
+export { IOneKeyDevice, ReactNativeBleTransport as default };

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA,OAAO,EACL,UAAU,IAAI,aAAa,EAC3B,MAAM,EAEN,cAAc,EAIf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,SAAkD,MAAM,wBAAwB,CAAC;AACxF,OAAO,EAEL,QAAQ,EAIT,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AAYvC,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAoDjE,MAAM,CAAC,OAAO,OAAO,uBAAuB;IAC1C,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;IAEzC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,IAAI,SAA6B;IAEjC,UAAU,UAAS;IAEnB,OAAO,UAAS;IAEhB,WAAW,SAAQ;IAEnB,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAExC,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;gBAEX,OAAO,EAAE,gBAAgB;IAIrC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY;IAKvC,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,MAAM;IAIN,aAAa,IAAI,OAAO,CAAC,aAAa,CAAC;IAWjC,SAAS;IA6FT,OAAO,CAAC,KAAK,EAAE,eAAe;;;IAkNpC,sBAAsB,CAAC,cAAc,EAAE,cAAc;IAkF/C,OAAO,CAAC,IAAI,EAAE,MAAM;IAepB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAIjE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IA2HpE,IAAI;IAIJ,MAAM;CAOP"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA,OAAO,EAIL,UAAU,IAAI,aAAa,EAE5B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,SAAS,EAAE,EAGhB,KAAK,oBAAoB,EAC1B,MAAM,wBAAwB,CAAC;AAehC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAYjE,MAAM,MAAM,aAAa,GAAG,oBAAoB,GAAG,MAAM,CAAC;AA0C1D,MAAM,CAAC,OAAO,OAAO,uBAAuB;IAC1C,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;IAEzC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,IAAI,SAA6B;IAEjC,UAAU,UAAS;IAEnB,OAAO,UAAS;IAEhB,WAAW,SAAQ;IAEnB,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAExC,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;gBAEX,OAAO,EAAE,gBAAgB;IAIrC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY;IAKvC,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,MAAM;IAIN,aAAa,IAAI,OAAO,CAAC,aAAa,CAAC;IAWjC,SAAS;IA6FT,OAAO,CAAC,KAAK,EAAE,eAAe;;;IAkNpC,sBAAsB,CAAC,cAAc,EAAE,cAAc;IAkF/C,OAAO,CAAC,IAAI,EAAE,MAAM;IAepB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAIjE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IA2HpE,IAAI;IAIJ,MAAM;CAOP"}

package/dist/index.js

@@ -338,7 +338,7 @@ class ReactNativeBleTransport {
                 });
                 const addDevice = (device) => {
                     if (deviceList.every(d => d.id !== device.id)) {
-                        deviceList.push(device);
+                        deviceList.push(Object.assign(Object.assign({}, device), { commType: 'ble' }));
                     }
                 };
                 timer.timeout(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "1.1.20-alpha.0",
+  "version": "1.1.20-alpha.2",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
   "main": "dist/index.js",
@@ -19,10 +19,10 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.1.20-alpha.0",
-    "@onekeyfe/hd-transport": "1.1.20-alpha.0",
+    "@onekeyfe/hd-shared": "1.1.20-alpha.2",
+    "@onekeyfe/hd-transport": "1.1.20-alpha.2",
     "@onekeyfe/react-native-ble-utils": "^0.1.4",
     "react-native-ble-plx": "3.5.0"
   },
-  "gitHead": "bff28f2906ab17d7843f4e0d634bf4acf6b375b4"
+  "gitHead": "dbf71f2cde0679e6f0bc84441ff0d0f905b054c0"
 }

package/src/index.ts

@@ -1,35 +1,35 @@
-import { Platform, PermissionsAndroid } from 'react-native';
+import { PermissionsAndroid, Platform } from 'react-native';
 import { Buffer } from 'buffer';
 import {
-  BleManager as BlePlxManager,
-  Device,
-  BleErrorCode,
-  Characteristic,
-  ScanMode,
   BleATTErrorCode,
   BleError,
+  BleErrorCode,
+  BleManager as BlePlxManager,
+  ScanMode,
 } from 'react-native-ble-plx';
 import ByteBuffer from 'bytebuffer';
-import transport, { COMMON_HEADER_SIZE, LogBlockCommand } from '@onekeyfe/hd-transport';
-import {
-  createDeferred,
-  Deferred,
-  ERRORS,
-  HardwareErrorCode,
-  isOnekeyDevice,
-} from '@onekeyfe/hd-shared';
-import type EventEmitter from 'events';
+import transport, {
+  COMMON_HEADER_SIZE,
+  LogBlockCommand,
+  type OneKeyDeviceInfoBase,
+} from '@onekeyfe/hd-transport';
+import { ERRORS, HardwareErrorCode, createDeferred, isOnekeyDevice } from '@onekeyfe/hd-shared';
+
 import { getConnectedDeviceIds, onDeviceBondState, pairDevice } from './BleManager';
 import { subscribeBleOn } from './subscribeBleOn';
 import {
+  ANDROID_PACKET_LENGTH,
+  IOS_PACKET_LENGTH,
   getBluetoothServiceUuids,
   getInfosForServiceUuid,
-  IOS_PACKET_LENGTH,
-  ANDROID_PACKET_LENGTH,
 } from './constants';
 import { isHeaderChunk } from './utils/validateNotify';
 import BleTransport from './BleTransport';
 import timer from './utils/timer';
+
+import type { Deferred } from '@onekeyfe/hd-shared';
+import type { Characteristic, Device } from 'react-native-ble-plx';
+import type EventEmitter from 'events';
 import type { BleAcquireInput, TransportOptions } from './types';
 
 const { check, buildBuffers, receiveOne, parseConfigure } = transport;
@@ -42,6 +42,8 @@ let connectOptions: Record<string, unknown> = {
   refreshGatt: 'OnConnected',
 };
 
+export type IOneKeyDevice = OneKeyDeviceInfoBase & Device;
+
 const tryToGetConfiguration = (device: Device) => {
   if (!device || !device.serviceUUIDs) return null;
   const [serviceUUID] = device.serviceUUIDs;
@@ -133,8 +135,8 @@ export default class ReactNativeBleTransport {
    */
   async enumerate() {
     // eslint-disable-next-line no-async-promise-executor
-    return new Promise<Device[]>(async (resolve, reject) => {
-      const deviceList: Device[] = [];
+    return new Promise<IOneKeyDevice[]>(async (resolve, reject) => {
+      const deviceList: IOneKeyDevice[] = [];
       const blePlxManager = await this.getPlxManager();
       try {
         await subscribeBleOn(blePlxManager);
@@ -213,7 +215,7 @@ export default class ReactNativeBleTransport {
 
       const addDevice = (device: Device) => {
         if (deviceList.every(d => d.id !== device.id)) {
-          deviceList.push(device);
+          deviceList.push({ ...device, commType: 'ble' } as IOneKeyDevice);
         }
       };