Skip to content
Open
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion PACKAGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ The dependencies between layers are enforced by the layer-check command._

| Packages | Layer Dependencies |
| --- | --- |
| - [@fluidframework/azure-client](/packages/service-clients/azure-client)</br>- [@fluidframework/odsp-client](/packages/service-clients/odsp-client)</br>- [@fluidframework/tinylicious-client](/packages/service-clients/tinylicious-client)</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp; | - [Core-Interfaces](#Core-Interfaces)</br>- [Driver-Definitions](#Driver-Definitions)</br>- [Container-Definitions](#Container-Definitions)</br>- [Core-Utils](#Core-Utils)</br>- [Telemetry-Utils](#Telemetry-Utils)</br>- [Driver-Utils](#Driver-Utils)</br>- [Other-Utils](#Other-Utils)</br>- [Driver](#Driver)</br>- [Loader](#Loader)</br>- [Runtime](#Runtime)</br>- [Framework](#Framework)</br>- [Routerlicious-Driver](#Routerlicious-Driver) |
| - [@fluidframework/azure-client](/packages/service-clients/azure-client)</br>- [@fluidframework/odsp-client](/packages/service-clients/odsp-client)</br>- [@fluidframework/tinylicious-client](/packages/service-clients/tinylicious-client)</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp;</br>&nbsp; | - [Core-Interfaces](#Core-Interfaces)</br>- [Driver-Definitions](#Driver-Definitions)</br>- [Container-Definitions](#Container-Definitions)</br>- [Core-Utils](#Core-Utils)</br>- [Client-Utils](#Client-Utils)</br>- [Telemetry-Utils](#Telemetry-Utils)</br>- [Driver-Utils](#Driver-Utils)</br>- [Other-Utils](#Other-Utils)</br>- [Driver](#Driver)</br>- [Loader](#Loader)</br>- [Runtime](#Runtime)</br>- [Framework](#Framework)</br>- [Routerlicious-Driver](#Routerlicious-Driver) |

### Examples

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
// @beta
export type IOdspAudience = IServiceAudience<OdspMember>;

// @beta
export interface IOdspContainerServicesEvents extends IEvent {
(event: "readOnlyStateChanged", listener: (readonly: boolean) => void): void;
(event: "sensitivityLabelChanged", listener: (sensitivityLabelsInfo: string) => void): void;
}

// @beta
export interface IOdspFluidContainer<TContainerSchema extends ContainerSchema = ContainerSchema> extends IFluidContainer<TContainerSchema> {
attach(props?: ContainerAttachProps<OdspContainerAttachProps>): Promise<string>;
Expand Down Expand Up @@ -55,8 +61,9 @@ export interface OdspContainerAttachProps {
}

// @beta
export interface OdspContainerServices {
export interface OdspContainerServices extends IEventProvider<IOdspContainerServicesEvents>, IDisposable {
audience: IOdspAudience;
getReadOnlyState(): boolean | undefined;
}

// @beta
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
// @beta
export type IOdspAudience = IServiceAudience<OdspMember>;

// @beta
export interface IOdspContainerServicesEvents extends IEvent {
(event: "readOnlyStateChanged", listener: (readonly: boolean) => void): void;
(event: "sensitivityLabelChanged", listener: (sensitivityLabelsInfo: string) => void): void;
}

// @beta
export interface IOdspFluidContainer<TContainerSchema extends ContainerSchema = ContainerSchema> extends IFluidContainer<TContainerSchema> {
attach(props?: ContainerAttachProps<OdspContainerAttachProps>): Promise<string>;
Expand Down Expand Up @@ -55,8 +61,9 @@ export interface OdspContainerAttachProps {
}

// @beta
export interface OdspContainerServices {
export interface OdspContainerServices extends IEventProvider<IOdspContainerServicesEvents>, IDisposable {
audience: IOdspAudience;
getReadOnlyState(): boolean | undefined;
}

// @beta
Expand Down
1 change: 1 addition & 0 deletions packages/service-clients/odsp-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@
"temp-directory": "nyc/.nyc_output"
},
"dependencies": {
"@fluid-internal/client-utils": "workspace:~",
"@fluidframework/container-definitions": "workspace:~",
"@fluidframework/container-loader": "workspace:~",
"@fluidframework/core-interfaces": "workspace:~",
Expand Down
1 change: 1 addition & 0 deletions packages/service-clients/odsp-client/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

export type {
IOdspAudience,
IOdspContainerServicesEvents,
IOdspFluidContainer,
OdspClientProps,
OdspConnectionConfig,
Expand Down
29 changes: 28 additions & 1 deletion packages/service-clients/odsp-client/src/interfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@

import type {
IConfigProviderBase,
IDisposable,
IEvent,
IEventProvider,
ITelemetryBaseLogger,
} from "@fluidframework/core-interfaces";
import type {
Expand Down Expand Up @@ -79,6 +82,22 @@ export interface OdspContainerAttachProps {
fileName: string | undefined;
}

/**
* Events emitted by the ODSP container service to notify consumers of select
* container changes.
* @beta
*/
export interface IOdspContainerServicesEvents extends IEvent {
/**
* Emitted when the read-only state of the container changes.
*/
(event: "readOnlyStateChanged", listener: (readonly: boolean) => void): void;
/**
* Emitted when the sensitivity label of the container changes.
*/
(event: "sensitivityLabelChanged", listener: (sensitivityLabelsInfo: string) => void): void;
}

/**
* ODSP version of the IFluidContainer interface.
* @beta
Expand Down Expand Up @@ -107,11 +126,19 @@ export interface IOdspFluidContainer<
* use, will not be included here but rather on the FluidContainer class itself.
* @beta
*/
export interface OdspContainerServices {
export interface OdspContainerServices
extends IEventProvider<IOdspContainerServicesEvents>,
IDisposable {
/**
* Provides an object that facilitates obtaining information about users present in the Fluid session, as well as listeners for roster changes triggered by users joining or leaving the session.
*/
audience: IOdspAudience;

/**
* Gets the read-only state of the container, if available.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the thorough docs! These are great!

* @returns The read-only state (true when readonly, false when editable), or undefined if not available.
*/
getReadOnlyState(): boolean | undefined;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general readonly state is not service-specific, so I'd probably expect to find it on IFluidContainer rather than a container services interface.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a handy way of exposing functionality via ODSP's beta API, rather than increasing scope to FluidContainer's public API. If you feel this needs to be added to the public API of FluidContainer instead, then we can increase the scope to do that. I worry it will prolong the timeline though, given the public IFluidContainer is a pretty tight subset of all container properties and events

Copy link
Contributor

@Josmithr Josmithr Nov 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe let's leave a @privateRemarks block comment noting that this should probably move to the base interface. I agree that moving it probably makes sense, but I don't think we need to block things on that.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, ya know what, looking at this again, I can get the same effect by doing what I did in other PRs via OdspFluidContainer

}

/**
Expand Down
44 changes: 42 additions & 2 deletions packages/service-clients/odsp-client/src/odspContainerServices.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,65 @@
* Licensed under the MIT License.
*/

import { TypedEventEmitter } from "@fluid-internal/client-utils";
import type { IContainer } from "@fluidframework/container-definitions/internal";
import type { IDisposable } from "@fluidframework/core-interfaces";
import { createServiceAudience } from "@fluidframework/fluid-static/internal";

import type {
IOdspAudience,
OdspContainerServices as IOdspContainerServices,
IOdspContainerServicesEvents,
} from "./interfaces.js";
import { createOdspAudienceMember } from "./odspAudience.js";

/**
* @internal
*/
export class OdspContainerServices implements IOdspContainerServices {
export class OdspContainerServices
extends TypedEventEmitter<IOdspContainerServicesEvents>
implements IOdspContainerServices, IDisposable
{
private _disposed = false;

public readonly audience: IOdspAudience;

public constructor(container: IContainer) {
public constructor(private readonly container: IContainer) {
super();
this.container.on("readonly", this.readonlyEventHandler);
this.container.on("metadataUpdate", this.metadataUpdateEventHandler);
this.audience = createServiceAudience({
container,
createServiceMember: createOdspAudienceMember,
});
}

private readonly readonlyEventHandler = (readonly: boolean): void => {
this.emit("readOnlyStateChanged", readonly);
};

private readonly metadataUpdateEventHandler = (metadata: Record<string, string>): void => {
if (metadata?.sensitivityLabelsInfo !== undefined) {
this.emit("sensitivityLabelChanged", metadata.sensitivityLabelsInfo);
}
};

public get disposed(): boolean {
return this._disposed;
}

public dispose(): void {
if (this._disposed) {
return;
}

this._disposed = true;
this.container.off("readonly", this.readonlyEventHandler);
this.container.off("metadataUpdate", this.metadataUpdateEventHandler);
this.removeAllListeners();
}

public getReadOnlyState(): boolean | undefined {
return this.container.readOnlyInfo.readonly;
}
}
3 changes: 3 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading