@fluidframework/container-runtime 2.0.0-internal.3.1.0 → 2.0.0-internal.3.2.0

package/src/pendingStateManager.ts

@@ -175,13 +175,11 @@ export class PendingStateManager implements IDisposable {
 	 * Called when a message is submitted locally. Adds the message and the associated details to the pending state
 	 * queue.
 	 * @param type - The container message type.
-	 * @param clientSequenceNumber - The clientSequenceNumber associated with the message.
 	 * @param content - The message content.
 	 * @param localOpMetadata - The local metadata associated with the message.
 	 */
 	public onSubmitMessage(
 		type: ContainerMessageType,
-		clientSequenceNumber: number,
 		referenceSequenceNumber: number,
 		content: any,
 		localOpMetadata: unknown,
@@ -190,7 +188,7 @@ export class PendingStateManager implements IDisposable {
 		const pendingMessage: IPendingMessage = {
 			type: "message",
 			messageType: type,
-			clientSequenceNumber,
+			clientSequenceNumber: -1, // dummy value (not to be used anywhere)
 			referenceSequenceNumber,
 			content,
 			localOpMetadata,
@@ -248,18 +246,34 @@ export class PendingStateManager implements IDisposable {
 		);
 		this.pendingMessages.shift();
 
-		// Processing part - Verify that there has been no data corruption.
-		// The clientSequenceNumber of the incoming message must match that of the pending message.
-		if (pendingMessage.clientSequenceNumber !== message.clientSequenceNumber) {
+		if (pendingMessage.messageType !== message.type) {
 			// Close the container because this could indicate data corruption.
-			const error = DataProcessingError.create(
-				"pending local message clientSequenceNumber mismatch",
-				"unexpectedAckReceived",
-				message,
-				{ expectedClientSequenceNumber: pendingMessage.clientSequenceNumber },
+			this.stateHandler.close(
+				DataProcessingError.create(
+					"pending local message type mismatch",
+					"unexpectedAckReceived",
+					message,
+					{
+						expectedMessageType: pendingMessage.messageType,
+					},
+				),
 			);
+			return;
+		}
+
+		const pendingMessageContent = JSON.stringify(pendingMessage.content);
+		const messageContent = JSON.stringify(message.contents);
 
-			this.stateHandler.close(error);
+		// Stringified content does not match
+		if (pendingMessageContent !== messageContent) {
+			// Close the container because this could indicate data corruption.
+			this.stateHandler.close(
+				DataProcessingError.create(
+					"pending local message content mismatch",
+					"unexpectedAckReceived",
+					message,
+				),
+			);
 			return;
 		}
 
@@ -329,8 +343,6 @@ export class PendingStateManager implements IDisposable {
 								hasBatchStart: batchBeginMetadata === true,
 								hasBatchEnd: batchEndMetadata === false,
 								messageType: message.type,
-								batchStartSequenceNumber:
-									this.pendingBatchBeginMessage.clientSequenceNumber,
 								pendingMessagesCount: this.pendingMessagesCount,
 							},
 						),

package/src/summary/index.ts

@@ -0,0 +1,99 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+export {
+	IOrderedClientCollection,
+	IOrderedClientElection,
+	ISerializedElection,
+	ITrackedClient,
+	OrderedClientCollection,
+	OrderedClientElection,
+} from "./orderedClientElection";
+export { RunningSummarizer } from "./runningSummarizer";
+export {
+	ICancellableSummarizerController,
+	neverCancelledSummaryToken,
+	RunWhileConnectedCoordinator,
+} from "./runWhileConnectedCoordinator";
+export { Summarizer } from "./summarizer";
+export {
+	ISummarizerClientElection,
+	ISummarizerClientElectionEvents,
+	SummarizerClientElection,
+	summarizerClientType,
+} from "./summarizerClientElection";
+export { SummarizerHandle } from "./summarizerHandle";
+export { SummarizeHeuristicData, SummarizeHeuristicRunner } from "./summarizerHeuristics";
+export {
+	IConnectableRuntime,
+	IGeneratedSummaryStats,
+	IRefreshSummaryAckOptions,
+	ISubmitSummaryOptions,
+	ISummarizeAttempt,
+	ISummarizeHeuristicData,
+	ISummarizer,
+	ISummarizeResults,
+	ISummarizerEvents,
+	ISummarizerInternalsProvider,
+	ISummarizerRuntime,
+	ISummaryCancellationToken,
+	SubmitSummaryResult,
+	SummarizerStopReason,
+	EnqueueSummarizeResult,
+	IAckSummaryResult,
+	IBaseSummarizeResult,
+	IBroadcastSummaryResult,
+	ICancellationToken,
+	IEnqueueSummarizeOptions,
+	IGenerateSummaryTreeResult,
+	INackSummaryResult,
+	IOnDemandSummarizeOptions,
+	IProvideSummarizer,
+	ISubmitSummaryOpResult,
+	ISummarizeOptions,
+	ISummarizingWarning,
+	IUploadSummaryResult,
+	SummarizeResultPart,
+} from "./summarizerTypes";
+export {
+	IAckedSummary,
+	ISummaryCollectionOpEvents,
+	ISummaryOpMessage,
+	SummaryCollection,
+	IClientSummaryWatcher,
+	ISummary,
+	ISummaryAckMessage,
+	ISummaryNackMessage,
+	OpActionEventListener,
+	OpActionEventName,
+} from "./summaryCollection";
+export {
+	aliasBlobName,
+	blobsTreeName,
+	chunksBlobName,
+	dataStoreAttributesBlobName,
+	electedSummarizerBlobName,
+	extractSummaryMetadataMessage,
+	getAttributesFormatVersion,
+	getFluidDataStoreAttributes,
+	hasIsolatedChannels,
+	IContainerRuntimeMetadata,
+	ICreateContainerMetadata,
+	ISummaryMetadataMessage,
+	metadataBlobName,
+	nonDataStorePaths,
+	ReadFluidDataStoreAttributes,
+	rootHasIsolatedChannels,
+	WriteFluidDataStoreAttributes,
+	wrapSummaryInChannelsTree,
+} from "./summaryFormat";
+export { SummarizeReason } from "./summaryGenerator";
+export {
+	IConnectedEvents,
+	IConnectedState,
+	ISummaryManagerConfig,
+	SummaryManager,
+	SummaryManagerState,
+} from "./summaryManager";