Merge pull request workadventure#3469 from workadventure/develop

Deploy to master
mconf · Sep 1, 2023 · 819f78c · 819f78c
2 parents 6f95ea6 + daab989
commit 819f78c
Show file tree

Hide file tree

Showing 93 changed files with 2,005 additions and 1,112 deletions.
diff --git a/.env.template b/.env.template
@@ -47,6 +47,12 @@ ACME_EMAIL=
 MAX_PER_GROUP=4
 MAX_USERNAME_LENGTH=10
 
+# Configure low and recommended bandwidth used by video and screen share in the peer-to-peer connection (in kbit/s)
+PEER_VIDEO_LOW_BANDWIDTH=150
+PEER_VIDEO_RECOMMENDED_BANDWIDTH=150
+PEER_SCREEN_SHARE_LOW_BANDWIDTH=250
+PEER_SCREEN_SHARE_RECOMMENDED_BANDWIDTH=1000
+
 OPID_CLIENT_ID=
 OPID_CLIENT_SECRET=
 OPID_CLIENT_ISSUER=

diff --git a/back/src/Model/Space.ts b/back/src/Model/Space.ts
@@ -67,8 +67,8 @@ export class Space implements CustomJsonReplacerInterface {
             if (spaceUser.visitCardUrl) {
                 user.visitCardUrl = spaceUser.visitCardUrl;
             }
-            if (spaceUser.screenSharing !== undefined) {
-                user.screenSharing = spaceUser.screenSharing;
+            if (spaceUser.screenSharingState !== undefined) {
+                user.screenSharingState = spaceUser.screenSharingState;
             }
             if (spaceUser.microphoneState !== undefined) {
                 user.microphoneState = spaceUser.microphoneState;

diff --git a/back/tests/Space.test.ts b/back/tests/Space.test.ts
@@ -56,7 +56,7 @@ describe("Space", () => {
             cameraState: false,
             microphoneState: false,
             megaphoneState: false,
-            screenSharing: false,
+            screenSharingState: false,
         });
         // Add user to space from watcher1
         space.addUser(watcher1, spaceUser);
@@ -94,7 +94,7 @@ describe("Space", () => {
             cameraState: true,
             microphoneState: true,
             megaphoneState: true,
-            screenSharing: true,
+            screenSharingState: true,
             visitCardUrl: "test2",
         });
 
@@ -117,7 +117,7 @@ describe("Space", () => {
             expect(user?.cameraState).toBe(true);
             expect(user?.microphoneState).toBe(true);
             expect(user?.megaphoneState).toBe(true);
-            expect(user?.screenSharing).toBe(true);
+            expect(user?.screenSharingState).toBe(true);
             expect(user?.visitCardUrl).toBe("test2");
         }
 

diff --git a/chat/src/Components/ChatMessageForm.svelte b/chat/src/Components/ChatMessageForm.svelte
@@ -334,7 +334,7 @@
                         <div
                             class={`error-hover tw-flex tw-flex-wrap tw-bg-dark-blue/95 tw-rounded-3xl tw-text-xxs tw-justify-between tw-items-center tw-px-4 tw-py-2 ${
                                 fileUploaded.errorCode === 423 && $me && $me.isAdmin
-                                    ? "tw-text-orange"
+                                    ? "tw-text-warning"
                                     : "tw-text-pop-red"
                             } tw-absolute tw-w-full`}
                         >
@@ -360,7 +360,7 @@
                             {/if}
                             {#if fileUploaded.errorCode === 423 && $me && $me.isAdmin}
                                 <button
-                                    class="tw-text-orange tw-font-bold tw-underline tw-m-auto"
+                                    class="tw-text-warning tw-font-bold tw-underline tw-m-auto"
                                     on:click={() => iframeListener.sendRedirectPricing()}
                                 >
                                     <img alt="Crown logo" src={crown} class="tw-mr-1" />
@@ -401,10 +401,10 @@
             {/each}
             {#if informationMessage}
                 <div
-                    class="tw-flex tw-flex-wrap tw-bg-dark-blue/95 tw-rounded-3xl tw-py-2 tw-text-xs tw-items-center tw-px-4 tw-text-orange tw-w-full tw-mb-1 tw-cursor-pointer"
+                    class="tw-flex tw-flex-wrap tw-bg-dark-blue/95 tw-rounded-3xl tw-py-2 tw-text-xs tw-items-center tw-px-4 tw-text-warning tw-w-full tw-mb-1 tw-cursor-pointer"
                     on:click|preventDefault|stopPropagation={() => (informationMessage = null)}
                 >
-                    <div class="tw-text-orange tw-mr-1.5">
+                    <div class="tw-text-warning tw-mr-1.5">
                         <AlertCircleIcon size="16" />
                     </div>
                     <p class="tw-m-0">

diff --git a/chat/src/Components/ChatMessagesList.svelte b/chat/src/Components/ChatMessagesList.svelte
@@ -240,7 +240,7 @@
             {:else if $showDisabledLoadOlderMessagesStore && $me && $me.isAdmin}
                 {#if ADMIN_API_URL}
                     <button
-                        class="tw-text-orange tw-font-bold tw-underline tw-m-auto tw-text-xs tw-cursor-pointer"
+                        class="tw-text-warning tw-font-bold tw-underline tw-m-auto tw-text-xs tw-cursor-pointer"
                         on:click={() => iframeListener.sendRedirectPricing()}
                     >
                         <img alt="Crown icon" src={crown} class="tw-mr-1" />

diff --git a/chat/src/Components/ChatUser.svelte b/chat/src/Components/ChatUser.svelte
@@ -82,7 +82,7 @@
             case 2:
                 return "tw-bg-pop-red";
             case 3:
-                return "tw-bg-orange";
+                return "tw-bg-warning";
         }
     }
 
@@ -150,7 +150,7 @@
                 </span>
             {/if}
             {#if user.isAdmin}
-                <span class="tw-text-orange" title={$LL.role.admin()}>
+                <span class="tw-text-warning" title={$LL.role.admin()}>
                     <ShieldIcon size="13" />
                 </span>
             {/if}
@@ -226,13 +226,13 @@
                     >
                     {#if user.isAdmin}
                         <span
-                            class="rank-down wa-dropdown-item tw-text-orange"
+                            class="rank-down wa-dropdown-item tw-text-warning"
                             on:click|stopPropagation={() => mucRoom.sendRankDown(user.jid)}
                             ><ShieldOffIcon size="13" /> {$LL.rankDown()} (coming soon)</span
                         >
                     {:else}
                         <span
-                            class="rank-up wa-dropdown-item tw-text-orange"
+                            class="rank-up wa-dropdown-item tw-text-warning"
                             on:click|stopPropagation={() => mucRoom.sendRankUp(user.jid)}
                             ><ShieldIcon size="13" /> {$LL.rankUp()} (coming soon)</span
                         >

diff --git a/contrib/docker/.env.prod.template b/contrib/docker/.env.prod.template
@@ -44,6 +44,12 @@ MAX_PER_GROUP=4
 MAX_USERNAME_LENGTH=10
 DISABLE_ANONYMOUS=false
 
+# Configure low and recommended bandwidth used by video and screen share in the peer-to-peer connection (in kbit/s)
+PEER_VIDEO_LOW_BANDWIDTH=150
+PEER_VIDEO_RECOMMENDED_BANDWIDTH=600
+PEER_SCREEN_SHARE_LOW_BANDWIDTH=250
+PEER_SCREEN_SHARE_RECOMMENDED_BANDWIDTH=1000
+
 # The version of the docker image to use
 # MUST uncomment "image" keys in the docker-compose file for it to be effective
 VERSION=master

diff --git a/contrib/docker/README.md b/contrib/docker/README.md
@@ -167,7 +167,7 @@ On your server, install the latest Docker version, along docker-compose.
 
 ### 2. Copy deployment files 
 
-Copy the [`.env.template`](.env.template) file on your server, and rename it to `.env`.
+Copy the [`.env.prod.template`](.env.prod.template) file on your server, and rename it to `.env`.
 Copy the [`docker-compose.prod.yaml`](docker-compose.prod.yaml) file on your server, and rename it to `docker-compose.yaml`.
 
 ### 3. Configure your environment

diff --git a/contrib/docker/docker-compose.prod.yaml b/contrib/docker/docker-compose.prod.yaml
@@ -94,6 +94,10 @@ services:
       - WOKA_SPEED
       - MAP_STORAGE_PATH_PREFIX=/map-storage
       - FEATURE_FLAG_BROADCAST_AREAS=${FEATURE_FLAG_BROADCAST_AREAS}
+      - PEER_VIDEO_LOW_BANDWIDTH=${PEER_VIDEO_LOW_BANDWIDTH}
+      - PEER_VIDEO_RECOMMENDED_BANDWIDTH=${PEER_VIDEO_RECOMMENDED_BANDWIDTH}
+      - PEER_SCREEN_SHARE_LOW_BANDWIDTH=${PEER_SCREEN_SHARE_LOW_BANDWIDTH}
+      - PEER_SCREEN_SHARE_RECOMMENDED_BANDWIDTH=${PEER_SCREEN_SHARE_RECOMMENDED_BANDWIDTH}
 
     labels:
       traefik.enable: "true"

diff --git a/deeployer.libsonnet b/deeployer.libsonnet
@@ -112,6 +112,10 @@
           "LOGROCKET_ID": env.LOGROCKET_ID,
           "ROOM_API_PORT": "50051",
           "DEBUG": "*",
+          "PEER_VIDEO_LOW_BANDWIDTH": "150",
+          "PEER_VIDEO_RECOMMENDED_BANDWIDTH": "600",
+          "PEER_SCREEN_SHARE_LOW_BANDWIDTH": "250",
+          "PEER_SCREEN_SHARE_RECOMMENDED_BANDWIDTH":"1000",
           "JITSI_DOMAIN": "coremeet.workadventu.re",
           "JITSI_XMPP_DOMAIN": "prosody.workadventu.re",
           "JITSI_MUC_DOMAIN": "muc.prosody.workadventu.re",

diff --git a/desktop/electron/yarn.lock b/desktop/electron/yarn.lock
@@ -2044,18 +2044,12 @@ semver-compare@^1.0.0:
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
 
 semver@^6.2.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
 
-semver@^7.3.2, semver@^7.3.5:
-  version "7.3.5"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@^7.3.7:
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
+semver@^7.3.2, semver@^7.3.5, semver@^7.3.7:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
   dependencies:
     lru-cache "^6.0.0"
 
@@ -2369,8 +2363,8 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/winreg/-/winreg-1.2.4.tgz#ba065629b7a925130e15779108cf540990e98d1b"
 
 word-wrap@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
 
 wrap-ansi@^7.0.0:
   version "7.0.0"

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -121,6 +121,10 @@ services:
             JITSI_MUC_DOMAIN: "$JITSI_MUC_DOMAIN"
             JITSI_XMPP_DOMAIN: "$JITSI_XMPP_DOMAIN"
             FEATURE_FLAG_BROADCAST_AREAS: "true"
+            PEER_VIDEO_LOW_BANDWIDTH: "$PEER_VIDEO_LOW_BANDWIDTH"
+            PEER_VIDEO_RECOMMENDED_BANDWIDTH: "$PEER_VIDEO_RECOMMENDED_BANDWIDTH"
+            PEER_SCREEN_SHARE_LOW_BANDWIDTH: "$PEER_SCREEN_SHARE_LOW_BANDWIDTH"
+            PEER_SCREEN_SHARE_RECOMMENDED_BANDWIDTH: "$PEER_SCREEN_SHARE_RECOMMENDED_BANDWIDTH"
         labels:
             - "traefik.enable=true"
             - "traefik.http.routers.front.rule=Host(`front.workadventure.localhost`)"

diff --git a/libs/messages/package.json b/libs/messages/package.json
@@ -15,7 +15,7 @@
     "google-protobuf": "^3.21.0",
     "long": "^5.2.1",
     "openapi3-ts": "^3.0.2",
-    "protobufjs": "^7.1.2",
+    "protobufjs": "^7.2.4",
     "rxjs": "6.6.3",
     "zod": "^3.19.1"
   },

diff --git a/libs/messages/src/JsonMessages/AdminApiData.ts b/libs/messages/src/JsonMessages/AdminApiData.ts
@@ -1,11 +1,6 @@
 import { z } from "zod";
 import { extendApi } from "@anatine/zod-openapi";
 
-/*
- * WARNING! The original file is in /messages/JsonMessages.
- * All other files are automatically copied from this file on container startup / build
- */
-
 export const isAdminApiData = z.object({
   userUuid: extendApi(z.string(), {
     example: "998ce839-3dea-4698-8b41-ebbdf7688ad9",

diff --git a/libs/messages/src/JsonMessages/CompanionTextures.ts b/libs/messages/src/JsonMessages/CompanionTextures.ts
@@ -1,11 +1,6 @@
 import { z } from "zod";
 import { extendApi } from "@anatine/zod-openapi";
 
-/*
- * WARNING! The original file is in /libs/messages/src/JsonMessages.
- * All other files are automatically copied from this file on container startup / build
- */
-
 //The list of all the companion textures
 
 export const CompanionBehavior = z.union([

diff --git a/libs/messages/src/JsonMessages/ErrorApiData.ts b/libs/messages/src/JsonMessages/ErrorApiData.ts
@@ -1,11 +1,6 @@
 import { z } from "zod";
 import { extendApi } from "@anatine/zod-openapi";
 
-/*
- * WARNING! The original file is in /messages/JsonMessages.
- * All other files are automatically copied from this file on container startup / build
- */
-
 export const isErrorApiErrorData = extendApi(
   z.object({
     type: z.literal("error"),

diff --git a/libs/messages/src/JsonMessages/MapDetailsData.ts b/libs/messages/src/JsonMessages/MapDetailsData.ts
@@ -5,11 +5,6 @@ import { isMetaTagManifestIcon } from "./MetaTagManifestIcon";
 import { OpidWokaNamePolicy } from "./OpidWokaNamePolicy";
 import { MucRoomDefinition } from "./MucRoomDefinition";
 
-/*
- * WARNING! The original file is in /messages/JsonMessages.
- * All other files are automatically copied from this file on container startup / build
- */
-
 const isBbbData = z.object({
     url: extendApi(z.string(), {
         description: 'The full URL to your BigBlueButton server. Do not forget the trailing "/bigbluebutton/".',

diff --git a/libs/messages/src/JsonMessages/PlayerTextures.ts b/libs/messages/src/JsonMessages/PlayerTextures.ts
@@ -1,11 +1,6 @@
 import { z } from "zod";
 import { extendApi } from "@anatine/zod-openapi";
 
-/*
- * WARNING! The original file is in /messages/JsonMessages.
- * All other files are automatically copied from this file on container startup / build
- */
-
 //The list of all the player textures, both the default models and the partial textures used for customization
 
 export const wokaTexture = z.object({

diff --git a/libs/messages/src/JsonMessages/RegisterData.ts b/libs/messages/src/JsonMessages/RegisterData.ts
@@ -1,10 +1,5 @@
 import { z } from "zod";
 
-/*
- * WARNING! The original file is in /messages/JsonMessages.
- * All other files are automatically copied from this file on container startup / build
- */
-
 export const isRegisterData = z.object({
   roomUrl: z.string(),
   email: z.string().nullable(),

diff --git a/libs/messages/src/JsonMessages/RoomRedirect.ts b/libs/messages/src/JsonMessages/RoomRedirect.ts
@@ -1,11 +1,6 @@
 import { z } from "zod";
 import { extendApi } from "@anatine/zod-openapi";
 
-/*
- * WARNING! The original file is in /messages/JsonMessages.
- * All other files are automatically copied from this file on container startup / build
- */
-
 export const isRoomRedirect = z.object({
   redirectUrl: extendApi(z.string(), {
     description: "The WorkAdventure URL to redirect to.",

diff --git a/libs/room-api-clients/room-api-client-js/package-lock.json b/libs/room-api-clients/room-api-client-js/package-lock.json