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

package/lib/channelCollection.d.ts

@@ -2,13 +2,15 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { ITelemetryBaseLogger, IDisposable, IFluidHandle, IRequest, FluidObject, IResponse } from "@fluidframework/core-interfaces";
-import { ISequencedDocumentMessage, ISnapshotTree } from "@fluidframework/protocol-definitions";
-import { AliasResult, IEnvelope, IFluidDataStoreChannel, IFluidDataStoreContextDetached, IGarbageCollectionData, IInboundSignalMessage, IFluidParentContext, ISummaryTreeWithStats, ITelemetryContext, IFluidDataStoreFactory, IFluidDataStoreContext, NamedFluidDataStoreRegistryEntries, IFluidDataStoreRegistry } from "@fluidframework/runtime-definitions";
 import { AttachState } from "@fluidframework/container-definitions";
+import { FluidObject, IDisposable, IFluidHandle, IRequest, IResponse, ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
+import { ISequencedDocumentMessage, ISnapshotTree } from "@fluidframework/protocol-definitions";
+import { IGarbageCollectionData, IInboundSignalMessage, ISummaryTreeWithStats, ITelemetryContext } from "@fluidframework/runtime-definitions";
+import { AliasResult, IEnvelope, IFluidDataStoreChannel, IFluidDataStoreContext, IFluidDataStoreContextDetached, IFluidDataStoreFactory, IFluidDataStoreRegistry, IFluidParentContext, NamedFluidDataStoreRegistryEntries } from "@fluidframework/runtime-definitions/internal";
+import { MonitoringContext } from "@fluidframework/telemetry-utils/internal";
 import { RuntimeHeaderData } from "./containerRuntime.js";
-import { FluidDataStoreContext, LocalFluidDataStoreContext } from "./dataStoreContext.js";
-import { IDataStoreAliasMessage } from "./dataStore.js";
+import { IFluidDataStoreContextInternal, ILocalDetachedFluidDataStoreContextProps, LocalFluidDataStoreContext } from "./dataStoreContext.js";
+import { DataStoreContexts } from "./dataStoreContexts.js";
 import { GCNodeType } from "./gc/index.js";
 import { IContainerRuntimeMetadata } from "./summary/index.js";
 /**
@@ -49,14 +51,14 @@ export declare function wrapContextForInnerChannel(id: string, parentContext: IF
  * @internal
  */
 export declare class ChannelCollection implements IFluidDataStoreChannel, IDisposable {
-    private readonly baseSnapshot;
+    protected readonly baseSnapshot: ISnapshotTree | undefined;
     readonly parentContext: IFluidParentContext;
     private readonly gcNodeUpdated;
     private readonly isDataStoreDeleted;
     private readonly aliasMap;
     private readonly pendingAttach;
     readonly attachOpFiredForDataStore: Set<string>;
-    private readonly mc;
+    protected readonly mc: MonitoringContext;
     private readonly disposeOnce;
     readonly entryPoint: IFluidHandle<FluidObject>;
     readonly containerLoadStats: {
@@ -66,14 +68,15 @@ export declare class ChannelCollection implements IFluidDataStoreChannel, IDispo
     private dataStoresSinceLastGC;
     private readonly containerRuntimeHandle;
     private readonly pendingAliasMap;
-    private readonly contexts;
+    protected readonly contexts: DataStoreContexts;
+    private readonly aliasedDataStores;
     constructor(baseSnapshot: ISnapshotTree | undefined, parentContext: IFluidParentContext, baseLogger: ITelemetryBaseLogger, gcNodeUpdated: (nodePath: string, reason: "Loaded" | "Changed", timestampMs?: number, packagePath?: readonly string[], request?: IRequest, headerData?: RuntimeHeaderData) => void, isDataStoreDeleted: (nodePath: string) => boolean, aliasMap: Map<string, string>, provideEntryPoint: (runtime: ChannelCollection) => Promise<FluidObject>);
     get aliases(): ReadonlyMap<string, string>;
     get pendingAliases(): Map<string, Promise<AliasResult>>;
     waitIfPendingAlias(maybeAlias: string): Promise<AliasResult>;
     /** For sampling. Only log once per container */
     private shouldSendAttachLog;
-    private wrapContextForInnerChannel;
+    protected wrapContextForInnerChannel(id: string): IFluidParentContext;
     /**
      * IFluidDataStoreChannel.makeVisibleAndAttachGraph implementation
      * Not clear when it would be called and what it should do.
@@ -82,7 +85,7 @@ export declare class ChannelCollection implements IFluidDataStoreChannel, IDispo
     makeVisibleAndAttachGraph(): void;
     private processAttachMessage;
     private processAliasMessage;
-    processAliasMessageCore(aliasMessage: IDataStoreAliasMessage): boolean;
+    processAliasMessageCore(internalId: string, alias: string): boolean;
     private alreadyProcessed;
     /** Package up the context's attach summary etc into an IAttachMessage */
     private generateAttachMessage;
@@ -92,6 +95,7 @@ export declare class ChannelCollection implements IFluidDataStoreChannel, IDispo
      * @param id - The id of the data store context to make visible.
      */
     private makeDataStoreLocallyVisible;
+    protected submitAttachChannelOp(localContext: LocalFluidDataStoreContext): void;
     /**
      * Generate compact internal DataStore ID.
      *
@@ -109,20 +113,24 @@ export declare class ChannelCollection implements IFluidDataStoreChannel, IDispo
      * Please note that above mentioned functions have the implementation they have (allowing #2) due to #1.
      */
     protected createDataStoreId(): string;
-    createDetachedDataStoreCore(pkg: Readonly<string[]>, loadingGroupId?: string): IFluidDataStoreContextDetached;
-    _createFluidDataStoreContext(pkg: Readonly<string[]>, props?: any, loadingGroupId?: string): LocalFluidDataStoreContext;
+    createDetachedDataStore(pkg: Readonly<string[]>, loadingGroupId?: string): IFluidDataStoreContextDetached;
+    createDataStoreContext(pkg: Readonly<string[]>, props?: any, loadingGroupId?: string): IFluidDataStoreContextInternal;
+    protected createContext<T extends LocalFluidDataStoreContext>(id: string, pkg: Readonly<string[]>, contextCtor: new (props: ILocalDetachedFluidDataStoreContextProps) => T, createProps?: any, loadingGroupId?: string): T;
     get disposed(): boolean;
     readonly dispose: () => void;
     reSubmit(type: string, content: any, localOpMetadata: unknown): void;
+    protected reSubmitChannelOp(type: string, content: any, localOpMetadata: unknown): void;
     rollback(type: string, content: any, localOpMetadata: unknown): void;
     applyStashedOp(content: unknown): Promise<unknown>;
+    protected applyStashedChannelChannelOp(envelope: IEnvelope): Promise<unknown>;
     private applyStashedAttachOp;
     process(message: ISequencedDocumentMessage, local: boolean, localMessageMetadata: unknown, addedOutboundReference?: (fromNodePath: string, toNodePath: string) => void): void;
-    getDataStore(id: string, requestHeaderData: RuntimeHeaderData): Promise<FluidDataStoreContext>;
+    protected processChannelOp(address: string, message: ISequencedDocumentMessage, local: boolean, localMessageMetadata: unknown): void;
+    getDataStore(id: string, requestHeaderData: RuntimeHeaderData): Promise<IFluidDataStoreContextInternal>;
     /**
      * Returns the data store requested with the given id if available. Otherwise, returns undefined.
      */
-    getDataStoreIfAvailable(id: string, requestHeaderData: RuntimeHeaderData): Promise<FluidDataStoreContext | undefined>;
+    getDataStoreIfAvailable(id: string, requestHeaderData: RuntimeHeaderData): Promise<IFluidDataStoreContextInternal | undefined>;
     /**
      * Checks if the data store has been deleted by GC. If so, log an error.
      * @param id - The data store's id.
@@ -166,11 +174,7 @@ export declare class ChannelCollection implements IFluidDataStoreChannel, IDispo
      * @param usedRoutes - The routes that are used in all data stores in this Container.
      */
     updateUsedRoutes(usedRoutes: readonly string[]): void;
-    /**
-     * 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: readonly string[]): void;
+    deleteChild(dataStoreId: string): void;
     /**
      * Delete data stores and its objects that are sweep ready.
      * @param sweepReadyDataStoreRoutes - The routes of data stores and its objects that are sweep ready and should
@@ -210,13 +214,14 @@ export declare function getSummaryForDatastores(snapshot: ISnapshotTree | undefi
  *
  * @internal
  */
-export declare function detectOutboundReferences(envelope: IEnvelope, addedOutboundReference: (fromNodePath: string, toNodePath: string) => void): void;
+export declare function detectOutboundReferences(address: string, contents: unknown, addedOutboundReference: (fromNodePath: string, toNodePath: string) => void): void;
 /** @internal */
-export declare class ChannelCollectionFactory implements IFluidDataStoreFactory {
+export declare class ChannelCollectionFactory<T extends ChannelCollection = ChannelCollection> implements IFluidDataStoreFactory {
     private readonly provideEntryPoint;
+    private readonly ctor;
     readonly type = "ChannelCollectionChannel";
     IFluidDataStoreRegistry: IFluidDataStoreRegistry;
-    constructor(registryEntries: NamedFluidDataStoreRegistryEntries, provideEntryPoint: (runtime: IFluidDataStoreChannel) => Promise<FluidObject>);
+    constructor(registryEntries: NamedFluidDataStoreRegistryEntries, provideEntryPoint: (runtime: IFluidDataStoreChannel) => Promise<FluidObject>, ctor: (...args: ConstructorParameters<typeof ChannelCollection>) => T);
     get IFluidDataStoreFactory(): this;
     instantiateDataStore(context: IFluidDataStoreContext, _existing: boolean): Promise<IFluidDataStoreChannel>;
 }

package/lib/channelCollection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"channelCollection.d.ts","sourceRoot":"","sources":["../src/channelCollection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"channelCollection.d.ts","sourceRoot":"","sources":["../src/channelCollection.ts"],"names":[],"mappings":"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"}

package/lib/channelCollection.js

@@ -2,22 +2,22 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { FluidObjectHandle } from "@fluidframework/datastore";
-import { channelsTreeName, CreateSummarizerNodeSource, } from "@fluidframework/runtime-definitions";
-import { convertSnapshotTreeToSummaryTree, convertSummaryTreeToITree, create404Response, createResponseError, GCDataBuilder, isSerializedHandle, processAttachMessageGCData, responseToException, SummaryTreeBuilder, unpackChildNodesUsedRoutes, RequestParser, encodeCompactIdToString, } from "@fluidframework/runtime-utils";
-import { createChildMonitoringContext, DataCorruptionError, DataProcessingError, extractSafePropertiesFromMessage, LoggingError, tagCodeArtifacts, createChildLogger, } from "@fluidframework/telemetry-utils";
 import { AttachState } from "@fluidframework/container-definitions";
-import { buildSnapshotTree } from "@fluidframework/driver-utils";
-import { assert, Lazy, LazyPromise } from "@fluidframework/core-utils";
-import { DataStoreContexts } from "./dataStoreContexts.js";
+import { assert, Lazy, LazyPromise } from "@fluidframework/core-utils/internal";
+import { FluidObjectHandle } from "@fluidframework/datastore/internal";
+import { buildSnapshotTree } from "@fluidframework/driver-utils/internal";
+import { CreateSummarizerNodeSource, channelsTreeName, } from "@fluidframework/runtime-definitions/internal";
+import { GCDataBuilder, RequestParser, SummaryTreeBuilder, convertSnapshotTreeToSummaryTree, convertSummaryTreeToITree, create404Response, createResponseError, encodeCompactIdToString, isSerializedHandle, processAttachMessageGCData, responseToException, unpackChildNodesUsedRoutes, } from "@fluidframework/runtime-utils/internal";
+import { DataCorruptionError, DataProcessingError, LoggingError, createChildLogger, createChildMonitoringContext, extractSafePropertiesFromMessage, tagCodeArtifacts, } from "@fluidframework/telemetry-utils/internal";
 import { defaultRuntimeHeaderData } from "./containerRuntime.js";
-import { RemoteFluidDataStoreContext, LocalFluidDataStoreContext, createAttributesBlob, LocalDetachedFluidDataStoreContext, } from "./dataStoreContext.js";
-import { StorageServiceWithAttachBlobs } from "./storageServiceWithAttachBlobs.js";
 import { channelToDataStore, isDataStoreAliasMessage, } from "./dataStore.js";
+import { LocalDetachedFluidDataStoreContext, LocalFluidDataStoreContext, RemoteFluidDataStoreContext, createAttributesBlob, } from "./dataStoreContext.js";
+import { DataStoreContexts } from "./dataStoreContexts.js";
+import { FluidDataStoreRegistry } from "./dataStoreRegistry.js";
 import { GCNodeType, detectOutboundRoutesViaDDSKey, trimLeadingAndTrailingSlashes, } from "./gc/index.js";
-import { nonDataStorePaths, rootHasIsolatedChannels, } from "./summary/index.js";
 import { ContainerMessageType } from "./messageTypes.js";
-import { FluidDataStoreRegistry } from "./dataStoreRegistry.js";
+import { StorageServiceWithAttachBlobs } from "./storageServiceWithAttachBlobs.js";
+import { nonDataStorePaths, rootHasIsolatedChannels, } from "./summary/index.js";
 /**
  * Accepted header keys for requests coming to the runtime.
  * @internal
@@ -102,7 +102,10 @@ export function wrapContext(context) {
             return context.getCreateChildSummarizerNodeFn?.(...args);
         },
         deleteChildSummarizerNode: (...args) => {
-            return context.deleteChildSummarizerNode?.(...args);
+            return context.deleteChildSummarizerNode(...args);
+        },
+        setChannelDirty: (address) => {
+            return context.setChannelDirty(address);
         },
     };
 }
@@ -164,6 +167,7 @@ export class ChannelCollection {
         this.contexts = new DataStoreContexts(baseLogger);
         this.containerRuntimeHandle = new FluidObjectHandle(this.parentContext, "/", this.parentContext.IFluidHandleContext);
         this.entryPoint = new FluidObjectHandle(new 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) {
@@ -209,7 +213,6 @@ export class ChannelCollection {
                     }),
                     makeLocallyVisibleFn: () => this.makeDataStoreLocallyVisible(key),
                     snapshotTree,
-                    isRootDataStore: undefined,
                 });
             }
             this.contexts.addBoundOrRemoted(dataStoreContext);
@@ -267,7 +270,7 @@ export class ChannelCollection {
         // The local object has already been attached
         if (local) {
             assert(this.pendingAttach.has(attachMessage.id), 0x15e /* "Local object does not have matching attach message id" */);
-            this.contexts.get(attachMessage.id)?.emit("attached");
+            this.contexts.get(attachMessage.id)?.setAttachState(AttachState.Attached);
             this.pendingAttach.delete(attachMessage.id);
             return;
         }
@@ -316,31 +319,32 @@ export class ChannelCollection {
             });
         }
         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 FluidObjectHandle(context, aliasMessage.internalId, this.parentContext.IFluidHandleContext);
+        const handle = new 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;
     }
