@prisma/client-engine-runtime 6.13.0-dev.5 → 6.13.0-dev.7

package/dist/index.js

@@ -1473,6 +1473,11 @@ var TransactionClosedError = class extends TransactionManagerError {
     super(`Transaction already closed: A ${operation} cannot be executed on a committed transaction.`);
   }
 };
+var TransactionClosingError = class extends TransactionManagerError {
+  constructor(operation) {
+    super(`Transaction is being closed: A ${operation} cannot be executed on a closing transaction.`);
+  }
+};
 var TransactionRolledBackError = class extends TransactionManagerError {
   constructor(operation) {
     super(`Transaction already closed: A ${operation} cannot be executed on a transaction that was rolled back.`);
@@ -1555,17 +1560,21 @@ var TransactionManager = class {
       transaction: void 0
     };
     this.transactions.set(transaction.id, transaction);
-    const startTimer = setTimeout(() => transaction.status = "timed_out", validatedOptions.maxWait);
+    let hasTimedOut = false;
+    const startTimer = setTimeout(() => hasTimedOut = true, validatedOptions.maxWait);
     transaction.transaction = await this.driverAdapter.startTransaction(validatedOptions.isolationLevel);
     clearTimeout(startTimer);
     switch (transaction.status) {
       case "waiting":
+        if (hasTimedOut) {
+          await this.closeTransaction(transaction, "timed_out");
+          throw new TransactionStartTimeoutError();
+        }
         transaction.status = "running";
         transaction.timer = this.startTransactionTimeout(transaction.id, validatedOptions.timeout);
         return { id: transaction.id };
+      case "closing":
       case "timed_out":
-        await this.closeTransaction(transaction, "timed_out");
-        throw new TransactionStartTimeoutError();
       case "running":
       case "committed":
       case "rolled_back":
@@ -1600,6 +1609,7 @@ var TransactionManager = class {
       if (closedTransaction) {
         debug("Transaction already closed.", { transactionId, status: closedTransaction.status });
         switch (closedTransaction.status) {
+          case "closing":
           case "waiting":
           case "running":
             throw new TransactionInternalConsistencyError("Active transaction found in closed transactions list.");
@@ -1618,6 +1628,9 @@ var TransactionManager = class {
         throw new TransactionNotFoundError();
       }
     }
+    if (transaction.status === "closing") {
+      throw new TransactionClosingError(operation);
+    }
     if (["committed", "rolled_back", "timed_out"].includes(transaction.status)) {
       throw new TransactionInternalConsistencyError("Closed transaction found in active transactions map.");
     }
@@ -1640,7 +1653,7 @@ var TransactionManager = class {
   }
   async closeTransaction(tx, status) {
     debug("Closing transaction.", { transactionId: tx.id, status });
-    tx.status = status;
+    tx.status = "closing";
     try {
       if (tx.transaction && status === "committed") {
         if (tx.transaction.options.usePhantomQuery) {
@@ -1660,6 +1673,7 @@ var TransactionManager = class {
         }
       }
     } finally {
+      tx.status = status;
       clearTimeout(tx.timer);
       tx.timer = void 0;
       this.transactions.delete(tx.id);

package/dist/index.mjs

@@ -1424,6 +1424,11 @@ var TransactionClosedError = class extends TransactionManagerError {
     super(`Transaction already closed: A ${operation} cannot be executed on a committed transaction.`);
   }
 };
+var TransactionClosingError = class extends TransactionManagerError {
+  constructor(operation) {
+    super(`Transaction is being closed: A ${operation} cannot be executed on a closing transaction.`);
+  }
+};
 var TransactionRolledBackError = class extends TransactionManagerError {
   constructor(operation) {
     super(`Transaction already closed: A ${operation} cannot be executed on a transaction that was rolled back.`);
@@ -1506,17 +1511,21 @@ var TransactionManager = class {
       transaction: void 0
     };
     this.transactions.set(transaction.id, transaction);
-    const startTimer = setTimeout(() => transaction.status = "timed_out", validatedOptions.maxWait);
+    let hasTimedOut = false;
+    const startTimer = setTimeout(() => hasTimedOut = true, validatedOptions.maxWait);
     transaction.transaction = await this.driverAdapter.startTransaction(validatedOptions.isolationLevel);
     clearTimeout(startTimer);
     switch (transaction.status) {
       case "waiting":
+        if (hasTimedOut) {
+          await this.closeTransaction(transaction, "timed_out");
+          throw new TransactionStartTimeoutError();
+        }
         transaction.status = "running";
         transaction.timer = this.startTransactionTimeout(transaction.id, validatedOptions.timeout);
         return { id: transaction.id };
+      case "closing":
       case "timed_out":
-        await this.closeTransaction(transaction, "timed_out");
-        throw new TransactionStartTimeoutError();
       case "running":
       case "committed":
       case "rolled_back":
@@ -1551,6 +1560,7 @@ var TransactionManager = class {
       if (closedTransaction) {
         debug("Transaction already closed.", { transactionId, status: closedTransaction.status });
         switch (closedTransaction.status) {
+          case "closing":
           case "waiting":
           case "running":
             throw new TransactionInternalConsistencyError("Active transaction found in closed transactions list.");
@@ -1569,6 +1579,9 @@ var TransactionManager = class {
         throw new TransactionNotFoundError();
       }
     }
+    if (transaction.status === "closing") {
+      throw new TransactionClosingError(operation);
+    }
     if (["committed", "rolled_back", "timed_out"].includes(transaction.status)) {
       throw new TransactionInternalConsistencyError("Closed transaction found in active transactions map.");
     }
@@ -1591,7 +1604,7 @@ var TransactionManager = class {
   }
   async closeTransaction(tx, status) {
     debug("Closing transaction.", { transactionId: tx.id, status });
-    tx.status = status;
+    tx.status = "closing";
     try {
       if (tx.transaction && status === "committed") {
         if (tx.transaction.options.usePhantomQuery) {
@@ -1611,6 +1624,7 @@ var TransactionManager = class {
         }
       }
     } finally {
+      tx.status = status;
       clearTimeout(tx.timer);
       tx.timer = void 0;
       this.transactions.delete(tx.id);

package/dist/transactionManager/TransactionManagerErrors.d.ts

@@ -9,6 +9,9 @@ export declare class TransactionNotFoundError extends TransactionManagerError {
 export declare class TransactionClosedError extends TransactionManagerError {
     constructor(operation: string);
 }
+export declare class TransactionClosingError extends TransactionManagerError {
+    constructor(operation: string);
+}
 export declare class TransactionRolledBackError extends TransactionManagerError {
     constructor(operation: string);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/client-engine-runtime",
-  "version": "6.13.0-dev.5",
+  "version": "6.13.0-dev.7",
   "description": "This package is intended for Prisma's internal use",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -31,8 +31,8 @@
     "nanoid": "5.1.5",
     "ulid": "3.0.0",
     "uuid": "11.1.0",
-    "@prisma/debug": "6.13.0-dev.5",
-    "@prisma/driver-adapter-utils": "6.13.0-dev.5"
+    "@prisma/debug": "6.13.0-dev.7",
+    "@prisma/driver-adapter-utils": "6.13.0-dev.7"
   },
   "devDependencies": {
     "@types/jest": "29.5.14",