Dont cache code, may need to revert

This commit is contained in:
Peter Stockings
2025-07-27 22:02:19 +10:00
parent f5e31921ef
commit 3ccf69e10a
2 changed files with 60 additions and 23 deletions

View File

@@ -6,13 +6,13 @@ const States = Object.freeze({
TIMEOUT: "TIMEOUT", TIMEOUT: "TIMEOUT",
}); });
async function handler(req: Request): Promise<Response> { // Create a pool of workers.
if (req.method !== "POST" || new URL(req.url).pathname !== "/execute") { const workerPool: { worker: Worker; inUse: boolean }[] = [];
return new Response("Not Found", { status: 404 }); // Allow the number of workers to be configured via an environment variable.
} const numWorkers =
parseInt(Deno.env.get("NUM_WORKERS") || "0") || navigator.hardwareConcurrency;
// For each request, spawn a new worker, use it, and then terminate it. for (let i = 0; i < numWorkers; i++) {
// This ensures a clean, stateless environment for every execution.
const worker = new Worker(new URL("./worker.ts", import.meta.url).href, { const worker = new Worker(new URL("./worker.ts", import.meta.url).href, {
type: "module", type: "module",
deno: { deno: {
@@ -20,6 +20,47 @@ async function handler(req: Request): Promise<Response> {
permissions: "inherit", permissions: "inherit",
}, },
}); });
workerPool.push({ worker, inUse: false });
}
const requestQueue: ((
value:
| { worker: Worker; inUse: boolean }
| PromiseLike<{ worker: Worker; inUse: boolean }>
) => void)[] = [];
function getAvailableWorker() {
return new Promise((resolve) => {
const availableWorker = workerPool.find((w) => !w.inUse);
if (availableWorker) {
availableWorker.inUse = true;
resolve(availableWorker);
} else {
requestQueue.push(resolve);
}
});
}
function releaseWorker(worker) {
if (requestQueue.length > 0) {
const nextRequest = requestQueue.shift();
if (nextRequest) {
nextRequest(worker);
}
} else {
worker.inUse = false;
}
}
async function handler(req: Request): Promise<Response> {
if (req.method !== "POST" || new URL(req.url).pathname !== "/execute") {
return new Response("Not Found", { status: 404 });
}
const availableWorker = (await getAvailableWorker()) as {
worker: Worker;
inUse: boolean;
};
try { try {
const body = await req.json(); const body = await req.json();
@@ -34,8 +75,8 @@ async function handler(req: Request): Promise<Response> {
let timeoutId: number; let timeoutId: number;
const cleanup = () => { const cleanup = () => {
worker.removeEventListener("message", messageHandler); availableWorker.worker.removeEventListener("message", messageHandler);
worker.removeEventListener("error", errorHandler); availableWorker.worker.removeEventListener("error", errorHandler);
if (timeoutId) clearTimeout(timeoutId); if (timeoutId) clearTimeout(timeoutId);
}; };
@@ -54,10 +95,10 @@ async function handler(req: Request): Promise<Response> {
reject(new Error("Timeout")); reject(new Error("Timeout"));
}, TIMEOUT_MS); }, TIMEOUT_MS);
worker.addEventListener("message", messageHandler); availableWorker.worker.addEventListener("message", messageHandler);
worker.addEventListener("error", errorHandler); availableWorker.worker.addEventListener("error", errorHandler);
worker.postMessage({ code, request, environment, name }); availableWorker.worker.postMessage({ code, request, environment, name });
}); });
const startTime = performance.now(); const startTime = performance.now();
@@ -83,12 +124,12 @@ async function handler(req: Request): Promise<Response> {
} catch (e) { } catch (e) {
return new Response(`Bad Request: ${e.message}`, { status: 400 }); return new Response(`Bad Request: ${e.message}`, { status: 400 });
} finally { } finally {
worker.terminate(); // Ensure the worker is always terminated. releaseWorker(availableWorker); // Release the worker.
} }
} }
const port = parseInt(Deno.env.get("PORT") || "8000"); const port = parseInt(Deno.env.get("PORT") || "8000");
console.log(`⚡ Deno server ready on :${port}`); console.log(`⚡ Deno server ready on :${port} with ${numWorkers} workers.`);
await serve(handler, { port }); await serve(handler, { port });

View File

@@ -1,5 +1,5 @@
// isolator/worker.ts // isolator/worker.ts
const moduleCache = new Map(); // No module cache to ensure fresh code for every execution.
const States = Object.freeze({ const States = Object.freeze({
SUCCESS: "SUCCESS", SUCCESS: "SUCCESS",
@@ -52,15 +52,11 @@ self.onmessage = async (e) => {
status status
); );
let userModule = moduleCache.get(code); // Use a data URL to import the user's code as a fresh ES module on every execution.
if (!userModule) {
// Use a data URL to import the user's code as an ES module.
const dataUrl = `data:text/javascript;base64,${btoa( const dataUrl = `data:text/javascript;base64,${btoa(
unescape(encodeURIComponent(code)) unescape(encodeURIComponent(code))
)}`; )}`;
userModule = await import(dataUrl); const userModule = await import(dataUrl);
moduleCache.set(code, userModule);
}
if (typeof userModule.default !== "function") { if (typeof userModule.default !== "function") {
throw new Error( throw new Error(