@fluidframework/container-runtime 2.0.0-rc.2.0.1 → 2.0.0-rc.3.0.0

package/dist/channelCollection.js

@@ -5,22 +5,22 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChannelCollectionFactory = exports.detectOutboundReferences = exports.getSummaryForDatastores = exports.ChannelCollection = exports.wrapContextForInnerChannel = exports.wrapContext = exports.AllowInactiveRequestHeaderKey = exports.AllowTombstoneRequestHeaderKey = exports.RuntimeHeaders = void 0;
-const datastore_1 = require("@fluidframework/datastore");
-const runtime_definitions_1 = require("@fluidframework/runtime-definitions");
-const runtime_utils_1 = require("@fluidframework/runtime-utils");
-const telemetry_utils_1 = require("@fluidframework/telemetry-utils");
 const container_definitions_1 = require("@fluidframework/container-definitions");
-const driver_utils_1 = require("@fluidframework/driver-utils");
-const core_utils_1 = require("@fluidframework/core-utils");
-const dataStoreContexts_js_1 = require("./dataStoreContexts.js");
+const internal_1 = require("@fluidframework/core-utils/internal");
+const internal_2 = require("@fluidframework/datastore/internal");
+const internal_3 = require("@fluidframework/driver-utils/internal");
+const internal_4 = require("@fluidframework/runtime-definitions/internal");
+const internal_5 = require("@fluidframework/runtime-utils/internal");
+const internal_6 = require("@fluidframework/telemetry-utils/internal");
 const containerRuntime_js_1 = require("./containerRuntime.js");
-const dataStoreContext_js_1 = require("./dataStoreContext.js");
-const storageServiceWithAttachBlobs_js_1 = require("./storageServiceWithAttachBlobs.js");
 const dataStore_js_1 = require("./dataStore.js");
+const dataStoreContext_js_1 = require("./dataStoreContext.js");
+const dataStoreContexts_js_1 = require("./dataStoreContexts.js");
+const dataStoreRegistry_js_1 = require("./dataStoreRegistry.js");
 const index_js_1 = require("./gc/index.js");
-const index_js_2 = require("./summary/index.js");
 const messageTypes_js_1 = require("./messageTypes.js");
-const dataStoreRegistry_js_1 = require("./dataStoreRegistry.js");
+const storageServiceWithAttachBlobs_js_1 = require("./storageServiceWithAttachBlobs.js");
+const index_js_2 = require("./summary/index.js");
 /**
  * Accepted header keys for requests coming to the runtime.
  * @internal
@@ -105,7 +105,10 @@ function wrapContext(context) {
             return context.getCreateChildSummarizerNodeFn?.(...args);
         },
         deleteChildSummarizerNode: (...args) => {
-            return context.deleteChildSummarizerNode?.(...args);
+            return context.deleteChildSummarizerNode(...args);
+        },
+        setChannelDirty: (address) => {
+            return context.setChannelDirty(address);
         },
     };
 }
@@ -157,7 +160,7 @@ class ChannelCollection {
         this.pendingAttach = new Map();
         // 0.24 back-compat attachingBeforeSummary
         this.attachOpFiredForDataStore = new Set();
-        this.disposeOnce = new core_utils_1.Lazy(() => this.contexts.dispose());
+        this.disposeOnce = new internal_1.Lazy(() => this.contexts.dispose());
         // Stores the ids of new data stores between two GC runs. This is used to notify the garbage collector of new
         // root data stores that are added.
         this.dataStoresSinceLastGC = [];
@@ -165,10 +168,11 @@ class ChannelCollection {
         /** For sampling. Only log once per container */
         this.shouldSendAttachLog = true;
         this.dispose = () => this.disposeOnce.value;
-        this.mc = (0, telemetry_utils_1.createChildMonitoringContext)({ logger: baseLogger });
+        this.mc = (0, internal_6.createChildMonitoringContext)({ logger: baseLogger });
         this.contexts = new dataStoreContexts_js_1.DataStoreContexts(baseLogger);
