From 297c6538bcb75ebdaf1feebe1dac2e35ecc04cf5 Mon Sep 17 00:00:00 2001 From: Faisal Salman Date: Wed, 28 Jun 2017 16:12:43 +0700 Subject: [PATCH] Fix #206 Detect OS for iOS app --- src/ua-parser.js | 5 +++-- test/os-test.json | 9 +++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/ua-parser.js b/src/ua-parser.js index 5d6d1ac..24292f2 100644 --- a/src/ua-parser.js +++ b/src/ua-parser.js @@ -777,8 +777,9 @@ /(haiku)\s(\w+)/i // Haiku ], [NAME, VERSION],[ - /(ip[honead]+)(?:.*os\s([\w]+)*\slike\smac|;\sopera)/i // iOS - ], [[NAME, 'iOS'], [VERSION, /_/g, '.']], [ + /cfnetwork\/.+darwin/i, + /ip[honead]+(?:.*os\s([\w]+)*\slike\smac|;\sopera)/i // iOS + ], [[VERSION, /_/g, '.'], [NAME, 'iOS']], [ /(mac\sos\sx)\s?([\w\s\.]+\w)*/i, /(macintosh|mac(?=_powerpc)\s)/i // Mac OS diff --git a/test/os-test.json b/test/os-test.json index c0100d0..86aa837 100644 --- a/test/os-test.json +++ b/test/os-test.json @@ -485,6 +485,15 @@ "version" : "" } }, + { + "desc" : "iOS in App", + "ua" : "AppName/version CFNetwork/version Darwin/version", + "expect" : + { + "name" : "iOS", + "version" : "undefined" + } + }, { "desc" : "iOS with Chrome", "ua" : "Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_1_1 like Mac OS X; en) AppleWebKit/534.46.0 (KHTML, like Gecko) CriOS/19.0.1084.60 Mobile/9B206 Safari/7534.48.3",