@solidjs/web 2.0.0-rc.1 → 2.0.0-rc.2

package/server-functions/dist/server.dev.cjs

@@ -362,6 +362,7 @@ async function decodeResponsePayload(response, codecOptions) {
   };
 }
 
+typeof setImmediate === "function" ? setImmediate : fn => setTimeout(fn, 0);
 const RequestContext = Symbol.for("solid.RequestContext");
 function getRequestEvent() {
   return globalThis[RequestContext] ? globalThis[RequestContext].getStore() || solidJs.sharedConfig.context && solidJs.sharedConfig.context.event || console.warn("RequestEvent is missing. This is most likely due to accessing `getRequestEvent` non-managed async scope in a partially polyfilled environment. Try moving it above all `await` calls.") : undefined;
@@ -493,7 +494,8 @@ const config = {
   transformFlightResult: undefined,
   transformDirectResult: undefined,
   handleNoJS: undefined,
-  endpoint: "/_server"
+  endpoint: "/_server",
+  csrf: true
 };
 function configureServerFunctionsServer({
   provideEvent,
@@ -504,6 +506,7 @@ function configureServerFunctionsServer({
   transformDirectResult,
   handleNoJS,
   endpoint,
+  csrf,
   codec
 } = {}) {
   if (provideEvent !== undefined) config.provideEvent = provideEvent;
@@ -514,6 +517,7 @@ function configureServerFunctionsServer({
   if (transformDirectResult !== undefined) config.transformDirectResult = transformDirectResult;
   if (handleNoJS !== undefined) config.handleNoJS = handleNoJS;
   if (endpoint !== undefined) config.endpoint = endpoint;
+  if (csrf !== undefined) config.csrf = csrf;
   if (codec !== undefined) configureServerFunctionsCodec(codec);
 }
 function provideEvent(event, fn) {
@@ -950,31 +954,96 @@ function sanitizeServerError(value) {
   if (isSafeError(value)) return value;
   return new Error(GENERIC_SERVER_ERROR_MESSAGE);
 }
+function observeServerFunctionCalls() {
+  return () => {};
+}
+async function matchesOrigin(origin, request, matcher) {
+  if (matcher === undefined) return origin === new URL(request.url).origin;
+  if (typeof matcher === "function") return !!(await matcher(origin, request));
+  return Array.isArray(matcher) ? matcher.includes(origin) : origin === matcher;
+}
+async function allowsServerFunctionRequest(request, options) {
+  const fetchSite = request.headers.get("Sec-Fetch-Site");
+  if (fetchSite === "same-origin") return true;
+  if (fetchSite === "same-site" || fetchSite === "cross-site" || fetchSite === "none") {
+    return false;
+  }
+  const origin = request.headers.get("Origin");
+  if (origin !== null) return matchesOrigin(origin, request, options.origin);
+  const referer = request.headers.get("Referer");
+  if (referer !== null) {
+    try {
+      return matchesOrigin(new URL(referer).origin, request, options.origin);
+    } catch {
+      return false;
+    }
+  }
+  return options.allowRequestsWithoutOriginCheck === true;
+}
+const CSRF_VARY = ["Sec-Fetch-Site", "Origin", "Referer"];
+function withCSRFVary(response) {
+  const current = response.headers.get("Vary");
+  if (current === "*") return response;
+  const values = current ? current.split(",").map(value => value.trim()) : [];
+  const names = new Set(values.map(value => value.toLowerCase()));
+  for (const value of CSRF_VARY) {
+    if (!names.has(value.toLowerCase())) values.push(value);
+  }
+  const vary = values.join(", ");
+  try {
+    response.headers.set("Vary", vary);
+    return response;
+  } catch {
+    const headers = new Headers(response.headers);
+    headers.set("Vary", vary);
+    return new Response(response.body, {
+      status: response.status,
+      statusText: response.statusText,
+      headers
+    });
+  }
+}
+function forbiddenResponse() {
+  return withCSRFVary(new Response(DEV ? "Forbidden" : null, {
+    status: 403,
+    headers: {
+      "Cache-Control": "no-store"
+    }
+  }));
+}
 async function handleServerFunctionRequest(request, options = {}) {
   const codec = options.codec !== undefined ? options.codec : getServerFunctionsCodec();
   const url = new URL(request.url);
+  const csrf = options.csrf !== undefined ? options.csrf : config.csrf;
+  const protectsRequest = csrf !== false;
+  if (protectsRequest && !(await allowsServerFunctionRequest(request, csrf === true ? {} : csrf))) {
+    return forbiddenResponse();
+  }
   const instance = request.headers.get(INSTANCE_HEADER);
   const functionId = resolveFunctionId(request, url);
   if (!functionId) {
-    return new Response(DEV ? "Server function not found" : null, {
+    const response = new Response(DEV ? "Server function not found" : null, {
       status: 404
     });
+    return protectsRequest ? withCSRFVary(response) : response;
   }
   let serverFunction;
   try {
     serverFunction = getServerFunction(functionId);
   } catch {
-    return new Response(DEV ? `Unknown server function: ${functionId}` : null, {
+    const response = new Response(DEV ? `Unknown server function: ${functionId}` : null, {
       status: 404
     });
+    return protectsRequest ? withCSRFVary(response) : response;
   }
   if (request.method === "GET" && METHODS.get(functionId) !== "GET") {
-    return new Response(DEV ? `Method not allowed for server function: ${functionId}` : null, {
+    const response = new Response(DEV ? `Method not allowed for server function: ${functionId}` : null, {
       status: 405,
       headers: {
         Allow: "POST"
       }
     });
+    return protectsRequest ? withCSRFVary(response) : response;
   }
   const event = options.createEvent ? options.createEvent(request) : {
     request,
@@ -1133,7 +1202,8 @@ async function handleServerFunctionRequest(request, options = {}) {
       return encodeResult(safe, headers, 200, codec, request.signal);
     }
   };
-  return commitEventResponse(await dispatch(), event);
+  const response = commitEventResponse(await dispatch(), event);
+  return protectsRequest ? withCSRFVary(response) : response;
 }
 
 exports.ERROR_HEADER = ERROR_HEADER;
@@ -1162,6 +1232,7 @@ exports.handleServerFunctionRequest = handleServerFunctionRequest;
 exports.hasFlashCookie = hasFlashCookie;
 exports.isServerFunction = isServerFunction;
 exports.live = live;
+exports.observeServerFunctionCalls = observeServerFunctionCalls;
 exports.registerServerFunction = registerServerFunction;
 exports.registerServerReference = registerServerReference;
 exports.sanitizeServerError = sanitizeServerError;

package/server-functions/dist/server.dev.js

@@ -360,6 +360,7 @@ async function decodeResponsePayload(response, codecOptions) {
   };
 }
 
+typeof setImmediate === "function" ? setImmediate : fn => setTimeout(fn, 0);
 const RequestContext = Symbol.for("solid.RequestContext");
 function getRequestEvent() {
   return globalThis[RequestContext] ? globalThis[RequestContext].getStore() || sharedConfig.context && sharedConfig.context.event || console.warn("RequestEvent is missing. This is most likely due to accessing `getRequestEvent` non-managed async scope in a partially polyfilled environment. Try moving it above all `await` calls.") : undefined;
@@ -491,7 +492,8 @@ const config = {
   transformFlightResult: undefined,
   transformDirectResult: undefined,
   handleNoJS: undefined,
-  endpoint: "/_server"
+  endpoint: "/_server",
+  csrf: true
 };
 function configureServerFunctionsServer({
   provideEvent,
@@ -502,6 +504,7 @@ function configureServerFunctionsServer({
   transformDirectResult,
   handleNoJS,
   endpoint,
+  csrf,
   codec
 } = {}) {
   if (provideEvent !== undefined) config.provideEvent = provideEvent;
@@ -512,6 +515,7 @@ function configureServerFunctionsServer({
   if (transformDirectResult !== undefined) config.transformDirectResult = transformDirectResult;
   if (handleNoJS !== undefined) config.handleNoJS = handleNoJS;
   if (endpoint !== undefined) config.endpoint = endpoint;
+  if (csrf !== undefined) config.csrf = csrf;
   if (codec !== undefined) configureServerFunctionsCodec(codec);
 }
 function provideEvent(event, fn) {
@@ -948,31 +952,96 @@ function sanitizeServerError(value) {
   if (isSafeError(value)) return value;
   return new Error(GENERIC_SERVER_ERROR_MESSAGE);
 }
+function observeServerFunctionCalls() {
+  return () => {};
+}
+async function matchesOrigin(origin, request, matcher) {
+  if (matcher === undefined) return origin === new URL(request.url).origin;
+  if (typeof matcher === "function") return !!(await matcher(origin, request));
+  return Array.isArray(matcher) ? matcher.includes(origin) : origin === matcher;
+}
+async function allowsServerFunctionRequest(request, options) {
+  const fetchSite = request.headers.get("Sec-Fetch-Site");
+  if (fetchSite === "same-origin") return true;
+  if (fetchSite === "same-site" || fetchSite === "cross-site" || fetchSite === "none") {
+    return false;
+  }
+  const origin = request.headers.get("Origin");
+  if (origin !== null) return matchesOrigin(origin, request, options.origin);
+  const referer = request.headers.get("Referer");
+  if (referer !== null) {
+    try {
+      return matchesOrigin(new URL(referer).origin, request, options.origin);
+    } catch {
+      return false;
+    }
+  }
+  return options.allowRequestsWithoutOriginCheck === true;
+}
+const CSRF_VARY = ["Sec-Fetch-Site", "Origin", "Referer"];
+function withCSRFVary(response) {
+  const current = response.headers.get("Vary");
+  if (current === "*") return response;
+  const values = current ? current.split(",").map(value => value.trim()) : [];
+  const names = new Set(values.map(value => value.toLowerCase()));
+  for (const value of CSRF_VARY) {
+    if (!names.has(value.toLowerCase())) values.push(value);
+  }
+  const vary = values.join(", ");
+  try {
+    response.headers.set("Vary", vary);
+    return response;
+  } catch {
+    const headers = new Headers(response.headers);
+    headers.set("Vary", vary);
+    return new Response(response.body, {
+      status: response.status,
+      statusText: response.statusText,
+      headers
+    });
+  }
+}
+function forbiddenResponse() {
+  return withCSRFVary(new Response(DEV ? "Forbidden" : null, {
+    status: 403,
+    headers: {
+      "Cache-Control": "no-store"
+    }
+  }));
+}
 async function handleServerFunctionRequest(request, options = {}) {
   const codec = options.codec !== undefined ? options.codec : getServerFunctionsCodec();
   const url = new URL(request.url);
+  const csrf = options.csrf !== undefined ? options.csrf : config.csrf;
+  const protectsRequest = csrf !== false;
+  if (protectsRequest && !(await allowsServerFunctionRequest(request, csrf === true ? {} : csrf))) {
+    return forbiddenResponse();
+  }
   const instance = request.headers.get(INSTANCE_HEADER);
   const functionId = resolveFunctionId(request, url);
   if (!functionId) {
-    return new Response(DEV ? "Server function not found" : null, {
+    const response = new Response(DEV ? "Server function not found" : null, {
       status: 404
     });
+    return protectsRequest ? withCSRFVary(response) : response;
   }
   let serverFunction;
   try {
     serverFunction = getServerFunction(functionId);
   } catch {
-    return new Response(DEV ? `Unknown server function: ${functionId}` : null, {
+    const response = new Response(DEV ? `Unknown server function: ${functionId}` : null, {
       status: 404
     });
+    return protectsRequest ? withCSRFVary(response) : response;
   }
   if (request.method === "GET" && METHODS.get(functionId) !== "GET") {
-    return new Response(DEV ? `Method not allowed for server function: ${functionId}` : null, {
+    const response = new Response(DEV ? `Method not allowed for server function: ${functionId}` : null, {
       status: 405,
       headers: {
         Allow: "POST"
       }
     });
+    return protectsRequest ? withCSRFVary(response) : response;
   }
   const event = options.createEvent ? options.createEvent(request) : {
     request,
@@ -1131,7 +1200,8 @@ async function handleServerFunctionRequest(request, options = {}) {
       return encodeResult(safe, headers, 200, codec, request.signal);
     }
   };
-  return commitEventResponse(await dispatch(), event);
+  const response = commitEventResponse(await dispatch(), event);
+  return protectsRequest ? withCSRFVary(response) : response;
 }
 
-export { ERROR_HEADER, FLASH_COOKIE, FUNCTION_HEADER, GENERIC_SERVER_ERROR_MESSAGE, GET, INSTANCE_HEADER, SINGLE_FLIGHT_HEADER, clearFlashCookie, configureServerFunctionsServer, createNoJSHandler, createServerReference, decodeErrorHeaderValue, decodeFlashCookie, decodeResponse, decodeResponsePayload, encodeErrorHeaderValue, encodeFlashCookie, foldSetCookies, getEventServerFunctionInvocation, getServerFunction, getServerFunctionInvocation, getServerFunctionMetadata, handleServerFunctionRequest, hasFlashCookie, isServerFunction, live, registerServerFunction, registerServerReference, sanitizeServerError, serializeResponseStream, setServerFunctionsDev, subscribeFlightData, withMeta };
+export { ERROR_HEADER, FLASH_COOKIE, FUNCTION_HEADER, GENERIC_SERVER_ERROR_MESSAGE, GET, INSTANCE_HEADER, SINGLE_FLIGHT_HEADER, clearFlashCookie, configureServerFunctionsServer, createNoJSHandler, createServerReference, decodeErrorHeaderValue, decodeFlashCookie, decodeResponse, decodeResponsePayload, encodeErrorHeaderValue, encodeFlashCookie, foldSetCookies, getEventServerFunctionInvocation, getServerFunction, getServerFunctionInvocation, getServerFunctionMetadata, handleServerFunctionRequest, hasFlashCookie, isServerFunction, live, observeServerFunctionCalls, registerServerFunction, registerServerReference, sanitizeServerError, serializeResponseStream, setServerFunctionsDev, subscribeFlightData, withMeta };

package/server-functions/dist/server.js

@@ -360,6 +360,7 @@ async function decodeResponsePayload(response, codecOptions) {
   };
 }
 
+typeof setImmediate === "function" ? setImmediate : fn => setTimeout(fn, 0);
 const RequestContext = Symbol.for("solid.RequestContext");
 function getRequestEvent() {
   return globalThis[RequestContext] ? globalThis[RequestContext].getStore() || sharedConfig.context && sharedConfig.context.event || console.warn("RequestEvent is missing. This is most likely due to accessing `getRequestEvent` non-managed async scope in a partially polyfilled environment. Try moving it above all `await` calls.") : undefined;
@@ -491,7 +492,8 @@ const config = {
   transformFlightResult: undefined,
   transformDirectResult: undefined,
   handleNoJS: undefined,
-  endpoint: "/_server"
+  endpoint: "/_server",
+  csrf: true
 };
 function configureServerFunctionsServer({
   provideEvent,
@@ -502,6 +504,7 @@ function configureServerFunctionsServer({
   transformDirectResult,
   handleNoJS,
   endpoint,
+  csrf,
   codec
 } = {}) {
   if (provideEvent !== undefined) config.provideEvent = provideEvent;
@@ -512,6 +515,7 @@ function configureServerFunctionsServer({
   if (transformDirectResult !== undefined) config.transformDirectResult = transformDirectResult;
   if (handleNoJS !== undefined) config.handleNoJS = handleNoJS;
   if (endpoint !== undefined) config.endpoint = endpoint;
+  if (csrf !== undefined) config.csrf = csrf;
   if (codec !== undefined) configureServerFunctionsCodec(codec);
 }
 function provideEvent(event, fn) {
@@ -948,31 +952,96 @@ function sanitizeServerError(value) {
   if (isSafeError(value)) return value;
   return new Error(GENERIC_SERVER_ERROR_MESSAGE);
 }
+function observeServerFunctionCalls() {
+  return () => {};
+}
+async function matchesOrigin(origin, request, matcher) {
+  if (matcher === undefined) return origin === new URL(request.url).origin;
+  if (typeof matcher === "function") return !!(await matcher(origin, request));
+  return Array.isArray(matcher) ? matcher.includes(origin) : origin === matcher;
+}
+async function allowsServerFunctionRequest(request, options) {
+  const fetchSite = request.headers.get("Sec-Fetch-Site");
+  if (fetchSite === "same-origin") return true;
+  if (fetchSite === "same-site" || fetchSite === "cross-site" || fetchSite === "none") {
+    return false;
+  }
+  const origin = request.headers.get("Origin");
+  if (origin !== null) return matchesOrigin(origin, request, options.origin);
+  const referer = request.headers.get("Referer");
+  if (referer !== null) {
+    try {
+      return matchesOrigin(new URL(referer).origin, request, options.origin);
+    } catch {
+      return false;
+    }
+  }
+  return options.allowRequestsWithoutOriginCheck === true;
+}
+const CSRF_VARY = ["Sec-Fetch-Site", "Origin", "Referer"];
+function withCSRFVary(response) {
+  const current = response.headers.get("Vary");
+  if (current === "*") return response;
+  const values = current ? current.split(",").map(value => value.trim()) : [];
+  const names = new Set(values.map(value => value.toLowerCase()));
+  for (const value of CSRF_VARY) {
+    if (!names.has(value.toLowerCase())) values.push(value);
+  }
+  const vary = values.join(", ");
+  try {
+    response.headers.set("Vary", vary);
+    return response;
+  } catch {
+    const headers = new Headers(response.headers);
+    headers.set("Vary", vary);
+    return new Response(response.body, {
+      status: response.status,
+      statusText: response.statusText,
+      headers
+    });
+  }
+}
+function forbiddenResponse() {
+  return withCSRFVary(new Response(DEV ? "Forbidden" : null, {
+    status: 403,
+    headers: {
+      "Cache-Control": "no-store"
+    }
+  }));
+}
 async function handleServerFunctionRequest(request, options = {}) {
   const codec = options.codec !== undefined ? options.codec : getServerFunctionsCodec();
   const url = new URL(request.url);
+  const csrf = options.csrf !== undefined ? options.csrf : config.csrf;
+  const protectsRequest = csrf !== false;
+  if (protectsRequest && !(await allowsServerFunctionRequest(request, csrf === true ? {} : csrf))) {
+    return forbiddenResponse();
+  }
   const instance = request.headers.get(INSTANCE_HEADER);
   const functionId = resolveFunctionId(request, url);
   if (!functionId) {
-    return new Response(DEV ? "Server function not found" : null, {
+    const response = new Response(DEV ? "Server function not found" : null, {
       status: 404
     });
+    return protectsRequest ? withCSRFVary(response) : response;
   }
   let serverFunction;
   try {
     serverFunction = getServerFunction(functionId);
   } catch {
-    return new Response(DEV ? `Unknown server function: ${functionId}` : null, {
+    const response = new Response(DEV ? `Unknown server function: ${functionId}` : null, {
       status: 404
     });
+    return protectsRequest ? withCSRFVary(response) : response;
   }
   if (request.method === "GET" && METHODS.get(functionId) !== "GET") {
-    return new Response(DEV ? `Method not allowed for server function: ${functionId}` : null, {
+    const response = new Response(DEV ? `Method not allowed for server function: ${functionId}` : null, {
       status: 405,
       headers: {
         Allow: "POST"
       }
     });
+    return protectsRequest ? withCSRFVary(response) : response;
   }
   const event = options.createEvent ? options.createEvent(request) : {
     request,
@@ -1131,7 +1200,8 @@ async function handleServerFunctionRequest(request, options = {}) {
       return encodeResult(safe, headers, 200, codec, request.signal);
     }
   };
-  return commitEventResponse(await dispatch(), event);
+  const response = commitEventResponse(await dispatch(), event);
+  return protectsRequest ? withCSRFVary(response) : response;
 }
 
-export { ERROR_HEADER, FLASH_COOKIE, FUNCTION_HEADER, GENERIC_SERVER_ERROR_MESSAGE, GET, INSTANCE_HEADER, SINGLE_FLIGHT_HEADER, clearFlashCookie, configureServerFunctionsServer, createNoJSHandler, createServerReference, decodeErrorHeaderValue, decodeFlashCookie, decodeResponse, decodeResponsePayload, encodeErrorHeaderValue, encodeFlashCookie, foldSetCookies, getEventServerFunctionInvocation, getServerFunction, getServerFunctionInvocation, getServerFunctionMetadata, handleServerFunctionRequest, hasFlashCookie, isServerFunction, live, registerServerFunction, registerServerReference, sanitizeServerError, serializeResponseStream, setServerFunctionsDev, subscribeFlightData, withMeta };
+export { ERROR_HEADER, FLASH_COOKIE, FUNCTION_HEADER, GENERIC_SERVER_ERROR_MESSAGE, GET, INSTANCE_HEADER, SINGLE_FLIGHT_HEADER, clearFlashCookie, configureServerFunctionsServer, createNoJSHandler, createServerReference, decodeErrorHeaderValue, decodeFlashCookie, decodeResponse, decodeResponsePayload, encodeErrorHeaderValue, encodeFlashCookie, foldSetCookies, getEventServerFunctionInvocation, getServerFunction, getServerFunctionInvocation, getServerFunctionMetadata, handleServerFunctionRequest, hasFlashCookie, isServerFunction, live, observeServerFunctionCalls, registerServerFunction, registerServerReference, sanitizeServerError, serializeResponseStream, setServerFunctionsDev, subscribeFlightData, withMeta };

package/types/core.d.ts

@@ -4,3 +4,6 @@ export declare const memo: (fn: any) => import("solid-js").SourceAccessor<any>;
 export declare const runWithHydrationScope: (id: any, fn: any) => unknown;
 export declare const ssrAsyncValue: (value: any) => import("solid-js").SourceAccessor<any>;
 export declare const waitAsset: (promise: any) => void;
+export declare const driveList: undefined;
+export declare const patchableRaw: undefined;
+export declare const registerPatch: undefined;

package/types/frames/frame-client.d.ts

@@ -245,6 +245,15 @@ export interface FrameHostOptions {
    * identity only.
    */
   isContainer?(value: unknown): boolean;
+  /**
+   * Arms event types for behavior claims: the `_bnd` sweep collects the
+   * event names it finds and hands them here so delegated dispatch can
+   * reach them. Platform glue passes its `delegateEvents` — the option
+   * exists (rather than client.js importing the event system) so
+   * tree-shaken subsets without events pay nothing. Frames registered
+   * with this host inherit it unless they pass their own `delegate`.
+   */
+  delegate?(eventNames: Iterable<string>): void;
 }
 
 /** @experimental */
@@ -260,6 +269,13 @@ export interface FrameOptions {
   id?: string;
   /** Client content keyed by prop name (occurrences resolve by prop). */
   slots?: Record<string, Slot>;
+  /**
+   * Raw client props for behavior-claim resolution: server elements carrying
+   * `_bnd="pos=prop"` markers (compiled under the `serverComponents` option)
+   * resolve ref/event positions by name through this object — read live at
+   * dispatch/materialize time, so compiled prop getters stay latest-value.
+   */
+  props?: Record<string, unknown>;
   /**
    * Adopt existing server-rendered DOM: the first apply morphs against it,
    * and slots sync immediately (hydration attach) — a document-SSR boot
@@ -277,6 +293,8 @@ export interface FrameOptions {
    * streamed chunks).
    */
   ownerScope?<T>(fn: () => T): T;
+  /** Per-frame override of the host's `delegate` (see FrameHostOptions). */
+  delegate?(eventNames: Iterable<string>): void;
   /**
    * Boundary-driven segment reveal. When present, `#revealSegment` hands the
    * placeholder seam to this hook instead of swapping imperatively: the binding

package/types/server-functions/client.d.ts

@@ -127,6 +127,36 @@ export interface ServerFunctionsClientConfig {
  */
 export function configureServerFunctionsClient(config?: ServerFunctionsClientConfig): void;
 
+export interface ServerFunctionRequestCall {
+  type: "request";
+  id: string;
+  instance: string;
+  request: Request;
+  meta: ServerFunctionMetadata | undefined;
+  time: number;
+}
+
+export interface ServerFunctionResponseCall {
+  type: "response";
+  id: string;
+  instance: string;
+  response: Response;
+  meta: ServerFunctionMetadata | undefined;
+  time: number;
+}
+
+export type ServerFunctionCall = ServerFunctionRequestCall | ServerFunctionResponseCall;
+
+/**
+ * Observes cloned requests and responses without handling them. Subscribe
+ * from devtools; do not use this to replace `prepareRequest` /
+ * `responseHandler`. The server entry exports a no-op of the same name so
+ * isomorphic `@solidjs/web/server-functions` imports resolve.
+ */
+export function observeServerFunctionCalls(
+  observer: (call: ServerFunctionCall) => void
+): () => void;
+
 /**
  * Declares a server function callable over HTTP GET: calls to the returned
  * reference go out as GET requests with the arguments codec-encoded in the
@@ -163,8 +193,9 @@ export type LiveSourceStatus = "connected" | "reconnecting" | "closed";
  * A live call's answer: the source's iterable, plus an optional `onstatus`
  * side channel for the wire facts the reconnect loop erases from the value
  * stream — `"connected"` on each successful (re)connect, `"reconnecting"`
- * (with the error) on each post-connect death, `"closed"` when the source
- * completes or the consumer ends it.
+ * (with the error) on each transient post-connect death, `"closed"` when
+ * the source completes or the consumer ends it — with the error when the
+ * end was a definite rejection (4xx) failing fast instead of retrying.
  */
 export type LiveSource<R> = R & {
   onstatus?: (state: LiveSourceStatus, error?: unknown) => void;

package/types/server-functions/server.d.ts

@@ -28,7 +28,7 @@ export type {
 } from "./shared.js";
 export { decodeFlashCookie, encodeFlashCookie } from "./flash.js";
 export type { FlashSubmission } from "./flash.js";
-import { ServerFunction } from "./shared.js";
+import { ServerFunction, ServerFunctionMetadata } from "./shared.js";
 
 /**
  * The request event a server function call runs under: the base
@@ -197,6 +197,26 @@ export function createNoJSHandler(
   options?: NoJSHandlerOptions
 ): (result: unknown, request: Request, args: unknown[], thrown?: boolean) => Response;
 
+export type ServerFunctionOriginMatcher =
+  | string
+  | readonly string[]
+  | ((origin: string, request: Request) => boolean | Promise<boolean>);
+
+/** Same-origin validation options for server function requests. */
+export interface ServerFunctionCSRFOptions {
+  /**
+   * Expected public origin. Defaults to the incoming request URL's origin.
+   * A function can validate origins dynamically for multi-tenant hosts.
+   */
+  origin?: ServerFunctionOriginMatcher;
+  /**
+   * Allows requests without `Sec-Fetch-Site`, `Origin`, or `Referer`.
+   * Cross-origin metadata is still rejected.
+   * @default false
+   */
+  allowRequestsWithoutOriginCheck?: boolean;
+}
+
 /** Options for `configureServerFunctionsServer`. */
 export interface ServerFunctionsServerConfig {
   /**
@@ -287,6 +307,12 @@ export interface ServerFunctionsServerConfig {
    * @default "/_server"
    */
   endpoint?: string;
+  /**
+   * Same-origin protection for HTTP server function calls. Enabled by
+   * default. Set to `false` only when another trusted layer protects the
+   * endpoint.
+   */
+  csrf?: boolean | ServerFunctionCSRFOptions;
   /**
    * Codec options (extra plugins etc.) for decoding arguments and encoding
    * results — must match the client's. Stored in the shared layer, so
@@ -392,7 +418,9 @@ export function GET<A extends readonly any[], R>(
   fn: (...args: A) => R
 ): ServerFunction<A, Awaited<R>>;
 
-/** Wire-state transitions a live call's iterable can report (client side). */
+/** Wire-state transitions a live call's iterable can report (client side).
+ * `"closed"` carries the error when a definite rejection (4xx) ended the
+ * call instead of the retry loop. */
 export type LiveSourceStatus = "connected" | "reconnecting" | "closed";
 
 /**
@@ -529,6 +557,11 @@ export interface HandleServerFunctionOptions {
     args: unknown[],
     thrown?: boolean
   ): Response | Promise<Response>;
+  /**
+   * Overrides same-origin protection for this handler. Set to `false` only
+   * when another trusted layer protects the endpoint.
+   */
+  csrf?: boolean | ServerFunctionCSRFOptions;
   /** Overrides the configured codec options for this handler. */
   codec?: JSONCodecOptions;
 }
@@ -543,6 +576,10 @@ export interface HandleServerFunctionOptions {
  * (default `/_server`); platform adapters (h3, express, ...) convert their
  * request shape to a web `Request` around it.
  *
+ * Requests are same-origin by default. The handler accepts browser requests
+ * proven by `Sec-Fetch-Site`, `Origin`, or `Referer`, and rejects requests
+ * without usable metadata unless explicitly configured otherwise.
+ *
  * When the event carries a `response` head stub (`event.response`, see the
  * server entry's `ResponseStub`), the handler folds it onto every outgoing
  * response as the head freezes — its `Set-Cookie` values (cookies appended
@@ -606,6 +643,34 @@ export const GENERIC_SERVER_ERROR_MESSAGE: string;
  */
 export function sanitizeServerError(value: unknown): unknown;
 
+export interface ServerFunctionRequestCall {
+  type: "request";
+  id: string;
+  instance: string;
+  request: Request;
+  meta: ServerFunctionMetadata | undefined;
+  time: number;
+}
+
+export interface ServerFunctionResponseCall {
+  type: "response";
+  id: string;
+  instance: string;
+  response: Response;
+  meta: ServerFunctionMetadata | undefined;
+  time: number;
+}
+
+export type ServerFunctionCall = ServerFunctionRequestCall | ServerFunctionResponseCall;
+
+/**
+ * Client-only inspection seam. A no-op on this entry so isomorphic
+ * `@solidjs/web/server-functions` imports resolve.
+ */
+export function observeServerFunctionCalls(
+  observer: (call: ServerFunctionCall) => void
+): () => void;
+
 /**
  * Overrides the build-variant dev flag for this module instance — the seam
  * for test harnesses and hand-rolled bundles whose packaging cannot replace