@tinkoff/user-agent 0.4.176 → 0.4.178

package/lib/client-hints.es.js

@@ -0,0 +1,88 @@
+import { getBrowserEngine, getMobileOs } from './utils.es.js';
+
+const KNOWN_VENDORS = new Set(['Opera', 'Google Chrome', 'Microsoft Edge', 'Firefox', 'Safari']);
+const KNOWN_ENGINES = new Set(['Chromium']);
+const parseQuotedString = (str) => {
+    var _a;
+    if (!str) {
+        return str;
+    }
+    try {
+        return (_a = JSON.parse(str)) === null || _a === void 0 ? void 0 : _a.trim();
+    }
+    catch (err) {
+        return str;
+    }
+};
+const parseBrowser = (brandsList) => {
+    const browser = {
+        name: undefined,
+        version: undefined,
+        major: undefined,
+        browserEngine: '',
+    };
+    const engine = {
+        name: undefined,
+        version: undefined,
+    };
+    brandsList.split(',').forEach((entry) => {
+        const [name, version] = entry.split(/;\s*v=/).map(parseQuotedString);
+        if (name && KNOWN_VENDORS.has(name)) {
+            browser.name = name.toLowerCase();
+            browser.version = version;
+            browser.major = version;
+        }
+        if (name && KNOWN_ENGINES.has(name)) {
+            engine.name = name.toLowerCase();
+            engine.version = version;
+        }
+    });
+    if (!browser.name && engine.name) {
+        browser.name = engine.name;
+        browser.version = engine.version;
+    }
+    browser.browserEngine = getBrowserEngine(browser.name, engine.name);
+    return { browser, engine };
+};
+/**
+ *
+ * @description
+ *
+ * Some of the data are available only when additional headers for client-hints were sent from server:
+ * - full browser version (only major version is available by default)
+ * - OS version
+ * - CPU architecture
+ * - device model
+ *
+ * To able to use data you should first provide header `Accept-CH` with the list of headers that client should send.
+ *
+ * @param headers
+ * @returns
+ */
+const parseClientHintsHeaders = (headers) => {
+    const { browser, engine } = parseBrowser(headers['sec-ch-ua-full-version-list'] || headers['sec-ch-ua']);
+    const osName = parseQuotedString(headers['sec-ch-ua-platform']);
+    const mobileOS = getMobileOs(osName);
+    return {
+        browser,
+        engine,
+        os: {
+            name: osName,
+            version: parseQuotedString(headers['sec-ch-ua-platform-version']),
+        },
+        cpu: {
+            architecture: parseQuotedString(headers['sec-ch-ua-arch']),
+        },
+        mobileOS,
+        device: {
+            model: parseQuotedString(headers['sec-ch-ua-model']),
+            type: headers['sec-ch-ua-mobile'] === '?1' ? 'mobile' : 'desktop',
+            vendor: undefined,
+        },
+        // basically all of the browsers with client-hints support
+        // also compatible with SameSite=None
+        sameSiteNoneCompatible: true,
+    };
+};
+
+export { parseClientHintsHeaders };

package/lib/client-hints.js

