Changeset 28145

Timestamp:

Jul 8, 2024, 9:07:04 PM (3 weeks ago)

Author:

phosit

Message:

Get a promise when starting a GUIpage

When calling Engine.PushGuiPage a promise is returned. The promise is settled when the "child" page is closed. That allows to await it inside async functions.
Previously the callback was run right inside the call to Engine.PopGuiPage. Now the continuation of the promise is called at the end of the "tick".

This won't help performance. It will more likely make things worse. Since gui pages aren't opened or closed that frequently, it doesn't matter that much.

Refs: r22676

For the engine side:
The promise is stored in the CGUIManager::SGUIPage (like previously the callback). When the promise is fulfilled it enqueues a callback in the JobQueue of the JSContext.

Comments by: @wraitii, @Stan, @Polakrity, @lyv, @elexis, @vladislavbelov

Differential Revision: ​https://code.wildfiregames.com/D3807

Location:

ps/trunk

Files:

• binaries/data/mods/_test.gui/gui/regainFocus/pushWithPopOnInit.js (modified) (1 diff)
• binaries/data/mods/mod/gui/common/functions_msgbox.js (modified) (3 diffs)
• binaries/data/mods/mod/gui/common/terms.js (modified) (2 diffs)
• binaries/data/mods/mod/gui/modmod/modmodio.js (modified) (1 diff)
• binaries/data/mods/public/gui/campaigns/default_menu/CampaignMenu.js (modified) (2 diffs)
• binaries/data/mods/public/gui/common/functions_utility.js (modified) (1 diff)
• binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Buttons/CivInfoButton.js (modified) (1 diff)
• binaries/data/mods/public/gui/locale/locale.js (modified) (2 diffs)
• binaries/data/mods/public/gui/options/options.js (modified) (1 diff)
• binaries/data/mods/public/gui/pregame/MainMenuItems.js (modified) (2 diffs)
• binaries/data/mods/public/gui/session/MenuButtons.js (modified) (7 diffs)
• binaries/data/mods/public/gui/session/SessionMessageBox.js (modified) (2 diffs)
• binaries/data/mods/public/gui/session/selection_panels.js (modified) (2 diffs)
• binaries/data/mods/public/gui/session/top_panel/CivIcon.js (modified) (2 diffs)
• source/gui/GUIManager.cpp (modified) (8 diffs)
• source/gui/GUIManager.h (modified) (4 diffs)
• source/gui/Scripting/JSInterface_GUIManager.cpp (modified) (2 diffs)
• source/gui/tests/test_GuiManager.h (modified) (5 diffs)
• source/scriptinterface/ScriptContext.cpp (modified) (5 diffs)
• source/scriptinterface/ScriptContext.h (modified) (5 diffs)
• source/scriptinterface/ScriptInterface.cpp (modified) (2 diffs)
• source/simulation2/Simulation2.cpp (modified) (1 diff)

ps/trunk/binaries/data/mods/_test.gui/gui/regainFocus/pushWithPopOnInit.js

@@ -1 @@
-Engine.PushGuiPage("regainFocus/page_emptyPage.xml", {}, () => Engine.PopGuiPage());
+Engine.PushGuiPage("regainFocus/page_emptyPage.xml");

ps/trunk/binaries/data/mods/mod/gui/common/functions_msgbox.js

