@onekeyfe/hd-shared 1.2.0-alpha.32 → 1.2.0-alpha.34

package/dist/constants.d.ts

@@ -45,5 +45,16 @@ export declare const ONEKEY_WRITE_CHARACTERISTIC_UUID = "00000002-0000-1000-8000
 export declare const ONEKEY_NOTIFY_CHARACTERISTIC_UUID = "00000003-0000-1000-8000-00805f9b34fb";
 export declare const isHeaderChunk: (chunk: Buffer | Uint8Array) => boolean;
 export declare const isOnekeyDevice: (name: string | null, id?: string) => boolean;
+type BluetoothDeviceIdentity = {
+    id?: string;
+    name?: string | null;
+    localName?: string | null;
+    serviceUuids?: Array<string | null | undefined> | null;
+};
+export declare const normalizeBleUuid: (uuid?: string | null) => string;
+export declare const createKnownBleUuidAliases: (uuid: string) => ReadonlySet<string>;
+export declare const matchesKnownBleUuid: (actualUuid: string | null | undefined, aliases: ReadonlySet<string>) => boolean;
+export declare const hasOnekeyCommunicationService: (serviceUuids: Array<string | null | undefined> | null | undefined) => boolean;
+export declare const isOnekeyBluetoothDevice: ({ id, name, localName, serviceUuids, }: BluetoothDeviceIdentity) => boolean;
 export {};
 //# sourceMappingURL=constants.d.ts.map

package/dist/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";AAEA,eAAO,MAAM,yBAAyB;;;CAG5B,CAAC;AAEX,MAAM,MAAM,uBAAuB,GACjC,CAAC,OAAO,yBAAyB,CAAC,CAAC,MAAM,OAAO,yBAAyB,CAAC,CAAC;AAE7E,eAAO,MAAM,oBAAoB;;;GAOhC,CAAC;AAEF,KAAK,wBAAwB,GAAG;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC,CAAC;AAIF,eAAO,MAAM,yBAAyB,eAAgB,wBAAwB,KAAG,OAQhF,CAAC;AAMF,eAAO,MAAM,2BAA2B,mDAS9B,CAAC;AAMX,eAAO,MAAM,8BAA8B,qBAGjC,CAAC;AAGX,oBAAY,qBAAqB;IAE/B,UAAU,uBAAuB;IACjC,iBAAiB,8BAA8B;IAC/C,aAAa,0BAA0B;IACvC,kBAAkB,+BAA+B;IACjD,cAAc,2BAA2B;IACzC,oBAAoB,iCAAiC;IAGrD,mBAAmB,gCAAgC;IACnD,oBAAoB,iCAAiC;IAGrD,aAAa,0BAA0B;IACvC,oBAAoB,iCAAiC;IAGrD,uBAAuB,oCAAoC;IAC3D,sBAAsB,mCAAmC;IAGzD,mBAAmB,gCAAgC;IACnD,mBAAmB,gCAAgC;IACnD,oBAAoB,iCAAiC;IACrD,iBAAiB,8BAA8B;IAC/C,oBAAoB,iCAAiC;IACrD,eAAe,4BAA4B;IAC3C,mBAAmB,gCAAgC;IACnD,qBAAqB,kCAAkC;IACvD,sBAAsB,mCAAmC;IACzD,wBAAwB,qCAAqC;CAC9D;AAED,eAAO,MAAM,mBAAmB,yCAAyC,CAAC;AAC1E,eAAO,MAAM,gCAAgC,yCAAyC,CAAC;AACvF,eAAO,MAAM,iCAAiC,yCAAyC,CAAC;AAIxF,eAAO,MAAM,aAAa,UAAW,MAAM,GAAG,UAAU,KAAG,OAa1D,CAAC;AAkBF,eAAO,MAAM,cAAc,SAAU,MAAM,GAAG,IAAI,OAAO,MAAM,KAAG,OAsBjE,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";AAEA,eAAO,MAAM,yBAAyB;;;CAG5B,CAAC;AAEX,MAAM,MAAM,uBAAuB,GACjC,CAAC,OAAO,yBAAyB,CAAC,CAAC,MAAM,OAAO,yBAAyB,CAAC,CAAC;AAE7E,eAAO,MAAM,oBAAoB;;;GAOhC,CAAC;AAEF,KAAK,wBAAwB,GAAG;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC,CAAC;AAIF,eAAO,MAAM,yBAAyB,eAAgB,wBAAwB,KAAG,OAQhF,CAAC;AAMF,eAAO,MAAM,2BAA2B,mDAS9B,CAAC;AAMX,eAAO,MAAM,8BAA8B,qBAGjC,CAAC;AAGX,oBAAY,qBAAqB;IAE/B,UAAU,uBAAuB;IACjC,iBAAiB,8BAA8B;IAC/C,aAAa,0BAA0B;IACvC,kBAAkB,+BAA+B;IACjD,cAAc,2BAA2B;IACzC,oBAAoB,iCAAiC;IAGrD,mBAAmB,gCAAgC;IACnD,oBAAoB,iCAAiC;IAGrD,aAAa,0BAA0B;IACvC,oBAAoB,iCAAiC;IAGrD,uBAAuB,oCAAoC;IAC3D,sBAAsB,mCAAmC;IAGzD,mBAAmB,gCAAgC;IACnD,mBAAmB,gCAAgC;IACnD,oBAAoB,iCAAiC;IACrD,iBAAiB,8BAA8B;IAC/C,oBAAoB,iCAAiC;IACrD,eAAe,4BAA4B;IAC3C,mBAAmB,gCAAgC;IACnD,qBAAqB,kCAAkC;IACvD,sBAAsB,mCAAmC;IACzD,wBAAwB,qCAAqC;CAC9D;AAED,eAAO,MAAM,mBAAmB,yCAAyC,CAAC;AAC1E,eAAO,MAAM,gCAAgC,yCAAyC,CAAC;AACvF,eAAO,MAAM,iCAAiC,yCAAyC,CAAC;AAIxF,eAAO,MAAM,aAAa,UAAW,MAAM,GAAG,UAAU,KAAG,OAa1D,CAAC;AAkBF,eAAO,MAAM,cAAc,SAAU,MAAM,GAAG,IAAI,OAAO,MAAM,KAAG,OAsBjE,CAAC;AAEF,KAAK,uBAAuB,GAAG;IAC7B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,YAAY,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC;CACxD,CAAC;AAIF,eAAO,MAAM,gBAAgB,UAAW,MAAM,GAAG,IAAI,WACP,CAAC;AAE/C,eAAO,MAAM,yBAAyB,SAAU,MAAM,KAAG,YAAY,MAAM,CAc1E,CAAC;AAEF,eAAO,MAAM,mBAAmB,eAClB,MAAM,GAAG,IAAI,GAAG,SAAS,WAC5B,YAAY,MAAM,CAAC,YACgB,CAAC;AAQ/C,eAAO,MAAM,6BAA6B,iBAC1B,MAAM,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,GAAG,IAAI,GAAG,SAAS,YAIhE,CAAC;AAEJ,eAAO,MAAM,uBAAuB,2CAKjC,uBAAuB,KAAG,OAe5B,CAAC"}

