oxidejs 0.2.1 → 0.2.3

package/README.md

@@ -113,27 +113,6 @@ Same factory as Vite: client stubs, `/__oxide/action`, and `dist/server.js`.
 
 ## Options
 
-### `middleware` and `imports`
-
-\`\`\`ts
-oxide({
-middleware: ["@ilha/router/ssr"], // string or { module, imports }
-imports: ["./side-effects"], // side-effect modules loaded at startup
-})
-\`\`\`
-
-Middleware handlers run in production before the action gate; the same specifiers are loaded through the SSR graph in dev, so dev and prod behave identically. Middleware entries may carry their own \`imports\`.
-
-### Other server options
-
-| Option        | Type   | Default | Description                                                          |
-| ------------- | ------ | ------- | -------------------------------------------------------------------- |
-| \`bodyLimit\` | number | 1048576 | Max request body size (Node preset); larger requests get 413         |
-| \`notFound\`  | string | —       | Custom HTML 404 body when no route or asset matches                  |
-| \`env\`       | object | —       | Passed as \`env\` to \`fetch(request, env, ctx)\` on the Node preset |
-
-## Options
-
 | Option                         | Default                  | Notes                                                                                       |
 | ------------------------------ | ------------------------ | ------------------------------------------------------------------------------------------- |
 | `preset`                       | `"fetch"`                | `"fetch"` or `"celld"`                                                                      |
@@ -150,23 +129,22 @@ Middleware handlers run in production before the action gate; the same specifier
 | `emitConfig`                   | `true` on `celld`        | Set `false` to skip `wrangler.jsonc`                                                        |
 | `actions`                      | `"http"`                 | `"ws"` needs `crossws`; object form: `{ transport, path, sameOrigin }` (`sameOrigin: true`) |
 | `actionHeaders`                | —                        | Static headers on the HTTP client                                                           |
-| `middleware`                   | `[]`                     | Default-exported production fetch middleware, run in order before actions and server entry  |
+| `middleware`                   | `[]`                     | Fetch middleware, run in order before actions and the server entry                          |
+| `imports`                      | `[]`                     | Modules imported for side effects at server startup                                         |
+| `bodyLimit`                    | `1048576`                | Max Node request body size; larger requests get 413                                         |
+| `notFound`                     | —                        | Custom HTML 404 body when no route or asset matches                                         |
+| `env`                          | —                        | Node preset value passed to `fetch(request, env, ctx)`                                      |
 
-`middleware` modules receive `(request, { env, ctx })`. They run in array order before actions, the server entry, and assets. Return a `Response` to stop the chain or `undefined` to continue.
+### `middleware` and `imports`
 
 ```ts
