@fluidframework/container-runtime 2.23.0-325054 → 2.30.0

package/src/dataStoreContext.ts

@@ -604,30 +604,6 @@ export abstract class FluidDataStoreContext
 		this.channel!.setConnectionState(connected, clientId);
 	}
 
-	/**
-	 * back-compat ADO 21575: This is temporary and will be removed once the compat requirement across Runtime and
-	 * Datastore boundary is satisfied.
-	 * Process the messages to maintain backwards compatibility. The `processMessages` function is added to
-	 * IFluidDataStoreChannel in 2.5.0. For channels before that, call `process` for each message.
-	 */
-	private processMessagesCompat(
-		channel: IFluidDataStoreChannel,
-		messageCollection: IRuntimeMessageCollection,
-	): void {
-		if (channel.processMessages === undefined) {
-			const { envelope, messagesContent, local } = messageCollection;
-			for (const { contents, localOpMetadata, clientSequenceNumber } of messagesContent) {
-				channel.process(
-					{ ...envelope, contents, clientSequenceNumber },
-					local,
-					localOpMetadata,
-				);
-			}
-		} else {
-			channel.processMessages(messageCollection);
-		}
-	}
-
 	/**
 	 * Process messages for this data store. The messages here are contiguous messages for this data store in a batch.
 	 * @param messageCollection - The collection of messages to process.
@@ -643,7 +619,7 @@ export abstract class FluidDataStoreContext
 
 		if (this.loaded) {
 			assert(this.channel !== undefined, 0xa68 /* Channel is not loaded */);
-			this.processMessagesCompat(this.channel, messageCollection);
+			this.channel.processMessages(messageCollection);
 		} else {
 			assert(!local, 0x142 /* "local store channel is not loaded" */);
 			assert(
@@ -849,12 +825,6 @@ export abstract class FluidDataStoreContext
 		}
 	}
 
