@fluidframework/container-loader 2.0.0-dev-rc.5.0.0.265721 → 2.0.0-dev-rc.5.0.0.267932

package/dist/container.js

@@ -13,9 +13,10 @@ const container_definitions_1 = require("@fluidframework/container-definitions")
 const internal_1 = require("@fluidframework/container-definitions/internal");
 const core_interfaces_1 = require("@fluidframework/core-interfaces");
 const internal_2 = require("@fluidframework/core-utils/internal");
-const internal_3 = require("@fluidframework/driver-utils/internal");
-const protocol_definitions_1 = require("@fluidframework/protocol-definitions");
-const internal_4 = require("@fluidframework/telemetry-utils/internal");
+const driver_definitions_1 = require("@fluidframework/driver-definitions");
+const internal_3 = require("@fluidframework/driver-definitions/internal");
+const internal_4 = require("@fluidframework/driver-utils/internal");
+const internal_5 = require("@fluidframework/telemetry-utils/internal");
 const structured_clone_1 = __importDefault(require("@ungap/structured-clone"));
 const uuid_1 = require("uuid");
 const attachment_js_1 = require("./attachment.js");
@@ -27,7 +28,9 @@ const containerContext_js_1 = require("./containerContext.js");
 const containerStorageAdapter_js_1 = require("./containerStorageAdapter.js");
 const contracts_js_1 = require("./contracts.js");
 const deltaManager_js_1 = require("./deltaManager.js");
+// eslint-disable-next-line import/no-deprecated
 const loader_js_1 = require("./loader.js");
+const memoryBlobStorage_js_1 = require("./memoryBlobStorage.js");
 const noopHeuristic_js_1 = require("./noopHeuristic.js");
 const packageVersion_js_1 = require("./packageVersion.js");
 const protocol_js_1 = require("./protocol.js");
