github_mirrors/ua-parser-js
3
0
Fork 1
mirror of https://github.com/faisalman/ua-parser-js.git synced 2025-09-27 16:08:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix #643 - Improve iOS detection + detect Slack (&Slackbot)

Browse Source
This commit is contained in:
Faisal Salman 2023-04-15 01:08:46 +07:00
parent c3be7326b8
commit 29fb85658a
4 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/ua-parser-extension.js
View File

@ -15,10 +15,19 @@ const VERSION = 'version';
const MOBILE = 'mobile'; const MOBILE = 'mobile';
const TABLET = 'tablet'; const TABLET = 'tablet';
const Apps = Object.freeze({
browser : [
[/chatlyio\/([\d\.]+)/i], [VERSION, 'Slack', [TYPE, 'app']]
]
});
const Bots = Object.freeze({ const Bots = Object.freeze({
browser : [ browser : [
// Googlebot / BingBot / MSNBot / FacebookBot // Googlebot / BingBot / MSNBot / FacebookBot
[/((?:google|bing|msn|facebook)bot(?:\-[imagevdo]{5})?|bingpreview)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'bot']] [/((?:google|bing|msn|facebook)bot(?:\-[imagevdo]{5})?|bingpreview)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'bot']],
// Slackbot - https://api.slack.com/robots
[/(slack(?:bot)?(?:-imgproxy|-linkexpanding)?) ([\w\.]+)/i], [NAME, VERSION, [TYPE, 'bot']]
] ]
}); });
@ -107,16 +116,17 @@ const Emails = Object.freeze({
] ]
}); });
const Tools = Object.freeze({ const CLI = Object.freeze({
browser : [ browser : [
// wget / curl / lynx // wget / curl / lynx
[/(wget|curl|lynx)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'tool']] [/(wget|curl|lynx)\/([\w\.]+)/i], [NAME, VERSION, [TYPE, 'cli']]
] ]
}); });
module.exports = { module.exports = {
Apps,
Bots, Bots,
ExtraDevices, ExtraDevices,
Emails, Emails,
Tools CLI
}; };

2
src/ua-parser.js
View File

@ -732,7 +732,7 @@
// iOS/macOS // iOS/macOS
/ip[honead]{2,4}\b(?:.*os ([\w]+) like mac|; opera)/i, // iOS /ip[honead]{2,4}\b(?:.*os ([\w]+) like mac|; opera)/i, // iOS
/ios;fbsv\/([\d\.]+)/i, /(?:ios;fbsv\/|iphone.+ios[\/ ])([\d\.]+)/i,
/cfnetwork\/.+darwin/i /cfnetwork\/.+darwin/i
], [[VERSION, /_/g, '.'], [NAME, 'iOS']], [ ], [[VERSION, /_/g, '.'], [NAME, 'iOS']], [
/(mac os x) ?([\w\. ]*)/i, /(mac os x) ?([\w\. ]*)/i,

12
test/mocha-test-extension.js
View File

@ -1,7 +1,7 @@
const assert = require('assert'); const assert = require('assert');
const safeRegex = require('safe-regex'); const safeRegex = require('safe-regex');
const UAParser = require('ua-parser-js'); const UAParser = require('ua-parser-js');
const { Bots, Emails, Tools } = require('ua-parser-js/extensions'); const { Bots, Emails, CLI } = require('ua-parser-js/extensions');
describe('Bots', () => { describe('Bots', () => {
it('Can detect bots', () => { it('Can detect bots', () => {
@ -20,11 +20,11 @@ describe('Bots', () => {
assert.deepEqual(botParser.setUA(bingPreview).getBrowser(), {name: "BingPreview", version: "1.0b", major: "1", type: "bot"}); assert.deepEqual(botParser.setUA(bingPreview).getBrowser(), {name: "BingPreview", version: "1.0b", major: "1", type: "bot"});
assert.deepEqual(botParser.setUA(opera).getBrowser(), {name: "Opera", version: "8.5", major: "8"}); assert.deepEqual(botParser.setUA(opera).getBrowser(), {name: "Opera", version: "8.5", major: "8"});
// try merging Bots & Tools // try merging Bots & CLIs
const botsAndTools = { browser : [...Bots.browser, ...Tools.browser]}; const botsAndCLIs = { browser : [...Bots.browser, ...CLI.browser]};
const botolParser = new UAParser(botsAndTools); const botsAndCLIsParser = new UAParser(botsAndCLIs);
assert.deepEqual(botolParser.setUA(wget).getBrowser(), {name: "Wget", version: "1.21.1", major: "1", type:"tool"}); assert.deepEqual(botsAndCLIsParser.setUA(wget).getBrowser(), {name: "Wget", version: "1.21.1", major: "1", type:"cli"});
assert.deepEqual(botolParser.setUA(facebookBot).getBrowser(), {name: "FacebookBot", version: "1.0", major: "1", type:"bot"}); assert.deepEqual(botsAndCLIsParser.setUA(facebookBot).getBrowser(), {name: "FacebookBot", version: "1.0", major: "1", type:"bot"});
const emailParser = new UAParser(Emails); const emailParser = new UAParser(Emails);
assert.deepEqual(emailParser.setUA(outlook).getBrowser(), {name: "Microsoft Outlook", version: "16.0.9126", major: "16", type: "email"}); assert.deepEqual(emailParser.setUA(outlook).getBrowser(), {name: "Microsoft Outlook", version: "16.0.9126", major: "16", type: "email"});

9
test/specs/os-all.json
View File

@ -773,6 +773,15 @@
"version" : "13.6.1" "version" : "13.6.1"
} }
}, },
{
"desc": "iOS with Slack App",
"ua": "com.tinyspeck.chatlyio/23.04.10 (iPhone; iOS 16.4.1; Scale/3.00)",
"expect":
{
"name" : "iOS",
"version" : "16.4.1"
}
},
{ {
"desc" : "watchOS", "desc" : "watchOS",
"ua" : "server-bag [Watch OS,8.4,19S546,Watch3,4]", "ua" : "server-bag [Watch OS,8.4,19S546,Watch3,4]",