@fluidframework/azure-end-to-end-tests 2.41.0-338401 → 2.42.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @fluidframework/azure-end-to-end-tests
 
+## 2.42.0
+
+Dependency updates only.
+
+## 2.41.0
+
+Dependency updates only.
+
 ## 2.40.0
 
 Dependency updates only.

package/lib/test/multiprocess/childClient.js

@@ -6,7 +6,7 @@ import { strict as assert } from "node:assert";
 import { AzureClient, } from "@fluidframework/azure-client";
 import { AttachState } from "@fluidframework/container-definitions";
 import { ConnectionState } from "@fluidframework/container-loader";
-import { getPresenceViaDataObject, ExperimentalPresenceManager,
+import { getPresence, ExperimentalPresenceManager,
 // eslint-disable-next-line import/no-internal-modules
  } from "@fluidframework/presence/alpha";
 import { InsecureTokenProvider } from "@fluidframework/test-runtime-utils/internal";
@@ -44,7 +44,8 @@ const getOrCreatePresenceContainer = async (id, user, config, scopes) => {
     const client = new AzureClient({ connection: connectionProps });
     const schema = {
         initialObjects: {
-            presence: ExperimentalPresenceManager,
+            // A DataObject is added as otherwise fluid-static complains "Container cannot be initialized without any DataTypes"
+            _unused: ExperimentalPresenceManager,
         },
     };
     let services;
@@ -64,7 +65,7 @@ const getOrCreatePresenceContainer = async (id, user, config, scopes) => {
         });
     }
     assert.strictEqual(container.attachState, AttachState.Attached, "Container is not attached after attach is called");
