gmongo 3.0.2 → 3.0.4

package/examples/collectionCopy.js

@@ -1,4 +1,4 @@
-require('dotenv').config()
+require('dotenv').config({ path: __dirname + '/.env' })
 const MGO = require('../mongo.js')
 
 function splitIntoBatches(array, batchSize) {
@@ -10,6 +10,12 @@ function splitIntoBatches(array, batchSize) {
 }
 
 async function copyCollections() {
+  // Validate required environment variables
+  if (!process.env.COLLECTIONS_TO_COPY) {
+    console.error('Error: COLLECTIONS_TO_COPY environment variable is required')
+    process.exit(1)
+  }
+
   const Source = {
     ATLAS: process.env.FROM_ATLAS === 'true',
     DB: process.env.FROM_DB,
@@ -31,6 +37,7 @@ async function copyCollections() {
   const timeoutInMS = parseInt(process.env.CONNECTION_TIMEOUT_MS) || 10000
   const insertBatchSize = parseInt(process.env.INSERT_BATCH_SIZE) || 1000
 
+  console.log('Connecting to source database...')
   await MGO.start(
     Source.ATLAS,
     Source.DB,
@@ -41,6 +48,9 @@ async function copyCollections() {
     Source.X509,
     timeoutInMS,
   )
+  console.log('✓ Connected to source database')
+
+  console.log('Connecting to destination database...')
   await MGO.start(
     Destination.ATLAS,
     Destination.DB,
@@ -51,24 +61,46 @@ async function copyCollections() {
     Destination.X509,
     timeoutInMS,
   )
+  console.log('✓ Connected to destination database')
 
   const CollectionsToCopy = process.env.COLLECTIONS_TO_COPY.split(',').map(
     (c) => c.trim(),
   )
 
+  console.log('Starting collection copy process...')
+  console.log(`Collections to copy: ${CollectionsToCopy.join(', ')}`)
+
+  let totalDocuments = 0
+
   try {
     for (const collectionName of CollectionsToCopy) {
+      console.log(`\nCopying collection: ${collectionName}`)
       const fromCollection = await MGO.query(Source.DB, collectionName, {})
+      console.log(`  Found ${fromCollection.length} documents`)
+      
+      if (fromCollection.length === 0) {
+        console.log(`  Skipping empty collection`)
+        continue
+      }
+      
       const insertList = splitIntoBatches(fromCollection, insertBatchSize)
-      for (const batch of insertList) {
-        await MGO.insert(Destination.DB, collectionName, batch)
+      console.log(`  Inserting in ${insertList.length} batches...`)
+      
+      for (let i = 0; i < insertList.length; i++) {
+        await MGO.insert(Destination.DB, collectionName, insertList[i])
+        console.log(`  Batch ${i + 1}/${insertList.length} completed`)
       }
+      
+      totalDocuments += fromCollection.length
       console.log(
-        `Copied collection: ${collectionName} with ${fromCollection.length} documents`,
+        `✓ Copied collection: ${collectionName} (${fromCollection.length} documents)`,
       )
     }
+    console.log(`\n✓ All collections copied successfully! (Total: ${totalDocuments} documents)`)
+    process.exit(0)
   } catch (error) {
-    console.error('Error copying collections:', error)
+    console.error('\n✗ Error copying collections:', error)
+    process.exit(1)
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gmongo",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "description": "MongoDB Connection Class",
   "main": "mongo.js",
   "scripts": {
@@ -17,6 +17,7 @@
   },
   "homepage": "https://github.com/GnomeGroup/gmongo#readme",
   "dependencies": {
+    "dotenv": "^17.3.1",
     "eslint": "^8.57.0",
     "mongodb": "^6.2.0",
     "prettier": "^3.2.5",

package/services/connect.js

@@ -1,12 +1,23 @@
 const mongo = require('mongodb').MongoClient
 
+const DEFAULT_TIMEOUT_MS = 30000
+const DEFAULT_PORT = 27017
+
 module.exports = (isAtlas, dbName, ip, port, user, pass, x509, timeoutInMS) =>
   new Promise(function (resolve, reject) {
-    let connectOptions = {
-      serverSelectionTimeoutMS: timeoutInMS
-        ? parseInt(timeoutInMS)
-        : CFG.defaults.timeout,
+    const parsedTimeout = Number.parseInt(timeoutInMS, 10)
+    const parsedPort = Number.parseInt(port, 10)
+    const effectivePort = Number.isFinite(parsedPort)
+      ? parsedPort
+      : DEFAULT_PORT
+    const authSource = process.env.MONGO_AUTH_SOURCE || dbName
+
+    const connectOptions = {
+      serverSelectionTimeoutMS: Number.isFinite(parsedTimeout)
+        ? parsedTimeout
+        : DEFAULT_TIMEOUT_MS,
     }
+
     try {
       const url =
         'mongodb' +
@@ -17,10 +28,11 @@ module.exports = (isAtlas, dbName, ip, port, user, pass, x509, timeoutInMS) =>
         (pass ? encodeURIComponent(pass) : '') +
         (user || pass ? '@' : '') +
         encodeURIComponent(ip) +
-        (isAtlas ? '' : ':' + parseInt(port).toString()) +
+        (isAtlas ? '' : ':' + effectivePort.toString()) +
         '/' +
         encodeURIComponent(dbName) +
         '?retryWrites=true&w=majority' +
+        `&authSource=${encodeURIComponent(authSource)}` +
         (x509
           ? '&authMechanism=MONGODB-X509&tls=true&tlsCertificateKeyFile=' +
             encodeURIComponent(x509)
@@ -32,6 +44,8 @@ module.exports = (isAtlas, dbName, ip, port, user, pass, x509, timeoutInMS) =>
         resolve(dbObject)
         return
       }
-    } catch (err) {}
-    reject()
+      reject(new Error(`Failed to initialize Mongo client for ${dbName}`))
+    } catch (err) {
+      reject(err)
+    }
   })