@onekeyfe/hd-shared 1.2.0-alpha.160 → 1.2.0-alpha.161

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -125,8 +125,6 @@ export declare const HardwareErrorCode: {
125
125
  };
126
126
  export declare const HardwareErrorCodeMessage: HardwareErrorCodeMessageMapping;
127
127
  export declare const TypedError: (hardwareError: ErrorCodeUnion | string, message?: string, params?: any) => HardwareError;
128
- export declare const isBleStaleBondHardwareError: (error: unknown) => boolean;
129
- export declare const isBleStaleBondErrorText: (text: string) => boolean;
130
128
  export declare const serializeError: (payload: any) => any;
131
129
  export declare const CreateErrorByMessage: (message: string) => HardwareError;
132
130
  export declare const CreateHardwareErrorByBridgeError: (raw: string) => HardwareError;
@@ -1 +1 @@
1
- {"version":3,"file":"HardwareError.d.ts","sourceRoot":"","sources":["../src/HardwareError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,OAAO,CAAC,OAAO,iBAAiB,CAAC,CAAC;IAC7C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,GAAG,CAAC;CACd;AAED,KAAK,OAAO,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAE5C,KAAK,+BAA+B,GAAG;KAAG,CAAC,IAAI,OAAO,CAAC,OAAO,iBAAiB,CAAC,GAAG,MAAM;CAAE,CAAC;AAE5F,KAAK,cAAc,GAAG,OAAO,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAsCxD,qBAAa,aAAc,SAAQ,KAAK;IACtC,SAAS,EAAE,cAAc,CAAkC;IAE3D,OAAO,SAAM;IAEb,MAAM,EAAE,GAAG,CAAM;gBAEL,aAAa,EAAE,cAAc,GAAG,MAAM;CAmBnD;AAED,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAybpB,CAAC;AAEX,eAAO,MAAM,wBAAwB,EAAE,+BAsJ7B,CAAC;AAEX,eAAO,MAAM,UAAU,kBACN,cAAc,GAAG,MAAM,YAC5B,MAAM,WACP,GAAG,kBAMb,CAAC;AAEF,eAAO,MAAM,2BAA2B,UAAW,OAAO,KAAG,OAM5D,CAAC;AAEF,eAAO,MAAM,uBAAuB,SAAU,MAAM,KAAG,OAQtD,CAAC;AAEF,eAAO,MAAM,cAAc,YAAa,GAAG,QAe1C,CAAC;AAEF,eAAO,MAAM,oBAAoB,YAAa,MAAM,KAAG,aAOtD,CAAC;AAGF,eAAO,MAAM,gCAAgC,QAAS,MAAM,KAAG,aAQ9D,CAAC;AAEF,QAAA,MAAM,uCAAuC;oBAM3B,MAAM;oBACN,MAAM;;;mBAcvB,CAAC;AAEF,QAAA,MAAM,sCAAsC;oBAM1B,MAAM;oBACN,MAAM;;;mBAcvB,CAAC;AAEF,QAAA,MAAM,yCAAyC,cAClC,MAAM,GAAG,SAAS,YACnB,MAAM,GAAG,SAAS,iBACb,CAAC,UAAU,GAAG,KAAK,CAAC,EAAE,oBACnB;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,kBAsBF,CAAC;AAEF,QAAA,MAAM,6BAA6B,mBACjB,MAAM,qBACH,MAAM,eACZ,MAAM,kBAQpB,CAAC;AAEF,QAAA,MAAM,4BAA4B,aACtB,MAAM,aACL,MAAM,cACL,MAAM,cACN,MAAM,aACP,MAAM,kBAWlB,CAAC;AAEF,QAAA,MAAM,iCAAiC,eAAgB,MAAM,gBAAgB,aAAa,kBAItF,CAAC;AAEL,OAAO,EACL,uCAAuC,EACvC,sCAAsC,EACtC,yCAAyC,EACzC,6BAA6B,EAC7B,4BAA4B,EAC5B,iCAAiC,GAClC,CAAC"}
1
+ {"version":3,"file":"HardwareError.d.ts","sourceRoot":"","sources":["../src/HardwareError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,OAAO,CAAC,OAAO,iBAAiB,CAAC,CAAC;IAC7C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,GAAG,CAAC;CACd;AAED,KAAK,OAAO,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAE5C,KAAK,+BAA+B,GAAG;KAAG,CAAC,IAAI,OAAO,CAAC,OAAO,iBAAiB,CAAC,GAAG,MAAM;CAAE,CAAC;AAE5F,KAAK,cAAc,GAAG,OAAO,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAsCxD,qBAAa,aAAc,SAAQ,KAAK;IACtC,SAAS,EAAE,cAAc,CAAkC;IAE3D,OAAO,SAAM;IAEb,MAAM,EAAE,GAAG,CAAM;gBAEL,aAAa,EAAE,cAAc,GAAG,MAAM;CAmBnD;AAED,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAybpB,CAAC;AAEX,eAAO,MAAM,wBAAwB,EAAE,+BAsJ7B,CAAC;AAEX,eAAO,MAAM,UAAU,kBACN,cAAc,GAAG,MAAM,YAC5B,MAAM,WACP,GAAG,kBAMb,CAAC;AAEF,eAAO,MAAM,cAAc,YAAa,GAAG,QAe1C,CAAC;AAEF,eAAO,MAAM,oBAAoB,YAAa,MAAM,KAAG,aAOtD,CAAC;AAGF,eAAO,MAAM,gCAAgC,QAAS,MAAM,KAAG,aAQ9D,CAAC;AAEF,QAAA,MAAM,uCAAuC;oBAM3B,MAAM;oBACN,MAAM;;;mBAcvB,CAAC;AAEF,QAAA,MAAM,sCAAsC;oBAM1B,MAAM;oBACN,MAAM;;;mBAcvB,CAAC;AAEF,QAAA,MAAM,yCAAyC,cAClC,MAAM,GAAG,SAAS,YACnB,MAAM,GAAG,SAAS,iBACb,CAAC,UAAU,GAAG,KAAK,CAAC,EAAE,oBACnB;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,kBAsBF,CAAC;AAEF,QAAA,MAAM,6BAA6B,mBACjB,MAAM,qBACH,MAAM,eACZ,MAAM,kBAQpB,CAAC;AAEF,QAAA,MAAM,4BAA4B,aACtB,MAAM,aACL,MAAM,cACL,MAAM,cACN,MAAM,aACP,MAAM,kBAWlB,CAAC;AAEF,QAAA,MAAM,iCAAiC,eAAgB,MAAM,gBAAgB,aAAa,kBAItF,CAAC;AAEL,OAAO,EACL,uCAAuC,EACvC,sCAAsC,EACtC,yCAAyC,EACzC,6BAA6B,EAC7B,4BAA4B,EAC5B,iCAAiC,GAClC,CAAC"}
@@ -74,8 +74,6 @@ export declare const createKnownBleUuidAliases: (uuid: string) => ReadonlySet<st
74
74
  export declare const matchesKnownBleUuid: (actualUuid: string | null | undefined, aliases: ReadonlySet<string>) => boolean;
75
75
  export declare const isPro2FindMyAdvertisementName: (value?: string | null) => boolean;
76
76
  export declare const normalizePro2FindMyAdvertisementName: (value: string) => string;
77
- export declare const canonicalizePro2BleAdvertisementName: (value: string) => string;
78
- export declare const isSameOnekeyBleName: (left?: string | null, right?: string | null) => boolean;
79
77
  export declare const hasOnekeyCommunicationService: (serviceUuids: Array<string | null | undefined> | null | undefined) => boolean;
80
78
  export declare const isOnekeyBluetoothDevice: ({ id, name, localName, serviceUuids, }: BluetoothDeviceIdentity) => boolean;
81
79
  export {};
@@ -1 +1 @@
1
- {"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"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"}
package/dist/index.d.ts CHANGED
@@ -92,16 +92,6 @@ declare const createKnownBleUuidAliases: (uuid: string) => ReadonlySet<string>;
92
92
  declare const matchesKnownBleUuid: (actualUuid: string | null | undefined, aliases: ReadonlySet<string>) => boolean;
93
93
  declare const isPro2FindMyAdvertisementName: (value?: string | null) => boolean;
94
94
  declare const normalizePro2FindMyAdvertisementName: (value: string) => string;
95
- /**
96
- * Current Pro2 advertisements use "Pro 2 XXXX". Older firmware used "Pro2 XXXX".
97
- * Discovery and DeviceInfo both go through this helper so the public BLE name
98
- * stays on the spaced form without changing OneKey Pro / Neo names.
99
- *
100
- * Match the compact Pro2 form first. A leading "Pro 2" regex would also eat the
101
- * first digit of a OneKey Pro suffix such as "Pro 22D8" or "Pro 2D8F".
102
- */
103
- declare const canonicalizePro2BleAdvertisementName: (value: string) => string;
104
- declare const isSameOnekeyBleName: (left?: string | null, right?: string | null) => boolean;
105
95
  declare const hasOnekeyCommunicationService: (serviceUuids: Array<string | null | undefined> | null | undefined) => boolean;
106
96
  declare const isOnekeyBluetoothDevice: ({ id, name, localName, serviceUuids, }: BluetoothDeviceIdentity) => boolean;
107
97
 
@@ -497,8 +487,6 @@ declare const HardwareErrorCode: {
497
487
  };
498
488
  declare const HardwareErrorCodeMessage: HardwareErrorCodeMessageMapping;
499
489
  declare const TypedError: (hardwareError: ErrorCodeUnion | string, message?: string, params?: any) => HardwareError;
500
- declare const isBleStaleBondHardwareError: (error: unknown) => boolean;
501
- declare const isBleStaleBondErrorText: (text: string) => boolean;
502
490
  declare const serializeError: (payload: any) => any;
503
491
  declare const CreateErrorByMessage: (message: string) => HardwareError;
504
492
  declare const CreateHardwareErrorByBridgeError: (raw: string) => HardwareError;
@@ -534,8 +522,6 @@ declare const HardwareError$1_HardwareError: typeof HardwareError;
534
522
  declare const HardwareError$1_HardwareErrorCode: typeof HardwareErrorCode;
535
523
  declare const HardwareError$1_HardwareErrorCodeMessage: typeof HardwareErrorCodeMessage;
536
524
  declare const HardwareError$1_TypedError: typeof TypedError;
537
- declare const HardwareError$1_isBleStaleBondHardwareError: typeof isBleStaleBondHardwareError;
538
- declare const HardwareError$1_isBleStaleBondErrorText: typeof isBleStaleBondErrorText;
539
525
  declare const HardwareError$1_serializeError: typeof serializeError;
540
526
  declare const HardwareError$1_CreateErrorByMessage: typeof CreateErrorByMessage;
541
527
  declare const HardwareError$1_CreateHardwareErrorByBridgeError: typeof CreateHardwareErrorByBridgeError;
@@ -552,8 +538,6 @@ declare namespace HardwareError$1 {
552
538
  HardwareError$1_HardwareErrorCode as HardwareErrorCode,
553
539
  HardwareError$1_HardwareErrorCodeMessage as HardwareErrorCodeMessage,
554
540
  HardwareError$1_TypedError as TypedError,
555
- HardwareError$1_isBleStaleBondHardwareError as isBleStaleBondHardwareError,
556
- HardwareError$1_isBleStaleBondErrorText as isBleStaleBondErrorText,
557
541
  HardwareError$1_serializeError as serializeError,
558
542
  HardwareError$1_CreateErrorByMessage as CreateErrorByMessage,
559
543
  HardwareError$1_CreateHardwareErrorByBridgeError as CreateHardwareErrorByBridgeError,
@@ -574,4 +558,4 @@ declare enum EDeviceType {
574
558
  Neo = "neo"
575
559
  }
576
560
 
577
- export { CreateErrorByMessage, CreateHardwareErrorByBridgeError, Deferred, EBleDisconnectReason, 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, isBleStaleBondErrorText, isBleStaleBondHardwareError, isHeaderChunk, isKnownTrezorWebUsbDevice, isOnekeyBluetoothDevice, isOnekeyDevice, isPro2FindMyAdvertisementName, isSameOnekeyBleName, matchesKnownBleUuid, normalizeBleUuid, normalizePro2FindMyAdvertisementName, resolveOneKeyUsbDevicePath, serializeError, wait };
561
+ export { CreateErrorByMessage, CreateHardwareErrorByBridgeError, Deferred, EBleDisconnectReason, 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 };
package/dist/index.js CHANGED
@@ -286,18 +286,6 @@ const TypedError = (hardwareError, message, params) => {
286
286
  }
287
287
  return new HardwareError({ errorCode: hardwareError, message: message !== null && message !== void 0 ? message : '', params });
288
288
  };
289
- const isBleStaleBondHardwareError = (error) => {
290
- const code = error === null || error === void 0 ? void 0 : error.errorCode;
291
- return (code === HardwareErrorCode.BleDeviceBondError ||
292
- code === HardwareErrorCode.BlePeerRemovedPairingInformation);
293
- };
294
- const isBleStaleBondErrorText = (text) => {
295
- const value = text.toLowerCase();
296
- return (value.includes('encryption is insufficient') ||
297
- value.includes('insufficient encryption') ||
298
- value.includes('peer removed pairing information') ||
299
- value.includes('gatt_insuf_authentication'));
300
- };
301
289
  const serializeError = (payload) => {
302
290
  if (payload && payload.error instanceof HardwareError) {
303
291
  return {
@@ -389,8 +377,6 @@ var HardwareError$1 = /*#__PURE__*/Object.freeze({
389
377
  HardwareErrorCode: HardwareErrorCode,
390
378
  HardwareErrorCodeMessage: HardwareErrorCodeMessage,
391
379
  TypedError: TypedError,
392
- isBleStaleBondHardwareError: isBleStaleBondHardwareError,
393
- isBleStaleBondErrorText: isBleStaleBondErrorText,
394
380
  serializeError: serializeError,
395
381
  CreateErrorByMessage: CreateErrorByMessage,
396
382
  CreateHardwareErrorByBridgeError: CreateHardwareErrorByBridgeError,
@@ -615,26 +601,6 @@ const normalizePro2FindMyAdvertisementName = (value) => {
615
601
  }
616
602
  return value;
617
603
  };
618
- const canonicalizePro2BleAdvertisementName = (value) => {
619
- const withoutFindMy = normalizePro2FindMyAdvertisementName(value);
620
- const compact = compactBleName(withoutFindMy);
621
- if (!PRO2_COMPACT_NAME_PATTERN.test(compact))
622
- return withoutFindMy;
623
- const match = withoutFindMy.match(/^(onekey\s*)?pro\s*2\s*/i);
624
- if (!match)
625
- return withoutFindMy;
626
- const rest = withoutFindMy.slice(match[0].length);
627
- const prefix = match[1] ? 'OneKey Pro 2' : 'Pro 2';
628
- return rest ? `${prefix} ${rest}` : prefix;
629
- };
630
- const isSameOnekeyBleName = (left, right) => {
631
- if (!left || !right)
632
- return false;
633
- if (left === right)
634
- return true;
635
- return (compactBleName(canonicalizePro2BleAdvertisementName(left)) ===
636
- compactBleName(canonicalizePro2BleAdvertisementName(right)));
637
- };
638
604
  const hasOnekeyCommunicationService = (serviceUuids) => (serviceUuids !== null && serviceUuids !== void 0 ? serviceUuids : []).some(uuid => matchesKnownBleUuid(uuid, ONEKEY_COMMUNICATION_SERVICE_ALIASES));
639
605
  const isOnekeyBluetoothDevice = ({ id, name, localName, serviceUuids, }) => {
640
606
  const advertisedServiceUuids = serviceUuids !== null && serviceUuids !== void 0 ? serviceUuids : [];
@@ -739,7 +705,6 @@ exports.ONEKEY_SERVICE_UUID = ONEKEY_SERVICE_UUID;
739
705
  exports.ONEKEY_WEBUSB_FILTER = ONEKEY_WEBUSB_FILTER;
740
706
  exports.ONEKEY_WRITE_CHARACTERISTIC_UUID = ONEKEY_WRITE_CHARACTERISTIC_UUID;
741
707
  exports.TypedError = TypedError;
742
- exports.canonicalizePro2BleAdvertisementName = canonicalizePro2BleAdvertisementName;
743
708
  exports.createDefectiveFirmwareError = createDefectiveFirmwareError;
744
709
  exports.createDeferred = createDeferred;
745
710
  exports.createDeprecatedHardwareError = createDeprecatedHardwareError;
@@ -750,14 +715,11 @@ exports.createNewFirmwareForceUpdateHardwareError = createNewFirmwareForceUpdate
750
715
  exports.createNewFirmwareUnReleaseHardwareError = createNewFirmwareUnReleaseHardwareError;
751
716
  exports.hasOnekeyCommunicationService = hasOnekeyCommunicationService;
752
717
  exports.inferProtocolHintFromUsbId = inferProtocolHintFromUsbId;
753
- exports.isBleStaleBondErrorText = isBleStaleBondErrorText;
754
- exports.isBleStaleBondHardwareError = isBleStaleBondHardwareError;
755
718
  exports.isHeaderChunk = isHeaderChunk;
756
719
  exports.isKnownTrezorWebUsbDevice = isKnownTrezorWebUsbDevice;
757
720
  exports.isOnekeyBluetoothDevice = isOnekeyBluetoothDevice;
758
721
  exports.isOnekeyDevice = isOnekeyDevice;
759
722
  exports.isPro2FindMyAdvertisementName = isPro2FindMyAdvertisementName;
760
- exports.isSameOnekeyBleName = isSameOnekeyBleName;
761
723
  exports.matchesKnownBleUuid = matchesKnownBleUuid;
762
724
  exports.normalizeBleUuid = normalizeBleUuid;
763
725
  exports.normalizePro2FindMyAdvertisementName = normalizePro2FindMyAdvertisementName;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@onekeyfe/hd-shared",
3
- "version": "1.2.0-alpha.160",
3
+ "version": "1.2.0-alpha.161",
4
4
  "description": "Hardware SDK's shared tool library",
5
5
  "keywords": [
6
6
  "Hardware-SDK",
@@ -26,5 +26,5 @@
26
26
  "lint": "eslint .",
27
27
  "lint:fix": "eslint . --fix"
28
28
  },
29
- "gitHead": "df1736352e44ac76af4185eb7a6112a081b0d68c"
29
+ "gitHead": "06316117fc9a7ebaecea1ca583b2d105709361bf"
30
30
  }
@@ -682,24 +682,6 @@ export const TypedError = (
682
682
  return new HardwareError({ errorCode: hardwareError, message: message ?? '', params });
683
683
  };
684
684
 
685
- export const isBleStaleBondHardwareError = (error: unknown): boolean => {
686
- const code = (error as { errorCode?: unknown })?.errorCode;
687
- return (
688
- code === HardwareErrorCode.BleDeviceBondError ||
689
- code === HardwareErrorCode.BlePeerRemovedPairingInformation
690
- );
691
- };
692
-
693
- export const isBleStaleBondErrorText = (text: string): boolean => {
694
- const value = text.toLowerCase();
695
- return (
696
- value.includes('encryption is insufficient') ||
697
- value.includes('insufficient encryption') ||
698
- value.includes('peer removed pairing information') ||
699
- value.includes('gatt_insuf_authentication')
700
- );
701
- };
702
-
703
685
  export const serializeError = (payload: any) => {
704
686
  if (payload && payload.error instanceof HardwareError) {
705
687
  return {
@@ -1,5 +1,4 @@
1
1
  import {
2
- canonicalizePro2BleAdvertisementName,
3
2
  createKnownBleUuidAliases,
4
3
  hasOnekeyCommunicationService,
5
4
  inferProtocolHintFromUsbId,
@@ -7,7 +6,6 @@ import {
7
6
  isOnekeyBluetoothDevice,
8
7
  isOnekeyDevice,
9
8
  isPro2FindMyAdvertisementName,
10
- isSameOnekeyBleName,
11
9
  matchesKnownBleUuid,
12
10
  normalizePro2FindMyAdvertisementName,
13
11
  resolveOneKeyUsbDevicePath,
@@ -19,9 +17,7 @@ describe('hardware device identity filters', () => {
19
17
  expect(isOnekeyDevice('Pro A1B2')).toBe(true);
20
18
  expect(isOnekeyDevice('Neo A1B2')).toBe(true);
21
19
  expect(isOnekeyDevice('Pro2A1B2')).toBe(true);
22
- expect(isOnekeyDevice('Pro 2 A1B2')).toBe(true);
23
20
  expect(isOnekeyDevice('OneKeyPro2A1B2')).toBe(true);
24
- expect(isOnekeyDevice('OneKey Pro 2 A1B2')).toBe(true);
25
21
  expect(isOnekeyDevice('Neo22D8')).toBe(true);
26
22
  expect(isOnekeyDevice('K1234')).toBe(true);
27
23
  expect(isOnekeyDevice('S8')).toBe(true);
@@ -46,12 +42,6 @@ describe('hardware device identity filters', () => {
46
42
  serviceUuids: ['0001', 'fffd'],
47
43
  })
48
44
  ).toBe(true);
49
- expect(
50
- isOnekeyBluetoothDevice({
51
- name: 'Pro 2 A1B2',
52
- serviceUuids: ['0001', 'fffd'],
53
- })
54
- ).toBe(true);
55
45
  expect(
56
46
  isOnekeyBluetoothDevice({
57
47
  localName: 'Pro2 A1B2 - Find My',
@@ -114,35 +104,6 @@ describe('hardware device identity filters', () => {
114
104
  expect(normalizePro2FindMyAdvertisementName(name)).toBe(expected);
115
105
  });
116
106
 
117
- it.each([
118
- ['Pro2 A1B2', 'Pro 2 A1B2'],
119
- ['Pro2A1B2', 'Pro 2 A1B2'],
120
- ['Pro 2 A1B2', 'Pro 2 A1B2'],
121
- ['Pro 2 0088', 'Pro 2 0088'],
122
- ['Pro2 22D8 - Find My', 'Pro 2 22D8'],
123
- ['Pro 2 A1B2 - Find My', 'Pro 2 A1B2'],
124
- ['OneKeyPro2A1B2', 'OneKey Pro 2 A1B2'],
125
- ['OneKey Pro 2 A1B2', 'OneKey Pro 2 A1B2'],
126
- ['OneKey Pro 2', 'OneKey Pro 2'],
127
- ['Pro A1B2', 'Pro A1B2'],
128
- ['Pro 22D8', 'Pro 22D8'],
129
- ['Pro 2D8F', 'Pro 2D8F'],
130
- ['OneKey Pro 22D8', 'OneKey Pro 22D8'],
131
- ['Neo 22D8', 'Neo 22D8'],
132
- ])('canonicalizes the public Pro2 advertisement name %s', (name, expected) => {
133
- expect(canonicalizePro2BleAdvertisementName(name)).toBe(expected);
134
- });
135
-
136
- it('treats compact and spaced Pro2 BLE names as the same device', () => {
137
- expect(isSameOnekeyBleName('Pro2 6136', 'Pro 2 6136')).toBe(true);
138
- expect(isSameOnekeyBleName('Pro2 6136 - Find My', 'Pro 2 6136')).toBe(true);
139
- expect(isSameOnekeyBleName('Pro 2 6136', 'Pro 2 0088')).toBe(false);
140
- expect(isSameOnekeyBleName('Pro A1B2', 'Pro 2 A1B2')).toBe(false);
141
- expect(isSameOnekeyBleName('Pro 22D8', 'Pro 22D8')).toBe(true);
142
- expect(isSameOnekeyBleName('Pro 22D8', 'Pro2 22D8')).toBe(false);
143
- expect(isSameOnekeyBleName('Pro 22D8', 'Pro 2 22D8')).toBe(false);
144
- });
145
-
146
107
  it('keeps OneKey discovery on the communication service', () => {
147
108
  expect(
148
109
  isOnekeyBluetoothDevice({
package/src/constants.ts CHANGED
@@ -307,36 +307,6 @@ export const normalizePro2FindMyAdvertisementName = (value: string) => {
307
307
  return value;
308
308
  };
309
309
 
310
- /**
311
- * Current Pro2 advertisements use "Pro 2 XXXX". Older firmware used "Pro2 XXXX".
312
- * Discovery and DeviceInfo both go through this helper so the public BLE name
313
- * stays on the spaced form without changing OneKey Pro / Neo names.
314
- *
315
- * Match the compact Pro2 form first. A leading "Pro 2" regex would also eat the
316
- * first digit of a OneKey Pro suffix such as "Pro 22D8" or "Pro 2D8F".
317
- */
318
- export const canonicalizePro2BleAdvertisementName = (value: string) => {
319
- const withoutFindMy = normalizePro2FindMyAdvertisementName(value);
320
- const compact = compactBleName(withoutFindMy);
321
- if (!PRO2_COMPACT_NAME_PATTERN.test(compact)) return withoutFindMy;
322
-
323
- const match = withoutFindMy.match(/^(onekey\s*)?pro\s*2\s*/i);
324
- if (!match) return withoutFindMy;
325
-
326
- const rest = withoutFindMy.slice(match[0].length);
327
- const prefix = match[1] ? 'OneKey Pro 2' : 'Pro 2';
328
- return rest ? `${prefix} ${rest}` : prefix;
329
- };
330
-
331
- export const isSameOnekeyBleName = (left?: string | null, right?: string | null) => {
332
- if (!left || !right) return false;
333
- if (left === right) return true;
334
- return (
335
- compactBleName(canonicalizePro2BleAdvertisementName(left)) ===
336
- compactBleName(canonicalizePro2BleAdvertisementName(right))
337
- );
338
- };
339
-
340
310
  export const hasOnekeyCommunicationService = (
341
311
  serviceUuids: Array<string | null | undefined> | null | undefined
342
312
  ) =>