@fluidframework/container-runtime 2.0.0-dev-rc.2.0.0.246488 → 2.0.0-dev-rc.3.0.0.253463

package/src/channelCollection.ts

@@ -3,92 +3,95 @@
  * Licensed under the MIT License.
  */
 
+import { AttachState } from "@fluidframework/container-definitions";
 import {
-	ITelemetryBaseLogger,
+	FluidObject,
 	IDisposable,
 	IFluidHandle,
 	IRequest,
-	FluidObject,
 	IResponse,
+	ITelemetryBaseLogger,
 } from "@fluidframework/core-interfaces";
-import { FluidObjectHandle } from "@fluidframework/datastore";
+import { assert, Lazy, LazyPromise } from "@fluidframework/core-utils/internal";
+import { FluidObjectHandle } from "@fluidframework/datastore/internal";
+import { buildSnapshotTree } from "@fluidframework/driver-utils/internal";
 import { ISequencedDocumentMessage, ISnapshotTree } from "@fluidframework/protocol-definitions";
+import {
+	IGarbageCollectionData,
+	IInboundSignalMessage,
+	ISummaryTreeWithStats,
+	ITelemetryContext,
+} from "@fluidframework/runtime-definitions";
 import {
 	AliasResult,
-	channelsTreeName,
 	CreateSummarizerNodeSource,
 	IAttachMessage,
 	IEnvelope,
 	IFluidDataStoreChannel,
+	IFluidDataStoreContext,
 	IFluidDataStoreContextDetached,
-	IGarbageCollectionData,
-	IInboundSignalMessage,
+	IFluidDataStoreFactory,
+	IFluidDataStoreRegistry,
 	IFluidParentContext,
-	InboundAttachMessage,
 	ISummarizeResult,
-	ISummaryTreeWithStats,
-	ITelemetryContext,
-	IFluidDataStoreFactory,
-	IFluidDataStoreContext,
+	InboundAttachMessage,
 	NamedFluidDataStoreRegistryEntries,
-	IFluidDataStoreRegistry,
-} from "@fluidframework/runtime-definitions";
+	channelsTreeName,
+} from "@fluidframework/runtime-definitions/internal";
 import {
+	GCDataBuilder,
+	RequestParser,
+	SummaryTreeBuilder,
 	convertSnapshotTreeToSummaryTree,
 	convertSummaryTreeToITree,
 	create404Response,
 	createResponseError,
-	GCDataBuilder,
+	encodeCompactIdToString,
 	isSerializedHandle,
 	processAttachMessageGCData,
 	responseToException,
-	SummaryTreeBuilder,
 	unpackChildNodesUsedRoutes,
-	RequestParser,
-	encodeCompactIdToString,
-} from "@fluidframework/runtime-utils";
+} from "@fluidframework/runtime-utils/internal";
 import {
-	createChildMonitoringContext,
 	DataCorruptionError,
 	DataProcessingError,
-	extractSafePropertiesFromMessage,
 	LoggingError,
 	MonitoringContext,
-	tagCodeArtifacts,
 	createChildLogger,
-} from "@fluidframework/telemetry-utils";
-import { AttachState } from "@fluidframework/container-definitions";
-import { buildSnapshotTree } from "@fluidframework/driver-utils";
-import { assert, Lazy, LazyPromise } from "@fluidframework/core-utils";
-import { DataStoreContexts } from "./dataStoreContexts.js";
-import { defaultRuntimeHeaderData, RuntimeHeaderData } from "./containerRuntime.js";
-import {
-	FluidDataStoreContext,
-	RemoteFluidDataStoreContext,
-	LocalFluidDataStoreContext,
-	createAttributesBlob,
-	LocalDetachedFluidDataStoreContext,
-	IFluidDataStoreContextInternal,
-	ILocalDetachedFluidDataStoreContextProps,
-} from "./dataStoreContext.js";
-import { StorageServiceWithAttachBlobs } from "./storageServiceWithAttachBlobs.js";
+	createChildMonitoringContext,
+	extractSafePropertiesFromMessage,
+	tagCodeArtifacts,
+} from "@fluidframework/telemetry-utils/internal";
+
+import { RuntimeHeaderData, defaultRuntimeHeaderData } from "./containerRuntime.js";
 import {
 	IDataStoreAliasMessage,
 	channelToDataStore,
 	isDataStoreAliasMessage,
 } from "./dataStore.js";
+import {
+	FluidDataStoreContext,
+	IFluidDataStoreContextInternal,
+	ILocalDetachedFluidDataStoreContextProps,
+	LocalDetachedFluidDataStoreContext,
+	LocalFluidDataStoreContext,
+	RemoteFluidDataStoreContext,
+	createAttributesBlob,
+} from "./dataStoreContext.js";
+import { DataStoreContexts } from "./dataStoreContexts.js";
+import { FluidDataStoreRegistry } from "./dataStoreRegistry.js";
 import {
 	GCNodeType,
 	detectOutboundRoutesViaDDSKey,
 	trimLeadingAndTrailingSlashes,
 } from "./gc/index.js";
