@fluidframework/container-runtime 0.56.7 → 0.57.1

package/dist/containerRuntime.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ContainerRuntime = exports.getDeviceSpec = exports.agentSchedulerId = exports.ScheduleManager = exports.unpackRuntimeMessage = exports.isRuntimeMessage = exports.RuntimeMessage = exports.ContainerMessageType = void 0;
+exports.ContainerRuntime = exports.getDeviceSpec = exports.agentSchedulerId = exports.ScheduleManager = exports.unpackRuntimeMessage = exports.isRuntimeMessage = exports.RuntimeMessage = exports.RuntimeHeaders = exports.ContainerMessageType = void 0;
 const container_definitions_1 = require("@fluidframework/container-definitions");
 const common_utils_1 = require("@fluidframework/common-utils");
 const telemetry_utils_1 = require("@fluidframework/telemetry-utils");
@@ -28,6 +28,7 @@ const summarizerClientElection_1 = require("./summarizerClientElection");
 const throttler_1 = require("./throttler");
 const runWhileConnectedCoordinator_1 = require("./runWhileConnectedCoordinator");
 const garbageCollection_1 = require("./garbageCollection");
+const dataStore_1 = require("./dataStore");
 var ContainerMessageType;
 (function (ContainerMessageType) {
     // An op to be delivered to store
@@ -55,9 +56,24 @@ const DefaultSummaryConfiguration = {
     // the min of the two will be chosen
     maxAckWaitTime: 120000,
 };
-;
+/**
+ * Accepted header keys for requests coming to the runtime.
+ */
+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 from an external app. Used for GC to handle scenarios where a data store
+     * is deleted and requested via an external app.
+     */
+    RuntimeHeaders["externalRequest"] = "externalRequest";
+    /** True if the request is coming from an IFluidHandle. */
+    RuntimeHeaders["viaHandle"] = "viaHandle";
+})(RuntimeHeaders = exports.RuntimeHeaders || (exports.RuntimeHeaders = {}));
 // Local storage key to set the default flush mode to TurnBased
 const turnBasedFlushModeKey = "Fluid.ContainerRuntime.FlushModeTurnBased";
