error refactoring

Author: swiftuiux

Sources/async-http-client/protocol/validate/IValidate.swift

@@ -14,5 +14,5 @@ protocol IValidate{
 
     /// Validate
     /// - Parameter data: URLResponse
-    func validate(_ data : URLResponse) throws
+    func validate(_ response : URLResponse, with data : Data?) throws
 }

Sources/async-http-client/proxy/http/Proxy.swift

@@ -192,7 +192,7 @@ public extension Http{
                 config.getSession
             )
 
-            try validateStatus(response, by : validate.pickStatusRules())
+            try validateStatus(response, by : validate.pickStatusRules(), with: data)
 
             let value: T = try reader.read(data: data)
 

Sources/async-http-client/proxy/http/error/Error.swift renamed to Sources/async-http-client/proxy/http/error/Errors.swift

@@ -1,5 +1,5 @@
 //
-//  Error.swift
+//  Errors.swift
 //  
 //
 //  Created by Igor on 13.03.2023.
@@ -10,6 +10,6 @@ import Foundation
 extension Http{
 
     enum Errors : Error{
-        case status(Int?, URLResponse)
+        case status(Int?, URLResponse, Data?)
     }
 }

Sources/async-http-client/validate/type/Status.swift

@@ -38,22 +38,22 @@ extension Http.Validate.Status: ExpressibleByIntegerLiteral {
 }
 
     // MARK: - API
-
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 public extension Http.Validate.Status{
 
     /// Validate status
     /// - Parameter data: URLResponse
-    func validate(_ data : URLResponse) throws{
+    func validate(_ response : URLResponse, with data : Data?) throws{
 
-        guard let status = (data as? HTTPURLResponse)?.statusCode else{ return try err(nil, data) }
+        guard let status = (response as? HTTPURLResponse)?.statusCode else{ return try err(nil, response, with: data) }
 
         switch(self){
             case .const(let value):
-                if value != status {  try err(status, data) }
+                if value != status {  try err(status, response, with: data) }
             case .range(let value) :
-                if !value.contains(status) { try err(status, data) }
+                if !value.contains(status) { try err(status, response, with: data) }
             case .predicate(let fn):
-                if !fn(status) { try err(status, data) }
+                if !fn(status) { try err(status, response, with: data) }
         }
     }
 }
@@ -66,9 +66,12 @@ public extension Http.Validate.Status{
 ///   - validate: Set of func to validate status code
 /// - Throws: Http.Errors.status(response)
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
-public func validateStatus(_ response : URLResponse, by rule : Http.Validate.Status) throws{
-    
-    try rule.validate(response)
+public func validateStatus(
+    _ response : URLResponse,
+    by rule : Http.Validate.Status,
+    with data : Data? = nil
+) throws{
+    try rule.validate(response, with: data)
 }
 
 
@@ -78,15 +81,20 @@ public func validateStatus(_ response : URLResponse, by rule : Http.Validate.Sta
 ///   - validate: Set of func to validate status code
 /// - Throws: Http.Errors.status(response)
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
-public func validateStatus(_ response : URLResponse, by rules : [Http.Validate.Status]) throws{
-    
+public func validateStatus(
+    _ response : URLResponse,
+    by rules : [Http.Validate.Status],
+    with data : Data? = nil
+) throws {
     try rules.forEach{
-        try validateStatus(response, by: $0)
+        try validateStatus(response, by: $0, with: data)
     }
 }
 
 // MARK: - File private
 
-fileprivate func err(_ status: Int?, _ response : URLResponse) throws{
-    throw Http.Errors.status(status, response)
+fileprivate func err(
+    _ status: Int?, _ response : URLResponse, with data : Data?
+)throws{
+    throw Http.Errors.status(status, response, data)
 }