@lunora/do 1.0.0-alpha.11 → 1.0.0-alpha.13

package/dist/index.d.mts

@@ -5045,10 +5045,22 @@ declare abstract class ShardDO {
   */
   protected respondFromIdempotencyCache(functionPath: string, dispatchStartedAt: number, mutatorClass: ClientMutationClass | undefined, cachedValue: unknown): Response;
   /**
+  * The CDC cursor a just-committed plain mutation landed at — the post-write
+  * high-watermark, on the same scale as the `cursor` on `data`/`delta` frames.
+  * The client drops a pending per-call optimistic overlay once it sees a frame
+  * with `cursor >= commitCursor` (gapless reconciliation that keeps mutations
+  * concurrent, without the serialized custom-mutator watermark). Scoped to a
+  * mutation (carries an `x-lunora-mutation-id`) on a CDC-enabled shard;
+  * `undefined` otherwise, leaving the wire byte-identical for queries/actions
+  * and CDC-off shards.
+  */
+  protected mutationCommitCursor(): number | undefined;
+  /**
   * Build the success response for a dispatched RPC. A `"next"` custom-mutator
   * push echoes the applied `lastMutationId` so the client drops the pending
-  * optimistic overlay as soon as the ack lands; ordinary calls return the bare
-  * `{ result }` envelope unchanged.
+  * optimistic overlay as soon as the ack lands; a plain mutation echoes
+  * `commitCursor` (see {@link mutationCommitCursor}); other calls return the
+  * bare `{ result }` envelope unchanged.
   */
   protected buildDispatchResponse(mutatorClass: ClientMutationClass | undefined, result: unknown): Response;
   /**

package/dist/index.d.ts

@@ -5045,10 +5045,22 @@ declare abstract class ShardDO {
   */
   protected respondFromIdempotencyCache(functionPath: string, dispatchStartedAt: number, mutatorClass: ClientMutationClass | undefined, cachedValue: unknown): Response;
   /**
+  * The CDC cursor a just-committed plain mutation landed at — the post-write
+  * high-watermark, on the same scale as the `cursor` on `data`/`delta` frames.
+  * The client drops a pending per-call optimistic overlay once it sees a frame
+  * with `cursor >= commitCursor` (gapless reconciliation that keeps mutations
+  * concurrent, without the serialized custom-mutator watermark). Scoped to a
+  * mutation (carries an `x-lunora-mutation-id`) on a CDC-enabled shard;
+  * `undefined` otherwise, leaving the wire byte-identical for queries/actions
+  * and CDC-off shards.
+  */
+  protected mutationCommitCursor(): number | undefined;
+  /**
   * Build the success response for a dispatched RPC. A `"next"` custom-mutator
   * push echoes the applied `lastMutationId` so the client drops the pending
-  * optimistic overlay as soon as the ack lands; ordinary calls return the bare
-  * `{ result }` envelope unchanged.
+  * optimistic overlay as soon as the ack lands; a plain mutation echoes
+  * `commitCursor` (see {@link mutationCommitCursor}); other calls return the
+  * bare `{ result }` envelope unchanged.
   */
   protected buildDispatchResponse(mutatorClass: ClientMutationClass | undefined, result: unknown): Response;
   /**

package/dist/index.mjs

@@ -23,7 +23,7 @@ export { RLS_UNWRAP_SYMBOL, RlsRequiredError, guardWriter } from './packem_share
 export { buildFtsMatch, ftsTableName, scoreDocument, stringifySearchText, tokenizeSearch } from './packem_shared/buildFtsMatch-BLEMawrp.mjs';
 export { M as MIN_ADMIN_TOKEN_LENGTH, a as MIN_AUTH_SECRET_LENGTH, b as buildSecurityAudit } from './packem_shared/security-audit-CucgBice.mjs';
 export { SESSION_DO_TTL_DEFAULT, SessionDO } from './packem_shared/SESSION_DO_TTL_DEFAULT-ilPZsVwu.mjs';
-export { ROOT_DO_SIZE_WARN_BYTES, ROOT_SHARD_NAME, ShardDO } from './packem_shared/ROOT_DO_SIZE_WARN_BYTES-DtZqOBIF.mjs';
+export { ROOT_DO_SIZE_WARN_BYTES, ROOT_SHARD_NAME, ShardDO } from './packem_shared/ROOT_DO_SIZE_WARN_BYTES-XEs4csIH.mjs';
 export { SHARD_REGISTRY_DO_NAME, ShardRegistryDO } from './packem_shared/SHARD_REGISTRY_DO_NAME-BsAbi5Mn.mjs';
 export { MAX_SQL_ROWS, assertReadonly, runReadonlySql } from './packem_shared/MAX_SQL_ROWS-dDcFE1YZ.mjs';
 export { createSystemReader } from './packem_shared/createSystemReader-8CzSZP9V.mjs';

package/dist/packem_shared/{ROOT_DO_SIZE_WARN_BYTES-DtZqOBIF.mjs → ROOT_DO_SIZE_WARN_BYTES-XEs4csIH.mjs}

@@ -1391,6 +1391,9 @@ class ShardDO {
       }
       const result = await this.handleRpc(payload.functionPath, payload.args ?? {});
       this.recordPostDispatchBookkeeping(result, mutatorClass);
+      if (mutatorClass?.kind === "next") {
+        this.advanceClientMutationWatermark();
+      }
       const durationMs = Date.now() - dispatchStartedAt;
       this.recordFunctionCall(payload.functionPath, durationMs, void 0, this.currentScannedTables, this.currentIndexHits);
       this.flushStmtSamples();
@@ -2423,19 +2426,35 @@ class ShardDO {
       this.advanceClientMutationWatermark();
       return this.buildDispatchResponse(mutatorClass, cachedValue);
     }
-    return jsonResponse({ result: cachedValue }, 200, this.currentResponseBookmark);
+    const commitCursor = this.mutationCommitCursor();
+    return jsonResponse(commitCursor === void 0 ? { result: cachedValue } : { commitCursor, result: cachedValue }, 200, this.currentResponseBookmark);
+  }
+  /**
+   * The CDC cursor a just-committed plain mutation landed at — the post-write
+   * high-watermark, on the same scale as the `cursor` on `data`/`delta` frames.
+   * The client drops a pending per-call optimistic overlay once it sees a frame
+   * with `cursor >= commitCursor` (gapless reconciliation that keeps mutations
+   * concurrent, without the serialized custom-mutator watermark). Scoped to a
+   * mutation (carries an `x-lunora-mutation-id`) on a CDC-enabled shard;
+   * `undefined` otherwise, leaving the wire byte-identical for queries/actions
+   * and CDC-off shards.
+   */
+  mutationCommitCursor() {
+    return this.currentRequestMutationId === void 0 ? void 0 : this.currentCdcCursor();
   }
   /**
    * Build the success response for a dispatched RPC. A `"next"` custom-mutator
    * push echoes the applied `lastMutationId` so the client drops the pending
-   * optimistic overlay as soon as the ack lands; ordinary calls return the bare
-   * `{ result }` envelope unchanged.
+   * optimistic overlay as soon as the ack lands; a plain mutation echoes
+   * `commitCursor` (see {@link mutationCommitCursor}); other calls return the
+   * bare `{ result }` envelope unchanged.
    */
   buildDispatchResponse(mutatorClass, result) {
     if (mutatorClass?.kind === "next") {
       return jsonResponse({ lastMutationId: this.currentRequestClientSeq, result }, 200, this.currentResponseBookmark);
     }
-    return jsonResponse({ result }, 200, this.currentResponseBookmark);
+    const commitCursor = this.mutationCommitCursor();
+    return jsonResponse(commitCursor === void 0 ? { result } : { commitCursor, result }, 200, this.currentResponseBookmark);
   }
   /**
    * Commit a mutation's replay bookkeeping — the `(identity, mutationId)`
@@ -4841,9 +4860,8 @@ class ShardDO {
     if (existing?.lastJson === json) {
       existing.tables = outcome.tables;
       const settledWatermark = this.socketClientWatermark(ws);
-      if (settledWatermark !== void 0) {
-        trySendFrame(ws, `{"type":"settled","id":${JSON.stringify(subId)},"lastMutationId":${String(settledWatermark)}${cursorSuffix}}`);
-      }
+      const watermarkField = settledWatermark === void 0 ? "" : `,"lastMutationId":${String(settledWatermark)}`;
+      trySendFrame(ws, `{"type":"settled","id":${JSON.stringify(subId)}${watermarkField}${cursorSuffix}}`);
       return;
     }
     const deltaFrames = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lunora/do",
-  "version": "1.0.0-alpha.11",
+  "version": "1.0.0-alpha.13",
   "description": "Lunora Durable Objects: ShardDO (SQLite, OCC, hibernated WebSocket subscriptions) and SessionDO",
   "keywords": [
     "cloudflare",