small tweaks
This commit is contained in:
parent
5b019a91c5
commit
1f05bde09b
@ -180,8 +180,6 @@ public class SocketEngine: NSObject, WebSocketDelegate {
|
|||||||
|
|
||||||
if let str = NSString(data: data, encoding: NSUTF8StringEncoding) as? String {
|
if let str = NSString(data: data, encoding: NSUTF8StringEncoding) as? String {
|
||||||
// println(str)
|
// println(str)
|
||||||
|
|
||||||
|
|
||||||
dispatch_async(self!.parseQueue) {callback(str)}
|
dispatch_async(self!.parseQueue) {callback(str)}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -196,8 +194,6 @@ public class SocketEngine: NSObject, WebSocketDelegate {
|
|||||||
}.resume()
|
}.resume()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private func flushProbeWait() {
|
private func flushProbeWait() {
|
||||||
// println("flushing probe wait")
|
// println("flushing probe wait")
|
||||||
dispatch_async(self.emitQueue) {[weak self] in
|
dispatch_async(self.emitQueue) {[weak self] in
|
||||||
@ -464,7 +460,7 @@ public class SocketEngine: NSObject, WebSocketDelegate {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func send(msg:String, datas:[NSData]? = nil) {
|
public func send(msg:String, datas:[NSData]? = nil) {
|
||||||
let _send = {[weak self] (msg:String, datas:[NSData]?) -> () -> Void in
|
let _send = {[weak self] (msg:String, datas:[NSData]?) -> () -> Void in
|
||||||
return {
|
return {
|
||||||
if self == nil || !self!.connected {
|
if self == nil || !self!.connected {
|
||||||
|
|||||||
@ -226,7 +226,7 @@ class SocketEvent {
|
|||||||
// We have multiple items
|
// We have multiple items
|
||||||
// Do it live
|
// Do it live
|
||||||
let argsAsArray = "[\(self.args)]"
|
let argsAsArray = "[\(self.args)]"
|
||||||
if let parsedArr = SocketIOClient.parseData(argsAsArray) as? NSArray {
|
if let parsedArr = SocketParser.parseData(argsAsArray) as? NSArray {
|
||||||
var returnArr = [AnyObject](count: parsedArr.count, repeatedValue: 0)
|
var returnArr = [AnyObject](count: parsedArr.count, repeatedValue: 0)
|
||||||
|
|
||||||
for i in 0..<parsedArr.count {
|
for i in 0..<parsedArr.count {
|
||||||
|
|||||||
@ -160,6 +160,8 @@ public class SocketIOClient: NSObject {
|
|||||||
self.reconnectTimer = nil
|
self.reconnectTimer = nil
|
||||||
self._sid = self.engine?.sid
|
self._sid = self.engine?.sid
|
||||||
|
|
||||||
|
// Don't handle as internal because something crazy could happen where
|
||||||
|
// we disconnect before it's handled
|
||||||
self.handleEvent("connect", data: nil, isInternalMessage: false)
|
self.handleEvent("connect", data: nil, isInternalMessage: false)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -247,7 +249,7 @@ public class SocketIOClient: NSObject {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// If the server wants to know that the client received data
|
// If the server wants to know that the client received data
|
||||||
internal func emitAck(ack:Int, withData data:[AnyObject]?, withAckType ackType:Int) {
|
func emitAck(ack:Int, withData data:[AnyObject]?, withAckType ackType:Int) {
|
||||||
dispatch_async(self.ackQueue) {[weak self] in
|
dispatch_async(self.ackQueue) {[weak self] in
|
||||||
if self == nil || !self!.connected || data == nil {
|
if self == nil || !self!.connected || data == nil {
|
||||||
return
|
return
|
||||||
@ -281,7 +283,7 @@ public class SocketIOClient: NSObject {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Called when the socket gets an ack for something it sent
|
// Called when the socket gets an ack for something it sent
|
||||||
internal func handleAck(ack:Int, data:AnyObject?) {
|
func handleAck(ack:Int, data:AnyObject?) {
|
||||||
self.ackHandlers = self.ackHandlers.filter {handler in
|
self.ackHandlers = self.ackHandlers.filter {handler in
|
||||||
if handler.ackNum != ack {
|
if handler.ackNum != ack {
|
||||||
return true
|
return true
|
||||||
@ -373,7 +375,7 @@ public class SocketIOClient: NSObject {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Something happened while polling
|
// Something happened while polling
|
||||||
internal func pollingDidFail(err:NSError?) {
|
func pollingDidFail(err:NSError?) {
|
||||||
if !self.reconnecting {
|
if !self.reconnecting {
|
||||||
self._connected = false
|
self._connected = false
|
||||||
self.handleEvent("reconnect", data: err?.localizedDescription, isInternalMessage: true)
|
self.handleEvent("reconnect", data: err?.localizedDescription, isInternalMessage: true)
|
||||||
@ -382,7 +384,7 @@ public class SocketIOClient: NSObject {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// We lost connection and should attempt to reestablish
|
// We lost connection and should attempt to reestablish
|
||||||
internal func tryReconnect() {
|
func tryReconnect() {
|
||||||
if self.reconnectAttempts != -1 && self.currentReconnectAttempt + 1 > self.reconnectAttempts {
|
if self.reconnectAttempts != -1 && self.currentReconnectAttempt + 1 > self.reconnectAttempts {
|
||||||
self.didForceClose()
|
self.didForceClose()
|
||||||
return
|
return
|
||||||
|
|||||||
@ -202,8 +202,6 @@ class SocketParser {
|
|||||||
socket.joinNamespace()
|
socket.joinNamespace()
|
||||||
return
|
return
|
||||||
} else {
|
} else {
|
||||||
// Don't handle as internal because something crazy could happen where
|
|
||||||
// we disconnect before it's handled
|
|
||||||
socket.didConnect()
|
socket.didConnect()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -225,7 +223,8 @@ class SocketParser {
|
|||||||
if messageGroups[3] != "" {
|
if messageGroups[3] != "" {
|
||||||
ackNum = messageGroups[3]
|
ackNum = messageGroups[3]
|
||||||
} else {
|
} else {
|
||||||
let range = Range<String.Index>(start: mesNum.startIndex, end: advance(mesNum.startIndex, 1))
|
let range = Range<String.Index>(start: mesNum.startIndex,
|
||||||
|
end: advance(mesNum.startIndex, 1))
|
||||||
mesNum.replaceRange(range, with: "")
|
mesNum.replaceRange(range, with: "")
|
||||||
ackNum = mesNum
|
ackNum = mesNum
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user