@fluidframework/container-runtime 2.0.0-internal.5.3.2 → 2.0.0-internal.6.0.0

package/dist/containerRuntime.js

@@ -18,19 +18,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ContainerRuntime = exports.getDeviceSpec = exports.agentSchedulerId = exports.isRuntimeMessage = exports.RuntimeMessage = exports.CompressionAlgorithms = exports.defaultRuntimeHeaderData = exports.TombstoneResponseHeaderKey = exports.AllowTombstoneRequestHeaderKey = exports.RuntimeHeaders = exports.DefaultSummaryConfiguration = exports.ContainerMessageType = void 0;
+exports.ContainerRuntime = exports.makeLegacySendBatchFn = exports.getDeviceSpec = exports.agentSchedulerId = exports.isRuntimeMessage = exports.RuntimeMessage = exports.CompressionAlgorithms = exports.defaultRuntimeHeaderData = exports.TombstoneResponseHeaderKey = exports.AllowTombstoneRequestHeaderKey = exports.RuntimeHeaders = exports.DefaultSummaryConfiguration = exports.ContainerMessageType = void 0;
 const container_definitions_1 = require("@fluidframework/container-definitions");
 const common_utils_1 = require("@fluidframework/common-utils");
 const core_utils_1 = require("@fluidframework/core-utils");
@@ -137,7 +126,7 @@ const defaultChunkSizeInBytes = 204800;
  * of the current system, we should close the summarizer and let it recover.
  * This delay's goal is to prevent tight restart loops
  */
-const defaultCloseSummarizerDelayMs = 10000; // 10 seconds
+const defaultCloseSummarizerDelayMs = 5000; // 5 seconds
 /**
  * @deprecated - use ContainerRuntimeMessage instead
  */
@@ -174,10 +163,25 @@ function getDeviceSpec() {
             };
         }
     }
-    catch (_a) { }
+    catch { }
     return {};
 }
 exports.getDeviceSpec = getDeviceSpec;
+/**
+ * Older loader doesn't have a submitBatchFn member, this is the older way of submitting a batch.
+ * Rather than exposing the submitFn (now deprecated) and IDeltaManager (dangerous to hand out) to the Outbox,
+ * we can provide a partially-applied function to keep those items private to the ContainerRuntime.
+ */
+const makeLegacySendBatchFn = (submitFn, deltaManager) => (batch) => {
+    for (const message of batch.content) {
+        submitFn(protocol_definitions_1.MessageType.Operation, 
+        // For back-compat (submitFn only works on deserialized content)
+        message.contents === undefined ? undefined : JSON.parse(message.contents), true, // batch
+        message.metadata);
+    }
+    deltaManager.flush();
+};
+exports.makeLegacySendBatchFn = makeLegacySendBatchFn;
 /**
  * Represents the runtime of the container. Contains helper functions/state of the container.
  * It will define the store level mappings.
@@ -186,11 +190,13 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
     /**
      * @internal
      */