-    const presence = getPresenceViaDataObject(container.initialObjects.presence);
+    const presence = getPresence(container);
     return {
         client,
         container,

package/lib/test/multiprocess/childClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"childClient.js","sourceRoot":"","sources":["../../../src/test/multiprocess/childClient.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { strict as assert } from \"node:assert\";\n\nimport {\n\tAzureClient,\n\ttype AzureContainerServices,\n\tAzureLocalConnectionConfig,\n\tAzureRemoteConnectionConfig,\n} from \"@fluidframework/azure-client\";\nimport { AttachState } from \"@fluidframework/container-definitions\";\nimport { ConnectionState } from \"@fluidframework/container-loader\";\nimport { ContainerSchema, type IFluidContainer } from \"@fluidframework/fluid-static\";\nimport {\n\tgetPresenceViaDataObject,\n\tExperimentalPresenceManager,\n\ttype ExperimentalPresenceDO,\n\ttype Presence,\n\ttype Attendee,\n\t// eslint-disable-next-line import/no-internal-modules\n} from \"@fluidframework/presence/alpha\";\nimport { InsecureTokenProvider } from \"@fluidframework/test-runtime-utils/internal\";\nimport { timeoutPromise } from \"@fluidframework/test-utils/internal\";\n\nimport { ScopeType } from \"../AzureClientFactory.js\";\nimport { createAzureTokenProvider } from \"../AzureTokenFactory.js\";\nimport { configProvider } from \"../utils.js\";\n\nimport { MessageFromChild, MessageToChild } from \"./messageTypes.js\";\n\ntype MessageFromParent = MessageToChild;\ntype MessageToParent = Required<MessageFromChild>;\ninterface UserIdAndName {\n\tid: string;\n\tname: string;\n}\n\nconst connectTimeoutMs = 10_000;\n// Identifier given to child process\nconst process_id = process.argv[2];\n\nconst useAzure = process.env.FLUID_CLIENT === \"azure\";\nconst tenantId = useAzure\n\t? (process.env.azure__fluid__relay__service__tenantId as string)\n\t: \"frs-client-tenant\";\nconst endPoint = process.env.azure__fluid__relay__service__endpoint as string;\nif (useAzure && endPoint === undefined) {\n\tthrow new Error(\"Azure Fluid Relay service endpoint is missing\");\n}\n\n/**\n * Get or create a Fluid container with Presence in initialObjects.\n */\nconst getOrCreatePresenceContainer = async (\n\tid: string | undefined,\n\tuser: UserIdAndName,\n\tconfig?: ReturnType<typeof configProvider>,\n\tscopes?: ScopeType[],\n): Promise<{\n\tcontainer: IFluidContainer;\n\tpresence: Presence;\n\tservices: AzureContainerServices;\n\tclient: AzureClient;\n\tcontainerId: string;\n}> => {\n\tlet container: IFluidContainer;\n\tlet containerId: string;\n\tconst connectionProps: AzureRemoteConnectionConfig | AzureLocalConnectionConfig = useAzure\n\t\t? {\n\t\t\t\ttenantId,\n\t\t\t\ttokenProvider: createAzureTokenProvider(user.id ?? \"foo\", user.name ?? \"bar\", scopes),\n\t\t\t\tendpoint: endPoint,\n\t\t\t\ttype: \"remote\",\n\t\t\t}\n\t\t: {\n\t\t\t\ttokenProvider: new InsecureTokenProvider(\"fooBar\", user, scopes),\n\t\t\t\tendpoint: \"http://localhost:7071\",\n\t\t\t\ttype: \"local\",\n\t\t\t};\n\tconst client = new AzureClient({ connection: connectionProps });\n\tconst schema: ContainerSchema = {\n\t\tinitialObjects: {\n\t\t\tpresence: ExperimentalPresenceManager,\n\t\t},\n\t};\n\tlet services: AzureContainerServices;\n\tif (id === undefined) {\n\t\t({ container, services } = await client.createContainer(schema, \"2\"));\n\t\tcontainerId = await container.attach();\n\t} else {\n\t\tcontainerId = id;\n\t\t({ container, services } = await client.getContainer(containerId, schema, \"2\"));\n\t}\n\t// wait for 'ConnectionState.Connected' so we return with client connected to container\n\tif (container.connectionState !== ConnectionState.Connected) {\n\t\tawait timeoutPromise((resolve) => container.once(\"connected\", () => resolve()), {\n\t\t\tdurationMs: connectTimeoutMs,\n\t\t\terrorMsg: \"container connect() timeout\",\n\t\t});\n\t}\n\tassert.strictEqual(\n\t\tcontainer.attachState,\n\t\tAttachState.Attached,\n\t\t\"Container is not attached after attach is called\",\n\t);\n\n\tconst presence = getPresenceViaDataObject(\n\t\tcontainer.initialObjects.presence as ExperimentalPresenceDO,\n\t);\n\treturn {\n\t\tclient,\n\t\tcontainer,\n\t\tpresence,\n\t\tservices,\n\t\tcontainerId,\n\t};\n};\nfunction createSendFunction(): (msg: MessageToParent) => void {\n\tif (process.send) {\n\t\treturn process.send.bind(process);\n\t}\n\tthrow new Error(\"process.send is not defined\");\n}\n\nconst send = createSendFunction();\n\nfunction isConnected(container: IFluidContainer | undefined): boolean {\n\treturn container !== undefined && container.connectionState === ConnectionState.Connected;\n}\n\nclass MessageHandler {\n\tpublic presence: Presence | undefined;\n\tpublic container: IFluidContainer | undefined;\n\tpublic containerId: string | undefined;\n\n\tpublic async onMessage(msg: MessageFromParent): Promise<void> {\n\t\tswitch (msg.command) {\n\t\t\t// Respond to connect command by connecting to Fluid container with the provided user information.\n\t\t\tcase \"connect\": {\n\t\t\t\t// Check if valid user information has been provided by parent/orchestrator\n\t\t\t\tif (!msg.user) {\n\t\t\t\t\tsend({ event: \"error\", error: `${process_id}: No azure user information given` });\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\t// Check if already connected to container\n\t\t\t\tif (isConnected(this.container)) {\n\t\t\t\t\tsend({ event: \"error\", error: `${process_id}: Already connected to container` });\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\tconst { container, presence, containerId } = await getOrCreatePresenceContainer(\n\t\t\t\t\tmsg.containerId,\n\t\t\t\t\tmsg.user,\n\t\t\t\t);\n\t\t\t\tthis.container = container;\n\t\t\t\tthis.presence = presence;\n\t\t\t\tthis.containerId = containerId;\n\n\t\t\t\t// Listen for presence events to notify parent/orchestrator when a new attendee joins or leaves the session.\n\t\t\t\tpresence.attendees.events.on(\"attendeeConnected\", (attendee: Attendee) => {\n\t\t\t\t\tconst m: MessageToParent = {\n\t\t\t\t\t\tevent: \"attendeeConnected\",\n\t\t\t\t\t\tattendeeId: attendee.attendeeId,\n\t\t\t\t\t};\n\t\t\t\t\tsend(m);\n\t\t\t\t});\n\t\t\t\tpresence.attendees.events.on(\"attendeeDisconnected\", (attendee: Attendee) => {\n\t\t\t\t\tconst m: MessageToParent = {\n\t\t\t\t\t\tevent: \"attendeeDisconnected\",\n\t\t\t\t\t\tattendeeId: attendee.attendeeId,\n\t\t\t\t\t};\n\t\t\t\t\tsend(m);\n\t\t\t\t});\n\t\t\t\tsend({\n\t\t\t\t\tevent: \"ready\",\n\t\t\t\t\tcontainerId,\n\t\t\t\t\tattendeeId: presence.attendees.getMyself().attendeeId,\n\t\t\t\t});\n\n\t\t\t\tbreak;\n\t\t\t}\n\n\t\t\t// Respond to disconnect command by disconnecting self from Fluid container.\n\t\t\tcase \"disconnectSelf\": {\n\t\t\t\tif (!this.container) {\n\t\t\t\t\tsend({ event: \"error\", error: `${process_id} is not connected to container` });\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\tif (!this.presence) {\n\t\t\t\t\tsend({ event: \"error\", error: `${process_id} is not connected to presence` });\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\n\t\t\t\tthis.container.disconnect();\n\t\t\t\tsend({\n\t\t\t\t\tevent: \"disconnectedSelf\",\n\t\t\t\t\tattendeeId: this.presence.attendees.getMyself().attendeeId,\n\t\t\t\t});\n\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\tdefault: {\n\t\t\t\tconsole.error(`${process_id}: Unknown command`);\n\t\t\t\tsend({ event: \"error\", error: `${process_id} Unknown command` });\n\t\t\t\tbreak;\n\t\t\t}\n\t\t}\n\t}\n}\n\nfunction setupMessageHandler(): void {\n\tconst messageHandler = new MessageHandler();\n\tprocess.on(\"message\", (msg: MessageFromParent) => {\n\t\tmessageHandler.onMessage(msg).catch((error: Error) => {\n\t\t\tconsole.error(`Error in client ${process_id}`, error);\n\t\t\tsend({ event: \"error\", error: `${process_id}: ${error.message}` });\n\t\t});\n\t});\n}\n\nsetupMessageHandler();\n"]}
+{"version":3,"file":"childClient.js","sourceRoot":"","sources":["../../../src/test/multiprocess/childClient.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { strict as assert } from \"node:assert\";\n\nimport {\n\tAzureClient,\n\ttype AzureContainerServices,\n\tAzureLocalConnectionConfig,\n\tAzureRemoteConnectionConfig,\n} from \"@fluidframework/azure-client\";\nimport { AttachState } from \"@fluidframework/container-definitions\";\nimport { ConnectionState } from \"@fluidframework/container-loader\";\nimport { ContainerSchema, type IFluidContainer } from \"@fluidframework/fluid-static\";\nimport {\n\tgetPresence,\n\ttype Attendee,\n\tExperimentalPresenceManager,\n\ttype Presence,\n\t// eslint-disable-next-line import/no-internal-modules\n} from \"@fluidframework/presence/alpha\";\nimport { InsecureTokenProvider } from \"@fluidframework/test-runtime-utils/internal\";\nimport { timeoutPromise } from \"@fluidframework/test-utils/internal\";\n\nimport { ScopeType } from \"../AzureClientFactory.js\";\nimport { createAzureTokenProvider } from \"../AzureTokenFactory.js\";\nimport { configProvider } from \"../utils.js\";\n\nimport { MessageFromChild, MessageToChild } from \"./messageTypes.js\";\n\ntype MessageFromParent = MessageToChild;\ntype MessageToParent = Required<MessageFromChild>;\ninterface UserIdAndName {\n\tid: string;\n\tname: string;\n}\n\nconst connectTimeoutMs = 10_000;\n// Identifier given to child process\nconst process_id = process.argv[2];\n\nconst useAzure = process.env.FLUID_CLIENT === \"azure\";\nconst tenantId = useAzure\n\t? (process.env.azure__fluid__relay__service__tenantId as string)\n\t: \"frs-client-tenant\";\nconst endPoint = process.env.azure__fluid__relay__service__endpoint as string;\nif (useAzure && endPoint === undefined) {\n\tthrow new Error(\"Azure Fluid Relay service endpoint is missing\");\n}\n\n/**\n * Get or create a Fluid container with Presence in initialObjects.\n */\nconst getOrCreatePresenceContainer = async (\n\tid: string | undefined,\n\tuser: UserIdAndName,\n\tconfig?: ReturnType<typeof configProvider>,\n\tscopes?: ScopeType[],\n): Promise<{\n\tcontainer: IFluidContainer;\n\tpresence: Presence;\n\tservices: AzureContainerServices;\n\tclient: AzureClient;\n\tcontainerId: string;\n}> => {\n\tlet container: IFluidContainer;\n\tlet containerId: string;\n\tconst connectionProps: AzureRemoteConnectionConfig | AzureLocalConnectionConfig = useAzure\n\t\t? {\n\t\t\t\ttenantId,\n\t\t\t\ttokenProvider: createAzureTokenProvider(user.id ?? \"foo\", user.name ?? \"bar\", scopes),\n\t\t\t\tendpoint: endPoint,\n\t\t\t\ttype: \"remote\",\n\t\t\t}\n\t\t: {\n\t\t\t\ttokenProvider: new InsecureTokenProvider(\"fooBar\", user, scopes),\n\t\t\t\tendpoint: \"http://localhost:7071\",\n\t\t\t\ttype: \"local\",\n\t\t\t};\n\tconst client = new AzureClient({ connection: connectionProps });\n\tconst schema: ContainerSchema = {\n\t\tinitialObjects: {\n\t\t\t// A DataObject is added as otherwise fluid-static complains \"Container cannot be initialized without any DataTypes\"\n\t\t\t_unused: ExperimentalPresenceManager,\n\t\t},\n\t};\n\tlet services: AzureContainerServices;\n\tif (id === undefined) {\n\t\t({ container, services } = await client.createContainer(schema, \"2\"));\n\t\tcontainerId = await container.attach();\n\t} else {\n\t\tcontainerId = id;\n\t\t({ container, services } = await client.getContainer(containerId, schema, \"2\"));\n\t}\n\t// wait for 'ConnectionState.Connected' so we return with client connected to container\n\tif (container.connectionState !== ConnectionState.Connected) {\n\t\tawait timeoutPromise((resolve) => container.once(\"connected\", () => resolve()), {\n\t\t\tdurationMs: connectTimeoutMs,\n\t\t\terrorMsg: \"container connect() timeout\",\n\t\t});\n\t}\n\tassert.strictEqual(\n\t\tcontainer.attachState,\n\t\tAttachState.Attached,\n\t\t\"Container is not attached after attach is called\",\n\t);\n\n\tconst presence = getPresence(container);\n\treturn {\n\t\tclient,\n\t\tcontainer,\n\t\tpresence,\n\t\tservices,\n\t\tcontainerId,\n\t};\n};\nfunction createSendFunction(): (msg: MessageToParent) => void {\n\tif (process.send) {\n\t\treturn process.send.bind(process);\n\t}\n\tthrow new Error(\"process.send is not defined\");\n}\n\nconst send = createSendFunction();\n\nfunction isConnected(container: IFluidContainer | undefined): boolean {\n\treturn container !== undefined && container.connectionState === ConnectionState.Connected;\n}\n\nclass MessageHandler {\n\tpublic presence: Presence | undefined;\n\tpublic container: IFluidContainer | undefined;\n\tpublic containerId: string | undefined;\n\n\tpublic async onMessage(msg: MessageFromParent): Promise<void> {\n\t\tswitch (msg.command) {\n\t\t\t// Respond to connect command by connecting to Fluid container with the provided user information.\n\t\t\tcase \"connect\": {\n\t\t\t\t// Check if valid user information has been provided by parent/orchestrator\n\t\t\t\tif (!msg.user) {\n\t\t\t\t\tsend({ event: \"error\", error: `${process_id}: No azure user information given` });\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\t// Check if already connected to container\n\t\t\t\tif (isConnected(this.container)) {\n\t\t\t\t\tsend({ event: \"error\", error: `${process_id}: Already connected to container` });\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\tconst { container, presence, containerId } = await getOrCreatePresenceContainer(\n\t\t\t\t\tmsg.containerId,\n\t\t\t\t\tmsg.user,\n\t\t\t\t);\n\t\t\t\tthis.container = container;\n\t\t\t\tthis.presence = presence;\n\t\t\t\tthis.containerId = containerId;\n\n\t\t\t\t// Listen for presence events to notify parent/orchestrator when a new attendee joins or leaves the session.\n\t\t\t\tpresence.attendees.events.on(\"attendeeConnected\", (attendee: Attendee) => {\n\t\t\t\t\tconst m: MessageToParent = {\n\t\t\t\t\t\tevent: \"attendeeConnected\",\n\t\t\t\t\t\tattendeeId: attendee.attendeeId,\n\t\t\t\t\t};\n\t\t\t\t\tsend(m);\n\t\t\t\t});\n\t\t\t\tpresence.attendees.events.on(\"attendeeDisconnected\", (attendee: Attendee) => {\n\t\t\t\t\tconst m: MessageToParent = {\n\t\t\t\t\t\tevent: \"attendeeDisconnected\",\n\t\t\t\t\t\tattendeeId: attendee.attendeeId,\n\t\t\t\t\t};\n\t\t\t\t\tsend(m);\n\t\t\t\t});\n\t\t\t\tsend({\n\t\t\t\t\tevent: \"ready\",\n\t\t\t\t\tcontainerId,\n\t\t\t\t\tattendeeId: presence.attendees.getMyself().attendeeId,\n\t\t\t\t});\n\n\t\t\t\tbreak;\n\t\t\t}\n\n\t\t\t// Respond to disconnect command by disconnecting self from Fluid container.\n\t\t\tcase \"disconnectSelf\": {\n\t\t\t\tif (!this.container) {\n\t\t\t\t\tsend({ event: \"error\", error: `${process_id} is not connected to container` });\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\t\t\t\tif (!this.presence) {\n\t\t\t\t\tsend({ event: \"error\", error: `${process_id} is not connected to presence` });\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\n\t\t\t\tthis.container.disconnect();\n\t\t\t\tsend({\n\t\t\t\t\tevent: \"disconnectedSelf\",\n\t\t\t\t\tattendeeId: this.presence.attendees.getMyself().attendeeId,\n\t\t\t\t});\n\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\tdefault: {\n\t\t\t\tconsole.error(`${process_id}: Unknown command`);\n\t\t\t\tsend({ event: \"error\", error: `${process_id} Unknown command` });\n\t\t\t\tbreak;\n\t\t\t}\n\t\t}\n\t}\n}\n\nfunction setupMessageHandler(): void {\n\tconst messageHandler = new MessageHandler();\n\tprocess.on(\"message\", (msg: MessageFromParent) => {\n\t\tmessageHandler.onMessage(msg).catch((error: Error) => {\n\t\t\tconsole.error(`Error in client ${process_id}`, error);\n\t\t\tsend({ event: \"error\", error: `${process_id}: ${error.message}` });\n\t\t});\n\t});\n}\n\nsetupMessageHandler();\n"]}

