@fluidframework/container-runtime 2.41.0-338401 → 2.41.0

package/src/opLifecycle/batchManager.ts

@@ -11,6 +11,7 @@ import {
 } from "@fluidframework/telemetry-utils/internal";
 
 import { ICompressionRuntimeOptions } from "../compressionDefinitions.js";
+import { isContainerMessageDirtyable } from "../containerRuntime.js";
 import { asBatchMetadata, type IBatchMetadata } from "../metadata.js";
 import type { IPendingMessage } from "../pendingStateManager.js";
 
@@ -168,6 +169,13 @@ export class BatchManager {
 			},
 		};
 	}
+
+	/**
+	 * Does this batch current contain user changes ("dirtyable" ops)?
+	 */
+	public containsUserChanges(): boolean {
+		return this.pendingBatch.some((message) => isContainerMessageDirtyable(message.runtimeOp));
+	}
 }
 
 const addBatchMetadata = (batch: LocalBatch, batchId?: BatchId): LocalBatch => {

package/src/opLifecycle/outbox.ts

@@ -236,6 +236,13 @@ export class Outbox {
 		return this.messageCount === 0;
 	}
 
+	public containsUserChanges(): boolean {
+		return (
+			this.mainBatch.containsUserChanges() || this.blobAttachBatch.containsUserChanges()
+			// ID Allocation ops are not user changes
+		);
+	}
+
 	/**
 	 * Detect whether batching has been interrupted by an incoming message being processed. In this case,
 	 * we will flush the accumulated messages to account for that (if allowed) and create a new batch with the new
@@ -440,7 +447,7 @@ export class Outbox {
 		const staged = rawBatch.staged === true;
 		assert(
 			resubmitInfo === undefined || resubmitInfo.staged === staged,
-			"Mismatch in staged state tracking",
+			0xba3 /* Mismatch in staged state tracking */,
 		);
 
 		const groupingEnabled =

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/container-runtime";
-export const pkgVersion = "2.41.0-338401";
+export const pkgVersion = "2.41.0";

package/src/pendingStateManager.ts

@@ -15,6 +15,7 @@ import {
 import Deque from "double-ended-queue";
 import { v4 as uuid } from "uuid";
 
+import { isContainerMessageDirtyable } from "./containerRuntime.js";
 import {
 	type InboundContainerRuntimeMessage,
 	type InboundSequencedContainerRuntimeMessage,
@@ -282,6 +283,22 @@ export class PendingStateManager implements IDisposable {
 		return this.pendingMessages.length + this.initialMessages.length;
 	}
 
+	/**
+	 * Checks the pending messages to see if any of them represent user changes (aka "dirtyable" messages)
+	 */
+	public hasPendingUserChanges(): boolean {
+		for (let i = 0; i < this.pendingMessages.length; i++) {
+			const element = this.pendingMessages.get(i);
+			// Missing runtimeOp implies not dirtyable: This only happens for empty batches
+			if (element?.runtimeOp !== undefined && isContainerMessageDirtyable(element.runtimeOp)) {
+				return true;
+			}
+		}
+		// Consider any initial messages to be user changes
+		// (it's an approximation since we would have to parse them to know for sure)
+		return this.initialMessages.length > 0;
+	}
+
 	/**
 	 * The minimumPendingMessageSequenceNumber is the minimum of the first pending message and the first initial message.
 	 *

package/src/runCounter.ts

@@ -45,7 +45,10 @@ export class BatchRunCounter extends RunCounter {
 	}
 
 	public run<T>(act: () => T, resubmitInfo?: BatchResubmitInfo): T {
-		assert(this.#resubmitInfo === undefined, "Reentrancy not allowed in BatchRunCounter");
+		assert(
+			this.#resubmitInfo === undefined,
+			0xba2 /* Reentrancy not allowed in BatchRunCounter */,
+		);
 		this.#resubmitInfo = resubmitInfo;
 		try {
 			return super.run(act);