Merge pull request #74 from pace/Add-requests-using-concurrency

philippkno · web-flow · commit 17a29f20b26e · 2023-06-20T16:40:34.000+02:00
Add requests using concurrency
diff --git a/Templates/Swift/Common/APIClient.swift b/Templates/Swift/Common/APIClient.swift
@@ -49,7 +49,7 @@ public class {{ options.name }}Client {
     ///   - currentRetryCount: The current number of retries for this request due to network connection errors and timeouts
     ///   - completionQueue: The queue that complete will be called on
     ///   - complete: A closure that gets passed the {{ options.name }}Response
-    /// - Returns: A cancellable request. Not that cancellation will only work after any validation RequestBehaviours have run
+    /// - Returns: A cancellable request. Note that cancellation will only work after any validation RequestBehaviours have run
     @discardableResult
     public func makeRequest<T>(_ request: {{ options.name }}Request<T>,
                                behaviours: [{{ options.name }}RequestBehaviour] = [],
@@ -365,3 +365,28 @@ public class {{ options.name }}Client {
         }
     }
 }
+
+@available(iOS 13.0, watchOS 6.0, *) @MainActor
+public extension {{ options.name }}Client {
+    /// Makes a network request
+    ///
+    /// - Parameters:
+    ///   - request: The API request to make
+    ///   - behaviours: A list of behaviours that will be run for this request. Merged with APIClient.behaviours
+    ///   - currentUnauthorizedRetryCount: The current number of retries for this request due to `401` responses
+    ///   - currentRetryCount: The current number of retries for this request due to network connection errors and timeouts
+    /// - Returns: An asynchronously-delivered result that either contains the response of the request
+    func makeRequest<T>(_ request: {{ options.name }}Request<T>,
+                        behaviours: [{{ options.name }}RequestBehaviour] = [],
+                        currentUnauthorizedRetryCount: Int = 0,
+                        currentRetryCount: Int = 0) async -> {{ options.name }}Response<T> {
+        await withCheckedContinuation { [weak self] continuation in
+            _ = self?.makeRequest(request, behaviours: behaviours,
+                                  currentUnauthorizedRetryCount: currentUnauthorizedRetryCount,
+                                  currentRetryCount: currentRetryCount,
+                                  complete: { response in
+                continuation.resume(returning: response)
+            })
+        }
+    }
+}
