@ossy/event-store 3.8.0 → 3.11.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/event-store",
-  "version": "3.8.0",
+  "version": "3.11.0",
   "description": "Ossy Event Store — Aggregate, EventStore, and MongoDB client",
   "repository": {
     "type": "git",
@@ -37,5 +37,5 @@
   "files": [
     "src"
   ],
-  "gitHead": "14548dfc2019e7258e8c75db527acbf66fe829bd"
+  "gitHead": "53ff8456920e09151c9d88df4a6c3ee958d811eb"
 }

package/src/mongodb.js

@@ -13,6 +13,7 @@ if (!globalThis.require) {
 const log = createLogger('event-store')
 
 const DEFAULT_MONGO_URL = 'mongodb://mongodb:27017/'
+const DEFAULT_MAX_POOL_SIZE = 50
 
 /**
  * Resolve MongoDB URL at call time so dotenv can load before the first connection.
@@ -29,12 +30,30 @@ export function resolveMongoUrl(url = process.env.DB_URL) {
   return resolved
 }
 
+/** Driver default maxPoolSize is 100; we cap lower. See MONGO_MAX_POOL_SIZE / MONGO_MAX_IDLE_TIME_MS. */
+export function resolveMongoClientOptions(env = process.env) {
+  const maxPoolSize = parsePositiveInt(env.MONGO_MAX_POOL_SIZE, DEFAULT_MAX_POOL_SIZE)
+  /** @type {import('mongodb').MongoClientOptions} */
+  const options = {
+    serverSelectionTimeoutMS: 30_000,
+    maxPoolSize,
+  }
+  const maxIdleTimeMS = parsePositiveInt(env.MONGO_MAX_IDLE_TIME_MS, 0)
+  if (maxIdleTimeMS > 0) {
+    options.maxIdleTimeMS = maxIdleTimeMS
+  }
+  return options
+}
+
+function parsePositiveInt(value, fallback) {
+  const n = Number.parseInt(value ?? '', 10)
+  return Number.isFinite(n) && n > 0 ? n : fallback
+}
+
 let mongoClient = null
 
 function createClient() {
-  return new MongoClient(resolveMongoUrl(), {
-    serverSelectionTimeoutMS: 30_000,
-  })
+  return new MongoClient(resolveMongoUrl(), resolveMongoClientOptions())
 }
 
 export function isMongoTopologyClosedError(error) {

package/src/mongodb.spec.js

@@ -0,0 +1,79 @@
+import { afterEach, describe, expect, it } from '@jest/globals'
+import {
+  Mongo,
+  resolveMongoClientOptions,
+  resolveMongoUrl,
+} from './mongodb.js'
+
+describe('resolveMongoUrl', () => {
+  it('adds directConnection for localhost URLs', () => {
+    expect(resolveMongoUrl('mongodb://127.0.0.1:27017/')).toContain('directConnection=true')
+    expect(resolveMongoUrl('mongodb://localhost:27017/test')).toContain('directConnection=true')
+  })
+
+  it('leaves mongodb+srv URLs unchanged', () => {
+    const url = 'mongodb+srv://user:pass@cluster.example.net/'
+    expect(resolveMongoUrl(url)).toBe(url)
+  })
+})
+
+describe('resolveMongoClientOptions', () => {
+  it('defaults to a bounded pool that still leaves headroom for concurrent API work', () => {
+    expect(resolveMongoClientOptions({})).toEqual({
+      serverSelectionTimeoutMS: 30_000,
+      maxPoolSize: 50,
+    })
+  })
+
+  it('reads MONGO_MAX_POOL_SIZE and optional MONGO_MAX_IDLE_TIME_MS', () => {
+    expect(resolveMongoClientOptions({
+      MONGO_MAX_POOL_SIZE: '5',
+      MONGO_MAX_IDLE_TIME_MS: '15000',
+    })).toEqual({
+      serverSelectionTimeoutMS: 30_000,
+      maxPoolSize: 5,
+      maxIdleTimeMS: 15_000,
+    })
+  })
+
+  it('omits maxIdleTimeMS unless env is a positive int', () => {
+    expect(resolveMongoClientOptions({
+      MONGO_MAX_POOL_SIZE: '40',
+      MONGO_MAX_IDLE_TIME_MS: '0',
+    })).toEqual({
+      serverSelectionTimeoutMS: 30_000,
+      maxPoolSize: 40,
+    })
+  })
+
+  it('falls back when env values are invalid', () => {
+    expect(resolveMongoClientOptions({
+      MONGO_MAX_POOL_SIZE: '0',
+      MONGO_MAX_IDLE_TIME_MS: 'nope',
+    })).toEqual({
+      serverSelectionTimeoutMS: 30_000,
+      maxPoolSize: 50,
+    })
+  })
+})
+
+describe('Mongo singleton', () => {
+  afterEach(async () => {
+    await Mongo.closeConnection()
+  })
+
+  it('reuses one client across getters', () => {
+    const a = Mongo.Client
+    const b = Mongo.Client
+    expect(a).toBe(b)
+    expect(a.options.maxPoolSize).toBe(50)
+  })
+
+  it('resetClient replaces the singleton', async () => {
+    const first = Mongo.Client
+    Mongo.resetClient()
+    const second = Mongo.Client
+    expect(second).not.toBe(first)
+    expect(second.options.maxPoolSize).toBe(50)
+  })
+})