Deprecates SRWebSocket, use StarScream

Author: flovilmart

.gitmodules

@@ -4,9 +4,9 @@
 [submodule "Carthage/Checkouts/Bolts-Swift"]
 	path = Carthage/Checkouts/Bolts-Swift
 	url = https://github.com/BoltsFramework/Bolts-Swift.git
-[submodule "Carthage/Checkouts/SocketRocket"]
-	path = Carthage/Checkouts/SocketRocket
-	url = https://github.com/parse-server-modules/SocketRocket.git
 [submodule "Carthage/Checkouts/Parse-SDK-iOS-OSX"]
 	path = Carthage/Checkouts/Parse-SDK-iOS-OSX
 	url = https://github.com/ParsePlatform/Parse-SDK-iOS-OSX.git
+[submodule "Carthage/Checkouts/Starscream"]
+	path = Carthage/Checkouts/Starscream
+	url = https://github.com/daltoniam/Starscream.git

Cartfile

@@ -1,4 +1,4 @@
 github "BoltsFramework/Bolts-Swift" == 1.3.0
-github "parse-server-modules/SocketRocket" == 0.6.0
 github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.14.2
+github "daltoniam/Starscream" == 2.0.3
 

Cartfile.resolved

@@ -1,4 +1,4 @@
 github "BoltsFramework/Bolts-ObjC" "1.8.4"
 github "BoltsFramework/Bolts-Swift" "1.3.0"
-github "parse-server-modules/SocketRocket" "0.6.0"
+github "daltoniam/Starscream" "2.0.3"
 github "ParsePlatform/Parse-SDK-iOS-OSX" "1.14.2"

Carthage/Checkouts/SocketRocket

@@ -18,5 +18,5 @@ Pod::Spec.new do |s|
 
   s.dependency 'Parse', '~> 1.14.2'
   s.dependency 'Bolts-Swift', '~> 1.3'
-  s.dependency 'SocketRocketParseLiveQuery', '~> 0.6'
+  s.dependency 'Starscream', '2.0.3'
 end

Carthage/Checkouts/Starscream

@@ -10,7 +10,7 @@
 import Foundation
 import Parse
 import BoltsSwift
-import SocketRocket
+import Starscream
 
 /**
  This is the 'advanced' view of live query subscriptions. It allows you to customize your subscriptions
@@ -22,7 +22,7 @@ open class Client: NSObject {
     let applicationId: String
     let clientKey: String?
 
-    var socket: SRWebSocket?
+    var socket: WebSocket?
     public var userDisconnected = false
 
     // This allows us to easily plug in another request ID generation scheme, or more easily change the request id type
@@ -149,11 +149,11 @@ extension Client {
             handler: handler
         )
         subscriptions.append(subscriptionRecord)
-        
-        if socket?.readyState == .OPEN {
+
+        if let socket = socket, socket.isConnected == true {
             _ = sendOperationAsync(.subscribe(requestId: subscriptionRecord.requestId, query: query as! PFQuery<PFObject>,
             sessionToken: PFUser.current()?.sessionToken))
-        } else if socket == nil || socket?.readyState != .CONNECTING {
+        } else {
             if !userDisconnected {
                 reconnect()
             } else {
@@ -202,12 +202,12 @@ extension Client {
      you use the client, and should usually only be called when an error occurs.
      */
     public func reconnect() {
-        socket?.close()
+        socket?.disconnect()
         socket = {
-            let socket: SRWebSocket = SRWebSocket(url: host)
+            let socket = WebSocket(url: host)
             socket.delegate = self
-            socket.delegateDispatchQueue = queue
-            socket.open()
+            socket.callbackQueue = queue
+            socket.connect()
             userDisconnected = false
             return socket
         }()
@@ -224,7 +224,7 @@ extension Client {
             else {
                 return
         }
-        socket.close()
+        socket.disconnect()
         self.socket = nil
         userDisconnected = true
     }

ParseLiveQuery.podspec

@@ -9,7 +9,7 @@
 
 import Foundation
 import Parse
-import SocketRocket
+import Starscream
 import BoltsSwift
 
 private func parseObject<T: PFObject>(_ objectDictionary: [String:AnyObject]) throws -> T {
@@ -125,32 +125,35 @@ func == (first: Client.RequestId, second: Client.RequestId) -> Bool {
 // MARK: Web Socket
 // ---------------
 
-extension Client: SRWebSocketDelegate {
-    public func webSocket(_ webSocket: SRWebSocket, didReceiveMessage message: Any) {
-        guard let messageString = message as? String else {
-            fatalError("Socket got into inconsistent state and received \(message) instead.")
-        }
-        handleOperationAsync(messageString).continueWith { task in
+extension Client: WebSocketDelegate {
+
+    public func websocketDidReceiveData(socket: WebSocket, data: Data) {
+        print("Received binary data but we don't handle it...")
+    }
+
+    public func websocketDidReceiveMessage(socket: WebSocket, text: String) {
+        handleOperationAsync(text).continueWith { task in
             if let error = task.error {
                 print("Error: \(error)")
             }
         }
     }
 
-    public func webSocketDidOpen(_ webSocket: SRWebSocket) {
+    public func websocketDidConnect(socket: WebSocket) {
         let sessionToken = PFUser.current()?.sessionToken ?? ""
         _ = self.sendOperationAsync(.connect(applicationId: applicationId, sessionToken: sessionToken))
     }
 
-    public func webSocket(_ webSocket: SRWebSocket, didFailWithError error: Error) {
-        print("Error: \(error)")
+    public func websocketDidDisconnect(socket: WebSocket, error: NSError?) {
+        print("error: \(error)")
 
+        // TODO: Better retry logic, unless `disconnect()` was explicitly called
         if !userDisconnected {
             reconnect()
         }
     }
 
-    public func webSocket(_ webSocket: SRWebSocket, didCloseWithCode code: Int, reason: String?, wasClean: Bool) {
+    public func webSocket(_ webSocket: WebSocket, didCloseWithCode code: Int, reason: String?, wasClean: Bool) {
         print("code: \(code) reason: \(reason)")
 
         // TODO: Better retry logic, unless `disconnect()` was explicitly called
@@ -207,8 +210,7 @@ extension Client {
             let jsonEncoded = operation.JSONObjectRepresentation
             let jsonData = try JSONSerialization.data(withJSONObject: jsonEncoded, options: JSONSerialization.WritingOptions(rawValue: 0))
             let jsonString = String(data: jsonData, encoding: String.Encoding.utf8)
-
-            try? self.socket?.send(string:jsonString!)
+            self.socket?.write(string: jsonString!)
         }
     }