package/dist/index.d.ts

@@ -52,6 +52,17 @@ declare const ONEKEY_WRITE_CHARACTERISTIC_UUID = "00000002-0000-1000-8000-00805f
 declare const ONEKEY_NOTIFY_CHARACTERISTIC_UUID = "00000003-0000-1000-8000-00805f9b34fb";
 declare const isHeaderChunk: (chunk: Buffer | Uint8Array) => boolean;
 declare const isOnekeyDevice: (name: string | null, id?: string) => boolean;
+type BluetoothDeviceIdentity = {
+    id?: string;
+    name?: string | null;
+    localName?: string | null;
+    serviceUuids?: Array<string | null | undefined> | null;
+};
+declare const normalizeBleUuid: (uuid?: string | null) => string;
+declare const createKnownBleUuidAliases: (uuid: string) => ReadonlySet<string>;
+declare const matchesKnownBleUuid: (actualUuid: string | null | undefined, aliases: ReadonlySet<string>) => boolean;
+declare const hasOnekeyCommunicationService: (serviceUuids: Array<string | null | undefined> | null | undefined) => boolean;
+declare const isOnekeyBluetoothDevice: ({ id, name, localName, serviceUuids, }: BluetoothDeviceIdentity) => boolean;
 
 type Deferred<T, I = any, D = any> = {
     id?: I;
@@ -513,4 +524,4 @@ declare enum EDeviceType {
     Pro2 = "pro2"
 }
 
-export { CreateErrorByMessage, CreateHardwareErrorByBridgeError, Deferred, EDeviceType, EFirmwareType, EOneKeyBleMessageKeys, HardwareError$1 as ERRORS, ERROR_CODES_REQUIRE_DISCONNECT, ERROR_CODES_REQUIRE_RELEASE, HARDWARE_CONNECT_PROTOCOL, HardwareConnectProtocol, HardwareError, HardwareErrorCode, HardwareErrorCodeMessage, IHardwareError, ONEKEY_NOTIFY_CHARACTERISTIC_UUID, ONEKEY_SERVICE_UUID, ONEKEY_WEBUSB_FILTER, ONEKEY_WRITE_CHARACTERISTIC_UUID, TypedError, createDefectiveFirmwareError, createDeferred, createDeprecatedHardwareError, createDeviceNotSupportMethodError, createNeedUpgradeFirmwareHardwareError, createNewFirmwareForceUpdateHardwareError, createNewFirmwareUnReleaseHardwareError, isHeaderChunk, isKnownTrezorWebUsbDevice, isOnekeyDevice, serializeError, wait };
+export { CreateErrorByMessage, CreateHardwareErrorByBridgeError, Deferred, EDeviceType, EFirmwareType, EOneKeyBleMessageKeys, HardwareError$1 as ERRORS, ERROR_CODES_REQUIRE_DISCONNECT, ERROR_CODES_REQUIRE_RELEASE, HARDWARE_CONNECT_PROTOCOL, HardwareConnectProtocol, HardwareError, HardwareErrorCode, HardwareErrorCodeMessage, IHardwareError, ONEKEY_NOTIFY_CHARACTERISTIC_UUID, ONEKEY_SERVICE_UUID, ONEKEY_WEBUSB_FILTER, ONEKEY_WRITE_CHARACTERISTIC_UUID, TypedError, createDefectiveFirmwareError, createDeferred, createDeprecatedHardwareError, createDeviceNotSupportMethodError, createKnownBleUuidAliases, createNeedUpgradeFirmwareHardwareError, createNewFirmwareForceUpdateHardwareError, createNewFirmwareUnReleaseHardwareError, hasOnekeyCommunicationService, isHeaderChunk, isKnownTrezorWebUsbDevice, isOnekeyBluetoothDevice, isOnekeyDevice, matchesKnownBleUuid, normalizeBleUuid, serializeError, wait };

package/dist/index.js

@@ -496,6 +496,39 @@ const isOnekeyDevice = (name, id) => {
     }
     return isOneKeyShortName(normalizedName);
 };
