Merge pull request #58 from growthbook/fix-bug-disconnection-sse

Fixed bug disconnection SSE
growthbook · May 2, 2024 · c31b2cb · c31b2cb
2 parents 3a027f8 + d62e4a7
commit c31b2cb
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 9 deletions.
diff --git a/Sources/CommonMain/Caching/CachingManager.swift b/Sources/CommonMain/Caching/CachingManager.swift
@@ -55,8 +55,13 @@ public class CachingManager: CachingLayer {
         // Check if file exists
         if fileManager.fileExists(atPath: filePath) {
             // Read File Contents
-            guard let jsonContents = fileManager.contents(atPath: filePath) else { return nil }
-            return jsonContents
+            if let jsonContents = fileManager.contents(atPath: filePath) {
+                return jsonContents
+            } else {
+                logger.error("Can't read file content")
+            }
+        } else {
+            logger.error("File doesn't exist")
         }
 
         return nil

diff --git a/Sources/CommonMain/Features/FeaturesViewModel.swift b/Sources/CommonMain/Features/FeaturesViewModel.swift
@@ -29,6 +29,12 @@ class FeaturesViewModel {
             self?.prepareFeaturesData(data: jsonData)
         }
         streamingUpdate.connect()
+
+        streamingUpdate.onDissconnect { _, shouldReconnect, _ in
+            if let shouldReconnect = shouldReconnect, shouldReconnect {
+                streamingUpdate.connect()
+            }
+        }
     }
 
     /// Fetch Features
@@ -45,7 +51,7 @@ class FeaturesViewModel {
             }
         } else {
             delegate?.featuresFetchFailed(error: .failedToLoadData, isRemote: false)
-            logger.error("Failed load local data")
+            logger.error("Failed load data from local storage or data is empty")
         }
 
         if let apiUrl = apiUrl {
@@ -88,12 +94,18 @@ class FeaturesViewModel {
                 if let encryptedString = jsonPetitions.encryptedFeatures, !encryptedString.isEmpty  {
                     if let encryptionKey = encryptionKey, !encryptionKey.isEmpty {
                         let crypto: CryptoProtocol = Crypto()
-                        guard let features = crypto.getFeaturesFromEncryptedFeatures(encryptedString: encryptedString, encryptionKey: encryptionKey) else { return }
-
-                        if let featureData = try? JSONEncoder().encode(features) {
-                            manager.putData(fileName: Constants.featureCache, content: featureData)
+                        if let features = crypto.getFeaturesFromEncryptedFeatures(encryptedString: encryptedString, encryptionKey: encryptionKey) {
+                            if let featureData = try? JSONEncoder().encode(features) {
+                                manager.putData(fileName: Constants.featureCache, content: featureData)
+                            } else {
+                                logger.error("Failed encode features")
+                            }
+                            delegate?.featuresFetchedSuccessfully(features: features, isRemote: true)
+                        } else {
+                            delegate?.featuresFetchFailed(error: .failedEncryptedFeatures, isRemote: true)
+                            logger.error("Failed get features from encrypted features")
+                            return
                         }
-                        delegate?.featuresFetchedSuccessfully(features: features, isRemote: true)
                     } else {
                         delegate?.featuresFetchFailed(error: .failedMissingKey, isRemote: true)
                         return

diff --git a/Sources/CommonMain/Network/SSEHandler.swift b/Sources/CommonMain/Network/SSEHandler.swift
@@ -161,7 +161,7 @@ extension SSEHandler {
     private func shouldReconnect(statusCode: Int) -> Bool {
         switch statusCode {
         case 200:
-            return false
+            return true
         case _ where statusCode > 200 && statusCode < 300:
             return true
         default:

diff --git a/Sources/CommonMain/Utils/Constants.swift b/Sources/CommonMain/Utils/Constants.swift
@@ -65,6 +65,7 @@ public struct BucketRange: Codable {
     case failedToLoadData = 0
     case failedParsedData = 1
     case failedMissingKey = 2
+    case failedEncryptedFeatures = 3
 }
 
 /// Meta info about the variations