@onekeyfe/hd-shared 1.1.29-alpha.2 → 1.1.29-alpha.4

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;AAyBF,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;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"}

package/dist/index.js

@@ -386,7 +386,7 @@ const ONEKEY_WEBUSB_FILTER = [
     { vendorId: 0x1209, productId: 0x4f4a },
     { vendorId: 0x1209, productId: 0x4f4b },
 ];
-const TREZOR_WEBUSB_MANUFACTURER_NAMES = new Set(['trezor', 'trezor company']);
+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);
@@ -450,27 +450,20 @@ const isHeaderChunk = (chunk) => {
     }
     return false;
 };
-const isAllDigits = (value) => {
-    if (!value)
-        return false;
-    for (const char of value) {
-        if (char < '0' || char > '9')
-            return false;
-    }
-    return true;
-};
-const isOneKeyShortName = (name) => {
-    const upperName = name.toUpperCase();
-    if (upperName.length === 5 && (upperName[0] === 'K' || upperName[0] === 'T')) {
-        return isAllDigits(upperName.slice(1));
-    }
-    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 : '';
@@ -487,7 +480,7 @@ const isOnekeyDevice = (name, id) => {
         return true;
     if (normalizedName.startsWith('touch ') || normalizedName.startsWith('pro '))
         return true;
-    return isOneKeyShortName(name.trim());
+    return isOneKeyShortName(normalizedName);
 };
 
 /******************************************************************************

package/package.json

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

package/src/constants.test.ts

@@ -5,6 +5,7 @@ describe('hardware device identity filters', () => {
     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', () => {
@@ -27,6 +28,13 @@ describe('hardware device identity filters', () => {
         manufacturerName: 'Trezor',
       })
     ).toBe(true);
+    expect(
+      isKnownTrezorWebUsbDevice({
+        vendorId: 0x1209,
+        productId: 0x53c1,
+        manufacturerName: 'SatoshiLabs',
+      })
+    ).toBe(true);
 
     expect(
       isKnownTrezorWebUsbDevice({

package/src/constants.ts

@@ -15,7 +15,7 @@ type WebUsbIdentityDescriptor = {
   manufacturerName?: string | null;
 };
 
-const TREZOR_WEBUSB_MANUFACTURER_NAMES = new Set(['trezor', 'trezor company']);
+const TREZOR_WEBUSB_MANUFACTURER_NAMES = new Set(['trezor', 'trezor company', 'satoshilabs']);
 
 export const isKnownTrezorWebUsbDevice = (descriptor: WebUsbIdentityDescriptor): boolean => {
   const isSharedWebUsbId = ONEKEY_WEBUSB_FILTER.some(
@@ -107,22 +107,6 @@ export const isHeaderChunk = (chunk: Buffer | Uint8Array): boolean => {
   return false;
 };
 
-const isAllDigits = (value: string): boolean => {
-  if (!value) return false;
-  for (const char of value) {
-    if (char < '0' || char > '9') return false;
-  }
-  return true;
-};
-
-const isOneKeyShortName = (name: string): boolean => {
-  const upperName = name.toUpperCase();
-  if (upperName.length === 5 && (upperName[0] === 'K' || upperName[0] === 'T')) {
-    return isAllDigits(upperName.slice(1));
-  }
-  return false;
-};
-
 const isKnownNonOneKeyDeviceName = (normalizedName: string): boolean =>
   normalizedName.startsWith('trezor') ||
   normalizedName.startsWith('ledger') ||
@@ -130,6 +114,15 @@ const isKnownNonOneKeyDeviceName = (normalizedName: string): boolean =>
   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)) {
@@ -145,5 +138,5 @@ export const isOnekeyDevice = (name: string | null, id?: string): boolean => {
   }
   if (normalizedName.startsWith('onekey') || normalizedName.startsWith('bixinkey')) return true;
   if (normalizedName.startsWith('touch ') || normalizedName.startsWith('pro ')) return true;
-  return isOneKeyShortName(name.trim());
+  return isOneKeyShortName(normalizedName);
 };