gwchq-textjam 0.1.110 → 0.1.112

package/dist/assets/{PyodideWorker54bb8b9ad9a6ac4abf31.js → PyodideWorkera79b61f3c8f551703270.js}

@@ -7,11 +7,68 @@ function toAbsoluteFromOrigin(url) {
   return new URL(url, self.location.origin).href;
 }
 
-// removing submodules (matplotlib.pyplot = matplotlib)
-const normalizeImportName = (name) => name.split(".")[0];
-
 const WORKING_DIR = "/home/pyodide";
 
+const toStructuredCloneable = (value) => {
+  if (value == null) return value;
+
+  if (
+    typeof value === "string" ||
+    typeof value === "number" ||
+    typeof value === "boolean"
+  ) {
+    return value;
+  }
+
+  if (value instanceof Uint8Array) {
+    return value.slice();
+  }
+
+  if (ArrayBuffer.isView(value)) {
+    return new Uint8Array(
+      value.buffer.slice(value.byteOffset, value.byteOffset + value.byteLength),
+    );
+  }
+
+  if (value instanceof ArrayBuffer) {
+    return value.slice(0);
+  }
+
+  if (value instanceof Map) {
+    return Object.fromEntries(
+      [...value.entries()].map(([k, v]) => [k, toStructuredCloneable(v)]),
+    );
+  }
+
+  if (Array.isArray(value)) {
+    return value.map(toStructuredCloneable);
+  }
+
+  if (typeof value?.toJs === "function") {
+    try {
+      const converted = value.toJs({ dict_converter: Object.fromEntries });
+      return toStructuredCloneable(converted);
+    } catch (_) {
+      try {
+        const converted = value.toJs();
+        return toStructuredCloneable(converted);
+      } catch (_) {
+        return String(value);
+      }
+    }
+  }
+
+  if (typeof value === "object") {
+    const result = {};
+    for (const [key, val] of Object.entries(value)) {
+      result[key] = toStructuredCloneable(val);
+    }
+    return result;
+  }
+
+  return String(value);
+};
+
 // Nest the PyodideWorker function inside a globalThis object so we control when its initialised.
 const PyodideWorker = () => {
   let assets;
@@ -66,9 +123,8 @@ const PyodideWorker = () => {
   let suppressInternalStdStreams = false;
 
   const onmessage = async ({ data }) => {
-    if (data.method !== "init") {
-      pyodide = await pyodidePromise;
-    }
+    pyodide = await pyodidePromise;
+    let encoder = new TextEncoder();
 
     switch (data.method) {
       case "stdinResponse":
@@ -96,7 +152,6 @@ const PyodideWorker = () => {
         }
         break;
       case "writeFile":
-        const encoder = new TextEncoder();
         pyodide.FS.writeFile(
           `${WORKING_DIR}/${data.filename}`,
           encoder.encode(data.content),
@@ -188,12 +243,27 @@ const PyodideWorker = () => {
 
       MAX_FILES = 100
       MAX_FILE_SIZE = 8500000
+      PROJECT_ROOT = os.path.abspath("${WORKING_DIR}")
+
+      def _is_project_file(filename):
+          abs_path = os.path.abspath(filename)
+          return abs_path == PROJECT_ROOT or abs_path.startswith(PROJECT_ROOT + os.sep)
+
+      def _to_project_relative(filename):
+          abs_path = os.path.abspath(filename)
+          return os.path.relpath(abs_path, PROJECT_ROOT)
 
       def _custom_open(filename, mode="r", *args, **kwargs):
-          if "x" in mode and os.path.exists(filename):
+          abs_path = os.path.abspath(filename)
+
+          if "x" in mode and os.path.exists(abs_path):
               raise FileExistsError(f"File '{filename}' already exists")
-          if ("w" in mode or "a" in mode or "x" in mode) and "b" not in mode:
-              if len(os.listdir()) > MAX_FILES and not os.path.exists(filename):
+
+          is_text_write = ("w" in mode or "a" in mode or "x" in mode) and "b" not in mode
+          is_project_file = _is_project_file(abs_path)
+
+          if is_text_write and is_project_file:
+              if len(os.listdir(PROJECT_ROOT)) > MAX_FILES and not os.path.exists(abs_path):
                   raise OSError(f"File system limit reached, no more than {MAX_FILES} files allowed")
               class CustomFile:
                   def __init__(self, filename):
@@ -204,9 +274,13 @@ const PyodideWorker = () => {
                       self.content += content
                       if len(self.content) > MAX_FILE_SIZE:
                           raise OSError(f"File '{self.filename}' exceeds maximum file size of {MAX_FILE_SIZE} bytes")
-                      with _original_open(self.filename, mode) as f:
+                      with _original_open(self.filename, mode, *args, **kwargs) as f:
                           f.write(self.content)
-                      basthon.kernel.write_file({ "filename": self.filename, "content": self.content, "mode": mode })
+                      basthon.kernel.write_file({
+                          "filename": _to_project_relative(self.filename),
+                          "content": self.content,
+                          "mode": mode
+                      })
 
                   def close(self):
                       pass
@@ -217,7 +291,7 @@ const PyodideWorker = () => {
                   def __exit__(self, exc_type, exc_val, exc_tb):
                       self.close()
 
-              return CustomFile(filename)
+              return CustomFile(abs_path)
           else:
               return _original_open(filename, mode, *args, **kwargs)
 
@@ -234,18 +308,16 @@ const PyodideWorker = () => {
 
     for (let name of imports) {
       checkIfStopped();
-      const pkgName = normalizeImportName(name);
-      await vendoredPackages[pkgName]?.after();
+      await vendoredPackages[name]?.after();
     }
   };
 
   const loadDependency = async (name) => {
     checkIfStopped();
 
-    const pkgName = normalizeImportName(name);
     // If the import is for another user file then open it and load its dependencies.
-    if (pyodide.FS.readdir(WORKING_DIR).includes(`${pkgName}.py`)) {
-      const fileContent = pyodide.FS.readFile(`${WORKING_DIR}/${pkgName}.py`, {
+    if (pyodide.FS.readdir(WORKING_DIR).includes(`${name}.py`)) {
+      const fileContent = pyodide.FS.readFile(`${WORKING_DIR}/${name}.py`, {
         encoding: "utf8",
       });
       await withSupportForPackages(fileContent);
@@ -253,30 +325,31 @@ const PyodideWorker = () => {
     }
 
     // If the import is for a vendored package then run its .before() hook.
-    const vendoredPackage = vendoredPackages[pkgName];
+    const vendoredPackage = vendoredPackages[name];
     await vendoredPackage?.before();
     if (vendoredPackage) {
       return;
     }
 
     // If the import is for a module built into Python then do nothing.
+    let pythonModule;
     try {
-      const pythonModule = pyodide.pyimport(pkgName);
-      if (pythonModule) {
-        return;
-      }
+      pythonModule = pyodide.pyimport(name);
     } catch (_) {}
+    if (pythonModule) {
+      return;
+    }
 
     // If the import is for a package built into Pyodide then load it.
     // Built-ins: https://pyodide.org/en/stable/usage/packages-in-pyodide.html
+    await pyodide.loadPackage(name)?.catch(() => {});
+    let pyodidePackage;
     try {
-      await pyodide.loadPackage(pkgName);
-
-      const pyodidePackage = pyodide.pyimport(pkgName);
-      if (pyodidePackage) {
-        return;
-      }
+      pyodidePackage = pyodide.pyimport(name);
     } catch (_) {}
+    if (pyodidePackage) {
+      return;
+    }
 
     // Ensure micropip is loaded which can fetch packages from PyPi.
     // See: https://pyodide.org/en/stable/usage/loading-packages.html
@@ -287,7 +360,7 @@ const PyodideWorker = () => {
 
     // If the import is for a PyPi package then load it.
     // Otherwise, don't error now so that we get an error later from Python.
-    await pyodide.micropip.install(pkgName).catch(() => {});
+    await pyodide.micropip.install(name).catch(() => {});
   };
 
   const vendoredPackages = {
@@ -457,15 +530,33 @@ const PyodideWorker = () => {
   const fakeBasthonPackage = {
     kernel: {
       display_event: (event) => {
-        const origin = event.toJs().get("display_type");
-        const content = event.toJs().get("content");
+        let payload;
+        try {
+          payload = event.toJs({ dict_converter: Object.fromEntries });
+        } catch (_) {
+          payload = event.toJs();
+        }
+
+        const origin = String(payload.display_type);
+        const content = toStructuredCloneable(payload.content);
 
         postMessage({ method: "handleVisual", origin, content });
       },
       write_file: (event) => {
-        const filename = event.toJs().get("filename");
-        const content = event.toJs().get("content");
-        const mode = event.toJs().get("mode");
+        let payload;
+        try {
+          payload = event.toJs({ dict_converter: Object.fromEntries });
+        } catch (_) {
+          payload = event.toJs();
+        }
+
+        const filename = String(payload.filename);
+        const content =
+          typeof payload.content === "string"
+            ? payload.content
+            : toStructuredCloneable(payload.content);
+        const mode = String(payload.mode);
+
         postMessage({ method: "handleFileWrite", filename, content, mode });
       },
       locals: () => pyodide.runPython("globals()"),
@@ -513,7 +604,6 @@ const PyodideWorker = () => {
 
     pyodidePromise = loadPyodide({
       stdout: (content) => {
-        if (stopped) return;
         if (userStdStreamsEnabled && !suppressInternalStdStreams) {
           postMessage({ method: "handleOutput", stream: "stdout", content });
         } else {
@@ -521,7 +611,6 @@ const PyodideWorker = () => {
         }
       },
       stderr: (content) => {
-        if (stopped) return;
         if (userStdStreamsEnabled && !suppressInternalStdStreams) {
           postMessage({ method: "handleOutput", stream: "stderr", content });
         } else {
@@ -646,7 +735,13 @@ const PyodideWorker = () => {
 
     return { file, line, mistake, type, info };
   };
+
+  // return {
+  //   postMessage,
+  //   onmessage,
+  // };
 };
 
 globalThis.PyodideWorker = PyodideWorker;
 PyodideWorker();
+// export default PyodideWorker;