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

Merge branch 'master' into engineerrors

Browse Source
This commit is contained in:
Erik 2015-04-09 00:39:43 -04:00
commit a01e85ba05
5 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SwiftIO/SocketAckMap.swift
View File

@ -39,7 +39,6 @@ struct SocketAckMap {
dispatch_async(dispatch_get_main_queue()) {
callback?(items)
return
}
acks.removeValueForKey(ack)

13
SwiftIO/SocketEngine.swift
View File

@ -83,11 +83,11 @@ public class SocketEngine: NSObject, WebSocketDelegate {
case UPGRADE = 5
case NOOP = 6
init(str:String) {
if let value = str.toInt() {
init?(str:String?) {
if let value = str?.toInt() {
self = PacketType(rawValue: value)!
} else {
self = PacketType.NOOP
return nil
}
}
}
@ -230,7 +230,6 @@ public class SocketEngine: NSObject, WebSocketDelegate {
if let str = NSString(data: data, encoding: NSUTF8StringEncoding) as? String {
dispatch_async(self!.parseQueue) {
self?.parsePollingMessage(str)
return
}
}
@ -424,7 +423,6 @@ public class SocketEngine: NSObject, WebSocketDelegate {
// Be sure to capture the value of the msg
dispatch_async(self.handleQueue) {[weak self, msg] in
self?.parseEngineMessage(msg, fromPolling: true)
return
}
}
@ -441,7 +439,6 @@ public class SocketEngine: NSObject, WebSocketDelegate {
dispatch_async(self.client!.handleQueue) {[weak self] in
self?.client?.parseBinaryData(data.subdataWithRange(NSMakeRange(1, data.length - 1)))
return
}
}
@ -451,7 +448,7 @@ public class SocketEngine: NSObject, WebSocketDelegate {
fixDoubleUTF8(&message)
}
let type = PacketType(str: (message["^(\\d)"].groups()?[1])!)
let type = PacketType(str: (message["^(\\d)"].groups()?[1]))
if type == PacketType.MESSAGE {
// Remove message type
@ -463,7 +460,6 @@ public class SocketEngine: NSObject, WebSocketDelegate {
dispatch_async(self.client!.handleQueue) {[weak self] in
self?.client?.parseSocketMessage(message)
return
}
} else if type == PacketType.NOOP {
self.doPoll()
@ -534,7 +530,6 @@ public class SocketEngine: NSObject, WebSocketDelegate {
dispatch_async(self.client!.handleQueue) {[weak self] in
self?.client?.parseBinaryData(data)
return
}
}
}

1
SwiftIO/SocketEventHandler.swift
View File

@ -43,7 +43,6 @@ class SocketEventHandler {
withSocket socket:SocketIOClient? = nil) {
dispatch_async(dispatch_get_main_queue()) {[weak self] in
self?.callback?(items, ack != nil ? emitAckCallback(socket!, ack!) : nil)
return
}
}
}

5
SwiftIO/SocketIOClient.swift
View File

@ -199,7 +199,6 @@ public class SocketIOClient: NSObject, SocketEngineClient {
dispatch_async(self!.emitQueue) {
self?._emit(event, items, ack: ack)
return
}
if timeout != 0 {
@ -207,7 +206,6 @@ public class SocketIOClient: NSObject, SocketEngineClient {
dispatch_after(time, dispatch_get_main_queue()) {
self?.ackHandlers.timeoutAck(ack)
return
}
}
}
@ -245,7 +243,6 @@ public class SocketIOClient: NSObject, SocketEngineClient {
dispatch_async(self.emitQueue) {[weak self] in
self?._emit(event, items)
return
}
}
@ -259,7 +256,6 @@ public class SocketIOClient: NSObject, SocketEngineClient {
dispatch_async(self.emitQueue) {[weak self] in
self?._emit(event, items)
return
}
}
@ -370,7 +366,6 @@ public class SocketIOClient: NSObject, SocketEngineClient {
if self.anyHandler != nil {
dispatch_async(dispatch_get_main_queue()) {[weak self] in
self?.anyHandler?(SocketAnyEvent(event: event, items: data))
return
}
}

6
SwiftIO/SocketParser.swift
View File

@ -183,11 +183,7 @@ class SocketParser {
}
func checkNSP(nsp:String) -> Bool {
if nsp == "" && socket.nsp != "/" {
return true
} else {
return false
}
return nsp == "" && socket.nsp != "/"
}
let p = parseString(stringMessage) as SocketPacket!