gwchq-textjam 0.3.6 → 0.3.7

package/dist/assets/{PyodideWorkerb1409749c37aedc47dc8.js → PyodideWorkereba24d5259c22fbe422a.js}

@@ -133,6 +133,8 @@ const PyodideWorker = () => {
   let useSyncXhrStdin = false;
   /** True when current input request was cancelled from outside the worker. */
   let stdinCancelled = false;
+  /** True when the sync-XHR stdin transport failed (SW unreachable / request escaped). */
+  let stdinTransportFailed = false;
   /** Used when SharedArrayBuffer is unavailable: resolve for the pending input() call. */
   let pendingStdinResolve = null;
   // Until Pyodide is fully initialised, keep stdout/stderr in the dev console only.
@@ -185,6 +187,7 @@ const PyodideWorker = () => {
       case "runPython":
         currentRunId = data.runId || null;
         stdinCancelled = false;
+        stdinTransportFailed = false;
         runPython(data.python, data.userModuleNames);
         break;
       case "stopPython": {
@@ -238,10 +241,7 @@ const PyodideWorker = () => {
         await runUserCode();
       });
     } catch (error) {
-      const isStdinControlError =
-        error?.message === "PYODIDE_STDIN_CANCELLED" ||
-        error?.message === "PYODIDE_STDIN_TIMEOUT" ||
-        error?.message === "PYODIDE_STDIN_ABORTED";
+      const isStdinControlError = error?.message === "PYODIDE_STDIN_CANCELLED";
 
       if (stdinCancelled || isStdinControlError) {
         postMessage({
@@ -256,6 +256,19 @@ const PyodideWorker = () => {
         return;
       }
 
+      if (stdinTransportFailed) {
+        postMessage({
+          method: "handleError",
+          file: "main.py",
+          line: "",
+          mistake: "",
+          type: "InputUnavailableError",
+          info: "Input timed out. Rerun your code and try again.",
+        });
+        await clearPyodideData(userModuleNames);
+        return;
+      }
+
       if (!(error instanceof pyodide.ffi.PythonError)) {
         postMessage({
           method: "handleError",
@@ -691,59 +704,64 @@ const PyodideWorker = () => {
   };
 
   const readInputViaSyncXhr = (runId) => {
-    const requestId = crypto.randomUUID();
-    const requestUrl = new URL(
-      stdinFallbackConfig.endpointPath,
-      // eslint-disable-next-line no-restricted-globals
-      self.location.origin,
-    );
-    requestUrl.searchParams.set("runId", runId || "");
-    requestUrl.searchParams.set("requestId", requestId);
-    requestUrl.searchParams.set("clientId", stdinFallbackConfig.clientId);
-
-    const xhr = new XMLHttpRequest();
-    xhr.open("GET", requestUrl.toString(), false);
-    xhr.setRequestHeader("X-Pyodide-Stdin-Request", "true");
-    xhr.setRequestHeader("Cache-Control", "no-store");
-
+    // Mark any failure with XHR setup as stdinTransportFailed for a clean error
     try {
+      const requestId = crypto.randomUUID();
+      const requestUrl = new URL(
+        stdinFallbackConfig.endpointPath,
+        // eslint-disable-next-line no-restricted-globals
+        self.location.origin,
+      );
+      requestUrl.searchParams.set("runId", runId || "");
+      requestUrl.searchParams.set("requestId", requestId);
+      requestUrl.searchParams.set("clientId", stdinFallbackConfig.clientId);
+
+      const xhr = new XMLHttpRequest();
+      xhr.open("GET", requestUrl.toString(), false);
+      xhr.setRequestHeader("X-Pyodide-Stdin-Request", "true");
+      xhr.setRequestHeader("Cache-Control", "no-store");
       xhr.send(null);
-    } catch (_) {
-      throw new Error("Failed to read Python input via stdin fallback");
-    }
 
-    if (xhr.status === STDIN_CANCELLED_RESPONSE_CODE) {
-      stdinCancelled = true;
-      throw new Error("PYODIDE_STDIN_CANCELLED");
-    }
+      if (xhr.status === STDIN_CANCELLED_RESPONSE_CODE) {
+        stdinCancelled = true;
+        throw new Error("PYODIDE_STDIN_CANCELLED");
+      }
 
-    if (xhr.status === STDIN_TIMEOUT_RESPONSE_CODE) {
-      throw new Error("PYODIDE_STDIN_TIMEOUT");
-    }
+      if (xhr.status === STDIN_TIMEOUT_RESPONSE_CODE) {
+        stdinTransportFailed = true;
+        throw new Error("PYODIDE_STDIN_TIMEOUT");
+      }
 
-    if (xhr.status === STDIN_ABORTED_RESPONSE_CODE) {
-      throw new Error("PYODIDE_STDIN_ABORTED");
-    }
+      if (xhr.status === STDIN_ABORTED_RESPONSE_CODE) {
+        stdinTransportFailed = true;
+        throw new Error("PYODIDE_STDIN_ABORTED");
+      }
 
-    // EOF: orchestrator signalled Ctrl+D / no more input. Returning null tells
-    // Pyodide's line-based stdin handler to raise EOFError at the input() call
-    // site, rather than escalating to a KeyboardInterrupt that tears down the run.
-    if (xhr.status === STDIN_EOF_RESPONSE_CODE) {
-      return null;
-    }
+      // EOF: orchestrator signalled Ctrl+D / no more input. Returning null tells
+      // Pyodide's line-based stdin handler to raise EOFError at the input() call
+      // site, rather than escalating to a KeyboardInterrupt that tears down the run.
+      if (xhr.status === STDIN_EOF_RESPONSE_CODE) {
+        return null;
+      }
 
-    if (xhr.status !== 200) {
-      throw new Error(
-        `Python input request failed with status ${xhr.status}: ${xhr.responseText}`,
-      );
-    }
+      if (xhr.status !== 200) {
+        throw new Error(
+          `Python input request failed with status ${xhr.status}: ${xhr.responseText}`,
+        );
+      }
 
-    let content = xhr.responseText ?? "";
-    if (!content.endsWith("\n")) {
-      content += "\n";
-    }
+      let content = xhr.responseText ?? "";
+      if (!content.endsWith("\n")) {
+        content += "\n";
+      }
 
-    return content;
+      return content;
+    } catch (err) {
+      if (!stdinCancelled) {
+        stdinTransportFailed = true;
+      }
+      throw err;
+    }
   };
 
   const clearPyodideData = async (userModuleNames) => {

package/dist/index.js

@@ -370252,18 +370252,18 @@ const useHtmlRunner = () => {
         };
     }, [shouldUseBrowserHistory]);
     (0, react_1.useEffect)(() => {
-        if (isPreviewMode) {
-            const handleMessage = (event) => {
-                if (event.data.type === BroadcastMessageType.RELOAD_PROJECT) {
-                    // Trigger a reload of a preview page
-                    window.location.reload();
-                }
-            };
-            broadcastChannel.current?.addEventListener("message", handleMessage);
-            return () => {
-                broadcastChannel.current?.removeEventListener("message", handleMessage);
-            };
-        }
+        if (!isPreviewMode)
+            return;
+        const handleMessage = (event) => {
+            if (event.data.type === BroadcastMessageType.RELOAD_PROJECT) {
+                // Trigger a reload of a preview page
+                window.location.reload();
+            }
+        };
+        broadcastChannel.current?.addEventListener("message", handleMessage);
+        return () => {
+            broadcastChannel.current?.removeEventListener("message", handleMessage);
+        };
     }, [isPreviewMode]);
     (0, react_1.useEffect)(() => {
         const handleReloadMessage = (event) => {
@@ -370315,15 +370315,15 @@ const useHtmlRunner = () => {
         dispatch((0, EditorSlice_1.setLoadedRunner)(EditorTypes_1.RunnerType.HTML));
     }, []);
     (0, react_1.useEffect)(() => {
-        if (codeRunTriggered) {
-            // Fresh iframe for each run (clean slate); it persists across view switches
-            createIframe();
-            runCode();
-            if (!isPreviewMode) {
-                broadcastChannel.current?.postMessage({
-                    type: BroadcastMessageType.RELOAD_PROJECT,
-                });
-            }
+        if (!codeRunTriggered)
+            return;
+        // Fresh iframe for each run (clean slate); it persists across view switches
+        createIframe();
+        runCode();
+        if (!isPreviewMode) {
+            broadcastChannel.current?.postMessage({
+                type: BroadcastMessageType.RELOAD_PROJECT,
+            });
         }
     }, [codeRunTriggered, page, isPreviewMode]);
     (0, react_1.useEffect)(() => {
@@ -370537,7 +370537,7 @@ const useIframeHost = ({ codeHasBeenRun, error, page, isPreviewMode, onIframeLoa
         slotRef.current = node;
         setSlotVersion((v) => v + 1);
     }, []);
-    // Create the persistent host + iframe once; tear it down on unmount
+    // Create the persistent host + iframe once; tear it down on unmount.
     (0, react_1.useEffect)(() => {
         if (typeof document === "undefined")
             return;
@@ -370555,6 +370555,7 @@ const useIframeHost = ({ codeHasBeenRun, error, page, isPreviewMode, onIframeLoa
                 document.body.removeChild(host);
             hostRef.current = null;
             output.current = null;
+            setHostReady(false);
         };
     }, [createIframe]);
     // Keep the host aligned with the active slot across resizes/scrolls/switches
@@ -370902,7 +370903,7 @@ const styles_module_scss_1 = __importDefault(__webpack_require__(12914));
  * The React component itself stays free of any worker plumbing — it just
  * consumes the values returned here to drive its JSX.
  */
-const usePyodideRunner = ({ active, packageApiUrl, }) => {
+const usePyodideRunner = ({ packageApiUrl, }) => {
     const dispatch = (0, react_redux_1.useDispatch)();
     // -------------------------------------------------------------------------
     // Redux selectors
@@ -371067,7 +371068,11 @@ const usePyodideRunner = ({ active, packageApiUrl, }) => {
     const handleError = (0, react_1.useCallback)((file, line, mistake, type, info) => {
         let errorMessage;
         if (type === "KeyboardInterrupt") {
-            errorMessage = "Execution interrupted";
+            errorMessage = info || "Execution interrupted";
+        }
+        else if (type === "InputUnavailableError") {
+            errorMessage =
+                info || "Input timed out. Rerun your code and try again.";
         }
         else {
             const message = [type, info].filter((s) => s).join(": ");
@@ -371142,7 +371147,6 @@ const usePyodideRunner = ({ active, packageApiUrl, }) => {
         handleVisual,
     ]);
     const { worker: pyodideWorker, recreateWorker } = (0, usePyodideWorker_1.usePyodideWorker)({
-        active,
         projectIdentifier: project.identifier,
         onMessage: handleMessage,
         onBeforeRecreate: handleBeforeRecreate,
@@ -371170,7 +371174,6 @@ const usePyodideRunner = ({ active, packageApiUrl, }) => {
         recreateWorker();
     }, [recreateWorker]);
     const { ensureInputServiceWorker, registerStdinClient } = (0, useStdinServiceWorker_1.useStdinServiceWorker)({
-        active,
         tabIdRef,
         onStdinRequest: handleStdinRequest,
         onControllerChange: handleControllerChange,
@@ -371334,13 +371337,13 @@ const usePyodideRunner = ({ active, packageApiUrl, }) => {
     }, [pyodideWorker, ensureInputServiceWorker, packageApiUrl]);
     // Kick off a run when the Redux flag flips on.
     (0, react_1.useEffect)(() => {
-        if (codeRunTriggered && active && output.current) {
+        if (codeRunTriggered && output.current) {
             handleRun();
         }
     }, [codeRunTriggered, output.current]);
     // Stop a run when the Redux flag flips on.
     (0, react_1.useEffect)(() => {
-        if (codeRunStopped && active) {
+        if (codeRunStopped) {
             handleStop();
         }
     }, [codeRunStopped]);
@@ -371369,7 +371372,7 @@ const assetUrls_1 = __webpack_require__(85799);
  * Owns the lifecycle of the Pyodide Web Worker.
  *
  * Responsibilities:
- *   - Create the worker once the runner becomes active.
+ *   - Create the worker on mount.
  *   - Re-create the worker whenever the project identifier changes (each
  *     project starts from a clean Python environment).
  *   - Expose an imperative `recreateWorker` for callers that need to force a
@@ -371379,7 +371382,7 @@ const assetUrls_1 = __webpack_require__(85799);
  * Posting messages and decoding incoming messages is the orchestrator's job —
  * this hook just hands the worker over and forwards messages.
  */
-const usePyodideWorker = ({ active, projectIdentifier, onMessage, onBeforeRecreate, }) => {
+const usePyodideWorker = ({ projectIdentifier, onMessage, onBeforeRecreate, }) => {
     const [worker, setWorker] = (0, react_1.useState)(null);
     // The onMessage callback closes over orchestrator state, so we route through
     // a ref to avoid rebuilding the worker every render.
@@ -371407,22 +371410,14 @@ const usePyodideWorker = ({ active, projectIdentifier, onMessage, onBeforeRecrea
             return createWorker();
         });
     }, [createWorker]);
-    // First-mount creation: only when active and no worker exists yet.
+    // First-mount creation: only when no worker exists yet.
     (0, react_1.useEffect)(() => {
         if (worker)
             return;
-        if (!active)
-            return;
         setWorker(createWorker());
-    }, [active, worker, createWorker]);
-    // Project changes always reset the worker — but only when this runner is
-    // the active one. Without this gate the hook would spin up a Pyodide
-    // worker for HTML projects too, since the runner factory now calls
-    // usePythonRunner unconditionally and only skips its side effects via
-    // `active`.
+    }, [worker, createWorker]);
+    // Project changes always reset the worker.
     (0, react_1.useEffect)(() => {
-        if (!active)
-            return;
         recreateWorker();
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [projectIdentifier]);
@@ -371462,7 +371457,7 @@ const serviceWorker_1 = __webpack_require__(58158);
  * Returns helpers (`ensureInputServiceWorker`, `registerStdinClient`) the
  * orchestrator calls from `run` and from `init`.
  */
-const useStdinServiceWorker = ({ active, tabIdRef, onStdinRequest, onControllerChange, }) => {
+const useStdinServiceWorker = ({ tabIdRef, onStdinRequest, onControllerChange, }) => {
     // Keep latest callbacks in refs so the event listener effects don't need to
     // re-subscribe whenever the parent re-renders with a new closure.
     const onStdinRequestRef = (0, react_1.useRef)(onStdinRequest);
@@ -371566,9 +371561,6 @@ const useStdinServiceWorker = ({ active, tabIdRef, onStdinRequest, onControllerC
     // Re-register stdin client and notify the orchestrator whenever the page
     // gains a new SW controller (e.g. after first registration or a SW update).
     (0, react_1.useEffect)(() => {
-        if (!active) {
-            return;
-        }
         if (!("serviceWorker" in navigator)) {
             return;
         }
@@ -371583,7 +371575,7 @@ const useStdinServiceWorker = ({ active, tabIdRef, onStdinRequest, onControllerC
         return () => {
             navigator.serviceWorker.removeEventListener("controllerchange", handleControllerChange);
         };
-    }, [active, registerStdinClient]);
+    }, [registerStdinClient]);
     return { ensureInputServiceWorker, registerStdinClient };
 };
 exports.useStdinServiceWorker = useStdinServiceWorker;
@@ -372045,18 +372037,17 @@ const styles_module_scss_1 = __importDefault(__webpack_require__(12914));
 const VisualOutputPane_1 = __importDefault(__webpack_require__(39626));
 const usePyodideRunner_1 = __webpack_require__(65587);
 const consoleInput_1 = __webpack_require__(35660);
-const usePythonRunner = ({ active, packageApiUrl, }) => {
+const usePythonRunner = ({ packageApiUrl, }) => {
     const dispatch = (0, react_redux_1.useDispatch)();
     const activeRunner = (0, stores_1.useAppSelector)((state) => state.editor.activeRunner);
     const { mountConsole, visuals, setVisuals } = (0, usePyodideRunner_1.usePyodideRunner)({
-        active,
         packageApiUrl,
     });
     (0, react_1.useEffect)(() => {
-        if (active && activeRunner !== EditorTypes_1.RunnerType.PYODIDE) {
+        if (activeRunner !== EditorTypes_1.RunnerType.PYODIDE) {
             dispatch((0, EditorSlice_1.loadingRunner)(EditorTypes_1.RunnerType.PYODIDE));
         }
-    }, [active, activeRunner, dispatch]);
+    }, [activeRunner, dispatch]);
     const renderConsoleOutput = (0, react_1.useCallback)(() => ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(ErrorMessage_1.default, {}), (0, jsx_runtime_1.jsx)("div", { className: styles_module_scss_1.default.consoleMount, onClick: consoleInput_1.shiftFocusToInput, ref: mountConsole })] })), [mountConsole]);
     const renderVisualOutput = (0, react_1.useCallback)(() => ((0, jsx_runtime_1.jsx)(VisualOutputPane_1.default, { visuals: visuals, setVisuals: setVisuals })), [visuals, setVisuals]);
     const outputMeta = {
@@ -372112,9 +372103,9 @@ const ProjectTypes_1 = __webpack_require__(27130);
 const EditorTypes_1 = __webpack_require__(42108);
 const useRunnerFactory = ({ projectType, packageApiUrl, }) => {
     const isWeb = projectType === ProjectTypes_1.ProjectType.WEB;
-    const htmlRunner = (0, useHtmlRunner_1.default)();
-    const pythonRunner = (0, usePythonRunner_1.default)({ active: !isWeb, packageApiUrl });
-    const { renderVisualOutput, renderConsoleOutput, outputMeta, panelOrder } = isWeb ? htmlRunner : pythonRunner;
+    const { renderVisualOutput, renderConsoleOutput, outputMeta, panelOrder } = 
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    isWeb ? (0, useHtmlRunner_1.default)() : (0, usePythonRunner_1.default)({ packageApiUrl });
     // The output-type → renderer mapping is identical across runners, so compose
     // the public renderOutput here rather than duplicating it in each hook.
     const renderOutput = (0, react_1.useCallback)((outputType) => outputType === EditorTypes_1.OutputType.VISUAL
@@ -385732,7 +385723,7 @@ module.exports = webpackAsyncContext;
 /***/ 24427:
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
-module.exports = __webpack_require__.p + "assets/PyodideWorkerb1409749c37aedc47dc8.js";
+module.exports = __webpack_require__.p + "assets/PyodideWorkereba24d5259c22fbe422a.js";
 
 /***/ }),
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gwchq-textjam",
   "description": "Embeddable React editor used in Raspberry Pi text-based projects.",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "license": "Apache-2.0",
   "homepage": "https://github.com/GirlsFirst/gwchq-textjam",
   "author": "Girls Who Code HQ",