Use starscream for websockets. Execute emitAcks on the main queue.

Author: nuclearace

README.md

@@ -7,9 +7,7 @@ For Swift 1.2 use the 1.2 branch.
 
 Installation
 ============
-1. Requires linking [SocketRocket](https://github.com/square/SocketRocket) against your xcode project. (Be sure to link the [frameworks](https://github.com/square/SocketRocket#framework-dependencies) required by SocketRocket)
-2. Create a bridging header for SocketRocket
-3. Copy the SwiftIO folder into your xcode project
+1. Copy the SwiftIO folder into your Xcode project!
 
 API
 ===

SwiftIO/SocketAckHandler.swift

@@ -39,4 +39,11 @@ class SocketAckHandler {
     func onAck(callback:AckCallback) {
         self.callback = callback
     }
+    
+    func executeAck(data:NSArray?) {
+        dispatch_async(dispatch_get_main_queue()) {[cb = self.callback] in
+            cb?(data)
+            return
+        }
+    }
 }

SwiftIO/SocketEngine.swift

@@ -46,7 +46,7 @@ private enum PacketType: String {
     case NOOP = "6"
 }
 
-class SocketEngine: NSObject, SRWebSocketDelegate {
+class SocketEngine: NSObject, WebSocketDelegate {
     unowned let client:SocketIOClient
     private let workQueue = NSOperationQueue()
     private let emitQueue = dispatch_queue_create(
@@ -77,7 +77,7 @@ class SocketEngine: NSObject, SRWebSocketDelegate {
     var websocket:Bool {
         return self._websocket
     }
-    var ws:SRWebSocket?
+    var ws:WebSocket?
 
     init(client:SocketIOClient, forcePolling:Bool = false) {
         self.client = client
@@ -165,7 +165,11 @@ class SocketEngine: NSObject, SRWebSocketDelegate {
             if let str = NSString(data: data, encoding: NSUTF8StringEncoding) as? String {
                 // println(str)
 
-                dispatch_async(self?.parseQueue) {[weak self] in
+                dispatch_async(self!.parseQueue) {[weak self] in
+                    if self == nil {
+                        return
+                    }
+                    
                     self?.parsePollingMessage(str)
                     return
                 }
@@ -224,12 +228,10 @@ class SocketEngine: NSObject, SRWebSocketDelegate {
         self.waitingForPost = true
 
         self.session.dataTaskWithRequest(req) {[weak self] data, res, err in
-            if err != nil {
-                if self!.polling {
-                    self?.handlePollingFailed(err)
-                }
+            if self == nil {
                 return
-            } else if self == nil {
+            } else if err != nil && self!.polling {
+                self?.handlePollingFailed(err)
                 return
             }
 
@@ -245,7 +247,7 @@ class SocketEngine: NSObject, SRWebSocketDelegate {
     // Send them raw
     private func flushWaitingForPostToWebSocket() {
         for msg in self.postWait {
-            self.ws?.send(msg)
+            self.ws?.writeString(msg)
         }
 
         self.postWait.removeAll(keepCapacity: true)
@@ -256,7 +258,7 @@ class SocketEngine: NSObject, SRWebSocketDelegate {
     private func handlePollingFailed(reason:NSError?) {
         if !self.client.reconnecting {
             self.connected = false
-            self.ws?.close()
+            self.ws?.disconnect()
             self.pingTimer?.invalidate()
             self.waitingForPoll = false
             self.waitingForPost = false
@@ -310,10 +312,10 @@ class SocketEngine: NSObject, SRWebSocketDelegate {
                             self?.sid = sid
 
                             if !self!.forcePolling {
-                                self?.ws = SRWebSocket(URL:
-                                    NSURL(string: urlWebSocket + "&sid=\(self!.sid)")!)
+                                self?.ws = WebSocket(url: NSURL(string: urlWebSocket + "&sid=\(self!.sid)")!)
+                                self?.ws?.queue = self?.handleQueue
                                 self?.ws?.delegate = self
-                                self?.ws?.open()
+                                self?.ws?.connect()
                             }
                         } else {
                             NSLog("Error handshaking")
@@ -377,8 +379,9 @@ class SocketEngine: NSObject, SRWebSocketDelegate {
                     // Be sure to capture the value of the msg
                     dispatch_async(self.handleQueue) {[weak self, msg] in
                         fixSwift = msg
-                        self?.parseEngineMessage(fixSwift)
-                        return
+                        if fixSwift is String {
+                            self?.parseEngineMessage(fixSwift as String)
+                        }
                     }
                 }
 
@@ -388,16 +391,14 @@ class SocketEngine: NSObject, SRWebSocketDelegate {
         }
     }
 
-    private func parseEngineMessage(message:AnyObject?) {
+    private func parseEngineData(data:NSData) {
+        self.client.parseBinaryData(data.subdataWithRange(NSMakeRange(1, data.length - 1)))
+    }
+    
+    private func parseEngineMessage(var message:String) {
         // println(message!)
-        if let data = message as? NSData {
-            // Strip off message type
-            self.client.parseSocketMessage(data.subdataWithRange(NSMakeRange(1, data.length - 1)))
-            return
-        }
 
-        var messageString = message as String
-        var strMessage = RegexMutable(messageString)
+        var strMessage = RegexMutable(message)
 
         // We should upgrade
         if strMessage == "3probe" {
@@ -409,16 +410,16 @@ class SocketEngine: NSObject, SRWebSocketDelegate {
 
         if type != PacketType.MESSAGE.rawValue {
             // TODO Handle other packets
-            if messageString.hasPrefix("b4") {
+            if message.hasPrefix("b4") {
                 // binary in base64 string
 
-                messageString.removeRange(Range<String.Index>(start: messageString.startIndex,
-                    end: advance(messageString.startIndex, 2)))
+                message.removeRange(Range<String.Index>(start: message.startIndex,
+                    end: advance(message.startIndex, 2)))
 
-                if let data = NSData(base64EncodedString: messageString,
+                if let data = NSData(base64EncodedString: message,
                     options: NSDataBase64DecodingOptions.IgnoreUnknownCharacters) {
                         // println("sending \(data)")
-                        self.client.parseSocketMessage(data)
+                        self.client.parseBinaryData(data)
                 }
 
                 return
@@ -427,7 +428,7 @@ class SocketEngine: NSObject, SRWebSocketDelegate {
                 return
             }
 
-            if messageString == PacketType.CLOSE.rawValue {
+            if message == PacketType.CLOSE.rawValue {
                 // do nothing
                 return
             }
@@ -436,10 +437,10 @@ class SocketEngine: NSObject, SRWebSocketDelegate {
         }
 
         // Remove message type
-        messageString.removeAtIndex(messageString.startIndex)
+        message.removeAtIndex(message.startIndex)
         // println("sending \(messageString)")
 
-        self.client.parseSocketMessage(messageString)
+        self.client.parseSocketMessage(message)
     }
 
     private func probeWebSocket() {
@@ -480,6 +481,7 @@ class SocketEngine: NSObject, SRWebSocketDelegate {
 
     func sendPing() {
         if self.websocket {
+            self.ws?.writePing(NSData())
             self.sendWebSocketMessage("", withType: PacketType.PING)
         } else {
             self.sendPollMessage("", withType: PacketType.PING)
@@ -510,13 +512,13 @@ class SocketEngine: NSObject, SRWebSocketDelegate {
 
     private func sendWebSocketMessage(str:String, withType type:PacketType, datas:[NSData]? = nil) {
         // println("Sending: ws: \(str) as type: \(type.rawValue)")
-        self.ws?.send("\(type.rawValue)\(str)")
+        self.ws?.writeString("\(type.rawValue)\(str)")
 
         if datas != nil {
             for data in datas! {
                 let (data, nilString) = self.createBinaryDataForSend(data)
                 if data != nil {
-                    self.ws?.send(data!)
+                    self.ws?.writeData(data!)
                 }
             }
         }
@@ -546,25 +548,13 @@ class SocketEngine: NSObject, SRWebSocketDelegate {
         }
     }
 
-    // Called when a message is recieved
-    func webSocket(webSocket:SRWebSocket!, didReceiveMessage message:AnyObject?) {
-        // println(message)
-        
-        dispatch_async(self.handleQueue) {[weak self] in
-            self?.parseEngineMessage(message)
-            return
-        }
-    }
-    
-    // Called when the socket is opened
-    func webSocketDidOpen(webSocket:SRWebSocket!) {
+    func websocketDidConnect(socket:WebSocket) {
         self.websocketConnected = true
         self.probing = true
         self.probeWebSocket()
     }
 
-    // Called when the socket is closed
-    func webSocket(webSocket:SRWebSocket!, didCloseWithCode code:Int, reason:String!, wasClean:Bool) {
+    func websocketDidDisconnect(socket:WebSocket, error:NSError?) {
         self.websocketConnected = false
         self.probing = false
 
@@ -573,24 +563,17 @@ class SocketEngine: NSObject, SRWebSocketDelegate {
             self.connected = false
             self._websocket = false
             self._polling = true
-            self.client.webSocketDidCloseWithCode(code, reason: reason, wasClean: wasClean)
+            self.client.webSocketDidCloseWithCode(1, reason: "Socket Disconnect", wasClean: true)
         } else {
             self.flushProbeWait()
         }
     }
 
-    // Called when an error occurs.
-    func webSocket(webSocket:SRWebSocket!, didFailWithError error:NSError!) {
-        self.websocketConnected = false
-        self._polling = true
-        self.probing = false
-        
-        if self.websocket {
-            self.pingTimer?.invalidate()
-            self.connected = false
-            self.client.webSocketDidFailWithError(error)
-        } else {
-            self.flushProbeWait()
-        }
+    func websocketDidReceiveMessage(socket:WebSocket, text:String) {
+        self.parseEngineMessage(text)
+    }
+    
+    func websocketDidReceiveData(socket:WebSocket, data:NSData) {
+        self.parseEngineData(data)
     }
 }

SwiftIO/SocketEventHandler.swift

@@ -22,6 +22,8 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 
+import Foundation
+
 typealias NormalCallback = (NSArray?, AckEmitter?) -> Void
 typealias AnyHandler = (event:String, items:AnyObject?)
 typealias AckEmitter = (AnyObject...) -> Void