Compare commits

..

13 Commits

Author SHA1 Message Date
Faisal Salman
40aa1a693b bump version 2017-10-12 12:10:08 +07:00
Faisal Salman
25e143ee7c Fix vulnerable regex in getOS() (as reported by Nick Starke) 2017-10-12 12:07:10 +07:00
Faisal Salman
7bd9ffea24 Fix #262 Chrome Headless 2017-10-12 09:48:25 +07:00
Faisal Salman
c566f45cbd Merge branch 'master' into develop 2017-10-12 09:39:37 +07:00
Faisal Salman
5ba5e7abc9 Merge branch 'develop' of github.com:faisalman/ua-parser-js into develop 2017-10-12 09:19:03 +07:00
Faisal Salman
b8978f5933 Fix #262 Chrome Headless 2017-10-12 09:18:42 +07:00
Faisal Salman
eeb1b9ef81 Merge pull request #265 from brophdawg11/support-ios-gsa
Add support for Google Search Appliance on iOS
2017-10-11 21:35:06 +07:00
Faisal Salman
aeae29be66 Merge pull request #267 from LukasDrgon/patch-1
Add CDN link
2017-10-11 20:48:39 +07:00
Lukas Drgon
3ce12c0cf9 Add CDN link 2017-10-02 19:31:03 +02:00
Matt Brophy
4d95ac10ef Add support for Google Search Appliance on iOS 2017-09-19 14:19:32 -04:00
Faisal Salman
61b4a089c5 Merge pull request #264 from arunrreddy/support-device-redmi
Support device redmi
2017-09-17 06:02:39 +07:00
Arun Rama Reddy
74ec93ffb6 feat: Added Redmi phone and Mi Pad tablet detection support 2017-09-16 11:12:29 +05:30
Faisal Salman
6f621f1ae2 New feature: CLI support 2017-08-06 07:55:22 +07:00
9 changed files with 683 additions and 721 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "ua-parser-js",
"version": "0.7.15",
"version": "0.7.16",
"authors": [
"Faisal Salman <fyzlman@gmail.com>"
],

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1,6 +1,6 @@
Package.describe({
name: 'faisalman:ua-parser-js',
version: '0.7.15',
version: '0.7.16',
summary: 'Lightweight JavaScript-based user-agent string parser',
git: 'https://github.com/faisalman/ua-parser-js.git',
documentation: 'readme.md'

View File

@@ -1,7 +1,7 @@
{
"title": "UAParser.js",
"name": "ua-parser-js",
"version": "0.7.15",
"version": "0.7.16",
"author": "Faisal Salman <f@faisalman.com> (http://faisalman.com)",
"description": "Lightweight JavaScript-based user-agent string parser",
"keywords": [

View File

@@ -212,6 +212,12 @@ requirejs(['ua-parser-js'], function(UAParser) {
});
```
## Using CDN
```html
<script src="https://cdn.jsdelivr.net/npm/ua-parser-js@0/dist/ua-parser.min.js"></script>
```
## Using bower
```sh
@@ -224,6 +230,18 @@ $ bower install ua-parser-js
$ meteor add faisalman:ua-parser-js
```
## Using CLI
```sh
$ node ua-parser.min.js "Mozilla/4.0 (compatible; MSIE 4.01; Windows 98)"
# multiple args
$ node ua-parser.min.js "Opera/1.2" "Opera/3.4"
# piped args
$ echo "Opera/1.2" | node ua-parser.min.js
# log file
$ cat ua.log | node ua-parser.min.js
```
## Using jQuery/Zepto ($.ua)
Although written in vanilla js (which means it doesn't depends on jQuery), this library will automatically detect if jQuery/Zepto is present and create `$.ua` object based on browser's user-agent (although in case you need, `window.UAParser` constructor is still present). To get/set user-agent you can use: `$.ua.get()` / `$.ua.set(uastring)`.

46
src/ua-parser.js Normal file → Executable file
View File

@@ -1,5 +1,5 @@
/**
* UAParser.js v0.7.15
* UAParser.js v0.7.16
* Lightweight JavaScript-based User-Agent string parser
* https://github.com/faisalman/ua-parser-js
*
@@ -16,7 +16,7 @@
/////////////
var LIBVERSION = '0.7.15',
var LIBVERSION = '0.7.16',
EMPTY = '',
UNKNOWN = '?',
FUNC_TYPE = 'function',
@@ -138,7 +138,7 @@
}
i += 2;
}
//console.log(this);
// console.log(this);
//return this;
},
@@ -292,7 +292,7 @@
/;fbav\/([\w\.]+);/i // Facebook App for iOS & Android
], [VERSION, [NAME, 'Facebook']], [
/(headlesschrome) ([\w\.]+)/i // Chrome Headless
/headlesschrome(?:\/([\w\.]+)|\s)/i // Chrome Headless
], [VERSION, [NAME, 'Chrome Headless']], [
/\swv\).+(chrome)\/([\w\.]+)/i // Chrome WebView
@@ -326,6 +326,9 @@
/version\/([\w\.]+).+?(mobile\s?safari|safari)/i // Safari & Safari Mobile
], [VERSION, NAME], [
/webkit.+?(gsa)\/([\w\.]+).+?(mobile\s?safari|safari)(\/[\w\.]+)/i // Google Search Appliance on iOS
], [[NAME, 'GSA'], VERSION], [
/webkit.+?(mobile\s?safari|safari)(\/[\w\.]+)/i // Safari < 3.0
], [NAME, [VERSION, mapper.str, maps.browser.oldsafari.version]], [
@@ -649,9 +652,11 @@
/android.+(\w+)\s+build\/hm\1/i, // Xiaomi Hongmi 'numeric' models
/android.+(hm[\s\-_]*note?[\s_]*(?:\d\w)?)\s+build/i, // Xiaomi Hongmi
/android.+(mi[\s\-_]*(?:one|one[\s_]plus|note lte)?[\s_]*(?:\d\w)?)\s+build/i // Xiaomi Mi
/android.+(mi[\s\-_]*(?:one|one[\s_]plus|note lte)?[\s_]*(?:\d\w)?)\s+build/i, // Xiaomi Mi
/android.+(redmi[\s\-_]*(?:note)?(?:[\s_]*[\w\s]+)?)\s+build/i // Redmi Phones
], [[MODEL, /_/g, ' '], [VENDOR, 'Xiaomi'], [TYPE, MOBILE]], [
/android.+(mi[\s\-_]*(?:pad)?(?:[\s_]*[\w\s]+)?)\s+build/i // Mi Pad tablets
],[[MODEL, /_/g, ' '], [VENDOR, 'Xiaomi'], [TYPE, TABLET]], [
/android.+;\s(m[1-5]\snote)\sbuild/i // Meizu Tablet
], [MODEL, [VENDOR, 'Meizu'], [TYPE, TABLET]], [
@@ -853,7 +858,7 @@
], [NAME, VERSION],[
/cfnetwork\/.+darwin/i,
/ip[honead]+(?:.*os\s([\w]+)*\slike\smac|;\sopera)/i // iOS
/ip[honead]+(?:.*os\s([\w]+)\slike\smac|;\sopera)/i // iOS
], [[VERSION, /_/g, '.'], [NAME, 'iOS']], [
/(mac\sos\sx)\s?([\w\s\.]+\w)*/i,
@@ -1001,6 +1006,33 @@
if (typeof module !== UNDEF_TYPE && module.exports) {
exports = module.exports = UAParser;
}
// TODO: test!!!
if (require && require.main === module && process) {
// cli
var jsonize = function (arr) {
var res = [];
for (var i in arr) {
res.push(new UAParser(arr[i]).getResult());
}
process.stdout.write(JSON.stringify(res, null, 2) + '\n');
};
if (process.stdin.isTTY) {
// via args
jsonize(process.argv.slice(2));
} else {
// via pipe
var str = '';
process.stdin.on('readable', function() {
var read = process.stdin.read();
if (read !== null) {
str += read;
}
});
process.stdin.on('end', function () {
jsonize(str.replace(/\n$/, '').split('\n'));
});
}
}
exports.UAParser = UAParser;
} else {
// requirejs env (optional)

View File

@@ -1,14 +1,4 @@
[
{
"desc" : "Chrome Headless",
"ua" : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) HeadlessChrome Safari/537.36",
"expect" :
{
"name" : "Chrome Headless",
"version" : "HeadlessChrome",
"major" : ""
}
},
{
"desc" : "Android Browser on Galaxy Nexus",
"ua" : "Mozilla/5.0 (Linux; U; Android 4.0.2; en-us; Galaxy Nexus Build/ICL53F) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
@@ -149,6 +139,26 @@
"major" : "20"
}
},
{
"desc" : "Chrome Headless",
"ua" : "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) HeadlessChrome Safari/537.36",
"expect" :
{
"name" : "Chrome Headless",
"version" : "undefined",
"major" : "undefined"
}
},
{
"desc" : "Chrome Headless",
"ua" : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) HeadlessChrome/60.0.3112.113 Safari/537.36",
"expect" :
{
"name" : "Chrome Headless",
"version" : "60.0.3112.113",
"major" : "60"
}
},
{
"desc" : "Chrome WebView",
"ua" : "Mozilla/5.0 (Linux; Android 5.1.1; Nexus 5 Build/LMY48B; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/43.0.2357.65 Mobile Safari/537.36",
@@ -958,5 +968,15 @@
"version" : "6.5.8.2910",
"major" : "6"
}
},
{
"desc" : "GSA on iOS",
"ua" : "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_2 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) GSA/30.1.161623614 Mobile/14F89 Safari/602.1",
"expect" :
{
"name" : "GSA",
"version" : "30.1.161623614",
"major" : "30"
}
}
]

File diff suppressed because it is too large Load Diff