From a49f8f19cf9c6b963572a8750a116dbcfd269026 Mon Sep 17 00:00:00 2001 From: Erik Date: Wed, 1 Jul 2015 07:05:06 -0400 Subject: [PATCH] add extraHeaders option fixes. nuclearace/Socket.IO-Client-Swift#64 --- README.md | 1 + SocketIOClientSwift/SocketEngine.swift | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/README.md b/README.md index 00f7f5b..7f61ef1 100644 --- a/README.md +++ b/README.md @@ -110,6 +110,7 @@ Options - `log: Bool` If `true` socket will log debug messages. Default is false. - `sessionDelegate: NSURLSessionDelegate` Sets an NSURLSessionDelegate for the underlying engine. Useful if you need to handle self-signed certs. Default is nil. - `path: String` - If the server uses a custom path. ex: `"/swift"`. Default is `""` +- `extraHeaders: [String: String]?` - Adds custom headers to the initial request. Default is nil. Methods ------- diff --git a/SocketIOClientSwift/SocketEngine.swift b/SocketIOClientSwift/SocketEngine.swift index f288d28..356f912 100644 --- a/SocketIOClientSwift/SocketEngine.swift +++ b/SocketIOClientSwift/SocketEngine.swift @@ -37,6 +37,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient { private var closed = false private var _connected = false + private var extraHeaders:[String: String]? private var fastUpgrade = false private var forcePolling = false private var forceWebsockets = false @@ -109,6 +110,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient { cookies = opts?["cookies"] as? [NSHTTPCookie] log = opts?["log"] as? Bool ?? false socketPath = opts?["path"] as? String ?? "" + extraHeaders = opts?["extraHeaders"] as? [String: String] } deinit { @@ -194,6 +196,13 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient { private func createWebsocket(andConnect connect:Bool) { ws = WebSocket(url: NSURL(string: urlWebSocket! + "&sid=\(sid)")!, cookies: cookies) + + if extraHeaders != nil { + for (headerName, value) in extraHeaders! { + ws?.headers[headerName] = value + } + } + ws?.queue = handleQueue ws?.delegate = self @@ -229,6 +238,12 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient { req.allHTTPHeaderFields = headers } + if extraHeaders != nil { + for (headerName, value) in extraHeaders! { + req.setValue(value, forHTTPHeaderField: headerName) + } + } + doRequest(req) } @@ -477,6 +492,12 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient { reqPolling.allHTTPHeaderFields = headers } + if extraHeaders != nil { + for (headerName, value) in extraHeaders! { + reqPolling.setValue(value, forHTTPHeaderField: headerName) + } + } + doRequest(reqPolling) }