cheykrym/socket.io-client-swift
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1420 from ranker-dev/feature/custom-engine-option

Browse Source 
Add option to allow the use of URLSessionWebSocketTask in WebSocket client.
This commit is contained in:
Erik Little 2022-07-29 10:49:57 -04:00 committed by GitHub
commit 61a7f2e936
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/SocketIO/Client/SocketIOClientOption.swift
View File

@ -108,6 +108,9 @@ public enum SocketIOClientOption : ClientOption {
/// Sets an NSURLSessionDelegate for the underlying engine. Useful if you need to handle self-signed certs. /// Sets an NSURLSessionDelegate for the underlying engine. Useful if you need to handle self-signed certs.
case sessionDelegate(URLSessionDelegate) case sessionDelegate(URLSessionDelegate)
/// If passed `false`, the WebSocket stream will be configured with the useCustomEngine `false`.
case useCustomEngine(Bool)
/// The version of socket.io being used. This should match the server version. Default is 3. /// The version of socket.io being used. This should match the server version. Default is 3.
case version(SocketIOVersion) case version(SocketIOVersion)
@ -160,6 +163,8 @@ public enum SocketIOClientOption : ClientOption {
description = "sessionDelegate" description = "sessionDelegate"
case .enableSOCKSProxy: case .enableSOCKSProxy:
description = "enableSOCKSProxy" description = "enableSOCKSProxy"
case .useCustomEngine:
description = "customEngine"
case .version: case .version:
description = "version" description = "version"
} }
@ -213,6 +218,8 @@ public enum SocketIOClientOption : ClientOption {
value = delegate value = delegate
case let .enableSOCKSProxy(enable): case let .enableSOCKSProxy(enable):
value = enable value = enable
case let .useCustomEngine(enable):
value = enable
case let.version(versionNum): case let.version(versionNum):
value = versionNum value = versionNum
} }

7
Source/SocketIO/Engine/SocketEngine.swift
View File

@ -111,6 +111,9 @@ open class SocketEngine:
/// The url for WebSockets. /// The url for WebSockets.
public private(set) var urlWebSocket = URL(string: "http://localhost/")! public private(set) var urlWebSocket = URL(string: "http://localhost/")!
/// When `false`, the WebSocket `stream` will be configured with the useCustomEngine `false`.
public private(set) var useCustomEngine = true
/// The version of engine.io being used. Default is three. /// The version of engine.io being used. Default is three.
public private(set) var version: SocketIOVersion = .three public private(set) var version: SocketIOVersion = .three
@ -307,7 +310,7 @@ open class SocketEngine:
includingCookies: session?.configuration.httpCookieStorage?.cookies(for: urlPollingWithSid) includingCookies: session?.configuration.httpCookieStorage?.cookies(for: urlPollingWithSid)
) )
ws = WebSocket(request: req, certPinner: certPinner, compressionHandler: compress ? WSCompression() : nil) ws = WebSocket(request: req, certPinner: certPinner, compressionHandler: compress ? WSCompression() : nil, useCustomEngine: useCustomEngine)
ws?.callbackQueue = engineQueue ws?.callbackQueue = engineQueue
ws?.delegate = self ws?.delegate = self
@ -624,6 +627,8 @@ open class SocketEngine:
self.compress = true self.compress = true
case .enableSOCKSProxy: case .enableSOCKSProxy:
self.enableSOCKSProxy = true self.enableSOCKSProxy = true
case let .useCustomEngine(enable):
self.useCustomEngine = enable
case let .version(num): case let .version(num):
version = num version = num
default: default: