@syncular/server 0.30.6 → 0.30.7

package/dist/pg-executor-pglite.js

@@ -1,3 +1,4 @@
+import { retainRollbackFailure } from './storage-errors.js';
 function queryable(db) {
     return {
         async query(text, params) {
@@ -32,7 +33,12 @@ export function pgliteExecutor(db) {
                     return result;
                 }
                 catch (error) {
-                    await like.exec('ROLLBACK');
+                    try {
+                        await like.exec('ROLLBACK');
+                    }
+                    catch (rollbackError) {
+                        retainRollbackFailure(error, rollbackError);
+                    }
                     throw error;
                 }
             }

package/dist/push.js

@@ -1,3 +1,4 @@
+import { retainRollbackFailure } from './storage-errors.js';
 /**
  * Push apply (SPEC.md §6) with §3.4 write-path authorization.
  *
@@ -1102,14 +1103,18 @@ export async function processPushOperationsWithTrace(ctx, schema, resolved, clie
                 try {
                     await tx.rollback();
                 }
-                catch {
-                    // Surface the finalization failure; a rollback failure would
-                    // otherwise mask it.
+                catch (rollbackError) {
+                    retainRollbackFailure(finalizationError, rollbackError);
                 }
                 throw finalizationError;
             }
         }
-        await tx.rollback();
+        try {
+            await tx.rollback();
+        }
+        catch (rollbackError) {
+            retainRollbackFailure(error, rollbackError);
+        }
         throw error;
     }
 }

package/dist/sqlite-image.js

@@ -1,3 +1,4 @@
+import { rollbackAfterError } from './storage-errors.js';
 /**
  * SQLite-image segment generation (SPEC.md §5.3): a complete SQLite
  * database file carrying one table's whole effective-scope snapshot at
@@ -79,7 +80,8 @@ export async function writeSqliteImage(db, input) {
         db.exec('COMMIT');
     }
     catch (error) {
-        db.exec('ROLLBACK');
-        throw error;
+        rollbackAfterError(() => {
+            db.exec('ROLLBACK');
+        }, error);
     }
 }

package/dist/sqlite-segment-store.js

@@ -1,3 +1,4 @@
+import { rollbackAfterError } from './storage-errors.js';
 /**
  * SQLite-backed segment store over the shared synchronous driver.
  */
@@ -137,8 +138,9 @@ export class SqliteSegmentStore {
             this.db.exec('COMMIT');
         }
         catch (error) {
-            this.db.exec('ROLLBACK');
-            throw error;
+            rollbackAfterError(() => {
+                this.db.exec('ROLLBACK');
+            }, error);
         }
         return record;
     }

package/dist/sqlite-storage.js

@@ -1,3 +1,4 @@
+import { retainRollbackFailure, rollbackAfterError } from './storage-errors.js';
 import { validateCommitPruneQuery } from './prune.js';
 import { StorageQueryError } from './storage-errors.js';
 import { serveGateRefusal } from './storage.js';
@@ -229,9 +230,8 @@ class SqliteTransaction {
             try {
                 this.#storage.db.exec('ROLLBACK');
             }
-            catch {
-                // Surface the COMMIT failure; a rollback failure would otherwise
-                // mask it.
+            catch (rollbackError) {
+                retainRollbackFailure(error, rollbackError);
             }
             throw error;
         }
@@ -433,8 +433,9 @@ END`);
                     this.db.exec('COMMIT');
                 }
                 catch (error) {
-                    this.db.exec('ROLLBACK');
-                    throw error;
+                    rollbackAfterError(() => {
+                        this.db.exec('ROLLBACK');
+                    }, error);
                 }
             });
         }
@@ -486,8 +487,9 @@ END`);
                 this.db.exec('COMMIT');
             }
             catch (error) {
-                this.db.exec('ROLLBACK');
-                throw error;
+                rollbackAfterError(() => {
+                    this.db.exec('ROLLBACK');
+                }, error);
             }
             return {
                 partition,
@@ -624,9 +626,10 @@ END`);
             return result;
         }
         catch (error) {
-            if (open)
-                this.db.exec('ROLLBACK');
-            throw error;
+            rollbackAfterError(() => {
+                if (open)
+                    this.db.exec('ROLLBACK');
+            }, error);
         }
         finally {
             release();
@@ -690,8 +693,9 @@ END`);
                 };
             }
             catch (error) {
-                this.db.exec('ROLLBACK');
-                throw error;
+                rollbackAfterError(() => {
+                    this.db.exec('ROLLBACK');
+                }, error);
             }
         });
     }
