@onekeyfe/hd-shared 1.2.0-alpha.125 → 1.2.0-alpha.126

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;IAG/C,iBAAiB,8BAA8B;IAC/C,oBAAoB,iCAAiC;IACrD,eAAe,4BAA4B;IAC3C,mBAAmB,gCAAgC;IACnD,qBAAqB,kCAAkC;IACvD,sBAAsB,mCAAmC;IACzD,qBAAqB,kCAAkC;IACvD,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,OAuBjE,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;AA8B/C,eAAO,MAAM,6BAA6B,WAAY,MAAM,GAAG,IAAI,YAGlE,CAAC;AAEF,eAAO,MAAM,oCAAoC,UAAW,MAAM,WAejE,CAAC;AAEF,eAAO,MAAM,6BAA6B,iBAC1B,MAAM,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,GAAG,IAAI,GAAG,SAAS,YAIhE,CAAC;AAEJ,eAAO,MAAM,uBAAuB,2CAKjC,uBAAuB,KAAG,OAiB5B,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;IAG/C,iBAAiB,8BAA8B;IAC/C,oBAAoB,iCAAiC;IACrD,eAAe,4BAA4B;IAC3C,mBAAmB,gCAAgC;IACnD,qBAAqB,kCAAkC;IACvD,sBAAsB,mCAAmC;IACzD,qBAAqB,kCAAkC;IACvD,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,OAuBjE,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;AAkC/C,eAAO,MAAM,6BAA6B,WAAY,MAAM,GAAG,IAAI,YAWlE,CAAC;AAEF,eAAO,MAAM,oCAAoC,UAAW,MAAM,WAejE,CAAC;AAEF,eAAO,MAAM,6BAA6B,iBAC1B,MAAM,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,GAAG,IAAI,GAAG,SAAS,YAIhE,CAAC;AAEJ,eAAO,MAAM,uBAAuB,2CAKjC,uBAAuB,KAAG,OAiB5B,CAAC"}

package/dist/index.js

@@ -529,13 +529,15 @@ const FIND_MY_COMPACT_SUFFIXES = [
     'find',
     'fin',
 ];
+const COMPLETE_FIND_MY_COMPACT_SUFFIXES = ['findemy', 'findmy'];
 const compactBleName = (value) => Array.from(value)
     .filter(character => character !== '-' && character.trim() !== '')
     .join('')
     .toLowerCase();
+const getFindMyCompactSuffix = (compactName) => FIND_MY_COMPACT_SUFFIXES.find(candidate => compactName.endsWith(candidate));
 const getPro2FindMyBaseLength = (value) => {
     const compactName = compactBleName(value);
-    const suffix = FIND_MY_COMPACT_SUFFIXES.find(candidate => compactName.endsWith(candidate));
+    const suffix = getFindMyCompactSuffix(compactName);
     if (!suffix)
         return undefined;
     const compactBaseName = compactName.slice(0, -suffix.length);
@@ -544,7 +546,13 @@ const getPro2FindMyBaseLength = (value) => {
 const isPro2FindMyAdvertisementName = (value) => {
     if (!value)
         return false;
-    return getPro2FindMyBaseLength(value) !== undefined;
+    if (getPro2FindMyBaseLength(value) !== undefined)
+        return true;
+    const compactName = compactBleName(value);
+    const suffix = COMPLETE_FIND_MY_COMPACT_SUFFIXES.find(candidate => compactName.endsWith(candidate));
+    if (!suffix)
+        return false;
+    return compactName.slice(0, -suffix.length).includes('pro2');
 };
 const normalizePro2FindMyAdvertisementName = (value) => {
     const baseLength = getPro2FindMyBaseLength(value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-shared",
-  "version": "1.2.0-alpha.125",
+  "version": "1.2.0-alpha.126",
   "description": "Hardware SDK's shared tool library",
   "keywords": [
     "Hardware-SDK",
@@ -26,5 +26,5 @@
     "lint": "eslint .",
     "lint:fix": "eslint . --fix"
   },
-  "gitHead": "d42192d8038f0cfba88ffa5ff0b9f13ff66dbd10"
+  "gitHead": "c82189b36d650aec460a6f29bd467bf16a74e510"
 }

package/src/constants.test.ts

@@ -4,6 +4,7 @@ import {
   isKnownTrezorWebUsbDevice,
   isOnekeyBluetoothDevice,
   isOnekeyDevice,
+  isPro2FindMyAdvertisementName,
   matchesKnownBleUuid,
   normalizePro2FindMyAdvertisementName,
 } from './constants';
@@ -68,6 +69,18 @@ describe('hardware device identity filters', () => {
         serviceUuids: ['fffd'],
       })
     ).toBe(false);
+    expect(isOnekeyBluetoothDevice({ name: 'Pro2 - Find My' })).toBe(false);
+    expect(isOnekeyBluetoothDevice({ name: 'Pro2 G12Z - Find My' })).toBe(false);
+  });
+
+  it('uses a broad Find My guard without broadening public name normalization', () => {
+    expect(isPro2FindMyAdvertisementName('Pro2 Griffin - Find My')).toBe(true);
+    expect(isPro2FindMyAdvertisementName('Pro2 Griffin')).toBe(false);
+    expect(isPro2FindMyAdvertisementName('Pro2 22D8 - Find My')).toBe(true);
+    expect(normalizePro2FindMyAdvertisementName('Pro2 Griffin - Find My')).toBe(
+      'Pro2 Griffin - Find My'
+    );
+    expect(normalizePro2FindMyAdvertisementName('Pro2 22D8 - Find My')).toBe('Pro2 22D8');
   });
 
   it.each([

package/src/constants.ts

@@ -205,6 +205,7 @@ const FIND_MY_COMPACT_SUFFIXES = [
   'find',
   'fin',
 ] as const;
+const COMPLETE_FIND_MY_COMPACT_SUFFIXES = ['findemy', 'findmy'] as const;
 
 const compactBleName = (value: string) =>
   Array.from(value)
@@ -212,9 +213,12 @@ const compactBleName = (value: string) =>
     .join('')
     .toLowerCase();
 
+const getFindMyCompactSuffix = (compactName: string) =>
+  FIND_MY_COMPACT_SUFFIXES.find(candidate => compactName.endsWith(candidate));
+
 const getPro2FindMyBaseLength = (value: string) => {
   const compactName = compactBleName(value);
-  const suffix = FIND_MY_COMPACT_SUFFIXES.find(candidate => compactName.endsWith(candidate));
+  const suffix = getFindMyCompactSuffix(compactName);
   if (!suffix) return undefined;
 
   const compactBaseName = compactName.slice(0, -suffix.length);
@@ -223,7 +227,15 @@ const getPro2FindMyBaseLength = (value: string) => {
 
 export const isPro2FindMyAdvertisementName = (value?: string | null) => {
   if (!value) return false;
-  return getPro2FindMyBaseLength(value) !== undefined;
+  if (getPro2FindMyBaseLength(value) !== undefined) return true;
+
+  const compactName = compactBleName(value);
+  const suffix = COMPLETE_FIND_MY_COMPACT_SUFFIXES.find(candidate =>
+    compactName.endsWith(candidate)
+  );
+  if (!suffix) return false;
+
+  return compactName.slice(0, -suffix.length).includes('pro2');
 };
 
 export const normalizePro2FindMyAdvertisementName = (value: string) => {