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

Don't need optionals here

Browse Source
This commit is contained in:
Erik 2015-09-24 15:01:06 -04:00
parent 12b312de57
commit 0ebbf3f0cd
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
SocketIOClientSwift/SocketEngine.swift
View File

@ -65,8 +65,9 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
var cookies: [NSHTTPCookie]? var cookies: [NSHTTPCookie]?
var sid = "" var sid = ""
var socketPath = "" var socketPath = ""
var urlPolling: String? var urlPolling = ""
var urlWebSocket: String? var urlWebSocket = ""
var ws: WebSocket? var ws: WebSocket?
@objc public enum PacketType: Int { @objc public enum PacketType: Int {
@ -147,13 +148,12 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
} }
} }
private func createURLs(params: [String: AnyObject]?) -> (String?, String?) { private func createURLs(params: [String: AnyObject]?) -> (String, String) {
if client == nil { if client == nil {
return (nil, nil) return ("", "")
} }
let path = socketPath == "" ? "/socket.io" : socketPath let path = socketPath == "" ? "/socket.io" : socketPath
let url = "\(client!.socketURL)\(path)/?transport=" let url = "\(client!.socketURL)\(path)/?transport="
var urlPolling: String var urlPolling: String
var urlWebSocket: String var urlWebSocket: String
@ -189,7 +189,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
} }
private func createWebsocket(andConnect connect: Bool) { private func createWebsocket(andConnect connect: Bool) {
let wsUrl = urlWebSocket! + (sid == "" ? "" : "&sid=\(sid)") let wsUrl = urlWebSocket + (sid == "" ? "" : "&sid=\(sid)")
ws = WebSocket(url: NSURL(string: wsUrl)!, ws = WebSocket(url: NSURL(string: wsUrl)!,
cookies: cookies) cookies: cookies)
@ -228,7 +228,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
} }
waitingForPoll = true waitingForPoll = true
let req = NSMutableURLRequest(URL: NSURL(string: urlPolling! + "&sid=\(sid)&b64=1")!) let req = NSMutableURLRequest(URL: NSURL(string: urlPolling + "&sid=\(sid)&b64=1")!)
if cookies != nil { if cookies != nil {
let headers = NSHTTPCookie.requestHeaderFieldsWithCookies(cookies!) let headers = NSHTTPCookie.requestHeaderFieldsWithCookies(cookies!)
@ -318,7 +318,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
postWait.removeAll(keepCapacity: false) postWait.removeAll(keepCapacity: false)
let req = NSMutableURLRequest(URL: NSURL(string: urlPolling! + "&sid=\(sid)")!) let req = NSMutableURLRequest(URL: NSURL(string: urlPolling + "&sid=\(sid)")!)
if let cookies = cookies { if let cookies = cookies {
let headers = NSHTTPCookie.requestHeaderFieldsWithCookies(cookies) let headers = NSHTTPCookie.requestHeaderFieldsWithCookies(cookies)
@ -468,7 +468,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate {
return return
} }
let reqPolling = NSMutableURLRequest(URL: NSURL(string: urlPolling! + "&b64=1")!) let reqPolling = NSMutableURLRequest(URL: NSURL(string: urlPolling + "&b64=1")!)
if cookies != nil { if cookies != nil {
let headers = NSHTTPCookie.requestHeaderFieldsWithCookies(cookies!) let headers = NSHTTPCookie.requestHeaderFieldsWithCookies(cookies!)