+const useDataStoreAliasingKey = "Fluid.ContainerRuntime.UseDataStoreAliasing";
 const maxConsecutiveReconnectsKey = "Fluid.ContainerRuntime.MaxConsecutiveReconnects";
 var RuntimeMessage;
 (function (RuntimeMessage) {
@@ -336,7 +352,7 @@ exports.getDeviceSpec = getDeviceSpec;
  */
 class ContainerRuntime extends common_utils_1.TypedEventEmitter {
     constructor(context, registry, metadata, electedSummarizerData, chunks, dataStoreAliasMap, runtimeOptions, containerScope, logger, existing, blobManagerSnapshot, requestHandler, _storage) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         super();
         this.context = context;
         this.registry = registry;
@@ -352,7 +368,6 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         this.paused = false;
         this.consecutiveReconnects = 0;
         this._disposed = false;
-        this.dirtyContainer = false;
         this.emitDirtyDocumentEvent = true;
         this.summarizerWarning = (warning) => this.mc.logger.sendTelemetryEvent({ eventName: "summarizerWarning" }, warning);
         /**
@@ -404,7 +419,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                 throw new container_utils_1.UsageError(`Can't summarize, disableSummaries: ${this.summariesDisabled}`);
             }
         };
-        this.baseSummaryMessage = metadata === null || metadata === void 0 ? void 0 : metadata.message;
+        this.messageAtLastSummary = metadata === null || metadata === void 0 ? void 0 : metadata.message;
         // If this is an existing container, we get values from metadata.
         // otherwise, we initialize them.
         if (existing) {
@@ -428,21 +443,16 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         this.mc = telemetry_utils_1.loggerToMonitoringContext(telemetry_utils_1.ChildLogger.create(this.logger, "ContainerRuntime"));
         this._flushMode =
             ((_b = this.mc.config.getBoolean(turnBasedFlushModeKey)) !== null && _b !== void 0 ? _b : false) ? runtime_definitions_1.FlushMode.TurnBased : runtime_definitions_1.FlushMode.Immediate;
+        this._aliasingEnabled =
+            ((_c = this.mc.config.getBoolean(useDataStoreAliasingKey)) !== null && _c !== void 0 ? _c : false) ||
+                ((_d = runtimeOptions.useDataStoreAliasing) !== null && _d !== void 0 ? _d : false);
+        this.maxConsecutiveReconnects = (_e = this.mc.config.getNumber(maxConsecutiveReconnectsKey)) !== null && _e !== void 0 ? _e : this.defaultMaxConsecutiveReconnects;
+        this.garbageCollector = garbageCollection_1.GarbageCollector.create(this, this.runtimeOptions.gcOptions, (unusedRoutes) => this.dataStores.deleteUnusedRoutes(unusedRoutes), (nodePath) => this.dataStores.getNodePackagePath(nodePath), 
         /**
-         * Function that return the current server timestamp. This is used by the garbage collector to set the
-         * time when a node becomes unreferenced.
-         * We use the timestamp of the last op for current timestamp. However, there can be cases where
-         * we don't have an op (on demand summaries for instance). In those cases, we will use the timestamp
-         * of this client's connection.
+         * Returns the timestamp of the last message seen by this client. This is used by garbage collector as
+         * the current reference timestamp for tracking unreferenced objects.
          */
-        const getCurrentTimestamp = () => {
-            var _a, _b, _c;
-            const client = this.clientId !== undefined ? this.getAudience().getMember(this.clientId) : undefined;
-            const timestamp = client === null || client === void 0 ? void 0 : client.timestamp;
-            return (_c = (_b = (_a = this.deltaManager.lastMessage) === null || _a === void 0 ? void 0 : _a.timestamp) !== null && _b !== void 0 ? _b : timestamp) !== null && _c !== void 0 ? _c : Date.now();
-        };
-        this.maxConsecutiveReconnects = (_c = this.mc.config.getNumber(maxConsecutiveReconnectsKey)) !== null && _c !== void 0 ? _c : this.defaultMaxConsecutiveReconnects;
-        this.garbageCollector = garbageCollection_1.GarbageCollector.create(this, this.runtimeOptions.gcOptions, (unusedRoutes) => this.dataStores.deleteUnusedRoutes(unusedRoutes), getCurrentTimestamp, this.closeFn, context.baseSnapshot, async (id) => driver_utils_1.readAndParse(this.storage, id), this.mc.logger, existing, metadata);
+        () => { var _a, _b, _c; return (_b = (_a = this.deltaManager.lastMessage) === null || _a === void 0 ? void 0 : _a.timestamp) !== null && _b !== void 0 ? _b : (_c = this.messageAtLastSummary) === null || _c === void 0 ? void 0 : _c.timestamp; }, () => { var _a; return (_a = this.messageAtLastSummary) === null || _a === void 0 ? void 0 : _a.timestamp; }, context.baseSnapshot, async (id) => driver_utils_1.readAndParse(this.storage, id), this.mc.logger, existing, metadata);
         const loadedFromSequenceNumber = this.deltaManager.initialSequenceNumber;
         this.summarizerNode = runtime_utils_1.createRootSummarizerNodeWithGC(telemetry_utils_1.ChildLogger.create(this.logger, "SummarizerNode"), 
         // Summarize function to call when summarize is called. Summarizer node always tracks summary state.
@@ -463,7 +473,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         if (this.context.baseSnapshot) {
             this.summarizerNode.loadBaseSummaryWithoutDifferential(this.context.baseSnapshot);
         }
-        this.dataStores = new dataStores_1.DataStores(dataStores_1.getSummaryForDatastores(context.baseSnapshot, metadata), this, (attachMsg) => this.submit(ContainerMessageType.Attach, attachMsg), (id, createParam) => (summarizeInternal, getGCDataFn, getBaseGCDetailsFn) => this.summarizerNode.createChild(summarizeInternal, id, createParam, undefined, getGCDataFn, getBaseGCDetailsFn), (id) => this.summarizerNode.deleteChild(id), this.mc.logger, async () => this.garbageCollector.getDataStoreBaseGCDetails(), (id) => this.garbageCollector.nodeChanged(id), new Map(dataStoreAliasMap), this.garbageCollector.writeDataAtRoot);
+        this.dataStores = new dataStores_1.DataStores(dataStores_1.getSummaryForDatastores(context.baseSnapshot, metadata), this, (attachMsg) => this.submit(ContainerMessageType.Attach, attachMsg), (id, createParam) => (summarizeInternal, getGCDataFn, getBaseGCDetailsFn) => this.summarizerNode.createChild(summarizeInternal, id, createParam, undefined, getGCDataFn, getBaseGCDetailsFn), (id) => this.summarizerNode.deleteChild(id), this.mc.logger, async () => this.garbageCollector.getDataStoreBaseGCDetails(), (path, timestampMs, packagePath) => this.garbageCollector.nodeUpdated(path, "Changed", timestampMs, packagePath), new Map(dataStoreAliasMap), this.garbageCollector.writeDataAtRoot);
         this.blobManager = new blobManager_1.BlobManager(this.handleContext, blobManagerSnapshot, () => this.storage, (blobId) => this.submit(ContainerMessageType.BlobAttach, undefined, undefined, { blobId }), this, this.logger);
         this.scheduleManager = new ScheduleManager(context.deltaManager, this, telemetry_utils_1.ChildLogger.create(this.logger, "ScheduleManager"));
         this.deltaSender = this.deltaManager;
@@ -472,6 +482,10 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             this.clearPartialChunks(clientId);
         });
         this.summaryCollection = new summaryCollection_1.SummaryCollection(this.deltaManager, this.logger);
+        const { attachState, pendingLocalState } = this.context;
+        this.dirtyContainer = attachState !== container_definitions_1.AttachState.Attached
+            || ((_f = pendingLocalState) === null || _f === void 0 ? void 0 : _f.pendingStates.length) > 0;
+        this.context.updateDirtyContainerState(this.dirtyContainer);
         // Map the deprecated generateSummaries flag to disableSummaries.
         if (this.runtimeOptions.summaryOptions.generateSummaries === false) {
             this.runtimeOptions.summaryOptions.disableSummaries = true;
@@ -483,8 +497,8 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             const orderedClientLogger = telemetry_utils_1.ChildLogger.create(this.logger, "OrderedClientElection");
             const orderedClientCollection = new orderedClientElection_1.OrderedClientCollection(orderedClientLogger, this.context.deltaManager, this.context.quorum);
             const orderedClientElectionForSummarizer = new orderedClientElection_1.OrderedClientElection(orderedClientLogger, orderedClientCollection, electedSummarizerData !== null && electedSummarizerData !== void 0 ? electedSummarizerData : this.context.deltaManager.lastSequenceNumber, summarizerClientElection_1.SummarizerClientElection.isClientEligible);
-            const summarizerClientElectionEnabled = (_d = this.mc.config.getBoolean("Fluid.ContainerRuntime.summarizerClientElection")) !== null && _d !== void 0 ? _d : ((_e = this.runtimeOptions.summaryOptions) === null || _e === void 0 ? void 0 : _e.summarizerClientElection) === true;
-            const maxOpsSinceLastSummary = (_f = this.runtimeOptions.summaryOptions.maxOpsSinceLastSummary) !== null && _f !== void 0 ? _f : 7000;
+            const summarizerClientElectionEnabled = (_g = this.mc.config.getBoolean("Fluid.ContainerRuntime.summarizerClientElection")) !== null && _g !== void 0 ? _g : ((_h = this.runtimeOptions.summaryOptions) === null || _h === void 0 ? void 0 : _h.summarizerClientElection) === true;
+            const maxOpsSinceLastSummary = (_j = this.runtimeOptions.summaryOptions.maxOpsSinceLastSummary) !== null && _j !== void 0 ? _j : 7000;
             this.summarizerClientElection = new summarizerClientElection_1.SummarizerClientElection(orderedClientLogger, this.summaryCollection, orderedClientElectionForSummarizer, maxOpsSinceLastSummary, summarizerClientElectionEnabled);
             if (this.context.clientDetails.type === summarizerClientElection_1.summarizerClientType) {
                 this._summarizer = new summarizer_1.Summarizer("/_summarizer", this /* ISummarizerRuntime */, () => this.summaryConfiguration, this /* ISummarizerInternalsProvider */, this.handleContext, this.summaryCollection, async (runtime) => runWhileConnectedCoordinator_1.RunWhileConnectedCoordinator.create(runtime));
@@ -568,7 +582,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                 runtimeVersion: packageVersion_1.pkgVersion,
             },
         });