-    constructor(context, registry, metadata, electedSummarizerData, chunks, dataStoreAliasMap, runtimeOptions, containerScope, logger, existing, blobManagerSnapshot, _storage, idCompressor, requestHandler, summaryConfiguration, initializeEntryPoint) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-        if (summaryConfiguration === void 0) { summaryConfiguration = Object.assign(Object.assign({}, exports.DefaultSummaryConfiguration), (_a = runtimeOptions.summaryOptions) === null || _a === void 0 ? void 0 : _a.summaryConfigOverrides); }
+    constructor(context, registry, metadata, electedSummarizerData, chunks, dataStoreAliasMap, runtimeOptions, containerScope, logger, existing, blobManagerSnapshot, _storage, idCompressor, requestHandler, summaryConfiguration = {
+        // the defaults
+        ...exports.DefaultSummaryConfiguration,
+        // the runtime configuration overrides
+        ...runtimeOptions.summaryOptions?.summaryConfigOverrides,
+    }, initializeEntryPoint) {
         super();
-        this.context = context;
         this.registry = registry;
         this.runtimeOptions = runtimeOptions;
         this.containerScope = containerScope;
@@ -220,7 +226,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             trackingSignalSequenceNumber: undefined,
         };
         this.summarizeOnDemand = (...args) => {
-            if (this.clientDetails.type === summary_1.summarizerClientType) {
+            if (this.isSummarizerClient) {
                 return this.summarizer.summarizeOnDemand(...args);
             }
             else if (this.summaryManager !== undefined) {
@@ -234,7 +240,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             }
         };
         this.enqueueSummarize = (...args) => {
-            if (this.clientDetails.type === summary_1.summarizerClientType) {
+            if (this.isSummarizerClient) {
                 return this.summarizer.enqueueSummarize(...args);
             }
             else if (this.summaryManager !== undefined) {
@@ -247,23 +253,56 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                 throw new container_utils_1.UsageError(`Can't summarize, disableSummaries: ${this.summariesDisabled}`);
             }
         };
-        this.innerDeltaManager = context.deltaManager;
-        this.deltaManager = new deltaManagerSummarizerProxy_1.DeltaManagerSummarizerProxy(context.deltaManager);
-        this.mc = (0, telemetry_utils_1.loggerToMonitoringContext)(telemetry_utils_1.ChildLogger.create(this.logger, "ContainerRuntime"));
+        const { options, clientDetails, connected, baseSnapshot, submitFn, submitBatchFn, submitSummaryFn, submitSignalFn, disposeFn, closeFn, deltaManager, quorum, audience, loader, pendingLocalState, supportedFeatures, } = context;
+        this.innerDeltaManager = deltaManager;
+        this.deltaManager = new deltaManagerSummarizerProxy_1.DeltaManagerSummarizerProxy(this.innerDeltaManager);
+        // Here we could wrap/intercept on these functions to block/modify outgoing messages if needed.
+        // This makes ContainerRuntime the final gatekeeper for outgoing messages.
+        this.submitFn = submitFn;
+        this.submitBatchFn = submitBatchFn;
+        this.submitSummaryFn = submitSummaryFn;
+        this.submitSignalFn = submitSignalFn;
+        this.options = options;
+        this.clientDetails = clientDetails;
+        this.isSummarizerClient = this.clientDetails.type === summary_1.summarizerClientType;
+        this.loadedFromVersionId = context.getLoadedFromVersion()?.id;
+        this._getClientId = () => context.clientId;
+        this._getAttachState = () => context.attachState;
+        this.getAbsoluteUrl = async (relativeUrl) => {
+            if (context.getAbsoluteUrl === undefined) {
+                throw new Error("Driver does not implement getAbsoluteUrl");
+            }
+            if (this.attachState !== container_definitions_1.AttachState.Attached) {
+                return undefined;
+            }
+            return context.getAbsoluteUrl(relativeUrl);
+        };
+        // TODO: Consider that the Container could just listen to these events itself, or even more appropriately maybe the
+        // customer should observe dirty state on the runtime (the owner of dirty state) directly, rather than on the IContainer.
+        this.on("dirty", () => context.updateDirtyContainerState(true));
+        this.on("saved", () => context.updateDirtyContainerState(false));
+        // In old loaders without dispose functionality, closeFn is equivalent but will also switch container to readonly mode
+        this.disposeFn = disposeFn ?? closeFn;
+        // In cases of summarizer, we want to dispose instead since consumer doesn't interact with this container
+        this.closeFn = this.isSummarizerClient ? this.disposeFn : closeFn;
+        this.mc = (0, telemetry_utils_1.createChildMonitoringContext)({
+            logger: this.logger,
+            namespace: "ContainerRuntime",
+        });
         let loadSummaryNumber;
         // Get the container creation metadata. For new container, we initialize these. For existing containers,
         // get the values from the metadata blob.
         if (existing) {
             this.createContainerMetadata = {
-                createContainerRuntimeVersion: metadata === null || metadata === void 0 ? void 0 : metadata.createContainerRuntimeVersion,
-                createContainerTimestamp: metadata === null || metadata === void 0 ? void 0 : metadata.createContainerTimestamp,
+                createContainerRuntimeVersion: metadata?.createContainerRuntimeVersion,
+                createContainerTimestamp: metadata?.createContainerTimestamp,
             };
             // summaryNumber was renamed from summaryCount. For older docs that haven't been opened for a long time,
             // the count is reset to 0.
-            loadSummaryNumber = (_b = metadata === null || metadata === void 0 ? void 0 : metadata.summaryNumber) !== null && _b !== void 0 ? _b : 0;
+            loadSummaryNumber = metadata?.summaryNumber ?? 0;
             // Enabling the IdCompressor is a one-way operation and we only want to
             // allow new containers to turn it on
-            this.idCompressorEnabled = (_c = metadata === null || metadata === void 0 ? void 0 : metadata.idCompressorEnabled) !== null && _c !== void 0 ? _c : false;
+            this.idCompressorEnabled = metadata?.idCompressorEnabled ?? false;
         }
         else {
             this.createContainerMetadata = {
@@ -272,24 +311,27 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             };
             loadSummaryNumber = 0;
             this.idCompressorEnabled =
-                (_d = this.mc.config.getBoolean("Fluid.ContainerRuntime.IdCompressorEnabled")) !== null && _d !== void 0 ? _d : idCompressor !== undefined;
+                this.mc.config.getBoolean("Fluid.ContainerRuntime.IdCompressorEnabled") ??
+                    idCompressor !== undefined;
         }
         this.nextSummaryNumber = loadSummaryNumber + 1;
-        this.messageAtLastSummary = metadata === null || metadata === void 0 ? void 0 : metadata.message;
-        this._connected = this.context.connected;
-        this.gcTombstoneEnforcementAllowed = (0, gc_1.shouldAllowGcTombstoneEnforcement)((_e = metadata === null || metadata === void 0 ? void 0 : metadata.gcFeatureMatrix) === null || _e === void 0 ? void 0 : _e.tombstoneGeneration /* persisted */, this.runtimeOptions.gcOptions[gc_1.gcTombstoneGenerationOptionName] /* current */);
+        this.messageAtLastSummary = metadata?.message;
+        // Note that we only need to pull the *initial* connected state from the context.
+        // Later updates come through calls to setConnectionState.
+        this._connected = connected;
+        this.gcTombstoneEnforcementAllowed = (0, gc_1.shouldAllowGcTombstoneEnforcement)(metadata?.gcFeatureMatrix?.tombstoneGeneration /* persisted */, this.runtimeOptions.gcOptions[gc_1.gcTombstoneGenerationOptionName] /* current */);
         this.mc.logger.sendTelemetryEvent({
             eventName: "GCFeatureMatrix",
-            metadataValue: JSON.stringify(metadata === null || metadata === void 0 ? void 0 : metadata.gcFeatureMatrix),
+            metadataValue: JSON.stringify(metadata?.gcFeatureMatrix),
             inputs: JSON.stringify({
                 gcOptions_gcTombstoneGeneration: this.runtimeOptions.gcOptions[gc_1.gcTombstoneGenerationOptionName],
             }),
         });
-        this.telemetryDocumentId = (_f = metadata === null || metadata === void 0 ? void 0 : metadata.telemetryDocumentId) !== null && _f !== void 0 ? _f : (0, uuid_1.v4)();
+        this.telemetryDocumentId = metadata?.telemetryDocumentId ?? (0, uuid_1.v4)();
         this.disableAttachReorder = this.mc.config.getBoolean("Fluid.ContainerRuntime.disableAttachOpReorder");
         const disableChunking = this.mc.config.getBoolean("Fluid.ContainerRuntime.CompressionChunkingDisabled");
         const opGroupingManager = new opLifecycle_1.OpGroupingManager(this.groupedBatchingEnabled);
-        const opSplitter = new opLifecycle_1.OpSplitter(chunks, this.context.submitBatchFn, disableChunking === true ? Number.POSITIVE_INFINITY : runtimeOptions.chunkSizeInBytes, runtimeOptions.maxBatchSizeInBytes, this.mc.logger);
+        const opSplitter = new opLifecycle_1.OpSplitter(chunks, this.submitBatchFn, disableChunking === true ? Number.POSITIVE_INFINITY : runtimeOptions.chunkSizeInBytes, runtimeOptions.maxBatchSizeInBytes, this.mc.logger);
         this.remoteMessageProcessor = new opLifecycle_1.RemoteMessageProcessor(opSplitter, new opLifecycle_1.OpDecompressor(this.mc.logger), opGroupingManager);
         this.handleContext = new containerHandleContext_1.ContainerFluidHandleContext("", this);
         if (this.summaryConfiguration.state === "enabled") {
@@ -308,9 +350,10 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             this.idCompressor = idCompressor;
         }
         this.maxConsecutiveReconnects =
-            (_g = this.mc.config.getNumber(maxConsecutiveReconnectsKey)) !== null && _g !== void 0 ? _g : this.defaultMaxConsecutiveReconnects;
+            this.mc.config.getNumber(maxConsecutiveReconnectsKey) ??
+                this.defaultMaxConsecutiveReconnects;
         if (runtimeOptions.flushMode === runtime_definitions_1.FlushModeExperimental.Async &&
-            ((_h = context.supportedFeatures) === null || _h === void 0 ? void 0 : _h.get("referenceSequenceNumbers")) !== true) {
+            supportedFeatures?.get("referenceSequenceNumbers") !== true) {
             // The loader does not support reference sequence numbers, falling back on FlushMode.TurnBased
             this.mc.logger.sendErrorEvent({ eventName: "FlushModeFallback" });
             this._flushMode = runtime_definitions_1.FlushMode.TurnBased;
@@ -318,8 +361,8 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         else {
             this._flushMode = runtimeOptions.flushMode;
         }
-        const pendingRuntimeState = context.pendingLocalState;
-        const maxSnapshotCacheDurationMs = (_k = (_j = this._storage) === null || _j === void 0 ? void 0 : _j.policies) === null || _k === void 0 ? void 0 : _k.maximumCacheDurationMs;
+        const pendingRuntimeState = pendingLocalState;
+        const maxSnapshotCacheDurationMs = this._storage?.policies?.maximumCacheDurationMs;
         if (maxSnapshotCacheDurationMs !== undefined &&
             maxSnapshotCacheDurationMs > 5 * 24 * 60 * 60 * 1000) {
             // This is a runtime enforcement of what's already explicit in the policy's type itself,
@@ -330,27 +373,27 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         this.garbageCollector = gc_1.GarbageCollector.create({
             runtime: this,
             gcOptions: this.runtimeOptions.gcOptions,
-            baseSnapshot: context.baseSnapshot,
+            baseSnapshot,
             baseLogger: this.mc.logger,
             existing,
             metadata,
             createContainerMetadata: this.createContainerMetadata,
-            isSummarizerClient: this.context.clientDetails.type === summary_1.summarizerClientType,
+            isSummarizerClient: this.isSummarizerClient,
             getNodePackagePath: async (nodePath) => this.getGCNodePackagePath(nodePath),
-            getLastSummaryTimestampMs: () => { var _a; return (_a = this.messageAtLastSummary) === null || _a === void 0 ? void 0 : _a.timestamp; },
+            getLastSummaryTimestampMs: () => this.messageAtLastSummary?.timestamp,
             readAndParseBlob: async (id) => (0, driver_utils_1.readAndParse)(this.storage, id),
             // GC runs in summarizer client and needs access to the real (non-proxy) active information. The proxy
             // delta manager would always return false for summarizer client.
             activeConnection: () => this.innerDeltaManager.active,
         });
         const loadedFromSequenceNumber = this.deltaManager.initialSequenceNumber;
-        this.summarizerNode = (0, summary_1.createRootSummarizerNodeWithGC)(telemetry_utils_1.ChildLogger.create(this.logger, "SummarizerNode"), 
+        this.summarizerNode = (0, summary_1.createRootSummarizerNodeWithGC)((0, telemetry_utils_1.createChildLogger)({ logger: this.logger, namespace: "SummarizerNode" }), 
         // Summarize function to call when summarize is called. Summarizer node always tracks summary state.
         async (fullTree, trackState, telemetryContext) => this.summarizeInternal(fullTree, trackState, telemetryContext), 
         // Latest change sequence number, no changes since summary applied yet
         loadedFromSequenceNumber, 
         // Summary reference sequence number, undefined if no summary yet
-        context.baseSnapshot ? loadedFromSequenceNumber : undefined, {
+        baseSnapshot !== undefined ? loadedFromSequenceNumber : undefined, {
             // Must set to false to prevent sending summary handle which would be pointing to
             // a summary with an older protocol state.
             canReuseHandle: false,
@@ -364,19 +407,19 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         async (fullGC) => this.getGCDataInternal(fullGC), 
         // Function to get the GC details from the base snapshot we loaded from.
         async () => this.garbageCollector.getBaseGCDetails());
-        if (context.baseSnapshot) {
-            this.summarizerNode.updateBaseSummaryState(context.baseSnapshot);
+        if (baseSnapshot) {
+            this.summarizerNode.updateBaseSummaryState(baseSnapshot);
         }
-        this.dataStores = new dataStores_1.DataStores((0, dataStores_1.getSummaryForDatastores)(context.baseSnapshot, metadata), this, (attachMsg) => this.submit(ContainerMessageType.Attach, attachMsg), (id, createParam) => (summarizeInternal, getGCDataFn) => this.summarizerNode.createChild(summarizeInternal, id, createParam, undefined, getGCDataFn), (id) => this.summarizerNode.deleteChild(id), this.mc.logger, (path, timestampMs, packagePath) => this.garbageCollector.nodeUpdated(path, "Changed", timestampMs, packagePath), (path) => this.garbageCollector.isNodeDeleted(path), new Map(dataStoreAliasMap));
+        this.dataStores = new dataStores_1.DataStores((0, dataStores_1.getSummaryForDatastores)(baseSnapshot, metadata), this, (attachMsg) => this.submit({ type: ContainerMessageType.Attach, contents: attachMsg }), (id, createParam) => (summarizeInternal, getGCDataFn) => this.summarizerNode.createChild(summarizeInternal, id, createParam, undefined, getGCDataFn), (id) => this.summarizerNode.deleteChild(id), this.mc.logger, (path, timestampMs, packagePath) => this.garbageCollector.nodeUpdated(path, "Changed", timestampMs, packagePath), (path) => this.garbageCollector.isNodeDeleted(path), new Map(dataStoreAliasMap));
         this.blobManager = new blobManager_1.BlobManager(this.handleContext, blobManagerSnapshot, () => this.storage, (localId, blobId) => {
             if (!this.disposed) {
-                this.submit(ContainerMessageType.BlobAttach, undefined, undefined, {
+                this.submit({ type: ContainerMessageType.BlobAttach, contents: undefined }, undefined, {
                     localId,
                     blobId,
                 });
             }
-        }, (blobPath) => this.garbageCollector.nodeUpdated(blobPath, "Loaded"), (blobPath) => this.garbageCollector.isNodeDeleted(blobPath), this, pendingRuntimeState === null || pendingRuntimeState === void 0 ? void 0 : pendingRuntimeState.pendingAttachmentBlobs, (error) => this.closeFn(error));
-        this.scheduleManager = new scheduleManager_1.ScheduleManager(context.deltaManager, this, () => this.clientId, telemetry_utils_1.ChildLogger.create(this.logger, "ScheduleManager"));
+        }, (blobPath) => this.garbageCollector.nodeUpdated(blobPath, "Loaded"), (blobPath) => this.garbageCollector.isNodeDeleted(blobPath), this, pendingRuntimeState?.pendingAttachmentBlobs, (error) => this.closeFn(error));
+        this.scheduleManager = new scheduleManager_1.ScheduleManager(this.innerDeltaManager, this, () => this.clientId, (0, telemetry_utils_1.createChildLogger)({ logger: this.logger, namespace: "ScheduleManager" }));
         this.pendingStateManager = new pendingStateManager_1.PendingStateManager({
             applyStashedOp: this.applyStashedOp.bind(this),
             clientId: () => this.clientId,
@@ -384,7 +427,8 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             connected: () => this.connected,
             reSubmit: this.reSubmit.bind(this),
             reSubmitBatch: this.reSubmitBatch.bind(this),
-        }, pendingRuntimeState === null || pendingRuntimeState === void 0 ? void 0 : pendingRuntimeState.pending);
+            isActiveConnection: () => this.innerDeltaManager.active,
+        }, pendingRuntimeState?.pending, this.logger);
         const disableCompression = this.mc.config.getBoolean("Fluid.ContainerRuntime.CompressionDisabled");
         const compressionOptions = disableCompression === true
             ? {
@@ -393,10 +437,12 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             }
             : runtimeOptions.compressionOptions;
         const disablePartialFlush = this.mc.config.getBoolean("Fluid.ContainerRuntime.DisablePartialFlush");
+        const legacySendBatchFn = (0, exports.makeLegacySendBatchFn)(this.submitFn, this.innerDeltaManager);
         this.outbox = new opLifecycle_1.Outbox({
             shouldSend: () => this.canSendOps(),
             pendingStateManager: this.pendingStateManager,
-            containerContext: this.context,
+            submitBatchFn: this.submitBatchFn,
+            legacySendBatchFn,
             compressor: new opLifecycle_1.OpCompressor(this.mc.logger),
             splitter: opSplitter,
             config: {
@@ -415,44 +461,53 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             opReentrancy: () => this.ensureNoDataModelChangesCalls > 0,
             closeContainer: this.closeFn,
         });
-        this.context.quorum.on("removeMember", (clientId) => {
+        this._quorum = quorum;
+        this._quorum.on("removeMember", (clientId) => {
             this.remoteMessageProcessor.clearPartialMessagesFor(clientId);
         });
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        this._audience = audience;
         this.summaryStateUpdateMethod = this.mc.config.getString("Fluid.ContainerRuntime.Test.SummaryStateUpdateMethodV2");
         const closeSummarizerDelayOverride = this.mc.config.getNumber("Fluid.ContainerRuntime.Test.CloseSummarizerDelayOverrideMs");
-        this.closeSummarizerDelayMs = closeSummarizerDelayOverride !== null && closeSummarizerDelayOverride !== void 0 ? closeSummarizerDelayOverride : defaultCloseSummarizerDelayMs;
+        this.closeSummarizerDelayMs = closeSummarizerDelayOverride ?? defaultCloseSummarizerDelayMs;
         this.validateSummaryBeforeUpload =
-            (_l = this.mc.config.getBoolean("Fluid.ContainerRuntime.Test.ValidateSummaryBeforeUpload")) !== null && _l !== void 0 ? _l : false;
+            this.mc.config.getBoolean("Fluid.ContainerRuntime.Test.ValidateSummaryBeforeUpload") ??
+                false;
         this.summaryCollection = new summary_1.SummaryCollection(this.deltaManager, this.logger);
         this.dirtyContainer =
-            this.context.attachState !== container_definitions_1.AttachState.Attached ||
+            this.attachState !== container_definitions_1.AttachState.Attached ||
                 this.pendingStateManager.hasPendingMessages();
-        this.context.updateDirtyContainerState(this.dirtyContainer);
+        context.updateDirtyContainerState(this.dirtyContainer);
         if (this.summariesDisabled) {
             this.mc.logger.sendTelemetryEvent({ eventName: "SummariesDisabled" });
         }
         else {
-            const orderedClientLogger = telemetry_utils_1.ChildLogger.create(this.logger, "OrderedClientElection");
-            const orderedClientCollection = new summary_1.OrderedClientCollection(orderedClientLogger, this.context.deltaManager, this.context.quorum);
-            const orderedClientElectionForSummarizer = new summary_1.OrderedClientElection(orderedClientLogger, orderedClientCollection, electedSummarizerData !== null && electedSummarizerData !== void 0 ? electedSummarizerData : this.context.deltaManager.lastSequenceNumber, summary_1.SummarizerClientElection.isClientEligible);
+            const orderedClientLogger = (0, telemetry_utils_1.createChildLogger)({
+                logger: this.logger,
+                namespace: "OrderedClientElection",
+            });
+            const orderedClientCollection = new summary_1.OrderedClientCollection(orderedClientLogger, this.innerDeltaManager, this._quorum);
+            const orderedClientElectionForSummarizer = new summary_1.OrderedClientElection(orderedClientLogger, orderedClientCollection, electedSummarizerData ?? this.innerDeltaManager.lastSequenceNumber, summary_1.SummarizerClientElection.isClientEligible);
             this.summarizerClientElection = new summary_1.SummarizerClientElection(orderedClientLogger, this.summaryCollection, orderedClientElectionForSummarizer, this.maxOpsSinceLastSummary);
-            if (this.context.clientDetails.type === summary_1.summarizerClientType) {
+            if (this.isSummarizerClient) {
                 this._summarizer = new summary_1.Summarizer(this /* ISummarizerRuntime */, () => this.summaryConfiguration, this /* ISummarizerInternalsProvider */, this.handleContext, this.summaryCollection, async (runtime) => summary_1.RunWhileConnectedCoordinator.create(runtime, 
                 // Summarization runs in summarizer client and needs access to the real (non-proxy) active
                 // information. The proxy delta manager would always return false for summarizer client.
                 () => this.innerDeltaManager.active));
             }
-            else if (summary_1.SummarizerClientElection.clientDetailsPermitElection(this.context.clientDetails)) {
+            else if (summary_1.SummarizerClientElection.clientDetailsPermitElection(this.clientDetails)) {
                 // Only create a SummaryManager and SummarizerClientElection
                 // if summaries are enabled and we are not the summarizer client.
                 const defaultAction = () => {
                     if (this.summaryCollection.opsSinceLastAck > this.maxOpsSinceLastSummary) {
-                        this.logger.sendTelemetryEvent({ eventName: "SummaryStatus:Behind" });
+                        this.mc.logger.sendTelemetryEvent({ eventName: "SummaryStatus:Behind" });
                         // unregister default to no log on every op after falling behind
                         // and register summary ack handler to re-register this handler
                         // after successful summary
                         this.summaryCollection.once(protocol_definitions_1.MessageType.SummaryAck, () => {
-                            this.logger.sendTelemetryEvent({ eventName: "SummaryStatus:CaughtUp" });
+                            this.mc.logger.sendTelemetryEvent({
+                                eventName: "SummaryStatus:CaughtUp",
+                            });
                             // we've caught up, so re-register the default action to monitor for
                             // falling behind, and unregister ourself
                             this.summaryCollection.on("default", defaultAction);
@@ -463,7 +518,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                 this.summaryCollection.on("default", defaultAction);
                 // Create the SummaryManager and mark the initial state
                 this.summaryManager = new summary_1.SummaryManager(this.summarizerClientElection, this, // IConnectedState
-                this.summaryCollection, this.logger, this.formRequestSummarizerFn(this.context.loader), new throttler_1.Throttler(60 * 1000, // 60 sec delay window
+                this.summaryCollection, this.logger, this.formRequestSummarizerFn(loader), new throttler_1.Throttler(60 * 1000, // 60 sec delay window
                 30 * 1000, // 30 sec max delay
                 // throttling function increases exponentially (0ms, 40ms, 80ms, 160ms, etc)
                 (0, throttler_1.formExponentialFn)({ coefficient: 20, initialDelay: 0 })), {
@@ -493,8 +548,20 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             this.replayPendingStates();
         });
         // logging hardware telemetry
-        logger.sendTelemetryEvent(Object.assign({ eventName: "DeviceSpec" }, getDeviceSpec()));
-        this.logger.sendTelemetryEvent(Object.assign(Object.assign(Object.assign({ eventName: "ContainerLoadStats" }, this.createContainerMetadata), this.dataStores.containerLoadStats), { summaryNumber: loadSummaryNumber, summaryFormatVersion: metadata === null || metadata === void 0 ? void 0 : metadata.summaryFormatVersion, disableIsolatedChannels: metadata === null || metadata === void 0 ? void 0 : metadata.disableIsolatedChannels, gcVersion: metadata === null || metadata === void 0 ? void 0 : metadata.gcFeature, options: JSON.stringify(runtimeOptions), featureGates: JSON.stringify({
+        logger.sendTelemetryEvent({
+            eventName: "DeviceSpec",
+            ...getDeviceSpec(),
+        });
+        this.mc.logger.sendTelemetryEvent({
+            eventName: "ContainerLoadStats",
+            ...this.createContainerMetadata,
+            ...this.dataStores.containerLoadStats,
+            summaryNumber: loadSummaryNumber,
+            summaryFormatVersion: metadata?.summaryFormatVersion,
+            disableIsolatedChannels: metadata?.disableIsolatedChannels,
+            gcVersion: metadata?.gcFeature,
+            options: JSON.stringify(runtimeOptions),
+            featureGates: JSON.stringify({
                 disableCompression,
                 disableOpReentryCheck,
                 disableChunking,
@@ -503,17 +570,23 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                 idCompressorEnabled: this.idCompressorEnabled,
                 summaryStateUpdateMethod: this.summaryStateUpdateMethod,
                 closeSummarizerDelayOverride,
-            }), telemetryDocumentId: this.telemetryDocumentId, groupedBatchingEnabled: this.groupedBatchingEnabled }));
-        (0, connectionTelemetry_1.ReportOpPerfTelemetry)(this.context.clientId, this.deltaManager, this.logger);
+            }),
+            telemetryDocumentId: this.telemetryDocumentId,
+            groupedBatchingEnabled: this.groupedBatchingEnabled,
+        });
+        (0, connectionTelemetry_1.ReportOpPerfTelemetry)(this.clientId, this.deltaManager, this.logger);
         (0, batchTracker_1.BindBatchTracker)(this, this.logger);
         this.entryPoint = new core_utils_1.LazyPromise(async () => {
-            if (this.context.clientDetails.type === summary_1.summarizerClientType) {
+            if (this.isSummarizerClient) {
                 (0, common_utils_1.assert)(this._summarizer !== undefined, 0x5bf /* Summarizer object is undefined in a summarizer client */);
                 return this._summarizer;
             }
-            return initializeEntryPoint === null || initializeEntryPoint === void 0 ? void 0 : initializeEntryPoint(this);
+            return initializeEntryPoint?.(this);
         });
     }
+    /**
+     * @deprecated - Will be removed in future major release. Migrate all usage of IFluidRouter to the "entryPoint" pattern. Refer to Removing-IFluidRouter.md
+     */
     get IFluidRouter() {
         return this;
     }
@@ -559,22 +632,24 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
      * This object should provide all the functionality that the Container is expected to provide to the loader layer.
      */
     static async loadRuntime(params) {
-        var _a, _b, _c, _d, _e, _f;
         const { context, registryEntries, existing, requestHandler, runtimeOptions = {}, containerScope = {}, containerRuntimeCtor = ContainerRuntime, initializeEntryPoint, } = params;
         // If taggedLogger exists, use it. Otherwise, wrap the vanilla logger:
         // back-compat: Remove the TaggedLoggerAdapter fallback once all the host are using loader > 0.45
         const backCompatContext = context;
-        const passLogger = (_a = backCompatContext.taggedLogger) !== null && _a !== void 0 ? _a : new telemetry_utils_1.TaggedLoggerAdapter(backCompatContext.logger);
-        const logger = telemetry_utils_1.ChildLogger.create(passLogger, undefined, {
-            all: {
-                runtimeVersion: packageVersion_1.pkgVersion,
+        const passLogger = backCompatContext.taggedLogger ??
+            new telemetry_utils_1.TaggedLoggerAdapter(backCompatContext.logger);
+        const logger = (0, telemetry_utils_1.createChildLogger)({
+            logger: passLogger,
+            properties: {
+                all: {
+                    runtimeVersion: packageVersion_1.pkgVersion,
+                },
             },
         });
         const { summaryOptions = {}, gcOptions = {}, loadSequenceNumberVerification = "close", flushMode = defaultFlushMode, compressionOptions = defaultCompressionConfig, maxBatchSizeInBytes = defaultMaxBatchSizeInBytes, enableRuntimeIdCompressor = false, chunkSizeInBytes = defaultChunkSizeInBytes, enableOpReentryCheck = false, enableGroupedBatching = false, } = runtimeOptions;
         const registry = new dataStoreRegistry_1.FluidDataStoreRegistry(registryEntries);
         const tryFetchBlob = async (blobName) => {
-            var _a;
-            const blobId = (_a = context.baseSnapshot) === null || _a === void 0 ? void 0 : _a.blobs[blobName];
+            const blobId = context.baseSnapshot?.blobs[blobName];
             if (context.baseSnapshot && blobId) {
                 // IContainerContext storage api return type still has undefined in 0.39 package version.
                 // So once we release 0.40 container-defn package we can remove this check.
@@ -589,16 +664,15 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             tryFetchBlob(summary_1.aliasBlobName),
             tryFetchBlob(summary_1.idCompressorBlobName),
         ]);
-        const loadExisting = existing === true || context.existing === true;
         // read snapshot blobs needed for BlobManager to load
-        const blobManagerSnapshot = await blobManager_1.BlobManager.load((_b = context.baseSnapshot) === null || _b === void 0 ? void 0 : _b.trees[summary_1.blobsTreeName], async (id) => {
+        const blobManagerSnapshot = await blobManager_1.BlobManager.load(context.baseSnapshot?.trees[summary_1.blobsTreeName], async (id) => {
             // IContainerContext storage api return type still has undefined in 0.39 package version.
             // So once we release 0.40 container-defn package we can remove this check.
             (0, common_utils_1.assert)(context.storage !== undefined, 0x256 /* "storage undefined in attached container" */);
             return (0, driver_utils_1.readAndParse)(context.storage, id);
         });
         // Verify summary runtime sequence number matches protocol sequence number.
-        const runtimeSequenceNumber = (_c = metadata === null || metadata === void 0 ? void 0 : metadata.message) === null || _c === void 0 ? void 0 : _c.sequenceNumber;
+        const runtimeSequenceNumber = metadata?.message?.sequenceNumber;
         // When we load with pending state, we reuse an old snapshot so we don't expect these numbers to match
         if (!context.pendingLocalState && runtimeSequenceNumber !== undefined) {
             const protocolSequenceNumber = context.deltaManager.initialSequenceNumber;
@@ -613,13 +687,11 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                     logger.sendErrorEvent({ eventName: "SequenceNumberMismatch" }, error);
                 }
                 else {
-                    // Call both close and dispose as closeFn implementation will no longer dispose runtime in future
                     context.closeFn(error);
-                    (_d = context.disposeFn) === null || _d === void 0 ? void 0 : _d.call(context, error);
                 }
             }
         }
-        const idCompressorEnabled = (_f = (_e = metadata === null || metadata === void 0 ? void 0 : metadata.idCompressorEnabled) !== null && _e !== void 0 ? _e : runtimeOptions.enableRuntimeIdCompressor) !== null && _f !== void 0 ? _f : false;
+        const idCompressorEnabled = metadata?.idCompressorEnabled ?? runtimeOptions.enableRuntimeIdCompressor ?? false;
         let idCompressor;
         if (idCompressorEnabled) {
             const { IdCompressor, createSessionId } = await Promise.resolve().then(() => __importStar(require("./id-compressor")));
@@ -628,7 +700,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                     ? IdCompressor.deserialize(serializedIdCompressor, createSessionId())
                     : new IdCompressor(createSessionId(), logger);
         }
-        const runtime = new containerRuntimeCtor(context, registry, metadata, electedSummarizerData, chunks !== null && chunks !== void 0 ? chunks : [], aliases !== null && aliases !== void 0 ? aliases : [], {
+        const runtime = new containerRuntimeCtor(context, registry, metadata, electedSummarizerData, chunks ?? [], aliases ?? [], {
             summaryOptions,
             gcOptions,
             loadSequenceNumberVerification,
@@ -639,7 +711,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             enableRuntimeIdCompressor,
             enableOpReentryCheck,
             enableGroupedBatching,
-        }, containerScope, logger, loadExisting, blobManagerSnapshot, context.storage, idCompressor, requestHandler, undefined, // summaryConfiguration
+        }, containerScope, logger, existing, blobManagerSnapshot, context.storage, idCompressor, requestHandler, undefined, // summaryConfiguration
         initializeEntryPoint);
         // It's possible to have ops with a reference sequence number of 0. Op sequence numbers start
         // at 1, so we won't see a replayed saved op with a sequence number of 0.
@@ -648,38 +720,15 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         await runtime.initializeBaseState();
         return runtime;
     }
-    get options() {
-        return this.context.options;
-    }
     get clientId() {
-        return this.context.clientId;
-    }
-    get clientDetails() {
-        return this.context.clientDetails;
+        return this._getClientId();
     }
     get storage() {
         return this._storage;
     }
+    /** @deprecated - The functionality is no longer exposed publicly */
     get reSubmitFn() {
-        // eslint-disable-next-line @typescript-eslint/unbound-method
-        return this.reSubmitCore;
-    }
-    get disposeFn() {
-        var _a;
-        // In old loaders without dispose functionality, closeFn is equivalent but will also switch container to readonly mode
-        return (_a = this.context.disposeFn) !== null && _a !== void 0 ? _a : this.context.closeFn;
-    }
-    get closeFn() {
-        if (this._summarizer !== undefined) {
-            // In cases of summarizer, we want to dispose instead since consumer doesn't interact with this container
-            return this.disposeFn;
-        }
-        // Also call disposeFn to retain functionality of runtime being disposed on close
-        return (error) => {
-            var _a, _b;
-            this.context.closeFn(error);
-            (_b = (_a = this.context).disposeFn) === null || _b === void 0 ? void 0 : _b.call(_a, error);
-        };
+        return (type, contents, localOpMetadata, opMetadata) => this.reSubmitCore({ type, contents }, localOpMetadata, opMetadata);
     }
     get flushMode() {
         return this._flushMode;
@@ -691,7 +740,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         return this.registry;
     }
     get attachState() {
-        return this.context.attachState;
+        return this._getAttachState();
     }
     get IFluidHandleContext() {
         return this.handleContext;
@@ -718,8 +767,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
     }
     /** clientId of parent (non-summarizing) container that owns summarizer container */
     get summarizerClientId() {
-        var _a;
-        return (_a = this.summarizerClientElection) === null || _a === void 0 ? void 0 : _a.electedClientId;
+        return this.summarizerClientElection?.electedClientId;
     }
     get disposed() {
         return this._disposed;
@@ -756,12 +804,11 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         await this.garbageCollector.initializeBaseState();
     }
     dispose(error) {
-        var _a;
         if (this._disposed) {
             return;
         }
         this._disposed = true;
-        this.logger.sendTelemetryEvent({
+        this.mc.logger.sendTelemetryEvent({
             eventName: "ContainerRuntimeDisposed",
             isDirty: this.isDirty,
             lastSequenceNumber: this.deltaManager.lastSequenceNumber,
@@ -771,7 +818,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             this.summaryManager.dispose();
         }
         this.garbageCollector.dispose();
-        (_a = this._summarizer) === null || _a === void 0 ? void 0 : _a.dispose();
+        this._summarizer?.dispose();
         this.dataStores.dispose();
         this.pendingStateManager.dispose();
         this.emit("dispose");
@@ -780,6 +827,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
     /**
      * Notifies this object about the request made to the container.
      * @param request - Request made to the handler.
+     * @deprecated - Will be removed in future major release. Migrate all usage of IFluidRouter to the "entryPoint" pattern. Refer to Removing-IFluidRouter.md
      */
     async request(request) {
         try {
@@ -846,19 +894,17 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         return this.entryPoint;
     }
     internalId(maybeAlias) {
-        var _a;
-        return (_a = this.dataStores.aliases.get(maybeAlias)) !== null && _a !== void 0 ? _a : maybeAlias;
+        return this.dataStores.aliases.get(maybeAlias) ?? maybeAlias;
     }
     async getDataStoreFromRequest(id, request) {
-        var _a, _b, _c;
         const headerData = {};
-        if (typeof ((_a = request.headers) === null || _a === void 0 ? void 0 : _a[RuntimeHeaders.wait]) === "boolean") {
+        if (typeof request.headers?.[RuntimeHeaders.wait] === "boolean") {
             headerData.wait = request.headers[RuntimeHeaders.wait];
         }
-        if (typeof ((_b = request.headers) === null || _b === void 0 ? void 0 : _b[RuntimeHeaders.viaHandle]) === "boolean") {
+        if (typeof request.headers?.[RuntimeHeaders.viaHandle] === "boolean") {
             headerData.viaHandle = request.headers[RuntimeHeaders.viaHandle];
         }
-        if (typeof ((_c = request.headers) === null || _c === void 0 ? void 0 : _c[exports.AllowTombstoneRequestHeaderKey]) === "boolean") {
+        if (typeof request.headers?.[exports.AllowTombstoneRequestHeaderKey] === "boolean") {
             headerData.allowTombstone = request.headers[exports.AllowTombstoneRequestHeaderKey];
         }
         await this.dataStores.waitIfPendingAlias(id);
@@ -868,22 +914,27 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         // Remove query params, leading and trailing slashes from the url. This is done to make sure the format is
         // the same as GC nodes id.
         const urlWithoutQuery = (0, gc_1.trimLeadingAndTrailingSlashes)(request.url.split("?")[0]);
-        this.garbageCollector.nodeUpdated(`/${urlWithoutQuery}`, "Loaded", undefined /* timestampMs */, dataStoreContext.packagePath, request === null || request === void 0 ? void 0 : request.headers);
+        this.garbageCollector.nodeUpdated(`/${urlWithoutQuery}`, "Loaded", undefined /* timestampMs */, dataStoreContext.packagePath, request?.headers);
         return dataStoreChannel;
     }
     /** Adds the container's metadata to the given summary tree. */
     addMetadataToSummary(summaryTree) {
-        var _a;
-        const metadata = Object.assign(Object.assign(Object.assign(Object.assign({}, this.createContainerMetadata), { 
+        const metadata = {
+            ...this.createContainerMetadata,
             // Increment the summary number for the next summary that will be generated.
-            summaryNumber: this.nextSummaryNumber++, summaryFormatVersion: 1 }), this.garbageCollector.getMetadata()), { 
+            summaryNumber: this.nextSummaryNumber++,
+            summaryFormatVersion: 1,
+            ...this.garbageCollector.getMetadata(),
             // The last message processed at the time of summary. If there are no new messages, use the message from the
             // last summary.
-            message: (_a = (0, summary_1.extractSummaryMetadataMessage)(this.deltaManager.lastMessage)) !== null && _a !== void 0 ? _a : this.messageAtLastSummary, telemetryDocumentId: this.telemetryDocumentId, idCompressorEnabled: this.idCompressorEnabled ? true : undefined });
+            message: (0, summary_1.extractSummaryMetadataMessage)(this.deltaManager.lastMessage) ??
+                this.messageAtLastSummary,
+            telemetryDocumentId: this.telemetryDocumentId,
+            idCompressorEnabled: this.idCompressorEnabled ? true : undefined,
+        };
         (0, runtime_utils_1.addBlobToSummary)(summaryTree, summary_1.metadataBlobName, JSON.stringify(metadata));
     }
     addContainerStateToSummary(summaryTree, fullTree, trackState, telemetryContext) {
-        var _a;
         this.addMetadataToSummary(summaryTree);
         if (this.idCompressorEnabled) {
             (0, common_utils_1.assert)(this.idCompressor !== undefined, 0x67a /* IdCompressor should be defined if enabled */);
@@ -899,7 +950,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             (0, runtime_utils_1.addBlobToSummary)(summaryTree, summary_1.aliasBlobName, JSON.stringify([...dataStoreAliases]));
         }
         if (this.summarizerClientElection) {
-            const electedSummarizerContent = JSON.stringify((_a = this.summarizerClientElection) === null || _a === void 0 ? void 0 : _a.serialize());
+            const electedSummarizerContent = JSON.stringify(this.summarizerClientElection?.serialize());
             (0, runtime_utils_1.addBlobToSummary)(summaryTree, summary_1.electedSummarizerBlobName, electedSummarizerContent);
         }
         const blobManagerSummary = this.blobManager.summarize();
@@ -946,7 +997,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         // in their own batches before the originating batch is sent.
         // Therefore, receiving them while attempting to send the originating batch
         // does not mean that the container is making any progress.
-        if ((message === null || message === void 0 ? void 0 : message.type) !== ContainerMessageType.ChunkedOp) {
+        if (message?.type !== ContainerMessageType.ChunkedOp) {
             this.consecutiveReconnects = 0;
         }
     }
@@ -996,9 +1047,9 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
      */
     parseOpContent(serializedContent) {
         (0, common_utils_1.assert)(serializedContent !== undefined, 0x6d5 /* content must be defined */);
-        const parsed = JSON.parse(serializedContent);
-        (0, common_utils_1.assert)(parsed.type !== undefined, 0x6d6 /* incorrect op content format */);
-        return { type: parsed.type, contents: parsed.contents };
+        const { type, contents } = JSON.parse(serializedContent);
+        (0, common_utils_1.assert)(type !== undefined, 0x6d6 /* incorrect op content format */);
+        return { type, contents };
     }
     async applyStashedOp(op) {
         // Need to parse from string for back-compat
@@ -1057,6 +1108,12 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         // There might be no change of state due to Container calling this API after loading runtime.
         const changeOfState = this._connected !== connected;
         const reconnection = changeOfState && !connected;
+        // We need to flush the ops currently collected by Outbox to preserve original order.
+        // This flush NEEDS to happen before we set the ContainerRuntime to "connected".
+        // We want these ops to get to the PendingStateManager without sending to service and have them return to the Outbox upon calling "replayPendingStates".
+        if (changeOfState && connected) {
+            this.flush();
+        }
         this._connected = connected;
         if (!connected) {
             this._perfSignalData.signalsLost = 0;
@@ -1095,13 +1152,18 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         // or something different, like a system message.
         const runtimeMessage = messageArg.type === protocol_definitions_1.MessageType.Operation;
         // Do shallow copy of message, as the processing flow will modify it.
-        const messageCopy = Object.assign({}, messageArg);
+        const messageCopy = { ...messageArg };
         for (const message of this.remoteMessageProcessor.process(messageCopy)) {
             this.processCore(message, local, runtimeMessage);
         }
     }
+    /**
+     * Direct the message to the correct subsystem for processing, and implement other side effects
+     * @param message - The unpacked message. Likely a ContainerRuntimeMessage, but could also be a system op
+     * @param local - Did this client send the op?
+     * @param runtimeMessage - Does this appear like a current ContainerRuntimeMessage?  If true, certain validation will occur.
+     */
     processCore(message, local, runtimeMessage) {
-        var _a;
         // Surround the actual processing of the operation with messages to the schedule manager indicating
         // the beginning and end. This allows it to emit appropriate events and/or pause the processing of new
         // messages once a batch has been fully processed.
@@ -1146,16 +1208,14 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                             local,
                             type: message.type,
                             contentType: typeof message.contents,
-                            batch: (_a = message.metadata) === null || _a === void 0 ? void 0 : _a.batch,
+                            batch: message.metadata?.batch,
                             compression: message.compression,
                         });
                         this.closeFn(error);
                         throw error;
                     }
             }
-            if (runtimeMessage || this.groupedBatchingEnabled) {
-                this.emit("op", message, runtimeMessage);
-            }
+            this.emit("op", message, runtimeMessage);
             this.scheduleManager.afterOpProcessing(undefined, message);
             if (local) {
                 // If we have processed a local op, this means that the container is
@@ -1178,7 +1238,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
      */
     sendSignalTelemetryEvent(clientSignalSequenceNumber) {
         const duration = Date.now() - this._perfSignalData.signalTimestamp;
-        this.logger.sendPerformanceEvent({
+        this.mc.logger.sendPerformanceEvent({
             eventName: "SignalLatency",
             duration,
             signalsLost: this._perfSignalData.signalsLost,
@@ -1201,7 +1261,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                     this._perfSignalData.trackingSignalSequenceNumber) {
                 this._perfSignalData.signalsLost++;
                 this._perfSignalData.trackingSignalSequenceNumber = undefined;
-                this.logger.sendErrorEvent({
+                this.mc.logger.sendErrorEvent({
                     eventName: "SignalLost",
                     type: envelope.contents.type,
                     signalsLost: this._perfSignalData.signalsLost,
@@ -1225,6 +1285,12 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         }
         this.dataStores.processSignal(envelope.address, transformed, local);
     }
+    /**
+     * Returns the runtime of the data store.
+     * @param id - Id supplied during creating the data store.
+     * @param wait - True if you want to wait for it.
+     * @deprecated - Use getAliasedDataStoreEntryPoint instead to get an aliased data store's entry point.
+     */
     async getRootDataStore(id, wait = true) {
         return this.getRootDataStoreChannel(id, wait);
     }
@@ -1286,9 +1352,25 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         }
         return result;
     }
-    async createDataStore(pkg) {
-        const internalId = (0, uuid_1.v4)();
-        return (0, dataStore_1.channelToDataStore)(await this._createDataStore(pkg, internalId), internalId, this, this.dataStores, this.mc.logger);
+    /**
+     * Returns the aliased data store's entryPoint, given the alias.
+     * @param alias - The alias for the data store.
+     * @returns - The data store's entry point (IFluidHandle) if it exists and is aliased. Returns undefined if no
+     * data store has been assigned the given alias.
+     */
+    async getAliasedDataStoreEntryPoint(alias) {
+        await this.dataStores.waitIfPendingAlias(alias);
+        const internalId = this.internalId(alias);
+        const context = await this.dataStores.getDataStoreIfAvailable(internalId, { wait: false });
+        // If the data store is not available or not an alias, return undefined.
+        if (context === undefined || !(await context.isRoot())) {
+            return undefined;
+        }
+        const channel = await context.realize();
+        if (channel.entryPoint === undefined) {
+            throw new container_utils_1.UsageError("entryPoint must be defined on data store runtime for using getAliasedDataStoreEntryPoint");
+        }
+        return channel.entryPoint;
     }
     createDetachedRootDataStore(pkg, rootDataStoreId) {
         if (rootDataStoreId.includes("/")) {
@@ -1299,16 +1381,20 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
     createDetachedDataStore(pkg) {
         return this.dataStores.createDetachedDataStoreCore(pkg, false);
     }
-    async _createDataStoreWithProps(pkg, props, id = (0, uuid_1.v4)()) {
-        const fluidDataStore = await this.dataStores
-            ._createFluidDataStoreContext(Array.isArray(pkg) ? pkg : [pkg], id, props)
-            .realize();
-        return (0, dataStore_1.channelToDataStore)(fluidDataStore, id, this, this.dataStores, this.mc.logger);
+    async createDataStore(pkg) {
+        const id = (0, uuid_1.v4)();
+        return (0, dataStore_1.channelToDataStore)(await this.dataStores
+            ._createFluidDataStoreContext(Array.isArray(pkg) ? pkg : [pkg], id)
+            .realize(), id, this, this.dataStores, this.mc.logger);
     }
-    async _createDataStore(pkg, id = (0, uuid_1.v4)(), props) {
-        return this.dataStores
+    /**
+     * @deprecated 0.16 Issue #1537, #3631
+     * @internal
+     */
+    async _createDataStoreWithProps(pkg, props, id = (0, uuid_1.v4)()) {
+        return (0, dataStore_1.channelToDataStore)(await this.dataStores
             ._createFluidDataStoreContext(Array.isArray(pkg) ? pkg : [pkg], id, props)
-            .realize();
+            .realize(), id, this, this.dataStores, this.mc.logger);
     }
     canSendOps() {
         // Note that the real (non-proxy) delta manager is needed here to get the readonly info. This is because
@@ -1322,11 +1408,10 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         return this.flushMode !== runtime_definitions_1.FlushMode.Immediate || this._orderSequentiallyCalls !== 0;
     }
     getQuorum() {
-        return this.context.quorum;
+        return this._quorum;
     }
     getAudience() {
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        return this.context.audience;
+        return this._audience;
     }
     /**
      * Returns true of container is dirty, i.e. there are some pending local changes that
@@ -1335,7 +1420,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
     get isDirty() {
         return this.dirtyContainer;
     }
-    isContainerMessageDirtyable(type, contents) {
+    isContainerMessageDirtyable({ type, contents }) {
         // For legacy purposes, exclude the old built-in AgentScheduler from dirty consideration as a special-case.
         // Ultimately we should have no special-cases from the ContainerRuntime's perspective.
         if (type === ContainerMessageType.Attach) {
@@ -1375,11 +1460,11 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
     submitSignal(type, content) {
         this.verifyNotClosed();
         const envelope = this.createNewSignalEnvelope(undefined /* address */, type, content);
-        return this.context.submitSignalFn(envelope);
+        return this.submitSignalFn(envelope);
     }
     submitDataStoreSignal(address, type, content) {
         const envelope = this.createNewSignalEnvelope(address, type, content);
-        return this.context.submitSignalFn(envelope);
+        return this.submitSignalFn(envelope);
     }
     setAttachState(attachState) {
         if (attachState === container_definitions_1.AttachState.Attaching) {
@@ -1412,22 +1497,17 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         this.addContainerStateToSummary(summarizeResult, true /* fullTree */, false /* trackState */, telemetryContext);
         return summarizeResult.summary;
     }
-    async getAbsoluteUrl(relativeUrl) {
-        if (this.context.getAbsoluteUrl === undefined) {
-            throw new Error("Driver does not implement getAbsoluteUrl");
-        }
-        if (this.attachState !== container_definitions_1.AttachState.Attached) {
-            return undefined;
-        }
-        return this.context.getAbsoluteUrl(relativeUrl);
-    }
     async summarizeInternal(fullTree, trackState, telemetryContext) {
         const summarizeResult = await this.dataStores.summarize(fullTree, trackState, telemetryContext);
         // Wrap data store summaries in .channels subtree.
         (0, summary_1.wrapSummaryInChannelsTree)(summarizeResult);
         const pathPartsForChildren = [runtime_definitions_1.channelsTreeName];
         this.addContainerStateToSummary(summarizeResult, fullTree, trackState, telemetryContext);
-        return Object.assign(Object.assign({}, summarizeResult), { id: "", pathPartsForChildren });
+        return {
+            ...summarizeResult,
+            id: "",
+            pathPartsForChildren,
+        };
     }
     /**
      * Returns a summary of the runtime at the current sequence number.
@@ -1445,16 +1525,15 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             runSweep,
         });
         try {
-            let gcStats;
             if (runGC) {
-                gcStats = await this.collectGarbage({ logger: summaryLogger, runSweep, fullGC }, telemetryContext);
+                await this.collectGarbage({ logger: summaryLogger, runSweep, fullGC }, telemetryContext);
             }
             const { stats, summary } = await this.summarizerNode.summarize(fullTree, trackState, telemetryContext);
             (0, common_utils_1.assert)(summary.type === protocol_definitions_1.SummaryType.Tree, 0x12f /* "Container Runtime's summarize should always return a tree" */);
-            return { stats, summary, gcStats };
+            return { stats, summary };
         }
         finally {
-            this.logger.sendTelemetryEvent({
+            this.mc.logger.sendTelemetryEvent({
                 eventName: "SummarizeTelemetry",
                 details: telemetryContext.serialize(),
             });
@@ -1536,21 +1615,19 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
      * Returns a server generated referenced timestamp to be used to track unreferenced nodes by GC.
      */
     getCurrentReferenceTimestampMs() {
-        var _a, _b, _c;
         // Use the timestamp of the last message seen by this client as that is server generated. If no messages have
         // been processed, use the timestamp of the message from the last summary.
-        return (_b = (_a = this.deltaManager.lastMessage) === null || _a === void 0 ? void 0 : _a.timestamp) !== null && _b !== void 0 ? _b : (_c = this.messageAtLastSummary) === null || _c === void 0 ? void 0 : _c.timestamp;
+        return this.deltaManager.lastMessage?.timestamp ?? this.messageAtLastSummary?.timestamp;
     }
     /**
      * Returns the type of the GC node. Currently, there are nodes that belong to the root ("/"), data stores or
      * blob manager.
      */
     getNodeType(nodePath) {
-        var _a;
         if (this.isBlobPath(nodePath)) {
             return gc_1.GCNodeType.Blob;
         }
-        return (_a = this.dataStores.getGCNodeType(nodePath)) !== null && _a !== void 0 ? _a : gc_1.GCNodeType.Other;
+        return this.dataStores.getGCNodeType(nodePath) ?? gc_1.GCNodeType.Other;
     }
     /**
      * Called by GC to retrieve the package path of the node with the given path. The node should belong to a
@@ -1621,18 +1698,24 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
      * @param options - options controlling how the summary is generated or submitted
      */
     async submitSummary(options) {
-        var _a, _b, _c;
         const { fullTree = false, refreshLatestAck, summaryLogger } = options;
         // The summary number for this summary. This will be updated during the summary process, so get it now and
         // use it for all events logged during this summary.
         const summaryNumber = this.nextSummaryNumber;
-        const summaryNumberLogger = telemetry_utils_1.ChildLogger.create(summaryLogger, undefined, {
-            all: { summaryNumber },
+        const summaryNumberLogger = (0, telemetry_utils_1.createChildLogger)({
+            logger: summaryLogger,
+            properties: {
+                all: { summaryNumber },
+            },
         });
         (0, common_utils_1.assert)(this.outbox.isEmpty, 0x3d1 /* Can't trigger summary in the middle of a batch */);
         let latestSnapshotVersionId;
         if (refreshLatestAck) {
-            const latestSnapshotInfo = await this.refreshLatestSummaryAckFromServer(telemetry_utils_1.ChildLogger.create(summaryNumberLogger, undefined, { all: { safeSummary: true } }));
+            const latestSnapshotInfo = await this.refreshLatestSummaryAckFromServer((0, telemetry_utils_1.createChildLogger)({
+                logger: summaryNumberLogger,
+                namespace: undefined,
+                properties: { all: { safeSummary: true } },
+            }));
             const latestSnapshotRefSeq = latestSnapshotInfo.latestSnapshotRefSeq;
             latestSnapshotVersionId = latestSnapshotInfo.latestSnapshotVersionId;
             // We might need to catch up to the latest summary's reference sequence number before pausing.
@@ -1652,7 +1735,6 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             this.summarizerNode.startSummary(summaryRefSeqNum, summaryNumberLogger);
             // Helper function to check whether we should still continue between each async step.
             const checkContinue = () => {
-                var _a;
                 // Do not check for loss of connectivity directly! Instead leave it up to
                 // RunWhileConnectedCoordinator to control policy in a single place.
                 // This will allow easier change of design if we chose to. For example, we may chose to allow
@@ -1675,7 +1757,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                         error: `lastSequenceNumber changed before uploading to storage. ${this.deltaManager.lastSequenceNumber} !== ${summaryRefSeqNum}`,
                     };
                 }
-                (0, common_utils_1.assert)(summaryRefSeqNum === ((_a = this.deltaManager.lastMessage) === null || _a === void 0 ? void 0 : _a.sequenceNumber), 0x395 /* it's one and the same thing */);
+                (0, common_utils_1.assert)(summaryRefSeqNum === this.deltaManager.lastMessage?.sequenceNumber, 0x395 /* it's one and the same thing */);
                 if (lastAck !== this.summaryCollection.latestAck) {
                     return {
                         continue: false,
@@ -1726,7 +1808,15 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             const gcSummaryTreeStats = summaryTree.tree[runtime_definitions_1.gcTreeKey]
                 ? (0, runtime_utils_1.calculateStats)(summaryTree.tree[runtime_definitions_1.gcTreeKey])
                 : undefined;
-            const summaryStats = Object.assign({ dataStoreCount: this.dataStores.size, summarizedDataStoreCount: this.dataStores.size - handleCount, gcStateUpdatedDataStoreCount: this.garbageCollector.updatedDSCountSinceLastSummary, gcBlobNodeCount: gcSummaryTreeStats === null || gcSummaryTreeStats === void 0 ? void 0 : gcSummaryTreeStats.blobNodeCount, gcTotalBlobsSize: gcSummaryTreeStats === null || gcSummaryTreeStats === void 0 ? void 0 : gcSummaryTreeStats.totalBlobSize, summaryNumber }, partialStats);
+            const summaryStats = {
+                dataStoreCount: this.dataStores.size,
+                summarizedDataStoreCount: this.dataStores.size - handleCount,
+                gcStateUpdatedDataStoreCount: this.garbageCollector.updatedDSCountSinceLastSummary,
+                gcBlobNodeCount: gcSummaryTreeStats?.blobNodeCount,
+                gcTotalBlobsSize: gcSummaryTreeStats?.totalBlobSize,
+                summaryNumber,
+                ...partialStats,
+            };
             const generateSummaryData = {
                 referenceSequenceNumber: summaryRefSeqNum,
                 minimumSequenceNumber,
@@ -1740,14 +1830,14 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             if (this.validateSummaryBeforeUpload) {
                 const validateResult = this.summarizerNode.validateSummary();
                 if (!validateResult.success) {
-                    const { success } = validateResult, loggingProps = __rest(validateResult, ["success"]);
-                    const error = new summary_1.RetriableSummaryError(validateResult.reason, validateResult.retryAfterSeconds, Object.assign({}, loggingProps));
-                    return Object.assign(Object.assign({ stage: "base" }, generateSummaryData), { error });
+                    const { success, ...loggingProps } = validateResult;
+                    const error = new summary_1.RetriableSummaryError(validateResult.reason, validateResult.retryAfterSeconds, { ...loggingProps });
+                    return { stage: "base", ...generateSummaryData, error };
                 }
             }
             continueResult = checkContinue();
             if (!continueResult.continue) {
-                return Object.assign(Object.assign({ stage: "generate" }, generateSummaryData), { error: continueResult.error });
+                return { stage: "generate", ...generateSummaryData, error: continueResult.error };
             }
             // It may happen that the lastAck it not correct due to missing summaryAck in case of single commit
             // summary. So if the previous summarizer closes just after submitting the summary and before
@@ -1755,7 +1845,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             // latestSnapshotVersionId from storage and it does not match with the lastAck ackHandle, then use
             // the one fetched from storage as parent as that is the latest.
             let summaryContext;
-            if ((lastAck === null || lastAck === void 0 ? void 0 : lastAck.summaryAck.contents.handle) !== latestSnapshotVersionId &&
+            if (lastAck?.summaryAck.contents.handle !== latestSnapshotVersionId &&
                 latestSnapshotVersionId !== undefined) {
                 summaryContext = {
                     proposalHandle: undefined,
@@ -1766,7 +1856,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             else if (lastAck === undefined) {
                 summaryContext = {
                     proposalHandle: undefined,
-                    ackHandle: (_a = this.context.getLoadedFromVersion()) === null || _a === void 0 ? void 0 : _a.id,
+                    ackHandle: this.loadedFromVersionId,
                     referenceSequenceNumber: summaryRefSeqNum,
                 };
             }
@@ -1782,7 +1872,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                 handle = await this.storage.uploadSummaryWithContext(summarizeResult.summary, summaryContext);
             }
             catch (error) {
-                return Object.assign(Object.assign({ stage: "generate" }, generateSummaryData), { error });
+                return { stage: "generate", ...generateSummaryData, error };
             }
             const parent = summaryContext.ackHandle;
             const summaryMessage = {
@@ -1792,25 +1882,34 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                 message,
                 parents: parent ? [parent] : [],
             };
-            const uploadData = Object.assign(Object.assign({}, generateSummaryData), { handle, uploadDuration: trace.trace().duration });
+            const uploadData = {
+                ...generateSummaryData,
+                handle,
+                uploadDuration: trace.trace().duration,
+            };
             continueResult = checkContinue();
             if (!continueResult.continue) {
-                return Object.assign(Object.assign({ stage: "upload" }, uploadData), { error: continueResult.error });
+                return { stage: "upload", ...uploadData, error: continueResult.error };
             }
             let clientSequenceNumber;
             try {
                 clientSequenceNumber = this.submitSummaryMessage(summaryMessage, summaryRefSeqNum);
             }
             catch (error) {
-                return Object.assign(Object.assign({ stage: "upload" }, uploadData), { error });
+                return { stage: "upload", ...uploadData, error };
             }
-            const submitData = Object.assign(Object.assign({ stage: "submit" }, uploadData), { clientSequenceNumber, submitOpDuration: trace.trace().duration });
+            const submitData = {
+                stage: "submit",
+                ...uploadData,
+                clientSequenceNumber,
+                submitOpDuration: trace.trace().duration,
+            };
             try {
                 // If validateSummaryBeforeUpload is false, the summary should be validated in this step.
                 this.summarizerNode.completeSummary(handle, !this.validateSummaryBeforeUpload /* validate */);
             }
             catch (error) {
-                return Object.assign(Object.assign({ stage: "upload" }, uploadData), { error });
+                return { stage: "upload", ...uploadData, error };
             }
             return submitData;
         }
@@ -1818,7 +1917,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             // Cleanup wip summary in case of failure
             this.summarizerNode.clearSummary();
             // ! This needs to happen before we resume inbound queues to ensure heuristics are tracked correctly
-            (_c = (_b = this._summarizer) === null || _b === void 0 ? void 0 : _b.recordSummaryAttempt) === null || _c === void 0 ? void 0 : _c.call(_b, summaryRefSeqNum);
+            this._summarizer?.recordSummaryAttempt?.(summaryRefSeqNum);
             // Restart the delta manager
             this.deltaManager.inbound.resume();
             if (shouldPauseInboundSignal) {
@@ -1843,7 +1942,6 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         this.dirtyContainer = dirty;
         if (this.emitDirtyDocumentEvent) {
             this.emit(dirty ? "dirty" : "saved");
-            this.context.updateDirtyContainerState(dirty);
         }
     }
     submitDataStoreOp(id, contents, localOpMetadata = undefined) {
@@ -1851,21 +1949,20 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             address: id,
             contents,
         };
-        this.submit(ContainerMessageType.FluidDataStoreOp, envelope, localOpMetadata);
+        this.submit({ type: ContainerMessageType.FluidDataStoreOp, contents: envelope }, localOpMetadata);
     }
     submitDataStoreAliasOp(contents, localOpMetadata) {
         const aliasMessage = contents;
         if (!(0, dataStore_1.isDataStoreAliasMessage)(aliasMessage)) {
             throw new container_utils_1.UsageError("malformedDataStoreAliasMessage");
         }
-        this.submit(ContainerMessageType.Alias, contents, localOpMetadata);
+        this.submit({ type: ContainerMessageType.Alias, contents }, localOpMetadata);
     }
-    async uploadBlob(blob) {
+    async uploadBlob(blob, signal) {
         this.verifyNotClosed();
-        return this.blobManager.createBlob(blob);
+        return this.blobManager.createBlob(blob, signal);
     }
     maybeSubmitIdAllocationOp(type) {
-        var _a, _b;
         if (type !== ContainerMessageType.IdAllocation) {
             let idAllocationBatchMessage;
             let idRange;
@@ -1873,7 +1970,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                 (0, common_utils_1.assert)(this.idCompressor !== undefined, 0x67d /* IdCompressor should be defined if enabled */);
                 idRange = this.idCompressor.takeNextCreationRange();
                 // Don't include the idRange if there weren't any Ids allocated
-                idRange = ((_a = idRange === null || idRange === void 0 ? void 0 : idRange.ids) === null || _a === void 0 ? void 0 : _a.first) !== undefined ? idRange : undefined;
+                idRange = idRange?.ids?.first !== undefined ? idRange : undefined;
             }
             if (idRange !== undefined) {
                 const idAllocationMessage = {
@@ -1884,7 +1981,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                     contents: JSON.stringify(idAllocationMessage),
                     referenceSequenceNumber: this.deltaManager.lastSequenceNumber,
                     metadata: undefined,
-                    localOpMetadata: (_b = this.idCompressor) === null || _b === void 0 ? void 0 : _b.serialize(true),
+                    localOpMetadata: this.idCompressor?.serialize(true),
                     type: ContainerMessageType.IdAllocation,
                 };
             }
@@ -1893,20 +1990,21 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             }
         }
     }
-    submit(type, contents, localOpMetadata = undefined, metadata = undefined) {
+    submit(containerRuntimeMessage, localOpMetadata = undefined, metadata = undefined) {
         this.verifyNotClosed();
         this.verifyCanSubmitOps();
         // There should be no ops in detached container state!
         (0, common_utils_1.assert)(this.attachState !== container_definitions_1.AttachState.Detached, 0x132 /* "sending ops in detached container" */);
-        const serializedContent = JSON.stringify({ type, contents });
+        const serializedContent = JSON.stringify(containerRuntimeMessage);
         // Note that the real (non-proxy) delta manager is used here to get the readonly info. This is because
         // container runtime's ability to submit ops depend on the actual readonly state of the delta manager.
         if (this.innerDeltaManager.readOnlyInfo.readonly) {
-            this.logger.sendTelemetryEvent({
+            this.mc.logger.sendTelemetryEvent({
                 eventName: "SubmitOpInReadonly",
                 connected: this.connected,
             });
         }
+        const type = containerRuntimeMessage.type;
         const message = {
             contents: serializedContent,
             type,
@@ -1963,7 +2061,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             this.closeFn(error);
             throw error;
         }
-        if (this.isContainerMessageDirtyable(type, contents)) {
+        if (this.isContainerMessageDirtyable(containerRuntimeMessage)) {
             this.updateDocumentDirtyState(true);
         }
     }
@@ -2006,9 +2104,9 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         // System message should not be sent in the middle of the batch.
         (0, common_utils_1.assert)(this.outbox.isEmpty, 0x3d4 /* System op in the middle of a batch */);
         // back-compat: ADO #1385: Make this call unconditional in the future
-        return this.context.submitSummaryFn !== undefined
-            ? this.context.submitSummaryFn(contents, referenceSequenceNumber)
-            : this.context.submitFn(protocol_definitions_1.MessageType.Summarize, contents, false);
+        return this.submitSummaryFn !== undefined
+            ? this.submitSummaryFn(contents, referenceSequenceNumber)
+            : this.submitFn(protocol_definitions_1.MessageType.Summarize, contents, false);
     }
     /**
      * Throw an error if the runtime is closed.  Methods that are expected to potentially
@@ -2055,32 +2153,33 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
     }
     reSubmit(message) {
         // Need to parse from string for back-compat
-        const { contents, type } = this.parseOpContent(message.content);
-        this.reSubmitCore(type, contents, message.localOpMetadata, message.opMetadata);
+        const containerRuntimeMessage = this.parseOpContent(message.content);
+        this.reSubmitCore(containerRuntimeMessage, message.localOpMetadata, message.opMetadata);
     }
     /**
      * Finds the right store and asks it to resubmit the message. This typically happens when we
      * reconnect and there are pending messages.
-     * @param content - The content of the original message.
+     * @param message - The original ContainerRuntimeMessage.
      * @param localOpMetadata - The local metadata associated with the original message.
      */
-    reSubmitCore(type, content, localOpMetadata, opMetadata) {
-        switch (type) {
+    reSubmitCore(message, localOpMetadata, opMetadata) {
+        const contents = message.contents;
+        switch (message.type) {
             case ContainerMessageType.FluidDataStoreOp:
                 // For Operations, call resubmitDataStoreOp which will find the right store
                 // and trigger resubmission on it.
-                this.dataStores.resubmitDataStoreOp(content, localOpMetadata);
+                this.dataStores.resubmitDataStoreOp(contents, localOpMetadata);
                 break;
             case ContainerMessageType.Attach:
             case ContainerMessageType.Alias:
-                this.submit(type, content, localOpMetadata);
+                this.submit(message, localOpMetadata);
                 break;
             case ContainerMessageType.IdAllocation:
                 // Remove the stashedState from the op if it's a stashed op
-                if (content.stashedState !== undefined) {
-                    delete content.stashedState;
+                if (contents.stashedState !== undefined) {
+                    delete contents.stashedState;
                 }
-                this.submit(type, content, localOpMetadata);
+                this.submit(message, localOpMetadata);
                 break;
             case ContainerMessageType.ChunkedOp:
                 throw new Error(`chunkedOp not expected here`);
@@ -2088,10 +2187,10 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                 this.blobManager.reSubmit(opMetadata);
                 break;
             case ContainerMessageType.Rejoin:
-                this.submit(type, content);
+                this.submit(message);
                 break;
             default:
-                (0, common_utils_1.unreachableCase)(type, `Unknown ContainerMessageType: ${type}`);
+                (0, common_utils_1.unreachableCase)(message.type, `Unknown ContainerMessageType [type: ${message.type}]`);
         }
     }
     rollback(content, localOpMetadata) {
@@ -2138,7 +2237,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
              * change that started fetching latest snapshot always.
              */
             if (fetchResult.latestSnapshotRefSeq < summaryRefSeq) {
-                fetchResult = await this.fetchSnapshotFromStorage(summaryLogger, {
+                fetchResult = await this.fetchSnapshotFromStorageAndClose(summaryLogger, {
                     eventName: "RefreshLatestSummaryAckFetchBackCompat",
                     ackHandle,
                     targetSequenceNumber: summaryRefSeq,
@@ -2160,7 +2259,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                     summaryRefSeq,
                     fetchedSnapshotRefSeq: fetchResult.latestSnapshotRefSeq,
                 });
-                this.closeFn(error);
+                this.disposeFn(error);
                 throw error;
             }
             // In case we had to retrieve the latest snapshot and it is different than summaryRefSeq,
@@ -2196,10 +2295,9 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         return { latestSnapshotRefSeq, latestSnapshotVersionId: versionId };
     }
     async fetchLatestSnapshotFromStorage(logger, event, readAndParseBlob) {
-        return this.fetchSnapshotFromStorage(logger, event, readAndParseBlob, null /* latest */);
+        return this.fetchSnapshotFromStorageAndClose(logger, event, readAndParseBlob, null /* latest */);
     }
-    async fetchSnapshotFromStorage(logger, event, readAndParseBlob, versionId) {
-        var _a;
+    async fetchSnapshotFromStorageAndClose(logger, event, readAndParseBlob, versionId) {
         const snapshotResults = await telemetry_utils_1.PerformanceEvent.timedExecAsync(logger, event, async (perfEvent) => {
             const stats = {};
             const trace = common_utils_1.Trace.start();
@@ -2222,29 +2320,37 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         // We choose to close the summarizer after the snapshot cache is updated to avoid
         // situations which the main client (which is likely to be re-elected as the leader again)
         // loads the summarizer from cache.
-        if (this.summaryStateUpdateMethod === "restart") {
-            const error = new container_utils_1.GenericError("Restarting summarizer instead of refreshing");
-            this.mc.logger.sendTelemetryEvent(Object.assign(Object.assign({}, event), { eventName: "ClosingSummarizerOnSummaryStale", codePath: event.eventName, message: "Stopping fetch from storage", versionId: versionId != null ? versionId : undefined, closeSummarizerDelayMs: this.closeSummarizerDelayMs }), error);
-            // Delay 10 seconds before restarting summarizer to prevent the summarizer from restarting too frequently.
+        if (this.summaryStateUpdateMethod !== "refreshFromSnapshot") {
+            this.mc.logger.sendTelemetryEvent({
+                ...event,
+                eventName: "ClosingSummarizerOnSummaryStale",
+                codePath: event.eventName,
+                message: "Stopping fetch from storage",
+                versionId: versionId != null ? versionId : undefined,
+                closeSummarizerDelayMs: this.closeSummarizerDelayMs,
+            }, new container_utils_1.GenericError("Restarting summarizer instead of refreshing"));
+            // Delay before restarting summarizer to prevent the summarizer from restarting too frequently.
             await (0, common_utils_1.delay)(this.closeSummarizerDelayMs);
-            (_a = this._summarizer) === null || _a === void 0 ? void 0 : _a.stop("latestSummaryStateStale");
-            this.closeFn();
-            throw error;
+            this._summarizer?.stop("latestSummaryStateStale");
+            this.disposeFn();
         }
         return snapshotResults;
     }
     notifyAttaching() { } // do nothing (deprecated method)
-    getPendingLocalState() {
+    async getPendingLocalState(props) {
+        this.verifyNotClosed();
+        const waitBlobsToAttach = props?.notifyImminentClosure;
         if (this._orderSequentiallyCalls !== 0) {
             throw new container_utils_1.UsageError("can't get state during orderSequentially");
         }
+        const pendingAttachmentBlobs = await this.blobManager.getPendingBlobs(waitBlobsToAttach);
         // Flush pending batch.
         // getPendingLocalState() is only exposed through Container.closeAndGetPendingLocalState(), so it's safe
         // to close current batch.
         this.flush();
         return {
             pending: this.pendingStateManager.getLocalState(),
-            pendingAttachmentBlobs: this.blobManager.getPendingBlobs(),
+            pendingAttachmentBlobs,
         };
     }
     /**