@onekeyfe/hd-shared 1.1.31 → 1.1.32-alpha.4

package/dist/constants.d.ts

@@ -3,12 +3,6 @@ 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 {
@@ -40,5 +34,4 @@ 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;
-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,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,OAgBjE,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";AAEA,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"}

package/dist/index.d.ts

@@ -2,12 +2,6 @@ declare const ONEKEY_WEBUSB_FILTER: {
     vendorId: number;
     productId: number;
 }[];
-type WebUsbIdentityDescriptor = {
-    vendorId?: number;
-    productId?: number;
-    manufacturerName?: string | null;
-};
-declare const isKnownTrezorWebUsbDevice: (descriptor: WebUsbIdentityDescriptor) => boolean;
 declare const ERROR_CODES_REQUIRE_RELEASE: readonly [106, 107, 109, 112, 805, 801, 802, 812];
 declare const ERROR_CODES_REQUIRE_DISCONNECT: readonly [106, 805];
 declare enum EOneKeyBleMessageKeys {
@@ -245,4 +239,4 @@ declare enum EDeviceType {
     Pro = "pro"
 }
 
-export { CreateErrorByMessage, CreateHardwareErrorByBridgeError, Deferred, EDeviceType, EFirmwareType, EOneKeyBleMessageKeys, HardwareError$1 as ERRORS, ERROR_CODES_REQUIRE_DISCONNECT, ERROR_CODES_REQUIRE_RELEASE, 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, isKnownTrezorWebUsbDevice, isOnekeyDevice, serializeError, wait };
+export { CreateErrorByMessage, CreateHardwareErrorByBridgeError, Deferred, EDeviceType, EFirmwareType, EOneKeyBleMessageKeys, HardwareError$1 as ERRORS, ERROR_CODES_REQUIRE_DISCONNECT, ERROR_CODES_REQUIRE_RELEASE, 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 };

package/dist/index.js

@@ -386,15 +386,6 @@ const ONEKEY_WEBUSB_FILTER = [
     { vendorId: 0x1209, productId: 0x4f4a },
     { vendorId: 0x1209, productId: 0x4f4b },
 ];
-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,
@@ -450,37 +441,16 @@ 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, _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')) {
+    var _a;
+    if ((_a = id === null || id === void 0 ? void 0 : id.startsWith) === null || _a === void 0 ? void 0 : _a.call(id, 'MI')) {
         return true;
     }
-    if (!name) {
-        return false;
-    }
-    if (normalizedName.startsWith('onekey') || normalizedName.startsWith('bixinkey'))
+    const re = /(BixinKey\d{10})|(K\d{4})|(T\d{4})|(Touch\s\w{4})|(Pro\s\w{4})/i;
+    if (name && re.exec(name)) {
         return true;
-    if (normalizedName.startsWith('touch ') || normalizedName.startsWith('pro '))
-        return true;
-    return isOneKeyShortName(normalizedName);
+    }
+    return false;
 };
 
 /******************************************************************************
@@ -576,7 +546,6 @@ exports.createNeedUpgradeFirmwareHardwareError = createNeedUpgradeFirmwareHardwa
 exports.createNewFirmwareForceUpdateHardwareError = createNewFirmwareForceUpdateHardwareError;
 exports.createNewFirmwareUnReleaseHardwareError = createNewFirmwareUnReleaseHardwareError;
 exports.isHeaderChunk = isHeaderChunk;
-exports.isKnownTrezorWebUsbDevice = isKnownTrezorWebUsbDevice;
 exports.isOnekeyDevice = isOnekeyDevice;
 exports.serializeError = serializeError;
 exports.wait = wait;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-shared",
-  "version": "1.1.31",
+  "version": "1.1.32-alpha.4",
   "description": "Hardware SDK's shared tool library",
   "keywords": [
     "Hardware-SDK",
@@ -25,5 +25,5 @@
     "lint": "eslint .",
     "lint:fix": "eslint . --fix"
   },
-  "gitHead": "4cb6a5f92d34a17b6303e0c73c91d6feaf5dd1cb"
+  "gitHead": "fc3bd904e2d35e9185d34c11460b53d558644009"
 }

package/src/constants.ts

@@ -9,24 +9,6 @@ export const ONEKEY_WEBUSB_FILTER = [
   // { 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
@@ -107,36 +89,16 @@ 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;
   }
 
-  if (!name) {
-    return false;
+  // 过滤 BixinKeyxxx 和 Kxxxx 和 Txxxx
+  // i 忽略大小写模式
+  const re = /(BixinKey\d{10})|(K\d{4})|(T\d{4})|(Touch\s\w{4})|(Pro\s\w{4})/i;
+  if (name && re.exec(name)) {
+    return true;
   }
-  if (normalizedName.startsWith('onekey') || normalizedName.startsWith('bixinkey')) return true;
-  if (normalizedName.startsWith('touch ') || normalizedName.startsWith('pro ')) return true;
-  return isOneKeyShortName(normalizedName);
+  return false;
 };

package/src/constants.test.ts

@@ -1,60 +0,0 @@
-import { isKnownTrezorWebUsbDevice, isOnekeyDevice } 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('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('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);
-  });
-});