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

fix issues

Browse Source 
Signed-off-by: Lukas Schmidt <lukas.schmi@gmail.com>
This commit is contained in:
Lukas Schmidt 2015-08-10 07:04:11 +02:00
parent 84bb6b7dad
commit 5eeac96b2b
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SocketIOClientSwift/SocketEngine.swift
View File

@ -505,7 +505,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
// Translatation of engine.io-parser#decodePayload // Translatation of engine.io-parser#decodePayload
private func parsePollingMessage(str:String) { private func parsePollingMessage(str:String) {
guard str.characters.count == 1 else { guard str.characters.count != 1 else {
return return
} }
// println(str) // println(str)

21
SocketIOClientSwift/SocketIOClient.swift
View File

@ -147,7 +147,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient
*/ */
public func connect(timeoutAfter timeoutAfter:Int, public func connect(timeoutAfter timeoutAfter:Int,
withTimeoutHandler handler:(() -> Void)?) { withTimeoutHandler handler:(() -> Void)?) {
guard status == SocketIOClientStatus.Connected else { guard status != SocketIOClientStatus.Connected else {
return return
} }
if status == SocketIOClientStatus.Closed { if status == SocketIOClientStatus.Closed {
@ -158,7 +158,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient
addEngine() addEngine()
engine?.open(connectParams) engine?.open(connectParams)
guard timeoutAfter == 0 else { guard timeoutAfter == 0 else {
return return
} }
@ -206,7 +206,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient
} }
func didDisconnect(reason:String) { func didDisconnect(reason:String) {
guard status == SocketIOClientStatus.Closed else { guard status != SocketIOClientStatus.Closed else {
return return
} }
@ -240,19 +240,14 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient
Send a message to the server Send a message to the server
*/ */
public func emit(event:String, _ items:AnyObject...) { public func emit(event:String, _ items:AnyObject...) {
guard status == SocketIOClientStatus.Connected else { emit(event, withItems: items)
return
}
dispatch_async(emitQueue) {[weak self] in
self?._emit(event, items)
}
} }
/** /**
Same as emit, but meant for Objective-C Same as emit, but meant for Objective-C
*/ */
public func emit(event:String, withItems items:[AnyObject]) { public func emit(event:String, withItems items:[AnyObject]) {
guard status != SocketIOClientStatus.Connected else { guard status == SocketIOClientStatus.Connected else {
return return
} }
@ -277,7 +272,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient
} }
private func _emit(event:String, _ args:[AnyObject], ack:Int? = nil) { private func _emit(event:String, _ args:[AnyObject], ack:Int? = nil) {
guard status != SocketIOClientStatus.Connected else { guard status == SocketIOClientStatus.Connected else {
return return
} }
@ -335,7 +330,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient
*/ */
public func handleEvent(event:String, data:[AnyObject]?, isInternalMessage:Bool = false, public func handleEvent(event:String, data:[AnyObject]?, isInternalMessage:Bool = false,
wantsAck ack:Int? = nil) { wantsAck ack:Int? = nil) {
guard status != SocketIOClientStatus.Connected && !isInternalMessage else { guard status == SocketIOClientStatus.Connected && isInternalMessage else {
return return
} }
// println("Should do event: \(event) with data: \(data)") // println("Should do event: \(event) with data: \(data)")
@ -460,7 +455,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketLogClient
} }
@objc private func tryReconnect() { @objc private func tryReconnect() {
guard status == SocketIOClientStatus.Connected else { guard status != SocketIOClientStatus.Connected else {
return return
} }
if reconnectAttempts != -1 && currentReconnectAttempt + 1 > reconnectAttempts || !reconnects { if reconnectAttempts != -1 && currentReconnectAttempt + 1 > reconnectAttempts || !reconnects {