Merge tag '2.0.6' into pro-personal

Author: faisalman

CHANGELOG.md

@@ -23,8 +23,12 @@
 - **Support for Custom/Predefined Extensions:**
   - Pass custom regexes or predefined extensions as a list to `UAParser()`
 
-- **Support for CLI Parsing:**
-  - Parse a user-agent directly from the command line using `npx ua-parser-js "[User-Agent]"`
+- **Support for CLI Processing:**
+  - Directly parse user-agent strings from the command line:
+    `npx ua-parser-js "<User-Agent>"`
+  - Process batch data from files: 
+    `npx ua-parser-js --input-file=log.txt >> result.json` or
+    `npx ua-parser-js --input-file=log.txt --output-file=result.json`
 
 - **Enhanced Detection with Client Hints:**
   - `withClientHints()`: Improves detection accuracy by leveraging client hints
@@ -65,6 +69,20 @@
 
 --- 
 
+## Version 2.0.6
+- Add new CLI feature: processing batch user-agent data from file and output as JSON
+- Fix `setUA()`: trim leading space from user-agent string input
+- Replace `undici` dependency with node's internal `Headers`
+- Add new browser: Bing, Qwant
+- Add new device vendor: Hisense, Wiko
+- Improve browser detection: Mozilla, Pale Moon
+- Improve CPU detection: 68k
+- Improve device detection: Apple, BlackBerry, Huawei, Nokia, Xiaomi
+- Improve OS detection: iOS 26
+- `extensions` submodule:
+    - Add new fetcher: Discordbot, KeybaseBot, Slackbot, Slackbot-LinkExpanding, Slack-ImgProxy, Twitterbot
+    - Add new crawler: Qwantbot-news, SurdotlyBot, SwiftBot
+
 ## Version 2.0.5
 
 - Add new browser: Zalo

README.md

