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

package/dist/{dataStores.js → channelCollection.js}

@@ -4,7 +4,7 @@
  * Licensed under the MIT License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.detectOutboundReferences = exports.getSummaryForDatastores = exports.DataStores = void 0;
+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");
@@ -12,29 +12,147 @@ 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 uuid_1 = require("uuid");
-const dataStoreContexts_1 = require("./dataStoreContexts");
-const containerRuntime_1 = require("./containerRuntime");
-const dataStoreContext_1 = require("./dataStoreContext");
-const storageServiceWithAttachBlobs_1 = require("./storageServiceWithAttachBlobs");
-const gc_1 = require("./gc");
-const dataStore_1 = require("./dataStore");
-const summary_1 = require("./summary");
+const dataStoreContexts_js_1 = require("./dataStoreContexts.js");
+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 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");
+/**
+ * Accepted header keys for requests coming to the runtime.
+ * @internal
+ */
+var RuntimeHeaders;
+(function (RuntimeHeaders) {
+    /** True to wait for a data store to be created and loaded before returning it. */
+    RuntimeHeaders["wait"] = "wait";
+    /** True if the request is coming from an IFluidHandle. */
+    RuntimeHeaders["viaHandle"] = "viaHandle";
+})(RuntimeHeaders || (exports.RuntimeHeaders = RuntimeHeaders = {}));
+/** True if a tombstoned object should be returned without erroring
+ * @alpha
+ */
+exports.AllowTombstoneRequestHeaderKey = "allowTombstone"; // Belongs in the enum above, but avoiding the breaking change
+/**
+ * [IRRELEVANT IF throwOnInactiveLoad OPTION NOT SET] True if an inactive object should be returned without erroring
+ * @internal
+ */
+exports.AllowInactiveRequestHeaderKey = "allowInactive"; // Belongs in the enum above, but avoiding the breaking change
+/**
+ * Creates a shallow wrapper of {@link IFluidParentContext}. The wrapper can then have its methods overwritten as needed
+ */
+function wrapContext(context) {
+    return {
+        get IFluidDataStoreRegistry() {
+            return context.IFluidDataStoreRegistry;
+        },
+        IFluidHandleContext: context.IFluidHandleContext,
+        options: context.options,
+        get clientId() {
+            return context.clientId;
+        },
+        get connected() {
+            return context.connected;
+        },
+        deltaManager: context.deltaManager,
+        storage: context.storage,
+        logger: context.logger,
+        get clientDetails() {
+            return context.clientDetails;
+        },
+        get idCompressor() {
+            return context.idCompressor;
+        },
+        loadingGroupId: context.loadingGroupId,
+        get attachState() {
+            return context.attachState;
+        },
+        containerRuntime: context.containerRuntime,
+        scope: context.scope,
+        gcThrowOnTombstoneUsage: context.gcThrowOnTombstoneUsage,
+        gcTombstoneEnforcementAllowed: context.gcTombstoneEnforcementAllowed,
+        getAbsoluteUrl: async (...args) => {
+            return context.getAbsoluteUrl(...args);
+        },
+        getQuorum: (...args) => {
+            return context.getQuorum(...args);
+        },
+        getAudience: (...args) => {
+            return context.getAudience(...args);
+        },
+        ensureNoDataModelChanges: (...args) => {
+            return context.ensureNoDataModelChanges(...args);
+        },
+        submitMessage: (...args) => {
+            return context.submitMessage(...args);
+        },
+        submitSignal: (...args) => {
+            return context.submitSignal(...args);
+        },
+        makeLocallyVisible: (...args) => {
+            return context.makeLocallyVisible(...args);
+        },
+        uploadBlob: async (...args) => {
+            return context.uploadBlob(...args);
+        },
+        addedGCOutboundReference: (...args) => {
+            return context.addedGCOutboundReference?.(...args);
+        },
+        getCreateChildSummarizerNodeFn: (...args) => {
+            return context.getCreateChildSummarizerNodeFn?.(...args);
+        },
+        deleteChildSummarizerNode: (...args) => {
+            return context.deleteChildSummarizerNode?.(...args);
+        },
+    };
+}
+exports.wrapContext = wrapContext;
+/**
+ * Creates a wrapper of a {@link IFluidParentContext} to be provided to the inner datastore channels.
+ * The wrapper will have the submit methods overwritten with the appropriate id as the destination address.
+ *
+ * @param id - the id of the channel
+ * @param parentContext - the {@link IFluidParentContext} to wrap
+ * @returns A wrapped {@link IFluidParentContext}
+ */
+function wrapContextForInnerChannel(id, parentContext) {
+    const context = wrapContext(parentContext);
+    context.submitMessage = (type, content, localOpMetadata) => {
+        const fluidDataStoreContent = {
+            content,
+            type,
+        };
+        const envelope = {
+            address: id,
+            contents: fluidDataStoreContent,
+        };
+        parentContext.submitMessage(messageTypes_js_1.ContainerMessageType.FluidDataStoreOp, envelope, localOpMetadata);
+    };
+    context.submitSignal = (type, contents, targetClientId) => {
+        const envelope = {
+            address: id,
+            contents,
+        };
+        parentContext.submitSignal(type, envelope, targetClientId);
+    };
+    return context;
+}
+exports.wrapContextForInnerChannel = wrapContextForInnerChannel;
 /**
  * This class encapsulates data store handling. Currently it is only used by the container runtime,
  * but eventually could be hosted on any channel once we formalize the channel api boundary.
+ * @internal
  */
