@onekeyfe/hd-transport-react-native 0.0.8 → 0.1.0

package/dist/BleManager.d.ts

@@ -8,4 +8,13 @@ export declare const getConnectedDeviceIds: (serviceUuids: string[]) => Promise<
     id: string;
     name: string | undefined;
 }[]>;
+export declare const getBondedDevices: () => Promise<{
+    isConnectable?: boolean | undefined;
+    localName?: string | undefined;
+    manufacturerData?: any;
+    serviceUUIDs?: string[] | undefined;
+    txPowerLevel?: number | undefined;
+    id: string;
+    name: string | undefined;
+}[]>;
 //# sourceMappingURL=BleManager.d.ts.map

package/dist/BleManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BleManager.d.ts","sourceRoot":"","sources":["../src/BleManager.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,oBAAoB,YAEhC,CAAC;AAOF,eAAO,MAAM,qBAAqB,iBAAwB,MAAM,EAAE;;;;;;;;IAMjE,CAAC"}
+{"version":3,"file":"BleManager.d.ts","sourceRoot":"","sources":["../src/BleManager.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,oBAAoB,YAEhC,CAAC;AAOF,eAAO,MAAM,qBAAqB,iBAAwB,MAAM,EAAE;;;;;;;;IAMjE,CAAC;AAEF,eAAO,MAAM,gBAAgB;;;;;;;;IAM5B,CAAC"}

package/dist/constants.d.ts

@@ -1,5 +1,7 @@
 export declare const PERMISSION_ERROR = "Bluetooth required to be turned on";
 export declare const LOCATION_ERROR = "Device is not authorized to use BluetoothLE";
+export declare const IOS_PACKET_LENGTH = 128;
+export declare const ANDROID_PACKET_LENGTH = 192;
 export declare const isOnekeyDevice: (name: string | null, id?: string | undefined) => boolean;
 export declare const getBluetoothServiceUuids: () => string[];
 export declare const getInfosForServiceUuid: (serviceUuid: string, deviceType: 'classic') => {

package/dist/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,gBAAgB,uCAAuC,CAAC;AACrE,eAAO,MAAM,cAAc,gDAAgD,CAAC;AAE5E,eAAO,MAAM,cAAc,SAAU,MAAM,GAAG,IAAI,8BAAgB,OAYjE,CAAC;AA8BF,eAAO,MAAM,wBAAwB,gBAA0B,CAAC;AAChE,eAAO,MAAM,sBAAsB,gBAAiB,MAAM,cAAc,SAAS;iBA1BhE,MAAM;;;QAoCtB,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,gBAAgB,uCAAuC,CAAC;AACrE,eAAO,MAAM,cAAc,gDAAgD,CAAC;AAE5E,eAAO,MAAM,iBAAiB,MAAM,CAAC;AACrC,eAAO,MAAM,qBAAqB,MAAM,CAAC;AAEzC,eAAO,MAAM,cAAc,SAAU,MAAM,GAAG,IAAI,8BAAgB,OAYjE,CAAC;AA8BF,eAAO,MAAM,wBAAwB,gBAA0B,CAAC;AAChE,eAAO,MAAM,sBAAsB,gBAAiB,MAAM,cAAc,SAAS;iBA1BhE,MAAM;;;QAoCtB,CAAC"}

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,SAAiC,MAAM,wBAAwB,CAAC;AACvE,OAAO,EACL,UAAU,IAAI,aAAa,EAC3B,MAAM,EAEN,cAAc,EAEf,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EACL,gBAAgB,EAChB,cAAc,EAMf,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;;;IA2JpC,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;IA4EpE,IAAI;CAGL;AAED,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,CAAC"}

package/dist/index.js

@@ -2,14 +2,17 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var reactNative = require('react-native');
 var buffer = require('buffer');
 var transport = require('@onekeyfe/hd-transport');
 var reactNativeBlePlx = require('react-native-ble-plx');
+var ByteBuffer = require('bytebuffer');
 var BleManager = require('react-native-ble-manager');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var transport__default = /*#__PURE__*/_interopDefaultLegacy(transport);
+var ByteBuffer__default = /*#__PURE__*/_interopDefaultLegacy(ByteBuffer);
 var BleManager__default = /*#__PURE__*/_interopDefaultLegacy(BleManager);
 
 /******************************************************************************
@@ -47,9 +50,18 @@ const getConnectedDeviceIds = (serviceUuids) => __awaiter(void 0, void 0, void 0
         return Object.assign({ id, name }, advertising);
     });
 });
+const getBondedDevices = () => __awaiter(void 0, void 0, void 0, function* () {
+    const peripherals = yield BleManager__default["default"].getBondedPeripherals();
+    return peripherals.map(peripheral => {
+        const { id, name, advertising = {} } = peripheral;
+        return Object.assign({ id, name }, advertising);
+    });
+});
 
 const PERMISSION_ERROR = 'Bluetooth required to be turned on';
 const LOCATION_ERROR = 'Device is not authorized to use BluetoothLE';
+const IOS_PACKET_LENGTH = 128;
+const ANDROID_PACKET_LENGTH = 192;
 const isOnekeyDevice = (name, id) => {
     var _a;
     if ((_a = id === null || id === void 0 ? void 0 : id.startsWith) === null || _a === void 0 ? void 0 : _a.call(id, 'MI')) {
@@ -281,7 +293,7 @@ class ReactNativeBleTransport {
             if (!uuid) {
                 throw new Error('uuid is required');
             }
-            let device;
+            let device = null;
             if (transportCache[uuid]) {
                 console.log('@onekey/hd-ble-sdk transport not be released, will release: ', uuid);
                 yield this.release(uuid);
@@ -341,6 +353,13 @@ class ReactNativeBleTransport {
                     }
                 }
             }
+            if (reactNative.Platform.OS === 'android') {
+                const bondedDevices = yield getBondedDevices();
+                const hasBonded = !!bondedDevices.find(bondedDevice => bondedDevice.id === (device === null || device === void 0 ? void 0 : device.id));
+                if (!hasBonded) {
+                    throw new Error('device is not bonded');
+                }
+            }
             yield device.discoverAllServicesAndCharacteristics();
             let infos = tryToGetConfiguration(device);
             let characteristics;
@@ -464,16 +483,41 @@ class ReactNativeBleTransport {
             const messages = this._messages;
             console.log('transport-react-native', 'call-', ' name: ', name, ' data: ', data);
             const buffers = buildBuffers(messages, name, data);
-            for (const o of buffers) {
-                const outData = o.toString('base64');
-                console.log('@onekey/hd-ble-sdk send hex strting: ', o.toString('hex'));
-                try {
-                    yield transport.writeCharacteristic.writeWithResponse(outData);
+            if (name === 'FirmwareUpload') {
+                const packetCapacity = reactNative.Platform.OS === 'ios' ? IOS_PACKET_LENGTH : ANDROID_PACKET_LENGTH;
+                let index = 0;
+                let chunk = ByteBuffer__default["default"].allocate(packetCapacity);
+                while (index < buffers.length) {
+                    const buffer = buffers[index].toBuffer();
+                    chunk.append(buffer);
+                    index += 1;
+                    if (chunk.offset === packetCapacity || index >= buffers.length) {
+                        chunk.reset();
+                        console.log('@onekey/hd-ble-sdk send more packet hex strting: ', chunk.toString('hex'));
+                        try {
+                            yield transport.writeCharacteristic.writeWithoutResponse(chunk.toString('base64'));
+                            chunk = ByteBuffer__default["default"].allocate(packetCapacity);
+                        }
+                        catch (e) {
+                            this.runPromise = null;
+                            console.log('writeCharacteristic write error: ', e);
+                            return;
+                        }
+                    }
                 }
-                catch (e) {
-                    this.runPromise = null;
-                    console.log('writeCharacteristic write error: ', e);
-                    return;
+            }
+            else {
+                for (const o of buffers) {
+                    const outData = o.toString('base64');
+                    console.log('@onekey/hd-ble-sdk send hex strting: ', o.toString('hex'));
+                    try {
+                        yield transport.writeCharacteristic.writeWithResponse(outData);
+                    }
+                    catch (e) {
+                        this.runPromise = null;
+                        console.log('writeCharacteristic write error: ', e);
+                        return;
+                    }
                 }
             }
             try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "0.0.8",
+  "version": "0.1.0",
   "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.8",
+    "@onekeyfe/hd-transport": "^0.1.0",
     "react-native-ble-manager": "^8.1.0",
     "react-native-ble-plx": "^2.0.3"
   },
-  "gitHead": "edfa30382fdf36182bc389c8ff1dd1a689096592"
+  "gitHead": "d50dc424865150391b7249d1010ee75dc2074a7e"
 }

package/src/BleManager.ts

@@ -16,3 +16,11 @@ export const getConnectedDeviceIds = async (serviceUuids: string[]) => {
     return { id, name, ...advertising };
   });
 };
+
+export const getBondedDevices = async () => {
+  const peripherals = await BleManager.getBondedPeripherals();
+  return peripherals.map(peripheral => {
+    const { id, name, advertising = {} } = peripheral;
+    return { id, name, ...advertising };
+  });
+};

package/src/constants.ts

@@ -1,6 +1,9 @@
 export const PERMISSION_ERROR = 'Bluetooth required to be turned on';
 export const LOCATION_ERROR = 'Device is not authorized to use BluetoothLE';
 
+export const IOS_PACKET_LENGTH = 128;
+export const ANDROID_PACKET_LENGTH = 192;
+
 export const isOnekeyDevice = (name: string | null, id?: string): boolean => {
   if (id?.startsWith?.('MI')) {
     return true;

package/src/index.ts

@@ -1,3 +1,4 @@
+import { Platform } from 'react-native';
 import { Buffer } from 'buffer';
 import transport, { COMMON_HEADER_SIZE } from '@onekeyfe/hd-transport';
 import {
@@ -7,7 +8,8 @@ import {
   Characteristic,
   ScanMode,
 } from 'react-native-ble-plx';
-import { initializeBleManager, getConnectedDeviceIds } from './BleManager';
+import ByteBuffer from 'bytebuffer';
+import { initializeBleManager, getConnectedDeviceIds, getBondedDevices } from './BleManager';
 import { subscribeBleOn } from './subscribeBleOn';
 import {
   PERMISSION_ERROR,
@@ -15,6 +17,8 @@ import {
   isOnekeyDevice,
   getBluetoothServiceUuids,
   getInfosForServiceUuid,
+  IOS_PACKET_LENGTH,
+  ANDROID_PACKET_LENGTH,
 } from './constants';
 import { Deferred, create as createDeferred } from './utils/deferred';
 import { isHeaderChunk } from './utils/validateNotify';
@@ -155,7 +159,7 @@ export default class ReactNativeBleTransport {
       throw new Error('uuid is required');
     }
 
-    let device;
+    let device: Device | null = null;
 
     if (transportCache[uuid]) {
       /**
@@ -227,6 +231,15 @@ export default class ReactNativeBleTransport {
       }
     }
 
+    // check device is bonded
+    if (Platform.OS === 'android') {
+      const bondedDevices = await getBondedDevices();
+      const hasBonded = !!bondedDevices.find(bondedDevice => bondedDevice.id === device?.id);
+      if (!hasBonded) {
+        throw new Error('device is not bonded');
+      }
+    }
+
     await device.discoverAllServicesAndCharacteristics();
     let infos = tryToGetConfiguration(device);
     let characteristics;
@@ -378,17 +391,42 @@ export default class ReactNativeBleTransport {
     const messages = this._messages;
     console.log('transport-react-native', 'call-', ' name: ', name, ' data: ', data);
     const buffers = buildBuffers(messages, name, data);
-    for (const o of buffers) {
-      const outData = o.toString('base64');
-      console.log('@onekey/hd-ble-sdk send hex strting: ', o.toString('hex'));
-      try {
-        await transport.writeCharacteristic.writeWithResponse(outData);
-      } catch (e) {
-        this.runPromise = null;
-        console.log('writeCharacteristic write error: ', e);
-        return;
+
+    if (name === 'FirmwareUpload') {
+      const packetCapacity = Platform.OS === 'ios' ? IOS_PACKET_LENGTH : ANDROID_PACKET_LENGTH;
+      let index = 0;
+      let chunk = ByteBuffer.allocate(packetCapacity);
+      while (index < buffers.length) {
+        const buffer = buffers[index].toBuffer();
+        chunk.append(buffer);
+        index += 1;
+        if (chunk.offset === packetCapacity || index >= buffers.length) {
+          chunk.reset();
+          console.log('@onekey/hd-ble-sdk send more packet hex strting: ', chunk.toString('hex'));
+          try {
+            await transport.writeCharacteristic.writeWithoutResponse(chunk.toString('base64'));
+            chunk = ByteBuffer.allocate(packetCapacity);
+          } catch (e) {
+            this.runPromise = null;
+            console.log('writeCharacteristic write error: ', e);
+            return;
+          }
+        }
+      }
+    } else {
+      for (const o of buffers) {
+        const outData = o.toString('base64');
+        console.log('@onekey/hd-ble-sdk send hex strting: ', o.toString('hex'));
+        try {
+          await transport.writeCharacteristic.writeWithResponse(outData);
+        } catch (e) {
+          this.runPromise = null;
+          console.log('writeCharacteristic write error: ', e);
+          return;
+        }
       }
     }
+
     try {
       const response = await this.runPromise.promise;