@onekeyfe/hd-transport-react-native 0.1.12 → 0.1.16

package/dist/index.d.ts

@@ -16,8 +16,9 @@ declare class ReactNativeBleTransport {
     stopped: boolean;
     scanTimeout: number;
     runPromise: Deferred<any> | null;
+    Log?: any;
     constructor(options: TransportOptions);
-    init(): void;
+    init(logger: any): void;
     configure(signedData: any): void;
     listen(): void;
     getPlxManager(): Promise<BleManager>;

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,EAEf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,SAAiC,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAkB,QAAQ,EAA6B,MAAM,qBAAqB,CAAC;AAa1F,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;IAsET,OAAO,CAAC,KAAK,EAAE,eAAe;;;IA+JpC,sBAAsB,CAAC,cAAc,EAAE,cAAc;IA4D/C,OAAO,CAAC,IAAI,EAAE,MAAM;IAcpB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IA+EpE,IAAI;IAIJ,MAAM;CAOP"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,UAAU,IAAI,aAAa,EAC3B,MAAM,EAEN,cAAc,EAEf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,SAAiC,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAkB,QAAQ,EAA6B,MAAM,qBAAqB,CAAC;AAa1F,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;IAExC,GAAG,CAAC,EAAE,GAAG,CAAC;gBAEE,OAAO,EAAE,gBAAgB;IAIrC,IAAI,CAAC,MAAM,EAAE,GAAG;IAIhB,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,MAAM;IAIN,aAAa,IAAI,OAAO,CAAC,aAAa,CAAC;IAYjC,SAAS;IAsET,OAAO,CAAC,KAAK,EAAE,eAAe;;;IA+JpC,sBAAsB,CAAC,cAAc,EAAE,cAAc;IA4D/C,OAAO,CAAC,IAAI,EAAE,MAAM;IAcpB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IA+EpE,IAAI;IAIJ,MAAM;CAOP"}

package/dist/index.js

@@ -188,7 +188,9 @@ class ReactNativeBleTransport {
         this.runPromise = null;
         this.scanTimeout = (_a = options.scanTimeout) !== null && _a !== void 0 ? _a : 3000;
     }
-    init() { }
+    init(logger) {
+        this.Log = logger;
+    }
     configure(signedData) {
         const messages = parseConfigure(signedData);
         this.configured = true;
@@ -212,7 +214,7 @@ class ReactNativeBleTransport {
                     yield subscribeBleOn(blePlxManager);
                 }
                 catch (error) {
-                    console.log('subscribeBleOn error: ', error);
+                    this.Log.debug('subscribeBleOn error: ', error);
                     reject(error);
                     return;
                 }
@@ -221,8 +223,8 @@ class ReactNativeBleTransport {
                 }, (error, device) => {
                     var _a, _b;
                     if (error) {
-                        console.log('ble scan manager: ', blePlxManager);
-                        console.log('ble scan error: ', error);
+                        this.Log.debug('ble scan manager: ', blePlxManager);
+                        this.Log.debug('ble scan error: ', error);
                         if ([reactNativeBlePlx.BleErrorCode.BluetoothPoweredOff, reactNativeBlePlx.BleErrorCode.BluetoothInUnknownState].includes(error.errorCode)) {
                             reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePermissionError));
                         }
@@ -235,16 +237,16 @@ class ReactNativeBleTransport {
                         return;
                     }
                     if (isOnekeyDevice((_b = device === null || device === void 0 ? void 0 : device.name) !== null && _b !== void 0 ? _b : null, device === null || device === void 0 ? void 0 : device.id)) {
-                        console.log('search device start ======================');
+                        this.Log.debug('search device start ======================');
                         const { name, localName, id } = device !== null && device !== void 0 ? device : {};
-                        console.log(`device name: ${name !== null && name !== void 0 ? name : ''}\nlocalName: ${localName !== null && localName !== void 0 ? localName : ''}\nid: ${id !== null && id !== void 0 ? id : ''}`);
+                        this.Log.debug(`device name: ${name !== null && name !== void 0 ? name : ''}\nlocalName: ${localName !== null && localName !== void 0 ? localName : ''}\nid: ${id !== null && id !== void 0 ? id : ''}`);
                         addDevice(device);
-                        console.log('search device end ======================\n');
+                        this.Log.debug('search device end ======================\n');
                     }
                 });
                 getConnectedDeviceIds(getBluetoothServiceUuids()).then(devices => {
                     for (const device of devices) {
-                        console.log('search connected peripheral: ', device.id);
+                        this.Log.debug('search connected peripheral: ', device.id);
                         addDevice(device);
                     }
                 });