@@ -373,14 +377,17 @@ export class ChannelCollection {
          * If the container is detached, this data store will be part of the summary that makes the container attached.
          */
         if (this.parentContext.attachState !== AttachState.Detached) {
-            localContext.emit("attaching");
-            const message = this.generateAttachMessage(localContext);
-            this.pendingAttach.set(id, message);
-            this.parentContext.submitMessage(ContainerMessageType.Attach, message, undefined);
-            this.attachOpFiredForDataStore.add(id);
+            localContext.setAttachState(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(ContainerMessageType.Attach, message, undefined);
+        this.attachOpFiredForDataStore.add(localContext.id);
+    }
     /**
      * Generate compact internal DataStore ID.
      *
@@ -413,29 +420,15 @@ export class ChannelCollection {
         }
         return id;
     }
-    createDetachedDataStoreCore(pkg, loadingGroupId) {
-        const id = this.createDataStoreId();
-        const context = new LocalDetachedFluidDataStoreContext({
-            id,
-            pkg,
-            parentContext: this.wrapContextForInnerChannel(id),
-            storage: this.parentContext.storage,
-            scope: this.parentContext.scope,
-            createSummarizerNodeFn: this.parentContext.getCreateChildSummarizerNodeFn(id, {
-                type: CreateSummarizerNodeSource.Local,
-            }),
-            makeLocallyVisibleFn: () => this.makeDataStoreLocallyVisible(id),
-            snapshotTree: undefined,
-            isRootDataStore: false,
-            loadingGroupId,
-            channelToDataStoreFn: (channel) => channelToDataStore(channel, id, this, createChildLogger({ logger: this.parentContext.logger })),
-        });
-        this.contexts.addUnbound(context);
-        return context;
+    createDetachedDataStore(pkg, loadingGroupId) {
+        return this.createContext(this.createDataStoreId(), pkg, LocalDetachedFluidDataStoreContext, undefined, // props
+        loadingGroupId);
+    }
+    createDataStoreContext(pkg, props, loadingGroupId) {
+        return this.createContext(this.createDataStoreId(), pkg, LocalFluidDataStoreContext, props, loadingGroupId);
     }
-    _createFluidDataStoreContext(pkg, props, loadingGroupId) {
-        const id = this.createDataStoreId();
-        const context = new LocalFluidDataStoreContext({
+    createContext(id, pkg, contextCtor, createProps, loadingGroupId) {
+        const context = new contextCtor({
             id,
             pkg,
             parentContext: this.wrapContextForInnerChannel(id),
@@ -446,9 +439,9 @@ export class ChannelCollection {
             }),
             makeLocallyVisibleFn: () => this.makeDataStoreLocallyVisible(id),
             snapshotTree: undefined,
-            isRootDataStore: false,
-            createProps: props,
+            createProps,
             loadingGroupId,
+            channelToDataStoreFn: (channel) => channelToDataStore(channel, id, this, createChildLogger({ logger: this.parentContext.logger })),
         });
         this.contexts.addUnbound(context);
         return context;
@@ -462,9 +455,13 @@ export class ChannelCollection {
             case ContainerMessageType.Alias:
                 this.parentContext.submitMessage(type, content, localOpMetadata);
                 return;
+            case ContainerMessageType.FluidDataStoreOp:
+                return this.reSubmitChannelOp(type, content, localOpMetadata);
             default:
+                assert(false, 0x907 /* unknown op type */);
         }
