oxidejs 0.2.0 → 0.2.2

package/README.md

@@ -76,15 +76,15 @@ export default {
 };
 ```
 
-`action()` is identity — it only marks the export. Wrap `async function*` in it to stream over tacho SSE. `oxidejs/tsconfig` makes `await ticks()` typecheck. Pass `{ signal }` last on any action to abort the fetch. Types come from the real `*.server.ts`, so declare the last argument there:
+`action()` is runtime identity — it marks the export and adds a typed transport-only `{ signal }` argument. Wrap `async function*` in it to stream over tacho SSE. Inside server code, always read the non-optional signal from `useRequest().signal`:
 
 ```ts
 // src/test.server.ts
-import { action } from "oxidejs";
-import type { ActionOptions } from "oxidejs";
+import { action, useRequest } from "oxidejs";
 
-export const ticks = action(async function* (n: number, _opts?: ActionOptions) {
-  for (let i = 0; i < n; i++) yield i;
+export const ticks = action(async function* (n: number) {
+  const { signal } = useRequest();
+  for (let i = 0; i < n && !signal.aborted; i++) yield i;
 });
 
 // src/client.ts
@@ -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.d.mts

@@ -12,28 +12,25 @@ type ActionContext = {
   fetchCtx?: ExecutionContext;
   [key: string]: unknown;
 };
-/** Current tacho `ctx`. Throws outside `*.server.ts` running over `/__oxide/action`. */
+/** Current tacho or host request context. Throws outside request handling. */
 declare function useCtx<C extends ActionContext = ActionContext>(): C;
-/** Current action `Request`. Throws outside `*.server.ts` running over `/__oxide/action`. */
+/** Current server `Request`. Available in actions, SSR, and frame renders. */
 declare function useRequest(): Request;
 /** Worker `env` from `fetch(request, env, ctx)`. `undefined` on the Node fetch preset. */
 declare function useEnv<E = unknown>(): E | undefined;
 /** Worker `ctx` from `fetch(request, env, ctx)` (`waitUntil`). Not tacho `ctx`. `undefined` on Node. */
 declare function useFetchCtx(): ExecutionContext | undefined;
-/** Optional last argument on a `*.server.ts` export so the client can pass `{ signal }`. */
-type ActionOptions = {
-  signal?: AbortSignal;
-};
 /**
- * Marks a `*.server.ts` export as a remote RPC action. Identity: returns `fn` unchanged.
- * Only exports wrapped in `action()` become callable over the wire; other exports stay
- * server-local. Wrap async functions and async generators.
+ * Marks a `*.server.ts` export as a remote RPC action. Runtime identity; the
+ * second call signature adds the transport-only `{ signal }` argument.
  */
-declare function action<T>(fn: T): T;
+declare function action<Args extends unknown[], Result>(fn: (...args: Args) => Result): typeof fn & ((...args: [...Args, options: {
+  signal?: AbortSignal;
+}]) => Result);
 //#endregion
 //#region src/index.d.ts
 declare const unpluginFactory: UnpluginFactory<OxidejsOptions | undefined>;
 declare const oxidejs: import("unplugin").UnpluginInstance<OxidejsOptions | undefined, boolean>;
 declare const vite: (options?: OxidejsOptions | undefined) => import("vite").Plugin<any> | import("vite").Plugin<any>[];
 //#endregion
-export { type ActionContext, type ActionOptions, type ExecutionContext, type OxidejsActionHeaders, type OxidejsActionTransport, type OxidejsOptions, type OxidejsPreset, type OxidejsWranglerOptions, type ResolvedOptions, action, oxidejs as default, oxidejs, unpluginFactory, useCtx, useEnv, useFetchCtx, useRequest, vite };
+export { type ActionContext, type ExecutionContext, type OxidejsActionHeaders, type OxidejsActionTransport, type OxidejsOptions, type OxidejsPreset, type OxidejsWranglerOptions, type ResolvedOptions, action, oxidejs as default, oxidejs, unpluginFactory, useCtx, useEnv, useFetchCtx, useRequest, vite };

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-zvdCGkyp.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-zvdCGkyp.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-zvdCGkyp.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,
@@ -210,7 +211,7 @@ function generateWorkerWrapper(userWorkerAbs, opts = {}) {
 	const hasActions = opts.hasActions !== false;
 	const ws = hasActions && opts.actions === "ws";
 	const bodyLimit = opts.bodyLimit ?? 1048576;
-	const __nf = `() => new Response(${JSON.stringify(opts.notFound ?? "<h1>404 Not Found</h1>")}, { status: 404, headers: { "content-type": "text/html; charset=utf-8" } })`;
+	const nfBlock = `const __nf = ${`() => new Response(${JSON.stringify(opts.notFound ?? "<h1>404 Not Found</h1>")}, { status: 404, headers: { "content-type": "text/html; charset=utf-8" } })`};\n`;
 	const assetBlock = serveAssets ? `import { readFile } from "node:fs/promises";
 import { extname, join } from "node:path";
 const __assets = join(import.meta.dirname, ${JSON.stringify(clientDir)});
@@ -253,7 +254,6 @@ async function __asset(request, spa) {
     return;
   }
 }
-const __nf = ${__nf};
 ` : "";
 	const envJson = JSON.stringify(opts.env ?? {});
 	const afterAction = serveAssets ? `if (typeof user.fetch === "function") {
@@ -326,7 +326,6 @@ const __fetch = Symbol.for("oxidejs.fetch");
 const __rpc = handle(actions, { path: ${JSON.stringify(actionPath)}${sameOrigin ? `, sameOrigin: true` : ``}, createContext: (req) => req[__fetch] ?? {} });
 ` : "";
 	const actionGate = hasActions && !ws ? `if (new URL(request.url).pathname === ${JSON.stringify(actionPath)}) {
-      request[__fetch] = { env, fetchCtx: ctx };
       return __rpc(request);
     }
     ` : "";
@@ -343,9 +342,10 @@ const __rpc = handle(actions, { path: ${JSON.stringify(actionPath)}${sameOrigin
     ` : "";
 	return `${(opts.imports ?? []).map((spec) => `import ${JSON.stringify(spec)};`).join("\n")}export * from ${JSON.stringify(userWorkerAbs)};
 import user from ${JSON.stringify(userWorkerAbs)};
-${middlewareImports}${actionImports}${assetBlock}const app = {
+${middlewareImports}${actionImports}${assetBlock}${nfBlock}const app = {
   ...user,
   async fetch(request, env, ctx) {
+    request[__fetch] = { env, fetchCtx: ctx };
     ${middlewareGate}${actionGate}${afterAction}
   },
 };
@@ -400,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)) {
@@ -418,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);
@@ -679,20 +686,21 @@ function applyRsbuildEnvironments(config, opts) {
 //#endregion
 //#region src/context.ts
 const ALS_KEY = Symbol.for("oxidejs.requestContext");
+const FETCH_KEY = Symbol.for("oxidejs.fetch");
 function als() {
 	const g = globalThis;
 	return g[ALS_KEY] ??= new AsyncLocalStorage();
 }
 function store() {
 	const current = als().getStore();
-	if (!current) throw new Error("oxidejs: useRequest() called outside an action");
+	if (!current) throw new Error("oxidejs: request context is unavailable");
 	return current;
 }
-/** Current tacho `ctx`. Throws outside `*.server.ts` running over `/__oxide/action`. */
+/** Current tacho or host request context. Throws outside request handling. */
 function useCtx() {
 	return store();
 }
-/** Current action `Request`. Throws outside `*.server.ts` running over `/__oxide/action`. */
+/** Current server `Request`. Available in actions, SSR, and frame renders. */
 function useRequest() {
 	return store().req;
 }
@@ -704,17 +712,27 @@ function useEnv() {
 function useFetchCtx() {
 	return store().fetchCtx;
 }
+function runWithRequest(req, fn, extra) {
+	return als().run({
+		...extra,
+		req
+	}, fn);
+}
+const HOOK_KEY = Symbol.for("oxidejs.runWithRequest");
+globalThis[HOOK_KEY] ??= (req, fn) => {
+	const extra = req[FETCH_KEY];
+	return runWithRequest(req, fn, extra);
+};
 /**
-* Marks a `*.server.ts` export as a remote RPC action. Identity: returns `fn` unchanged.
-* Only exports wrapped in `action()` become callable over the wire; other exports stay
-* server-local. Wrap async functions and async generators.
+* Marks a `*.server.ts` export as a remote RPC action. Runtime identity; the
+* second call signature adds the transport-only `{ signal }` argument.
 */
 function action(fn) {
 	return 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();
@@ -728,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) {
@@ -847,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;
@@ -897,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-zvdCGkyp.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.0",
+  "version": "0.2.2",
   "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.4.3"
+    "tacho": "^0.6.0"
   },
   "peerDependencies": {
     "@rsbuild/core": "*",