gwchq-textjam 0.3.6 → 0.3.8

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) => {