@fluidframework/container-runtime 2.0.0-internal.5.3.4 → 2.0.0-internal.5.4.2

package/lib/containerRuntime.js

@@ -12,7 +12,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 import { AttachState, LoaderHeader, } from "@fluidframework/container-definitions";
 import { assert, delay, Trace, TypedEventEmitter, unreachableCase, } from "@fluidframework/common-utils";
 import { LazyPromise } from "@fluidframework/core-utils";
-import { ChildLogger, raiseConnectedEvent, PerformanceEvent, TaggedLoggerAdapter, loggerToMonitoringContext, wrapError, } from "@fluidframework/telemetry-utils";
+import { createChildLogger, raiseConnectedEvent, PerformanceEvent, TaggedLoggerAdapter, wrapError, createChildMonitoringContext, } from "@fluidframework/telemetry-utils";
 import { DriverHeader, FetchSource, } from "@fluidframework/driver-definitions";
 import { readAndParse } from "@fluidframework/driver-utils";
 import { DataCorruptionError, DataProcessingError, GenericError, UsageError, } from "@fluidframework/container-utils";
@@ -115,7 +115,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
  */
@@ -154,6 +154,20 @@ export function getDeviceSpec() {
     catch (_a) { }
     return {};
 }
+/**
+ * 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.
+ */
+export const makeLegacySendBatchFn = (submitFn, deltaManager) => (batch) => {
+    for (const message of batch.content) {
+        submitFn(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();
+};
 /**
  * Represents the runtime of the container. Contains helper functions/state of the container.
  * It will define the store level mappings.
@@ -166,7 +180,6 @@ export class ContainerRuntime extends TypedEventEmitter {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         if (summaryConfiguration === void 0) { summaryConfiguration = Object.assign(Object.assign({}, DefaultSummaryConfiguration), (_a = runtimeOptions.summaryOptions) === null || _a === void 0 ? void 0 : _a.summaryConfigOverrides); }
         super();
-        this.context = context;
         this.registry = registry;
         this.runtimeOptions = runtimeOptions;
         this.containerScope = containerScope;
@@ -196,7 +209,7 @@ export class ContainerRuntime extends TypedEventEmitter {
             trackingSignalSequenceNumber: undefined,
         };
         this.summarizeOnDemand = (...args) => {
-            if (this.clientDetails.type === summarizerClientType) {
+            if (this.isSummarizerClient) {
                 return this.summarizer.summarizeOnDemand(...args);
             }
             else if (this.summaryManager !== undefined) {
@@ -210,7 +223,7 @@ export class ContainerRuntime extends TypedEventEmitter {
             }
         };
         this.enqueueSummarize = (...args) => {
-            if (this.clientDetails.type === summarizerClientType) {
+            if (this.isSummarizerClient) {
                 return this.summarizer.enqueueSummarize(...args);
             }
             else if (this.summaryManager !== undefined) {
@@ -223,9 +236,48 @@ export class ContainerRuntime extends TypedEventEmitter {
                 throw new UsageError(`Can't summarize, disableSummaries: ${this.summariesDisabled}`);
             }
         };
-        this.innerDeltaManager = context.deltaManager;
-        this.deltaManager = new DeltaManagerSummarizerProxy(context.deltaManager);
-        this.mc = loggerToMonitoringContext(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(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 === summarizerClientType;
+        this.loadedFromVersionId = (_b = context.getLoadedFromVersion()) === null || _b === void 0 ? void 0 : _b.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 !== 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 !== null && disposeFn !== void 0 ? 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
+            : (error) => {
+                closeFn(error);
+                // Also call disposeFn to retain functionality of runtime being disposed on close
+                disposeFn === null || disposeFn === void 0 ? void 0 : disposeFn(error);
+            };
+        this.mc = 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.
@@ -236,10 +288,10 @@ export class ContainerRuntime extends TypedEventEmitter {
             };
             // 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 = (_c = metadata === null || metadata === void 0 ? void 0 : metadata.summaryNumber) !== null && _c !== void 0 ? _c : 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 = (_d = metadata === null || metadata === void 0 ? void 0 : metadata.idCompressorEnabled) !== null && _d !== void 0 ? _d : false;
         }
         else {
             this.createContainerMetadata = {
@@ -248,12 +300,14 @@ export class ContainerRuntime extends TypedEventEmitter {
             };
             loadSummaryNumber = 0;
             this.idCompressorEnabled =
-                (_d = this.mc.config.getBoolean("Fluid.ContainerRuntime.IdCompressorEnabled")) !== null && _d !== void 0 ? _d : idCompressor !== undefined;
+                (_e = this.mc.config.getBoolean("Fluid.ContainerRuntime.IdCompressorEnabled")) !== null && _e !== void 0 ? _e : idCompressor !== undefined;
         }
         this.nextSummaryNumber = loadSummaryNumber + 1;
         this.messageAtLastSummary = metadata === null || metadata === void 0 ? void 0 : metadata.message;
-        this._connected = this.context.connected;
-        this.gcTombstoneEnforcementAllowed = shouldAllowGcTombstoneEnforcement((_e = metadata === null || metadata === void 0 ? void 0 : metadata.gcFeatureMatrix) === null || _e === void 0 ? void 0 : _e.tombstoneGeneration /* persisted */, this.runtimeOptions.gcOptions[gcTombstoneGenerationOptionName] /* current */);
+        // 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 = shouldAllowGcTombstoneEnforcement((_f = metadata === null || metadata === void 0 ? void 0 : metadata.gcFeatureMatrix) === null || _f === void 0 ? void 0 : _f.tombstoneGeneration /* persisted */, this.runtimeOptions.gcOptions[gcTombstoneGenerationOptionName] /* current */);
         this.mc.logger.sendTelemetryEvent({
             eventName: "GCFeatureMatrix",
             metadataValue: JSON.stringify(metadata === null || metadata === void 0 ? void 0 : metadata.gcFeatureMatrix),
@@ -261,11 +315,11 @@ export class ContainerRuntime extends TypedEventEmitter {
                 gcOptions_gcTombstoneGeneration: this.runtimeOptions.gcOptions[gcTombstoneGenerationOptionName],
             }),
         });