package/lib/test/multiprocess/messageTypes.js.map

@@ -1 +1 @@
-{"version":3,"file":"messageTypes.js","sourceRoot":"","sources":["../../../src/test/multiprocess/messageTypes.ts"],"names":[],"mappings":"AAAA;;;GAGG","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport type { AzureUser } from \"@fluidframework/azure-client/internal\";\n// eslint-disable-next-line import/no-internal-modules\nimport type { AttendeeId } from \"@fluidframework/presence/alpha\";\n\nexport type MessageToChild = ConnectCommand | DisconnectSelfCommand;\ninterface ConnectCommand {\n\tcommand: \"connect\";\n\tuser: AzureUser;\n\tcontainerId?: string;\n}\n\ninterface DisconnectSelfCommand {\n\tcommand: \"disconnectSelf\";\n}\n\nexport type MessageFromChild =\n\t| AttendeeDisconnectedEvent\n\t| attendeeConnectedEvent\n\t| ReadyEvent\n\t| DisconnectedSelfEvent\n\t| ErrorEvent;\ninterface AttendeeDisconnectedEvent {\n\tevent: \"attendeeDisconnected\";\n\tattendeeId: AttendeeId;\n}\n\ninterface attendeeConnectedEvent {\n\tevent: \"attendeeConnected\";\n\tattendeeId: AttendeeId;\n}\n\ninterface ReadyEvent {\n\tevent: \"ready\";\n\tcontainerId: string;\n\tattendeeId: AttendeeId;\n}\n\ninterface DisconnectedSelfEvent {\n\tevent: \"disconnectedSelf\";\n\tattendeeId: AttendeeId;\n}\ninterface ErrorEvent {\n\tevent: \"error\";\n\terror: string;\n}\n"]}
+{"version":3,"file":"messageTypes.js","sourceRoot":"","sources":["../../../src/test/multiprocess/messageTypes.ts"],"names":[],"mappings":"AAAA;;;GAGG","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport type { AzureUser } from \"@fluidframework/azure-client/internal\";\n// eslint-disable-next-line import/no-internal-modules\nimport type { AttendeeId } from \"@fluidframework/presence/beta\";\n\nexport type MessageToChild = ConnectCommand | DisconnectSelfCommand;\ninterface ConnectCommand {\n\tcommand: \"connect\";\n\tuser: AzureUser;\n\tcontainerId?: string;\n}\n\ninterface DisconnectSelfCommand {\n\tcommand: \"disconnectSelf\";\n}\n\nexport type MessageFromChild =\n\t| AttendeeDisconnectedEvent\n\t| attendeeConnectedEvent\n\t| ReadyEvent\n\t| DisconnectedSelfEvent\n\t| ErrorEvent;\ninterface AttendeeDisconnectedEvent {\n\tevent: \"attendeeDisconnected\";\n\tattendeeId: AttendeeId;\n}\n\ninterface attendeeConnectedEvent {\n\tevent: \"attendeeConnected\";\n\tattendeeId: AttendeeId;\n}\n\ninterface ReadyEvent {\n\tevent: \"ready\";\n\tcontainerId: string;\n\tattendeeId: AttendeeId;\n}\n\ninterface DisconnectedSelfEvent {\n\tevent: \"disconnectedSelf\";\n\tattendeeId: AttendeeId;\n}\ninterface ErrorEvent {\n\tevent: \"error\";\n\terror: string;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/azure-end-to-end-tests",
-  "version": "2.41.0-338401",
+  "version": "2.42.0",
   "description": "Azure client end to end tests",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -33,29 +33,29 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-experimental/data-objects": "2.41.0-338401",
-    "@fluid-internal/client-utils": "2.41.0-338401",
-    "@fluid-internal/mocha-test-setup": "2.41.0-338401",
-    "@fluid-private/test-version-utils": "2.41.0-338401",
-    "@fluidframework/aqueduct": "2.41.0-338401",
-    "@fluidframework/azure-client": "2.41.0-338401",
+    "@fluid-experimental/data-objects": "~2.42.0",
+    "@fluid-internal/client-utils": "~2.42.0",
+    "@fluid-internal/mocha-test-setup": "~2.42.0",
+    "@fluid-private/test-version-utils": "~2.42.0",
+    "@fluidframework/aqueduct": "~2.42.0",
+    "@fluidframework/azure-client": "~2.42.0",
     "@fluidframework/azure-client-legacy": "npm:@fluidframework/azure-client@^1.2.0",
-    "@fluidframework/container-definitions": "2.41.0-338401",
-    "@fluidframework/container-loader": "2.41.0-338401",
-    "@fluidframework/core-interfaces": "2.41.0-338401",
-    "@fluidframework/counter": "2.41.0-338401",
-    "@fluidframework/datastore-definitions": "2.41.0-338401",
-    "@fluidframework/fluid-static": "2.41.0-338401",
-    "@fluidframework/map": "2.41.0-338401",
+    "@fluidframework/container-definitions": "~2.42.0",
+    "@fluidframework/container-loader": "~2.42.0",
+    "@fluidframework/core-interfaces": "~2.42.0",
+    "@fluidframework/counter": "~2.42.0",
+    "@fluidframework/datastore-definitions": "~2.42.0",
+    "@fluidframework/fluid-static": "~2.42.0",
+    "@fluidframework/map": "~2.42.0",
     "@fluidframework/map-legacy": "npm:@fluidframework/map@^1.4.0",
-    "@fluidframework/matrix": "2.41.0-338401",
-    "@fluidframework/presence": "2.41.0-338401",
-    "@fluidframework/runtime-definitions": "2.41.0-338401",
-    "@fluidframework/sequence": "2.41.0-338401",
-    "@fluidframework/telemetry-utils": "2.41.0-338401",
-    "@fluidframework/test-runtime-utils": "2.41.0-338401",
-    "@fluidframework/test-utils": "2.41.0-338401",
-    "@fluidframework/tree": "2.41.0-338401",
+    "@fluidframework/matrix": "~2.42.0",
+    "@fluidframework/presence": "~2.42.0",
+    "@fluidframework/runtime-definitions": "~2.42.0",
+    "@fluidframework/sequence": "~2.42.0",
+    "@fluidframework/telemetry-utils": "~2.42.0",
+    "@fluidframework/test-runtime-utils": "~2.42.0",
+    "@fluidframework/test-utils": "~2.42.0",
+    "@fluidframework/tree": "~2.42.0",
     "axios": "^1.8.4",
     "cross-env": "^7.0.3",
     "mocha": "^10.8.2",
@@ -69,8 +69,8 @@
     "@biomejs/biome": "~1.9.3",
     "@fluidframework/build-common": "^2.0.3",
     "@fluidframework/build-tools": "^0.55.0",
-    "@fluidframework/driver-definitions": "2.41.0-338401",
-    "@fluidframework/eslint-config-fluid": "^5.7.3",
+    "@fluidframework/driver-definitions": "~2.42.0",
+    "@fluidframework/eslint-config-fluid": "^5.7.4",
     "@types/mocha": "^10.0.10",
     "@types/nock": "^9.3.0",
     "@types/node": "^18.19.0",

package/src/test/multiprocess/childClient.ts

@@ -15,11 +15,10 @@ import { AttachState } from "@fluidframework/container-definitions";
 import { ConnectionState } from "@fluidframework/container-loader";
 import { ContainerSchema, type IFluidContainer } from "@fluidframework/fluid-static";
 import {
-	getPresenceViaDataObject,
+	getPresence,
+	type Attendee,
 	ExperimentalPresenceManager,
-	type ExperimentalPresenceDO,
 	type Presence,
-	type Attendee,
 	// eslint-disable-next-line import/no-internal-modules
 } from "@fluidframework/presence/alpha";
 import { InsecureTokenProvider } from "@fluidframework/test-runtime-utils/internal";
@@ -83,7 +82,8 @@ const getOrCreatePresenceContainer = async (
 	const client = new AzureClient({ connection: connectionProps });
 	const schema: ContainerSchema = {
 		initialObjects: {
-			presence: ExperimentalPresenceManager,
+			// A DataObject is added as otherwise fluid-static complains "Container cannot be initialized without any DataTypes"
+			_unused: ExperimentalPresenceManager,
 		},
 	};
 	let services: AzureContainerServices;
@@ -107,9 +107,7 @@ const getOrCreatePresenceContainer = async (
 		"Container is not attached after attach is called",
 	);
 
-	const presence = getPresenceViaDataObject(
-		container.initialObjects.presence as ExperimentalPresenceDO,
-	);
+	const presence = getPresence(container);
 	return {
 		client,
 		container,

package/src/test/multiprocess/messageTypes.ts

@@ -5,7 +5,7 @@
 
 import type { AzureUser } from "@fluidframework/azure-client/internal";
 // eslint-disable-next-line import/no-internal-modules
-import type { AttendeeId } from "@fluidframework/presence/alpha";
+import type { AttendeeId } from "@fluidframework/presence/beta";
 
 export type MessageToChild = ConnectCommand | DisconnectSelfCommand;
 interface ConnectCommand {