@b9g/platform-node 0.1.16 → 0.1.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b9g/platform-node",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "description": "Node.js platform adapter for Shovel with hot reloading and ESBuild integration",
   "keywords": [
     "shovel",
@@ -16,10 +16,10 @@
     "directory": "packages/platform-node"
   },
   "dependencies": {
-    "@b9g/cache": "^0.2.1",
+    "@b9g/cache": "^0.2.2",
     "@b9g/http-errors": "^0.2.1",
     "@b9g/node-webworker": "^0.2.1",
-    "@b9g/platform": "^0.1.16",
+    "@b9g/platform": "^0.1.17",
     "@logtape/logtape": "^1.2.0"
   },
   "devDependencies": {

package/src/index.d.ts

@@ -111,8 +111,9 @@ export declare class NodePlatform {
      * - worker.js: Single worker with message loop (develop command acts as supervisor)
      *
      * Production mode:
-     * - index.js: Supervisor that spawns workers and owns the HTTP server
-     * - worker.js: Worker that handles requests via message loop
+     * - index.js: Supervisor that spawns workers and manages lifecycle
+     * - worker.js: Worker that either runs its own HTTP server (single-worker)
+     *   or uses message loop (multi-worker, supervisor owns the HTTP server)
      */
     getEntryPoints(userEntryPath: string, mode: "development" | "production"): EntryPoints;
     /**

package/src/index.js

@@ -192,11 +192,14 @@ var NodePlatform = class {
     const httpServer = HTTP.createServer(async (req, res) => {
       try {
         const url = `http://${req.headers.host}${req.url}`;
+        const hasBody = req.method !== "GET" && req.method !== "HEAD";
         const request = new Request(url, {
           method: req.method,
           headers: req.headers,
           // Node.js IncomingMessage can be used as body (it's a readable stream)
-          body: req.method !== "GET" && req.method !== "HEAD" ? req : void 0
+          body: hasBody ? req : void 0,
+          // Required by Node.js when Request has a streaming body
+          duplex: hasBody ? "half" : void 0
         });
         const response = await handler(request);
         res.statusCode = response.status;
@@ -294,11 +297,12 @@ var NodePlatform = class {
    * - worker.js: Single worker with message loop (develop command acts as supervisor)
    *
    * Production mode:
-   * - index.js: Supervisor that spawns workers and owns the HTTP server
-   * - worker.js: Worker that handles requests via message loop
+   * - index.js: Supervisor that spawns workers and manages lifecycle
+   * - worker.js: Worker that either runs its own HTTP server (single-worker)
+   *   or uses message loop (multi-worker, supervisor owns the HTTP server)
    */
   getEntryPoints(userEntryPath, mode) {
-    const workerCode = `// Node.js Worker
+    const devWorkerCode = `// Node.js Development Worker
 import {parentPort} from "node:worker_threads";
 import {configureLogging, initWorkerRuntime, runLifecycle, startWorkerMessageLoop} from "@b9g/platform/runtime";
 import {config} from "shovel:config";
@@ -306,7 +310,8 @@ import {config} from "shovel:config";
 await configureLogging(config.logging);
 
 // Initialize worker runtime (installs ServiceWorker globals)
-const {registration, databases} = await initWorkerRuntime({config});
+// Single-worker dev mode uses direct cache (no PostMessage overhead)
+const {registration, databases} = await initWorkerRuntime({config, usePostMessage: config.workers > 1});
 
 // Import user code (registers event handlers)
 await import("${userEntryPath}");
@@ -325,8 +330,63 @@ if (config.lifecycle) {
 }
 `;
     if (mode === "development") {
-      return { worker: workerCode };
+      return { worker: devWorkerCode };
     }
+    const prodWorkerCode = `// Node.js Production Worker
+import {parentPort} from "node:worker_threads";
+import {getLogger} from "@logtape/logtape";
+import {configureLogging, initWorkerRuntime, runLifecycle, startWorkerMessageLoop, dispatchRequest} from "@b9g/platform/runtime";
+import NodePlatform from "@b9g/platform-node";
+import {config} from "shovel:config";
+
+await configureLogging(config.logging);
+const logger = getLogger(["shovel", "platform"]);
+
+const directMode = config.workers <= 1;
+
+// Track resources for shutdown
+let server;
+let databases;
+
+// Register shutdown handler before async startup
+parentPort?.on("message", async (event) => {
+	if (event.type === "shutdown") {
+		logger.info("Worker shutting down");
+		if (server) await server.close();
+		if (databases) await databases.closeAll();
+		parentPort?.postMessage({type: "shutdown-complete"});
+	}
+});
+
+// Initialize worker runtime (usePostMessage: false when worker owns the server)
+const result = await initWorkerRuntime({config, usePostMessage: !directMode});
+const registration = result.registration;
+databases = result.databases;
+
+// Import user code (registers event handlers)
+await import("${userEntryPath}");
+
+// Run ServiceWorker lifecycle (stage from config.lifecycle if present)
+await runLifecycle(registration, config.lifecycle?.stage);
+
+if (config.lifecycle) {
+	parentPort?.postMessage({type: "ready"});
+	if (databases) await databases.closeAll();
+	process.exit(0);
+} else if (directMode) {
+	// Single worker: create own HTTP server
+	const platform = new NodePlatform({port: config.port, host: config.host});
+	server = platform.createServer(
+		(request) => dispatchRequest(registration, request),
+	);
+	await server.listen();
+	parentPort?.postMessage({type: "ready"});
+	logger.info("Worker started (direct mode)", {port: config.port});
+} else {
+	// Multi-worker: use message loop (supervisor owns the HTTP server)
+	startWorkerMessageLoop({registration, databases});
+}
+`;
     const supervisorCode = `// Node.js Production Supervisor
 import {Worker} from "@b9g/node-webworker";
 import {getLogger} from "@logtape/logtape";
@@ -346,8 +406,10 @@ platform.createWorker = (entrypoint) => new Worker(entrypoint);
 await platform.serviceWorker.register(new URL("./worker.js", import.meta.url).href);
 await platform.serviceWorker.ready;
 
-// Start HTTP server
-await platform.listen();
+// Single worker owns its own HTTP server \u2014 skip platform.listen()
+if (config.workers > 1) {
+	await platform.listen();
+}
 
 logger.info("Server started", {port: config.port, host: config.host, workers: config.workers});
 
@@ -362,7 +424,7 @@ process.on("SIGTERM", handleShutdown);
 `;
     return {
       supervisor: supervisorCode,
-      worker: workerCode
+      worker: prodWorkerCode
     };
   }
   /**
@@ -390,7 +452,7 @@ process.on("SIGTERM", handleShutdown);
   getDefaults() {
     return {
       caches: {
-        default: {
+        "*": {
           module: "@b9g/cache/memory",
           export: "MemoryCache"
         }

package/src/platform.d.ts

@@ -13,8 +13,9 @@ export declare const name = "node";
  * - worker.js: Single worker with message loop (develop command acts as supervisor)
  *
  * Production mode:
- * - supervisor.js: Spawns workers and owns the HTTP server
- * - worker.js: Handles requests via message loop
+ * - supervisor.js: Spawns workers and manages lifecycle
+ * - worker.js: Worker that either runs its own HTTP server (single-worker)
+ *   or uses message loop (multi-worker, supervisor owns the HTTP server)
  */
 export declare function getEntryPoints(userEntryPath: string, mode: "development" | "production"): EntryPoints;
 /**

package/src/platform.js

@@ -6,7 +6,7 @@ var logger = getLogger(["shovel", "platform"]);
 var name = "node";
 function getEntryPoints(userEntryPath, mode) {
   const safePath = JSON.stringify(userEntryPath);
-  const workerCode = `// Node.js Worker
+  const devWorkerCode = `// Node.js Development Worker
 import {parentPort} from "node:worker_threads";
 import {configureLogging, initWorkerRuntime, runLifecycle, startWorkerMessageLoop} from "@b9g/platform/runtime";
 import {config} from "shovel:config";
@@ -14,7 +14,8 @@ import {config} from "shovel:config";
 await configureLogging(config.logging);
 
 // Initialize worker runtime (installs ServiceWorker globals)
-const {registration, databases} = await initWorkerRuntime({config});
+// Single-worker dev mode uses direct cache (no PostMessage overhead)
+const {registration, databases} = await initWorkerRuntime({config, usePostMessage: config.workers > 1});
 
 // Import user code (registers event handlers)
 await import(${safePath});
@@ -33,8 +34,63 @@ if (config.lifecycle) {
 }
 `;
   if (mode === "development") {
-    return { worker: workerCode };
+    return { worker: devWorkerCode };
   }
+  const prodWorkerCode = `// Node.js Production Worker
+import {parentPort} from "node:worker_threads";
+import {getLogger} from "@logtape/logtape";
+import {configureLogging, initWorkerRuntime, runLifecycle, startWorkerMessageLoop, dispatchRequest} from "@b9g/platform/runtime";
+import NodePlatform from "@b9g/platform-node";
+import {config} from "shovel:config";
+
+await configureLogging(config.logging);
+const logger = getLogger(["shovel", "platform"]);
+
+const directMode = config.workers <= 1;
+
+// Track resources for shutdown
+let server;
+let databases;
+
+// Register shutdown handler before async startup
+parentPort?.on("message", async (event) => {
+	if (event.type === "shutdown") {
+		logger.info("Worker shutting down");
+		if (server) await server.close();
+		if (databases) await databases.closeAll();
+		parentPort?.postMessage({type: "shutdown-complete"});
+	}
+});
+
+// Initialize worker runtime (usePostMessage: false when worker owns the server)
+const result = await initWorkerRuntime({config, usePostMessage: !directMode});
+const registration = result.registration;
+databases = result.databases;
+
+// Import user code (registers event handlers)
+await import(${safePath});
+
+// Run ServiceWorker lifecycle (stage from config.lifecycle if present)
+await runLifecycle(registration, config.lifecycle?.stage);
+
+if (config.lifecycle) {
+	parentPort?.postMessage({type: "ready"});
+	if (databases) await databases.closeAll();
+	process.exit(0);
+} else if (directMode) {
+	// Single worker: create own HTTP server
+	const platform = new NodePlatform({port: config.port, host: config.host});
+	server = platform.createServer(
+		(request) => dispatchRequest(registration, request),
+	);
+	await server.listen();
+	parentPort?.postMessage({type: "ready"});
+	logger.info("Worker started (direct mode)", {port: config.port});
+} else {
+	// Multi-worker: use message loop (supervisor owns the HTTP server)
+	startWorkerMessageLoop({registration, databases});
+}
+`;
   const supervisorCode = `// Node.js Production Supervisor
 import {Worker} from "@b9g/node-webworker";
 import {getLogger} from "@logtape/logtape";
@@ -54,8 +110,10 @@ platform.createWorker = (entrypoint) => new Worker(entrypoint);
 await platform.serviceWorker.register(new URL("./worker.js", import.meta.url).href);
 await platform.serviceWorker.ready;
 
-// Start HTTP server
-await platform.listen();
+// Single worker owns its own HTTP server \u2014 skip platform.listen()
+if (config.workers > 1) {
+	await platform.listen();
+}
 
 logger.info("Server started", {port: config.port, host: config.host, workers: config.workers});
 
@@ -70,7 +128,7 @@ process.on("SIGTERM", handleShutdown);
 `;
   return {
     supervisor: supervisorCode,
-    worker: workerCode
+    worker: prodWorkerCode
   };
 }
 function getESBuildConfig() {
@@ -86,7 +144,7 @@ function getESBuildConfig() {
 function getDefaults() {
   return {
     caches: {
-      default: {
+      "*": {
         module: "@b9g/cache/memory",
         export: "MemoryCache"
       }