-	/**
-	 * Submits the signal to be sent to other clients.
-	 * @param type - Type 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.
-	 */
 	public submitSignal(type: string, content: unknown, targetClientId?: string): void {
 		this.verifyNotClosed("submitSignal");
 
@@ -881,7 +851,7 @@ export abstract class FluidDataStoreContext
 		for (const messageCollection of this.pendingMessagesState.messageCollections) {
 			// Only process ops whose seq number is greater than snapshot sequence number from which it loaded.
 			if (messageCollection.envelope.sequenceNumber > baseSequenceNumber) {
-				this.processMessagesCompat(channel, messageCollection);
+				channel.processMessages(messageCollection);
 			}
 		}
 

package/src/gc/garbageCollection.ts

@@ -34,22 +34,17 @@ import { IRefreshSummaryResult } from "../summary/index.js";
 
 import { generateGCConfigs } from "./gcConfigs.js";
 import {
-	// eslint-disable-next-line import/no-deprecated
 	GCNodeType,
 	GarbageCollectionMessage,
 	GarbageCollectionMessageType,
-	// eslint-disable-next-line import/no-deprecated
 	IGCMetadata,
 	IGCResult,
-	// eslint-disable-next-line import/no-deprecated
 	IGCStats,
 	IGarbageCollectionRuntime,
 	IGarbageCollector,
 	IGarbageCollectorConfigs,
 	IGarbageCollectorCreateParams,
-	// eslint-disable-next-line import/no-deprecated
 	IMarkPhaseStats,
-	// eslint-disable-next-line import/no-deprecated
 	ISweepPhaseStats,
 	UnreferencedState,
 	type IGCNodeUpdatedProps,
@@ -516,7 +511,6 @@ export class GarbageCollector implements IGarbageCollector {
 			fullGC?: boolean;
 		},
 		telemetryContext?: ITelemetryContext,
-		// eslint-disable-next-line import/no-deprecated
 	): Promise<IGCStats | undefined> {
 		const fullGC =
 			options.fullGC ?? (this.configs.runFullGC === true || this.autoRecovery.useFullGC());
@@ -614,7 +608,6 @@ export class GarbageCollector implements IGarbageCollector {
 		fullGC: boolean,
 		currentReferenceTimestampMs: number,
 		logger: ITelemetryLoggerExt,
-		// eslint-disable-next-line import/no-deprecated
 	): Promise<IGCStats> {
 		// 1. Generate / analyze the runtime's reference graph.
 		// Get the reference graph (gcData) and run GC algorithm to get referenced / unreferenced nodes.
@@ -770,7 +763,7 @@ export class GarbageCollector implements IGarbageCollector {
 			// local state when processing the op.
 			const sweepReadyDSAndBlobs = nodesToDelete.filter((nodeId) => {
 				const nodeType = this.runtime.getNodeType(nodeId);
-				// eslint-disable-next-line import/no-deprecated
+
 				return nodeType === GCNodeType.DataStore || nodeType === GCNodeType.Blob;
 			});
 			const contents: GarbageCollectionMessage = {
@@ -902,7 +895,6 @@ export class GarbageCollector implements IGarbageCollector {
 		);
 	}
 
-	// eslint-disable-next-line import/no-deprecated
 	public getMetadata(): IGCMetadata {
 		return {
 			/**
@@ -1065,7 +1057,6 @@ export class GarbageCollector implements IGarbageCollector {
 		// Unless this is a Loaded event for a Blob or DataStore, we're done after telemetry tracking
 		const loadedBlobOrDataStore =
 			reason === "Loaded" &&
-			// eslint-disable-next-line import/no-deprecated
 			(nodeType === GCNodeType.Blob || nodeType === GCNodeType.DataStore);
 		if (!loadedBlobOrDataStore) {
 			return;
@@ -1193,9 +1184,8 @@ export class GarbageCollector implements IGarbageCollector {
 	 * @param gcResult - The result of the current GC run.
 	 * @returns the stats of the mark phase run.
 	 */
-	// eslint-disable-next-line import/no-deprecated
+
 	private getMarkPhaseStats(gcResult: IGCResult): IMarkPhaseStats {
-		// eslint-disable-next-line import/no-deprecated
 		const markPhaseStats: IMarkPhaseStats = {
 			nodeCount: 0,
 			dataStoreCount: 0,
@@ -1222,7 +1212,6 @@ export class GarbageCollector implements IGarbageCollector {
 				markPhaseStats.unrefNodeCount++;
 			}
 
-			// eslint-disable-next-line import/no-deprecated
 			if (this.runtime.getNodeType(nodeId) === GCNodeType.DataStore) {
 				markPhaseStats.dataStoreCount++;
 				if (stateUpdated) {
@@ -1232,7 +1221,7 @@ export class GarbageCollector implements IGarbageCollector {
 					markPhaseStats.unrefDataStoreCount++;
 				}
 			}
-			// eslint-disable-next-line import/no-deprecated
+
 			if (this.runtime.getNodeType(nodeId) === GCNodeType.Blob) {
 				markPhaseStats.attachmentBlobCount++;
 				if (stateUpdated) {
@@ -1266,13 +1255,12 @@ export class GarbageCollector implements IGarbageCollector {
 	private getSweepPhaseStats(
 		deletedNodes: Set<string>,
 		sweepReadyNodes: Set<string>,
-		// eslint-disable-next-line import/no-deprecated
+
 		markPhaseStats: IMarkPhaseStats,
-		// eslint-disable-next-line import/no-deprecated
 	): ISweepPhaseStats {
 		// Initialize the life time node counts to the mark phase node counts. If sweep is not enabled,
 		// these will be the life time node count for this container.
-		// eslint-disable-next-line import/no-deprecated
+
 		const sweepPhaseStats: ISweepPhaseStats = {
 			lifetimeNodeCount: markPhaseStats.nodeCount,
 			lifetimeDataStoreCount: markPhaseStats.dataStoreCount,
@@ -1284,32 +1272,28 @@ export class GarbageCollector implements IGarbageCollector {
 
 		// The runtime can't reliably identify the type of deleted nodes. So, get the type here. This should
 		// be good enough because the only types that participate in GC today are data stores, DDSes and blobs.
-		// eslint-disable-next-line import/no-deprecated, unicorn/consistent-function-scoping
+		// eslint-disable-next-line unicorn/consistent-function-scoping
 		const getDeletedNodeType = (nodeId: string): GCNodeType => {
 			const pathParts = nodeId.split("/");
 			if (pathParts[1] === blobManagerBasePath) {
-				// eslint-disable-next-line import/no-deprecated
 				return GCNodeType.Blob;
 			}
 			if (pathParts.length === 2) {
-				// eslint-disable-next-line import/no-deprecated
 				return GCNodeType.DataStore;
 			}
 			if (pathParts.length === 3) {
-				// eslint-disable-next-line import/no-deprecated
 				return GCNodeType.SubDataStore;
 			}
-			// eslint-disable-next-line import/no-deprecated
+
 			return GCNodeType.Other;
 		};
 
 		for (const nodeId of deletedNodes) {
 			sweepPhaseStats.deletedNodeCount++;
 			const nodeType = getDeletedNodeType(nodeId);
-			// eslint-disable-next-line import/no-deprecated
+
 			if (nodeType === GCNodeType.DataStore) {
 				sweepPhaseStats.deletedDataStoreCount++;
-				// eslint-disable-next-line import/no-deprecated
 			} else if (nodeType === GCNodeType.Blob) {
 				sweepPhaseStats.deletedAttachmentBlobCount++;
 			}
@@ -1330,10 +1314,9 @@ export class GarbageCollector implements IGarbageCollector {
 		for (const nodeId of sweepReadyNodes) {
 			sweepPhaseStats.deletedNodeCount++;
 			const nodeType = this.runtime.getNodeType(nodeId);
-			// eslint-disable-next-line import/no-deprecated
+
 			if (nodeType === GCNodeType.DataStore) {
 				sweepPhaseStats.deletedDataStoreCount++;
-				// eslint-disable-next-line import/no-deprecated
 			} else if (nodeType === GCNodeType.Blob) {
 				sweepPhaseStats.deletedAttachmentBlobCount++;
 			}

package/src/gc/gcConfigs.ts

@@ -9,13 +9,10 @@ import {
 	validatePrecondition,
 } from "@fluidframework/telemetry-utils/internal";
 
-// eslint-disable-next-line import/no-deprecated
 import { IContainerRuntimeMetadata } from "../summary/index.js";
 
 import {
-	// eslint-disable-next-line import/no-deprecated
 	GCFeatureMatrix,
-	// eslint-disable-next-line import/no-deprecated
 	GCVersion,
 	IGCMetadata_Deprecated,
 	IGCRuntimeOptions,
@@ -45,7 +42,7 @@ export function generateGCConfigs(
 	mc: MonitoringContext,
 	createParams: {
 		gcOptions: IGCRuntimeOptions;
-		// eslint-disable-next-line import/no-deprecated
+
 		metadata: IContainerRuntimeMetadata | undefined;
 		existing: boolean;
 		isSummarizerClient: boolean;
@@ -54,9 +51,9 @@ export function generateGCConfigs(
 	let gcAllowed: boolean = true;
 	let sessionExpiryTimeoutMs: number | undefined;
 	let tombstoneTimeoutMs: number | undefined;
-	// eslint-disable-next-line import/no-deprecated
+
 	let persistedGcFeatureMatrix: GCFeatureMatrix | undefined;
-	// eslint-disable-next-line import/no-deprecated
+
 	let gcVersionInBaseSnapshot: GCVersion | undefined;
 
 	/**

package/src/gc/gcDefinitions.ts

@@ -21,17 +21,13 @@ import {
 import { RuntimeHeaderData } from "../containerRuntime.js";
 import { ContainerRuntimeGCMessage } from "../messageTypes.js";
 import {
-	// eslint-disable-next-line import/no-deprecated
 	IContainerRuntimeMetadata,
-	// eslint-disable-next-line import/no-deprecated
 	ICreateContainerMetadata,
 	IRefreshSummaryResult,
 } from "../summary/index.js";
 
 /**
- * @legacy
- * @alpha
- * @deprecated This type will be moved to internal in 2.30. External usage is not necessary or supported.
+ * @internal
  */
 export type GCVersion = number;
 
@@ -92,9 +88,7 @@ export const defaultSweepGracePeriodMs = 1 * oneDayMs; // 1 day
 
 /**
  * @see IGCMetadata.gcFeatureMatrix and @see gcGenerationOptionName
- * @legacy
- * @alpha
- * @deprecated This type will be moved to internal in 2.30. External usage is not necessary or supported.
+ * @internal
  */
 export type GCFeatureMatrix =
 	| {
@@ -133,9 +127,7 @@ export interface IGCMetadata_Deprecated {
 /**
  * GC-specific metadata to be written into the summary.
  *
- * @legacy
- * @alpha
- * @deprecated This type will be moved to internal in 2.30. External usage is not necessary or supported.
+ * @internal
  */
 export interface IGCMetadata {
 	/**
@@ -184,9 +176,7 @@ export interface IGCMetadata {
 
 /**
  * The statistics of the system state after a garbage collection mark phase run.
- * @legacy
- * @alpha
- * @deprecated This type will be moved to internal in 2.30. External usage is not necessary or supported.
+ * @internal
  */
 export interface IMarkPhaseStats {
 	/**
@@ -229,9 +219,7 @@ export interface IMarkPhaseStats {
 
 /**
  * The statistics of the system state after a garbage collection sweep phase run.
- * @legacy
- * @alpha
- * @deprecated This type will be moved to internal in 2.30. External usage is not necessary or supported.
+ * @internal
  */
 export interface ISweepPhaseStats {
 	/**
@@ -262,17 +250,13 @@ export interface ISweepPhaseStats {
 
 /**
  * The statistics of the system state after a garbage collection run.
- * @legacy
- * @alpha
- * @deprecated This type will be moved to internal in 2.30. External usage is not necessary or supported.
+ * @internal
  */
 export interface IGCStats extends IMarkPhaseStats, ISweepPhaseStats {}
 
 /**
  * The types of GC nodes in the GC reference graph.
- * @legacy
- * @alpha
- * @deprecated This type will be moved to internal in 2.30. External usage is not necessary or supported.
+ * @internal
  */
 export const GCNodeType = {
 	// Nodes that are for data stores.
@@ -286,9 +270,7 @@ export const GCNodeType = {
 } as const;
 
 /**
- * @legacy
- * @alpha
- * @deprecated This type will be moved to internal in 2.30. External usage is not necessary or supported.
+ * @internal
  */
 export type GCNodeType = (typeof GCNodeType)[keyof typeof GCNodeType];
 
@@ -512,9 +494,9 @@ export interface IGarbageCollectorCreateParams {
 	readonly gcOptions: IGCRuntimeOptions;
 	readonly baseLogger: ITelemetryLoggerExt;
 	readonly existing: boolean;
-	// eslint-disable-next-line import/no-deprecated
+
 	readonly metadata: IContainerRuntimeMetadata | undefined;
-	// eslint-disable-next-line import/no-deprecated
+
 	readonly createContainerMetadata: ICreateContainerMetadata;
 	readonly baseSnapshot: ISnapshotTree | undefined;
 	readonly isSummarizerClient: boolean;

package/src/gc/gcHelpers.ts

@@ -15,11 +15,8 @@ import {
 import type { IConfigProvider } from "@fluidframework/telemetry-utils/internal";
 
 import {
-	// eslint-disable-next-line import/no-deprecated
 	GCFeatureMatrix,
-	// eslint-disable-next-line import/no-deprecated
 	GCVersion,
-	// eslint-disable-next-line import/no-deprecated
 	IGCMetadata,
 	gcVersionUpgradeToV4Key,
 	nextGCVersion,
@@ -31,7 +28,6 @@ import {
 	IGarbageCollectionState,
 } from "./gcSummaryDefinitions.js";
 
-// eslint-disable-next-line import/no-deprecated
 export function getGCVersion(metadata?: IGCMetadata): GCVersion {
 	if (!metadata) {
 		// Force to 0/disallowed in prior versions
@@ -67,7 +63,6 @@ export function getGCVersionInEffect(configProvider: IConfigProvider): number {
  * @returns true if GC Sweep should be allowed for this document
  */
 export function shouldAllowGcSweep(
-	// eslint-disable-next-line import/no-deprecated
 	featureMatrix: GCFeatureMatrix,
 	currentGeneration: number | undefined,
 ): boolean {

package/src/gc/gcSummaryStateTracker.ts

@@ -16,7 +16,6 @@ import { SummaryTreeBuilder, mergeStats } from "@fluidframework/runtime-utils/in
 
 import { IRefreshSummaryResult } from "../summary/index.js";
 
-// eslint-disable-next-line import/no-deprecated
 import { IGCStats, IGarbageCollectorConfigs } from "./gcDefinitions.js";
 import { generateSortedGCState } from "./gcHelpers.js";
 import {
@@ -231,7 +230,7 @@ export class GCSummaryStateTracker {
 	/**
 	 * Called to update the state from a GC run's stats. Used to update the count of data stores whose state updated.
 	 */
-	// eslint-disable-next-line import/no-deprecated
+
 	public updateStateFromGCRunStats(stats: IGCStats): void {
 		this.updatedDSCountSinceLastSummary += stats.updatedDataStoreCount;
 	}

package/src/gc/gcTelemetry.ts

@@ -14,13 +14,10 @@ import {
 } from "@fluidframework/telemetry-utils/internal";
 
 import { RuntimeHeaderData } from "../containerRuntime.js";
-// eslint-disable-next-line import/no-deprecated
 import { ICreateContainerMetadata } from "../summary/index.js";
 
 import {
-	// eslint-disable-next-line import/no-deprecated
 	GCFeatureMatrix,
-	// eslint-disable-next-line import/no-deprecated
 	GCNodeType,
 	IGarbageCollectorConfigs,
 	UnreferencedState,
@@ -44,7 +41,7 @@ interface ICommonProps {
 /**
  * The event that is logged when unreferenced node is used after a certain time.
  */
-// eslint-disable-next-line import/no-deprecated
+
 interface IUnreferencedEventProps extends ICreateContainerMetadata, ICommonProps {
 	/**
 	 * The id that GC uses to track the node. May or may not match id
@@ -56,13 +53,12 @@ interface IUnreferencedEventProps extends ICreateContainerMetadata, ICommonProps
 	 */
 	id: Tagged<string>;
 	fromId?: Tagged<string>;
-	// eslint-disable-next-line import/no-deprecated
+
 	type: GCNodeType;
 	unrefTime: number;
 	age: number;
 	// Expanding GC feature matrix. Without doing this, the configs cannot be logged in telemetry directly.
 	gcConfigs: Omit<IGarbageCollectorConfigs, "persistedGcFeatureMatrix"> & {
-		// eslint-disable-next-line import/no-deprecated
 		[K in keyof GCFeatureMatrix]: GCFeatureMatrix[K];
 	};
 	timeout?: number;
@@ -129,9 +125,9 @@ export class GCTelemetryTracker {
 		private readonly mc: MonitoringContext,
 		private readonly configs: IGarbageCollectorConfigs,
 		private readonly isSummarizerClient: boolean,
-		// eslint-disable-next-line import/no-deprecated
+
 		private readonly createContainerMetadata: ICreateContainerMetadata,
-		// eslint-disable-next-line import/no-deprecated
+
 		private readonly getNodeType: (nodeId: string) => GCNodeType,
 		private readonly getNodeStateTracker: (
 			nodeId: string,
@@ -152,7 +148,6 @@ export class GCTelemetryTracker {
 	 * 2. An event is logged only once per container instance per event per node.
 	 */
 	private shouldLogNonActiveEvent(
-		// eslint-disable-next-line import/no-deprecated
 		nodeType: GCNodeType,
 		usageType: NodeUsageType,
 		nodeStateTracker: UnreferencedStateTracker,
@@ -162,14 +157,13 @@ export class GCTelemetryTracker {
 			return false;
 		}
 
-		// eslint-disable-next-line import/no-deprecated
 		if (nodeType === GCNodeType.Other) {
 			return false;
 		}
 
 		// For sub data store (DDS) nodes, if they are changed, its data store will also be changed,
 		// so skip logging to make the telemetry less noisy.
-		// eslint-disable-next-line import/no-deprecated
+
 		if (nodeType === GCNodeType.SubDataStore && usageType === "Changed") {
 			return false;
 		}
@@ -305,7 +299,7 @@ export class GCTelemetryTracker {
 	 */
 	private logTombstoneUsageTelemetry(
 		unrefEventProps: Omit<IUnreferencedEventProps, "state" | "usageType">,
-		// eslint-disable-next-line import/no-deprecated
+
 		nodeType: GCNodeType,
 		usageType: NodeUsageType,
 		packagePath?: readonly string[],
@@ -373,7 +367,6 @@ export class GCTelemetryTracker {
 			for (const route of currentOutboundRoutes) {
 				const nodeType = this.getNodeType(route);
 				if (
-					// eslint-disable-next-line import/no-deprecated
 					(nodeType === GCNodeType.DataStore || nodeType === GCNodeType.Blob) &&
 					!nodeId.startsWith(route) &&
 					!previousRoutes.includes(route) &&

package/src/index.ts

@@ -5,10 +5,6 @@
 
 export {
 	ISummaryRuntimeOptions,
-	ISummaryBaseConfiguration,
-	ISummaryConfigurationHeuristics,
-	ISummaryConfigurationDisableSummarizer,
-	ISummaryConfigurationDisableHeuristics,
 	IContainerRuntimeOptions,
 	IContainerRuntimeOptionsInternal,
 	loadContainerRuntime,
@@ -18,8 +14,6 @@ export {
 	DeletedResponseHeaderKey,
 	TombstoneResponseHeaderKey,
 	InactiveResponseHeaderKey,
-	ISummaryConfiguration,
-	DefaultSummaryConfiguration,
 	ICompressionRuntimeOptions,
 	CompressionAlgorithms,
 	RuntimeHeaderData,
@@ -106,6 +100,12 @@ export {
 	IFluidDataStoreAttributes1,
 	IFluidDataStoreAttributes2,
 	OmitAttributesVersions,
+	ISummaryBaseConfiguration,
+	ISummaryConfigurationHeuristics,
+	ISummaryConfigurationDisableSummarizer,
+	ISummaryConfigurationDisableHeuristics,
+	ISummaryConfiguration,
+	DefaultSummaryConfiguration,
 } from "./summary/index.js";
 export { IChunkedOp, unpackRuntimeMessage } from "./opLifecycle/index.js";
 export { ChannelCollection } from "./channelCollection.js";

package/src/messageTypes.ts

@@ -14,7 +14,6 @@ import {
 import { IDataStoreAliasMessage } from "./dataStore.js";
 import { GarbageCollectionMessage } from "./gc/index.js";
 import { IChunkedOp } from "./opLifecycle/index.js";
-// eslint-disable-next-line import/no-deprecated
 import { IDocumentSchemaChangeMessage } from "./summary/index.js";
 
 /**
@@ -115,7 +114,6 @@ export type ContainerRuntimeGCMessage = TypedContainerRuntimeMessage<
 >;
 export type ContainerRuntimeDocumentSchemaMessage = TypedContainerRuntimeMessage<
 	ContainerMessageType.DocumentSchemaChange,
-	// eslint-disable-next-line import/no-deprecated
 	IDocumentSchemaChangeMessage
 >;
 

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/container-runtime";
-export const pkgVersion = "2.23.0-325054";
+export const pkgVersion = "2.30.0";