@fluidframework/datastore 2.0.0-internal.4.2.1 → 2.0.0-internal.4.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/datastore",
-  "version": "2.0.0-internal.4.2.1",
+  "version": "2.0.0-internal.4.4.0",
   "description": "Fluid data store implementation",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -37,18 +37,18 @@
   "dependencies": {
     "@fluidframework/common-definitions": "^0.20.1",
     "@fluidframework/common-utils": "^1.1.1",
-    "@fluidframework/container-definitions": ">=2.0.0-internal.4.2.1 <2.0.0-internal.4.3.0",
-    "@fluidframework/container-utils": ">=2.0.0-internal.4.2.1 <2.0.0-internal.4.3.0",
-    "@fluidframework/core-interfaces": ">=2.0.0-internal.4.2.1 <2.0.0-internal.4.3.0",
-    "@fluidframework/datastore-definitions": ">=2.0.0-internal.4.2.1 <2.0.0-internal.4.3.0",
-    "@fluidframework/driver-definitions": ">=2.0.0-internal.4.2.1 <2.0.0-internal.4.3.0",
-    "@fluidframework/driver-utils": ">=2.0.0-internal.4.2.1 <2.0.0-internal.4.3.0",
-    "@fluidframework/garbage-collector": ">=2.0.0-internal.4.2.1 <2.0.0-internal.4.3.0",
+    "@fluidframework/container-definitions": ">=2.0.0-internal.4.4.0 <2.0.0-internal.4.5.0",
+    "@fluidframework/container-utils": ">=2.0.0-internal.4.4.0 <2.0.0-internal.4.5.0",
+    "@fluidframework/core-interfaces": ">=2.0.0-internal.4.4.0 <2.0.0-internal.4.5.0",
+    "@fluidframework/datastore-definitions": ">=2.0.0-internal.4.4.0 <2.0.0-internal.4.5.0",
+    "@fluidframework/driver-definitions": ">=2.0.0-internal.4.4.0 <2.0.0-internal.4.5.0",
+    "@fluidframework/driver-utils": ">=2.0.0-internal.4.4.0 <2.0.0-internal.4.5.0",
+    "@fluidframework/garbage-collector": ">=2.0.0-internal.4.4.0 <2.0.0-internal.4.5.0",
     "@fluidframework/protocol-base": "^0.1039.1000",
     "@fluidframework/protocol-definitions": "^1.1.0",
-    "@fluidframework/runtime-definitions": ">=2.0.0-internal.4.2.1 <2.0.0-internal.4.3.0",
-    "@fluidframework/runtime-utils": ">=2.0.0-internal.4.2.1 <2.0.0-internal.4.3.0",
-    "@fluidframework/telemetry-utils": ">=2.0.0-internal.4.2.1 <2.0.0-internal.4.3.0",
+    "@fluidframework/runtime-definitions": ">=2.0.0-internal.4.4.0 <2.0.0-internal.4.5.0",
+    "@fluidframework/runtime-utils": ">=2.0.0-internal.4.4.0 <2.0.0-internal.4.5.0",
+    "@fluidframework/telemetry-utils": ">=2.0.0-internal.4.4.0 <2.0.0-internal.4.5.0",
     "lodash": "^4.17.21",
     "uuid": "^8.3.1"
   },
@@ -58,8 +58,8 @@
     "@fluidframework/build-tools": "^0.17.0",
     "@fluidframework/datastore-previous": "npm:@fluidframework/datastore@2.0.0-internal.4.1.0",
     "@fluidframework/eslint-config-fluid": "^2.0.0",
-    "@fluidframework/mocha-test-setup": ">=2.0.0-internal.4.2.1 <2.0.0-internal.4.3.0",
-    "@fluidframework/test-runtime-utils": ">=2.0.0-internal.4.2.1 <2.0.0-internal.4.3.0",
+    "@fluidframework/mocha-test-setup": ">=2.0.0-internal.4.4.0 <2.0.0-internal.4.5.0",
+    "@fluidframework/test-runtime-utils": ">=2.0.0-internal.4.4.0 <2.0.0-internal.4.5.0",
     "@microsoft/api-extractor": "^7.34.4",
     "@types/mocha": "^9.1.1",
     "@types/node": "^14.18.38",
