Move Concurrency Client to Client

Author: vani2

Example/Example/Sources/Business Logic/Service/BookService.swift

@@ -18,9 +18,9 @@ protocol BookService {
 
 final class BookServiceImpl: BookService {
 
-    let apiClient: ConcurrencyClient
+    let apiClient: Client
 
-    init(apiClient: ConcurrencyClient) {
+    init(apiClient: Client) {
         self.apiClient = apiClient
     }
 

Example/Example/Sources/Business Logic/Service/FileService.swift

@@ -17,9 +17,9 @@ protocol FileService {
 
 final class FileServiceImpl: FileService {
 
-    let apiClient: ConcurrencyClient
+    let apiClient: Client
 
-    init(apiClient: ConcurrencyClient) {
+    init(apiClient: Client) {
         self.apiClient = apiClient
     }
 

Example/Example/Sources/Business Logic/ServiceLayer.swift

@@ -15,7 +15,7 @@ final class ServiceLayer {
 
     static let shared = ServiceLayer()
 
-    private(set) lazy var apiClient: ConcurrencyClient = AlamofireClient(
+    private(set) lazy var apiClient: Client = AlamofireClient(
         baseURL: URL(string: "https://library.mock-object.redmadserver.com/api/v1/")!,
         configuration: .ephemeral,
         responseObserver: { [weak self] request, response, data, error in

Sources/Apexy/Client.swift

@@ -1,16 +1,17 @@
 import Foundation
 
+@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
 public protocol Client: AnyObject {
-    
     /// Send request to specified endpoint.
-    ///
     /// - Parameters:
-    ///   - endpoint: endpoint of remote content.
-    ///   - completionHandler: The completion closure to be executed when request is completed.
-    /// - Returns: The progress of fetching the response data from the server for the request.
-    func request<T>(
-        _ endpoint: T,
-        completionHandler: @escaping (APIResult<T.Content>) -> Void
-    ) -> Progress where T: Endpoint
+    ///    - endpoint: endpoint of remote content.
+    /// - Returns: response data from the server for the request.
+    func request<T>(_ endpoint: T) async throws -> T.Content where T: Endpoint
+    
+    /// Upload data to specified endpoint.
+    /// - Parameters:
+    ///    - endpoint: endpoint of remote content.
+    /// - Returns: response data from the server for the upload.
+    func upload<T>(_ endpoint: T) async throws -> T.Content where T: UploadEndpoint
 
 }

Sources/Apexy/Clients/ConcurrencyClient.swift

@@ -10,6 +10,7 @@ import Apexy
 import Foundation
 
 /// API Client.
+@available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
 open class AlamofireClient: Client, CombineClient {
 
     /// Session network manager.
@@ -93,43 +94,72 @@ open class AlamofireClient: Client, CombineClient {
             eventMonitors: eventMonitors)
     }
 
-    /// Send request to specified endpoint.
-    ///
-    /// - Parameters:
-    ///   - endpoint: endpoint of remote content.
-    ///   - completionHandler: The completion closure to be executed when request is completed.
-    /// - Returns: The progress of fetching the response data from the server for the request.
-    open func request<T>(
-        _ endpoint: T,
-        completionHandler: @escaping (APIResult<T.Content>) -> Void
-    ) -> Progress where T: Endpoint {
-
+    func observeResponse(
+        dataResponse: DataResponse<Data, AFError>,
+        error: Error?) {
+            self.responseObserver?(
+                dataResponse.request,
+                dataResponse.response,
+                dataResponse.data,
+                error)
+        }
+    
+    open func request<T>(_ endpoint: T) async throws -> T.Content where T : Endpoint {
+        
         let anyRequest = AnyRequest(create: endpoint.makeRequest)
         let request = sessionManager.request(anyRequest)
             .validate { request, response, data in
                 Result(catching: { try endpoint.validate(request, response: response, data: data) })
-            }.responseData(
-                queue: responseQueue,
-                completionHandler: { (response: DataResponse<Data, AFError>) in
-
-                    let result = APIResult<T.Content>(catching: { () throws -> T.Content in
-                        do {
-                            let data = try response.result.get()
-                            return try endpoint.content(from: response.response, with: data)
-                        } catch {
-                            throw error.unwrapAlamofireValidationError()
-                        }
-                    })
-
-                    self.completionQueue.async {
-                        self.responseObserver?(response.request, response.response, response.data, result.error)
-                        completionHandler(result)
-                    }
-            })
-
-        let progress = request.downloadProgress
-        progress.cancellationHandler = { [weak request] in request?.cancel() }
-        return progress
+            }
+
+        let dataResponse = await request.serializingData().response
+        let result = APIResult<T.Content>(catching: { () throws -> T.Content in
+            do {
+                let data = try dataResponse.result.get()
+                return try endpoint.content(from: dataResponse.response, with: data)
+            } catch {
+                throw error.unwrapAlamofireValidationError()
+            }
+        })
+
+        Task.detached { [weak self, dataResponse, result] in
+            self?.observeResponse(dataResponse: dataResponse, error: result.error)
+        }
+
+        return try result.get()
+    }
+    
+    open func upload<T>(_ endpoint: T) async throws -> T.Content where T : UploadEndpoint {
+        
+        let urlRequest: URLRequest
+        let body: UploadEndpointBody
+        (urlRequest, body) = try endpoint.makeRequest()
+        
+        let request: UploadRequest
+        switch body {
+        case .data(let data):
+            request = sessionManager.upload(data, with: urlRequest)
+        case .file(let url):
+            request = sessionManager.upload(url, with: urlRequest)
+        case .stream(let stream):
+            request = sessionManager.upload(stream, with: urlRequest)
+        }
+
+        let dataResponse = await request.serializingData().response
+        let result = APIResult<T.Content>(catching: { () throws -> T.Content in
+            do {
+                let data = try dataResponse.result.get()
+                return try endpoint.content(from: dataResponse.response, with: data)
+            } catch {
+                throw error.unwrapAlamofireValidationError()
+            }
+        })
+
+        Task.detached { [weak self, dataResponse, result] in
+            self?.observeResponse(dataResponse: dataResponse, error: result.error)
+        }
+
+        return try result.get()
     }
 
 }