ParseLiveQuery checks all states of a websocket (#207)

* ParseLiveQuery checks all states of a websocket

* Added completion handler to resumeTask

* remove some changes to resumeTask

* Update .codecov.yml

* Remove extra receives

* Add closeAll back

* remove delegate if needed

* Call open when error received

* Call open when attempting to reconnect to add delay

* Remove closeAll test. LiveQuery test a little flaky

Author: cbaker6

.codecov.yml

@@ -4,7 +4,7 @@ coverage:
   status:
     patch:
       default:
-        target: auto
+        target: 51
     changes: false
     project:
       default:

CHANGELOG.md

@@ -1,9 +1,14 @@
 # Parse-Swift Changelog
 
 ### main
-[Full Changelog](https://github.com/parse-community/Parse-Swift/compare/1.9.1...main)
+[Full Changelog](https://github.com/parse-community/Parse-Swift/compare/1.9.2...main)
 * _Contributing to this repo? Add info about your change here to be included in the next release_
 
+### 1.9.2
+[Full Changelog](https://github.com/parse-community/Parse-Swift/compare/1.9.1...1.9.2)
+__Improvements__
+- ParseLiveQuery checks all states of a websocket and reacts as needed after an error ([#206](https://github.com/parse-community/Parse-Swift/pull/206)), thanks to [Corey Baker](https://github.com/cbaker6).
+
 ### 1.9.1
 [Full Changelog](https://github.com/parse-community/Parse-Swift/compare/1.9.0...1.9.1)
 

Sources/ParseSwift/LiveQuery/LiveQuerySocket.swift

@@ -59,9 +59,11 @@ extension LiveQuerySocket {
             return
         }
         task.send(.string(encodedAsString)) { error in
+            if error == nil {
+                self.receive(task)
+            }
             completion(error)
         }
-        self.receive(task)
     }
 }
 
@@ -74,9 +76,6 @@ extension LiveQuerySocket {
             return
         }
         task.send(.string(encodedAsString)) { error in
-            if error == nil {
-                self.receive(task)
-            }
             completion(error)
         }
     }

Sources/ParseSwift/LiveQuery/ParseLiveQuery.swift

@@ -200,8 +200,7 @@ public final class ParseLiveQuery: NSObject {
         components.scheme = (components.scheme == "https" || components.scheme == "wss") ? "wss" : "ws"
         url = components.url
         self.task = URLSession.liveQuery.createTask(self.url)
-        self.resumeTask()
-
+        self.resumeTask { _ in }
         if isDefault {
             Self.setDefault(self)
         }
@@ -227,13 +226,25 @@ extension ParseLiveQuery {
         return Int.random(in: 0 ..< Int(truncating: min))
     }
 
-    func resumeTask() {
+    func resumeTask(completion: @escaping (Error?) -> Void) {
         synchronizationQueue.sync {
-            if self.task.state == .suspended {
-                self.task.resume()
+            switch self.task.state {
+            case .suspended:
+                task.resume()
+                URLSession.liveQuery.delegates.removeValue(forKey: self.task)
+                URLSession.liveQuery.delegates[self.task] = self
+                completion(nil)
+            case .completed, .canceling:
+                URLSession.liveQuery.delegates.removeValue(forKey: self.task)
+                task = URLSession.liveQuery.createTask(self.url)
+                task.resume()
+                URLSession.liveQuery.delegates[self.task] = self
+                completion(nil)
+            case .running:
+                open(isUserWantsToConnect: false, completion: completion)
+            @unknown default:
+                break
             }
-            URLSession.liveQuery.receive(self.task)
-            URLSession.liveQuery.delegates[self.task] = self
         }
     }
 
@@ -322,8 +333,8 @@ extension ParseLiveQuery: LiveQuerySocketDelegate {
                 }
                 self.isSocketEstablished = false
                 if !self.isDisconnectedByUser {
-                    //Try to reconnect
-                    self.resumeTask()
+                    // Try to reconnect
+                    self.open(isUserWantsToConnect: false) { _ in }
                 }
             }
         }
@@ -337,7 +348,7 @@ extension ParseLiveQuery: LiveQuerySocketDelegate {
                     if self.isConnected {
                         self.close(useDedicatedQueue: true)
                         //Try to reconnect
-                        self.resumeTask()
+                        self.resumeTask { _ in }
                     }
                 }
                 return
@@ -484,9 +495,20 @@ extension ParseLiveQuery: LiveQuerySocketDelegate {
 Max attempts (\(ParseLiveQueryConstants.maxConnectionAttempts) reached.
 Not attempting to connect to LiveQuery server anymore.
 """)
-                self.receiveDelegate?.received(parseError)
+                notificationQueue.async {
+                    self.receiveDelegate?.received(parseError)
+                }
+            }
+            isSocketEstablished = false
+            open(isUserWantsToConnect: false) { error in
+                guard let error = error else {
+                    // Resumed task successfully
+                    return
+                }
+                self.notificationQueue.async {
+                    self.receiveDelegate?.received(error)
+                }
             }
-            self.open(isUserWantsToConnect: false) { _ in }
         } else {
             notificationQueue.async {
                 self.receiveDelegate?.received(error)
@@ -558,12 +580,12 @@ extension ParseLiveQuery {
                 self.synchronizationQueue
                     .asyncAfter(deadline: .now() + DispatchTimeInterval
                                     .seconds(reconnectInterval)) {
-                    self.resumeTask()
-                    self.attempts += 1
-                    let error = ParseError(code: .unknownError,
-                                           // swiftlint:disable:next line_length
-                                           message: "ParseLiveQuery Error: attempted to open socket \(self.attempts) time(s)")
-                    completion(error)
+                        self.attempts += 1
+                        self.resumeTask { _ in }
+                        let error = ParseError(code: .unknownError,
+                                               // swiftlint:disable:next line_length
+                                               message: "ParseLiveQuery Error: attempted to open socket \(self.attempts) time(s)")
+                        completion(error)
                 }
             }
         }

Sources/ParseSwift/ParseConstants.swift

@@ -10,7 +10,7 @@ import Foundation
 
 enum ParseConstants {
     static let sdk = "swift"
-    static let version = "1.9.1"
+    static let version = "1.9.2"
     static let fileManagementDirectory = "parse/"
     static let fileManagementPrivateDocumentsDirectory = "Private Documents/"
     static let fileManagementLibraryDirectory = "Library/"