@fluidframework/container-loader 2.0.0-rc.4.0.5 → 2.0.0-rc.5.0.0

package/src/loader.ts

@@ -19,13 +19,13 @@ import {
 	IRequest,
 	ITelemetryBaseLogger,
 } from "@fluidframework/core-interfaces";
+import { IClientDetails } from "@fluidframework/driver-definitions";
 import {
 	IDocumentServiceFactory,
 	IDocumentStorageService,
 	IResolvedUrl,
 	IUrlResolver,
 } from "@fluidframework/driver-definitions/internal";
-import { IClientDetails } from "@fluidframework/protocol-definitions";
 import {
 	ITelemetryLoggerExt,
 	MonitoringContext,

package/src/memoryBlobStorage.ts

@@ -3,9 +3,10 @@
  * Licensed under the MIT License.
  */
 
-import type { ICreateBlobResponse } from "@fluidframework/protocol-definitions";
 import { bufferToString, stringToBuffer } from "@fluid-internal/client-utils";
 import { assert, isObject } from "@fluidframework/core-utils/internal";
+import type { ICreateBlobResponse } from "@fluidframework/driver-definitions/internal";
+
 // eslint-disable-next-line import/no-deprecated
 import type { IDetachedBlobStorage } from "./loader.js";
 
@@ -25,7 +26,8 @@ function isMemoryDetachedBlobStorage(
 	return (
 		isObject(detachedStorage) &&
 		MemoryDetachedBlobStorageIdentifier in detachedStorage &&
-		detachedStorage[MemoryDetachedBlobStorageIdentifier] === MemoryDetachedBlobStorageIdentifier
+		detachedStorage[MemoryDetachedBlobStorageIdentifier] ===
+			MemoryDetachedBlobStorageIdentifier
 	);
 }
 
@@ -49,9 +51,9 @@ export function tryInitializeMemoryDetachedBlobStorage(
 		);
 	}
 
-	assert(detachedStorage.size === 0, "Blob storage already initialized");
+	assert(detachedStorage.size === 0, 0x99e /* Blob storage already initialized */);
 	const maybeAttachmentBlobs = JSON.parse(attachmentBlobs);
-	assert(Array.isArray(maybeAttachmentBlobs), "Invalid attachmentBlobs");
+	assert(Array.isArray(maybeAttachmentBlobs), 0x99f /* Invalid attachmentBlobs */);
 
 	detachedStorage.initialize(maybeAttachmentBlobs);
 }

package/src/noopHeuristic.ts

@@ -6,8 +6,8 @@
 import { TypedEventEmitter } from "@fluid-internal/client-utils";
 import { IEvent } from "@fluidframework/core-interfaces";
 import { assert, Timer } from "@fluidframework/core-utils/internal";
+import { ISequencedDocumentMessage } from "@fluidframework/driver-definitions/internal";
 import { isRuntimeMessage } from "@fluidframework/driver-utils/internal";
-import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
 
 const defaultNoopTimeFrequency = 2000;
 const defaultNoopCountFrequency = 50;

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/container-loader";
-export const pkgVersion = "2.0.0-rc.4.0.5";
+export const pkgVersion = "2.0.0-rc.5.0.0";

package/src/protocol/README.md

@@ -0,0 +1,10 @@
+# @fluidframework/container-loader/src/protocol
+
+These files should be aligned with the service side definitions contained here:
+
+server/routerlicious/packages/protocol-base
+
+## Notes
+
+The file names in this directory align with those in server/protocol-base to facilitate
+copying/synchronization in the future, if desireable.

package/src/protocol/index.ts

@@ -0,0 +1,16 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+export {
+	IProtocolHandler as IBaseProtocolHandler,
+	ProtocolOpHandler,
+	IScribeProtocolState,
+} from "./protocol.js";
+export {
+	IQuorumSnapshot,
+	Quorum,
+	QuorumClientsSnapshot,
+	QuorumProposalsSnapshot,
+} from "./quorum.js";

package/src/protocol/protocol.ts

