@revojs/server 0.2.31 → 0.2.33

package/dist/index.d.ts

@@ -23,6 +23,10 @@ export interface ResponseConfig extends Record<string, unknown> {
     statusText?: string;
     headers: Headers;
 }
+export interface FetchOptions extends RequestInit {
+    json?: unknown;
+    forwardHeaders?: Array<string>;
+}
 export interface ServerContext {
     states: Record<string, unknown>;
     request: Request;
@@ -108,7 +112,7 @@ export declare function sendForbidden<T>(scope: Scope, body?: T | BodyInit, conf
 export declare function sendNotFound<T>(scope: Scope, body?: T | BodyInit, config?: Mergeable<ResponseConfig>): Response;
 export declare function getState<T>(scope: Scope, name: string): T;
 export declare function setState<T>(scope: Scope, name: string, value: T): void;
-export declare function fetch<T>(scope: Scope, input: string | URL, options?: RequestInit): Promise<T>;
+export declare function fetch<T>(scope: Scope, input: string | URL, options?: FetchOptions): Promise<T>;
 export declare function invoke(scope: Scope, pipeline: Array<Middleware>, index?: number): Promise<Result>;
 export declare function invokeWebSocket(webSocket: WebSocket, connection: WebSocketConnection, invoke: () => Awaitable<void>): Promise<void>;
 export declare function createStaticMiddleware(resolve: (path: string | URL) => Awaitable<Blob>): {

package/dist/index.js

@@ -256,19 +256,31 @@ function getState(scope, name) {
 function setState(scope, name, value) {
 	useStates(scope)[name] = value;
 }
-async function fetch(scope, input, options) {
+async function fetch(scope, input, options = {}) {
+	const { json, forwardHeaders, ...init } = options;
+	const headers = new Headers(init.headers);
+	if (json !== void 0) {
+		if (init.body !== void 0 && init.body !== null) throw new TypeError("fetch accepts either json or body, not both");
+		init.body = JSON.stringify(json);
+		if (!headers.has("Content-Type")) headers.set("Content-Type", "application/json");
+	}
+	init.headers = headers;
 	let response;
 	if (isServer) {
 		const { states, request } = useServer(scope);
 		const url = new URL(input.toString(), request.url);
-		const next = await createServerScope(new Request(url, options), useVariables(scope), states);
-		const previous = new URL(request.url);
-		if (url.origin === previous.origin) {
-			const result = await (await import("#server")).default.fetch(next);
+		if (url.origin === new URL(request.url).origin) {
+			const names = [...forwardHeaders ?? []];
+			if (init.credentials !== "omit") names.push("cookie");
+			for (const name of names) {
+				const value = request.headers.get(name);
+				if (value !== null && !headers.has(name)) headers.set(name, value);
+			}
+			const result = await (await import("#server")).default.fetch(await createServerScope(new Request(url, init), useVariables(scope), states));
 			if (isResponse(result)) response = result;
 		}
 	}
-	response ??= await globalThis.fetch(input, options);
+	response ??= await globalThis.fetch(input, init);
 	if (response.ok === false) throw response;
 	switch (response.headers.get("Content-Type")?.split(";").shift() ?? "") {
 		case "application/json": return response.json();
@@ -307,7 +319,22 @@ function createStaticMiddleware(resolve) {
 	return defineMiddleware({ async fetch(scope, next) {
 		const { pathname } = useUrl(scope);
 		const asset = assets[pathname];
-		if (asset) return sendOk(scope, await resolve(asset.relative), { headers: new Headers({ "Content-Type": asset.type }) });
+		if (asset) {
+			const { request } = useServer(scope);
+			let cacheControl = "public, max-age=0, must-revalidate";
+			if (pathname.startsWith("/assets/")) cacheControl = "public, max-age=31536000, immutable";
+			const headers = new Headers({
+				"Content-Type": asset.type,
+				"Cache-Control": cacheControl,
+				"ETag": asset.entityTag,
+				"Last-Modified": new Date(asset.lastModified).toUTCString()
+			});
+			for (const tag of request.headers.get("If-None-Match")?.split(",") ?? []) if (tag.trim() === asset.entityTag || tag.trim() === "*") return sendResponse(scope, null, {
+				status: 304,
+				headers
+			});
+			return sendOk(scope, await resolve(asset.relative), { headers });
+		}
 		return next?.();
 	} });
 }

package/dist/package.js

@@ -1,6 +1,6 @@
 //#region package.json
 var name = "@revojs/server";
-var version = "0.2.31";
+var version = "0.2.33";
 var repository = {
 	"type": "git",
 	"url": "git+https://github.com/tellua/revojs.git"

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@revojs/server",
-    "version": "0.2.31",
+    "version": "0.2.33",
     "license": "MIT",
     "repository": {
         "type": "git",