[Dispatching] Native socket support #911
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| import Foundation | ||
|
|
||
| enum WebSocketClientError: Error { | ||
| case errorWithCode(URLSessionWebSocketTask.CloseCode) | ||
| } | ||
|
|
||
| struct WebSocketClientFactory: WebSocketFactory { | ||
| func create(with url: URL) -> WebSocketConnecting { | ||
| return WebSocketClient(url: url, logger: ConsoleLogger(loggingLevel: .debug)) | ||
| } | ||
| } | ||
|
|
||
| final class WebSocketClient: NSObject, WebSocketConnecting { | ||
| private var socket: URLSessionWebSocketTask? = nil | ||
| private var url: URL | ||
| private let logger: ConsoleLogging | ||
|
|
||
| init(url url: URL, logger: ConsoleLogging) { | ||
| self.url = url | ||
| self.logger = logger | ||
| self.isConnected = false | ||
| self.request = URLRequest(url: url) | ||
| super.init() | ||
| } | ||
|
|
||
| func reconnect() { | ||
| let configuration = URLSessionConfiguration.default | ||
| let urlSession = URLSession(configuration: configuration, delegate: self, delegateQueue: OperationQueue()) | ||
| let urlRequest = URLRequest(url: url) | ||
| socket = urlSession.webSocketTask(with: urlRequest) | ||
|
|
||
| isConnected = false | ||
|
There was a problem hiding this comment. Why we're you're setting isConnected = false on reconnect? There was a problem hiding this comment. Because we are not actually connected yet but disconnected already. It will happen here There was a problem hiding this comment. I am a bit concerned about handling the state of this flag properly, doesn't websocketTask or anything expose the state from urlsession itself? |
||
| connect() | ||
| } | ||
|
|
||
| // MARK: - WebSocketConnecting | ||
| var isConnected: Bool | ||
| var onConnect: (() -> Void)? | ||
| var onDisconnect: ((Error?) -> Void)? | ||
| var onText: ((String) -> Void)? | ||
| var request: URLRequest { | ||
| didSet { | ||
| if let url = request.url { | ||
|
There was a problem hiding this comment. What is the goal of this didSet closure? I can see There was a problem hiding this comment. It's used for the updating socket url (new |
||
| let configuration = URLSessionConfiguration.default | ||
| let urlSession = URLSession(configuration: configuration, delegate: self, delegateQueue: OperationQueue()) | ||
| let urlRequest = URLRequest(url: url) | ||
| socket = urlSession.webSocketTask(with: urlRequest) | ||
|
|
||
| isConnected = false | ||
| self.url = url | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func connect() { | ||
| logger.debug("[WebSocketClient]: Connect called") | ||
| socket?.resume() | ||
| } | ||
|
|
||
| func disconnect() { | ||
| logger.debug("[WebSocketClient]: Disconnect called") | ||
| socket?.cancel() | ||
| } | ||
|
|
||
| func write(string: String, completion: (() -> Void)?) { | ||
| let message = URLSessionWebSocketTask.Message.string(string) | ||
| socket?.send(message) { _ in | ||
| completion?() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // MARK: - URLSessionWebSocketDelegate | ||
| extension WebSocketClient: URLSessionWebSocketDelegate { | ||
| func urlSession(_ session: URLSession, webSocketTask: URLSessionWebSocketTask, didOpenWithProtocol protocol: String?) { | ||
| isConnected = true | ||
| logger.debug("[WebSocketClient]: Connected") | ||
| onConnect?() | ||
| receiveMessage() | ||
| } | ||
|
|
||
| func urlSession(_ session: URLSession, webSocketTask: URLSessionWebSocketTask, didCloseWith closeCode: URLSessionWebSocketTask.CloseCode, reason: Data?) { | ||
| isConnected = false | ||
| logger.debug("[WebSocketClient]: Did close with code: \(closeCode)") | ||
| onDisconnect?(WebSocketClientError.errorWithCode(closeCode)) | ||
| } | ||
|
|
||
| func receiveMessage() { | ||
| socket?.receive { [weak self] result in | ||
| guard let self else { | ||
| return | ||
| } | ||
| switch result { | ||
| case .failure(let error): | ||
| self.logger.debug("[WebSocketClient]: Error receiving: \(error)") | ||
| self.isConnected = false | ||
|
|
||
| case .success(let message): | ||
| switch message { | ||
| case .string(let messageString): | ||
| self.logger.debug("[WebSocketClient]: Received message: \(messageString)") | ||
| self.onText?(messageString) | ||
|
|
||
| case .data(let data): | ||
| self.logger.debug("[WebSocketClient]: Received data: \(data.description)") | ||
| self.onText?(data.description) | ||
|
|
||
| default: | ||
| self.logger.debug("[WebSocketClient]: Received unknown data") | ||
| } | ||
| } | ||
|
|
||
| if self.isConnected == true { | ||
| self.receiveMessage() | ||
|
There was a problem hiding this comment. is it safe to call method from it self here? How it's working? There was a problem hiding this comment. I also got confused, but apparently, this is by design from Apple. It needs to be called to receive further messages. There was a problem hiding this comment. Radek is correct 😅 Agree this looks strange |
||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we still need to conform to WebSocketConnecting protocol?
I was a starscream requirement
wouldn't it be better to refactor Dispatcher and socket would conform to this protocol?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe this protocol is more abstract in terms of testing. In case of conforming to
URLSessionWebSocketTaskwe will need to depend onURLSessionWebSocketTaskinternal types likeMessageandCloseCode. But your suggestion is also valid, let's discuss on sync.