@@ -1 @@
-function messageBox(mbWidth, mbHeight, mbMessage, mbTitle, mbButtonCaptions, mbBtnCode, mbCallbackArgs)
+async function messageBox(mbWidth, mbHeight, mbMessage, mbTitle, mbButtonCaptions, mbBtnCode,
+    mbCallbackArgs)
 {
-    Engine.PushGuiPage(
+    Engine.PushGuiPage(
         "page_msgbox.xml",
         {
@@ -9 +10 @@
             "title": mbTitle,
             "buttonCaptions": mbButtonCaptions
-        },
-        btnCode => {
-            if (mbBtnCode !== undefined && mbBtnCode[btnCode])
-                mbBtnCode[btnCode](mbCallbackArgs ? mbCallbackArgs[btnCode] : undefined);
         });
+
+
+
 }
 
-function timedConfirmation(width, height, message, timeParameter, timeout, title, buttonCaptions, btnCode, callbackArgs)
+async function timedConfirmation(width, height, message, timeParameter, timeout, title, buttonCaptions,
+    btnCode, callbackArgs)
 {
-    Engine.PushGuiPage(
+    Engine.PushGuiPage(
         "page_timedconfirmation.xml",
         {
@@ -28 +29 @@
             "title": title,
             "buttonCaptions": buttonCaptions
-        },
-        button => {
-            if (btnCode !== undefined && btnCode[button])
-                btnCode[button](callbackArgs ? callbackArgs[button] : undefined);
         });
-}
 
-function colorMixer(color, callback)
-{
-    Engine.PushGuiPage(
-        "page_colormixer.xml",
-        color,
-        result => {
-            callback(result);
-        }
-    );
+    if (btnCode !== undefined && btnCode[button])
+        btnCode[button](callbackArgs ? callbackArgs[button] : undefined);
 }
 

ps/trunk/binaries/data/mods/mod/gui/common/terms.js

@@ -6 +6 @@
 }
 
-function openTerms(page)
+function openTerms(page)
 {
-    Engine.PushGuiPage(
+    Engine.PushGuiPage(
         "page_termsdialog.xml",
         {
@@ -17 +17 @@
             "termsURL": g_Terms[page].termsURL || undefined,
             "page": page
-        },
-        data => {
-            g_Terms[data.page].accepted = data.accepted;
+        });
 
-            Engine.ConfigDB_CreateAndSaveValue(
-                "user",
-                g_Terms[data.page].config,
-                data.accepted ? getTermsHash(data.page) : "0");
+    g_Terms[data.page].accepted = data.accepted;
 
-            if (g_Terms[data.page].callback)
-                g_Terms[data.page].callback(data);
-        }
-    );
+    Engine.ConfigDB_CreateAndSaveValue(
+        "user",
+        g_Terms[data.page].config,
+        data.accepted ? getTermsHash(data.page) : "0");
+
+    if (g_Terms[data.page].callback)
+        g_Terms[data.page].callback(data);
 }
 

ps/trunk/binaries/data/mods/mod/gui/modmod/modmodio.js

@@ -24 +24 @@
 }
 
-function openModIo(data)
+function openModIo(data)
 {
-    if (data.accepted)
-        Engine.PushGuiPage("page_modio.xml", {}, initMods);
+    if (!data.accepted)
+        return;
+
+    await Engine.PushGuiPage("page_modio.xml");
+    initMods();
 }

ps/trunk/binaries/data/mods/public/gui/campaigns/default_menu/CampaignMenu.js

@@ -20 +20 @@
         Engine.GetGUIObjectByName('startButton').onPress = () => this.startScenario();
         Engine.GetGUIObjectByName('backToMain').onPress = () => this.goBackToMainMenu();
-        Engine.GetGUIObjectByName('savedGamesButton').onPress = Engine.PushGuiPage.bind(Engine,
-            'page_loadgame.xml', { "campaignRun": this.run.filename }, this.loadSavegame.bind(this));
+        Engine.GetGUIObjectByName('savedGamesButton').onPress = this.loadSavegame.bind(this);
 
         this.mapCache = new MapCache();
@@ -28 +27 @@
     }
 
-    loadSavegame(gameId)
-    {
+    async loadSavegame()
+    {
+        const gameId = await Engine.PushGuiPage(
+            'page_loadgame.xml',
+            {
+                "campaignRun": this.run.filename
+            });
+
         if (!gameId)
             return;

ps/trunk/binaries/data/mods/public/gui/common/functions_utility.js

@@ -289 +289 @@
  *  That continues untill there is no @a nextPage property in the completion
  *  value. If there is no @a nextPage in the completion value the
- *  @a continuation is called with the completion value.
+ *  @a co.
  * @param {String} page - The page first opened.
  * @param args - passed to the first page opened.
- * @param continuation {function | undefined} - Completion callback, called when
- *  there is no @a nextPage property in the completion value.
- */
-function pageLoop(page, args, continuation)
-{
-    (function recursiveFunction(completionValue)
-        {
-            if (completionValue?.nextPage != null)
-                Engine.PushGuiPage(completionValue.nextPage, completionValue.args, recursiveFunction);
-            else
-                continuation?.(completionValue);
-        })({ "nextPage": page, "args": args });
-}
+ */
+async function pageLoop(page, args)
+{
+    let completionValue = { "nextPage": page, "args": args };
+    while (completionValue?.nextPage != null)
+        completionValue = await Engine.PushGuiPage(completionValue.nextPage, completionValue.args);
+
+    return completionValue;
+}

ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Buttons/CivInfoButton.js

@@ -24 +24 @@
     }
 
-    openPage(page)
+    openPage(page)
     {
-        pageLoop(page, this.civInfo.args, data => this.civInfo = data);
+        );
     }
 }

