correct user-agent parser bug

Author: tayloraswift

Sources/SwiftinitServer/Server/Swiftinit.ClientAnnotation.swift

@@ -147,35 +147,35 @@ extension Swiftinit.ClientAnnotation
                     suspicion -= 100
                 }
 
-            case .single("AppleWebKit", let version?):
+            case .single("AppleWebKit", .numeric(let version, _)?):
                 //  Modern WebKit version: might be a Barbie.
-                if  version.major >= 604
+                if  version >= 604
                 {
                     suspicion -= 1
                 }
 
-            case .single("Firefox", let version?):
+            case .single("Firefox", .numeric(let version, _)?):
                 //  Modern Firefox version: might be a Barbie.
-                if  version.major >= 115
+                if  version >= 115
                 {
                     suspicion -= 1
                 }
 
-            case .single("CriOS", let version?):
+            case .single("CriOS", .numeric(let version, _)?):
                 //  Modern Chrome version: might be a Barbie.
-                if  version.major >= 109
+                if  version >= 109
                 {
                     suspicion -= 1
                 }
 
-            case .single("Chrome", let version?):
+            case .single("Chrome", .numeric(let version, _)?):
                 //  Modern Chrome version: might be a Barbie.
-                if  version.major >= 109
+                if  version >= 109
                 {
                     suspicion -= 1
                 }
                 //  Very old Chrome version: probably a bot.
-                if  version.major < 90
+                if  version < 90
                 {
                     suspicion += 10
                 }

Sources/UA/Parser/UA.VersionRule.swift

@@ -17,16 +17,18 @@ extension UA.VersionRule:ParsingRule
         where Source:Collection<UInt8>, Source.Index == Location
     {
         try input.parse(as: UnicodeEncoding.Slash.self)
-        let major:Int = try input.parse(
-            as: Pattern.UnsignedInteger<UnicodeDigit<Location, Terminal, Int>.Decimal>.self)
 
-        if  let _:Void = input.parse(as: UnicodeEncoding.Period?.self)
+        if  let (major, _):(Int, Void) = try? input.parse(as:
+                (
+                    Pattern.UnsignedInteger<UnicodeDigit<Location, Terminal, Int>.Decimal>,
+                    UnicodeEncoding.Period
+                ).self)
         {
-            return .init(major: major, minor: try input.parse(as: UA.NameRule.self))
+            return .numeric(major, try input.parse(as: UA.NameRule.self))
         }
         else
         {
-            return .init(major: major, minor: nil)
+            return .nominal(try input.parse(as: UA.NameRule.self))
         }
     }
 }

Sources/UA/UA.Component.swift

@@ -14,7 +14,7 @@ extension UA.Component
     @inlinable public static
     func single(_ name:String, _ major:Int, _ minor:String? = nil) -> Self
     {
-        .single(name, .init(major: major, minor: minor))
+        .single(name, .numeric(major, minor))
     }
 
     @inlinable public static

Sources/UA/UA.Version.swift

@@ -1,18 +1,21 @@
 extension UA
 {
     @frozen public
-    struct Version:Equatable, Hashable, Sendable
+    enum Version:Equatable, Hashable, Sendable
     {
-        public
-        let major:Int
-        public
-        let minor:String?
-
-        @inlinable public
-        init(major:Int, minor:String? = nil)
+        case numeric(Int, String?)
+        case nominal(String)
+    }
+}
+extension UA.Version
+{
+    @inlinable public
+    var major:Int?
+    {
+        switch self
         {
-            self.major = major
-            self.minor = minor
+        case .numeric(let major, _):    major
+        case .nominal:                  nil
         }
     }
 }
@@ -21,6 +24,11 @@ extension UA.Version:CustomStringConvertible
     @inlinable public
     var description:String
     {
-        self.minor.map { "\(self.major).\($0)" } ?? "\(self.major)"
+        switch self
+        {
+        case .numeric(let major, let suffix?):  "\(major).\(suffix)"
+        case .numeric(let major, nil):          "\(major)"
+        case .nominal(let name):                name
+        }
     }
 }

Sources/UA/UA.swift

@@ -51,6 +51,12 @@ extension UA:CustomStringConvertible
 }
 extension UA:LosslessStringConvertible
 {
+    public
+    init(parsing description:String) throws
+    {
+        self.init(components: try ParsingRule.parse(description.utf8))
+    }
+
     public
     init?(_ description:String)
     {

Sources/UATests/Main.Parsing.swift

@@ -9,6 +9,9 @@ extension Main
     {
     }
 }
+
+import Grammar
+
 extension Main.Parsing:TestBattery
 {
     private static
@@ -23,13 +26,26 @@ extension Main.Parsing:TestBattery
     static
     func run(tests:TestGroup)
     {
-        //  TODO
-        let _:String = """
-        Mozilla/5.0 (iPhone; CPU iPhone OS 17_1_2 like Mac OS X) \
-        AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.1.2 Mobile/15E148 Safari/604.1
-        """
-
-        if  let tests:TestGroup = tests / "SafariWithPrivacyGuard"
+        if  let tests:TestGroup = tests / "iPhoneSafari"
+        {
+            Self.run(tests,
+                parsing: """
+                Mozilla/5.0 (iPhone; CPU iPhone OS 17_1_2 like Mac OS X) \
+                AppleWebKit/605.1.15 (KHTML, like Gecko) \
+                Version/17.1.2 Mobile/15E148 Safari/604.1
+                """,
+                expected:
+                [
+                    .single("Mozilla", 5, "0"),
+                    .group("iPhone", "CPU iPhone OS 17_1_2 like Mac OS X"),
+                    .single("AppleWebKit", 605, "1.15"),
+                    .group("KHTML, like Gecko"),
+                    .single("Version", 17, "1.2"),
+                    .single("Mobile", .nominal("15E148")),
+                    .single("Safari", 604, "1"),
+                ])
+        }
+        if  let tests:TestGroup = tests / "macSafariWithPrivacyGuard"
         {
             Self.run(tests,
                 parsing: """