Improve custom errors

Author: MihaelIsaev

CodyFire/Classes/APIRequest+Build.swift

@@ -93,7 +93,7 @@ extension APIRequest {
 
     @discardableResult
     public func addCustomError(_ customError: NetworkError) -> APIRequest {
-        customErrors.append(customError)
+        customErrors.update(with:customError)
         return self
     }
 
@@ -103,6 +103,19 @@ extension APIRequest {
         return addCustomError(code, description)
     }
 
+    @discardableResult
+    public func addCustomError(_ codes: StatusCode..., description: String) -> APIRequest {
+        return addCustomError(codes, description: description)
+    }
+    
+    @discardableResult
+    public func addCustomError(_ codes: [StatusCode], description: String) -> APIRequest {
+        for code in codes {
+            addCustomError(NetworkError(code: code, description: description))
+        }
+        return self
+    }
+    
     @discardableResult
     public func addCustomError(_ code: StatusCode, _ description: String) -> APIRequest {
         return addCustomError(NetworkError(code: code, description: description))
@@ -116,7 +129,7 @@ extension APIRequest {
 
     @discardableResult
     public func addCustomErrors(_ errors: [NetworkError]) -> APIRequest {
-        customErrors.append(contentsOf: errors)
+        errors.forEach { customErrors.update(with: $0) }
         return self
     }
 

CodyFire/Classes/APIRequest.swift

@@ -36,7 +36,7 @@ public class APIRequest<ResultType: Decodable> {
 
     public typealias SuccessResponse = (ResultType)->()
     var customServerURL: ServerURL?
-    var customErrors: [NetworkError] = []
+    var customErrors: Set<NetworkError> = []
     var endpoint: String = "/"
     var method: HTTPMethod = .get
     var payload: PayloadProtocol?

CodyFire/Classes/CodyFire.swift

@@ -26,6 +26,7 @@ open class CodyFire {
 
     /// Called on each succeeded response
     public var successResponseHandler: ((_ host: String, _ endpoint: String)->())?
+    public var errorResponseHandler: ((_ host: String, _ endpoint: String)->())?
     public var unauthorizedHandler: UnauthorizedHandler?
     public var reachability: NetworkHelperProtocol?
 
@@ -52,7 +53,7 @@ open class CodyFire {
 
     public var ws: WS { return WS.shared }
 
-    var customErrors: [NetworkError] = [
+    var customErrors: Set<NetworkError> = [
         NetworkError(code: .unauthorized, description: "You're not authorized"),
         NetworkError(code: .forbidden, description: "This action is prohibited"),
         NetworkError(code: .internalServerError, description: "Service temporary unavailable"),
@@ -81,9 +82,16 @@ open class CodyFire {
     ]
 
     public func setCustomError(_ error: NetworkError) {
-        if let index = customErrors.index(where: { $0.code.rawValue == error.code.rawValue }) {
-            customErrors.remove(at: index)
-            customErrors.append(error)
+        customErrors.update(with: error)
+    }
+    
+    public func setCustomError(codes: StatusCode..., description: String) {
+        setCustomError(codes: codes, description: description)
+    }
+    
+    public func setCustomError(codes: [StatusCode], description: String) {
+        for code in codes {
+            setCustomError(NetworkError(code: code, description: description))
         }
     }
 

CodyFire/Classes/NetworkError.swift

@@ -10,7 +10,7 @@ import Foundation
 @available(*, deprecated, renamed: "NetworkError")
 public typealias KnownNetworkError = NetworkError
 
-public struct NetworkError: Error, CustomStringConvertible {
+public struct NetworkError: Error, CustomStringConvertible, Hashable {
     public var code: StatusCode
     public var description: String
     public var raw: Data?
@@ -25,4 +25,8 @@ public struct NetworkError: Error, CustomStringConvertible {
         self.code = code
         self.description = description
     }
+    
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(code.rawValue)
+    }
 }