Merge branch 'develop' of github.com:thecodingmachine/workadventure into feature-voice-chat-indicator

front/src/WebRtc/CoWebsite/JitsiCoWebsite.ts

@@ -1,22 +1,11 @@
 import CancelablePromise from "cancelable-promise";
 import { gameManager } from "../../Phaser/Game/GameManager";
-import { coWebsiteManager } from "../CoWebsiteManager";
 import { jitsiFactory } from "../JitsiFactory";
 import { SimpleCoWebsite } from "./SimpleCoWebsite";
 
 export class JitsiCoWebsite extends SimpleCoWebsite {
     private jitsiLoadPromise?: () => CancelablePromise<HTMLIFrameElement>;
 
-    constructor(url: URL, allowApi?: boolean, allowPolicy?: string, widthPercent?: number, closable?: boolean) {
-        const coWebsite = coWebsiteManager.searchJitsi();
-
-        if (coWebsite) {
-            coWebsiteManager.closeCoWebsite(coWebsite);
-        }
-
-        super(url, allowApi, allowPolicy, widthPercent, closable);
-    }
-
     setJitsiLoadPromise(promise: () => CancelablePromise<HTMLIFrameElement>): void {
         this.jitsiLoadPromise = promise;
     }
@@ -26,7 +15,6 @@ export class JitsiCoWebsite extends SimpleCoWebsite {
             this.state.set("loading");
 
             gameManager.getCurrentGameScene().disableMediaBehaviors();
-            jitsiFactory.restart();
 
             if (!this.jitsiLoadPromise) {
                 return reject("Undefined Jitsi start callback");

front/src/WebRtc/CoWebsiteManager.ts

@@ -1,8 +1,8 @@
 import { HtmlUtils } from "./HtmlUtils";
 import { Subject } from "rxjs";
 import { waScaleManager } from "../Phaser/Services/WaScaleManager";
-import { coWebsites, coWebsitesNotAsleep, jitsiCoWebsite, mainCoWebsite } from "../Stores/CoWebsiteStore";
-import { get } from "svelte/store";
+import { coWebsites, coWebsitesNotAsleep, mainCoWebsite } from "../Stores/CoWebsiteStore";
+import { get, Readable, Writable, writable } from "svelte/store";
 import { embedScreenLayout, highlightedEmbedScreen } from "../Stores/EmbedScreensStore";
 import { isMediaBreakpointDown } from "../Utils/BreakpointsUtils";
 import { LayoutMode } from "./LayoutManager";
@@ -34,7 +34,7 @@ interface TouchMoveCoordinates {
 }
 
 class CoWebsiteManager {
-    private openedMain: iframeStates = iframeStates.closed;
+    private openedMain: Writable<iframeStates> = writable(iframeStates.closed);
 
     private _onResize: Subject<void> = new Subject();
     public onResize = this._onResize.asObservable();
@@ -57,6 +57,10 @@ class CoWebsiteManager {
     });
 
     public getMainState() {
+        return get(this.openedMain);
+    }
+
+    public getMainStateSubscriber(): Readable<iframeStates> {
         return this.openedMain;
     }
 
@@ -324,7 +328,7 @@ class CoWebsiteManager {
         }
         this.cowebsiteDom.classList.add("closing");
         this.cowebsiteDom.classList.remove("opened");
-        this.openedMain = iframeStates.closed;
+        this.openedMain.set(iframeStates.closed);
         this.fire();
     }
 
@@ -332,7 +336,7 @@ class CoWebsiteManager {
         this.toggleFullScreenIcon(true);
         this.cowebsiteDom.classList.add("closing");
         this.cowebsiteDom.classList.remove("opened");
-        this.openedMain = iframeStates.closed;
+        this.openedMain.set(iframeStates.closed);
         this.resetStyleMain();
         this.fire();
     }
@@ -386,14 +390,14 @@ class CoWebsiteManager {
         }
 
         this.cowebsiteDom.classList.add("opened");
-        this.openedMain = iframeStates.loading;
+        this.openedMain.set(iframeStates.loading);
     }
 
     private openMain(): void {
         this.cowebsiteDom.addEventListener("transitionend", () => {
             this.resizeAllIframes();
         });
-        this.openedMain = iframeStates.opened;
+        this.openedMain.set(iframeStates.opened);
     }
 
     public resetStyleMain() {
@@ -556,19 +560,12 @@ class CoWebsiteManager {
             mainCoWebsite.getId() !== coWebsite.getId() &&
             mainCoWebsite.getState() !== "asleep"
         ) {
-            highlightedEmbedScreen.toggleHighlight({
-                type: "cowebsite",
-                embed: mainCoWebsite,
-            });
+            highlightedEmbedScreen.removeHighlight();
         }
 
         this.resizeAllIframes();
     }
 
-    public searchJitsi(): CoWebsite | undefined {
-        return get(jitsiCoWebsite);
-    }
-
     public addCoWebsiteToStore(coWebsite: CoWebsite, position: number | undefined) {
         const coWebsitePosition = position === undefined ? get(coWebsites).length : position;
         coWebsites.add(coWebsite, coWebsitePosition);
@@ -591,7 +588,7 @@ class CoWebsiteManager {
         }
 
         // Check if the main is hide
-        if (this.getMainCoWebsite() && this.openedMain === iframeStates.closed) {
+        if (this.getMainCoWebsite() && this.getMainState() === iframeStates.closed) {
             this.displayMain();
         }
 
@@ -665,7 +662,7 @@ class CoWebsiteManager {
     }
 
     public getGameSize(): { width: number; height: number } {
-        if (this.openedMain === iframeStates.closed) {
+        if (this.getMainState() === iframeStates.closed) {
             return {
                 width: window.innerWidth,
                 height: window.innerHeight,

front/src/WebRtc/JitsiFactory.ts

@@ -2,7 +2,6 @@ import { JITSI_URL } from "../Enum/EnvironmentVariable";
 import { coWebsiteManager } from "./CoWebsiteManager";
 import { requestedCameraState, requestedMicrophoneState } from "../Stores/MediaStore";
 import { get } from "svelte/store";
-import type { CoWebsite } from "./CoWebsite/CoWesbite";
 import CancelablePromise from "cancelable-promise";
 
 interface jitsiConfigInterface {
@@ -180,13 +179,14 @@ class JitsiFactory {
                     const iframe = coWebsiteManager
                         .getCoWebsiteBuffer()
                         .querySelector<HTMLIFrameElement>('[id*="jitsi" i]');
+
                     if (iframe && this.jitsiApi) {
                         this.jitsiApi.addListener("videoConferenceLeft", () => {
-                            this.closeOrUnload();
+                            this.closeOrUnload(iframe);
                         });
 
                         this.jitsiApi.addListener("readyToClose", () => {
-                            this.closeOrUnload();
+                            this.closeOrUnload(iframe);
                         });
 
                         return resolve(iframe);
@@ -209,8 +209,9 @@ class JitsiFactory {
         });
     }
 
-    private closeOrUnload = function () {
-        const coWebsite = coWebsiteManager.searchJitsi();
+    private closeOrUnload = function (iframe: HTMLIFrameElement) {
+        const coWebsite = coWebsiteManager.getCoWebsites().find((coWebsite) => coWebsite.getIframe() === iframe);
+
         if (!coWebsite) {
             return;
         }
@@ -224,30 +225,6 @@ class JitsiFactory {
         }
     };
 
-    public restart() {
-        if (!this.jitsiApi) {
-            return;
-        }
-
-        this.jitsiApi.addListener("audioMuteStatusChanged", this.audioCallback);
-        this.jitsiApi.addListener("videoMuteStatusChanged", this.videoCallback);
-
-        const coWebsite = coWebsiteManager.searchJitsi();
-
-        if (!coWebsite) {
-            this.destroy();
-            return;
-        }
-
-        this.jitsiApi.addListener("videoConferenceLeft", () => {
-            this.closeOrUnload();
-        });
-
-        this.jitsiApi.addListener("readyToClose", () => {
-            this.closeOrUnload();
-        });
-    }
-
     public stop() {
         if (!this.jitsiApi) {
             return;