Update Alamofire+Promise.swift

PromiseKit · Feb 28, 2022 · 51bdde5 · 51bdde5
1 parent d6ec200
commit 51bdde5
Showing 1 changed file with 132 additions and 131 deletions.
diff --git a/Sources/Alamofire+Promise.swift b/Sources/Alamofire+Promise.swift
@@ -7,169 +7,170 @@ import PromiseKit
 /**
  To import the `Alamofire` category:
 
-     use_frameworks!
-     pod "PromiseKit/Alamofire"
+	 use_frameworks!
+	 pod "PromiseKit/Alamofire"
 
  And then in your sources:
 
-     import PromiseKit
+	 import PromiseKit
  */
 extension Alamofire.DataRequest {
-    /// Adds a handler to be called once the request has finished.
-    public func response(_: PMKNamespacer, queue: DispatchQueue = .main) -> Promise<(URLRequest, HTTPURLResponse, Data)> {
-        return Promise { seal in
-            response(queue: queue) { rsp in
-                if let error = rsp.error {
-                    seal.reject(error)
-                } else if let a = rsp.request, let b = rsp.response, let c = rsp.data {
-                    seal.fulfill((a, b, c))
-                } else {
-                    seal.reject(PMKError.invalidCallingConvention)
-                }
-            }
-        }
-    }
+	/// Adds a handler to be called once the request has finished.
+	public func response(_: PMKNamespacer, queue: DispatchQueue = .main) -> Promise<(URLRequest, HTTPURLResponse, Data)> {
+		return Promise { seal in
+			response(queue: queue) { rsp in
+				if let error = rsp.error {
+					seal.reject(error)
+				} else if let a = rsp.request, let b = rsp.response, let c = rsp.data {
+					seal.fulfill((a, b, c))
+				} else {
+					seal.reject(PMKError.invalidCallingConvention)
+				}
+			}
+		}
+	}
 
-    /// Adds a handler to be called once the request has finished.
-    public func responseData(queue: DispatchQueue = .main) -> Promise<(data: Data, response: PMKAlamofireDataResponse)> {
-        return Promise { seal in
-            responseData(queue: queue) { response in
-                switch response.result {
-                case .success(let value):
-                    seal.fulfill((value, PMKAlamofireDataResponse(response)))
-                case .failure(let error):
-                    seal.reject(error)
-                }
-            }
-        }
-    }
+	/// Adds a handler to be called once the request has finished.
+	public func responseData(queue: DispatchQueue = .main) -> Promise<(data: Data, response: PMKAlamofireDataResponse)> {
+		return Promise { seal in
+			responseData(queue: queue) { response in
+				switch response.result {
+				case .success(let value):
+					seal.fulfill((value, PMKAlamofireDataResponse(response)))
+				case .failure(let error):
+					seal.reject(error)
+				}
+			}
+		}
+	}
 
-    /// Adds a handler to be called once the request has finished.
-    public func responseString(queue: DispatchQueue = .main) -> Promise<(string: String, response: PMKAlamofireDataResponse)> {
-        return Promise { seal in
-            responseString(queue: queue) { response in
-                switch response.result {
-                case .success(let value):
-                    seal.fulfill((value, PMKAlamofireDataResponse(response)))
-                case .failure(let error):
-                    seal.reject(error)
-                }
-            }
-        }
-    }
+	/// Adds a handler to be called once the request has finished.
+	public func responseString(queue: DispatchQueue = .main) -> Promise<(string: String, response: PMKAlamofireDataResponse)> {
+		return Promise { seal in
+			responseString(queue: queue) { response in
+				switch response.result {
+				case .success(let value):
+					seal.fulfill((value, PMKAlamofireDataResponse(response)))
+				case .failure(let error):
+					seal.reject(error)
+				}
+			}
+		}
+	}
 
-    /// Adds a handler to be called once the request has finished.
+	/// Adds a handler to be called once the request has finished.
 	public func responseJSON(queue: DispatchQueue = .main, options: JSONSerialization.ReadingOptions = .allowFragments) -> Promise<(json: Any, response: PMKAlamofireDataResponse)> {
 		return Promise { seal in
 			responseData(queue: queue) { response in
 				switch response.result {
-				case .success(let dataValue):
+					case .success(let dataValue):
+						do {
+							let json = try JSONSerialization.jsonObject(with: dataValue, options: options)
+							seal.fulfill((json, PMKAlamofireDataResponse(response)))
+						} catch {
+							seal.reject(error)
+						}
+					case .failure(let error):
+						seal.reject(error)
+				}
+			}
+		}
+	}
+
+#if swift(>=3.2)
+	/**
+	 Returns a Promise for a Decodable
+	 Adds a handler to be called once the request has finished.
+
+	 - Parameter queue: DispatchQueue, by default nil
+	 - Parameter decoder: JSONDecoder, by default JSONDecoder()
+	 */
+	public func responseDecodable<T: Decodable>(queue: DispatchQueue = .main, decoder: JSONDecoder = JSONDecoder()) -> Promise<T> {
+		return Promise { seal in
+			responseData(queue: queue) { response in
+				switch response.result {
+				case .success(let value):
 					do {
-						let json = try JSONSerialization.jsonObject(with: dataValue, options: options)
-						seal.fulfill((json, PMKAlamofireDataResponse(response)))
+						seal.fulfill(try decoder.decode(T.self, from: value))
 					} catch {
 						seal.reject(error)
 					}
 				case .failure(let error):
 					seal.reject(error)
 				}
 			}
- }
-
-#if swift(>=3.2)
-    /**
-     Returns a Promise for a Decodable
-     Adds a handler to be called once the request has finished.
-
-     - Parameter queue: DispatchQueue, by default nil
-     - Parameter decoder: JSONDecoder, by default JSONDecoder()
-     */
-    public func responseDecodable<T: Decodable>(queue: DispatchQueue = .main, decoder: JSONDecoder = JSONDecoder()) -> Promise<T> {
-        return Promise { seal in
-            responseData(queue: queue) { response in
-                switch response.result {
-                case .success(let value):
-                    do {
-                        seal.fulfill(try decoder.decode(T.self, from: value))
-                    } catch {
-                        seal.reject(error)
-                    }
-                case .failure(let error):
-                    seal.reject(error)
-                }
-            }
-        }
-    }
+		}
+	}
 
