spooder 6.2.3 → 6.2.5

package/README.md

@@ -302,6 +302,32 @@ This can be configured in `spooder` using the `instances` array, with each entry
 
 Instances will be managed individually in the same manner that a single process would be, including auto-restarting and other functionality.
 
+### Instance Environment
+
+Each instance can define custom environment variables using the `env` property. These variables are merged with the parent process environment and passed to the spawned instance.
+
+```json
+"spooder": {
+	"instances": [
+		{
+			"id": "foo",
+			"run": "bun run server.ts",
+			"env": { "ENVTEST": "foo" }
+		},
+		{
+			"id": "bar",
+			"run": "bun run server.ts",
+			"env": { "ENVTEST": "bar" }
+		}
+	]
+}
+```
+
+Environment variable precedence (highest to lowest):
+1. `SPOODER_ENV` - always set by spooder (`dev` or `prod`)
+2. Instance `env` - overrides parent environment
+3. Parent process environment - inherited from spooder
+
 ### Instance Stagger
 
 By default, instances are all launched instantly. This behavior can be configured with the `instance_stagger_interval` configuration property, which defines an interval between instance launches in milliseconds.

package/bun.lock

@@ -10,11 +10,11 @@
     },
   },
   "packages": {
-    "@types/bun": ["@types/bun@1.3.5", "", { "dependencies": { "bun-types": "1.3.5" } }, "sha512-RnygCqNrd3srIPEWBd5LFeUYG7plCoH2Yw9WaZGyNmdTEei+gWaHqydbaIRkIkcbXwhBT94q78QljxN0Sk838w=="],
+    "@types/bun": ["@types/bun@1.3.8", "", { "dependencies": { "bun-types": "1.3.8" } }, "sha512-3LvWJ2q5GerAXYxO2mffLTqOzEu5qnhEAlh48Vnu8WQfnmSwbgagjGZV6BoHKJztENYEDn6QmVd949W4uESRJA=="],
 
-    "@types/node": ["@types/node@25.0.7", "", { "dependencies": { "undici-types": "~7.16.0" } }, "sha512-C/er7DlIZgRJO7WtTdYovjIFzGsz0I95UlMyR9anTb4aCpBSRWe5Jc1/RvLKUfzmOxHPGjSE5+63HgLtndxU4w=="],
+    "@types/node": ["@types/node@25.2.0", "", { "dependencies": { "undici-types": "~7.16.0" } }, "sha512-DZ8VwRFUNzuqJ5khrvwMXHmvPe+zGayJhr2CDNiKB1WBE1ST8Djl00D0IC4vvNmHMdj6DlbYRIaFE7WHjlDl5w=="],
 
-    "bun-types": ["bun-types@1.3.5", "", { "dependencies": { "@types/node": "*" } }, "sha512-inmAYe2PFLs0SUbFOWSVD24sg1jFlMPxOjOSSCYqUgn4Hsc3rDc7dFvfVYjFPNHtov6kgUeulV4SxbuIV/stPw=="],
+    "bun-types": ["bun-types@1.3.8", "", { "dependencies": { "@types/node": "*" } }, "sha512-fL99nxdOWvV4LqjmC+8Q9kW3M4QTtTR1eePs94v5ctGqU8OeceWrSUaRw3JYb7tU3FkMIAjkueehrHPPPGKi5Q=="],
 
     "undici-types": ["undici-types@7.16.0", "", {}, "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw=="],
   }

package/package.json

@@ -2,7 +2,7 @@
 	"name": "spooder",
 	"author": "Kruithne <kruithne@gmail.com>",
 	"type": "module",
-	"version": "6.2.3",
+	"version": "6.2.5",
 	"module": "./src/api.ts",
 	"repository": {
 		"url": "https://github.com/Kruithne/spooder"

package/src/api.ts

@@ -1904,10 +1904,17 @@ export function http_serve(port: number, hostname?: string) {
 					});
 				}
 
+				const wrap_response = (result: ReturnType<typeof handler>) => {
+					if (result !== null && typeof result === 'object' && !(result instanceof Response) && !(result instanceof Blob))
+						return Response.json(result, { headers: { 'Cache-Control': 'no-store, no-cache, must-revalidate', 'Pragma': 'no-cache' } });
+
+					return result;
+				};
+
 				try {
 					// GET/HEAD requests don't have bodies, skip validation
 					if (req.method === 'GET' || req.method === 'HEAD')
-						return handler(req, url, null);
+						return wrap_response(await handler(req, url, null));
 
 					if (req.headers.get('Content-Type') !== 'application/json')
 						return 400; // Bad Request
@@ -1916,7 +1923,7 @@ export function http_serve(port: number, hostname?: string) {
 					if (json === null || typeof json !== 'object' || Array.isArray(json))
 						return 400; // Bad Request
 
-					return handler(req, url, json as JsonObject);
+					return wrap_response(await handler(req, url, json as JsonObject));
 				} catch (e) {
 					return 400; // Bad Request
 				}

package/src/cli.ts

@@ -10,6 +10,7 @@ type InstanceConfig = {
 	id: string;
 	run: string;
 	run_dev?: string;
+	env?: Record<string, string>;
 };
 
 type Instance = {
@@ -168,7 +169,7 @@ async function start_instance(instance: InstanceConfig, config: Config, update =
 	const run_command = is_dev_mode && instance.run_dev ? instance.run_dev : instance.run;
 	const proc = Bun.spawn(parse_command_line(run_command), {
 		cwd: process.cwd(),
-		env: { ...process.env, SPOODER_ENV: is_dev_mode ? 'dev' : 'prod' },
+		env: { ...process.env, ...instance.env, SPOODER_ENV: is_dev_mode ? 'dev' : 'prod' },
 		stdout: std_mode,
 		stderr: std_mode,
 		ipc: handle_ipc.bind({ instance_id: instance.id, config })