@fluidframework/container-runtime 2.0.0-dev.7.2.0.205722 → 2.0.0-dev.7.3.0.207781

package/dist/containerRuntime.js

@@ -120,6 +120,7 @@ exports.defaultRuntimeHeaderData = {
     wait: true,
     viaHandle: false,
     allowTombstone: false,
+    allowInactive: false,
 };
 /**
  * Available compression algorithms for op compression.
@@ -476,10 +477,6 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
     get gcTombstoneEnforcementAllowed() {
         return this.garbageCollector.tombstoneEnforcementAllowed;
     }
-    /** If true, throw an error when a tombstone data store is retrieved */
-    get gcThrowOnTombstoneLoad() {
-        return this.garbageCollector.throwOnTombstoneLoad;
-    }
     /** If true, throw an error when a tombstone data store is used. */
     get gcThrowOnTombstoneUsage() {
         return this.garbageCollector.throwOnTombstoneUsage;
@@ -946,6 +943,9 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         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;
@@ -953,12 +953,15 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         await this.dataStores.waitIfPendingAlias(id);
         const internalId = this.internalId(id);
         const dataStoreContext = await this.dataStores.getDataStore(internalId, headerData);
-        const dataStoreChannel = await dataStoreContext.realize();
         // 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, gc_1.trimLeadingAndTrailingSlashes)(request.url.split("?")[0]);
-        this.garbageCollector.nodeUpdated(`/${urlWithoutQuery}`, "Loaded", undefined /* timestampMs */, dataStoreContext.packagePath, request?.headers);
-        return dataStoreChannel;
+        // 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.garbageCollector.nodeUpdated(`/${urlWithoutQuery}`, "Loaded", undefined /* timestampMs */, details.pkg, request, headerData);
+        return dataStoreContext.realize();
     }
     /** Adds the container's metadata to the given summary tree. */
     addMetadataToSummary(summaryTree) {
@@ -1462,6 +1465,7 @@ class ContainerRuntime extends client_utils_1.TypedEventEmitter {
         if (channel.entryPoint === undefined) {
             throw new telemetry_utils_1.UsageError("entryPoint must be defined on data store runtime for using getAliasedDataStoreEntryPoint");
         }
+        this.garbageCollector.nodeUpdated(`/${internalId}`, "Loaded", undefined /* timestampMs */, context.packagePath);
         return channel.entryPoint;
     }
     createDetachedRootDataStore(pkg, rootDataStoreId) {
@@ -1548,15 +1552,22 @@ class ContainerRuntime 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 targetClientId - When specified, the signal is only sent to the provided client id.
      */
-    submitSignal(type, content) {
+    submitSignal(type, content, targetClientId) {
         this.verifyNotClosed();
         const envelope = this.createNewSignalEnvelope(undefined /* address */, type, content);
-        return this.submitSignalFn(envelope);
+        return this.submitSignalFn(envelope, targetClientId);
     }
-    submitDataStoreSignal(address, type, content) {
+    /**
+     * Submits the signal to be sent to other clients.
+     * @param type - Type of the signal.
+     * @param content - Content of the signal.
+     * @param targetClientId - When specified, the signal is only sent to the provided client id.
+     */
+    submitDataStoreSignal(address, type, content, targetClientId) {
         const envelope = this.createNewSignalEnvelope(address, type, content);
-        return this.submitSignalFn(envelope);
+        return this.submitSignalFn(envelope, targetClientId);
     }
     setAttachState(attachState) {
         if (attachState === container_definitions_1.AttachState.Attaching) {