ps/trunk/binaries/data/mods/public/gui/locale/locale.js

@@ -53 +53 @@
 }
 
-function openAdvancedMenu()
+function openAdvancedMenu()
 {
     let localeText = Engine.GetGUIObjectByName("localeText");
-    Engine.PushGuiPage("page_locale_advanced.xml", { "locale": localeText.caption }, applyFromAdvancedMenu);
-}
+    const locale = await Engine.PushGuiPage("page_locale_advanced.xml", { "locale": localeText.caption });
 
-function applyFromAdvancedMenu(locale)
-{
     if (!locale)
         return;
@@ -73 +70 @@
         languageList.selected = index;
 
-    var localeText = Engine.GetGUIObjectByName("localeText");
     localeText.caption = locale;
 }

ps/trunk/binaries/data/mods/public/gui/options/options.js

@@ -81 +81 @@
         },
         "initGUI": (option, control) => {
-            control.children[2].onPress = () => {
-                colorMixer(
-                    control.caption,
-                    (color) => {
-                        if (color != control.caption)
-                        {
-                            control.caption = color;
-                            control.onTextEdit();
-                        }
-                    }
-                );
+            control.children[2].onPress = async() => {
+                const color = await Engine.PushGuiPage("page_colormixer.xml", control.caption);
+
+                if (color != control.caption)
+                {
+                    control.caption = color;
+                    control.onTextEdit();
+                }
             };
         },

ps/trunk/binaries/data/mods/public/gui/pregame/MainMenuItems.js

@@ -91 +91 @@
                 "caption": translate("Load Game"),
                 "tooltip": translate("Load a saved game."),
-                "onPress": Engine.PushGuiPage.bind(Engine, "page_loadgame.xml", {}, (gameId) =>
+                "onPress": async() => {
+                    const gameId = await Engine.PushGuiPage("page_loadgame.xml");
+
+                    if (!gameId)
+                        return;
+
+                    const metadata = Engine.StartSavedGame(gameId);
+                    if (!metadata)
                     {
-                        if (!gameId)
-                            return;
+                        error("Could not load saved game: " + gameId);
+                        return;
+                    }
 
-                        const metadata = Engine.StartSavedGame(gameId);
-                        if (!metadata)
-                        {
-                            error("Could not load saved game: " + gameId);
-                            return;
-                        }
-
-                        Engine.SwitchGuiPage("page_loading.xml", {
-                            "attribs": metadata.initAttributes,
-                            "playerAssignments": {
-                                "local": {
-                                    "name": metadata.initAttributes.settings.
-                                        PlayerData[metadata.playerID]?.Name ??
-                                        singleplayerName(),
-                                    "player": metadata.playerID
-                                }
-                            },
-                            "savedGUIData": metadata.gui
-                        });
-                    })
+                    Engine.SwitchGuiPage("page_loading.xml", {
+                        "attribs": metadata.initAttributes,
+                        "playerAssignments": {
+                            "local": {
+                                "name": metadata.initAttributes.settings.
+                                    PlayerData[metadata.playerID]?.Name ??
+                                    singleplayerName(),
+                                "player": metadata.playerID
+                            }
+                        },
+                        "savedGUIData": metadata.gui
+                    });
+                }
             },
             {
@@ -222 +223 @@
                 "caption": translate("Options"),
                 "tooltip": translate("Adjust game settings."),
-                "onPress": () => {
-                    Engine.PushGuiPage(
-                        "page_options.xml",
-                        {},
-                        fireConfigChangeHandlers);
+                "onPress": async() => {
+                    fireConfigChangeHandlers(await Engine.PushGuiPage("page_options.xml"));
                 }
             },

ps/trunk/binaries/data/mods/public/gui/session/MenuButtons.js

@@ -17 +17 @@
     }
 
-    onPress()
-    {
-        closeOpenDialogs();
-        this.pauseControl.implicitPause();
-        Engine.PushGuiPage("page_manual.xml", {}, resumeGame);
+    async onPress()
+    {
+        closeOpenDialogs();
+        this.pauseControl.implicitPause();
+        await Engine.PushGuiPage("page_manual.xml");
+        resumeGame();
     }
 };
