Update cleanMessageData method

Author: Recouse

Sources/EventSource/Data+Trim.swift

@@ -0,0 +1,44 @@
+//
+//  Data+Trim.swift
+//  EventSource
+//
+//  Created by Firdavs Khaydarov on 06/07/2025.
+//
+
+import Foundation
+
+extension Data {
+    package func trimmingPrefix(while predicate: (Element) -> Bool) -> SubSequence {
+        let start = endOfPrefix(while: predicate)
+        return self[start..<endIndex]
+    }
+
+    package func trimmingSuffix(while predicate: (Element) -> Bool) -> SubSequence {
+        let end = startOfSuffix(while: predicate)
+        return self[startIndex..<end]
+    }
+
+    package func trimming(while predicate: (Element) -> Bool) -> SubSequence {
+        trimmingPrefix(while: predicate).trimmingSuffix(while: predicate)
+    }
+
+    package func endOfPrefix(while predicate: (Element) -> Bool) -> Index {
+        var index = startIndex
+        while index != endIndex && predicate(self[index]) {
+            formIndex(after: &index)
+        }
+        return index
+    }
+
+    package func startOfSuffix(while predicate: (Element) -> Bool) -> Index {
+        var index = endIndex
+        while index != startIndex {
+            let after = index
+            formIndex(before: &index)
+            if !predicate(self[index]) {
+                return after
+            }
+        }
+        return index
+    }
+}

Sources/EventSource/EventParser.swift

@@ -77,16 +77,18 @@ struct ServerEventParser: EventParser {
 
     private func cleanMessageData(_ messageData: Data) -> Data {
         var cleanData = messageData
+
         // remove trailing CR/LF characters from the end
         while !cleanData.isEmpty, cleanData.last == Self.cr || cleanData.last == Self.lf {
             cleanData = cleanData.dropLast()
         }
-        guard let messageString = String(data: cleanData, encoding: .utf8) else { return cleanData }
+
         // also clean internal lines within each message to remove trailing \r
-        let cleanedLines = messageString.components(separatedBy: .newlines)
-            .map { $0.trimmingCharacters(in: CharacterSet(charactersIn: "\r")) }
-        let cleanedMessage = cleanedLines.joined(separator: "\n")
-        return Data(cleanedMessage.utf8)
+        let cleanedLines = cleanData.split(separator: Self.lf)
+            .map { line in line.trimming(while: { $0 == Self.cr }) }
+            .joined(separator: [Self.lf])
+
+        return Data(cleanedLines)
     }
 }