-     /**
-     Returns a Promise for a Decodable
-     Adds a handler to be called once the request has finished.
-     
-     - Parameter queue: DispatchQueue, by default nil
-     - Parameter decoder: JSONDecoder, by default JSONDecoder()
-     */
-    public func responseDecodable<T: Decodable>(_ type: T.Type, queue: DispatchQueue = .main, decoder: JSONDecoder = JSONDecoder()) -> Promise<T> {
-        return Promise { seal in
-            responseData(queue: queue) { response in
-                switch response.result {
-                case .success(let value):
-                    do {
-                        seal.fulfill(try decoder.decode(type, from: value))
-                    } catch {
-                        seal.reject(error)
-                    }
-                case .failure(let error):
-                    seal.reject(error)
-                }
-            }
-        }
-    }
+	 /**
+	 Returns a Promise for a Decodable
+	 Adds a handler to be called once the request has finished.
+	 
+	 - Parameter queue: DispatchQueue, by default nil
+	 - Parameter decoder: JSONDecoder, by default JSONDecoder()
+	 */
+	public func responseDecodable<T: Decodable>(_ type: T.Type, queue: DispatchQueue = .main, decoder: JSONDecoder = JSONDecoder()) -> Promise<T> {
+		return Promise { seal in
+			responseData(queue: queue) { response in
+				switch response.result {
+				case .success(let value):
+					do {
+						seal.fulfill(try decoder.decode(type, from: value))
+					} catch {
+						seal.reject(error)
+					}
+				case .failure(let error):
+					seal.reject(error)
+				}
+			}
+		}
+	}
 #endif
 }
 
 extension Alamofire.DownloadRequest {
-    public func response(_: PMKNamespacer, queue: DispatchQueue = .main) -> Promise<DownloadResponse<URL?,AFError>> {
-        return Promise { seal in
-            response(queue: queue) { response in
-                if let error = response.error {
-                    seal.reject(error)
-                } else {
-                    seal.fulfill(response)
-                }
-            }
-        }
-    }
+	public func response(_: PMKNamespacer, queue: DispatchQueue = .main) -> Promise<DownloadResponse<URL?,AFError>> {
+		return Promise { seal in
+			response(queue: queue) { response in
+				if let error = response.error {
+					seal.reject(error)
+				} else {
+					seal.fulfill(response)
+				}
+			}
+		}
+	}
 
-    /// Adds a handler to be called once the request has finished.
-    public func responseData(queue: DispatchQueue = .main) -> Promise<DownloadResponse<Data,AFError>> {
-        return Promise { seal in
-            responseData(queue: queue) { response in
-                switch response.result {
-                case .success:
-                    seal.fulfill(response)
-                case .failure(let error):
-                    seal.reject(error)
-                }
-            }
-        }
-    }
+	/// Adds a handler to be called once the request has finished.
+	public func responseData(queue: DispatchQueue = .main) -> Promise<DownloadResponse<Data,AFError>> {
+		return Promise { seal in
+			responseData(queue: queue) { response in
+				switch response.result {
+				case .success:
+					seal.fulfill(response)
+				case .failure(let error):
+					seal.reject(error)
+				}
+			}
+		}
+	}
 }
 
 
 /// Alamofire.DataResponse, but without the `result`, since the Promise represents the `Result`
 public struct PMKAlamofireDataResponse {
-    public init<T,E>(_ rawrsp: Alamofire.DataResponse<T,E>) {
-        request = rawrsp.request
-        response = rawrsp.response
-        data = rawrsp.data
-    }
+	public init<T,E>(_ rawrsp: Alamofire.DataResponse<T,E>) {
+		request = rawrsp.request
+		response = rawrsp.response
+		data = rawrsp.data
+	}
 
-    /// The URL request sent to the server.
-    public let request: URLRequest?
+	/// The URL request sent to the server.
+	public let request: URLRequest?
 
-    /// The server's response to the URL request.
-    public let response: HTTPURLResponse?
+	/// The server's response to the URL request.
+	public let response: HTTPURLResponse?
 
-    /// The data returned by the server.
-    public let data: Data?
+	/// The data returned by the server.
+	public let data: Data?
 }