@@ -55 +56 @@
     }
 
-    onPress()
-    {
-        closeOpenDialogs();
-        this.pauseControl.implicitPause();
-
-        Engine.PushGuiPage(
+    onPress()
+    {
+        closeOpenDialogs();
+        this.pauseControl.implicitPause();
+
+        Engine.PushGuiPage(
             "page_loadgame.xml",
             {
                 "savedGameData": getSavedGameData(),
                 "campaignRun": g_CampaignSession ? g_CampaignSession.run.filename : null
-            },
-            resumeGame);
+            }
+        );
     }
 };
@@ -93 +94 @@
     }
 
-    onPress()
+    onPress()
     {
         if (Engine.IsAtlasRunning())
@@ -103 +104 @@
         // If they have shared ally vision researched, they are able to see the summary of there allies too.
         let simState = Engine.GuiInterfaceCall("GetExtendedSimulationState");
-        Engine.PushGuiPage(
+        Engine.PushGuiPage(
             "page_summary.xml",
             {
@@ -118 +119 @@
                     "summarySelection": this.summarySelection
                 },
-            },
-            data => {
-                this.summarySelection = data.summarySelection;
-                this.pauseControl.implicitResume();
             });
+
+
+
     }
 };
@@ -163 +163 @@
     }
 
-    onPress()
-    {
-        closeOpenDialogs();
-        this.pauseControl.implicitPause();
-
-        Engine.PushGuiPage(
-            "page_options.xml",
-            {},
-            changes => {
-                fireConfigChangeHandlers(changes);
-                resumeGame();
-            });
+    async onPress()
+    {
+        closeOpenDialogs();
+        this.pauseControl.implicitPause();
+
+        fireConfigChangeHandlers(await Engine.PushGuiPage("page_options.xml"));
+        resumeGame();
     }
 };
@@ -187 +182 @@
     }
 
-    onPress()
-    {
-        closeOpenDialogs();
-        this.pauseControl.implicitPause();
-
-        Engine.PushGuiPage(
-            "hotkeys/page_hotkeys.xml",
-            {},
-            () => { resumeGame(); });
+    async onPress()
+    {
+        closeOpenDialogs();
+        this.pauseControl.implicitPause();
+
+        await Engine.PushGuiPage("hotkeys/page_hotkeys.xml");
+        resumeGame();
     }
 };

ps/trunk/binaries/data/mods/public/gui/session/SessionMessageBox.js

@@ -5 +5 @@
 class SessionMessageBox
 {
-    display()
+    display()
     {
-        this.onPageOpening();
+        closeOpenDialogs();
+        g_PauseControl.implicitPause();
 
-        Engine.PushGuiPage(
+        Engine.PushGuiPage(
             "page_msgbox.xml",
             {
@@ -17 +18 @@
                 "message": this.Caption,
                 "buttonCaptions": this.Buttons ? this.Buttons.map(button => button.caption) : undefined,
-            },
-            this.onPageClosed.bind(this));
-    }
+            });
 
-    onPageOpening()
-    {
-        closeOpenDialogs();
-        g_PauseControl.implicitPause();
-    }
-
-    onPageClosed(buttonId)
-    {
         if (this.Buttons && this.Buttons[buttonId].onPress)
             this.Buttons[buttonId].onPress.call(this);

ps/trunk/binaries/data/mods/public/gui/session/selection_panels.js

@@ -1263 +1263 @@
  * @param {string} [civCode] - The template name of the entity that researches the selected technology.
  */
-function showTemplateDetails(templateName, civCode)
+function showTemplateDetails(templateName, civCode)
 {
     if (inputState != INPUT_NORMAL)
@@ -1269 +1269 @@
     g_PauseControl.implicitPause();
 
-    Engine.PushGuiPage(
+    Engine.PushGuiPage(
         "page_viewer.xml",
         {
             "templateName": templateName,
             "civ": civCode
-        },
-        resumeGame);
+        }
+    );
 }
 

ps/trunk/binaries/data/mods/public/gui/session/top_panel/CivIcon.js

@@ -30 +30 @@
     }
 
