code-battles 1.7.7 → 1.7.9

package/dist/code_battles/battles.py

@@ -543,18 +543,10 @@ class CodeBattles(
 
     @web_only
     def _initialize(self):
-        from js import document, window
+        from js import window
         from pyscript.ffi import create_proxy
 
         window.addEventListener("resize", create_proxy(lambda _: self._resize_canvas()))
-        document.getElementById("playpause").onclick = create_proxy(
-            lambda _: asyncio.get_event_loop().run_until_complete(self._play_pause())
-        )
-        step_element = document.getElementById("step")
-        if step_element is not None:
-            step_element.onclick = create_proxy(
-                lambda _: asyncio.get_event_loop().run_until_complete(self._step())
-            )
 
     def _initialize_simulation(
         self, player_codes: List[str], seed: Optional[int] = None
@@ -698,15 +690,7 @@ class CodeBattles(
             with open(output_file, "w") as f:
                 f.write(simulation_str)
 
-    def _start_simulation(self, *args, **kwargs):
-        loop = asyncio.get_event_loop()
-        loop.run_until_complete(self._start_simulation_async(*args, **kwargs))
-
-    def _start_simulation_from_file(self, contents: str):
-        loop = asyncio.get_event_loop()
-        loop.run_until_complete(self._start_simulation_from_file_async(contents))
-
-    async def _start_simulation_from_file_async(self, contents: str):
+    async def _start_simulation_from_file(self, contents: str):
         from js import document
 
         try:
@@ -773,7 +757,7 @@ class CodeBattles(
             print(e)
 
     @web_only
-    async def _start_simulation_async(
+    async def _start_simulation(
         self,
         parameters: Dict[str, str],
         player_codes: List[str],

package/dist/esm/index.js

@@ -407,7 +407,7 @@ const runNoUI = (parameters, apis, playerBots, seed, verbose) => {
     const players = playerBots.map((api) => (api === "None" ? "" : apis[api]));
     tryUntilSuccess(() => 
     // @ts-ignore
-    window._startSimulation.callPromising(parameters, players, playerBots, true, false, verbose, seed));
+    window._startSimulation(parameters, players, playerBots, true, false, verbose, seed));
 };
 const tryUntilSuccess = (f, timeout = 500) => {
     try {
@@ -2698,7 +2698,7 @@ const RunSimulationBlock = () => {
                 window._isSimulationFromFile = true;
                 tryUntilSuccess(() => {
                     // @ts-ignore
-                    window._startSimulationFromFile.callPromising(text);
+                    window._startSimulationFromFile(text);
                 });
             }), style: {
                 textAlign: "center",
@@ -3349,6 +3349,8 @@ const PlayPauseButton = () => {
                 (_b = window.mainAudio) === null || _b === void 0 ? void 0 : _b.play();
             }
             setPlaying((p) => !p);
+            // @ts-ignore
+            window._playPause();
         }, leftSection: playing ? (React.createElement("i", { className: "fa-solid fa-pause" })) : (React.createElement("i", { className: "fa-solid fa-play" })), color: playing ? "yellow.4" : "green", id: "playpause" }, playing ? "Pause" : "Play"));
 };
 const Simulation = () => {
@@ -3411,7 +3413,7 @@ const Simulation = () => {
             const seed = (_a = searchParams.get("seed")) !== null && _a !== void 0 ? _a : "";
             tryUntilSuccess(() => 
             // @ts-ignore
-            window._startSimulation.callPromising(parameters, players, playerNames, false, !showcaseMode, true, seed));
+            window._startSimulation(parameters, players, playerNames, false, !showcaseMode, true, seed));
         }
     }, [loading]);
     const newRank = getRank(getLocalStorage("Cached tournament/info"), winner, getLocalStorage("Point Modifier")) + 1;
@@ -3492,7 +3494,9 @@ const Simulation = () => {
                         showcaseMode || (React.createElement(React.Fragment, null,
                             React.createElement("span", { id: "render-status", style: { marginRight: 10 } }),
                             React.createElement(NumberInput, { id: "breakpoint", label: "Breakpoint", min: 0, leftSection: React.createElement("i", { className: "fa-solid fa-stopwatch" }), display: "inline-block", maw: "35%", mr: "xs" }),
-                            React.createElement(Button, { style: { flex: "none" }, my: "xs", w: 100, leftSection: React.createElement("i", { className: "fa-solid fa-wand-magic" }), color: "grape", id: "step", mr: "xs", radius: "20px" }, "Step"))),
+                            React.createElement(Button, { style: { flex: "none" }, my: "xs", w: 100, leftSection: React.createElement("i", { className: "fa-solid fa-wand-magic" }), color: "grape", id: "step", mr: "xs", radius: "20px", 
+                                // @ts-ignore
+                                onClick: () => window._step() }, "Step"))),
                         React.createElement(PlayPauseButton, null),
                         downloadBytes && (React.createElement(Button, { ml: "xs", radius: "20px", leftSection: React.createElement("i", { className: "fa-solid fa-download" }), color: "blue", onClick: () => downloadFile(`${playerNames.join("-")}.btl`, "text/plain", 
                             // @ts-ignore
@@ -5981,6 +5985,19 @@ function requirePrismLineNumbers () {
 requirePrismLineNumbers();
 
 const initialize = () => {
+    // Load the packed Python file of the project, on the main thread and on a web worker.
+    const mainThreadScript = document.createElement("script");
+    mainThreadScript.type = "py";
+    mainThreadScript.src = "/scripts/packed.py";
+    mainThreadScript.setAttribute("config", "/config.json");
+    document.body.appendChild(mainThreadScript);
+    const workerScript = document.createElement("script");
+    workerScript.type = "py";
+    workerScript.src = "/scripts/packed.py";
+    workerScript.setAttribute("config", "/config.json");
+    workerScript.toggleAttribute("worker", true);
+    workerScript.setAttribute("name", "worker");
+    document.body.appendChild(workerScript);
     // @ts-ignore
     window.showAlert = (title, alert, color, icon, limitTime, isCode) => {
         var _a;