Skip to content

Fix not to fetch the js file when starting new worker. #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yomaytk merged 1 commit into from
Mar 22, 2026
Merged

Fix not to fetch the js file when starting new worker. #240

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 23 additions & 12 deletions browser/js-kernel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ var Module = (() => {

var WORKER_MGR = {
wasmModules: new Map(),
workerBlobUrls: new Map(), // jsPath -> blob URL (cached to avoid server re-fetch)
workerInfoPool: [],
prWorkerPoolCapacity: 20,
dupWorkerNum: 3,
Expand All @@ -166,6 +167,16 @@ var Module = (() => {
shared: true
});
},
createWorker(jsPath, id) {
let blobUrl = this.workerBlobUrls.get(jsPath);
if (!blobUrl) {
throw new Error(`worker script '${jsPath}' has not been cached yet.`);
}
return new Worker(blobUrl, {
type: "module",
name: `${jsPath}-worker-${id}`,
});
},
init(userBinSet) {
for (let userBinPath of userBinSet) {
// We create the 3 workers for the every executable binary.
Expand All @@ -175,10 +186,7 @@ var Module = (() => {
let wasmPath = userBinPath + ".wasm";
let id = this.workerInfoPool.length;
let memory = this.newProcessMemory(INITIAL_MEMORY_SIZE);
let worker = new Worker(new URL(jsPath, import.meta.url), {
type: "module",
name: `${jsPath}-worker-${id}`,
});
let worker = this.createWorker(jsPath, id);
let wasmModule = this.wasmModules.get(wasmPath);
if (!wasmModule) {
throw new Error(`wasm module '${wasmPath}' has not been initialzed yet (at WORKER_MGR.init).`);
Expand Down Expand Up @@ -217,10 +225,7 @@ var Module = (() => {
let id = this.workerInfoPool.length;
let memory = this.newProcessMemory(INITIAL_MEMORY_SIZE);
let wasmPath = jsPath.slice(0, -3) + ".wasm";
let worker = new Worker(new URL(jsPath, import.meta.url), {
type: "module",
name: `${jsPath}-worker-${id}`,
});
let worker = this.createWorker(jsPath, id);
let wasmModule = this.wasmModules.get(wasmPath);
if (!wasmModule) {
throw new Error(`wasm module '${wasmPath}' has not been initialized yet (at getAvailableWorkerInfo).`);
Expand Down Expand Up @@ -250,10 +255,7 @@ var Module = (() => {
let jsPath = oldWorkerInfo.jsPath;
let wasmPath = jsPath.slice(0, -3) + ".wasm";
let newMemory = this.newProcessMemory(INITIAL_MEMORY_SIZE);
let newWorker = new Worker(new URL(jsPath, import.meta.url), {
type: "module",
name: `${jsPath}-worker-${workerId}`,
});
let newWorker = this.createWorker(jsPath, workerId);
let wasmModule = oldWorkerInfo.module;
this.setInitialMsgHandling(newWorker);
this.workerInfoPool[workerId] = {
Expand Down Expand Up @@ -315,6 +317,15 @@ var Module = (() => {
for (let ELF_Bin of binList) {
try {
let wasmPath = ELF_Bin + ".wasm";
let jsPath = ELF_Bin + ".js";

// <ELF>.js
const jsUrl = new URL(jsPath, import.meta.url).href;
const jsResp = await fetch(jsUrl, { credentials: "same-origin" });
const jsText = await jsResp.text();
const blob = new Blob([jsText], { type: "application/javascript" });
this.workerBlobUrls.set(jsPath, URL.createObjectURL(blob));
// <ELF>.wasm
const url = new URL(wasmPath, import.meta.url).href;
const resp = await fetch(url, { credentials: "same-origin" });
const wasmBytes = await resp.arrayBuffer();
Expand Down
Loading