-        assert(type === 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
@@ -502,9 +499,13 @@ export class ChannelCollection {
                 return this.applyStashedAttachOp(opContents.contents);
             case ContainerMessageType.Alias:
                 return;
+            case ContainerMessageType.FluidDataStoreOp:
+                return this.applyStashedChannelChannelOp(opContents.contents);
             default:
+                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.
@@ -515,9 +516,42 @@ export class ChannelCollection {
         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 = buildSnapshotTree(snapshot.entries, flatAttachBlobs);
+        const storage = new 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 LocalFluidDataStoreContext({
+            id,
+            pkg: undefined,
+            parentContext: this.wrapContextForInnerChannel(id),
+            storage,
+            scope: this.parentContext.scope,
+            createSummarizerNodeFn: this.parentContext.getCreateChildSummarizerNodeFn(id, {
+                type: 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 !== 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) {
@@ -527,22 +561,33 @@ export class ChannelCollection {
             case ContainerMessageType.Alias:
                 this.processAliasMessage(message, localMessageMetadata, local);
                 return;
-            case ContainerMessageType.FluidDataStoreOp:
+            case 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(detectOutboundRoutesViaDDSKey) !== true &&
+                    addedOutboundReference !== undefined) {
+                    // Notify GC of any outbound references that were added by this op.
+                    detectOutboundReferences(envelope.address, transformed.contents, addedOutboundReference);
+                }
                 break;
+            }
             default:
                 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) {
@@ -553,20 +598,13 @@ export class ChannelCollection {
                     type: message.type,
                     contentType: typeof message.contents,
                 }),
-                ...tagCodeArtifacts({ address: envelope.address }),
+                ...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(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 = { ...defaultRuntimeHeaderData, ...requestHeaderData };
@@ -664,11 +702,10 @@ export class ChannelCollection {
         }
     }
     setAttachState(attachState) {
-        const eventName = attachState === 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);
             }
         }
     }
@@ -804,25 +841,14 @@ export class ChannelCollection {
             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];
-            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);
+        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,11 +880,7 @@ export class ChannelCollection {
                 });
                 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);
     }
@@ -893,8 +915,9 @@ export 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}`);
             }
@@ -998,7 +1021,7 @@ export function getSummaryForDatastores(snapshot, metadata) {
  *
  * @internal
  */
-export function detectOutboundReferences(envelope, addedOutboundReference) {
+export function detectOutboundReferences(address, contents, addedOutboundReference) {
     // These will be built up as we traverse the envelope contents
     const outboundPaths = [];
     let ddsAddress;
@@ -1019,18 +1042,19 @@ export 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));
 }
 /** @internal */
 export 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 FluidDataStoreRegistry(registryEntries);
     }
@@ -1038,7 +1062,7 @@ export 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