-// src/auth.ts
-export default function auth(request: Request) {
-  if (!request.headers.has("authorization")) {
-    return new Response("Unauthorized", { status: 401 });
-  }
-}
-
-// vite.config.ts
-oxide({ middleware: ["./src/auth.ts"] });
+oxide({
+  middleware: ["@ilha/router/ssr"], // string or { module, imports }
+  imports: ["./side-effects"],
+});
 ```
 
-This option applies to production builds; use Connect middleware in Vite or Rsbuild during development.
+Middleware modules receive `(request, { env, ctx })`. They run before actions, the server entry, and assets. Return a `Response` to stop the chain or `undefined` to continue. Vite loads the same modules through its SSR graph in development. Middleware entries may carry their own `imports`.
 
 `main` is always `./server.js`. `assets` is added only when `index.html` exists. Unknown wrangler keys fail at build time.
 

package/dist/index.mjs

@@ -1,2 +1,2 @@
-import { a as useCtx, c as useRequest, i as action, n as unpluginFactory, o as useEnv, r as vite, s as useFetchCtx, t as oxidejs } from "./src-CsQ-6GnW.mjs";
+import { a as useCtx, c as useRequest, i as action, n as unpluginFactory, o as useEnv, r as vite, s as useFetchCtx, t as oxidejs } from "./src-D-qdNVqg.mjs";
 export { action, oxidejs as default, oxidejs, unpluginFactory, useCtx, useEnv, useFetchCtx, useRequest, vite };

package/dist/rsbuild.mjs

@@ -1,6 +1,5 @@
-import { t as oxidejs } from "./src-CsQ-6GnW.mjs";
+import { t as oxidejs } from "./src-D-qdNVqg.mjs";
 //#region src/rsbuild.ts
-/** @experimental Rsbuild integration is not yet implemented. */
 var rsbuild_default = oxidejs.rsbuild;
 //#endregion
 export { rsbuild_default as default };

package/dist/{src-CsQ-6GnW.mjs → src-D-qdNVqg.mjs}

@@ -21,6 +21,7 @@ var actions_exports = /* @__PURE__ */ __exportAll({
 	RESOLVED_VIRTUAL_ACTIONS_ID: () => RESOLVED_VIRTUAL_ACTIONS_ID,
 	RESOLVED_VIRTUAL_CLIENT_ID: () => RESOLVED_VIRTUAL_CLIENT_ID,
 	RESOLVED_VIRTUAL_WORKER_ID: () => RESOLVED_VIRTUAL_WORKER_ID,
+	RequestBodyTooLargeError: () => RequestBodyTooLargeError,
 	VIRTUAL_ACTIONS_ID: () => VIRTUAL_ACTIONS_ID,
 	VIRTUAL_CLIENT_ID: () => VIRTUAL_CLIENT_ID,
 	VIRTUAL_WORKER_ID: () => VIRTUAL_WORKER_ID,
@@ -399,7 +400,8 @@ function loadClientStub(id) {
 		exports: parseExportedNames(fs.readFileSync(file, "utf8"))
 	});
 }
-async function nodeToWebRequest(req) {
+var RequestBodyTooLargeError = class extends Error {};
+async function nodeToWebRequest(req, maxBytes = Number.POSITIVE_INFINITY) {
 	const url = `http://${req.headers.host ?? "localhost"}${req.url ?? "/"}`;
 	const headers = new Headers();
 	for (const [key, value] of Object.entries(req.headers)) {
@@ -417,7 +419,13 @@ async function nodeToWebRequest(req) {
 	};
 	if (method === "GET" || method === "HEAD") return new Request(url, init);
 	const chunks = [];
-	for await (const chunk of req) chunks.push(typeof chunk === "string" ? Buffer.from(chunk) : chunk);
+	let size = 0;
+	for await (const chunk of req) {
+		const buffer = typeof chunk === "string" ? Buffer.from(chunk) : chunk;
+		size += buffer.length;
+		if (size > maxBytes) throw new RequestBodyTooLargeError();
+		chunks.push(buffer);
+	}
 	const body = Buffer.concat(chunks);
 	if (body.length > 0) init.body = body;
 	return new Request(url, init);
@@ -724,7 +732,7 @@ function action(fn) {
 }
 //#endregion
 //#region src/index.ts
-function actionMiddleware(loadRouter, path, sameOrigin) {
+function actionMiddleware(loadRouter, path, sameOrigin, bodyLimit) {
 	return (req, res, next) => {
 		if ((req.url ?? "").split("?")[0] !== path) {
 			next();
@@ -738,8 +746,13 @@ function actionMiddleware(loadRouter, path, sameOrigin) {
 			await sendWebResponseFrom(req, res, await handle(await loadRouter(), {
 				path,
 				...sameOrigin ? { sameOrigin: true } : {}
-			})(await nodeToWebRequest(req)));
-		})().catch(next);
+			})(await nodeToWebRequest(req, bodyLimit)));
+		})().catch((error) => {
+			if (error instanceof RequestBodyTooLargeError) {
+				res.statusCode = 413;
+				res.end();
+			} else next(error);
+		});
 	};
 }
 function attachActionUpgrade(httpServer, loadRouter, path, sameOrigin) {
@@ -857,40 +870,54 @@ const unpluginFactory = (options) => {
 				const loadRouter = async () => {
 					return (await server.ssrLoadModule(VIRTUAL_ACTIONS_ID)).default;
 				};
-				if ((resolved?.middleware?.length ?? 0) > 0 || (resolved?.imports?.length ?? 0) > 0) (async () => {
+				const wireActions = () => server.middlewares.use(actionMiddleware(loadRouter, resolved.actionPath, resolved.actionSameOrigin, resolved.bodyLimit));
+				if (resolved?.actions === "ws") {
+					attachActionUpgrade(server.httpServer, loadRouter, resolved.actionPath, resolved.actionSameOrigin);
+					return;
+				}
+				if ((resolved?.middleware?.length ?? 0) === 0 && (resolved?.imports?.length ?? 0) === 0) {
+					wireActions();
+					return;
+				}
+				(async () => {
 					try {
 						for (const spec of resolved.imports ?? []) await server.ssrLoadModule(spec);
 						const handlers = [];
 						for (const entry of resolved.middleware ?? []) {
-							const spec2 = typeof entry === "string" ? entry : entry.module;
-							const mod = await server.ssrLoadModule(spec2);
+							const spec = typeof entry === "string" ? entry : entry.module;
+							const mod = await server.ssrLoadModule(spec);
 							if (typeof mod.default !== "function") continue;
 							const fn = mod.default;
-							handlers.push((request) => Promise.resolve(fn(request)));
+							handlers.push((request, context) => Promise.resolve(fn(request, context)));
 						}
-						if (handlers.length === 0) return;
-						const { nodeToWebRequest, sendWebResponseFrom } = await Promise.resolve().then(() => actions_exports);
-						server.middlewares.use((creq, cres, next) => {
-							(async () => {
-								try {
-									const request = await nodeToWebRequest(creq);
-									for (const handler of handlers) {
-										const hit = await handler(request);
-										if (hit) return sendWebResponseFrom(creq, cres, hit);
+						if (handlers.length > 0) {
+							const { nodeToWebRequest, sendWebResponseFrom } = await Promise.resolve().then(() => actions_exports);
+							server.middlewares.use((creq, cres, next) => {
+								(async () => {
+									try {
+										const request = await nodeToWebRequest(creq, resolved.bodyLimit);
+										const context = {
+											env: resolved.env,
+											ctx: void 0
+										};
+										for (const handler of handlers) {
+											const hit = await handler(request, context);
+											if (hit) return sendWebResponseFrom(creq, cres, hit);
+										}
+										next();
+									} catch (error) {
+										cres.statusCode = error instanceof RequestBodyTooLargeError ? 413 : 500;
+										cres.end(error instanceof RequestBodyTooLargeError ? void 0 : String(error));
 									}
-									next();
-								} catch (error) {
-									cres.statusCode = 500;
-									cres.end(String(error));
-								}
-							})();
-						});
+								})();
+							});
+						}
 					} catch (error) {
 						server.config.logger.error("oxidejs: failed to wire dev middleware: " + String(error));
+					} finally {
+						wireActions();
 					}
 				})();
-				if (resolved?.actions === "ws") attachActionUpgrade(server.httpServer, loadRouter, resolved.actionPath, resolved.actionSameOrigin);
-				else server.middlewares.use(actionMiddleware(loadRouter, resolved.actionPath, resolved.actionSameOrigin));
 			},
 			configurePreviewServer(server) {
 				if (resolved?.preset !== "fetch") return;
@@ -907,7 +934,7 @@ const unpluginFactory = (options) => {
 					return (await loadActions(resolved?.root ?? process.cwd())).default;
 				};
 				if (resolved?.actions === "ws") attachActionUpgrade(server.httpServer, loadRouter, resolved.actionPath, resolved.actionSameOrigin);
-				else server.middlewares.use(actionMiddleware(loadRouter, resolved.actionPath, resolved.actionSameOrigin));
+				else server.middlewares.use(actionMiddleware(loadRouter, resolved.actionPath, resolved.actionSameOrigin, resolved.bodyLimit));
 			});
 			api.onBeforeStartPreviewServer?.(({ server }) => {
 				if (resolved?.preset !== "fetch") return;

package/dist/vite.mjs

@@ -1,4 +1,4 @@
-import { t as oxidejs } from "./src-CsQ-6GnW.mjs";
+import { t as oxidejs } from "./src-D-qdNVqg.mjs";
 //#region src/vite.ts
 var vite_default = oxidejs.vite;
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oxidejs",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Vite/Rsbuild plugin. One build → dist/server.js + optional client. Server actions via *.server.ts.",
   "keywords": [
     "cloudflare",
@@ -59,7 +59,7 @@
     "unplugin": "^3.3.0"
   },
   "devDependencies": {
-    "tacho": "^0.5.0"
+    "tacho": "^0.6.1"
   },
   "peerDependencies": {
     "@rsbuild/core": "*",