@@ -0,0 +1,92 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var utils = require('./utils.js');
+
+const KNOWN_VENDORS = new Set(['Opera', 'Google Chrome', 'Microsoft Edge', 'Firefox', 'Safari']);
+const KNOWN_ENGINES = new Set(['Chromium']);
+const parseQuotedString = (str) => {
+    var _a;
+    if (!str) {
+        return str;
+    }
+    try {
+        return (_a = JSON.parse(str)) === null || _a === void 0 ? void 0 : _a.trim();
+    }
+    catch (err) {
+        return str;
+    }
+};
+const parseBrowser = (brandsList) => {
+    const browser = {
+        name: undefined,
+        version: undefined,
+        major: undefined,
+        browserEngine: '',
+    };
+    const engine = {
+        name: undefined,
+        version: undefined,
+    };
+    brandsList.split(',').forEach((entry) => {
+        const [name, version] = entry.split(/;\s*v=/).map(parseQuotedString);
+        if (name && KNOWN_VENDORS.has(name)) {
+            browser.name = name.toLowerCase();
+            browser.version = version;
+            browser.major = version;
+        }
+        if (name && KNOWN_ENGINES.has(name)) {
+            engine.name = name.toLowerCase();
+            engine.version = version;
+        }
+    });
+    if (!browser.name && engine.name) {
+        browser.name = engine.name;
+        browser.version = engine.version;
+    }
+    browser.browserEngine = utils.getBrowserEngine(browser.name, engine.name);
+    return { browser, engine };
+};
+/**
+ *
+ * @description
+ *
+ * Some of the data are available only when additional headers for client-hints were sent from server:
+ * - full browser version (only major version is available by default)
+ * - OS version
+ * - CPU architecture
+ * - device model
+ *
+ * To able to use data you should first provide header `Accept-CH` with the list of headers that client should send.
+ *
+ * @param headers
+ * @returns
+ */
+const parseClientHintsHeaders = (headers) => {
+    const { browser, engine } = parseBrowser(headers['sec-ch-ua-full-version-list'] || headers['sec-ch-ua']);
+    const osName = parseQuotedString(headers['sec-ch-ua-platform']);
+    const mobileOS = utils.getMobileOs(osName);
+    return {
+        browser,
+        engine,
+        os: {
+            name: osName,
+            version: parseQuotedString(headers['sec-ch-ua-platform-version']),
+        },
+        cpu: {
+            architecture: parseQuotedString(headers['sec-ch-ua-arch']),
+        },
+        mobileOS,
+        device: {
+            model: parseQuotedString(headers['sec-ch-ua-model']),
+            type: headers['sec-ch-ua-mobile'] === '?1' ? 'mobile' : 'desktop',
+            vendor: undefined,
+        },
+        // basically all of the browsers with client-hints support
+        // also compatible with SameSite=None
+        sameSiteNoneCompatible: true,
+    };
+};
+
+exports.parseClientHintsHeaders = parseClientHintsHeaders;

package/lib/constants.es.js

@@ -0,0 +1,57 @@
+const BROWSERS_LIST_MAP = {
+    chrome: {
+        type: 'desktop',
+        name: 'chrome',
+    },
+    safari: {
+        type: 'desktop',
+        name: 'safari',
+    },
+    firefox: {
+        type: 'desktop',
+        name: 'firefox',
+    },
+    opera: {
+        type: 'desktop',
+        name: 'opera',
+    },
+    ie: {
+        type: 'desktop',
+        name: 'ie',
+    },
+    edge: {
+        type: 'any',
+        name: 'edge',
+    },
+    and_chr: {
+        type: 'mobile',
+        name: 'chrome',
+    },
+    ios_saf: {
+        type: 'mobile',
+        name: 'mobile safari',
+    },
+    android: {
+        type: 'mobile',
+        name: 'android browser',
+    },
+    op_mob: {
+        type: 'mobile',
+        name: 'opera',
+    },
+    and_uc: {
+        type: 'mobile',
+        name: 'ucbrowser',
+    },
+    and_ff: {
+        type: 'mobile',
+        name: 'firefox',
+    },
+};
+const CHROMIUM_BASED_BROWSERS = [
+    'android browser',
+    'yandex',
+    'vivaldi' /* , 'chrome webview', 'opera', 'samsung' */,
+];
+
+export { BROWSERS_LIST_MAP, CHROMIUM_BASED_BROWSERS };

package/lib/constants.js

@@ -0,0 +1,62 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const BROWSERS_LIST_MAP = {
+    chrome: {
+        type: 'desktop',
+        name: 'chrome',
+    },
+    safari: {
+        type: 'desktop',
+        name: 'safari',
+    },
+    firefox: {
+        type: 'desktop',
+        name: 'firefox',
+    },
+    opera: {
+        type: 'desktop',
+        name: 'opera',
+    },
+    ie: {
+        type: 'desktop',
+        name: 'ie',
+    },
+    edge: {
+        type: 'any',
+        name: 'edge',
+    },
+    and_chr: {
+        type: 'mobile',
+        name: 'chrome',
+    },
+    ios_saf: {
+        type: 'mobile',
+        name: 'mobile safari',
+    },
+    android: {
+        type: 'mobile',
+        name: 'android browser',
+    },
+    op_mob: {
+        type: 'mobile',
+        name: 'opera',
+    },
+    and_uc: {
+        type: 'mobile',
+        name: 'ucbrowser',
+    },
+    and_ff: {
+        type: 'mobile',
+        name: 'firefox',
+    },
+};
+const CHROMIUM_BASED_BROWSERS = [
+    'android browser',
+    'yandex',
+    'vivaldi' /* , 'chrome webview', 'opera', 'samsung' */,
+];
+
+exports.BROWSERS_LIST_MAP = BROWSERS_LIST_MAP;
+exports.CHROMIUM_BASED_BROWSERS = CHROMIUM_BASED_BROWSERS;

package/lib/index.es.js

