@fluidframework/container-runtime 2.0.0-rc.1.0.6 → 2.0.0-rc.2.0.1

package/src/opLifecycle/opCompressor.ts

@@ -8,9 +8,9 @@ import { assert } from "@fluidframework/core-utils";
 import { IsoBuffer } from "@fluid-internal/client-utils";
 import { compress } from "lz4js";
 import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
-import { CompressionAlgorithms } from "../containerRuntime";
-import { estimateSocketSize } from "./batchManager";
-import { IBatch, BatchMessage } from "./definitions";
+import { CompressionAlgorithms } from "../containerRuntime.js";
+import { estimateSocketSize } from "./batchManager.js";
+import { IBatch, BatchMessage } from "./definitions.js";
 
 /**
  * Compresses batches of ops. It generates a single compressed op that contains

package/src/opLifecycle/opDecompressor.ts

@@ -9,9 +9,9 @@ import { assert } from "@fluidframework/core-utils";
 import { IsoBuffer, Uint8ArrayToString } from "@fluid-internal/client-utils";
 import { createChildLogger } from "@fluidframework/telemetry-utils";
 import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
-import { CompressionAlgorithms } from "../containerRuntime";
-import { IBatchMetadata } from "../metadata";
-import { IMessageProcessingResult } from "./definitions";
+import { CompressionAlgorithms } from "../containerRuntime.js";
+import { IBatchMetadata } from "../metadata.js";
+import { IMessageProcessingResult } from "./definitions.js";
 
 /**
  * Compression makes assumptions about the shape of message contents. This interface codifies those assumptions, but does not validate them.

package/src/opLifecycle/opGroupingManager.ts

@@ -7,8 +7,8 @@ import { assert } from "@fluidframework/core-utils";
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
 import { createChildLogger } from "@fluidframework/telemetry-utils";
 import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
-import { ContainerMessageType } from "../messageTypes";
-import { IBatch } from "./definitions";
+import { ContainerMessageType } from "../messageTypes.js";
+import { IBatch } from "./definitions.js";
 
 /**
  * Grouping makes assumptions about the shape of message contents. This interface codifies those assumptions, but does not validate them.
@@ -96,21 +96,12 @@ export class OpGroupingManager {
 	}
 
 	public ungroupOp(op: ISequencedDocumentMessage): ISequencedDocumentMessage[] {
-		let fakeCsn = 1;
 		if (!isGroupContents(op.contents)) {
-			// Align the worlds of what clientSequenceNumber represents when grouped batching is enabled
-			if (this.config.groupedBatchingEnabled) {
-				return [
-					{
-						...op,
-						clientSequenceNumber: fakeCsn,
-					},
-				];
-			}
 			return [op];
 		}
 
 		const messages = op.contents.contents;
+		let fakeCsn = 1;
 		return messages.map((subMessage) => ({
 			...op,
 			clientSequenceNumber: fakeCsn++,

package/src/opLifecycle/opSplitter.ts

@@ -12,9 +12,9 @@ import { assert } from "@fluidframework/core-utils";
 import { IBatchMessage } from "@fluidframework/container-definitions";
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
 import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
-import { ContainerMessageType, ContainerRuntimeChunkedOpMessage } from "../messageTypes";
-import { estimateSocketSize } from "./batchManager";
-import { BatchMessage, IBatch, IChunkedOp, IMessageProcessingResult } from "./definitions";
+import { ContainerMessageType, ContainerRuntimeChunkedOpMessage } from "../messageTypes.js";
+import { estimateSocketSize } from "./batchManager.js";
+import { BatchMessage, IBatch, IChunkedOp, IMessageProcessingResult } from "./definitions.js";
 
 /**
  * Responsible for creating and reconstructing chunked messages.

package/src/opLifecycle/outbox.ts

@@ -12,18 +12,19 @@ import {
 import { assert } from "@fluidframework/core-utils";
 import { IBatchMessage, ICriticalContainerError } from "@fluidframework/container-definitions";
 import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
-import { ICompressionRuntimeOptions } from "../containerRuntime";
-import { IPendingBatchMessage, PendingStateManager } from "../pendingStateManager";
+import { ICompressionRuntimeOptions } from "../containerRuntime.js";
+import { IPendingBatchMessage, PendingStateManager } from "../pendingStateManager.js";
+import { ContainerMessageType } from "../messageTypes.js";
 import {
 	BatchManager,
 	BatchSequenceNumbers,
 	estimateSocketSize,
 	sequenceNumbersMatch,
-} from "./batchManager";
-import { BatchMessage, IBatch, IBatchCheckpoint } from "./definitions";
-import { OpCompressor } from "./opCompressor";
-import { OpGroupingManager } from "./opGroupingManager";
-import { OpSplitter } from "./opSplitter";
+} from "./batchManager.js";
+import { BatchMessage, IBatch, IBatchCheckpoint } from "./definitions.js";
+import { OpCompressor } from "./opCompressor.js";
+import { OpGroupingManager } from "./opGroupingManager.js";
+import { OpSplitter } from "./opSplitter.js";
 
 export interface IOutboxConfig {
 	readonly compressionOptions: ICompressionRuntimeOptions;
@@ -136,10 +137,12 @@ export class Outbox {
 		const mainBatchSeqNums = this.mainBatch.sequenceNumbers;
 		const attachFlowBatchSeqNums = this.attachFlowBatch.sequenceNumbers;
 		const blobAttachSeqNums = this.blobAttachBatch.sequenceNumbers;
+		const idAllocSeqNums = this.idAllocationBatch.sequenceNumbers;
 		assert(
 			this.params.config.disablePartialFlush ||
 				(sequenceNumbersMatch(mainBatchSeqNums, attachFlowBatchSeqNums) &&
-					sequenceNumbersMatch(mainBatchSeqNums, blobAttachSeqNums)),
+					sequenceNumbersMatch(mainBatchSeqNums, blobAttachSeqNums) &&
+					sequenceNumbersMatch(mainBatchSeqNums, idAllocSeqNums)),
 			0x58d /* Reference sequence numbers from both batches must be in sync */,
 		);
 