+import { ContainerMessageType, LocalContainerRuntimeMessage } from "./messageTypes.js";
+import { StorageServiceWithAttachBlobs } from "./storageServiceWithAttachBlobs.js";
 import {
 	IContainerRuntimeMetadata,
 	nonDataStorePaths,
 	rootHasIsolatedChannels,
 } from "./summary/index.js";
-import { ContainerMessageType, LocalContainerRuntimeMessage } from "./messageTypes.js";
-import { FluidDataStoreRegistry } from "./dataStoreRegistry.js";
 
 /**
  * Accepted header keys for requests coming to the runtime.
@@ -220,7 +223,7 @@ export function wrapContextForInnerChannel(
 		);
 	};
 
-	context.submitSignal = (type: string, contents: any, targetClientId?: string) => {
+	context.submitSignal = (type: string, contents: unknown, targetClientId?: string) => {
 		const envelope: IEnvelope = {
 			address: id,
 			contents,
@@ -746,9 +749,49 @@ export class ChannelCollection implements IFluidDataStoreChannel, IDisposable {
 	}
 
 	private async applyStashedAttachOp(message: IAttachMessage) {
-		this.pendingAttach.set(message.id, message);
-		// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-		this.processAttachMessage({ contents: message } as ISequencedDocumentMessage, false);
+		const { id, snapshot } = message;
+
+		// build the snapshot from the summary in the attach message
+		const flatAttachBlobs = new Map<string, ArrayBufferLike>();
+		const snapshotTree = buildSnapshotTree(snapshot.entries, flatAttachBlobs);
+		const storage = new StorageServiceWithAttachBlobs(
+			this.parentContext.storage,
+			flatAttachBlobs,
+		);
+
+		// create a local datastore context for the data store context,
+		// which this message represents. All newly created data store
+		// contexts start as a local context on the client that created
+		// them, and for stashed ops, the client that applies it plays
+		// the role of creating client.
+		const dataStoreContext = new LocalFluidDataStoreContext({
+			id,
+			pkg: undefined,
+			parentContext: this.wrapContextForInnerChannel(id),
+			storage,
+			scope: this.parentContext.scope,
+			createSummarizerNodeFn: this.parentContext.getCreateChildSummarizerNodeFn(id, {
+				type: CreateSummarizerNodeSource.FromSummary,
+			}),
+			makeLocallyVisibleFn: () => this.makeDataStoreLocallyVisible(id),
+			snapshotTree,
+		});
+
+		// realize the local context, as local contexts shouldn't be delay
+		// loaded, as this client is playing the role of creating client,
+		// and creating clients always create realized data store contexts.
+		const channel = await dataStoreContext.realize();
+		await channel.entryPoint.get();
+
+		// add to the list of bound or remoted, as this context must be bound
+		// to had an attach message sent, and is the non-detached case is remoted.
+		this.contexts.addBoundOrRemoted(dataStoreContext);
+		if (this.parentContext.attachState !== AttachState.Detached) {
+			// if the client is not detached put in the pending attach list
+			// so that on ack of the stashed op, the context is found.
+			// detached client don't send ops, so should not expect and ack.
+			this.pendingAttach.set(message.id, message);
+		}
 	}
 
 	public process(

package/src/connectionTelemetry.ts

@@ -3,24 +3,24 @@
  * Licensed under the MIT License.
  */
 
-import {
-	IEventSampler,
-	ISampledTelemetryLogger,
-	ITelemetryLoggerExt,
-	createChildLogger,
-	createSampledLogger,
-	formatTick,
-} from "@fluidframework/telemetry-utils";
+import { performance } from "@fluid-internal/client-utils";
 import { IDeltaManager } from "@fluidframework/container-definitions";
+import { IContainerRuntimeEvents } from "@fluidframework/container-runtime-definitions/internal";
+import { IEventProvider } from "@fluidframework/core-interfaces";
+import { assert } from "@fluidframework/core-utils/internal";
 import {
 	IDocumentMessage,
 	ISequencedDocumentMessage,
 	MessageType,
 } from "@fluidframework/protocol-definitions";
-import { assert } from "@fluidframework/core-utils";
-import { performance } from "@fluid-internal/client-utils";
-import { IContainerRuntimeEvents } from "@fluidframework/container-runtime-definitions";
-import { IEventProvider } from "@fluidframework/core-interfaces";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+import {
+	IEventSampler,
+	ISampledTelemetryLogger,
+	createChildLogger,
+	createSampledLogger,
+	formatTick,
+} from "@fluidframework/telemetry-utils/internal";
 
 /**
  * We report various latency-related errors when waiting for op roundtrip takes longer than that amout of time.

package/src/containerHandleContext.ts

@@ -3,9 +3,10 @@
  * Licensed under the MIT License.
  */
 
-import { IFluidHandleContext, IRequest, IResponse } from "@fluidframework/core-interfaces";
 import { AttachState } from "@fluidframework/container-definitions";
-import { generateHandleContextPath } from "@fluidframework/runtime-utils";
+import { IFluidHandleContext, IRequest, IResponse } from "@fluidframework/core-interfaces";
+import { generateHandleContextPath } from "@fluidframework/runtime-utils/internal";
+
 import { ContainerRuntime } from "./containerRuntime.js";
 
 export class ContainerFluidHandleContext implements IFluidHandleContext {