fix: properly throw ConflictRetriesExhaustedError instead of TransactionError

Previously, when the retries where exhausted and the last retry resulted in a conflict, a TransactionError was thrown that wrapped a ConflictRetriesExhaustedError. Now, we properly throw the ConflictRetriesExhaustedError.

Also fixes the error message (it had a NonError: [object object] at the end instead of the original error message)

Author: Yogu

src/database/arangodb/arangodb-adapter.ts

@@ -436,6 +436,11 @@ export class ArangoDBAdapter implements DatabaseAdapter {
             transactionTimeoutMs: number | undefined;
         },
     ): Error {
+        if (error instanceof ConflictRetriesExhaustedError) {
+            // this is returned in executeTransactionWithRetries()
+            return error;
+        }
+
         // might be just something like a TypeError
         if (!isArangoError(error)) {
             return new TransactionError(error.message, error);
@@ -503,16 +508,33 @@ export class ArangoDBAdapter implements DatabaseAdapter {
             }
 
             if (retries >= maxRetries) {
-                // retries exhausted
-                return {
-                    ...result,
-                    timings,
-                    stats,
-                    databaseError: new ConflictRetriesExhaustedError({
-                        causedBy: result.databaseError,
-                        retries,
-                    }),
-                };
+                // retries exhausted. If it's a CONFLICT error, report in a special way
+                if (
+                    isArangoError(result.databaseError) &&
+                    result.databaseError.errorNum === ERROR_ARANGO_CONFLICT
+                ) {
+                    const convertedCause = this.processDatabaseError(result.databaseError, {
+                        wasCancelled: false,
+                        hasTimedOut: false,
+                        transactionTimeoutMs: undefined,
+                    });
+                    return {
+                        ...result,
+                        timings,
+                        stats,
+                        databaseError: new ConflictRetriesExhaustedError({
+                            causedBy: convertedCause,
+                            retries,
+                        }),
+                    };
+                } else {
+                    // non-conflict error that just happened to occur on the last retry
+                    return {
+                        ...result,
+                        timings,
+                        stats,
+                    };
+                }
             }
 
             const sleepStart = getPreciseTime();

src/execution/runtime-errors.ts

@@ -31,10 +31,10 @@ export class ConflictRetriesExhaustedError extends ErrorWithCause {
     static readonly CODE = 'CONFLICT_RETRIES_EXHAUSTED';
 
     readonly code = ConflictRetriesExhaustedError.CODE;
+    readonly retries: number;
 
     constructor({ causedBy, retries }: { causedBy: unknown; retries: number }) {
-        super(`Operation detected conflicts and was aborted after ${retries} retries`, {
-            causedBy,
-        });
+        super(`Operation detected conflicts and was aborted after ${retries} retries`, causedBy);
+        this.retries = retries;
     }
 }