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

merge master

Browse Source
This commit is contained in:
Erik 2015-04-07 21:56:36 -04:00
commit d8ea3a3c11
2 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SwiftIO/SocketAckMap.swift
View File

@ -24,7 +24,7 @@
import Foundation import Foundation
public typealias AckCallback = (NSArray?) -> Void public typealias AckCallback = @objc_block (NSArray?) -> Void
public typealias OnAckCallback = (timeout:UInt64, callback:AckCallback) -> Void public typealias OnAckCallback = (timeout:UInt64, callback:AckCallback) -> Void
struct SocketAckMap { struct SocketAckMap {

92
SwiftIO/SocketPacket.swift
View File

@ -90,68 +90,68 @@ class SocketPacket {
} }
func createMessageForEvent(event:String) -> String { func createMessageForEvent(event:String) -> String {
var message:String var message:String
var jsonSendError:NSError? var jsonSendError:NSError?
if self.binary.count == 0 { if self.binary.count == 0 {
self.type = SocketPacketType.EVENT self.type = SocketPacketType.EVENT
if self.nsp == "/" { if self.nsp == "/" {
if self.id == nil { if self.id == nil {
message = "2[\"\(event)\"" message = "2[\"\(event)\""
} else {
message = "2\(self.id!)[\"\(event)\""
}
} else { } else {
if self.id == nil { message = "2\(self.id!)[\"\(event)\""
message = "2/\(self.nsp),[\"\(event)\""
} else {
message = "2/\(self.nsp),\(self.id!)[\"\(event)\""
}
} }
} else { } else {
self.type = SocketPacketType.BINARY_EVENT if self.id == nil {
message = "2/\(self.nsp),[\"\(event)\""
if self.nsp == "/" {
if self.id == nil {
message = "5\(self.binary.count)-[\"\(event)\""
} else {
message = "5\(self.binary.count)-\(self.id!)[\"\(event)\""
}
} else { } else {
if self.id == nil { message = "2/\(self.nsp),\(self.id!)[\"\(event)\""
message = "5\(self.binary.count)-/\(self.nsp),[\"\(event)\""
} else {
message = "5\(self.binary.count)-/\(self.nsp),\(self.id!)[\"\(event)\""
}
} }
} }
} else {
self.type = SocketPacketType.BINARY_EVENT
return self.completeMessage(message) if self.nsp == "/" {
if self.id == nil {
message = "5\(self.binary.count)-[\"\(event)\""
} else {
message = "5\(self.binary.count)-\(self.id!)[\"\(event)\""
}
} else {
if self.id == nil {
message = "5\(self.binary.count)-/\(self.nsp),[\"\(event)\""
} else {
message = "5\(self.binary.count)-/\(self.nsp),\(self.id!)[\"\(event)\""
}
}
}
return self.completeMessage(message)
} }
func createAck() -> String { func createAck() -> String {
var msg:String var msg:String
if self.binary.count == 0 { if self.binary.count == 0 {
self.type = SocketPacketType.ACK self.type = SocketPacketType.ACK
if nsp == "/" { if nsp == "/" {
msg = "3\(self.id!)[" msg = "3\(self.id!)["
} else {
msg = "3/\(self.nsp),\(self.id!)["
}
} else { } else {
self.type = SocketPacketType.BINARY_ACK msg = "3/\(self.nsp),\(self.id!)["
if nsp == "/" {
msg = "6\(self.binary.count)-\(self.id!)["
} else {
msg = "6\(self.binary.count)-/\(self.nsp),\(self.id!)["
}
} }
} else {
self.type = SocketPacketType.BINARY_ACK
return self.completeMessage(msg, ack: true) if nsp == "/" {
msg = "6\(self.binary.count)-\(self.id!)["
} else {
msg = "6\(self.binary.count)-/\(self.nsp),\(self.id!)["
}
}
return self.completeMessage(msg, ack: true)
} }
func completeMessage(var message:String, ack:Bool = false) -> String { func completeMessage(var message:String, ack:Bool = false) -> String {