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

clean up

Browse Source
This commit is contained in:
Erik 2015-05-07 10:32:30 -04:00
parent fdfd4dbc4d
commit 88c139ed0c
3 changed files with 25 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SocketIOClientSwift/SocketEngine.swift
View File

@ -493,15 +493,11 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
} }
} else if type == PacketType.NOOP { } else if type == PacketType.NOOP {
self.doPoll() self.doPoll()
return
} else if type == PacketType.PONG { } else if type == PacketType.PONG {
// We should upgrade // We should upgrade
if message == "3probe" { if message == "3probe" {
self.upgradeTransport() self.upgradeTransport()
return
} }
return
} else if type == PacketType.OPEN { } else if type == PacketType.OPEN {
var err:NSError? var err:NSError?
@ -531,8 +527,6 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
if !self.forceWebsockets { if !self.forceWebsockets {
self.doPoll() self.doPoll()
} }
return
} else if type == PacketType.CLOSE { } else if type == PacketType.CLOSE {
if self.client == nil { if self.client == nil {
return return
@ -541,8 +535,6 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
if self.polling { if self.polling {
self.client!.engineDidClose("Disconnect") self.client!.engineDidClose("Disconnect")
} }
return
} else if message.hasPrefix("b4") { } else if message.hasPrefix("b4") {
// binary in base64 string // binary in base64 string
message.removeRange(Range<String.Index>(start: message.startIndex, message.removeRange(Range<String.Index>(start: message.startIndex,

52
SocketIOClientSwift/SocketIOClient.swift
View File

@ -89,40 +89,36 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient
self.opts = opts self.opts = opts
// Set options // Set options
if opts != nil { if let sessionDelegate = opts?["sessionDelegate"] as? NSURLSessionDelegate {
if let sessionDelegate = opts!["sessionDelegate"] as? NSURLSessionDelegate { self.sessionDelegate = sessionDelegate
self.sessionDelegate = sessionDelegate }
if let log = opts?["log"] as? Bool {
self.log = log
}
if var nsp = opts?["nsp"] as? String {
if nsp != "/" && nsp.hasPrefix("/") {
nsp.removeAtIndex(nsp.startIndex)
} }
if let log = opts!["log"] as? Bool { self.nsp = nsp
self.log = log }
}
if let reconnects = opts?["reconnects"] as? Bool {
if var nsp = opts!["nsp"] as? String { self.reconnects = reconnects
if nsp != "/" && nsp.hasPrefix("/") { }
nsp.removeAtIndex(nsp.startIndex)
} if let reconnectAttempts = opts?["reconnectAttempts"] as? Int {
self.reconnectAttempts = reconnectAttempts
self.nsp = nsp
}
if let reconnects = opts!["reconnects"] as? Bool {
self.reconnects = reconnects
}
if let reconnectAttempts = opts!["reconnectAttempts"] as? Int {
self.reconnectAttempts = reconnectAttempts
} else {
self.reconnectAttempts = -1
}
if let reconnectWait = opts!["reconnectWait"] as? Int {
self.reconnectWait = abs(reconnectWait)
}
} else { } else {
self.reconnectAttempts = -1 self.reconnectAttempts = -1
} }
if let reconnectWait = opts?["reconnectWait"] as? Int {
self.reconnectWait = abs(reconnectWait)
}
super.init() super.init()
} }

3
SocketIOClientSwift/SocketPacket.swift
View File

@ -94,7 +94,6 @@ final class SocketPacket: Printable {
func createMessageForEvent(event:String) -> String { func createMessageForEvent(event:String) -> String {
let message:String let message:String
var jsonSendError:NSError?
if self.binary.count == 0 { if self.binary.count == 0 {
self.type = PacketType.EVENT self.type = PacketType.EVENT
@ -157,7 +156,7 @@ final class SocketPacket: Printable {
return self.completeMessage(msg, ack: true) return self.completeMessage(msg, ack: true)
} }
func completeMessage(var message:String, ack:Bool = false) -> String { private func completeMessage(var message:String, ack:Bool = false) -> String {
var err:NSError? var err:NSError?
if self.data == nil || self.data!.count == 0 { if self.data == nil || self.data!.count == 0 {