Merge pull request #158 from swhitty/handle-offset-requests

Handle offset requests

Author: swhitty

FlyingFox/Sources/HTTPConnection.swift

@@ -60,8 +60,15 @@ struct HTTPConnection: Sendable {
         switch response.payload {
         case .httpBody(let sequence):
             try await socket.write(header)
+            var sent = 0
             for try await chunk in sequence {
-                try await socket.write(chunk)
+                do {
+                    try await socket.write(chunk)
+                    sent += chunk.count
+                } catch {
+                    let total = sequence.count.map(String.init) ?? "unknown"
+                    throw Error("\(error.localizedDescription), sent: \(sent)/\(total).")
+                }
             }
         case .webSocket(let handler):
             try await switchToWebSocket(with: handler, response: header)
@@ -82,6 +89,14 @@ struct HTTPConnection: Sendable {
     func close() throws {
         try socket.close()
     }
+
+    struct Error: LocalizedError {
+        var errorDescription: String?
+
+        init(_ description: String) {
+            self.errorDescription = description
+        }
+    }
 }
 
 extension HTTPConnection: Hashable {

FlyingFox/Sources/HTTPServer.swift

@@ -352,7 +352,8 @@ extension Logging {
     }
 
     func logRequest(_ request: HTTPRequest, on connection: HTTPConnection) {
-        logInfo("\(connection.identifer) request: \(request.method.rawValue) \(request.path)")
+        let suffix = request.headers[.range] != nil ? " <ranged>" : ""
+        logInfo("\(connection.identifer) request: \(request.method.rawValue) \(request.path)\(suffix)")
     }
 
     func logError(_ error: any Error, on connection: HTTPConnection) {

FlyingFox/Sources/Handlers/FileHTTPHandler.swift

@@ -105,7 +105,7 @@ public struct FileHTTPHandler: HTTPHandler {
                 )
             }
 
-            if let range = Self.makePartialRange(for: request.headers) {
+            if let range = Self.makePartialRange(for: request.headers, fileSize: fileSize) {
                 headers[.contentRange] = "bytes \(range.lowerBound)-\(range.upperBound)/\(fileSize)"
                 return try HTTPResponse(
                     statusCode: .partialContent,
@@ -124,17 +124,19 @@ public struct FileHTTPHandler: HTTPHandler {
         }
     }
 
-    static func makePartialRange(for headers: [HTTPHeader: String]) -> ClosedRange<Int>? {
+    static func makePartialRange(for headers: [HTTPHeader: String], fileSize: Int) -> ClosedRange<Int>? {
         guard let headerValue = headers[.range] else { return nil }
         let scanner = Scanner(string: headerValue)
         guard scanner.scanString("bytes") != nil,
               scanner.scanString("=") != nil,
               let start = scanner.scanInt(),
-              scanner.scanString("-") != nil,
-              let end = scanner.scanInt(),
-              start <= end else {
+              scanner.scanString("-") != nil else {
             return nil
         }
+
+        // if no end clamp at 10MB
+        let end = scanner.scanInt() ?? min(start + 10_000_000, fileSize) - 1
+        guard start <= end else { return nil }
         return start...end
     }
 }

FlyingFox/Tests/Handlers/HTTPHandlerTests.swift

@@ -186,6 +186,15 @@ struct HTTPHandlerTests {
         #expect(
             FileHTTPHandler.makePartialRange(for: [.range: "bytes=1-5"]) == 1...5
         )
+        #expect(
+            FileHTTPHandler.makePartialRange(for: [.range: "bytes=0-5100"]) == 0...5100
+        )
+        #expect(
+            FileHTTPHandler.makePartialRange(for: [.range: "bytes=0-"], fileSize: 10) == 0...9
+        )
+        #expect(
+            FileHTTPHandler.makePartialRange(for: [.range: "bytes=2-"], fileSize: 10) == 2...9
+        )
         #expect(
             FileHTTPHandler.makePartialRange(for: [.range: "bytes = 8 - 10"]) == 8...10
         )
@@ -313,3 +322,9 @@ struct HTTPHandlerTests {
         #expect(response.statusCode == .ok)
     }
 }
+
+private extension FileHTTPHandler {
+    static func makePartialRange(for headers: [HTTPHeader: String]) -> ClosedRange<Int>? {
+        makePartialRange(for: headers, fileSize: 10000)
+    }
+}