@syncular/server 0.20.1 → 0.21.0

package/src/frame-bytes.ts

@@ -18,14 +18,11 @@ import {
   type SubStartFrame,
 } from '@syncular/core';
 
-const stubHeader = (wireVersion: number): RespHeaderFrame =>
-  wireVersion >= 2
-    ? {
-        type: 'RESP_HEADER',
-        logEpoch: 'frame-probe',
-        resetRequired: false,
-      }
-    : { type: 'RESP_HEADER' };
+const stubHeader = (): RespHeaderFrame => ({
+  type: 'RESP_HEADER',
+  logEpoch: 'frame-probe',
+  resetRequired: false,
+});
 const STUB_SUB_START: SubStartFrame = {
   type: 'SUB_START',
   id: '',
@@ -37,9 +34,9 @@ const STUB_SUB_START: SubStartFrame = {
 const STUB_SUB_END: SubEndFrame = { type: 'SUB_END', nextCursor: 0 };
 
 const probe = encodeMessage({
-  wireVersion: 1,
+  wireVersion: PROTOCOL_WIRE_VERSION,
   msgKind: 'response',
-  frames: [stubHeader(1)],
+  frames: [stubHeader()],
 });
 
 /** The 8-byte SSP2 response envelope header (§1.2). */
@@ -47,7 +44,7 @@ export function responseEnvelopeHeader(wireVersion: number): Uint8Array {
   const encoded = encodeMessage({
     wireVersion,
     msgKind: 'response',
-    frames: [stubHeader(wireVersion)],
+    frames: [stubHeader()],
   });
   return encoded.slice(0, 8);
 }
@@ -55,10 +52,7 @@ export function responseEnvelopeHeader(wireVersion: number): Uint8Array {
 /** The terminating END frame (§1.2 rule 1). */
 export const END_FRAME_BYTES: Uint8Array = probe.slice(probe.length - 5);
 
-function wrapperFor(
-  frame: ResponseFrame,
-  wireVersion: number,
-): {
+function wrapperFor(frame: ResponseFrame): {
   frames: ResponseFrame[];
   index: number;
 } {
@@ -67,11 +61,11 @@ function wrapperFor(
       return { frames: [frame], index: 0 };
     case 'LEASE':
       // §7.3.2: LEASE rides immediately after RESP_HEADER.
-      return { frames: [stubHeader(wireVersion), frame], index: 1 };
+      return { frames: [stubHeader(), frame], index: 1 };
     case 'PUSH_RESULT':
     case 'ERROR':
     case 'UNKNOWN':
-      return { frames: [stubHeader(wireVersion), frame], index: 1 };
+      return { frames: [stubHeader(), frame], index: 1 };
     case 'PUSH_RESULT_DETAILS': {
       const result: PushResultFrame = {
         type: 'PUSH_RESULT',
@@ -85,23 +79,23 @@ function wrapperFor(
           retryable: false,
         })),
       };
-      return { frames: [stubHeader(wireVersion), result, frame], index: 2 };
+      return { frames: [stubHeader(), result, frame], index: 2 };
     }
     case 'SUB_START':
       return {
-        frames: [stubHeader(wireVersion), frame, STUB_SUB_END],
+        frames: [stubHeader(), frame, STUB_SUB_END],
         index: 1,
       };
     case 'SUB_END':
       return {
-        frames: [stubHeader(wireVersion), STUB_SUB_START, frame],
+        frames: [stubHeader(), STUB_SUB_START, frame],
         index: 2,
       };
     case 'COMMIT':
     case 'SEGMENT_REF':
     case 'SEGMENT_INLINE':
       return {
-        frames: [stubHeader(wireVersion), STUB_SUB_START, frame, STUB_SUB_END],
+        frames: [stubHeader(), STUB_SUB_START, frame, STUB_SUB_END],
         index: 2,
       };
   }
@@ -115,7 +109,7 @@ export function encodeResponseFrame(
   frame: ResponseFrame,
   wireVersion = PROTOCOL_WIRE_VERSION,
 ): Uint8Array {
-  const { frames, index } = wrapperFor(frame, wireVersion);
+  const { frames, index } = wrapperFor(frame);
   const encoded = encodeMessage({
     wireVersion,
     msgKind: 'response',

package/src/handler.ts

@@ -211,12 +211,6 @@ async function planRequest(
     else if (frame.type === 'SUBSCRIPTION') subFrames.push(frame);
   }
 
-  if (request.wireVersion === 1 && registry.epochRequired) {
-    throw syncError(
-      'sync.client_wire_unsupported',
-      'this partition requires a client that validates log epochs (§2.1)',
-    );
-  }
   if (
     request.wireVersion >= 2 &&
     header.logEpoch === undefined &&

package/src/operations.ts

@@ -5,8 +5,8 @@ import {
 import {
   decodeRow,
   decodeRemoteOperationRequest,
-  encodeRow,
   encodeRemoteOperationResponse,
+  encodeSparseRow,
   type PushOperation,
   type RemoteOperationResponse,
   type RowValue,
@@ -526,7 +526,7 @@ function commandOperations(
       table: table.name,
       rowId,
       op: 'upsert',
-      payload: encodeRow(table.columns, values),
+      payload: encodeSparseRow(table.columns, table.primaryKeyIndex, values),
     };
   });
 }

package/src/postgres-storage.ts

@@ -213,6 +213,11 @@ CREATE TABLE IF NOT EXISTS sync_blob_refs(
 );
 CREATE INDEX IF NOT EXISTS sync_blob_refs_by_blob
   ON sync_blob_refs(partition, blob_id);
+CREATE TABLE IF NOT EXISTS sync_tombstones(
+  partition TEXT NOT NULL, tbl TEXT NOT NULL, row_id TEXT NOT NULL,
+  commit_seq BIGINT NOT NULL,
+  PRIMARY KEY(partition, tbl, row_id)
+);
 `;
 
 interface SerializedResult {
@@ -222,6 +227,7 @@ interface SerializedResult {
   message?: string;
   serverVersion?: number;
   serverRow?: string;
+  conflictColumns?: string;
   retryable?: boolean;
   details?: import('@syncular/core').RejectionDetails;
 }
@@ -325,6 +331,7 @@ function serializePushResult(result: StoredPushResult): unknown {
           message: record.message,
           serverVersion: record.serverVersion,
           serverRow: toBase64(record.serverRow),
+          conflictColumns: toBase64(record.conflictColumns),
         };
       }
       if (record.status === 'error') {
@@ -359,6 +366,7 @@ function deserializePushResult(value: unknown): StoredPushResult {
         message: record.message ?? '',
         serverVersion: record.serverVersion ?? 0,
         serverRow: fromBase64(record.serverRow ?? ''),
+        conflictColumns: fromBase64(record.conflictColumns ?? ''),
       };
     }
     if (record.status === 'error') {
@@ -400,6 +408,7 @@ interface RowRecord {
   server_version: unknown;
   scopes: unknown;
   payload: unknown;
+  column_versions: unknown;
 }
 
 interface ChangeRecord {
@@ -434,6 +443,9 @@ function toStoredRow(record: RowRecord): StoredRow {
     serverVersion: asNumber(record.server_version),
     scopes: asJson<Record<string, string>>(record.scopes),
     payload: asBytes(record.payload),
+    ...(record.column_versions === null || record.column_versions === undefined
+      ? {}
+      : { columnVersions: asBytes(record.column_versions) }),
   };
 }
 
@@ -610,6 +622,27 @@ class PostgresTransaction implements StorageTransaction {
     );
   }
 
+  async getTombstoneSeq(
+    table: string,
+    rowId: string,
+  ): Promise<number | undefined> {
+    this.#assertOpen();
+    const { rows } = await this.#client.query<{ commit_seq: unknown }>(
+      'SELECT commit_seq FROM sync_tombstones WHERE partition=$1 AND tbl=$2 AND row_id=$3',
+      [this.#partition, table, rowId],
+    );
+    const seq = rows[0]?.commit_seq;
+    return seq === null || seq === undefined ? undefined : asNumber(seq);
+  }
+
+  async clearTombstone(table: string, rowId: string): Promise<void> {
+    this.#assertOpen();
+    await this.#client.query(
+      'DELETE FROM sync_tombstones WHERE partition=$1 AND tbl=$2 AND row_id=$3',
+      [this.#partition, table, rowId],
+    );
+  }
+
   getPushResult(
     clientId: string,
     clientCommitId: string,
@@ -784,16 +817,24 @@ class PostgresTransaction implements StorageTransaction {
       if (change === undefined) continue;
       // Bind serialized scopes as text before parsing JSONB. Drivers that
       // encode JSONB parameters would otherwise store this string as a scalar.
+      // One statement per change: scopes AND the §5 delete tombstone ride the
+      // same writable-CTE chain.
       await q.query(
         `WITH inserted AS (
            INSERT INTO sync_changes(partition, commit_seq, idx, tbl, row_id, op, row_version, scopes, payload)
            VALUES ($1,$2,$3,$4,$5,$6,$7,$8::text::jsonb,$9)
-           RETURNING partition, tbl, commit_seq, scopes
+           RETURNING partition, tbl, row_id, op, commit_seq, scopes
+         ),
+         scoped AS (
+           INSERT INTO sync_change_scopes(partition, tbl, var, value, commit_seq)
+           SELECT inserted.partition, inserted.tbl, scope.key, scope.value, inserted.commit_seq
+           FROM inserted CROSS JOIN LATERAL jsonb_each_text(inserted.scopes) AS scope
+           ON CONFLICT DO NOTHING
          )
-         INSERT INTO sync_change_scopes(partition, tbl, var, value, commit_seq)
-         SELECT inserted.partition, inserted.tbl, scope.key, scope.value, inserted.commit_seq
-         FROM inserted CROSS JOIN LATERAL jsonb_each_text(inserted.scopes) AS scope
-         ON CONFLICT DO NOTHING`,
+         INSERT INTO sync_tombstones(partition, tbl, row_id, commit_seq)
+         SELECT partition, tbl, row_id, commit_seq FROM inserted WHERE op = 2
+         ON CONFLICT (partition, tbl, row_id)
+         DO UPDATE SET commit_seq = excluded.commit_seq`,
         [
           p,
           commitSeq,
@@ -1258,6 +1299,11 @@ export class PostgresServerStorage implements ServerStorage {
         'DELETE FROM sync_change_scopes WHERE partition=$1 AND commit_seq<=$2',
         [partition, horizonSeq],
       );
+      // §4.6: tombstones prune in the same pass as the commit log.
+      await client.query(
+        'DELETE FROM sync_tombstones WHERE partition=$1 AND commit_seq<=$2',
+        [partition, horizonSeq],
+      );
       return {
         previousHorizonSeq,
         horizonSeq,