Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added error handler so user can respond to a specific error different… #9

Merged
merged 1 commit into from
Mar 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion Sources/WebRequest/Delivery/HTTPWebRequestDelivery.swift
Original file line number Diff line number Diff line change
Expand Up @@ -103,21 +103,28 @@ open class HTTPWebRequestDelivery : NSObject, WebRequestDelivery {
let group = DispatchGroup()
var taskData: Data?
var taskResponse: HTTPURLResponse?
var errorCode: ErrorCode?

group.enter()
queue.async {
let task = urlSession.dataTask(
with: urlRequest,
completionHandler: ({ (data, response, _) in
completionHandler: ({ (data, response, error) in
taskData = data
taskResponse = response as? HTTPURLResponse
errorCode = self.parseError(error)
group.leave()
}))
task.resume()
}

let timeoutResult = group.wait(timeout: .now() + timeoutInterval)

if let errorCode = errorCode {
try complete(request: request, errorCode: errorCode)
return
}

guard (timeoutResult != .timedOut) else {
try complete(request: request, errorCode: .TimedOut)
return
Expand Down Expand Up @@ -150,4 +157,19 @@ open class HTTPWebRequestDelivery : NSObject, WebRequestDelivery {
let result = WebRequest.Result(status: status, headers: [:] , data: nil)
try request.onDataReceived?(result, request, percentComplete, target);
}

open func parseError(_ error: Error?) -> ErrorCode? {
guard let error = error else { return nil }
if let urlError = error as? URLError {
switch urlError.code {
case .notConnectedToInternet:
return .NoInternetConnection
case .timedOut:
return .TimedOut
default:
()
}
}
return .MalformedResponse
}
}
1 change: 1 addition & 0 deletions Sources/WebRequest/WebRequest+Result.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ extension WebRequest {
case MalformedURL = -8
case MalformedResponse = -11
case TimedOut = -12
case NoInternetConnection = -13
}

public init(status: Int) {
Expand Down