peterstockings/deno-isolator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cache the scripts on disk, in attempt to increase perfrmance, may need to revisit this

Browse Source
This commit is contained in:
Peter Stockings
2025-07-26 21:50:45 +10:00
parent 748771dc33
commit 4a335dc936
5 changed files with 95 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Procfile
View File

@@ -1 +1 @@
web: deno run --allow-net --allow-read --allow-env --unstable-worker-options deno_server.ts
web: deno run --allow-net --allow-read --allow-write --allow-env --unstable-worker-options deno_server.ts

2
deno.jsonc
View File

@@ -23,6 +23,6 @@
}
},
"tasks": {
"start": "deno run --allow-net --allow-read --allow-env --unstable-worker-options deno_server.ts"
"start": "deno run --allow-net --allow-read --allow-write --allow-env --unstable-worker-options deno_server.ts"
}
}

16
deno.lock generated
View File

@@ -26,6 +26,22 @@
"https://deno.land/std@0.201.0/assert/assert.ts": "9a97dad6d98c238938e7540736b826440ad8c1c1e54430ca4c4e623e585607ee",
"https://deno.land/std@0.201.0/assert/assertion_error.ts": "4d0bde9b374dfbcbe8ac23f54f567b77024fb67dbb1906a852d67fe050d42f56",
"https://deno.land/std@0.201.0/async/delay.ts": "a6142eb44cdd856b645086af2b811b1fcce08ec06bb7d50969e6a872ee9b8659",
"https://deno.land/std@0.201.0/crypto/_fnv/fnv32.ts": "e4649dfdefc5c987ed53c3c25db62db771a06d9d1b9c36d2b5cf0853b8e82153",
"https://deno.land/std@0.201.0/crypto/_fnv/fnv64.ts": "bfa0e4702061fdb490a14e6bf5f9168a22fb022b307c5723499469bfefca555e",
"https://deno.land/std@0.201.0/crypto/_fnv/mod.ts": "f956a95f58910f223e420340b7404702ecd429603acd4491fa77af84f746040c",
"https://deno.land/std@0.201.0/crypto/_fnv/util.ts": "accba12bfd80a352e32a872f87df2a195e75561f1b1304a4cb4f5a4648d288f9",
"https://deno.land/std@0.201.0/crypto/_wasm/lib/deno_std_wasm_crypto.generated.mjs": "85b50eee2e511584698c04f1d84155e57452ea963106fee64987c326e9e5d25d",
"https://deno.land/std@0.201.0/crypto/_wasm/mod.ts": "973058e70052c98292b567d1c8396dffc28d6dfc6a44f0763032f6fbdf5222f5",
"https://deno.land/std@0.201.0/crypto/crypto.ts": "c1fac13f11e5150e7690a4d6f09bc09b39d0a13fc5cf129f13617656fea7379e",
"https://deno.land/std@0.201.0/crypto/keystack.ts": "877ab0f19eb7d37ad6495190d3c3e39f58e9c52e0b6a966f82fd6df67ca55f90",
"https://deno.land/std@0.201.0/crypto/mod.ts": "ae384519e85eca9aeff4e7111ed153df8f3dbda7b35b70850ed4b3e9c8cec4d5",
"https://deno.land/std@0.201.0/crypto/timing_safe_equal.ts": "f6edc08d702f660b1ab3505b74d53a9d499e34a1351f6ab70f5ce8653fee8fb7",
"https://deno.land/std@0.201.0/crypto/to_hash_string.ts": "6927c768f3e373a1be4a31555a45ccecf7bd413105455cc334ad3f908cfa986f",
"https://deno.land/std@0.201.0/encoding/base64.ts": "144ae6234c1fbe5b68666c711dc15b1e9ee2aef6d42b3b4345bf9a6c91d70d0d",
"https://deno.land/std@0.201.0/encoding/base64url.ts": "2ed4ba122b20fedf226c5d337cf22ee2024fa73a8f85d915d442af7e9ce1fae1",
"https://deno.land/std@0.201.0/encoding/hex.ts": "7894f92cd271a3df42012798310fe011ae8780d551b6538189937d1712094f14",
"https://deno.land/std@0.201.0/fs/_util.ts": "fbf57dcdc9f7bc8128d60301eece608246971a7836a3bb1e78da75314f08b978",
"https://deno.land/std@0.201.0/fs/ensure_dir.ts": "dc64c4c75c64721d4e3fb681f1382f803ff3d2868f08563ff923fdd20d071c40",
"https://deno.land/std@0.201.0/http/server.ts": "1b2403b3c544c0624ad23e8ca4e05877e65380d9e0d75d04957432d65c3d5f41",
"https://deno.land/std@0.201.0/path/_basename.ts": "057d420c9049821f983f784fd87fa73ac471901fb628920b67972b0f44319343",
"https://deno.land/std@0.201.0/path/_constants.ts": "e49961f6f4f48039c0dfed3c3f93e963ca3d92791c9d478ac5b43183413136e0",

140
deno_server.ts
View File

