ua-parser-js 2.0.0-beta.2 → 2.0.0-rc.1

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

@@ -3,7 +3,7 @@
 // Source: /src/extensions/ua-parser-extensions.js
 
 ///////////////////////////////////////////////
-/*  Extensions for UAParser.js v2.0.0-beta.2
+/*  Extensions for UAParser.js v2.0.0-rc.1
     https://github.com/faisalman/ua-parser-js
     Author: Faisal Salman <f@faisalman.com>
     AGPLv3 License */
@@ -18,33 +18,80 @@ const VENDOR    = 'vendor';
 const VERSION   = 'version';
 const MOBILE    = 'mobile';
 const TABLET    = 'tablet';
+const CRAWLER   = 'crawler';
+const CLI       = 'cli';
+const EMAIL     = 'email';
+const FETCHER   = 'fetcher';
+const INAPP     = 'inapp';
+const MEDIAPLAYER = 'mediaplayer';
+const MODULE    = 'module';
+
+//////////////////////
+// COMMAND LINE APPS
+/////////////////////
 
-const Apps = Object.freeze({
+const CLIs = Object.freeze({
     browser : [
-        [/chatlyio\/([\d\.]+)/i], [VERSION, 'Slack', [TYPE, 'app']]
+        // wget / curl / lynx
+        [/(wget|curl|lynx)[\/ ]([\w\.]+)/i], [NAME, VERSION, [TYPE, CLI]]
     ]
 });
 
-const Bots = Object.freeze({
-    browser : [
-        // Googlebot / BingBot / MSNBot / FacebookBot
-        [/((?:google|bing|msn|facebook)bot(?:[\-imagevdo]{0,6})|bingpreview)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'bot']],
-
-        // GPTBot - https://platform.openai.com/docs/gptbot
-        [/(gptbot)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'bot']],
+////////////////////////
+// CRAWLERS / SPIDERS
+///////////////////////
 
-        // Slackbot - https://api.slack.com/robots
-        [/(slack(?:bot)?(?:-imgproxy|-linkexpanding)?) ([\w\.]+)/i], [NAME, VERSION, [TYPE, 'bot']]
-    ]
-});
-
-const CLIs = Object.freeze({
+const Crawlers = Object.freeze({
     browser : [
-                                                                            // wget / curl / lynx
-        [/(wget|curl|lynx)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'cli']]
+        [
+            // AhrefsBot - https://ahrefs.com/robot
+            // Amazonbot - https://developer.amazon.com/amazonbot
+            // Applebot - http://apple.com/go/applebot
+            // Bingbot - http://www.bing.com/bingbot.htm
+            // Dotbot - https://moz.com/help/moz-procedures/crawlers/dotbot
+            // DuckDuckBot - http://duckduckgo.com/duckduckbot.html
+            // FacebookBot - https://developers.facebook.com/docs/sharing/bot/
+            // GPTBot - https://platform.openai.com/docs/gptbot
+            // MJ12bot - https://mj12bot.com/
+            // OpenAI Search - https://platform.openai.com/docs/bots
+            // SemrushBot - http://www.semrush.com/bot.html
+            /((?:ahrefs|amazon|apple|bing|dot|duckduck|facebook|gpt|mj12|oai-search|semrush)bot)\/([\w\.]+)/i,
+
+            // Baiduspider https://help.baidu.com/question?prod_id=99&class=0&id=3001
+            /(baiduspider)[-imagevdonsfcpr]{0,6}\/([\w\.]+)/i,
+
+            // ClaudeBot
+            /(claude(?:bot|-web))\/([\w\.]+)/i, 
+
+            // Coc Coc Bot - https://help.coccoc.com/en/search-engine
+            /(coccocbot-(?:image|web))\/([\w\.]+)/i, 
+
+            // Googlebot - http://www.google.com/bot.html
+            /(google(?:bot|other)(?:-image|-video|-news|-extended)?|(?:storebot-)?google(?:-inspectiontool)?)\/?([\w\.]*)/i, 
+
+            // Sogou Spider
+            /(sogou (?:pic|head|web|orion|news) spider)\/([\w\.]+)/i, 
+
+            // Yahoo! Japan - https://support.yahoo-net.jp/PccSearch/s/article/H000007955
+            /(y!?j-(?:asr|br[uw]|dscv|mmp|vsidx|wsc))\/([\w\.]+)/i, 
+
+            // Yandex Bots - https://yandex.com/bots
+            /(yandex(?:(?:mobile)?(?:accessibility|additional|renderresources|screenshot|sprav)?bot|image(?:s|resizer)|video(?:parser)?|blogs|adnet|favicons|fordomain|market|media|metrika|news|ontodb(?:api)?|pagechecker|partner|rca|tracker|turbo|vertis|webmaster|antivirus))\/([\w\.]+)/i 
+        ],
+
+        [NAME, VERSION, [TYPE, CRAWLER]],
+
+        // Bytespider
+        // Yahoo! Slurp - http://help.yahoo.com/help/us/ysearch/slurp
+        [/((?:bytespider|(?=yahoo! )slurp))/i], 
+        [NAME, [TYPE, CRAWLER]]
     ]
 });
 
+//////////////////
+// EXTRA DEVICES
+/////////////////
+
 const ExtraDevices = Object.freeze({
     device : [[    
         /(nook)[\w ]+build\/(\w+)/i,                                        // Nook
@@ -121,25 +168,80 @@ const ExtraDevices = Object.freeze({
     ]
 });
 
+///////////////
+// EMAIL APPS
+//////////////
+
 const Emails = Object.freeze({
     browser : [
-                                                                            // Microsoft Outlook / Thunderbird
-        [/(microsoft outlook|thunderbird)[\s\/]([\w\.]+)/i], [NAME, VERSION, [TYPE, 'email']]
+        // Microsoft Outlook / Thunderbird
+        [/(microsoft outlook|thunderbird)[\s\/]([\w\.]+)/i], [NAME, VERSION, [TYPE, EMAIL]]
+    ]
+});
+
+///////////////////////
+// ON-DEMAND SCRAPERS
+//////////////////////
+
+const Fetchers = Object.freeze({
+    browser : [
+        [
+            // AhrefsSiteAudit - https://ahrefs.com/robot/site-audit
+            // ChatGPT-User - https://platform.openai.com/docs/plugins/bot
+            // BingPreview / Mastodon / Pinterestbot / Redditbot / Rogerbot / Telegrambot / Twitterbot / UptimeRobot
+            /(ahrefssiteaudit|bingpreview|chatgpt-user|mastodon|(?:discord|linkedin|pinterest|reddit|roger|telegram|twitter|uptimero)bot)\/([\w\.]+)/i,
+
+            // Slackbot - https://api.slack.com/robots
+            /(slack(?:bot)?(?:-imgproxy|-linkexpanding)?) ([\w\.]+)/i,
+            
+            // WhatsApp
+            /(whatsapp)\/([\w\.]+)[\/ ][ianw]/i,
+
+            // Yahoo! Japan
+            /(y!?j-dlc)\/([\w\.]+)/i,
+
+            // Yandex Bots - https://yandex.com/bots
+            /(yandex(?:calendar|direct(?:dyn)?|searchshop)|yadirectfetcher)\/([\w\.]+)/i,
+            /(yandex(?:sitelinks|userproxy))/i
+        ], 
+        [NAME, VERSION, [TYPE, FETCHER]],
+
+        // Google Bots / Snapchat
+        [/(feedfetcher-google|google-read-aloud|(?=bot; )snapchat)/i], 
+        [NAME, [TYPE, FETCHER]],
     ]
 });
 
+////////////////////
+// IN-APP BROWSERS
+///////////////////
+
+const InApps = Object.freeze({
+    browser : [
+        // Slack
+        [/chatlyio\/([\d\.]+)/i], [VERSION, 'Slack', [TYPE, INAPP]],
+
+        // Yahoo! Japan
+        [/jp\.co\.yahoo\.android\.yjtop\/([\d\.]+)/i], [VERSION, 'Yahoo! Japan', [TYPE, INAPP]]
+    ]
+});
+
+//////////////////////
+// MEDIA PLAYER APPS
+/////////////////////
+
 const MediaPlayers = Object.freeze({
     browser : [[
 
         /(apple(?:coremedia|))\/([\w\._]+)/i,                               // Generic Apple CoreMedia
         /(coremedia) v([\w\._]+)/i
-        ], [NAME, VERSION], [
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
 
         /(aqualung|lyssna|bsplayer)\/([\w\.-]+)/i                           // Aqualung/Lyssna/BSPlayer
-        ], [NAME, VERSION], [
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
 
         /(ares|ossproxy)\s([\w\.-]+)/i                                      // Ares/OSSProxy
-        ], [NAME, VERSION], [
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
 
         /(audacious|audimusicstream|amarok|bass|core|dalvik|gnomemplayer|music on console|nsplayer|psp-internetradioplayer|videos)\/([\w\.-]+)/i,
                                                                             // Audacious/AudiMusicStream/Amarok/BASS/OpenCORE/Dalvik/GnomeMplayer/MoC
@@ -147,106 +249,125 @@ const MediaPlayers = Object.freeze({
         /(clementine|music player daemon)\s([\w\.-]+)/i,                    // Clementine/MPD
         /(lg player|nexplayer)\s([\d\.]+)/i,
         /player\/(nexplayer|lg player)\s([\w\.-]+)/i                        // NexPlayer/LG Player
-        ], [NAME, VERSION], [
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
         /(nexplayer)\s([\w\.-]+)/i                                          // Nexplayer
-        ], [NAME, VERSION], [
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
 
         /(flrp)\/([\w\.-]+)/i                                               // Flip Player
-        ], [[NAME, 'Flip Player'], VERSION], [
+        ], [[NAME, 'Flip Player'], VERSION, [TYPE, MEDIAPLAYER]], [
 
         /(fstream|nativehost|queryseekspider|ia-archiver|facebookexternalhit)/i
                                                                             // FStream/NativeHost/QuerySeekSpider/IA Archiver/facebookexternalhit
-        ], [NAME], [
+        ], [NAME, [TYPE, MEDIAPLAYER]], [
 
         /(gstreamer) souphttpsrc.+libsoup\/([\w\.-]+)/i
                                                                             // Gstreamer
-        ], [NAME, VERSION], [
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
 
         /(htc streaming player)\s[\w_]+\s\/\s([\d\.]+)/i,                   // HTC Streaming Player
         /(java|python-urllib|python-requests|wget|libcurl)\/([\w\.-_]+)/i,
                                                                             // Java/urllib/requests/wget/cURL
         /(lavf)([\d\.]+)/i                                                  // Lavf (FFMPEG)
-        ], [NAME, VERSION], [
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
 
         /(htc_one_s)\/([\d\.]+)/i,                                          // HTC One S
-        ], [[NAME, /_/g, ' '], VERSION], [
+        ], [[NAME, /_/g, ' '], VERSION, [TYPE, MEDIAPLAYER]], [
 
         /(mplayer)(?:\s|\/)(?:(?:sherpya-){0,1}svn)(?:-|\s)(r\d+(?:-\d+[\w\.-]+))/i,
                                                                             // MPlayer SVN
-        ], [NAME, VERSION], [
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
 
         /(mplayer)(?:\s|\/)([\w\.-]+)/i,                                    // MPlayer
         /(mplayer) unknown-([\w\.\-]+)/i                                    // MPlayer UNKNOWN
-        ], [NAME, VERSION], [
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
 
         /(mplayer)/i,                                                       // MPlayer (no other info)
         /(yourmuze)/i,                                                      // YourMuze
         /(media player classic|nero showtime)/i                             // Media Player Classic/Nero ShowTime
-        ], [NAME], [
+        ], [NAME, [TYPE, MEDIAPLAYER]], [
 
         /(nero (?:home|scout))\/([\w\.-]+)/i                                // Nero Home/Nero Scout
-        ], [NAME, VERSION], [
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
 
         /(nokia\d+)\/([\w\.-]+)/i                                           // Nokia
-        ], [NAME, VERSION], [
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
 
         /\s(songbird)\/([\w\.-]+)/i                                         // Songbird/Philips-Songbird
-        ], [NAME, VERSION], [
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
 
         /(winamp)3 version ([\w\.-]+)/i,                                    // Winamp
         /(winamp)\s([\w\.-]+)/i,
         /(winamp)mpeg\/([\w\.-]+)/i
-        ], [NAME, VERSION], [
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
 
         /(ocms-bot|tapinradio|tunein radio|unknown|winamp|inlight radio)/i  // OCMS-bot/tap in radio/tunein/unknown/winamp (no other info)
                                                                             // inlight radio
-        ], [NAME], [
+        ], [NAME, [TYPE, MEDIAPLAYER]], [
 
         /(quicktime|rma|radioapp|radioclientapplication|soundtap|totem|stagefright|streamium)\/([\w\.-]+)/i
                                                                             // QuickTime/RealMedia/RadioApp/RadioClientApplication/
                                                                             // SoundTap/Totem/Stagefright/Streamium
-        ], [NAME, VERSION], [
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
 
         /(smp)([\d\.]+)/i                                                   // SMP
-        ], [NAME, VERSION], [
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
 
         /(vlc) media player - version ([\w\.]+)/i,                          // VLC Videolan
         /(vlc)\/([\w\.-]+)/i,
         /(xbmc|gvfs|xine|xmms|irapp)\/([\w\.-]+)/i,                         // XBMC/gvfs/Xine/XMMS/irapp
         /(foobar2000)\/([\d\.]+)/i,                                         // Foobar2000
         /(itunes)\/([\d\.]+)/i                                              // iTunes
-        ], [NAME, VERSION], [
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
 
         /(wmplayer)\/([\w\.-]+)/i,                                          // Windows Media Player
         /(windows-media-player)\/([\w\.-]+)/i
-        ], [[NAME, /-/g, ' '], VERSION], [
+        ], [[NAME, /-/g, ' '], VERSION, [TYPE, MEDIAPLAYER]], [
 
         /windows\/([\w\.-]+) upnp\/[\d\.]+ dlnadoc\/[\d\.]+ (home media server)/i,
                                                                             // Windows Media Server
-        ], [VERSION, [NAME, 'Windows']], [
+        ], [VERSION, [NAME, 'Windows'], [TYPE, MEDIAPLAYER]], [
 
         /(com\.riseupradioalarm)\/([\d\.]*)/i                               // RiseUP Radio Alarm
-        ], [NAME, VERSION], [
+        ], [NAME, VERSION, [TYPE, MEDIAPLAYER]], [
 
         /(rad.io)\s([\d\.]+)/i,                                             // Rad.io
         /(radio.(?:de|at|fr))\s([\d\.]+)/i
-        ], [[NAME, 'rad.io'], VERSION]
+        ], [[NAME, 'rad.io'], VERSION, [TYPE, MEDIAPLAYER]]
     ]
 });
 
+////////////////////////
+// MODULES / LIBRARIES
+///////////////////////
+
 const Modules = Object.freeze({
     browser : [
-                                                                            // Axios/jsdom/Scrapy
-        [/\b(axios|jsdom|scrapy)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'module']]
+        // Axios/jsdom/Scrapy
+        [/\b(axios|jsdom|scrapy)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, MODULE]]
+    ]
+});
+
+//////////
+// BOTS
+/////////
+
+const Bots = Object.freeze({
+    browser : [
+        ...CLIs.browser,
+        ...Crawlers.browser,
+        ...Fetchers.browser,
+        ...Modules.browser
     ]
 });
 
 export { 
-    Apps,
     Bots,
     CLIs,
+    Crawlers,
     ExtraDevices,
     Emails,
+    Fetchers,
+    InApps,
     MediaPlayers,
     Modules
 };

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

@@ -1,15 +1,23 @@
-// Type definitions for Helpers submodule of UAParser.js v2.0.0-beta.2
+// Type definitions for Helpers submodule of UAParser.js v2.0.0-beta.3
 // Project: https://github.com/faisalman/ua-parser-js
 // Definitions by: Faisal Salman <https://github.com/faisalman>
 
 import { IResult } from "../main/ua-parser";
 
+declare function getDeviceVendor(model: string): string | undefined;
 declare function isAppleSilicon(res: IResult): boolean;
-declare function isChromiumBased(res: IResult): boolean;
+declare function isChromeFamily(res: IResult): boolean;
+declare function isElectron(): boolean;
+declare function isFromEU(): boolean;
 declare function isFrozenUA(ua: string): boolean;
+declare function isStandalonePWA(): boolean;
 
 export {
+    getDeviceVendor,
     isAppleSilicon,
-    isChromiumBased,
-    isFrozenUA
+    isChromeFamily,
+    isElectron,
+    isFromEU,
+    isFrozenUA,
+    isStandalonePWA
 }

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

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////
-/*  Helpers for UAParser.js v2.0.0-beta.2
+/*  Helpers for UAParser.js v2.0.0-rc.1
     https://github.com/faisalman/ua-parser-js
     Author: Faisal Salman <f@faisalman.com>
     AGPLv3 License */
@@ -8,15 +8,54 @@
 /*jshint esversion: 6 */ 
 
 const { CPU, OS, Engine } = require('../enums/ua-parser-enums');
+const { UAParser } = require('../main/ua-parser');
+const { isFromEU } = require('detect-europe-js');
 
-const isAppleSilicon = (res) => res.os.is(OS.MACOS) && res.cpu.is(CPU.ARM);
+const getDeviceVendor = (model) => UAParser(`Mozilla/5.0 (Linux; Android 10; ${model}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.0.0 Safari/537.36`).device.vendor;
 
-const isChromiumBased = (res) => res.engine.is(Engine.BLINK);
+const isAppleSilicon = (res) => {
+    if (res.os.is(OS.MACOS)) {
+        if (res.cpu.is(CPU.ARM)) {
+            return true;
+        }
+        try {
+            const canvas = document.createElement('canvas');
+            const webgl = canvas.getContext('webgl2') || canvas.getContext('webgl') || canvas.getContext('experimental-webgl');
+            const debug = webgl.getExtension('WEBGL_debug_renderer_info');
+            const renderer = webgl.getParameter(debug.UNMASKED_RENDERER_WEBGL);
+            if (renderer.match(/apple m\d/i)) {
+                return true;
+            }
+        } catch {
+            return false;
+        }
+    }
+    return false;
+}
+
+const isChromeFamily = (res) => res.engine.is(Engine.BLINK);
+
+const isElectron = () => !!(process?.versions?.hasOwnProperty('electron') ||    // node.js
+                            / electron\//i.test(navigator?.userAgent));         // browser
 
 const isFrozenUA = (ua) => /^Mozilla\/5\.0 \((Windows NT 10\.0; Win64; x64|Macintosh; Intel Mac OS X 10_15_7|X11; Linux x86_64|X11; CrOS x86_64 14541\.0\.0|Fuchsia|Linux; Android 10; K)\) AppleWebKit\/537\.36 \(KHTML, like Gecko\) Chrome\/\d+\.0\.0\.0 (Mobile )?Safari\/537\.36/.test(ua);
 
+const isStandalonePWA = () => window && (window.matchMedia('(display-mode: standalone)').matches || 
+                                // iOS
+                                navigator.standalone ||
+                                // Android
+                                document.referrer.startsWith('android-app://') ||
+                                // Windows
+                                window.Windows ||
+                                /trident.+(msapphost|webview)\//i.test(navigator.userAgent) ||
+                                document.referrer.startsWith('app-info://platform/microsoft-store'));
+
 module.exports = { 
+    getDeviceVendor,
     isAppleSilicon,
-    isChromiumBased,
-    isFrozenUA
+    isChromeFamily,
+    isElectron,
+    isFromEU,
+    isFrozenUA,
+    isStandalonePWA
 }

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

@@ -3,7 +3,7 @@
 // Source: /src/helpers/ua-parser-helpers.js
 
 ///////////////////////////////////////////////
-/*  Helpers for UAParser.js v2.0.0-beta.2
+/*  Helpers for UAParser.js v2.0.0-rc.1
     https://github.com/faisalman/ua-parser-js
     Author: Faisal Salman <f@faisalman.com>
     AGPLv3 License */
@@ -11,16 +11,55 @@
 
 /*jshint esversion: 6 */ 
 
-import { CPU, OS, Engine } from '../enums/ua-parser-enums';
+import { CPU, OS, Engine } from './enums/ua-parser-enums.mjs';
+import { UAParser } from './main/ua-parser.mjs';
+import { isFromEU } from 'detect-europe-js';
 
-const isAppleSilicon = (res) => res.os.is(OS.MACOS) && res.cpu.is(CPU.ARM);
+const getDeviceVendor = (model) => UAParser(`Mozilla/5.0 (Linux; Android 10; ${model}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.0.0 Safari/537.36`).device.vendor;
 
-const isChromiumBased = (res) => res.engine.is(Engine.BLINK);
+const isAppleSilicon = (res) => {
+    if (res.os.is(OS.MACOS)) {
+        if (res.cpu.is(CPU.ARM)) {
+            return true;
+        }
+        try {
+            const canvas = document.createElement('canvas');
+            const webgl = canvas.getContext('webgl2') || canvas.getContext('webgl') || canvas.getContext('experimental-webgl');
+            const debug = webgl.getExtension('WEBGL_debug_renderer_info');
+            const renderer = webgl.getParameter(debug.UNMASKED_RENDERER_WEBGL);
+            if (renderer.match(/apple m\d/i)) {
+                return true;
+            }
+        } catch {
+            return false;
+        }
+    }
+    return false;
+}
+
+const isChromeFamily = (res) => res.engine.is(Engine.BLINK);
+
+const isElectron = () => !!(process?.versions?.hasOwnProperty('electron') ||    // node.js
+                            / electron\//i.test(navigator?.userAgent));         // browser
 
 const isFrozenUA = (ua) => /^Mozilla\/5\.0 \((Windows NT 10\.0; Win64; x64|Macintosh; Intel Mac OS X 10_15_7|X11; Linux x86_64|X11; CrOS x86_64 14541\.0\.0|Fuchsia|Linux; Android 10; K)\) AppleWebKit\/537\.36 \(KHTML, like Gecko\) Chrome\/\d+\.0\.0\.0 (Mobile )?Safari\/537\.36/.test(ua);
 
+const isStandalonePWA = () => window && (window.matchMedia('(display-mode: standalone)').matches || 
+                                // iOS
+                                navigator.standalone ||
+                                // Android
+                                document.referrer.startsWith('android-app://') ||
+                                // Windows
+                                window.Windows ||
+                                /trident.+(msapphost|webview)\//i.test(navigator.userAgent) ||
+                                document.referrer.startsWith('app-info://platform/microsoft-store'));
+
 export { 
+    getDeviceVendor,
     isAppleSilicon,
-    isChromiumBased,
-    isFrozenUA
+    isChromeFamily,
+    isElectron,
+    isFromEU,
+    isFrozenUA,
+    isStandalonePWA
 }

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

@@ -1,4 +1,4 @@
-// Type definitions for UAParser.js v2.0.0-beta.2
+// Type definitions for UAParser.js v2.0.0-beta.3
 // Project: https://github.com/faisalman/ua-parser-js
 // Definitions by: Faisal Salman <https://github.com/faisalman>
 
@@ -8,13 +8,14 @@ declare namespace UAParser {
         is(val: string): boolean;
         toString(): string;
         withClientHints(): PromiseLike<T> | T;
-        withFeatureCheck(): T;
+        withFeatureCheck(): PromiseLike<T> | T;
     }
 
     interface IBrowser extends IData<IBrowser> {
         name?: string;
         version?: string;
         major?: string;
+        type?: 'crawler' | 'cli' | 'email' | 'fetcher' | 'inapp' | 'mediaplayer' | 'module';
     }
 
     interface ICPU extends IData<ICPU> {
@@ -22,7 +23,7 @@ declare namespace UAParser {
     }
 
     interface IDevice extends IData<IDevice> {
-        type?: 'mobile' | 'tablet' | 'console' | 'smarttv' | 'wearable';
+        type?: 'mobile' | 'tablet' | 'console' | 'smarttv' | 'wearable' | 'xr' | 'embedded';
         vendor?: string;
         model?: string;
     }
@@ -48,7 +49,7 @@ declare namespace UAParser {
 
     type RegexMap = ((RegExp | string | (string | RegExp | Function)[])[])[];
     type UAParserProps = 'browser' | 'cpu' | 'device' | 'engine' | 'os';
-    type UAParserExt = Partial<Record<UAParserProps, RegexMap>>;
+    type UAParserExt = Partial<Record<UAParserProps, RegexMap>> | Partial<Record<UAParserProps, RegexMap>>[];
 
     export function UAParser(uastring?: string, extensions?: UAParserExt, headers?: Record<string, string>): IResult;
     export function UAParser(uastring?: string, headers?: Record<string, string>): IResult;
@@ -61,6 +62,7 @@ declare namespace UAParser {
             NAME: 'name'; 
             VERSION: 'version'; 
             MAJOR: 'major';
+            TYPE: 'type';
         };
         static readonly CPU: { 
             ARCHITECTURE: 'architecture'; 
@@ -74,6 +76,7 @@ declare namespace UAParser {
             SMARTTV: 'smarttv';
             TABLET: 'tablet';
             WEARABLE: 'wearable';
+            XR: 'xr';
             EMBEDDED: 'embedded';
         };
         static readonly ENGINE: {