-        this.containerRuntimeHandle = new datastore_1.FluidObjectHandle(this.parentContext, "/", this.parentContext.IFluidHandleContext);
-        this.entryPoint = new datastore_1.FluidObjectHandle(new core_utils_1.LazyPromise(async () => provideEntryPoint(this)), "", this.parentContext.IFluidHandleContext);
+        this.containerRuntimeHandle = new internal_2.FluidObjectHandle(this.parentContext, "/", this.parentContext.IFluidHandleContext);
+        this.entryPoint = new internal_2.FluidObjectHandle(new internal_1.LazyPromise(async () => provideEntryPoint(this)), "", this.parentContext.IFluidHandleContext);
+        this.aliasedDataStores = new Set(aliasMap.values());
         // Extract stores stored inside the snapshot
         const fluidDataStores = new Map();
         if (baseSnapshot) {
@@ -193,14 +197,14 @@ class ChannelCollection {
                     storage: this.parentContext.storage,
                     scope: this.parentContext.scope,
                     createSummarizerNodeFn: this.parentContext.getCreateChildSummarizerNodeFn(key, {
-                        type: runtime_definitions_1.CreateSummarizerNodeSource.FromSummary,
+                        type: internal_4.CreateSummarizerNodeSource.FromSummary,
                     }),
                     loadingGroupId: value.groupId,
                 });
             }
             else {
                 if (typeof value !== "object") {
-                    throw new telemetry_utils_1.LoggingError("Snapshot should be there to load from!!");
+                    throw new internal_6.LoggingError("Snapshot should be there to load from!!");
                 }
                 const snapshotTree = value;
                 dataStoreContext = new dataStoreContext_js_1.LocalFluidDataStoreContext({
@@ -210,11 +214,10 @@ class ChannelCollection {
                     storage: this.parentContext.storage,
                     scope: this.parentContext.scope,
                     createSummarizerNodeFn: this.parentContext.getCreateChildSummarizerNodeFn(key, {
-                        type: runtime_definitions_1.CreateSummarizerNodeSource.FromSummary,
+                        type: internal_4.CreateSummarizerNodeSource.FromSummary,
                     }),
                     makeLocallyVisibleFn: () => this.makeDataStoreLocallyVisible(key),
                     snapshotTree,
-                    isRootDataStore: undefined,
                 });
             }
             this.contexts.addBoundOrRemoted(dataStoreContext);
@@ -249,7 +252,7 @@ class ChannelCollection {
         const attachMessage = message.contents;
         this.dataStoresSinceLastGC.push(attachMessage.id);
         // We need to process the GC Data for both local and remote attach messages
-        const foundGCData = (0, runtime_utils_1.processAttachMessageGCData)(attachMessage.snapshot, (nodeId, toPath) => {
+        const foundGCData = (0, internal_5.processAttachMessageGCData)(attachMessage.snapshot, (nodeId, toPath) => {
             // nodeId is the relative path under the node being attached. Always starts with "/", but no trailing "/" after an id
             const fromPath = `/${attachMessage.id}${nodeId === "/" ? "" : nodeId}`;
             this.parentContext.addedGCOutboundReference?.({ absolutePath: fromPath }, { absolutePath: toPath });
@@ -260,37 +263,37 @@ class ChannelCollection {
             this.shouldSendAttachLog = false;
             this.mc.logger.sendTelemetryEvent({
                 eventName: "dataStoreAttachMessage_sampled",
-                ...(0, telemetry_utils_1.tagCodeArtifacts)({ id: attachMessage.id, pkg: attachMessage.type }),
+                ...(0, internal_6.tagCodeArtifacts)({ id: attachMessage.id, pkg: attachMessage.type }),
                 details: {
                     local,
                     snapshot: !!attachMessage.snapshot,
                     foundGCData,
                 },
-                ...(0, telemetry_utils_1.extractSafePropertiesFromMessage)(message),
+                ...(0, internal_6.extractSafePropertiesFromMessage)(message),
             });
         }
         // The local object has already been attached
         if (local) {
-            (0, core_utils_1.assert)(this.pendingAttach.has(attachMessage.id), 0x15e /* "Local object does not have matching attach message id" */);
-            this.contexts.get(attachMessage.id)?.emit("attached");
+            (0, internal_1.assert)(this.pendingAttach.has(attachMessage.id), 0x15e /* "Local object does not have matching attach message id" */);
+            this.contexts.get(attachMessage.id)?.setAttachState(container_definitions_1.AttachState.Attached);
             this.pendingAttach.delete(attachMessage.id);
             return;
         }
         // If a non-local operation then go and create the object, otherwise mark it as officially attached.
         if (this.alreadyProcessed(attachMessage.id)) {
             // TODO: dataStoreId may require a different tag from PackageData #7488
-            const error = new telemetry_utils_1.DataCorruptionError(
+            const error = new internal_6.DataCorruptionError(
             // pre-0.58 error message: duplicateDataStoreCreatedWithExistingId
             "Duplicate DataStore created with existing id", {
-                ...(0, telemetry_utils_1.extractSafePropertiesFromMessage)(message),
-                ...(0, telemetry_utils_1.tagCodeArtifacts)({ dataStoreId: attachMessage.id }),
+                ...(0, internal_6.extractSafePropertiesFromMessage)(message),
+                ...(0, internal_6.tagCodeArtifacts)({ dataStoreId: attachMessage.id }),
             });
             throw error;
         }
         const flatAttachBlobs = new Map();
         let snapshotTree;
         if (attachMessage.snapshot) {
-            snapshotTree = (0, driver_utils_1.buildSnapshotTree)(attachMessage.snapshot.entries, flatAttachBlobs);
+            snapshotTree = (0, internal_3.buildSnapshotTree)(attachMessage.snapshot.entries, flatAttachBlobs);
         }
         // Include the type of attach message which is the pkg of the store to be
         // used by RemoteFluidDataStoreContext in case it is not in the snapshot.
@@ -303,7 +306,7 @@ class ChannelCollection {
             scope: this.parentContext.scope,
             loadingGroupId: attachMessage.snapshot?.groupId,
             createSummarizerNodeFn: this.parentContext.getCreateChildSummarizerNodeFn(attachMessage.id, {
-                type: runtime_definitions_1.CreateSummarizerNodeSource.FromAttach,
+                type: internal_4.CreateSummarizerNodeSource.FromAttach,
                 sequenceNumber: message.sequenceNumber,
                 snapshot: attachMessage.snapshot ?? {
                     entries: [(0, dataStoreContext_js_1.createAttributesBlob)(pkg, true /* isRootDataStore */)],
@@ -316,36 +319,37 @@ class ChannelCollection {
     processAliasMessage(message, localOpMetadata, local) {
         const aliasMessage = message.contents;
         if (!(0, dataStore_js_1.isDataStoreAliasMessage)(aliasMessage)) {
-            throw new telemetry_utils_1.DataCorruptionError("malformedDataStoreAliasMessage", {
-                ...(0, telemetry_utils_1.extractSafePropertiesFromMessage)(message),
+            throw new internal_6.DataCorruptionError("malformedDataStoreAliasMessage", {
+                ...(0, internal_6.extractSafePropertiesFromMessage)(message),
             });
         }
         const resolve = localOpMetadata;
-        const aliasResult = this.processAliasMessageCore(aliasMessage);
+        const aliasResult = this.processAliasMessageCore(aliasMessage.internalId, aliasMessage.alias);
         if (local) {
             resolve(aliasResult);
         }
     }
-    processAliasMessageCore(aliasMessage) {
-        if (this.alreadyProcessed(aliasMessage.alias)) {
+    processAliasMessageCore(internalId, alias) {
+        if (this.alreadyProcessed(alias)) {
             return false;
         }
-        const context = this.contexts.get(aliasMessage.internalId);
+        const context = this.contexts.get(internalId);
         // If the data store has been deleted, log an error and ignore this message. This helps prevent document
         // corruption in case a deleted data store accidentally submitted a signal.
-        if (this.checkAndLogIfDeleted(aliasMessage.internalId, context, "Changed", "processAliasMessageCore")) {
+        if (this.checkAndLogIfDeleted(internalId, context, "Changed", "processAliasMessageCore")) {
             return false;
         }
         if (context === undefined) {
             this.mc.logger.sendErrorEvent({
                 eventName: "AliasFluidDataStoreNotFound",
-                fluidDataStoreId: aliasMessage.internalId,
+                fluidDataStoreId: internalId,
             });
             return false;
         }
-        const handle = new datastore_1.FluidObjectHandle(context, aliasMessage.internalId, this.parentContext.IFluidHandleContext);
+        const handle = new internal_2.FluidObjectHandle(context, internalId, this.parentContext.IFluidHandleContext);
         this.parentContext.addedGCOutboundReference?.(this.containerRuntimeHandle, handle);
-        this.aliasMap.set(aliasMessage.alias, context.id);
+        this.aliasMap.set(alias, context.id);
+        this.aliasedDataStores.add(context.id);
         context.setInMemoryRoot();
         return true;
     }
@@ -357,7 +361,7 @@ class ChannelCollection {
         const { attachSummary } = localContext.getAttachData(/* includeGCData: */ true);
         const type = localContext.packagePath[localContext.packagePath.length - 1];
         // Attach message needs the summary in ITree format. Convert the ISummaryTree into an ITree.
-        const snapshot = (0, runtime_utils_1.convertSummaryTreeToITree)(attachSummary.summary);
+        const snapshot = (0, internal_5.convertSummaryTreeToITree)(attachSummary.summary);
         return {
             id: localContext.id,
             snapshot,
@@ -371,21 +375,24 @@ class ChannelCollection {
      */
     makeDataStoreLocallyVisible(id) {
         const localContext = this.contexts.getUnbound(id);
-        (0, core_utils_1.assert)(!!localContext, 0x15f /* "Could not find unbound context to bind" */);
+        (0, internal_1.assert)(!!localContext, 0x15f /* "Could not find unbound context to bind" */);
         /**
          * If the container is not detached, it is globally visible to all clients. This data store should also be
          * globally visible. Move it to attaching state and send an "attach" op for it.
          * If the container is detached, this data store will be part of the summary that makes the container attached.
          */
         if (this.parentContext.attachState !== container_definitions_1.AttachState.Detached) {
-            localContext.emit("attaching");
-            const message = this.generateAttachMessage(localContext);
-            this.pendingAttach.set(id, message);
-            this.parentContext.submitMessage(messageTypes_js_1.ContainerMessageType.Attach, message, undefined);
-            this.attachOpFiredForDataStore.add(id);
+            localContext.setAttachState(container_definitions_1.AttachState.Attaching);
+            this.submitAttachChannelOp(localContext);
         }
         this.contexts.bind(id);
     }
+    submitAttachChannelOp(localContext) {
+        const message = this.generateAttachMessage(localContext);
+        this.pendingAttach.set(localContext.id, message);
+        this.parentContext.submitMessage(messageTypes_js_1.ContainerMessageType.Attach, message, undefined);
+        this.attachOpFiredForDataStore.add(localContext.id);
+    }
     /**
      * Generate compact internal DataStore ID.
      *
@@ -410,50 +417,36 @@ class ChannelCollection {
         // In first two cases we will encode result as strings in more compact form.
         if (this.parentContext.attachState === container_definitions_1.AttachState.Detached) {
             // container is detached, only one client observes content,  no way to hit collisions with other clients.
-            return (0, runtime_utils_1.encodeCompactIdToString)(2 * this.contexts.size);
+            return (0, internal_5.encodeCompactIdToString)(2 * this.contexts.size);
         }
         const id = this.parentContext.containerRuntime.generateDocumentUniqueId();
         if (typeof id === "number") {
-            return (0, runtime_utils_1.encodeCompactIdToString)(2 * id + 1);
+            return (0, internal_5.encodeCompactIdToString)(2 * id + 1);
         }
         return id;
     }
-    createDetachedDataStoreCore(pkg, loadingGroupId) {
-        const id = this.createDataStoreId();
-        const context = new dataStoreContext_js_1.LocalDetachedFluidDataStoreContext({
-            id,
-            pkg,
-            parentContext: this.wrapContextForInnerChannel(id),
-            storage: this.parentContext.storage,
-            scope: this.parentContext.scope,
-            createSummarizerNodeFn: this.parentContext.getCreateChildSummarizerNodeFn(id, {
-                type: runtime_definitions_1.CreateSummarizerNodeSource.Local,
-            }),
-            makeLocallyVisibleFn: () => this.makeDataStoreLocallyVisible(id),
-            snapshotTree: undefined,
-            isRootDataStore: false,
-            loadingGroupId,
-            channelToDataStoreFn: (channel) => (0, dataStore_js_1.channelToDataStore)(channel, id, this, (0, telemetry_utils_1.createChildLogger)({ logger: this.parentContext.logger })),
-        });
-        this.contexts.addUnbound(context);
-        return context;
+    createDetachedDataStore(pkg, loadingGroupId) {
+        return this.createContext(this.createDataStoreId(), pkg, dataStoreContext_js_1.LocalDetachedFluidDataStoreContext, undefined, // props
+        loadingGroupId);
+    }
+    createDataStoreContext(pkg, props, loadingGroupId) {
+        return this.createContext(this.createDataStoreId(), pkg, dataStoreContext_js_1.LocalFluidDataStoreContext, props, loadingGroupId);
     }
-    _createFluidDataStoreContext(pkg, props, loadingGroupId) {
-        const id = this.createDataStoreId();
-        const context = new dataStoreContext_js_1.LocalFluidDataStoreContext({
+    createContext(id, pkg, contextCtor, createProps, loadingGroupId) {
+        const context = new contextCtor({
             id,
             pkg,
             parentContext: this.wrapContextForInnerChannel(id),
             storage: this.parentContext.storage,
             scope: this.parentContext.scope,
             createSummarizerNodeFn: this.parentContext.getCreateChildSummarizerNodeFn(id, {
-                type: runtime_definitions_1.CreateSummarizerNodeSource.Local,
+                type: internal_4.CreateSummarizerNodeSource.Local,
             }),
             makeLocallyVisibleFn: () => this.makeDataStoreLocallyVisible(id),
             snapshotTree: undefined,
-            isRootDataStore: false,
-            createProps: props,
+            createProps,
             loadingGroupId,
+            channelToDataStoreFn: (channel) => (0, dataStore_js_1.channelToDataStore)(channel, id, this, (0, internal_6.createChildLogger)({ logger: this.parentContext.logger })),
         });
         this.contexts.addUnbound(context);
         return context;
@@ -467,36 +460,40 @@ class ChannelCollection {
             case messageTypes_js_1.ContainerMessageType.Alias:
                 this.parentContext.submitMessage(type, content, localOpMetadata);
                 return;
+            case messageTypes_js_1.ContainerMessageType.FluidDataStoreOp:
+                return this.reSubmitChannelOp(type, content, localOpMetadata);
             default:
+                (0, internal_1.assert)(false, 0x907 /* unknown op type */);
         }
-        (0, core_utils_1.assert)(type === messageTypes_js_1.ContainerMessageType.FluidDataStoreOp, 0x8e7 /* type */);
+    }
+    reSubmitChannelOp(type, content, localOpMetadata) {
         const envelope = content;
         const context = this.contexts.get(envelope.address);
         // If the data store has been deleted, log an error and throw an error. If there are local changes for a
         // deleted data store, it can otherwise lead to inconsistent state when compared to other clients.
         if (this.checkAndLogIfDeleted(envelope.address, context, "Changed", "resubmitDataStoreOp")) {
-            throw new telemetry_utils_1.DataCorruptionError("Context is deleted!", {
+            throw new internal_6.DataCorruptionError("Context is deleted!", {
                 callSite: "resubmitDataStoreOp",
-                ...(0, telemetry_utils_1.tagCodeArtifacts)({ id: envelope.address }),
+                ...(0, internal_6.tagCodeArtifacts)({ id: envelope.address }),
             });
         }
-        (0, core_utils_1.assert)(!!context, 0x160 /* "There should be a store context for the op" */);
+        (0, internal_1.assert)(!!context, 0x160 /* "There should be a store context for the op" */);
         const innerContents = envelope.contents;
         context.reSubmit(innerContents.type, innerContents.content, localOpMetadata);
     }
     rollback(type, content, localOpMetadata) {
-        (0, core_utils_1.assert)(type === messageTypes_js_1.ContainerMessageType.FluidDataStoreOp, 0x8e8 /* type */);
+        (0, internal_1.assert)(type === messageTypes_js_1.ContainerMessageType.FluidDataStoreOp, 0x8e8 /* type */);
         const envelope = content;
         const context = this.contexts.get(envelope.address);
         // If the data store has been deleted, log an error and throw an error. If there are local changes for a
         // deleted data store, it can otherwise lead to inconsistent state when compared to other clients.
         if (this.checkAndLogIfDeleted(envelope.address, context, "Changed", "rollbackDataStoreOp")) {
-            throw new telemetry_utils_1.DataCorruptionError("Context is deleted!", {
+            throw new internal_6.DataCorruptionError("Context is deleted!", {
                 callSite: "rollbackDataStoreOp",
-                ...(0, telemetry_utils_1.tagCodeArtifacts)({ id: envelope.address }),
+                ...(0, internal_6.tagCodeArtifacts)({ id: envelope.address }),
             });
         }
-        (0, core_utils_1.assert)(!!context, 0x2e8 /* "There should be a store context for the op" */);
+        (0, internal_1.assert)(!!context, 0x2e8 /* "There should be a store context for the op" */);
         const innerContents = envelope.contents;
         context.rollback(innerContents.type, innerContents.content, localOpMetadata);
     }
@@ -507,22 +504,59 @@ class ChannelCollection {
                 return this.applyStashedAttachOp(opContents.contents);
             case messageTypes_js_1.ContainerMessageType.Alias:
                 return;
+            case messageTypes_js_1.ContainerMessageType.FluidDataStoreOp:
+                return this.applyStashedChannelChannelOp(opContents.contents);
             default:
+                (0, internal_1.assert)(false, 0x908 /* unknon type of op */);
         }
-        const envelope = opContents.contents;
+    }
+    async applyStashedChannelChannelOp(envelope) {
         const context = this.contexts.get(envelope.address);
         // If the data store has been deleted, log an error and ignore this message. This helps prevent document
         // corruption in case the data store that stashed the op is deleted.
         if (this.checkAndLogIfDeleted(envelope.address, context, "Changed", "applyStashedOp")) {
             return undefined;
         }
-        (0, core_utils_1.assert)(!!context, 0x161 /* "There should be a store context for the op" */);
+        (0, internal_1.assert)(!!context, 0x161 /* "There should be a store context for the op" */);
         return context.applyStashedOp(envelope.contents);
     }
     async applyStashedAttachOp(message) {
-        this.pendingAttach.set(message.id, message);
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        this.processAttachMessage({ contents: message }, false);
+        const { id, snapshot } = message;
+        // build the snapshot from the summary in the attach message
+        const flatAttachBlobs = new Map();
+        const snapshotTree = (0, internal_3.buildSnapshotTree)(snapshot.entries, flatAttachBlobs);
+        const storage = new storageServiceWithAttachBlobs_js_1.StorageServiceWithAttachBlobs(this.parentContext.storage, flatAttachBlobs);
+        // create a local datastore context for the data store context,
+        // which this message represents. All newly created data store
+        // contexts start as a local context on the client that created
+        // them, and for stashed ops, the client that applies it plays
+        // the role of creating client.
+        const dataStoreContext = new dataStoreContext_js_1.LocalFluidDataStoreContext({
+            id,
+            pkg: undefined,
+            parentContext: this.wrapContextForInnerChannel(id),
+            storage,
+            scope: this.parentContext.scope,
+            createSummarizerNodeFn: this.parentContext.getCreateChildSummarizerNodeFn(id, {
+                type: internal_4.CreateSummarizerNodeSource.FromSummary,
+            }),
+            makeLocallyVisibleFn: () => this.makeDataStoreLocallyVisible(id),
+            snapshotTree,
+        });
+        // realize the local context, as local contexts shouldn't be delay
+        // loaded, as this client is playing the role of creating client,
+        // and creating clients always create realized data store contexts.
+        const channel = await dataStoreContext.realize();
+        await channel.entryPoint.get();
+        // add to the list of bound or remoted, as this context must be bound
+        // to had an attach message sent, and is the non-detached case is remoted.
+        this.contexts.addBoundOrRemoted(dataStoreContext);
+        if (this.parentContext.attachState !== container_definitions_1.AttachState.Detached) {
+            // if the client is not detached put in the pending attach list
+            // so that on ack of the stashed op, the context is found.
+            // detached client don't send ops, so should not expect and ack.
+            this.pendingAttach.set(message.id, message);
+        }
     }
     process(message, local, localMessageMetadata, addedOutboundReference) {
         switch (message.type) {
@@ -532,59 +566,63 @@ class ChannelCollection {
             case messageTypes_js_1.ContainerMessageType.Alias:
                 this.processAliasMessage(message, localMessageMetadata, local);
                 return;
-            case messageTypes_js_1.ContainerMessageType.FluidDataStoreOp:
+            case messageTypes_js_1.ContainerMessageType.FluidDataStoreOp: {
+                const envelope = message.contents;
+                const innerContents = envelope.contents;
+                const transformed = {
+                    ...message,
+                    type: innerContents.type,
+                    contents: innerContents.content,
+                };
+                this.processChannelOp(envelope.address, transformed, local, localMessageMetadata);
+                // By default, we use the new behavior of detecting outbound routes here.
+                // If this setting is true, then DataStoreContext would be notifying GC instead.
+                if (this.mc.config.getBoolean(index_js_1.detectOutboundRoutesViaDDSKey) !== true &&
+                    addedOutboundReference !== undefined) {
+                    // Notify GC of any outbound references that were added by this op.
+                    detectOutboundReferences(envelope.address, transformed.contents, addedOutboundReference);
+                }
                 break;
+            }
             default:
-                (0, core_utils_1.assert)(false, 0x8e9 /* unreached */);
+                (0, internal_1.assert)(false, 0x8e9 /* unreached */);
         }
-        const envelope = message.contents;
-        const innerContents = envelope.contents;
-        const transformed = {
-            ...message,
-            type: innerContents.type,
-            contents: innerContents.content,
-        };
-        const context = this.contexts.get(envelope.address);
+    }
+    processChannelOp(address, message, local, localMessageMetadata) {
+        const context = this.contexts.get(address);
         // If the data store has been deleted, log an error and ignore this message. This helps prevent document
         // corruption in case a deleted data store accidentally submitted an op.
-        if (this.checkAndLogIfDeleted(envelope.address, context, "Changed", "processFluidDataStoreOp")) {
+        if (this.checkAndLogIfDeleted(address, context, "Changed", "processFluidDataStoreOp")) {
             return;
         }
         if (context === undefined) {
             // Former assert 0x162
-            throw telemetry_utils_1.DataProcessingError.create("No context for op", "processFluidDataStoreOp", message, {
+            throw internal_6.DataProcessingError.create("No context for op", "processFluidDataStoreOp", message, {
                 local,
                 messageDetails: JSON.stringify({
                     type: message.type,
                     contentType: typeof message.contents,
                 }),
-                ...(0, telemetry_utils_1.tagCodeArtifacts)({ address: envelope.address }),
+                ...(0, internal_6.tagCodeArtifacts)({ address }),
             });
         }
-        context.process(transformed, local, localMessageMetadata);
-        // By default, we use the new behavior of detecting outbound routes here.
-        // If this setting is true, then DataStoreContext would be notifying GC instead.
-        if (this.mc.config.getBoolean(index_js_1.detectOutboundRoutesViaDDSKey) !== true &&
-            addedOutboundReference !== undefined) {
-            // Notify GC of any outbound references that were added by this op.
-            detectOutboundReferences(envelope, addedOutboundReference);
-        }
+        context.process(message, local, localMessageMetadata);
         // Notify that a GC node for the data store changed. This is used to detect if a deleted data store is
         // being used.
-        this.gcNodeUpdated(`/${envelope.address}`, "Changed", message.timestamp, context.isLoaded ? context.packagePath : undefined);
+        this.gcNodeUpdated(`/${address}`, "Changed", message.timestamp, context.isLoaded ? context.packagePath : undefined);
     }
     async getDataStore(id, requestHeaderData) {
         const headerData = { ...containerRuntime_js_1.defaultRuntimeHeaderData, ...requestHeaderData };
         if (this.checkAndLogIfDeleted(id, this.contexts.get(id), "Requested", "getDataStore", requestHeaderData)) {
             // The requested data store has been deleted by gc. Create a 404 response exception.
             const request = { url: id };
-            throw (0, runtime_utils_1.responseToException)((0, runtime_utils_1.createResponseError)(404, "DataStore was deleted", request), request);
+            throw (0, internal_5.responseToException)((0, internal_5.createResponseError)(404, "DataStore was deleted", request), request);
         }
         const context = await this.contexts.getBoundOrRemoted(id, headerData.wait);
         if (context === undefined) {
             // The requested data store does not exits. Throw a 404 response exception.
             const request = { url: id };
-            throw (0, runtime_utils_1.responseToException)((0, runtime_utils_1.create404Response)(request), request);
+            throw (0, internal_5.responseToException)((0, internal_5.create404Response)(request), request);
         }
         return context;
     }
@@ -618,7 +656,7 @@ class ChannelCollection {
         }
         this.mc.logger.sendErrorEvent({
             eventName: `GC_Deleted_DataStore_${deletedLogSuffix}`,
-            ...(0, telemetry_utils_1.tagCodeArtifacts)({ id }),
+            ...(0, internal_6.tagCodeArtifacts)({ id }),
             callSite,
             headers: JSON.stringify(requestHeaderData),
             exists: context !== undefined,
@@ -637,10 +675,10 @@ class ChannelCollection {
         }
         if (!context) {
             // Attach message may not have been processed yet
-            (0, core_utils_1.assert)(!local, 0x163 /* "Missing datastore for local signal" */);
+            (0, internal_1.assert)(!local, 0x163 /* "Missing datastore for local signal" */);
             this.mc.logger.sendTelemetryEvent({
                 eventName: "SignalFluidDataStoreNotFound",
-                ...(0, telemetry_utils_1.tagCodeArtifacts)({
+                ...(0, internal_6.tagCodeArtifacts)({
                     fluidDataStoreId,
                 }),
             });
@@ -657,7 +695,7 @@ class ChannelCollection {
                 this.mc.logger.sendErrorEvent({
                     eventName: "SetConnectionStateError",
                     clientId,
-                    ...(0, telemetry_utils_1.tagCodeArtifacts)({
+                    ...(0, internal_6.tagCodeArtifacts)({
                         fluidDataStoreId,
                     }),
                     details: JSON.stringify({
@@ -669,11 +707,10 @@ class ChannelCollection {
         }
     }
     setAttachState(attachState) {
-        const eventName = attachState === container_definitions_1.AttachState.Attaching ? "attaching" : "attached";
         for (const [, context] of this.contexts) {
             // Fire only for bounded stores.
             if (!this.contexts.isNotBound(context.id)) {
-                context.emit(eventName);
+                context.setAttachState(attachState);
             }
         }
     }
@@ -681,7 +718,7 @@ class ChannelCollection {
         return this.contexts.size;
     }
     async summarize(fullTree, trackState, telemetryContext) {
-        const summaryBuilder = new runtime_utils_1.SummaryTreeBuilder();
+        const summaryBuilder = new internal_5.SummaryTreeBuilder();
         // Iterate over each store and ask it to snapshot
         await Promise.all(Array.from(this.contexts)
             .filter(([_, context]) => {
@@ -690,7 +727,7 @@ class ChannelCollection {
             // had not yet round tripped back to the client.
             if (context.attachState === container_definitions_1.AttachState.Attaching) {
                 // Formerly assert 0x588
-                const error = telemetry_utils_1.DataProcessingError.create("Local data store detected in attaching state during summarize", "summarize");
+                const error = internal_6.DataProcessingError.create("Local data store detected in attaching state during summarize", "summarize");
                 throw error;
             }
             return context.attachState === container_definitions_1.AttachState.Attached;
@@ -705,7 +742,7 @@ class ChannelCollection {
      * Create a summary. Used when attaching or serializing a detached container.
      */
     getAttachSummary(telemetryContext) {
-        const builder = new runtime_utils_1.SummaryTreeBuilder();
+        const builder = new internal_5.SummaryTreeBuilder();
         // Attaching graph of some stores can cause other stores to get bound too.
         // So keep taking summary until no new stores get bound.
         let notBoundContextsLength;
@@ -730,8 +767,8 @@ class ChannelCollection {
                 else {
                     // If this data store is not yet loaded, then there should be no changes in the snapshot from
                     // which it was created as it is detached container. So just use the previous snapshot.
-                    (0, core_utils_1.assert)(!!this.baseSnapshot, 0x166 /* "BaseSnapshot should be there as detached container loaded from snapshot" */);
-                    dataStoreSummary = (0, runtime_utils_1.convertSnapshotTreeToSummaryTree)(this.baseSnapshot.trees[key]);
+                    (0, internal_1.assert)(!!this.baseSnapshot, 0x166 /* "BaseSnapshot should be there as detached container loaded from snapshot" */);
+                    dataStoreSummary = (0, internal_5.convertSnapshotTreeToSummaryTree)(this.baseSnapshot.trees[key]);
                 }
                 builder.addWithStats(key, dataStoreSummary);
             });
@@ -746,10 +783,10 @@ class ChannelCollection {
     async updateStateBeforeGC() {
         for (const id of this.dataStoresSinceLastGC) {
             const context = this.contexts.get(id);
-            (0, core_utils_1.assert)(context !== undefined, 0x2b6 /* Missing data store context */);
+            (0, internal_1.assert)(context !== undefined, 0x2b6 /* Missing data store context */);
             if (await context.isRoot()) {
                 // A root data store is basically a reference from the container runtime to the data store.
-                const handle = new datastore_1.FluidObjectHandle(context, id, this.parentContext.IFluidHandleContext);
+                const handle = new internal_2.FluidObjectHandle(context, id, this.parentContext.IFluidHandleContext);
                 this.parentContext.addedGCOutboundReference?.(this.containerRuntimeHandle, handle);
             }
         }
@@ -769,7 +806,7 @@ class ChannelCollection {
      * @param fullGC - true to bypass optimizations and force full generation of GC data.
      */
     async getGCData(fullGC = false) {
-        const builder = new runtime_utils_1.GCDataBuilder();
+        const builder = new internal_5.GCDataBuilder();
         // Iterate over each store and get their GC data.
         await Promise.all(Array.from(this.contexts)
             .filter(([_, context]) => {
@@ -778,7 +815,7 @@ class ChannelCollection {
             // had not yet round tripped back to the client.
             // Formerly assert 0x589
             if (context.attachState === container_definitions_1.AttachState.Attaching) {
-                const error = telemetry_utils_1.DataProcessingError.create("Local data store detected in attaching state while running GC", "getGCData");
+                const error = internal_6.DataProcessingError.create("Local data store detected in attaching state while running GC", "getGCData");
                 throw error;
             }
             return context.attachState === container_definitions_1.AttachState.Attached;
@@ -799,35 +836,24 @@ class ChannelCollection {
      */
     updateUsedRoutes(usedRoutes) {
         // Get a map of data store ids to routes used in it.
-        const usedDataStoreRoutes = (0, runtime_utils_1.unpackChildNodesUsedRoutes)(usedRoutes);
+        const usedDataStoreRoutes = (0, internal_5.unpackChildNodesUsedRoutes)(usedRoutes);
         // Verify that the used routes are correct.
         for (const [id] of usedDataStoreRoutes) {
-            (0, core_utils_1.assert)(this.contexts.has(id), 0x167 /* "Used route does not belong to any known data store" */);
+            (0, internal_1.assert)(this.contexts.has(id), 0x167 /* "Used route does not belong to any known data store" */);
         }
         // Update the used routes in each data store. Used routes is empty for unused data stores.
         for (const [contextId, context] of this.contexts) {
             context.updateUsedRoutes(usedDataStoreRoutes.get(contextId) ?? []);
         }
     }
-    /**
-     * This is called to update objects whose routes are unused. The unused objects are deleted.
-     * @param unusedRoutes - The routes that are unused in all data stores in this Container.
-     */
-    updateUnusedRoutes(unusedRoutes) {
-        for (const route of unusedRoutes) {
-            const pathParts = route.split("/");
-            // Delete data store only if its route (/datastoreId) is in unusedRoutes. We don't want to delete a data
-            // store based on its DDS being unused.
-            if (pathParts.length > 2) {
-                continue;
-            }
-            const dataStoreId = pathParts[1];
-            (0, core_utils_1.assert)(this.contexts.has(dataStoreId), 0x2d7 /* No data store with specified id */);
-            // Delete the contexts of unused data stores.
-            this.contexts.delete(dataStoreId);
-            // Delete the summarizer node of the unused data stores.
-            this.parentContext.deleteChildSummarizerNode?.(dataStoreId);
-        }
+    deleteChild(dataStoreId) {
+        const dataStoreContext = this.contexts.get(dataStoreId);
+        (0, internal_1.assert)(dataStoreContext !== undefined, 0x2d7 /* No data store with specified id */);
+        dataStoreContext.delete();
+        // Delete the contexts of unused data stores.
+        this.contexts.delete(dataStoreId);
+        // Delete the summarizer node of the unused data stores.
+        this.parentContext.deleteChildSummarizerNode(dataStoreId);
     }
     /**
      * Delete data stores and its objects that are sweep ready.
@@ -854,16 +880,12 @@ class ChannelCollection {
                 this.mc.logger.sendTelemetryEvent({
                     eventName: "DeletedDataStoreNotFound",
                     category: alreadyDeleted ? "generic" : "error",
-                    ...(0, telemetry_utils_1.tagCodeArtifacts)({ id: dataStoreId }),
+                    ...(0, internal_6.tagCodeArtifacts)({ id: dataStoreId }),
                     details: { alreadyDeleted },
                 });
                 continue;
             }
-            dataStoreContext.delete();
-            // Delete the contexts of sweep ready data stores.
-            this.contexts.delete(dataStoreId);
-            // Delete the summarizer node of the sweep ready data stores.
-            this.parentContext.deleteChildSummarizerNode?.(dataStoreId);
+            this.deleteChild(dataStoreId);
         }
         return Array.from(sweepReadyDataStoreRoutes);
     }
@@ -884,7 +906,7 @@ class ChannelCollection {
                 continue;
             }
             const dataStoreId = pathParts[1];
-            (0, core_utils_1.assert)(this.contexts.has(dataStoreId), 0x510 /* No data store with specified id */);
+            (0, internal_1.assert)(this.contexts.has(dataStoreId), 0x510 /* No data store with specified id */);
             tombstonedDataStoresSet.add(dataStoreId);
         }
         // Update the used routes in each data store. Used routes is empty for unused data stores.
@@ -898,8 +920,9 @@ class ChannelCollection {
      */
     async getOutboundRoutes() {
         const outboundRoutes = [];
+        // Getting this information is a performance optimization that reduces network calls for virtualized datastores
         for (const [contextId, context] of this.contexts) {
-            const isRootDataStore = await context.isRoot();
+            const isRootDataStore = await context.isRoot(this.aliasedDataStores);
             if (isRootDataStore) {
                 outboundRoutes.push(`/${contextId}`);
             }
@@ -935,7 +958,7 @@ class ChannelCollection {
         return this.aliases.get(maybeAlias) ?? maybeAlias;
     }
     async request(request) {
-        const requestParser = runtime_utils_1.RequestParser.create(request);
+        const requestParser = internal_5.RequestParser.create(request);
         const id = requestParser.pathParts[0];
         // Differentiate between requesting the dataStore directly, or one of its children
         const requestForChild = !requestParser.isLeaf(1);
@@ -971,7 +994,7 @@ class ChannelCollection {
         const subRequest = requestParser.createSubRequest(1);
         // We always expect createSubRequest to include a leading slash, but asserting here to protect against
         // unintentionally modifying the url if that changes.
-        (0, core_utils_1.assert)(subRequest.url.startsWith("/"), 0x126 /* "Expected createSubRequest url to include a leading slash" */);
+        (0, internal_1.assert)(subRequest.url.startsWith("/"), 0x126 /* "Expected createSubRequest url to include a leading slash" */);
         return dataStore.request(subRequest);
     }
 }
@@ -981,8 +1004,8 @@ function getSummaryForDatastores(snapshot, metadata) {
         return undefined;
     }
     if ((0, index_js_2.rootHasIsolatedChannels)(metadata)) {
-        const datastoresSnapshot = snapshot.trees[runtime_definitions_1.channelsTreeName];
-        (0, core_utils_1.assert)(!!datastoresSnapshot, 0x168 /* Expected tree in snapshot not found */);
+        const datastoresSnapshot = snapshot.trees[internal_4.channelsTreeName];
+        (0, internal_1.assert)(!!datastoresSnapshot, 0x168 /* Expected tree in snapshot not found */);
         return datastoresSnapshot;
     }
     else {
@@ -1005,7 +1028,7 @@ exports.getSummaryForDatastores = getSummaryForDatastores;
  *
  * @internal
  */
-function detectOutboundReferences(envelope, addedOutboundReference) {
+function detectOutboundReferences(address, contents, addedOutboundReference) {
     // These will be built up as we traverse the envelope contents
     const outboundPaths = [];
     let ddsAddress;
@@ -1013,7 +1036,7 @@ function detectOutboundReferences(envelope, addedOutboundReference) {
         if (typeof obj === "object" && obj !== null) {
             for (const [key, value] of Object.entries(obj)) {
                 // If 'value' is a serialized IFluidHandle, it represents a new outbound route.
-                if ((0, runtime_utils_1.isSerializedHandle)(value)) {
+                if ((0, internal_5.isSerializedHandle)(value)) {
                     outboundPaths.push(value.url);
                 }
                 // NOTE: This is taking a hard dependency on the fact that in our DataStore implementation,
@@ -1026,10 +1049,10 @@ function detectOutboundReferences(envelope, addedOutboundReference) {
             }
         }
     }
-    recursivelyFindHandles(envelope.contents);
+    recursivelyFindHandles(contents);
     // GC node paths are all absolute paths, hence the "" prefix.
     // e.g. this will yield "/dataStoreId/ddsId"
-    const fromPath = ["", envelope.address, ddsAddress].join("/");
+    const fromPath = ["", address, ddsAddress].join("/");
     outboundPaths.forEach((toPath) => addedOutboundReference(fromPath, toPath));
 }
 exports.detectOutboundReferences = detectOutboundReferences;
@@ -1037,8 +1060,9 @@ exports.detectOutboundReferences = detectOutboundReferences;
 class ChannelCollectionFactory {
     constructor(registryEntries, 
     // ADO:7302 We need a better type here
-    provideEntryPoint) {
+    provideEntryPoint, ctor) {
         this.provideEntryPoint = provideEntryPoint;
+        this.ctor = ctor;
         this.type = "ChannelCollectionChannel";
         this.IFluidDataStoreRegistry = new dataStoreRegistry_js_1.FluidDataStoreRegistry(registryEntries);
     }
@@ -1046,7 +1070,7 @@ class ChannelCollectionFactory {
         return this;
     }
     async instantiateDataStore(context, _existing) {
-        const runtime = new ChannelCollection(context.baseSnapshot, context, // parentContext
+        const runtime = this.ctor(context.baseSnapshot, context, // parentContext
         context.logger, () => { }, // gcNodeUpdated
         (_nodePath) => false, // isDataStoreDeleted
         new Map(), // aliasMap