@tinkoff/user-agent 0.4.445 → 0.4.447

package/lib/client-hints.d.ts

@@ -22,7 +22,7 @@ export declare const parseClientHintsHeaders: (headers: Record<string, string |
  * `getHighEntropyValues` async method, but it's not suitable for all cases.
  *
  * @see https://developer.mozilla.org/en-US/docs/Web/API/User-Agent_Client_Hints_API
- * @see https://wicg.github.io/ua-client-hints/#user-agent-model
+ * @see https://wicg.github.io/ua-client-hints/#http-ua-hints
  *
  * @param payload
  *

package/lib/client-hints.es.js

@@ -88,6 +88,17 @@ const getBackwardCompatibleOsName = (payload) => {
     }
     return (_a = BACKWARD_COMPATIBILITY_OS_NAME[payload]) !== null && _a !== void 0 ? _a : payload;
 };
+/**
+ * Method to convert arch + bitness to `ua-parser-js` compatible format.
+ *
+ * @see ICPU
+ */
+const getArchitecture = (arch, bitness) => {
+    if (arch === undefined) {
+        return undefined;
+    }
+    return `${arch}${bitness !== null && bitness !== void 0 ? bitness : ''}`;
+};
 /**
  *
  * @description
@@ -115,7 +126,7 @@ const parseClientHintsHeaders = (headers) => {
             version: parseQuotedString(headers['sec-ch-ua-platform-version']),
         },
         cpu: {
-            architecture: parseQuotedString(headers['sec-ch-ua-arch']),
+            architecture: getArchitecture(parseQuotedString(headers['sec-ch-ua-arch']), parseQuotedString(headers['sec-ch-ua-bitness'])),
         },
         mobileOS,
         device: {
@@ -135,7 +146,7 @@ const parseClientHintsHeaders = (headers) => {
  * `getHighEntropyValues` async method, but it's not suitable for all cases.
  *
  * @see https://developer.mozilla.org/en-US/docs/Web/API/User-Agent_Client_Hints_API
- * @see https://wicg.github.io/ua-client-hints/#user-agent-model
+ * @see https://wicg.github.io/ua-client-hints/#http-ua-hints
  *
  * @param payload
  *
@@ -152,7 +163,7 @@ const parseClientHintsUserAgentData = (payload) => {
             version: payload.platformVersion,
         },
         cpu: {
-            architecture: payload.architecture,
+            architecture: getArchitecture(payload.architecture, payload.bitness),
         },
         mobileOS: getMobileOs(payload.platform),
         device: {

package/lib/client-hints.js

@@ -92,6 +92,17 @@ const getBackwardCompatibleOsName = (payload) => {
     }
     return (_a = BACKWARD_COMPATIBILITY_OS_NAME[payload]) !== null && _a !== void 0 ? _a : payload;
 };
+/**
+ * Method to convert arch + bitness to `ua-parser-js` compatible format.
+ *
+ * @see ICPU
+ */
+const getArchitecture = (arch, bitness) => {
+    if (arch === undefined) {
+        return undefined;
+    }
+    return `${arch}${bitness !== null && bitness !== void 0 ? bitness : ''}`;
+};
 /**
  *
  * @description
@@ -119,7 +130,7 @@ const parseClientHintsHeaders = (headers) => {
             version: parseQuotedString(headers['sec-ch-ua-platform-version']),
         },
         cpu: {
-            architecture: parseQuotedString(headers['sec-ch-ua-arch']),
+            architecture: getArchitecture(parseQuotedString(headers['sec-ch-ua-arch']), parseQuotedString(headers['sec-ch-ua-bitness'])),
         },
         mobileOS,
         device: {
@@ -139,7 +150,7 @@ const parseClientHintsHeaders = (headers) => {
  * `getHighEntropyValues` async method, but it's not suitable for all cases.
  *
  * @see https://developer.mozilla.org/en-US/docs/Web/API/User-Agent_Client_Hints_API
- * @see https://wicg.github.io/ua-client-hints/#user-agent-model
+ * @see https://wicg.github.io/ua-client-hints/#http-ua-hints
  *
  * @param payload
  *
@@ -156,7 +167,7 @@ const parseClientHintsUserAgentData = (payload) => {
             version: payload.platformVersion,
         },
         cpu: {
-            architecture: payload.architecture,
+            architecture: getArchitecture(payload.architecture, payload.bitness),
         },
         mobileOS: utils.getMobileOs(payload.platform),
         device: {

package/lib/types.d.ts

@@ -15,6 +15,10 @@ export interface Engine {
     version: string | undefined;
 }
 export interface Device {
+    /**
+     * Device type may be undefined in various cases.
+     * @see https://github.com/faisalman/ua-parser-js/issues/182
+     */
     type: string | undefined;
     model: string | undefined;
     /**
@@ -27,9 +31,6 @@ export interface OS {
     version: string | undefined;
 }
 export interface Cpu {
-    /**
-     * @deprecated This is not provided by default with client-hints
-     */
     architecture: string | undefined;
 }
 export interface UserAgent {
@@ -37,9 +38,6 @@ export interface UserAgent {
     engine: Engine;
     device: Device;
     os: OS;
-    /**
-     * @deprecated This is not provided by default with client-hints
-     */
     cpu: Cpu;
     mobileOS?: string;
     sameSiteNoneCompatible: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinkoff/user-agent",
-  "version": "0.4.445",
+  "version": "0.4.447",
   "description": "",
   "main": "lib/index.js",
   "module": "lib/index.es.js",
@@ -29,7 +29,7 @@
     "user-agent-data-types": "^0.3.1"
   },
   "peerDependencies": {
-    "@tramvai/cli": "2.154.0",
+    "@tramvai/cli": "2.155.0",
     "@types/ua-parser-js": "^0.7.33"
   },
   "license": "Apache-2.0"