@onekeyfe/hd-transport-react-native 1.1.27-patch.1 → 1.2.0-alpha.0

package/dist/logger.d.ts

@@ -0,0 +1,14 @@
+type LogMethod = (...args: unknown[]) => void;
+type TransportLogger = {
+    debug?: LogMethod;
+    error?: LogMethod;
+    warn?: LogMethod;
+};
+export declare const setBleLogger: (logger?: TransportLogger) => void;
+export declare const bleLogger: {
+    debug: (...args: unknown[]) => void | undefined;
+    error: (...args: unknown[]) => void | undefined;
+    warn: (...args: unknown[]) => void | undefined;
+};
+export {};
+//# sourceMappingURL=logger.d.ts.map

package/dist/logger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA,KAAK,SAAS,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;AAE9C,KAAK,eAAe,GAAG;IACrB,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,IAAI,CAAC,EAAE,SAAS,CAAC;CAClB,CAAC;AAIF,eAAO,MAAM,YAAY,YAAa,eAAe,SAEpD,CAAC;AAEF,eAAO,MAAM,SAAS;qBACH,OAAO,EAAE;qBACT,OAAO,EAAE;oBACV,OAAO,EAAE;CAC1B,CAAC"}

package/dist/types.d.ts

@@ -1,3 +1,4 @@
+import type { ProtocolType } from '@onekeyfe/hd-transport';
 export type { BleManager as BlePlxManager } from 'react-native-ble-plx';
 export type TransportOptions = {
     scanTimeout?: number;
@@ -5,5 +6,6 @@ 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,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"}
+{"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "1.1.27-patch.1",
+  "version": "1.2.0-alpha.0",
   "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-patch.1",
-    "@onekeyfe/hd-shared": "1.1.27-patch.1",
-    "@onekeyfe/hd-transport": "1.1.27-patch.1",
+    "@onekeyfe/hd-core": "1.2.0-alpha.0",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.0",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.0",
     "@onekeyfe/react-native-ble-utils": "^0.1.4",
     "react-native-ble-plx": "3.5.1"
   },
-  "gitHead": "c7e514c9914c8faf5c0e74e1f7be4d87a015af8c"
+  "gitHead": "de9efe20b83666b641ab9e8d945e6350f6450904"
 }

package/src/BleManager.ts

@@ -1,10 +1,11 @@
 import BleUtils from '@onekeyfe/react-native-ble-utils';
 import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
-import { LoggerNames, getLogger } from '@onekeyfe/hd-core';
+
+import { bleLogger } from './logger';
 
 import type { Peripheral } from '@onekeyfe/react-native-ble-utils';
 
