From 635534899e04499c11d425e0663a8e0650c63052 Mon Sep 17 00:00:00 2001 From: Anthony LC Date: Fri, 14 Feb 2025 17:08:28 +0100 Subject: [PATCH] for-testing Firefox with websocket Other without --- .github/workflows/docker-hub.yml | 1 + docker-compose.yml | 2 ++ .../docs/doc-management/libs/CollaborationProvider.ts | 8 ++++++++ 3 files changed, 11 insertions(+) diff --git a/.github/workflows/docker-hub.yml b/.github/workflows/docker-hub.yml index 7dca9637d..20f2dae6d 100644 --- a/.github/workflows/docker-hub.yml +++ b/.github/workflows/docker-hub.yml @@ -6,6 +6,7 @@ on: push: branches: - 'main' + - 'feature/collab-long-polling' tags: - 'v*' pull_request: diff --git a/docker-compose.yml b/docker-compose.yml index e10221b92..c4df60e67 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -166,6 +166,8 @@ services: - env.d/development/common ports: - "4444:4444" + volumes: + - ./src/frontend/servers/y-provider:/home/frontend/servers/y-provider kc_postgresql: image: postgres:14.3 diff --git a/src/frontend/apps/impress/src/features/docs/doc-management/libs/CollaborationProvider.ts b/src/frontend/apps/impress/src/features/docs/doc-management/libs/CollaborationProvider.ts index 083b49733..d3998bdf5 100644 --- a/src/frontend/apps/impress/src/features/docs/doc-management/libs/CollaborationProvider.ts +++ b/src/frontend/apps/impress/src/features/docs/doc-management/libs/CollaborationProvider.ts @@ -95,6 +95,14 @@ export class CollaborationProvider extends HocuspocusProvider { let url = ''; if (isHocuspocusProviderConfigurationUrl(configuration)) { url = configuration.url; + let withWS = true; + if ( + new URLSearchParams(window.location.search).get('withoutWS') === 'true' + ) { + withWS = false; + } + + configuration.url = !withWS ? 'ws://localhost:6666' : configuration.url; } super(configuration);