@fluidframework/azure-end-to-end-tests 2.60.0 → 2.61.0-355516

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/azure-end-to-end-tests",
-  "version": "2.60.0",
+  "version": "2.61.0-355516",
   "description": "Azure client end to end tests",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -33,29 +33,29 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-experimental/data-objects": "~2.60.0",
-    "@fluid-internal/client-utils": "~2.60.0",
-    "@fluid-internal/mocha-test-setup": "~2.60.0",
-    "@fluid-private/test-version-utils": "~2.60.0",
-    "@fluidframework/aqueduct": "~2.60.0",
-    "@fluidframework/azure-client": "~2.60.0",
+    "@fluid-experimental/data-objects": "2.61.0-355516",
+    "@fluid-internal/client-utils": "2.61.0-355516",
+    "@fluid-internal/mocha-test-setup": "2.61.0-355516",
+    "@fluid-private/test-version-utils": "2.61.0-355516",
+    "@fluidframework/aqueduct": "2.61.0-355516",
+    "@fluidframework/azure-client": "2.61.0-355516",
     "@fluidframework/azure-client-legacy": "npm:@fluidframework/azure-client@^1.2.0",
-    "@fluidframework/container-definitions": "~2.60.0",
-    "@fluidframework/container-loader": "~2.60.0",
-    "@fluidframework/core-interfaces": "~2.60.0",
-    "@fluidframework/counter": "~2.60.0",
-    "@fluidframework/datastore-definitions": "~2.60.0",
-    "@fluidframework/fluid-static": "~2.60.0",
-    "@fluidframework/map": "~2.60.0",
+    "@fluidframework/container-definitions": "2.61.0-355516",
+    "@fluidframework/container-loader": "2.61.0-355516",
+    "@fluidframework/core-interfaces": "2.61.0-355516",
+    "@fluidframework/counter": "2.61.0-355516",
+    "@fluidframework/datastore-definitions": "2.61.0-355516",
+    "@fluidframework/fluid-static": "2.61.0-355516",
+    "@fluidframework/map": "2.61.0-355516",
     "@fluidframework/map-legacy": "npm:@fluidframework/map@^1.4.0",
-    "@fluidframework/matrix": "~2.60.0",
-    "@fluidframework/presence": "~2.60.0",
-    "@fluidframework/runtime-definitions": "~2.60.0",
-    "@fluidframework/sequence": "~2.60.0",
-    "@fluidframework/telemetry-utils": "~2.60.0",
-    "@fluidframework/test-runtime-utils": "~2.60.0",
-    "@fluidframework/test-utils": "~2.60.0",
-    "@fluidframework/tree": "~2.60.0",
+    "@fluidframework/matrix": "2.61.0-355516",
+    "@fluidframework/presence": "2.61.0-355516",
+    "@fluidframework/runtime-definitions": "2.61.0-355516",
+    "@fluidframework/sequence": "2.61.0-355516",
+    "@fluidframework/telemetry-utils": "2.61.0-355516",
+    "@fluidframework/test-runtime-utils": "2.61.0-355516",
+    "@fluidframework/test-utils": "2.61.0-355516",
+    "@fluidframework/tree": "2.61.0-355516",
     "axios": "^1.8.4",
     "cross-env": "^7.0.3",
     "mocha": "^10.8.2",
