@opra/mongodb 1.28.5 → 1.29.0

package/README.md

@@ -48,11 +48,15 @@ export class UsersController extends MongoCollectionService<User> {
   }
 
   @HttpOperation.Entity.FindMany({ type: User })
-  findMany() { return super.findMany(); }
+  findMany() {
+    return super.findMany();
+  }
 
   @HttpOperation.Entity.GetOne({ type: User })
   @HttpOperation.PathParam('id', 'objectId')
-  getOne(id: ObjectId) { return super.getOne(id); }
+  getOne(id: ObjectId) {
+    return super.getOne(id);
+  }
 }
 ```
 

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@opra/mongodb",
-  "version": "1.28.5",
+  "version": "1.29.0",
   "description": "Opra MongoDB adapter package",
   "author": "Panates",
   "license": "MIT",
   "homepage": "https://www.oprajs.com",
   "dependencies": {
-    "@jsopen/objects": "^2.2.2",
+    "@jsopen/objects": "^2.2.3",
     "tslib": "^2.8.1",
-    "valgen": "^6.2.0"
+    "valgen": "^6.2.2"
   },
   "peerDependencies": {
-    "@opra/common": "^1.28.5",
-    "@opra/core": "^1.28.5",
-    "@opra/http": "^1.28.5",
+    "@opra/common": "^1.29.0",
+    "@opra/core": "^1.29.0",
+    "@opra/http": "^1.29.0",
     "mongodb": "^7.0.0"
   },
   "exports": {

package/services/mongo-service.d.ts

@@ -1,6 +1,6 @@
 import { ComplexType } from '@opra/common';
 import { ExecutionContext, ServiceBase } from '@opra/core';
-import mongodb, { ClientSession, type Document, type TransactionOptions } from 'mongodb';
+import mongodb, { ClientSession, type Document, MongoClient, type TransactionOptions } from 'mongodb';
 import type { Nullish, StrictOmit, Type } from 'ts-gems';
 import type { vg } from 'valgen';
 import { MongoAdapter } from '../adapter/mongo-adapter.js';
@@ -270,6 +270,13 @@ export declare class MongoService<T extends mongodb.Document = mongodb.Document>
      * @throws {@link Error} If the context or database is not set.
      */
     protected getDatabase(): mongodb.Db;
+    /**
+     * Retrieves the MongoClient.
+     *
+     * @protected
+     * @throws {@link Error} If the context or database is not set.
+     */
+    protected getDBClient(): MongoClient;
     /**
      * Retrieves the database session.
      *

package/services/mongo-service.js

@@ -2,7 +2,8 @@ import { ComplexType, DataType, DATATYPE_METADATA } from '@opra/common';
 import { ExecutionContext, ServiceBase } from '@opra/core';
 import mongodb, { ClientSession, MongoClient, ObjectId, } from 'mongodb';
 import { MongoAdapter } from '../adapter/mongo-adapter.js';
-const transactionKey = Symbol.for('transaction');
+const dbInstanceKey = Symbol.for('db-instance');
+const dbSessionKey = Symbol.for('db-session');
 /**
  * Class representing a MongoDB service for interacting with a collection.
  * @extends ServiceBase
@@ -143,21 +144,13 @@ export class MongoService extends ServiceBase {
     async withTransaction(callback, options) {
         const ctx = this.context;
         let closeSessionOnFinish = false;
-        let transaction = ctx[transactionKey];
-        let session;
-        if (transaction) {
-            session = transaction.session;
-        }
-        else {
-            const db = this.getDatabase();
-            const client = db.client;
+        const dbInstance = this.getDatabase();
+        let session = this.getSession();
+        if (!session) {
+            const client = dbInstance.client;
             session = client.startSession();
+            ctx[dbSessionKey] = session;
             closeSessionOnFinish = true;
-            transaction = {
-                db,
-                session,
-            };
-            ctx[transactionKey] = transaction;
         }
         const oldInTransaction = session.inTransaction();
         try {
@@ -174,7 +167,8 @@ export class MongoService extends ServiceBase {
             throw e;
         }
         finally {
-            delete ctx[transactionKey];
+            delete ctx[dbInstanceKey];
+            delete ctx[dbSessionKey];
             if (closeSessionOnFinish) {
                 await session.endSession();
             }
@@ -188,14 +182,28 @@ export class MongoService extends ServiceBase {
      */
     getDatabase() {
         const ctx = this.context;
-        const transaction = ctx[transactionKey];
-        if (transaction)
-            return transaction.db;
-        const db = typeof this.db === 'function' ? this.db(this) : this.db;
-        if (db)
-            return db;
+        let dbInstance = ctx[dbInstanceKey] || ctx.bundle?.[dbInstanceKey];
+        if (dbInstance)
+            return dbInstance;
+        dbInstance = typeof this.db === 'function' ? this.db(this) : this.db;
+        if (dbInstance) {
+            if (ctx.bundle?.transaction) {
+                ctx.bundle[dbInstanceKey] = dbInstance;
+            }
+            return dbInstance;
+        }
         throw new Error(`Database not set!`);
     }
+    /**
+     * Retrieves the MongoClient.
+     *
+     * @protected
+     * @throws {@link Error} If the context or database is not set.
+     */
+    getDBClient() {
+        const dbInstance = this.getDatabase();
+        return dbInstance.client;
+    }
     /**
      * Retrieves the database session.
      *
@@ -204,12 +212,36 @@ export class MongoService extends ServiceBase {
      */
     getSession() {
         const ctx = this.context;
-        const transaction = ctx[transactionKey];
-        if (transaction)
-            return transaction.session;
-        const session = typeof this.session === 'function' ? this.session(this) : this.session;
+        let session = ctx[dbSessionKey] || ctx.bundle?.[dbSessionKey];
+        if (session)
+            return session;
+        session =
+            typeof this.session === 'function' ? this.session(this) : this.session;
         if (session)
             return session;
+        if (ctx.bundle?.transaction) {
+            const dbInstance = this.getDatabase();
+            const client = dbInstance.client;
+            session = client.startSession();
+            ctx.bundle[dbSessionKey] = session;
+            /* Commit or Rollback transaction after executed */
+            ctx.bundle.on('after-execute', async () => {
+                try {
+                    if (session.inTransaction()) {
+                        if (ctx.bundle.success)
+                            await session.commitTransaction();
+                        else
+                            await session.abortTransaction();
+                    }
+                }
+                finally {
+                    delete ctx.bundle[dbInstanceKey];
+                    delete ctx.bundle[dbSessionKey];
+                    await session.endSession();
+                }
+            });
+        }
+        return session;
     }
     /**
      * Retrieves a MongoDB collection from the given database.