@@ -771,8 +775,9 @@ END`);
                 return toStoredCheckpoint(row);
             }
             catch (error) {
-                this.db.exec('ROLLBACK');
-                throw error;
+                rollbackAfterError(() => {
+                    this.db.exec('ROLLBACK');
+                }, error);
             }
         });
     }
@@ -810,8 +815,9 @@ END`);
                 return Number(updated.changes) === 1 ? 'activated' : 'stale';
             }
             catch (error) {
-                this.db.exec('ROLLBACK');
-                throw error;
+                rollbackAfterError(() => {
+                    this.db.exec('ROLLBACK');
+                }, error);
             }
         });
     }

package/dist/storage-errors.d.ts

@@ -31,3 +31,6 @@ export declare function isPostgresConstraintError(error: unknown): boolean;
  * the original message is copied to the public StorageConstraintError.
  */
 export declare function isD1ConstraintError(error: unknown): boolean;
+/** Preserve the operation failure when transaction cleanup also fails. */
+export declare function retainRollbackFailure(error: unknown, rollbackError: unknown): void;
+export declare function rollbackAfterError(run: () => void, error: unknown): never;

package/dist/storage-errors.js

@@ -84,3 +84,18 @@ export function isD1ConstraintError(error) {
     return (typeof message === 'string' &&
         /^(?:D1(?:_EXEC)?_ERROR:\s*)?(?:UNIQUE|NOT NULL|CHECK|FOREIGN KEY) constraint failed\b/i.test(message));
 }
+/** Preserve the operation failure when transaction cleanup also fails. */
+export function retainRollbackFailure(error, rollbackError) {
+    if (error instanceof Error && !('rollbackError' in error)) {
+        Object.defineProperty(error, 'rollbackError', { value: rollbackError });
+    }
+}
+export function rollbackAfterError(run, error) {
+    try {
+        run();
+    }
+    catch (rollbackError) {
+        retainRollbackFailure(error, rollbackError);
+    }
+    throw error;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@syncular/server",
-  "version": "0.30.6",
+  "version": "0.30.7",
   "description": "Syncular server: handleSyncRequest + storage/auth interfaces for the sync protocol",
   "license": "Apache-2.0",
   "author": "Benjamin Kniffler",
@@ -68,7 +68,7 @@
     "verify:node": "cd ../.. && bun build ./packages/server/test/sqlite-runtime/verify-node.mjs --target=node --conditions=bun --outfile=./packages/server/.verify-node.built.mjs && node ./packages/server/.verify-node.built.mjs"
   },
   "dependencies": {
-    "@syncular/core": "0.30.6"
+    "@syncular/core": "0.30.7"
   },
   "devDependencies": {
     "@electric-sql/pglite": "^0.5.4"

package/src/pg-executor-pglite.ts

@@ -1,3 +1,4 @@
+import { retainRollbackFailure } from './storage-errors';
 /**
  * A `PgExecutor` over @electric-sql/pglite (embedded WASM Postgres).
  *
@@ -64,7 +65,11 @@ export function pgliteExecutor(db: PGlite | PgliteLike): PgExecutor {
           await like.exec('COMMIT');
           return result;
         } catch (error) {
-          await like.exec('ROLLBACK');
+          try {
+            await like.exec('ROLLBACK');
+          } catch (rollbackError) {
+            retainRollbackFailure(error, rollbackError);
+          }
           throw error;
         }
       } finally {

package/src/push.ts

@@ -1,3 +1,4 @@
+import { retainRollbackFailure } from './storage-errors';
 /**
  * Push apply (SPEC.md §6) with §3.4 write-path authorization.
  *
@@ -1661,14 +1662,17 @@ export async function processPushOperationsWithTrace(
         // a no-op when the finalization already committed.
         try {
           await tx.rollback();
-        } catch {
-          // Surface the finalization failure; a rollback failure would
-          // otherwise mask it.
+        } catch (rollbackError) {
+          retainRollbackFailure(finalizationError, rollbackError);
         }
         throw finalizationError;
       }
     }
-    await tx.rollback();
+    try {
+      await tx.rollback();
+    } catch (rollbackError) {
+      retainRollbackFailure(error, rollbackError);
+    }
     throw error;
   }
 }

package/src/sqlite-image.ts

@@ -1,3 +1,4 @@
+import { rollbackAfterError } from './storage-errors';
 /**
  * SQLite-image segment generation (SPEC.md §5.3): a complete SQLite
  * database file carrying one table's whole effective-scope snapshot at
@@ -124,7 +125,8 @@ export async function writeSqliteImage(
 
     db.exec('COMMIT');
   } catch (error) {
-    db.exec('ROLLBACK');
-    throw error;
+    rollbackAfterError(() => {
+      db.exec('ROLLBACK');
+    }, error);
   }
 }

package/src/sqlite-segment-store.ts

@@ -1,3 +1,4 @@
+import { rollbackAfterError } from './storage-errors';
 /**
  * SQLite-backed segment store over the shared synchronous driver.
  */
@@ -238,8 +239,9 @@ export class SqliteSegmentStore implements SegmentStore {
       }
       this.db.exec('COMMIT');
     } catch (error) {
-      this.db.exec('ROLLBACK');
-      throw error;
+      rollbackAfterError(() => {
+        this.db.exec('ROLLBACK');
+      }, error);
     }
     return record;
   }

