Skip to content

feat(waiting): add error handling for errors while waiting #772

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.

Sign up for GitHub

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

Open
DomiR wants to merge 2 commits into
base: master
Choose a base branch
from
+7 −4
Open

feat(waiting): add error handling for errors while waiting #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
530af70
feat(waiting): add error handling for errors while waiting
DomiR May 6, 2020
143efdc
Merge remote-tracking branch 'upstream/master'
DomiR Sep 30, 2020
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
5 changes: 4 additions & 1 deletion Sources/Engine/WSEngine.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,10 @@ FrameCollectorDelegate, HTTPHandlerDelegate {
let wsReq = HTTPWSHeader.createUpgrade(request: request, supportsCompression: framer.supportsCompression(), secKeyValue: secKeyValue)
let data = httpHandler.convert(request: wsReq)
transport.write(data: data, completion: {_ in })
case .waiting:
case .waiting(let error):
if let error = error {
handleError(error);
}
break
case .failed(let error):
handleError(error)
Expand Down
4 changes: 2 additions & 2 deletions Sources/Transport/TCPTransport.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ public class TCPTransport: Transport {
switch newState {
case .ready:
self?.delegate?.connectionChanged(state: .connected)
case .waiting:
self?.delegate?.connectionChanged(state: .waiting)
case .waiting(let error):
self?.delegate?.connectionChanged(state: .waiting(error))
case .cancelled:
self?.delegate?.connectionChanged(state: .cancelled)
case .failed(let error):
Expand Down
2 changes: 1 addition & 1 deletion Sources/Transport/Transport.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import Foundation

public enum ConnectionState {
case connected
case waiting
case waiting(Error?)
case cancelled
case failed(Error?)

Expand Down