Remove the need for a semaphore in ResourceResponse

readium · Jul 12, 2024 · be843c6 · be843c6
1 parent 548b29c
commit be843c6
Showing 1 changed file with 12 additions and 19 deletions.
diff --git a/Sources/Adapters/GCDWebServer/ResourceResponse.swift b/Sources/Adapters/GCDWebServer/ResourceResponse.swift
@@ -98,26 +98,19 @@ class ResourceResponse: ReadiumGCDWebServerFileResponse, Loggable {
     }
 
     /// Read a new chunk of data.
-    override open func readData() throws -> Data {
-        let semaphore = DispatchSemaphore(value: 0)
-        Task {
-            let len = min(bufferSize, range.count - Int(totalNumberOfBytesRead))
-            // If nothing to read, return
-            guard len > 0, offset < length else {
-                lastReadData = .success(Data())
-                return
-            }
-            // Read
-            lastReadData = await resource.read(range: offset ..< (offset + UInt64(len)))
-            if case let .success(data) = lastReadData {
-                totalNumberOfBytesRead += UInt64(data.count)
-                offset += UInt64(data.count)
-            }
-
-            semaphore.signal()
+    override func asyncReadData() async throws -> Data {
+        let len = min(bufferSize, range.count - Int(totalNumberOfBytesRead))
+        // If nothing to read, return
+        guard len > 0, offset < length else {
+            lastReadData = .success(Data())
+            return Data()
+        }
+        // Read
+        lastReadData = await resource.read(range: offset ..< (offset + UInt64(len)))
+        if case let .success(data) = lastReadData {
+            totalNumberOfBytesRead += UInt64(data.count)
+            offset += UInt64(data.count)
         }
-
-        _ = semaphore.wait(timeout: .distantFuture)
 
         return (try? lastReadData?.get()) ?? Data()
     }