TouchInstinct
/
LeadKit
310
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Network error handling fix vol. 3

This commit is contained in:
Anton Popkov 2018-10-26 16:10:21 +03:00
parent 615ca1d4b4
commit acf7876f71
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Sources/Extensions/Alamofire/SessionManager+Extensions.swift
View File

@ -51,11 +51,11 @@ public extension Reactive where Base: SessionManager {
-> Observable<(response: HTTPURLResponse, model: T)> {
return apiRequest(requestParameters: requestParameters)
.takeOneAndCatchError()
.flatMap {
$0.rx.apiResponse(mappingQueue: self.base.mappingQueue, decoder: decoder)
.catchErrorAndWrap(for: $0)
.catchErrorAndWrap(with: $0)
}
.catchErrorAndWrap()
}
/// Method that executes request and serializes response into target object
@ -68,27 +68,20 @@ public extension Reactive where Base: SessionManager {
-> Observable<(response: HTTPURLResponse, model: T)> {
return apiRequest(requestParameters: requestParameters)
.takeOneAndCatchError()
.flatMap {
$0.rx.observableApiResponse(mappingQueue: self.base.mappingQueue, decoder: decoder)
.catchErrorAndWrap(for: $0)
.catchErrorAndWrap(with: $0)
}
.catchErrorAndWrap()
}
}
private extension ObservableType where E: DataRequest {
func takeOneAndCatchError() -> Observable<E> {
return take(1)
.catchError { throw RequestError.network(error: $0, response: nil) }
}
}
private extension ObservableType {
func catchErrorAndWrap(for request: DataRequest) -> Observable<E> {
func catchErrorAndWrap(with request: DataRequest? = nil) -> Observable<E> {
return catchError {
let resultError: RequestError
let response = request.delegate.data
let response = request?.delegate.data
switch $0 {
case let requestError as RequestError: