@interop/was-react 0.8.2 → 0.9.0

package/dist/sync/pushWrites.js

@@ -1,44 +1,20 @@
-import { WasSyncConflictError } from './types.js';
+import { formatEtag } from '@interop/was-client/sync';
+import { bodiesEqual, copyOptionalBodyFields, WasSyncAuthError, WasSyncConflictError } from './types.js';
 /**
- * Formats a master revision (`version` or `metaVersion`) as the quoted strong
- * ETag the server compares `If-Match` against (revision `3` becomes `"3"`).
- *
- * @param revision {number}
- * @returns {string}
- */
-export function formatEtag(revision) {
-    return `"${revision}"`;
-}
-/**
- * Structural equality over two opaque bodies, by canonical-free JSON string.
- * Used only to decide whether the content or the metadata half changed and thus
- * which endpoint(s) to write. Content-addressed collections never mutate `data`
- * for a given id (so the content half only fires on create/delete), and a real
- * metadata edit re-encrypts to fresh bytes, so this coarse comparison is
- * sufficient for routing.
- *
- * @param left {Json | undefined}
- * @param right {Json | undefined}
- * @returns {boolean}
- */
-function bodiesEqual(left, right) {
-    return JSON.stringify(left ?? null) === JSON.stringify(right ?? null);
-}
-/**
- * Builds the RxDB conflict entry (the real current master state) for a row whose
- * conditional write was rejected with `412`. Re-reads the resource; when it is
- * genuinely absent (a delete/delete race) the master is a tombstone synthesized
- * from what we know locally.
+ * Maps a re-read master state into the RxDB conflict entry for one row, or --
+ * when the re-read found the resource genuinely absent (`master === null`, a
+ * delete/delete race) -- synthesizes the tombstone conflict entry from what we
+ * know locally. Shared by the `412` assembler and the `/meta` 404 recovery, so
+ * both report an absent master identically.
  *
  * @param options {object}
- * @param options.port {WasSyncPort}
  * @param options.id {string}
+ * @param options.master {MasterState | null}
  * @param options.fallbackUpdatedAt {string}   used if the resource is now absent
  * @param options.fallbackVersion {number}     used if the resource is now absent
- * @returns {Promise<WithDeleted<SyncedDoc>>}
+ * @returns {WithDeleted<SyncedDoc>}
  */
-async function assembleConflict({ port, id, fallbackUpdatedAt, fallbackVersion }) {
-    const master = await port.get({ id });
+function masterOrTombstone({ id, master, fallbackUpdatedAt, fallbackVersion }) {
     if (master === null) {
         return {
             id,
@@ -53,36 +29,59 @@ async function assembleConflict({ port, id, fallbackUpdatedAt, fallbackVersion }
         version: master.version,
         _deleted: master.deleted
     };
-    if (master.data !== undefined) {
-        conflict.data = master.data;
-    }
-    if (master.metaVersion !== undefined) {
-        conflict.metaVersion = master.metaVersion;
-    }
-    if (master.custom !== undefined) {
-        conflict.custom = master.custom;
-    }
+    copyOptionalBodyFields({ source: master, target: conflict });
     return conflict;
 }
 /**
  * Sends one local change to the remote Collection as up to two conditional
  * writes (content, then metadata). Returns the master-state conflict entry on a
- * `412` at either step (with `ack: null`), or the accepted writes' acked
- * revisions on success (`ack: null` when no response carried a revision).
+ * `412` at either step, or the accepted writes' acked revisions on success
+ * (`ack: null` when no response carried a revision). A conflict on the
+ * metadata half still returns the content half's earned ack alongside the
+ * conflict entry, so an accepted content version is never discarded.
  *
  * @param options {object}
  * @param options.port {WasSyncPort}
  * @param options.newDocumentState {WithDeleted<SyncedDoc>}
  * @param [options.assumedMasterState] {WithDeleted<SyncedDoc>}
+ * @param [options.cache] {MasterReadCache}   the push batch's shared
+ *   master-read memo
  * @returns {Promise<{ conflict: WithDeleted<SyncedDoc> | null,
  *   ack: PushWriteAck | null }>}
  */
-async function pushRow({ port, newDocumentState, assumedMasterState }) {
+async function pushRow({ port, newDocumentState, assumedMasterState, cache }) {
     const { id } = newDocumentState;
     const assumedVersion = assumedMasterState?.version;
     const isCreate = assumedMasterState === undefined;
+    const ack = { id };
+    const hasAck = () => ack.version !== undefined || ack.metaVersion !== undefined;
+    const fallbackVersion = () => ack.version ?? assumedVersion ?? newDocumentState.version;
+    // Re-reads this row's master. A row that has ALREADY written this batch
+    // (a content write accepted before a `/meta` rejection) bypasses the batch
+    // memo: a sibling's feed read may have paged past this resource before our
+    // own write landed, and the conflict entry must carry the revision that write
+    // produced. Rows that wrote nothing -- the ordinary content 412, the common
+    // case -- are exactly what the memo is for.
+    const readMaster = async () => hasAck()
+        ? port.get({ id })
+        : port.get({ id, ...(cache !== undefined && { cache }) });
+    // Builds the conflict outcome from a re-read master (or from its absence, a
+    // delete/delete race), PRESERVING any ack already earned: a content write
+    // accepted before a `/meta` 412 must keep its acked `version` (and feed it to
+    // the absent-master fallback), or the local row keeps the pre-write version
+    // and every later conditional write sends a stale `If-Match`.
+    const conflictOutcome = (master) => ({
+        conflict: masterOrTombstone({
+            id,
+            master,
+            fallbackUpdatedAt: newDocumentState.updatedAt,
+            fallbackVersion: fallbackVersion()
+        }),
+        ack: hasAck() ? ack : null
+    });
+    // The 412 path: re-read the resource, then report its real master state.
+    const conflictResult = async () => conflictOutcome(await readMaster());
     try {
-        const ack = { id };
         if (newDocumentState._deleted) {
             // Delete supersedes any metadata write: drop the content, tombstone wins.
             const ackedVersion = await port.deleteContent({
@@ -104,6 +103,9 @@ async function pushRow({ port, newDocumentState, assumedMasterState }) {
             const ackedVersion = await port.putContent({
                 id,
                 data: newDocumentState.data ?? null,
+                ...(newDocumentState.epoch !== undefined && {
+                    epoch: newDocumentState.epoch
+                }),
                 ...(isCreate
                     ? { ifNoneMatch: true }
                     : assumedVersion !== undefined && {
@@ -114,14 +116,29 @@ async function pushRow({ port, newDocumentState, assumedMasterState }) {
                 ack.version = ackedVersion;
             }
         }
-        // Metadata half: write when the resource has metadata and it changed. On a
-        // create this runs after the content write (the resource must exist first).
-        const metadataChanged = !bodiesEqual(newDocumentState.custom, assumedMasterState?.custom);
-        if (newDocumentState.custom !== undefined && metadataChanged) {
+    }
+    catch (err) {
+        if (err instanceof WasSyncConflictError) {
+            return await conflictResult();
+        }
+        // Any non-conflict error (network, 5xx, auth) propagates so RxDB retries
+        // the whole batch with backoff.
+        throw err;
+    }
+    // Metadata half: write when the metadata changed -- including a CLEAR (the
+    // new state carries no `custom` while the assumed master does; `putMeta`
+    // with no `custom` writes the cleared state). On a create this runs after
+    // the content write (the resource must exist first). Its own try/catch so a
+    // rejection here can never discard an ack the content half already earned.
+    const metadataChanged = !bodiesEqual(newDocumentState.custom, assumedMasterState?.custom);
+    if (metadataChanged) {
+        try {
             const assumedMetaVersion = assumedMasterState?.metaVersion;
             const ackedMetaVersion = await port.putMeta({
                 id,
-                custom: newDocumentState.custom,
+                ...(newDocumentState.custom !== undefined && {
+                    custom: newDocumentState.custom
+                }),
                 ...(assumedMetaVersion !== undefined
                     ? { ifMatch: formatEtag(assumedMetaVersion) }
                     : { ifNoneMatch: true })
@@ -130,23 +147,32 @@ async function pushRow({ port, newDocumentState, assumedMasterState }) {
                 ack.metaVersion = ackedMetaVersion;
             }
         }
-        const hasAck = ack.version !== undefined || ack.metaVersion !== undefined;
-        return { conflict: null, ack: hasAck ? ack : null };
-    }
-    catch (err) {
-        if (err instanceof WasSyncConflictError) {
-            const conflict = await assembleConflict({
-                port,
-                id,
-                fallbackUpdatedAt: newDocumentState.updatedAt,
-                fallbackVersion: assumedVersion ?? newDocumentState.version
-            });
-            return { conflict, ack: null };
+        catch (err) {
+            if (err instanceof WasSyncConflictError) {
+                return await conflictResult();
+            }
+            // Corroborate before condemnation: under WAS 404-masking a `/meta` 404
+            // is ambiguous -- expired access, or an ordinary race with a remote
+            // delete (a PUT to the `/meta` of a nonexistent resource legitimately
+            // 404s). An independent request decides: re-read the master off the
+            // changes feed. A feed read that is itself denied rethrows its own auth
+            // error (access genuinely expired, so the controller escalates); a feed
+            // that answers with an absent/deleted master confirms the delete race,
+            // and the row is resolved with that tombstone as the conflict entry
+            // (the conflict handler reconciles it) instead of flipping the whole
+            // session to "access expired" and wedging the batch in RxDB's retries.
+            if (err instanceof WasSyncAuthError && err.status === 404) {
+                const master = await readMaster();
+                if (master === null || master.deleted) {
+                    return conflictOutcome(master);
+                }
+                // The resource is alive and readable while its `/meta` write 404s:
+                // the write itself was rejected, so the auth signal stands.
+            }
+            throw err;
         }
-        // Any non-conflict error (network, 5xx, auth) propagates so RxDB retries
-        // the whole batch with backoff.
-        throw err;
     }
+    return { conflict: null, ack: hasAck() ? ack : null };
 }
 /**
  * Builds the RxDB push handler that fans a batch of local changes out to
@@ -160,6 +186,12 @@ async function pushRow({ port, newDocumentState, assumedMasterState }) {
  * caller can write the new `version` / `metaVersion` back into the local row
  * and keep subsequent conditional writes' `If-Match` in step with the server.
  *
+ * Each batch gets one short-lived master-read memo, shared by its rows and
+ * discarded with the batch (never held across batches, where it would go
+ * stale). A conflict re-read walks the changes feed from its origin and so pages
+ * past every other conflicting row's master on the way; without the memo a batch
+ * with k conflicts would run k concurrent full-feed walks.
+ *
  * @param port {WasSyncPort}
  * @param [onWriteAccepted] {(ack: PushWriteAck) => Promise<void>}
  * @returns {(rows: Array<{ newDocumentState: WithDeleted<SyncedDoc>,
@@ -168,11 +200,13 @@ async function pushRow({ port, newDocumentState, assumedMasterState }) {
  */
 export function createPushHandler(port, onWriteAccepted) {
     return async function push(rows) {
+        const cache = { byId: new Map(), inFlight: null };
         const results = await Promise.all(rows.map(async (row) => {
             const result = await pushRow({
                 port,
                 newDocumentState: row.newDocumentState,
-                assumedMasterState: row.assumedMasterState
+                assumedMasterState: row.assumedMasterState,
+                cache
             });
             if (result.ack !== null && onWriteAccepted !== undefined) {
                 await onWriteAccepted(result.ack);

package/dist/sync/pushWrites.js.map

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

package/dist/sync/syncedDocSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"syncedDocSchema.d.ts","sourceRoot":"","sources":["../../src/sync/syncedDocSchema.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAE3C;;;;;;GAMG;AACH,wBAAgB,eAAe,IAAI,YAAY,CAAC,SAAS,CAAC,CAiBzD"}
+{"version":3,"file":"syncedDocSchema.d.ts","sourceRoot":"","sources":["../../src/sync/syncedDocSchema.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAE3C;;;;;;GAMG;AACH,wBAAgB,eAAe,IAAI,YAAY,CAAC,SAAS,CAAC,CAoBzD"}

package/dist/sync/syncedDocSchema.js

@@ -15,6 +15,9 @@ export function syncedDocSchema() {
             updatedAt: { type: 'string', maxLength: 64 },
             version: { type: 'number' },
             metaVersion: { type: 'number' },
+            // The opaque key-epoch id `data` was encrypted under (the `WAS-Key-Epoch`
+            // content-push header), when known.
+            epoch: { type: 'string', maxLength: 256 },
             // Opaque stored bodies -- content and metadata envelopes -- moved verbatim.
             data: { type: 'object', additionalProperties: true },
             custom: { type: 'object', additionalProperties: true }

package/dist/sync/syncedDocSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"syncedDocSchema.js","sourceRoot":"","sources":["../../src/sync/syncedDocSchema.ts"],"names":[],"mappings":"AAcA;;;;;;GAMG;AACH,MAAM,UAAU,eAAe;IAC7B,OAAO;QACL,OAAO,EAAE,CAAC;QACV,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,EAAE;YACtC,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;YAC5C,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC3B,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC/B,4EAA4E;YAC5E,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,oBAAoB,EAAE,IAAI,EAAE;YACpD,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,oBAAoB,EAAE,IAAI,EAAE;SACvD;QACD,QAAQ,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,CAAC;QACxC,OAAO,EAAE,CAAC,WAAW,CAAC;KACI,CAAA;AAC9B,CAAC"}
+{"version":3,"file":"syncedDocSchema.js","sourceRoot":"","sources":["../../src/sync/syncedDocSchema.ts"],"names":[],"mappings":"AAcA;;;;;;GAMG;AACH,MAAM,UAAU,eAAe;IAC7B,OAAO;QACL,OAAO,EAAE,CAAC;QACV,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,EAAE;YACtC,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE;YAC5C,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC3B,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC/B,0EAA0E;YAC1E,oCAAoC;YACpC,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,EAAE;YACzC,4EAA4E;YAC5E,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,oBAAoB,EAAE,IAAI,EAAE;YACpD,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,oBAAoB,EAAE,IAAI,EAAE;SACvD;QACD,QAAQ,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,CAAC;QACxC,OAAO,EAAE,CAAC,WAAW,CAAC;KACI,CAAA;AAC9B,CAAC"}

package/dist/sync/types.d.ts

@@ -19,15 +19,63 @@
  * or the EDV envelope on an encrypted collection) and `custom` is the stored
  * metadata body (an opaque envelope on an encrypted collection); encrypt/decrypt
  * stays a read/write-time concern above this layer.
+ *
+ * The two small helpers that travel with these shapes live here as well: the
+ * opaque-body equality every routing decision is made on, and the optional-field
+ * copy every wire-to-local mapping runs.
  */
+import type { Json } from '@interop/was-client';
 /**
  * A JSON value -- the opaque stored resource body the sync layer moves verbatim.
  * For a plaintext collection this is the user document; for an encrypted one it
- * is the EDV envelope. The adapter never inspects or transforms it.
+ * is the EDV envelope. The adapter never inspects or transforms it. Re-exported
+ * from `@interop/was-client`, which owns the wire model, so a body crosses the
+ * port boundary without a cast.
+ */
+export type { Json };
+/**
+ * The optional half of a synced document, shared verbatim by every shape it
+ * travels in ({@link WireDoc} on the feed, {@link SyncedDoc} locally,
+ * {@link MasterState} on the conflict re-read): the independently-versioned
+ * metadata revision and body, the content body, and the content body's
+ * key-epoch stamp. Each is genuinely absent rather than `undefined` when the
+ * server has nothing for it, so every mapping between the shapes copies them
+ * conditionally -- see {@link copyOptionalBodyFields}.
+ */
+export interface OptionalBodyFields {
+    metaVersion?: number;
+    data?: Json;
+    custom?: Json;
+    epoch?: string;
+}
+/**
+ * Structural equality over two opaque bodies, by canonical-free JSON string.
+ * Decides whether the content or the metadata half changed -- which endpoint(s)
+ * a push writes, and whether two states compare equal for conflict resolution.
+ * Content-addressed collections never mutate `data` for a given id, and a real
+ * metadata edit re-encrypts to fresh bytes, so this coarse comparison suffices.
+ *
+ * @param left {Json | undefined}
+ * @param right {Json | undefined}
+ * @returns {boolean}
+ */
+export declare function bodiesEqual(left: Json | undefined, right: Json | undefined): boolean;
+/**
+ * Copies the {@link OptionalBodyFields} that are present on `source` onto
+ * `target`, leaving an absent field absent (never writing an explicit
+ * `undefined`, which would surface the key in a serialized body). The single
+ * place every wire-to-local, feed-to-master, and master-to-conflict mapping
+ * shares, so a new optional wire field is added once.
+ *
+ * @param options {object}
+ * @param options.source {OptionalBodyFields}
+ * @param options.target {OptionalBodyFields}   mutated in place
+ * @returns {void}
  */
-export type Json = null | boolean | number | string | Json[] | {
-    [key: string]: Json;
-};
+export declare function copyOptionalBodyFields({ source, target }: {
+    source: OptionalBodyFields;
+    target: OptionalBodyFields;
+}): void;
 /**
  * The keyset position in the change feed: the `{ id, updatedAt }` of the last
  * document a pull returned. Passed back verbatim to resume, and used as the
@@ -56,6 +104,12 @@ export interface WireDoc {
     metaVersion?: number;
     data?: Json;
     custom?: Json;
+    /**
+     * The opaque key-epoch id the content body was encrypted under (the
+     * `key-epochs` feature), present when the server holds a stamp for the
+     * resource. Moved verbatim; the sync layer never interprets it.
+     */
+    epoch?: string;
 }
 /**
  * The local RxDB document shape, shared across every synced collection. The
@@ -72,6 +126,13 @@ export interface SyncedDoc {
     metaVersion?: number;
     data?: Json;
     custom?: Json;
+    /**
+     * The opaque key-epoch id `data` was encrypted under, when known (stamped by
+     * the encrypting cipher on a local write, or pulled off the feed). Sent as
+     * the `WAS-Key-Epoch` header on the content push so the server's stamp stays
+     * in step with the envelope.
+     */
+    epoch?: string;
 }
 /**
  * The current master state of a single resource, as read back for the 412
@@ -85,6 +146,30 @@ export interface MasterState {
     metaVersion?: number;
     data?: Json;
     custom?: Json;
+    /**
+     * The key-epoch stamp of the master's content body, when the feed carries one.
+     */
+    epoch?: string;
+}
+/**
+ * The short-lived master-read memo the rows of ONE push batch share. A
+ * resolving `get` implementation may answer from `byId` and MUST record every
+ * master it resolved on the way there; a feed-walking implementation pages past
+ * all of them anyway, so a batch of k conflicts costs one walk instead of k.
+ *
+ * `inFlight` is what makes that hold under concurrency: the batch's rows push in
+ * parallel, so without it every row would start its own walk before the first
+ * one finished and the memo would never be read. A `get` that must walk
+ * publishes its walk here; a `get` that finds a walk already running awaits it
+ * and re-checks `byId` first. It settles (never rejects) so one row's failed
+ * read is not another row's, and is `null` whenever no walk is running.
+ *
+ * The whole object is created per batch invocation and dropped with it: a memo
+ * held across batches would go stale.
+ */
+export interface MasterReadCache {
+    byId: Map<string, MasterState | null>;
+    inFlight: Promise<void> | null;
 }
 /**
  * The write/query half of the injected WAS-access seam. An adapter (the app-side
@@ -124,15 +209,19 @@ export interface WasSyncBasePort {
     /**
      * Conditionally writes the content body verbatim (`PUT /:id`). Pass
      * `ifNoneMatch: true` for a create-if-absent, or `ifMatch` (a quoted ETag over
-     * the content `version`) for an update-if-unchanged. Returns the new content
-     * `version` parsed from the response ETag (the acked master revision), or
-     * `undefined` when the server does not supply one.
+     * the content `version`) for an update-if-unchanged. `epoch` is the opaque
+     * key-epoch id the body was encrypted under, sent as the `WAS-Key-Epoch`
+     * header (an absent epoch clears any prior stamp on the server, per the
+     * `key-epochs` feature). Returns the new content `version` parsed from the
+     * response ETag (the acked master revision), or `undefined` when the server
+     * does not supply one.
      *
      * @param options {object}
      * @param options.id {string}
      * @param options.data {Json}
      * @param [options.ifMatch] {string}
      * @param [options.ifNoneMatch] {boolean}
+     * @param [options.epoch] {string}
      * @returns {Promise<number | undefined>}
      */
     putContent(options: {
@@ -140,6 +229,7 @@ export interface WasSyncBasePort {
         data: Json;
         ifMatch?: string;
         ifNoneMatch?: boolean;
+        epoch?: string;
     }): Promise<number | undefined>;
     /**
      * Conditionally deletes a resource (writes a tombstone; `DELETE /:id`). Pass
@@ -162,23 +252,25 @@ export interface WasSyncBasePort {
     }): Promise<number | undefined>;
     /**
      * Conditionally writes the metadata body verbatim (`PUT /:id/meta`, body
-     * `{ custom }`). Pass `ifNoneMatch: true` when the resource has no metadata
-     * yet, or `ifMatch` (a quoted ETag over `metaVersion`) for an
-     * update-if-unchanged. The resource must already exist (the server does not
-     * create a resource from a `/meta` write). Returns the new `metaVersion`
-     * parsed from the response ETag, or `undefined` when the server does not
-     * supply one.
+     * `{ custom }`). An ABSENT `custom` writes the CLEARED state (a body with no
+     * `custom` member -- the server's metadata replace clears every property the
+     * body omits), so removing a resource's metadata replicates rather than being
+     * skipped. Pass `ifNoneMatch: true` when the resource has no metadata yet, or
+     * `ifMatch` (a quoted ETag over `metaVersion`) for an update-if-unchanged.
+     * The resource must already exist (the server does not create a resource from
+     * a `/meta` write). Returns the new `metaVersion` parsed from the response
+     * ETag, or `undefined` when the server does not supply one.
      *
      * @param options {object}
+     * @param [options.custom] {Json}   absent = write the cleared state
      * @param options.id {string}
-     * @param options.custom {Json}
      * @param [options.ifMatch] {string}
      * @param [options.ifNoneMatch] {boolean}
      * @returns {Promise<number | undefined>}
      */
     putMeta(options: {
         id: string;
-        custom: Json;
+        custom?: Json;
         ifMatch?: string;
         ifNoneMatch?: boolean;
     }): Promise<number | undefined>;
@@ -197,12 +289,20 @@ export interface WasSyncPort extends WasSyncBasePort {
      * cannot be resolved (e.g. a feed re-read that exhausts its scan budget), so
      * the replication cycle retries rather than fabricating a false tombstone.
      *
+     * `cache` is an OPTIONAL {@link MasterReadCache}, shared by the rows of one
+     * push batch (see its own docs for the contract). A hit is no staler than a
+     * read issued at the same moment, since the memo lives only for that batch. An
+     * implementation that ignores it is fully conformant, and a caller that omits
+     * it gets an uncached read.
+     *
      * @param options {object}
      * @param options.id {string}
+     * @param [options.cache] {MasterReadCache}
      * @returns {Promise<MasterState | null>}
      */
     get(options: {
         id: string;
+        cache?: MasterReadCache;
     }): Promise<MasterState | null>;
 }
 /**

package/dist/sync/types.d.ts.map

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

package/dist/sync/types.js

@@ -1,25 +1,43 @@
-/*!
- * Copyright (c) 2026 Interop Alliance. All rights reserved.
- */
 /**
- * Shared types for the collection-agnostic WAS replication adapter.
+ * Structural equality over two opaque bodies, by canonical-free JSON string.
+ * Decides whether the content or the metadata half changed -- which endpoint(s)
+ * a push writes, and whether two states compare equal for conflict resolution.
+ * Content-addressed collections never mutate `data` for a given id, and a real
+ * metadata edit re-encrypts to fresh bytes, so this coarse comparison suffices.
  *
- * The adapter drives an RxDB `replicateRxCollection` state machine against a
- * remote WAS Collection's replication endpoints. It is deliberately free of any
- * React or app imports so it can stand alone; all WAS access is injected through
- * the {@link WasSyncPort} seam rather than importing `@interop/was-client`
- * directly.
+ * @param left {Json | undefined}
+ * @param right {Json | undefined}
+ * @returns {boolean}
+ */
+export function bodiesEqual(left, right) {
+    return JSON.stringify(left ?? null) === JSON.stringify(right ?? null);
+}
+/**
+ * Copies the {@link OptionalBodyFields} that are present on `source` onto
+ * `target`, leaving an absent field absent (never writing an explicit
+ * `undefined`, which would surface the key in a serialized body). The single
+ * place every wire-to-local, feed-to-master, and master-to-conflict mapping
+ * shares, so a new optional wire field is added once.
  *
- * The wire contract follows the WAS `changes` feed and its V2 encrypted-metadata
- * profile: a synced document carries both a content revision (`version` /
- * `data`) and an independently-versioned metadata sub-resource (`metaVersion` /
- * `custom`). A metadata-only edit re-surfaces the resource with a bumped
- * `updatedAt` / `metaVersion` but unchanged `version` / `data`. The sync layer
- * moves both bodies opaquely: `data` is the stored content body (plaintext JSON,
- * or the EDV envelope on an encrypted collection) and `custom` is the stored
- * metadata body (an opaque envelope on an encrypted collection); encrypt/decrypt
- * stays a read/write-time concern above this layer.
+ * @param options {object}
+ * @param options.source {OptionalBodyFields}
+ * @param options.target {OptionalBodyFields}   mutated in place
+ * @returns {void}
  */
+export function copyOptionalBodyFields({ source, target }) {
+    if (source.data !== undefined) {
+        target.data = source.data;
+    }
+    if (source.metaVersion !== undefined) {
+        target.metaVersion = source.metaVersion;
+    }
+    if (source.custom !== undefined) {
+        target.custom = source.custom;
+    }
+    if (source.epoch !== undefined) {
+        target.epoch = source.epoch;
+    }
+}
 /**
  * Thrown by a {@link WasSyncPort} implementation when a conditional write is
  * rejected with `412 precondition-failed` (a lost-update conflict, or a

package/dist/sync/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/sync/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;;GAkBG;AA+LH;;;;;;GAMG;AACH,MAAM,OAAO,oBAAqB,SAAQ,KAAK;IAC7C,YAAY,OAAO,GAAG,4CAA4C;QAChE,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,sBAAsB,CAAA;IACpC,CAAC;CACF;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IAChC,MAAM,CAAQ;IACvB,YAAY,MAAc;QACxB,KAAK,CAAC,mCAAmC,MAAM,IAAI,CAAC,CAAA;QACpD,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAA;QAC9B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;CACF"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/sync/types.ts"],"names":[],"mappings":"AAqDA;;;;;;;;;;GAUG;AACH,MAAM,UAAU,WAAW,CACzB,IAAsB,EACtB,KAAuB;IAEvB,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,IAAI,CAAC,CAAA;AACvE,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,sBAAsB,CAAC,EACrC,MAAM,EACN,MAAM,EAIP;IACC,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC9B,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;IAC3B,CAAC;IACD,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QACrC,MAAM,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAA;IACzC,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAChC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;IAC/B,CAAC;IACD,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC/B,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;IAC7B,CAAC;AACH,CAAC;AA8OD;;;;;;GAMG;AACH,MAAM,OAAO,oBAAqB,SAAQ,KAAK;IAC7C,YAAY,OAAO,GAAG,4CAA4C;QAChE,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,sBAAsB,CAAA;IACpC,CAAC;CACF;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IAChC,MAAM,CAAQ;IACvB,YAAY,MAAc;QACxB,KAAK,CAAC,mCAAmC,MAAM,IAAI,CAAC,CAAA;QACpD,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAA;QAC9B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;CACF"}

package/dist/sync/wasSyncPort.d.ts

@@ -26,17 +26,6 @@
 import { type WasClient } from '@interop/was-client';
 import type { IZcap } from '@interop/data-integrity-core';
 import { type WasSyncBasePort } from './types.js';
-/**
- * Extracts an HTTP status from a raw ky/ezcap error. `was.request()` rejects on
- * any non-2xx with `err.status` set (see `@interop/http-client`'s error
- * normaliser); this reads it defensively from either location. Shared with the
- * remote store's descriptor PUT and the dev-grant provisioner, which need the raw
- * status for diagnostics rather than the mapped sync error.
- *
- * @param err {unknown}
- * @returns {number | undefined}
- */
-export declare function errorStatus(err: unknown): number | undefined;
 /**
  * Normalizes an unknown caught error into a display string: the `Error`'s
  * `message` when it is one, else its `String(...)` coercion. Shared by the

package/dist/sync/wasSyncPort.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wasSyncPort.d.ts","sourceRoot":"","sources":["../../src/sync/wasSyncPort.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,OAAO,EAA0B,KAAK,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC5E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAA;AACzD,OAAO,EAIL,KAAK,eAAe,EAErB,MAAM,YAAY,CAAA;AAEnB;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAK5D;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAEjD;AAgDD;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAAC,EAChC,GAAG,EACH,OAAO,EACP,YAAY,EACZ,UAAU,EACX,EAAE;IACD,GAAG,EAAE,SAAS,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,CAAC,EAAE,KAAK,CAAA;CACnB,GAAG,eAAe,CAwGlB"}
+{"version":3,"file":"wasSyncPort.d.ts","sourceRoot":"","sources":["../../src/sync/wasSyncPort.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,OAAO,EAA0B,KAAK,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAE5E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAA;AAEzD,OAAO,EAIL,KAAK,eAAe,EAErB,MAAM,YAAY,CAAA;AAEnB;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAEjD;AAgCD;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAAC,EAChC,GAAG,EACH,OAAO,EACP,YAAY,EACZ,UAAU,EACX,EAAE;IACD,GAAG,EAAE,SAAS,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,CAAC,EAAE,KAAK,CAAA;CACnB,GAAG,eAAe,CAkHlB"}