-class DataStores {
-    constructor(baseSnapshot, runtime, submitAttachFn, getCreateChildSummarizerNodeFn, deleteChildSummarizerNodeFn, baseLogger, gcNodeUpdated, isDataStoreDeleted, aliasMap, contexts = new dataStoreContexts_1.DataStoreContexts(baseLogger)) {
+class ChannelCollection {
+    constructor(baseSnapshot, parentContext, baseLogger, gcNodeUpdated, isDataStoreDeleted, aliasMap, provideEntryPoint) {
         this.baseSnapshot = baseSnapshot;
-        this.runtime = runtime;
-        this.submitAttachFn = submitAttachFn;
-        this.getCreateChildSummarizerNodeFn = getCreateChildSummarizerNodeFn;
-        this.deleteChildSummarizerNodeFn = deleteChildSummarizerNodeFn;
+        this.parentContext = parentContext;
         this.gcNodeUpdated = gcNodeUpdated;
         this.isDataStoreDeleted = isDataStoreDeleted;
         this.aliasMap = aliasMap;
-        this.contexts = contexts;
         // Stores tracked by the Domain
         this.pendingAttach = new Map();
         // 0.24 back-compat attachingBeforeSummary
@@ -48,7 +166,9 @@ class DataStores {
         this.shouldSendAttachLog = true;
         this.dispose = () => this.disposeOnce.value;
         this.mc = (0, telemetry_utils_1.createChildMonitoringContext)({ logger: baseLogger });
-        this.containerRuntimeHandle = new datastore_1.FluidObjectHandle(this.runtime, "/", this.runtime.IFluidHandleContext);
+        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);
         // Extract stores stored inside the snapshot
         const fluidDataStores = new Map();
         if (baseSnapshot) {
@@ -65,16 +185,17 @@ class DataStores {
                 unreferencedDataStoreCount++;
             }
             // If we have a detached container, then create local data store contexts.
-            if (this.runtime.attachState !== container_definitions_1.AttachState.Detached) {
-                dataStoreContext = new dataStoreContext_1.RemoteFluidDataStoreContext({
+            if (this.parentContext.attachState !== container_definitions_1.AttachState.Detached) {
+                dataStoreContext = new dataStoreContext_js_1.RemoteFluidDataStoreContext({
                     id: key,
                     snapshotTree: value,
-                    runtime: this.runtime,
-                    storage: this.runtime.storage,
-                    scope: this.runtime.scope,
-                    createSummarizerNodeFn: this.getCreateChildSummarizerNodeFn(key, {
+                    parentContext: this.wrapContextForInnerChannel(key),
+                    storage: this.parentContext.storage,
+                    scope: this.parentContext.scope,
+                    createSummarizerNodeFn: this.parentContext.getCreateChildSummarizerNodeFn(key, {
                         type: runtime_definitions_1.CreateSummarizerNodeSource.FromSummary,
                     }),
+                    loadingGroupId: value.groupId,
                 });
             }
             else {
@@ -82,13 +203,13 @@ class DataStores {
                     throw new telemetry_utils_1.LoggingError("Snapshot should be there to load from!!");
                 }
                 const snapshotTree = value;
-                dataStoreContext = new dataStoreContext_1.LocalFluidDataStoreContext({
+                dataStoreContext = new dataStoreContext_js_1.LocalFluidDataStoreContext({
                     id: key,
                     pkg: undefined,
-                    runtime: this.runtime,
-                    storage: this.runtime.storage,
-                    scope: this.runtime.scope,
-                    createSummarizerNodeFn: this.getCreateChildSummarizerNodeFn(key, {
+                    parentContext: this.wrapContextForInnerChannel(key),
+                    storage: this.parentContext.storage,
+                    scope: this.parentContext.scope,
+                    createSummarizerNodeFn: this.parentContext.getCreateChildSummarizerNodeFn(key, {
                         type: runtime_definitions_1.CreateSummarizerNodeSource.FromSummary,
                     }),
                     makeLocallyVisibleFn: () => this.makeDataStoreLocallyVisible(key),
@@ -113,6 +234,17 @@ class DataStores {
         const pendingAliasPromise = this.pendingAliases.get(maybeAlias);
         return pendingAliasPromise ?? "Success";
     }
+    wrapContextForInnerChannel(id) {
+        return wrapContextForInnerChannel(id, this.parentContext);
+    }
+    /**
+     * IFluidDataStoreChannel.makeVisibleAndAttachGraph implementation
+     * Not clear when it would be called and what it should do.
+     * Currently this API is called by context only for root data stores.
+     */
+    makeVisibleAndAttachGraph() {
+        this.parentContext.makeLocallyVisible();
+    }
     processAttachMessage(message, local) {
         const attachMessage = message.contents;
         this.dataStoresSinceLastGC.push(attachMessage.id);
@@ -120,7 +252,7 @@ class DataStores {
         const foundGCData = (0, runtime_utils_1.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.runtime.addedGCOutboundReference({ absolutePath: fromPath }, { absolutePath: toPath });
+            this.parentContext.addedGCOutboundReference?.({ absolutePath: fromPath }, { absolutePath: toPath });
         });
         // Only log once per container to avoid noise/cost.
         // Allows longitudinal tracking of various state (e.g. foundGCData), and some sampled details
@@ -163,17 +295,18 @@ class DataStores {
         // 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.
         const pkg = [attachMessage.type];
-        const remoteFluidDataStoreContext = new dataStoreContext_1.RemoteFluidDataStoreContext({
+        const remoteFluidDataStoreContext = new dataStoreContext_js_1.RemoteFluidDataStoreContext({
             id: attachMessage.id,
             snapshotTree,
-            runtime: this.runtime,
-            storage: new storageServiceWithAttachBlobs_1.StorageServiceWithAttachBlobs(this.runtime.storage, flatAttachBlobs),
-            scope: this.runtime.scope,
-            createSummarizerNodeFn: this.getCreateChildSummarizerNodeFn(attachMessage.id, {
+            parentContext: this.wrapContextForInnerChannel(attachMessage.id),
+            storage: new storageServiceWithAttachBlobs_js_1.StorageServiceWithAttachBlobs(this.parentContext.storage, flatAttachBlobs),
+            scope: this.parentContext.scope,
+            loadingGroupId: attachMessage.snapshot?.groupId,
+            createSummarizerNodeFn: this.parentContext.getCreateChildSummarizerNodeFn(attachMessage.id, {
                 type: runtime_definitions_1.CreateSummarizerNodeSource.FromAttach,
                 sequenceNumber: message.sequenceNumber,
                 snapshot: attachMessage.snapshot ?? {
-                    entries: [(0, dataStoreContext_1.createAttributesBlob)(pkg, true /* isRootDataStore */)],
+                    entries: [(0, dataStoreContext_js_1.createAttributesBlob)(pkg, true /* isRootDataStore */)],
                 },
             }),
             pkg,
@@ -182,7 +315,7 @@ class DataStores {
     }
     processAliasMessage(message, localOpMetadata, local) {
         const aliasMessage = message.contents;
-        if (!(0, dataStore_1.isDataStoreAliasMessage)(aliasMessage)) {
+        if (!(0, dataStore_js_1.isDataStoreAliasMessage)(aliasMessage)) {
             throw new telemetry_utils_1.DataCorruptionError("malformedDataStoreAliasMessage", {
                 ...(0, telemetry_utils_1.extractSafePropertiesFromMessage)(message),
             });
@@ -210,8 +343,8 @@ class DataStores {
             });
             return false;
         }
-        const handle = new datastore_1.FluidObjectHandle(context, aliasMessage.internalId, this.runtime.IFluidHandleContext);
-        this.runtime.addedGCOutboundReference(this.containerRuntimeHandle, handle);
+        const handle = new datastore_1.FluidObjectHandle(context, aliasMessage.internalId, this.parentContext.IFluidHandleContext);
+        this.parentContext.addedGCOutboundReference?.(this.containerRuntimeHandle, handle);
         this.aliasMap.set(aliasMessage.alias, context.id);
         context.setInMemoryRoot();
         return true;
@@ -221,11 +354,8 @@ class DataStores {
     }
     /** Package up the context's attach summary etc into an IAttachMessage */
     generateAttachMessage(localContext) {
-        const { attachSummary, type, gcData } = localContext.getAttachData(
-        /* includeGCData: */ true);
-        if (gcData !== undefined) {
-            (0, runtime_utils_1.addBlobToSummary)(attachSummary, runtime_definitions_1.gcDataBlobKey, JSON.stringify(gcData));
-        }
+        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);
         return {
@@ -247,48 +377,83 @@ class DataStores {
          * 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.runtime.attachState !== container_definitions_1.AttachState.Detached) {
+        if (this.parentContext.attachState !== container_definitions_1.AttachState.Detached) {
             localContext.emit("attaching");
             const message = this.generateAttachMessage(localContext);
             this.pendingAttach.set(id, message);
-            this.submitAttachFn(message);
+            this.parentContext.submitMessage(messageTypes_js_1.ContainerMessageType.Attach, message, undefined);
             this.attachOpFiredForDataStore.add(id);
         }
         this.contexts.bind(id);
     }
-    createDetachedDataStoreCore(pkg, isRoot, id = (0, uuid_1.v4)()) {
-        (0, core_utils_1.assert)(!id.includes("/"), 0x30c /* Id cannot contain slashes */);
-        const context = new dataStoreContext_1.LocalDetachedFluidDataStoreContext({
+    /**
+     * Generate compact internal DataStore ID.
+     *
+     * A note about namespace and name collisions:
+     * This code assumes that that's the only way to generate internal IDs, and that it's Ok for this namespace to overlap with
+     * user-provided alias names namespace.
+     * There are two scenarios where it could cause trouble:
+     * 1) Old files, where (already removed) CreateRoot*DataStore*() API was used, and thus internal name of data store
+     * was provided by user. Such files may experience name collision with future data stores that receive a name generated
+     * by this function.
+     * 2) Much less likely, but if it happen that internal ID (generated by this function) is exactly the same as alias name
+     * that user might use in the future, them ContainerRuntime.getAliasedDataStoreEntryPoint() or
+     * ContainerRuntime.getDataStoreFromRequest() could return a data store with internalID matching user request, even though
+     * user expected some other data store (that would receive alias later).
+     * Please note that above mentioned functions have the implementation they have (allowing #2) due to #1.
+     */
+    createDataStoreId() {
+        // We use three non-overlapping namespaces:
+        // - detached state: even numbers
+        // - attached state: odd numbers
+        // - uuids
+        // 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);
+        }
+        const id = this.parentContext.containerRuntime.generateDocumentUniqueId();
+        if (typeof id === "number") {
+            return (0, runtime_utils_1.encodeCompactIdToString)(2 * id + 1);
+        }
+        return id;
+    }
+    createDetachedDataStoreCore(pkg, loadingGroupId) {
+        const id = this.createDataStoreId();
+        const context = new dataStoreContext_js_1.LocalDetachedFluidDataStoreContext({
             id,
             pkg,
-            runtime: this.runtime,
-            storage: this.runtime.storage,
-            scope: this.runtime.scope,
-            createSummarizerNodeFn: this.getCreateChildSummarizerNodeFn(id, {
+            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: isRoot,
+            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;
     }
-    _createFluidDataStoreContext(pkg, id, props) {
-        (0, core_utils_1.assert)(!id.includes("/"), 0x30d /* Id cannot contain slashes */);
-        const context = new dataStoreContext_1.LocalFluidDataStoreContext({
+    _createFluidDataStoreContext(pkg, props, loadingGroupId) {
+        const id = this.createDataStoreId();
+        const context = new dataStoreContext_js_1.LocalFluidDataStoreContext({
             id,
             pkg,
-            runtime: this.runtime,
-            storage: this.runtime.storage,
-            scope: this.runtime.scope,
-            createSummarizerNodeFn: this.getCreateChildSummarizerNodeFn(id, {
+            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,
             createProps: props,
+            loadingGroupId,
         });
         this.contexts.addUnbound(context);
         return context;
@@ -296,7 +461,16 @@ class DataStores {
     get disposed() {
         return this.disposeOnce.evaluated;
     }
-    resubmitDataStoreOp(envelope, localOpMetadata) {
+    reSubmit(type, content, localOpMetadata) {
+        switch (type) {
+            case messageTypes_js_1.ContainerMessageType.Attach:
+            case messageTypes_js_1.ContainerMessageType.Alias:
+                this.parentContext.submitMessage(type, content, localOpMetadata);
+                return;
+            default:
+        }
+        (0, core_utils_1.assert)(type === messageTypes_js_1.ContainerMessageType.FluidDataStoreOp, 0x8e7 /* 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.
@@ -307,9 +481,12 @@ class DataStores {
             });
         }
         (0, core_utils_1.assert)(!!context, 0x160 /* "There should be a store context for the op" */);
-        context.reSubmit(envelope.contents, localOpMetadata);
+        const innerContents = envelope.contents;
+        context.reSubmit(innerContents.type, innerContents.content, localOpMetadata);
     }
-    rollbackDataStoreOp(envelope, localOpMetadata) {
+    rollback(type, content, localOpMetadata) {
+        (0, core_utils_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.
@@ -320,9 +497,19 @@ class DataStores {
             });
         }
         (0, core_utils_1.assert)(!!context, 0x2e8 /* "There should be a store context for the op" */);
-        context.rollback(envelope.contents, localOpMetadata);
+        const innerContents = envelope.contents;
+        context.rollback(innerContents.type, innerContents.content, localOpMetadata);
     }
-    async applyStashedOp(envelope) {
+    async applyStashedOp(content) {
+        const opContents = content;
+        switch (opContents.type) {
+            case messageTypes_js_1.ContainerMessageType.Attach:
+                return this.applyStashedAttachOp(opContents.contents);
+            case messageTypes_js_1.ContainerMessageType.Alias:
+                return;
+            default:
+        }
+        const envelope = opContents.contents;
         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.
@@ -337,9 +524,26 @@ class DataStores {
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
         this.processAttachMessage({ contents: message }, false);
     }
-    processFluidDataStoreOp(message, local, localMessageMetadata, addedOutboundReference) {
+    process(message, local, localMessageMetadata, addedOutboundReference) {
+        switch (message.type) {
+            case messageTypes_js_1.ContainerMessageType.Attach:
+                this.processAttachMessage(message, local);
+                return;
+            case messageTypes_js_1.ContainerMessageType.Alias:
+                this.processAliasMessage(message, localMessageMetadata, local);
+                return;
+            case messageTypes_js_1.ContainerMessageType.FluidDataStoreOp:
+                break;
+            default:
+                (0, core_utils_1.assert)(false, 0x8e9 /* unreached */);
+        }
         const envelope = message.contents;
-        const transformed = { ...message, contents: envelope.contents };
+        const innerContents = envelope.contents;
+        const transformed = {
+            ...message,
+            type: innerContents.type,
+            contents: innerContents.content,
+        };
         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 a deleted data store accidentally submitted an op.
@@ -360,16 +564,17 @@ class DataStores {
         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(gc_1.detectOutboundRoutesViaDDSKey) !== true) {
+        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);
         }
         // 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}`, message.timestamp, context.isLoaded ? context.packagePath : undefined);
+        this.gcNodeUpdated(`/${envelope.address}`, "Changed", message.timestamp, context.isLoaded ? context.packagePath : undefined);
     }
     async getDataStore(id, requestHeaderData) {
-        const headerData = { ...containerRuntime_1.defaultRuntimeHeaderData, ...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 };
@@ -391,7 +596,7 @@ class DataStores {
         if (this.checkAndLogIfDeleted(id, this.contexts.get(id), "Requested", "getDataStoreIfAvailable", requestHeaderData)) {
             return undefined;
         }
-        const headerData = { ...containerRuntime_1.defaultRuntimeHeaderData, ...requestHeaderData };
+        const headerData = { ...containerRuntime_js_1.defaultRuntimeHeaderData, ...requestHeaderData };
         const context = await this.contexts.getBoundOrRemoted(id, headerData.wait);
         if (context === undefined) {
             return undefined;
@@ -420,7 +625,10 @@ class DataStores {
         });
         return true;
     }
-    processSignal(fluidDataStoreId, message, local) {
+    processSignal(messageArg, local) {
+        const envelope = messageArg.content;
+        const fluidDataStoreId = envelope.address;
+        const message = { ...messageArg, content: envelope.contents };
         const context = this.contexts.get(fluidDataStoreId);
         // 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.
@@ -453,7 +661,7 @@ class DataStores {
                         fluidDataStoreId,
                     }),
                     details: JSON.stringify({
-                        runtimeConnected: this.runtime.connected,
+                        runtimeConnected: this.parentContext.connected,
                         connected,
                     }),
                 }, error);
@@ -496,7 +704,7 @@ class DataStores {
     /**
      * Create a summary. Used when attaching or serializing a detached container.
      */
-    createSummary(telemetryContext) {
+    getAttachSummary(telemetryContext) {
         const builder = new runtime_utils_1.SummaryTreeBuilder();
         // Attaching graph of some stores can cause other stores to get bound too.
         // So keep taking summary until no new stores get bound.
@@ -541,8 +749,8 @@ class DataStores {
             (0, core_utils_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.runtime.IFluidHandleContext);
-                this.runtime.addedGCOutboundReference(this.containerRuntimeHandle, handle);
+                const handle = new datastore_1.FluidObjectHandle(context, id, this.parentContext.IFluidHandleContext);
+                this.parentContext.addedGCOutboundReference?.(this.containerRuntimeHandle, handle);
             }
         }
         this.dataStoresSinceLastGC = [];
@@ -618,7 +826,7 @@ class DataStores {
             // Delete the contexts of unused data stores.
             this.contexts.delete(dataStoreId);
             // Delete the summarizer node of the unused data stores.
-            this.deleteChildSummarizerNodeFn(dataStoreId);
+            this.parentContext.deleteChildSummarizerNode?.(dataStoreId);
         }
     }
     /**
@@ -655,7 +863,7 @@ class DataStores {
             // Delete the contexts of sweep ready data stores.
             this.contexts.delete(dataStoreId);
             // Delete the summarizer node of the sweep ready data stores.
-            this.deleteChildSummarizerNodeFn(dataStoreId);
+            this.parentContext.deleteChildSummarizerNode?.(dataStoreId);
         }
         return Array.from(sweepReadyDataStoreRoutes);
     }
@@ -719,17 +927,60 @@ class DataStores {
         // Data stores paths are of the format "/dataStoreId".
         // Sub data store paths are of the format "/dataStoreId/subPath/...".
         if (pathParts.length === 2) {
-            return gc_1.GCNodeType.DataStore;
+            return index_js_1.GCNodeType.DataStore;
         }
-        return gc_1.GCNodeType.SubDataStore;
+        return index_js_1.GCNodeType.SubDataStore;
+    }
+    internalId(maybeAlias) {
+        return this.aliases.get(maybeAlias) ?? maybeAlias;
+    }
+    async request(request) {
+        const requestParser = runtime_utils_1.RequestParser.create(request);
+        const id = requestParser.pathParts[0];
+        // Differentiate between requesting the dataStore directly, or one of its children
+        const requestForChild = !requestParser.isLeaf(1);
+        const headerData = {};
+        if (typeof request.headers?.[RuntimeHeaders.wait] === "boolean") {
+            headerData.wait = request.headers[RuntimeHeaders.wait];
+        }
+        if (typeof request.headers?.[RuntimeHeaders.viaHandle] === "boolean") {
+            headerData.viaHandle = request.headers[RuntimeHeaders.viaHandle];
+        }
+        if (typeof request.headers?.[exports.AllowTombstoneRequestHeaderKey] === "boolean") {
+            headerData.allowTombstone = request.headers[exports.AllowTombstoneRequestHeaderKey];
+        }
+        if (typeof request.headers?.[exports.AllowInactiveRequestHeaderKey] === "boolean") {
+            headerData.allowInactive = request.headers[exports.AllowInactiveRequestHeaderKey];
+        }
+        // We allow Tombstone requests for sub-DataStore objects
+        if (requestForChild) {
+            headerData.allowTombstone = true;
+        }
+        await this.waitIfPendingAlias(id);
+        const internalId = this.internalId(id);
+        const dataStoreContext = await this.getDataStore(internalId, headerData);
+        // Remove query params, leading and trailing slashes from the url. This is done to make sure the format is
+        // the same as GC nodes id.
+        const urlWithoutQuery = (0, index_js_1.trimLeadingAndTrailingSlashes)(request.url.split("?")[0]);
+        // Get the initial snapshot details which contain the data store package path.
+        const details = await dataStoreContext.getInitialSnapshotDetails();
+        // Note that this will throw if the data store is inactive or tombstoned and throwing on incorrect usage
+        // is configured.
+        this.gcNodeUpdated(`/${urlWithoutQuery}`, "Loaded", undefined /* timestampMs */, details.pkg, request, headerData);
+        const dataStore = await dataStoreContext.realize();
+        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" */);
+        return dataStore.request(subRequest);
     }
 }
-exports.DataStores = DataStores;
+exports.ChannelCollection = ChannelCollection;
 function getSummaryForDatastores(snapshot, metadata) {
     if (!snapshot) {
         return undefined;
     }
-    if ((0, summary_1.rootHasIsolatedChannels)(metadata)) {
+    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 */);
         return datastoresSnapshot;
@@ -738,7 +989,7 @@ function getSummaryForDatastores(snapshot, metadata) {
         // back-compat: strip out all non-datastore paths before giving to DataStores object.
         const datastoresTrees = {};
         for (const [key, value] of Object.entries(snapshot.trees)) {
-            if (!summary_1.nonDataStorePaths.includes(key)) {
+            if (!index_js_2.nonDataStorePaths.includes(key)) {
                 datastoresTrees[key] = value;
             }
         }
@@ -751,6 +1002,8 @@ function getSummaryForDatastores(snapshot, metadata) {
 exports.getSummaryForDatastores = getSummaryForDatastores;
 /**
  * Traverse this op's contents and detect any outbound routes that were added by this op.
+ *
+ * @internal
  */
 function detectOutboundReferences(envelope, addedOutboundReference) {
     // These will be built up as we traverse the envelope contents
@@ -780,4 +1033,26 @@ function detectOutboundReferences(envelope, addedOutboundReference) {
     outboundPaths.forEach((toPath) => addedOutboundReference(fromPath, toPath));
 }
 exports.detectOutboundReferences = detectOutboundReferences;
-//# sourceMappingURL=dataStores.js.map
+/** @internal */
+class ChannelCollectionFactory {
+    constructor(registryEntries, 
+    // ADO:7302 We need a better type here
+    provideEntryPoint) {
+        this.provideEntryPoint = provideEntryPoint;
+        this.type = "ChannelCollectionChannel";
+        this.IFluidDataStoreRegistry = new dataStoreRegistry_js_1.FluidDataStoreRegistry(registryEntries);
+    }
+    get IFluidDataStoreFactory() {
+        return this;
+    }
+    async instantiateDataStore(context, _existing) {
+        const runtime = new ChannelCollection(context.baseSnapshot, context, // parentContext
+        context.logger, () => { }, // gcNodeUpdated
+        (_nodePath) => false, // isDataStoreDeleted
+        new Map(), // aliasMap
+        this.provideEntryPoint);
+        return runtime;
+    }
+}
+exports.ChannelCollectionFactory = ChannelCollectionFactory;
+//# sourceMappingURL=channelCollection.js.map