+const BLUETOOTH_BASE_UUID_SUFFIX = '00001000800000805f9b34fb';
+const normalizeBleUuid = (uuid) => (uuid !== null && uuid !== void 0 ? uuid : '').replace(/-/g, '').toLowerCase();
+const createKnownBleUuidAliases = (uuid) => {
+    const normalized = normalizeBleUuid(uuid);
+    const aliases = new Set([normalized]);
+    if (normalized.length !== 32 || !normalized.endsWith(BLUETOOTH_BASE_UUID_SUFFIX)) {
+        return aliases;
+    }
+    const assignedNumber = normalized.slice(0, 8);
+    aliases.add(assignedNumber);
+    if (assignedNumber.startsWith('0000')) {
+        aliases.add(assignedNumber.slice(4));
+    }
+    return aliases;
+};
+const matchesKnownBleUuid = (actualUuid, aliases) => aliases.has(normalizeBleUuid(actualUuid));
+const ONEKEY_COMMUNICATION_SERVICE_ALIASES = createKnownBleUuidAliases(ONEKEY_SERVICE_UUID);
+const FIDO_SERVICE_ALIASES = createKnownBleUuidAliases('0000fffd-0000-1000-8000-00805f9b34fb');
+const isFindMyAdvertisementName = (value) => { var _a; return /\bfinde?\s+my\b/.test((_a = value === null || value === void 0 ? void 0 : value.trim().toLowerCase()) !== null && _a !== void 0 ? _a : ''); };
+const hasOnekeyCommunicationService = (serviceUuids) => (serviceUuids !== null && serviceUuids !== void 0 ? serviceUuids : []).some(uuid => matchesKnownBleUuid(uuid, ONEKEY_COMMUNICATION_SERVICE_ALIASES));
+const isOnekeyBluetoothDevice = ({ id, name, localName, serviceUuids, }) => {
+    const advertisedServiceUuids = serviceUuids !== null && serviceUuids !== void 0 ? serviceUuids : [];
+    if (isFindMyAdvertisementName(name) || isFindMyAdvertisementName(localName)) {
+        return false;
+    }
+    if (hasOnekeyCommunicationService(advertisedServiceUuids)) {
+        return true;
+    }
+    if (advertisedServiceUuids.some(uuid => matchesKnownBleUuid(uuid, FIDO_SERVICE_ALIASES))) {
+        return false;
+    }
+    return isOnekeyDevice(name !== null && name !== void 0 ? name : null, id) || isOnekeyDevice(localName !== null && localName !== void 0 ? localName : null, id);
+};
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -588,11 +621,16 @@ exports.createDefectiveFirmwareError = createDefectiveFirmwareError;
 exports.createDeferred = createDeferred;
 exports.createDeprecatedHardwareError = createDeprecatedHardwareError;
 exports.createDeviceNotSupportMethodError = createDeviceNotSupportMethodError;
