ua-parser-js 2.0.3 → 2.0.6

package/src/helpers/ua-parser-helpers.js

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////
-/*  Helpers for UAParser.js v2.0.3
+/*  Helpers for UAParser.js v2.0.6
     https://github.com/faisalman/ua-parser-js
     Author: Faisal Salman <f@faisalman.com>
     AGPLv3 License */
@@ -8,11 +8,12 @@
 /*jshint esversion: 6 */ 
 
 const { UAParser } = require('../main/ua-parser');
-const { CPU, OS, Engine } = require('../enums/ua-parser-enums');
-const { Bots } = require('../extensions/ua-parser-extensions');
+const { CPUArch, OSName, EngineName, Extension, BrowserType } = require('../enums/ua-parser-enums');
+const { Bots, Crawlers } = require('../extensions/ua-parser-extensions');
 const { isFromEU } = require('detect-europe-js');
 const { isFrozenUA } = require('ua-is-frozen');
 const { isStandalonePWA } = require('is-standalone-pwa');
+const { Crawler } = Extension.BrowserName;
 
 const toResult = (value, head, ext) => typeof value === 'string' ? UAParser(value, head, ext) : value;
 
@@ -20,8 +21,8 @@ const getDeviceVendor = (model) => UAParser(`Mozilla/5.0 (Linux; Android 10; ${m
 
 const isAppleSilicon = (resultOrUA) => {
     const res = toResult(resultOrUA);
-    if (res.os.is(OS.MACOS)) {
-        if (res.cpu.is(CPU.ARM)) {
+    if (res.os.is(OSName.MACOS)) {
+        if (res.cpu.is(CPUArch.ARM)) {
             return true;
         }
         if (typeof resultOrUA !== 'string' && typeof window !== 'undefined') {
@@ -44,85 +45,129 @@ const isAppleSilicon = (resultOrUA) => {
 const isAIBot = (resultOrUA) => [
 
     // AI2
-    'ai2bot',
+    Crawler.AI2_BOT,
 
     // Amazon
-    'amazonbot',
+    Crawler.AMAZON_BOT,
 
     // Anthropic
-    'anthropic-ai',
-    'claude-web',
-    'claudebot',
+    Crawler.ANTHROPIC_AI,
+    Crawler.ANTHROPIC_CLAUDE_BOT,
+    Crawler.ANTHROPIC_CLAUDE_SEARCHBOT,
+    Crawler.ANTHROPIC_CLAUDE_WEB,
 
     // Apple
-    'applebot',
-    'applebot-extended',
+    Crawler.APPLE_BOT,
+    Crawler.APPLE_BOT_EXTENDED,
+
+    // Brave
+    Crawler.BRAVE_BOT,
 
     // ByteDance
-    'bytespider',
+    Crawler.BYTEDANCE_BYTESPIDER,
+    Crawler.BYTEDANCE_TIKTOKSPIDER,
+
+    // Cohere
+    Crawler.COHERE_TRAINING_DATA_CRAWLER,
 
     // Common Crawl
-    'ccbot',
+    Crawler.COMMON_CRAWL_CCBOT,
+    
+    // Coveo
+    Crawler.COVEO_BOT,
 
     // DataForSeo
-    'dataforseobot',
+    Crawler.DATAFORSEO_BOT,
+
+    // DeepSeek
+    Crawler.DEEPSEEK_BOT,
 
     // Diffbot
-    'diffbot',
+    Crawler.DIFFBOT,
 
     // Google
-    'googleother',
-    'googleother-image',
-    'googleother-video',
-    'google-extended',
+    Crawler.GOOGLE_EXTENDED,
+    Crawler.GOOGLE_OTHER,
+    Crawler.GOOGLE_OTHER_IMAGE,
+    Crawler.GOOGLE_OTHER_VIDEO,
+    Crawler.GOOGLE_CLOUDVERTEXBOT,
 
     // Hive AI
-    'imagesiftbot',
+    Crawler.HIVE_IMAGESIFTBOT,
 
     // Huawei
-    'petalbot',
+    Crawler.HUAWEI_PETALBOT,
+    Crawler.HUAWEI_PANGUBOT,
+
+    // Hugging Face
+    Crawler.HUGGINGFACE_BOT,
+
+    // Kangaroo
+    Crawler.KANGAROO_BOT,
+
+    // Mendable.ai
+    Crawler.FIRECRAWL_AGENT,
 
     // Meta
-    'facebookbot',
-    'meta-externalagent',
+    Crawler.META_FACEBOOKBOT,
+    Crawler.META_EXTERNALAGENT,
 
     // OpenAI
-    'gptbot',
-    'oai-searchbot',
+    Crawler.OPENAI_GPTBOT,
+    Crawler.OPENAI_SEARCH_BOT,
 
     // Perplexity
-    'perplexitybot',
+    Crawler.PERPLEXITY_BOT,
+
+    // Replicate
+    Crawler.REPLICATE_BOT,
+
+    // Runpod
+    Crawler.RUNPOD_BOT,
+
+    // SB Intuitions
+    Crawler.SB_INTUITIONS_BOT,
 
     // Semrush
-    'semrushbot-ocob',
+    Crawler.SEMRUSH_BOT_CONTENTSHAKE,
 
     // Timpi
-    'timpibot',
+    Crawler.TIMPI_BOT,
+
+    // Together AI
+    Crawler.TOGETHER_BOT,
 
     // Velen.io
-    'velenpublicwebcrawler',
+    Crawler.HUNTER_VELENPUBLICWEBCRAWLER,
+
+    // Vercel
+    Crawler.VERCEL_V0BOT,
 
     // Webz.io
-    'omgili',
-    'omgilibot',
-    'webzio-extended',
+    Crawler.WEBZIO_OMGILI,
+    Crawler.WEBZIO_OMGILI_BOT,
+    Crawler.WEBZIO_EXTENDED,
 
-    // You.com
-    'youbot',
+    // X
+    Crawler.XAI_BOT,
 
-    // Zyte
-    'scrapy'
+    // You.com
+    Crawler.YOU_BOT,
 
-    ].includes(String(toResult(resultOrUA, Bots).browser.name).toLowerCase());
+    // Zhipu AI
+    Crawler.ZHIPU_CHATGLM_SPIDER
+    ]
+    .map((s) => s.toLowerCase())
+    .includes(String(toResult(resultOrUA, Crawlers).browser.name).toLowerCase());
 
 const isBot = (resultOrUA) => [
-    'cli', 
-    'crawler', 
-    'fetcher', 
-    'library'
+    BrowserType.CLI, 
+    BrowserType.CRAWLER, 
+    BrowserType.FETCHER, 
+    BrowserType.LIBRARY
     ].includes(toResult(resultOrUA, Bots).browser.type);
 
-const isChromeFamily = (resultOrUA) => toResult(resultOrUA).engine.is(Engine.BLINK);
+const isChromeFamily = (resultOrUA) => toResult(resultOrUA).engine.is(EngineName.BLINK);
 
 const isElectron = () => !!(process?.versions?.hasOwnProperty('electron') ||    // node.js
                             / electron\//i.test(navigator?.userAgent));         // browser

package/src/helpers/ua-parser-helpers.mjs

@@ -3,7 +3,7 @@
 // Source: /src/helpers/ua-parser-helpers.js
 
 ///////////////////////////////////////////////
-/*  Helpers for UAParser.js v2.0.3
+/*  Helpers for UAParser.js v2.0.6
     https://github.com/faisalman/ua-parser-js
     Author: Faisal Salman <f@faisalman.com>
     AGPLv3 License */
@@ -12,11 +12,12 @@
 /*jshint esversion: 6 */ 
 
 import { UAParser } from '../main/ua-parser.mjs';
-import { CPU, OS, Engine } from '../enums/ua-parser-enums.mjs';
-import { Bots } from '../extensions/ua-parser-extensions.mjs';
+import { CPUArch, OSName, EngineName, Extension, BrowserType } from '../enums/ua-parser-enums.mjs';
+import { Bots, Crawlers } from '../extensions/ua-parser-extensions.mjs';
 import { isFromEU } from 'detect-europe-js';
 import { isFrozenUA } from 'ua-is-frozen';
 import { isStandalonePWA } from 'is-standalone-pwa';
+const { Crawler } = Extension.BrowserName;
 
 const toResult = (value, head, ext) => typeof value === 'string' ? UAParser(value, head, ext) : value;
 
@@ -24,8 +25,8 @@ const getDeviceVendor = (model) => UAParser(`Mozilla/5.0 (Linux; Android 10; ${m
 
 const isAppleSilicon = (resultOrUA) => {
     const res = toResult(resultOrUA);
-    if (res.os.is(OS.MACOS)) {
-        if (res.cpu.is(CPU.ARM)) {
+    if (res.os.is(OSName.MACOS)) {
+        if (res.cpu.is(CPUArch.ARM)) {
             return true;
         }
         if (typeof resultOrUA !== 'string' && typeof window !== 'undefined') {
@@ -48,85 +49,129 @@ const isAppleSilicon = (resultOrUA) => {
 const isAIBot = (resultOrUA) => [
 
     // AI2
-    'ai2bot',
+    Crawler.AI2_BOT,
 
     // Amazon
-    'amazonbot',
+    Crawler.AMAZON_BOT,
 
     // Anthropic
-    'anthropic-ai',
-    'claude-web',
-    'claudebot',
+    Crawler.ANTHROPIC_AI,
+    Crawler.ANTHROPIC_CLAUDE_BOT,
+    Crawler.ANTHROPIC_CLAUDE_SEARCHBOT,
+    Crawler.ANTHROPIC_CLAUDE_WEB,
 
     // Apple
-    'applebot',
-    'applebot-extended',
+    Crawler.APPLE_BOT,
+    Crawler.APPLE_BOT_EXTENDED,
+
+    // Brave
+    Crawler.BRAVE_BOT,
 
     // ByteDance
-    'bytespider',
+    Crawler.BYTEDANCE_BYTESPIDER,
+    Crawler.BYTEDANCE_TIKTOKSPIDER,
+
+    // Cohere
+    Crawler.COHERE_TRAINING_DATA_CRAWLER,
 
     // Common Crawl
-    'ccbot',
+    Crawler.COMMON_CRAWL_CCBOT,
+    
+    // Coveo
+    Crawler.COVEO_BOT,
 
     // DataForSeo
-    'dataforseobot',
+    Crawler.DATAFORSEO_BOT,
+
+    // DeepSeek
+    Crawler.DEEPSEEK_BOT,
 
     // Diffbot
-    'diffbot',
+    Crawler.DIFFBOT,
 
     // Google
-    'googleother',
-    'googleother-image',
-    'googleother-video',
-    'google-extended',
+    Crawler.GOOGLE_EXTENDED,
+    Crawler.GOOGLE_OTHER,
+    Crawler.GOOGLE_OTHER_IMAGE,
+    Crawler.GOOGLE_OTHER_VIDEO,
+    Crawler.GOOGLE_CLOUDVERTEXBOT,
 
     // Hive AI
-    'imagesiftbot',
+    Crawler.HIVE_IMAGESIFTBOT,
 
     // Huawei
-    'petalbot',
+    Crawler.HUAWEI_PETALBOT,
+    Crawler.HUAWEI_PANGUBOT,
+
+    // Hugging Face
+    Crawler.HUGGINGFACE_BOT,
+
+    // Kangaroo
+    Crawler.KANGAROO_BOT,
+
+    // Mendable.ai
+    Crawler.FIRECRAWL_AGENT,
 
     // Meta
-    'facebookbot',
-    'meta-externalagent',
+    Crawler.META_FACEBOOKBOT,
+    Crawler.META_EXTERNALAGENT,
 
     // OpenAI
-    'gptbot',
-    'oai-searchbot',
+    Crawler.OPENAI_GPTBOT,
+    Crawler.OPENAI_SEARCH_BOT,
 
     // Perplexity
-    'perplexitybot',
+    Crawler.PERPLEXITY_BOT,
+
+    // Replicate
+    Crawler.REPLICATE_BOT,
+
+    // Runpod
+    Crawler.RUNPOD_BOT,
+
+    // SB Intuitions
+    Crawler.SB_INTUITIONS_BOT,
 
     // Semrush
-    'semrushbot-ocob',
+    Crawler.SEMRUSH_BOT_CONTENTSHAKE,
 
     // Timpi
-    'timpibot',
+    Crawler.TIMPI_BOT,
+
+    // Together AI
+    Crawler.TOGETHER_BOT,
 
     // Velen.io
-    'velenpublicwebcrawler',
+    Crawler.HUNTER_VELENPUBLICWEBCRAWLER,
+
+    // Vercel
+    Crawler.VERCEL_V0BOT,
 
     // Webz.io
-    'omgili',
-    'omgilibot',
-    'webzio-extended',
+    Crawler.WEBZIO_OMGILI,
+    Crawler.WEBZIO_OMGILI_BOT,
+    Crawler.WEBZIO_EXTENDED,
 
-    // You.com
-    'youbot',
+    // X
+    Crawler.XAI_BOT,
 
-    // Zyte
-    'scrapy'
+    // You.com
+    Crawler.YOU_BOT,
 
-    ].includes(String(toResult(resultOrUA, Bots).browser.name).toLowerCase());
+    // Zhipu AI
+    Crawler.ZHIPU_CHATGLM_SPIDER
+    ]
+    .map((s) => s.toLowerCase())
+    .includes(String(toResult(resultOrUA, Crawlers).browser.name).toLowerCase());
 
 const isBot = (resultOrUA) => [
-    'cli', 
-    'crawler', 
-    'fetcher', 
-    'library'
+    BrowserType.CLI, 
+    BrowserType.CRAWLER, 
+    BrowserType.FETCHER, 
+    BrowserType.LIBRARY
     ].includes(toResult(resultOrUA, Bots).browser.type);
 
-const isChromeFamily = (resultOrUA) => toResult(resultOrUA).engine.is(Engine.BLINK);
+const isChromeFamily = (resultOrUA) => toResult(resultOrUA).engine.is(EngineName.BLINK);
 
 const isElectron = () => !!(process?.versions?.hasOwnProperty('electron') ||    // node.js
                             / electron\//i.test(navigator?.userAgent));         // browser

package/src/main/ua-parser.d.ts

@@ -1,9 +1,8 @@
-// Type definitions for UAParser.js v2.0.3
+// Type definitions for UAParser.js v2.0.6
 // Project: https://github.com/faisalman/ua-parser-js
 // Definitions by: Faisal Salman <https://github.com/faisalman>
 
-import type { IncomingHttpHeaders } from 'http';
-import type { Headers as FetchAPIHeaders } from 'node-fetch';
+import { BrowserType, CPUArch, DeviceType, EngineName } from "../enums/ua-parser-enums";
 
 declare namespace UAParser {
     
@@ -18,21 +17,21 @@ declare namespace UAParser {
         name?: string;
         version?: string;
         major?: string;
-        type?: 'crawler' | 'cli' | 'email' | 'fetcher' | 'inapp' | 'mediaplayer' | 'library';
+        type?: typeof BrowserType[keyof typeof BrowserType];
     }
 
     interface ICPU extends IData<ICPU> {
-        architecture?: 'ia32' | 'ia64' | 'amd64' | 'arm' | 'arm64' | 'armhf' | 'avr' | 'avr32' | 'irix' | 'irix64' | 'mips' | 'mips64' | '68k' | 'pa-risc' | 'ppc' | 'sparc' | 'sparc64';
+        architecture?: typeof CPUArch[keyof typeof CPUArch];
     }
 
     interface IDevice extends IData<IDevice> {
-        type?: 'mobile' | 'tablet' | 'console' | 'smarttv' | 'wearable' | 'xr' | 'embedded';
+        type?: typeof DeviceType[keyof typeof DeviceType];
         vendor?: string;
         model?: string;
     }
 
     interface IEngine extends IData<IEngine> {
-        name?: 'Amaya' | 'ArkWeb' | 'Blink' | 'EdgeHTML' | 'Flow' | 'Gecko' | 'Goanna' | 'iCab' | 'KHTML' | 'LibWeb' | 'Links' | 'Lynx' | 'NetFront' | 'NetSurf' | 'Presto' | 'Servo' | 'Tasman' | 'Trident' | 'w3m' | 'WebKit';
+        name?: typeof EngineName[keyof typeof EngineName];
         version?: string;
     }
 
@@ -53,7 +52,7 @@ declare namespace UAParser {
     type RegexMap = ((RegExp | string | (string | RegExp | Function)[])[])[];
     type UAParserProps = 'browser' | 'cpu' | 'device' | 'engine' | 'os';
     type UAParserExt = Partial<Record<UAParserProps, RegexMap>> | Partial<Record<UAParserProps, RegexMap>>[];
-    type UAParserHeaders = Record<string, string> | IncomingHttpHeaders | FetchAPIHeaders;
+    export type UAParserHeaders = Record<string, string | string[] | undefined> | Headers;
 
     export function UAParser(uastring?: string, extensions?: UAParserExt, headers?: UAParserHeaders): IResult;
     export function UAParser(uastring?: string, headers?: UAParserHeaders): IResult;