@@ -148,7 +151,8 @@ export class Outbox {
 		if (
 			sequenceNumbersMatch(mainBatchSeqNums, currentSequenceNumbers) &&
 			sequenceNumbersMatch(attachFlowBatchSeqNums, currentSequenceNumbers) &&
-			sequenceNumbersMatch(blobAttachSeqNums, currentSequenceNumbers)
+			sequenceNumbersMatch(blobAttachSeqNums, currentSequenceNumbers) &&
+			sequenceNumbersMatch(idAllocSeqNums, currentSequenceNumbers)
 		) {
 			// The reference sequence numbers are stable, there is nothing to do
 			return;
@@ -178,12 +182,20 @@ export class Outbox {
 	}
 
 	public submit(message: BatchMessage) {
+		assert(
+			message.type !== ContainerMessageType.IdAllocation,
+			0x8f8 /* Allocation message submitted to mainBatch. */,
+		);
 		this.maybeFlushPartialBatch();
 
 		this.addMessageToBatchManager(this.mainBatch, message);
 	}
 
 	public submitAttach(message: BatchMessage) {
+		assert(
+			message.type === ContainerMessageType.Attach,
+			0x8f9 /* Non attach message submitted to attachFlowBatch. */,
+		);
 		this.maybeFlushPartialBatch();
 
 		if (
@@ -215,6 +227,10 @@ export class Outbox {
 	}
 
 	public submitBlobAttach(message: BatchMessage) {
+		assert(
+			message.type === ContainerMessageType.BlobAttach,
+			0x8fa /* Non blobAttach message submitted to blobAttachBatch. */,
+		);
 		this.maybeFlushPartialBatch();
 
 		this.addMessageToBatchManager(this.blobAttachBatch, message);
@@ -233,6 +249,10 @@ export class Outbox {
 	}
 
 	public submitIdAllocation(message: BatchMessage) {
+		assert(
+			message.type === ContainerMessageType.IdAllocation,
+			0x8fb /* Non allocation message submitted to idAllocationBatch. */,
+		);
 		this.maybeFlushPartialBatch();
 
 		if (

package/src/opLifecycle/remoteMessageProcessor.ts

@@ -10,10 +10,10 @@ import {
 	type InboundSequencedContainerRuntimeMessage,
 	type InboundSequencedContainerRuntimeMessageOrSystemMessage,
 	type InboundSequencedRecentlyAddedContainerRuntimeMessage,
-} from "../messageTypes";
-import { OpDecompressor } from "./opDecompressor";
-import { OpGroupingManager } from "./opGroupingManager";
-import { OpSplitter } from "./opSplitter";
+} from "../messageTypes.js";
+import { OpDecompressor } from "./opDecompressor.js";
+import { OpGroupingManager } from "./opGroupingManager.js";
+import { OpSplitter } from "./opSplitter.js";
 
 /**
  * Stateful class for processing incoming remote messages as the virtualization measures are unwrapped,

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/container-runtime";
-export const pkgVersion = "2.0.0-rc.1.0.6";
+export const pkgVersion = "2.0.0-rc.2.0.1";

package/src/pendingStateManager.ts

@@ -11,9 +11,9 @@ import { ICriticalContainerError } from "@fluidframework/container-definitions";
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
 import { DataProcessingError, ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
 
-import { InboundSequencedContainerRuntimeMessage } from "./messageTypes";
-import { pkgVersion } from "./packageVersion";
-import { IBatchMetadata } from "./metadata";
+import { InboundSequencedContainerRuntimeMessage } from "./messageTypes.js";
+import { pkgVersion } from "./packageVersion.js";
+import { IBatchMetadata } from "./metadata.js";
 
 /**
  * This represents a message that has been submitted and is added to the pending queue when `submit` is called on the
@@ -48,6 +48,7 @@ export interface IRuntimeStateHandler {
 	reSubmit(message: IPendingBatchMessage): void;
 	reSubmitBatch(batch: IPendingBatchMessage[]): void;
 	isActiveConnection: () => boolean;
+	isAttached: () => boolean;
 }
 
 /** Union of keys of T */
@@ -182,28 +183,33 @@ export class PendingStateManager implements IDisposable {
 	public async applyStashedOpsAt(seqNum?: number) {
 		// apply stashed ops at sequence number
 		while (!this.initialMessages.isEmpty()) {
-			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-			const nextMessage = this.initialMessages.peekFront()!;
 			if (seqNum !== undefined) {
-				if (nextMessage.referenceSequenceNumber > seqNum) {
+				// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+				const peekMessage = this.initialMessages.peekFront()!;
+				if (peekMessage.referenceSequenceNumber > seqNum) {
 					break; // nothing left to do at this sequence number
 				}
-				if (nextMessage.referenceSequenceNumber < seqNum) {
+				if (peekMessage.referenceSequenceNumber < seqNum) {
 					throw new Error("loaded from snapshot too recent to apply stashed ops");
 				}
 			}
-
+			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+			const nextMessage = this.initialMessages.shift()!;
 			try {
 				// applyStashedOp will cause the DDS to behave as if it has sent the op but not actually send it
 				const localOpMetadata = await this.stateHandler.applyStashedOp(nextMessage.content);
-				nextMessage.localOpMetadata = localOpMetadata;
+				if (!this.stateHandler.isAttached()) {
+					if (localOpMetadata !== undefined) {
+						throw new Error("Local Op Metadata must be undefined when not attached");
+					}
+				} else {
+					nextMessage.localOpMetadata = localOpMetadata;
+					// then we push onto pendingMessages which will cause PendingStateManager to resubmit when we connect
+					this.pendingMessages.push(nextMessage);
+				}
 			} catch (error) {
 				throw DataProcessingError.wrapIfUnrecognized(error, "applyStashedOp", nextMessage);
 			}
-
-			// then we push onto pendingMessages which will cause PendingStateManager to resubmit when we connect
-			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-			this.pendingMessages.push(this.initialMessages.shift()!);
 		}
 	}
 

package/src/scheduleManager.ts

@@ -2,7 +2,6 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { EventEmitter } from "events";
 import { IDeltaManager } from "@fluidframework/container-definitions";
 import { IDocumentMessage, ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
 import {
@@ -13,11 +12,12 @@ import {
 	ITelemetryLoggerExt,
 } from "@fluidframework/telemetry-utils";
 import { assert } from "@fluidframework/core-utils";
+import type { EventEmitter } from "@fluid-internal/client-utils";
 import { performance } from "@fluid-internal/client-utils";
 import { isRuntimeMessage } from "@fluidframework/driver-utils";
-import { DeltaScheduler } from "./deltaScheduler";
-import { pkgVersion } from "./packageVersion";
-import { IBatchMetadata } from "./metadata";
+import { DeltaScheduler } from "./deltaScheduler.js";
+import { pkgVersion } from "./packageVersion.js";
+import { IBatchMetadata } from "./metadata.js";
 
 type IRuntimeMessageMetadata =
 	| undefined

package/src/summary/index.ts

@@ -10,28 +10,28 @@ export {
 	ITrackedClient,
 	OrderedClientCollection,
 	OrderedClientElection,
-} from "./orderedClientElection";
-export { defaultMaxAttemptsForSubmitFailures, RunningSummarizer } from "./runningSummarizer";
+} from "./orderedClientElection.js";
+export { defaultMaxAttemptsForSubmitFailures, RunningSummarizer } from "./runningSummarizer.js";
 export {
 	ICancellableSummarizerController,
 	neverCancelledSummaryToken,
 	RunWhileConnectedCoordinator,
-} from "./runWhileConnectedCoordinator";
-export { Summarizer } from "./summarizer";
+} from "./runWhileConnectedCoordinator.js";
+export { Summarizer } from "./summarizer.js";
 export {
 	ISummarizerClientElection,
 	ISummarizerClientElectionEvents,
 	SummarizerClientElection,
 	summarizerClientType,
-} from "./summarizerClientElection";
-export { SummarizeHeuristicData, SummarizeHeuristicRunner } from "./summarizerHeuristics";
+} from "./summarizerClientElection.js";
+export { SummarizeHeuristicData, SummarizeHeuristicRunner } from "./summarizerHeuristics.js";
 export {
 	createRootSummarizerNode,
 	createRootSummarizerNodeWithGC,
 	IRefreshSummaryResult,
 	IRootSummarizerNode,
 	IRootSummarizerNodeWithGC,
-} from "./summarizerNode";
+} from "./summarizerNode/index.js";
 export {
 	IConnectableRuntime,
 	IGeneratedSummaryStats,
@@ -65,7 +65,7 @@ export {
 	SummaryStage,
 	IRetriableFailureResult,
 	ISummarizeEventProps,
-} from "./summarizerTypes";
+} from "./summarizerTypes.js";
 export {
 	IAckedSummary,
 	ISummaryCollectionOpEvents,
@@ -77,7 +77,7 @@ export {
 	ISummaryNackMessage,
 	OpActionEventListener,
 	OpActionEventName,
-} from "./summaryCollection";
+} from "./summaryCollection.js";
 export {
 	aliasBlobName,
 	blobsTreeName,
@@ -98,12 +98,13 @@ export {
 	WriteFluidDataStoreAttributes,
 	wrapSummaryInChannelsTree,
 	idCompressorBlobName,
-} from "./summaryFormat";
-export { getFailMessage, RetriableSummaryError, SummarizeReason } from "./summaryGenerator";
+	IdCompressorMode,
+} from "./summaryFormat.js";
+export { getFailMessage, RetriableSummaryError, SummarizeReason } from "./summaryGenerator.js";
 export {
 	IConnectedEvents,
 	IConnectedState,
 	ISummaryManagerConfig,
 	SummaryManager,
 	SummaryManagerState,
-} from "./summaryManager";
+} from "./summaryManager.js";

package/src/summary/orderedClientElection.ts

@@ -13,7 +13,7 @@ import { assert } from "@fluidframework/core-utils";
 import { TypedEventEmitter } from "@fluid-internal/client-utils";
 import { IDeltaManager } from "@fluidframework/container-definitions";
 import { IClient, IQuorumClients, ISequencedClient } from "@fluidframework/protocol-definitions";
-import { summarizerClientType } from "./summarizerClientElection";
+import { summarizerClientType } from "./summarizerClientElection.js";
 
 // helper types for recursive readonly.
 // eslint-disable-next-line @typescript-eslint/ban-types

package/src/summary/runWhileConnectedCoordinator.ts

@@ -8,7 +8,7 @@ import {
 	SummarizerStopReason,
 	IConnectableRuntime,
 	ISummaryCancellationToken,
-} from "./summarizerTypes";
+} from "./summarizerTypes.js";
 
 /**
  * Similar to AbortController, but using promise instead of events