@quereus/sync 3.3.0 → 4.1.0

package/dist/src/sync/snapshot.js

@@ -7,7 +7,7 @@
 import { deserializeColumnVersion } from '../metadata/column-version.js';
 import { deserializeMigration } from '../metadata/schema-migration.js';
 import { buildAllColumnVersionsScanBounds, buildAllTombstonesScanBounds, buildAllSchemaMigrationsScanBounds, buildAllChangeLogScanBounds, parseColumnVersionKey, parseSchemaMigrationKey, encodePK, } from '../metadata/keys.js';
-import { persistHLCState } from './sync-context.js';
+import { admitGroup } from './admission.js';
 /**
  * Get a full snapshot of all data and schema state.
  */
@@ -115,51 +115,70 @@ export async function applySnapshot(ctx, snapshot) {
             });
         }
     }
-    // PHASE 2: Apply data to store
-    if (ctx.applyToStore && (dataChangesToApply.length > 0 || schemaChangesToApply.length > 0)) {
-        await ctx.applyToStore(dataChangesToApply, schemaChangesToApply, { remote: true });
-    }
-    // PHASE 3: Clear existing CRDT metadata and apply new
-    const clearBatch = ctx.kv.batch();
-    for await (const entry of ctx.kv.iterate(buildAllColumnVersionsScanBounds())) {
-        clearBatch.delete(entry.key);
-    }
-    for await (const entry of ctx.kv.iterate(buildAllTombstonesScanBounds())) {
-        clearBatch.delete(entry.key);
-    }
-    for await (const entry of ctx.kv.iterate(buildAllChangeLogScanBounds())) {
-        clearBatch.delete(entry.key);
-    }
-    await clearBatch.write();
-    // Apply snapshot's column versions and rebuild change log
-    const applyBatch = ctx.kv.batch();
-    for (const tableSnapshot of snapshot.tables) {
-        for (const [versionKey, cvEntry] of tableSnapshot.columnVersions) {
-            const lastColon = versionKey.lastIndexOf(':');
-            if (lastColon === -1)
-                continue;
-            const rowKey = versionKey.slice(0, lastColon);
-            const column = versionKey.slice(lastColon + 1);
-            const pk = JSON.parse(rowKey);
-            ctx.columnVersions.setColumnVersionBatch(applyBatch, tableSnapshot.schema, tableSnapshot.table, pk, column, { hlc: cvEntry.hlc, value: cvEntry.value });
-            ctx.changeLog.recordColumnChangeBatch(applyBatch, cvEntry.hlc, tableSnapshot.schema, tableSnapshot.table, pk, column);
-        }
-    }
-    // Record schema migrations
-    for (const migration of snapshot.schemaMigrations) {
-        const schemaVersion = migration.schemaVersion ??
-            (await ctx.schemaMigrations.getCurrentVersion(migration.schema, migration.table)) + 1;
-        await ctx.schemaMigrations.recordMigration(migration.schema, migration.table, {
-            type: migration.type,
-            ddl: migration.ddl,
-            hlc: migration.hlc,
-            schemaVersion,
+    // Admit the snapshot as one wholesale all-or-nothing unit: data first (PHASE 2,
+    // a bootstrap apply — the adapter skips the engine seam, converged once by the
+    // finalize below), then the wholesale metadata replace (PHASE 3), then the
+    // clock watermark. A data-apply failure aborts before clearing/rewriting
+    // metadata, leaving prior CRDT state intact; the snapshot retries wholesale
+    // (idempotent on the store side) and now also emits status:'error'.
+    await admitGroup(ctx, {
+        dataChanges: dataChangesToApply,
+        schemaChanges: schemaChangesToApply,
+        applyOptions: { remote: true, bootstrap: true },
+        commitMetadata: async () => {
+            // Clear existing CRDT metadata and apply new
+            const clearBatch = ctx.kv.batch();
+            for await (const entry of ctx.kv.iterate(buildAllColumnVersionsScanBounds())) {
+                clearBatch.delete(entry.key);
+            }
+            for await (const entry of ctx.kv.iterate(buildAllTombstonesScanBounds())) {
+                clearBatch.delete(entry.key);
+            }
+            for await (const entry of ctx.kv.iterate(buildAllChangeLogScanBounds())) {
+                clearBatch.delete(entry.key);
+            }
+            await clearBatch.write();
+            // Apply snapshot's column versions and rebuild change log
+            const applyBatch = ctx.kv.batch();
+            for (const tableSnapshot of snapshot.tables) {
+                for (const [versionKey, cvEntry] of tableSnapshot.columnVersions) {
+                    const lastColon = versionKey.lastIndexOf(':');
+                    if (lastColon === -1)
+                        continue;
+                    const rowKey = versionKey.slice(0, lastColon);
+                    const column = versionKey.slice(lastColon + 1);
+                    const pk = JSON.parse(rowKey);
+                    ctx.columnVersions.setColumnVersionBatch(applyBatch, tableSnapshot.schema, tableSnapshot.table, pk, column, { hlc: cvEntry.hlc, value: cvEntry.value });
+                    ctx.changeLog.recordColumnChangeBatch(applyBatch, cvEntry.hlc, tableSnapshot.schema, tableSnapshot.table, pk, column);
+                }
+            }
+            // Record schema migrations
+            for (const migration of snapshot.schemaMigrations) {
+                const schemaVersion = migration.schemaVersion ??
+                    (await ctx.schemaMigrations.getCurrentVersion(migration.schema, migration.table)) + 1;
+                await ctx.schemaMigrations.recordMigration(migration.schema, migration.table, {
+                    type: migration.type,
+                    ddl: migration.ddl,
+                    hlc: migration.hlc,
+                    schemaVersion,
+                });
+            }
+            await applyBatch.write();
+        },
+        watermarkHLC: snapshot.hlc,
+    });
+    // Converge the bootstrap: PHASE 2 deferred MV maintenance and watch capture
+    // (seam skipped), so converge every MV once and coarse-notify each
+    // bootstrapped table's watchers. Issued before `status: 'synced'` so a
+    // finalize failure aborts the apply (the storage rows are already correct, so
+    // a retry's finalize rebuilds cleanly).
+    if (ctx.applyToStore) {
+        await ctx.applyToStore([], [], {
+            remote: true,
+            bootstrapFinalize: true,
+            bootstrapTables: snapshot.tables.map(t => ({ schema: t.schema, table: t.table })),
         });
     }
-    await applyBatch.write();
-    // Update HLC
-    ctx.hlcManager.receive(snapshot.hlc);
-    await persistHLCState(ctx);
     // Emit sync state change
     ctx.syncEvents.emitSyncStateChange({ status: 'synced', lastSyncHLC: snapshot.hlc });
 }

package/dist/src/sync/snapshot.js.map

@@ -1 +1 @@
-{"version":3,"file":"snapshot.js","sourceRoot":"","sources":["../../../src/sync/snapshot.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"snapshot.js","sourceRoot":"","sources":["../../../src/sync/snapshot.ts"],"names":[],"mappings":"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"}

package/dist/src/sync/store-adapter.d.ts

@@ -1,31 +1,131 @@
 /**
  * Store adapter for applying remote sync changes.
  *
- * This module provides adapters that implement the ApplyToStoreCallback
- * interface for LevelDB and IndexedDB stores, enabling the SyncManager
- * to apply remote changes to the actual data store.
+ * Implements the ApplyToStoreCallback interface over the store module's
+ * external row-write entry point (`StoreTable.applyExternalRowChanges` —
+ * table-owned key encoding, secondary-index and stats maintenance) plus the
+ * engine's batch ingestion seam (`Database.ingestExternalRowChanges` — change
+ * capture for `Database.watch` + global assertions, materialized-view
+ * maintenance, opt-in parent-side FK actions).
+ *
+ * Per `applyToStore(dataChanges, schemaChanges, options)` invocation:
+ *   1. Schema changes execute first via `db.exec` (DDL before DML), with the
+ *      resulting module schema events pre-marked remote.
+ *   2. Data changes are grouped per table, then per row; each row group
+ *      collapses to ONE `ExternalRowOp` (a delete in the group wins over
+ *      column updates; column updates merge onto the pre-read existing row,
+ *      or onto a PK+nulls partial row when absent — UPSERT semantics).
+ *   3. `StoreTable.applyExternalRowChanges(ops)` applies the table's ops to
+ *      committed storage and returns the EFFECTIVE changes (no-ops — absent
+ *      delete, value-identical upsert — are suppressed: no storage write, no
+ *      module event, no seam report).
+ *   4. Module data events are emitted from the effective changes with
+ *      `remote: true` (so the SyncManager never re-records inbound changes),
+ *      carrying accurate `oldRow` before-images and derived `changedColumns`.
+ *   5. After all tables' storage writes, ONE seam call reports the
+ *      accumulated effective changes: `db.ingestExternalRowChanges(batch,
+ *      { applyForeignKeyActions, assertionFailureMode: 'report' })` — capture +
+ *      MV facets default on, commit-time global assertions in REPORT mode (a
+ *      violation is collected into the result and the batch still commits).
+ *      Changes recorded in `result.errors` are excluded from the batch.
+ *
+ * Snapshot bootstrap (per-call, not sticky): a known-complete wholesale load
+ * defers MV maintenance and watch capture for the whole transfer and converges
+ * once at the end.
+ *   - `bootstrap` flush: steps 1–4 run unchanged (storage rows applied, remote
+ *     module events emitted) but step 5 — the seam call — is SKIPPED. MV
+ *     maintenance + capture are deferred to the finalize and FK actions are off
+ *     for a wholesale load, so the only seam facet skipping the call drops
+ *     outright is commit-time GLOBAL ASSERTION evaluation over the bootstrapped
+ *     rows — deliberate under the seam's trust-the-origin contract. The
+ *     incremental path enforces global assertions because it **merges** deltas
+ *     from possibly many origins into the receiver's existing state, and a
+ *     cross-origin merge can produce a global-invariant violation no single
+ *     origin ever saw. Bootstrap does something different: it installs **one**
+ *     origin's already-converged state **wholesale (replace, not merge)** — no
+ *     merge means no merge-introduced violation, so a complete snapshot already
+ *     satisfied the origin's assertions and re-checking is redundant. The
+ *     `bootstrapFinalize` therefore does NOT evaluate any global assertion —
+ *     not even a no-dependency one. This uniform skip is consistent with the
+ *     seam's general trust-the-origin posture for every other constraint type
+ *     (see `docs/materialized-views.md` § Trust boundary). MV-backed assertions
+ *     would see the MV only after `refreshAllMaterializedViews()`; under
+ *     trust-the-origin they are not evaluated at finalize at all, so MV-refresh
+ *     ordering is moot for assertions. Residual risk (a corrupt/hostile snapshot
+ *     installs invariant-violating data) is already unguarded for every other
+ *     constraint type; a one-off assertion sweep would be inconsistent
+ *     defense-in-depth — a separate integrity layer is the right fix if origins
+ *     are ever distrusted. Per-flush evaluation also could not serve bootstrap
+ *     correctly: it could spuriously fail a valid snapshot whose cross-table
+ *     assertion sees children before parents. The remaining seam work for a
+ *     wholesale load is otherwise deferred, so skipping the call also removes
+ *     the per-flush transaction/savepoint and the per-flush full-rebuild.
+ *   - `bootstrapFinalize` call (empty data/schema): converges every MV in
+ *     dependency order via `db.refreshAllMaterializedViews()`, then fires a
+ *     coarse `db.notifyExternalChange` per bootstrapped base table and per
+ *     refreshed MV — one whole-table watch invalidation instead of per-row
+ *     capture. The caller issues it before clearing the snapshot checkpoint, so
+ *     a finalize throw leaves the checkpoint in place and the transfer retries.
+ *
+ * Inbound assertion violations are DETECT-AND-NOTIFY, not throw. Under the
+ * seam's trust-the-origin contract the merged data must land regardless, so a
+ * **local** commit-time global assertion can only usefully *notify*: the seam
+ * runs in report mode, so a violation is collected and RETURNED in
+ * `result.assertionViolations` while the batch commits — the derived effects
+ * (MV backing deltas, capture entries) for the violating row land on the FIRST
+ * attempt, so an incremental MV / `Database.watch` subscriber stays consistent
+ * with the base table and there is no divergence and no retry. The consumer
+ * (admission.ts) surfaces each returned violation to the host as an
+ * `onAssertionViolation` event; the host decides policy.
+ *
+ * A genuine per-change STORAGE failure is different and still aborts: the
+ * adapter collects it in `result.errors` (it keeps applying other tables), and
+ * the consumer treats any non-empty `errors` like a whole-batch throw — emit
+ * `status:'error'`, leave CRDT metadata uncommitted, re-resolve next sync.
+ * Re-application is idempotent (value-identical upserts suppress). "Orthogonal"
+ * (above) means the two outcomes are independent facts, NOT that a co-occurring
+ * violation is dropped: when ONE batch carries both a per-change error and a
+ * reported violation, the violation's row already committed in report mode, so
+ * the consumer surfaces the `onAssertionViolation` event BEFORE the per-change
+ * abort throws (see admission.ts `applyDataToStore`). The abort still blocks the
+ * metadata commit and the batch still re-resolves.
+ *
+ * Constraints (see docs/materialized-views.md § External row-change
+ * ingestion): the callback is host-driven — never invoke it from within
+ * statement execution or vtab callbacks (exec-mutex deadlock), and hosts
+ * should not drive it while holding an open explicit transaction on `db`
+ * (the seam would join that transaction, so a later rollback diverges
+ * MV/capture state from the already-committed storage rows; recoverable via
+ * MV refresh).
  */
-import type { Database, TableSchema } from '@quereus/quereus';
-import type { KVStore, StoreEventEmitter } from '@quereus/store';
+import type { Database } from '@quereus/quereus';
+import type { StoreEventEmitter, StoreModule } from '@quereus/store';
 import type { ApplyToStoreCallback } from './protocol.js';
 /**
  * Options for creating a SyncStoreAdapter.
  */
 export interface SyncStoreAdapterOptions {
-    /** The Quereus database for executing DDL statements. */
+    /** The Quereus database: DDL execution + `ingestExternalRowChanges` reporting. */
     db: Database;
     /**
-     * Function to get the KV store for a specific table.
-     * Each table may have its own IndexedDB database, so we need to look up
-     * the correct store for each table when applying remote changes.
+     * The store module owning the synced tables. Each table is resolved per
+     * apply via `getTableForExternalWrite`, which owns key encoding (incl.
+     * per-PK-column collations), secondary-index maintenance, and per-table
+     * store resolution (e.g. IndexedDB's one-database-per-table layout).
      */
-    getKVStore: (schemaName: string, tableName: string) => Promise<KVStore>;
-    /** The event emitter for data change events. */
+    storeModule: StoreModule;
+    /** The event emitter for data change events (the adapter emits `remote: true`). */
     events: StoreEventEmitter;
-    /** Function to get table schema by name. */
-    getTableSchema: (schemaName: string, tableName: string) => TableSchema | undefined;
-    /** Collation for text key encoding. */
-    collation?: 'BINARY' | 'NOCASE';
+    /**
+     * Parent-side FK actions on inbound update/delete (seam facet). Default
+     * false — a replication stream usually carries the origin's cascade
+     * effects; opt in only when the deployment's stream does not. When on, an
+     * inbound parent delete cascades to local children through the full DML
+     * pipeline; those cascaded child writes emit module events WITHOUT
+     * `remote`, so they are recorded as local changes and propagate outward —
+     * correct for the opt-in posture.
+     */
+    applyForeignKeyActions?: boolean;
 }
 /**
  * Creates an ApplyToStoreCallback for applying remote sync changes.
@@ -34,6 +134,8 @@ export interface SyncStoreAdapterOptions {
  * - UPSERT semantics for column changes (insert if row doesn't exist, update if it does)
  * - Row deletions by primary key
  * - DDL execution for schema changes
+ * - Post-apply reporting through the engine's ingestion seam (MV maintenance,
+ *   `Database.watch` capture, opt-in FK actions)
  *
  * All data change events are emitted with `remote: true` to prevent
  * the SyncManager from re-recording CRDT metadata.

package/dist/src/sync/store-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"store-adapter.d.ts","sourceRoot":"","sources":["../../../src/sync/store-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAiB,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEjE,OAAO,KAAK,EACV,oBAAoB,EAKrB,MAAM,eAAe,CAAC;AAGvB;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,yDAAyD;IACzD,EAAE,EAAE,QAAQ,CAAC;IACb;;;;OAIG;IACH,UAAU,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACxE,gDAAgD;IAChD,MAAM,EAAE,iBAAiB,CAAC;IAC1B,4CAA4C;IAC5C,cAAc,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,WAAW,GAAG,SAAS,CAAC;IACnF,uCAAuC;IACvC,SAAS,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;CACjC;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,uBAAuB,GAAG,oBAAoB,CAyDzF"}
+{"version":3,"file":"store-adapter.d.ts","sourceRoot":"","sources":["../../../src/sync/store-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmGG;AAEH,OAAO,KAAK,EAAoB,QAAQ,EAAiD,MAAM,kBAAkB,CAAC;AAElH,OAAO,KAAK,EAAiB,iBAAiB,EAAE,WAAW,EAAc,MAAM,gBAAgB,CAAC;AAChG,OAAO,KAAK,EACV,oBAAoB,EAKrB,MAAM,eAAe,CAAC;AAGvB;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,kFAAkF;IAClF,EAAE,EAAE,QAAQ,CAAC;IACb;;;;;OAKG;IACH,WAAW,EAAE,WAAW,CAAC;IACzB,mFAAmF;IACnF,MAAM,EAAE,iBAAiB,CAAC;IAC1B;;;;;;;;OAQG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,uBAAuB,GAAG,oBAAoB,CAwGzF"}