@onekeyfe/hd-transport-react-native 0.0.6 → 0.0.7

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import transport from '@onekeyfe/hd-transport';
-import { Device, Characteristic } from 'react-native-ble-plx';
+import { BleManager, Device, Characteristic } from 'react-native-ble-plx';
 
 declare const PERMISSION_ERROR = "Bluetooth required to be turned on";
 declare const LOCATION_ERROR = "Device is not authorized to use BluetoothLE";
@@ -20,6 +20,7 @@ declare type BleAcquireInput = {
 };
 
 declare class ReactNativeBleTransport {
+    blePlxManager: BleManager | undefined;
     _messages: ReturnType<typeof transport.parseConfigure> | undefined;
     configured: boolean;
     stopped: boolean;
@@ -29,6 +30,7 @@ declare class ReactNativeBleTransport {
     init(): void;
     configure(signedData: any): void;
     listen(): void;
+    getPlxManager(): Promise<BleManager>;
     enumerate(): Promise<Device[]>;
     acquire(input: BleAcquireInput): Promise<{
         uuid: string;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAC/C,OAAO,EAEL,MAAM,EAEN,cAAc,EAEf,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EACL,gBAAgB,EAChB,cAAc,EAIf,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,QAAQ,EAA4B,MAAM,kBAAkB,CAAC;AAItE,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAqBjE,MAAM,CAAC,OAAO,OAAO,uBAAuB;IAC1C,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,UAAU,UAAS;IAEnB,OAAO,UAAS;IAEhB,WAAW,SAAQ;IAEnB,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;gBAE5B,OAAO,EAAE,gBAAgB;IAIrC,IAAI;IAIJ,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,MAAM;IASA,SAAS;IA4DT,OAAO,CAAC,KAAK,EAAE,eAAe;;;IAiJpC,sBAAsB,CAAC,cAAc,EAAE,cAAc;IA8C/C,OAAO,CAAC,IAAI,EAAE,MAAM;IAepB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAmDpE,IAAI;CAGL;AAED,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,SAAiC,MAAM,wBAAwB,CAAC;AACvE,OAAO,EACL,UAAU,IAAI,aAAa,EAC3B,MAAM,EAEN,cAAc,EAEf,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EACL,gBAAgB,EAChB,cAAc,EAIf,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,QAAQ,EAA4B,MAAM,kBAAkB,CAAC;AAItE,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAmBjE,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,UAAU,UAAS;IAEnB,OAAO,UAAS;IAEhB,WAAW,SAAQ;IAEnB,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;gBAE5B,OAAO,EAAE,gBAAgB;IAIrC,IAAI;IAEJ,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,MAAM;IAIN,aAAa,IAAI,OAAO,CAAC,aAAa,CAAC;IAYjC,SAAS;IAoET,OAAO,CAAC,KAAK,EAAE,eAAe;;;IAkJpC,sBAAsB,CAAC,cAAc,EAAE,cAAc;IA+C/C,OAAO,CAAC,IAAI,EAAE,MAAM;IAepB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAmDpE,IAAI;CAGL;AAED,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,CAAC"}

package/dist/index.js

@@ -55,7 +55,7 @@ const isOnekeyDevice = (name, id) => {
     if ((_a = id === null || id === void 0 ? void 0 : id.startsWith) === null || _a === void 0 ? void 0 : _a.call(id, 'MI')) {
         return true;
     }
-    const re = /(BixinKey\d{10})|(K\d{4})/i;
+    const re = /(BixinKey\d{10})|(K\d{4})|(T\d{4})/i;
     if (name && re.exec(name)) {
         return true;
     }
@@ -111,7 +111,7 @@ const timer = process.env.NODE_ENV === 'development'
         },
     };
 
-const subscribeBleOn = (bleManager, ms = 3000) => new Promise((resolve, reject) => {
+const subscribeBleOn = (bleManager, ms = 1000) => new Promise((resolve, reject) => {
     let done = false;
     const subscription = bleManager.onStateChange(state => {
         console.log('ble state -> ', state);
@@ -183,10 +183,9 @@ class BleTransport {
 }
 
 const { check, buildBuffers, receiveOne, parseConfigure } = transport__default["default"];
-const blePlxManager = new reactNativeBlePlx.BleManager();
 const transportCache = {};
 let connectOptions = {
-    requestMTU: 1500,
+    requestMTU: 512,
     timeout: 3000,
 };
 const tryToGetConfiguration = (device) => {
@@ -207,9 +206,7 @@ class ReactNativeBleTransport {
         this.runPromise = null;
         this.scanTimeout = (_a = options.scanTimeout) !== null && _a !== void 0 ? _a : 3000;
     }
-    init() {
-        initializeBleManager();
-    }
+    init() { }
     configure(signedData) {
         const messages = parseConfigure(signedData);
         this.configured = true;
@@ -217,10 +214,18 @@ class ReactNativeBleTransport {
     }
     listen() {
     }
+    getPlxManager() {
+        if (this.blePlxManager)
+            return Promise.resolve(this.blePlxManager);
+        this.blePlxManager = new reactNativeBlePlx.BleManager();
+        initializeBleManager();
+        return Promise.resolve(this.blePlxManager);
+    }
     enumerate() {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
                 const deviceList = [];
+                const blePlxManager = yield this.getPlxManager();
                 try {
                     yield subscribeBleOn(blePlxManager);
                 }
@@ -236,7 +241,12 @@ class ReactNativeBleTransport {
                     if (error) {
                         console.log('ble scan manager: ', blePlxManager);
                         console.log('ble scan error: ', error);
-                        reject(error);
+                        if ([reactNativeBlePlx.BleErrorCode.BluetoothPoweredOff, reactNativeBlePlx.BleErrorCode.BluetoothInUnknownState].includes(error.errorCode)) {
+                            reject(new Error(PERMISSION_ERROR));
+                        }
+                        else {
+                            reject(error);
+                        }
                         return;
                     }
                     if (isOnekeyDevice((_a = device === null || device === void 0 ? void 0 : device.name) !== null && _a !== void 0 ? _a : null, device === null || device === void 0 ? void 0 : device.id)) {
@@ -276,6 +286,7 @@ class ReactNativeBleTransport {
                 console.log('@onekey/hd-ble-sdk transport not be released, will release: ', uuid);
                 yield this.release(uuid);
             }
+            const blePlxManager = yield this.getPlxManager();
             try {
                 yield subscribeBleOn(blePlxManager);
             }
@@ -406,7 +417,7 @@ class ReactNativeBleTransport {
                 else {
                     buffer$1 = buffer$1.concat([...data]);
                 }
-                if (buffer$1.length >= bufferLength) {
+                if (buffer$1.length - transport.COMMON_HEADER_SIZE >= bufferLength) {
                     const value = buffer.Buffer.from(buffer$1);
                     bufferLength = 0;
                     buffer$1 = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
   "main": "dist/index.js",
@@ -20,9 +20,9 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-transport": "^0.0.6",
+    "@onekeyfe/hd-transport": "^0.0.7",
     "react-native-ble-manager": "^8.1.0",
     "react-native-ble-plx": "^2.0.3"
   },
-  "gitHead": "b37ddf4e02812f40a01ec38ffef2ff6cdcad4bbc"
+  "gitHead": "7be7677368fcb50f411891f009367424ea77df33"
 }

package/src/constants.ts

@@ -6,9 +6,9 @@ export const isOnekeyDevice = (name: string | null, id?: string): boolean => {
     return true;
   }
 
-  // 过滤 BixinKeyxxx 和 Kxxxx
+  // 过滤 BixinKeyxxx 和 Kxxxx 和 Txxxx
   // i 忽略大小写模式
-  const re = /(BixinKey\d{10})|(K\d{4})/i;
+  const re = /(BixinKey\d{10})|(K\d{4})|(T\d{4})/i;
   if (name && re.exec(name)) {
     return true;
   }

package/src/index.ts

@@ -1,5 +1,5 @@
 import { Buffer } from 'buffer';
-import transport from '@onekeyfe/hd-transport';
+import transport, { COMMON_HEADER_SIZE } from '@onekeyfe/hd-transport';
 import {
   BleManager as BlePlxManager,
   Device,
@@ -24,12 +24,10 @@ import type { BleAcquireInput, TransportOptions } from './types';
 
 const { check, buildBuffers, receiveOne, parseConfigure } = transport;
 
-const blePlxManager = new BlePlxManager();
-
 const transportCache: Record<string, any> = {};
 
 let connectOptions: Record<string, unknown> = {
-  requestMTU: 1500,
+  requestMTU: 512,
   timeout: 3000,
 };
 
@@ -42,6 +40,8 @@ const tryToGetConfiguration = (device: Device) => {
 };
 
 export default class ReactNativeBleTransport {
+  blePlxManager: BlePlxManager | undefined;
+
   _messages: ReturnType<typeof transport.parseConfigure> | undefined;
 
   configured = false;
@@ -56,9 +56,7 @@ export default class ReactNativeBleTransport {
     this.scanTimeout = options.scanTimeout ?? 3000;
   }
 
-  init() {
-    initializeBleManager();
-  }
+  init() {}
 
   configure(signedData: any) {
     const messages = parseConfigure(signedData);
@@ -70,6 +68,13 @@ export default class ReactNativeBleTransport {
     // empty
   }
 
+  getPlxManager(): Promise<BlePlxManager> {
+    if (this.blePlxManager) return Promise.resolve(this.blePlxManager);
+    this.blePlxManager = new BlePlxManager();
+    initializeBleManager();
+    return Promise.resolve(this.blePlxManager);
+  }
+
   /**
    * 获取设备列表
    * 在搜索超过超时时间或设备数量大于 5 台时，返回 OneKey 设备，
@@ -79,7 +84,7 @@ export default class ReactNativeBleTransport {
     // eslint-disable-next-line no-async-promise-executor
     return new Promise<Device[]>(async (resolve, reject) => {
       const deviceList: Device[] = [];
-
+      const blePlxManager = await this.getPlxManager();
       try {
         await subscribeBleOn(blePlxManager);
       } catch (error) {
@@ -97,7 +102,15 @@ export default class ReactNativeBleTransport {
           if (error) {
             console.log('ble scan manager: ', blePlxManager);
             console.log('ble scan error: ', error);
-            reject(error);
+            if (
+              [BleErrorCode.BluetoothPoweredOff, BleErrorCode.BluetoothInUnknownState].includes(
+                error.errorCode
+              )
+            ) {
+              reject(new Error(PERMISSION_ERROR));
+            } else {
+              reject(error);
+            }
             return;
           }
 
@@ -153,6 +166,7 @@ export default class ReactNativeBleTransport {
       await this.release(uuid);
     }
 
+    const blePlxManager = await this.getPlxManager();
     try {
       await subscribeBleOn(blePlxManager);
     } catch (error) {
@@ -295,6 +309,7 @@ export default class ReactNativeBleTransport {
 
       try {
         const data = Buffer.from(c.value as string, 'base64');
+        // console.log('[hd-transport-react-native] Received a packet, ', 'buffer: ', data);
         if (isHeaderChunk(data)) {
           bufferLength = data.readInt32BE(5);
           buffer = [...data.subarray(3)];
@@ -302,7 +317,7 @@ export default class ReactNativeBleTransport {
           buffer = buffer.concat([...data]);
         }
 
-        if (buffer.length >= bufferLength) {
+        if (buffer.length - COMMON_HEADER_SIZE >= bufferLength) {
           const value = Buffer.from(buffer);
           // console.log(
           //   '[hd-transport-react-native] Received a complete packet of data, resolve Promise, this.runPromise: ',

package/src/subscribeBleOn.ts

@@ -2,7 +2,7 @@ import { PERMISSION_ERROR } from './constants';
 import { BlePlxManager } from './types';
 import timer from './utils/timer';
 
-export const subscribeBleOn = (bleManager: BlePlxManager, ms = 3000): Promise<void> =>
+export const subscribeBleOn = (bleManager: BlePlxManager, ms = 1000): Promise<void> =>
   new Promise((resolve, reject) => {
     let done = false;