addressing review comments

Author: jianminzhao

src/CBLCollection_Internal.hh

@@ -279,6 +279,7 @@ protected:
     friend struct CBLDatabase;
     friend struct CBLDocument;
     friend struct cbl_internal::ListenerToken<CBLCollectionDocumentChangeListener>;
+    friend struct CBLURLEndpointListener;
 
     // Called by the database to take an ownership.
     // Release the database to avoid the circular reference

src/CBLURLEndpointListener_CAPI.cc

@@ -33,13 +33,6 @@ void CBLListenerAuth_Free(CBLListenerAuthenticator* _cbl_nullable auth) noexcept
 }
 
 CBLURLEndpointListener* CBLURLEndpointListener_Create(const CBLURLEndpointListenerConfiguration* conf, CBLError* outError) noexcept {
-    if (conf->collectionCount == 0) {
-        if (outError) {
-            outError->domain = kCBLDomain;
-            outError->code = kCBLErrorInvalidParameter;
-        }
-        return nullptr;
-    }
     try {
         return retain(new CBLURLEndpointListener(*conf));
     } catchAndBridge(outError);
@@ -72,7 +65,7 @@ CBLConnectionStatus CBLURLEndpointListener_Status(const CBLURLEndpointListener*
 
 bool CBLURLEndpointListener_Start(CBLURLEndpointListener* listener, CBLError* outError) noexcept {
     try {
-        return listener->start(outError);
+        return listener->start();
     } catchAndBridge(outError)
 }
 

src/CBLURLEndpointListener_Internal.hh

@@ -21,7 +21,7 @@
 #include "Internal.hh"
 #include "CBLCollection_Internal.hh"
 #include "CBLDatabase_Internal.hh"
-#include "c4.h"
+#include "c4Listener.hh"
 
 #ifdef COUCHBASE_ENTERPRISE
 
@@ -35,35 +35,43 @@ struct CBLURLEndpointListener final : public CBLRefCounted {
 public:
     CBLURLEndpointListener(const CBLURLEndpointListenerConfiguration &conf)
     : _conf(conf)
-    { }
+    {
+        if (conf.collectionCount == 0) {
+            C4Error::raise(LiteCoreDomain, kC4ErrorInvalidParameter, "No collections in CBLURLEndpointListenerConfiguration");
+        }
+    }
 
     const CBLURLEndpointListenerConfiguration* configuration() const { return &_conf; }
 
     uint16_t port() const {
         if (_port == 0 && _c4listener) {
-            _port = c4listener_getPort(_c4listener);
+            _port = _c4listener->port();
         }
         return _port;
     }
 
     FLMutableArray _cbl_nullable getUrls() const {
-        FLMutableArray ret = (FLMutableArray) nullptr;
-        if (_c4listener) {
-            CBLDatabase* cblDb = CBLCollection_Database(_conf.collections[0]);
-            cblDb->c4db()->useLocked([&](C4Database* db) {
-                ret = c4listener_getURLs(_c4listener, db, kC4SyncAPI, nullptr);
-            });
-        }
-        return ret;
+        if (!_c4listener) return (FLMutableArray) nullptr;
+
+        CBLDatabase* cblDb = CBLCollection_Database(_conf.collections[0]);
+        auto urls = fleece::MutableArray::newArray();
+        cblDb->c4db()->useLocked([&](C4Database* db) {
+            for ( const std::string& url : _c4listener->URLs(db, kC4SyncAPI) )
+                urls.append(url);
+        });
+        return (FLMutableArray)FLValue_Retain(urls);
     }
 
     CBLConnectionStatus getConnectionStatus() const {
-        unsigned int total = 0, active = 0;
-        if (_c4listener) c4listener_getConnectionStatus(_c4listener, &total, &active);
-        return {total, active};
+        if (_c4listener) {
+            auto [total, active] = _c4listener->connectionStatus();
+            return {total, active};
+        } else {
+            return {0, 0};
+        }
     }
 
-    bool start(CBLError* _cbl_nullable outError) {
+    bool start() {
         if (_c4listener) return true;
 
         Assert(_conf.collectionCount > 0);
@@ -77,46 +85,43 @@ public:
         c4config.allowPull = !_conf.readOnly;
         c4config.enableDeltaSync = _conf.enableDeltaSync;
 
-        _c4listener = c4listener_start(&c4config, internal(outError));
-        if (!_c4listener)
-            return false;
+        _c4listener = new C4Listener(c4config);
 
         slice dbname;
         CBLDatabase* cblDb = CBLCollection_Database(_conf.collections[0]);
         cblDb->c4db()->useLocked([&](C4Database* db) {
             dbname = db->getName();
-            if (c4listener_shareDB(_c4listener, dbname, db, internal(outError))) {
+            if (_c4listener->shareDB(dbname, db)) {
                 _db = db;
             }
             if (_db) {
-                for (unsigned i = 0; i < _conf.collectionCount; ++i) {
-                    C4Collection* coll = db->getCollection(_conf.collections[i]->spec());
-                    if (!coll) {
-                        if (outError) {
-                            outError->domain = kCBLDomain;
-                            outError->code = kCBLErrorInvalidParameter;
-                        }
-                        break;
-                    }
-                    if (c4listener_shareCollection(_c4listener, dbname, coll, internal(outError))) {
-                        _collections.push_back(coll);
+                try {
+                    for (unsigned i = 0; i < _conf.collectionCount; ++i) {
+                        _conf.collections[i]->useLocked([&](C4Collection* coll) {
+                            if (_c4listener->shareCollection(dbname, coll)) {
+                                _collections.push_back(coll);
+                            }
+                        });
+                        if (_collections.size() < i + 1) break;
                     }
-                }
+                } catchAndWarnNoReturn();
             }
         });
+
         if (_collections.size() == _conf.collectionCount) {
             return true;
         }
 
         // Otherwise unwind
         for (C4Collection* coll: _collections) {
             // These collections have been successfully shared.
-            (void)c4listener_unshareCollection(_c4listener, dbname, coll, nullptr);
+            (void)_c4listener->unshareCollection(dbname, coll);
         }
-        (void)c4listener_unshareDB(_c4listener, _db, nullptr);
+        (void)_c4listener->unshareDB(_db);
 
-        c4listener_free(_c4listener);
+        delete _c4listener;
         _c4listener = nullptr;
+
         return false;
     }
 
@@ -125,9 +130,9 @@ public:
 
         auto dbname = _db->getName();
         for (C4Collection* coll: _collections) {
-            (void)c4listener_unshareCollection(_c4listener, dbname, coll, nullptr);
+            (void)_c4listener->unshareCollection(dbname, coll);
         }
-        (void)c4listener_unshareDB(_c4listener, _db, nullptr);
+        (void)_c4listener->unshareDB(_db);
 
         c4listener_free(_c4listener);
         _c4listener = nullptr;

test/URLEndpointListenerTest.cc

@@ -99,6 +99,7 @@ TEST_CASE_METHOD(URLEndpointListenerTest, "Listener Basics", "[URLListener]") {
 
     CBLURLEndpointListener* listener = nullptr;
     SECTION("0 Collections") {
+        ExpectingExceptions x;
         listenerConfig.collectionCount = 0;
         // Cannot create listener with 0 collections.
         listener = CBLURLEndpointListener_Create(&listenerConfig, &error);