Skip to content

Commit

Permalink
Fix #519 #521 #616 - Improve iPhone & iOS detection
Browse files Browse the repository at this point in the history
  • Loading branch information
faisalman committed Mar 20, 2023
1 parent 0097b21 commit a1d816a
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/ua-parser.js
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@
], [MODEL, [VENDOR, SAMSUNG], [TYPE, MOBILE]], [

// Apple
/\((ip(?:hone|od)[\w ]*);/i // iPod/iPhone
/(?:\/|\()(ip(?:hone|od)[\w, ]*)(?:\/|;)/i // iPod/iPhone
], [MODEL, [VENDOR, APPLE], [TYPE, MOBILE]], [
/\((ipad);[-\w\),; ]+apple/i, // iPad
/applecoremedia\/[\w\.]+ \((ipad)/i,
Expand Down Expand Up @@ -789,6 +789,7 @@

// iOS/macOS
/ip[honead]{2,4}\b(?:.*os ([\w]+) like mac|; opera)/i, // iOS
/ios;fbsv\/([\d\.]+)/i,
/cfnetwork\/.+darwin/i
], [[VERSION, /_/g, '.'], [NAME, 'iOS']], [
/(mac os x) ?([\w\. ]*)/i,
Expand Down
11 changes: 11 additions & 0 deletions test/device-test.json
Original file line number Diff line number Diff line change
Expand Up @@ -3136,6 +3136,17 @@
"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]",
"expect": {
"vendor": "Apple",
"model": "iPhone12,1",
"type": "mobile"
}
},
{
"desc": "Issue #519",
"ua": "ios/iPhone/14.2/SOME_CUSTOM_APP_VERSION",
"expect": {
"vendor": "Apple",
"model": "iPhone",
"type": "mobile"
}
},
Expand Down
9 changes: 9 additions & 0 deletions test/os-test.json
Original file line number Diff line number Diff line change
Expand Up @@ -764,6 +764,15 @@
"version" : "undefined"
}
},
{
"desc": "iOS with 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]",
"expect":
{
"name" : "iOS",
"version" : "13.6.1"
}
},
{
"desc" : "watchOS",
"ua" : "server-bag [Watch OS,8.4,19S546,Watch3,4]",
Expand Down

0 comments on commit a1d816a

Please sign in to comment.