@onekeyfe/hd-shared 1.2.0-alpha.150 → 1.2.0-alpha.152

package/dist/constants.d.ts

@@ -70,6 +70,8 @@ export declare const createKnownBleUuidAliases: (uuid: string) => ReadonlySet<st
 export declare const matchesKnownBleUuid: (actualUuid: string | null | undefined, aliases: ReadonlySet<string>) => boolean;
 export declare const isPro2FindMyAdvertisementName: (value?: string | null) => boolean;
 export declare const normalizePro2FindMyAdvertisementName: (value: string) => string;
+export declare const canonicalizePro2BleAdvertisementName: (value: string) => string;
+export declare const isSameOnekeyBleName: (left?: string | null, right?: string | null) => boolean;
 export declare const hasOnekeyCommunicationService: (serviceUuids: Array<string | null | undefined> | null | undefined) => boolean;
 export declare const isOnekeyBluetoothDevice: ({ id, name, localName, serviceUuids, }: BluetoothDeviceIdentity) => boolean;
 export {};

package/dist/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -78,6 +78,13 @@ declare const createKnownBleUuidAliases: (uuid: string) => ReadonlySet<string>;
 declare const matchesKnownBleUuid: (actualUuid: string | null | undefined, aliases: ReadonlySet<string>) => boolean;
 declare const isPro2FindMyAdvertisementName: (value?: string | null) => boolean;
 declare const normalizePro2FindMyAdvertisementName: (value: string) => string;
+/**
+ * Current Pro2 advertisements use "Pro 2 XXXX". Older firmware used "Pro2 XXXX".
+ * Discovery and DeviceInfo both go through this helper so the public BLE name
+ * stays on the spaced form without changing OneKey Pro / Neo names.
+ */
+declare const canonicalizePro2BleAdvertisementName: (value: string) => string;
+declare const isSameOnekeyBleName: (left?: string | null, right?: string | null) => boolean;
 declare const hasOnekeyCommunicationService: (serviceUuids: Array<string | null | undefined> | null | undefined) => boolean;
 declare const isOnekeyBluetoothDevice: ({ id, name, localName, serviceUuids, }: BluetoothDeviceIdentity) => boolean;
 
@@ -544,4 +551,4 @@ declare enum EDeviceType {
     Neo = "neo"
 }
 
-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_PROTOCOL_V2_USB_IDS, ONEKEY_SERVICE_UUID, ONEKEY_WEBUSB_FILTER, ONEKEY_WRITE_CHARACTERISTIC_UUID, TypedError, createDefectiveFirmwareError, createDeferred, createDeprecatedHardwareError, createDeviceNotSupportMethodError, createKnownBleUuidAliases, createNeedUpgradeFirmwareHardwareError, createNewFirmwareForceUpdateHardwareError, createNewFirmwareUnReleaseHardwareError, hasOnekeyCommunicationService, inferProtocolHintFromUsbId, isHeaderChunk, isKnownTrezorWebUsbDevice, isOnekeyBluetoothDevice, isOnekeyDevice, isPro2FindMyAdvertisementName, matchesKnownBleUuid, normalizeBleUuid, normalizePro2FindMyAdvertisementName, resolveOneKeyUsbDevicePath, 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_PROTOCOL_V2_USB_IDS, ONEKEY_SERVICE_UUID, ONEKEY_WEBUSB_FILTER, ONEKEY_WRITE_CHARACTERISTIC_UUID, TypedError, canonicalizePro2BleAdvertisementName, createDefectiveFirmwareError, createDeferred, createDeprecatedHardwareError, createDeviceNotSupportMethodError, createKnownBleUuidAliases, createNeedUpgradeFirmwareHardwareError, createNewFirmwareForceUpdateHardwareError, createNewFirmwareUnReleaseHardwareError, hasOnekeyCommunicationService, inferProtocolHintFromUsbId, isHeaderChunk, isKnownTrezorWebUsbDevice, isOnekeyBluetoothDevice, isOnekeyDevice, isPro2FindMyAdvertisementName, isSameOnekeyBleName, matchesKnownBleUuid, normalizeBleUuid, normalizePro2FindMyAdvertisementName, resolveOneKeyUsbDevicePath, serializeError, wait };