-        const { summaryOptions = {}, gcOptions = {}, loadSequenceNumberVerification = "close", } = runtimeOptions;
+        const { summaryOptions = {}, gcOptions = {}, loadSequenceNumberVerification = "close", useDataStoreAliasing = false, } = runtimeOptions;
         // We pack at data store level only. If isolated channels are disabled,
         // then there are no .channel layers, we pack at level 1, otherwise we pack at level 2
         const packingLevel = summaryOptions.disableIsolatedChannels ? 1 : 2;
@@ -636,6 +650,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             summaryOptions,
             gcOptions,
             loadSequenceNumberVerification,
+            useDataStoreAliasing,
         }, containerScope, logger, loadExisting, blobManagerSnapshot, requestHandler, storage);
         return runtime;
     }
@@ -775,7 +790,6 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
      * @param request - Request made to the handler.
      */
     async resolveHandle(request) {
-        var _a, _b;
         try {
             const requestParser = runtime_utils_1.RequestParser.create(request);
             const id = requestParser.pathParts[0];
@@ -796,18 +810,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                 }
             }
             else if (requestParser.pathParts.length > 0) {
-                /**
-                 * If GC should run and this an external app request with "externalRequest" header, we need to return
-                 * an error if the data store being requested is marked as unreferenced as per the data store's initial
-                 * summary.
-                 *
-                 * This is a workaround to handle scenarios where a data store shared with an external app is deleted
-                 * and marked as unreferenced by GC. Returning an error will fail to load the data store for the app.
-                 */
-                const wait = typeof ((_a = request.headers) === null || _a === void 0 ? void 0 : _a.wait) === "boolean" ? request.headers.wait : undefined;
-                const dataStore = ((_b = request.headers) === null || _b === void 0 ? void 0 : _b.externalRequest) && this.garbageCollector.shouldRunGC
-                    ? await this.getDataStoreIfInitiallyReferenced(id, wait)
-                    : await this.getDataStore(id, wait);
+                const dataStore = await this.getDataStoreFromRequest(id, request);
                 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.
@@ -820,46 +823,37 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             return runtime_utils_1.exceptionToResponse(error);
         }
     }