-    openPage(page)
+    openPage(page)
     {
         closeOpenDialogs();
         g_PauseControl.implicitPause();
 
-        pageLoop(
+        pageLoop(
             page,
             {
@@ -43 +43 @@
 
                 // TODO add info about researched techs and unlocked entities
-            },
-            data =>
-            {
-                this.dialogSelection = data;
-                resumeGame();
             });
+
     }
 

ps/trunk/source/gui/GUIManager.cpp

@@ -31 +31 @@
 #include "scriptinterface/FunctionWrapper.h"
 #include "scriptinterface/Object.h"
+
 #include "scriptinterface/ScriptContext.h"
 #include "scriptinterface/ScriptInterface.h"
@@ -113 +114 @@
     }
 
-    PushPage(pageName, initDataClone, JS::UndefinedHandleValue);
-}
-
-void CGUIManager::PushPage(const CStrW& pageName, Script::StructuredClone initData, JS::HandleValue callbackFunction)
+    PushPage(pageName, initDataClone);
+}
+
+)
 {
     // Store the callback handler in the current GUI page before opening the new one
-    if (!m_PageStack.empty() && !callbackFunction.isUndefined())
-    {
-        m_PageStack.back().SetCallbackFunction(m_ScriptInterface, callbackFunction);
-
-        // Make sure we unfocus anything on the current page.
-        m_PageStack.back().gui->SendFocusMessage(GUIM_LOST_FOCUS);
-    }
+    JS::RootedValue promise{m_ScriptInterface.GetGeneralJSContext(), [&]
+        {
+            if (m_PageStack.empty())
+                return JS::UndefinedValue();
+
+            // Make sure we unfocus anything on the current page.
+            m_PageStack.back().gui->SendFocusMessage(GUIM_LOST_FOCUS);
+            return m_PageStack.back().ReplacePromise(m_ScriptInterface);
+        }()};
 
     // Push the page prior to loading its contents, because that may push
@@ -131 +134 @@
     m_PageStack.emplace_back(pageName, initData);
     m_PageStack.back().LoadPage(m_ScriptContext);
+
+
 }
 
@@ -145 +150 @@
 
     m_PageStack.pop_back();
-    m_PageStack.back().PerformCallbackFunction(args);
+    m_PageStack.back().(args);
 
     // We return to a page where some object might have been focused.
@@ -246 +251 @@
 }
 
-void CGUIManager::SGUIPage::SetCallbackFunction(ScriptInterface& scriptInterface, JS::HandleValue callbackFunc)
-{
-    if (!callbackFunc.isObject())
-    {
-        LOGERROR("Given callback handler is not an object!");
-        return;
-    }
-
-    ScriptRequest rq(scriptInterface);
-
-    if (!JS_ObjectIsFunction(&callbackFunc.toObject()))
-    {
-        LOGERROR("Given callback handler is not a function!");
-        return;
-    }
-
-    callbackFunction = std::make_shared<JS::PersistentRootedValue>(scriptInterface.GetGeneralJSContext(), callbackFunc);
-}
-
-void CGUIManager::SGUIPage::PerformCallbackFunction(Script::StructuredClone args)
+JS::Value CGUIManager::SGUIPage::ReplacePromise(ScriptInterface& scriptInterface)
+{
+    JSContext* generalContext{scriptInterface.GetGeneralJSContext()};
+    callbackFunction = std::make_shared<JS::PersistentRootedObject>(generalContext,
+        JS::NewPromiseObject(generalContext, nullptr));
+    return JS::ObjectValue(**callbackFunction);
+}
+
+void CGUIManager::SGUIPage::ResolvePromise(Script::StructuredClone args)
 {
     if (!callbackFunction)
@@ -275 +269 @@
     JS::RootedObject globalObj(rq.cx, rq.glob);
 
-    JS::RootedValue funcVal(rq.cx, *callbackFunction);
+    JS::Rooted funcVal(rq.cx, *callbackFunction);
 
     // Delete the callback function, so that it is not called again
@@ -284 +278 @@
         Script::ReadStructuredClone(rq, args, &argVal);
 
-    JS::RootedValueVector paramData(rq.cx);
-    ignore_result(paramData.append(argVal));
-
-    JS::RootedValue result(rq.cx);
-
-    if(!JS_CallFunctionValue(rq.cx, globalObj, funcVal, paramData, &result))
-        ScriptException::CatchPending(rq);
+    // This only resolves the promise, it doesn't call the continuation.
+    JS::ResolvePromise(rq.cx, funcVal, argVal);
 }
 
