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

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

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////
-/*  Helpers for UAParser.js v2.0.0-rc.2
+/*  Helpers for UAParser.js v2.0.0
     https://github.com/faisalman/ua-parser-js
     Author: Faisal Salman <f@faisalman.com>
     AGPLv3 License */
@@ -9,35 +9,117 @@
 
 const { UAParser } = require('../main/ua-parser');
 const { CPU, OS, Engine } = require('../enums/ua-parser-enums');
+const { Bots } = require('../extensions/ua-parser-extensions');
 const { isFromEU } = require('detect-europe-js');
 const { isFrozenUA } = require('ua-is-frozen');
 const { isStandalonePWA } = require('is-standalone-pwa');
 
+const toResult = (value, head, ext) => typeof value === 'string' ? UAParser(value, head, ext) : value;
+
 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 isAppleSilicon = (res) => {
+const isAppleSilicon = (resultOrUA) => {
+    const res = toResult(resultOrUA);
     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;
+        if (typeof resultOrUA !== 'string' && typeof window !== 'undefined') {
+            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;
             }
-        } catch {
-            return false;
         }
     }
     return false;
 }
 
-const isBot = (res) => ['cli', 'crawler', 'fetcher', 'module'].includes(res.browser.type);
+const isAIBot = (resultOrUA) => [
+
+    // AI2
+    'ai2bot',
+
+    // Amazon
+    'amazonbot',
+
+    // Anthropic
+    'anthropic-ai',
+    'claude-web',
+    'claudebot',
+
+    // Apple
+    'applebot',
+    'applebot-extended',
+
+    // ByteDance
+    'bytespider',
+
+    // Common Crawl
+    'ccbot',
+
+    // DataForSeo
+    'dataforseobot',
+
+    // Diffbot
+    'diffbot',
+
+    // Google
+    'googleother',
+    'googleother-image',
+    'googleother-video',
+    'google-extended',
+
+    // Hive AI
+    'imagesiftbot',
+
+    // Huawei
+    'petalbot',
+
+    // Meta
+    'facebookbot',
+    'meta-externalagent',
+
+    // OpenAI
+    'gptbot',
+    'oai-searchbot',
+
+    // Perplexity
+    'perplexitybot',
+
+    // Timpi
+    'timpibot',
+
+    // Velen.io
+    'velenpublicwebcrawler',
+
+    // Webz.io
+    'omgili',
+    'omgilibot',
+    'webzio-extended',
+
+    // You.com
+    'youbot',
+
+    // Zyte
+    'scrapy'
+
+    ].includes(String(toResult(resultOrUA, Bots).browser.name).toLowerCase());
+
+const isBot = (resultOrUA) => [
+    'cli', 
+    'crawler', 
+    'fetcher', 
+    'library'
+    ].includes(toResult(resultOrUA, Bots).browser.type);
 
