@fluidframework/container-runtime 2.0.0-rc.2.0.2 → 2.0.0-rc.3.0.1

package/dist/dataStoreContext.js

@@ -5,15 +5,15 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LocalDetachedFluidDataStoreContext = exports.LocalFluidDataStoreContext = exports.LocalFluidDataStoreContextBase = exports.RemoteFluidDataStoreContext = exports.FluidDataStoreContext = exports.createAttributesBlob = void 0;
-const container_definitions_1 = require("@fluidframework/container-definitions");
 const client_utils_1 = require("@fluid-internal/client-utils");
-const core_utils_1 = require("@fluidframework/core-utils");
-const driver_utils_1 = require("@fluidframework/driver-utils");
-const runtime_definitions_1 = require("@fluidframework/runtime-definitions");
-const runtime_utils_1 = require("@fluidframework/runtime-utils");
-const telemetry_utils_1 = require("@fluidframework/telemetry-utils");
-const index_js_1 = require("./summary/index.js");
-const index_js_2 = require("./gc/index.js");
+const container_definitions_1 = require("@fluidframework/container-definitions");
+const internal_1 = require("@fluidframework/core-utils/internal");
+const internal_2 = require("@fluidframework/driver-utils/internal");
+const internal_3 = require("@fluidframework/runtime-definitions/internal");
+const internal_4 = require("@fluidframework/runtime-utils/internal");
+const internal_5 = require("@fluidframework/telemetry-utils/internal");
+const index_js_1 = require("./gc/index.js");
+const index_js_2 = require("./summary/index.js");
 function createAttributes(pkg, isRootDataStore) {
     const stringifiedPkg = JSON.stringify(pkg);
     return {
@@ -24,15 +24,16 @@ function createAttributes(pkg, isRootDataStore) {
 }
 function createAttributesBlob(pkg, isRootDataStore) {
     const attributes = createAttributes(pkg, isRootDataStore);
-    return new driver_utils_1.BlobTreeEntry(index_js_1.dataStoreAttributesBlobName, JSON.stringify(attributes));
+    return new internal_2.BlobTreeEntry(index_js_2.dataStoreAttributesBlobName, JSON.stringify(attributes));
 }
 exports.createAttributesBlob = createAttributesBlob;
 /**
  * Represents the context for the store. This context is passed to the store runtime.
+ * @internal
  */
 class FluidDataStoreContext extends client_utils_1.TypedEventEmitter {
     get packagePath() {
-        (0, core_utils_1.assert)(this.pkg !== undefined, 0x139 /* "Undefined package path" */);
+        (0, internal_1.assert)(this.pkg !== undefined, 0x139 /* "Undefined package path" */);
         return this.pkg;
     }
     get options() {
@@ -81,7 +82,6 @@ class FluidDataStoreContext extends client_utils_1.TypedEventEmitter {
         return this._attachState;
     }
     get IFluidDataStoreRegistry() {
-        (0, core_utils_1.assert)(this.channel !== undefined, 0x8f3 /* This should be called after the channel is created, when the registry is populated */);
         return this.registry;
     }
     /**
@@ -90,8 +90,18 @@ class FluidDataStoreContext extends client_utils_1.TypedEventEmitter {
      * 2. is root as part of the base snapshot that the datastore loaded from
      * @returns whether a datastore is root
      */
-    async isRoot() {
-        return this.isInMemoryRoot() || (await this.getInitialSnapshotDetails()).isRootDataStore;
+    async isRoot(aliasedDataStores) {
+        if (this.isInMemoryRoot()) {
+            return true;
+        }
+        // This if is a performance optimization.
+        // We know that if the base snapshot is omitted, then the isRootDataStore flag is not set.
+        // That means we can skip the expensive call to getInitialSnapshotDetails for virtualized datastores,
+        // and get the information from the alias map directly.
+        if (aliasedDataStores !== undefined && this.baseSnapshot?.omitted === true) {
+            return aliasedDataStores.has(this.id);
+        }
+        return (await this.getInitialSnapshotDetails()).isRootDataStore;
     }
     /**
      * There are 3 states where isInMemoryRoot needs to be true
@@ -129,18 +139,18 @@ class FluidDataStoreContext extends client_utils_1.TypedEventEmitter {
         this.loadingGroupId = props.loadingGroupId;
         // URIs use slashes as delimiters. Handles use URIs.
         // Thus having slashes in types almost guarantees trouble down the road!
-        (0, core_utils_1.assert)(!this.id.includes("/"), 0x13a /* Data store ID contains slash */);
+        (0, internal_1.assert)(!this.id.includes("/"), 0x13a /* Data store ID contains slash */);
         this._attachState =
             this.parentContext.attachState !== container_definitions_1.AttachState.Detached && this.existing
                 ? this.parentContext.attachState
                 : container_definitions_1.AttachState.Detached;
         const thisSummarizeInternal = async (fullTree, trackState, telemetryContext) => this.summarizeInternal(fullTree, trackState, telemetryContext);
         this.summarizerNode = props.createSummarizerNodeFn(thisSummarizeInternal, async (fullGC) => this.getGCDataInternal(fullGC));
-        this.mc = (0, telemetry_utils_1.createChildMonitoringContext)({
+        this.mc = (0, internal_5.createChildMonitoringContext)({
             logger: this.logger,
             namespace: "FluidDataStoreContext",
             properties: {
-                all: (0, telemetry_utils_1.tagCodeArtifacts)({
+                all: (0, internal_5.tagCodeArtifacts)({
                     fluidDataStoreId: this.id,
                     // The package name is a getter because `this.pkg` may not be initialized during construction.
                     // For data stores loaded from summary, it is initialized during data store realization.
@@ -148,7 +158,7 @@ class FluidDataStoreContext extends client_utils_1.TypedEventEmitter {
                 }),
             },
         });
-        this.thresholdOpsCounter = new telemetry_utils_1.ThresholdCounter(FluidDataStoreContext.pendingOpsCountThreshold, this.mc.logger);
+        this.thresholdOpsCounter = new internal_5.ThresholdCounter(FluidDataStoreContext.pendingOpsCountThreshold, this.mc.logger);
         this.gcThrowOnTombstoneUsage = this.parentContext.gcThrowOnTombstoneUsage;
         this.gcTombstoneEnforcementAllowed = this.parentContext.gcTombstoneEnforcementAllowed;
         // By default, a data store can log maximum 10 local changes telemetry in summarizer.
@@ -185,17 +195,17 @@ class FluidDataStoreContext extends client_utils_1.TypedEventEmitter {
         this._tombstoned = tombstone;
     }
     rejectDeferredRealize(reason, failedPkgPath, fullPackageName) {
-        throw new telemetry_utils_1.LoggingError(reason, (0, telemetry_utils_1.tagCodeArtifacts)({
+        throw new internal_5.LoggingError(reason, (0, internal_5.tagCodeArtifacts)({
             failedPkgPath,
             packagePath: fullPackageName?.join("/"),
         }));
     }
     async realize() {
-        (0, core_utils_1.assert)(!this.detachedRuntimeCreation, 0x13d /* "Detached runtime creation on realize()" */);
+        (0, internal_1.assert)(!this.detachedRuntimeCreation, 0x13d /* "Detached runtime creation on realize()" */);
         if (!this.channelP) {
             this.channelP = this.realizeCore(this.existing).catch((error) => {
-                const errorWrapped = telemetry_utils_1.DataProcessingError.wrapIfUnrecognized(error, "realizeFluidDataStoreContext");
-                errorWrapped.addTelemetryProperties((0, telemetry_utils_1.tagCodeArtifacts)({
+                const errorWrapped = internal_5.DataProcessingError.wrapIfUnrecognized(error, "realizeFluidDataStoreContext");
+                errorWrapped.addTelemetryProperties((0, internal_5.tagCodeArtifacts)({
                     fullPackageName: this.pkg?.join("/"),
                     fluidDataStoreId: this.id,
                 }));
@@ -228,7 +238,7 @@ class FluidDataStoreContext extends client_utils_1.TypedEventEmitter {
         if (factory === undefined) {
             this.rejectDeferredRealize("Can't find factory for package", lastPkg, packages);
         }
-        (0, core_utils_1.assert)(this.registry === undefined, 0x157 /* "datastore registry already attached" */);
+        (0, internal_1.assert)(this.registry === undefined, 0x157 /* "datastore registry already attached" */);
         this.registry = registry;
         return factory;
     }
@@ -239,10 +249,10 @@ class FluidDataStoreContext extends client_utils_1.TypedEventEmitter {
         // that it is set here, before bindRuntime is called.
         this._baseSnapshot = details.snapshot;
         this.baseSnapshotSequenceNumber = details.sequenceNumber;
-        (0, core_utils_1.assert)(this.pkg === details.pkg, 0x13e /* "Unexpected package path" */);
+        (0, internal_1.assert)(this.pkg === details.pkg, 0x13e /* "Unexpected package path" */);
         const factory = await this.factoryFromPackagePath();
         const channel = await factory.instantiateDataStore(this, existing);
-        (0, core_utils_1.assert)(channel !== undefined, 0x140 /* "undefined channel on datastore context" */);
+        (0, internal_1.assert)(channel !== undefined, 0x140 /* "undefined channel on datastore context" */);
         await this.bindRuntime(channel, existing);
         // This data store may have been disposed before the channel is created during realization. If so,
         // dispose the channel now.
@@ -264,25 +274,25 @@ class FluidDataStoreContext extends client_utils_1.TypedEventEmitter {
         if (!this.loaded) {
             return;
         }
-        (0, core_utils_1.assert)(this.connected === connected, 0x141 /* "Unexpected connected state" */);
+        (0, internal_1.assert)(this.connected === connected, 0x141 /* "Unexpected connected state" */);
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         this.channel.setConnectionState(connected, clientId);
     }
     process(message, local, localOpMetadata) {
-        const safeTelemetryProps = (0, telemetry_utils_1.extractSafePropertiesFromMessage)(message);
+        const safeTelemetryProps = (0, internal_5.extractSafePropertiesFromMessage)(message);
         // On op process, tombstone error is logged in garbage collector. So, set "checkTombstone" to false when calling
         // "verifyNotClosed" which logs tombstone errors. Throw error if tombstoned and throwing on load is configured.
         this.verifyNotClosed("process", false /* checkTombstone */, safeTelemetryProps);
         if (this.tombstoned && this.gcThrowOnTombstoneUsage) {
-            throw new telemetry_utils_1.DataCorruptionError("Context is tombstoned! Call site [process]", safeTelemetryProps);
+            throw new internal_5.DataCorruptionError("Context is tombstoned! Call site [process]", safeTelemetryProps);
         }
         this.summarizerNode.recordChange(message);
         if (this.loaded) {
             return this.channel?.process(message, local, localOpMetadata);
         }
         else {
-            (0, core_utils_1.assert)(!local, 0x142 /* "local store channel is not loaded" */);
-            (0, core_utils_1.assert)(this.pending !== undefined, 0x23d /* "pending is undefined" */);
+            (0, internal_1.assert)(!local, 0x142 /* "local store channel is not loaded" */);
+            (0, internal_1.assert)(this.pending !== undefined, 0x23d /* "pending is undefined" */);
             this.pending.push(message);
             this.thresholdOpsCounter.sendIfMultiple("StorePendingOps", this.pending.length);
         }
@@ -315,13 +325,13 @@ class FluidDataStoreContext extends client_utils_1.TypedEventEmitter {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const summarizeResult = await this.channel.summarize(fullTree, trackState, telemetryContext);
         // Wrap dds summaries in .channels subtree.
-        (0, index_js_1.wrapSummaryInChannelsTree)(summarizeResult);
-        const pathPartsForChildren = [runtime_definitions_1.channelsTreeName];
+        (0, index_js_2.wrapSummaryInChannelsTree)(summarizeResult);
+        const pathPartsForChildren = [internal_3.channelsTreeName];
         // Add data store's attributes to the summary.
         const { pkg } = await this.getInitialSnapshotDetails();
         const isRoot = await this.isRoot();
         const attributes = createAttributes(pkg, isRoot);
-        (0, runtime_utils_1.addBlobToSummary)(summarizeResult, index_js_1.dataStoreAttributesBlobName, JSON.stringify(attributes));
+        (0, internal_4.addBlobToSummary)(summarizeResult, index_js_2.dataStoreAttributesBlobName, JSON.stringify(attributes));
         // If we are not referenced, mark the summary tree as unreferenced. Also, update unreferenced blob
         // size in the summary stats with the blobs size of this data store.
         if (!this.summarizerNode.isReferenced()) {
@@ -356,7 +366,7 @@ class FluidDataStoreContext extends client_utils_1.TypedEventEmitter {
      */
     async getGCDataInternal(fullGC = false) {
         await this.realize();
-        (0, core_utils_1.assert)(this.channel !== undefined, 0x143 /* "Channel should not be undefined when running GC" */);
+        (0, internal_1.assert)(this.channel !== undefined, 0x143 /* "Channel should not be undefined when running GC" */);
         return this.channel.getGCData(fullGC);
     }
     /**
@@ -403,7 +413,7 @@ class FluidDataStoreContext extends client_utils_1.TypedEventEmitter {
      */
     addedGCOutboundReference(srcHandle, outboundHandle) {
         // By default, skip this call since the ContainerRuntime will detect the outbound route directly.
-        if (this.mc.config.getBoolean(index_js_2.detectOutboundRoutesViaDDSKey) === true) {
+        if (this.mc.config.getBoolean(index_js_1.detectOutboundRoutesViaDDSKey) === true) {
             // Note: The ContainerRuntime code will check this same setting to avoid double counting.
             this.parentContext.addedGCOutboundReference?.(srcHandle, outboundHandle);
         }
@@ -427,8 +437,8 @@ class FluidDataStoreContext extends client_utils_1.TypedEventEmitter {
      * 2. When the data store is realized. This updates the channel's used routes as per last GC run.
      */
     updateChannelUsedRoutes() {
-        (0, core_utils_1.assert)(this.loaded, 0x144 /* "Channel should be loaded when updating used routes" */);
-        (0, core_utils_1.assert)(this.channel !== undefined, 0x145 /* "Channel should be present when data store is loaded" */);
+        (0, internal_1.assert)(this.loaded, 0x144 /* "Channel should be loaded when updating used routes" */);
+        (0, internal_1.assert)(this.channel !== undefined, 0x145 /* "Channel should be present when data store is loaded" */);
         // If there is no lastUsedRoutes, GC has not run up until this point.
         if (this.lastUsedRoutes === undefined) {
             return;
@@ -448,7 +458,7 @@ class FluidDataStoreContext extends client_utils_1.TypedEventEmitter {
     }
     submitMessage(type, content, localOpMetadata) {
         this.verifyNotClosed("submitMessage");
-        (0, core_utils_1.assert)(!!this.channel, 0x146 /* "Channel must exist when submitting message" */);
+        (0, internal_1.assert)(!!this.channel, 0x146 /* "Channel must exist when submitting message" */);
         // Summarizer clients should not submit messages.
         this.identifyLocalChangeInSummarizer("DataStoreMessageSubmittedInSummarizer", type);
         this.parentContext.submitMessage(type, content, localOpMetadata);
@@ -475,12 +485,12 @@ class FluidDataStoreContext extends client_utils_1.TypedEventEmitter {
     /**
      * Submits the signal to be sent to other clients.
      * @param type - Type of the signal.
-     * @param content - Content of the signal.
+     * @param content - Content of the signal. Should be a JSON serializable object or primitive.
      * @param targetClientId - When specified, the signal is only sent to the provided client id.
      */
     submitSignal(type, content, targetClientId) {
         this.verifyNotClosed("submitSignal");
-        (0, core_utils_1.assert)(!!this.channel, 0x147 /* "Channel must exist on submitting signal" */);
+        (0, internal_1.assert)(!!this.channel, 0x147 /* "Channel must exist on submitting signal" */);
         return this.parentContext.submitSignal(type, content, targetClientId);
     }
     /**
@@ -488,43 +498,32 @@ class FluidDataStoreContext extends client_utils_1.TypedEventEmitter {
      * globally visible now.
      */
     makeLocallyVisible() {
-        (0, core_utils_1.assert)(this.channel !== undefined, 0x2cf /* "undefined channel on datastore context" */);
+        (0, internal_1.assert)(this.channel !== undefined, 0x2cf /* "undefined channel on datastore context" */);
         this.makeLocallyVisibleFn();
     }
-    async bindRuntime(channel, existing) {
-        if (this.channel) {
-            throw new Error("Runtime already bound");
-        }
-        (0, core_utils_1.assert)(!this.detachedRuntimeCreation, 0x148 /* "Detached runtime creation on runtime bind" */);
-        (0, core_utils_1.assert)(this.pkg !== undefined, 0x14a /* "Undefined package path" */);
-        if (existing) {
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            const pending = this.pending;
-            // Apply all pending ops
-            for (const op of pending) {
-                // Only process ops whose seq number is greater than snapshot sequence number from which it loaded.
-                const seqNumber = this.baseSnapshotSequenceNumber ?? -1;
-                if (op.sequenceNumber > seqNumber) {
-                    channel.process(op, false, undefined /* localOpMetadata */);
-                }
+    processPendingOps(channel) {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const pending = this.pending;
+        // Apply all pending ops
+        for (const op of pending) {
+            // Only process ops whose seq number is greater than snapshot sequence number from which it loaded.
+            const seqNumber = this.baseSnapshotSequenceNumber ?? -1;
+            if (op.sequenceNumber > seqNumber) {
+                channel.process(op, false, undefined /* localOpMetadata */);
             }
-            this.thresholdOpsCounter.send("ProcessPendingOps", pending.length);
-        }
-        else {
-            (0, core_utils_1.assert)(this.pending?.length === 0, 0x8f4 /* no pending ops */);
-            // Execute data store's entry point to make sure that for a local (aka detached from container) data store, the
-            // entryPoint initialization function is called before the data store gets attached and potentially connected to
-            // the delta stream, so it gets a chance to do things while the data store is still "purely local".
-            // This preserves the behavior from before we introduced entryPoints, where the instantiateDataStore method
-            // of data store factories tends to construct the data object (at least kick off an async method that returns
-            // it); that code moved to the entryPoint initialization function, so we want to ensure it still executes
-            // before the data store is attached.
-            await channel.entryPoint.get();
         }
         this.pending = undefined;
+        this.thresholdOpsCounter.send("ProcessPendingOps", pending.length);
+    }
+    completeBindingRuntime(channel) {
         // And now mark the runtime active
         this.loaded = true;
         this.channel = channel;
+        // Channel does not know when it's "live" (as in - starts to receive events in the system)
+        // It may read current state of the system when channel was created, but it was not getting any updates
+        // through creation process and could have missed events. So update it on current state.
+        // Once this.loaded is set (above), it will stat receiving events.
+        channel.setConnectionState(this.connected, this.clientId);
         // Freeze the package path to ensure that someone doesn't modify it when it is
         // returned in packagePath().
         Object.freeze(this.pkg);
@@ -537,6 +536,25 @@ class FluidDataStoreContext extends client_utils_1.TypedEventEmitter {
          */
         this.updateChannelUsedRoutes();
     }
+    async bindRuntime(channel, existing) {
+        if (this.channel) {
+            throw new Error("Runtime already bound");
+        }
+        (0, internal_1.assert)(!this.detachedRuntimeCreation, 0x148 /* "Detached runtime creation on runtime bind" */);
+        (0, internal_1.assert)(this.pkg !== undefined, 0x14a /* "Undefined package path" */);
+        if (!existing) {
+            // Execute data store's entry point to make sure that for a local (aka detached from container) data store, the
+            // entryPoint initialization function is called before the data store gets attached and potentially connected to
+            // the delta stream, so it gets a chance to do things while the data store is still "purely local".
+            // This preserves the behavior from before we introduced entryPoints, where the instantiateDataStore method
+            // of data store factories tends to construct the data object (at least kick off an async method that returns
+            // it); that code moved to the entryPoint initialization function, so we want to ensure it still executes
+            // before the data store is attached.
+            await channel.entryPoint.get();
+        }
+        this.processPendingOps(channel);
+        this.completeBindingRuntime(channel);
+    }
     async getAbsoluteUrl(relativeUrl) {
         if (this.attachState !== container_definitions_1.AttachState.Attached) {
             return undefined;
@@ -558,7 +576,7 @@ class FluidDataStoreContext extends client_utils_1.TypedEventEmitter {
         return {};
     }
     reSubmit(type, contents, localOpMetadata) {
-        (0, core_utils_1.assert)(!!this.channel, 0x14b /* "Channel must exist when resubmitting ops" */);
+        (0, internal_1.assert)(!!this.channel, 0x14b /* "Channel must exist when resubmitting ops" */);
         this.channel.reSubmit(type, contents, localOpMetadata);
     }
     rollback(type, contents, localOpMetadata) {
@@ -574,13 +592,13 @@ class FluidDataStoreContext extends client_utils_1.TypedEventEmitter {
         if (!this.channel) {
             await this.realize();
         }
-        (0, core_utils_1.assert)(!!this.channel, 0x14c /* "Channel must exist when rebasing ops" */);
+        (0, internal_1.assert)(!!this.channel, 0x14c /* "Channel must exist when rebasing ops" */);
         return this.channel.applyStashedOp(contents);
     }
     verifyNotClosed(callSite, checkTombstone = true, safeTelemetryProps = {}) {
         if (this.deleted) {
             const messageString = `Context is deleted! Call site [${callSite}]`;
-            const error = new telemetry_utils_1.DataCorruptionError(messageString, safeTelemetryProps);
+            const error = new internal_5.DataCorruptionError(messageString, safeTelemetryProps);
             this.mc.logger.sendErrorEvent({
                 eventName: "GC_Deleted_DataStore_Changed",
                 callSite,
@@ -592,8 +610,8 @@ class FluidDataStoreContext extends client_utils_1.TypedEventEmitter {
         }
         if (checkTombstone && this.tombstoned) {
             const messageString = `Context is tombstoned! Call site [${callSite}]`;
-            const error = new telemetry_utils_1.DataCorruptionError(messageString, safeTelemetryProps);
-            (0, index_js_2.sendGCUnexpectedUsageEvent)(this.mc, {
+            const error = new internal_5.DataCorruptionError(messageString, safeTelemetryProps);
+            (0, index_js_1.sendGCUnexpectedUsageEvent)(this.mc, {
                 eventName: "GC_Tombstone_DataStore_Changed",
                 category: this.gcThrowOnTombstoneUsage ? "error" : "generic",
                 gcTombstoneEnforcementAllowed: this.gcTombstoneEnforcementAllowed,
@@ -610,7 +628,7 @@ class FluidDataStoreContext extends client_utils_1.TypedEventEmitter {
      * other clients that are up-to-date till seq# 100 may not have them yet.
      */
     identifyLocalChangeInSummarizer(eventName, type) {
-        if (this.clientDetails.type !== index_js_1.summarizerClientType ||
+        if (this.clientDetails.type !== index_js_2.summarizerClientType ||
             this.localChangesTelemetryCount <= 0) {
             return;
         }
@@ -621,7 +639,7 @@ class FluidDataStoreContext extends client_utils_1.TypedEventEmitter {
             eventName,
             type,
             isSummaryInProgress: this.summarizerNode.isSummaryInProgress?.(),
-            stack: (0, telemetry_utils_1.generateStack)(),
+            stack: (0, internal_5.generateStack)(),
         });
         this.localChangesTelemetryCount--;
     }
@@ -637,16 +655,17 @@ class FluidDataStoreContext extends client_utils_1.TypedEventEmitter {
 }
 exports.FluidDataStoreContext = FluidDataStoreContext;
 FluidDataStoreContext.pendingOpsCountThreshold = 1000;
+/** @internal */
 class RemoteFluidDataStoreContext extends FluidDataStoreContext {
     constructor(props) {
         super(props, true /* existing */, false /* isLocalDataStore */, () => {
             throw new Error("Already attached");
         });
-        this.initialSnapshotDetailsP = new core_utils_1.LazyPromise(async () => {
+        this.initialSnapshotDetailsP = new internal_1.LazyPromise(async () => {
             // Sequence number of the snapshot.
             let sequenceNumber;
             if (this.snapshotFetchRequired) {
-                (0, core_utils_1.assert)(this.loadingGroupId !== undefined, 0x8f5 /* groupId should be present to fetch snapshot */);
+                (0, internal_1.assert)(this.loadingGroupId !== undefined, 0x8f5 /* groupId should be present to fetch snapshot */);
                 const snapshot = await this.runtime.getSnapshotForLoadingGroupId([this.loadingGroupId], [this.id]);
                 this._baseSnapshot = snapshot.snapshotTree;
                 sequenceNumber = snapshot.sequenceNumber;
@@ -654,13 +673,13 @@ class RemoteFluidDataStoreContext extends FluidDataStoreContext {
             }
             let tree = this.baseSnapshot;
             let isRootDataStore = true;
-            if (!!tree && tree.blobs[index_js_1.dataStoreAttributesBlobName] !== undefined) {
+            if (!!tree && tree.blobs[index_js_2.dataStoreAttributesBlobName] !== undefined) {
                 // Need to get through snapshot and use that to populate extraBlobs
-                const attributes = await (0, driver_utils_1.readAndParse)(this.storage, tree.blobs[index_js_1.dataStoreAttributesBlobName]);
+                const attributes = await (0, internal_2.readAndParse)(this.storage, tree.blobs[index_js_2.dataStoreAttributesBlobName]);
                 let pkgFromSnapshot;
                 // Use the snapshotFormatVersion to determine how the pkg is encoded in the snapshot.
                 // For snapshotFormatVersion = "0.1" (1) or above, pkg is jsonified, otherwise it is just a string.
-                const formatVersion = (0, index_js_1.getAttributesFormatVersion)(attributes);
+                const formatVersion = (0, index_js_2.getAttributesFormatVersion)(attributes);
                 if (formatVersion < 1) {
                     pkgFromSnapshot =
                         attributes.pkg.startsWith('["') && attributes.pkg.endsWith('"]')
@@ -677,12 +696,12 @@ class RemoteFluidDataStoreContext extends FluidDataStoreContext {
                  * roots in the document but they won't break.
                  */
                 isRootDataStore = attributes.isRootDataStore ?? true;
-                if ((0, index_js_1.hasIsolatedChannels)(attributes)) {
-                    tree = tree.trees[runtime_definitions_1.channelsTreeName];
-                    (0, core_utils_1.assert)(tree !== undefined, 0x1fe /* "isolated channels subtree should exist in remote datastore snapshot" */);
+                if ((0, index_js_2.hasIsolatedChannels)(attributes)) {
+                    tree = tree.trees[internal_3.channelsTreeName];
+                    (0, internal_1.assert)(tree !== undefined, 0x1fe /* "isolated channels subtree should exist in remote datastore snapshot" */);
                 }
             }
-            (0, core_utils_1.assert)(this.pkg !== undefined, 0x8f6 /* The datastore context package should be defined */);
+            (0, internal_1.assert)(this.pkg !== undefined, 0x8f6 /* The datastore context package should be defined */);
             return {
                 pkg: this.pkg,
                 isRootDataStore,
@@ -697,6 +716,17 @@ class RemoteFluidDataStoreContext extends FluidDataStoreContext {
             this.summarizerNode.updateBaseSummaryState(props.snapshotTree);
         }
     }
+    /*
+    This API should not be called for RemoteFluidDataStoreContext. But here is one scenario where it's not the case:
+    The scenario (hit by stashedOps.spec.ts, "resends attach op" UT is the following (as far as I understand):
+    1. data store is being attached in attached container
+    2. container state is serialized (stashed ops feature)
+    3. new container instance is rehydrated (from stashed ops)
+        - As result, we create RemoteFluidDataStoreContext for this data store that is actually in "attaching" state (as of # 2).
+          But its state is set to attached when loading container from stashed ops
+    4. attach op for this data store is processed - setAttachState() is called.
+    */
+    setAttachState(attachState) { }
     async getInitialSnapshotDetails() {
         return this.initialSnapshotDetailsP;
     }
@@ -710,21 +740,22 @@ class RemoteFluidDataStoreContext extends FluidDataStoreContext {
 exports.RemoteFluidDataStoreContext = RemoteFluidDataStoreContext;
 /**
  * Base class for detached & attached context classes
+ * @internal
  */
 class LocalFluidDataStoreContextBase extends FluidDataStoreContext {
     constructor(props) {
-        super(props, props.snapshotTree !== undefined ? true : false /* existing */, true /* isLocalDataStore */, props.makeLocallyVisibleFn);
-        this.initialSnapshotDetailsP = new core_utils_1.LazyPromise(async () => {
+        super(props, props.snapshotTree !== undefined /* existing */, true /* isLocalDataStore */, props.makeLocallyVisibleFn);
+        this.initialSnapshotDetailsP = new internal_1.LazyPromise(async () => {
             let snapshot = this.snapshotTree;
             let attributes;
             let isRootDataStore = false;
             if (snapshot !== undefined) {
                 // Get the dataStore attributes.
                 // Note: storage can be undefined in special case while detached.
-                attributes = await (0, index_js_1.getFluidDataStoreAttributes)(this.storage, snapshot);
-                if ((0, index_js_1.hasIsolatedChannels)(attributes)) {
-                    snapshot = snapshot.trees[runtime_definitions_1.channelsTreeName];
-                    (0, core_utils_1.assert)(snapshot !== undefined, 0x1ff /* "isolated channels subtree should exist in local datastore snapshot" */);
+                attributes = await (0, index_js_2.getFluidDataStoreAttributes)(this.storage, snapshot);
+                if ((0, index_js_2.hasIsolatedChannels)(attributes)) {
+                    snapshot = snapshot.trees[internal_3.channelsTreeName];
+                    (0, internal_1.assert)(snapshot !== undefined, 0x1ff /* "isolated channels subtree should exist in local datastore snapshot" */);
                 }
                 if (this.pkg === undefined) {
                     this.pkg = JSON.parse(attributes.pkg);
@@ -737,7 +768,7 @@ class LocalFluidDataStoreContextBase extends FluidDataStoreContext {
                     }
                 }
             }
-            (0, core_utils_1.assert)(this.pkg !== undefined, 0x152 /* "pkg should be available in local data store" */);
+            (0, internal_1.assert)(this.pkg !== undefined, 0x152 /* "pkg should be available in local data store" */);
             return {
                 pkg: this.pkg,
                 isRootDataStore,
@@ -747,40 +778,63 @@ class LocalFluidDataStoreContextBase extends FluidDataStoreContext {
         // Summarizer client should not create local data stores.
         this.identifyLocalChangeInSummarizer("DataStoreCreatedInSummarizer");
         this.snapshotTree = props.snapshotTree;
-        if (props.isRootDataStore === true) {
-            this.setInMemoryRoot();
-        }
         this.createProps = props.createProps;
-        this.attachListeners();
     }
-    attachListeners() {
-        if (this.attachState !== container_definitions_1.AttachState.Attached) {
-            this.once("attaching", () => {
-                (0, core_utils_1.assert)(this.attachState === container_definitions_1.AttachState.Detached, 0x14d /* "Should move from detached to attaching" */);
+    setAttachState(attachState) {
+        switch (attachState) {
+            case container_definitions_1.AttachState.Attaching:
+                (0, internal_1.assert)(this.attachState === container_definitions_1.AttachState.Detached, 0x14d /* "Should move from detached to attaching" */);
                 this._attachState = container_definitions_1.AttachState.Attaching;
-            });
-            this.once("attached", () => {
-                (0, core_utils_1.assert)(this.attachState === container_definitions_1.AttachState.Attaching, 0x14e /* "Should move from attaching to attached" */);
-                this._attachState = container_definitions_1.AttachState.Attached;
-            });
+                if (this.channel?.setAttachState) {
+                    this.channel.setAttachState(attachState);
+                }
+                else if (this.channel) {
+                    // back-compat! To be removed in the future
+                    // Added in "2.0.0-rc.2.0.0" timeframe.
+                    this.emit("attaching");
+                }
+                break;
+            case container_definitions_1.AttachState.Attached:
+                // We can get called into here twice, as result of both container and data store being attached, if
+                // those processes overlapped, for example, in a flow like that one:
+                // 1. Container attach started
+                // 2. data store attachment started
+                // 3. container attached
+                // 4. data store attached.
+                if (this.attachState !== container_definitions_1.AttachState.Attached) {
+                    (0, internal_1.assert)(this.attachState === container_definitions_1.AttachState.Attaching, 0x14e /* "Should move from attaching to attached" */);
+                    this._attachState = container_definitions_1.AttachState.Attached;
+                    this.channel?.setAttachState?.(attachState);
+                    if (this.channel?.setAttachState) {
+                        this.channel.setAttachState(attachState);
+                    }
+                    else if (this.channel) {
+                        // back-compat! To be removed in the future
+                        // Added in "2.0.0-rc.2.0.0" timeframe.
+                        this.emit("attached");
+                    }
+                }
+                break;
+            default:
+                (0, internal_1.unreachableCase)(attachState, "unreached");
         }
     }
     /**
      * @see FluidDataStoreContext.getAttachData
      */
     getAttachData(includeGCData, telemetryContext) {
-        (0, core_utils_1.assert)(this.channel !== undefined, 0x14f /* "There should be a channel when generating attach message" */);
-        (0, core_utils_1.assert)(this.pkg !== undefined, 0x150 /* "pkg should be available in local data store context" */);
+        (0, internal_1.assert)(this.channel !== undefined, 0x14f /* "There should be a channel when generating attach message" */);
+        (0, internal_1.assert)(this.pkg !== undefined, 0x150 /* "pkg should be available in local data store context" */);
         const attachSummary = this.channel.getAttachSummary(telemetryContext);
         // Wrap dds summaries in .channels subtree.
-        (0, index_js_1.wrapSummaryInChannelsTree)(attachSummary);
+        (0, index_js_2.wrapSummaryInChannelsTree)(attachSummary);
         // Add data store's attributes to the summary.
         const attributes = createAttributes(this.pkg, this.isInMemoryRoot());
-        (0, runtime_utils_1.addBlobToSummary)(attachSummary, index_js_1.dataStoreAttributesBlobName, JSON.stringify(attributes));
+        (0, internal_4.addBlobToSummary)(attachSummary, index_js_2.dataStoreAttributesBlobName, JSON.stringify(attributes));
         if (includeGCData) {
             const gcData = this.channel.getAttachGCData?.(telemetryContext);
             if (gcData !== undefined) {
-                (0, runtime_utils_1.addBlobToSummary)(attachSummary, runtime_definitions_1.gcDataBlobKey, JSON.stringify(gcData));
+                (0, internal_4.addBlobToSummary)(attachSummary, internal_3.gcDataBlobKey, JSON.stringify(gcData));
             }
         }
         // Add loadingGroupId to the summary
@@ -804,7 +858,7 @@ class LocalFluidDataStoreContextBase extends FluidDataStoreContext {
      */
     delete() {
         // TODO: GC:Validation - potentially prevent this from happening or asserting. Maybe throw here.
-        (0, index_js_2.sendGCUnexpectedUsageEvent)(this.mc, {
+        (0, index_js_1.sendGCUnexpectedUsageEvent)(this.mc, {
             eventName: "GC_Deleted_DataStore_Unexpected_Delete",
             message: "Unexpected deletion of a local data store context",
             category: "error",
@@ -819,6 +873,7 @@ exports.LocalFluidDataStoreContextBase = LocalFluidDataStoreContextBase;
  * Various workflows (snapshot creation, requests) result in .realize() being called
  * on context, resulting in instantiation and attachment of runtime.
  * Runtime is created using data store factory that is associated with this context.
+ * @internal
  */
 class LocalFluidDataStoreContext extends LocalFluidDataStoreContextBase {
     constructor(props) {
@@ -839,16 +894,16 @@ class LocalDetachedFluidDataStoreContext extends LocalFluidDataStoreContextBase
         this.channelToDataStoreFn = props.channelToDataStoreFn;
     }
     async attachRuntime(registry, dataStoreChannel) {
-        (0, core_utils_1.assert)(this.detachedRuntimeCreation, 0x154 /* "runtime creation is already attached" */);
+        (0, internal_1.assert)(this.detachedRuntimeCreation, 0x154 /* "runtime creation is already attached" */);
         this.detachedRuntimeCreation = false;
-        (0, core_utils_1.assert)(this.channelP === undefined, 0x155 /* "channel deferral is already set" */);
+        (0, internal_1.assert)(this.channelP === undefined, 0x155 /* "channel deferral is already set" */);
         this.channelP = Promise.resolve()
             .then(async () => {
             const factory = registry.IFluidDataStoreFactory;
             const factory2 = await this.factoryFromPackagePath();
-            (0, core_utils_1.assert)(factory2 === factory, 0x156 /* "Unexpected factory for package path" */);
+            (0, internal_1.assert)(factory2 === factory, 0x156 /* "Unexpected factory for package path" */);
             await super.bindRuntime(dataStoreChannel, false /* existing */);
-            (0, core_utils_1.assert)(!(await this.isRoot()), 0x8f7 /* there are no more createRootDataStore() kind of APIs! */);
+            (0, internal_1.assert)(!(await this.isRoot()), 0x8f7 /* there are no more createRootDataStore() kind of APIs! */);
             return dataStoreChannel;
         })
             .catch((error) => {