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

small tweaks

Browse Source
This commit is contained in:
Erik 2015-03-13 09:09:37 -04:00
parent 5b019a91c5
commit 1f05bde09b
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SwiftIO/SocketEngine.swift
View File

@ -180,8 +180,6 @@ public class SocketEngine: NSObject, WebSocketDelegate {
if let str = NSString(data: data, encoding: NSUTF8StringEncoding) as? String {
// println(str)
dispatch_async(self!.parseQueue) {callback(str)}
}
@ -196,8 +194,6 @@ public class SocketEngine: NSObject, WebSocketDelegate {
}.resume()
}
private func flushProbeWait() {
// println("flushing probe wait")
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
return {
if self == nil || !self!.connected {

2
SwiftIO/SocketEvent.swift
View File

@ -226,7 +226,7 @@ class SocketEvent {
// We have multiple items
// Do it live
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)
for i in 0..<parsedArr.count {

10
SwiftIO/SocketIOClient.swift
View File

@ -160,6 +160,8 @@ public class SocketIOClient: NSObject {
self.reconnectTimer = nil
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)
}
@ -247,7 +249,7 @@ public class SocketIOClient: NSObject {
}
// 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
if self == nil || !self!.connected || data == nil {
return
@ -281,7 +283,7 @@ public class SocketIOClient: NSObject {
}
// 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
if handler.ackNum != ack {
return true
@ -373,7 +375,7 @@ public class SocketIOClient: NSObject {
}
// Something happened while polling
internal func pollingDidFail(err:NSError?) {
func pollingDidFail(err:NSError?) {
if !self.reconnecting {
self._connected = false
self.handleEvent("reconnect", data: err?.localizedDescription, isInternalMessage: true)
@ -382,7 +384,7 @@ public class SocketIOClient: NSObject {
}
// We lost connection and should attempt to reestablish
internal func tryReconnect() {
func tryReconnect() {
if self.reconnectAttempts != -1 && self.currentReconnectAttempt + 1 > self.reconnectAttempts {
self.didForceClose()
return

5
SwiftIO/SocketParser.swift
View File

@ -202,8 +202,6 @@ class SocketParser {
socket.joinNamespace()
return
} else {
// Don't handle as internal because something crazy could happen where
// we disconnect before it's handled
socket.didConnect()
return
}
@ -225,7 +223,8 @@ class SocketParser {
if messageGroups[3] != "" {
ackNum = messageGroups[3]
} 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: "")
ackNum = mesNum
}