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-04 21:50:23 -05:00
parent 1f1ba60574
commit 63aed1ce91
2 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -67,7 +67,7 @@ socket.on("ackEvent") {data, ack in
} }
socket.emitWithAck("ackTest", "test").onAck {data in socket.emitWithAck("ackTest", "test").onAck {data in
println(data) println(data?[0])
} }
ack?("Got your event", "dude") ack?("Got your event", "dude")

79
SwiftIO/SocketEngine.swift
View File

@ -49,6 +49,8 @@ private enum PacketType: String {
class SocketEngine: NSObject, SRWebSocketDelegate { class SocketEngine: NSObject, SRWebSocketDelegate {
unowned let client:SocketIOClient unowned let client:SocketIOClient
private let workQueue = NSOperationQueue() private let workQueue = NSOperationQueue()
private let handleQueue = dispatch_queue_create(
"handleQueue".cStringUsingEncoding(NSUTF8StringEncoding), DISPATCH_QUEUE_SERIAL)
private var pingTimer:NSTimer? private var pingTimer:NSTimer?
private var _polling = true private var _polling = true
private var probing = false private var probing = false
@ -134,7 +136,7 @@ class SocketEngine: NSObject, SRWebSocketDelegate {
return (urlPolling, urlWebSocket) return (urlPolling, urlWebSocket)
} }
func doPoll() { private func doPoll() {
if self.urlPolling == nil || self.websocket || self.wait { if self.urlPolling == nil || self.websocket || self.wait {
return return
} }
@ -221,7 +223,7 @@ class SocketEngine: NSObject, SRWebSocketDelegate {
self?.ws = SRWebSocket(URL: self?.ws = SRWebSocket(URL:
NSURL(string: urlWebSocket + "&sid=\(self!.sid)")!) NSURL(string: urlWebSocket + "&sid=\(self!.sid)")!)
self?.ws?.delegate = self self?.ws?.delegate = self
// self?.ws?.open() self?.ws?.open()
} else { } else {
NSLog("Error handshaking") NSLog("Error handshaking")
return return
@ -304,46 +306,47 @@ class SocketEngine: NSObject, SRWebSocketDelegate {
private func parseEngineMessage(message:AnyObject?) { private func parseEngineMessage(message:AnyObject?) {
// println(message) // println(message)
dispatch_async(self.handleQueue) {[weak self] in
if let data = message as? NSData { if let data = message as? NSData {
// Strip off message type // Strip off message type
self.client.parseSocketMessage(data.subdataWithRange(NSMakeRange(1, data.length - 1))) self?.client.parseSocketMessage(data.subdataWithRange(NSMakeRange(1, data.length - 1)))
return
}
var messageString = message as String
var strMessage = RegexMutable(messageString)
// We should upgrade
if strMessage == "3probe" {
self.upgradeTransport()
return
}
let type = strMessage["^(\\d)"].groups()?[1]
if type != PacketType.MESSAGE.rawValue {
// TODO Handle other packets
if messageString.hasPrefix("b4") {
// binary in base64 string
messageString.removeRange(Range<String.Index>(start: messageString.startIndex,
end: advance(messageString.startIndex, 2)))
if let data = NSData(base64EncodedString: messageString,
options: NSDataBase64DecodingOptions.IgnoreUnknownCharacters) {
self.client.parseSocketMessage(data)
}
return return
} }
println("Got something idk what to do with") var messageString = message as String
println(messageString) var strMessage = RegexMutable(messageString)
}
// Remove message type // We should upgrade
messageString.removeAtIndex(messageString.startIndex) if strMessage == "3probe" {
self.client.parseSocketMessage(messageString) self?.upgradeTransport()
return
}
let type = strMessage["^(\\d)"].groups()?[1]
if type != PacketType.MESSAGE.rawValue {
// TODO Handle other packets
if messageString.hasPrefix("b4") {
// binary in base64 string
messageString.removeRange(Range<String.Index>(start: messageString.startIndex,
end: advance(messageString.startIndex, 2)))
if let data = NSData(base64EncodedString: messageString,
options: NSDataBase64DecodingOptions.IgnoreUnknownCharacters) {
self?.client.parseSocketMessage(data)
}
return
}
// println("Got something idk what to do with")
// println(messageString)
}
// Remove message type
messageString.removeAtIndex(messageString.startIndex)
self?.client.parseSocketMessage(messageString)
}
} }
func probeWebSocket() { func probeWebSocket() {