@onekeyfe/hd-transport-react-native 1.1.26-alpha.12 → 1.1.26-alpha.30

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.26-alpha.12",
+  "version": "1.1.26-alpha.30",
   "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.26-alpha.12",
-    "@onekeyfe/hd-shared": "1.1.26-alpha.12",
-    "@onekeyfe/hd-transport": "1.1.26-alpha.12",
+    "@onekeyfe/hd-core": "1.1.26-alpha.30",
+    "@onekeyfe/hd-shared": "1.1.26-alpha.30",
+    "@onekeyfe/hd-transport": "1.1.26-alpha.30",
     "@onekeyfe/react-native-ble-utils": "^0.1.4",
     "react-native-ble-plx": "3.5.1"
   },
-  "gitHead": "f9e7f7f5bdca2609e817898efd4b54c8c871bb2b"
+  "gitHead": "88ec305cb60347e09cf9e0c8e921d414f7fe3656"
 }

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 type { Peripheral } from '@onekeyfe/react-native-ble-utils';
 
-const Logger = getLogger(LoggerNames.HdBleTransport);
+import { bleLogger } from './logger';
+
+const Logger = bleLogger;
 
 /**
  * get the device basic info of connected devices

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 type { Characteristic, Device, Subscription } from 'react-native-ble-plx';
-// import { wait } from '@onekeyfe/hd-core/src/utils';
 
-const Log = getLogger(LoggerNames.HdBleTransport);
+import { bleLogger } from './logger';
+
+const Log = bleLogger;
 
 export default class BleTransport {
   id: string;
@@ -23,6 +24,10 @@ export default class BleTransport {
 
   disconnectSubscription?: Subscription;
 
+  notifyTransactionId?: string;
+
+  monitorToken?: number;
+
   static MAX_RETRIES = 5;
 
   static RETRY_DELAY = 2000;

package/src/constants.ts

@@ -35,9 +35,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))
+  );
+};