@onekeyfe/hd-transport-react-native 1.1.27-alpha.41 → 1.1.27-alpha.6

package/dist/types.d.ts

@@ -1,4 +1,3 @@
-import type { ProtocolType } from '@onekeyfe/hd-transport';
 export type { BleManager as BlePlxManager } from 'react-native-ble-plx';
 export type TransportOptions = {
     scanTimeout?: number;
@@ -6,6 +5,5 @@ export type TransportOptions = {
 export type BleAcquireInput = {
     uuid: string;
     forceCleanRunPromise?: boolean;
-    expectedProtocol?: ProtocolType;
 };
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE3D,YAAY,EAAE,UAAU,IAAI,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAExE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,gBAAgB,CAAC,EAAE,YAAY,CAAC;CACjC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,UAAU,IAAI,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAExE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "1.1.27-alpha.41",
+  "version": "1.1.27-alpha.6",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
   "main": "dist/index.js",
@@ -19,11 +19,11 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-core": "1.1.27-alpha.41",
-    "@onekeyfe/hd-shared": "1.1.27-alpha.41",
-    "@onekeyfe/hd-transport": "1.1.27-alpha.41",
+    "@onekeyfe/hd-core": "1.1.27-alpha.6",
+    "@onekeyfe/hd-shared": "1.1.27-alpha.6",
+    "@onekeyfe/hd-transport": "1.1.27-alpha.6",
     "@onekeyfe/react-native-ble-utils": "^0.1.4",
     "react-native-ble-plx": "3.5.1"
   },
-  "gitHead": "09cece9f0c9d85f55ae2f7f0458ed7d8833483d2"
+  "gitHead": "a1fb7786313ccee4b1e570c53ae2c05a96f785df"
 }

package/src/BleManager.ts

@@ -1,11 +1,10 @@
 import BleUtils from '@onekeyfe/react-native-ble-utils';
 import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
+import { LoggerNames, getLogger } from '@onekeyfe/hd-core';
 
 import type { Peripheral } from '@onekeyfe/react-native-ble-utils';
 
-import { bleLogger } from './logger';
-
-const Logger = bleLogger;
+const Logger = getLogger(LoggerNames.HdBleTransport);
 
 /**
  * get the device basic info of connected devices
@@ -21,35 +20,36 @@ export const pairDevice = (macAddress: string) => BleUtils.pairDevice(macAddress
 
 export const onDeviceBondState = (bleMacAddress: string): Promise<Peripheral | undefined> =>
   new Promise((resolve, reject) => {
-    let timeout: ReturnType<typeof setTimeout> | undefined;
-    let cleanupListener: (() => void) | undefined;
+    let timeout: any | undefined;
 
-    const cleanup = () => {
+    const cleanup = (cleanupListener: (() => void) | undefined) => {
       if (timeout) {
         clearTimeout(timeout);
       }
       if (cleanupListener) cleanupListener();
     };
 
-    timeout = setTimeout(() => {
-      cleanup();
-      reject(ERRORS.TypedError(HardwareErrorCode.BleDeviceNotBonded, 'device is not bonded'));
-    }, 60 * 1000);
-
-    cleanupListener = BleUtils.onDeviceBondState(peripheral => {
+    const cleanupListener = BleUtils.onDeviceBondState(peripheral => {
       if (peripheral.id?.toLowerCase() !== bleMacAddress.toLowerCase()) {
         return;
       }
       const { bondState } = peripheral;
 
+      if (bondState.preState === 'BOND_NONE' && bondState.state === 'BOND_BONDING') {
+        timeout = setTimeout(() => {
+          cleanup(cleanupListener);
+          reject(ERRORS.TypedError(HardwareErrorCode.BleDeviceNotBonded, 'device is not bonded'));
+        }, 60 * 1000);
+      }
+
       const hasBonded = bondState.preState === 'BOND_BONDING' && bondState.state === 'BOND_BONDED';
       const hasCanceled = bondState.preState === 'BOND_BONDING' && bondState.state === 'BOND_NONE';
       Logger.debug('onDeviceBondState bondState:', bondState);
       if (hasBonded) {
-        cleanup();
+        cleanup(cleanupListener);
         resolve(peripheral);
       } else if (hasCanceled) {
-        cleanup();
+        cleanup(cleanupListener);
         reject(ERRORS.TypedError(HardwareErrorCode.BleDeviceBondedCanceled, 'bonding canceled'));
       }
     });

package/src/BleTransport.ts

@@ -1,11 +1,10 @@
 import { BleErrorCode } from 'react-native-ble-plx';
-import { wait } from '@onekeyfe/hd-shared';
+import { LoggerNames, getLogger, wait } from '@onekeyfe/hd-core';
 
 import type { Characteristic, Device, Subscription } from 'react-native-ble-plx';
+// import { wait } from '@onekeyfe/hd-core/src/utils';
 
-import { bleLogger } from './logger';
-
-const Log = bleLogger;
+const Log = getLogger(LoggerNames.HdBleTransport);
 
 export default class BleTransport {
   id: string;
@@ -14,7 +13,7 @@ export default class BleTransport {
 
   device: Device;
 
-  mtuSize = 23;
+  mtuSize = 20;
 
   writeCharacteristic: Characteristic;
 
@@ -24,10 +23,6 @@ export default class BleTransport {
 
   disconnectSubscription?: Subscription;
 
-  notifyTransactionId?: string;
-
-  monitorToken?: number;
-
   static MAX_RETRIES = 5;
 
   static RETRY_DELAY = 2000;
@@ -41,6 +36,7 @@ export default class BleTransport {
     this.device = device;
     this.writeCharacteristic = writeCharacteristic;
     this.notifyCharacteristic = notifyCharacteristic;
+    console.log(`BleTransport(${String(this.id)}) new instance`);
   }
 
   /**

package/src/constants.ts

@@ -1,6 +1,5 @@
 export const IOS_PACKET_LENGTH = 128;
 export const ANDROID_PACKET_LENGTH = 192;
-export const ANDROID_DEFAULT_MTU = 23;
 
 type BluetoothServices = Record<
   string,
@@ -36,32 +35,9 @@ export const getInfosForServiceUuid = (serviceUuid: string, deviceType: 'classic
   if (!services) {
     return null;
   }
-  const normalizedServiceUuid = normalizeBleUuid(serviceUuid);
-  const service =
-    services[serviceUuid] ??
-    Object.values(services).find(
-      item => normalizeBleUuid(item.serviceUuid) === normalizedServiceUuid
-    );
+  const service = services[serviceUuid];
   if (!service) {
     return null;
   }
   return service;
 };
-
-export const normalizeBleUuid = (uuid?: string | null) =>
-  (uuid ?? '').replace(/-/g, '').toLowerCase();
-
-export const getBleUuidKey = (uuid?: string | null) => {
-  const normalized = normalizeBleUuid(uuid);
-  return normalized.length >= 8 ? normalized.substring(4, 8) : normalized;
-};
-
-export const isSameBleUuid = (left?: string | null, right?: string | null) => {
-  const normalizedLeft = normalizeBleUuid(left);
-  const normalizedRight = normalizeBleUuid(right);
-
-  return (
-    normalizedLeft === normalizedRight ||
-    (getBleUuidKey(left) !== '' && getBleUuidKey(left) === getBleUuidKey(right))
-  );
-};