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

tweaks

Browse Source
This commit is contained in:
Erik 2015-03-06 21:17:26 -05:00
parent 14bf64233b
commit 6399df4c33
3 changed files with 103 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
SwiftIO/SocketEngine.swift
View File

@ -229,12 +229,16 @@ class SocketEngine: NSObject, SRWebSocketDelegate {
self?.handlePollingFailed(err) self?.handlePollingFailed(err)
} }
return return
} else if self == nil {
return
} }
self?.flushWaitingForPost()
self?.waitingForPost = false self?.waitingForPost = false
dispatch_async(self!.emitQueue) {
self?.flushWaitingForPost()
self?.doPoll() self?.doPoll()
}.resume() return
}}.resume()
} }
// We had packets waiting for send when we upgraded // We had packets waiting for send when we upgraded
@ -252,6 +256,7 @@ class SocketEngine: NSObject, SRWebSocketDelegate {
private func handlePollingFailed(reason:NSError?) { private func handlePollingFailed(reason:NSError?) {
if !self.client.reconnecting { if !self.client.reconnecting {
self.connected = false self.connected = false
self.ws?.close()
self.pingTimer?.invalidate() self.pingTimer?.invalidate()
self.waitingForPoll = false self.waitingForPoll = false
self.waitingForPost = false self.waitingForPost = false
@ -271,27 +276,25 @@ class SocketEngine: NSObject, SRWebSocketDelegate {
let reqPolling = NSURLRequest(URL: NSURL(string: urlPolling + "&b64=1")!) let reqPolling = NSURLRequest(URL: NSURL(string: urlPolling + "&b64=1")!)
self.session.dataTaskWithRequest(reqPolling) {[weak self] data, res, err in self.session.dataTaskWithRequest(reqPolling) {[weak self] data, res, err in
var err:NSError? var err2:NSError?
if self == nil { if self == nil {
return return
} else if err != nil || data == nil { } else if err != nil || data == nil {
if self!.polling {
self?.handlePollingFailed(err) self?.handlePollingFailed(err)
}
return return
} }
if let dataString = NSString(data: data, encoding: NSUTF8StringEncoding) { if let dataString = NSString(data: data, encoding: NSUTF8StringEncoding) {
var mutString = RegexMutable(dataString) var mutString = RegexMutable(dataString)
let parsed = mutString["(\\d*):(\\d)(\\{.*\\})?"].groups() let parsed:[String]? = mutString["(\\d*):(\\d)(\\{.*\\})?"].groups()
if parsed.count != 4 { if parsed == nil || parsed?.count != 4 {
return return
} }
let length = parsed[1] let length = parsed![1]
let type = parsed[2] let type = parsed![2]
let jsonData = parsed[3].dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false) let jsonData = parsed![3].dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)
if type != "0" { if type != "0" {
NSLog("Error handshaking") NSLog("Error handshaking")
@ -301,7 +304,7 @@ class SocketEngine: NSObject, SRWebSocketDelegate {
self?.connected = true self?.connected = true
if let json = NSJSONSerialization.JSONObjectWithData(jsonData!, if let json = NSJSONSerialization.JSONObjectWithData(jsonData!,
options: NSJSONReadingOptions.AllowFragments, error: &err) as? NSDictionary { options: NSJSONReadingOptions.AllowFragments, error: &err2) as? NSDictionary {
if let sid = json["sid"] as? String { if let sid = json["sid"] as? String {
// println(json) // println(json)
self?.sid = sid self?.sid = sid
@ -324,8 +327,7 @@ class SocketEngine: NSObject, SRWebSocketDelegate {
self?.doPoll() self?.doPoll()
self?.startPingTimer() self?.startPingTimer()
} }}.resume()
}.resume()
} }
// Translatation of engine.io-parser#decodePayload // Translatation of engine.io-parser#decodePayload

5
SwiftIO/SocketEventHandler.swift
View File

@ -45,6 +45,9 @@ class SocketEventHandler {
func executeCallback(_ items:NSArray? = nil, withAck ack:Int? = nil, withAckType type:Int? = nil, func executeCallback(_ items:NSArray? = nil, withAck ack:Int? = nil, withAckType type:Int? = nil,
withSocket socket:SocketIOClient? = nil) { withSocket socket:SocketIOClient? = nil) {
callback?(items, ack != nil ? emitAckCallback(socket!, ack!, type!) : nil) dispatch_async(dispatch_get_main_queue()) {[weak self] in
self?.callback?(items, ack != nil ? emitAckCallback(socket!, ack!, type!) : nil)
return
}
} }
} }

2
SwiftIO/SocketIOClient.swift
View File

@ -280,7 +280,6 @@ class SocketIOClient {
} }
for handler in self.handlers { for handler in self.handlers {
if handler.event == event { if handler.event == event {
dispatch_async(dispatch_get_main_queue()) {
if data is NSArray { if data is NSArray {
if ack != nil { if ack != nil {
handler.executeCallback(data as? NSArray, withAck: ack!, handler.executeCallback(data as? NSArray, withAck: ack!,
@ -308,7 +307,6 @@ class SocketIOClient {
} }
} }
} }
}
// Should be removed and moved to SocketEngine // Should be removed and moved to SocketEngine
func joinNamespace() { func joinNamespace() {