bosia 0.2.3 → 0.3.1

package/src/core/dev.ts

@@ -1,6 +1,23 @@
 import { spawn, type Subprocess } from "bun";
 import { watch } from "fs";
 import { join } from "path";
+import { loadEnv, resetDeclaredKeys } from "./env.ts";
+
+// Snapshot pure shell env BEFORE any loadEnv call pollutes process.env.
+// On `.env*` change we restore from this snapshot, then re-run loadEnv,
+// so removed/renamed keys no longer linger in the dev process.
+const SHELL_ENV_SNAPSHOT: Record<string, string | undefined> = { ...process.env };
+
+loadEnv("development");
+
+function reloadEnv() {
+	for (const k of Object.keys(process.env)) delete process.env[k];
+	for (const [k, v] of Object.entries(SHELL_ENV_SNAPSHOT)) {
+		if (v !== undefined) process.env[k] = v;
+	}
+	resetDeclaredKeys();
+	loadEnv("development");
+}
 
 console.log("⬡ Bosia dev server starting...\n");
 
@@ -17,17 +34,17 @@ const RAPID_CRASH_WINDOW = 5_000; // 5 seconds
 // ─── SSE Broadcast ────────────────────────────────────────
 
 function broadcastReload() {
-    const msg = new TextEncoder().encode("event: reload\ndata: ok\n\n");
-    for (const ctrl of sseClients) {
-        try {
-            ctrl.enqueue(msg);
-        } catch {
-            sseClients.delete(ctrl);
-        }
-    }
-    if (sseClients.size > 0) {
-        console.log(`📡 Reload sent to ${sseClients.size} client(s)`);
-    }
+	const msg = new TextEncoder().encode("event: reload\ndata: ok\n\n");
+	for (const ctrl of sseClients) {
+		try {
+			ctrl.enqueue(msg);
+		} catch {
+			sseClients.delete(ctrl);
+		}
+	}
+	if (sseClients.size > 0) {
+		console.log(`📡 Reload sent to ${sseClients.size} client(s)`);
+	}
 }
 
 // ─── Build ────────────────────────────────────────────────
@@ -37,13 +54,13 @@ import { BOSIA_NODE_PATH } from "./paths.ts";
 const BUILD_SCRIPT = join(import.meta.dir, "build.ts");
 
 async function runBuild(): Promise<boolean> {
-    console.log("🏗️  Building...");
-    const proc = spawn(["bun", "run", BUILD_SCRIPT], {
-        stdout: "inherit",
-        stderr: "inherit",
-        cwd: process.cwd(),
-    });
-    return (await proc.exited) === 0;
+	console.log("🏗️  Building...");
+	const proc = spawn(["bun", "run", BUILD_SCRIPT], {
+		stdout: "inherit",
+		stderr: "inherit",
+		cwd: process.cwd(),
+	});
+	return (await proc.exited) === 0;
 }
 
 // ─── Ports ────────────────────────────────────────────────