@@ -22,8 +22,12 @@ https://docs.uaparser.dev
 import { UAParser } from '@ua-parser-js/pro-personal';
 ```
 
+```js
+import { isFrozenUA } from '@ua-parser-js/pro-personal/helpers';
+```
+
 # License
 
 UAParser.js PRO Personal
 
-Copyright (c) 2023-2024 Faisal Salman <<f@faisalman.com>>
+Copyright (c) 2023-2025 Faisal Salman <<f@faisalman.com>>

dist/ua-parser.min.js

@@ -1,25 +1,25 @@
 {
   "title": "UAParser.js PRO Personal",
   "name": "@ua-parser-js/pro-personal",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "author": "Faisal Salman <f@faisalman.com> (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": [
     "user-agent",
     "client-hints",
-    "parser",
     "browser",
     "engine",
     "os",
     "device",
     "cpu",
-    "jquery-plugin",
-    "ecosystem:jquery",
     "ua-parser-js",
     "browser-detection",
     "device-detection",
     "os-detection",
-    "bot-detection"
+    "bot-detection",
+    "ai-detection",
+    "app-detection",
+    "crawler-detection"
   ],
   "homepage": "https://uaparser.dev",
   "contributors": [
@@ -220,14 +220,13 @@
     "test:eslint": "eslint src && eslint script",
     "test:jshint": "jshint src/main",
     "test:lockfile-lint": "npx lockfile-lint -p package-lock.json",
-    "test:mocha": "mocha test/unit",
+    "test:mocha": "mocha --recursive test/unit",
     "test:playwright": "npx playwright install && playwright test test/e2e --browser all"
   },
   "dependencies": {
     "detect-europe-js": "^0.1.2",
     "is-standalone-pwa": "^0.1.1",
-    "ua-is-frozen": "^0.1.2",
-    "undici": "^7.12.0"
+    "ua-is-frozen": "^0.1.2"
   },
   "devDependencies": {
     "@babel/parser": "7.15.8",

dist/ua-parser.min.mjs

@@ -1,4 +1,94 @@
 #!/usr/bin/env node
 
-const UAParser = require('ua-parser-js');
-console.log(JSON.stringify(process.argv.slice(2).map(ua => UAParser(ua)), null, 4));
+try {    
+    const fs = require('node:fs');
+    const path = require('node:path');
+    const { performance } = require('node:perf_hooks');
+    const readline = require('node:readline');
+    const { parseArgs } = require('node:util');
+    const UAParser = require('../src/main/ua-parser');
+    const { Bots, Emails, ExtraDevices, InApps, Vehicles } = require('../src/extensions/ua-parser-extensions');
+
+    if (!process.argv[2].startsWith('-')) {
+
+        const results = process.argv.slice(2).map(ua => UAParser(ua));
+        console.log(JSON.stringify(results, null, 4));
+        process.exit(0);
+
+    } else if (['-h', '--help'].includes(process.argv[2])) {
+
+        console.log('Usage: npx ua-parser-js <string>');
+        console.log('   or  npx ua-parser-js --input-file <filepath> [--output-file <filepath>]');
+        console.log('-i, --input-file');
+        console.log('-o, --output-file');
+        process.exit(0);
+
+    } else {
+
+        const startPerf = performance.now();
+        const {
+            values: { 
+                'input-file': inputFile, 
+                'output-file': outputFile 
+            },
+        } = parseArgs({
+            options: {
+                'input-file': { type: 'string', short: 'i' },
+                'output-file': { type: 'string', short: 'o' }
+            }
+        });
+
+        if (!inputFile) {
+            console.error('Input file must be present');
+            process.exit(1);
+        }
+
+        const inputPath = path.resolve(__dirname, inputFile);
+        const outputPath = outputFile ? path.resolve(__dirname, outputFile) : null;
+
+        if (!fs.existsSync(inputPath)) {
+            console.error(`Input file not found: ${inputPath}`);
+            process.exit(1);
+        }
+
+        const inputStream = fs.createReadStream(inputPath, 'utf8');
+        const rl = readline.createInterface({
+            input: inputStream,
+            crlfDelay: Infinity
+        });
+
+        const outputStream = outputPath ? fs.createWriteStream(outputPath, { encoding : 'utf8' }) : process.stdout;
+
+        const uap = new UAParser([Bots, Emails, ExtraDevices, InApps, Vehicles]);
+        let lineNumber = 0;
+
+        outputStream.write('[\n');
+
+        rl.on('line', line => {
+            const result = uap.setUA(line).getResult();
+            const json = JSON.stringify(result, null, 4);
+            if (lineNumber > 0) outputStream.write(',\n');
+            outputStream.write(json);
+            lineNumber++;
+        });
+
+        rl.on('close', () => {
+            outputStream.write('\n]');
+            if (outputPath) {
+                outputStream.end(() => {
+                    const finishPerf = performance.now();
+                    console.log(`Done!`);
+                    console.log(`Number of lines found: ${lineNumber}`);
+                    console.log(`Task finished in: ${(finishPerf - startPerf).toFixed(3)}ms`);
+                    console.log(`Output written to: ${outputPath}`);
+                    process.exit(0);
+                });
+            } else {
+                process.exit(0);
+            }
+        });
+    }
+} catch (err) {
+    console.error(err);
+    process.exit(1);
+}

dist/ua-parser.pack.js

@@ -3,7 +3,7 @@
 // Source: /src/enums/ua-parser-enums.js
 
 ///////////////////////////////////////////////
-/*  Enums for UAParser.js v2.0.5
+/*  Enums for UAParser.js v2.0.6
     https://github.com/faisalman/ua-parser-js
     Author: Faisal Salman <f@faisalman.com>
     UAParser.js PRO Personal License */
@@ -24,6 +24,7 @@ export const BrowserName: Readonly<{
     AVG: 'AVG Secure Browser',
     BAIDU: 'Baidu Browser',
     BASILISK: 'Basilisk',
+    BING: 'Bing',
     BLAZER: 'Blazer',
     BOLT: 'Bolt',
     BOWSER: 'Bowser',
@@ -129,6 +130,7 @@ export const BrowserName: Readonly<{
     QUARK: 'Quark',
     QUPZILLA: 'QupZilla',
     QUTEBROWSER: 'qutebrowser',
+    QWANT: 'Qwant',
     REKONQ: 'rekonq',
     ROCKMELT: 'Rockmelt',
     SAFARI: 'Safari',
@@ -243,6 +245,7 @@ export const DeviceVendor: Readonly<{
     GEEKSPHONE: 'GeeksPhone',
     GENERIC: 'Generic',
     GOOGLE: 'Google',
+    HISENSE: 'Hisense',
     HMD: 'HMD',
     HP: 'HP',
     HTC: 'HTC',
@@ -291,6 +294,7 @@ export const DeviceVendor: Readonly<{
     VIVO: 'Vivo',
     VIZIO: 'Vizio',
     VODAFONE: 'Vodafone',
+    WIKO: 'Wiko',
     XBOX: 'Xbox',
     XIAOMI: 'Xiaomi',
     ZEBRA: 'Zebra',
@@ -489,6 +493,7 @@ export const Extension: Readonly<{
             DUCKDUCKGO_BOT: 'DuckDuckBot',
             DUCKDUCKGO_FAVICONS_BOT: 'DuckDuckGo-Favicons-Bot',
             ELASTIC: 'Elastic',
+            ELASTIC_SWIFTYPE_BOT: 'Swiftbot',
             EXALEAD_EXABOT: 'Exabot',
             FIRECRAWL_AGENT: 'FirecrawlAgent',
             FREESPOKE: 'Freespoke',
@@ -538,6 +543,7 @@ export const Extension: Readonly<{
             PERPLEXITY_BOT: 'PerplexityBot',
             QIHOO_360_SPIDER: '360Spider',
             QWANT_BOT: 'Qwantbot',
+            QWANT_BOT_NEWS: 'Qwantbot-news',
             REPLICATE_BOT: 'Replicate-Bot',
             RUNPOD_BOT: 'RunPod-Bot',
             SB_INTUITIONS_BOT: 'SBIntuitionsBot',
@@ -551,6 +557,7 @@ export const Extension: Readonly<{
             SOGOU_PIC_SPIDER: 'Sogou Pic Spider',
             SOGOU_WEB_SPIDER: 'Sogou web spider',
             STARTPAGE: 'Startpage',
+            SURLY_BOT: 'SurdotlyBot',
             TIMPI_BOT: 'Timpibot',
             TOGETHER_BOT: 'Together-Bot',
             TURNITIN_BOT: 'TurnitinBot',
@@ -631,6 +638,7 @@ export const Extension: Readonly<{
             BLUESKY: 'Bluesky',
             BUFFER_LINKPREVIEWBOT: 'BufferLinkPreviewBot',
             COHERE_AI: 'Cohere-AI',
+            DISCORD_BOT: 'Discordbot',
             DUCKDUCKGO_ASSISTBOT: 'DuckAssistBot',
             GOOGLE_CHROME_LIGHTHOUSE: 'Chrome-Lighthouse',
             GOOGLE_FEEDFETCHER: 'FeedFetcher-Google',
@@ -643,6 +651,7 @@ export const Extension: Readonly<{
             HUBSPOT_PAGE_FETCHER: 'HubSpot Page Fetcher',
             IFRAMELY: 'Iframely',
             KAKAOTALK_SCRAP: 'kakaotalk-scrap',
+            KEYBASE_BOT: 'KeybaseBot',
             META_EXTERNALFETCHER: 'meta-externalfetcher',
             META_WHATSAPP: 'WhatsApp',
             MICROSOFT_BINGPREVIEW: 'BingPreview',
@@ -654,6 +663,9 @@ export const Extension: Readonly<{
             PERPLEXITY_USER: 'Perplexity-User',
             PINTEREST_BOT: 'Pinterestbot',
             SEMRUSH_SITEAUDITBOT: 'SiteAuditBot',
+            SLACK_BOT: 'Slackbot',
+            SLACK_BOT_LINKEXPANDING: 'Slackbot-LinkExpanding',
+            SLACK_IMGPROXY: 'Slack-ImgProxy',
             SNAP_URL_PREVIEW: 'Snap URL Preview',
             SKYPE_URIPREVIEW: 'SkypeUriPreview',
             TELEGRAM_BOT: 'TelegramBot',
@@ -663,6 +675,7 @@ export const Extension: Readonly<{
             VERCEL_BOT: 'Vercelbot',
             VERCEL_FLAGS: 'vercelflags',
             VERCEL_TRACING: 'verceltracing',
+            X_TWITTERBOT: 'Twitterbot',
             YANDEX_CALENDAR: 'YandexCalendar',
             YANDEX_DIRECT: 'YandexDirect',
             YANDEX_DIRECTDYN: 'YandexDirectDyn',