@solidjs/web 2.0.0-beta.25 → 2.0.0-beta.27

package/server-functions/dist/client.cjs

@@ -3,6 +3,8 @@
 var seroval = require('seroval');
 var web = require('seroval-plugins/web');
 
+const REVALIDATE_HEADER = "X-Revalidate";
+
 seroval.Feature.AggregateError | seroval.Feature.BigIntTypedArray;
 const DEFAULT_WEB_PLUGINS = Object.freeze([web.AbortSignalPlugin,
 web.CustomEventPlugin, web.DOMExceptionPlugin, web.EventPlugin,
@@ -98,6 +100,14 @@ const INSTANCE_HEADER = "X-Server-Function-Instance";
 const BODY_FORMAT_HEADER = "X-Server-Function-Format";
 const SINGLE_FLIGHT_HEADER = "X-Single-Flight";
 const FILE_FORM_KEY = "__server_function_file__";
+const FLASH_COOKIE = "flash";
+const FLASH_MATCHER = new RegExp(`(?:^|;\\s*)${FLASH_COOKIE}=([^;]+)`);
+function hasFlashCookie(cookieHeader) {
+  return !!cookieHeader && FLASH_MATCHER.test(cookieHeader);
+}
+function clearFlashCookie() {
+  return `${FLASH_COOKIE}=; Max-Age=0; Path=/`;
+}
 const BodyFormat = {
   Serialized: "0",
   String: "1",
@@ -219,15 +229,15 @@ class ChunkReader {
     }
   }
   async next() {
-    if (this.buffer.length === 0) {
+    while (this.buffer.length < 12) {
       if (this.done) {
-        return {
+        if (this.buffer.length === 0) return {
           done: true,
           value: undefined
         };
+        throw new Error("Malformed server function stream.");
       }
       await this.readChunk();
-      return await this.next();
     }
     const head = new TextDecoder().decode(this.buffer.subarray(1, 11));
     const bytes = Number.parseInt(head, 16);
@@ -403,13 +413,13 @@ async function fetchServerFunction(base, id, options, args, meta) {
       await consumer(payload.data, {
         response
       });
-      if (response.headers.has(ERROR_HEADER) && !response.headers.has("Location") && !response.headers.has("X-Revalidate")) {
+      if (response.headers.has(ERROR_HEADER) && !response.headers.has("Location") && !response.headers.has(REVALIDATE_HEADER)) {
         throw payload.value;
       }
       return payload.value;
     }
   }
-  if (response.headers.has("Location") || response.headers.has("X-Revalidate") || response.headers.has(SINGLE_FLIGHT_HEADER)) {
+  if (response.headers.has("Location") || response.headers.has(REVALIDATE_HEADER) || response.headers.has(SINGLE_FLIGHT_HEADER)) {
     return response;
   }
   const result = await decodeResponse(response.clone());
@@ -487,16 +497,19 @@ function registerServerReference() {
 }
 
 exports.ERROR_HEADER = ERROR_HEADER;
+exports.FLASH_COOKIE = FLASH_COOKIE;
 exports.FUNCTION_HEADER = FUNCTION_HEADER;
 exports.GET = GET;
 exports.INSTANCE_HEADER = INSTANCE_HEADER;
 exports.SINGLE_FLIGHT_HEADER = SINGLE_FLIGHT_HEADER;
+exports.clearFlashCookie = clearFlashCookie;
 exports.configureServerFunctionsClient = configureServerFunctionsClient;
 exports.createServerReference = createServerReference;
 exports.decodeErrorHeaderValue = decodeErrorHeaderValue;
 exports.decodeResponse = decodeResponse;
 exports.encodeErrorHeaderValue = encodeErrorHeaderValue;
 exports.getServerFunctionMetadata = getServerFunctionMetadata;
+exports.hasFlashCookie = hasFlashCookie;
 exports.isServerFunction = isServerFunction;
 exports.registerServerReference = registerServerReference;
 exports.subscribeFlightData = subscribeFlightData;

package/server-functions/dist/client.js

@@ -1,6 +1,8 @@
 import { fromCrossJSON, Feature } from 'seroval';
 import { AbortSignalPlugin, CustomEventPlugin, DOMExceptionPlugin, EventPlugin, FormDataPlugin, HeadersPlugin, ReadableStreamPlugin, RequestPlugin, ResponsePlugin, URLSearchParamsPlugin, URLPlugin } from 'seroval-plugins/web';
 
+const REVALIDATE_HEADER = "X-Revalidate";
+
 Feature.AggregateError | Feature.BigIntTypedArray;
 const DEFAULT_WEB_PLUGINS = Object.freeze([AbortSignalPlugin,
 CustomEventPlugin, DOMExceptionPlugin, EventPlugin,
@@ -96,6 +98,14 @@ const INSTANCE_HEADER = "X-Server-Function-Instance";
 const BODY_FORMAT_HEADER = "X-Server-Function-Format";
 const SINGLE_FLIGHT_HEADER = "X-Single-Flight";
 const FILE_FORM_KEY = "__server_function_file__";
+const FLASH_COOKIE = "flash";
+const FLASH_MATCHER = new RegExp(`(?:^|;\\s*)${FLASH_COOKIE}=([^;]+)`);
+function hasFlashCookie(cookieHeader) {
+  return !!cookieHeader && FLASH_MATCHER.test(cookieHeader);
+}
+function clearFlashCookie() {
+  return `${FLASH_COOKIE}=; Max-Age=0; Path=/`;
+}
 const BodyFormat = {
   Serialized: "0",
   String: "1",
@@ -217,15 +227,15 @@ class ChunkReader {
     }
   }
   async next() {
-    if (this.buffer.length === 0) {
+    while (this.buffer.length < 12) {
       if (this.done) {
-        return {
+        if (this.buffer.length === 0) return {
           done: true,
           value: undefined
         };
+        throw new Error("Malformed server function stream.");
       }
       await this.readChunk();
-      return await this.next();
     }
     const head = new TextDecoder().decode(this.buffer.subarray(1, 11));
     const bytes = Number.parseInt(head, 16);
@@ -401,13 +411,13 @@ async function fetchServerFunction(base, id, options, args, meta) {
       await consumer(payload.data, {
         response
       });
-      if (response.headers.has(ERROR_HEADER) && !response.headers.has("Location") && !response.headers.has("X-Revalidate")) {
+      if (response.headers.has(ERROR_HEADER) && !response.headers.has("Location") && !response.headers.has(REVALIDATE_HEADER)) {
         throw payload.value;
       }
       return payload.value;
     }
   }
-  if (response.headers.has("Location") || response.headers.has("X-Revalidate") || response.headers.has(SINGLE_FLIGHT_HEADER)) {
+  if (response.headers.has("Location") || response.headers.has(REVALIDATE_HEADER) || response.headers.has(SINGLE_FLIGHT_HEADER)) {
     return response;
   }
   const result = await decodeResponse(response.clone());
@@ -484,4 +494,4 @@ function registerServerReference() {
   throw new Error("registerServerReference must not be called in the client build");
 }
 
-export { ERROR_HEADER, FUNCTION_HEADER, GET, INSTANCE_HEADER, SINGLE_FLIGHT_HEADER, configureServerFunctionsClient, createServerReference, decodeErrorHeaderValue, decodeResponse, encodeErrorHeaderValue, getServerFunctionMetadata, isServerFunction, registerServerReference, subscribeFlightData, withMeta };
+export { ERROR_HEADER, FLASH_COOKIE, FUNCTION_HEADER, GET, INSTANCE_HEADER, SINGLE_FLIGHT_HEADER, clearFlashCookie, configureServerFunctionsClient, createServerReference, decodeErrorHeaderValue, decodeResponse, encodeErrorHeaderValue, getServerFunctionMetadata, hasFlashCookie, isServerFunction, registerServerReference, subscribeFlightData, withMeta };

package/server-functions/dist/server.cjs

@@ -10,6 +10,7 @@ function isResponseEnvelope(value) {
 }
 
 seroval.Feature.AggregateError | seroval.Feature.BigIntTypedArray;
+const serializeOnlyDisabledFeatures = () => process.env.NODE_ENV === "development" ? 0 : seroval.Feature.ErrorPrototypeStack;
 const DEFAULT_WEB_PLUGINS = Object.freeze([web.AbortSignalPlugin,
 web.CustomEventPlugin, web.DOMExceptionPlugin, web.EventPlugin,
 web.FormDataPlugin, web.HeadersPlugin, web.ReadableStreamPlugin, web.RequestPlugin, web.ResponsePlugin, web.URLSearchParamsPlugin, web.URLPlugin]);
@@ -35,11 +36,13 @@ function serializeJSON(value, {
   onError,
   ...codecOptions
 }) {
+  const resolved = resolveCodecOptions(codecOptions);
   return seroval.toCrossJSONStream(value, {
     onParse,
     onDone,
     onError,
-    ...resolveCodecOptions(codecOptions)
+    ...resolved,
+    disabledFeatures: resolved.disabledFeatures | serializeOnlyDisabledFeatures()
   });
 }
 function createJSONDeserializer(options) {
@@ -117,6 +120,18 @@ const INSTANCE_HEADER = "X-Server-Function-Instance";
 const BODY_FORMAT_HEADER = "X-Server-Function-Format";
 const SINGLE_FLIGHT_HEADER = "X-Single-Flight";
 const FILE_FORM_KEY = "__server_function_file__";
+const FLASH_COOKIE = "flash";
+const FLASH_MATCHER = new RegExp(`(?:^|;\\s*)${FLASH_COOKIE}=([^;]+)`);
+function hasFlashCookie(cookieHeader) {
+  return !!cookieHeader && FLASH_MATCHER.test(cookieHeader);
+}
+function matchFlashCookie(cookieHeader) {
+  const match = cookieHeader && cookieHeader.match(FLASH_MATCHER);
+  return match ? match[1] : undefined;
+}
+function clearFlashCookie() {
+  return `${FLASH_COOKIE}=; Max-Age=0; Path=/`;
+}
 const BodyFormat = {
   Serialized: "0",
   String: "1",
@@ -249,15 +264,15 @@ class ChunkReader {
     }
   }
   async next() {
-    if (this.buffer.length === 0) {
+    while (this.buffer.length < 12) {
       if (this.done) {
-        return {
+        if (this.buffer.length === 0) return {
           done: true,
           value: undefined
         };
+        throw new Error("Malformed server function stream.");
       }
       await this.readChunk();
-      return await this.next();
     }
     const head = new TextDecoder().decode(this.buffer.subarray(1, 11));
     const bytes = Number.parseInt(head, 16);
@@ -329,11 +344,61 @@ async function decodeResponse(response, codecOptions) {
   return await extractBody(response, codecOptions === undefined ? codecConfig.codec : codecOptions);
 }
 
+function encodeInputValue(value) {
+  if (value instanceof FormData) return {
+    $f: [...value.entries()].filter(([, v]) => typeof v === "string")
+  };
+  if (value instanceof URLSearchParams) return {
+    $u: [...value.entries()]
+  };
+  return value;
+}
+function decodeInputValue(value) {
+  if (value && typeof value === "object") {
+    if (Array.isArray(value.$f)) {
+      const form = new FormData();
+      for (const [k, v] of value.$f) form.append(k, v);
+      return form;
+    }
+    if (Array.isArray(value.$u)) return new URLSearchParams(value.$u);
+  }
+  return value;
+}
+function encodeFlashCookie(url, result, input, thrown) {
+  const isError = result instanceof Error;
+  const payload = {
+    url,
+    result: isError ? result.message : result,
+    error: isError,
+    thrown: !!thrown,
+    input: input.map(encodeInputValue)
+  };
+  return `${FLASH_COOKIE}=${encodeURIComponent(JSON.stringify(payload))}; Secure; HttpOnly; Path=/`;
+}
+function decodeFlashCookie(cookieHeader) {
+  const match = matchFlashCookie(cookieHeader);
+  if (!match) return;
+  try {
+    const payload = JSON.parse(decodeURIComponent(match));
+    if (!payload || !payload.result) return;
+    const result = payload.error ? new Error(payload.result) : payload.result;
+    return {
+      input: Array.isArray(payload.input) ? payload.input.map(decodeInputValue) : [],
+      url: payload.url,
+      result: payload.thrown ? undefined : result,
+      error: payload.thrown ? result : undefined
+    };
+  } catch (error) {
+    console.error(error);
+  }
+}
+
 const config = {
   provideEvent: undefined,
   collectFlightData: undefined,
   transformResult: undefined,
   transformDirectResult: undefined,
+  handleNoJS: undefined,
   endpoint: "/_server"
 };
 function configureServerFunctionsServer({
@@ -341,6 +406,7 @@ function configureServerFunctionsServer({
   collectFlightData,
   transformResult,
   transformDirectResult,
+  handleNoJS,
   endpoint,
   codec
 } = {}) {
@@ -348,6 +414,7 @@ function configureServerFunctionsServer({
   if (collectFlightData !== undefined) config.collectFlightData = collectFlightData;
   if (transformResult !== undefined) config.transformResult = transformResult;
   if (transformDirectResult !== undefined) config.transformDirectResult = transformDirectResult;
+  if (handleNoJS !== undefined) config.handleNoJS = handleNoJS;
   if (endpoint !== undefined) config.endpoint = endpoint;
   if (codec !== undefined) configureServerFunctionsCodec(codec);
 }
@@ -473,6 +540,87 @@ async function foldFlightData(hook, event, headers, outcome) {
     data
   };
 }
+function parseSetCookie(setCookie) {
+  const [pair, ...attributes] = setCookie.split(";");
+  const eq = pair.indexOf("=");
+  if (eq < 0) return undefined;
+  const parsed = {
+    name: pair.slice(0, eq).trim(),
+    value: pair.slice(eq + 1).trim()
+  };
+  for (const attribute of attributes) {
+    const attrEq = attribute.indexOf("=");
+    const key = (attrEq < 0 ? attribute : attribute.slice(0, attrEq)).trim().toLowerCase();
+    const value = attrEq < 0 ? "" : attribute.slice(attrEq + 1).trim();
+    if (key === "max-age") parsed.maxAge = Number(value);else if (key === "expires") parsed.expires = new Date(value);
+  }
+  return parsed;
+}
+function foldSetCookies(headers, setCookies) {
+  const folded = new Headers(headers);
+  if (!setCookies.length) return folded;
+  const cookies = {};
+  for (const pair of folded.get("cookie")?.split(";") ?? []) {
+    const eq = pair.indexOf("=");
+    if (eq > -1) cookies[pair.slice(0, eq).trim()] = pair.slice(eq + 1).trim();
+  }
+  for (const setCookie of setCookies) {
+    const parsed = parseSetCookie(setCookie);
+    if (!parsed) continue;
+    if (parsed.maxAge != null && parsed.maxAge <= 0 || parsed.expires != null && parsed.expires.getTime() <= Date.now()) {
+      delete cookies[parsed.name];
+    } else {
+      cookies[parsed.name] = parsed.value;
+    }
+  }
+  folded.delete("cookie");
+  const serialized = Object.entries(cookies).map(([name, value]) => `${name}=${value}`).join("; ");
+  if (serialized) folded.set("cookie", serialized);
+  return folded;
+}
+const validRedirectStatuses = new Set([301, 302, 303, 307, 308]);
+function createNoJSHandler({
+  base = ""
+} = {}) {
+  return function handleNoJS(result, request, args, thrown) {
+    const url = new URL(request.url);
+    let back = new URL(base || "/", url.origin).toString();
+    try {
+      const referer = request.headers.get("referer");
+      if (referer) back = new URL(referer).toString();
+    } catch {}
+    let status = 303;
+    let headers;
+    if (result instanceof Response) {
+      headers = new Headers(result.headers);
+      if (result.headers.has("Location")) {
+        headers.set("Location", new URL(result.headers.get("Location"), url.origin + base).toString());
+        if (validRedirectStatuses.has(result.status)) status = result.status;
+      } else {
+        headers.set("Location", back);
+      }
+      headers.delete("Content-Type");
+      headers.delete("Content-Length");
+    } else {
+      headers = new Headers({
+        Location: back
+      });
+    }
+    if (result && !(result instanceof Response)) {
+      headers.append("Set-Cookie", encodeFlashCookie(url.pathname + url.search, result, args, thrown));
+    }
+    return new Response(null, {
+      status,
+      headers
+    });
+  };
+}
+let defaultNoJSHandler;
+function isFormPost(request) {
+  if (request.method !== "POST" || request.headers.has(BODY_FORMAT_HEADER)) return false;
+  const type = request.headers.get("content-type") || "";
+  return type.startsWith("application/x-www-form-urlencoded") || type.startsWith("multipart/form-data");
+}
 function serializedResponse(value, headers, codec) {
   headers.set(BODY_FORMAT_HEADER, BodyFormat.Serialized);
   headers.set("Content-Type", "text/plain");
@@ -530,6 +678,7 @@ async function handleServerFunctionRequest(request, options = {}) {
   const provide = options.provideEvent || provideEvent;
   const flightHook = options.collectFlightData !== undefined ? options.collectFlightData : config.collectFlightData;
   const transformResult = options.transformResult !== undefined ? options.transformResult : config.transformResult;
+  const handleNoJS = options.handleNoJS !== undefined ? options.handleNoJS : config.handleNoJS !== undefined ? config.handleNoJS : isFormPost(request) ? defaultNoJSHandler || (defaultNoJSHandler = createNoJSHandler()) : undefined;
   const collectsFlight = !!(flightHook && instance && request.headers.has(SINGLE_FLIGHT_HEADER));
   const parsed = await parseArguments(request, url, instance, codec);
   const headers = new Headers();
@@ -553,7 +702,7 @@ async function handleServerFunctionRequest(request, options = {}) {
         response,
         value
       } = result;
-      if (!instance && !options.handleNoJS && response && response.body) {
+      if (!instance && !handleNoJS && response && response.body) {
         return response;
       }
       if (response && response.headers) {
@@ -589,7 +738,7 @@ async function handleServerFunctionRequest(request, options = {}) {
       });
     }
     if (!instance) {
-      if (options.handleNoJS) return options.handleNoJS(result, request, parsed);
+      if (handleNoJS) return handleNoJS(result, request, parsed);
       if (result instanceof Response) return result;
       return encodeResult(result, headers, 200, codec);
     }
@@ -641,13 +790,13 @@ async function handleServerFunctionRequest(request, options = {}) {
       }
       headers.set(ERROR_HEADER, "true");
       if (!instance) {
-        if (options.handleNoJS) return options.handleNoJS(x, request, parsed, true);
+        if (handleNoJS) return handleNoJS(x ?? metadata, request, parsed, true);
         if (x instanceof Response) return x;
       }
       return encodeResult(x, headers, status, codec);
     }
     if (!instance) {
-      if (options.handleNoJS) return options.handleNoJS(x, request, parsed, true);
+      if (handleNoJS) return handleNoJS(x, request, parsed, true);
       const message = x instanceof Error ? x.message : String(x);
       return new Response(process.env.NODE_ENV === "development" ? message : null, {
         status: 500
@@ -660,19 +809,26 @@ async function handleServerFunctionRequest(request, options = {}) {
 }
 
 exports.ERROR_HEADER = ERROR_HEADER;
+exports.FLASH_COOKIE = FLASH_COOKIE;
 exports.FUNCTION_HEADER = FUNCTION_HEADER;
 exports.GET = GET;
 exports.INSTANCE_HEADER = INSTANCE_HEADER;
 exports.SINGLE_FLIGHT_HEADER = SINGLE_FLIGHT_HEADER;
+exports.clearFlashCookie = clearFlashCookie;
 exports.configureServerFunctionsServer = configureServerFunctionsServer;
+exports.createNoJSHandler = createNoJSHandler;
 exports.createServerReference = createServerReference;
 exports.decodeErrorHeaderValue = decodeErrorHeaderValue;
+exports.decodeFlashCookie = decodeFlashCookie;
 exports.decodeResponse = decodeResponse;
 exports.encodeErrorHeaderValue = encodeErrorHeaderValue;
+exports.encodeFlashCookie = encodeFlashCookie;
+exports.foldSetCookies = foldSetCookies;
 exports.getServerFunction = getServerFunction;
 exports.getServerFunctionMeta = getServerFunctionMeta;
 exports.getServerFunctionMetadata = getServerFunctionMetadata;
 exports.handleServerFunctionRequest = handleServerFunctionRequest;
+exports.hasFlashCookie = hasFlashCookie;
 exports.isServerFunction = isServerFunction;
 exports.registerServerFunction = registerServerFunction;
 exports.registerServerReference = registerServerReference;