whiteboard support #1480

tgrld · 2023-02-22T11:04:12Z

No description provided.

tgrld · 2023-02-22T11:08:36Z

demo: https://meet.tugrul.dev/

saghul

Thanks for getting this started!

README.md

env.example

tgrld · 2023-03-08T06:12:00Z

jitsi/web docker image must be rebuild

saghul

Left some comments!

saghul · 2023-03-08T07:42:26Z

env.example

@@ -214,3 +214,8 @@ JIBRI_XMPP_PASSWORD=

 # Jitsi image version (useful for local development)
 #JITSI_IMAGE_VERSION=latest
+
+# whiteboard support


Please drop these from here and make a PR to the handbook.

saghul · 2023-03-08T07:43:24Z

web/rootfs/defaults/meet.conf

@@ -5,6 +5,7 @@
 {{ $ENABLE_SUBDOMAINS := .Env.ENABLE_SUBDOMAINS | default "true" | toBool -}}
 {{ $XMPP_DOMAIN := .Env.XMPP_DOMAIN | default "meet.jitsi" -}}
 {{ $XMPP_BOSH_URL_BASE := .Env.XMPP_BOSH_URL_BASE | default "http://xmpp.meet.jitsi:5280" -}}
+{{ $WHITEBOARD_URL_BASE := .Env.WHITEBOARD_URL_BASE | default "http://whiteboard.meet.jitsi" -}}


Don't set a default, otherwise it will always be enabled.

At any rate you are not using this variable.

saghul · 2023-03-08T07:44:30Z

web/rootfs/defaults/meet.conf

@@ -130,6 +131,20 @@ location ^~ /etherpad/ {
 }
 {{ end }}

+{{ if .Env.WHITEBOARD_URL_BASE }}
+# whiteboard (excalidraw-backend)
+location = /socket.io/ {


Let's add some extra path here like excalidraw-collab/socket.io sinilar to what we do for Etherpad.

saghul · 2023-03-08T07:45:03Z

web/rootfs/defaults/settings-config.js

+config.whiteboard.collabServerBaseUrl = '{{ $WHITEBOARD_COLLAB_SERVER_PUBLIC_URL }}';
+{{ else if .Env.WHITEBOARD_URL_BASE -}}
+config.whiteboard.collabServerBaseUrl = '{{ $PUBLIC_URL }}';


Adjust the URL as mentioned above.

saghul · 2023-03-08T07:46:05Z

whiteboard.yml

+        networks:
+            meet.jitsi:
+              aliases:
+                    - ${WHITEBOARD_URL_BASE:-whiteboard.meet.jitsi}


Just "hardcode" the alias, like we do for Etherpad.

There is not much of a point in changing it since it's just the internal network alias.

Is this still ongoing? Or is this now supported natively already?

Still ongoing

loli10K · 2024-03-23T16:07:39Z

I would like to have this integrated as well, any news on this @tgrld?

Does this require some sort of official jitsi/excalidraw-backend docker image published by you guys @saghul?

saghul · 2024-03-23T17:30:39Z

Yes, we need to publish that image indeed.

I plan to do that and come back to this PR soon.

loli10K · 2024-03-23T19:12:28Z

Thanks. I am currently running the following patch locally and it seems to work without issues (jitsi/excalidraw-backend is a local build)

diff --git a/web/rootfs/defaults/meet.conf b/web/rootfs/defaults/meet.conf
index 6ec7c03..986e9da 100644
--- a/web/rootfs/defaults/meet.conf
+++ b/web/rootfs/defaults/meet.conf
@@ -8,6 +8,7 @@
 {{ $ENABLE_SUBDOMAINS := .Env.ENABLE_SUBDOMAINS | default "true" | toBool -}}
 {{ $XMPP_DOMAIN := .Env.XMPP_DOMAIN | default "meet.jitsi" -}}
 {{ $XMPP_BOSH_URL_BASE := .Env.XMPP_BOSH_URL_BASE | default "http://xmpp.meet.jitsi:5280" -}}
+{{ $WHITEBOARD_ENABLED := .Env.WHITEBOARD_ENABLED | default "0" | toBool }}
 
 server_name _;
 
@@ -133,6 +134,20 @@ location ^~ /etherpad/ {
 }
 {{ end }}
 
+{{ if $WHITEBOARD_ENABLED }}
+# whiteboard (excalidraw-backend)
+location = /socket.io/ {
+    tcp_nodelay on;
+
+    proxy_http_version 1.1;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+    proxy_set_header Host $http_host;
+
+    proxy_pass http://whiteboard.meet.jitsi/socket.io/?$args;
+}
+{{ end }}
+
 location ~ ^/([^/?&:'"]+)$ {
     try_files $uri @root_path;
 }
diff --git a/web/rootfs/defaults/settings-config.js b/web/rootfs/defaults/settings-config.js
index 4a5fbb1..9fae33a 100644
--- a/web/rootfs/defaults/settings-config.js
+++ b/web/rootfs/defaults/settings-config.js
@@ -554,7 +554,11 @@ config.e2eping.maxMessagePerSecond = {{ .Env.E2EPING_MAX_MESSAGE_PER_SECOND }};
 // Settings for the Excalidraw whiteboard integration.
 config.whiteboard = {
     enabled: {{ $WHITEBOARD_ENABLED }},
-    collabServerBaseUrl: '{{ $WHITEBOARD_COLLAB_SERVER_PUBLIC_URL }}'
+{{ if .Env.WHITEBOARD_COLLAB_SERVER_PUBLIC_URL -}}
+    config.whiteboard.collabServerBaseUrl = '{{ $WHITEBOARD_COLLAB_SERVER_PUBLIC_URL }}';
+{{ else }}
+    collabServerBaseUrl: '{{ $PUBLIC_URL }}'
+{{ end }}
 };
 
 // Testing
diff --git a/whiteboard.yml b/whiteboard.yml
new file mode 100644
index 0000000..d7817ae
--- /dev/null
+++ b/whiteboard.yml
@@ -0,0 +1,12 @@
+version: '3.5'
+
+services:
+  whiteboard:
+        image: jitsi/excalidraw-backend:${JITSI_IMAGE_VERSION:-unstable}
+        restart: ${RESTART_POLICY:-unless-stopped}
+        depends_on:
+            - web
+        networks:
+            meet.jitsi:
+              aliases:
+                    - whiteboard.meet.jitsi

However as soon as i move the excalidraw location to a different path as requested in the code review things start to break:

diff --git a/web/rootfs/defaults/meet.conf b/web/rootfs/defaults/meet.conf
index 986e9da..6ade033 100644
--- a/web/rootfs/defaults/meet.conf
+++ b/web/rootfs/defaults/meet.conf
@@ -136,7 +136,7 @@ location ^~ /etherpad/ {
 
 {{ if $WHITEBOARD_ENABLED }}
 # whiteboard (excalidraw-backend)
-location = /socket.io/ {
+location = /excalidraw-collab/socket.io/ {
     tcp_nodelay on;
 
     proxy_http_version 1.1;
diff --git a/web/rootfs/defaults/settings-config.js b/web/rootfs/defaults/settings-config.js
index 9fae33a..a828a2d 100644
--- a/web/rootfs/defaults/settings-config.js
+++ b/web/rootfs/defaults/settings-config.js
@@ -557,7 +557,7 @@ config.whiteboard = {
 {{ if .Env.WHITEBOARD_COLLAB_SERVER_PUBLIC_URL -}}
     config.whiteboard.collabServerBaseUrl = '{{ $WHITEBOARD_COLLAB_SERVER_PUBLIC_URL }}';
 {{ else }}
-    collabServerBaseUrl: '{{ $PUBLIC_URL }}'
+    collabServerBaseUrl: '{{ $PUBLIC_URL }}/excalidraw-collab/'
 {{ end }}
 };

For some reason my browser keeps trying to connect to $PUBLIC_URL/socket.io instead of $PUBLIC_URL/excalidraw-collab/socket.io.

loli10K · 2024-04-25T07:52:15Z

I'm sorry for being persistent here but how soon-ish can we expect this to move forward @saghul? I am having trouble keeping up with master while also manually applying patches for this functionality (plus #1737).

Also should we open a new PR for this? From his activity history it seems @tgrld is no longer active on GitHub.

saghul · 2024-04-25T07:54:48Z

I can't provide an ETA, sorry. Things are busy at the moment.

I'd say open a new PR.

(plus #1737).

How is that one related? AFAIS my feedback has yet to be addressed.

loli10K · 2024-04-25T08:38:53Z

How is that one related? AFAIS my feedback has yet to be addressed.

It is indeed not related to this one, i was just saying that since i also need that functionality i am required to apply both patches manually every time master gets updated which is kind of troublesome, so at least having this merged would really help. I will open a new PR.

bmagistro · 2024-07-02T20:41:49Z

With the completion of jitsi/excalidraw-backend#5 (publishing backend to docker hub) this would be great to have completed as well. @loli10K are you still working on this? If not I may use this branch as a start and try to get something out there sooner

Closes: jitsi#1480 Co-authored-by: Tugrul Dogan <[email protected]> Co-authored-by: Saúl Ibarra Corretgé <[email protected]>

saghul · 2024-07-02T20:50:14Z

See: #1794

tgrld added 5 commits January 26, 2023 19:19

added whiteboard support

110b7fa

Update README.md

e586311

Merge branch 'jitsi-master' and update version stable-8252

c495f97

some whiteboard fixes

e4cd2b3

Merge branch 'master' into master

4ddcd27

saghul requested changes Feb 23, 2023

View reviewed changes

updated whiteboard support

8cfaaa8

tgrld requested a review from saghul March 5, 2023 16:03

tgrld added 6 commits March 5, 2023 19:23

little whiteboard fix

c2a89a3

some fix

2e85e0b

Merge branch 'master' into master

424e6c0

Merge branch 'jitsi:master' into master

05848be

Merge branch 'jitsi:master' into master

861c13d

fix config.whiteboard.collabServerBaseUrl

8de1086

saghul requested changes Mar 8, 2023

View reviewed changes

tgrld added 2 commits March 8, 2023 13:31

removed default WHITEBOARD_URL_BASE in meet.conf

564c20c

Merge branch 'jitsi:master' into master

8a29acb

This was referenced Apr 25, 2024

whiteboard.yml: add collaborative whiteboard addon #1794

Merged

Add whiteboard via Excalidraw jitsi/handbook#504

Open

saghul added a commit to loli10K/docker-jitsi-meet that referenced this pull request Jul 2, 2024

feat(whiteboard) add builtin whiteboard integration

871f4e3

Closes: jitsi#1480 Co-authored-by: Tugrul Dogan <[email protected]> Co-authored-by: Saúl Ibarra Corretgé <[email protected]>

saghul closed this in b4604f3 Jul 2, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

whiteboard support #1480

whiteboard support #1480

tgrld commented Feb 22, 2023

tgrld commented Feb 22, 2023

saghul left a comment

tgrld commented Mar 8, 2023

saghul left a comment

saghul Mar 8, 2023

saghul Mar 8, 2023

saghul Mar 8, 2023

saghul Mar 8, 2023

saghul Mar 8, 2023

ppenguin Nov 6, 2023

saghul Nov 6, 2023

loli10K commented Mar 23, 2024

saghul commented Mar 23, 2024

loli10K commented Mar 23, 2024

loli10K commented Apr 25, 2024

saghul commented Apr 25, 2024

loli10K commented Apr 25, 2024 •

edited

Loading

bmagistro commented Jul 2, 2024

saghul commented Jul 2, 2024

whiteboard support #1480

whiteboard support #1480

Conversation

tgrld commented Feb 22, 2023

tgrld commented Feb 22, 2023

saghul left a comment

Choose a reason for hiding this comment

tgrld commented Mar 8, 2023

saghul left a comment

Choose a reason for hiding this comment

saghul Mar 8, 2023

Choose a reason for hiding this comment

saghul Mar 8, 2023

Choose a reason for hiding this comment

saghul Mar 8, 2023

Choose a reason for hiding this comment

saghul Mar 8, 2023

Choose a reason for hiding this comment

saghul Mar 8, 2023

Choose a reason for hiding this comment

ppenguin Nov 6, 2023

Choose a reason for hiding this comment

saghul Nov 6, 2023

Choose a reason for hiding this comment

loli10K commented Mar 23, 2024

saghul commented Mar 23, 2024

loli10K commented Mar 23, 2024

loli10K commented Apr 25, 2024

saghul commented Apr 25, 2024

loli10K commented Apr 25, 2024 • edited Loading

bmagistro commented Jul 2, 2024

saghul commented Jul 2, 2024

loli10K commented Apr 25, 2024 •

edited

Loading