another try

Author: velicuvlad

CBLClient/Apps/CBLTestServer-iOS/CBLTestServer-iOS/Server/PeerToPeerRequestHandler.swift

@@ -73,8 +73,8 @@ public class PeerToPeerRequestHandler {
                 config = URLEndpointListenerConfiguration(collections: collections!)
             }
             else if database != nil {
-                let defaultCol = try database?.defaultCollection()
-                config = URLEndpointListenerConfiguration.init(collections: [defaultCol!])
+                let defaultCol = try database!.defaultCollection()
+                config = URLEndpointListenerConfiguration.init(collections: [defaultCol])
             }
             else {
                 throw RequestHandlerError.InvalidArgument("Provide collections or database")
@@ -238,7 +238,7 @@ public class PeerToPeerRequestHandler {
             let serverDBName: String = args.get(name:"serverDBName")!
             let database: Database = args.get(name:"database")!
             let defaultCol = try database.defaultCollection()
-            let colConfig = CollectionConfiguration(collection: defaultCol)
+            var colConfig = CollectionConfiguration(collection: defaultCol)
 
             let continuous: Bool? = args.get(name:"continuous")!
             let replication_type: String? = args.get(name: "replicationType")!
@@ -260,6 +260,7 @@ public class PeerToPeerRequestHandler {
             var wsPort: String?
             let maxRetries: String? = args.get(name: "max_retries")
             let maxRetryWaitTime: String? = args.get(name: "max_timeout")
+            
 
             if let type = replication_type {
                 if type == "push" {
@@ -276,93 +277,94 @@ public class PeerToPeerRequestHandler {
             } else {
                 wsPort = "ws"
             }
-
-            let url = URL(string: "\(wsPort ?? "ws")://\(host):\(port)/\(serverDBName)")!
-            if endPointType == "URLEndPoint"{
-                let urlEndPoint: URLEndpoint = URLEndpoint(url: url)
-                replicatorConfig = ReplicatorConfiguration(collections: [colConfig], target: urlEndPoint)
-            }
-            else{
-                let endpoint = MessageEndpoint(uid: url.absoluteString, target: url, protocolType: ProtocolType.byteStream, delegate: self)
-                replicatorConfig = ReplicatorConfiguration(collections: [colConfig], target: endpoint)
-            }
 
-            if auth != nil {
-               replicatorConfig.authenticator = auth
-            }
-            if serverVerificationMode != false {
-                replicatorConfig.acceptOnlySelfSignedServerCertificate = true
-            }
-            
-            if tlsAuthType == "self_signed" {
-                let certData = try! dataFromResource(name: "identity/certs", ofType: "p12")
-                try! TLSIdentity.deleteIdentity(withLabel: "CBL-Cert")
-                let identity = try! TLSIdentity.importIdentity(withData: certData, password: "123", label: "CBL-Cert")
-                replicatorConfig.pinnedServerCertificate = identity.certs[0]
-                print("======= pinned the certs to Replicator ============")
-            }
-            if tlsAuthenticator != false {
-                let clientCertData = try dataFromResource(name: "identity/client", ofType: "p12")
-                try! TLSIdentity.deleteIdentity(withLabel: "CBL-Cert")
-                let identity = try TLSIdentity.importIdentity(withData: clientCertData, password: "123", label: "CBL-Cert")
-                replicatorConfig.authenticator = ClientCertificateAuthenticator(identity: identity)
-                print("====== Added Autheticator to Replicator ========")
-            }
-
-            if continuous != nil {
-                replicatorConfig.continuous = continuous!
-            }
             if documentIDs != nil {
-                replicatorConfig.documentIDs = documentIDs
+                colConfig.documentIDs = documentIDs
             }
             if pull_filter != false {
                 if filter_callback_func == "boolean" {
-                    replicatorConfig.pullFilter = _replicatorBooleanFilterCallback;
+                    colConfig.pullFilter = _replicatorBooleanFilterCallback;
                 } else if filter_callback_func == "deleted" {
-                    replicatorConfig.pullFilter = _replicatorDeletedFilterCallback;
+                    colConfig.pullFilter = _replicatorDeletedFilterCallback;
                 } else if filter_callback_func == "access_revoked" {
-                    replicatorConfig.pullFilter = _replicatorAccessRevokedCallback;
+                    colConfig.pullFilter = _replicatorAccessRevokedCallback;
                 } else {
-                    replicatorConfig.pullFilter = _defaultReplicatorFilterCallback;
+                    colConfig.pullFilter = _defaultReplicatorFilterCallback;
                 }
             }
             if push_filter != false {
                 if filter_callback_func == "boolean" {
-                    replicatorConfig.pushFilter = _replicatorBooleanFilterCallback;
+                    colConfig.pushFilter = _replicatorBooleanFilterCallback;
                 } else if filter_callback_func == "deleted" {
-                    replicatorConfig.pushFilter = _replicatorDeletedFilterCallback;
+                    colConfig.pushFilter = _replicatorDeletedFilterCallback;
                 } else if filter_callback_func == "access_revoked" {
-                    replicatorConfig.pushFilter = _replicatorAccessRevokedCallback;
+                    colConfig.pushFilter = _replicatorAccessRevokedCallback;
                 } else {
-                    replicatorConfig.pushFilter = _defaultReplicatorFilterCallback;
+                    colConfig.pushFilter = _defaultReplicatorFilterCallback;
                 }
             }
             switch conflict_resolver {
                 case "local_wins":
-                    replicatorConfig.conflictResolver = LocalWinCustomConflictResolver();
+                    colConfig.conflictResolver = LocalWinCustomConflictResolver();
                     break
                 case "remote_wins":
-                    replicatorConfig.conflictResolver = RemoteWinCustomConflictResolver();
+                    colConfig.conflictResolver = RemoteWinCustomConflictResolver();
                     break;
                 case "null":
-                    replicatorConfig.conflictResolver = NullWinCustomConflictResolver();
+                    colConfig.conflictResolver = NullWinCustomConflictResolver();
                     break;
                 case "merge":
-                    replicatorConfig.conflictResolver = MergeWinCustomConflictResolver();
+                    colConfig.conflictResolver = MergeWinCustomConflictResolver();
                     break;
                 case "incorrect_doc_id":
-                    replicatorConfig.conflictResolver = IncorrectDocIdCustomConflictResolver();
+                    colConfig.conflictResolver = IncorrectDocIdCustomConflictResolver();
                     break;
                 case "delayed_local_win":
-                    replicatorConfig.conflictResolver = DelayedLocalWinCustomConflictResolver();
+                    colConfig.conflictResolver = DelayedLocalWinCustomConflictResolver();
                     break;
                 case "exception_thrown":
-                    replicatorConfig.conflictResolver = ExceptionThrownCustomConflictResolver();
+                    colConfig.conflictResolver = ExceptionThrownCustomConflictResolver();
                     break;
                 default:
-                    replicatorConfig.conflictResolver = ConflictResolver.default
+                    colConfig.conflictResolver = ConflictResolver.default
                     break;
             }
+            
+            let url = URL(string: "\(wsPort ?? "ws")://\(host):\(port)/\(serverDBName)")!
+            if endPointType == "URLEndPoint"{
+                let urlEndPoint: URLEndpoint = URLEndpoint(url: url)
+                replicatorConfig = ReplicatorConfiguration(collections: [colConfig], target: urlEndPoint)
+            }
+            else{
+                let endpoint = MessageEndpoint(uid: url.absoluteString, target: url, protocolType: ProtocolType.byteStream, delegate: self)
+                replicatorConfig = ReplicatorConfiguration(collections: [colConfig], target: endpoint)
+            }
+            
+            if auth != nil {
+               replicatorConfig.authenticator = auth
+            }
+            if serverVerificationMode != false {
+                replicatorConfig.acceptOnlySelfSignedServerCertificate = true
+            }
+            
+            if tlsAuthType == "self_signed" {
+                let certData = try! dataFromResource(name: "identity/certs", ofType: "p12")
+                try! TLSIdentity.deleteIdentity(withLabel: "CBL-Cert")
+                let identity = try! TLSIdentity.importIdentity(withData: certData, password: "123", label: "CBL-Cert")
+                replicatorConfig.pinnedServerCertificate = identity.certs[0]
+                print("======= pinned the certs to Replicator ============")
+            }
+            if tlsAuthenticator != false {
+                let clientCertData = try dataFromResource(name: "identity/client", ofType: "p12")
+                try! TLSIdentity.deleteIdentity(withLabel: "CBL-Cert")
+                let identity = try TLSIdentity.importIdentity(withData: clientCertData, password: "123", label: "CBL-Cert")
+                replicatorConfig.authenticator = ClientCertificateAuthenticator(identity: identity)
+                print("====== Added Autheticator to Replicator ========")
+            }
+
+            if continuous != nil {
+                replicatorConfig.continuous = continuous!
+            }
             if let heartbeat = heartbeat, let heartbeatDouble = Double(heartbeat) {
                 replicatorConfig.heartbeat = heartbeatDouble
             }
@@ -391,7 +393,7 @@ public class PeerToPeerRequestHandler {
         case "peerToPeer_removeReplicatorEventListener":
             let replication_obj: Replicator = args.get(name: "replicator")!
             let changeListener : MyDocumentReplicationListener = (args.get(name: "changeListener"))!
-            replication_obj.removeChangeListener(withToken: changeListener.listenerToken!)
+            changeListener.listenerToken!.remove()
 
         case "peerToPeer_replicatorEventChangesCount":
             let changeListener: MyDocumentReplicationListener = (args.get(name: "changeListener"))!
@@ -415,6 +417,9 @@ public class PeerToPeerRequestHandler {
         default:
             throw RequestHandlerError.MethodNotFound(method)
         }
+        
+        return PeerToPeerRequestHandler.VOID
+
     }
 }
 #if COUCHBASE_ENTERPRISE

CBLClient/Apps/CBLTestServer-iOS/CBLTestServer-iOS/Server/PredictiveQueriesRequestHandler.swift

@@ -127,6 +127,7 @@ public class PredictiveQueriesRequestHandler {
         default:
             throw RequestHandlerError.MethodNotFound(method)
         }
+        return PredictiveQueriesRequestHandler.VOID
     }
 
 }