@@ -1,333 +1,3 @@
-import propOr from '@tinkoff/utils/object/propOr';
-import compose from '@tinkoff/utils/function/compose';
-import toLower from '@tinkoff/utils/string/toLower';
-import { UAParser } from 'ua-parser-js';
-import isString from '@tinkoff/utils/is/string';
-import browserslist from 'browserslist';
-import browserslistTinkoffConfig from '@tinkoff/browserslist-config';
-import browserslistFileConfig from '@tramvai/cli/lib/external/browserslist-normalized-file-config';
-
-const processUserAgentAttributeName = (attributeName = '') => attributeName.toLowerCase();
-const splitUserAgentAttributeVersion = (attributeVersion = '-1.-1.-1') => attributeVersion.split('.').map(Number);
-// https://www.chromium.org/updates/same-site/incompatible-clients
-const isSameSiteNoneCompatible = (userAgent) => {
-    // На случай неполных данных из ua-parser-js
-    try {
-        const browserName = processUserAgentAttributeName(userAgent.browser.name);
-        const [browserMajor, browserMinor, browserBuild] = splitUserAgentAttributeVersion(userAgent.browser.version);
-        const osName = processUserAgentAttributeName(userAgent.os.name);
-        const [osMajor, osMinor] = splitUserAgentAttributeVersion(userAgent.os.version);
-        const engineName = processUserAgentAttributeName(userAgent.engine.name);
-        const [engineMajor] = splitUserAgentAttributeVersion(userAgent.engine.version);
-        if (osName === 'ios') {
-            // На iOS 12 все браузеры не совместимы с samesite=none
-            // При этом полагается, что если на iOS!=12 - любые браузеры совместимы с samesite=none, включая UCBrowser<12.13.2 и 51<=Chrome<=66 (WebKit)
-            return osMajor !== 12;
-        }
-        // Встроенный браузер Mac OS парсится как Webkit
-        if (browserName === 'safari' || browserName === 'webkit') {
-            return !(osName === 'mac os' && osMajor === 10 && osMinor === 14);
-        }
-        if (browserName === 'ucbrowser') {
-            const [major, minor, build] = [12, 13, 2];
-            if (browserMajor !== major) {
-                return browserMajor > major;
-            }
-            if (browserMinor !== minor) {
-                return browserMinor > minor;
-            }
-            return browserBuild >= build;
-        }
-        if (browserName === 'chrome' || browserName === 'chromium') {
-            return browserMajor < 51 || browserMajor > 66;
-        }
-        if (engineName === 'blink') {
-            return engineMajor < 51 || engineMajor > 66;
-        }
-        return true;
-    }
-    catch {
-        return true;
-    }
-};
-
-const getMobileOs = (osName) => {
-    switch (osName) {
-        case 'Windows Phone':
-            return 'winphone';
-        case 'Android':
-            return 'android';
-        case 'iOS':
-            return 'ios';
-        case 'BlackBerry':
-        case 'RIM Tablet OS':
-            return 'blackberry';
-    }
-};
-const getBrowserEngine = (browserName, engineName) => {
-    switch (true) {
-        case browserName === 'firefox':
-            return 'firefox';
-        case browserName === 'safari':
-            return 'safari';
-        case engineName === 'webkit' || engineName === 'blink' || engineName === 'chromium':
-            return 'chrome';
-    }
-    return 'other';
-};
-
-const toLowerName = compose(toLower, propOr('name', ''));
-const uaParserExtensions = [
-    // добавляем отдельные регекспы для ботов гугла и т.п.
-    // это позволит для них получить отдельное имя браузера и обработать специальным образом
-    // https://github.com/faisalman/ua-parser-js/issues/227
-    // google, bing, msn
-    [/((?:\S+)bot(?:-[imagevdo]{5})?)\/([\w.]+)/i],
-    [UAParser.BROWSER.NAME, UAParser.BROWSER.VERSION, ['type', 'bot']],
-    // google adsbot под видом обычного браузера
-    [/[\s;(](adsbot[-\w]*?[\s;)])/i],
-    [UAParser.BROWSER.NAME, [UAParser.BROWSER.VERSION, 'unknown'], ['type', 'bot']],
-    // добавляем регекспы для браузеров которые пытаются казаться другими браузерами
-    // например ua-parser-js Firefox Focus для ios считает как просто Firefox, что ломает проверки на версии
-    // Firefox for iOS
-    [/fxios\/([\w\\.-]+)/i],
-    [[UAParser.BROWSER.NAME, 'Firefox Focus'], UAParser.BROWSER.VERSION],
-];
-const parseUserAgentHeader = (userAgent) => {
-    const uaParser = new UAParser('', { browser: uaParserExtensions });
-    const { ua, ...result } = uaParser.setUA(userAgent).getResult();
-    const { browser, os, engine } = result;
-    const browserName = toLowerName(browser);
-    const engineName = toLowerName(engine);
-    const sameSiteNoneCompatible = isSameSiteNoneCompatible(result);
-    const mobileOS = getMobileOs(os.name);
-    if (browserName === 'opera mobi') {
-        result.device.type = 'mobile';
-    }
-    const browserEngine = getBrowserEngine(browserName, engineName);
-    return {
-        ...result,
-        mobileOS,
-        sameSiteNoneCompatible,
-        browser: {
-            ...browser,
-            browserEngine,
-            name: browserName,
-        },
-    };
-};
-
-const BROWSERS_LIST_MAP = {
-    chrome: {
-        type: 'desktop',
-        name: 'chrome',
-    },
-    safari: {
-        type: 'desktop',
-        name: 'safari',
-    },
-    firefox: {
-        type: 'desktop',
-        name: 'firefox',
-    },
-    opera: {
-        type: 'desktop',
-        name: 'opera',
-    },
-    ie: {
-        type: 'desktop',
-        name: 'ie',
-    },
-    edge: {
-        type: 'any',
-        name: 'edge',
-    },
-    and_chr: {
-        type: 'mobile',
-        name: 'chrome',
-    },
-    ios_saf: {
-        type: 'mobile',
-        name: 'mobile safari',
-    },
-    android: {
-        type: 'mobile',
-        name: 'android browser',
-    },
-    op_mob: {
-        type: 'mobile',
-        name: 'opera',
-    },
-    and_uc: {
-        type: 'mobile',
-        name: 'ucbrowser',
-    },
-    and_ff: {
-        type: 'mobile',
-        name: 'firefox',
-    },
-};
-const CHROMIUM_BASED_BROWSERS = [
-    'android browser',
-    'yandex',
-    'vivaldi' /* , 'chrome webview', 'opera', 'samsung' */,
-];
-
-const deviceTypes = {
-    mobile: 'mobile',
-    tablet: 'mobile',
-    desktop: 'desktop',
-};
-const normalizedBrowserslist = (query) => {
-    const resolved = browserslist(query, {
-        // ставим в true, чтобы browserslist возвращал полный список для мобильных браузеров
-        // т.к. по умолчанию, из-за того что `Can I use` хранит только последнюю версию мобильных браузеров
-        // то и browserslist возвращал только самую последнюю версию для мобилок, а так он будет маппить
-        // соответствие к десктопной версии
-        mobileToDesktop: true,
-    })
-        // так как ie убрали из конфига @tinkoff/browserslist-config, то для того чтобы отсечь ie
-        // добавляем фиктивную версию, чтобы вся функция вернула false для любой версии ie
-        // причем если обычная версия ie была задана в кастомном конфиге или в конфиге переданном как аргумент
-        // эта фиктивная версия ни на что не повлияет и будет использована кастомная конфигурация
-        .concat(['ie 999']);
-    const result = {};
-    for (let i = 0; i < resolved.length; i++) {
-        const [name, version] = resolved[i].split(' ');
-        if (BROWSERS_LIST_MAP[name]) {
-            const { type: mapType, name: mapName } = BROWSERS_LIST_MAP[name];
-            const mapVersion = parseFloat(version);
-            if (result[mapName]) {
-                if (!result[mapName][mapType] || result[mapName][mapType] > mapVersion) {
-                    result[mapName][mapType] = mapVersion;
-                }
-            }
-            else {
-                result[mapName] = {
-                    [mapType]: mapVersion,
-                };
-            }
-        }
-    }
-    return result;
-};
-const satisfies = (userAgent, browserslistConfig, { env = 'defaults' } = {}) => {
-    var _a, _b;
-    const ua = isString(userAgent) ? parseUserAgentHeader(userAgent) : userAgent;
-    const { engine: { name: engineName = '', version: engineVersion }, device: { type = '' } = {}, } = ua;
-    let { browser: { name: browserName = '', version: browserVersion = '' } = {} } = ua;
-    // Chromium based браузеры (yandex, samsung, opera, vivaldi, edge) указывают версию движка как `Chrome/*`.
-    // А версия движка (blink) матчится в версию chromium один к одному
-    // https://github.com/faisalman/ua-parser-js/pull/390
-    // https://developer.mozilla.org/en-US/docs/Web/HTTP/Browser_detection_using_the_user_agent#Rendering_engine
-    if (engineName === 'chromium' ||
-        (engineName.toLowerCase() === 'blink' && CHROMIUM_BASED_BROWSERS.indexOf(browserName) !== -1)) {
-        browserName = 'chrome';
-        browserVersion = engineVersion || '';
-    }
-    // parseFloat - заберет мажорную + минорную версии, остальное отбросит
-    const checkVersion = parseFloat(browserVersion);
-    const deviceType = deviceTypes[type] || type || deviceTypes.desktop; // по умолчанию считаем устройство десктопом
-    if (!browserName) {
-        return null;
-    }
-    const targets = (_a = browserslistConfig !== null && browserslistConfig !== void 0 ? browserslistConfig : browserslistFileConfig[env]) !== null && _a !== void 0 ? _a : browserslistTinkoffConfig[env];
-    const browsers = normalizedBrowserslist(targets);
-    let hasEntry = false;
-    if (browserName in browsers) {
-        const browserInfo = browsers[browserName];
-        const browserInfoVersion = (_b = browserInfo.any) !== null && _b !== void 0 ? _b : browserInfo[deviceType];
-        hasEntry = !!browserInfoVersion;
-        if (checkVersion >= browserInfoVersion) {
-            return true;
-        }
-    }
-    return hasEntry ? false : null; // null означает что не нашли соответствия браузеру в списке browserslist
-};
-
-const KNOWN_VENDORS = new Set(['Opera', 'Google Chrome', 'Microsoft Edge', 'Firefox', 'Safari']);
-const KNOWN_ENGINES = new Set(['Chromium']);
-const parseQuotedString = (str) => {
-    var _a;
-    if (!str) {
-        return str;
-    }
-    try {
-        return (_a = JSON.parse(str)) === null || _a === void 0 ? void 0 : _a.trim();
-    }
-    catch (err) {
-        return str;
-    }
-};
-const parseBrowser = (brandsList) => {
-    const browser = {
-        name: undefined,
-        version: undefined,
-        major: undefined,
-        browserEngine: '',
-    };
-    const engine = {
-        name: undefined,
-        version: undefined,
-    };
-    brandsList.split(',').forEach((entry) => {
-        const [name, version] = entry.split(/;\s*v=/).map(parseQuotedString);
-        if (name && KNOWN_VENDORS.has(name)) {
-            browser.name = name.toLowerCase();
-            browser.version = version;
-            browser.major = version;
-        }
-        if (name && KNOWN_ENGINES.has(name)) {
-            engine.name = name.toLowerCase();
-            engine.version = version;
-        }
-    });
-    if (!browser.name && engine.name) {
-        browser.name = engine.name;
-        browser.version = engine.version;
-    }
-    browser.browserEngine = getBrowserEngine(browser.name, engine.name);
-    return { browser, engine };
-};
-/**
- *
- * @description
- *
- * Some of the data are available only when additional headers for client-hints were sent from server:
- * - full browser version (only major version is available by default)
- * - OS version
- * - CPU architecture
- * - device model
- *
- * To able to use data you should first provide header `Accept-CH` with the list of headers that client should send.
- *
- * @param headers
- * @returns
- */
-const parseClientHintsHeaders = (headers) => {
-    const { browser, engine } = parseBrowser(headers['sec-ch-ua-full-version-list'] || headers['sec-ch-ua']);
-    const osName = parseQuotedString(headers['sec-ch-ua-platform']);
-    const mobileOS = getMobileOs(osName);
-    return {
-        browser,
-        engine,
-        os: {
-            name: osName,
-            version: parseQuotedString(headers['sec-ch-ua-platform-version']),
-        },
-        cpu: {
-            architecture: parseQuotedString(headers['sec-ch-ua-arch']),
-        },
-        mobileOS,
-        device: {
-            model: parseQuotedString(headers['sec-ch-ua-model']),
-            type: headers['sec-ch-ua-mobile'] === '?1' ? 'mobile' : 'desktop',
-            vendor: undefined,
-        },
-        // basically all of the browsers with client-hints support
-        // also compatible with SameSite=None
-        sameSiteNoneCompatible: true,
-    };
-};
-
-export { parseUserAgentHeader as parse, parseClientHintsHeaders as parseClientHints, parseUserAgentHeader, satisfies };
+export { parseUserAgentHeader as parse, parseUserAgentHeader } from './userAgent.es.js';
+export { satisfies } from './satisfies.es.js';
+export { parseClientHintsHeaders as parseClientHints } from './client-hints.es.js';