package/dist/index.js

@@ -596,6 +596,23 @@ const normalizePro2FindMyAdvertisementName = (value) => {
     }
     return value;
 };
+const canonicalizePro2BleAdvertisementName = (value) => {
+    const withoutFindMy = normalizePro2FindMyAdvertisementName(value);
+    const match = withoutFindMy.match(/^(onekey\s*)?pro\s*2\s*/i);
+    if (!match)
+        return withoutFindMy;
+    const rest = withoutFindMy.slice(match[0].length);
+    const prefix = match[1] ? 'OneKey Pro 2' : 'Pro 2';
+    return rest ? `${prefix} ${rest}` : prefix;
+};
+const isSameOnekeyBleName = (left, right) => {
+    if (!left || !right)
+        return false;
+    if (left === right)
+        return true;
+    return (compactBleName(canonicalizePro2BleAdvertisementName(left)) ===
+        compactBleName(canonicalizePro2BleAdvertisementName(right)));
+};
 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 : [];
@@ -700,6 +717,7 @@ exports.ONEKEY_SERVICE_UUID = ONEKEY_SERVICE_UUID;
 exports.ONEKEY_WEBUSB_FILTER = ONEKEY_WEBUSB_FILTER;
 exports.ONEKEY_WRITE_CHARACTERISTIC_UUID = ONEKEY_WRITE_CHARACTERISTIC_UUID;
 exports.TypedError = TypedError;
+exports.canonicalizePro2BleAdvertisementName = canonicalizePro2BleAdvertisementName;
 exports.createDefectiveFirmwareError = createDefectiveFirmwareError;
 exports.createDeferred = createDeferred;
 exports.createDeprecatedHardwareError = createDeprecatedHardwareError;
@@ -715,6 +733,7 @@ exports.isKnownTrezorWebUsbDevice = isKnownTrezorWebUsbDevice;
 exports.isOnekeyBluetoothDevice = isOnekeyBluetoothDevice;
 exports.isOnekeyDevice = isOnekeyDevice;
 exports.isPro2FindMyAdvertisementName = isPro2FindMyAdvertisementName;
+exports.isSameOnekeyBleName = isSameOnekeyBleName;
 exports.matchesKnownBleUuid = matchesKnownBleUuid;
 exports.normalizeBleUuid = normalizeBleUuid;
 exports.normalizePro2FindMyAdvertisementName = normalizePro2FindMyAdvertisementName;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-shared",
-  "version": "1.2.0-alpha.150",
+  "version": "1.2.0-alpha.152",
   "description": "Hardware SDK's shared tool library",
   "keywords": [
     "Hardware-SDK",
@@ -26,5 +26,5 @@
     "lint": "eslint .",
     "lint:fix": "eslint . --fix"
   },
-  "gitHead": "08359528e71933964694eb49793e555635350104"
+  "gitHead": "cbd3c7de0d95f910c98165467da53035f16e9d40"
 }

package/src/constants.test.ts

