@onekeyfe/hd-shared 1.2.0-alpha.98 → 1.2.0

package/dist/HardwareError.d.ts

@@ -86,6 +86,7 @@ export declare const HardwareErrorCode: {
     readonly BleDeviceDisconnected: 720;
     readonly BlePoweredOff: 721;
     readonly BleUnsupported: 722;
+    readonly BleUnavailableWhileUsbConnected: 723;
     readonly RuntimeError: 800;
     readonly PinInvalid: 801;
     readonly PinCancelled: 802;
@@ -124,6 +125,8 @@ export declare const HardwareErrorCode: {
 };
 export declare const HardwareErrorCodeMessage: HardwareErrorCodeMessageMapping;
 export declare const TypedError: (hardwareError: ErrorCodeUnion | string, message?: string, params?: any) => HardwareError;
+export declare const isBleStaleBondHardwareError: (error: unknown) => boolean;
+export declare const isBleStaleBondErrorText: (text: string) => boolean;
 export declare const serializeError: (payload: any) => any;
 export declare const CreateErrorByMessage: (message: string) => HardwareError;
 export declare const CreateHardwareErrorByBridgeError: (raw: string) => HardwareError;

package/dist/HardwareError.d.ts.map

@@ -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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwbpB,CAAC;AAEX,eAAO,MAAM,wBAAwB,EAAE,+BAoJ7B,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"}
+{"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"}

package/dist/constants.d.ts

@@ -8,6 +8,10 @@ export declare const ONEKEY_WEBUSB_FILTER: {
     vendorId: number;
     productId: number;
 }[];
+export declare const ONEKEY_PROTOCOL_V2_USB_IDS: readonly [{
+    readonly vendorId: 4617;
+    readonly productId: 20300;
+}];
 type WebUsbIdentityDescriptor = {
     vendorId?: number;
     productId?: number;
@@ -42,11 +46,23 @@ export declare enum EOneKeyBleMessageKeys {
     NOBLE_BLE_MTU_CHANGED = "$onekey-noble-ble-mtu-changed",
     NOBLE_BLE_CANCEL_PAIRING = "$onekey-noble-ble-cancel-pairing"
 }
+export declare enum EBleDisconnectReason {
+    DeviceDisconnected = "device-disconnected",
+    IdleKeepAlive = "idle-keep-alive"
+}
 export declare const ONEKEY_SERVICE_UUID = "00000001-0000-1000-8000-00805f9b34fb";
 export declare const ONEKEY_WRITE_CHARACTERISTIC_UUID = "00000002-0000-1000-8000-00805f9b34fb";
 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;
+export declare const inferProtocolHintFromUsbId: (vendorId?: number | null, productId?: number | null) => "V2" | undefined;
+type UsbDevicePathInput = {
+    serialNumber?: string | null;
+    vendorId?: number;
+    productId?: number;
+    productName?: string | null;
+};
+export declare const resolveOneKeyUsbDevicePath: (device: UsbDevicePathInput) => string | undefined;
 type BluetoothDeviceIdentity = {
     id?: string;
     name?: string | null;
@@ -57,7 +73,11 @@ 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 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 isPro2FamilyBleName: (value?: string | null) => 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;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;AAK/C,eAAO,MAAM,6BAA6B,WAAY,MAAM,GAAG,IAAI,YAGlE,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":"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"}

package/dist/index.d.ts

@@ -7,6 +7,11 @@ declare const ONEKEY_WEBUSB_FILTER: {
     vendorId: number;
     productId: number;
 }[];
+/** USB IDs whose first probe should be Protocol V2. Shared Pro/Touch PIDs stay unhinted. */
+declare const ONEKEY_PROTOCOL_V2_USB_IDS: readonly [{
+    readonly vendorId: 4617;
+    readonly productId: 20300;
+}];
 type WebUsbIdentityDescriptor = {
     vendorId?: number;
     productId?: number;
@@ -49,11 +54,33 @@ declare enum EOneKeyBleMessageKeys {
     NOBLE_BLE_MTU_CHANGED = "$onekey-noble-ble-mtu-changed",
     NOBLE_BLE_CANCEL_PAIRING = "$onekey-noble-ble-cancel-pairing"
 }
+/**
+ * Why a BLE link went down, carried on BLE_DEVICE_DISCONNECTED.
+ *
+ * The main process frees an idle link on its own keep-alive timer, which is an
+ * internal optimisation the device knows nothing about — consumers must not
+ * treat it as "the device is gone". Only DeviceDisconnected means the
+ * peripheral actually dropped.
+ */
+declare enum EBleDisconnectReason {
+    /** Unsolicited peripheral drop: powered off, out of range, cable/BLE lost. */
+    DeviceDisconnected = "device-disconnected",
+    /** Main-process keep-alive timer released an idle link; device still present. */
+    IdleKeepAlive = "idle-keep-alive"
+}
 declare const ONEKEY_SERVICE_UUID = "00000001-0000-1000-8000-00805f9b34fb";
 declare const ONEKEY_WRITE_CHARACTERISTIC_UUID = "00000002-0000-1000-8000-00805f9b34fb";
 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;
+declare const inferProtocolHintFromUsbId: (vendorId?: number | null, productId?: number | null) => "V2" | undefined;
+type UsbDevicePathInput = {
+    serialNumber?: string | null;
+    vendorId?: number;
+    productId?: number;
+    productName?: string | null;
+};
+declare const resolveOneKeyUsbDevicePath: (device: UsbDevicePathInput) => string | undefined;
 type BluetoothDeviceIdentity = {
     id?: string;
     name?: string | null;
@@ -64,7 +91,24 @@ 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 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.
+ *
+ * Match the compact Pro2 form first. A leading "Pro 2" regex would also eat the
+ * first digit of a OneKey Pro suffix such as "Pro 22D8" or "Pro 2D8F".
+ */
+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;
+/**
+ * Protocol V2 family (Pro2 / Neo) by advertised BLE name. Callers use it to
+ * pick a connection strategy: this family also advertises under Find My names
+ * that carry no OneKey service UUID, so a scan cannot always see it.
+ */
+declare const isPro2FamilyBleName: (value?: string | null) => boolean;
 declare const isOnekeyBluetoothDevice: ({ id, name, localName, serviceUuids, }: BluetoothDeviceIdentity) => boolean;
 
 type Deferred<T, I = any, D = any> = {
@@ -316,6 +360,7 @@ declare const HardwareErrorCode: {
     readonly BleDeviceDisconnected: 720;
     readonly BlePoweredOff: 721;
     readonly BleUnsupported: 722;
+    readonly BleUnavailableWhileUsbConnected: 723;
     /**
      * Hardware runtiome errors
      */
@@ -458,6 +503,8 @@ declare const HardwareErrorCode: {
 };
 declare const HardwareErrorCodeMessage: HardwareErrorCodeMessageMapping;
 declare const TypedError: (hardwareError: ErrorCodeUnion | string, message?: string, params?: any) => HardwareError;
+declare const isBleStaleBondHardwareError: (error: unknown) => boolean;
+declare const isBleStaleBondErrorText: (text: string) => boolean;
 declare const serializeError: (payload: any) => any;
 declare const CreateErrorByMessage: (message: string) => HardwareError;
 declare const CreateHardwareErrorByBridgeError: (raw: string) => HardwareError;
@@ -493,6 +540,8 @@ declare const HardwareError$1_HardwareError: typeof HardwareError;
 declare const HardwareError$1_HardwareErrorCode: typeof HardwareErrorCode;
 declare const HardwareError$1_HardwareErrorCodeMessage: typeof HardwareErrorCodeMessage;
 declare const HardwareError$1_TypedError: typeof TypedError;
+declare const HardwareError$1_isBleStaleBondHardwareError: typeof isBleStaleBondHardwareError;
+declare const HardwareError$1_isBleStaleBondErrorText: typeof isBleStaleBondErrorText;
 declare const HardwareError$1_serializeError: typeof serializeError;
 declare const HardwareError$1_CreateErrorByMessage: typeof CreateErrorByMessage;
 declare const HardwareError$1_CreateHardwareErrorByBridgeError: typeof CreateHardwareErrorByBridgeError;
@@ -509,6 +558,8 @@ declare namespace HardwareError$1 {
     HardwareError$1_HardwareErrorCode as HardwareErrorCode,
     HardwareError$1_HardwareErrorCodeMessage as HardwareErrorCodeMessage,
     HardwareError$1_TypedError as TypedError,
+    HardwareError$1_isBleStaleBondHardwareError as isBleStaleBondHardwareError,
+    HardwareError$1_isBleStaleBondErrorText as isBleStaleBondErrorText,
     HardwareError$1_serializeError as serializeError,
     HardwareError$1_CreateErrorByMessage as CreateErrorByMessage,
     HardwareError$1_CreateHardwareErrorByBridgeError as CreateHardwareErrorByBridgeError,
@@ -529,4 +580,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_SERVICE_UUID, ONEKEY_WEBUSB_FILTER, ONEKEY_WRITE_CHARACTERISTIC_UUID, TypedError, createDefectiveFirmwareError, createDeferred, createDeprecatedHardwareError, createDeviceNotSupportMethodError, createKnownBleUuidAliases, createNeedUpgradeFirmwareHardwareError, createNewFirmwareForceUpdateHardwareError, createNewFirmwareUnReleaseHardwareError, hasOnekeyCommunicationService, isHeaderChunk, isKnownTrezorWebUsbDevice, isOnekeyBluetoothDevice, isOnekeyDevice, isPro2FindMyAdvertisementName, matchesKnownBleUuid, normalizeBleUuid, serializeError, wait };
+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, isPro2FamilyBleName, isPro2FindMyAdvertisementName, isSameOnekeyBleName, matchesKnownBleUuid, normalizeBleUuid, normalizePro2FindMyAdvertisementName, resolveOneKeyUsbDevicePath, serializeError, wait };

package/dist/index.js

@@ -135,6 +135,7 @@ const HardwareErrorCode = {
     BleDeviceDisconnected: 720,
     BlePoweredOff: 721,
     BleUnsupported: 722,
+    BleUnavailableWhileUsbConnected: 723,
     RuntimeError: 800,
     PinInvalid: 801,
     PinCancelled: 802,
@@ -242,6 +243,7 @@ const HardwareErrorCodeMessage = {
     [HardwareErrorCode.BleDeviceDisconnected]: 'Device disconnected',
     [HardwareErrorCode.BlePoweredOff]: 'Bluetooth is turned off',
     [HardwareErrorCode.BleUnsupported]: 'Bluetooth is not supported on this device',
+    [HardwareErrorCode.BleUnavailableWhileUsbConnected]: 'Bluetooth is unavailable while USB is connected. Unplug USB and try again.',
     [HardwareErrorCode.RuntimeError]: 'Runtime error',
     [HardwareErrorCode.PinInvalid]: 'Pin invalid',
     [HardwareErrorCode.PinCancelled]: 'Pin cancelled',
@@ -284,6 +286,18 @@ const TypedError = (hardwareError, message, params) => {
     }
     return new HardwareError({ errorCode: hardwareError, message: message !== null && message !== void 0 ? message : '', params });
 };
+const isBleStaleBondHardwareError = (error) => {
+    const code = error === null || error === void 0 ? void 0 : error.errorCode;
+    return (code === HardwareErrorCode.BleDeviceBondError ||
+        code === HardwareErrorCode.BlePeerRemovedPairingInformation);
+};
+const isBleStaleBondErrorText = (text) => {
+    const value = text.toLowerCase();
+    return (value.includes('encryption is insufficient') ||
+        value.includes('insufficient encryption') ||
+        value.includes('peer removed pairing information') ||
+        value.includes('gatt_insuf_authentication'));
+};
 const serializeError = (payload) => {
     if (payload && payload.error instanceof HardwareError) {
         return {
@@ -375,6 +389,8 @@ var HardwareError$1 = /*#__PURE__*/Object.freeze({
     HardwareErrorCode: HardwareErrorCode,
     HardwareErrorCodeMessage: HardwareErrorCodeMessage,
     TypedError: TypedError,
+    isBleStaleBondHardwareError: isBleStaleBondHardwareError,
+    isBleStaleBondErrorText: isBleStaleBondErrorText,
     serializeError: serializeError,
     CreateErrorByMessage: CreateErrorByMessage,
     CreateHardwareErrorByBridgeError: CreateHardwareErrorByBridgeError,
@@ -397,6 +413,7 @@ const ONEKEY_WEBUSB_FILTER = [
     { vendorId: 0x1209, productId: 0x4f4b },
     { vendorId: 0x1209, productId: 0x4f4c },
 ];
+const ONEKEY_PROTOCOL_V2_USB_IDS = [{ vendorId: 0x1209, productId: 0x4f4c }];
 const TREZOR_WEBUSB_MANUFACTURER_NAMES = new Set(['trezor', 'trezor company', 'satoshilabs']);
 const isKnownTrezorWebUsbDevice = (descriptor) => {
     var _a;
@@ -447,6 +464,11 @@ exports.EOneKeyBleMessageKeys = void 0;
     EOneKeyBleMessageKeys["NOBLE_BLE_MTU_CHANGED"] = "$onekey-noble-ble-mtu-changed";
     EOneKeyBleMessageKeys["NOBLE_BLE_CANCEL_PAIRING"] = "$onekey-noble-ble-cancel-pairing";
 })(exports.EOneKeyBleMessageKeys || (exports.EOneKeyBleMessageKeys = {}));
+exports.EBleDisconnectReason = void 0;
+(function (EBleDisconnectReason) {
+    EBleDisconnectReason["DeviceDisconnected"] = "device-disconnected";
+    EBleDisconnectReason["IdleKeepAlive"] = "idle-keep-alive";
+})(exports.EBleDisconnectReason || (exports.EBleDisconnectReason = {}));
 const ONEKEY_SERVICE_UUID = '00000001-0000-1000-8000-00805f9b34fb';
 const ONEKEY_WRITE_CHARACTERISTIC_UUID = '00000002-0000-1000-8000-00805f9b34fb';
 const ONEKEY_NOTIFY_CHARACTERISTIC_UUID = '00000003-0000-1000-8000-00805f9b34fb';
@@ -493,12 +515,36 @@ const isOnekeyDevice = (name, id) => {
         return true;
     if (normalizedName.startsWith('touch ') ||
         normalizedName.startsWith('pro ') ||
-        normalizedName.startsWith('pro2 ') ||
-        normalizedName.startsWith('neo ')) {
+        normalizedName.startsWith('pro2') ||
+        normalizedName.startsWith('neo')) {
+        return true;
+    }
+    const compactName = compactBleName(normalizedName);
+    if (PRO2_COMPACT_NAME_PATTERN.test(compactName) || NEO_COMPACT_NAME_PATTERN.test(compactName)) {
         return true;
     }
     return isOneKeyShortName(normalizedName);
 };
+const inferProtocolHintFromUsbId = (vendorId, productId) => ONEKEY_PROTOCOL_V2_USB_IDS.some(id => id.vendorId === vendorId && id.productId === productId)
+    ? 'V2'
+    : undefined;
+const resolveOneKeyUsbDevicePath = (device) => {
+    var _a, _b, _c, _d;
+    const serial = (_a = device.serialNumber) === null || _a === void 0 ? void 0 : _a.trim();
+    if (serial)
+        return serial;
+    if (device.vendorId == null && device.productId == null && !device.productName) {
+        return undefined;
+    }
+    const vendorId = ((_b = device.vendorId) !== null && _b !== void 0 ? _b : 0).toString(16).padStart(4, '0');
+    const productId = ((_c = device.productId) !== null && _c !== void 0 ? _c : 0).toString(16).padStart(4, '0');
+    const product = ((_d = device.productName) !== null && _d !== void 0 ? _d : 'onekey')
+        .trim()
+        .toLowerCase()
+        .replace(/\s+/g, '-')
+        .replace(/[^a-z0-9-]/g, '');
+    return `usb-${vendorId}-${productId}-${product || 'onekey'}`;
+};
 const BLUETOOTH_BASE_UUID_SUFFIX = '00001000800000805f9b34fb';
 const normalizeBleUuid = (uuid) => (uuid !== null && uuid !== void 0 ? uuid : '').replace(/-/g, '').toLowerCase();
 const createKnownBleUuidAliases = (uuid) => {
@@ -517,12 +563,95 @@ const createKnownBleUuidAliases = (uuid) => {
 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 PRO2_COMPACT_NAME_PATTERN = /^(?:onekey)?pro2[a-f0-9]{4}$/i;
+const NEO_COMPACT_NAME_PATTERN = /^(?:onekey)?neo[a-f0-9]{4}$/i;
+const FIND_MY_COMPACT_SUFFIXES = [
+    'findemy',
+    'findem',
+    'finde',
+    'findmy',
+    'findm',
+    '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 = getFindMyCompactSuffix(compactName);
+    if (!suffix)
+        return undefined;
+    const compactBaseName = compactName.slice(0, -suffix.length);
+    return PRO2_COMPACT_NAME_PATTERN.test(compactBaseName) ? compactBaseName.length : undefined;
+};
 const isPro2FindMyAdvertisementName = (value) => {
-    var _a;
-    const normalizedName = (_a = value === null || value === void 0 ? void 0 : value.trim().toLowerCase()) !== null && _a !== void 0 ? _a : '';
-    return /\bpro\s*2\b/.test(normalizedName) && /\bfinde?\s+my\b/.test(normalizedName);
+    if (!value)
+        return false;
+    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);
+    if (baseLength === undefined)
+        return value;
+    let compactLength = 0;
+    for (let index = 0; index < value.length; index += 1) {
+        const character = value[index];
+        if (character !== '-' && character.trim() !== '') {
+            compactLength += 1;
+            if (compactLength === baseLength) {
+                return value.slice(0, index + 1).trimEnd();
+            }
+        }
+    }
+    return value;
+};
+const canonicalizePro2BleAdvertisementName = (value) => {
+    const withoutFindMy = normalizePro2FindMyAdvertisementName(value);
+    const compact = compactBleName(withoutFindMy);
+    if (!PRO2_COMPACT_NAME_PATTERN.test(compact))
+        return withoutFindMy;
+    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 isPro2FamilyBleName = (value) => {
+    if (!value) {
+        return false;
+    }
+    const normalized = value.trim().toLowerCase();
+    if (!normalized) {
+        return false;
+    }
+    if (normalized.startsWith('pro2') || normalized.startsWith('neo')) {
+        return true;
+    }
+    const compact = compactBleName(normalized);
+    return (PRO2_COMPACT_NAME_PATTERN.test(compact) ||
+        NEO_COMPACT_NAME_PATTERN.test(compact) ||
+        isPro2FindMyAdvertisementName(value));
+};
 const isOnekeyBluetoothDevice = ({ id, name, localName, serviceUuids, }) => {
     const advertisedServiceUuids = serviceUuids !== null && serviceUuids !== void 0 ? serviceUuids : [];
     if (hasOnekeyCommunicationService(advertisedServiceUuids)) {
@@ -621,10 +750,12 @@ exports.HardwareError = HardwareError;
 exports.HardwareErrorCode = HardwareErrorCode;
 exports.HardwareErrorCodeMessage = HardwareErrorCodeMessage;
 exports.ONEKEY_NOTIFY_CHARACTERISTIC_UUID = ONEKEY_NOTIFY_CHARACTERISTIC_UUID;
+exports.ONEKEY_PROTOCOL_V2_USB_IDS = ONEKEY_PROTOCOL_V2_USB_IDS;
 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;
@@ -634,12 +765,19 @@ exports.createNeedUpgradeFirmwareHardwareError = createNeedUpgradeFirmwareHardwa
 exports.createNewFirmwareForceUpdateHardwareError = createNewFirmwareForceUpdateHardwareError;
 exports.createNewFirmwareUnReleaseHardwareError = createNewFirmwareUnReleaseHardwareError;
 exports.hasOnekeyCommunicationService = hasOnekeyCommunicationService;
+exports.inferProtocolHintFromUsbId = inferProtocolHintFromUsbId;
+exports.isBleStaleBondErrorText = isBleStaleBondErrorText;
+exports.isBleStaleBondHardwareError = isBleStaleBondHardwareError;
 exports.isHeaderChunk = isHeaderChunk;
 exports.isKnownTrezorWebUsbDevice = isKnownTrezorWebUsbDevice;
 exports.isOnekeyBluetoothDevice = isOnekeyBluetoothDevice;
 exports.isOnekeyDevice = isOnekeyDevice;
+exports.isPro2FamilyBleName = isPro2FamilyBleName;
 exports.isPro2FindMyAdvertisementName = isPro2FindMyAdvertisementName;
+exports.isSameOnekeyBleName = isSameOnekeyBleName;
 exports.matchesKnownBleUuid = matchesKnownBleUuid;
 exports.normalizeBleUuid = normalizeBleUuid;
+exports.normalizePro2FindMyAdvertisementName = normalizePro2FindMyAdvertisementName;
+exports.resolveOneKeyUsbDevicePath = resolveOneKeyUsbDevicePath;
 exports.serializeError = serializeError;
 exports.wait = wait;

package/package.json

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

package/src/HardwareError.test.ts

@@ -1,4 +1,9 @@
-import { HardwareErrorCode } from './HardwareError';
+import {
+  HardwareErrorCode,
+  HardwareErrorCodeMessage,
+  TypedError,
+  serializeError,
+} from './HardwareError';
 
 describe('HardwareErrorCode compatibility', () => {
   test('preserves published Protocol V2 values while leaving code 829 unused', () => {
@@ -6,4 +11,26 @@ describe('HardwareErrorCode compatibility', () => {
     expect(HardwareErrorCode.DeviceLocked).toBe(830);
     expect(HardwareErrorCode.WalletSessionInvalid).toBe(831);
   });
+
+  test('reserves the BLE and USB conflict code for app error mapping', () => {
+    expect(HardwareErrorCode.BleUnavailableWhileUsbConnected).toBe(723);
+    expect(HardwareErrorCodeMessage[HardwareErrorCode.BleUnavailableWhileUsbConnected]).toBe(
+      'Bluetooth is unavailable while USB is connected. Unplug USB and try again.'
+    );
+    expect(
+      serializeError({
+        error: TypedError(HardwareErrorCode.BleUnavailableWhileUsbConnected, undefined, {
+          failureCode: 'Failure_ProcessError',
+          firmwareMessage: 'link disabled',
+        }),
+      })
+    ).toEqual({
+      code: 723,
+      error: 'Bluetooth is unavailable while USB is connected. Unplug USB and try again.',
+      params: {
+        failureCode: 'Failure_ProcessError',
+        firmwareMessage: 'link disabled',
+      },
+    });
+  });
 });

package/src/HardwareError.ts

@@ -345,6 +345,7 @@ export const HardwareErrorCode = {
   BleDeviceDisconnected: 720,
   BlePoweredOff: 721,
   BleUnsupported: 722,
+  BleUnavailableWhileUsbConnected: 723,
 
   /**
    * Hardware runtiome errors
@@ -619,6 +620,8 @@ export const HardwareErrorCodeMessage: HardwareErrorCodeMessageMapping = {
   [HardwareErrorCode.BleDeviceDisconnected]: 'Device disconnected',
   [HardwareErrorCode.BlePoweredOff]: 'Bluetooth is turned off',
   [HardwareErrorCode.BleUnsupported]: 'Bluetooth is not supported on this device',
+  [HardwareErrorCode.BleUnavailableWhileUsbConnected]:
+    'Bluetooth is unavailable while USB is connected. Unplug USB and try again.',
 
   /**
    * Runtime Error
@@ -679,6 +682,24 @@ export const TypedError = (
   return new HardwareError({ errorCode: hardwareError, message: message ?? '', params });
 };
 
+export const isBleStaleBondHardwareError = (error: unknown): boolean => {
+  const code = (error as { errorCode?: unknown })?.errorCode;
+  return (
+    code === HardwareErrorCode.BleDeviceBondError ||
+    code === HardwareErrorCode.BlePeerRemovedPairingInformation
+  );
+};
+
+export const isBleStaleBondErrorText = (text: string): boolean => {
+  const value = text.toLowerCase();
+  return (
+    value.includes('encryption is insufficient') ||
+    value.includes('insufficient encryption') ||
+    value.includes('peer removed pairing information') ||
+    value.includes('gatt_insuf_authentication')
+  );
+};
+
 export const serializeError = (payload: any) => {
   if (payload && payload.error instanceof HardwareError) {
     return {

package/src/constants.test.ts

@@ -1,10 +1,16 @@
 import {
+  canonicalizePro2BleAdvertisementName,
   createKnownBleUuidAliases,
   hasOnekeyCommunicationService,
+  inferProtocolHintFromUsbId,
   isKnownTrezorWebUsbDevice,
   isOnekeyBluetoothDevice,
   isOnekeyDevice,
+  isPro2FindMyAdvertisementName,
+  isSameOnekeyBleName,
   matchesKnownBleUuid,
+  normalizePro2FindMyAdvertisementName,
+  resolveOneKeyUsbDevicePath,
 } from './constants';
 
 describe('hardware device identity filters', () => {
@@ -12,6 +18,11 @@ describe('hardware device identity filters', () => {
     expect(isOnekeyDevice('Touch A1B2')).toBe(true);
     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);
   });
@@ -35,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',
@@ -67,6 +84,63 @@ 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([
+    ['Pro2 A1B2 - Find My', 'Pro2 A1B2'],
+    ['Pro2 5E9D - Finde My', 'Pro2 5E9D'],
+    ['  OneKey Pro 2 A1B2 Find My  ', '  OneKey Pro 2 A1B2'],
+    ['OneKey Pro-2 22D8--Find-My', 'OneKey Pro-2 22D8'],
+    ['Pro2 22D8FindMy', 'Pro2 22D8'],
+    ['Pro2 22D8 - Fin', 'Pro2 22D8'],
+    ['Pro2 22D8FindM', 'Pro2 22D8'],
+    [`Pro2 22D8${'\t'.repeat(10_000)}Find My`, 'Pro2 22D8'],
+    ['Pro2 A1B2', 'Pro2 A1B2'],
+    ['Pro2 Griffin', 'Pro2 Griffin'],
+    ['Find My', 'Find My'],
+  ])('normalizes the public Pro2 advertisement name %s', (name, expected) => {
+    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'],
+    ['Pro 22D8', 'Pro 22D8'],
+    ['Pro 2D8F', 'Pro 2D8F'],
+    ['OneKey Pro 22D8', 'OneKey Pro 22D8'],
+    ['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);
+    expect(isSameOnekeyBleName('Pro 22D8', 'Pro 22D8')).toBe(true);
+    expect(isSameOnekeyBleName('Pro 22D8', 'Pro2 22D8')).toBe(false);
+    expect(isSameOnekeyBleName('Pro 22D8', 'Pro 2 22D8')).toBe(false);
   });
 
   it('keeps OneKey discovery on the communication service', () => {
@@ -106,6 +180,32 @@ describe('hardware device identity filters', () => {
     expect(hasOnekeyCommunicationService(['abcd0001-1234-5678-9012-abcdefabcdef'])).toBe(false);
   });
 
+  it('hints Protocol V2 from the current Pro2/Neo USB ID only', () => {
+    expect(inferProtocolHintFromUsbId(0x1209, 0x4f4c)).toBe('V2');
+    expect(inferProtocolHintFromUsbId(0x1209, 0x53c1)).toBeUndefined();
+    expect(inferProtocolHintFromUsbId(0x1209, 0x4f4a)).toBeUndefined();
+    expect(inferProtocolHintFromUsbId(0x1209, 0x4f4b)).toBeUndefined();
+  });
+
+  it('uses the USB serial when present and synthesizes a path when firmware omits it', () => {
+    expect(
+      resolveOneKeyUsbDevicePath({
+        vendorId: 0x1209,
+        productId: 0x4f4c,
+        productName: 'OneKey Pro 2',
+        serialNumber: 'PRO2-SERIAL',
+      })
+    ).toBe('PRO2-SERIAL');
+    expect(
+      resolveOneKeyUsbDevicePath({
+        vendorId: 0x1209,
+        productId: 0x4f4c,
+        productName: 'OneKey Neo',
+        serialNumber: '',
+      })
+    ).toBe('usb-1209-4f4c-onekey-neo');
+  });
+
   it('only filters WebUSB descriptors that are explicitly identified as Trezor', () => {
     expect(
       isKnownTrezorWebUsbDevice({

package/src/constants.ts

@@ -13,10 +13,13 @@ export const ONEKEY_WEBUSB_FILTER = [
   { vendorId: 0x1209, productId: 0x53c1 }, // Classic/Classic1s/Mini/Pro/Touch firmware and legacy Pro2; keep for existing devices
   { vendorId: 0x1209, productId: 0x4f4a }, // Pro bootloader, Touch bootloader, Pro2
   { vendorId: 0x1209, productId: 0x4f4b }, // Pro/Touch firmware (Trezor not implemented), Pro2
-  { vendorId: 0x1209, productId: 0x4f4c }, // Pro board and Pro2 with the new firmware PID
+  { vendorId: 0x1209, productId: 0x4f4c }, // Pro2 / Neo current firmware, all modes
   // { vendorId: 0x1209, productId: 0x4f50 }, // Touch Board
 ];
 
+/** USB IDs whose first probe should be Protocol V2. Shared Pro/Touch PIDs stay unhinted. */
+export const ONEKEY_PROTOCOL_V2_USB_IDS = [{ vendorId: 0x1209, productId: 0x4f4c }] as const;
+
 type WebUsbIdentityDescriptor = {
   vendorId?: number;
   productId?: number;
@@ -98,6 +101,21 @@ export enum EOneKeyBleMessageKeys {
   NOBLE_BLE_CANCEL_PAIRING = '$onekey-noble-ble-cancel-pairing',
 }
 
+/**
+ * Why a BLE link went down, carried on BLE_DEVICE_DISCONNECTED.
+ *
+ * The main process frees an idle link on its own keep-alive timer, which is an
+ * internal optimisation the device knows nothing about — consumers must not
+ * treat it as "the device is gone". Only DeviceDisconnected means the
+ * peripheral actually dropped.
+ */
+export enum EBleDisconnectReason {
+  /** Unsolicited peripheral drop: powered off, out of range, cable/BLE lost. */
+  DeviceDisconnected = 'device-disconnected',
+  /** Main-process keep-alive timer released an idle link; device still present. */
+  IdleKeepAlive = 'idle-keep-alive',
+}
+
 export const ONEKEY_SERVICE_UUID = '00000001-0000-1000-8000-00805f9b34fb';
 export const ONEKEY_WRITE_CHARACTERISTIC_UUID = '00000002-0000-1000-8000-00805f9b34fb';
 export const ONEKEY_NOTIFY_CHARACTERISTIC_UUID = '00000003-0000-1000-8000-00805f9b34fb';
@@ -152,14 +170,47 @@ export const isOnekeyDevice = (name: string | null, id?: string): boolean => {
   if (
     normalizedName.startsWith('touch ') ||
     normalizedName.startsWith('pro ') ||
-    normalizedName.startsWith('pro2 ') ||
-    normalizedName.startsWith('neo ')
+    normalizedName.startsWith('pro2') ||
+    normalizedName.startsWith('neo')
   ) {
     return true;
   }
+  const compactName = compactBleName(normalizedName);
+  if (PRO2_COMPACT_NAME_PATTERN.test(compactName) || NEO_COMPACT_NAME_PATTERN.test(compactName)) {
+    return true;
+  }
   return isOneKeyShortName(normalizedName);
 };
 
+export const inferProtocolHintFromUsbId = (vendorId?: number | null, productId?: number | null) =>
+  ONEKEY_PROTOCOL_V2_USB_IDS.some(id => id.vendorId === vendorId && id.productId === productId)
+    ? ('V2' as const)
+    : undefined;
+
+type UsbDevicePathInput = {
+  serialNumber?: string | null;
+  vendorId?: number;
+  productId?: number;
+  productName?: string | null;
+};
+
+export const resolveOneKeyUsbDevicePath = (device: UsbDevicePathInput): string | undefined => {
+  const serial = device.serialNumber?.trim();
+  if (serial) return serial;
+  if (device.vendorId == null && device.productId == null && !device.productName) {
+    return undefined;
+  }
+
+  const vendorId = (device.vendorId ?? 0).toString(16).padStart(4, '0');
+  const productId = (device.productId ?? 0).toString(16).padStart(4, '0');
+  const product = (device.productName ?? 'onekey')
+    .trim()
+    .toLowerCase()
+    .replace(/\s+/g, '-')
+    .replace(/[^a-z0-9-]/g, '');
+  return `usb-${vendorId}-${productId}-${product || 'onekey'}`;
+};
+
 type BluetoothDeviceIdentity = {
   id?: string;
   name?: string | null;
@@ -195,10 +246,95 @@ export const matchesKnownBleUuid = (
 
 const ONEKEY_COMMUNICATION_SERVICE_ALIASES = createKnownBleUuidAliases(ONEKEY_SERVICE_UUID);
 const FIDO_SERVICE_ALIASES = createKnownBleUuidAliases('0000fffd-0000-1000-8000-00805f9b34fb');
+const PRO2_COMPACT_NAME_PATTERN = /^(?:onekey)?pro2[a-f0-9]{4}$/i;
+const NEO_COMPACT_NAME_PATTERN = /^(?:onekey)?neo[a-f0-9]{4}$/i;
+const FIND_MY_COMPACT_SUFFIXES = [
+  'findemy',
+  'findem',
+  'finde',
+  'findmy',
+  'findm',
+  'find',
+  'fin',
+] as const;
+const COMPLETE_FIND_MY_COMPACT_SUFFIXES = ['findemy', 'findmy'] as const;
+
+const compactBleName = (value: string) =>
+  Array.from(value)
+    .filter(character => character !== '-' && character.trim() !== '')
+    .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 = getFindMyCompactSuffix(compactName);
+  if (!suffix) return undefined;
+
+  const compactBaseName = compactName.slice(0, -suffix.length);
+  return PRO2_COMPACT_NAME_PATTERN.test(compactBaseName) ? compactBaseName.length : undefined;
+};
 
 export const isPro2FindMyAdvertisementName = (value?: string | null) => {
-  const normalizedName = value?.trim().toLowerCase() ?? '';
-  return /\bpro\s*2\b/.test(normalizedName) && /\bfinde?\s+my\b/.test(normalizedName);
+  if (!value) return false;
+  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) => {
+  const baseLength = getPro2FindMyBaseLength(value);
+  if (baseLength === undefined) return value;
+
+  let compactLength = 0;
+  for (let index = 0; index < value.length; index += 1) {
+    const character = value[index];
+    if (character !== '-' && character.trim() !== '') {
+      compactLength += 1;
+      if (compactLength === baseLength) {
+        return value.slice(0, index + 1).trimEnd();
+      }
+    }
+  }
+  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.
+ *
+ * Match the compact Pro2 form first. A leading "Pro 2" regex would also eat the
+ * first digit of a OneKey Pro suffix such as "Pro 22D8" or "Pro 2D8F".
+ */
+export const canonicalizePro2BleAdvertisementName = (value: string) => {
+  const withoutFindMy = normalizePro2FindMyAdvertisementName(value);
+  const compact = compactBleName(withoutFindMy);
+  if (!PRO2_COMPACT_NAME_PATTERN.test(compact)) return withoutFindMy;
+
+  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 = (
@@ -208,6 +344,30 @@ export const hasOnekeyCommunicationService = (
     matchesKnownBleUuid(uuid, ONEKEY_COMMUNICATION_SERVICE_ALIASES)
   );
 
+/**
+ * Protocol V2 family (Pro2 / Neo) by advertised BLE name. Callers use it to
+ * pick a connection strategy: this family also advertises under Find My names
+ * that carry no OneKey service UUID, so a scan cannot always see it.
+ */
+export const isPro2FamilyBleName = (value?: string | null): boolean => {
+  if (!value) {
+    return false;
+  }
+  const normalized = value.trim().toLowerCase();
+  if (!normalized) {
+    return false;
+  }
+  if (normalized.startsWith('pro2') || normalized.startsWith('neo')) {
+    return true;
+  }
+  const compact = compactBleName(normalized);
+  return (
+    PRO2_COMPACT_NAME_PATTERN.test(compact) ||
+    NEO_COMPACT_NAME_PATTERN.test(compact) ||
+    isPro2FindMyAdvertisementName(value)
+  );
+};
+
 export const isOnekeyBluetoothDevice = ({
   id,
   name,