sandboxedjs 0.1.68 → 0.1.70

package/dist/index.js

@@ -17953,7 +17953,7 @@ var wheels_default = {
 
 // package.json
 var package_default = {
-  version: "0.1.68"};
+  version: "0.1.70"};
 
 // src/runtime/python/config.ts
 var bundledManifest = {
@@ -18498,9 +18498,6 @@ function toPosixError(error) {
   };
   return new PosixError(code && mapped[code] ? mapped[code] : Errno.EIO, message);
 }
-
-// src/runtime/python/backend.ts
-init_signals();
 var DescriptorTable = class _DescriptorTable {
   slots = /* @__PURE__ */ new Map();
   /** Descriptions this table shares with others, so close counts correctly. */
@@ -18571,6 +18568,10 @@ var DescriptorTable = class _DescriptorTable {
       }
     }
   }
+  /** The numbers this table currently holds, in ascending order. */
+  fds() {
+    return [...this.slots.keys()].sort((a, b) => a - b);
+  }
   get openCount() {
     return this.slots.size;
   }
@@ -18672,6 +18673,9 @@ var FileService = class {
   }
 };
 
+// src/runtime/python/backend.ts
+init_signals();
+
 // src/runtime/python/protocol.ts
 var ProtocolError = class extends Error {
   code = "ERR_SBX_ABI_PROTOCOL";
@@ -19787,7 +19791,9 @@ async function startPythonProcess(options) {
   table.set(0, stdin);
   table.set(1, stdout);
   table.set(2, stderr);
-  for (const [fd, description] of options.inherit ?? []) table.set(fd, description);
+  const inheritedFds = options.inherit?.fds() ?? [];
+  for (const fd of inheritedFds) table.set(fd, options.inherit.get(fd));
+  options.inherit?.closeAll();
   const controller = new AbortController();
   const abort = () => controller.abort();
   options.signal.addEventListener("abort", abort, { once: true });
@@ -19867,7 +19873,11 @@ async function startPythonProcess(options) {
     pid: options.pid,
     ppid: options.ppid,
     mounts: options.mounts,
-    isTty: options.isTty
+    isTty: options.isTty,
+    /* Only beyond the standard three: 0, 1 and 2 are bound as the process's
+     * terminal-or-pipe streams by the worker itself, and installing a second
+     * stream over one of them would leave two objects claiming the number. */
+    inheritFds: inheritedFds.filter((fd) => fd > 2)
   });
   return {
     write: (data) => stdin.push(data),
@@ -20346,11 +20356,18 @@ function consoleLauncher(target) {
   return `#!/usr/bin/python3
 import sys
 from importlib import import_module
-entry = import_module(${JSON.stringify(module)})
-for part in ${JSON.stringify(attribute)}.split('.'):
-    if part:
-        entry = getattr(entry, part)
-raise SystemExit(entry())
+
+
+def _entry():
+    entry = import_module(${JSON.stringify(module)})
+    for part in ${JSON.stringify(attribute)}.split('.'):
+        if part:
+            entry = getattr(entry, part)
+    return entry
+
+
+if __name__ == '__main__':
+    sys.exit(_entry()())
 `;
 }
 
@@ -20361,10 +20378,10 @@ var WNOHANG = 1;
 function claimInheritance(env2) {
   const token = env2[INHERIT_TOKEN];
   if (!token) return void 0;
-  const files = PENDING_INHERITANCE.get(token);
+  const held = PENDING_INHERITANCE.get(token);
   PENDING_INHERITANCE.delete(token);
   delete env2[INHERIT_TOKEN];
-  return files;
+  return held;
 }
 function waitStatus(proc) {
   if (proc.termSignal) return signalNumber(proc.termSignal) & 127;
@@ -20390,15 +20407,11 @@ function createProcessService(ctx) {
   return {
     async spawn(request) {
       const token = `${ctx.proc.pid}:${Math.random().toString(36).slice(2)}`;
-      const extra = /* @__PURE__ */ new Map();
-      for (const [fd, description] of request.files) {
-        if (fd > 2) extra.set(fd, description);
-      }
       const env2 = { ...request.env };
-      if (extra.size > 0) {
-        PENDING_INHERITANCE.set(token, extra);
-        env2[INHERIT_TOKEN] = token;
-      }
+      const held = new DescriptorTable();
+      for (const [fd, description] of request.files) held.set(fd, description);
+      PENDING_INHERITANCE.set(token, held);
+      env2[INHERIT_TOKEN] = token;
       const stdin = request.files.get(0);
       const argv = [containerProgram(ctx, request.argv[0] ?? ""), ...request.argv.slice(1)];
       const proc = ctx.kernel.spawn(argv, {
@@ -20411,7 +20424,9 @@ function createProcessService(ctx) {
         stderr: outputFor(request.files.get(2), ctx.stderr)
       });
       children.set(proc.pid, proc);
-      void proc.wait().finally(() => PENDING_INHERITANCE.delete(token));
+      void proc.wait().finally(() => {
+        if (PENDING_INHERITANCE.delete(token)) held.closeAll();
+      });
       return proc.pid;
     },
     async wait(pid, options) {