oxidejs 0.2.3 → 0.2.4

package/README.md

@@ -12,6 +12,8 @@ dist/
 
 v1 targets **Vite** and **Rsbuild** via unplugin. Other bundlers are out of scope for now.
 
+The `oxidejs` entry exports runtime helpers (`action`, `useRequest`, …). The bundler plugin lives at `oxidejs/vite` or `oxidejs/rsbuild` — keep those separate so `*.server.ts` can import `oxidejs` under `preset: "celld"` without pulling Node build tooling into the worker graph.
+
 ## Vite
 
 ```ts

package/dist/index.d.mts

@@ -1,5 +1,4 @@
 import { a as OxidejsWranglerOptions, i as OxidejsPreset, n as OxidejsActionTransport, o as ResolvedOptions, r as OxidejsOptions, t as OxidejsActionHeaders } from "./types-BM4NAnzy.mjs";
-import { UnpluginFactory } from "unplugin";
 //#region src/context.d.ts
 type ExecutionContext = {
   waitUntil?(promise: Promise<unknown>): void;
@@ -28,9 +27,4 @@ declare function action<Args extends unknown[], Result>(fn: (...args: Args) => R
   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 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, useCtx, useEnv, useFetchCtx, useRequest };

package/dist/index.mjs

@@ -1,2 +1,49 @@
-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 };
+import { AsyncLocalStorage } from "node:async_hooks";
+//#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: request context is unavailable");
+	return current;
+}
+/** Current tacho or host request context. Throws outside request handling. */
+function useCtx() {
+	return store();
+}
+/** Current server `Request`. Available in actions, SSR, and frame renders. */
+function useRequest() {
+	return store().req;
+}
+/** Worker `env` from `fetch(request, env, ctx)`. `undefined` on the Node fetch preset. */
+function useEnv() {
+	return store().env;
+}
+/** Worker `ctx` from `fetch(request, env, ctx)` (`waitUntil`). Not tacho `ctx`. `undefined` on Node. */
+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. Runtime identity; the
+* second call signature adds the transport-only `{ signal }` argument.
+*/
+function action(fn) {
+	return fn;
+}
+//#endregion
+export { action, useCtx, useEnv, useFetchCtx, useRequest };

package/dist/{src-D-qdNVqg.mjs → plugin-nO0yjtk0.mjs}

@@ -2,7 +2,6 @@ import { createUnplugin } from "unplugin";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
 import fs from "node:fs";
-import { AsyncLocalStorage } from "node:async_hooks";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {
@@ -684,55 +683,8 @@ function applyRsbuildEnvironments(config, opts) {
 	return config;
 }
 //#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: request context is unavailable");
-	return current;
-}
-/** Current tacho or host request context. Throws outside request handling. */
-function useCtx() {
-	return store();
-}
-/** Current server `Request`. Available in actions, SSR, and frame renders. */
-function useRequest() {
-	return store().req;
-}
-/** Worker `env` from `fetch(request, env, ctx)`. `undefined` on the Node fetch preset. */
-function useEnv() {
-	return store().env;
-}
-/** Worker `ctx` from `fetch(request, env, ctx)` (`waitUntil`). Not tacho `ctx`. `undefined` on Node. */
-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. 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, bodyLimit) {
+//#region src/plugin.ts
+function actionMiddleware(loadRouter, path, sameOrigin, bodyLimit, onError) {
 	return (req, res, next) => {
 		if ((req.url ?? "").split("?")[0] !== path) {
 			next();
@@ -748,10 +700,16 @@ function actionMiddleware(loadRouter, path, sameOrigin, bodyLimit) {
 				...sameOrigin ? { sameOrigin: true } : {}
 			})(await nodeToWebRequest(req, bodyLimit)));
 		})().catch((error) => {
+			if (res.headersSent) return;
 			if (error instanceof RequestBodyTooLargeError) {
 				res.statusCode = 413;
 				res.end();
-			} else next(error);
+				return;
+			}
+			onError?.(error);
+			res.statusCode = 503;
+			res.setHeader("content-type", "application/json");
+			res.end(JSON.stringify({ error: "oxide action handler failed" }));
 		});
 	};
 }
@@ -864,60 +822,102 @@ const unpluginFactory = (options) => {
 						if (mod) env.moduleGraph.invalidateModule(mod);
 					}
 				};
+				const fetchRouter = async () => {
+					return (await server.ssrLoadModule(VIRTUAL_ACTIONS_ID)).default;
+				};
+				let routerReady;
+				const loadRouter = () => {
+					const current = routerReady ??= fetchRouter();
+					return current.catch((error) => {
+						if (routerReady === current) routerReady = void 0;
+						throw error;
+					});
+				};
+				const refreshRouter = () => {
+					routerReady = void 0;
+				};
 				server.watcher.on("all", (_event, file) => {
-					if (isServerFileId(file)) invalidateActions();
+					if (isServerFileId(file)) {
+						invalidateActions();
+						refreshRouter();
+					}
 				});
-				const loadRouter = async () => {
-					return (await server.ssrLoadModule(VIRTUAL_ACTIONS_ID)).default;
+				const logActionError = (error) => {
+					server.config.logger.error("oxidejs: action handler failed: " + String(error));
 				};
-				const wireActions = () => server.middlewares.use(actionMiddleware(loadRouter, resolved.actionPath, resolved.actionSameOrigin, resolved.bodyLimit));
+				const wireActions = () => server.middlewares.use(actionMiddleware(loadRouter, resolved.actionPath, resolved.actionSameOrigin, resolved.bodyLimit, logActionError));
 				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;
+					return async () => {
+						try {
+							await loadRouter();
+						} catch (error) {
+							server.config.logger.error("oxidejs: failed to prewarm actions: " + String(error));
+						}
+					};
 				}
-				(async () => {
-					try {
-						for (const spec of resolved.imports ?? []) await server.ssrLoadModule(spec);
-						const handlers = [];
-						for (const entry of resolved.middleware ?? []) {
-							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, context) => Promise.resolve(fn(request, context)));
+				let handlersPromise = Promise.resolve([]);
+				if ((resolved?.middleware?.length ?? 0) > 0 || (resolved?.imports?.length ?? 0) > 0) {
+					handlersPromise = (async () => {
+						try {
+							for (const spec of resolved.imports ?? []) await server.ssrLoadModule(spec);
+							const handlers = [];
+							for (const entry of resolved.middleware ?? []) {
+								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, context) => Promise.resolve(fn(request, context)));
+							}
+							return handlers;
+						} catch (error) {
+							server.config.logger.error("oxidejs: failed to wire dev middleware: " + String(error));
+							return [];
 						}
-						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));
-									}
-								})();
-							});
+					})();
+					server.middlewares.use((creq, cres, next) => {
+						if ((creq.url ?? "").split("?")[0] === resolved.actionPath) {
+							next();
+							return;
 						}
+						(async () => {
+							try {
+								const handlers = await handlersPromise;
+								if (handlers.length === 0) {
+									next();
+									return;
+								}
+								const { nodeToWebRequest, sendWebResponseFrom } = await Promise.resolve().then(() => actions_exports);
+								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) {
+										await sendWebResponseFrom(creq, cres, hit);
+										return;
+									}
+								}
+								next();
+							} catch (error) {
+								if (cres.headersSent) return;
+								cres.statusCode = error instanceof RequestBodyTooLargeError ? 413 : 500;
+								cres.end(error instanceof RequestBodyTooLargeError ? void 0 : String(error));
+							}
+						})();
+					});
+				}
+				wireActions();
+				return async () => {
+					try {
+						await loadRouter();
+						await handlersPromise;
 					} catch (error) {
-						server.config.logger.error("oxidejs: failed to wire dev middleware: " + String(error));
-					} finally {
-						wireActions();
+						server.config.logger.error("oxidejs: failed to prewarm dev server: " + String(error));
 					}
-				})();
+				};
 			},
 			configurePreviewServer(server) {
 				if (resolved?.preset !== "fetch") return;
@@ -951,4 +951,4 @@ const unpluginFactory = (options) => {
 const oxidejs = /* @__PURE__ */ createUnplugin(unpluginFactory);
 const vite = /* @__PURE__ */ (() => oxidejs.vite)();
 //#endregion
-export { useCtx as a, useRequest as c, action as i, unpluginFactory as n, useEnv as o, vite as r, useFetchCtx as s, oxidejs as t };
+export { unpluginFactory as n, vite as r, oxidejs as t };

package/dist/plugin.d.mts

@@ -0,0 +1,8 @@
+import { r as OxidejsOptions } from "./types-BM4NAnzy.mjs";
+import { UnpluginFactory } from "unplugin";
+//#region src/plugin.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 { oxidejs as default, oxidejs, unpluginFactory, vite };

package/dist/plugin.mjs

@@ -0,0 +1,2 @@
+import { n as unpluginFactory, r as vite, t as oxidejs } from "./plugin-nO0yjtk0.mjs";
+export { oxidejs as default, oxidejs, unpluginFactory, vite };

package/dist/rsbuild.mjs

@@ -1,4 +1,4 @@
-import { t as oxidejs } from "./src-D-qdNVqg.mjs";
+import { t as oxidejs } from "./plugin-nO0yjtk0.mjs";
 //#region src/rsbuild.ts
 var rsbuild_default = oxidejs.rsbuild;
 //#endregion

package/dist/vite.mjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oxidejs",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Vite/Rsbuild plugin. One build → dist/server.js + optional client. Server actions via *.server.ts.",
   "keywords": [
     "cloudflare",