core-services-sdk 1.3.26 → 1.3.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-services-sdk",
-  "version": "1.3.26",
+  "version": "1.3.27",
   "main": "src/index.js",
   "type": "module",
   "types": "types/index.d.ts",
@@ -35,6 +35,7 @@
     "http-status": "^2.1.0",
     "mongodb": "^6.18.0",
     "nodemailer": "^7.0.5",
+    "p-retry": "^7.0.0",
     "pino": "^9.7.0",
     "ulid": "^3.0.1",
     "uuid": "^11.1.0",

package/src/mongodb/connect.js

@@ -1,23 +1,56 @@
+import pRetry from 'p-retry'
 import { MongoClient, ServerApiVersion } from 'mongodb'
 
 /**
- * Connects to MongoDB.
+ * Connects to MongoDB with retry and timeout support.
  *
  * @param {Object} options
  * @param {string} options.uri - MongoDB connection URI.
  * @param {object} [options.serverApi] - Optional serverApi configuration.
- * @returns {Promise<import('mongodb').MongoClient>}
+ * @param {number} [options.timeout=5000] - Timeout in ms for each attempt.
+ * @param {number} [options.retries=3] - Number of retry attempts.
+ * @returns {Promise<MongoClient>}
  */
+export const mongoConnect = async ({
+  uri,
+  serverApi,
+  timeout = 5000,
+  retries = 3,
+}) => {
+  const attemptConnect = async () => {
+    const connectPromise = MongoClient.connect(uri, {
+      serverApi: {
+        version: ServerApiVersion.v1,
+        strict: true,
+        deprecationErrors: true,
+        ...serverApi,
+      },
+      connectTimeoutMS: timeout,
+      socketTimeoutMS: timeout,
+    })
 
-export const mongoConnect = async ({ uri, serverApi }) => {
-  const client = await MongoClient.connect(uri, {
-    serverApi: {
-      version: ServerApiVersion.v1,
-      strict: true,
-      deprecationErrors: true,
-      ...serverApi,
+    // Race connection vs timeout
+    const timeoutPromise = new Promise((_, reject) =>
+      setTimeout(
+        () =>
+          reject(new Error(`MongoDB connection timed out after ${timeout}ms`)),
+        timeout,
+      ),
+    )
+
+    return Promise.race([connectPromise, timeoutPromise])
+  }
+
+  return pRetry(attemptConnect, {
+    retries,
+    factor: 2, // exponential backoff multiplier
+    minTimeout: 500, // wait 500ms before first retry
+    maxTimeout: timeout, // cap backoff at timeout value
+    onFailedAttempt: (error) => {
+      console.warn(
+        `MongoDB connection attempt ${error.attemptNumber} failed. ` +
+          `There are ${error.retriesLeft} retries left. Reason: ${error.message}`,
+      )
     },
   })
-
-  return client
 }

package/tests/mongodb/connect.integration.test.js

@@ -0,0 +1,62 @@
+// @ts-nocheck
+import { describe, it, expect, beforeAll, afterAll } from 'vitest'
+import { mongoConnect } from '../../src/mongodb/connect.js'
+import { startMongo, stopMongo } from '../resources/docker-mongo-test.js'
+
+const MONGO_PORT = 29060
+const CONTAINER_NAME = 'mongo-connect-integration-test'
+
+describe('mongoConnect - Integration', () => {
+  let client
+
+  beforeAll(async () => {
+    // Start a fresh Mongo container
+    startMongo(MONGO_PORT, CONTAINER_NAME)
+  })
+
+  afterAll(async () => {
+    if (client) {
+      await client.close()
+    }
+    stopMongo(CONTAINER_NAME)
+  })
+
+  it('successfully connects to a running MongoDB container', async () => {
+    client = await mongoConnect({
+      uri: `mongodb://0.0.0.0:${MONGO_PORT}`,
+    })
+
+    const db = client.db('integration-test')
+    const col = db.collection('docs')
+
+    await col.insertOne({ name: 'hello' })
+    const found = await col.findOne({ name: 'hello' })
+
+    expect(found).toMatchObject({ name: 'hello' })
+  })
+
+  it('respects custom timeout', async () => {
+    // should connect quickly
+    client = await mongoConnect({
+      uri: `mongodb://0.0.0.0:${MONGO_PORT}`,
+      timeout: 2000,
+    })
+
+    expect(client).toBeDefined()
+  })
+
+  it('fails to connect to an invalid port with retries', async () => {
+    const badPort = 29999 // unused port
+
+    await expect(
+      mongoConnect({
+        uri: `mongodb://0.0.0.0:${badPort}`,
+        timeout: 1000,
+        retries: 2,
+      }),
+    ).rejects.toThrow()
+
+    // should try initial + retries
+    // we don’t assert number of attempts here because it’s handled by p-retry
+  })
+})

package/tests/mongodb/connect.unit.test.js

@@ -23,7 +23,7 @@ describe('mongoConnect', () => {
     MongoClient.connect.mockResolvedValue(fakeClient)
   })
 
-  it('should call MongoClient.connect with default serverApi options', async () => {
+  it('should call MongoClient.connect with default serverApi options and default timeouts', async () => {
     const uri = 'mongodb://localhost:27017'
     await mongoConnect({ uri })
 
@@ -33,6 +33,8 @@ describe('mongoConnect', () => {
         strict: true,
         deprecationErrors: true,
       },
+      connectTimeoutMS: 5000,
+      socketTimeoutMS: 5000,
     })
   })
 
@@ -48,13 +50,53 @@ describe('mongoConnect', () => {
         strict: false,
         deprecationErrors: true,
       },
+      connectTimeoutMS: 5000,
+      socketTimeoutMS: 5000,
     })
   })
 
+  it('should honor custom timeout value', async () => {
+    const uri = 'mongodb://localhost:27017'
+    await mongoConnect({ uri, timeout: 2000 })
+
+    expect(MongoClient.connect).toHaveBeenCalledWith(
+      uri,
+      expect.objectContaining({
+        connectTimeoutMS: 2000,
+        socketTimeoutMS: 2000,
+      }),
+    )
+  })
+
   it('should return the connected client', async () => {
     const uri = 'mongodb://localhost:27017'
     const client = await mongoConnect({ uri })
 
     expect(client).toBe(fakeClient)
   })
+
+  it('should retry when connection fails initially', async () => {
+    const uri = 'mongodb://localhost:27017'
+
+    // fail first attempt, succeed second
+    MongoClient.connect
+      .mockRejectedValueOnce(new Error('temporary error'))
+      .mockResolvedValueOnce(fakeClient)
+
+    const client = await mongoConnect({ uri, retries: 2 })
+
+    expect(client).toBe(fakeClient)
+    expect(MongoClient.connect).toHaveBeenCalledTimes(2)
+  })
+
+  it('should throw after exceeding retries', async () => {
+    const uri = 'mongodb://localhost:27017'
+    MongoClient.connect.mockRejectedValue(new Error('always fails'))
+
+    await expect(
+      mongoConnect({ uri, retries: 2, timeout: 100 }),
+    ).rejects.toThrow(/always fails/)
+
+    expect(MongoClient.connect).toHaveBeenCalledTimes(3) // initial + 2 retries
+  })
 })