Relase 2.4.0.

Author: maksimn

Source/Array+Core.swift Source/Foundation+Core/Array+Core.swiftSource/Array+Core.swift renamed to Source/Foundation+Core/Array+Core.swift

@@ -0,0 +1,15 @@
+//
+//  Date+Core.swift
+//  ReTodoList
+//
+//  Created by Maksim Ivanov on 12.08.2022.
+//
+
+import Foundation
+
+extension Data {
+
+    public var asUTF8: String {
+        String(decoding: self, as: UTF8.self)
+    }
+}

Source/Foundation+Core/Data+Core.swift

@@ -28,13 +28,13 @@ extension LogLevel {
         switch self {
         case .debug:
             return .debug
-            
+
         case .info:
             return .default
-            
+
         case .warn:
             return .error
-            
+
         case .error:
             return .fault
         }

Source/Date+Core.swift Source/Foundation+Core/Date+Core.swiftSource/Date+Core.swift renamed to Source/Foundation+Core/Date+Core.swift

@@ -0,0 +1,29 @@
+//
+//  Http.swift
+//  PersonalDictionary
+//
+//  Created by Maxim Ivanov on 15.07.2023.
+//
+
+import Foundation
+
+public struct Http {
+    public let urlString: String
+    public let method: String
+    public let headers: [String: String]?
+    public let body: Data?
+
+    public init(urlString: String = "",
+                method: String = "GET",
+                headers: [String: String]? = nil,
+                body: Data? = nil) {
+        self.urlString = urlString
+        self.method = method
+        self.headers = headers
+        self.body = body
+    }
+
+    func setBody(_ data: Data) -> Http {
+        .init(urlString: urlString, method: method, headers: headers, body: data)
+    }
+}

Source/Logger/LoggerImpl.swift

@@ -10,23 +10,6 @@ import Foundation
 
 public typealias RxHttpResponse = AnyPublisher<(response: HTTPURLResponse, data: Data), Error>
 
-public struct Http {
-    public let urlString: String
-    public let method: String
-    public let headers: [String: String]?
-    public let body: Data?
-
-    public init(urlString: String = "",
-                method: String = "GET",
-                headers: [String: String]? = nil,
-                body: Data? = nil) {
-        self.urlString = urlString
-        self.method = method
-        self.headers = headers
-        self.body = body
-    }
-}
-
 public protocol HttpClient {
 
     func send(_ http: Http) -> RxHttpResponse

Source/Networking/Http.swift

@@ -21,3 +21,18 @@ public protocol HttpClientAdapter {
 
     func send(_ http: Http) async throws -> HttpResponseResult
 }
+
+extension HttpClientAdapter {
+
+    public func sendAndDecode<Output: Decodable>(_ http: Http) async throws -> Output {
+        let httpResponse = try await send(http)
+
+        return try JSONDecoder().decode(Output.self, from: httpResponse.data)
+    }
+
+    public func sendAndDecode<Body: Encodable, Output: Decodable>(_ http: Http, _ body: Body) async throws -> Output {
+        let body = try JSONEncoder().encode(body)
+
+        return try await sendAndDecode(http.setBody(body))
+    }
+}

Source/Networking/HttpClient.swift

@@ -18,14 +18,18 @@ public final class LoggableHttpClient: HttpClient {
     public func send(_ http: Http) -> RxHttpResponse {
         logger.log("HTTP REQUEST START: \(http)", level: .info)
 
+        if let body = http.body {
+            logger.log("HTTP REQUEST BODY: \(body.asUTF8)", level: .info)
+        }
+
         return httpClient.send(http)
             .handleEvents(
                 receiveOutput: { httpResponse in
                     self.logger.log(
                         """
                         HTTP RESPONSE FETCHED
                         HTTPURLResponse: \(httpResponse.response)
-                        Data: \(String(decoding: httpResponse.data, as: UTF8.self))
+                        HTTP_Response_Data: \(httpResponse.data.asUTF8)
                         """,
                         level: .info
                     )

Source/Networking/HttpClientAdapter.swift

@@ -9,7 +9,8 @@ import UIKit
 
 public extension UIColor {
 
-    /// Creates a color object that generates its color data dynamically using the specified colors. For early SDKs creates light color.
+    /// Creates a color object that generates its color data dynamically using the specified colors.
+    /// For early SDKs creates light color.
     /// - Parameters:
     ///   - light: The color for light mode.
     ///   - dark: The color for dark mode.
@@ -21,8 +22,7 @@ public extension UIColor {
                 }
                 return light
             }
-        }
-        else {
+        } else {
             self.init(cgColor: light.cgColor)
         }
     }

Source/Networking/LoggableHttpClient.swift

@@ -0,0 +1,51 @@
+//
+//  WithError.swift
+//  CoreModule
+//
+//  Created by Maxim Ivanov on 29.07.2023.
+//
+
+public struct WithError: Error, Equatable, CustomStringConvertible {
+
+    public let base: Error
+
+    private let equals: (Error) -> Bool
+
+    public init<Base: Error>(_ base: Base) {
+        self.base = base
+        self.equals = { String(reflecting: $0) == String(reflecting: base) }
+    }
+
+    public init<Base: Error & Equatable>(_ base: Base) {
+        self.base = base
+        self.equals = { ($0 as? Base) == base }
+    }
+
+    public static func == (lhs: WithError, rhs: WithError) -> Bool {
+        lhs.equals(rhs.base)
+    }
+
+    public var description: String {
+        "\(self.base)"
+    }
+
+    public func asError<Base: Error>(type: Base.Type) -> Base? {
+        self.base as? Base
+    }
+
+    public var localizedDescription: String {
+        self.base.localizedDescription
+    }
+}
+
+extension Error where Self: Equatable {
+    public func withError() -> WithError {
+        WithError(self)
+    }
+}
+
+extension Error {
+    public func withError() -> WithError {
+        WithError(self)
+    }
+}