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

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

@@ -3,7 +3,7 @@
 // Source: /src/enums/ua-parser-enums.js
 
 ///////////////////////////////////////////////
-/*  Enums for UAParser.js v2.0.0-beta.2
+/*  Enums for UAParser.js v2.0.0-rc.1
     https://github.com/faisalman/ua-parser-js
     Author: Faisal Salman <f@faisalman.com>
     AGPLv3 License */
@@ -12,8 +12,8 @@
 /*jshint esversion: 6 */ 
 
 const Browser = Object.freeze({
-    _2345_EXPLORER: '2345Explorer',
-    _360: '360 Browser',
+    '2345_EXPLORER': '2345Explorer',
+    '360': '360 Browser',
     ALIPAY: 'Alipay',
     AMAYA: 'Amaya',
     ANDROID: 'Android Browser',
@@ -54,8 +54,9 @@ const Browser = Object.freeze({
     FENNEC: 'Fennec',
     FLOCK: 'Flock',
     FLOW: 'Flow',
-    GO: 'Go Browser',
+    GO: 'GoBrowser',
     GOOGLE_SEARCH: 'GSA',
+    HELIO: 'Helio',
     HEYTAP: 'HeyTap',
     HUAWEI: 'Huawei Browser',
     ICAB: 'iCab',
@@ -108,6 +109,7 @@ const Browser = Object.freeze({
     PALEMOON: 'PaleMoon',
     PHANTOMJS: 'PhantomJS',
     PHOENIX: 'Phoenix',
+    PICOBROWSER: 'Pico Browser',
     POLARIS: 'Polaris',
     PUFFIN: 'Puffin',
     QQ: 'QQBrowser',
@@ -132,9 +134,9 @@ const Browser = Object.freeze({
     TESLA: 'Tesla',
     TIKTOK: 'TikTok',
     TIZEN: 'Tizen Browser',
+    TWITTER: 'Twitter',
     UC: 'UCBrowser',
     UP: 'UP.Browser',
-    VIERA: 'Viera',
     VIVALDI: 'Vivaldi',
     VIVO: 'Vivo Browser',
     W3M: 'w3m',
@@ -143,12 +145,24 @@ const Browser = Object.freeze({
     WECHAT: 'WeChat',
     WEIBO: 'Weibo',
     WHALE: 'Whale',
+    WOLVIC: 'Wolvic',
     YANDEX: 'Yandex'
 
     // TODO : test!
 });
 
+const BrowserType = Object.freeze({
+    CRAWLER: 'crawler',
+    CLI: 'cli',
+    EMAIL: 'email',
+    FETCHER: 'fetcher',
+    INAPP: 'inapp',
+    MEDIAPLAYER: 'mediaplayer',
+    MODULE: 'module'
+});
+
 const CPU = Object.freeze({
+    '68K': '68k',
     ARM : 'arm',
     ARM_64: 'arm64',
     ARM_HF: 'armhf',
@@ -159,7 +173,6 @@ const CPU = Object.freeze({
     IRIX_64: 'irix64',
     MIPS: 'mips',
     MIPS_64: 'mips64',
-    M68K: '68k',
     PA_RISC: 'pa-risc',
     PPC: 'ppc',
     SPARC: 'sparc',
@@ -175,7 +188,8 @@ const Device = Object.freeze({
     MOBILE: 'mobile',
     SMARTTV: 'smarttv',
     TABLET: 'tablet',
-    WEARABLE: 'wearable'
+    WEARABLE: 'wearable',
+    XR: 'xr'
 });
 
 const Vendor = Object.freeze({
@@ -199,6 +213,7 @@ const Vendor = Object.freeze({
     HTC: 'HTC',
     HUAWEI: 'Huawei',
     INFINIX: 'Infinix',
+    ITEL: 'itel',
     JOLLA: 'Jolla',
     KOBO: 'Kobo',
     LENOVO: 'Lenovo',
@@ -209,6 +224,7 @@ const Vendor = Object.freeze({
     NEXIAN: 'Nexian',
     NINTENDO: 'Nintendo',
     NOKIA: 'Nokia',
+    NOTHING: 'Nothing',
     NVIDIA: 'Nvidia',
     ONEPLUS: 'OnePlus',
     OPPO: 'OPPO',
@@ -216,6 +232,7 @@ const Vendor = Object.freeze({
     PALM: 'Palm',
     PANASONIC: 'Panasonic',
     PEBBLE: 'Pebble',
+    PICO: 'Pico',
     POLYTRON: 'Polytron',
     REALME: 'Realme',
     RIM: 'RIM',
@@ -225,6 +242,7 @@ const Vendor = Object.freeze({
     SIEMENS: 'Siemens',
     SONY: 'Sony',
     SPRINT: 'Sprint',
+    TCL: 'TCL',
     TECHNISAT: 'TechniSAT',
     TECNO: 'Tecno',
     TESLA: 'Tesla',
@@ -241,6 +259,7 @@ const Vendor = Object.freeze({
 
 const Engine = Object.freeze({
     AMAYA: 'Amaya',
+    ARKWEB: 'ArkWeb',
     BLINK: 'Blink',
     EDGEHTML: 'EdgeHTML',
     FLOW: 'Flow',
@@ -307,12 +326,14 @@ const OS = Object.freeze({
     NETRANGE: 'NetRange',
     NETTV: 'NetTV',
     NINTENDO: 'Nintendo',
+    OPENHARMONY: 'OpenHarmony',
     OPENBSD: 'OpenBSD',
     OPENVMS: 'OpenVMS',
     OS2: 'OS/2',
     PALM: 'Palm',
     PC_BSD: 'PC-BSD',
     PCLINUXOS: 'PCLinuxOS',
+    PICO: 'Pico',
     PLAN9: 'Plan9',
     PLAYSTATION: 'PlayStation',
     QNX: 'QNX',
@@ -332,7 +353,6 @@ const OS = Object.freeze({
     UBUNTU: 'Ubuntu',
     UNIX: 'Unix',
     VECTORLINUX: 'VectorLinux',
-    VIERA: 'Viera',
     WATCHOS: 'watchOS',
     WEBOS: 'WebOS',
     WINDOWS: 'Windows',
@@ -345,7 +365,8 @@ const OS = Object.freeze({
 });
 
 export { 
-    Browser, 
+    Browser,
+    BrowserType, 
     CPU, 
     Device, 
     Vendor,

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

@@ -1,13 +1,15 @@
-// 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 type { UAParserExt } from "../main/ua-parser";
 
-export const Apps: UAParserExt;
 export const Bots: UAParserExt;
 export const CLIs: UAParserExt;
+export const Crawlers: UAParserExt;
 export const ExtraDevices: UAParserExt;
 export const Emails: UAParserExt;
+export const Fetchers: UAParserExt;
+export const InApps: UAParserExt;
 export const MediaPlayers: UAParserExt;
 export const Modules: UAParserExt;

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

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////
-/*  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 */
@@ -14,33 +14,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
@@ -117,25 +164,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
@@ -143,106 +245,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
     ]
 });
 
 module.exports = { 
-    Apps,
     Bots,
     CLIs,
+    Crawlers,
     ExtraDevices,
     Emails,
+    Fetchers,
+    InApps,
     MediaPlayers,
     Modules
 };