+exports.createKnownBleUuidAliases = createKnownBleUuidAliases;
 exports.createNeedUpgradeFirmwareHardwareError = createNeedUpgradeFirmwareHardwareError;
 exports.createNewFirmwareForceUpdateHardwareError = createNewFirmwareForceUpdateHardwareError;
 exports.createNewFirmwareUnReleaseHardwareError = createNewFirmwareUnReleaseHardwareError;
+exports.hasOnekeyCommunicationService = hasOnekeyCommunicationService;
 exports.isHeaderChunk = isHeaderChunk;
 exports.isKnownTrezorWebUsbDevice = isKnownTrezorWebUsbDevice;
+exports.isOnekeyBluetoothDevice = isOnekeyBluetoothDevice;
 exports.isOnekeyDevice = isOnekeyDevice;
+exports.matchesKnownBleUuid = matchesKnownBleUuid;
+exports.normalizeBleUuid = normalizeBleUuid;
 exports.serializeError = serializeError;
 exports.wait = wait;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-shared",
-  "version": "1.2.0-alpha.32",
+  "version": "1.2.0-alpha.34",
   "description": "Hardware SDK's shared tool library",
   "keywords": [
     "Hardware-SDK",
@@ -26,5 +26,5 @@
     "lint": "eslint .",
     "lint:fix": "eslint . --fix"
   },
-  "gitHead": "468888b93df8b147a512f63a8cbdc40ca1c5c1cf"
+  "gitHead": "07f10b4c9fab177da7c36d976ec18b075492b57f"
 }

package/src/constants.test.ts

