Merge pull request #1 from BinaryBirds/feature/dev

Simplified upload and download task

Author: tib

Sources/SwiftHttp/HttpError.swift

@@ -25,6 +25,9 @@ public enum HttpError: LocalizedError {
     /// The response has an invalid header value
     case invalidHeaderValue(HttpResponse)
 
+    /// Upload request does not have data to send
+    case missingUploadData
+    
     /// Unknown error
     case unknown(Error)
 
@@ -41,6 +44,8 @@ public enum HttpError: LocalizedError {
             return "Missing header"
         case .invalidHeaderValue(_):
             return "Invalid header value"
+        case .missingUploadData:
+            return "Missing upload data"
         case .unknown(let error):
             return error.localizedDescription
         }

Sources/SwiftHttp/UrlSessionHttpClient.swift

@@ -53,21 +53,13 @@ public struct UrlSessionHttpClient: HttpClient {
     ///
     public func uploadTask(_ req: HttpRequest) async throws -> HttpResponse {
         let urlRequest = req.urlRequest
+        guard let data = urlRequest.httpBody else {
+            throw HttpError.missingUploadData
+        }
         if log {
             print(urlRequest.curlString)
         }
-        
-        let res: (Data, URLResponse) = try await withUnsafeThrowingContinuation { c in
-            session.uploadTask(with: urlRequest, from: urlRequest.httpBody) { data, response, error in
-                if let error = error {
-                    return c.resume(throwing: error)
-                }
-                guard let data = data, let urlResponse = response else {
-                    return c.resume(throwing: HttpError.invalidResponse)
-                }
-                c.resume(returning: (data, urlResponse))
-            }.resume()
-        }
+        let res: (Data, URLResponse) = try await session.upload(for: urlRequest, from: data, delegate: nil)
         return try HttpRawResponse(res)
     }
 
@@ -85,22 +77,10 @@ public struct UrlSessionHttpClient: HttpClient {
         if log {
             print(urlRequest.curlString)
         }
-
-        let res: (Data, URLResponse) = try await withUnsafeThrowingContinuation { c in
-            session.downloadTask(with: urlRequest) { url, response, error in
-                if let error = error {
-                    return c.resume(throwing: error)
-                }
-                guard let urlResponse = response, let url = url, let pathData = url.path.data(using: .utf8) else {
-                    return c.resume(throwing: HttpError.invalidResponse)
-                }
-                c.resume(returning: (pathData, urlResponse))
-            }
-            .resume()
+        let res: (URL, URLResponse) = try await session.download(for: urlRequest, delegate: nil)
+        guard let pathData = res.0.path.data(using: .utf8) else {
+            throw HttpError.invalidResponse
         }
-        return try HttpRawResponse(res)
+        return try HttpRawResponse((pathData, res.1))
     }
 }
-
-
-

Tests/SwiftHttpTests/DownloadTests.swift

@@ -0,0 +1,22 @@
+//
+//  File.swift
+//  
+//
+//  Created by Viasz-Kádi Ferenc on 2022. 03. 27..
+//
+
+import Foundation
+
+import XCTest
+@testable import SwiftHttp
+
+final class DownloadTests: XCTestCase {
+        
+    let api = ImageApi()
+    
+    func testDownload() async throws {
+        let data = try await api.download()
+        let filePath = String(data: data, encoding: .utf8)
+        XCTAssertFalse(filePath == nil)
+    }
+}

Tests/SwiftHttpTests/Helpers/ImageApi.swift

@@ -0,0 +1,21 @@
+//
+//  File.swift
+//  
+//
+//  Created by Viasz-Kádi Ferenc on 2022. 03. 27..
+//
+
+import Foundation
+import SwiftHttp
+
+struct ImageApi {
+
+    let client: HttpClient = UrlSessionHttpClient(log: true)
+    let apiBaseUrl = HttpUrl(host: "via.placeholder.com")
+
+    func download() async throws -> Data {
+        let pipeline = HttpRawPipeline(url: apiBaseUrl.path("150"), method: .get)
+        let res = try await pipeline.execute(client.downloadTask)
+        return res.data
+    }
+}