Fix cowebsite closing on fast opening/closing

front/src/Components/EmbedScreens/Layouts/PresentationLayout.svelte

@@ -10,13 +10,9 @@
     function closeCoWebsite() {
         if ($highlightedEmbedScreen?.type === "cowebsite") {
             if ($highlightedEmbedScreen.embed.closable) {
-                coWebsiteManager.closeCoWebsite($highlightedEmbedScreen.embed).catch(() => {
+                coWebsiteManager.closeCoWebsite($highlightedEmbedScreen.embed);
-                    console.error("Error during co-website highlighted closing");
-                });
             } else {
-                coWebsiteManager.unloadCoWebsite($highlightedEmbedScreen.embed).catch(() => {
+                coWebsiteManager.unloadCoWebsite($highlightedEmbedScreen.embed);
-                    console.error("Error during co-website highlighted unloading");
-                });
             }
         }
     }

front/src/Phaser/Game/GameMapPropertiesListener.ts

@@ -9,17 +9,12 @@ import { get } from "svelte/store";
 import { ON_ACTION_TRIGGER_BUTTON, ON_ICON_TRIGGER_BUTTON } from "../../WebRtc/LayoutManager";
 import type { ITiledMapLayer } from "../Map/ITiledMap";
 import { GameMapProperties } from "./GameMapProperties";
-
+import type CancelablePromise from "cancelable-promise";
-enum OpenCoWebsiteState {
-    ASLEEP,
-    OPENED,
-    MUST_BE_CLOSE,
-}
 
 interface OpenCoWebsite {
     actionId: string;
     coWebsite?: CoWebsite;
-    state: OpenCoWebsiteState;
+    loadPromise?: CancelablePromise;
 }
 
 export class GameMapPropertiesListener {
@@ -106,32 +101,14 @@ export class GameMapPropertiesListener {
                         return;
                     }
 
-                    this.coWebsitesOpenByLayer.set(layer, {
+                    const coWebsiteOpen: OpenCoWebsite = {
                         actionId: actionId,
-                        coWebsite: undefined,
+                    };
-                        state: OpenCoWebsiteState.ASLEEP,
+
-                    });
+                    this.coWebsitesOpenByLayer.set(layer, coWebsiteOpen);
 
                     const loadCoWebsiteFunction = (coWebsite: CoWebsite) => {
-                        coWebsiteManager
+                        coWebsiteOpen.loadPromise = coWebsiteManager.loadCoWebsite(coWebsite).catch(() => {
-                            .loadCoWebsite(coWebsite)
-                            .then((coWebsite) => {
-                                const coWebsiteOpen = this.coWebsitesOpenByLayer.get(layer);
-                                if (coWebsiteOpen && coWebsiteOpen.state === OpenCoWebsiteState.MUST_BE_CLOSE) {
-                                    coWebsiteManager.closeCoWebsite(coWebsite).catch(() => {
-                                        console.error("Error during a co-website closing");
-                                    });
-                                    this.coWebsitesOpenByLayer.delete(layer);
-                                    this.coWebsitesActionTriggerByLayer.delete(layer);
-                                } else {
-                                    this.coWebsitesOpenByLayer.set(layer, {
-                                        actionId,
-                                        coWebsite,
-                                        state: OpenCoWebsiteState.OPENED,
-                                    });
-                                }
-                            })
-                            .catch(() => {
                             console.error("Error during loading a co-website: " + coWebsite.url);
                         });
 
@@ -149,6 +126,8 @@ export class GameMapPropertiesListener {
                             false
                         );
 
+                        coWebsiteOpen.coWebsite = coWebsite;
+
                         loadCoWebsiteFunction(coWebsite);
                     };
 
@@ -180,11 +159,7 @@ export class GameMapPropertiesListener {
                             false
                         );
 
-                        const ObjectByLayer = this.coWebsitesOpenByLayer.get(layer);
+                        coWebsiteOpen.coWebsite = coWebsite;
-
-                        if (ObjectByLayer) {
-                            ObjectByLayer.coWebsite = coWebsite;
-                        }
                     }
 
                     if (!websiteTriggerProperty) {
@@ -228,12 +203,12 @@ export class GameMapPropertiesListener {
                         return;
                     }
 
-                    if (coWebsiteOpen.state === OpenCoWebsiteState.ASLEEP) {
+                    if (coWebsiteOpen.loadPromise !== undefined) {
-                        coWebsiteOpen.state = OpenCoWebsiteState.MUST_BE_CLOSE;
+                        coWebsiteOpen.loadPromise.cancel();
                     }
 
                     if (coWebsiteOpen.coWebsite !== undefined) {
-                        coWebsiteManager.closeCoWebsite(coWebsiteOpen.coWebsite).catch((e) => console.error(e));
+                        coWebsiteManager.closeCoWebsite(coWebsiteOpen.coWebsite);
                     }
 
                     this.coWebsitesOpenByLayer.delete(layer);

front/src/Phaser/Game/GameScene.ts

@@ -1289,22 +1289,18 @@ ${escapedMessage}
             });
         });
 
