@tinkoff/user-agent 0.8.189 → 0.8.208

package/lib/parse-user-agent-header/parseUserAgentHeader.es.js

@@ -5,12 +5,13 @@ import { getMobileOs } from '../utils/getMobileOs.es.js';
 import { toLowerName } from './utils/toLowerName.es.js';
 import { DeviceType } from '../constants.es.js';
 import { mergeExtensions } from './utils/mergeExtensions.es.js';
+import { normalizeOSVersion } from './utils/normalizeOSVersion.es.js';
 
 const parseUserAgentHeader = (userAgent, extensions) => {
     const { ua, ...result } = new UAParser(userAgent, {
         ...mergeExtensions(extensions || []),
     }).getResult();
-    const { browser, os, engine } = result;
+    const { browser, engine, os } = result;
     const browserName = toLowerName(browser);
     const engineName = toLowerName(engine);
     if (browserName === 'opera mobi') {
@@ -18,6 +19,7 @@ const parseUserAgentHeader = (userAgent, extensions) => {
     }
     return {
         ...result,
+        os: normalizeOSVersion({ os, browser }),
         mobileOS: getMobileOs(os.name),
         sameSiteNoneCompatible: isSameSiteNoneCompatible(result),
         browser: {

package/lib/parse-user-agent-header/parseUserAgentHeader.js

@@ -9,12 +9,13 @@ var getMobileOs = require('../utils/getMobileOs.js');
 var toLowerName = require('./utils/toLowerName.js');
 var constants = require('../constants.js');
 var mergeExtensions = require('./utils/mergeExtensions.js');
+var normalizeOSVersion = require('./utils/normalizeOSVersion.js');
 
 const parseUserAgentHeader = (userAgent, extensions) => {
     const { ua, ...result } = new uaParserJs.UAParser(userAgent, {
         ...mergeExtensions.mergeExtensions(extensions || []),
     }).getResult();
-    const { browser, os, engine } = result;
+    const { browser, engine, os } = result;
     const browserName = toLowerName.toLowerName(browser);
     const engineName = toLowerName.toLowerName(engine);
     if (browserName === 'opera mobi') {
@@ -22,6 +23,7 @@ const parseUserAgentHeader = (userAgent, extensions) => {
     }
     return {
         ...result,
+        os: normalizeOSVersion.normalizeOSVersion({ os, browser }),
         mobileOS: getMobileOs.getMobileOs(os.name),
         sameSiteNoneCompatible: isSameSiteNoneCompatible.isSameSiteNoneCompatible(result),
         browser: {

package/lib/parse-user-agent-header/utils/normalizeOSVersion.d.ts

@@ -0,0 +1,21 @@
+/**
+ * https://webkit.org/blog/17333/webkit-features-in-safari-26-0/#update-to-ua-string
+ *
+ * iOS version normalization workaround for Safari ≥ 26.
+ *
+ * Starting from iOS 26, WebKit freezes the OS version in the User-Agent
+ * string at 18.6, making it unreliable for detecting the real iOS version.
+ *
+ * To address this, we derive the actual iOS version from the Safari version
+ * (Version/X.Y in the UA), since Safari’s major version is aligned with the
+ * iOS major version (e.g., Safari 26 → iOS 26).
+ *
+ * This function adjusts the parsed UA result by replacing the incorrect
+ * iOS version with the inferred one when necessary.
+ */
+import type { IBrowser, IOS } from 'ua-parser-js';
+export declare const normalizeOSVersion: ({ os, browser }: {
+    os: IOS;
+    browser: IBrowser;
+}) => IOS;
+//# sourceMappingURL=normalizeOSVersion.d.ts.map

package/lib/parse-user-agent-header/utils/normalizeOSVersion.es.js

@@ -0,0 +1,32 @@
+/**
+ * https://webkit.org/blog/17333/webkit-features-in-safari-26-0/#update-to-ua-string
+ *
+ * iOS version normalization workaround for Safari ≥ 26.
+ *
+ * Starting from iOS 26, WebKit freezes the OS version in the User-Agent
+ * string at 18.6, making it unreliable for detecting the real iOS version.
+ *
+ * To address this, we derive the actual iOS version from the Safari version
+ * (Version/X.Y in the UA), since Safari’s major version is aligned with the
+ * iOS major version (e.g., Safari 26 → iOS 26).
+ *
+ * This function adjusts the parsed UA result by replacing the incorrect
+ * iOS version with the inferred one when necessary.
+ */
+const normalizeOSVersion = ({ os, browser }) => {
+    if (browser.name?.toLowerCase() === 'mobile safari') {
+        const safariVersion = parseFloat(browser.version || '0');
+        if (safariVersion >= 26) {
+            return {
+                name: os.name,
+                version: `${safariVersion}`,
+            };
+        }
+    }
+    return {
+        name: os.name,
+        version: os.version,
+    };
+};
+
+export { normalizeOSVersion };

package/lib/parse-user-agent-header/utils/normalizeOSVersion.js

@@ -0,0 +1,36 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+/**
+ * https://webkit.org/blog/17333/webkit-features-in-safari-26-0/#update-to-ua-string
+ *
+ * iOS version normalization workaround for Safari ≥ 26.
+ *
+ * Starting from iOS 26, WebKit freezes the OS version in the User-Agent
+ * string at 18.6, making it unreliable for detecting the real iOS version.
+ *
+ * To address this, we derive the actual iOS version from the Safari version
+ * (Version/X.Y in the UA), since Safari’s major version is aligned with the
+ * iOS major version (e.g., Safari 26 → iOS 26).
+ *
+ * This function adjusts the parsed UA result by replacing the incorrect
+ * iOS version with the inferred one when necessary.
+ */
+const normalizeOSVersion = ({ os, browser }) => {
+    if (browser.name?.toLowerCase() === 'mobile safari') {
+        const safariVersion = parseFloat(browser.version || '0');
+        if (safariVersion >= 26) {
+            return {
+                name: os.name,
+                version: `${safariVersion}`,
+            };
+        }
+    }
+    return {
+        name: os.name,
+        version: os.version,
+    };
+};
+
+exports.normalizeOSVersion = normalizeOSVersion;

package/package.json

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