@@ -52,57 +69,59 @@ const DEV_PORT = Number(process.env.PORT) || 9000;
 const APP_PORT = DEV_PORT + 1; // internal, hidden from user
 
 async function startAppServer() {
-    if (appProcess) {
-        intentionalKill = true;
-        appProcess.kill();
-        await appProcess.exited;
-        intentionalKill = false;
-    }
-
-    // Read the server entry filename from the manifest written by build.ts
-    let serverEntry = "index.js";
-    try {
-        const manifest = await Bun.file("./dist/manifest.json").json();
-        serverEntry = manifest.serverEntry ?? "index.js";
-    } catch { }
-
-    appProcess = spawn(["bun", "run", `dist/server/${serverEntry}`], {
-        stdout: "inherit",
-        stderr: "inherit",
-        cwd: process.cwd(),
-        env: {
-            ...process.env,
-            NODE_ENV: "development",
-            // Force app server to APP_PORT — prevents PORT from .env conflicting with the dev proxy
-            PORT: String(APP_PORT),
-            // Allow externalized deps (elysia, etc.) to resolve from bosia's node_modules
-            NODE_PATH: BOSIA_NODE_PATH,
-        },
-    });
-
-    // Monitor for unexpected crashes
-    const proc = appProcess;
-    proc.exited.then((code) => {
-        if (proc !== appProcess || intentionalKill) return;
-        if (code === 0) return; // clean exit
-
-        const now = Date.now();
-        if (now - lastCrashTime < RAPID_CRASH_WINDOW) {
-            crashCount++;
-        } else {
-            crashCount = 1;
-        }
-        lastCrashTime = now;
-
-        if (crashCount >= MAX_RAPID_CRASHES) {
-            console.error(`\n💥 App crashed ${crashCount} times in ${RAPID_CRASH_WINDOW / 1000}s — waiting for file change to restart\n`);
-            crashCount = 0;
-            return;
-        }
-
-        console.warn(`\n⚠️  App crashed (exit code ${code}). Restarting...\n`);
-        startAppServer();
-    });
+	if (appProcess) {
+		intentionalKill = true;
+		appProcess.kill();
+		await appProcess.exited;
+		intentionalKill = false;
+	}
+
+	// Read the server entry filename from the manifest written by build.ts
+	let serverEntry = "index.js";
+	try {
+		const manifest = await Bun.file("./dist/manifest.json").json();
+		serverEntry = manifest.serverEntry ?? "index.js";
+	} catch {}
+
+	appProcess = spawn(["bun", "run", `dist/server/${serverEntry}`], {
+		stdout: "inherit",
+		stderr: "inherit",
+		cwd: process.cwd(),
+		env: {
+			...process.env,
+			NODE_ENV: "development",
+			// Force app server to APP_PORT — prevents PORT from .env conflicting with the dev proxy
+			PORT: String(APP_PORT),
+			// Allow externalized deps (elysia, etc.) to resolve from bosia's node_modules
+			NODE_PATH: BOSIA_NODE_PATH,
+		},
+	});
+
+	// Monitor for unexpected crashes
+	const proc = appProcess;
+	proc.exited.then((code) => {
+		if (proc !== appProcess || intentionalKill) return;
+		if (code === 0) return; // clean exit
+
+		const now = Date.now();
+		if (now - lastCrashTime < RAPID_CRASH_WINDOW) {
+			crashCount++;
+		} else {
+			crashCount = 1;
+		}
+		lastCrashTime = now;
+
+		if (crashCount >= MAX_RAPID_CRASHES) {
+			console.error(
+				`\n💥 App crashed ${crashCount} times in ${RAPID_CRASH_WINDOW / 1000}s — waiting for file change to restart\n`,
+			);
+			crashCount = 0;
+			return;
+		}
+
+		console.warn(`\n⚠️  App crashed (exit code ${code}). Restarting...\n`);
+		startAppServer();
+	});
 }
 
 // ─── Build & Restart ──────────────────────────────────────
@@ -112,33 +131,33 @@ let building = false;
 let buildPending = false;
 
 async function buildAndRestart() {
-    if (building) {
-        buildPending = true;
-        return;
-    }
-    building = true;
-    try {
-        const ok = await runBuild();
-        if (!ok) {
-            console.error("❌ Build failed — fix errors and save again");
-            return;
-        }
-        await startAppServer();
-        // Give the app server a moment to bind its port
-        await Bun.sleep(200);
-        broadcastReload();
-    } finally {
-        building = false;
-    }
-    if (buildPending) {
-        buildPending = false;
-        buildAndRestart();
-    }
+	if (building) {
+		buildPending = true;
+		return;
+	}
+	building = true;
+	try {
+		const ok = await runBuild();
+		if (!ok) {
+			console.error("❌ Build failed — fix errors and save again");
+			return;
+		}
+		await startAppServer();
+		// Give the app server a moment to bind its port
+		await Bun.sleep(200);
+		broadcastReload();
+	} finally {
+		building = false;
+	}
+	if (buildPending) {
+		buildPending = false;
+		buildAndRestart();
+	}
 }
 
 function scheduleBuild() {
-    if (buildTimer) clearTimeout(buildTimer);
-    buildTimer = setTimeout(buildAndRestart, 300);
+	if (buildTimer) clearTimeout(buildTimer);
+	buildTimer = setTimeout(buildAndRestart, 300);
 }
 
 // ─── Dev Proxy ────────────────────────────────────────────