@@ -58,7 +61,7 @@ const packageNotFactoryError = "Code package does not implement IRuntimeFactory"
 async function waitContainerToCatchUp(container) {
     // Make sure we stop waiting if container is closed.
     if (container.closed) {
-        throw new internal_4.UsageError("waitContainerToCatchUp: Container closed");
+        throw new internal_5.UsageError("waitContainerToCatchUp: Container closed");
     }
     return new Promise((resolve, reject) => {
         const deltaManager = container.deltaManager;
@@ -66,8 +69,8 @@ async function waitContainerToCatchUp(container) {
             container.off("closed", closedCallback);
             const baseMessage = "Container closed while waiting to catch up";
             reject(err !== undefined
-                ? (0, internal_4.wrapError)(err, (innerMessage) => new internal_4.GenericError(`${baseMessage}: ${innerMessage}`))
-                : new internal_4.GenericError(baseMessage));
+                ? (0, internal_5.wrapError)(err, (innerMessage) => new internal_5.GenericError(`${baseMessage}: ${innerMessage}`))
+                : new internal_5.GenericError(baseMessage));
         };
         container.on("closed", closedCallback);
         // Depending on config, transition to "connected" state may include the guarantee
@@ -103,10 +106,10 @@ async function waitContainerToCatchUp(container) {
             return;
         }
         const callback = () => {
-            container.off(internal_4.connectedEventName, callback);
+            container.off(internal_5.connectedEventName, callback);
             waitForOps();
         };
-        container.on(internal_4.connectedEventName, callback);
+        container.on(internal_5.connectedEventName, callback);
         if (container.connectionState === connectionState_js_1.ConnectionState.Disconnected) {
             container.connect();
         }
@@ -121,7 +124,7 @@ const getCodeProposal = (quorum) => quorum.get("code") ?? quorum.get("code2");
  * @param action - functor to call and measure
  */
 async function ReportIfTooLong(logger, eventName, action) {
-    const event = internal_4.PerformanceEvent.start(logger, { eventName });
+    const event = internal_5.PerformanceEvent.start(logger, { eventName });
     const props = await action();
     if (event.duration > 200) {
         event.end(props);
@@ -129,14 +132,14 @@ async function ReportIfTooLong(logger, eventName, action) {
 }
 exports.ReportIfTooLong = ReportIfTooLong;
 const summarizerClientType = "summarizer";
-class Container extends internal_4.EventEmitterWithErrorHandling {
+class Container extends internal_5.EventEmitterWithErrorHandling {
     /**
      * Load an existing container.
      */
     static async load(loadProps, createProps) {
         const { version, pendingLocalState, loadMode, resolvedUrl } = loadProps;
         const container = new Container(createProps, loadProps);
-        return internal_4.PerformanceEvent.timedExecAsync(container.mc.logger, { eventName: "Load", ...loadMode }, async (event) => new Promise((resolve, reject) => {
+        return internal_5.PerformanceEvent.timedExecAsync(container.mc.logger, { eventName: "Load", ...loadMode }, async (event) => new Promise((resolve, reject) => {
             const defaultMode = { opsBeforeReturn: "cached" };
             // if we have pendingLocalState, anything we cached is not useful and we shouldn't wait for connection
             // to return container, so ignore this value and use undefined for opsBeforeReturn
@@ -145,7 +148,7 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
                 : loadMode ?? defaultMode;
             const onClosed = (err) => {
                 // pre-0.58 error message: containerClosedWithoutErrorDuringLoad
-                reject(err ?? new internal_4.GenericError("Container closed without error during load"));
+                reject(err ?? new internal_5.GenericError("Container closed without error during load"));
             };
             container.on("closed", onClosed);
             container
@@ -157,7 +160,7 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
                 event.end({ ...props });
                 resolve(container);
             }, (error) => {
-                const err = (0, internal_4.normalizeError)(error);
+                const err = (0, internal_5.normalizeError)(error);
                 // Depending where error happens, we can be attempting to connect to web socket
                 // and continuously retrying (consider offline mode)
                 // Host has no container to close, so it's prudent to do it here
@@ -175,7 +178,7 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
      */
     static async createDetached(createProps, codeDetails) {
         const container = new Container(createProps);
-        return internal_4.PerformanceEvent.timedExecAsync(container.mc.logger, { eventName: "CreateDetached" }, async (_event) => {
+        return internal_5.PerformanceEvent.timedExecAsync(container.mc.logger, { eventName: "CreateDetached" }, async (_event) => {
             await container.createDetached(codeDetails);
             return container;
         }, { start: true, end: true, cancel: "generic" });
@@ -188,7 +191,7 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
      */
     static async rehydrateDetachedFromSnapshot(createProps, snapshot) {
         const container = new Container(createProps);
-        return internal_4.PerformanceEvent.timedExecAsync(container.mc.logger, { eventName: "RehydrateDetachedFromSnapshot" }, async (_event) => {
+        return internal_5.PerformanceEvent.timedExecAsync(container.mc.logger, { eventName: "RehydrateDetachedFromSnapshot" }, async (_event) => {
             const detachedContainerState = (0, utils_js_1.getDetachedContainerStateFromSerializedContainer)(snapshot);
             await container.rehydrateDetachedFromSnapshot(detachedContainerState);
             return container;
@@ -204,6 +207,14 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
             // (calling this.handleDeltaConnectionArg() after setLoaded() call)
             // If this assert fires, it means our logic managing connection flow is wrong, and the logic below is also wrong.
             (0, internal_2.assert)(this.connectionState !== connectionState_js_1.ConnectionState.Connected, 0x969 /* not connected yet */);
+            // Track membership changes and update connection state accordingly
+            // We do this call here, instead of doing it in initializeProtocolState() due to pendingLocalState.
+            // When we load from stashed state, we let connectionStateHandler know about clientId from previous container instance.
+            // But we will play trailing ops from snapshot, including potentially playing join & leave ops for that same clientId!
+            // In other words, if connectionStateHandler has access to Quorum early in load sequence, it will see events (in stashed ops mode)
+            // in the order that is not possible in real life, that it may not expect.
+            // Ideally, we should supply pendingLocalState?.clientId here as well, not in constructor, but it does not matter (at least today)
+            this.connectionStateHandler.initProtocol(this.protocolHandler);
             // Propagate current connection state through the system.
             const readonly = this.readOnlyInfo.readonly ?? false;
             // This call does not look like needed any more, with delaying all connection-related events past loaded phase.
@@ -337,7 +348,7 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
      */
     async getEntryPoint() {
         if (this._disposed) {
-            throw new internal_4.UsageError("The context is already disposed");
+            throw new internal_5.UsageError("The context is already disposed");
         }
         if (this._runtime !== undefined) {
             return this._runtime.getEntryPoint?.();
@@ -362,7 +373,7 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
                 eventName: "ContainerEventHandlerException",
                 name: typeof name === "string" ? name : undefined,
             }, error);
-            this.close((0, internal_4.normalizeError)(error));
+            this.close((0, internal_5.normalizeError)(error));
         });
         /**
          * Lifecycle state of the container, used mainly to prevent re-entrancy and telemetry
@@ -392,14 +403,14 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
         this._lifecycleEvents = new client_utils_1.TypedEventEmitter();
         this._disposed = false;
         this.attach = (0, utils_js_1.runSingle)(async (request, attachProps) => {
-            await internal_4.PerformanceEvent.timedExecAsync(this.mc.logger, { eventName: "Attach" }, async () => {
+            await internal_5.PerformanceEvent.timedExecAsync(this.mc.logger, { eventName: "Attach" }, async () => {
                 if (this._lifecycleState !== "loaded" ||
                     this.attachmentData.state === container_definitions_1.AttachState.Attached) {
                     // pre-0.58 error message: containerNotValidForAttach
-                    throw new internal_4.UsageError(`The Container is not in a valid state for attach [${this._lifecycleState}] and [${this.attachState}]`);
+                    throw new internal_5.UsageError(`The Container is not in a valid state for attach [${this._lifecycleState}] and [${this.attachState}]`);
                 }
                 const normalizeErrorAndClose = (error) => {
-                    const newError = (0, internal_4.normalizeError)(error);
+                    const newError = (0, internal_5.normalizeError)(error);
                     this.close(newError);
                     // add resolved URL on error object so that host has the ability to find this document and delete it
                     newError.addTelemetryProperties({
@@ -436,7 +447,7 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
                         const createNewResolvedUrl = await this.urlResolver.resolve(request);
                         (0, internal_2.assert)(this.client.details.type !== summarizerClientType &&
                             createNewResolvedUrl !== undefined, 0x2c4 /* "client should not be summarizer before container is created" */);
-                        this.service = await (0, internal_3.runWithRetry)(async () => this.serviceFactory.createContainer(summary, createNewResolvedUrl, this.subLogger, false), "containerAttach", this.mc.logger, {
+                        this.service = await (0, internal_4.runWithRetry)(async () => this.serviceFactory.createContainer(summary, createNewResolvedUrl, this.subLogger, false), "containerAttach", this.mc.logger, {
                             cancel: this._deltaManager.closeAbortController.signal,
                         });
                     }
@@ -461,6 +472,7 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
                 const snapshotWithBlobs = await attachP;
                 this.serializedStateManager.setInitialSnapshot(snapshotWithBlobs);
                 if (!this.closed) {
+                    this.detachedBlobStorage.dispose?.();
                     this.handleDeltaConnectionArg(attachProps?.deltaConnection, {
                         fetchOpsFromStorage: false,
                         reason: { text: "createDetached" },
@@ -498,7 +510,7 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
         // Tracking alternative ways to handle this in AB#4129.
         this.options = { ...options };
         this.scope = scope;
-        this.detachedBlobStorage = detachedBlobStorage;
+        this.detachedBlobStorage = detachedBlobStorage ?? (0, memoryBlobStorage_js_1.createMemoryDetachedBlobStorage)();
         this.protocolHandlerBuilder =
             protocolHandlerBuilder ??
                 ((attributes, quorumSnapshot, sendProposal) => new protocol_js_1.ProtocolHandler(attributes, quorumSnapshot, sendProposal, new audience_js_1.Audience(), (clientId) => this.clientsWhoShouldHaveLeft.has(clientId)));
@@ -517,7 +529,7 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
         const clientType = `${interactive ? "interactive" : "noninteractive"}${type !== undefined && type !== "" ? `/${type}` : ""}`;
         // Need to use the property getter for docId because for detached flow we don't have the docId initially.
         // We assign the id later so property getter is used.
-        this.subLogger = (0, internal_4.createChildLogger)({
+        this.subLogger = (0, internal_5.createChildLogger)({
             logger: subLogger,
             properties: {
                 all: {
@@ -552,10 +564,13 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
             },
         });
         // Prefix all events in this file with container-loader
-        this.mc = (0, internal_4.createChildMonitoringContext)({ logger: this.subLogger, namespace: "Container" });
+        this.mc = (0, internal_5.createChildMonitoringContext)({ logger: this.subLogger, namespace: "Container" });
         this._deltaManager = this.createDeltaManager();
         this.connectionStateHandler = (0, connectionStateHandler_js_1.createConnectionStateHandler)({
             logger: this.mc.logger,
+            // WARNING: logger on this context should not including getters like containerConnectionState above (on this.subLogger),
+            // as that will result in attempt to dereference this.connectionStateHandler from this call while it's still undefined.
+            mc: (0, internal_5.loggerToMonitoringContext)(subLogger),
             connectionStateChanged: (value, oldState, reason) => {
                 this.logConnectionStateChangeTelemetry(value, oldState, reason);
                 if (this.loaded) {
@@ -606,7 +621,7 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
                 this.clientsWhoShouldHaveLeft.add(clientId);
             },
             onCriticalError: (error) => {
-                this.close((0, internal_4.normalizeError)(error));
+                this.close((0, internal_5.normalizeError)(error));
             },
         }, this.deltaManager, pendingLocalState?.clientId);
         this.on(savedContainerEvent, () => {
@@ -615,14 +630,14 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
         // We expose our storage publicly, so it's possible others may call uploadSummaryWithContext() with a
         // non-combined summary tree (in particular, ContainerRuntime.submitSummary).  We'll intercept those calls
         // using this callback and fix them up.
-        const addProtocolSummaryIfMissing = (summaryTree) => (0, internal_3.isCombinedAppAndProtocolSummary)(summaryTree) === true
+        const addProtocolSummaryIfMissing = (summaryTree) => (0, internal_4.isCombinedAppAndProtocolSummary)(summaryTree) === true
             ? summaryTree
             : (0, utils_js_1.combineAppAndProtocolSummary)(summaryTree, this.captureProtocolSummary());
         // Whether the combined summary tree has been forced on by either the loader option or the monitoring context.
         // Even if not forced on via this flag, combined summaries may still be enabled by service policy.
         const forceEnableSummarizeProtocolTree = this.mc.config.getBoolean("Fluid.Container.summarizeProtocolTree2") ??
             options.summarizeProtocolTree;
-        this.storageAdapter = new containerStorageAdapter_js_1.ContainerStorageAdapter(detachedBlobStorage, this.mc.logger, pendingLocalState?.snapshotBlobs, pendingLocalState?.loadedGroupIdSnapshots, addProtocolSummaryIfMissing, forceEnableSummarizeProtocolTree);
+        this.storageAdapter = new containerStorageAdapter_js_1.ContainerStorageAdapter(this.detachedBlobStorage, this.mc.logger, pendingLocalState?.snapshotBlobs, pendingLocalState?.loadedGroupIdSnapshots, addProtocolSummaryIfMissing, forceEnableSummarizeProtocolTree);
         const offlineLoadEnabled = (this.isInteractiveClient &&
             this.mc.config.getBoolean("Fluid.Container.enableOfflineLoad")) ??
             options.enableOfflineLoad === true;
@@ -771,7 +786,7 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
     }
     async getPendingLocalStateCore(props) {
         if (this.closed || this._disposed) {
-            throw new internal_4.UsageError("Pending state cannot be retried if the container is closed or disposed");
+            throw new internal_5.UsageError("Pending state cannot be retried if the container is closed or disposed");
         }
         (0, internal_2.assert)(this.attachmentData.state === container_definitions_1.AttachState.Attached, 0x0d1 /* "Container should be attached before close" */);
         (0, internal_2.assert)(this.resolvedUrl !== undefined && this.resolvedUrl.type === "fluid", 0x0d2 /* "resolved url should be valid Fluid url" */);
@@ -789,7 +804,7 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
      */
     serialize() {
         if (this.attachmentData.state === container_definitions_1.AttachState.Attached || this.closed) {
-            throw new internal_4.UsageError("Container must not be attached or closed.");
+            throw new internal_5.UsageError("Container must not be attached or closed.");
         }
         const attachingData = this.attachmentData.state === container_definitions_1.AttachState.Attaching ? this.attachmentData : undefined;
         const combinedSummary = attachingData?.summary ??
@@ -802,7 +817,8 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
             baseSnapshot,
             snapshotBlobs,
             pendingRuntimeState,
-            hasAttachmentBlobs: !!this.detachedBlobStorage && this.detachedBlobStorage.size > 0,
+            hasAttachmentBlobs: this.detachedBlobStorage.size > 0,
+            attachmentBlobs: (0, memoryBlobStorage_js_1.serializeMemoryDetachedBlobStorage)(this.detachedBlobStorage),
         };
         return JSON.stringify(detachedContainerState);
     }
@@ -824,10 +840,10 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
     }
     connect() {
         if (this.closed) {
-            throw new internal_4.UsageError(`The Container is closed and cannot be connected`);
+            throw new internal_5.UsageError(`The Container is closed and cannot be connected`);
         }
         else if (this.attachState !== container_definitions_1.AttachState.Attached) {
-            throw new internal_4.UsageError(`The Container is not attached and cannot be connected`);
+            throw new internal_5.UsageError(`The Container is not attached and cannot be connected`);
         }
         else if (!this.connected) {
             // Note: no need to fetch ops as we do it preemptively as part of DeltaManager.attachOpHandler().
@@ -850,7 +866,7 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
     }
     disconnect() {
         if (this.closed) {
-            throw new internal_4.UsageError(`The Container is closed and cannot be disconnected`);
+            throw new internal_5.UsageError(`The Container is closed and cannot be disconnected`);
         }
         else {
             this.disconnectInternal({ text: "DocumentDisconnect" });
@@ -905,7 +921,7 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
             return;
         }
         // pre-0.58 error message: existingContextDoesNotSatisfyIncomingProposal
-        const error = new internal_4.GenericError("Existing context does not satisfy incoming proposal");
+        const error = new internal_5.GenericError("Existing context does not satisfy incoming proposal");
         this.close(error);
     }
     /**
@@ -986,7 +1002,7 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
             true && this.service?.policies?.supportGetSnapshotApi === true;
         // Fetch specified snapshot.
         const { baseSnapshot, version } = await this.serializedStateManager.fetchSnapshot(specifiedVersion, supportGetSnapshotApi);
-        const baseSnapshotTree = (0, internal_3.getSnapshotTree)(baseSnapshot);
+        const baseSnapshotTree = (0, internal_4.getSnapshotTree)(baseSnapshot);
         this._loadedFromVersion = version;
         const attributes = await (0, utils_js_1.getDocumentAttributes)(this.storageAdapter, baseSnapshotTree);
         // If we saved ops, we will replay them and don't need DeltaManager to fetch them
@@ -1021,7 +1037,7 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
         const codeDetails = this.getCodeDetailsFromQuorum();
         await this.instantiateRuntime(codeDetails, baseSnapshotTree, 
         // give runtime a dummy value so it knows we're loading from a stash blob
-        pendingLocalState ? pendingLocalState?.pendingRuntimeState ?? {} : undefined, (0, internal_3.isInstanceOfISnapshot)(baseSnapshot) ? baseSnapshot : undefined);
+        pendingLocalState ? pendingLocalState?.pendingRuntimeState ?? {} : undefined, (0, internal_4.isInstanceOfISnapshot)(baseSnapshot) ? baseSnapshot : undefined);
         // replay saved ops
         if (pendingLocalState) {
             for (const message of pendingLocalState.savedOps) {
@@ -1040,8 +1056,8 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
         if (!this.closed) {
             if (opsBeforeReturnP !== undefined) {
                 this._deltaManager.inbound.resume();
-                await internal_4.PerformanceEvent.timedExecAsync(this.mc.logger, { eventName: "WaitOps" }, async () => opsBeforeReturnP);
-                await internal_4.PerformanceEvent.timedExecAsync(this.mc.logger, { eventName: "WaitOpProcessing" }, async () => this._deltaManager.inbound.waitTillProcessingDone());
+                await internal_5.PerformanceEvent.timedExecAsync(this.mc.logger, { eventName: "WaitOps" }, async () => opsBeforeReturnP);
+                await internal_5.PerformanceEvent.timedExecAsync(this.mc.logger, { eventName: "WaitOpProcessing" }, async () => this._deltaManager.inbound.waitTillProcessingDone());
                 // eslint-disable-next-line @typescript-eslint/no-floating-promises
                 this._deltaManager.inbound.pause();
             }
@@ -1087,9 +1103,12 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
         await this.instantiateRuntime(codeDetails, undefined);
         this.setLoaded();
     }
-    async rehydrateDetachedFromSnapshot({ baseSnapshot, snapshotBlobs, hasAttachmentBlobs, pendingRuntimeState, }) {
+    async rehydrateDetachedFromSnapshot({ baseSnapshot, snapshotBlobs, hasAttachmentBlobs, attachmentBlobs, pendingRuntimeState, }) {
         if (hasAttachmentBlobs) {
-            (0, internal_2.assert)(!!this.detachedBlobStorage && this.detachedBlobStorage.size > 0, 0x250 /* "serialized container with attachment blobs must be rehydrated with detached blob storage" */);
+            if (attachmentBlobs !== undefined) {
+                (0, memoryBlobStorage_js_1.tryInitializeMemoryDetachedBlobStorage)(this.detachedBlobStorage, attachmentBlobs);
+            }
+            (0, internal_2.assert)(this.detachedBlobStorage.size > 0, 0x250 /* "serialized container with attachment blobs must be rehydrated with detached blob storage" */);
         }
         const snapshotTreeWithBlobContents = (0, utils_js_1.combineSnapshotTreeAndSnapshotBlobs)(baseSnapshot, snapshotBlobs);
         this.storageAdapter.loadSnapshotFromSnapshotBlobs(snapshotBlobs);
@@ -1097,7 +1116,7 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
         await this.attachDeltaManagerOpHandler(attributes);
         // Initialize the protocol handler
         const baseTree = (0, utils_js_1.getProtocolSnapshotTree)(snapshotTreeWithBlobContents);
-        const qValues = await (0, internal_3.readAndParse)(this.storageAdapter, baseTree.blobs.quorumValues);
+        const qValues = await (0, internal_4.readAndParse)(this.storageAdapter, baseTree.blobs.quorumValues);
         this.initializeProtocolState(attributes, {
             members: [],
             proposals: [],
@@ -1117,24 +1136,22 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
             const baseTree = (0, utils_js_1.getProtocolSnapshotTree)(snapshot);
             [quorumSnapshot.members, quorumSnapshot.proposals, quorumSnapshot.values] =
                 await Promise.all([
-                    (0, internal_3.readAndParse)(storage, baseTree.blobs.quorumMembers),
-                    (0, internal_3.readAndParse)(storage, baseTree.blobs.quorumProposals),
-                    (0, internal_3.readAndParse)(storage, baseTree.blobs.quorumValues),
+                    (0, internal_4.readAndParse)(storage, baseTree.blobs.quorumMembers),
+                    (0, internal_4.readAndParse)(storage, baseTree.blobs.quorumProposals),
+                    (0, internal_4.readAndParse)(storage, baseTree.blobs.quorumValues),
                 ]);
         }
         this.initializeProtocolState(attributes, quorumSnapshot);
     }
     initializeProtocolState(attributes, quorumSnapshot) {
-        const protocol = this.protocolHandlerBuilder(attributes, quorumSnapshot, (key, value) => this.submitMessage(protocol_definitions_1.MessageType.Propose, JSON.stringify({ key, value })));
-        const protocolLogger = (0, internal_4.createChildLogger)({
+        const protocol = this.protocolHandlerBuilder(attributes, quorumSnapshot, (key, value) => this.submitMessage(internal_3.MessageType.Propose, JSON.stringify({ key, value })));
+        const protocolLogger = (0, internal_5.createChildLogger)({
             logger: this.subLogger,
             namespace: "ProtocolHandler",
         });
         protocol.quorum.on("error", (error) => {
             protocolLogger.sendErrorEvent(error);
         });
-        // Track membership changes and update connection state accordingly
-        this.connectionStateHandler.initProtocol(protocol);
         protocol.quorum.on("addProposal", (proposal) => {
             if (proposal.key === "code" || proposal.key === "code2") {
                 this.emit("codeDetailsProposed", proposal.value, proposal);
@@ -1148,7 +1165,7 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
                     });
                 }
                 this.processCodeProposal().catch((error) => {
-                    const normalizedError = (0, internal_4.normalizeError)(error);
+                    const normalizedError = (0, internal_5.normalizeError)(error);
                     this.close(normalizedError);
                     throw error;
                 });
@@ -1166,22 +1183,22 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
             tree: {
                 attributes: {
                     content: JSON.stringify(this.protocolHandler.attributes),
-                    type: protocol_definitions_1.SummaryType.Blob,
+                    type: driver_definitions_1.SummaryType.Blob,
                 },
                 quorumMembers: {
                     content: JSON.stringify(quorumSnapshot.members),
-                    type: protocol_definitions_1.SummaryType.Blob,
+                    type: driver_definitions_1.SummaryType.Blob,
                 },
                 quorumProposals: {
                     content: JSON.stringify(quorumSnapshot.proposals),
-                    type: protocol_definitions_1.SummaryType.Blob,
+                    type: driver_definitions_1.SummaryType.Blob,
                 },
                 quorumValues: {
                     content: JSON.stringify(quorumSnapshot.values),
-                    type: protocol_definitions_1.SummaryType.Blob,
+                    type: driver_definitions_1.SummaryType.Blob,
                 },
             },
-            type: protocol_definitions_1.SummaryType.Tree,
+            type: driver_definitions_1.SummaryType.Tree,
         };
         return summary;
     }
@@ -1230,7 +1247,7 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
     }
     createDeltaManager() {
         const serviceProvider = () => this.service;
-        const deltaManager = new deltaManager_js_1.DeltaManager(serviceProvider, (0, internal_4.createChildLogger)({ logger: this.subLogger, namespace: "DeltaManager" }), () => this.activeConnection(), (props) => new connectionManager_js_1.ConnectionManager(serviceProvider, () => this.isDirty, this.client, this._canReconnect, (0, internal_4.createChildLogger)({ logger: this.subLogger, namespace: "ConnectionManager" }), props));
+        const deltaManager = new deltaManager_js_1.DeltaManager(serviceProvider, (0, internal_5.createChildLogger)({ logger: this.subLogger, namespace: "DeltaManager" }), () => this.activeConnection(), (props) => new connectionManager_js_1.ConnectionManager(serviceProvider, () => this.isDirty, this.client, this._canReconnect, (0, internal_5.createChildLogger)({ logger: this.subLogger, namespace: "ConnectionManager" }), props));
         // Disable inbound queues as Container is not ready to accept any ops until we are fully loaded!
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
         deltaManager.inbound.pause();
@@ -1320,7 +1337,7 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
             if (value === connectionState_js_1.ConnectionState.Connected) {
                 durationFromDisconnected =
                     time - this.connectionTransitionTimes[connectionState_js_1.ConnectionState.Disconnected];
-                durationFromDisconnected = (0, internal_4.formatTick)(durationFromDisconnected);
+                durationFromDisconnected = (0, internal_5.formatTick)(durationFromDisconnected);
             }
             else if (value === connectionState_js_1.ConnectionState.CatchingUp) {
                 // This info is of most interesting while Catching Up.
@@ -1343,7 +1360,7 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
             clientId: this.connectionStateHandler.clientId,
             autoReconnect,
             opsBehind,
-            online: internal_3.OnlineStatus[(0, internal_3.isOnline)()],
+            online: internal_4.OnlineStatus[(0, internal_4.isOnline)()],
             lastVisible: this.lastVisible !== undefined
                 ? client_utils_1.performance.now() - this.lastVisible
                 : undefined,
@@ -1372,17 +1389,17 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
         // Both protocol and context should not be undefined if we got so far.
         this.setContextConnectedState(connected, this.readOnlyInfo.readonly ?? false);
         this.protocolHandler.setConnectionState(connected, this.clientId);
-        (0, internal_4.raiseConnectedEvent)(this.mc.logger, this, connected, this.clientId, disconnectedReason?.text);
+        (0, internal_5.raiseConnectedEvent)(this.mc.logger, this, connected, this.clientId, disconnectedReason?.text);
     }
     // back-compat: ADO #1385: Remove in the future, summary op should come through submitSummaryMessage()
     submitContainerMessage(type, contents, batch, metadata) {
         switch (type) {
-            case protocol_definitions_1.MessageType.Operation:
+            case internal_3.MessageType.Operation:
                 return this.submitMessage(type, JSON.stringify(contents), batch, metadata);
-            case protocol_definitions_1.MessageType.Summarize:
+            case internal_3.MessageType.Summarize:
                 return this.submitSummaryMessage(contents);
             default: {
-                const newError = new internal_4.GenericError("invalidContainerSubmitOpType", undefined /* error */, { messageType: type });
+                const newError = new internal_5.GenericError("invalidContainerSubmitOpType", undefined /* error */, { messageType: type });
                 this.close(newError);
                 return -1;
             }
@@ -1392,7 +1409,7 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
     submitBatch(batch, referenceSequenceNumber) {
         let clientSequenceNumber = -1;
         for (const message of batch) {
-            clientSequenceNumber = this.submitMessage(protocol_definitions_1.MessageType.Operation, message.contents, true, // batch
+            clientSequenceNumber = this.submitMessage(internal_3.MessageType.Operation, message.contents, true, // batch
             message.metadata, message.compression, referenceSequenceNumber);
         }
         this._deltaManager.flush();
@@ -1407,7 +1424,7 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
             summary.details = {};
         }
         summary.details.includesProtocolTree = this.storageAdapter.summarizeProtocolTree;
-        return this.submitMessage(protocol_definitions_1.MessageType.Summarize, JSON.stringify(summary), false /* batch */, undefined /* metadata */, undefined /* compression */, referenceSequenceNumber);
+        return this.submitMessage(internal_3.MessageType.Summarize, JSON.stringify(summary), false /* batch */, undefined /* metadata */, undefined /* compression */, referenceSequenceNumber);
     }
     submitMessage(type, contents, batch, metadata, compression, referenceSequenceNumber) {
         if (this.connectionState !== connectionState_js_1.ConnectionState.Connected) {
@@ -1439,14 +1456,14 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
                     // Hitting this assert would imply we lost activeConnection between notifying the heuristic of a processed message and
                     // running the microtask that the heuristic queued in response.
                     (0, internal_2.assert)(this.activeConnection(), 0x241 /* "Trying to send noop without active connection" */);
-                    this.submitMessage(protocol_definitions_1.MessageType.NoOp);
+                    this.submitMessage(internal_3.MessageType.NoOp);
                 });
             }
             this.noopHeuristic.notifyMessageProcessed(message);
             // The contract with the protocolHandler is that returning "immediateNoOp" is equivalent to "please immediately accept the proposal I just processed".
             if (result.immediateNoOp === true) {
                 // ADO:1385: Remove cast and use MessageType once definition changes propagate
-                this.submitMessage(internal_3.MessageType2.Accept);
+                this.submitMessage(internal_4.MessageType2.Accept);
             }
         }
         this.emit("op", message);
@@ -1471,7 +1488,7 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
         // are set. Global requests will still go directly to the loader
         const maybeLoader = this.scope;
         const loader = new loader_js_1.RelativeLoader(this, maybeLoader.ILoader);
-        const loadCodeResult = await internal_4.PerformanceEvent.timedExecAsync(this.subLogger, { eventName: "CodeLoad" }, async () => this.codeLoader.load(codeDetails));
+        const loadCodeResult = await internal_5.PerformanceEvent.timedExecAsync(this.subLogger, { eventName: "CodeLoad" }, async () => this.codeLoader.load(codeDetails));
         this._loadedModule = {
             module: loadCodeResult.module,
             // An older interface ICodeLoader could return an IFluidModule which didn't have details.
@@ -1486,7 +1503,7 @@ class Container extends internal_4.EventEmitterWithErrorHandling {
         }
         const existing = snapshotTree !== undefined;
         const context = new containerContext_js_1.ContainerContext(this.options, this.scope, snapshotTree, this._loadedFromVersion, this._deltaManager, this.storageAdapter, this.protocolHandler.quorum, this.protocolHandler.audience, loader, (type, contents, batch, metadata) => this.submitContainerMessage(type, contents, batch, metadata), (summaryOp, referenceSequenceNumber) => this.submitSummaryMessage(summaryOp, referenceSequenceNumber), (batch, referenceSequenceNumber) => this.submitBatch(batch, referenceSequenceNumber), (content, targetClientId) => this.submitSignal(content, targetClientId), (error) => this.dispose(error), (error) => this.close(error), this.updateDirtyContainerState, this.getAbsoluteUrl, () => this.resolvedUrl?.id, () => this.clientId, () => this.attachState, () => this.connected, this._deltaManager.clientDetails, existing, this.subLogger, pendingLocalState, snapshot);
-        this._runtime = await internal_4.PerformanceEvent.timedExecAsync(this.subLogger, { eventName: "InstantiateRuntime" }, async () => runtimeFactory.instantiateRuntime(context, existing));
+        this._runtime = await internal_5.PerformanceEvent.timedExecAsync(this.subLogger, { eventName: "InstantiateRuntime" }, async () => runtimeFactory.instantiateRuntime(context, existing));
         this._lifecycleEvents.emit("runtimeInstantiated");
         this._loadedCodeDetails = codeDetails;
     }