fix: support mongodb+srv:// URIs and speed up collection loading (#419) (#425)

* fix: support mongodb+srv:// URIs, bundle plugin, skip duplicates, and speed up collection loading (#419)

* perf: reduce MongoDB collection load time with estimatedDocumentCount and smaller schema sample

* revert: remove MongoDB plugin from built-in app bundle

* docs: fix CHANGELOG entries to use Added/Changed instead of Fixed for unreleased features

* fix: address PR review — serverVersion queue dispatch, explicitKeys filter, SSH param forwarding, stale field cleanup

Author: datlechin

CHANGELOG.md

@@ -10,6 +10,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Keyboard focus navigation (Tab, Ctrl+J/K/N/P, arrow keys) for connection list, quick switcher, and database switcher
+- MongoDB `mongodb+srv://` URI support with SRV toggle, Auth Mechanism dropdown, and Replica Set field (#419)
+
+### Changed
+
+- MongoDB `authSource` defaults to database name per MongoDB URI spec instead of always "admin"
+- MongoDB collection loading uses `estimatedDocumentCount` and smaller schema sample for faster sidebar population
 
 ## [0.22.1] - 2026-03-22
 

Plugins/MongoDBDriverPlugin/MongoDBConnection.swift

@@ -62,6 +62,10 @@ final class MongoDBConnection: @unchecked Sendable {
     private let authSource: String?
     private let readPreference: String?
     private let writeConcern: String?
+    private let useSrv: Bool
+    private let authMechanism: String?
+    private let replicaSet: String?
+    private let extraUriParams: [String: String]
 
     private let stateLock = NSLock()
     private var _isConnected: Bool = false
@@ -114,7 +118,11 @@ final class MongoDBConnection: @unchecked Sendable {
         sslClientCertPath: String = "",
         authSource: String? = nil,
         readPreference: String? = nil,
-        writeConcern: String? = nil
+        writeConcern: String? = nil,
+        useSrv: Bool = false,
+        authMechanism: String? = nil,
+        replicaSet: String? = nil,
+        extraUriParams: [String: String] = [:]
     ) {
         self.host = host
         self.port = port
@@ -127,6 +135,10 @@ final class MongoDBConnection: @unchecked Sendable {
         self.authSource = authSource
         self.readPreference = readPreference
         self.writeConcern = writeConcern
+        self.useSrv = useSrv
+        self.authMechanism = authMechanism
+        self.replicaSet = replicaSet
+        self.extraUriParams = extraUriParams
     }
 
     deinit {
@@ -150,7 +162,8 @@ final class MongoDBConnection: @unchecked Sendable {
     // MARK: - URI Construction
 
     private func buildUri() -> String {
-        var uri = "mongodb://"
+        let scheme = useSrv ? "mongodb+srv" : "mongodb"
+        var uri = "\(scheme)://"
 
         if !user.isEmpty {
             let encodedUser = user.addingPercentEncoding(withAllowedCharacters: .urlUserAllowed) ?? user
@@ -167,10 +180,21 @@ final class MongoDBConnection: @unchecked Sendable {
         let encodedHost = host.addingPercentEncoding(withAllowedCharacters: .urlHostAllowed) ?? host
         let encodedDb = database.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? database
 
-        uri += "\(encodedHost):\(port)"
+        if useSrv {
+            uri += encodedHost
+        } else {
+            uri += "\(encodedHost):\(port)"
+        }
         uri += database.isEmpty ? "/" : "/\(encodedDb)"
 
-        let effectiveAuthSource = authSource.flatMap { $0.isEmpty ? nil : $0 } ?? "admin"
+        let effectiveAuthSource: String
+        if let source = authSource, !source.isEmpty {
+            effectiveAuthSource = source
+        } else if !database.isEmpty {
+            effectiveAuthSource = database
+        } else {
+            effectiveAuthSource = "admin"
+        }
         let encodedAuthSource = effectiveAuthSource
             .addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) ?? effectiveAuthSource
         var params: [String] = [
@@ -206,6 +230,24 @@ final class MongoDBConnection: @unchecked Sendable {
         if let wc = writeConcern, !wc.isEmpty {
             params.append("w=\(wc)")
         }
+        if let mechanism = authMechanism, !mechanism.isEmpty {
+            params.append("authMechanism=\(mechanism)")
+        }
+        if let rs = replicaSet, !rs.isEmpty {
+            params.append("replicaSet=\(rs)")
+        }
+
+        var explicitKeys: Set<String> = [
+            "connectTimeoutMS", "serverSelectionTimeoutMS",
+            "authSource", "authMechanism", "replicaSet",
+            "tls", "tlsAllowInvalidCertificates", "tlsCAFile", "tlsCertificateKeyFile"
+        ]
+        if readPreference != nil, !readPreference!.isEmpty { explicitKeys.insert("readPreference") }
+        if writeConcern != nil, !writeConcern!.isEmpty { explicitKeys.insert("w") }
+        for (key, value) in extraUriParams where !explicitKeys.contains(key) {
+            let encodedValue = value.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) ?? value
+            params.append("\(key)=\(encodedValue)")
+        }
 
         uri += "?" + params.joined(separator: "&")
         return uri
@@ -248,14 +290,12 @@ final class MongoDBConnection: @unchecked Sendable {
             }
 
             self.client = newClient
-            let versionString = self.fetchServerVersionSync()
 
             self.stateLock.lock()
-            self._cachedServerVersion = versionString
             self._isConnected = true
             self.stateLock.unlock()
 
-            logger.info("Connected to MongoDB \(versionString ?? "unknown")")
+            logger.info("Connected to MongoDB at \(self.host):\(self.port)")
         }
         #else
         throw MongoDBError.libmongocUnavailable
@@ -341,8 +381,21 @@ final class MongoDBConnection: @unchecked Sendable {
 
     func serverVersion() -> String? {
         stateLock.lock()
-        defer { stateLock.unlock() }
-        return _cachedServerVersion
+        if let cached = _cachedServerVersion {
+            stateLock.unlock()
+            return cached
+        }
+        stateLock.unlock()
+
+        #if canImport(CLibMongoc)
+        let version = queue.sync { fetchServerVersionSync() }
+        stateLock.lock()
+        _cachedServerVersion = version
+        stateLock.unlock()
+        return version
+        #else
+        return nil
+        #endif
     }
     func currentDatabase() -> String { database }
 
@@ -429,6 +482,29 @@ final class MongoDBConnection: @unchecked Sendable {
         #endif
     }
 
+    func estimatedDocumentCount(database: String, collection: String) async throws -> Int64 {
+        #if canImport(CLibMongoc)
+        resetCancellation()
+        return try await pluginDispatchAsync(on: queue) { [self] in
+            guard !isShuttingDown, let client = self.client else {
+                throw MongoDBError.notConnected
+            }
+            try checkCancelled()
+            let col = try getCollection(client, database: database, collection: collection)
+            defer { mongoc_collection_destroy(col) }
+
+            var error = bson_error_t()
+            let count = mongoc_collection_estimated_document_count(col, nil, nil, nil, &error)
+            if count < 0 {
+                throw makeError(error)
+            }
+            return count
+        }
+        #else
+        throw MongoDBError.libmongocUnavailable
+        #endif
+    }
+
     func insertOne(database: String, collection: String, document: String) async throws -> String? {
         #if canImport(CLibMongoc)
         resetCancellation()

Plugins/MongoDBDriverPlugin/MongoDBPlugin.swift

@@ -41,6 +41,30 @@ final class MongoDBPlugin: NSObject, TableProPlugin, DriverPlugin {
                 .init(value: "3", label: "3"),
             ])
         ),
+        ConnectionField(
+            id: "mongoUseSrv",
+            label: "Use SRV Record",
+            defaultValue: "false",
+            fieldType: .toggle,
+            section: .advanced
+        ),
+        ConnectionField(
+            id: "mongoAuthMechanism",
+            label: "Auth Mechanism",
+            fieldType: .dropdown(options: [
+                .init(value: "", label: "Default"),
+                .init(value: "SCRAM-SHA-1", label: "SCRAM-SHA-1"),
+                .init(value: "SCRAM-SHA-256", label: "SCRAM-SHA-256"),
+                .init(value: "MONGODB-X509", label: "X.509"),
+                .init(value: "MONGODB-AWS", label: "AWS IAM"),
+            ]),
+            section: .authentication
+        ),
+        ConnectionField(
+            id: "mongoReplicaSet",
+            label: "Replica Set",
+            section: .advanced
+        ),
     ]
 
     // MARK: - UI/Capability Metadata

Plugins/MongoDBDriverPlugin/MongoDBPluginDriver.swift

@@ -36,6 +36,18 @@ final class MongoDBPluginDriver: PluginDatabaseDriver {
     // MARK: - Connection Management
 
     func connect() async throws {
+        let useSrv = config.additionalFields["mongoUseSrv"] == "true"
+        let authMechanism = config.additionalFields["mongoAuthMechanism"]
+        let replicaSet = config.additionalFields["mongoReplicaSet"]
+
+        var extraParams: [String: String] = [:]
+        for (key, value) in config.additionalFields where key.hasPrefix("mongoParam_") {
+            let paramName = String(key.dropFirst("mongoParam_".count))
+            if !paramName.isEmpty {
+                extraParams[paramName] = value
+            }
+        }
+
         let conn = MongoDBConnection(
             host: config.host,
             port: config.port,
@@ -47,7 +59,11 @@ final class MongoDBPluginDriver: PluginDatabaseDriver {
             sslClientCertPath: config.additionalFields["sslClientCertPath"] ?? "",
             authSource: config.additionalFields["mongoAuthSource"],
             readPreference: config.additionalFields["mongoReadPreference"],
-            writeConcern: config.additionalFields["mongoWriteConcern"]
+            writeConcern: config.additionalFields["mongoWriteConcern"],
+            useSrv: useSrv,
+            authMechanism: authMechanism,
+            replicaSet: replicaSet,
+            extraUriParams: extraParams
         )
 
         try await conn.connect()
@@ -183,7 +199,7 @@ final class MongoDBPluginDriver: PluginDatabaseDriver {
 
         let docs = try await conn.find(
             database: currentDb, collection: table,
-            filter: "{}", sort: nil, projection: nil, skip: 0, limit: 500
+            filter: "{}", sort: nil, projection: nil, skip: 0, limit: 50
         ).docs
 
         if docs.isEmpty {
@@ -277,7 +293,7 @@ final class MongoDBPluginDriver: PluginDatabaseDriver {
             throw MongoDBPluginError.notConnected
         }
 
-        let count = try await conn.countDocuments(database: currentDb, collection: table, filter: "{}")
+        let count = try await conn.estimatedDocumentCount(database: currentDb, collection: table)
         return Int(count)
     }
 

TablePro/AppDelegate+ConnectionHandler.swift

@@ -440,7 +440,7 @@ extension AppDelegate {
             tagId = ConnectionURLParser.tagId(fromEnvName: envName)
         }
 
-        return DatabaseConnection(
+        var connection = DatabaseConnection(
             name: parsed.connectionName ?? parsed.suggestedName,
             host: parsed.host,
             port: parsed.port ?? parsed.type.defaultPort,
@@ -452,8 +452,19 @@ extension AppDelegate {
             color: color,
             tagId: tagId,
             mongoAuthSource: parsed.authSource,
+            mongoUseSrv: parsed.useSrv,
+            mongoAuthMechanism: parsed.mongoQueryParams["authMechanism"],
+            mongoReplicaSet: parsed.mongoQueryParams["replicaSet"],
             redisDatabase: parsed.redisDatabase,
             oracleServiceName: parsed.oracleServiceName
         )
+
+        for (key, value) in parsed.mongoQueryParams where !value.isEmpty {
+            if key != "authMechanism" && key != "replicaSet" {
+                connection.additionalFields["mongoParam_\(key)"] = value
+            }
+        }
+
+        return connection
     }
 }

TablePro/Core/Plugins/PluginManager.swift

@@ -400,6 +400,16 @@ final class PluginManager {
         }
 
         let bundleId = bundle.bundleIdentifier ?? url.lastPathComponent
+
+        // Skip user-installed plugin if a built-in version already exists
+        if source == .userInstalled,
+           let existing = plugins.first(where: { $0.id == bundleId }),
+           existing.source == .builtIn
+        {
+            Self.logger.info("Skipping user-installed '\(bundleId)' — built-in version already loaded")
+            return existing
+        }
+
         let disabled = disabledPluginIds
 
         let driverType = principalClass as? any DriverPlugin.Type