@prisma/client-engine-runtime 6.13.0-dev.3 → 6.13.0-dev.31

package/dist/index.js

@@ -454,6 +454,8 @@ function getErrorCode(err) {
   switch (err.cause.kind) {
     case "AuthenticationFailed":
       return "P1000";
+    case "DatabaseNotReachable":
+      return "P1001";
     case "DatabaseDoesNotExist":
       return "P1003";
     case "SocketTimeout":
@@ -462,6 +464,10 @@ function getErrorCode(err) {
       return "P1009";
     case "DatabaseAccessDenied":
       return "P1010";
+    case "TlsConnectionError":
+      return "P1011";
+    case "ConnectionClosed":
+      return "P1017";
     case "TransactionAlreadyClosed":
       return "P1018";
     case "LengthMismatch":
@@ -506,6 +512,10 @@ function renderErrorMessage(err) {
       const user = err.cause.user ?? "(not available)";
       return `Authentication failed against the database server, the provided database credentials for \`${user}\` are not valid`;
     }
+    case "DatabaseNotReachable": {
+      const address = err.cause.host && err.cause.port ? `${err.cause.host}:${err.cause.port}` : err.cause.host;
+      return `Can't reach database server${address ? ` at ${address}` : ""}`;
+    }
     case "DatabaseDoesNotExist": {
       const db = err.cause.db ?? "(not available)";
       return `Database \`${db}\` does not exist on the database server`;
@@ -520,6 +530,12 @@ function renderErrorMessage(err) {
       const db = err.cause.db ?? "(not available)";
       return `User was denied access on the database \`${db}\``;
     }
+    case "TlsConnectionError": {
+      return `Error opening a TLS connection: ${err.cause.reason}`;
+    }
+    case "ConnectionClosed": {
+      return "Server has closed the connection.";
+    }
     case "TransactionAlreadyClosed":
       return err.cause.cause;
     case "LengthMismatch": {
@@ -1473,6 +1489,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 +1576,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 +1625,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 +1644,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 +1669,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 +1689,7 @@ var TransactionManager = class {
         }
       }
     } finally {
+      tx.status = status;
       clearTimeout(tx.timer);
       tx.timer = void 0;
       this.transactions.delete(tx.id);

package/dist/index.mjs

@@ -405,6 +405,8 @@ function getErrorCode(err) {
   switch (err.cause.kind) {
     case "AuthenticationFailed":
       return "P1000";
+    case "DatabaseNotReachable":
+      return "P1001";
     case "DatabaseDoesNotExist":
       return "P1003";
     case "SocketTimeout":
@@ -413,6 +415,10 @@ function getErrorCode(err) {
       return "P1009";
     case "DatabaseAccessDenied":
       return "P1010";
+    case "TlsConnectionError":
+      return "P1011";
+    case "ConnectionClosed":
+      return "P1017";
     case "TransactionAlreadyClosed":
       return "P1018";
     case "LengthMismatch":
@@ -457,6 +463,10 @@ function renderErrorMessage(err) {
       const user = err.cause.user ?? "(not available)";
       return `Authentication failed against the database server, the provided database credentials for \`${user}\` are not valid`;
     }
+    case "DatabaseNotReachable": {
+      const address = err.cause.host && err.cause.port ? `${err.cause.host}:${err.cause.port}` : err.cause.host;
+      return `Can't reach database server${address ? ` at ${address}` : ""}`;
+    }
     case "DatabaseDoesNotExist": {
       const db = err.cause.db ?? "(not available)";
       return `Database \`${db}\` does not exist on the database server`;
@@ -471,6 +481,12 @@ function renderErrorMessage(err) {
       const db = err.cause.db ?? "(not available)";
       return `User was denied access on the database \`${db}\``;
     }
+    case "TlsConnectionError": {
+      return `Error opening a TLS connection: ${err.cause.reason}`;
+    }
+    case "ConnectionClosed": {
+      return "Server has closed the connection.";
+    }
     case "TransactionAlreadyClosed":
       return err.cause.cause;
     case "LengthMismatch": {
@@ -1424,6 +1440,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 +1527,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 +1576,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 +1595,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 +1620,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 +1640,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.3",
+  "version": "6.13.0-dev.31",
   "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/driver-adapter-utils": "6.13.0-dev.3",
-    "@prisma/debug": "6.13.0-dev.3"
+    "@prisma/debug": "6.13.0-dev.31",
+    "@prisma/driver-adapter-utils": "6.13.0-dev.31"
   },
   "devDependencies": {
     "@types/jest": "29.5.14",