@@ -68,14 +68,14 @@
   "devDependencies": {
     "@biomejs/biome": "~1.9.3",
     "@fluidframework/build-common": "^2.0.3",
-    "@fluidframework/build-tools": "^0.57.0",
-    "@fluidframework/driver-definitions": "~2.60.0",
+    "@fluidframework/build-tools": "^0.58.1",
+    "@fluidframework/driver-definitions": "2.61.0-355516",
     "@fluidframework/eslint-config-fluid": "^6.0.0",
     "@types/mocha": "^10.0.10",
     "@types/nock": "^9.3.0",
     "@types/node": "^18.19.0",
     "@types/sinon": "^17.0.3",
-    "c8": "^8.0.1",
+    "c8": "^10.1.3",
     "eslint": "~8.55.0",
     "nock": "^13.3.3",
     "rimraf": "^4.4.0",
@@ -113,7 +113,7 @@
     "test:coverage": "c8 npm test",
     "test:realsvc": "npm run test:realsvc:tinylicious",
     "test:realsvc:azure": "cross-env FLUID_CLIENT=azure npm run test:realsvc:azure:run -- --driver=r11s --r11sEndpointName=frs",
-    "test:realsvc:azure:run": "mocha --recursive \"lib/test/**/*.spec.*js\" --exit --timeout 20000 --config src/test/.mocharc.cjs",
+    "test:realsvc:azure:run": "mocha --exit --timeout 20000 --config src/test/.mocharc.cjs",
     "test:realsvc:tinylicious": "start-server-and-test start:tinylicious:test 7071 test:realsvc:tinylicious:run",
     "test:realsvc:tinylicious:report": "npm run test:realsvc:tinylicious",
     "test:realsvc:tinylicious:run": "npm run test:realsvc:azure:run -- --driver=t9s",

package/src/test/.mocharc.cjs

@@ -8,5 +8,4 @@
 const packageDir = `${__dirname}/../..`;
 const getFluidTestMochaConfig = require("@fluid-private/test-version-utils/mocharc-common");
 const config = getFluidTestMochaConfig(packageDir);
-
 module.exports = config;

package/src/test/multiprocess/{childClient.ts → childClient.tool.ts}

@@ -160,6 +160,19 @@ function createSendFunction(): (msg: MessageToParent) => void {
 
 const send = createSendFunction();
 
+function sendAttendeeConnected(attendee: Attendee): void {
+	send({
+		event: "attendeeConnected",
+		attendeeId: attendee.attendeeId,
+	});
+}
+function sendAttendeeDisconnected(attendee: Attendee): void {
+	send({
+		event: "attendeeDisconnected",
+		attendeeId: attendee.attendeeId,
+	});
+}
+
 function isConnected(container: IFluidContainer | undefined): boolean {
 	return container !== undefined && container.connectionState === ConnectionState.Connected;
 }
@@ -365,17 +378,25 @@ class MessageHandler {
 		this.container = container;
 		this.presence = presence;
 		this.containerId = containerId;
-		presence.attendees.events.on("attendeeConnected", (attendee: Attendee) => {
-			send({ event: "attendeeConnected", attendeeId: attendee.attendeeId });
-		});
-		presence.attendees.events.on("attendeeDisconnected", (attendee: Attendee) => {
-			send({ event: "attendeeDisconnected", attendeeId: attendee.attendeeId });
-		});
+
+		// Acknowledge connection before sending current attendee information
 		send({
 			event: "connected",
 			containerId,
 			attendeeId: presence.attendees.getMyself().attendeeId,
 		});
+
+		// Send existing attendees excluding self to parent/orchestrator
+		const self = presence.attendees.getMyself();
+		for (const attendee of presence.attendees.getAttendees()) {
+			if (attendee !== self) {
+				sendAttendeeConnected(attendee);
+			}
+		}
+
+		// Listen for presence events to notify parent/orchestrator when a new attendee joins or leaves the session.
+		presence.attendees.events.on("attendeeConnected", sendAttendeeConnected);
+		presence.attendees.events.on("attendeeDisconnected", sendAttendeeDisconnected);
 	}
 
 	private handleDisconnectSelf(): void {

package/src/test/multiprocess/orchestratorUtils.ts

@@ -64,7 +64,7 @@ export async function forkChildProcesses(
 	const childReadyPromises: Promise<void>[] = [];
 	const childErrorPromises: Promise<never>[] = [];
 	for (let i = 0; i < numProcesses; i++) {
-		const child = fork("./lib/test/multiprocess/childClient.js", [
+		const child = fork("./lib/test/multiprocess/childClient.tool.js", [
 			`child ${i}` /* identifier passed to child process */,
 			childLoggingVerbosity /* console logging verbosity */,
 		]);
@@ -114,10 +114,15 @@ function composeConnectMessage(
 			name: `test-user-name-${id}`,
 		},
 		scopes,
-		createScopes: [ScopeType.DocWrite],
+		createScopes: [ScopeType.DocWrite, ScopeType.DocRead],
 	};
 }
 
+interface CreatorAttendeeIdAndAttendeePromises {
+	containerCreatorAttendeeId: AttendeeId;
+	attendeeIdPromises: Promise<AttendeeId>[];
+}
+
 /**
  * Sends connect commands to the provided child processes.
  *
@@ -127,10 +132,7 @@ function composeConnectMessage(
 export async function connectChildProcesses(
 	childProcesses: ChildProcess[],
 	{ writeClients, readyTimeoutMs }: { writeClients: number; readyTimeoutMs: number },
-): Promise<{
-	containerCreatorAttendeeId: AttendeeId;
-	attendeeIdPromises: Promise<AttendeeId>[];
-}> {
+): Promise<CreatorAttendeeIdAndAttendeePromises> {
 	if (childProcesses.length === 0) {
 		throw new Error("No child processes provided for connection.");
 	}
@@ -154,9 +156,10 @@ export async function connectChildProcesses(
 		// Note that DocWrite is used to have this attendee be the "leader".
 		// DocRead would also be valid as DocWrite is specified for attach when there
 		// is no document id (container id).
-		const connectContainerCreator = composeConnectMessage(0, [
-			writeClients > 0 ? ScopeType.DocWrite : ScopeType.DocRead,
-		]);
+		const connectContainerCreator = composeConnectMessage(
+			0,
+			writeClients > 0 ? [ScopeType.DocWrite, ScopeType.DocRead] : [ScopeType.DocRead],
+		);
 		firstChild.send(connectContainerCreator);
 	}
 	const { containerCreatorAttendeeId, containerId } = await timeoutAwait(
@@ -173,9 +176,10 @@ export async function connectChildProcesses(
 			attendeeIdPromises.push(Promise.resolve(containerCreatorAttendeeId));
 			continue;
 		}
-		const message = composeConnectMessage(index, [
-			index < writeClients ? ScopeType.DocWrite : ScopeType.DocRead,
-		]);
+		const message = composeConnectMessage(
+			index,
+			index < writeClients ? [ScopeType.DocWrite, ScopeType.DocRead] : [ScopeType.DocRead],
+		);
 		message.containerId = containerId;
 		attendeeIdPromises.push(
 			new Promise<AttendeeId>((resolve, reject) => {
@@ -193,49 +197,116 @@ export async function connectChildProcesses(
 	return { containerCreatorAttendeeId, attendeeIdPromises };
 }
 
+interface ConnectAndListenForAttendees extends CreatorAttendeeIdAndAttendeePromises {
+	attendeeCountRequiredPromises: Promise<void>[];
+}
+
 /**
- * Connects the child processes and waits for the specified number of attendees to connect.
+ * Connects the child processes and creates promises for the specified number of
+ * attendees to connect.
  */
-export async function connectAndWaitForAttendees(
+export async function connectAndListenForAttendees(
 	children: ChildProcess[],
 	{
 		writeClients,
 		attendeeCountRequired,
 		childConnectTimeoutMs,
-		attendeesJoinedTimeoutMs,
 	}: {
+		/**
+		 * The number of clients that should have write access.
+		 */
 		writeClients: number;
+		/**
+		 * The number of attendees that must connect.
+		 */
 		attendeeCountRequired: number;
+		/**
+		 * Timeout duration for child process connections.
+		 */
 		childConnectTimeoutMs: number;
-		attendeesJoinedTimeoutMs: number;
 	},
-	earlyExitPromise: Promise<never>,
-): Promise<{ containerCreatorAttendeeId: AttendeeId }> {
-	const attendeeConnectedPromise = new Promise<void>((resolve) => {
-		let attendeesJoinedEvents = 0;
-		children[0].on("message", (msg: MessageFromChild) => {
-			if (msg.event === "attendeeConnected") {
-				attendeesJoinedEvents++;
-				if (attendeesJoinedEvents >= attendeeCountRequired) {
-					resolve();
-				}
-			}
-		});
-	});
+): Promise<ConnectAndListenForAttendees> {
+	// Setup
+	const attendeeCountRequiredPromises = children.map(
+		// eslint-disable-next-line @typescript-eslint/promise-function-async
+		(child) =>
+			new Promise<void>((resolve) => {
+				let attendeesJoinedEvents = 0;
+				const listenForAttendees = (msg: MessageFromChild): void => {
+					if (msg.event === "attendeeConnected") {
+						attendeesJoinedEvents++;
+						if (attendeesJoinedEvents >= attendeeCountRequired) {
+							resolve();
+						}
+					}
+				};
+				child.on("message", listenForAttendees);
+			}),
+	);
+
+	// Act - connect all child processes
 	const connectResult = await connectChildProcesses(children, {
 		writeClients,
 		readyTimeoutMs: childConnectTimeoutMs,
 	});
+
 	Promise.all(connectResult.attendeeIdPromises)
 		.then(() => console.log("All attendees connected."))
 		.catch((error) => {
 			testConsole.error("Error connecting children:", error);
 		});
+
+	return { ...connectResult, attendeeCountRequiredPromises };
+}
+
+/**
+ * Connects the child processes and waits for the specified number of attendees to connect.
+ *
+ * @remarks
+ * This function can be used directly as a test. Comments in the functionality describe the
+ * breakdown of test blocks.
+ */
+export async function connectAndWaitForAttendees(
+	children: ChildProcess[],
+	{
+		writeClients,
+		attendeeCountRequired,
+		childConnectTimeoutMs,
+		allAttendeesJoinedTimeoutMs,
+	}: {
+		/**
+		 * The number of clients that should have write access.
+		 */
+		writeClients: number;
+		/**
+		 * The number of attendees that must connect.
+		 */
+		attendeeCountRequired: number;
+		/**
+		 * Timeout duration for child process connections.
+		 */
+		childConnectTimeoutMs: number;
+		/**
+		 * Timeout duration for all required attendees to join.
+		 */
+		allAttendeesJoinedTimeoutMs: number;
+	},
+	earlyExitPromise: Promise<never>,
+): Promise<{ containerCreatorAttendeeId: AttendeeId }> {
+	// Setup and Act - connect all child processes
+	const connectAndListenResult = await connectAndListenForAttendees(children, {
+		writeClients,
+		attendeeCountRequired,
+		childConnectTimeoutMs,
+	});
+
+	const attendeeConnectedPromise = connectAndListenResult.attendeeCountRequiredPromises[0];
+
 	await timeoutAwait(Promise.race([attendeeConnectedPromise, earlyExitPromise]), {
-		durationMs: attendeesJoinedTimeoutMs,
+		durationMs: allAttendeesJoinedTimeoutMs,
 		errorMsg: "child 0 did not receive all 'attendeeConnected' events",
 	});
-	return connectResult;
+	return connectAndListenResult;
 }
 
 /**