@syncular/server 0.94.0 → 0.96.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/src/handler.ts CHANGED
@@ -37,7 +37,7 @@ import {
37
37
  RESOLVER_OUTAGE,
38
38
  touchAuthenticatedPartition,
39
39
  } from './context';
40
- import { reportError, SyncError, syncError } from './errors';
40
+ import { adapterSyncError, reportError, SyncError, syncError } from './errors';
41
41
  import {
42
42
  emitEvent,
43
43
  type PullUnitSummary,
@@ -855,7 +855,8 @@ async function* streamResponse(
855
855
  );
856
856
  }
857
857
  } else {
858
- const horizonSeq = await ctx.storage.getHorizonSeq(ctx.partition);
858
+ const horizons = await ctx.storage.getHorizons(ctx.partition);
859
+ const { seq: horizonSeq, tables: tableHorizons } = horizons;
859
860
  const R = pull.header.cursor;
860
861
  const echo = echoDigest(
861
862
  units.map(({ plan: unit }) => ({
@@ -875,6 +876,20 @@ async function* streamResponse(
875
876
  );
876
877
  // §4.6 replica reset: a live unit with R outside [horizon, max].
877
878
  let liveReset = liveUnits && (R < horizonSeq || R > maxSeq);
879
+ // §4.6 unit reset: `cursor` lies below the table horizon of one of
880
+ // the unit's active pairs outside its RESTRICT tables.
881
+ const belowTable = (
882
+ index: number,
883
+ cursor: number,
884
+ horizons: ReadonlyMap<string, number>,
885
+ ): boolean => {
886
+ const { plan: unit, restrict } = units[index]!;
887
+ return [...unit.pairs.keys()].some(
888
+ (table) =>
889
+ cursor < (horizons.get(table) ?? -1) &&
890
+ restrict?.tables.includes(table) !== true,
891
+ );
892
+ };
878
893
  // Per unit: its section kind and its scan-set bound (§4.5).
879
894
  type UnitState =
880
895
  | { kind: 'revoked' }
@@ -886,16 +901,21 @@ async function* streamResponse(
886
901
  /** The join cursor (§4.7): the pin, or the kept cursor. */
887
902
  pin: number;
888
903
  restricted: boolean;
889
- frames: ResponseFrame[];
904
+ frames: (ResponseFrame | Promise<ResponseFrame>)[];
890
905
  token: string | undefined;
891
906
  };
892
907
  const states: UnitState[] = units.map(
893
- ({ plan: unit, progress, restrict }): UnitState => {
908
+ ({ plan: unit, progress, restrict }, index): UnitState => {
894
909
  if (unit.status === 'revoked') return { kind: 'revoked' };
895
- if (progress === undefined) return { kind: 'live' };
910
+ if (progress === undefined)
911
+ return !liveReset && belowTable(index, R, tableHorizons)
912
+ ? { kind: 'reset' }
913
+ : { kind: 'live' };
896
914
  // §4.6: a kept cursor outside [horizon, max] cannot join.
897
915
  if (restrict !== undefined)
898
- return restrict.cursor < horizonSeq || restrict.cursor > maxSeq
916
+ return restrict.cursor < horizonSeq ||
917
+ restrict.cursor > maxSeq ||
918
+ belowTable(index, restrict.cursor, tableHorizons)
899
919
  ? { kind: 'reset' }
900
920
  : {
901
921
  kind: 'bootstrap',
@@ -910,7 +930,8 @@ async function* streamResponse(
910
930
  progress.cursor >= 0 &&
911
931
  progress.cursor <= maxSeq
912
932
  ) {
913
- return progress.cursor < horizonSeq
933
+ return progress.cursor < horizonSeq ||
934
+ belowTable(index, progress.cursor, tableHorizons)
914
935
  ? { kind: 'reset' }
915
936
  : { kind: 'post', cursor: progress.cursor };
916
937
  }
@@ -941,6 +962,11 @@ async function* streamResponse(
941
962
  1,
942
963
  Math.floor(100_000 / (limits.limitSnapshotRows + 1)),
943
964
  );
965
+ // The segment puts of every bootstrap section, in frame order. A
966
+ // pull holds the encoded bytes of the puts in flight.
967
+ const puts: Promise<ResponseFrame>[] = [];
968
+ const inFlight = new Set<Promise<void>>();
969
+ let failed = false;
944
970
  for (let next = 0; next < bootstrapping.length;) {
945
971
  const window: number[] = [];
946
972
  let pages = 0;
@@ -979,14 +1005,14 @@ async function* streamResponse(
979
1005
  },
980
1006
  progress?.bootstrapState,
981
1007
  maxSeq,
982
- horizonSeq,
1008
+ horizons,
983
1009
  plan.logEpoch,
984
1010
  restrict?.cursor,
985
1011
  ),
986
1012
  };
987
1013
  });
988
1014
  for (const { index, plan: bootstrap } of batch) {
989
- const frames: ResponseFrame[] = [];
1015
+ const frames: (ResponseFrame | Promise<ResponseFrame>)[] = [];
990
1016
  const segments = bootstrapSegments(
991
1017
  ctx,
992
1018
  schema,
@@ -997,7 +1023,31 @@ async function* streamResponse(
997
1023
  );
998
1024
  let step = await segments.next();
999
1025
  while (!step.done) {
1000
- frames.push(step.value);
1026
+ const frame = step.value;
1027
+ if (frame.type === 'PENDING_REF') {
1028
+ // A rows segment's put runs while later pages are scanned;
1029
+ // the next page waits while six puts are in flight: a
1030
+ // Workers invocation holds six connections open at once and
1031
+ // an R2 put uses one, so past six the runtime queues the put.
1032
+ const settled: Promise<void> = frame.ref.then(
1033
+ () => void inFlight.delete(settled),
1034
+ () => {
1035
+ failed = true;
1036
+ inFlight.delete(settled);
1037
+ },
1038
+ );
1039
+ inFlight.add(settled);
1040
+ puts.push(frame.ref);
1041
+ frames.push(frame.ref);
1042
+ while (inFlight.size >= 6) {
1043
+ await Promise.race(inFlight);
1044
+ if (failed) break;
1045
+ }
1046
+ // A failed put ends the pull before it scans another page.
1047
+ if (failed) for (const put of puts) await put;
1048
+ } else {
1049
+ frames.push(frame);
1050
+ }
1001
1051
  step = await segments.next();
1002
1052
  }
1003
1053
  const restrict = units[index]!.restrict;
@@ -1010,6 +1060,12 @@ async function* streamResponse(
1010
1060
  };
1011
1061
  }
1012
1062
  }
1063
+ // Every put completes before the live read, as in a pull with one put
1064
+ // in flight. A failed put fails the pull with the error of the first
1065
+ // failed page, and the puts still in flight finish unobserved: each
1066
+ // stores its bytes before its record, so no record points at missing
1067
+ // bytes.
1068
+ for (const put of puts) await put;
1013
1069
  const bound = (state: UnitState): number | undefined =>
1014
1070
  state.kind === 'live'
1015
1071
  ? R
@@ -1024,10 +1080,27 @@ async function* streamResponse(
1024
1080
  let live: LiveWindow | undefined;
1025
1081
  for (;;) {
1026
1082
  const scanned = units.flatMap(({ plan: unit }, index) => {
1027
- const afterSeq = bound(states[index]!);
1028
- return afterSeq === undefined
1029
- ? []
1030
- : [{ index, scopes: unit.scopes, afterSeq, tables: unit.pairs }];
1083
+ const bounded = bound(states[index]!);
1084
+ if (bounded === undefined) return [];
1085
+ // §4.5: a table reaches the unit only above its table horizon,
1086
+ // which lies above the bound only for a RESTRICT table.
1087
+ const byBound = new Map<number, Map<string, ScopeMap>>();
1088
+ for (const [table, scopes] of unit.pairs) {
1089
+ const afterSeq = Math.max(
1090
+ bounded,
1091
+ tableHorizons.get(table) ?? -1,
1092
+ );
1093
+ byBound.set(
1094
+ afterSeq,
1095
+ (byBound.get(afterSeq) ?? new Map()).set(table, scopes),
1096
+ );
1097
+ }
1098
+ return [...byBound].map(([afterSeq, tables]) => ({
1099
+ index,
1100
+ scopes: unit.scopes,
1101
+ afterSeq,
1102
+ tables,
1103
+ }));
1031
1104
  });
1032
1105
  if (liveReset || scanned.length === 0) break;
1033
1106
  live = await ctx.storage.readLiveWindow(ctx.partition, {
@@ -1047,18 +1120,33 @@ async function* streamResponse(
1047
1120
  live = undefined;
1048
1121
  continue;
1049
1122
  }
1050
- const recheck = await ctx.storage.getHorizonSeq(ctx.partition);
1123
+ const { seq: recheck, tables: recheckTables } =
1124
+ await ctx.storage.getHorizons(ctx.partition);
1051
1125
  let expired = false;
1052
1126
  for (const [index, state] of states.entries()) {
1053
- // §4.6: a restricted bootstrap's kept cursor is rechecked too.
1127
+ // §4.6: a restricted bootstrap's kept cursor is rechecked too,
1128
+ // and a table horizon that rose during the round resets it: its
1129
+ // segments were read before the re-key.
1130
+ const restricted = state.kind === 'bootstrap' && state.restricted;
1054
1131
  const afterSeq =
1055
- bound(state) ??
1056
- (state.kind === 'bootstrap' && state.restricted
1057
- ? state.pin
1058
- : undefined);
1059
- if (afterSeq === undefined || afterSeq >= recheck) continue;
1132
+ bound(state) ?? (restricted ? state.pin : undefined);
1133
+ if (
1134
+ afterSeq === undefined ||
1135
+ (afterSeq >= recheck &&
1136
+ !belowTable(index, afterSeq, recheckTables) &&
1137
+ !(
1138
+ restricted &&
1139
+ [...units[index]!.plan.pairs.keys()].some(
1140
+ (table) =>
1141
+ (recheckTables.get(table) ?? -1) >
1142
+ (tableHorizons.get(table) ?? -1),
1143
+ )
1144
+ ))
1145
+ )
1146
+ continue;
1060
1147
  expired = true;
1061
- if (state.kind === 'live') liveReset = true;
1148
+ // A live unit below a table horizon alone takes a unit reset.
1149
+ if (state.kind === 'live' && afterSeq < recheck) liveReset = true;
1062
1150
  else states[index] = { kind: 'reset' };
1063
1151
  }
1064
1152
  if (!expired) break;
@@ -1107,7 +1195,7 @@ async function* streamResponse(
1107
1195
  );
1108
1196
  if (state.kind === 'bootstrap') {
1109
1197
  for (const frame of state.frames) {
1110
- yield encodeResponseFrame(frame, plan.wireVersion);
1198
+ yield encodeResponseFrame(await frame, plan.wireVersion);
1111
1199
  }
1112
1200
  }
1113
1201
  yield encodeResponseFrame(
@@ -1274,18 +1362,7 @@ async function* streamResponse(
1274
1362
  report.errorCode = error.code;
1275
1363
  await recordRoundFailure(ctx, clientId, error);
1276
1364
  // §1.6: in-band ERROR, then END, nothing else.
1277
- yield encodeResponseFrame(
1278
- {
1279
- type: 'ERROR',
1280
- code: error.code,
1281
- message: error.message,
1282
- category: error.category,
1283
- retryable: error.retryable,
1284
- recommendedAction: error.recommendedAction,
1285
- ...(error.details !== undefined ? { details: error.details } : {}),
1286
- },
1287
- plan.wireVersion,
1288
- );
1365
+ yield errorFrameBytes(error, plan.wireVersion);
1289
1366
  yield END_FRAME_BYTES;
1290
1367
  return;
1291
1368
  }
@@ -1294,15 +1371,43 @@ async function* streamResponse(
1294
1371
  yield END_FRAME_BYTES;
1295
1372
  }
1296
1373
 
1374
+ /** The in-band `ERROR` frame of a failure (§1.6). */
1375
+ function errorFrameBytes(error: SyncError, wireVersion: number): Uint8Array {
1376
+ return encodeResponseFrame(
1377
+ {
1378
+ type: 'ERROR',
1379
+ code: error.code,
1380
+ message: error.message,
1381
+ category: error.category,
1382
+ retryable: error.retryable,
1383
+ recommendedAction: error.recommendedAction,
1384
+ ...(error.details !== undefined ? { details: error.details } : {}),
1385
+ },
1386
+ wireVersion,
1387
+ );
1388
+ }
1389
+
1390
+ /**
1391
+ * A response's chunks, one per encoded frame (§1.4). `live` turns true when
1392
+ * the response goes out before it is built: its header frames and
1393
+ * `KEEPALIVE` frames (§1.6) precede the rest, and a later failure is an
1394
+ * in-band `ERROR`.
1395
+ */
1396
+ export interface SyncResponseStream extends AsyncIterable<Uint8Array> {
1397
+ readonly live: boolean;
1398
+ }
1399
+
1297
1400
  /**
1298
1401
  * Decode and validate the request, then return the streaming response.
1299
1402
  * Request-validation failures (§1.7) throw `SyncError` here, before any
1300
- * bytes are produced; adapters map them to HTTP JSON errors (§1.1).
1403
+ * bytes are produced; adapters map them to HTTP JSON errors (§1.1). The
1404
+ * first chunk arrives once the response is built or its first `KEEPALIVE`
1405
+ * is due (§1.6); a failure before then throws from it, before any byte.
1301
1406
  */
1302
1407
  export async function createSyncResponseStream(
1303
1408
  bytes: Uint8Array,
1304
1409
  ctx: SyncRequestContext,
1305
- ): Promise<AsyncIterable<Uint8Array>> {
1410
+ ): Promise<SyncResponseStream> {
1306
1411
  const sink = ctx.events;
1307
1412
  if (sink === undefined) {
1308
1413
  try {
@@ -1414,7 +1519,7 @@ async function createStreamCore(
1414
1519
  ctx: SyncRequestContext,
1415
1520
  events: SyncularServerEvents | undefined,
1416
1521
  startedAtMs = 0,
1417
- ): Promise<AsyncIterable<Uint8Array>> {
1522
+ ): Promise<SyncResponseStream> {
1418
1523
  let request: RequestMessage;
1419
1524
  try {
1420
1525
  request = decodeRequest(bytes);
@@ -1473,19 +1578,23 @@ async function createStreamCore(
1473
1578
  );
1474
1579
  }
1475
1580
  const report: RequestReport = { outcome: 'ok' };
1476
- // RFC 0007 read-verify-refuse for the streamed read path: the generator
1477
- // builds the whole response (its data reads) before yielding the first
1478
- // frame, then compares the gate token across those reads. Nothing escapes
1479
- // before the verification, and the buffered size is bounded by the request's
1480
- // pull limits and the server's inline segment cap. Every request verifies,
1581
+ // RFC 0007 read-verify-refuse for the streamed read path: the build
1582
+ // buffers the whole response (its data reads), then compares the gate token
1583
+ // across those reads. No push result or section escapes before the
1584
+ // verification, and the buffered size is bounded by the request's pull
1585
+ // limits and the server's inline segment cap. Every request verifies,
1481
1586
  // including a mixed push+pull: a write that already applied when the token
1482
1587
  // changed is durable and replayable under the same commit id / idempotency
1483
1588
  // key, so refusing the request is safe (proved in the serve-gate lane).
1484
- const verified = async function* (): AsyncGenerator<Uint8Array> {
1485
- const buffered: Uint8Array[] = [];
1589
+ const buffered: Uint8Array[] = [];
1590
+ // Set at the build deadline: a build that finishes later stops before the
1591
+ // serve-gate read and persists nothing.
1592
+ let abandoned = false;
1593
+ const built = (async () => {
1486
1594
  for await (const chunk of streamResponse(plan, ctx, served, report)) {
1487
1595
  buffered.push(chunk);
1488
1596
  }
1597
+ if (abandoned) return false;
1489
1598
  const after = await ctx.storage.readServeGate(
1490
1599
  ctx.partition,
1491
1600
  schema.version,
@@ -1499,24 +1608,138 @@ async function createStreamCore(
1499
1608
  if (afterRefusal !== undefined) throw serveNotReadyError(afterRefusal);
1500
1609
  if (changed !== undefined) throw serveNotReadyError(changed);
1501
1610
  await report.persist?.();
1502
- for (const chunk of buffered) yield chunk;
1611
+ return true;
1612
+ })();
1613
+ // The races below observe the failure; this keeps an abandoned stream's
1614
+ // failure from surfacing as unhandled.
1615
+ built.catch(() => {});
1616
+ // §1.6 header frames: the envelope header, RESP_HEADER and its LEASE.
1617
+ const headerChunks = plan.leaseToEmit !== undefined ? 3 : 2;
1618
+ let live = false;
1619
+ const verified = async function* (): AsyncGenerator<Uint8Array> {
1620
+ let timer: ReturnType<typeof setTimeout> | undefined;
1621
+ let elapsedMs = 0;
1622
+ try {
1623
+ for (;;) {
1624
+ let done: boolean;
1625
+ try {
1626
+ done = await Promise.race([
1627
+ built,
1628
+ // §1.6: every 10 s, a third of the native client's 30 s socket
1629
+ // round silence bound (§1.8).
1630
+ new Promise<false>((resolve) => {
1631
+ timer = setTimeout(() => resolve(false), 10_000);
1632
+ }),
1633
+ ]);
1634
+ if (!done) elapsedMs += 10_000;
1635
+ // §1.6 build deadline: 300 s, 2.5 times the slowest cold build
1636
+ // measured in production (119.7 s for 67 segment puts). A build
1637
+ // still running then is abandoned like a failed put.
1638
+ if (elapsedMs === 300_000) {
1639
+ abandoned = true;
1640
+ throw syncError(
1641
+ 'sync.segment_build_timeout',
1642
+ 'the response was not built within the server build deadline',
1643
+ );
1644
+ }
1645
+ } catch (thrown) {
1646
+ if (!live) throw thrown;
1647
+ // The header frames went out: the failure is in-band (§1.6), and
1648
+ // one outside the catalog answers `sync.internal_error`.
1649
+ const error = adapterSyncError(
1650
+ thrown,
1651
+ ctx.onError,
1652
+ 'sync',
1653
+ ctx.mapError,
1654
+ );
1655
+ report.outcome = 'error';
1656
+ report.errorCode = error.code;
1657
+ await recordRoundFailure(ctx, plan.header.clientId, error);
1658
+ yield errorFrameBytes(error, plan.wireVersion);
1659
+ yield END_FRAME_BYTES;
1660
+ return;
1661
+ }
1662
+ clearTimeout(timer);
1663
+ if (done) break;
1664
+ if (!live && buffered.length < headerChunks) continue;
1665
+ if (!live) {
1666
+ live = true;
1667
+ yield* buffered.slice(0, headerChunks);
1668
+ }
1669
+ yield encodeResponseFrame({ type: 'KEEPALIVE' }, plan.wireVersion);
1670
+ }
1671
+ } finally {
1672
+ clearTimeout(timer);
1673
+ }
1674
+ yield* buffered.slice(live ? headerChunks : 0);
1503
1675
  };
1504
- if (events === undefined) {
1505
- return recordedStream(verified(), ctx, plan.header.clientId);
1506
- }
1507
- return recordedStream(
1508
- instrumentedStream(
1509
- verified(),
1510
- ctx,
1511
- events,
1512
- plan,
1513
- report,
1514
- bytes.length,
1515
- startedAtMs,
1516
- ),
1676
+ const stream = recordedStream(
1677
+ events === undefined
1678
+ ? verified()
1679
+ : instrumentedStream(
1680
+ verified(),
1681
+ ctx,
1682
+ events,
1683
+ plan,
1684
+ report,
1685
+ bytes.length,
1686
+ startedAtMs,
1687
+ ),
1517
1688
  ctx,
1518
1689
  plan.header.clientId,
1519
1690
  );
1691
+ return {
1692
+ get live() {
1693
+ return live;
1694
+ },
1695
+ [Symbol.asyncIterator]: () => stream,
1696
+ };
1697
+ }
1698
+
1699
+ /**
1700
+ * The `POST /sync` body (§1.1): the whole response when it was built before
1701
+ * its first `KEEPALIVE` was due, otherwise a stream that carries the header
1702
+ * frames and `KEEPALIVE` frames first (§1.6). Adapters compress only the
1703
+ * whole response (§1.3).
1704
+ */
1705
+ export async function createSyncResponseBody(
1706
+ bytes: Uint8Array,
1707
+ ctx: SyncRequestContext,
1708
+ ): Promise<Uint8Array | ReadableStream<Uint8Array>> {
1709
+ const stream = await createSyncResponseStream(bytes, ctx);
1710
+ const iterator = stream[Symbol.asyncIterator]();
1711
+ const first = await iterator.next();
1712
+ if (stream.live) {
1713
+ return new ReadableStream<Uint8Array>({
1714
+ start(controller) {
1715
+ if (!first.done) controller.enqueue(first.value);
1716
+ },
1717
+ async pull(controller) {
1718
+ const step = await iterator.next();
1719
+ if (step.done) controller.close();
1720
+ else controller.enqueue(step.value);
1721
+ },
1722
+ async cancel() {
1723
+ await iterator.return?.();
1724
+ },
1725
+ });
1726
+ }
1727
+ const chunks: Uint8Array[] = first.done ? [] : [first.value];
1728
+ for (
1729
+ let step = await iterator.next();
1730
+ !step.done;
1731
+ step = await iterator.next()
1732
+ )
1733
+ chunks.push(step.value);
1734
+ const out = new Uint8Array(
1735
+ chunks.reduce((sum, chunk) => sum + chunk.length, 0),
1736
+ );
1737
+ let offset = 0;
1738
+ for (const chunk of chunks) {
1739
+ out.set(chunk, offset);
1740
+ offset += chunk.length;
1741
+ }
1742
+ return out;
1520
1743
  }
1521
1744
 
1522
1745
  /** Counts response bytes and emits `request.handled` when the stream
@@ -1571,18 +1794,8 @@ export async function handleSyncRequest(
1571
1794
  bytes: Uint8Array,
1572
1795
  ctx: SyncRequestContext,
1573
1796
  ): Promise<Uint8Array> {
1574
- const stream = await createSyncResponseStream(bytes, ctx);
1575
- const chunks: Uint8Array[] = [];
1576
- let total = 0;
1577
- for await (const chunk of stream) {
1578
- chunks.push(chunk);
1579
- total += chunk.length;
1580
- }
1581
- const out = new Uint8Array(total);
1582
- let offset = 0;
1583
- for (const chunk of chunks) {
1584
- out.set(chunk, offset);
1585
- offset += chunk.length;
1586
- }
1587
- return out;
1797
+ const body = await createSyncResponseBody(bytes, ctx);
1798
+ return body instanceof Uint8Array
1799
+ ? body
1800
+ : new Uint8Array(await new Response(body).arrayBuffer());
1588
1801
  }
@@ -1,6 +1,10 @@
1
1
  import { validateCommitPruneQuery } from './prune';
2
2
  import { StorageQueryError } from './storage-errors';
3
- import type { CommitPruneQuery, CommitPruneResult } from './storage';
3
+ import type {
4
+ CommitPruneQuery,
5
+ CommitPruneResult,
6
+ PartitionHorizons,
7
+ } from './storage';
4
8
  import {
5
9
  asJson,
6
10
  CLIENT_RECORD_COLUMNS,
@@ -222,6 +226,11 @@ CREATE TABLE IF NOT EXISTS sync_partition_registry(
222
226
  epoch_required BOOLEAN NOT NULL DEFAULT FALSE,
223
227
  last_authenticated_at_ms BIGINT NOT NULL
224
228
  );
229
+ CREATE TABLE IF NOT EXISTS sync_table_horizons(
230
+ partition TEXT NOT NULL, tbl TEXT NOT NULL,
231
+ commit_seq BIGINT NOT NULL,
232
+ PRIMARY KEY(partition, tbl)
233
+ );
225
234
  CREATE TABLE IF NOT EXISTS sync_row_scopes(
226
235
  partition TEXT NOT NULL, tbl TEXT NOT NULL,
227
236
  var TEXT NOT NULL, value TEXT NOT NULL, row_id TEXT NOT NULL,
@@ -2794,6 +2803,20 @@ FOR EACH ROW EXECUTE FUNCTION syncular_writer_fence()`,
2794
2803
  return rows[0] === undefined ? 0 : asNumber(rows[0].horizon_seq);
2795
2804
  }
2796
2805
 
2806
+ async getHorizons(partition: string): Promise<PartitionHorizons> {
2807
+ const { rows } = await this.#exec.query<{ seq: unknown; tables: string }>(
2808
+ `SELECT coalesce((SELECT horizon_seq FROM sync_partitions WHERE partition=$1),0) AS seq,
2809
+ coalesce((SELECT jsonb_object_agg(tbl, commit_seq) FROM sync_table_horizons WHERE partition=$1),'{}')::text AS tables`,
2810
+ [partition],
2811
+ );
2812
+ return {
2813
+ seq: asNumber(rows[0]?.seq),
2814
+ tables: new Map(
2815
+ Object.entries(asJson<Record<string, number>>(rows[0]?.tables ?? '{}')),
2816
+ ),
2817
+ };
2818
+ }
2819
+
2797
2820
  async setHorizonSeq(partition: string, seq: number): Promise<void> {
2798
2821
  await this.#exec.query(
2799
2822
  `INSERT INTO sync_partitions(partition, horizon_seq) VALUES ($1,$2)
@@ -2845,11 +2868,14 @@ FOR EACH ROW EXECUTE FUNCTION syncular_writer_fence()`,
2845
2868
  'DELETE FROM sync_changes WHERE partition=$1 AND commit_seq<=$2',
2846
2869
  [partition, horizonSeq],
2847
2870
  );
2848
- // §4.6: tombstones prune in the same pass as the commit log.
2849
- await client.query(
2850
- 'DELETE FROM sync_tombstones WHERE partition=$1 AND commit_seq<=$2',
2851
- [partition, horizonSeq],
2852
- );
2871
+ // §4.6: tombstones and table horizons prune in the same pass as the
2872
+ // commit log.
2873
+ for (const table of ['sync_tombstones', 'sync_table_horizons']) {
2874
+ await client.query(
2875
+ `DELETE FROM ${table} WHERE partition=$1 AND commit_seq<=$2`,
2876
+ [partition, horizonSeq],
2877
+ );
2878
+ }
2853
2879
  return {
2854
2880
  previousHorizonSeq,
2855
2881
  horizonSeq,