@@ -389 +378 @@
     for (const SGUIPage& p : pageStack)
         p.gui->TickObjects();
+
+
 }
 

ps/trunk/source/gui/GUIManager.h

@@ -69 +69 @@
      * and will still be drawn and receive tick events, but will not receive
      * user inputs.
-     * If given, the callbackHandler function will be executed once this page is closed.
-     */
-    void PushPage(const CStrW& pageName, Script::StructuredClone initData, JS::HandleValue callbackFunc);
+     *  page is closed.
+     */
+    );
 
     /**
@@ -147 +147 @@
 
         /**
-         * Sets the callback handler when a new page is opened that will be performed when the page is closed.
-         */
-        void SetCallbackFunction(ScriptInterface& scriptInterface, JS::HandleValue callbackFunc);
+         * A new promise gets set. A reference to that promise is returned. The promise will settle when
+         * the page is closed.
+         */
+        JS::Value ReplacePromise(ScriptInterface& scriptInterface);
 
         /**
          * Execute the stored callback function with the given arguments.
          */
-        void PerformCallbackFunction(Script::StructuredClone args);
-
-        CStrW m_Name;
+        void (Script::StructuredClone args);
+
+         m_Name;
         std::unordered_set<VfsPath> inputs; // for hotloading
         Script::StructuredClone initData; // data to be passed to the init() function
@@ -165 +166 @@
          * Notice that storing it in the SGUIPage instead of CGUI means that it will survive the hotloading CGUI reset.
          */
-        std::shared_ptr<JS::PersistentRootedValue> callbackFunction;
+        std::shared_ptr<JS::PersistentRooted> callbackFunction;
     };
 
@@ -177 +178 @@
      * may crash (as the pusher page will suddenly have moved, and the stack will be confused).
      * Therefore use std::deque over std::vector.
-     */
-    using PageStackType = std::deque<SGUIPage>;
+     * Also the elements have to be destructed back to front.
+     */
+    class PageStackType : public std::deque<SGUIPage>
+    {
+    public:
+        ~PageStackType()
+        {
+            clear();
+        }
+
+        void clear()
+        {
+            while (!std::deque<SGUIPage>::empty())
+                std::deque<SGUIPage>::pop_back();
+        }
+    };
     PageStackType m_PageStack;
 

ps/trunk/source/gui/Scripting/JSInterface_GUIManager.cpp

