@onekeyfe/hd-shared 1.2.0-alpha.7 → 1.2.0-alpha.70

package/dist/HardwareError.d.ts

@@ -115,6 +115,9 @@ export declare const HardwareErrorCode: {
     readonly DeviceSettingsLanguageNotSupport: 826;
     readonly TooManyInputs: 827;
     readonly PinMismatch: 828;
+    readonly DeviceLocked: 830;
+    readonly WalletSessionInvalid: 831;
+    readonly NftStorageLimitReached: 832;
     readonly LowlevelTrasnportConnectError: 900;
     readonly WebDeviceNotFoundOrNeedsPermission: 901;
     readonly WebDevicePromptAccessError: 902;

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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsapB,CAAC;AAEX,eAAO,MAAM,wBAAwB,EAAE,+BAgJ7B,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;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"}

package/dist/constants.d.ts

@@ -8,6 +8,12 @@ export declare const ONEKEY_WEBUSB_FILTER: {
     vendorId: number;
     productId: number;
 }[];
+type WebUsbIdentityDescriptor = {
+    vendorId?: number;
+    productId?: number;
+    manufacturerName?: string | null;
+};
+export declare const isKnownTrezorWebUsbDevice: (descriptor: WebUsbIdentityDescriptor) => boolean;
 export declare const ERROR_CODES_REQUIRE_RELEASE: readonly [106, 107, 109, 112, 805, 801, 802, 812];
 export declare const ERROR_CODES_REQUIRE_DISCONNECT: readonly [106, 805];
 export declare enum EOneKeyBleMessageKeys {
@@ -39,4 +45,17 @@ 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 isPro2FindMyAdvertisementName: (value?: 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 {};
 //# 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;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;AAEF,eAAO,MAAM,cAAc,SAAU,MAAM,GAAG,IAAI,OAAO,MAAM,KAAG,OAYjE,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,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"}

package/dist/deviceType.d.ts

@@ -6,6 +6,7 @@ export declare enum EDeviceType {
     Mini = "mini",
     Touch = "touch",
     Pro = "pro",
-    Pro2 = "pro2"
+    Pro2 = "pro2",
+    Neo = "neo"
 }
 //# sourceMappingURL=deviceType.d.ts.map

package/dist/deviceType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deviceType.d.ts","sourceRoot":"","sources":["../src/deviceType.ts"],"names":[],"mappings":"AAAA,oBAAY,WAAW;IACrB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,SAAS,cAAc;IACvB,WAAW,gBAAgB;IAC3B,IAAI,SAAS;IACb,KAAK,UAAU;IACf,GAAG,QAAQ;IACX,IAAI,SAAS;CACd"}
+{"version":3,"file":"deviceType.d.ts","sourceRoot":"","sources":["../src/deviceType.ts"],"names":[],"mappings":"AAAA,oBAAY,WAAW;IACrB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,SAAS,cAAc;IACvB,WAAW,gBAAgB;IAC3B,IAAI,SAAS;IACb,KAAK,UAAU;IACf,GAAG,QAAQ;IACX,IAAI,SAAS;IACb,GAAG,QAAQ;CACZ"}

package/dist/index.d.ts

@@ -7,7 +7,21 @@ declare const ONEKEY_WEBUSB_FILTER: {
     vendorId: number;
     productId: number;
 }[];
+type WebUsbIdentityDescriptor = {
+    vendorId?: number;
+    productId?: number;
+    manufacturerName?: string | null;
+};
+declare const isKnownTrezorWebUsbDevice: (descriptor: WebUsbIdentityDescriptor) => boolean;
+/**
+ * Error codes that require device release after occurrence
+ * These errors indicate the device is in an invalid state and needs to be released
+ */
 declare const ERROR_CODES_REQUIRE_RELEASE: readonly [106, 107, 109, 112, 805, 801, 802, 812];
+/**
+ * Error codes that require device disconnect before release
+ * These errors indicate a communication failure that requires full reconnection
+ */
 declare const ERROR_CODES_REQUIRE_DISCONNECT: readonly [106, 805];
 declare enum EOneKeyBleMessageKeys {
     BLE_SELECT = "$onekey-ble-select",
@@ -38,6 +52,18 @@ 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 isPro2FindMyAdvertisementName: (value?: string | null) => 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;
@@ -70,53 +96,201 @@ declare class HardwareError extends Error {
     constructor(hardwareError: IHardwareError | string);
 }
 declare const HardwareErrorCode: {
+    /**
+     * This error can be thrown when unexpected error occurred and in most cases it is related to implementation bug.
+     * Original message is available in message property.
+     */
     readonly UnknownError: 0;
+    /**
+     * Firmware version mismatch
+     */
     readonly DeviceFwException: 101;
+    /**
+     * Device unexpected mode
+     */
     readonly DeviceUnexpectedMode: 102;
+    /**
+     * Device list is not initialized
+     */
     readonly DeviceListNotInitialized: 103;
+    /**
+     * Please select the connected device
+     */
     readonly SelectDevice: 104;
+    /**
+     * Device not found
+     */
     readonly DeviceNotFound: 105;
+    /**
+     * Device is not initialized
+     */
     readonly DeviceInitializeFailed: 106;
+    /**
+     * Device interrupted from another operation
+     */
     readonly DeviceInterruptedFromOutside: 107;
+    /**
+     * Device should be in bootloader mode
+     */
     readonly RequiredButInBootloaderMode: 108;
+    /**
+     * Device interrupted from user
+     */
     readonly DeviceInterruptedFromUser: 109;
+    /**
+     * Check device id is same
+     */
     readonly DeviceCheckDeviceIdError: 110;
+    /**
+     * Do not support passphrase
+     * @params: { require: string }
+     */
     readonly DeviceNotSupportPassphrase: 111;
     readonly DeviceCheckPassphraseStateError: 112;
+    /**
+     * use passphrase, but passphrase is not opened
+     */
     readonly DeviceNotOpenedPassphrase: 113;
+    /**
+     * not use passphrase, but passphrase is opened
+     */
     readonly DeviceOpenedPassphrase: 114;
+    /**
+     *  Detect hardware that is in bootloader mode and return an error.
+     */
     readonly DeviceDetectInBootloaderMode: 115;
+    /**
+     * Device not allow in bootloader mode
+     */
     readonly NotAllowInBootloaderMode: 116;
+    /**
+     * Device is busy
+     */
     readonly DeviceBusy: 117;
+    /**
+     * Device check unlock type not match error
+     */
     readonly DeviceCheckUnlockTypeError: 118;
+    /**
+     * Not initialized
+     */
     readonly NotInitialized: 200;
+    /**
+     * Iframe not initialized
+     */
     readonly IFrameNotInitialized: 300;
+    /**
+     * iframe repeat initialization
+     */
     readonly IFrameAleradyInitialized: 301;
+    /**
+     * iframe load failure
+     */
     readonly IFrameLoadFail: 302;
+    /**
+     * init iframe time out
+     */
     readonly IframeTimeout: 303;
+    /**
+     * iframe blocked
+     */
     readonly IframeBlocked: 304;
+    /**
+     * iframe host not trust
+     */
     readonly IframeDistrust: 305;
+    /**
+     * Runtime errors during method execution
+     */
     readonly CallMethodError: 400;
+    /**
+     * Method does not responding
+     */
     readonly CallMethodNotResponse: 404;
+    /**
+     * Call method invalid parameter
+     */
     readonly CallMethodInvalidParameter: 405;
+    /**
+     * firmware update download failed
+     */
     readonly FirmwareUpdateDownloadFailed: 406;
+    /**
+     * Call method not supported, need update firmware
+     * @params: { current: string, require: string }
+     */
     readonly CallMethodNeedUpgradeFirmware: 407;
+    /**
+     * Call method not supported, is deprecated
+     * @params: { current: string, deprecated: string }
+     */
     readonly CallMethodDeprecated: 408;
+    /**
+     * Only one device can be connected during firmware upgrade
+     */
     readonly FirmwareUpdateLimitOneDevice: 409;
+    /**
+     * You need to manually enter boot
+     */
     readonly FirmwareUpdateManuallyEnterBoot: 410;
+    /**
+     * Manual entry fails. You must manually enter the boot
+     */
     readonly FirmwareUpdateAutoEnterBootFailure: 411;
+    /**
+     * The new firmware has not been released yet
+     */
     readonly NewFirmwareUnRelease: 412;
+    /**
+     * use OneKey desktop client to update the firmware
+     * because need copy resource file to Touch
+     */
     readonly UseDesktopToUpdateFirmware: 413;
+    /**
+     * Mandatory firmware update
+     * @params:{ connectId: string? , deviceId: string? }
+     */
     readonly NewFirmwareForceUpdate: 414;
+    /**
+     * Device not support this method
+     */
     readonly DeviceNotSupportMethod: 415;
+    /**
+     * Forbidden key path
+     */
     readonly ForbiddenKeyPath: 416;
+    /**
+     * Repeat unlocking
+     * all network get address by loop need repeat unlocking
+     */
     readonly RepeatUnlocking: 417;
+    /**
+     * Defective firmware detected
+     */
     readonly DefectiveFirmware: 418;
+    /**
+     * Netword request error
+     */
     readonly NetworkError: 500;
+    /**
+     * Transport not configured
+     */
     readonly TransportNotConfigured: 600;
+    /**
+     * Transport call in progress
+     */
     readonly TransportCallInProgress: 601;
+    /**
+     * Transport not found
+     */
     readonly TransportNotFound: 602;
+    /**
+     * Transport invalid protobuf
+     */
     readonly TransportInvalidProtobuf: 603;
+    /**
+     * Bluetooth error code
+     */
     readonly BleScanError: 700;
     readonly BlePermissionError: 701;
     readonly BleLocationError: 702;
@@ -140,37 +314,144 @@ declare const HardwareErrorCode: {
     readonly BleDeviceDisconnected: 720;
     readonly BlePoweredOff: 721;
     readonly BleUnsupported: 722;
+    /**
+     * Hardware runtiome errors
+     */
     readonly RuntimeError: 800;
+    /**
+     * invalid pin
+     */
     readonly PinInvalid: 801;
+    /**
+     * pin cancelled by user
+     */
     readonly PinCancelled: 802;
+    /**
+     * Action cancelled by user
+     */
     readonly ActionCancelled: 803;
+    /**
+     * Firmware installation failed
+     */
     readonly FirmwareError: 804;
+    /**
+     * transport response unexpect error
+     */
     readonly ResponseUnexpectTypeError: 805;
+    /**
+     * bridge network error
+     */
     readonly BridgeNetworkError: 806;
+    /**
+     * Bridge network timeout
+     */
     readonly BridgeTimeoutError: 807;
+    /**
+     * Bridge not installed
+     */
     readonly BridgeNotInstalled: 808;
+    /**
+     * ensure connect timeout
+     */
     readonly PollingTimeout: 809;
+    /**
+     * ensure connect stop polling
+     */
     readonly PollingStop: 810;
+    /**
+     * Device does not open blid sign
+     */
     readonly BlindSignDisabled: 811;
     readonly UnexpectPassphrase: 812;
+    /**
+     * NFT file already exists
+     */
     readonly FileAlreadyExists: 813;
+    /**
+     * check file length error
+     */
     readonly CheckDownloadFileError: 814;
+    /**
+     * not in signing mode
+     */
     readonly NotInSigningMode: 815;
+    /**
+     * not in signing mode
+     */
     readonly DataOverload: 816;
+    /**
+     * device disconnected during action
+     */
     readonly BridgeDeviceDisconnected: 817;
+    /**
+     * BTC PSBT too many utxos
+     * @params:{ count: number }
+     */
     readonly BTCPsbtTooManyUtxos: 818;
+    /**
+     * EMMC file write firmware error
+     */
     readonly EmmcFileWriteFirmwareError: 819;
+    /**
+     * Firmware verification failed (e.g., bootloader file verify failed)
+     */
     readonly FirmwareVerificationFailed: 820;
+    /**
+     * Web bridge coonect needs permission
+     */
     readonly BridgeNeedsPermission: 821;
     readonly CallQueueActionCancelled: 822;
+    /**
+     * Firmware downgrade not allowed
+     */
     readonly FirmwareDowngradeNotAllowed: 823;
+    /**
+     * Cosmos invalid JSON message, Only support Amino msgs.
+     */
     readonly CosmosInvalidJsonMessage: 824;
+    /**
+     * No setting provided
+     */
     readonly DeviceSettingsNotProvided: 825;
+    /**
+     * Language not supported
+     */
     readonly DeviceSettingsLanguageNotSupport: 826;
+    /**
+     * Too many inputs
+     * @params: { count?: string }
+     */
     readonly TooManyInputs: 827;
+    /**
+     * The two PIN entries did not match while setting/changing PIN on device
+     */
     readonly PinMismatch: 828;
+    /**
+     * Protocol V2 device must be unlocked before the requested operation.
+     * @params: { failureCode?: string; subcode?: number; firmwareMessage?: string }
+     */
+    readonly DeviceLocked: 830;
+    /**
+     * The cached wallet session is invalid or has expired.
+     * @params: { failureCode?: string; subcode?: number; firmwareMessage?: string }
+     */
+    readonly WalletSessionInvalid: 831;
+    /**
+     * Pro2 NFT storage has reached its item limit.
+     * @params: { count: number; limit: number }
+     */
+    readonly NftStorageLimitReached: 832;
+    /**
+     * Lowlevel transport connect error
+     */
     readonly LowlevelTrasnportConnectError: 900;
+    /**
+     * Web USB or Web Bluetooth device not found or needs permission
+     */
     readonly WebDeviceNotFoundOrNeedsPermission: 901;
+    /**
+     * Web USB or Web Bluetooth device prompt access error
+     */
     readonly WebDevicePromptAccessError: 902;
 };
 declare const HardwareErrorCodeMessage: HardwareErrorCodeMessageMapping;
@@ -242,7 +523,8 @@ declare enum EDeviceType {
     Mini = "mini",
     Touch = "touch",
     Pro = "pro",
-    Pro2 = "pro2"
+    Pro2 = "pro2",
+    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, createNeedUpgradeFirmwareHardwareError, createNewFirmwareForceUpdateHardwareError, createNewFirmwareUnReleaseHardwareError, isHeaderChunk, 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, isPro2FindMyAdvertisementName, matchesKnownBleUuid, normalizeBleUuid, serializeError, wait };

package/dist/index.js

@@ -164,6 +164,9 @@ const HardwareErrorCode = {
     DeviceSettingsLanguageNotSupport: 826,
     TooManyInputs: 827,
     PinMismatch: 828,
+    DeviceLocked: 830,
+    WalletSessionInvalid: 831,
+    NftStorageLimitReached: 832,
     LowlevelTrasnportConnectError: 900,
     WebDeviceNotFoundOrNeedsPermission: 901,
     WebDevicePromptAccessError: 902,
@@ -268,6 +271,9 @@ const HardwareErrorCodeMessage = {
     [HardwareErrorCode.DeviceSettingsLanguageNotSupport]: 'Language not supported',
     [HardwareErrorCode.TooManyInputs]: 'Too many inputs',
     [HardwareErrorCode.PinMismatch]: 'PIN mismatch',
+    [HardwareErrorCode.DeviceLocked]: 'Device locked',
+    [HardwareErrorCode.WalletSessionInvalid]: 'Wallet session is invalid or expired',
+    [HardwareErrorCode.NftStorageLimitReached]: 'NFT storage limit reached. Remove an NFT from the device and try again.',
     [HardwareErrorCode.LowlevelTrasnportConnectError]: 'Lowlevel transport connect error',
     [HardwareErrorCode.WebDeviceNotFoundOrNeedsPermission]: 'Web-USB or Web-Bluetooth device not found or needs permission',
     [HardwareErrorCode.WebDevicePromptAccessError]: 'Web-USB or Web-Bluetooth device prompt access error',
@@ -391,6 +397,15 @@ const ONEKEY_WEBUSB_FILTER = [
     { vendorId: 0x1209, productId: 0x4f4b },
     { vendorId: 0x1209, productId: 0x4f4c },
 ];
+const TREZOR_WEBUSB_MANUFACTURER_NAMES = new Set(['trezor', 'trezor company', 'satoshilabs']);
+const isKnownTrezorWebUsbDevice = (descriptor) => {
+    var _a;
+    const isSharedWebUsbId = ONEKEY_WEBUSB_FILTER.some(filter => descriptor.vendorId === filter.vendorId && descriptor.productId === filter.productId);
+    if (!isSharedWebUsbId)
+        return false;
+    const manufacturerName = (_a = descriptor.manufacturerName) === null || _a === void 0 ? void 0 : _a.trim().toLowerCase();
+    return manufacturerName != null && TREZOR_WEBUSB_MANUFACTURER_NAMES.has(manufacturerName);
+};
 const ERROR_CODES_REQUIRE_RELEASE = [
     HardwareErrorCode.DeviceInitializeFailed,
     HardwareErrorCode.DeviceInterruptedFromOutside,
@@ -446,16 +461,78 @@ const isHeaderChunk = (chunk) => {
     }
     return false;
 };
+const isKnownNonOneKeyDeviceName = (normalizedName) => normalizedName.startsWith('trezor') ||
+    normalizedName.startsWith('ledger') ||
+    normalizedName.startsWith('nano ') ||
+    normalizedName.startsWith('stax') ||
+    normalizedName.startsWith('flex');
+const ONEKEY_EXACT_SHORT_NAMES = new Set(['s8']);
+const isOneKeyShortName = (normalizedName) => {
+    if (ONEKEY_EXACT_SHORT_NAMES.has(normalizedName))
+        return true;
+    if (normalizedName.length !== 5)
+        return false;
+    const firstChar = normalizedName[0];
+    return (firstChar === 'k' || firstChar === 't') && /^\d{4}$/.test(normalizedName.slice(1));
+};
 const isOnekeyDevice = (name, id) => {
-    var _a;
-    if ((_a = id === null || id === void 0 ? void 0 : id.startsWith) === null || _a === void 0 ? void 0 : _a.call(id, 'MI')) {
+    var _a, _b;
+    const normalizedName = (_a = name === null || name === void 0 ? void 0 : name.trim().toLowerCase()) !== null && _a !== void 0 ? _a : '';
+    if (isKnownNonOneKeyDeviceName(normalizedName)) {
+        return false;
+    }
+    if ((_b = id === null || id === void 0 ? void 0 : id.startsWith) === null || _b === void 0 ? void 0 : _b.call(id, 'MI')) {
         return true;
     }
-    const re = /(BixinKey\d{10})|(K\d{4})|(T\d{4})|(Touch\s\w{4})|(Pro\s\w{4})|(Pro\s*2)/i;
-    if (name && re.exec(name)) {
+    if (!name) {
+        return false;
+    }
+    if (normalizedName.startsWith('onekey') || normalizedName.startsWith('bixinkey'))
+        return true;
+    if (normalizedName.startsWith('touch ') ||
+        normalizedName.startsWith('pro ') ||
+        normalizedName.startsWith('pro2 ') ||
+        normalizedName.startsWith('neo ')) {
         return true;
     }
-    return false;
+    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 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);
+};
+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 (hasOnekeyCommunicationService(advertisedServiceUuids)) {
+        return true;
+    }
+    if (isPro2FindMyAdvertisementName(name) || isPro2FindMyAdvertisementName(localName)) {
+        return false;
+    }
+    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);
 };
 
 /******************************************************************************
@@ -529,6 +606,7 @@ exports.EDeviceType = void 0;
     EDeviceType["Touch"] = "touch";
     EDeviceType["Pro"] = "pro";
     EDeviceType["Pro2"] = "pro2";
+    EDeviceType["Neo"] = "neo";
 })(exports.EDeviceType || (exports.EDeviceType = {}));
 
 exports.CreateErrorByMessage = CreateErrorByMessage;
@@ -549,10 +627,17 @@ 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.isPro2FindMyAdvertisementName = isPro2FindMyAdvertisementName;
+exports.matchesKnownBleUuid = matchesKnownBleUuid;
+exports.normalizeBleUuid = normalizeBleUuid;
 exports.serializeError = serializeError;
 exports.wait = wait;

package/jest.config.js

@@ -0,0 +1,5 @@
+module.exports = {
+  preset: '../../jest.config.js',
+  testEnvironment: 'node',
+  modulePathIgnorePatterns: ['node_modules', '<rootDir>/dist'],
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-shared",
-  "version": "1.2.0-alpha.7",
+  "version": "1.2.0-alpha.70",
   "description": "Hardware SDK's shared tool library",
   "keywords": [
     "Hardware-SDK",
@@ -22,8 +22,9 @@
   "scripts": {
     "dev": "rimraf dist && rollup -c ../../build/rollup.config.js -w",
     "build": "rimraf dist && rollup -c ../../build/rollup.config.js",
+    "test": "jest",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix"
   },
-  "gitHead": "001372047f518aaeed5fcbe87b990b8b619a9a65"
+  "gitHead": "d86b033cf970f97e060c49fe4cf618f38b9ce666"
 }

package/src/HardwareError.test.ts

@@ -0,0 +1,9 @@
+import { HardwareErrorCode } from './HardwareError';
+
+describe('HardwareErrorCode compatibility', () => {
+  test('preserves published Protocol V2 values while leaving code 829 unused', () => {
+    expect(HardwareErrorCode).not.toHaveProperty('KaspaPrevTxIdMismatch');
+    expect(HardwareErrorCode.DeviceLocked).toBe(830);
+    expect(HardwareErrorCode.WalletSessionInvalid).toBe(831);
+  });
+});

package/src/HardwareError.ts

@@ -484,6 +484,24 @@ export const HardwareErrorCode = {
    */
   PinMismatch: 828,
 
+  /**
+   * Protocol V2 device must be unlocked before the requested operation.
+   * @params: { failureCode?: string; subcode?: number; firmwareMessage?: string }
+   */
+  DeviceLocked: 830,
+
+  /**
+   * The cached wallet session is invalid or has expired.
+   * @params: { failureCode?: string; subcode?: number; firmwareMessage?: string }
+   */
+  WalletSessionInvalid: 831,
+
+  /**
+   * Pro2 NFT storage has reached its item limit.
+   * @params: { count: number; limit: number }
+   */
+  NftStorageLimitReached: 832,
+
   /**
    * Lowlevel transport connect error
    */
@@ -635,6 +653,10 @@ export const HardwareErrorCodeMessage: HardwareErrorCodeMessageMapping = {
   [HardwareErrorCode.DeviceSettingsLanguageNotSupport]: 'Language not supported',
   [HardwareErrorCode.TooManyInputs]: 'Too many inputs',
   [HardwareErrorCode.PinMismatch]: 'PIN mismatch',
+  [HardwareErrorCode.DeviceLocked]: 'Device locked',
+  [HardwareErrorCode.WalletSessionInvalid]: 'Wallet session is invalid or expired',
+  [HardwareErrorCode.NftStorageLimitReached]:
+    'NFT storage limit reached. Remove an NFT from the device and try again.',
 
   /**
    * Lowlevel transport

package/src/constants.test.ts

@@ -0,0 +1,153 @@
+import {
+  createKnownBleUuidAliases,
+  hasOnekeyCommunicationService,
+  isKnownTrezorWebUsbDevice,
+  isOnekeyBluetoothDevice,
+  isOnekeyDevice,
+  matchesKnownBleUuid,
+} from './constants';
+
+describe('hardware device identity filters', () => {
+  it('accepts known OneKey BLE names', () => {
+    expect(isOnekeyDevice('Touch A1B2')).toBe(true);
+    expect(isOnekeyDevice('Pro A1B2')).toBe(true);
+    expect(isOnekeyDevice('Neo A1B2')).toBe(true);
+    expect(isOnekeyDevice('K1234')).toBe(true);
+    expect(isOnekeyDevice('S8')).toBe(true);
+  });
+
+  it('rejects known Trezor and Ledger BLE names from OneKey discovery', () => {
+    expect(isOnekeyDevice('Trezor Safe 7')).toBe(false);
+    expect(isOnekeyDevice('Ledger Nano X')).toBe(false);
+  });
+
+  it('does not identify an FFFD-only advertisement as OneKey', () => {
+    expect(isOnekeyBluetoothDevice({ name: 'Find My', serviceUuids: ['fffd'] })).toBe(false);
+    expect(
+      isOnekeyBluetoothDevice({ serviceUuids: ['0000fffd-0000-1000-8000-00805f9b34fb'] })
+    ).toBe(false);
+  });
+
+  it('identifies Pro2 communication advertisements independently of their display name', () => {
+    expect(
+      isOnekeyBluetoothDevice({
+        name: 'Pro2 A1B2',
+        serviceUuids: ['0001', 'fffd'],
+      })
+    ).toBe(true);
+    expect(
+      isOnekeyBluetoothDevice({
+        localName: 'Pro2 A1B2 - Find My',
+        serviceUuids: ['0001', 'fffd'],
+      })
+    ).toBe(true);
+    expect(
+      isOnekeyBluetoothDevice({
+        name: 'Pro2 5E9D - Finde My',
+        serviceUuids: ['0001', 'fffd'],
+      })
+    ).toBe(true);
+  });
+
+  it('rejects Pro2 Find My entries when the communication service is absent', () => {
+    expect(
+      isOnekeyBluetoothDevice({
+        name: 'Pro2 A1B2 - Find My',
+      })
+    ).toBe(false);
+    expect(
+      isOnekeyBluetoothDevice({
+        localName: 'OneKey Pro 2 A1B2 - Find My',
+        serviceUuids: [],
+      })
+    ).toBe(false);
+    expect(
+      isOnekeyBluetoothDevice({
+        name: 'Pro2 5E9D - Finde My',
+        serviceUuids: ['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({
+        vendorId: 0x1209,
+        productId: 0x53c1,
+        manufacturerName: 'Trezor Company',
+      })
+    ).toBe(true);
+    expect(
+      isKnownTrezorWebUsbDevice({
+        vendorId: 0x1209,
+        productId: 0x53c1,
+        manufacturerName: 'Trezor',
+      })
+    ).toBe(true);
+    expect(
+      isKnownTrezorWebUsbDevice({
+        vendorId: 0x1209,
+        productId: 0x53c1,
+        manufacturerName: 'SatoshiLabs',
+      })
+    ).toBe(true);
+
+    expect(
+      isKnownTrezorWebUsbDevice({
+        vendorId: 0x1209,
+        productId: 0x53c1,
+        manufacturerName: 'OneKey',
+      })
+    ).toBe(false);
+    expect(
+      isKnownTrezorWebUsbDevice({
+        vendorId: 0x1209,
+        productId: 0x53c1,
+      })
+    ).toBe(false);
+    expect(
+      isKnownTrezorWebUsbDevice({
+        vendorId: 0x1209,
+        productId: 0x53c1,
+        productName: 'Trezor Safe 7',
+      })
+    ).toBe(false);
+  });
+});

package/src/constants.ts

@@ -10,13 +10,31 @@ export type HardwareConnectProtocol =
 
 export const ONEKEY_WEBUSB_FILTER = [
   { vendorId: 0x1209, productId: 0x53c0 }, // Classic Boot、Classic1s Boot、Mini Boot
-  { vendorId: 0x1209, productId: 0x53c1 }, // Classic Firmware、Classic1s Firmware、Mini Firmware、Pro Firmware、Touch Firmware、Pro2（旧固件，勿删：存量设备仍以此 PID 枚举）
-  { vendorId: 0x1209, productId: 0x4f4a }, // Pro Boot、Touch Boot、Pro2
-  { vendorId: 0x1209, productId: 0x4f4b }, // Pro Firmware、Touch Firmware（Not implemented Trezor）、Pro2
-  { vendorId: 0x1209, productId: 0x4f4c }, // Pro Board、Pro2（新固件 PID）
+  { 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: 0x4f50 }, // Touch Board
 ];
 
+type WebUsbIdentityDescriptor = {
+  vendorId?: number;
+  productId?: number;
+  manufacturerName?: string | null;
+};
+
+const TREZOR_WEBUSB_MANUFACTURER_NAMES = new Set(['trezor', 'trezor company', 'satoshilabs']);
+
+export const isKnownTrezorWebUsbDevice = (descriptor: WebUsbIdentityDescriptor): boolean => {
+  const isSharedWebUsbId = ONEKEY_WEBUSB_FILTER.some(
+    filter => descriptor.vendorId === filter.vendorId && descriptor.productId === filter.productId
+  );
+  if (!isSharedWebUsbId) return false;
+
+  const manufacturerName = descriptor.manufacturerName?.trim().toLowerCase();
+  return manufacturerName != null && TREZOR_WEBUSB_MANUFACTURER_NAMES.has(manufacturerName);
+};
+
 /**
  * Error codes that require device release after occurrence
  * These errors indicate the device is in an invalid state and needs to be released
@@ -97,16 +115,115 @@ export const isHeaderChunk = (chunk: Buffer | Uint8Array): boolean => {
   return false;
 };
 
+const isKnownNonOneKeyDeviceName = (normalizedName: string): boolean =>
+  normalizedName.startsWith('trezor') ||
+  normalizedName.startsWith('ledger') ||
+  normalizedName.startsWith('nano ') ||
+  normalizedName.startsWith('stax') ||
+  normalizedName.startsWith('flex');
+
+const ONEKEY_EXACT_SHORT_NAMES = new Set(['s8']);
+
+const isOneKeyShortName = (normalizedName: string): boolean => {
+  if (ONEKEY_EXACT_SHORT_NAMES.has(normalizedName)) return true;
+  if (normalizedName.length !== 5) return false;
+  const firstChar = normalizedName[0];
+  return (firstChar === 'k' || firstChar === 't') && /^\d{4}$/.test(normalizedName.slice(1));
+};
+
 export const isOnekeyDevice = (name: string | null, id?: string): boolean => {
+  const normalizedName = name?.trim().toLowerCase() ?? '';
+  if (isKnownNonOneKeyDeviceName(normalizedName)) {
+    return false;
+  }
+
   if (id?.startsWith?.('MI')) {
     return true;
   }
 
-  // 过滤 BixinKeyxxx 和 Kxxxx 和 Txxxx 和 Pro2
-  // i 忽略大小写模式
-  const re = /(BixinKey\d{10})|(K\d{4})|(T\d{4})|(Touch\s\w{4})|(Pro\s\w{4})|(Pro\s*2)/i;
-  if (name && re.exec(name)) {
+  if (!name) {
+    return false;
+  }
+  if (normalizedName.startsWith('onekey') || normalizedName.startsWith('bixinkey')) return true;
+  if (
+    normalizedName.startsWith('touch ') ||
+    normalizedName.startsWith('pro ') ||
+    normalizedName.startsWith('pro2 ') ||
+    normalizedName.startsWith('neo ')
+  ) {
     return true;
   }
-  return false;
+  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');
+
+export const isPro2FindMyAdvertisementName = (value?: string | null) => {
+  const normalizedName = value?.trim().toLowerCase() ?? '';
+  return /\bpro\s*2\b/.test(normalizedName) && /\bfinde?\s+my\b/.test(normalizedName);
+};
+
+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 (hasOnekeyCommunicationService(advertisedServiceUuids)) {
+    return true;
+  }
+
+  // Android can return a connected Find My peripheral without its advertised
+  // services. Do not let the Pro2-looking name fall through to name discovery.
+  if (isPro2FindMyAdvertisementName(name) || isPro2FindMyAdvertisementName(localName)) {
+    return false;
+  }
+
+  if (advertisedServiceUuids.some(uuid => matchesKnownBleUuid(uuid, FIDO_SERVICE_ALIASES))) {
+    return false;
+  }
+
+  return isOnekeyDevice(name ?? null, id) || isOnekeyDevice(localName ?? null, id);
 };

package/src/deviceType.ts

@@ -7,4 +7,5 @@ export enum EDeviceType {
   Touch = 'touch',
   Pro = 'pro',
   Pro2 = 'pro2',
+  Neo = 'neo',
 }