@fluidframework/container-loader 2.4.0-299707 → 2.5.0-302463

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/container-loader",
-  "version": "2.4.0-299707",
+  "version": "2.5.0-302463",
   "description": "Fluid container loader",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -119,13 +119,13 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": "2.4.0-299707",
-    "@fluidframework/container-definitions": "2.4.0-299707",
-    "@fluidframework/core-interfaces": "2.4.0-299707",
-    "@fluidframework/core-utils": "2.4.0-299707",
-    "@fluidframework/driver-definitions": "2.4.0-299707",
-    "@fluidframework/driver-utils": "2.4.0-299707",
-    "@fluidframework/telemetry-utils": "2.4.0-299707",
+    "@fluid-internal/client-utils": "2.5.0-302463",
+    "@fluidframework/container-definitions": "2.5.0-302463",
+    "@fluidframework/core-interfaces": "2.5.0-302463",
+    "@fluidframework/core-utils": "2.5.0-302463",
+    "@fluidframework/driver-definitions": "2.5.0-302463",
+    "@fluidframework/driver-utils": "2.5.0-302463",
+    "@fluidframework/telemetry-utils": "2.5.0-302463",
     "@types/events_pkg": "npm:@types/events@^3.0.0",
     "@ungap/structured-clone": "^1.2.0",
     "debug": "^4.3.4",
@@ -135,14 +135,14 @@
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.16.4",
-    "@biomejs/biome": "~1.8.3",
-    "@fluid-internal/client-utils": "2.4.0-299707",
-    "@fluid-internal/mocha-test-setup": "2.4.0-299707",
-    "@fluid-private/test-loader-utils": "2.4.0-299707",
-    "@fluid-tools/build-cli": "^0.48.0",
+    "@biomejs/biome": "~1.9.3",
+    "@fluid-internal/client-utils": "2.5.0-302463",
+    "@fluid-internal/mocha-test-setup": "2.5.0-302463",
+    "@fluid-private/test-loader-utils": "2.5.0-302463",
+    "@fluid-tools/build-cli": "^0.49.0",
     "@fluidframework/build-common": "^2.0.3",
-    "@fluidframework/build-tools": "^0.48.0",
-    "@fluidframework/container-loader-previous": "npm:@fluidframework/container-loader@~2.3.0",
+    "@fluidframework/build-tools": "^0.49.0",
+    "@fluidframework/container-loader-previous": "npm:@fluidframework/container-loader@~2.4.0",
     "@fluidframework/eslint-config-fluid": "^5.4.0",
     "@microsoft/api-extractor": "7.47.8",
     "@types/debug": "^4.1.5",

package/src/container.ts

@@ -394,7 +394,7 @@ export class Container
 					// to return container, so ignore this value and use undefined for opsBeforeReturn
 					const mode: IContainerLoadMode = pendingLocalState
 						? { ...(loadMode ?? defaultMode), opsBeforeReturn: undefined }
-						: loadMode ?? defaultMode;
+						: (loadMode ?? defaultMode);
 
 					const onClosed = (err?: ICriticalContainerError): void => {
 						// pre-0.58 error message: containerClosedWithoutErrorDuringLoad
@@ -1719,7 +1719,7 @@ export class Container
 			codeDetails,
 			baseSnapshotTree,
 			// give runtime a dummy value so it knows we're loading from a stash blob
-			pendingLocalState ? pendingLocalState?.pendingRuntimeState ?? {} : undefined,
+			pendingLocalState ? (pendingLocalState?.pendingRuntimeState ?? {}) : undefined,
 			isInstanceOfISnapshot(baseSnapshot) ? baseSnapshot : undefined,
 		);
 

package/src/deltaManager.ts

@@ -1031,15 +1031,6 @@ export class DeltaManager<TConnectionManager extends IConnectionManager>
 			});
 		}
 
-		// TODO: AB#12052: Stop parsing message.contents here, let the downstream handlers do it
-		if (
-			typeof message.contents === "string" &&
-			message.contents !== "" &&
-			message.type !== MessageType.ClientLeave
-		) {
-			message.contents = JSON.parse(message.contents);
-		}
-
 		// Validate client sequence number has no gap. Decrement the noOpCount by gap
 		// If the count ends up negative, that means we have a real gap and throw error
 		if (

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/container-loader";
-export const pkgVersion = "2.4.0-299707";
+export const pkgVersion = "2.5.0-302463";

package/src/protocol/protocol.ts

@@ -125,7 +125,9 @@ export class ProtocolOpHandler implements IProtocolHandler {
 			}
 
 			case MessageType.Propose: {
-				// This should become unconditional once DeltaManager.processInboundMessage() stops parsing content (ADO #12052)
+				// DeltaManager is no longer parsing the contents, so we expect this to be a string here
+				// (However, switching this to an assert caused some tests to fail, apparently due to the same
+				// message object being processed multiple times - So we will retain the typeof check for now)
 				if (typeof message.contents === "string") {
 					message.contents = JSON.parse(message.contents);
 				}

package/src/protocol.ts

@@ -73,9 +73,6 @@ export class ProtocolHandler extends ProtocolOpHandler implements IProtocolHandl
 			audience.addMember(clientId, details.client),
 		);
 		this.quorum.on("removeMember", (clientId) => audience.removeMember(clientId));
-		for (const [clientId, details] of this.quorum.getMembers()) {
-			this.audience.addMember(clientId, details.client);
-		}
 	}
 
 	public processMessage(