diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80dfe6423..63d6bf0f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,25 @@
# UAParser.js Changelog
+## Version 2.0.0-rc.1
+
+- Fix Python Request mistakenly identified as Meta Quest
+- Add new browser: Helio
+- Add new device: itel, Nothing, Pico, TCL
+- Add new engine: ArkWeb
+- Add new OS: OpenHarmony, Pico
+- Improve browser detection: Quark
+- Improve device detection: Xiaomi, Amazon Echo Show, Google Chromecast, Samsung Galaxy Watch
+- `ua-parser-js/helpers` submodule:
+ - Add new method:
+ - `getDeviceVendor()` to guess for a device vendor based on its model name
+ - `isElectron()` to check if current window is running inside Electron
+ - `isFromEU()` to check if current window is from an EU (European Union) country
+ - `isStandalonePWA()` to check if current window is a standalone PWA
+ - Rename `isChromiumBased()` to `isChromeFamily()`
+ - Update `isAppleSilicon()` to also checks for WebGL renderer info
+- `ua-parser-js/extensions` submodule:
+ - Restore `bots` as a compilation of all these browser types: `clis`, `crawlers`, `fetchers`, and `modules`
+
## Version 2.0.0-beta.3
- Breaking:
diff --git a/README.md b/README.md
index 57e0473bf..701add0cd 100644
--- a/README.md
+++ b/README.md
@@ -19,81 +19,14 @@ The most comprehensive, compact, & up-to-date isomorphic JavaScript library to d
user's Browser, Engine, OS, CPU, and Device type/model. Runs either in browser
(client-side) or node.js (server-side).
-# Overview
-
-```js
-import { UAParser } from 'ua-parser-js';
-
-// 1. Problem:
-// Imagine getting this wild user-agent string from a visitor:
-const ua = `Mozilla/5.0 (Linux; Android 10; STK-LX1
-Build/HONORSTK-LX1; wv) AppleWebKit/537.36 (KHTML,
-like Gecko) Version/4.0 Chrome/110.0.5481.153 Mobile
-Safari/537.36 musical_ly_2022803040 JsSdk/1.0
-NetType/WIFI Channel/huaweiadsglobal_int
-AppName/musical_ly app_version/28.3.4 ByteLocale/en
-ByteFullLocale/en Region/IQ Spark/1.2.7-alpha.8
-AppVersion/28.3.4 PIA/1.5.11 BytedanceWebview/d8a21c6`;
-// Note: this is a real user-agent (what???)
-
-// 2. Solution:
-// Just pass the complex user-agent string to `UAParser`
-const parser = new UAParser(ua);
-
-// 3. Result:
-// And voila!
-console.log(parser.getBrowser());
-// { name : "TikTok", version : "28.3.4", major : "28", type: undefined }
-
-console.log(parser.getCPU());
-// { architecture : undefined }
-
-console.log(parser.getEngine());
-// { name : "Blink", version : "110.0.5481.153" }
-
-console.log(parser.getDevice());
-// { type : "mobile", vendor : "Huawei", model : "STK-LX1" }
-
-console.log(parser.getOS());
-// { name : "Android", version : "10" }
-
-console.log(parser.getResult());
-/*
-{
- ua: "Mozilla/5.0 (Linux; Android 10; STK-LX1 Build/HONORSTK-LX1; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/110.0.5481.153 Mobile Safari/537.36 musical_ly_2022803040 JsSdk/1.0 NetType/WIFI Channel/huaweiadsglobal_int AppName/musical_ly app_version/28.3.4 ByteLocale/en ByteFullLocale/en Region/IQ Spark/1.2.7-alpha.8 AppVersion/28.3.4 PIA/1.5.11 BytedanceWebview/d8a21c6",
- browser: {
- name: "TikTok",
- version: "28.3.4",
- major: "28"
- },
- cpu: {},
- device: {
- type: "mobile",
- model: "STK-LX1",
- vendor: "Huawei"
- },
- engine: {
- name: "Blink",
- version: "110.0.5481.153"
- },
- os: {
- name: "Android",
- version: "10"
- }
-}
-*/
-
-// 4. Conclusion:
-// The visitor is browsing from a TikTok app using an Android-powered Huawei device
-// Phew! Thanks, UAParser.js!
-```
+# Demo
* Live demo: https://uaparser.dev
# Documentation
- * v1.0: https://github.com/faisalman/ua-parser-js/tree/1.0.38#documentation
- * v2.0: https://docs.uaparser.dev
+ * `version 1.x` : https://github.com/faisalman/ua-parser-js/tree/1.0.x#documentation
+ * `version 2.x` : https://docs.uaparser.dev
Before upgrading from `v0.7` / `v1.0`, please read [CHANGELOG](CHANGELOG.md) to
see what's new & breaking.
@@ -234,7 +167,7 @@ see what's new & breaking.
| ✅ |
✅ |
✅ |
- ⚠️ |
+ ⛔️ |
✅ |
@@ -257,9 +190,9 @@ see what's new & breaking.
| Price |
FREE (License) |
FREE (License) |
- $12 (License) |
- $25 (License) |
- $500 (License) |
+ $14 (License) |
+ $29 (License) |
+ $588 (License) |
@@ -287,3 +220,5 @@ Made with [contributors-img](https://contrib.rocks).
+
+Support the open-source versions of UAParser.js on [OpenCollective](https://opencollective.com/ua-parser-js) or [GitHub Sponsors](https://github.com/sponsors/faisalman).
diff --git a/dist/ua-parser.min.js b/dist/ua-parser.min.js
index 8819c5a6f..4187195e4 100644
--- a/dist/ua-parser.min.js
+++ b/dist/ua-parser.min.js
@@ -1,4 +1,4 @@
-/* UAParser.js v2.0.0-beta.3
+/* UAParser.js v2.0.0-rc.1
Copyright © 2012-2024 Faisal Salman
AGPLv3 License */
-(function(window,undefined){"use strict";var LIBVERSION="2.0.0-beta.3",EMPTY="",UNKNOWN="?",FUNC_TYPE="function",UNDEF_TYPE="undefined",OBJ_TYPE="object",STR_TYPE="string",MAJOR="major",MODEL="model",NAME="name",TYPE="type",VENDOR="vendor",VERSION="version",ARCHITECTURE="architecture",CONSOLE="console",MOBILE="mobile",TABLET="tablet",SMARTTV="smarttv",WEARABLE="wearable",XR="xr",EMBEDDED="embedded",USER_AGENT="user-agent",UA_MAX_LENGTH=500,BRANDS="brands",FORMFACTORS="formFactors",FULLVERLIST="fullVersionList",PLATFORM="platform",PLATFORMVER="platformVersion",BITNESS="bitness",CH_HEADER="sec-ch-ua",CH_HEADER_FULL_VER_LIST=CH_HEADER+"-full-version-list",CH_HEADER_ARCH=CH_HEADER+"-arch",CH_HEADER_BITNESS=CH_HEADER+"-"+BITNESS,CH_HEADER_FORM_FACTORS=CH_HEADER+"-form-factors",CH_HEADER_MOBILE=CH_HEADER+"-"+MOBILE,CH_HEADER_MODEL=CH_HEADER+"-"+MODEL,CH_HEADER_PLATFORM=CH_HEADER+"-"+PLATFORM,CH_HEADER_PLATFORM_VER=CH_HEADER_PLATFORM+"-version",CH_ALL_VALUES=[BRANDS,FULLVERLIST,MOBILE,MODEL,PLATFORM,PLATFORMVER,ARCHITECTURE,FORMFACTORS,BITNESS],UA_BROWSER="browser",UA_CPU="cpu",UA_DEVICE="device",UA_ENGINE="engine",UA_OS="os",UA_RESULT="result",AMAZON="Amazon",APPLE="Apple",ASUS="ASUS",BLACKBERRY="BlackBerry",GOOGLE="Google",HUAWEI="Huawei",LENOVO="Lenovo",LG="LG",MICROSOFT="Microsoft",MOTOROLA="Motorola",SAMSUNG="Samsung",SHARP="Sharp",SONY="Sony",XIAOMI="Xiaomi",ZEBRA="Zebra",PREFIX_MOBILE="Mobile ",SUFFIX_BROWSER=" Browser",CHROME="Chrome",EDGE="Edge",FIREFOX="Firefox",OPERA="Opera",FACEBOOK="Facebook",SOGOU="Sogou",WINDOWS="Windows";var isWindow=typeof window!==UNDEF_TYPE,NAVIGATOR=isWindow&&window.navigator?window.navigator:undefined,NAVIGATOR_UADATA=NAVIGATOR&&NAVIGATOR.userAgentData?NAVIGATOR.userAgentData:undefined;var extend=function(defaultRgx,extensions){var mergedRgx={};var extraRgx=extensions;if(!isExtensions(extensions)){extraRgx={};for(var i in extensions){for(var j in extensions[i]){extraRgx[j]=extensions[i][j].concat(extraRgx[j]?extraRgx[j]:[])}}}for(var k in defaultRgx){mergedRgx[k]=extraRgx[k]&&extraRgx[k].length%2===0?extraRgx[k].concat(defaultRgx[k]):defaultRgx[k]}return mergedRgx},enumerize=function(arr){var enums={};for(var i=0;i0){for(var i in str1){if(lowerize(str1[i])==lowerize(str2))return true}return false}return isString(str1)?lowerize(str2).indexOf(lowerize(str1))!==-1:false},isExtensions=function(obj,deep){for(var prop in obj){return/^(browser|cpu|device|engine|os)$/.test(prop)||(deep?isExtensions(obj[prop]):false)}},isString=function(val){return typeof val===STR_TYPE},itemListToArray=function(header){if(!header)return undefined;var arr=[];var tokens=strip(/\\?\"/g,header).split(",");for(var i=0;i-1){var token=trim(tokens[i]).split(";v=");arr[i]={brand:token[0],version:token[1]}}else{arr[i]=trim(tokens[i])}}return arr},lowerize=function(str){return isString(str)?str.toLowerCase():str},majorize=function(version){return isString(version)?strip(/[^\d\.]/g,version).split(".")[0]:undefined},setProps=function(arr){for(var i in arr){var propName=arr[i];if(typeof propName==OBJ_TYPE&&propName.length==2){this[propName[0]]=propName[1]}else{this[propName]=undefined}}return this},strip=function(pattern,str){return isString(str)?str.replace(pattern,EMPTY):str},stripQuotes=function(str){return strip(/\\?\"/g,str)},trim=function(str,len){if(isString(str)){str=strip(/^\s\s*/,str);return typeof len===UNDEF_TYPE?str:str.substring(0,UA_MAX_LENGTH)}};var rgxMapper=function(ua,arrays){if(!ua||!arrays)return;var i=0,j,k,p,q,matches,match;while(i0){if(q.length===2){if(typeof q[1]==FUNC_TYPE){this[q[0]]=q[1].call(this,match)}else{this[q[0]]=q[1]}}else if(q.length===3){if(typeof q[1]===FUNC_TYPE&&!(q[1].exec&&q[1].test)){this[q[0]]=match?q[1].call(this,match,q[2]):undefined}else{this[q[0]]=match?match.replace(q[1],q[2]):undefined}}else if(q.length===4){this[q[0]]=match?q[3].call(this,match.replace(q[1],q[2])):undefined}}else{this[q]=match?match:undefined}}}}i+=2}},strMapper=function(str,map){for(var i in map){if(typeof map[i]===OBJ_TYPE&&map[i].length>0){for(var j=0;j2){this.set(MODEL,"iPad").set(TYPE,TABLET)}break;case UA_OS:if(!this.get(NAME)&&NAVIGATOR_UADATA&&NAVIGATOR_UADATA[PLATFORM]){this.set(NAME,NAVIGATOR_UADATA[PLATFORM])}break;case UA_RESULT:var data=this.data;var detect=function(itemType){return data[itemType].getItem().detectFeature().get()};this.set(UA_BROWSER,detect(UA_BROWSER)).set(UA_CPU,detect(UA_CPU)).set(UA_DEVICE,detect(UA_DEVICE)).set(UA_ENGINE,detect(UA_ENGINE)).set(UA_OS,detect(UA_OS))}}return this};this.parseUA=function(){if(this.itemType!=UA_RESULT){rgxMapper.call(this.data,this.ua,this.rgxMap)}if(this.itemType==UA_BROWSER){this.set(MAJOR,majorize(this.get(VERSION)))}return this};this.parseCH=function(){var uaCH=this.uaCH,rgxMap=this.rgxMap;switch(this.itemType){case UA_BROWSER:var brands=uaCH[FULLVERLIST]||uaCH[BRANDS],prevName;if(brands){for(var i in brands){var brandName=strip(/(Google|Microsoft) /,brands[i].brand||brands[i]),brandVersion=brands[i].version;if(!/not.a.brand/i.test(brandName)&&(!prevName||/chrom/i.test(prevName)&&!/chromi/i.test(brandName))){this.set(NAME,brandName).set(VERSION,brandVersion).set(MAJOR,majorize(brandVersion));prevName=brandName}}}break;case UA_CPU:var archName=uaCH[ARCHITECTURE];if(archName){if(archName&&uaCH[BITNESS]=="64")archName+="64";rgxMapper.call(this.data,archName+";",rgxMap)}break;case UA_DEVICE:if(uaCH[MOBILE]){this.set(TYPE,MOBILE)}if(uaCH[MODEL]){this.set(MODEL,uaCH[MODEL])}if(uaCH[MODEL]=="Xbox"){this.set(TYPE,CONSOLE).set(VENDOR,MICROSOFT)}if(uaCH[FORMFACTORS]){var ff;if(typeof uaCH[FORMFACTORS]!=="string"){var idx=0;while(!ff&&idx=13?"11":"10";this.set(NAME,osName).set(VERSION,osVersion)}if(this.get(NAME)==WINDOWS&&uaCH[MODEL]=="Xbox"){this.set(NAME,"Xbox").set(VERSION,undefined)}break;case UA_RESULT:var data=this.data;var parse=function(itemType){return data[itemType].getItem().setCH(uaCH).parseCH().get()};this.set(UA_BROWSER,parse(UA_BROWSER)).set(UA_CPU,parse(UA_CPU)).set(UA_DEVICE,parse(UA_DEVICE)).set(UA_ENGINE,parse(UA_ENGINE)).set(UA_OS,parse(UA_OS))}return this};setProps.call(this,[["itemType",itemType],["ua",ua],["uaCH",uaCH],["rgxMap",rgxMap],["data",createIData(this,itemType)]]);return this}function UAParser(ua,extensions,headers){if(typeof ua===OBJ_TYPE){if(isExtensions(ua,true)){if(typeof extensions===OBJ_TYPE){headers=extensions}extensions=ua}else{headers=ua;extensions=undefined}ua=undefined}else if(typeof ua===STR_TYPE&&!isExtensions(extensions,true)){headers=extensions;extensions=undefined}if(!(this instanceof UAParser)){return new UAParser(ua,extensions,headers).getResult()}var userAgent=typeof ua===STR_TYPE?ua:NAVIGATOR&&NAVIGATOR.userAgent?NAVIGATOR.userAgent:headers&&headers[USER_AGENT]?headers[USER_AGENT]:EMPTY,httpUACH=new UACHData(headers,true),regexMap=extensions?extend(defaultRegexes,extensions):defaultRegexes,createItemFunc=function(itemType){if(itemType==UA_RESULT){return function(){return new UAItem(itemType,userAgent,regexMap,httpUACH).set("ua",userAgent).set(UA_BROWSER,this.getBrowser()).set(UA_CPU,this.getCPU()).set(UA_DEVICE,this.getDevice()).set(UA_ENGINE,this.getEngine()).set(UA_OS,this.getOS()).get()}}else{return function(){return new UAItem(itemType,userAgent,regexMap[itemType],httpUACH).parseUA().get()}}};setProps.call(this,[["getBrowser",createItemFunc(UA_BROWSER)],["getCPU",createItemFunc(UA_CPU)],["getDevice",createItemFunc(UA_DEVICE)],["getEngine",createItemFunc(UA_ENGINE)],["getOS",createItemFunc(UA_OS)],["getResult",createItemFunc(UA_RESULT)],["getUA",function(){return userAgent}],["setUA",function(ua){if(isString(ua))userAgent=ua.length>UA_MAX_LENGTH?trim(ua,UA_MAX_LENGTH):ua;return this}]]).setUA(userAgent);return this}UAParser.VERSION=LIBVERSION;UAParser.BROWSER=enumerize([NAME,VERSION,MAJOR,TYPE]);UAParser.CPU=enumerize([ARCHITECTURE]);UAParser.DEVICE=enumerize([MODEL,VENDOR,TYPE,CONSOLE,MOBILE,SMARTTV,TABLET,WEARABLE,EMBEDDED]);UAParser.ENGINE=UAParser.OS=enumerize([NAME,VERSION]);if(typeof exports!==UNDEF_TYPE){if(typeof module!==UNDEF_TYPE&&module.exports){exports=module.exports=UAParser}exports.UAParser=UAParser}else{if(typeof define===FUNC_TYPE&&define.amd){define(function(){return UAParser})}else if(isWindow){window.UAParser=UAParser}}var $=isWindow&&(window.jQuery||window.Zepto);if($&&!$.ua){var parser=new UAParser;$.ua=parser.getResult();$.ua.get=function(){return parser.getUA()};$.ua.set=function(ua){parser.setUA(ua);var result=parser.getResult();for(var prop in result){$.ua[prop]=result[prop]}}}})(typeof window==="object"?window:this);
\ No newline at end of file
+(function(window,undefined){"use strict";var LIBVERSION="2.0.0-rc.1",EMPTY="",UNKNOWN="?",FUNC_TYPE="function",UNDEF_TYPE="undefined",OBJ_TYPE="object",STR_TYPE="string",MAJOR="major",MODEL="model",NAME="name",TYPE="type",VENDOR="vendor",VERSION="version",ARCHITECTURE="architecture",CONSOLE="console",MOBILE="mobile",TABLET="tablet",SMARTTV="smarttv",WEARABLE="wearable",XR="xr",EMBEDDED="embedded",USER_AGENT="user-agent",UA_MAX_LENGTH=500,BRANDS="brands",FORMFACTORS="formFactors",FULLVERLIST="fullVersionList",PLATFORM="platform",PLATFORMVER="platformVersion",BITNESS="bitness",CH_HEADER="sec-ch-ua",CH_HEADER_FULL_VER_LIST=CH_HEADER+"-full-version-list",CH_HEADER_ARCH=CH_HEADER+"-arch",CH_HEADER_BITNESS=CH_HEADER+"-"+BITNESS,CH_HEADER_FORM_FACTORS=CH_HEADER+"-form-factors",CH_HEADER_MOBILE=CH_HEADER+"-"+MOBILE,CH_HEADER_MODEL=CH_HEADER+"-"+MODEL,CH_HEADER_PLATFORM=CH_HEADER+"-"+PLATFORM,CH_HEADER_PLATFORM_VER=CH_HEADER_PLATFORM+"-version",CH_ALL_VALUES=[BRANDS,FULLVERLIST,MOBILE,MODEL,PLATFORM,PLATFORMVER,ARCHITECTURE,FORMFACTORS,BITNESS],UA_BROWSER="browser",UA_CPU="cpu",UA_DEVICE="device",UA_ENGINE="engine",UA_OS="os",UA_RESULT="result",AMAZON="Amazon",APPLE="Apple",ASUS="ASUS",BLACKBERRY="BlackBerry",GOOGLE="Google",HUAWEI="Huawei",LENOVO="Lenovo",LG="LG",MICROSOFT="Microsoft",MOTOROLA="Motorola",SAMSUNG="Samsung",SHARP="Sharp",SONY="Sony",XIAOMI="Xiaomi",ZEBRA="Zebra",PREFIX_MOBILE="Mobile ",SUFFIX_BROWSER=" Browser",CHROME="Chrome",CHROMECAST="Chromecast",EDGE="Edge",FIREFOX="Firefox",OPERA="Opera",FACEBOOK="Facebook",SOGOU="Sogou",WINDOWS="Windows";var isWindow=typeof window!==UNDEF_TYPE,NAVIGATOR=isWindow&&window.navigator?window.navigator:undefined,NAVIGATOR_UADATA=NAVIGATOR&&NAVIGATOR.userAgentData?NAVIGATOR.userAgentData:undefined;var extend=function(defaultRgx,extensions){var mergedRgx={};var extraRgx=extensions;if(!isExtensions(extensions)){extraRgx={};for(var i in extensions){for(var j in extensions[i]){extraRgx[j]=extensions[i][j].concat(extraRgx[j]?extraRgx[j]:[])}}}for(var k in defaultRgx){mergedRgx[k]=extraRgx[k]&&extraRgx[k].length%2===0?extraRgx[k].concat(defaultRgx[k]):defaultRgx[k]}return mergedRgx},enumerize=function(arr){var enums={};for(var i=0;i0){for(var i in str1){if(lowerize(str1[i])==lowerize(str2))return true}return false}return isString(str1)?lowerize(str2).indexOf(lowerize(str1))!==-1:false},isExtensions=function(obj,deep){for(var prop in obj){return/^(browser|cpu|device|engine|os)$/.test(prop)||(deep?isExtensions(obj[prop]):false)}},isString=function(val){return typeof val===STR_TYPE},itemListToArray=function(header){if(!header)return undefined;var arr=[];var tokens=strip(/\\?\"/g,header).split(",");for(var i=0;i-1){var token=trim(tokens[i]).split(";v=");arr[i]={brand:token[0],version:token[1]}}else{arr[i]=trim(tokens[i])}}return arr},lowerize=function(str){return isString(str)?str.toLowerCase():str},majorize=function(version){return isString(version)?strip(/[^\d\.]/g,version).split(".")[0]:undefined},setProps=function(arr){for(var i in arr){var propName=arr[i];if(typeof propName==OBJ_TYPE&&propName.length==2){this[propName[0]]=propName[1]}else{this[propName]=undefined}}return this},strip=function(pattern,str){return isString(str)?str.replace(pattern,EMPTY):str},stripQuotes=function(str){return strip(/\\?\"/g,str)},trim=function(str,len){if(isString(str)){str=strip(/^\s\s*/,str);return typeof len===UNDEF_TYPE?str:str.substring(0,UA_MAX_LENGTH)}};var rgxMapper=function(ua,arrays){if(!ua||!arrays)return;var i=0,j,k,p,q,matches,match;while(i0){if(q.length===2){if(typeof q[1]==FUNC_TYPE){this[q[0]]=q[1].call(this,match)}else{this[q[0]]=q[1]}}else if(q.length===3){if(typeof q[1]===FUNC_TYPE&&!(q[1].exec&&q[1].test)){this[q[0]]=match?q[1].call(this,match,q[2]):undefined}else{this[q[0]]=match?match.replace(q[1],q[2]):undefined}}else if(q.length===4){this[q[0]]=match?q[3].call(this,match.replace(q[1],q[2])):undefined}}else{this[q]=match?match:undefined}}}}i+=2}},strMapper=function(str,map){for(var i in map){if(typeof map[i]===OBJ_TYPE&&map[i].length>0){for(var j=0;j2){this.set(MODEL,"iPad").set(TYPE,TABLET)}break;case UA_OS:if(!this.get(NAME)&&NAVIGATOR_UADATA&&NAVIGATOR_UADATA[PLATFORM]){this.set(NAME,NAVIGATOR_UADATA[PLATFORM])}break;case UA_RESULT:var data=this.data;var detect=function(itemType){return data[itemType].getItem().detectFeature().get()};this.set(UA_BROWSER,detect(UA_BROWSER)).set(UA_CPU,detect(UA_CPU)).set(UA_DEVICE,detect(UA_DEVICE)).set(UA_ENGINE,detect(UA_ENGINE)).set(UA_OS,detect(UA_OS))}}return this};this.parseUA=function(){if(this.itemType!=UA_RESULT){rgxMapper.call(this.data,this.ua,this.rgxMap)}if(this.itemType==UA_BROWSER){this.set(MAJOR,majorize(this.get(VERSION)))}return this};this.parseCH=function(){var uaCH=this.uaCH,rgxMap=this.rgxMap;switch(this.itemType){case UA_BROWSER:var brands=uaCH[FULLVERLIST]||uaCH[BRANDS],prevName;if(brands){for(var i in brands){var brandName=strip(/(Google|Microsoft) /,brands[i].brand||brands[i]),brandVersion=brands[i].version;if(!/not.a.brand/i.test(brandName)&&(!prevName||/chrom/i.test(prevName)&&!/chromi/i.test(brandName))){this.set(NAME,brandName).set(VERSION,brandVersion).set(MAJOR,majorize(brandVersion));prevName=brandName}}}break;case UA_CPU:var archName=uaCH[ARCHITECTURE];if(archName){if(archName&&uaCH[BITNESS]=="64")archName+="64";rgxMapper.call(this.data,archName+";",rgxMap)}break;case UA_DEVICE:if(uaCH[MOBILE]){this.set(TYPE,MOBILE)}if(uaCH[MODEL]){this.set(MODEL,uaCH[MODEL])}if(uaCH[MODEL]=="Xbox"){this.set(TYPE,CONSOLE).set(VENDOR,MICROSOFT)}if(uaCH[FORMFACTORS]){var ff;if(typeof uaCH[FORMFACTORS]!=="string"){var idx=0;while(!ff&&idx=13?"11":"10";this.set(NAME,osName).set(VERSION,osVersion)}if(this.get(NAME)==WINDOWS&&uaCH[MODEL]=="Xbox"){this.set(NAME,"Xbox").set(VERSION,undefined)}break;case UA_RESULT:var data=this.data;var parse=function(itemType){return data[itemType].getItem().setCH(uaCH).parseCH().get()};this.set(UA_BROWSER,parse(UA_BROWSER)).set(UA_CPU,parse(UA_CPU)).set(UA_DEVICE,parse(UA_DEVICE)).set(UA_ENGINE,parse(UA_ENGINE)).set(UA_OS,parse(UA_OS))}return this};setProps.call(this,[["itemType",itemType],["ua",ua],["uaCH",uaCH],["rgxMap",rgxMap],["data",createIData(this,itemType)]]);return this}function UAParser(ua,extensions,headers){if(typeof ua===OBJ_TYPE){if(isExtensions(ua,true)){if(typeof extensions===OBJ_TYPE){headers=extensions}extensions=ua}else{headers=ua;extensions=undefined}ua=undefined}else if(typeof ua===STR_TYPE&&!isExtensions(extensions,true)){headers=extensions;extensions=undefined}if(!(this instanceof UAParser)){return new UAParser(ua,extensions,headers).getResult()}var userAgent=typeof ua===STR_TYPE?ua:NAVIGATOR&&NAVIGATOR.userAgent?NAVIGATOR.userAgent:headers&&headers[USER_AGENT]?headers[USER_AGENT]:EMPTY,httpUACH=new UACHData(headers,true),regexMap=extensions?extend(defaultRegexes,extensions):defaultRegexes,createItemFunc=function(itemType){if(itemType==UA_RESULT){return function(){return new UAItem(itemType,userAgent,regexMap,httpUACH).set("ua",userAgent).set(UA_BROWSER,this.getBrowser()).set(UA_CPU,this.getCPU()).set(UA_DEVICE,this.getDevice()).set(UA_ENGINE,this.getEngine()).set(UA_OS,this.getOS()).get()}}else{return function(){return new UAItem(itemType,userAgent,regexMap[itemType],httpUACH).parseUA().get()}}};setProps.call(this,[["getBrowser",createItemFunc(UA_BROWSER)],["getCPU",createItemFunc(UA_CPU)],["getDevice",createItemFunc(UA_DEVICE)],["getEngine",createItemFunc(UA_ENGINE)],["getOS",createItemFunc(UA_OS)],["getResult",createItemFunc(UA_RESULT)],["getUA",function(){return userAgent}],["setUA",function(ua){if(isString(ua))userAgent=ua.length>UA_MAX_LENGTH?trim(ua,UA_MAX_LENGTH):ua;return this}]]).setUA(userAgent);return this}UAParser.VERSION=LIBVERSION;UAParser.BROWSER=enumerize([NAME,VERSION,MAJOR,TYPE]);UAParser.CPU=enumerize([ARCHITECTURE]);UAParser.DEVICE=enumerize([MODEL,VENDOR,TYPE,CONSOLE,MOBILE,SMARTTV,TABLET,WEARABLE,EMBEDDED]);UAParser.ENGINE=UAParser.OS=enumerize([NAME,VERSION]);if(typeof exports!==UNDEF_TYPE){if(typeof module!==UNDEF_TYPE&&module.exports){exports=module.exports=UAParser}exports.UAParser=UAParser}else{if(typeof define===FUNC_TYPE&&define.amd){define(function(){return UAParser})}else if(isWindow){window.UAParser=UAParser}}var $=isWindow&&(window.jQuery||window.Zepto);if($&&!$.ua){var parser=new UAParser;$.ua=parser.getResult();$.ua.get=function(){return parser.getUA()};$.ua.set=function(ua){parser.setUA(ua);var result=parser.getResult();for(var prop in result){$.ua[prop]=result[prop]}}}})(typeof window==="object"?window:this);
\ No newline at end of file
diff --git a/dist/ua-parser.pack.js b/dist/ua-parser.pack.js
index 5b538966c..e22b892ce 100644
--- a/dist/ua-parser.pack.js
+++ b/dist/ua-parser.pack.js
@@ -1,4 +1,4 @@
-/* UAParser.js v2.0.0-beta.3
+/* UAParser.js v2.0.0-rc.1
Copyright © 2012-2024 Faisal Salman
AGPLv3 License */
-!function(i,c){"use strict";function e(i){for(var e={},t=0;t_?Si(i,_):i),this}]]).setUA(o),this}Ui.VERSION="2.0.0-beta.3",Ui.BROWSER=e([f,v,p,m]),Ui.CPU=e([x]),Ui.DEVICE=e([h,g,m,k,y,t,r,o,a]),Ui.ENGINE=Ui.OS=e([f,v]),typeof exports!==b?(typeof module!==b&&module.exports&&(exports=module.exports=Ui),exports.UAParser=Ui):typeof define===u&&define.amd?define(function(){return Ui}):ui&&(i.UAParser=Ui);var Hi,Ei=ui&&(i.jQuery||i.Zepto);Ei&&!Ei.ua&&(Hi=new Ui,Ei.ua=Hi.getResult(),Ei.ua.get=function(){return Hi.getUA()},Ei.ua.set=function(i){Hi.setUA(i);var e,t=Hi.getResult();for(e in t)Ei.ua[e]=t[e]})}("object"==typeof window?window:this);
\ No newline at end of file
+!function(i,c){"use strict";function e(i){for(var e={},t=0;tS?Ti(i,S):i),this}]]).setUA(o),this}Ui.VERSION="2.0.0-rc.1",Ui.BROWSER=e([m,v,h,f]),Ui.CPU=e([k]),Ui.DEVICE=e([p,g,f,x,y,t,r,o,d]),Ui.ENGINE=Ui.OS=e([m,v]),typeof exports!==b?(typeof module!==b&&module.exports&&(exports=module.exports=Ui),exports.UAParser=Ui):typeof define===l&&define.amd?define(function(){return Ui}):ui&&(i.UAParser=Ui);var ji,Ei=ui&&(i.jQuery||i.Zepto);Ei&&!Ei.ua&&(ji=new Ui,Ei.ua=ji.getResult(),Ei.ua.get=function(){return ji.getUA()},Ei.ua.set=function(i){ji.setUA(i);var e,t=ji.getResult();for(e in t)Ei.ua[e]=t[e]})}("object"==typeof window?window:this);
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index c1e325174..1c4d590fc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "ua-parser-js",
- "version": "2.0.0-beta.3",
+ "version": "2.0.0-rc.1",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "ua-parser-js",
- "version": "2.0.0-beta.3",
+ "version": "2.0.0-rc.1",
"funding": [
{
"type": "opencollective",
diff --git a/package.json b/package.json
index 6a7d31ac2..7674e9273 100755
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"title": "UAParser.js",
"name": "ua-parser-js",
- "version": "2.0.0-beta.3",
+ "version": "2.0.0-rc.1",
"author": "Faisal Salman (http://faisalman.com)",
"description": "Detect Browser, Engine, OS, CPU, and Device type/model from User-Agent & Client Hints data. Supports browser & node.js environment",
"keywords": [
diff --git a/src/enums/ua-parser-enums.js b/src/enums/ua-parser-enums.js
index e80a0d57a..4fc06b4d0 100644
--- a/src/enums/ua-parser-enums.js
+++ b/src/enums/ua-parser-enums.js
@@ -1,5 +1,5 @@
///////////////////////////////////////////////
-/* Enums for UAParser.js v2.0.0-beta.3
+/* Enums for UAParser.js v2.0.0-rc.1
https://github.com/faisalman/ua-parser-js
Author: Faisal Salman
AGPLv3 License */
diff --git a/src/enums/ua-parser-enums.mjs b/src/enums/ua-parser-enums.mjs
index 539cf3059..52df47f6e 100644
--- a/src/enums/ua-parser-enums.mjs
+++ b/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.3
+/* Enums for UAParser.js v2.0.0-rc.1
https://github.com/faisalman/ua-parser-js
Author: Faisal Salman
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',
@@ -56,6 +56,7 @@ const Browser = Object.freeze({
FLOW: 'Flow',
GO: 'GoBrowser',
GOOGLE_SEARCH: 'GSA',
+ HELIO: 'Helio',
HEYTAP: 'HeyTap',
HUAWEI: 'Huawei Browser',
ICAB: 'iCab',
@@ -161,6 +162,7 @@ const BrowserType = Object.freeze({
});
const CPU = Object.freeze({
+ '68K': '68k',
ARM : 'arm',
ARM_64: 'arm64',
ARM_HF: 'armhf',
@@ -171,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',
@@ -212,6 +213,7 @@ const Vendor = Object.freeze({
HTC: 'HTC',
HUAWEI: 'Huawei',
INFINIX: 'Infinix',
+ ITEL: 'itel',
JOLLA: 'Jolla',
KOBO: 'Kobo',
LENOVO: 'Lenovo',
@@ -222,6 +224,7 @@ const Vendor = Object.freeze({
NEXIAN: 'Nexian',
NINTENDO: 'Nintendo',
NOKIA: 'Nokia',
+ NOTHING: 'Nothing',
NVIDIA: 'Nvidia',
ONEPLUS: 'OnePlus',
OPPO: 'OPPO',
@@ -239,6 +242,7 @@ const Vendor = Object.freeze({
SIEMENS: 'Siemens',
SONY: 'Sony',
SPRINT: 'Sprint',
+ TCL: 'TCL',
TECHNISAT: 'TechniSAT',
TECNO: 'Tecno',
TESLA: 'Tesla',
@@ -255,6 +259,7 @@ const Vendor = Object.freeze({
const Engine = Object.freeze({
AMAYA: 'Amaya',
+ ARKWEB: 'ArkWeb',
BLINK: 'Blink',
EDGEHTML: 'EdgeHTML',
FLOW: 'Flow',
@@ -321,6 +326,7 @@ const OS = Object.freeze({
NETRANGE: 'NetRange',
NETTV: 'NetTV',
NINTENDO: 'Nintendo',
+ OPENHARMONY: 'OpenHarmony',
OPENBSD: 'OpenBSD',
OPENVMS: 'OpenVMS',
OS2: 'OS/2',
@@ -347,7 +353,6 @@ const OS = Object.freeze({
UBUNTU: 'Ubuntu',
UNIX: 'Unix',
VECTORLINUX: 'VectorLinux',
- VIERA: 'Viera',
WATCHOS: 'watchOS',
WEBOS: 'WebOS',
WINDOWS: 'Windows',
diff --git a/src/extensions/ua-parser-extensions.js b/src/extensions/ua-parser-extensions.js
index a50145daf..124fe9923 100644
--- a/src/extensions/ua-parser-extensions.js
+++ b/src/extensions/ua-parser-extensions.js
@@ -1,5 +1,5 @@
///////////////////////////////////////////////
-/* Extensions for UAParser.js v2.0.0-beta.3
+/* Extensions for UAParser.js v2.0.0-rc.1
https://github.com/faisalman/ua-parser-js
Author: Faisal Salman
AGPLv3 License */
diff --git a/src/extensions/ua-parser-extensions.mjs b/src/extensions/ua-parser-extensions.mjs
index 192889056..bf12ddf64 100644
--- a/src/extensions/ua-parser-extensions.mjs
+++ b/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.3
+/* Extensions for UAParser.js v2.0.0-rc.1
https://github.com/faisalman/ua-parser-js
Author: Faisal Salman
AGPLv3 License */
@@ -23,6 +23,7 @@ const CLI = 'cli';
const EMAIL = 'email';
const FETCHER = 'fetcher';
const INAPP = 'inapp';
+const MEDIAPLAYER = 'mediaplayer';
const MODULE = 'module';
//////////////////////
@@ -42,45 +43,48 @@ const CLIs = Object.freeze({
const Crawlers = Object.freeze({
browser : [
- // Amazonbot - https://developer.amazon.com/amazonbot
- // Applebot - http://apple.com/go/applebot
- // Bingbot - http://www.bing.com/bingbot.htm
- // 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/
- // SemrushBot - http://www.semrush.com/bot.html
- [/((?:amazon|apple|bing|duckduck|facebook|gpt|mj12|semrush)bot)\/([\w\.]+)/i],
- [NAME, VERSION, [TYPE, CRAWLER]],
+ [
+ // 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],
- [NAME, VERSION, [TYPE, CRAWLER]],
+ // Baiduspider https://help.baidu.com/question?prod_id=99&class=0&id=3001
+ /(baiduspider)[-imagevdonsfcpr]{0,6}\/([\w\.]+)/i,
- // Bytespider
- // Yahoo! Slurp - http://help.yahoo.com/help/us/ysearch/slurp
- [/((?:bytespider|(?=yahoo! )slurp))/i],
- [NAME, [TYPE, CRAWLER]],
+ // ClaudeBot
+ /(claude(?:bot|-web))\/([\w\.]+)/i,
- // ClaudeBot
- [/(claude(?:bot|-web))\/([\w\.]+)/i],
- [NAME, VERSION, [TYPE, CRAWLER]],
+ // 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
+ ],
- // Googlebot - http://www.google.com/bot.html
- [
- /(google(?:bot|other)(?:-image|-video|-news|-extended)?|(?:storebot-)?google(?:-inspectiontool)?)\/?([\w\.]*)/i
- ],
- [NAME, VERSION, [TYPE, CRAWLER]],
-
- // Sogou Spider
- [/(sogou (?:pic|head|web|orion|news) spider)\/([\w\.]+)/i],
[NAME, VERSION, [TYPE, CRAWLER]],
- // 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]]
]
});
@@ -181,29 +185,30 @@ const Emails = Object.freeze({
const Fetchers = Object.freeze({
browser : [
- // BingPreview / Mastodon / Pinterestbot / Redditbot / Telegrambot / Twitterbot
- [/(bingpreview|mastodon|(?:discord|linkedin|pinterest|reddit|telegram|twitter)bot)\/([\w\.]+)/i],
- [NAME, VERSION, [TYPE, FETCHER]],
-
- // Google Bots / Snapchat
- [/(feedfetcher-google|google-read-aloud|(?=bot; )snapchat)/i],
- [NAME, [TYPE, FETCHER]],
-
+ [
+ // 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],
- [NAME, VERSION, [TYPE, FETCHER]],
+ // Slackbot - https://api.slack.com/robots
+ /(slack(?:bot)?(?:-imgproxy|-linkexpanding)?) ([\w\.]+)/i,
+
+ // WhatsApp
+ /(whatsapp)\/([\w\.]+)[\/ ][ianw]/i,
- // WhatsApp
- [/(whatsapp)\/([\w\.]+)[\/ ][ianw]/i],
- [NAME, VERSION, [TYPE, FETCHER]],
+ // Yahoo! Japan
+ /(y!?j-dlc)\/([\w\.]+)/i,
- // Yandex Bots - https://yandex.com/bots
- [
+ // Yandex Bots - https://yandex.com/bots
/(yandex(?:calendar|direct(?:dyn)?|searchshop)|yadirectfetcher)\/([\w\.]+)/i,
/(yandex(?:sitelinks|userproxy))/i
],
- [NAME, VERSION, [TYPE, FETCHER]]
+ [NAME, VERSION, [TYPE, FETCHER]],
+
+ // Google Bots / Snapchat
+ [/(feedfetcher-google|google-read-aloud|(?=bot; )snapchat)/i],
+ [NAME, [TYPE, FETCHER]],
]
});
@@ -213,7 +218,11 @@ const Fetchers = Object.freeze({
const InApps = Object.freeze({
browser : [
- [/chatlyio\/([\d\.]+)/i], [VERSION, 'Slack', [TYPE, INAPP]]
+ // Slack
+ [/chatlyio\/([\d\.]+)/i], [VERSION, 'Slack', [TYPE, INAPP]],
+
+ // Yahoo! Japan
+ [/jp\.co\.yahoo\.android\.yjtop\/([\d\.]+)/i], [VERSION, 'Yahoo! Japan', [TYPE, INAPP]]
]
});
@@ -226,13 +235,13 @@ const MediaPlayers = Object.freeze({
/(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
@@ -240,90 +249,90 @@ 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]]
]
});
@@ -338,7 +347,21 @@ const Modules = Object.freeze({
]
});
+//////////
+// BOTS
+/////////
+
+const Bots = Object.freeze({
+ browser : [
+ ...CLIs.browser,
+ ...Crawlers.browser,
+ ...Fetchers.browser,
+ ...Modules.browser
+ ]
+});
+
export {
+ Bots,
CLIs,
Crawlers,
ExtraDevices,
diff --git a/src/helpers/ua-parser-helpers.js b/src/helpers/ua-parser-helpers.js
index 8582fe5b4..61c63bbb6 100644
--- a/src/helpers/ua-parser-helpers.js
+++ b/src/helpers/ua-parser-helpers.js
@@ -1,5 +1,5 @@
///////////////////////////////////////////////
-/* Helpers for UAParser.js v2.0.0-beta.3
+/* Helpers for UAParser.js v2.0.0-rc.1
https://github.com/faisalman/ua-parser-js
Author: Faisal Salman
AGPLv3 License */
diff --git a/src/helpers/ua-parser-helpers.mjs b/src/helpers/ua-parser-helpers.mjs
index 95d6c0f17..886d0dc31 100644
--- a/src/helpers/ua-parser-helpers.mjs
+++ b/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.3
+/* Helpers for UAParser.js v2.0.0-rc.1
https://github.com/faisalman/ua-parser-js
Author: Faisal Salman
AGPLv3 License */
@@ -11,16 +11,55 @@
/*jshint esversion: 6 */
-import { CPU, OS, Engine } from '../enums/ua-parser-enums.mjs';
+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
}
\ No newline at end of file
diff --git a/src/main/ua-parser.js b/src/main/ua-parser.js
index 0eb24efd1..07d59086a 100755
--- a/src/main/ua-parser.js
+++ b/src/main/ua-parser.js
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////////
-/* UAParser.js v2.0.0-beta.3
+/* UAParser.js v2.0.0-rc.1
Copyright © 2012-2024 Faisal Salman
AGPLv3 License *//*
Detect Browser, Engine, OS, CPU, and Device type/model from User-Agent data.
@@ -19,7 +19,7 @@
// Constants
/////////////
- var LIBVERSION = '2.0.0-beta.3',
+ var LIBVERSION = '2.0.0-rc.1',
EMPTY = '',
UNKNOWN = '?',
FUNC_TYPE = 'function',
diff --git a/src/main/ua-parser.mjs b/src/main/ua-parser.mjs
index e0e4f4ed3..e9861fc5c 100644
--- a/src/main/ua-parser.mjs
+++ b/src/main/ua-parser.mjs
@@ -3,12 +3,12 @@
// Source: /src/main/ua-parser.js
/////////////////////////////////////////////////////////////////////////////////
-/* UAParser.js v2.0.0-beta.3
+/* UAParser.js v2.0.0-rc.1
Copyright © 2012-2024 Faisal Salman
AGPLv3 License *//*
Detect Browser, Engine, OS, CPU, and Device type/model from User-Agent data.
Supports browser & node.js environment.
- Demo : https://faisalman.github.io/ua-parser-js
+ Demo : https://uaparser.dev
Source : https://github.com/faisalman/ua-parser-js */
/////////////////////////////////////////////////////////////////////////////////
@@ -21,7 +21,7 @@
// Constants
/////////////
- var LIBVERSION = '2.0.0-beta.3',
+ var LIBVERSION = '2.0.0-rc.1',
EMPTY = '',
UNKNOWN = '?',
FUNC_TYPE = 'function',
@@ -84,6 +84,7 @@
PREFIX_MOBILE = 'Mobile ',
SUFFIX_BROWSER = ' Browser',
CHROME = 'Chrome',
+ CHROMECAST = 'Chromecast',
EDGE = 'Edge',
FIREFOX = 'Firefox',
OPERA = 'Opera',
@@ -329,11 +330,13 @@
/(?:ms|\()(ie) ([\w\.]+)/i, // Internet Explorer
// Webkit/KHTML based // Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron/Iridium/PhantomJS/Bowser/QupZilla/Falkon
- /(flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt|iron|vivaldi|iridium|phantomjs|bowser|quark|qupzilla|falkon|rekonq|puffin|brave|whale(?!.+naver)|qqbrowserlite|duckduckgo|klar)\/([-\w\.]+)/i,
- // Rekonq/Puffin/Brave/Whale/QQBrowserLite/QQ//Vivaldi/DuckDuckGo/Klar
+ /(flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt|iron|vivaldi|iridium|phantomjs|bowser|qupzilla|falkon|rekonq|puffin|brave|whale(?!.+naver)|qqbrowserlite|duckduckgo|klar|helio)\/([-\w\.]+)/i,
+ // Rekonq/Puffin/Brave/Whale/QQBrowserLite/QQ//Vivaldi/DuckDuckGo/Klar/Helio
/(heytap|ovi)browser\/([\d\.]+)/i, // HeyTap/Ovi
/(weibo)__([\d\.]+)/i // Weibo
], [NAME, VERSION], [
+ /quark(?:pc)?\/([-\w\.]+)/i // Quark
+ ], [VERSION, [NAME, 'Quark']], [
/\bddg\/([\w\.]+)/i // DuckDuckGo
], [VERSION, [NAME, 'DuckDuckGo']], [
/(?:\buc? ?browser|(?:juc.+)ucweb)[\/ ]?([\w\.]+)/i // UCBrowser
@@ -499,8 +502,8 @@
// Samsung
/\b(sch-i[89]0\d|shw-m380s|sm-[ptx]\w{2,4}|gt-[pn]\d{2,4}|sgh-t8[56]9|nexus 10)/i
], [MODEL, [VENDOR, SAMSUNG], [TYPE, TABLET]], [
- /\b((?:s[cgp]h|gt|sm)-\w+|sc[g-]?[\d]+a?|galaxy nexus)/i,
- /samsung[- ]([-\w]+)/i,
+ /\b((?:s[cgp]h|gt|sm)-(?![lr])\w+|sc[g-]?[\d]+a?|galaxy nexus)/i,
+ /samsung[- ]((?!sm-[lr])[-\w]+)/i,
/sec-(sgh\w+)/i
], [MODEL, [VENDOR, SAMSUNG], [TYPE, MOBILE]], [
@@ -531,7 +534,7 @@
/\b(hm[-_ ]?note?[_ ]?(?:\d\w)?) bui/i, // Xiaomi Hongmi
/\b(redmi[\-_ ]?(?:note|k)?[\w_ ]+)(?: bui|\))/i, // Xiaomi Redmi
/oid[^\)]+; (m?[12][0-389][01]\w{3,6}[c-y])( bui|; wv|\))/i, // Xiaomi Redmi 'numeric' models
- /\b(mi[-_ ]?(?:a\d|one|one[_ ]plus|note lte|max|cc)?[_ ]?(?:\d?\w?)[_ ]?(?:plus|se|lite)?)(?: bui|\))/i // Xiaomi Mi
+ /\b(mi[-_ ]?(?:a\d|one|one[_ ]plus|note lte|max|cc)?[_ ]?(?:\d?\w?)[_ ]?(?:plus|se|lite|pro)?)(?: bui|\))/i // Xiaomi Mi
], [[MODEL, /_/g, ' '], [VENDOR, XIAOMI], [TYPE, MOBILE]], [
/oid[^\)]+; (2\d{4}(283|rpbf)[cgl])( bui|\))/i, // Redmi Pad
/\b(mi[-_ ]?(?:pad)(?:[\w_ ]+))(?: bui|\))/i // Mi Pad tablets
@@ -599,7 +602,7 @@
// Amazon
/(alexa)webm/i,
- /(kf[a-z]{2}wi|aeo[c-r]{2})( bui|\))/i, // Kindle Fire without Silk / Echo Show
+ /(kf[a-z]{2}wi|aeo(?!bc)\w\w)( bui|\))/i, // Kindle Fire without Silk / Echo Show
/(kf[a-z]+)( bui|\)).+silk\//i // Kindle Fire HD
], [MODEL, [VENDOR, AMAZON], [TYPE, TABLET]], [
/((?:sd|kf)[0349hijorstuw]+)( bui|\)).+silk\//i // Fire Phone
@@ -628,6 +631,17 @@
/(alcatel|geeksphone|nexian|panasonic(?!(?:;|\.))|sony(?!-bra))[-_ ]?([-\w]*)/i // Alcatel/GeeksPhone/Nexian/Panasonic/Sony
], [VENDOR, [MODEL, /_/g, ' '], [TYPE, MOBILE]], [
+ // TCL
+ /tcl (xess p17aa)/i,
+ /droid [\w\.]+; ((?:8[14]9[16]|9(?:0(?:48|60|8[01])|1(?:3[27]|66)|2(?:6[69]|9[56])|466))[gqswx])(_\w(\w|\w\w))?(\)| bui)/i
+ ], [MODEL, [VENDOR, 'TCL'], [TYPE, TABLET]], [
+ /droid [\w\.]+; (418(?:7d|8v)|5087z|5102l|61(?:02[dh]|25[adfh]|27[ai]|56[dh]|59k|65[ah])|a509dl|t(?:43(?:0w|1[adepqu])|50(?:6d|7[adju])|6(?:09dl|10k|12b|71[efho]|76[hjk])|7(?:66[ahju]|67[hw]|7[045][bh]|71[hk]|73o|76[ho]|79w|81[hks]?|82h|90[bhsy]|99b)|810[hs]))(_\w(\w|\w\w))?(\)| bui)/i
+ ], [MODEL, [VENDOR, 'TCL'], [TYPE, MOBILE]], [
+
+ // itel
+ /(itel) ((\w+))/i
+ ], [[VENDOR, lowerize], MODEL, [TYPE, strMapper, { 'tablet' : ['p10001l', 'w7001'], '*' : 'mobile' }]], [
+
// Acer
/droid.+; ([ab][1-7]-?[0178a]\d\d?)/i
], [MODEL, [VENDOR, 'Acer'], [TYPE, TABLET]], [
@@ -641,6 +655,10 @@
/; ((?:power )?armor(?:[\w ]{0,8}))(?: bui|\))/i
], [MODEL, [VENDOR, 'Ulefone'], [TYPE, MOBILE]], [
+ // Nothing
+ /droid.+; (a(?:015|06[35]|142p?))/i
+ ], [MODEL, [VENDOR, 'Nothing'], [TYPE, MOBILE]], [
+
// MIXED
/(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|meizu|motorola|polytron|infinix|tecno)[-_ ]?([-\w]*)/i,
// BlackBerry/BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Meizu/Motorola/Polytron
@@ -685,8 +703,14 @@
], [[VENDOR, LG], [TYPE, SMARTTV]], [
/(apple) ?tv/i // Apple TV
], [VENDOR, [MODEL, APPLE+' TV'], [TYPE, SMARTTV]], [
- /crkey/i // Google Chromecast
- ], [[MODEL, CHROME+'cast'], [VENDOR, GOOGLE], [TYPE, SMARTTV]], [
+ /crkey.*devicetype\/chromecast/i // Google Chromecast Third Generation
+ ], [[MODEL, CHROMECAST+' Third Generation'], [VENDOR, GOOGLE], [TYPE, SMARTTV]], [
+ /crkey.*devicetype\/([^/]*)/i // Google Chromecast with specific device type
+ ], [[MODEL, /^/, 'Chromecast '], [VENDOR, GOOGLE], [TYPE, SMARTTV]], [
+ /fuchsia.*crkey/i // Google Chromecast Nest Hub
+ ], [[MODEL, CHROMECAST+' Nest Hub'], [VENDOR, GOOGLE], [TYPE, SMARTTV]], [
+ /crkey/i // Google Chromecast, Linux-based or unknown
+ ], [[MODEL, CHROMECAST], [VENDOR, GOOGLE], [TYPE, SMARTTV]], [
/droid.+aft(\w+)( bui|\))/i // Fire TV
], [MODEL, [VENDOR, AMAZON], [TYPE, SMARTTV]], [
/\(dtv[\);].+(aquos)/i,
@@ -722,6 +746,8 @@
// WEARABLES
///////////////////
+ /\b(sm-[lr]\d\d[05][fnuw]?s?)\b/i // Samsung Galaxy Watch
+ ], [MODEL, [VENDOR, SAMSUNG], [TYPE, WEARABLE]], [
/((pebble))app/i // Pebble
], [VENDOR, MODEL, [TYPE, WEARABLE]], [
/(watch)(?: ?os[,\/]|\d,\d\/)[\d\.]+/i // Apple Watch
@@ -735,7 +761,9 @@
/droid.+; (glass) \d/i // Google Glass
], [MODEL, [VENDOR, GOOGLE], [TYPE, XR]], [
- /(quest( \d| pro)?)/i // Oculus Quest
+ /(pico) (4|neo3(?: link|pro)?)/i // Pico
+ ], [VENDOR, MODEL, [TYPE, XR]], [
+ /; (quest( \d| pro)?)/i // Oculus Quest
], [MODEL, [VENDOR, FACEBOOK], [TYPE, XR]], [
///////////////////
@@ -768,6 +796,9 @@
/windows.+ edge\/([\w\.]+)/i // EdgeHTML
], [VERSION, [NAME, EDGE+'HTML']], [
+ /(arkweb)\/([\w\.]+)/i // ArkWeb
+ ], [NAME, VERSION], [
+
/webkit\/537\.36.+chrome\/(?!27)([\w\.]+)/i // Blink
], [VERSION, [NAME, 'Blink']], [
@@ -804,10 +835,22 @@
/(macintosh|mac_powerpc\b)(?!.+haiku)/i // Mac OS
], [[NAME, 'macOS'], [VERSION, /_/g, '.']], [
+ // Google Chromecast
+ /android ([\d\.]+).*crkey/i // Google Chromecast, Android-based
+ ], [VERSION, [NAME, CHROMECAST + ' Android']], [
+ /fuchsia.*crkey\/([\d\.]+)/i // Google Chromecast, Fuchsia-based
+ ], [VERSION, [NAME, CHROMECAST + ' Fuchsia']], [
+ /crkey\/([\d\.]+).*devicetype\/smartspeaker/i // Google Chromecast, Linux-based Smart Speaker
+ ], [VERSION, [NAME, CHROMECAST + ' SmartSpeaker']], [
+ /linux.*crkey\/([\d\.]+)/i // Google Chromecast, Legacy Linux-based
+ ], [VERSION, [NAME, CHROMECAST + ' Linux']], [
+ /crkey\/([\d\.]+)/i // Google Chromecast, unknown
+ ], [VERSION, [NAME, CHROMECAST]], [
+
// Mobile OSes
/droid ([\w\.]+)\b.+(android[- ]x86|harmonyos)/i // Android-x86/HarmonyOS
- ], [VERSION, NAME], [ // Android/WebOS/QNX/Bada/RIM/Maemo/MeeGo/Sailfish OS
- /(android|webos|qnx|bada|rim tablet os|maemo|meego|sailfish)[-\/ ]?([\w\.]*)/i,
+ ], [VERSION, NAME], [ // Android/WebOS/QNX/Bada/RIM/Maemo/MeeGo/Sailfish OS/OpenHarmony
+ /(android|webos|qnx|bada|rim tablet os|maemo|meego|sailfish|openharmony)[-\/ ]?([\w\.]*)/i,
/(blackberry)\w*\/([\w\.]*)/i, // Blackberry
/(tizen|kaios)[\/ ]([\w\.]+)/i, // Tizen/KaiOS
/\((series40);/i // Series 40
@@ -824,9 +867,7 @@
/watch(?: ?os[,\/]|\d,\d\/)([\d\.]+)/i // watchOS
], [VERSION, [NAME, 'watchOS']], [
- // Google Chromecast
- /crkey\/([\d\.]+)/i // Google Chromecast
- ], [VERSION, [NAME, CHROME+'cast']], [
+ // Google ChromeOS
/(cros) [\w]+(?:\)| ([\w\.]+)\b)/i // Chromium OS
], [[NAME, "Chrome OS"], VERSION],[
@@ -838,6 +879,7 @@
// Console
/(nintendo|playstation) (\w+)/i, // Nintendo/Playstation
/(xbox); +xbox ([^\);]+)/i, // Microsoft Xbox (360, One, X, S, Series X, Series S)
+ /(pico) .+os([\w\.]+)/i, // Pico
// Other
/\b(joli|palm)\b ?(?:os)?\/?([\w\.]*)/i, // Joli/Palm