-const isChromeFamily = (res) => res.engine.is(Engine.BLINK);
+const isChromeFamily = (resultOrUA) => toResult(resultOrUA).engine.is(Engine.BLINK);
 
 const isElectron = () => !!(process?.versions?.hasOwnProperty('electron') ||    // node.js
                             / electron\//i.test(navigator?.userAgent));         // browser
@@ -45,6 +127,7 @@ const isElectron = () => !!(process?.versions?.hasOwnProperty('electron') ||
 module.exports = { 
     getDeviceVendor,
     isAppleSilicon,
+    isAIBot,
     isBot,
     isChromeFamily,
     isElectron,

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-rc.2
+/*  Helpers for UAParser.js v2.0.0
     https://github.com/faisalman/ua-parser-js
     Author: Faisal Salman <f@faisalman.com>
     AGPLv3 License */
@@ -13,35 +13,117 @@
 
 import { UAParser } from '../main/ua-parser.mjs';
 import { CPU, OS, Engine } from '../enums/ua-parser-enums.mjs';
+import { Bots } from '../extensions/ua-parser-extensions.mjs';
 import { isFromEU } from 'detect-europe-js';
 import { isFrozenUA } from 'ua-is-frozen';
 import { isStandalonePWA } from 'is-standalone-pwa';
 
+const toResult = (value, head, ext) => typeof value === 'string' ? UAParser(value, head, ext) : value;
+
 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 isAppleSilicon = (res) => {
+const isAppleSilicon = (resultOrUA) => {
+    const res = toResult(resultOrUA);
     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;
+        if (typeof resultOrUA !== 'string' && typeof window !== 'undefined') {
+            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;
             }
-        } catch {
-            return false;
         }
     }
     return false;
 }
 
-const isBot = (res) => ['cli', 'crawler', 'fetcher', 'module'].includes(res.browser.type);
+const isAIBot = (resultOrUA) => [
+
+    // AI2
+    'ai2bot',
+
+    // Amazon
+    'amazonbot',
+
+    // Anthropic
+    'anthropic-ai',
+    'claude-web',
+    'claudebot',
+
+    // Apple
+    'applebot',
+    'applebot-extended',
+
+    // ByteDance
+    'bytespider',
+
+    // Common Crawl
+    'ccbot',
+
+    // DataForSeo
+    'dataforseobot',
+
+    // Diffbot
+    'diffbot',
+
+    // Google
+    'googleother',
+    'googleother-image',
+    'googleother-video',
+    'google-extended',
+
+    // Hive AI
+    'imagesiftbot',
+
+    // Huawei
+    'petalbot',
+
+    // Meta
+    'facebookbot',
+    'meta-externalagent',
+
+    // OpenAI
+    'gptbot',
+    'oai-searchbot',
+
+    // Perplexity
+    'perplexitybot',
+
+    // Timpi
+    'timpibot',
+
+    // Velen.io
+    'velenpublicwebcrawler',
+
+    // Webz.io
+    'omgili',
+    'omgilibot',
+    'webzio-extended',
+
+    // You.com
+    'youbot',
+
+    // Zyte
+    'scrapy'
+
+    ].includes(String(toResult(resultOrUA, Bots).browser.name).toLowerCase());
+
+const isBot = (resultOrUA) => [
+    'cli', 
+    'crawler', 
+    'fetcher', 
+    'library'
+    ].includes(toResult(resultOrUA, Bots).browser.type);
 
-const isChromeFamily = (res) => res.engine.is(Engine.BLINK);
+const isChromeFamily = (resultOrUA) => toResult(resultOrUA).engine.is(Engine.BLINK);
 
 const isElectron = () => !!(process?.versions?.hasOwnProperty('electron') ||    // node.js
                             / electron\//i.test(navigator?.userAgent));         // browser
@@ -49,6 +131,7 @@ const isElectron = () => !!(process?.versions?.hasOwnProperty('electron') ||
 export { 
     getDeviceVendor,
     isAppleSilicon,
+    isAIBot,
     isBot,
     isChromeFamily,
     isElectron,

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

@@ -1,4 +1,4 @@
-// Type definitions for UAParser.js v2.0.0-rc.2
+// Type definitions for UAParser.js v2.0.0
 // Project: https://github.com/faisalman/ua-parser-js
 // Definitions by: Faisal Salman <https://github.com/faisalman>
 
@@ -15,11 +15,11 @@ declare namespace UAParser {
         name?: string;
         version?: string;
         major?: string;
-        type?: 'crawler' | 'cli' | 'email' | 'fetcher' | 'inapp' | 'mediaplayer' | 'module';
+        type?: 'crawler' | 'cli' | 'email' | 'fetcher' | 'inapp' | 'mediaplayer' | 'library';
     }
 
     interface ICPU extends IData<ICPU> {
-        architecture?: 'ia32' | 'ia64' | 'amd64' | 'arm' | 'arm64' | 'armhf' | 'avr' | 'irix' | 'irix64' | 'mips' | 'mips64' | '68k' | 'ppc' | 'sparc' | 'sparc64';
+        architecture?: 'ia32' | 'ia64' | 'amd64' | 'arm' | 'arm64' | 'armhf' | 'avr' | 'avr32' | 'irix' | 'irix64' | 'mips' | 'mips64' | '68k' | 'pa-risc' | 'ppc' | 'sparc' | 'sparc64';
     }
 
     interface IDevice extends IData<IDevice> {
@@ -29,7 +29,7 @@ declare namespace UAParser {
     }
 
     interface IEngine extends IData<IEngine> {
-        name?: 'Amaya' | 'Blink' | 'EdgeHTML' | 'Flow' | 'Gecko' | 'Goanna' | 'iCab' | 'KHTML' | 'LibWeb' | 'Links' | 'Lynx' | 'NetFront' | 'NetSurf' | 'Presto' | 'Tasman' | 'Trident' | 'w3m' | 'WebKit';
+        name?: 'Amaya' | 'ArkWeb' | 'Blink' | 'EdgeHTML' | 'Flow' | 'Gecko' | 'Goanna' | 'iCab' | 'KHTML' | 'LibWeb' | 'Links' | 'Lynx' | 'NetFront' | 'NetSurf' | 'Presto' | 'Servo' | 'Tasman' | 'Trident' | 'w3m' | 'WebKit';
         version?: string;
     }
 

package/src/main/ua-parser.js

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////////
-/* UAParser.js v2.0.0-rc.2
+/* UAParser.js v2.0.0
    Copyright © 2012-2024 Faisal Salman <f@faisalman.com>
    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-rc.2',
+    var LIBVERSION  = '2.0.0',
         EMPTY       = '',
         UNKNOWN     = '?',
         FUNC_TYPE   = 'function',
@@ -72,6 +72,7 @@
         GOOGLE      = 'Google',
         HUAWEI      = 'Huawei',
         LENOVO      = 'Lenovo',
+        HONOR       = 'Honor',
         LG          = 'LG',
         MICROSOFT   = 'Microsoft',
         MOTOROLA    = 'Motorola',
@@ -462,7 +463,7 @@
             // Other
             /(polaris|lynx|dillo|icab|doris|amaya|w3m|netsurf|obigo|mosaic|(?:go|ice|up)[\. ]?browser)[-\/ ]?v?([\w\.]+)/i,
                                                                                 // Polaris/Lynx/Dillo/iCab/Doris/Amaya/w3m/NetSurf/Obigo/Mosaic/Go/ICE/UP.Browser
-            /(links) \(([\w\.]+)/i                                              // Links
+            /\b(links) \(([\w\.]+)/i                                            // Links
             ], [NAME, [VERSION, /_/g, '.']], [
             
             /(cobalt)\/([\w\.]+)/i                                              // Cobalt
@@ -527,10 +528,14 @@
             /\b(sh-?[altvz]?\d\d[a-ekm]?)/i
             ], [MODEL, [VENDOR, SHARP], [TYPE, MOBILE]], [
 
+            // Honor
+            /(?:honor)([-\w ]+)[;\)]/i
+            ], [MODEL, [VENDOR, HONOR], [TYPE, MOBILE]], [
+
             // Huawei
             /\b((?:ag[rs][23]?|bah2?|sht?|btv)-a?[lw]\d{2})\b(?!.+d\/s)/i
             ], [MODEL, [VENDOR, HUAWEI], [TYPE, TABLET]], [
-            /(?:huawei|honor)([-\w ]+)[;\)]/i,
+            /(?:huawei)([-\w ]+)[;\)]/i,
             /\b(nexus 6p|\w{2,4}e?-[atu]?[ln][\dx][012359c][adn]?)\b(?!.+d\/s)/i
             ], [MODEL, [VENDOR, HUAWEI], [TYPE, MOBILE]], [
 
@@ -595,7 +600,7 @@
             ], [MODEL, [VENDOR, GOOGLE], [TYPE, MOBILE]], [
 
             // Sony
-            /droid.+ (a?\d[0-2]{2}so|[c-g]\d{4}|so[-gl]\w+|xq-a\w[4-7][12])(?= bui|\).+chrome\/(?![1-6]{0,1}\d\.))/i
+            /droid.+; (a?\d[0-2]{2}so|[c-g]\d{4}|so[-gl]\w+|xq-a\w[4-7][12])(?= bui|\).+chrome\/(?![1-6]{0,1}\d\.))/i
             ], [MODEL, [VENDOR, SONY], [TYPE, MOBILE]], [
             /sony tablet [ps]/i,
             /\b(?:sony)?sgp\w+(?: bui|\))/i
@@ -661,13 +666,28 @@
             /; ((?:power )?armor(?:[\w ]{0,8}))(?: bui|\))/i
             ], [MODEL, [VENDOR, 'Ulefone'], [TYPE, MOBILE]], [
 
+            // Energizer
+            /; (energy ?\w+)(?: bui|\))/i,
+            /; energizer ([\w ]+)(?: bui|\))/i
+            ], [MODEL, [VENDOR, 'Energizer'], [TYPE, MOBILE]], [
+
+            // Cat
+            /; cat (b35);/i,
+            /; (b15q?|s22 flip|s48c|s62 pro)(?: bui|\))/i
+            ], [MODEL, [VENDOR, 'Cat'], [TYPE, MOBILE]], [
+
+            // Smartfren
+            /((?:new )?andromax[\w- ]+)(?: bui|\))/i
+            ], [MODEL, [VENDOR, 'Smartfren'], [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
+            /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|meizu|motorola|polytron|infinix|tecno|micromax|advan)[-_ ]?([-\w]*)/i,
+                                                                                // BlackBerry/BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Meizu/Motorola/Polytron/Infinix/Tecno/Micromax/Advan
+            /; (imo) ((?!tab)[\w ]+?)(?: bui|\))/i,                             // IMO
             /(hp) ([\w ]+\w)/i,                                                 // HP iPAQ
             /(asus)-?(\w+)/i,                                                   // Asus
             /(microsoft); (lumia[\w ]+)/i,                                      // Microsoft Lumia
@@ -676,6 +696,7 @@
             /(oppo) ?([\w ]+) bui/i                                             // OPPO
             ], [VENDOR, MODEL, [TYPE, MOBILE]], [
 
+            /(imo) (tab \w+)/i,                                                 // IMO
             /(kobo)\s(ereader|touch)/i,                                         // Kobo
             /(archos) (gamepad2?)/i,                                            // Archos
             /(hp).+(touchpad(?!.+tablet)|tablet)/i,                             // HP TouchPad
@@ -809,7 +830,7 @@
             ], [VERSION, [NAME, 'Blink']], [
 
             /(presto)\/([\w\.]+)/i,                                             // Presto
-            /(webkit|trident|netfront|netsurf|amaya|lynx|w3m|goanna)\/([\w\.]+)/i, // WebKit/Trident/NetFront/NetSurf/Amaya/Lynx/w3m/Goanna
+            /(webkit|trident|netfront|netsurf|amaya|lynx|w3m|goanna|servo)\/([\w\.]+)/i, // WebKit/Trident/NetFront/NetSurf/Amaya/Lynx/w3m/Goanna/Servo
             /ekioh(flow)\/([\w\.]+)/i,                                          // Flow
             /(khtml|tasman|links)[\/ ]\(?([\w\.]+)/i,                           // KHTML/Tasman/Links
             /(icab)[\/ ]([23]\.[\d\.]+)/i,                                      // iCab
@@ -1236,14 +1257,21 @@
             headers = extensions;                       // case UAParser(ua, headers)
             extensions = undefined;
         }
+
+        // Convert Headers object into a plain object
+        if (headers && typeof headers.append === FUNC_TYPE) {
+            var kv = {};
+            headers.forEach(function (v, k) { kv[k] = v; });
+            headers = kv;
+        }
         
         if (!(this instanceof UAParser)) {
             return new UAParser(ua, extensions, headers).getResult();
         }
 
         var userAgent = typeof ua === STR_TYPE ? ua :                                       // Passed user-agent string
-                            ((NAVIGATOR && NAVIGATOR.userAgent) ? NAVIGATOR.userAgent :     // navigator.userAgent
                                 (headers && headers[USER_AGENT] ? headers[USER_AGENT] :     // User-Agent from passed headers
+                                ((NAVIGATOR && NAVIGATOR.userAgent) ? NAVIGATOR.userAgent : // navigator.userAgent
                                     EMPTY)),                                                // empty string
 
             httpUACH = new UACHData(headers, true),

package/src/main/ua-parser.mjs

@@ -3,7 +3,7 @@
 // Source: /src/main/ua-parser.js
 
 /////////////////////////////////////////////////////////////////////////////////
-/* UAParser.js v2.0.0-rc.2
+/* UAParser.js v2.0.0
    Copyright © 2012-2024 Faisal Salman <f@faisalman.com>
    AGPLv3 License *//*
    Detect Browser, Engine, OS, CPU, and Device type/model from User-Agent data.
@@ -21,7 +21,7 @@
     // Constants
     /////////////
 
-    var LIBVERSION  = '2.0.0-rc.2',
+    var LIBVERSION  = '2.0.0',
         EMPTY       = '',
         UNKNOWN     = '?',
         FUNC_TYPE   = 'function',
@@ -74,6 +74,7 @@
         GOOGLE      = 'Google',
         HUAWEI      = 'Huawei',
         LENOVO      = 'Lenovo',
+        HONOR       = 'Honor',
         LG          = 'LG',
         MICROSOFT   = 'Microsoft',
         MOTOROLA    = 'Motorola',
@@ -464,7 +465,7 @@
             // Other
             /(polaris|lynx|dillo|icab|doris|amaya|w3m|netsurf|obigo|mosaic|(?:go|ice|up)[\. ]?browser)[-\/ ]?v?([\w\.]+)/i,
                                                                                 // Polaris/Lynx/Dillo/iCab/Doris/Amaya/w3m/NetSurf/Obigo/Mosaic/Go/ICE/UP.Browser
-            /(links) \(([\w\.]+)/i                                              // Links
+            /\b(links) \(([\w\.]+)/i                                            // Links
             ], [NAME, [VERSION, /_/g, '.']], [
             
             /(cobalt)\/([\w\.]+)/i                                              // Cobalt
@@ -529,10 +530,14 @@
             /\b(sh-?[altvz]?\d\d[a-ekm]?)/i
             ], [MODEL, [VENDOR, SHARP], [TYPE, MOBILE]], [
 
+            // Honor
+            /(?:honor)([-\w ]+)[;\)]/i
+            ], [MODEL, [VENDOR, HONOR], [TYPE, MOBILE]], [
+
             // Huawei
             /\b((?:ag[rs][23]?|bah2?|sht?|btv)-a?[lw]\d{2})\b(?!.+d\/s)/i
             ], [MODEL, [VENDOR, HUAWEI], [TYPE, TABLET]], [
-            /(?:huawei|honor)([-\w ]+)[;\)]/i,
+            /(?:huawei)([-\w ]+)[;\)]/i,
             /\b(nexus 6p|\w{2,4}e?-[atu]?[ln][\dx][012359c][adn]?)\b(?!.+d\/s)/i
             ], [MODEL, [VENDOR, HUAWEI], [TYPE, MOBILE]], [
 
@@ -597,7 +602,7 @@
             ], [MODEL, [VENDOR, GOOGLE], [TYPE, MOBILE]], [
 
             // Sony
-            /droid.+ (a?\d[0-2]{2}so|[c-g]\d{4}|so[-gl]\w+|xq-a\w[4-7][12])(?= bui|\).+chrome\/(?![1-6]{0,1}\d\.))/i
+            /droid.+; (a?\d[0-2]{2}so|[c-g]\d{4}|so[-gl]\w+|xq-a\w[4-7][12])(?= bui|\).+chrome\/(?![1-6]{0,1}\d\.))/i
             ], [MODEL, [VENDOR, SONY], [TYPE, MOBILE]], [
             /sony tablet [ps]/i,
             /\b(?:sony)?sgp\w+(?: bui|\))/i
@@ -663,13 +668,28 @@
             /; ((?:power )?armor(?:[\w ]{0,8}))(?: bui|\))/i
             ], [MODEL, [VENDOR, 'Ulefone'], [TYPE, MOBILE]], [
 
+            // Energizer
+            /; (energy ?\w+)(?: bui|\))/i,
+            /; energizer ([\w ]+)(?: bui|\))/i
+            ], [MODEL, [VENDOR, 'Energizer'], [TYPE, MOBILE]], [
+
+            // Cat
+            /; cat (b35);/i,
+            /; (b15q?|s22 flip|s48c|s62 pro)(?: bui|\))/i
+            ], [MODEL, [VENDOR, 'Cat'], [TYPE, MOBILE]], [
+
+            // Smartfren
+            /((?:new )?andromax[\w- ]+)(?: bui|\))/i
+            ], [MODEL, [VENDOR, 'Smartfren'], [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
+            /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|meizu|motorola|polytron|infinix|tecno|micromax|advan)[-_ ]?([-\w]*)/i,
+                                                                                // BlackBerry/BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Meizu/Motorola/Polytron/Infinix/Tecno/Micromax/Advan
+            /; (imo) ((?!tab)[\w ]+?)(?: bui|\))/i,                             // IMO
             /(hp) ([\w ]+\w)/i,                                                 // HP iPAQ
             /(asus)-?(\w+)/i,                                                   // Asus
             /(microsoft); (lumia[\w ]+)/i,                                      // Microsoft Lumia
@@ -678,6 +698,7 @@
             /(oppo) ?([\w ]+) bui/i                                             // OPPO
             ], [VENDOR, MODEL, [TYPE, MOBILE]], [
 
+            /(imo) (tab \w+)/i,                                                 // IMO
             /(kobo)\s(ereader|touch)/i,                                         // Kobo
             /(archos) (gamepad2?)/i,                                            // Archos
             /(hp).+(touchpad(?!.+tablet)|tablet)/i,                             // HP TouchPad
@@ -811,7 +832,7 @@
             ], [VERSION, [NAME, 'Blink']], [
 
             /(presto)\/([\w\.]+)/i,                                             // Presto
-            /(webkit|trident|netfront|netsurf|amaya|lynx|w3m|goanna)\/([\w\.]+)/i, // WebKit/Trident/NetFront/NetSurf/Amaya/Lynx/w3m/Goanna
+            /(webkit|trident|netfront|netsurf|amaya|lynx|w3m|goanna|servo)\/([\w\.]+)/i, // WebKit/Trident/NetFront/NetSurf/Amaya/Lynx/w3m/Goanna/Servo
             /ekioh(flow)\/([\w\.]+)/i,                                          // Flow
             /(khtml|tasman|links)[\/ ]\(?([\w\.]+)/i,                           // KHTML/Tasman/Links
             /(icab)[\/ ]([23]\.[\d\.]+)/i,                                      // iCab
@@ -1238,14 +1259,21 @@
             headers = extensions;                       // case UAParser(ua, headers)
             extensions = undefined;
         }
+
+        // Convert Headers object into a plain object
+        if (headers && typeof headers.append === FUNC_TYPE) {
+            var kv = {};
+            headers.forEach(function (v, k) { kv[k] = v; });
+            headers = kv;
+        }
         
         if (!(this instanceof UAParser)) {
             return new UAParser(ua, extensions, headers).getResult();
         }
 
         var userAgent = typeof ua === STR_TYPE ? ua :                                       // Passed user-agent string
-                            ((NAVIGATOR && NAVIGATOR.userAgent) ? NAVIGATOR.userAgent :     // navigator.userAgent
                                 (headers && headers[USER_AGENT] ? headers[USER_AGENT] :     // User-Agent from passed headers
+                                ((NAVIGATOR && NAVIGATOR.userAgent) ? NAVIGATOR.userAgent : // navigator.userAgent
                                     EMPTY)),                                                // empty string
 
             httpUACH = new UACHData(headers, true),