@aventara/prisma7-adapter 1.0.0-rc.13 → 1.0.0-rc.14

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @aventara/prisma7-adapter
 
+## 1.0.0-rc.14
+
+### Patch Changes
+
+- 28688e4: On SQLite (`@prisma/adapter-better-sqlite3`), a plain operation or `ctx.$sql` that gives up waiting for the connection another request's transaction holds still answers `A3002`, and its diagnostic now says so: how many milliseconds it waited, the `maxWait` that ran out (the adapter's `transactionOptions.maxWait`, or else the PrismaClient's, 2000 ms unless set on the client), and that it never ran. A transaction that fails to open for another reason, such as an unsupported isolation level, keeps its usual diagnostic. Before, the diagnostic said the call's transaction "was no longer open", which named the wrong cause. Raise the adapter's `transactionOptions.maxWait`, or keep the transaction that holds the connection shorter.
+- Updated dependencies [1c5eaa3]
+  - @aventara/core@1.0.0-rc.14
+
 ## 1.0.0-rc.13
 
 ### Patch Changes

package/README.md

@@ -101,7 +101,8 @@ connection without waiting, so a plain call made meanwhile would run inside the
 see its uncommitted rows and roll back with it. With that driver, an operation that is not part of a
 transaction, and a `ctx.$sql` that is not, each run in a `$transaction` of their own that holds only that
 call. They wait on the driver's own lock, so operations and transactions queue for the connection and run
-one at a time. `transactionOptions` apply to the wait: past `maxWait` the operation answers `A3002`, and
+one at a time. `transactionOptions` apply to the wait: past `maxWait` the operation answers `A3002`, its
+diagnostic says how long it waited for the connection another request's transaction held, and
 `timeout` limits a single plain operation too. `@prisma/adapter-pg` checks a connection of its own out of
 the pool for each transaction, and D1 runs none, so both stay as they were. Calls made on the Prisma client
 directly, outside Aventara, are not covered.

package/dist/errors/error.normalizer.d.ts

@@ -66,6 +66,21 @@ export declare function classifyPrismaError(error: unknown, operation: Pick<AvOp
 export declare function classifyPrismaStatementError(error: unknown): PrismaErrorClassification;
 /** The deliberate failure an `outcome` classification stands for. */
 export declare function prismaOutcomeFailure(code: AvOperationErrorCode): AvError;
+/**
+ * Whether a failure to open a transaction has the structure of the `maxWait`
+ * acquisition timeout: `P2028` with an empty `meta`.
+ */
+export declare function isPrismaAcquisitionTimeout(error: unknown): boolean;
+/**
+ * `A3002` for a plain call on a one-connection driver that gave up waiting for
+ * the connection another request's transaction held: its own transaction never
+ * opened, so `OUTCOME_MESSAGES`' "no longer open" text would name the wrong
+ * cause. Diagnostics only, like every `A3xxx` text here.
+ */
+export declare function prismaConnectionWaitFailure(facts: {
+    readonly waitedMs: number;
+    readonly maxWait: number | undefined;
+}): AvError;
 /** The `A2004` a value the database refused answers: one issue at the arguments (or the value in them) saying what was refused. */
 export declare function prismaValueFailure(refusal: PrismaValueRefusal, path?: PrismaArgumentPath): AvError;
 /** The `A2004` a nested write that writes its relation back answers: `V1012` at `path`. */

package/dist/errors/error.normalizer.js

@@ -127,6 +127,18 @@ export function prismaOutcomeFailure(code) {
         message: OUTCOME_MESSAGES[code] ?? "The operation could not be completed.",
     });
 }
+export function isPrismaAcquisitionTimeout(error) {
+    const facts = readPrismaError(error);
+    return facts.code === "P2028" && facts.metaKeys.length === 0;
+}
+export function prismaConnectionWaitFailure(facts) {
+    const limit = facts.maxWait === undefined
+        ? "the PrismaClient's maxWait (2000 ms unless set on the client)"
+        : `the adapter's maxWait (${facts.maxWait} ms)`;
+    return new AvError("A3002", {
+        message: `This call waited ${Math.round(facts.waitedMs)} ms for the SQLite connection, which another request's transaction held, and gave up when ${limit} ran out: it never ran and wrote nothing. Raise the adapter's transactionOptions.maxWait, or keep the transaction that holds the connection shorter.`,
+    });
+}
 export function prismaValueFailure(refusal, path = []) {
     const { code, message } = DATABASE_REFUSALS[refusal];
     return new AvError("A2004", {

package/dist/execution/shared-connection.router.js

@@ -1,5 +1,5 @@
 import { emitAdapterWarning } from "../adapter-warning.emitter.js";
-import { classifyPrismaStatementError, prismaOutcomeFailure, } from "../errors/error.normalizer.js";
+import { classifyPrismaStatementError, isPrismaAcquisitionTimeout, prismaConnectionWaitFailure, prismaOutcomeFailure, } from "../errors/error.normalizer.js";
 const TRANSACTION_JOINED_WARNING = "AVENTARA_PRISMA_SQLITE_TRANSACTION_JOINED";
 const warnedJoins = new Set();
 function warnJoined(call) {
@@ -40,7 +40,9 @@ export function createSharedConnectionRouter(dependencies) {
             return work(joined.client);
         }
         let thrownByWork = false;
+        let started = false;
         const run = async (transactional) => {
+            started = true;
             try {
                 return await within(transactional, () => work(transactional));
             }
@@ -50,6 +52,7 @@ export function createSharedConnectionRouter(dependencies) {
             }
         };
         const options = dependencies.transactionOptions;
+        const waitedFrom = performance.now();
         try {
             return await (options === undefined
                 ? dependencies.client.$transaction(run)
@@ -61,7 +64,14 @@ export function createSharedConnectionRouter(dependencies) {
             }
             const classification = classifyPrismaStatementError(error);
             if (classification.kind === "outcome") {
-                throw prismaOutcomeFailure(classification.code);
+                const waitedMs = performance.now() - waitedFrom;
+                const maxWait = options?.maxWait;
+                const waitedOut = !started &&
+                    isPrismaAcquisitionTimeout(error) &&
+                    (maxWait === undefined || waitedMs + 1 >= maxWait);
+                throw waitedOut
+                    ? prismaConnectionWaitFailure({ waitedMs, maxWait })
+                    : prismaOutcomeFailure(classification.code);
             }
             throw error;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aventara/prisma7-adapter",
-  "version": "1.0.0-rc.13",
+  "version": "1.0.0-rc.14",
   "license": "SEE LICENSE IN LICENSE",
   "description": "The Prisma 7 adapter for Aventara.",
   "type": "module",
@@ -30,7 +30,7 @@
     "CHANGELOG.md"
   ],
   "dependencies": {
-    "@aventara/core": "1.0.0-rc.13"
+    "@aventara/core": "1.0.0-rc.14"
   },
   "peerDependencies": {
     "@prisma/adapter-better-sqlite3": "^7.10.1",