package/src/sqlite-storage.ts

@@ -1,3 +1,4 @@
+import { retainRollbackFailure, rollbackAfterError } from './storage-errors';
 import { validateCommitPruneQuery } from './prune';
 import { StorageQueryError } from './storage-errors';
 import type { CommitPruneQuery, CommitPruneResult } from './storage';
@@ -469,9 +470,8 @@ class SqliteTransaction implements StorageTransaction {
       // connection.
       try {
         this.#storage.db.exec('ROLLBACK');
-      } catch {
-        // Surface the COMMIT failure; a rollback failure would otherwise
-        // mask it.
+      } catch (rollbackError) {
+        retainRollbackFailure(error, rollbackError);
       }
       throw error;
     } finally {
@@ -725,8 +725,9 @@ END`);
           }
           this.db.exec('COMMIT');
         } catch (error) {
-          this.db.exec('ROLLBACK');
-          throw error;
+          rollbackAfterError(() => {
+            this.db.exec('ROLLBACK');
+          }, error);
         }
       });
     }
@@ -799,8 +800,9 @@ END`);
           .run(partition);
         this.db.exec('COMMIT');
       } catch (error) {
-        this.db.exec('ROLLBACK');
-        throw error;
+        rollbackAfterError(() => {
+          this.db.exec('ROLLBACK');
+        }, error);
       }
       return {
         partition,
@@ -1002,8 +1004,9 @@ END`);
       open = false;
       return result;
     } catch (error) {
-      if (open) this.db.exec('ROLLBACK');
-      throw error;
+      rollbackAfterError(() => {
+        if (open) this.db.exec('ROLLBACK');
+      }, error);
     } finally {
       release();
     }
@@ -1085,8 +1088,9 @@ END`);
           removedCommits: Number(removed.changes),
         };
       } catch (error) {
-        this.db.exec('ROLLBACK');
-        throw error;
+        rollbackAfterError(() => {
+          this.db.exec('ROLLBACK');
+        }, error);
       }
     });
   }
@@ -1202,8 +1206,9 @@ END`);
         this.db.exec('COMMIT');
         return toStoredCheckpoint(row);
       } catch (error) {
-        this.db.exec('ROLLBACK');
-        throw error;
+        rollbackAfterError(() => {
+          this.db.exec('ROLLBACK');
+        }, error);
       }
     });
   }
@@ -1260,8 +1265,9 @@ END`);
         this.db.exec('COMMIT');
         return Number(updated.changes) === 1 ? 'activated' : 'stale';
       } catch (error) {
-        this.db.exec('ROLLBACK');
-        throw error;
+        rollbackAfterError(() => {
+          this.db.exec('ROLLBACK');
+        }, error);
       }
     });
   }

package/src/storage-errors.ts

@@ -150,3 +150,22 @@ export function isD1ConstraintError(error: unknown): boolean {
     )
   );
 }
+
+/** Preserve the operation failure when transaction cleanup also fails. */
+export function retainRollbackFailure(
+  error: unknown,
+  rollbackError: unknown,
+): void {
+  if (error instanceof Error && !('rollbackError' in error)) {
+    Object.defineProperty(error, 'rollbackError', { value: rollbackError });
+  }
+}
+
+export function rollbackAfterError(run: () => void, error: unknown): never {
+  try {
+    run();
+  } catch (rollbackError) {
+    retainRollbackFailure(error, rollbackError);
+  }
+  throw error;
+}