@@ -0,0 +1,185 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import { ISequencedClient } from "@fluidframework/driver-definitions";
+import { ISequencedDocumentMessage } from "@fluidframework/driver-definitions/internal";
+import {
+	IDocumentAttributes,
+	IClientJoin,
+	ICommittedProposal,
+	IProcessMessageResult,
+	IProposal,
+	IQuorum,
+	ISequencedDocumentSystemMessage,
+	ISequencedProposal,
+	MessageType,
+} from "@fluidframework/driver-definitions/internal";
+
+import { IQuorumSnapshot, Quorum } from "./quorum.js";
+
+/**
+ * @alpha
+ */
+export interface IScribeProtocolState {
+	sequenceNumber: number;
+	minimumSequenceNumber: number;
+	members: [string, ISequencedClient][];
+	proposals: [number, ISequencedProposal, string[]][];
+	values: [string, ICommittedProposal][];
+}
+
+/**
+ * @alpha
+ */
+export interface IProtocolHandler {
+	readonly quorum: IQuorum;
+	readonly attributes: IDocumentAttributes;
+
+	setConnectionState(connected: boolean, clientId: string | undefined);
+	snapshot(): IQuorumSnapshot;
+
+	close(): void;
+	processMessage(message: ISequencedDocumentMessage, local: boolean): IProcessMessageResult;
+	getProtocolState(): IScribeProtocolState;
+}
+
+/**
+ * Handles protocol specific ops.
+ * @internal
+ */
+export class ProtocolOpHandler implements IProtocolHandler {
+	private readonly _quorum: Quorum;
+	public get quorum(): Quorum {
+		return this._quorum;
+	}
+
+	constructor(
+		public minimumSequenceNumber: number,
+		public sequenceNumber: number,
+		members: [string, ISequencedClient][],
+		proposals: [number, ISequencedProposal, string[]][],
+		values: [string, ICommittedProposal][],
+		sendProposal: (key: string, value: any) => number,
+	) {
+		this._quorum = new Quorum(members, proposals, values, sendProposal);
+	}
+
+	public get attributes(): IDocumentAttributes {
+		return {
+			minimumSequenceNumber: this.minimumSequenceNumber,
+			sequenceNumber: this.sequenceNumber,
+		};
+	}
+
+	setConnectionState(connected: boolean, clientId: string | undefined) {
+		this._quorum.setConnectionState(connected, clientId);
+	}
+
+	snapshot(): IQuorumSnapshot {
+		return this._quorum.snapshot();
+	}
+
+	public close() {
+		this._quorum.close();
+	}
+
+	public processMessage(
+		message: ISequencedDocumentMessage,
+		local: boolean,
+	): IProcessMessageResult {
+		// verify it's moving sequentially
+		if (message.sequenceNumber !== this.sequenceNumber + 1) {
+			throw new Error(
+				`Protocol state is not moving sequentially. ` +
+					`Current is ${this.sequenceNumber}. Next is ${message.sequenceNumber}`,
+			);
+		}
+
+		// Update tracked sequence numbers
+		this.sequenceNumber = message.sequenceNumber;
+		this.minimumSequenceNumber = message.minimumSequenceNumber;
+
+		let immediateNoOp = false;
+
+		/* eslint-disable no-case-declarations */
+
+		switch (message.type) {
+			case MessageType.ClientJoin:
+				const systemJoinMessage = message as ISequencedDocumentSystemMessage;
+				const join = JSON.parse(systemJoinMessage.data) as IClientJoin;
+				const member: ISequencedClient = {
+					client: join.detail,
+					sequenceNumber: systemJoinMessage.sequenceNumber,
+				};
+				this._quorum.addMember(join.clientId, member);
+				break;
+
+			case MessageType.ClientLeave:
+				const systemLeaveMessage = message as ISequencedDocumentSystemMessage;
+				const clientId = JSON.parse(systemLeaveMessage.data) as string;
+				this._quorum.removeMember(clientId);
+				break;
+
+			case MessageType.Propose:
+				// back-compat: ADO #1385: This should become unconditional eventually.
+				// Can be done only after Container.processRemoteMessage() stops parsing content!
+				if (typeof message.contents === "string") {
+					message.contents = JSON.parse(message.contents);
+				}
+				const proposal = message.contents as IProposal;
+				this._quorum.addProposal(
+					proposal.key,
+					proposal.value,
+					message.sequenceNumber,
+					local,
+					message.clientSequenceNumber,
+				);
+
+				// On a quorum proposal, immediately send a response to expedite the approval.
+				immediateNoOp = true;
+				break;
+
+			default:
+		}
+
+		/* eslint-enable no-case-declarations */
+
+		// Notify the quorum of the MSN from the message. We rely on it to handle duplicate values but may
+		// want to move that logic to this class.
+		this._quorum.updateMinimumSequenceNumber(message);
+
+		return { immediateNoOp };
+	}
+
+	/**
+	 * Gets the scribe protocol state
+	 * @param scrubUserData - whether to remove all user data from the quorum members. CAUTION: this will corrupt the quorum if used in a summary.
+	 */
+	public getProtocolState(scrubUserData = false): IScribeProtocolState {
+		// return a new object every time
+		// this ensures future state changes will not affect outside callers
+		const snapshot = this._quorum.snapshot();
+
+		if (scrubUserData) {
+			// In place, remove any identifying client information
+			snapshot.members = snapshot.members.map(([id, sequencedClient]) => [
+				id,
+				{
+					...sequencedClient,
+					client: {
+						...sequencedClient.client,
+						user: { id: "" },
+					},
+				},
+			]);
+		}
+
+		return {
+			sequenceNumber: this.sequenceNumber,
+			minimumSequenceNumber: this.minimumSequenceNumber,
+			...snapshot,
+		};
+	}
+}