@frogfish/k2db 1.0.11 → 1.0.14

package/db.js

@@ -18,42 +18,73 @@ class K2DB {
      * Initializes the MongoDB connection.
      */
     async init() {
+        // 1. dbName from config
         const dbName = this.conf.name;
-        let connectUrl = "mongodb://";
-        // Add user and password if available
+        // 2. Build the connection string with user/password if available
+        //    (Change 'mongodb+srv://' back to 'mongodb://' if you're not using an SRV connection)
+        let connectUrl = "mongodb+srv://";
         if (this.conf.user && this.conf.password) {
             connectUrl += `${encodeURIComponent(this.conf.user)}:${encodeURIComponent(this.conf.password)}@`;
         }
-        // Handle single host (non-replicaset) or multiple hosts (replicaset)
+        // 3. If no hosts, throw an error
         if (!this.conf.hosts || this.conf.hosts.length === 0) {
             throw new k2error_1.K2Error(k2error_1.ServiceError.CONFIGURATION_ERROR, "No valid hosts provided in configuration", "sys_mdb_no_hosts");
         }
-        connectUrl += this.conf.hosts
-            .map((host) => `${host.host}:${host.port || 27017}`)
-            .join(",");
-        // Append database name
+        // 4. Handle single vs multiple hosts
+        //    - If SRV, you typically only specify the first host (no port)
+        //    - If non-SRV, you'd do: .map((host) => `${host.host}:${host.port || 27017}`).join(",")
+        //
+        // For SRV, we *usually* just do the first host:
+        connectUrl += this.conf.hosts[0].host;
+        // 5. Append the DB name
+        //    If SRV with Atlas, you can also append `retryWrites=true&w=majority`, etc.
+        //    If you need to pass additional params (e.g., replicaSet), you can do so below.
         connectUrl += `/${dbName}`;
-        // Append replicaset and options if it's a replicaset
+        // 6. Append replicaset if more than one host and replicaset is defined.
+        //    (Typically, SRV records handle the replicaSet automatically, so you may not need this.
+        //     But if you do, keep this logic.)
         if (this.conf.hosts.length > 1 && this.conf.replicaset) {
-            connectUrl += `?replicaSet=${this.conf.replicaset}&keepAlive=true&autoReconnect=true&socketTimeoutMS=0`;
+            // If you already have `/${dbName}?...`, you need to add `&` instead of `?`.
+            // For simplicity, we do a conditional:
+            if (connectUrl.includes("?")) {
+                connectUrl += `&replicaSet=${this.conf.replicaset}&keepAlive=true&autoReconnect=true&socketTimeoutMS=0`;
+            }
+            else {
+                connectUrl += `?replicaSet=${this.conf.replicaset}&keepAlive=true&autoReconnect=true&socketTimeoutMS=0`;
+            }
+        }
+        else {
+            // For SRV + Atlas: often we want at least `?retryWrites=true&w=majority`
+            if (!connectUrl.includes("?")) {
+                connectUrl += "?retryWrites=true&w=majority";
+            }
+            else {
+                connectUrl += "&retryWrites=true&w=majority";
+            }
         }
         // Mask sensitive information in logs
         const safeConnectUrl = connectUrl.replace(/\/\/.*?:.*?@/, "//*****:*****@");
         debug(`Connecting to MongoDB: ${safeConnectUrl}`);
-        // Define connection options with timeouts
+        // 7. Define connection options with timeouts
+        //    (Keep from original code, or update as needed)
         const options = {
-            connectTimeoutMS: 2000, // 2 seconds
-            serverSelectionTimeoutMS: 2000, // 2 seconds
-            // Additional options can be added here
+            connectTimeoutMS: 2000,
+            serverSelectionTimeoutMS: 2000,
+            // If you want the Stable API (like in your _init), do:
+            // serverApi: {
+            //   version: ServerApiVersion.v1,
+            //   strict: true,
+            //   deprecationErrors: true,
+            // },
         };
         try {
-            // Establish MongoDB connection
+            // 8. Establish MongoDB connection
             this.connection = await mongodb_1.MongoClient.connect(connectUrl, options);
             this.db = this.connection.db(dbName);
             debug("Successfully connected to MongoDB");
         }
         catch (err) {
-            // Handle connection error
+            // 9. Handle connection error
             throw new k2error_1.K2Error(k2error_1.ServiceError.SYSTEM_ERROR, "Failed to connect to MongoDB", "sys_mdb_init", this.normalizeError(err));
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frogfish/k2db",
-  "version": "1.0.11",
+  "version": "1.0.14",
   "description": "A data handling library for K2 applications.",
   "main": "data.js",
   "types": "data.d.ts",