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

Extract addHeaders to enginespec

Browse Source
This commit is contained in:
Erik Little 2017-09-16 09:20:50 -04:00
parent 3019fd7ea3
commit df8f87cc21
No known key found for this signature in database
GPG Key ID: 4930B7C5FBC1A69D
3 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -269,17 +269,7 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
var reqPolling = URLRequest(url: urlPolling, cachePolicy: .reloadIgnoringLocalCacheData, timeoutInterval: 60.0) var reqPolling = URLRequest(url: urlPolling, cachePolicy: .reloadIgnoringLocalCacheData, timeoutInterval: 60.0)
if cookies != nil { addHeaders(to: &reqPolling)
let headers = HTTPCookie.requestHeaderFields(with: cookies!)
reqPolling.allHTTPHeaderFields = headers
}
if let extraHeaders = extraHeaders {
for (headerName, value) in extraHeaders {
reqPolling.setValue(value, forHTTPHeaderField: headerName)
}
}
doLongPoll(for: reqPolling) doLongPoll(for: reqPolling)
} }
@ -303,9 +293,9 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
urlWebSocket.scheme = "ws" urlWebSocket.scheme = "ws"
} }
if connectParams != nil { if let connectParams = self.connectParams {
for (key, value) in connectParams! { for (key, value) in connectParams {
let keyEsc = key.urlEncode()! let keyEsc = key.urlEncode()!
let valueEsc = "\(value)".urlEncode()! let valueEsc = "\(value)".urlEncode()!
queryString += "&\(keyEsc)=\(valueEsc)" queryString += "&\(keyEsc)=\(valueEsc)"

13
Source/SocketIO/Engine/SocketEnginePollable.swift
View File

@ -71,19 +71,6 @@ public protocol SocketEnginePollable : SocketEngineSpec {
// Default polling methods // Default polling methods
extension SocketEnginePollable { extension SocketEnginePollable {
private func addHeaders(to req: inout URLRequest) {
if cookies != nil {
let headers = HTTPCookie.requestHeaderFields(with: cookies!)
req.allHTTPHeaderFields = headers
}
if extraHeaders != nil {
for (headerName, value) in extraHeaders! {
req.setValue(value, forHTTPHeaderField: headerName)
}
}
}
func createRequestForPostWithPostWait() -> URLRequest { func createRequestForPostWithPostWait() -> URLRequest {
defer { postWait.removeAll(keepingCapacity: true) } defer { postWait.removeAll(keepingCapacity: true) }

12
Source/SocketIO/Engine/SocketEngineSpec.swift
View File

@ -147,6 +147,18 @@ extension SocketEngineSpec {
return com.url! return com.url!
} }
func addHeaders(to req: inout URLRequest) {
if let cookies = cookies {
req.allHTTPHeaderFields = HTTPCookie.requestHeaderFields(with: cookies)
}
if let extraHeaders = extraHeaders {
for (headerName, value) in extraHeaders {
req.setValue(value, forHTTPHeaderField: headerName)
}
}
}
func createBinaryDataForSend(using data: Data) -> Either<Data, String> { func createBinaryDataForSend(using data: Data) -> Either<Data, String> {
if websocket { if websocket {
var byteArray = [UInt8](repeating: 0x4, count: 1) var byteArray = [UInt8](repeating: 0x4, count: 1)