@syncular/server 0.30.5 → 0.30.7

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;
+}

package/src/storage.ts

@@ -288,6 +288,8 @@ export interface StoredPushResult {
 }
 
 export interface ClientSubscription {
+  /** Codec accepted by the last pull; absent on records written before schema windows. */
+  readonly schemaVersion?: number;
   readonly id: string;
   readonly table: string;
   /** Requested scopes of the client's most recent pull (§8.1). */