@@ -146,65 +165,67 @@ function scheduleBuild() {
 // All other requests are proxied to the app server.
 
 Bun.serve({
-    port: DEV_PORT,
-    idleTimeout: 255,
-    async fetch(req) {
-        const url = new URL(req.url);
-
-        // SSE endpoint — owned by dev server, not the app
-        if (url.pathname === "/__bosia/sse") {
-            return new Response(
-                new ReadableStream({
-                    start(ctrl) {
-                        sseClients.add(ctrl);
-                        // Initial keepalive so the browser knows the connection is open
-                        ctrl.enqueue(new TextEncoder().encode(":ok\n\n"));
-
-                        // Ping every 25s to prevent idle timeout
-                        const ping = setInterval(() => {
-                            try {
-                                ctrl.enqueue(new TextEncoder().encode(":ping\n\n"));
-                            } catch {
-                                clearInterval(ping);
-                                sseClients.delete(ctrl);
-                            }
-                        }, 25_000);
-
-                        req.signal.addEventListener("abort", () => {
-                            clearInterval(ping);
-                            sseClients.delete(ctrl);
-                        });
-                    },
-                }),
-                {
-                    headers: {
-                        "Content-Type": "text/event-stream; charset=utf-8",
-                        "Cache-Control": "no-cache",
-                        Connection: "keep-alive",
-                    },
-                },
-            );
-        }
-
-        // Proxy everything else to the app server
-        try {
-            const target = new URL(req.url);
-            target.hostname = "localhost";
-            target.port = String(APP_PORT);
-
-            return await fetch(new Request(target.toString(), {
-                method: req.method,
-                headers: req.headers,
-                body: req.body,
-                redirect: "manual",
-            }));
-        } catch {
-            return new Response("App server is starting...", {
-                status: 503,
-                headers: { "Content-Type": "text/plain", "Retry-After": "1" },
-            });
-        }
-    },
+	port: DEV_PORT,
+	idleTimeout: 255,
+	async fetch(req) {
+		const url = new URL(req.url);
+
+		// SSE endpoint — owned by dev server, not the app
+		if (url.pathname === "/__bosia/sse") {
+			return new Response(
+				new ReadableStream({
+					start(ctrl) {
+						sseClients.add(ctrl);
+						// Initial keepalive so the browser knows the connection is open
+						ctrl.enqueue(new TextEncoder().encode(":ok\n\n"));
+
+						// Ping every 25s to prevent idle timeout
+						const ping = setInterval(() => {
+							try {
+								ctrl.enqueue(new TextEncoder().encode(":ping\n\n"));
+							} catch {
+								clearInterval(ping);
+								sseClients.delete(ctrl);
+							}
+						}, 25_000);
+
+						req.signal.addEventListener("abort", () => {
+							clearInterval(ping);
+							sseClients.delete(ctrl);
+						});
+					},
+				}),
+				{
+					headers: {
+						"Content-Type": "text/event-stream; charset=utf-8",
+						"Cache-Control": "no-cache",
+						Connection: "keep-alive",
+					},
+				},
+			);
+		}
+
+		// Proxy everything else to the app server
+		try {
+			const target = new URL(req.url);
+			target.hostname = "localhost";
+			target.port = String(APP_PORT);
+
+			return await fetch(
+				new Request(target.toString(), {
+					method: req.method,
+					headers: req.headers,
+					body: req.body,
+					redirect: "manual",
+				}),
+			);
+		} catch {
+			return new Response("App server is starting...", {
+				status: 503,
+				headers: { "Content-Type": "text/plain", "Retry-After": "1" },
+			});
+		}
+	},
 });
 
 // ─── Initial Build ────────────────────────────────────────
@@ -216,25 +237,32 @@ console.log(`\n🌐 Open http://localhost:${DEV_PORT}\n`);
 // ─── File Watcher ─────────────────────────────────────────
 // Watch src/ recursively. Skip generated files to avoid loops.
 
-const GENERATED = [
-    join(process.cwd(), ".bosia"),
-    join(process.cwd(), "public", "bosia-tw.css"),
-];
+const GENERATED = [join(process.cwd(), ".bosia"), join(process.cwd(), "public", "bosia-tw.css")];
 
 function isGenerated(path: string): boolean {
-    return GENERATED.some(g => path.startsWith(g));
+	return GENERATED.some((g) => path.startsWith(g));
 }
 
-watch(
-    join(process.cwd(), "src"),
-    { recursive: true },
-    (_event, filename) => {
-        if (!filename) return;
-        const abs = join(process.cwd(), "src", filename);
-        if (isGenerated(abs)) return;
-        console.log(`[watch] changed: ${filename}`);
-        scheduleBuild();
-    },
-);
+watch(join(process.cwd(), "src"), { recursive: true }, (_event, filename) => {
+	if (!filename) return;
+	const abs = join(process.cwd(), "src", filename);
+	if (isGenerated(abs)) return;
+	console.log(`[watch] changed: ${filename}`);
+	scheduleBuild();
+});
+
+// ─── .env Watcher ─────────────────────────────────────────
+// Reset to shell-env snapshot and re-run loadEnv so removed/renamed
+// keys don't linger across hot-reloads. The respawn at startAppServer
+// already spreads `...process.env`, so the child picks up the fresh state.
+
+const ENV_FILES = new Set([".env", ".env.local", ".env.development", ".env.development.local"]);
+
+watch(process.cwd(), { recursive: false }, (_event, filename) => {
+	if (!filename || !ENV_FILES.has(filename)) return;
+	console.log(`[watch] env changed: ${filename}`);
+	reloadEnv();
+	scheduleBuild();
+});
 
 console.log("👀 Watching src/ for changes...\n");