WebSocket Fixes - Revert to Starscream 3.x and invert dependency #1861
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,57 +1,35 @@ | ||
| import Foundation | ||
| @testable import ApolloWebSocket | ||
|
|
||
| public class MockWebSocket: WebSocketClient { | ||
|
|
||
| public var request: URLRequest | ||
| public var callbackQueue: DispatchQueue = DispatchQueue.main | ||
| public var delegate: WebSocketClientDelegate? = nil | ||
| public var isConnected: Bool = false | ||
|
|
||
| public required init(request: URLRequest) { | ||
| self.request = request | ||
| } | ||
|
|
||
| open func reportDidConnect() { | ||
| callbackQueue.async { | ||
| self.delegate?.websocketDidConnect(socket: self) | ||
| } | ||
| } | ||
|
|
||
| open func write(string: String) { | ||
| callbackQueue.async { | ||
| self.delegate?.websocketDidReceiveMessage(socket: self, text: string) | ||
| } | ||
| } | ||
|
|
||
| open func write(ping: Data, completion: (() -> ())?) { | ||
| } | ||
|
|
||
| public func disconnect() { | ||
| } | ||
|
|
||
| public func connect() { | ||
| } | ||
| } |
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,70 @@ | ||
| import Starscream | ||
| import Foundation | ||
|
|
||
| /// Included default implementation of a `WebSocketClient`, based on `Starscream`'s `WebSocket`. | ||
| public class DefaultWebSocket: WebSocketClient, Starscream.WebSocketDelegate { | ||
calvincestari marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| /// The websocket protocols supported by this websocket client implementation. | ||
| static private let wsProtocols = ["graphql-ws"] | ||
|
|
||
| /// The underlying `Starscream` websocket used by this websocket client. | ||
| private let underlyingWebsocket: Starscream.WebSocket | ||
|
|
||
| public var request: URLRequest { | ||
| get { underlyingWebsocket.request } | ||
| set { underlyingWebsocket.request = newValue } | ||
| } | ||
|
|
||
| public weak var delegate: WebSocketClientDelegate? | ||
|
|
||
| public var callbackQueue: DispatchQueue { | ||
| get { underlyingWebsocket.callbackQueue } | ||
| set { underlyingWebsocket.callbackQueue = newValue } | ||
| } | ||
|
|
||
| /// Required initializer | ||
| /// | ||
| /// - Parameters: | ||
| /// - request: The URLRequest to use on connection. | ||
| /// - certPinner: [optional] The object providing information about certificate pinning. Should default to Starscream's `FoundationSecurity`. | ||
| /// - compressionHandler: [optional] The object helping with any compression handling. Should default to nil. | ||
| required public init(request: URLRequest) { | ||
| self.underlyingWebsocket = Starscream.WebSocket( | ||
| request: request, | ||
| protocols: Self.wsProtocols, | ||
| stream: FoundationStream()) | ||
| self.underlyingWebsocket.delegate = self | ||
| } | ||
|
|
||
| public func connect() { | ||
| self.underlyingWebsocket.connect() | ||
| } | ||
|
|
||
| public func disconnect() { | ||
| self.underlyingWebsocket.disconnect() | ||
| } | ||
|
|
||
| public func write(ping: Data, completion: (() -> Void)?) { | ||
| self.underlyingWebsocket.write(ping: ping, completion: completion) | ||
| } | ||
|
|
||
| public func write(string: String) { | ||
| self.underlyingWebsocket.write(string: string) | ||
| } | ||
|
|
||
| public func websocketDidConnect(socket: Starscream.WebSocketClient) { | ||
| self.delegate?.websocketDidConnect(socket: self) | ||
| } | ||
|
|
||
| public func websocketDidDisconnect(socket: Starscream.WebSocketClient, error: Error?) { | ||
| self.delegate?.websocketDidDisconnect(socket: self, error: error) | ||
| } | ||
|
|
||
| public func websocketDidReceiveMessage(socket: Starscream.WebSocketClient, text: String) { | ||
| self.delegate?.websocketDidReceiveMessage(socket: self, text: text) | ||
| } | ||
|
|
||
| public func websocketDidReceiveData(socket: Starscream.WebSocketClient, data: Data) { | ||
| self.delegate?.websocketDidReceiveData(socket: self, data: data) | ||
| } | ||
| } | ||
Oops, something went wrong.
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.
It looks like there's some kind of reference to the main Starscream repo floating around in here