@@ -1 @@
-/* Copyright (C) 2021 Wildfire Games.
+/* Copyright (C) 202 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -33 +33 @@
 // Note that the initData argument may only contain clonable data.
 // Functions aren't supported for example!
-void PushGuiPage(const ScriptRequest& rq, const std::wstring& name, JS::HandleValue initData, JS::HandleValue callbackFunction)
+// It returns a promise.
+JS::Value PushGuiPage(const ScriptRequest& rq, const std::wstring& name, JS::HandleValue initData)
 {
-    g_GUI->PushPage(name, Script::WriteStructuredClone(rq, initData), callbackFunction);
+    );
 }
 

ps/trunk/source/gui/tests/test_GuiManager.h

@@ -27 +27 @@
 #include "ps/Hotkey.h"
 #include "ps/XML/Xeromyces.h"
+
 #include "scriptinterface/ScriptRequest.h"
 #include "scriptinterface/ScriptInterface.h"
@@ -73 +74 @@
 
         Script::StructuredClone data = Script::WriteStructuredClone(rq, JS::NullHandleValue);
-        g_GUI->PushPage(L"event/page_event.xml", data, JS::UndefinedHandleValue);
+        g_GUI->PushPage(L"event/page_event.xml", data);
 
         const ScriptInterface& pageScriptInterface = *(g_GUI->GetActiveGUI()->GetScriptInterface());
@@ -136 +137 @@
 
         Script::StructuredClone data = Script::WriteStructuredClone(rq, JS::NullHandleValue);
-        g_GUI->PushPage(L"hotkey/page_hotkey.xml", data, JS::UndefinedHandleValue);
+        g_GUI->PushPage(L"hotkey/page_hotkey.xml", data);
 
         // Press 'a'.
@@ -209 +210 @@
         Script::CreateObject(rq, &val);
 
+
         Script::StructuredClone data = Script::WriteStructuredClone(rq, JS::NullHandleValue);
-        g_GUI->PushPage(L"regainFocus/page_emptyPage.xml", data, JS::UndefinedHandleValue);
+        g_GUI->PushPage(L"regainFocus/page_emptyPage.xml", data);
 
         const ScriptInterface& pageScriptInterface = *(g_GUI->GetActiveGUI()->GetScriptInterface());
@@ -216 +218 @@
         JS::RootedValue global(prq.cx, prq.globalValue());
 
-        g_GUI->PushPage(L"regainFocus/page_emptyPage.xml", data, JS::UndefinedHandleValue);
+        TS_ASSERT_EQUALS(g_GUI->GetPageCount(), 1);
+        g_GUI->PushPage(L"regainFocus/page_emptyPage.xml", data);
+        TS_ASSERT_EQUALS(g_GUI->GetPageCount(), 2);
         g_GUI->PopPage(data);
+
 
         // This page instantly pushes an empty page with a callback that pops another page again.
-        g_GUI->PushPage(L"regainFocus/page_pushWithPopOnInit.xml", data, JS::UndefinedHandleValue);
-
-        // Pop the empty page and trigger the callback (effectively pops twice).
+        g_GUI->PushPage(L"regainFocus/page_pushWithPopOnInit.xml", data);
+        TS_ASSERT_EQUALS(g_GUI->GetPageCount(), 3);
+
+        // Pop the empty page
         g_GUI->PopPage(data);
+
+
+
     }
 };

ps/trunk/source/scriptinterface/ScriptContext.cpp

@@ -1 @@
-/* Copyright (C) 2023 Wildfire Games.
+/* Copyright (C) 202 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -23 +23 @@
 #include "ps/GameSetup/Config.h"
 #include "ps/Profile.h"
+
 #include "scriptinterface/ScriptExtraHeaders.h"
 #include "scriptinterface/ScriptEngine.h"
@@ -84 +85 @@
 
 ScriptContext::ScriptContext(int contextSize, int heapGrowthBytesGCTrigger):
-    m_LastGCBytes(0),
-    m_LastGCCheck(0.0f),
-    m_HeapGrowthBytesGCTrigger(heapGrowthBytesGCTrigger),
-    m_ContextSize(contextSize)
+    m_JobQueue{std::make_unique<Script::JobQueue>()},
+    m_ContextSize{contextSize},
+    m_HeapGrowthBytesGCTrigger{heapGrowthBytesGCTrigger}
 {
     ENSURE(ScriptEngine::IsInitialised() && "The ScriptEngine must be initialized before constructing any ScriptContexts!");
@@ -131 +131 @@
 
     ScriptEngine::GetSingleton().RegisterContext(m_cx);
+
+
 }
 
@@ -269 +271 @@
 }
 
+
+
+
+
+
 void ScriptContext::PrepareZonesForIncrementalGC() const
 {

ps/trunk/source/scriptinterface/ScriptContext.h

@@ -1 @@
-/* Copyright (C) 2023 Wildfire Games.
+/* Copyright (C) 202 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -27 +27 @@
 constexpr int DEFAULT_CONTEXT_SIZE = 16 * 1024 * 1024;
 constexpr int DEFAULT_HEAP_GROWTH_BYTES_GCTRIGGER = 2 * 1024 * 1024;
+
+
+
+
+
 
 /**
@@ -76 +81 @@
 
     /**
+
+
+
+
+
+
+
+
      * GetGeneralJSContext returns the context without starting a GC request and without
      * entering any compartment. It should only be used in specific situations, such as
@@ -87 +100 @@
 
     JSContext* m_cx;
+
 
     void PrepareZonesForIncrementalGC() const;
@@ -93 +107 @@
     int m_ContextSize;
     int m_HeapGrowthBytesGCTrigger;
-    int m_LastGCBytes;
-    double m_LastGCCheck;
+    int m_LastGCBytes;
+    double m_LastGCCheck;
 };
 

ps/trunk/source/scriptinterface/ScriptInterface.cpp

@@ -1 @@
-/* Copyright (C) 2023 Wildfire Games.
+/* Copyright (C) 202 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -385 +385 @@
 ScriptInterface::~ScriptInterface()
 {
+
     if (Threading::IsMainThread())
     {

ps/trunk/source/simulation2/Simulation2.cpp

@@ -586 +586 @@
         cmpPathfinder->StartProcessingMoves(false);
     }
+
+
 }