@@ -1,106 +1,114 @@
// isolator/deno_server.ts
import { serve } from "https://deno.land/std@0.201.0/http/server.ts";
import { crypto } from "https://deno.land/std@0.201.0/crypto/mod.ts";
import { ensureDir } from "https://deno.land/std@0.201.0/fs/ensure_dir.ts";
const TIMEOUT_MS = 5_000;
const States = Object.freeze({
TIMEOUT: "TIMEOUT",
});
// Create a pool of workers.
const workerPool: { worker: Worker; inUse: boolean }[] = [];
// Allow the number of workers to be configured via an environment variable.
const numWorkers =
parseInt(Deno.env.get("NUM_WORKERS") || "0") || navigator.hardwareConcurrency;
for (let i = 0; i < numWorkers; i++) {
const worker = new Worker(new URL("./worker.ts", import.meta.url).href, {
type: "module",
deno: {
namespace: true,
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;
}
}
const CACHE_DIR = "./.cache";
await ensureDir(CACHE_DIR);
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;
};
let worker: Worker | undefined;
try {
const body = await req.json();
const {
code = "",
request = {},
environment = {},
name = "userFunc",
} = body;
} = await req.json();
// Create a content-addressed hash of the code.
const hash = await crypto.subtle.digest(
"SHA-256",
new TextEncoder().encode(code)
);
const hashString = Array.from(new Uint8Array(hash))
.map((b) => b.toString(16).padStart(2, "0"))
.join("");
const filePath = `${CACHE_DIR}/${hashString}.mjs`;
// Write the code to a file if it doesn't already exist.
try {
await Deno.stat(filePath);
} catch (e) {
if (e instanceof Deno.errors.NotFound) {
await Deno.writeTextFile(filePath, code);
} else {
throw e;
}
}
// Create a new worker for each request.
const worker = new Worker(new URL("./worker.ts", import.meta.url).href, {
type: "module",
deno: {
namespace: true,
permissions: "inherit",
},
});
const executionPromise = new Promise((resolve, reject) => {
const messageHandler = (e) => {
const messageHandler = (e: MessageEvent) => {
resolve(e.data);
cleanup();
};
const errorHandler = (e) => {
const errorHandler = (e: ErrorEvent) => {
reject(new Error(`Worker error: ${e.message}`));
cleanup();
};
const cleanup = () => {
availableWorker.worker.removeEventListener("message", messageHandler);
availableWorker.worker.removeEventListener("error", errorHandler);
worker.removeEventListener("message", messageHandler);
worker.removeEventListener("error", errorHandler);
};
availableWorker.worker.addEventListener("message", messageHandler);
availableWorker.worker.addEventListener("error", errorHandler);
worker.addEventListener("message", messageHandler);
worker.addEventListener("error", errorHandler);
});
const timeoutPromise = new Promise((_, reject) =>
setTimeout(() => reject(new Error("Timeout")), TIMEOUT_MS)
);
availableWorker.worker.postMessage({ code, request, environment, name });
worker.postMessage({
filePath: new URL(filePath, import.meta.url).href,
request,
environment,
name,
});
const startTime = performance.now();
try {
const result = await Promise.race([executionPromise, timeoutPromise]);
return new Response(JSON.stringify(result), {
headers: { "Content-Type": "application/json" },
});
const result: any = await Promise.race([
executionPromise,
timeoutPromise,
]);
// Check if the result from the worker looks like a Response object.
if (
result &&
typeof result === "object" &&
"body" in result &&
"status" in result &&
"headers" in result
) {
return new Response(result.body, {
status: result.status,
headers: result.headers,
});
} else {
// Otherwise, fall back to the old behavior.
return new Response(JSON.stringify(result), {
headers: { "Content-Type": "application/json" },
});
}
} catch (err) {
const executionTime = performance.now() - startTime;
const payload = {
@@ -118,12 +126,14 @@ async function handler(req: Request): Promise<Response> {
} catch (e) {
return new Response(`Bad Request: ${e.message}`, { status: 400 });
} finally {
releaseWorker(availableWorker); // Release the worker.
if (worker) {
worker.terminate(); // Terminate the worker after the request is handled.
}
}
}
const port = parseInt(Deno.env.get("PORT") || "8000");
console.log(`⚡ Deno server ready on :${port} with ${numWorkers} workers.`);
console.log(`⚡ Deno server ready on :${port}, ready to spawn workers.`);
await serve(handler, { port });

12
worker.ts
View File

@@ -8,7 +8,7 @@ const States = Object.freeze({
});
self.onmessage = async (e) => {
const { code, request, environment, name } = e.data;
const { filePath, request, environment, name } = e.data;
const logs: any[] = [];
const startTime = performance.now();
@@ -52,15 +52,7 @@ self.onmessage = async (e) => {
status
);
let userModule = moduleCache.get(code);
if (!userModule) {
// Use a data URL to import the user's code as an ES module.
const dataUrl = `data:text/javascript;base64,${btoa(
unescape(encodeURIComponent(code))
)}`;
userModule = await import(dataUrl);
moduleCache.set(code, userModule);
}
const userModule = await import(filePath);
if (typeof userModule.default !== "function") {
throw new Error(