Use makeStream for creating AsyncStreams

Author: SwiftyJoeyy

Sources/NetworkingClient/Tasks/DownloadTask.swift

@@ -24,9 +24,7 @@ open class DownloadTask: NetworkTask<URL>, @unchecked Sendable {
 
     /// A stream that emits progress updates throughout the download lifecycle.
     public var progressUpdates: AsyncStream<Double> {
-        get async {
-            return await progressTracker.progressStream
-        }
+        return progressTracker.progressStream.stream
     }
 
     /// The current progress value.
@@ -136,33 +134,22 @@ extension DownloadTask {
 /// - Important: This type is internal and intended for use within the networking framework only.
 internal actor ProgressTracker {
 // MARK: - Properties
-    /// The stream continuation for emitting progress values.
-    private var continuation: AsyncStream<Double>.Continuation? {
-        didSet {
-            continuation?.yield(progress)
-        }
-    }
-    
     /// A stream that emits progress updates throughout the download lifecycle.
-    ///
-    /// The stream completes automatically when ``finish()`` is called.
-    internal private(set) lazy var progressStream: AsyncStream<Double> = {
-        return AsyncStream(
-            bufferingPolicy: .bufferingNewest(1)
-        ) { continuation in
-            self.continuation = continuation
-        }
-    }()
+    internal let progressStream = AsyncStream<Double>.makeStream(bufferingPolicy: .bufferingNewest(1))
 
     /// The current progress value.
     ///
     /// Updating this property emits the new value to the progress stream.
     internal private(set) var progress = Double.zero {
         didSet {
-            continuation?.yield(progress)
+            progressStream.continuation.yield(progress)
         }
     }
 
+    internal init() {
+        progressStream.continuation.yield(progress)
+    }
+    
 // MARK: - Functions
     /// Sets the progress to the given normalized value.
     ///
@@ -180,18 +167,13 @@ internal actor ProgressTracker {
     ///   - offset: The number of bytes downloaded.
     ///   - total: The total number of bytes expected.
     internal func setProgress(_ offset: Double, total: Double) {
-        guard total > 0 else {
-            setProgress(0)
-            return
-        }
-        setProgress(offset / total)
+        setProgress(total > 0 ? offset / total : 0)
     }
 
     /// Completes the progress stream and clears the continuation.
     ///
     /// Call this when the download has finished or been cancelled.
     internal func finish() {
-        continuation?.finish()
-        continuation = nil
+        progressStream.continuation.finish()
     }
 }

Sources/NetworkingClient/Tasks/NetworkTask.swift

@@ -261,9 +261,7 @@ extension NetworkTask: NetworkingTask {
 
     /// A stream that emits state updates throughout the task lifecycle.
     public var stateUpdates: AsyncStream<TaskState> {
-        get async {
-            return await values.stateStream
-        }
+        return values.stateStream.stream
     }
 
     /// Called when a task has finished collecting metrics.

Sources/NetworkingClient/Tasks/NetworkTaskValues.swift

@@ -41,26 +41,13 @@ internal actor NetworkTaskValues<T: Sendable> {
     /// The current ``URLSessionTask`` instance, if any.
     internal var sessionTask: URLSessionTask?
 
-    /// The stream continuation for emitting progress values.
-    private var stateStreamContinuation: AsyncStream<TaskState>.Continuation? {
-        didSet {
-            stateStreamContinuation?.yield(state)
-        }
-    }
-    
     /// A stream that emits state updates throughout the task lifecycle.
-    internal private(set) lazy var stateStream: AsyncStream<TaskState> = {
-        return AsyncStream(
-            bufferingPolicy: .bufferingNewest(1)
-        ) { continuation in
-            self.stateStreamContinuation = continuation
-        }
-    }()
+    internal let stateStream = AsyncStream<TaskState>.makeStream(bufferingPolicy: .bufferingNewest(1))
 
     /// The current execution state of a task.
     internal private(set) var state = TaskState.created {
         didSet {
-            stateStreamContinuation?.yield(state)
+            stateStream.continuation.yield(state)
         }
     }
 
@@ -70,6 +57,7 @@ internal actor NetworkTaskValues<T: Sendable> {
     /// - Parameter request: The type-erased request associated with the task.
     internal init(request: AnyRequest) {
         self.request = request
+        stateStream.continuation.yield(state)
     }
 
 // MARK: - Functions
@@ -139,8 +127,7 @@ internal actor NetworkTaskValues<T: Sendable> {
     ///
     /// Call this when the task has finished or been cancelled.
     internal func finish() {
-        stateStreamContinuation?.finish()
-        stateStreamContinuation = nil
+        stateStream.continuation.finish()
     }
 }
 

Sources/NetworkingCore/RequestModifiers/Parameters/Parameter.swift

@@ -182,7 +182,7 @@ extension Request {
     /// struct GoogleRequest {
     ///     var request: some Request {
     ///         HTTPRequest()
-    ///             .appendingParameter("language", value: "en")
+    ///             .appendingParameter("language", values: ["en"])
     ///     }
     /// }
     /// ```

Sources/NetworkingCore/RequestModifiers/Parameters/RequestParameter.swift

@@ -14,8 +14,6 @@ public protocol RequestParameter: RequestModifier, CustomStringConvertible {
     var parameters: [URLQueryItem] {get}
 }
 
-// TODO: - Add support for parameter encoding strategies (ie: arrays)
-
 // MARK: - RequestModifier
 extension RequestParameter {
     /// Modifies the given ``URLRequest`` by appending query parameters.

Tests/NetworkingClientTests/Tasks/DonwloadTaskTests.swift

@@ -87,7 +87,7 @@ struct DownloadTaskTests {
         }
 
         var progressUpdates = [Double]()
-        for await progress in await task.progressUpdates {
+        for await progress in task.progressUpdates {
             try await #require(task.progress == progress)
             progressUpdates.append(progress)
         }
@@ -109,7 +109,7 @@ struct DownloadTaskTests {
         }
 
         var progressUpdate = 0.0
-        for await progress in await task.progressUpdates {
+        for await progress in task.progressUpdates {
             try await #require(task.progress == progress)
             progressUpdate = progress
         }

Tests/NetworkingClientTests/Tasks/NetworkTaskStateTests.swift

@@ -180,7 +180,7 @@ struct NetworkTaskStateTests {
         }
 
         var updates = [TaskState]()
-        for await state in await task.stateUpdates {
+        for await state in task.stateUpdates {
             try await #require(task.state == state)
             updates.append(state)
         }