Feature/async support

Sources/MBNetworking/Extensions/CharacterEncoding.swift

@@ -23,7 +23,7 @@ extension CharacterSet {
         let generalDelimitersToEncode = ":#[]@" // does not include "?" or "/" due to RFC 3986 - Section 3.4
         let subDelimitersToEncode = "!$&'()*+,;="
         let encodableDelimiters = CharacterSet(charactersIn: "\(generalDelimitersToEncode)\(subDelimitersToEncode)")
-        
+
         return CharacterSet.urlQueryAllowed.subtracting(encodableDelimiters)
     }()
 }

Sources/MBNetworking/Extensions/Data.swift

@@ -9,10 +9,8 @@
 import Foundation
 
 extension NSMutableData {
-
     func appendString(_ string: String) {
         guard let data = string.data(using: .utf8) else { return }
         append(data)
     }
-
 }

Sources/MBNetworking/Extensions/ProcessInfo.swift

@@ -9,10 +9,8 @@
 import Foundation
 
 extension ProcessInfo {
-
     /// Returns true if process is in testing.
     static var isUnderTest: Bool {
         ProcessInfo.processInfo.environment["XCTestConfigurationFilePath"] != nil
     }
-
 }

Sources/MBNetworking/Extensions/SecTrust.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-public extension Array where Element == SecCertificate {
+public extension [SecCertificate] {
     var publicKeys: [SecKey] {
         compactMap(\.publicKey)
     }
@@ -32,9 +32,9 @@ public extension SecCertificate {
 public extension SecTrust {
     var certificates: [SecCertificate] {
         if #available(iOS 15, macOS 12, watchOS 8, *) {
-            return (SecTrustCopyCertificateChain(self) as? [SecCertificate]) ?? []
+            (SecTrustCopyCertificateChain(self) as? [SecCertificate]) ?? []
         } else {
-            return (0 ..< SecTrustGetCertificateCount(self)).compactMap { index in
+            (0 ..< SecTrustGetCertificateCount(self)).compactMap { index in
                 SecTrustGetCertificateAtIndex(self, index)
             }
         }

Sources/MBNetworking/Extensions/URL.swift

@@ -8,25 +8,24 @@
 
 import Foundation
 
-extension URL {
-
+public extension URL {
     /// Initializes URL with string. Same as URL(string:), but returns URL (not optional.)
     /// In case of failure in initializing, fatal error will be thrown.
-    public init(forceString string: String) {
+    init(forceString string: String) {
         guard let url = URL(string: string) else { fatalError("Could not init URL '\(string)'") }
         self = url
     }
-    
+
     /// Returns URL by settings URL.queryItems to specified parameters.
-    public func adding(parameters: [String: String]) -> URL {
+    func adding(parameters: [String: String]) -> URL {
         guard parameters.count > 0 else { return self }
         var queryItems: [URLQueryItem] = []
         for parameter in parameters {
             queryItems.append(URLQueryItem(name: parameter.key, value: parameter.value))
         }
         return adding(queryItems: queryItems)
     }
-    
+
     /// Returns URL by settings URL.queryItems to specified queryItems.
     private func adding(queryItems: [URLQueryItem]) -> URL {
         guard var urlComponents = URLComponents(string: absoluteString) else {
@@ -38,5 +37,4 @@ extension URL {
         }
         return url
     }
-
 }

Sources/MBNetworking/Networkable+DataTask.swift

@@ -1,5 +1,5 @@
 //
-//  Network.swift
+//  Networkable+DataTask.swift
 //  Network
 //
 //  Created by Rasid Ramazanov on 25.11.2019.
@@ -19,12 +19,11 @@ extension Networkable {
         _ type: V.Type,
         completion: @escaping ((Result<V, MBErrorKit.NetworkingError>) -> Void)
     ) {
+        fetch(request, completion: completion)
+
         // StubURLProtocol enabled and adding a small delay.
         if StubURLProtocol.isEnabled, ProcessInfo.isUnderTest {
-            fetch(request, completion: completion)
             RunLoop.current.run(until: Date().addingTimeInterval(0.05))
-        } else {
-            fetch(request, completion: completion)
         }
     }
 
@@ -34,19 +33,18 @@ extension Networkable {
     ) {
         requestData(urlRequest) { response, data, error in
 
-            if let error = error,
+            if let error,
                self.isNetworkConnectionError((error as NSError).code) {
                 let error = MBErrorKit.NetworkingError.networkConnectionError(error)
                 MBErrorKit.ErrorKit.shared().delegate?.errorKitDidCatch(networkingError: error)
                 self.printErrorLog(error)
                 completion(.failure(error))
 
-            } else if let error = error {
-                let networkingError: NetworkingError
-                if (error as NSError).code == NSURLErrorCancelled {
-                    networkingError = .dataTaskCancelled
+            } else if let error {
+                let networkingError: NetworkingError = if (error as NSError).code == NSURLErrorCancelled {
+                    .dataTaskCancelled
                 } else {
-                    networkingError = MBErrorKit.NetworkingError.underlyingError(error, response, data)
+                    MBErrorKit.NetworkingError.underlyingError(error, response, data)
                 }
                 MBErrorKit.ErrorKit.shared().delegate?.errorKitDidCatch(networkingError: networkingError)
                 self.printErrorLog(networkingError)
@@ -59,13 +57,13 @@ extension Networkable {
                 self.printErrorLog(error)
                 completion(.failure(error))
 
-            } else if let response = response, data == nil || data?.count == 0 {
+            } else if let response, data == nil || data?.count == 0 {
                 let error = MBErrorKit.NetworkingError.dataTaskError(response, data)
                 MBErrorKit.ErrorKit.shared().delegate?.errorKitDidCatch(networkingError: error)
                 self.printErrorLog(error)
                 completion(.failure(error))
 
-            } else if let data = data, data.count > 0 {
+            } else if let data, !data.isEmpty {
                 do {
                     // If requested decodable type is Data, received data will be returned.
                     if V.Type.self == Data.Type.self {
@@ -111,9 +109,9 @@ extension Networkable {
                     }
                     Session.shared.networkLogMonitoringDelegate?.logTask(task: task, didCompleteWithError: error)
                 }
-                
+
                 Session.shared.tasksInProgress.removeValue(forKey: taskId)
-                
+
                 self.printResponse(data)
                 DispatchQueue.main.async {
                     completion(response, data, error)

Sources/MBNetworking/Networkable+DataTaskAsync.swift

@@ -0,0 +1,90 @@
+//
+//  Networkable+DataTaskAsync.swift
+//  Network
+//
+//  Created by Rasid Ramazanov on 25.11.2019.
+//  Copyright © 2019 LeanScale. All rights reserved.
+//
+
+import Foundation
+import MBErrorKit
+
+/// Networkable extension related to data tasks.
+///
+@available(iOS 13.0.0, *) extension Networkable {
+    /// Fetch data with specified parameters and return back with the completion.
+    /// - Parameters:
+    ///   - type: Type of the result.
+    /// - Returns: Response as `Result`
+    public func fetch<V: Decodable>(_ type: V.Type) async throws -> V {
+        try await fetch(request)
+    }
+
+    private func fetch<V: Decodable>(_ urlRequest: URLRequest) async throws -> V {
+        let (response, data, error) = await requestData(urlRequest)
+
+        if let error,
+           isNetworkConnectionError((error as NSError).code) {
+            let error = MBErrorKit.NetworkingError.networkConnectionError(error)
+            MBErrorKit.ErrorKit.shared().delegate?.errorKitDidCatch(networkingError: error)
+            printErrorLog(error)
+            throw error
+
+        } else if let error {
+            let networkingError: NetworkingError = if (error as NSError).code == NSURLErrorCancelled {
+                .dataTaskCancelled
+            } else {
+                MBErrorKit.NetworkingError.underlyingError(error, response, data)
+            }
+            MBErrorKit.ErrorKit.shared().delegate?.errorKitDidCatch(networkingError: networkingError)
+            printErrorLog(networkingError)
+            throw networkingError
+
+        } else if let httpResponse = response as? HTTPURLResponse,
+                  isSuccess(httpResponse.statusCode) {
+            let error = MBErrorKit.NetworkingError.httpError(error, httpResponse, data)
+            MBErrorKit.ErrorKit.shared().delegate?.errorKitDidCatch(networkingError: error)
+            printErrorLog(error)
+            throw error
+
+        } else if let response, data == nil || data?.count == 0 {
+            let error = MBErrorKit.NetworkingError.dataTaskError(response, data)
+            MBErrorKit.ErrorKit.shared().delegate?.errorKitDidCatch(networkingError: error)
+            printErrorLog(error)
+            throw error
+
+        } else if let data, data.count > 0 {
+            do {
+                // If requested decodable type is Data, received data will be returned.
+                if V.Type.self == Data.Type.self {
+                    return data as! V
+                }
+                let decodableData = try JSONDecoder().decode(V.self, from: data)
+                return decodableData
+            } catch let sError {
+                let error = MBErrorKit.NetworkingError.decodingError(sError, response, data)
+                MBErrorKit.ErrorKit.shared().delegate?.errorKitDidCatch(serializationError: error)
+                self.printErrorLog(error)
+                throw error
+            }
+
+        } else {
+            let error = MBErrorKit.NetworkingError.unkownError(error, data)
+            MBErrorKit.ErrorKit.shared().delegate?.errorKitDidCatch(networkingError: error)
+            printErrorLog(error)
+            throw error
+        }
+    }
+
+    private func requestData(_ urlRequest: URLRequest) async -> (URLResponse?, Data?, Error?) {
+        // TODO: Should async support Session.shared.taskInProgress cancellation logic?
+
+        do {
+            let (data, response) = try await Session.shared.session.data(for: urlRequest)
+            printResponse(data)
+            return (response, data, nil)
+        } catch {
+            return (nil, nil, error)
+        }
+    }
+}

Sources/MBNetworking/Networkable+Logs.swift

@@ -54,7 +54,7 @@ extension Networkable {
     }
 
     private func getStringFrom(_ data: Data?) -> String {
-        if let data = data {
+        if let data {
             if let jsonObject = try? JSONSerialization.jsonObject(with: data, options: .allowFragments),
                !(jsonObject is NSNull),
                let json = try? JSONSerialization.data(withJSONObject: jsonObject, options: .prettyPrinted),