-        this.telemetryDocumentId = (_f = metadata === null || metadata === void 0 ? void 0 : metadata.telemetryDocumentId) !== null && _f !== void 0 ? _f : uuid();
+        this.telemetryDocumentId = (_g = metadata === null || metadata === void 0 ? void 0 : metadata.telemetryDocumentId) !== null && _g !== void 0 ? _g : uuid();
         this.disableAttachReorder = this.mc.config.getBoolean("Fluid.ContainerRuntime.disableAttachOpReorder");
         const disableChunking = this.mc.config.getBoolean("Fluid.ContainerRuntime.CompressionChunkingDisabled");
         const opGroupingManager = new OpGroupingManager(this.groupedBatchingEnabled);
-        const opSplitter = new OpSplitter(chunks, this.context.submitBatchFn, disableChunking === true ? Number.POSITIVE_INFINITY : runtimeOptions.chunkSizeInBytes, runtimeOptions.maxBatchSizeInBytes, this.mc.logger);
+        const opSplitter = new OpSplitter(chunks, this.submitBatchFn, disableChunking === true ? Number.POSITIVE_INFINITY : runtimeOptions.chunkSizeInBytes, runtimeOptions.maxBatchSizeInBytes, this.mc.logger);
         this.remoteMessageProcessor = new RemoteMessageProcessor(opSplitter, new OpDecompressor(this.mc.logger), opGroupingManager);
         this.handleContext = new ContainerFluidHandleContext("", this);
         if (this.summaryConfiguration.state === "enabled") {
@@ -284,9 +338,9 @@ export class ContainerRuntime extends TypedEventEmitter {
             this.idCompressor = idCompressor;
         }
         this.maxConsecutiveReconnects =
-            (_g = this.mc.config.getNumber(maxConsecutiveReconnectsKey)) !== null && _g !== void 0 ? _g : this.defaultMaxConsecutiveReconnects;
+            (_h = this.mc.config.getNumber(maxConsecutiveReconnectsKey)) !== null && _h !== void 0 ? _h : this.defaultMaxConsecutiveReconnects;
         if (runtimeOptions.flushMode === FlushModeExperimental.Async &&
-            ((_h = context.supportedFeatures) === null || _h === void 0 ? void 0 : _h.get("referenceSequenceNumbers")) !== true) {
+            (supportedFeatures === null || supportedFeatures === void 0 ? void 0 : 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 = FlushMode.TurnBased;
@@ -294,7 +348,7 @@ export class ContainerRuntime extends TypedEventEmitter {
         else {
             this._flushMode = runtimeOptions.flushMode;
         }
-        const pendingRuntimeState = context.pendingLocalState;
+        const pendingRuntimeState = pendingLocalState;
         const maxSnapshotCacheDurationMs = (_k = (_j = this._storage) === null || _j === void 0 ? void 0 : _j.policies) === null || _k === void 0 ? void 0 : _k.maximumCacheDurationMs;
         if (maxSnapshotCacheDurationMs !== undefined &&
             maxSnapshotCacheDurationMs > 5 * 24 * 60 * 60 * 1000) {
@@ -306,12 +360,12 @@ export class ContainerRuntime extends TypedEventEmitter {
         this.garbageCollector = 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 === 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; },
             readAndParseBlob: async (id) => readAndParse(this.storage, id),
@@ -320,13 +374,13 @@ export class ContainerRuntime extends TypedEventEmitter {
             activeConnection: () => this.innerDeltaManager.active,
         });
         const loadedFromSequenceNumber = this.deltaManager.initialSequenceNumber;
-        this.summarizerNode = createRootSummarizerNodeWithGC(ChildLogger.create(this.logger, "SummarizerNode"), 
+        this.summarizerNode = createRootSummarizerNodeWithGC(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,
@@ -340,19 +394,19 @@ export class ContainerRuntime extends 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(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(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(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(context.deltaManager, this, () => this.clientId, ChildLogger.create(this.logger, "ScheduleManager"));
+        this.scheduleManager = new ScheduleManager(this.innerDeltaManager, this, () => this.clientId, createChildLogger({ logger: this.logger, namespace: "ScheduleManager" }));
         this.pendingStateManager = new PendingStateManager({
             applyStashedOp: this.applyStashedOp.bind(this),
             clientId: () => this.clientId,
@@ -360,7 +414,8 @@ export class ContainerRuntime extends 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 === null || pendingRuntimeState === void 0 ? void 0 : pendingRuntimeState.pending, this.logger);
         const disableCompression = this.mc.config.getBoolean("Fluid.ContainerRuntime.CompressionDisabled");
         const compressionOptions = disableCompression === true
             ? {
@@ -369,10 +424,12 @@ export class ContainerRuntime extends TypedEventEmitter {
             }
             : runtimeOptions.compressionOptions;
         const disablePartialFlush = this.mc.config.getBoolean("Fluid.ContainerRuntime.DisablePartialFlush");
+        const legacySendBatchFn = makeLegacySendBatchFn(this.submitFn, this.innerDeltaManager);
         this.outbox = new Outbox({
             shouldSend: () => this.canSendOps(),
             pendingStateManager: this.pendingStateManager,
-            containerContext: this.context,
+            submitBatchFn: this.submitBatchFn,
+            legacySendBatchFn,
             compressor: new OpCompressor(this.mc.logger),
             splitter: opSplitter,
             config: {
@@ -391,9 +448,12 @@ export class ContainerRuntime extends 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;
@@ -401,34 +461,39 @@ export class ContainerRuntime extends TypedEventEmitter {
             (_l = this.mc.config.getBoolean("Fluid.ContainerRuntime.Test.ValidateSummaryBeforeUpload")) !== null && _l !== void 0 ? _l : false;
         this.summaryCollection = new SummaryCollection(this.deltaManager, this.logger);
         this.dirtyContainer =
-            this.context.attachState !== AttachState.Attached ||
+            this.attachState !== 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 = ChildLogger.create(this.logger, "OrderedClientElection");
-            const orderedClientCollection = new OrderedClientCollection(orderedClientLogger, this.context.deltaManager, this.context.quorum);
-            const orderedClientElectionForSummarizer = new OrderedClientElection(orderedClientLogger, orderedClientCollection, electedSummarizerData !== null && electedSummarizerData !== void 0 ? electedSummarizerData : this.context.deltaManager.lastSequenceNumber, SummarizerClientElection.isClientEligible);
+            const orderedClientLogger = createChildLogger({
+                logger: this.logger,
+                namespace: "OrderedClientElection",
+            });
+            const orderedClientCollection = new OrderedClientCollection(orderedClientLogger, this.innerDeltaManager, this._quorum);
+            const orderedClientElectionForSummarizer = new OrderedClientElection(orderedClientLogger, orderedClientCollection, electedSummarizerData !== null && electedSummarizerData !== void 0 ? electedSummarizerData : this.innerDeltaManager.lastSequenceNumber, SummarizerClientElection.isClientEligible);
             this.summarizerClientElection = new SummarizerClientElection(orderedClientLogger, this.summaryCollection, orderedClientElectionForSummarizer, this.maxOpsSinceLastSummary);
-            if (this.context.clientDetails.type === summarizerClientType) {
+            if (this.isSummarizerClient) {
                 this._summarizer = new Summarizer(this /* ISummarizerRuntime */, () => this.summaryConfiguration, this /* ISummarizerInternalsProvider */, this.handleContext, this.summaryCollection, async (runtime) => 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 (SummarizerClientElection.clientDetailsPermitElection(this.context.clientDetails)) {
+            else if (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(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);
@@ -439,7 +504,7 @@ export class ContainerRuntime extends TypedEventEmitter {
                 this.summaryCollection.on("default", defaultAction);
                 // Create the SummaryManager and mark the initial state
                 this.summaryManager = new SummaryManager(this.summarizerClientElection, this, // IConnectedState
-                this.summaryCollection, this.logger, this.formRequestSummarizerFn(this.context.loader), new Throttler(60 * 1000, // 60 sec delay window
+                this.summaryCollection, this.logger, this.formRequestSummarizerFn(loader), new Throttler(60 * 1000, // 60 sec delay window
                 30 * 1000, // 30 sec max delay
                 // throttling function increases exponentially (0ms, 40ms, 80ms, 160ms, etc)
                 formExponentialFn({ coefficient: 20, initialDelay: 0 })), {
@@ -470,7 +535,7 @@ export class ContainerRuntime extends TypedEventEmitter {
         });
         // 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({
+        this.mc.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({
                 disableCompression,
                 disableOpReentryCheck,
                 disableChunking,
@@ -480,10 +545,10 @@ export class ContainerRuntime extends TypedEventEmitter {
                 summaryStateUpdateMethod: this.summaryStateUpdateMethod,
                 closeSummarizerDelayOverride,
             }), telemetryDocumentId: this.telemetryDocumentId, groupedBatchingEnabled: this.groupedBatchingEnabled }));
-        ReportOpPerfTelemetry(this.context.clientId, this.deltaManager, this.logger);
+        ReportOpPerfTelemetry(this.clientId, this.deltaManager, this.logger);
         BindBatchTracker(this, this.logger);
         this.entryPoint = new LazyPromise(async () => {
-            if (this.context.clientDetails.type === summarizerClientType) {
+            if (this.isSummarizerClient) {
                 assert(this._summarizer !== undefined, 0x5bf /* Summarizer object is undefined in a summarizer client */);
                 return this._summarizer;
             }
@@ -541,9 +606,12 @@ export class ContainerRuntime extends TypedEventEmitter {
         // 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 TaggedLoggerAdapter(backCompatContext.logger);
-        const logger = ChildLogger.create(passLogger, undefined, {
-            all: {
-                runtimeVersion: pkgVersion,
+        const logger = createChildLogger({
+            logger: passLogger,
+            properties: {
+                all: {
+                    runtimeVersion: pkgVersion,
+                },
             },
         });
         const { summaryOptions = {}, gcOptions = {}, loadSequenceNumberVerification = "close", flushMode = defaultFlushMode, compressionOptions = defaultCompressionConfig, maxBatchSizeInBytes = defaultMaxBatchSizeInBytes, enableRuntimeIdCompressor = false, chunkSizeInBytes = defaultChunkSizeInBytes, enableOpReentryCheck = false, enableGroupedBatching = false, } = runtimeOptions;
@@ -624,38 +692,15 @@ export class ContainerRuntime extends 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;
@@ -667,7 +712,7 @@ export class ContainerRuntime extends TypedEventEmitter {
         return this.registry;
     }
     get attachState() {
-        return this.context.attachState;
+        return this._getAttachState();
     }
     get IFluidHandleContext() {
         return this.handleContext;
@@ -737,7 +782,7 @@ export class ContainerRuntime extends TypedEventEmitter {
             return;
         }
         this._disposed = true;
-        this.logger.sendTelemetryEvent({
+        this.mc.logger.sendTelemetryEvent({
             eventName: "ContainerRuntimeDisposed",
             isDirty: this.isDirty,
             lastSequenceNumber: this.deltaManager.lastSequenceNumber,
@@ -972,9 +1017,9 @@ export class ContainerRuntime extends TypedEventEmitter {
      */
     parseOpContent(serializedContent) {
         assert(serializedContent !== undefined, 0x6d5 /* content must be defined */);
-        const parsed = JSON.parse(serializedContent);
-        assert(parsed.type !== undefined, 0x6d6 /* incorrect op content format */);
-        return { type: parsed.type, contents: parsed.contents };
+        const { type, contents } = JSON.parse(serializedContent);
+        assert(type !== undefined, 0x6d6 /* incorrect op content format */);
+        return { type, contents };
     }
     async applyStashedOp(op) {
         // Need to parse from string for back-compat
@@ -1033,6 +1078,12 @@ export class ContainerRuntime extends 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;
@@ -1076,6 +1127,12 @@ export class ContainerRuntime extends TypedEventEmitter {
             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
@@ -1129,9 +1186,7 @@ export class ContainerRuntime extends TypedEventEmitter {
                         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
@@ -1154,7 +1209,7 @@ export class ContainerRuntime extends TypedEventEmitter {
      */
     sendSignalTelemetryEvent(clientSignalSequenceNumber) {
         const duration = Date.now() - this._perfSignalData.signalTimestamp;
-        this.logger.sendPerformanceEvent({
+        this.mc.logger.sendPerformanceEvent({
             eventName: "SignalLatency",
             duration,
             signalsLost: this._perfSignalData.signalsLost,
@@ -1177,7 +1232,7 @@ export class ContainerRuntime extends 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,
@@ -1298,11 +1353,10 @@ export class ContainerRuntime extends TypedEventEmitter {
         return this.flushMode !== 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
@@ -1311,7 +1365,7 @@ export class ContainerRuntime extends 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) {
@@ -1351,11 +1405,11 @@ export class ContainerRuntime extends 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 === AttachState.Attaching) {
@@ -1388,15 +1442,6 @@ export class ContainerRuntime extends 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 !== 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.
@@ -1430,7 +1475,7 @@ export class ContainerRuntime extends TypedEventEmitter {
             return { stats, summary, gcStats };
         }
         finally {
-            this.logger.sendTelemetryEvent({
+            this.mc.logger.sendTelemetryEvent({
                 eventName: "SummarizeTelemetry",
                 details: telemetryContext.serialize(),
             });
@@ -1597,18 +1642,25 @@ export class ContainerRuntime extends TypedEventEmitter {
      * @param options - options controlling how the summary is generated or submitted
      */
     async submitSummary(options) {
-        var _a, _b, _c;
+        var _a, _b;
         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 = ChildLogger.create(summaryLogger, undefined, {
-            all: { summaryNumber },
+        const summaryNumberLogger = createChildLogger({
+            logger: summaryLogger,
+            properties: {
+                all: { summaryNumber },
+            },
         });
         assert(this.outbox.isEmpty, 0x3d1 /* Can't trigger summary in the middle of a batch */);
         let latestSnapshotVersionId;
         if (refreshLatestAck) {
-            const latestSnapshotInfo = await this.refreshLatestSummaryAckFromServer(ChildLogger.create(summaryNumberLogger, undefined, { all: { safeSummary: true } }));
+            const latestSnapshotInfo = await this.refreshLatestSummaryAckFromServer(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.
@@ -1742,7 +1794,7 @@ export class ContainerRuntime extends 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,
                 };
             }
@@ -1794,7 +1846,7 @@ export class ContainerRuntime extends 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);
+            (_b = (_a = this._summarizer) === null || _a === void 0 ? void 0 : _a.recordSummaryAttempt) === null || _b === void 0 ? void 0 : _b.call(_a, summaryRefSeqNum);
             // Restart the delta manager
             this.deltaManager.inbound.resume();
             if (shouldPauseInboundSignal) {
@@ -1819,7 +1871,6 @@ export class ContainerRuntime extends TypedEventEmitter {
         this.dirtyContainer = dirty;
         if (this.emitDirtyDocumentEvent) {
             this.emit(dirty ? "dirty" : "saved");
-            this.context.updateDirtyContainerState(dirty);
         }
     }
     submitDataStoreOp(id, contents, localOpMetadata = undefined) {
@@ -1827,18 +1878,18 @@ export class ContainerRuntime extends 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 (!isDataStoreAliasMessage(aliasMessage)) {
             throw new 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;
@@ -1869,20 +1920,21 @@ export class ContainerRuntime extends 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!
         assert(this.attachState !== 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,
@@ -1939,7 +1991,7 @@ export class ContainerRuntime extends TypedEventEmitter {
             this.closeFn(error);
             throw error;
         }
-        if (this.isContainerMessageDirtyable(type, contents)) {
+        if (this.isContainerMessageDirtyable(containerRuntimeMessage)) {
             this.updateDocumentDirtyState(true);
         }
     }
@@ -1982,9 +2034,9 @@ export class ContainerRuntime extends TypedEventEmitter {
         // System message should not be sent in the middle of the batch.
         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(MessageType.Summarize, contents, false);
+        return this.submitSummaryFn !== undefined
+            ? this.submitSummaryFn(contents, referenceSequenceNumber)
+            : this.submitFn(MessageType.Summarize, contents, false);
     }
     /**
      * Throw an error if the runtime is closed.  Methods that are expected to potentially
@@ -2031,32 +2083,33 @@ export class ContainerRuntime extends 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`);
@@ -2064,10 +2117,10 @@ export class ContainerRuntime extends TypedEventEmitter {
                 this.blobManager.reSubmit(opMetadata);
                 break;
             case ContainerMessageType.Rejoin:
-                this.submit(type, content);
+                this.submit(message);
                 break;
             default:
-                unreachableCase(type, `Unknown ContainerMessageType: ${type}`);
+                unreachableCase(message.type, `Unknown ContainerMessageType [type: ${message.type}]`);
         }
     }
     rollback(content, localOpMetadata) {
@@ -2114,7 +2167,7 @@ export class ContainerRuntime extends 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,
@@ -2172,9 +2225,9 @@ export class ContainerRuntime extends 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) {
+    async fetchSnapshotFromStorageAndClose(logger, event, readAndParseBlob, versionId) {
         var _a;
         const snapshotResults = await PerformanceEvent.timedExecAsync(logger, event, async (perfEvent) => {
             const stats = {};
@@ -2198,14 +2251,12 @@ export class ContainerRuntime extends 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 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(Object.assign(Object.assign({}, event), { eventName: "ClosingSummarizerOnSummaryStale", codePath: event.eventName, message: "Stopping fetch from storage", versionId: versionId != null ? versionId : undefined, closeSummarizerDelayMs: this.closeSummarizerDelayMs }), new GenericError("Restarting summarizer instead of refreshing"));
+            // Delay before restarting summarizer to prevent the summarizer from restarting too frequently.
             await delay(this.closeSummarizerDelayMs);
             (_a = this._summarizer) === null || _a === void 0 ? void 0 : _a.stop("latestSummaryStateStale");
-            this.closeFn();
-            throw error;
+            this.disposeFn();
         }
         return snapshotResults;
     }