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

Re-apply change from adbac2be284234b0cf8ff22e17b2ecec2036a8b8

Browse Source 
feat: read detail model for iphone, ipod, ipad if the model information exist
This commit is contained in:
Kevin You 2023-03-24 00:21:45 -05:00
parent 2eb1fd8a66
commit f89fc31634
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ua-parser.js
View File

@ -459,6 +459,14 @@
[MODEL, [VENDOR, SAMSUNG], [TYPE, MOBILE]], [MODEL, [VENDOR, SAMSUNG], [TYPE, MOBILE]],
[ [
// Apple // Apple
/((ipod|iphone)\d+,\d+)/i // iPod/iPhone model
],
[MODEL, [VENDOR, APPLE], [TYPE, MOBILE]],
[
/(ipad\d+,\d+)/i // iPad model
],
[MODEL, [VENDOR, APPLE], [TYPE, TABLET]],
[
/\((ip(?:hone|od)[\w ]*);/i // iPod/iPhone /\((ip(?:hone|od)[\w ]*);/i // iPod/iPhone
], ],
[MODEL, [VENDOR, APPLE], [TYPE, MOBILE]], [MODEL, [VENDOR, APPLE], [TYPE, MOBILE]],

18
test/device-test.json
View File

@ -768,7 +768,7 @@
"ua": "Mozilla/5.0 (iPad; U; CPU OS 11_2 like Mac OS X; zh-CN; iPad5,3) AppleWebKit/534.46 (KHTML, like Gecko) UCBrowser/3.0.1.776 U3/ Mobile/10A403 Safari/7543.48.3", "ua": "Mozilla/5.0 (iPad; U; CPU OS 11_2 like Mac OS X; zh-CN; iPad5,3) AppleWebKit/534.46 (KHTML, like Gecko) UCBrowser/3.0.1.776 U3/ Mobile/10A403 Safari/7543.48.3",
"expect": { "expect": {
"vendor": "Apple", "vendor": "Apple",
"model": "iPad", "model": "iPad5,3",
"type": "tablet" "type": "tablet"
} }
}, },
@ -777,7 +777,7 @@
"ua": "Mozilla/5.0 (iPad; CPU OS 12_4_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPad4,1;FBMD/iPad;FBSN/iOS;FBSV/12.4.5;FBSS/2;FBID/tablet;FBLC/en_US;FBOP/5;FBCR/]", "ua": "Mozilla/5.0 (iPad; CPU OS 12_4_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPad4,1;FBMD/iPad;FBSN/iOS;FBSV/12.4.5;FBSS/2;FBID/tablet;FBLC/en_US;FBOP/5;FBCR/]",
"expect": { "expect": {
"vendor": "Apple", "vendor": "Apple",
"model": "iPad", "model": "iPad4,1",
"type": "tablet" "type": "tablet"
} }
}, },
@ -786,7 +786,7 @@
"ua": "Mozilla/5.0 (iPad; CPU OS 14_4_2 like Mac OS X) WebKit/8610 (KHTML, like Gecko) Mobile/18D70 [FBAN/FBIOS;FBDV/iPad7,11;FBMD/iPad;FBSN/iOS;FBSV/14.4.2;FBSS/2;FBID/tablet;FBLC/en_US;FBOP/5]", "ua": "Mozilla/5.0 (iPad; CPU OS 14_4_2 like Mac OS X) WebKit/8610 (KHTML, like Gecko) Mobile/18D70 [FBAN/FBIOS;FBDV/iPad7,11;FBMD/iPad;FBSN/iOS;FBSV/14.4.2;FBSS/2;FBID/tablet;FBLC/en_US;FBOP/5]",
"expect": { "expect": {
"vendor": "Apple", "vendor": "Apple",
"model": "iPad", "model": "iPad7,11",
"type": "tablet" "type": "tablet"
} }
}, },
@ -1076,7 +1076,7 @@
"ua": "Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone8,4;FBMD/iPhone;FBSN/iOS;FBSV/13.3.1;FBSS/2;FBID/phone;FBLC/en_US;FBOP/5;FBCR/]", "ua": "Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone8,4;FBMD/iPhone;FBSN/iOS;FBSV/13.3.1;FBSS/2;FBID/phone;FBLC/en_US;FBOP/5;FBCR/]",
"expect": { "expect": {
"vendor": "Apple", "vendor": "Apple",
"model": "iPhone", "model": "iPhone8,4",
"type": "mobile" "type": "mobile"
} }
}, },
@ -1085,7 +1085,7 @@
"ua": "Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone8,4;FBMD/iPhone;FBSN/iOS;FBSV/13.3.1;FBSS/2;FBID/phone;FBLC/en_US;FBOP/5;FBCR/]", "ua": "Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone8,4;FBMD/iPhone;FBSN/iOS;FBSV/13.3.1;FBSS/2;FBID/phone;FBLC/en_US;FBOP/5;FBCR/]",
"expect": { "expect": {
"vendor": "Apple", "vendor": "Apple",
"model": "iPhone", "model": "iPhone8,4",
"type": "mobile" "type": "mobile"
} }
}, },
@ -1094,7 +1094,7 @@
"ua": "Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone12,5;FBMD/iPhone;FBSN/iOS;FBSV/13.3.1;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/]", "ua": "Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone12,5;FBMD/iPhone;FBSN/iOS;FBSV/13.3.1;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/]",
"expect": { "expect": {
"vendor": "Apple", "vendor": "Apple",
"model": "iPhone", "model": "iPhone12,5",
"type": "mobile" "type": "mobile"
} }
}, },
@ -1103,7 +1103,7 @@
"ua": "Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone11,2;FBMD/iPhone;FBSN/iOS;FBSV/13.3.1;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/]", "ua": "Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone11,2;FBMD/iPhone;FBSN/iOS;FBSV/13.3.1;FBSS/3;FBID/phone;FBLC/en_US;FBOP/5;FBCR/]",
"expect": { "expect": {
"vendor": "Apple", "vendor": "Apple",
"model": "iPhone", "model": "iPhone11,2",
"type": "mobile" "type": "mobile"
} }
}, },
@ -2927,7 +2927,9 @@
"desc": "FaceBook Mobile App", "desc": "FaceBook Mobile App",
"ua": "[FBAN/FBIOS;FBAV/283.0.0.44.117;FBBV/238386386;FBDV/iPhone12,1;FBMD/iPhone;FBSN/iOS;FBSV/13.6.1;FBSS/2;FBID/phone;FBLC/en_US;FBOP/5;FBRV/240127608]", "ua": "[FBAN/FBIOS;FBAV/283.0.0.44.117;FBBV/238386386;FBDV/iPhone12,1;FBMD/iPhone;FBSN/iOS;FBSV/13.6.1;FBSS/2;FBID/phone;FBLC/en_US;FBOP/5;FBRV/240127608]",
"expect": { "expect": {
"type": "mobile" "type": "mobile",
"model": "iPhone12,1",
"vendor": "Apple"
} }
}, },
{ {