@@ -85,14 +85,13 @@
     }
   },
   "scripts": {
-    "build": "npm run build:genver && concurrently npm:build:compile npm:lint && npm run build:docs",
+    "build": "concurrently npm:build:compile npm:lint && npm run build:docs",
     "build:commonjs": "npm run tsc && npm run typetests:gen && npm run build:test",
     "build:compile": "concurrently npm:build:commonjs npm:build:esnext",
     "build:docs": "api-extractor run --local --typescript-compiler-folder ../../../node_modules/typescript && copyfiles -u 1 ./_api-extractor-temp/doc-models/* ../../../_api-extractor-temp/",
     "build:esnext": "tsc --project ./tsconfig.esnext.json",
     "build:full": "npm run build",
     "build:full:compile": "npm run build:compile",
-    "build:genver": "gen-version",
     "build:test": "tsc --project ./src/test/tsconfig.json",
     "ci:build:docs": "api-extractor run --typescript-compiler-folder ../../../node_modules/typescript && copyfiles -u 1 ./_api-extractor-temp/* ../../../_api-extractor-temp/",
     "clean": "rimraf dist lib *.tsbuildinfo *.build.log",

package/src/channelContext.ts

@@ -5,7 +5,12 @@
 
 import { ITelemetryLogger } from "@fluidframework/common-definitions";
 import { IFluidHandle } from "@fluidframework/core-interfaces";
-import { IChannel } from "@fluidframework/datastore-definitions";
+import {
+	IChannel,
+	IChannelAttributes,
+	IChannelFactory,
+	IFluidDataStoreRuntime,
+} from "@fluidframework/datastore-definitions";
 import { IDocumentStorageService } from "@fluidframework/driver-definitions";
 import { ISequencedDocumentMessage, ISnapshotTree } from "@fluidframework/protocol-definitions";
 import {
@@ -14,10 +19,15 @@ import {
 	ISummarizeResult,
 	ISummaryTreeWithStats,
 	ITelemetryContext,
+	IFluidDataStoreContext,
 } from "@fluidframework/runtime-definitions";
 import { addBlobToSummary } from "@fluidframework/runtime-utils";
-import { ChannelDeltaConnection } from "./channelDeltaConnection";
+import { DataCorruptionError } from "@fluidframework/container-utils";
+import { readAndParse } from "@fluidframework/driver-utils";
+import { TelemetryDataTag } from "@fluidframework/telemetry-utils";
 import { ChannelStorageService } from "./channelStorageService";
+import { ChannelDeltaConnection } from "./channelDeltaConnection";
+import { ISharedObjectRegistry } from "./dataStoreRuntime";
 
 export const attributesBlobKey = ".attributes";
 
@@ -56,8 +66,12 @@ export interface IChannelContext {
 	updateUsedRoutes(usedRoutes: string[]): void;
 }
 
-export function createServiceEndpoints(
-	id: string,
+export interface ChannelServiceEndpoints {
+	deltaConnection: ChannelDeltaConnection;
+	objectStorage: ChannelStorageService;
+}
+
+export function createChannelServiceEndpoints(
 	connected: boolean,
 	submitFn: (content: any, localOpMetadata: unknown) => void,
 	dirtyFn: () => void,
@@ -66,9 +80,8 @@ export function createServiceEndpoints(
 	logger: ITelemetryLogger,
 	tree?: ISnapshotTree,
 	extraBlobs?: Map<string, ArrayBufferLike>,
-) {
+): ChannelServiceEndpoints {
 	const deltaConnection = new ChannelDeltaConnection(
-		id,
 		connected,
 		(message, localOpMetadata) => submitFn(message, localOpMetadata),
 		dirtyFn,
@@ -113,3 +126,89 @@ export async function summarizeChannelAsync(
 	addBlobToSummary(summarizeResult, attributesBlobKey, JSON.stringify(channel.attributes));
 	return summarizeResult;
 }
+
+export async function loadChannelFactoryAndAttributes(
+	dataStoreContext: IFluidDataStoreContext,
+	services: ChannelServiceEndpoints,
+	channelId: string,
+	registry: ISharedObjectRegistry,
+	attachMessageType?: string,
+): Promise<{ factory: IChannelFactory; attributes: IChannelAttributes }> {
+	let attributes: IChannelAttributes | undefined;
+	if (await services.objectStorage.contains(attributesBlobKey)) {
+		attributes = await readAndParse<IChannelAttributes | undefined>(
+			services.objectStorage,
+			attributesBlobKey,
+		);
+	}
+
+	// This is a backward compatibility case where the attach message doesn't include attributes. They must
+	// include attach message type.
+	// Since old attach messages will not have attributes, we need to keep this as long as we support old attach
+	// messages.
+	const channelFactoryType = attributes ? attributes.type : attachMessageType;
+	if (channelFactoryType === undefined) {
+		throw new DataCorruptionError("channelTypeNotAvailable", {
+			channelId: {
+				value: channelId,
+				tag: TelemetryDataTag.CodeArtifact,
+			},
+			dataStoreId: {
+				value: dataStoreContext.id,
+				tag: TelemetryDataTag.CodeArtifact,
+			},
+			dataStorePackagePath: dataStoreContext.packagePath.join("/"),
+			channelFactoryType: attachMessageType,
+		});
+	}
+	const factory = registry.get(channelFactoryType);
+	if (factory === undefined) {
+		// TODO: dataStoreId may require a different tag from PackageData #7488
+		throw new DataCorruptionError("channelFactoryNotRegisteredForGivenType", {
+			channelId: {
+				value: channelId,
+				tag: TelemetryDataTag.CodeArtifact,
+			},
+			dataStoreId: {
+				value: dataStoreContext.id,
+				tag: TelemetryDataTag.CodeArtifact,
+			},
+			dataStorePackagePath: dataStoreContext.packagePath.join("/"),
+			channelFactoryType,
+		});
+	}
+	// This is a backward compatibility case where the attach message doesn't include attributes. Get the attributes
+	// from the factory.
+	attributes = attributes ?? factory.attributes;
+	return { factory, attributes };
+}
+
+export async function loadChannel(
+	dataStoreRuntime: IFluidDataStoreRuntime,
+	attributes: IChannelAttributes,
+	factory: IChannelFactory,
+	services: ChannelServiceEndpoints,
+	logger: ITelemetryLogger,
+	channelId: string,
+): Promise<IChannel> {
+	// Compare snapshot version to collaborative object version
+	if (
+		attributes.snapshotFormatVersion !== undefined &&
+		attributes.snapshotFormatVersion !== factory.attributes.snapshotFormatVersion
+	) {
+		logger.sendTelemetryEvent({
+			eventName: "ChannelAttributesVersionMismatch",
+			channelType: { value: attributes.type, tag: TelemetryDataTag.CodeArtifact },
+			channelSnapshotVersion: {
+				value: `${attributes.snapshotFormatVersion}@${attributes.packageVersion}`,
+				tag: TelemetryDataTag.CodeArtifact,
+			},
+			channelCodeVersion: {
+				value: `${factory.attributes.snapshotFormatVersion}@${factory.attributes.packageVersion}`,
+				tag: TelemetryDataTag.CodeArtifact,
+			},
+		});
+	}
+
+	return factory.load(dataStoreRuntime, channelId, services, attributes);
+}

package/src/channelDeltaConnection.ts

@@ -4,7 +4,7 @@
  */
 
 import { assert } from "@fluidframework/common-utils";
-import { IDocumentMessage, ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
+import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
 import { IDeltaConnection, IDeltaHandler } from "@fluidframework/datastore-definitions";
 import { DataProcessingError } from "@fluidframework/container-utils";
 import { IFluidHandle } from "@fluidframework/core-interfaces";
@@ -21,9 +21,8 @@ export class ChannelDeltaConnection implements IDeltaConnection {
 	}
 
 	constructor(
-		public objectId: string,
 		private _connected: boolean,
-		public readonly submit: (message: IDocumentMessage, localOpMetadata: unknown) => void,
+		public readonly submit: (content: any, localOpMetadata: unknown) => void,
 		public readonly dirty: () => void,
 		public readonly addedGCOutboundReference: (
 			srcHandle: IFluidHandle,
@@ -65,7 +64,7 @@ export class ChannelDeltaConnection implements IDeltaConnection {
 		this.handler.rollback(content, localOpMetadata);
 	}
 
-	public applyStashedOp(message: ISequencedDocumentMessage): unknown {
-		return this.handler.applyStashedOp(message);
+	public applyStashedOp(content: any): unknown {
+		return this.handler.applyStashedOp(content);
 	}
 }

package/src/dataStoreRuntime.ts

@@ -278,7 +278,7 @@ export class FluidDataStoreRuntime
 					return;
 				}
 
-				let channelContext: IChannelContext;
+				let channelContext: RemoteChannelContext | RehydratedLocalChannelContext;
 				// If already exists on storage, then create a remote channel. However, if it is case of rehydrating a
 				// container from snapshot where we load detached container from a snapshot, isLocalDataStore would be
 				// true. In this case create a RehydratedLocalChannelContext.
@@ -302,12 +302,9 @@ export class FluidDataStoreRuntime
 					// the channel visible. So do it now. Otherwise, add it to local channel context queue, so
 					// that it can be make it visible later with the data store.
 					if (dataStoreContext.attachState !== AttachState.Detached) {
-						(channelContext as LocalChannelContextBase).makeVisible();
+						channelContext.makeVisible();
 					} else {
-						this.localChannelContextQueue.set(
-							path,
-							channelContext as LocalChannelContextBase,
-						);
+						this.localChannelContextQueue.set(path, channelContext);
 					}
 				} else {
 					channelContext = new RemoteChannelContext(
@@ -478,7 +475,6 @@ export class FluidDataStoreRuntime
 		// Channels (DDS) should not be created in summarizer client.
 		this.identifyLocalChangeInSummarizer("DDSCreatedInSummarizer", id, type);
 
-		assert(!!context.channel, 0x17a /* "Channel should be loaded when created!!" */);
 		return context.channel;
 	}
 
@@ -490,7 +486,7 @@ export class FluidDataStoreRuntime
 	public bindChannel(channel: IChannel): void {
 		assert(
 			this.notBoundedChannelContextSet.has(channel.id),
-			0x17b /* "Channel to be binded should be in not bounded set" */,
+			0x17b /* "Channel to be bound should be in not bounded set" */,
 		);
 		this.notBoundedChannelContextSet.delete(channel.id);
 		// If our data store is attached, then attach the channel.

package/src/localChannelContext.ts

@@ -8,65 +8,58 @@ import cloneDeep from "lodash/cloneDeep";
 import { ITelemetryLogger } from "@fluidframework/common-definitions";
 import { IDocumentStorageService } from "@fluidframework/driver-definitions";
 import { ISequencedDocumentMessage, ISnapshotTree } from "@fluidframework/protocol-definitions";
-import {
-	IChannel,
-	IFluidDataStoreRuntime,
-	IChannelFactory,
-	IChannelAttributes,
-} from "@fluidframework/datastore-definitions";
+import { IChannel, IFluidDataStoreRuntime } from "@fluidframework/datastore-definitions";
 import {
 	IFluidDataStoreContext,
 	IGarbageCollectionData,
 	ISummarizeResult,
 	ITelemetryContext,
 } from "@fluidframework/runtime-definitions";
-import { readAndParse } from "@fluidframework/driver-utils";
 import { DataProcessingError } from "@fluidframework/container-utils";
-import { assert, Lazy } from "@fluidframework/common-utils";
+import { assert, Lazy, LazyPromise } from "@fluidframework/common-utils";
 import { IFluidHandle } from "@fluidframework/core-interfaces";
 import {
-	createServiceEndpoints,
+	ChannelServiceEndpoints,
+	createChannelServiceEndpoints,
 	IChannelContext,
+	loadChannel,
+	loadChannelFactoryAndAttributes,
 	summarizeChannel,
 	summarizeChannelAsync,
 } from "./channelContext";
-import { ChannelDeltaConnection } from "./channelDeltaConnection";
 import { ISharedObjectRegistry } from "./dataStoreRuntime";
-import { ChannelStorageService } from "./channelStorageService";
 
 /**
  * Channel context for a locally created channel
  */
 export abstract class LocalChannelContextBase implements IChannelContext {
-	public channel: IChannel | undefined;
 	private globallyVisible = false;
 	protected readonly pending: ISequencedDocumentMessage[] = [];
-	protected factory: IChannelFactory | undefined;
 	constructor(
 		protected readonly id: string,
-		protected readonly registry: ISharedObjectRegistry,
 		protected readonly runtime: IFluidDataStoreRuntime,
-		private readonly servicesGetter: () => Lazy<{
-			readonly deltaConnection: ChannelDeltaConnection;
-			readonly objectStorage: ChannelStorageService;
-		}>,
+		protected readonly services: Lazy<ChannelServiceEndpoints>,
+		private readonly channelP: Promise<IChannel>,
+		private _channel?: IChannel,
 	) {
 		assert(!this.id.includes("/"), 0x30f /* Channel context ID cannot contain slashes */);
 	}
 
 	public async getChannel(): Promise<IChannel> {
-		assert(this.channel !== undefined, 0x207 /* "Channel should be defined" */);
-		return this.channel;
+		if (this._channel === undefined) {
+			return this.channelP.then((c) => (this._channel = c));
+		}
+		return this.channelP;
 	}
 
 	public get isLoaded(): boolean {
-		return this.channel !== undefined;
+		return this._channel !== undefined;
 	}
 
 	public setConnectionState(connected: boolean, clientId?: string) {
 		// Connection events are ignored if the data store is not yet globallyVisible or loaded
 		if (this.globallyVisible && this.isLoaded) {
-			this.servicesGetter().value.deltaConnection.setConnectionState(connected);
+			this.services.value.deltaConnection.setConnectionState(connected);
 		}
 	}
 
@@ -84,7 +77,7 @@ export abstract class LocalChannelContextBase implements IChannelContext {
 		// delay loading. So after the container is attached and some other client joins which start generating
 		// ops for this channel. So not loaded local channel can still receive ops and we store them to process later.
 		if (this.isLoaded) {
-			this.servicesGetter().value.deltaConnection.process(message, local, localOpMetadata);
+			this.services.value.deltaConnection.process(message, local, localOpMetadata);
 		} else {
 			assert(
 				local === false,
@@ -100,7 +93,7 @@ export abstract class LocalChannelContextBase implements IChannelContext {
 			this.globallyVisible,
 			0x2d4 /* "Local channel must be globally visible when resubmitting op" */,
 		);
-		this.servicesGetter().value.deltaConnection.reSubmit(content, localOpMetadata);
+		this.services.value.deltaConnection.reSubmit(content, localOpMetadata);
 	}
 	public rollback(content: any, localOpMetadata: unknown) {
 		assert(this.isLoaded, 0x2ee /* "Channel should be loaded to rollback ops" */);
@@ -108,7 +101,7 @@ export abstract class LocalChannelContextBase implements IChannelContext {
 			this.globallyVisible,
 			0x2ef /* "Local channel must be globally visible when rolling back op" */,
 		);
-		this.servicesGetter().value.deltaConnection.rollback(content, localOpMetadata);
+		this.services.value.deltaConnection.rollback(content, localOpMetadata);
 	}
 
 	public applyStashedOp() {
@@ -126,20 +119,17 @@ export abstract class LocalChannelContextBase implements IChannelContext {
 		trackState: boolean = false,
 		telemetryContext?: ITelemetryContext,
 	): Promise<ISummarizeResult> {
-		assert(
-			this.isLoaded && this.channel !== undefined,
-			0x18c /* "Channel should be loaded to summarize" */,
-		);
-		return summarizeChannelAsync(this.channel, fullTree, trackState, telemetryContext);
+		const channel = await this.getChannel();
+		return summarizeChannelAsync(channel, fullTree, trackState, telemetryContext);
 	}
 
 	public getAttachSummary(telemetryContext?: ITelemetryContext): ISummarizeResult {
 		assert(
-			this.isLoaded && this.channel !== undefined,
+			this._channel !== undefined,
 			0x18d /* "Channel should be loaded to take snapshot" */,
 		);
 		return summarizeChannel(
-			this.channel,
+			this._channel,
 			true /* fullTree */,
 			false /* trackState */,
 			telemetryContext,
@@ -152,8 +142,8 @@ export abstract class LocalChannelContextBase implements IChannelContext {
 		}
 
 		if (this.isLoaded) {
-			assert(!!this.channel, 0x192 /* "Channel should be there if loaded!!" */);
-			this.channel.connect(this.servicesGetter().value);
+			assert(!!this._channel, 0x192 /* "Channel should be there if loaded!!" */);
+			this._channel.connect(this.services.value);
 		}
 		this.globallyVisible = true;
 	}
@@ -165,11 +155,8 @@ export abstract class LocalChannelContextBase implements IChannelContext {
 	 * @param fullGC - true to bypass optimizations and force full generation of GC data.
 	 */
 	public async getGCData(fullGC: boolean = false): Promise<IGarbageCollectionData> {
-		assert(
-			this.isLoaded && this.channel !== undefined,
-			0x193 /* "Channel should be loaded to run GC" */,
-		);
-		return this.channel.getGCData(fullGC);
+		const channel = await this.getChannel();
+		return channel.getGCData(fullGC);
 	}
 
 	public updateUsedRoutes(usedRoutes: string[]) {
@@ -182,13 +169,7 @@ export abstract class LocalChannelContextBase implements IChannelContext {
 }
 
 export class RehydratedLocalChannelContext extends LocalChannelContextBase {
-	private readonly services: Lazy<{
-		readonly deltaConnection: ChannelDeltaConnection;
-		readonly objectStorage: ChannelStorageService;
-	}>;
-
 	private readonly dirtyFn: () => void;
-
 	constructor(
 		id: string,
 		registry: ISharedObjectRegistry,
@@ -201,88 +182,69 @@ export class RehydratedLocalChannelContext extends LocalChannelContextBase {
 		addedGCOutboundReferenceFn: (srcHandle: IFluidHandle, outboundHandle: IFluidHandle) => void,
 		private readonly snapshotTree: ISnapshotTree,
 	) {
-		super(id, registry, runtime, () => this.services);
-		const blobMap: Map<string, ArrayBufferLike> = new Map<string, ArrayBufferLike>();
-		const clonedSnapshotTree = cloneDeep(this.snapshotTree);
-		// 0.47 back-compat Need to sanitize if snapshotTree.blobs still contains blob contents too.
-		// This is for older snapshot which is generated by loader <=0.47 version which still contains
-		// the contents within blobs. After a couple of revisions we can remove it.
-		if (this.isSnapshotInOldFormatAndCollectBlobs(clonedSnapshotTree, blobMap)) {
-			this.sanitizeSnapshot(clonedSnapshotTree);
-		}
+		super(
+			id,
+			runtime,
+			new Lazy(() => {
+				const blobMap: Map<string, ArrayBufferLike> = new Map<string, ArrayBufferLike>();
+				const clonedSnapshotTree = cloneDeep(this.snapshotTree);
+				// 0.47 back-compat Need to sanitize if snapshotTree.blobs still contains blob contents too.
+				// This is for older snapshot which is generated by loader <=0.47 version which still contains
+				// the contents within blobs. After a couple of revisions we can remove it.
+				if (this.isSnapshotInOldFormatAndCollectBlobs(clonedSnapshotTree, blobMap)) {
+					this.sanitizeSnapshot(clonedSnapshotTree);
+				}
+				return createChannelServiceEndpoints(
+					dataStoreContext.connected,
+					submitFn,
+					this.dirtyFn,
+					addedGCOutboundReferenceFn,
+					storageService,
+					logger,
+					clonedSnapshotTree,
+					blobMap,
+				);
+			}),
+			new LazyPromise<IChannel>(async () => {
+				try {
+					const { attributes, factory } = await loadChannelFactoryAndAttributes(
+						dataStoreContext,
+						this.services.value,
+						this.id,
+						registry,
+					);
+					const channel = await loadChannel(
+						runtime,
+						attributes,
+						factory,
+						this.services.value,
+						logger,
+						this.id,
+					);
+					// Send all pending messages to the channel
+					for (const message of this.pending) {
+						this.services.value.deltaConnection.process(
+							message,
+							false,
+							undefined /* localOpMetadata */,
+						);
+					}
+					return channel;
+				} catch (err) {
+					throw DataProcessingError.wrapIfUnrecognized(
+						err,
+						"rehydratedLocalChannelContextFailedToLoadChannel",
+						undefined,
+					);
+				}
+			}),
+		);
 
-		this.services = new Lazy(() => {
-			return createServiceEndpoints(
-				this.id,
-				dataStoreContext.connected,
-				submitFn,
-				this.dirtyFn,
-				addedGCOutboundReferenceFn,
-				storageService,
-				logger,
-				clonedSnapshotTree,
-				blobMap,
-			);
-		});
 		this.dirtyFn = () => {
 			dirtyFn(id);
 		};
 	}
 
-	public async getChannel(): Promise<IChannel> {
-		if (this.channel === undefined) {
-			this.channel = await this.loadChannel().catch((err) => {
-				throw DataProcessingError.wrapIfUnrecognized(
-					err,
-					"rehydratedLocalChannelContextFailedToLoadChannel",
-					undefined,
-				);
-			});
-		}
-		return this.channel;
-	}
-
-	private async loadChannel(): Promise<IChannel> {
-		assert(!this.isLoaded, 0x18e /* "Channel must not already be loaded when loading" */);
-		assert(
-			await this.services.value.objectStorage.contains(".attributes"),
-			0x190 /* ".attributes blob should be present" */,
-		);
-		const attributes = await readAndParse<IChannelAttributes>(
-			this.services.value.objectStorage,
-			".attributes",
-		);
-
-		assert(
-			this.factory === undefined,
-			0x208 /* "Factory should be undefined before loading" */,
-		);
-		this.factory = this.registry.get(attributes.type);
-		if (this.factory === undefined) {
-			throw new Error(`Channel Factory ${attributes.type} not registered`);
-		}
-		// Services will be assigned during this load.
-		const channel = await this.factory.load(
-			this.runtime,
-			this.id,
-			this.services.value,
-			attributes,
-		);
-
-		// Commit changes.
-		this.channel = channel;
-
-		// Send all pending messages to the channel
-		for (const message of this.pending) {
-			this.services.value.deltaConnection.process(
-				message,
-				false,
-				undefined /* localOpMetadata */,
-			);
-		}
-		return this.channel;
-	}
-
 	private isSnapshotInOldFormatAndCollectBlobs(
 		snapshotTree: ISnapshotTree,
 		blobMap: Map<string, ArrayBufferLike>,
@@ -318,11 +280,8 @@ export class RehydratedLocalChannelContext extends LocalChannelContextBase {
 }
 
 export class LocalChannelContext extends LocalChannelContextBase {
-	private readonly services: Lazy<{
-		readonly deltaConnection: ChannelDeltaConnection;
-		readonly objectStorage: ChannelStorageService;
-	}>;
 	private readonly dirtyFn: () => void;
+	public readonly channel: IChannel;
 	constructor(
 		id: string,
 		registry: ISharedObjectRegistry,
@@ -335,24 +294,30 @@ export class LocalChannelContext extends LocalChannelContextBase {
 		dirtyFn: (address: string) => void,
 		addedGCOutboundReferenceFn: (srcHandle: IFluidHandle, outboundHandle: IFluidHandle) => void,
 	) {
-		super(id, registry, runtime, () => this.services);
 		assert(type !== undefined, 0x209 /* "Factory Type should be defined" */);
-		this.factory = registry.get(type);
-		if (this.factory === undefined) {
+		const factory = registry.get(type);
+		if (factory === undefined) {
 			throw new Error(`Channel Factory ${type} not registered`);
 		}
-		this.channel = this.factory.create(runtime, id);
-		this.services = new Lazy(() => {
-			return createServiceEndpoints(
-				this.id,
-				dataStoreContext.connected,
-				submitFn,
-				this.dirtyFn,
-				addedGCOutboundReferenceFn,
-				storageService,
-				logger,
-			);
-		});
+		const channel = factory.create(runtime, id);
+		super(
+			id,
+			runtime,
+			new Lazy(() => {
+				return createChannelServiceEndpoints(
+					dataStoreContext.connected,
+					submitFn,
+					this.dirtyFn,
+					addedGCOutboundReferenceFn,
+					storageService,
+					logger,
+				);
+			}),
+			Promise.resolve(channel),
+			channel,
+		);
+		this.channel = channel;
+
 		this.dirtyFn = () => {
 			dirtyFn(id);
 		};