From c1c68e4ed075abe90680020acbf48801999e9471 Mon Sep 17 00:00:00 2001
From: Project516 <138796702+Project516@users.noreply.github.com>
Date: Tue, 3 Nov 2026 20:33:55 -0600
Subject: [PATCH] Run the java-web command through a launcher that turns on
 Node's compile cache

---
 AGENTS.md            | 2 +-
 docs/browser.md      | 2 +-
 package.json         | 3 ++-
 scripts/build-web.ts | 8 ++++++++
 src/node.ts          | 3 ++-
 test/image.test.ts   | 8 +++++---
 6 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index e365583..639178d 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -31,7 +31,7 @@ Node, which is how the tests run.
   (static String calls), `cheerpOSAddStringFile`, `cjFileBlob`, `/files/` in
   IndexedDB and one VM per about:blank iframe. Keep these working.
 - The release form is an npm package of the built files only
-  (`java-web.js`, `java-web-worker.js`, `node.js` (the Node entry and the
+  (`java-web.js`, `java-web-worker.js`, `node.js` (the Node entry), `cli.js` (the
   `java-web` command), `boot.pack`, `jdk/<module>.jar`,
   `jdk/javac.pack`, `jdk/jdk.localedata.txt`, and OpenJDK's notices in `jdk/legal/`), versioned, with
   nothing built at install. A GitHub Actions workflow triggered by a release
diff --git a/docs/browser.md b/docs/browser.md
index 524de37..e477ac6 100644
--- a/docs/browser.md
+++ b/docs/browser.md
@@ -1,7 +1,7 @@
 # Using java-web in a page
 
 The npm package holds the built files: `java-web.js`, `java-web-worker.js`,
-`boot.pack` and `jdk/` for pages, and `node.js` for Node ([node.md](node.md)). Serve `node_modules/@project516/java-web/dist/` as static files
+`boot.pack` and `jdk/` for pages, and `node.js` and `cli.js` (the `java-web` command) for Node ([node.md](node.md)). Serve `node_modules/@project516/java-web/dist/` as static files
 and load `java-web.js` with a classic `<script>` tag. It finds the other files
 next to itself, or where `cheerpjInit({ runtime: "/path/to/dist/" })` says.
 
diff --git a/package.json b/package.json
index 705be73..744eacb 100644
--- a/package.json
+++ b/package.json
@@ -26,12 +26,13 @@
     "./dist/*": "./dist/*"
   },
   "bin": {
-    "java-web": "dist/node.js"
+    "java-web": "dist/cli.js"
   },
   "files": [
     "dist/java-web.js",
     "dist/java-web-worker.js",
     "dist/node.js",
+    "dist/cli.js",
     "dist/node.d.ts",
     "dist/boot.pack",
     "dist/jdk/*.jar",
diff --git a/scripts/build-web.ts b/scripts/build-web.ts
index 9808525..9d8aa20 100644
--- a/scripts/build-web.ts
+++ b/scripts/build-web.ts
@@ -55,6 +55,14 @@ await build({
   define,
 });
 cpSync(join(root, "types", "node.d.ts"), join(dist, "node.d.ts"));
+// The java-web command. Node's compile cache covers only modules loaded after
+// it is on, so it comes before the VM: later runs skip compiling node.js.
+writeFileSync(join(dist, "cli.js"), `#!/usr/bin/env node
+import { enableCompileCache } from "node:module";
+enableCompileCache?.();
+const { main } = await import("./node.js");
+main(process.argv.slice(2));
+`, { mode: 0o755 });
 
 mkdirSync(join(dist, "jdk"), { recursive: true });
 
diff --git a/src/node.ts b/src/node.ts
index 5fa7766..d4ac8a6 100644
--- a/src/node.ts
+++ b/src/node.ts
@@ -440,7 +440,8 @@ function heapSize(s: string): number {
   return unit ? Number(s.slice(0, -1)) * unit : Number(s);
 }
 
-function main(argv: string[]) {
+// the java-web command, which dist/cli.js runs
+export function main(argv: string[]) {
   const o: NodeRunOptions = { classpath: ["."], props: {} };
   let i = 0;
   for (; i < argv.length; i++) {
diff --git a/test/image.test.ts b/test/image.test.ts
index 18fea82..f534101 100644
--- a/test/image.test.ts
+++ b/test/image.test.ts
@@ -78,12 +78,14 @@ const node = join(root, "dist", "node.js");
 const skip = existsSync(node) ? false : "run `pnpm build` first";
 const out = join(root, "build", "test-image");
 
-test("dist/node.js runs a program as HotSpot does", { skip }, () => {
+test("dist/node.js and the java-web command run a program as HotSpot does", { skip }, () => {
   mkdirSync(out, { recursive: true });
   spawnSync(hotspot("javac"), ["-d", out, join(root, "test", "java", "Collections.java")], { stdio: "inherit" });
   const ref = spawnSync(hotspot("java"), ["-cp", out, "Collections"], { encoding: "utf8" });
-  const got = spawnSync(process.execPath, [node, "-cp", out, "Collections"], { encoding: "utf8" });
-  assert.deepEqual({ stdout: got.stdout, stderr: got.stderr, code: got.status }, { stdout: ref.stdout, stderr: ref.stderr, code: ref.status });
+  for (const entry of [node, join(root, "dist", "cli.js")]) {
+    const got = spawnSync(process.execPath, [entry, "-cp", out, "Collections"], { encoding: "utf8" });
+    assert.deepEqual({ stdout: got.stdout, stderr: got.stderr, code: got.status }, { stdout: ref.stdout, stderr: ref.stderr, code: ref.status }, entry);
+  }
 });
 
 test("dist/node.js exports runNode, and javac runs on the packaged image", { skip }, async () => {