@@ -1,4 +1,5 @@
 import {
+  canonicalizePro2BleAdvertisementName,
   createKnownBleUuidAliases,
   hasOnekeyCommunicationService,
   inferProtocolHintFromUsbId,
@@ -6,6 +7,7 @@ import {
   isOnekeyBluetoothDevice,
   isOnekeyDevice,
   isPro2FindMyAdvertisementName,
+  isSameOnekeyBleName,
   matchesKnownBleUuid,
   normalizePro2FindMyAdvertisementName,
   resolveOneKeyUsbDevicePath,
@@ -17,7 +19,9 @@ describe('hardware device identity filters', () => {
     expect(isOnekeyDevice('Pro A1B2')).toBe(true);
     expect(isOnekeyDevice('Neo A1B2')).toBe(true);
     expect(isOnekeyDevice('Pro2A1B2')).toBe(true);
+    expect(isOnekeyDevice('Pro 2 A1B2')).toBe(true);
     expect(isOnekeyDevice('OneKeyPro2A1B2')).toBe(true);
+    expect(isOnekeyDevice('OneKey Pro 2 A1B2')).toBe(true);
     expect(isOnekeyDevice('Neo22D8')).toBe(true);
     expect(isOnekeyDevice('K1234')).toBe(true);
     expect(isOnekeyDevice('S8')).toBe(true);
@@ -42,6 +46,12 @@ describe('hardware device identity filters', () => {
         serviceUuids: ['0001', 'fffd'],
       })
     ).toBe(true);
+    expect(
+      isOnekeyBluetoothDevice({
+        name: 'Pro 2 A1B2',
+        serviceUuids: ['0001', 'fffd'],
+      })
+    ).toBe(true);
     expect(
       isOnekeyBluetoothDevice({
         localName: 'Pro2 A1B2 - Find My',
@@ -104,6 +114,29 @@ describe('hardware device identity filters', () => {
     expect(normalizePro2FindMyAdvertisementName(name)).toBe(expected);
   });
 
+  it.each([
+    ['Pro2 A1B2', 'Pro 2 A1B2'],
+    ['Pro2A1B2', 'Pro 2 A1B2'],
+    ['Pro 2 A1B2', 'Pro 2 A1B2'],
+    ['Pro 2 0088', 'Pro 2 0088'],
+    ['Pro2 22D8 - Find My', 'Pro 2 22D8'],
+    ['Pro 2 A1B2 - Find My', 'Pro 2 A1B2'],
+    ['OneKeyPro2A1B2', 'OneKey Pro 2 A1B2'],
+    ['OneKey Pro 2 A1B2', 'OneKey Pro 2 A1B2'],
+    ['OneKey Pro 2', 'OneKey Pro 2'],
+    ['Pro A1B2', 'Pro A1B2'],
+    ['Neo 22D8', 'Neo 22D8'],
+  ])('canonicalizes the public Pro2 advertisement name %s', (name, expected) => {
+    expect(canonicalizePro2BleAdvertisementName(name)).toBe(expected);
+  });
+
+  it('treats compact and spaced Pro2 BLE names as the same device', () => {
+    expect(isSameOnekeyBleName('Pro2 6136', 'Pro 2 6136')).toBe(true);
+    expect(isSameOnekeyBleName('Pro2 6136 - Find My', 'Pro 2 6136')).toBe(true);
+    expect(isSameOnekeyBleName('Pro 2 6136', 'Pro 2 0088')).toBe(false);
+    expect(isSameOnekeyBleName('Pro A1B2', 'Pro 2 A1B2')).toBe(false);
+  });
+
   it('keeps OneKey discovery on the communication service', () => {
     expect(
       isOnekeyBluetoothDevice({

package/src/constants.ts

@@ -292,6 +292,30 @@ export const normalizePro2FindMyAdvertisementName = (value: string) => {
   return value;
 };
 
+/**
+ * Current Pro2 advertisements use "Pro 2 XXXX". Older firmware used "Pro2 XXXX".
+ * Discovery and DeviceInfo both go through this helper so the public BLE name
+ * stays on the spaced form without changing OneKey Pro / Neo names.
+ */
+export const canonicalizePro2BleAdvertisementName = (value: string) => {
+  const withoutFindMy = normalizePro2FindMyAdvertisementName(value);
+  const match = withoutFindMy.match(/^(onekey\s*)?pro\s*2\s*/i);
+  if (!match) return withoutFindMy;
+
+  const rest = withoutFindMy.slice(match[0].length);
+  const prefix = match[1] ? 'OneKey Pro 2' : 'Pro 2';
+  return rest ? `${prefix} ${rest}` : prefix;
+};
+
+export const isSameOnekeyBleName = (left?: string | null, right?: string | null) => {
+  if (!left || !right) return false;
+  if (left === right) return true;
+  return (
+    compactBleName(canonicalizePro2BleAdvertisementName(left)) ===
+    compactBleName(canonicalizePro2BleAdvertisementName(right))
+  );
+};
+
 export const hasOnekeyCommunicationService = (
   serviceUuids: Array<string | null | undefined> | null | undefined
 ) =>