@@ -1,4 +1,11 @@
-import { isKnownTrezorWebUsbDevice, isOnekeyDevice } from './constants';
+import {
+  createKnownBleUuidAliases,
+  hasOnekeyCommunicationService,
+  isKnownTrezorWebUsbDevice,
+  isOnekeyBluetoothDevice,
+  isOnekeyDevice,
+  matchesKnownBleUuid,
+} from './constants';
 
 describe('hardware device identity filters', () => {
   it('accepts known OneKey BLE names', () => {
@@ -13,6 +20,71 @@ describe('hardware device identity filters', () => {
     expect(isOnekeyDevice('Ledger Nano X')).toBe(false);
   });
 
+  it('does not identify an unnamed FFFD or Find My advertisement as OneKey', () => {
+    expect(isOnekeyBluetoothDevice({ name: 'Find My', serviceUuids: ['fffd'] })).toBe(false);
+    expect(
+      isOnekeyBluetoothDevice({ serviceUuids: ['0000fffd-0000-1000-8000-00805f9b34fb'] })
+    ).toBe(false);
+  });
+
+  it('keeps Pro2 communication advertisements and rejects its Find My advertisement', () => {
+    expect(
+      isOnekeyBluetoothDevice({
+        name: 'Pro2 A1B2',
+        serviceUuids: ['0001', 'fffd'],
+      })
+    ).toBe(true);
+    expect(
+      isOnekeyBluetoothDevice({
+        localName: 'Pro2 A1B2 - Find My',
+        serviceUuids: ['fffd'],
+      })
+    ).toBe(false);
+    expect(
+      isOnekeyBluetoothDevice({
+        name: 'Pro2 5E9D - Finde My',
+        serviceUuids: ['0001', 'fffd'],
+      })
+    ).toBe(false);
+  });
+
+  it('keeps OneKey discovery on the communication service', () => {
+    expect(
+      isOnekeyBluetoothDevice({
+        name: 'OneKey Pro 2',
+        serviceUuids: ['00000001-0000-1000-8000-00805f9b34fb'],
+      })
+    ).toBe(true);
+  });
+
+  it('only aliases standard Bluetooth Base UUID representations', () => {
+    const aliases = createKnownBleUuidAliases('00000001-0000-1000-8000-00805f9b34fb');
+
+    expect(matchesKnownBleUuid('0001', aliases)).toBe(true);
+    expect(matchesKnownBleUuid('00000001', aliases)).toBe(true);
+    expect(matchesKnownBleUuid('abcd0001-1234-5678-9012-abcdefabcdef', aliases)).toBe(false);
+  });
+
+  it('does not treat vendor-specific UUID fragments as communication or FIDO services', () => {
+    expect(
+      isOnekeyBluetoothDevice({
+        name: 'OneKey Pro 2',
+        serviceUuids: ['abcdfffd-1234-5678-9012-abcdefabcdef'],
+      })
+    ).toBe(true);
+    expect(
+      isOnekeyBluetoothDevice({
+        serviceUuids: ['abcd0001-1234-5678-9012-abcdefabcdef'],
+      })
+    ).toBe(false);
+  });
+
+  it('requires an explicitly advertised communication service for strict discovery', () => {
+    expect(hasOnekeyCommunicationService([])).toBe(false);
+    expect(hasOnekeyCommunicationService(['0001'])).toBe(true);
+    expect(hasOnekeyCommunicationService(['abcd0001-1234-5678-9012-abcdefabcdef'])).toBe(false);
+  });
+
   it('only filters WebUSB descriptors that are explicitly identified as Trezor', () => {
     expect(
       isKnownTrezorWebUsbDevice({

package/src/constants.ts

@@ -154,3 +154,71 @@ export const isOnekeyDevice = (name: string | null, id?: string): boolean => {
   }
   return isOneKeyShortName(normalizedName);
 };
+
+type BluetoothDeviceIdentity = {
+  id?: string;
+  name?: string | null;
+  localName?: string | null;
+  serviceUuids?: Array<string | null | undefined> | null;
+};
+
+const BLUETOOTH_BASE_UUID_SUFFIX = '00001000800000805f9b34fb';
+
+export const normalizeBleUuid = (uuid?: string | null) =>
+  (uuid ?? '').replace(/-/g, '').toLowerCase();
+
+export const createKnownBleUuidAliases = (uuid: string): ReadonlySet<string> => {
+  const normalized = normalizeBleUuid(uuid);
+  const aliases = new Set([normalized]);
+
+  if (normalized.length !== 32 || !normalized.endsWith(BLUETOOTH_BASE_UUID_SUFFIX)) {
+    return aliases;
+  }
+
+  const assignedNumber = normalized.slice(0, 8);
+  aliases.add(assignedNumber);
+  if (assignedNumber.startsWith('0000')) {
+    aliases.add(assignedNumber.slice(4));
+  }
+  return aliases;
+};
+
+export const matchesKnownBleUuid = (
+  actualUuid: string | null | undefined,
+  aliases: ReadonlySet<string>
+) => aliases.has(normalizeBleUuid(actualUuid));
+
+const ONEKEY_COMMUNICATION_SERVICE_ALIASES = createKnownBleUuidAliases(ONEKEY_SERVICE_UUID);
+const FIDO_SERVICE_ALIASES = createKnownBleUuidAliases('0000fffd-0000-1000-8000-00805f9b34fb');
+
+const isFindMyAdvertisementName = (value?: string | null) =>
+  /\bfinde?\s+my\b/.test(value?.trim().toLowerCase() ?? '');
+
+export const hasOnekeyCommunicationService = (
+  serviceUuids: Array<string | null | undefined> | null | undefined
+) =>
+  (serviceUuids ?? []).some(uuid =>
+    matchesKnownBleUuid(uuid, ONEKEY_COMMUNICATION_SERVICE_ALIASES)
+  );
+
+export const isOnekeyBluetoothDevice = ({
+  id,
+  name,
+  localName,
+  serviceUuids,
+}: BluetoothDeviceIdentity): boolean => {
+  const advertisedServiceUuids = serviceUuids ?? [];
+  if (isFindMyAdvertisementName(name) || isFindMyAdvertisementName(localName)) {
+    return false;
+  }
+
+  if (hasOnekeyCommunicationService(advertisedServiceUuids)) {
+    return true;
+  }
+
+  if (advertisedServiceUuids.some(uuid => matchesKnownBleUuid(uuid, FIDO_SERVICE_ALIASES))) {
+    return false;
+  }
+
+  return isOnekeyDevice(name ?? null, id) || isOnekeyDevice(localName ?? null, id);
+};