@@ -269,7 +271,7 @@ class ReactNativeBleTransport {
             }
             let device = null;
             if (transportCache[uuid]) {
-                console.log('@onekey/hd-ble-sdk transport not be released, will release: ', uuid);
+                this.Log.debug('transport not be released, will release: ', uuid);
                 yield this.release(uuid);
             }
             const blePlxManager = yield this.getPlxManager();
@@ -277,7 +279,7 @@ class ReactNativeBleTransport {
                 yield subscribeBleOn(blePlxManager);
             }
             catch (error) {
-                console.log('subscribeBleOn error: ', error);
+                this.Log.debug('subscribeBleOn error: ', error);
                 throw error;
             }
             if (!device) {
@@ -287,16 +289,16 @@ class ReactNativeBleTransport {
             if (!device) {
                 const connectedDevice = yield blePlxManager.connectedDevices(getBluetoothServiceUuids());
                 const deviceFilter = connectedDevice.filter(device => device.id === uuid);
-                console.log(`found connected device count: ${deviceFilter.length}`);
+                this.Log.debug(`found connected device count: ${deviceFilter.length}`);
                 [device] = deviceFilter;
             }
             if (!device) {
-                console.log('try to connect to device: ', uuid);
+                this.Log.debug('try to connect to device: ', uuid);
                 try {
                     device = yield blePlxManager.connectToDevice(uuid, connectOptions);
                 }
                 catch (e) {
-                    console.log('try to connect to device has error: ', e);
+                    this.Log.debug('try to connect to device has error: ', e);
                     if (e.errorCode === reactNativeBlePlx.BleErrorCode.DeviceMTUChangeFailed ||
                         e.errorCode === reactNativeBlePlx.BleErrorCode.OperationCancelled) {
                         connectOptions = {};
@@ -311,12 +313,12 @@ class ReactNativeBleTransport {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, 'unable to connect to device');
             }
             if (!(yield device.isConnected())) {
-                console.log('not connected, try to connect to device: ', uuid);
+                this.Log.debug('not connected, try to connect to device: ', uuid);
                 try {
                     yield device.connect(connectOptions);
                 }
                 catch (e) {
-                    console.log('try to connect to device has error: ', e);
+                    this.Log.debug('try to connect to device has error: ', e);
                     if (e.errorCode === reactNativeBlePlx.BleErrorCode.DeviceMTUChangeFailed ||
                         e.errorCode === reactNativeBlePlx.BleErrorCode.OperationCancelled) {
                         connectOptions = {};
@@ -345,7 +347,7 @@ class ReactNativeBleTransport {
                         break;
                     }
                     catch (e) {
-                        console.log(e);
+                        this.Log.error(e);
                     }
                 }
             }
@@ -385,7 +387,7 @@ class ReactNativeBleTransport {
             transport.nofitySubscription = this._monitorCharacteristic(transport.notifyCharacteristic);
             transportCache[uuid] = transport;
             const disconnectSubscription = device.onDisconnected(() => {
-                console.log('device disconnect: ', device === null || device === void 0 ? void 0 : device.id);
+                this.Log.debug('device disconnect: ', device === null || device === void 0 ? void 0 : device.id);
                 this.release(uuid);
                 disconnectSubscription === null || disconnectSubscription === void 0 ? void 0 : disconnectSubscription.remove();
             });
@@ -398,10 +400,10 @@ class ReactNativeBleTransport {
         const subscription = characteristic.monitor((error, c) => {
             var _a, _b, _c;
             if (error) {
-                console.log(`error monitor ${characteristic.uuid}, deviceId: ${characteristic.deviceID}: ${error}`);
+                this.Log.debug(`error monitor ${characteristic.uuid}, deviceId: ${characteristic.deviceID}: ${error}`);
                 if (this.runPromise) {
                     this.runPromise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleCharacteristicNotifyError, (_a = error.reason) !== null && _a !== void 0 ? _a : error.message));
-                    console.log('@onekey/hd-ble-sdk: monitor notify error, and has unreleased Promise');
+                    this.Log.debug(': monitor notify error, and has unreleased Promise');
                 }
                 return;
             }
@@ -425,12 +427,12 @@ class ReactNativeBleTransport {
                 }
             }
             catch (error) {
-                console.log('monitor data error: ', error);
+                this.Log.debug('monitor data error: ', error);
                 (_c = this.runPromise) === null || _c === void 0 ? void 0 : _c.reject(error);
             }
         });
         return () => {
-            console.log('remove characteristic monitor: ', characteristic.uuid);
+            this.Log.debug('remove characteristic monitor: ', characteristic.uuid);
             subscription.remove();
         };
     }
@@ -465,7 +467,7 @@ class ReactNativeBleTransport {
             }
             this.runPromise = hdShared.createDeferred();
             const messages = this._messages;
-            console.log('transport-react-native', 'call-', ' name: ', name, ' data: ', data);
+            this.Log.debug('transport-react-native', 'call-', ' name: ', name, ' data: ', data);
             const buffers = buildBuffers(messages, name, data);
             if (name === 'FirmwareUpload') {
                 const packetCapacity = reactNative.Platform.OS === 'ios' ? IOS_PACKET_LENGTH : ANDROID_PACKET_LENGTH;
@@ -477,14 +479,14 @@ class ReactNativeBleTransport {
                     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'));
+                        this.Log.debug('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);
+                            this.Log.error('writeCharacteristic write error: ', e);
                             return;
                         }
                     }
@@ -493,7 +495,7 @@ class ReactNativeBleTransport {
             else {
                 for (const o of buffers) {
                     const outData = o.toString('base64');
-                    console.log('@onekey/hd-ble-sdk send hex strting: ', o.toString('hex'));
+                    this.Log.debug('send hex strting: ', o.toString('hex'));
                     try {
                         yield transport.writeCharacteristic.writeWithoutResponse(outData);
                     }
@@ -502,7 +504,7 @@ class ReactNativeBleTransport {
                             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceNotBonded);
                         }
                         this.runPromise = null;
-                        console.log('writeCharacteristic write error: ', e);
+                        this.Log.debug('writeCharacteristic write error: ', e);
                         return;
                     }
                 }
@@ -512,12 +514,12 @@ class ReactNativeBleTransport {
                 if (typeof response !== 'string') {
                     throw new Error('Returning data is not string.');
                 }
-                console.log('@onekey/hd-ble-sdk receive data: ', response);
+                this.Log.debug('receive data: ', response);
                 const jsonData = receiveOne(messages, response);
                 return check.call(jsonData);
             }
             catch (e) {
-                console.log('call error: ', e);
+                this.Log.error('call error: ', e);
                 return e;
             }
             finally {
@@ -529,7 +531,7 @@ class ReactNativeBleTransport {
         this.stopped = true;
     }
     cancel() {
-        console.log('transport-react-native canceled');
+        this.Log.debug('transport-react-native canceled');
         if (this.runPromise) ;
         this.runPromise = null;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "0.1.12",
+  "version": "0.1.16",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
   "main": "dist/index.js",
@@ -20,10 +20,10 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^0.1.12",
-    "@onekeyfe/hd-transport": "^0.1.12",
+    "@onekeyfe/hd-shared": "^0.1.16",
+    "@onekeyfe/hd-transport": "^0.1.16",
     "react-native-ble-manager": "^8.1.0",
     "react-native-ble-plx": "^2.0.3"
   },
-  "gitHead": "38d4f8d711d212de8617f217a0148dcf3cdcc477"
+  "gitHead": "e87fdbab30d6daa4f32e28259bd221d75b5d6aad"
 }

package/src/index.ts

@@ -54,11 +54,15 @@ export default class ReactNativeBleTransport {
 
   runPromise: Deferred<any> | null = null;
 
+  Log?: any;
+
   constructor(options: TransportOptions) {
     this.scanTimeout = options.scanTimeout ?? 3000;
   }
 
-  init() {}
+  init(logger: any) {
+    this.Log = logger;
+  }
 
   configure(signedData: any) {
     const messages = parseConfigure(signedData);
@@ -90,7 +94,7 @@ export default class ReactNativeBleTransport {
       try {
         await subscribeBleOn(blePlxManager);
       } catch (error) {
-        console.log('subscribeBleOn error: ', error);
+        this.Log.debug('subscribeBleOn error: ', error);
         reject(error);
         return;
       }
@@ -102,8 +106,8 @@ export default class ReactNativeBleTransport {
         },
         (error, device) => {
           if (error) {
-            console.log('ble scan manager: ', blePlxManager);
-            console.log('ble scan error: ', error);
+            this.Log.debug('ble scan manager: ', blePlxManager);
+            this.Log.debug('ble scan error: ', error);
             if (
               [BleErrorCode.BluetoothPoweredOff, BleErrorCode.BluetoothInUnknownState].includes(
                 error.errorCode
@@ -119,22 +123,22 @@ export default class ReactNativeBleTransport {
           }
 
           if (isOnekeyDevice(device?.name ?? null, device?.id)) {
-            console.log('search device start ======================');
+            this.Log.debug('search device start ======================');
 
             const { name, localName, id } = device ?? {};
-            console.log(
+            this.Log.debug(
               `device name: ${name ?? ''}\nlocalName: ${localName ?? ''}\nid: ${id ?? ''}`
             );
             addDevice(device as unknown as Device);
 
-            console.log('search device end ======================\n');
+            this.Log.debug('search device end ======================\n');
           }
         }
       );
 
       getConnectedDeviceIds(getBluetoothServiceUuids()).then(devices => {
         for (const device of devices) {
-          console.log('search connected peripheral: ', device.id);
+          this.Log.debug('search connected peripheral: ', device.id);
           addDevice(device as unknown as Device);
         }
       });
@@ -166,7 +170,7 @@ export default class ReactNativeBleTransport {
        * If the transport is not released due to an exception operation
        * it will be handled again here
        */
-      console.log('@onekey/hd-ble-sdk transport not be released, will release: ', uuid);
+      this.Log.debug('transport not be released, will release: ', uuid);
       await this.release(uuid);
     }
 
@@ -174,7 +178,7 @@ export default class ReactNativeBleTransport {
     try {
       await subscribeBleOn(blePlxManager);
     } catch (error) {
-      console.log('subscribeBleOn error: ', error);
+      this.Log.debug('subscribeBleOn error: ', error);
       throw error;
     }
 
@@ -186,16 +190,16 @@ export default class ReactNativeBleTransport {
     if (!device) {
       const connectedDevice = await blePlxManager.connectedDevices(getBluetoothServiceUuids());
       const deviceFilter = connectedDevice.filter(device => device.id === uuid);
-      console.log(`found connected device count: ${deviceFilter.length}`);
+      this.Log.debug(`found connected device count: ${deviceFilter.length}`);
       [device] = deviceFilter;
     }
 
     if (!device) {
-      console.log('try to connect to device: ', uuid);
+      this.Log.debug('try to connect to device: ', uuid);
       try {
         device = await blePlxManager.connectToDevice(uuid, connectOptions);
       } catch (e) {
-        console.log('try to connect to device has error: ', e);
+        this.Log.debug('try to connect to device has error: ', e);
         if (
           e.errorCode === BleErrorCode.DeviceMTUChangeFailed ||
           e.errorCode === BleErrorCode.OperationCancelled
@@ -213,12 +217,12 @@ export default class ReactNativeBleTransport {
     }
 
     if (!(await device.isConnected())) {
-      console.log('not connected, try to connect to device: ', uuid);
+      this.Log.debug('not connected, try to connect to device: ', uuid);
 
       try {
         await device.connect(connectOptions);
       } catch (e) {
-        console.log('try to connect to device has error: ', e);
+        this.Log.debug('try to connect to device has error: ', e);
         if (
           e.errorCode === BleErrorCode.DeviceMTUChangeFailed ||
           e.errorCode === BleErrorCode.OperationCancelled
@@ -251,7 +255,7 @@ export default class ReactNativeBleTransport {
           infos = getInfosForServiceUuid(serviceUuid, 'classic');
           break;
         } catch (e) {
-          console.log(e);
+          this.Log.error(e);
         }
       }
     }
@@ -303,7 +307,7 @@ export default class ReactNativeBleTransport {
     transportCache[uuid] = transport;
 
     const disconnectSubscription = device.onDisconnected(() => {
-      console.log('device disconnect: ', device?.id);
+      this.Log.debug('device disconnect: ', device?.id);
       this.release(uuid);
       disconnectSubscription?.remove();
     });
@@ -316,7 +320,7 @@ export default class ReactNativeBleTransport {
     let buffer: any[] = [];
     const subscription = characteristic.monitor((error, c) => {
       if (error) {
-        console.log(
+        this.Log.debug(
           `error monitor ${characteristic.uuid}, deviceId: ${characteristic.deviceID}: ${
             error as unknown as string
           }`
@@ -328,7 +332,7 @@ export default class ReactNativeBleTransport {
               error.reason ?? error.message
             )
           );
-          console.log('@onekey/hd-ble-sdk: monitor notify error, and has unreleased Promise');
+          this.Log.debug(': monitor notify error, and has unreleased Promise');
         }
         return;
       }
@@ -360,13 +364,13 @@ export default class ReactNativeBleTransport {
           this.runPromise?.resolve(value.toString('hex'));
         }
       } catch (error) {
-        console.log('monitor data error: ', error);
+        this.Log.debug('monitor data error: ', error);
         this.runPromise?.reject(error);
       }
     });
 
     return () => {
-      console.log('remove characteristic monitor: ', characteristic.uuid);
+      this.Log.debug('remove characteristic monitor: ', characteristic.uuid);
       subscription.remove();
     };
   }
@@ -405,7 +409,7 @@ export default class ReactNativeBleTransport {
 
     this.runPromise = createDeferred();
     const messages = this._messages;
-    console.log('transport-react-native', 'call-', ' name: ', name, ' data: ', data);
+    this.Log.debug('transport-react-native', 'call-', ' name: ', name, ' data: ', data);
     const buffers = buildBuffers(messages, name, data);
 
     if (name === 'FirmwareUpload') {
@@ -418,13 +422,13 @@ export default class ReactNativeBleTransport {
         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'));
+          this.Log.debug('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);
+            this.Log.error('writeCharacteristic write error: ', e);
             return;
           }
         }
@@ -432,7 +436,7 @@ export default class ReactNativeBleTransport {
     } else {
       for (const o of buffers) {
         const outData = o.toString('base64');
-        console.log('@onekey/hd-ble-sdk send hex strting: ', o.toString('hex'));
+        this.Log.debug('send hex strting: ', o.toString('hex'));
         try {
           await transport.writeCharacteristic.writeWithoutResponse(outData);
         } catch (e) {
@@ -440,7 +444,7 @@ export default class ReactNativeBleTransport {
             throw ERRORS.TypedError(HardwareErrorCode.BleDeviceNotBonded);
           }
           this.runPromise = null;
-          console.log('writeCharacteristic write error: ', e);
+          this.Log.debug('writeCharacteristic write error: ', e);
           return;
         }
       }
@@ -453,11 +457,11 @@ export default class ReactNativeBleTransport {
         throw new Error('Returning data is not string.');
       }
 
-      console.log('@onekey/hd-ble-sdk receive data: ', response);
+      this.Log.debug('receive data: ', response);
       const jsonData = receiveOne(messages, response);
       return check.call(jsonData);
     } catch (e) {
-      console.log('call error: ', e);
+      this.Log.error('call error: ', e);
       return e;
     } finally {
       this.runPromise = null;
@@ -469,7 +473,7 @@ export default class ReactNativeBleTransport {
   }
 
   cancel() {
-    console.log('transport-react-native canceled');
+    this.Log.debug('transport-react-native canceled');
     if (this.runPromise) {
       // this.runPromise.reject(new Error('Transport_CallCanceled'));
     }