-        iframeListener.registerAnswerer("closeCoWebsite", async (coWebsiteId) => {
+        iframeListener.registerAnswerer("closeCoWebsite", (coWebsiteId) => {
             const coWebsite = coWebsiteManager.getCoWebsiteById(coWebsiteId);
 
             if (!coWebsite) {
                 throw new Error("Unknown co-website");
             }
 
-            return coWebsiteManager.closeCoWebsite(coWebsite).catch((error) => {
+            return coWebsiteManager.closeCoWebsite(coWebsite);
-                throw new Error("Error on closing co-website");
-            });
         });
 
-        iframeListener.registerAnswerer("closeCoWebsites", async () => {
+        iframeListener.registerAnswerer("closeCoWebsites", () => {
-            return await coWebsiteManager.closeCoWebsites().catch((error) => {
+            return coWebsiteManager.closeCoWebsites();
-                throw new Error("Error on closing all co-websites");
-            });
         });
 
         iframeListener.registerAnswerer("getMapData", () => {
@@ -1568,7 +1564,7 @@ ${escapedMessage}
 
     public cleanupClosingScene(): void {
         // stop playing audio, close any open website, stop any open Jitsi
-        coWebsiteManager.closeCoWebsites().catch((e) => console.error(e));
+        coWebsiteManager.closeCoWebsites();
         // Stop the script, if any
         const scripts = this.getScriptUrls(this.mapFile);
         for (const script of scripts) {
@@ -2138,9 +2134,7 @@ ${escapedMessage}
     public stopJitsi(): void {
         const coWebsite = coWebsiteManager.searchJitsi();
         if (coWebsite) {
-            coWebsiteManager.closeCoWebsite(coWebsite).catch((e) => {
+            coWebsiteManager.closeCoWebsite(coWebsite);
-                console.error("Error during Jitsi co-website closing", e);
-            });
         }
     }
 

front/src/WebRtc/CoWebsiteManager.ts

@@ -9,6 +9,7 @@ import { isMediaBreakpointDown } from "../Utils/BreakpointsUtils";
 import { jitsiFactory } from "./JitsiFactory";
 import { gameManager } from "../Phaser/Game/GameManager";
 import { LayoutMode } from "./LayoutManager";
+import CancelablePromise from "cancelable-promise";
 
 export enum iframeStates {
     closed = 1,
@@ -53,11 +54,7 @@ class CoWebsiteManager {
 
     private _onResize: Subject<void> = new Subject();
     public onResize = this._onResize.asObservable();
-    /**
+
-     * Quickly going in and out of an iframe trigger can create conflicts between the iframe states.
-     * So we use this promise to queue up every cowebsite state transition
-     */
-    private currentOperationPromise: Promise<void> = Promise.resolve();
     private cowebsiteDom: HTMLDivElement;
     private resizing: boolean = false;
     private gameOverlayDom: HTMLDivElement;
@@ -148,13 +145,9 @@ class CoWebsiteManager {
             }
 
             if (coWebsite.closable) {
-                this.closeCoWebsite(coWebsite).catch(() => {
+                this.closeCoWebsite(coWebsite);
-                    console.error("Error during closing a co-website by a button");
-                });
             } else {
-                this.unloadCoWebsite(coWebsite).catch(() => {
+                this.unloadCoWebsite(coWebsite);
-                    console.error("Error during unloading a co-website by a button");
-                });
             }
         });
 
@@ -647,7 +640,7 @@ class CoWebsiteManager {
         return newCoWebsite;
     }
 
-    public loadCoWebsite(coWebsite: CoWebsite): Promise<CoWebsite> {
+    public loadCoWebsite(coWebsite: CoWebsite): CancelablePromise<CoWebsite> {
         if (get(coWebsitesNotAsleep).length < 1) {
             coWebsites.remove(coWebsite);
             coWebsites.add(coWebsite, 0);
@@ -663,7 +656,7 @@ class CoWebsiteManager {
 
         const mainCoWebsite = this.getMainCoWebsite();
 
-        return new Promise((resolve, reject) => {
+        return new CancelablePromise((resolve, reject, cancel) => {
             const onloadPromise = new Promise<void>((resolve) => {
                 coWebsite.iframe.onload = () => {
                     coWebsite.state.set("ready");
@@ -683,8 +676,7 @@ class CoWebsiteManager {
                 jitsiFactory.restart();
             }
 
-            this.currentOperationPromise = this.currentOperationPromise
+            const race = CancelablePromise.race([onloadPromise, onTimeoutPromise])
-                .then(() => Promise.race([onloadPromise, onTimeoutPromise]))
                 .then(() => {
                     if (mainCoWebsite && mainCoWebsite.iframe.id === coWebsite.iframe.id) {
                         this.openMain();
@@ -701,11 +693,15 @@ class CoWebsiteManager {
                     this.removeCoWebsiteFromStack(coWebsite);
                     return reject();
                 });
+
+            cancel(() => {
+                race.cancel();
+                this.unloadCoWebsite(coWebsite);
+            });
         });
     }
 
-    public unloadCoWebsite(coWebsite: CoWebsite): Promise<void> {
+    public unloadCoWebsite(coWebsite: CoWebsite): void {
-        return new Promise((resolve, reject) => {
         this.removeHighlightCoWebsite(coWebsite);
 
         coWebsite.iframe.parentNode?.removeChild(coWebsite.iframe);
@@ -729,15 +725,9 @@ class CoWebsiteManager {
         }
 
         coWebsites.add(coWebsite, get(coWebsites).length);
-
-            resolve();
-        });
     }
 
-    public closeCoWebsite(coWebsite: CoWebsite): Promise<void> {
+    public closeCoWebsite(coWebsite: CoWebsite): void {
-        this.currentOperationPromise = this.currentOperationPromise.then(
-            () =>
-                new Promise((resolve) => {
         if (coWebsite.jitsi) {
             jitsiFactory.destroy();
             const gameScene = gameManager.getCurrentGameScene();
@@ -763,21 +753,12 @@ class CoWebsiteManager {
         } else {
             this.closeMain();
         }
-                    resolve();
-                })
-        );
-        return this.currentOperationPromise;
     }
 
-    public closeCoWebsites(): Promise<void> {
+    public closeCoWebsites(): void {
-        return (this.currentOperationPromise = this.currentOperationPromise.then(() => {
         get(coWebsites).forEach((coWebsite: CoWebsite) => {
-                this.closeCoWebsite(coWebsite).catch(() => {
+            this.closeCoWebsite(coWebsite);
-                    console.error("Error during closing a co-website");
         });
-            });
-        }));
-        return this.currentOperationPromise;
     }
 
     public getGameSize(): { width: number; height: number } {

front/src/WebRtc/JitsiFactory.ts

@@ -145,7 +145,7 @@ class JitsiFactory {
         const coWebsite = coWebsiteManager.searchJitsi();
 
         if (coWebsite) {
-            await coWebsiteManager.closeCoWebsite(coWebsite);
+            coWebsiteManager.closeCoWebsite(coWebsite);
         }
 
         // Jitsi meet external API maintains some data in local storage
@@ -214,13 +214,9 @@ class JitsiFactory {
 
     private closeOrUnload = function (coWebsite: CoWebsite) {
         if (coWebsite.closable) {
-            coWebsiteManager.closeCoWebsite(coWebsite).catch(() => {
+            coWebsiteManager.closeCoWebsite(coWebsite);
-                console.error("Error during closing a Jitsi Meet");
-            });
         } else {
-            coWebsiteManager.unloadCoWebsite(coWebsite).catch(() => {
+            coWebsiteManager.unloadCoWebsite(coWebsite);
-                console.error("Error during unloading a Jitsi Meet");
-            });
         }
     };