-const Logger = getLogger(LoggerNames.HdBleTransport);
+const Logger = bleLogger;
 
 /**
  * get the device basic info of connected devices
@@ -20,36 +21,32 @@ export const pairDevice = (macAddress: string) => BleUtils.pairDevice(macAddress
 
 export const onDeviceBondState = (bleMacAddress: string): Promise<Peripheral | undefined> =>
   new Promise((resolve, reject) => {
-    let timeout: any | undefined;
-
-    const cleanup = (cleanupListener: (() => void) | undefined) => {
+    const cleanup = () => {
       if (timeout) {
         clearTimeout(timeout);
       }
       if (cleanupListener) cleanupListener();
     };
 
+    const timeout = setTimeout(() => {
+      cleanup();
+      reject(ERRORS.TypedError(HardwareErrorCode.BleDeviceNotBonded, 'device is not bonded'));
+    }, 60 * 1000);
+
     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(cleanupListener);
+        cleanup();
         resolve(peripheral);
       } else if (hasCanceled) {
-        cleanup(cleanupListener);
+        cleanup();
         reject(ERRORS.TypedError(HardwareErrorCode.BleDeviceBondedCanceled, 'bonding canceled'));
       }
     });

package/src/BleTransport.ts

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

package/src/__tests__/bleStrategy.test.ts

@@ -0,0 +1,47 @@
+import {
+  hasWritableCapability,
+  resolveBleWriteMode,
+  resolveProtocolV2PacketCapacity,
+} from '../bleStrategy';
+
+describe('React Native BLE strategy', () => {
+  test('accepts writeWithoutResponse-only characteristics', () => {
+    const characteristic = {
+      isWritableWithResponse: false,
+      isWritableWithoutResponse: true,
+    };
+
+    expect(hasWritableCapability(characteristic)).toBe(true);
+    expect(resolveBleWriteMode(characteristic)).toBe('withoutResponse');
+  });
+
+  test('falls back to Android default ATT payload when MTU is unavailable', () => {
+    expect(
+      resolveProtocolV2PacketCapacity({
+        platform: 'android',
+        androidPacketLength: 192,
+        mtu: null,
+      })
+    ).toBe(20);
+  });
+
+  test('caps Android packet length by negotiated MTU payload', () => {
+    expect(
+      resolveProtocolV2PacketCapacity({
+        platform: 'android',
+        androidPacketLength: 192,
+        mtu: 100,
+      })
+    ).toBe(97);
+  });
+
+  test('keeps iOS packet length controlled by tuning profile', () => {
+    expect(
+      resolveProtocolV2PacketCapacity({
+        platform: 'ios',
+        iosPacketLength: 244,
+        mtu: 256,
+      })
+    ).toBe(244);
+  });
+});

package/src/bleStrategy.ts

@@ -0,0 +1,60 @@
+import { ANDROID_DEFAULT_MTU, ANDROID_PACKET_LENGTH, IOS_PACKET_LENGTH } from './constants';
+
+export type BlePlatform = 'ios' | 'android' | string;
+
+export type BleWriteCapability = {
+  isWritableWithResponse?: boolean | null;
+  isWritableWithoutResponse?: boolean | null;
+};
+
+export type BleWriteMode = 'withResponse' | 'withoutResponse';
+
+export function hasWritableCapability(characteristic: BleWriteCapability) {
+  return !!(characteristic.isWritableWithResponse || characteristic.isWritableWithoutResponse);
+}
+
+export function resolveBleWriteMode(
+  characteristic: BleWriteCapability,
+  preferredMode: BleWriteMode = 'withoutResponse'
+): BleWriteMode {
+  if (preferredMode === 'withoutResponse' && characteristic.isWritableWithoutResponse) {
+    return 'withoutResponse';
+  }
+
+  if (preferredMode === 'withResponse' && characteristic.isWritableWithResponse) {
+    return 'withResponse';
+  }
+
+  if (characteristic.isWritableWithoutResponse) {
+    return 'withoutResponse';
+  }
+
+  if (characteristic.isWritableWithResponse) {
+    return 'withResponse';
+  }
+
+  return preferredMode;
+}
+
+export function resolveProtocolV2PacketCapacity({
+  platform,
+  iosPacketLength = IOS_PACKET_LENGTH,
+  androidPacketLength = ANDROID_PACKET_LENGTH,
+  mtu,
+}: {
+  platform: BlePlatform;
+  iosPacketLength?: number;
+  androidPacketLength?: number;
+  mtu?: number | null;
+}) {
+  if (platform === 'ios') {
+    return iosPacketLength;
+  }
+
+  if (platform === 'android') {
+    const payloadLength = Math.max((mtu ?? ANDROID_DEFAULT_MTU) - 3, 1);
+    return Math.min(androidPacketLength, payloadLength);
+  }
+
+  return androidPacketLength;
+}

package/src/constants.ts

@@ -1,5 +1,6 @@
 export const IOS_PACKET_LENGTH = 128;
 export const ANDROID_PACKET_LENGTH = 192;
+export const ANDROID_DEFAULT_MTU = 23;
 
 type BluetoothServices = Record<
   string,
@@ -35,9 +36,32 @@ export const getInfosForServiceUuid = (serviceUuid: string, deviceType: 'classic
   if (!services) {
     return null;
   }
-  const service = services[serviceUuid];
+  const normalizedServiceUuid = normalizeBleUuid(serviceUuid);
+  const service =
+    services[serviceUuid] ??
+    Object.values(services).find(
+      item => normalizeBleUuid(item.serviceUuid) === normalizedServiceUuid
+    );
   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))
+  );
+};