Merge pull request #2 from Couchbase-Ecosystem/8-fix-replication-configuration

updated to fix replication issues with configuration deserization

Author: biozal

CbliteSwiftJsLib.podspec

@@ -7,7 +7,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'CbliteSwiftJsLib'
-  s.version          = '0.1.0'
+  s.version          = '0.1.6'
   s.summary          = 'Couchbase Lite Swift libary for cblite.js (Javascript) Library'
 
 # This description is used to generate tags and improve search results.

CbliteSwiftJsLib/Classes/CollectionManager.swift

@@ -8,7 +8,27 @@
 import Foundation
 import CouchbaseLiteSwift
 
-enum CollectionError: Error {
+public struct CollectionConfigItem: Codable {
+    let collections: [CollectionDtoWrapper]
+    let config: ConfigDto
+}
+
+public struct CollectionDtoWrapper: Codable {
+    let collection: CollectionDto
+}
+
+public struct CollectionDto: Codable {
+    let name: String
+    let scopeName: String
+    let databaseName: String
+}
+
+public struct ConfigDto: Codable {
+    let channels: [String]
+    let documentIds: [String]
+}
+
+public enum CollectionError: Error {
     case unableToFindCollection(collectionName: String, scopeName: String, databaseName: String)
     case getCollection(message: String, collectionName: String, scopeName: String, databaseName: String)
     case cannotCreateIndex(indexName: String)

CbliteSwiftJsLib/Classes/ReplicatorHelper.swift

@@ -6,124 +6,139 @@
 //
 
 import Foundation
+import JavaScriptCore
 import CouchbaseLiteSwift
 
 public struct ReplicatorHelper {
-
-    public static func replicatorConfigFromJson(_ data: [String: Any]) throws -> ReplicatorConfiguration {
-        guard let authenticatorData = data["authenticator"] as? [String: Any],
-              let target = data["target"] as? [String: Any],
+    
+    public static func replicatorConfigFromJson(_ data: [String: Any], collectionConfiguration: [CollectionConfigItem]) throws -> ReplicatorConfiguration {
+        guard let target = data["target"] as? [String: Any],
               let url = target["url"] as? String,
               let replicatorType = data["replicatorType"] as? String,
               let continuous = data["continuous"] as? Bool,
-              let collectionConfig = data["collectionConfig"] as? [String: Any] else {
+              let acceptParentDomainCookies = data["acceptParentDomainCookies"] as? Bool,
+              let acceptSelfSignedCerts = data["acceptSelfSignedCerts"] as? Bool,
+              let allowReplicationInBackground = data["allowReplicationInBackground"] as? Bool,
+              let autoPurgeEnabled = data["autoPurgeEnabled"] as? Bool,
+              let heartbeat = data["heartbeat"] as? NSNumber,
+              let maxAttempts = data["maxAttempts"] as? NSNumber,
+              let maxAttemptWaitTime = data["maxAttemptWaitTime"] as? NSNumber
+        else {
             throw ReplicatorError.fatalError(message: "Invalid JSON data")
         }
-
+        
         let endpoint = URLEndpoint(url: URL(string: url)!)
+        
+        //set values from data
         var replConfig = ReplicatorConfiguration(target: endpoint)
-
-        switch replicatorType {
-        case "PUSH_AND_PULL":
-            replConfig.replicatorType = .pushAndPull
-        case "PULL":
-            replConfig.replicatorType = .pull
-        case "PUSH":
-            replConfig.replicatorType = .push
-        default:
-            throw ReplicatorError.fatalError(message: "Invalid replicatorType")
-        }
-
+        replConfig.acceptParentDomainCookie = acceptSelfSignedCerts
+        replConfig.acceptParentDomainCookie = acceptParentDomainCookies
+        replConfig.allowReplicatingInBackground = allowReplicationInBackground
         replConfig.continuous = continuous
-
-        if let authenticator = ReplicatorHelper.replicatorAuthenticatorFromConfig(authenticatorData) {
-            replConfig.authenticator = authenticator
+        replConfig.enableAutoPurge = autoPurgeEnabled
+    
+        replConfig.heartbeat = TimeInterval(exactly: heartbeat.int64Value) ?? 300
+        replConfig.maxAttemptWaitTime = TimeInterval(exactly: maxAttemptWaitTime.int64Value) ?? 0
+        replConfig.maxAttempts = maxAttempts.uintValue
+        
+        //check for headers
+        if let headers = data["headers"] as? [String: String] {
+            replConfig.headers = headers
         }
 
-        //setup collections
-        let (collections, colConfig) = try ReplicatorHelper.replicatorCollectionConfigFromJson(collectionConfig)
-        replConfig.addCollections(Array(collections), config: colConfig)
+        if let authenticatorData = data["authenticator"], !(authenticatorData is String && authenticatorData as! String == "")  {
+            if let authenticatorConfig = authenticatorData as? [String: Any] {
+                if let authenticator = ReplicatorHelper.replicatorAuthenticatorFromConfig(authenticatorConfig) {
+                    replConfig.authenticator = authenticator
+                }
+            }
+            
+        }
 
+       try  ReplicatorHelper.replicatorCollectionConfigFromJson(collectionConfiguration, replicationConfig:  &replConfig)
+        
+        switch replicatorType {
+            case "PUSH_AND_PULL":
+                replConfig.replicatorType = .pushAndPull
+            case "PULL":
+                replConfig.replicatorType = .pull
+            case "PUSH":
+                replConfig.replicatorType = .push
+            default:
+                throw ReplicatorError.fatalError(message: "Invalid replicatorType")
+        }
         return replConfig
     }
-
-    private static func replicatorCollectionConfigFromJson(_ data: [String: Any]) throws -> (Set<Collection>, CollectionConfiguration) {
+    
+    public static func replicatorCollectionConfigFromJson(_ data:  [CollectionConfigItem], replicationConfig: inout ReplicatorConfiguration) throws {
 
         //work on the collections sent in as part of the configuration with an array of collectionName, scopeName, and databaseName
-        guard let collectionData = data["collections"] as? [[String: String]] else {
-            throw ReplicatorError.configurationError(message: "collections doesn't include collections in the proper format")
-        }
-        guard let config = data["config"] as? [String: Any] else {
-            throw ReplicatorError.configurationError(message: "ReplicationConfig collection config is incorrect format")
-        }
-        
-        var collections: Set<Collection> = []
-    
-        for collectionItem in collectionData {
-            guard let collectionName = collectionItem["collectionName"],
-                  let scopeName = collectionItem["scopeName"],
-                  let databaseName = collectionItem["databaseName"] else {
-                // Handle the case where any required key is missing
-                throw ReplicatorError.configurationError(message: "Error: collections missing required key in collection data - collectionName, scopeName, or databaseName")
+        for item in data {
+            
+            var collections: [Collection] = []
+            
+            for col in item.collections {
+                
+                guard let collection = try CollectionManager.shared.getCollection(col.collection.name, scopeName: col.collection.scopeName, databaseName: col.collection.databaseName) else {
+                    throw CollectionError.unableToFindCollection(collectionName: col.collection.name, scopeName: col.collection.scopeName, databaseName: col.collection.databaseName)
+                }
+                collections.append(collection)
             }
-            guard let collection = try CollectionManager.shared.getCollection(collectionName, scopeName: scopeName, databaseName: databaseName) else {
-                throw CollectionError.unableToFindCollection(collectionName: collectionName, scopeName: scopeName, databaseName: databaseName)
+            
+            //process the config part of the data
+            var collectionConfig = CollectionConfiguration()
+            
+            //get the channels and documentIds to filter for the collections
+            //these are optional
+            if item.config.channels.count > 0 {
+                collectionConfig.channels =  item.config.channels
             }
-            collections.insert(collection)
-        }
-        //process the config part of the data
-        var collectionConfig = CollectionConfiguration()
-        
-        //get the channels and documentIds to filter for the collections
-        //these are optional
-        if let channels = config["channels"] as? [String] {
-            collectionConfig.channels = channels
-        }
-        if let documentIds = config["documentIds"] as? [String] {
-            collectionConfig.documentIDs = documentIds
+            if item.config.documentIds.count > 0 {
+                collectionConfig.documentIDs = item.config.documentIds
+            }
+            replicationConfig.addCollections(collections, config: collectionConfig)
         }
-        return (collections, collectionConfig)
     }
-
+    
     private static func replicatorAuthenticatorFromConfig(_ config: [String: Any]?) -> Authenticator? {
         guard let type = config?["type"] as? String,
               let data = config?["data"] as? [String: Any] else {
             return nil
         }
-
+        
         switch type {
-        case "session":
-            guard let sessionID = data["sessionID"] as? String,
-                  let cookieName = data["cookieName"] as? String else {
-                return nil
-            }
-            return SessionAuthenticator(sessionID: sessionID, cookieName: cookieName)
-
-        case "basic":
-            guard let username = data["username"] as? String,
-                  let password = data["password"] as? String else {
+            case "session":
+                guard let sessionID = data["sessionID"] as? String,
+                      let cookieName = data["cookieName"] as? String else {
+                    return nil
+                }
+                return SessionAuthenticator(sessionID: sessionID, cookieName: cookieName)
+                
+            case "basic":
+                guard let username = data["username"] as? String,
+                      let password = data["password"] as? String else {
+                    return nil
+                }
+                return BasicAuthenticator(username: username, password: password)
+                
+            default:
                 return nil
-            }
-            return BasicAuthenticator(username: username, password: password)
-
-        default:
-            return nil
         }
     }
-
+    
     public static func generateReplicatorStatusJson(_ status: Replicator.Status) -> [String: Any] {
         var errorJson: [String: Any]?
         if let error = status.error {
             errorJson = [
                 "message": error.localizedDescription
             ]
         }
-
+        
         let progressJson: [String: Any] = [
             "completed": status.progress.completed,
             "total": status.progress.total
         ]
-
+        
         if let errorJson = errorJson {
             return [
                 "activityLevel": status.activity.rawValue,
@@ -137,10 +152,10 @@ public struct ReplicatorHelper {
             ]
         }
     }
-
+    
     public static func generateReplicationJson(_ replication: [ReplicatedDocument], isPush: Bool) -> [String: Any] {
         var docs = [[String: Any]]()
-
+        
         for document in replication {
             var flags = [String]()
             if document.flags.contains(.deleted) {
@@ -149,21 +164,21 @@ public struct ReplicatorHelper {
             if document.flags.contains(.accessRemoved) {
                 flags.append("ACCESS_REMOVED")
             }
-            var documentDictionary: [String: Any] = ["id": document.id, "flags": flags]
-
+            var documentDictionary: [String: Any] = ["id": document.id, "flags": flags, "scopeName": document.scope, "collectionName": document.collection]
+            
             if let error = document.error {
                 documentDictionary["error"] = [
                     "message": error.localizedDescription
                 ]
             }
-
+            
             docs.append(documentDictionary)
         }
-
+        
         return [
-            "direction": isPush ? "PUSH" : "PULL",
+            "isPush": isPush ? true : false,
             "documents": docs
         ]
     }
-
+    
 }

CbliteSwiftJsLib/Classes/ReplicatorManager.swift

@@ -40,16 +40,13 @@ public class ReplicatorManager {
 
     // MARK: Replicator Functions
 
-    public func replicator(_ replicatorConfig: [String: Any]) throws -> String {
-        do {
+    public func replicator(_ replicatorConfig: [String: Any], collectionConfiguration: [CollectionConfigItem]) throws -> String {
             let id = UUID().uuidString
-            let config = try ReplicatorHelper.replicatorConfigFromJson(replicatorConfig)
+            let config = try ReplicatorHelper.replicatorConfigFromJson(replicatorConfig, collectionConfiguration: collectionConfiguration)
+        
             let replicator = Replicator(config: config)
             replicators[id] = replicator
             return id
-        } catch {
-            throw ReplicatorError.fatalError(message: error.localizedDescription)
-        }
     }
 
     public func start(_ replicatorId: String) throws {
@@ -91,6 +88,19 @@ public class ReplicatorManager {
             throw ReplicatorError.unableToFindReplicator(replicatorId: replicatorId)
         }
     }
+    
+    public func getPendingDocumentIds(_ replicatorId: String, collection: Collection) throws ->  [String:Any] {
+        if let replicator = getReplicator(replicatorId: replicatorId) {
+            do {
+                let documentIds = try replicator.pendingDocumentIds(collection: collection)
+                return ["documentIds": documentIds];
+            } catch {
+                throw error
+            }
+        } else {
+            throw ReplicatorError.unableToFindReplicator(replicatorId: replicatorId)
+        }
+    }
 
     public func cleanUp(_ replicatorId: String) throws {
         if let replicator = getReplicator(replicatorId: replicatorId) {