Refactoring

Author: mickael-menu

Sources/Shared/Fetcher/HTTPFetcher.swift

@@ -61,18 +61,21 @@ public final class HTTPFetcher: Fetcher, Loggable {
         var file: FileURL? { nil }
 
         func stream(range: Range<UInt64>?, consume: @escaping (Data) -> Void, completion: @escaping (ResourceResult<Void>) -> Void) -> Cancellable {
-            var request = HTTPRequest(url: url)
-            if let range = range {
-                request.setRange(range)
-            }
-
-            return client.stream(
-                request,
-                consume: { data, _ in consume(data) },
-                completion: { result in
-                    completion(result.map { _ in }.mapError { ResourceError.wrap($0) })
+            let request = {
+                var request = HTTPRequest(url: url)
+                if let range = range {
+                    request.setRange(range)
                 }
-            )
+                return request
+            }()
+
+            return CancellableTask(task: Task {
+                let result = await client.stream(
+                    request: request,
+                    consume: { data, _ in consume(data) }
+                )
+                completion(result.map { _ in }.mapError { ResourceError.wrap($0) })
+            })
         }
 
         func close() {}

Sources/Shared/Toolkit/HTTP/HTTPClient.swift

@@ -145,21 +145,21 @@ public extension HTTPClient {
         }
     }
 
-    @available(*, deprecated, message: "Use the async variant.")
+    @available(*, unavailable, message: "Use the async variant.")
     func stream(_ request: HTTPRequestConvertible, receiveResponse: ((HTTPResponse) -> Void)?, consume: @escaping (_ chunk: Data, _ progress: Double?) -> Void, completion: @escaping (HTTPResult<HTTPResponse>) -> Void) -> Cancellable {
         CancellableTask(task: Task {
             await completion(stream(request: request, consume: consume))
         })
     }
 
-    @available(*, deprecated, message: "Use the async variant.")
+    @available(*, unavailable, message: "Use the async variant.")
     func stream(_ request: HTTPRequestConvertible, consume: @escaping (Data, Double?) -> Void, completion: @escaping (HTTPResult<HTTPResponse>) -> Void) -> Cancellable {
         CancellableTask(task: Task {
             await completion(stream(request: request, consume: consume))
         })
     }
 
-    @available(*, deprecated, message: "Use the async variant.")
+    @available(*, unavailable, message: "Use the async variant.")
     func fetch(_ request: HTTPRequestConvertible, completion: @escaping (HTTPResult<HTTPResponse>) -> Void) -> Cancellable {
         CancellableTask(task: Task {
             await completion(fetch(request))