refactor(odsp-client): Move ODSP Container Services into a class

packages/service-clients/odsp-client/src/odspClient.ts

@@ -28,7 +28,6 @@ import type {
 import {
 	createDOProviderContainerRuntimeFactory,
 	createFluidContainer,
-	createServiceAudience,
 } from "@fluidframework/fluid-static/internal";
 import {
 	OdspDocumentServiceFactory,
@@ -46,9 +45,9 @@ import type {
 	OdspClientProps,
 	OdspConnectionConfig,
 	OdspContainerAttachProps,
-	OdspContainerServices,
+	OdspContainerServices as IOdspContainerServices,
 } from "./interfaces.js";
-import { createOdspAudienceMember } from "./odspAudience.js";
+import { OdspContainerServices } from "./odspContainerServices.js";
 import type { IOdspTokenProvider } from "./token.js";
 
 async function getStorageToken(
@@ -118,7 +117,7 @@ export class OdspClient {
 		containerSchema: T,
 	): Promise<{
 		container: IFluidContainer<T>;
-		services: OdspContainerServices;
+		services: IOdspContainerServices;
 	}> {
 		const loaderProps = this.getLoaderProps(containerSchema);
 
@@ -142,7 +141,7 @@ export class OdspClient {
 		containerSchema: T,
 	): Promise<{
 		container: IFluidContainer<T>;
-		services: OdspContainerServices;
+		services: IOdspContainerServices;
 	}> {
 		const loaderProps = this.getLoaderProps(containerSchema);
 		const url = createOdspUrl({
@@ -232,12 +231,7 @@ export class OdspClient {
 		return fluidContainer;
 	}
 
-	private async getContainerServices(container: IContainer): Promise<OdspContainerServices> {
-		return {
-			audience: createServiceAudience({
-				container,
-				createServiceMember: createOdspAudienceMember,
-			}),
-		};
+	private async getContainerServices(container: IContainer): Promise<IOdspContainerServices> {
+		return new OdspContainerServices(container);
 	}
 }

packages/service-clients/odsp-client/src/odspContainerServices.ts

@@ -0,0 +1,27 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import type { IContainer } from "@fluidframework/container-definitions/internal";
+import { createServiceAudience } from "@fluidframework/fluid-static/internal";
+
+import type {
+	IOdspAudience,
+	OdspContainerServices as IOdspContainerServices,
+} from "./interfaces.js";
+import { createOdspAudienceMember } from "./odspAudience.js";
+
+/**
+ * @internal
+ */
+export class OdspContainerServices implements IOdspContainerServices {
+	public readonly audience: IOdspAudience;
+
+	public constructor(container: IContainer) {
+		this.audience = createServiceAudience({
+			container,
+			createServiceMember: createOdspAudienceMember,
+		});
+	}
+}