-    formMetadata() {
-        var _a;
-        return Object.assign(Object.assign({}, this.createContainerMetadata), { summaryCount: this.summaryCount, summaryFormatVersion: 1, disableIsolatedChannels: this.disableIsolatedChannels || undefined, gcFeature: this.garbageCollector.gcSummaryFeatureVersion, 
-            // The last message processed at the time of summary. If there are no messages, nothing has changed from
-            // the base summary we loaded from. So, use the message from its metadata blob.
-            message: (_a = summaryFormat_1.extractSummaryMetadataMessage(this.deltaManager.lastMessage)) !== null && _a !== void 0 ? _a : this.baseSummaryMessage, sessionExpiryTimeoutMs: this.garbageCollector.sessionExpiryTimeoutMs });
-    }
-    /**
-     * Retrieves the runtime for a data store if it's referenced as per the initially summary that it is loaded with.
-     * This is a workaround to handle scenarios where a data store shared with an external app is deleted and marked
-     * as unreferenced by GC.
-     * @param id - Id supplied during creating the data store.
-     * @param wait - True if you want to wait for it.
-     * @returns the data store runtime if the data store exists and is initially referenced; undefined otherwise.
-     */
-    async getDataStoreIfInitiallyReferenced(id, wait = true) {
+    async getDataStoreFromRequest(id, request) {
+        var _a, _b, _c;
+        const wait = typeof ((_a = request.headers) === null || _a === void 0 ? void 0 : _a[RuntimeHeaders.wait]) === "boolean"
+            ? (_b = request.headers) === null || _b === void 0 ? void 0 : _b[RuntimeHeaders.wait] : true;
         const dataStoreContext = await this.dataStores.getDataStore(id, wait);
-        // The data store is referenced if used routes in the initial summary has a route to self.
-        // Older documents may not have used routes in the summary. They are considered referenced.
-        const usedRoutes = (await dataStoreContext.getBaseGCDetails()).usedRoutes;
-        if (usedRoutes === undefined || usedRoutes.includes("") || usedRoutes.includes("/")) {
-            return dataStoreContext.realize();
+        /**
+         * If GC should run and this an external app request with "externalRequest" header, we need to return
+         * an error if the data store being requested is marked as unreferenced as per the data store's base
+         * GC data.
+         *
+         * This is a workaround to handle scenarios where a data store shared with an external app is deleted
+         * and marked as unreferenced by GC. Returning an error will fail to load the data store for the app.
+         */
+        if (((_c = request.headers) === null || _c === void 0 ? void 0 : _c[RuntimeHeaders.externalRequest]) && this.garbageCollector.shouldRunGC) {
+            // The data store is referenced if used routes in the base summary has a route to self.
+            // Older documents may not have used routes in the summary. They are considered referenced.
+            const usedRoutes = (await dataStoreContext.getBaseGCDetails()).usedRoutes;
+            if (!(usedRoutes === undefined || usedRoutes.includes("") || usedRoutes.includes("/"))) {
+                throw runtime_utils_1.responseToException(runtime_utils_1.create404Response(request), request);
+            }
         }
-        // The data store is unreferenced. Throw a 404 response exception.
-        const request = { url: id };
-        throw runtime_utils_1.responseToException(runtime_utils_1.create404Response(request), request);
+        const dataStoreChannel = await dataStoreContext.realize();
+        this.garbageCollector.nodeUpdated(`/${id}`, "Loaded", undefined /* timestampMs */, dataStoreContext.packagePath, request === null || request === void 0 ? void 0 : request.headers);
+        return dataStoreChannel;
     }
-    /**
-     * Notifies this object to take the snapshot of the container.
-     * @deprecated - Use summarize to get summary of the container runtime.
-     */
-    async snapshot() {
-        const summaryResult = await this.summarize({
-            summaryLogger: this.logger,
-            fullTree: true,
-            trackState: false,
-            runGC: this.garbageCollector.shouldRunGC,
-            fullGC: true,
-        });
-        return runtime_utils_1.convertSummaryTreeToITree(summaryResult.summary);
+    formMetadata() {
+        var _a;
+        return Object.assign(Object.assign({}, this.createContainerMetadata), { summaryCount: this.summaryCount, summaryFormatVersion: 1, disableIsolatedChannels: this.disableIsolatedChannels || undefined, gcFeature: this.garbageCollector.gcSummaryFeatureVersion, 
+            // The last message processed at the time of summary. If there are no new messages, use the message from the
+            // last summary.
+            message: (_a = summaryFormat_1.extractSummaryMetadataMessage(this.deltaManager.lastMessage)) !== null && _a !== void 0 ? _a : this.messageAtLastSummary, sessionExpiryTimeoutMs: this.garbageCollector.sessionExpiryTimeoutMs });
     }
     addContainerStateToSummary(summaryTree) {
         var _a;
@@ -1064,9 +1058,6 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         common_utils_1.assert(await context.isRoot(), 0x12b /* "did not get root data store" */);
         return context.realize();
     }
-    async getDataStore(id, wait = true) {
-        return (await this.dataStores.getDataStore(id, wait)).realize();
-    }
     setFlushMode(mode) {
         if (mode === this._flushMode) {
             return;
@@ -1131,28 +1122,84 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         }
     }
     async createDataStore(pkg) {
-        return this._createDataStore(pkg, false /* isRoot */);
+        const internalId = uuid_1.v4();
+        return dataStore_1.channelToDataStore(await this._createDataStore(pkg, false /* isRoot */, internalId), internalId, this, this.dataStores, this.mc.logger);
     }
-    async createRootDataStore(pkg, rootDataStoreId) {
+    /**
+     * Creates a root datastore directly with a user generated id and attaches it to storage.
+     * It is vulnerable to name collisions and should not be used.
+     *
+     * This method will be removed. See #6465.
+     */
+    async createRootDataStoreLegacy(pkg, rootDataStoreId) {
         const fluidDataStore = await this._createDataStore(pkg, true /* isRoot */, rootDataStoreId);
         fluidDataStore.bindToContext();
         return fluidDataStore;
     }
+    async createRootDataStore(pkg, rootDataStoreId) {
+        return this._aliasingEnabled === true ?
+            this.createAndAliasDataStore(pkg, rootDataStoreId) :
+            this.createRootDataStoreLegacy(pkg, rootDataStoreId);
+    }
+    /**
+     * Creates a data store then attempts to alias it.
+     * If aliasing fails, it will raise an exception.
+     *
+     * This method will be removed. See #6465.
+     *
+     * @param pkg - Package name of the data store
+     * @param alias - Alias to be assigned to the data store
+     * @param props - Properties for the data store
+     * @returns - An aliased data store which can can be found / loaded by alias.
+     */
+    async createAndAliasDataStore(pkg, alias, props) {
+        const internalId = uuid_1.v4();
+        const dataStore = await this._createDataStore(pkg, false /* isRoot */, internalId, props);
+        const aliasedDataStore = dataStore_1.channelToDataStore(dataStore, internalId, this, this.dataStores, this.mc.logger);
+        const result = await aliasedDataStore.trySetAlias(alias);
+        if (result !== "Success") {
+            throw new container_utils_1.GenericError("dataStoreAliasFailure", undefined /* error */, {
+                alias: {
+                    value: alias,
+                    tag: telemetry_utils_1.TelemetryDataTag.UserData,
+                },
+                internalId: {
+                    value: internalId,
+                    tag: telemetry_utils_1.TelemetryDataTag.PackageData,
+                },
+                aliasResult: result,
+            });
+        }
+        return aliasedDataStore;
+    }
     createDetachedRootDataStore(pkg, rootDataStoreId) {
         return this.dataStores.createDetachedDataStoreCore(pkg, true, rootDataStoreId);
     }
     createDetachedDataStore(pkg) {
         return this.dataStores.createDetachedDataStoreCore(pkg, false);
     }
-    async _createDataStoreWithProps(pkg, props, id = uuid_1.v4(), isRoot = false) {
+    /**
+     * Creates a possibly root datastore directly with a possibly user generated id and attaches it to storage.
+     * It is vulnerable to name collisions if both aforementioned conditions are true, and should not be used.
+     *
+     * This method will be removed. See #6465.
+     */
+    async _createDataStoreWithPropsLegacy(pkg, props, id = uuid_1.v4(), isRoot = false) {
         const fluidDataStore = await this.dataStores._createFluidDataStoreContext(Array.isArray(pkg) ? pkg : [pkg], id, isRoot, props).realize();
         if (isRoot) {
             fluidDataStore.bindToContext();
         }
-        return fluidDataStore;
+        return dataStore_1.channelToDataStore(fluidDataStore, id, this, this.dataStores, this.mc.logger);
     }
-    async _createDataStore(pkg, isRoot, id = uuid_1.v4()) {
-        return this.dataStores._createFluidDataStoreContext(Array.isArray(pkg) ? pkg : [pkg], id, isRoot).realize();
+    async _createDataStoreWithProps(pkg, props, id = uuid_1.v4(), isRoot = false) {
+        return this._aliasingEnabled === true && isRoot ?
+            this.createAndAliasDataStore(pkg, id, props) :
+            this._createDataStoreWithPropsLegacy(pkg, props, id, isRoot);
+    }
+    async _createDataStore(pkg, isRoot, id = uuid_1.v4(), props) {
+        return this.dataStores
+            ._createFluidDataStoreContext(Array.isArray(pkg) ? pkg : [pkg], id, isRoot, props)
+            .realize();
     }
     canSendOps() {
         return this.connected && !this.deltaManager.readOnlyInfo.readonly;
@@ -1210,6 +1257,9 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             common_utils_1.assert(this.attachState === container_definitions_1.AttachState.Attached, 0x12e /* "Container Context should already be in attached state" */);
             this.emit("attached");
         }
+        if (attachState === container_definitions_1.AttachState.Attached && !this.pendingStateManager.hasPendingMessages()) {
+            this.updateDocumentDirtyState(false);
+        }
         this.dataStores.setAttachState(attachState);
     }
     /**
@@ -1256,13 +1306,14 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
      */
     async summarize(options) {
         this.verifyNotClosed();
-        const { summaryLogger, fullTree = false, trackState = true, runGC = true, runSweep, fullGC } = options;
+        const { fullTree = false, trackState = true, summaryLogger = this.logger, runGC = this.garbageCollector.shouldRunGC, runSweep, fullGC, } = options;
+        let gcStats;
         if (runGC) {
-            await this.collectGarbage({ logger: summaryLogger, runSweep, fullGC });
+            gcStats = await this.collectGarbage({ logger: summaryLogger, runSweep, fullGC });
         }
         const summarizeResult = await this.summarizerNode.summarize(fullTree, trackState);
         common_utils_1.assert(summarizeResult.summary.type === protocol_definitions_1.SummaryType.Tree, 0x12f /* "Container Runtime's summarize should always return a tree" */);
-        return summarizeResult;
+        return Object.assign(Object.assign({}, summarizeResult), { gcStats });
     }
     /**
      * Implementation of IGarbageCollectionRuntime::updateStateBeforeGC.
@@ -1287,7 +1338,6 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
      * @param usedRoutes - The routes that are used in all nodes in this Container.
      * @param gcTimestamp - The time when GC was run that generated these used routes. If any node node becomes
      * unreferenced as part of this GC run, this should be used to update the time when it happens.
-     * @returns the statistics of the used state of the data stores.
      */
     updateUsedRoutes(usedRoutes, gcTimestamp) {
         // Update our summarizer node's used routes. Updating used routes in summarizer node before
@@ -1321,7 +1371,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
      * @param options - options controlling how the summary is generated or submitted
      */
     async submitSummary(options) {
-        var _a;
+        var _a, _b;
         const { fullTree, refreshLatestAck, summaryLogger } = options;
         if (refreshLatestAck) {
             const latestSummaryRefSeq = await this.refreshLatestSummaryAckFromServer(telemetry_utils_1.ChildLogger.create(summaryLogger, undefined, { all: { safeSummary: true } }));
@@ -1385,9 +1435,9 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             const forcedFullTree = this.garbageCollector.summaryStateNeedsReset;
             try {
                 summarizeResult = await this.summarize({
-                    summaryLogger,
                     fullTree: fullTree || forcedFullTree,
                     trackState: true,
+                    summaryLogger,
                     runGC: this.garbageCollector.shouldRunGC,
                 });
             }
@@ -1395,13 +1445,15 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
                 return { stage: "base", referenceSequenceNumber: summaryRefSeqNum, error };
             }
             const { summary: summaryTree, stats: partialStats } = summarizeResult;
+            // Now that we have generated the summary, update the message at last summary to the last message processed.
+            this.messageAtLastSummary = this.deltaManager.lastMessage;
             // Counting dataStores and handles
             // Because handles are unchanged dataStores in the current logic,
             // summarized dataStore count is total dataStore count minus handle count
             const dataStoreTree = this.disableIsolatedChannels ? summaryTree : summaryTree.tree[runtime_definitions_1.channelsTreeName];
             common_utils_1.assert(dataStoreTree.type === protocol_definitions_1.SummaryType.Tree, 0x1fc /* "summary is not a tree" */);
             const handleCount = Object.values(dataStoreTree.tree).filter((value) => value.type === protocol_definitions_1.SummaryType.Handle).length;
-            const summaryStats = Object.assign({ dataStoreCount: this.dataStores.size, summarizedDataStoreCount: this.dataStores.size - handleCount }, partialStats);
+            const summaryStats = Object.assign({ dataStoreCount: this.dataStores.size, summarizedDataStoreCount: this.dataStores.size - handleCount, gcStateUpdatedDataStoreCount: (_a = summarizeResult.gcStats) === null || _a === void 0 ? void 0 : _a.updatedDataStoreCount }, partialStats);
             const generateSummaryData = {
                 referenceSequenceNumber: summaryRefSeqNum,
                 summaryTree,
@@ -1417,7 +1469,7 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
             const summaryContext = lastAck === undefined
                 ? {
                     proposalHandle: undefined,
-                    ackHandle: (_a = this.context.getLoadedFromVersion()) === null || _a === void 0 ? void 0 : _a.id,
+                    ackHandle: (_b = this.context.getLoadedFromVersion()) === null || _b === void 0 ? void 0 : _b.id,
                     referenceSequenceNumber: summaryRefSeqNum,
                 }
                 : {
@@ -1512,6 +1564,13 @@ class ContainerRuntime extends common_utils_1.TypedEventEmitter {
         };
         this.submit(ContainerMessageType.FluidDataStoreOp, envelope, localOpMetadata);
     }
+    submitDataStoreAliasOp(contents, localOpMetadata) {
+        const aliasMessage = contents;
+        if (!dataStore_1.isDataStoreAliasMessage(aliasMessage)) {
+            throw new container_utils_1.UsageError("malformedDataStoreAliasMessage");
+        }
+        this.submit(ContainerMessageType.Alias, contents, localOpMetadata);
+    }
     async uploadBlob(blob) {
         this.verifyNotClosed();
         return this.blobManager.createBlob(blob);