sibujs 4.13.0 → 4.14.0

package/dist/ssr.d.cts

@@ -1,7 +1,63 @@
-export { A as ActionFn, a as ActionResult, H as Head, I as ISROptions, L as LoadRemoteModuleOptions, b as LoadWasmOptions, M as MicroApp, c as MicroAppConfig, d as MiddlewareFn, S as SSGOptions, e as SSGResult, f as ScrollRestorationOptions, g as ServiceWorkerState, h as SharedScope, U as UseWorkerFnReturn, i as UseWorkerReturn, W as WasmConfig, j as WasmModuleState, k as WorkerPool, l as clearWasmCache, m as composeMiddleware, n as createAction, o as createISR, p as createMicroApp, q as createMiddlewareChain, r as createSharedScope, s as createWasmBridge, t as createWorkerPool, u as defineRemoteComponent, v as generateStaticSite, w as isWasmCached, x as loadRemoteModule, y as loadWasmModule, z as loadWasmModuleWithOptions, B as preloadWasm, C as scrollRestoration, D as serviceWorker, E as setCanonical, F as setStructuredData, G as wasm, J as worker, K as workerFn } from './routeMiddleware-CedQTsLK.cjs';
-export { H as HydrateOptions, a as HydrationMismatch, T as TrustedHTML, c as collectStream, d as deserializeState, e as escapeScriptJson, h as hydrate, b as hydrateIslands, f as hydrateProgressively, i as isDangerousMetaRefresh, g as island, r as renderToDocument, j as renderToReadableStream, k as renderToStream, l as renderToString, m as renderToSuspenseStream, n as resetSSRState, s as serializeState, o as ssrSuspense, p as suspenseSwapScript, t as trustHTML } from './ssr-Db0Sgdu3.cjs';
+export { A as ActionFn, a as ActionResult, H as Head, I as ISROptions, L as LoadRemoteModuleOptions, b as LoadWasmOptions, M as MicroApp, c as MicroAppConfig, d as MiddlewareFn, S as SSGOptions, e as SSGResult, f as ScrollRestorationOptions, g as ServiceWorkerState, h as SharedScope, U as UseWorkerFnReturn, i as UseWorkerReturn, W as WasmConfig, j as WasmModuleState, k as WorkerPool, l as clearWasmCache, m as composeMiddleware, n as createAction, o as createISR, p as createMicroApp, q as createMiddlewareChain, r as createSharedScope, s as createWasmBridge, t as createWorkerPool, u as defineRemoteComponent, v as generateStaticSite, w as isWasmCached, x as loadRemoteModule, y as loadWasmModule, z as loadWasmModuleWithOptions, B as preloadWasm, C as scrollRestoration, D as serviceWorker, E as setCanonical, F as setStructuredData, G as wasm, J as worker, K as workerFn } from './routeMiddleware-CijZD5eW.cjs';
+export { v as ADOPT_ID_ATTR, w as AdoptMismatch, x as AdoptOptions, y as AdoptResult, A as AsyncRenderOptions, C as ComponentIslandOptions, z as DEFAULT_SETTLE_TIMEOUT, B as DEFAULT_TRANSFER_MAX_BYTES, D as DocumentOptions, H as HydrateOptions, a as HydrationMismatch, I as ISLAND_PROPS_ATTR, E as RenderDiagnostics, R as RenderResult, S as SerializeOptions, F as SettleOptions, G as SettleResult, J as StreamRenderOptions, T as TrustedHTML, b as assembleDocument, c as collectStream, K as componentIsland, L as describeNodePath, d as deserializeState, e as escapeScriptJson, M as formatRenderDiagnostics, h as hydrate, f as hydrateIslands, g as hydrateProgressively, i as isDangerousMetaRefresh, j as island, N as islandComponent, O as renderFailure, r as renderToDocument, P as renderToDocumentAsync, k as renderToReadableStream, l as renderToStream, m as renderToString, Q as renderToStringAsync, n as renderToStringWith, o as renderToSuspenseStream, p as resetSSRState, s as serializeState, U as settled, q as ssrSuspense, t as suspenseSwapScript, u as trustHTML } from './ssr-JpGpHnpC.cjs';
+import { a as RouteDef } from './routeHead-CE9SV-cH.cjs';
+import { R as RenderRouteOptions, a as RouteRenderResult } from './renderRoute-DP20XwMS.cjs';
+export { b as RenderedRoute, c as RouteRenderMode, r as renderRoute } from './renderRoute-DP20XwMS.cjs';
 import './types-CJFViL6Q.cjs';
 
+/** Options of {@link createRenderHandler}. */
+interface RenderHandlerOptions extends RenderRouteOptions {
+    /**
+     * Keep rendered pages in memory. `max` entries (default 500), each for `ttl`
+     * ms (default 60 000); `version()` is part of the key, so changing what it
+     * returns makes every cached page stale at once. The cache also holds at
+     * most `maxBytes` of HTML (default 32 MB): any query string is a distinct
+     * key, so a client inventing them evicts the oldest pages but cannot grow the
+     * process without bound.
+     *
+     * A page is stored only when it is a 200 or 404 that did not time out AND
+     * its `Cache-Control` (from `cacheControl`) allows a shared cache: no
+     * `no-store`, `no-cache` or `private` directive. This cache is shared by
+     * every visitor, so a personalized page must say `private` (or `no-store`)
+     * — that is the opt-out, and the default 404 (`no-store`) is not stored
+     * either. `x-sibu-cache` says what happened: `hit`, `miss` (rendered and
+     * stored) or `bypass` (rendered, not stored).
+     */
+    cache?: {
+        max?: number;
+        ttl?: number;
+        maxBytes?: number;
+        version?: () => string | number;
+    };
+    /**
+     * The `Cache-Control` value for a result. Default: 200 →
+     * `public, max-age=0, s-maxage=60, stale-while-revalidate=600`; 301/308 →
+     * `public, max-age=3600`; a timed-out render and anything else → `no-store`.
+     * Return `null` to send none.
+     */
+    cacheControl?: (result: RouteRenderResult) => string | null;
+}
+/**
+ * Serve server-rendered pages from a route table.
+ *
+ * @param routes The app's route table.
+ * @param options `renderRoute` options (a `document` is used by default, so the
+ * response is a full page), plus `cache` and `cacheControl`.
+ * @returns A `Request → Response` handler. GET and HEAD only (others: 405). A
+ * render that throws answers a bare 500 (`no-store`, no error details) and is
+ * logged with `console.error`; the handler itself never rejects.
+ *
+ * @example
+ * ```ts
+ * const handle = createRenderHandler(routes, {
+ *   router: { head },
+ *   document: { scripts: ["/assets/main.js"] },
+ *   cache: { version: () => catalogVersion },
+ * });
+ * ```
+ */
+declare function createRenderHandler(routes: RouteDef[], options?: RenderHandlerOptions): (request: Request) => Promise<Response>;
+
 /**
  * Whether this code is running inside the build-time pre-renderer.
  *
@@ -19,13 +75,15 @@ declare function isPrerendering(): boolean;
  */
 declare function prerenderRoute(): string | null;
 /**
- * Make the pre-renderer wait for `promise` before it serializes the page.
+ * Make the pre-renderer — and an async server render (`renderToStringAsync`,
+ * `renderRoute`) — wait for `promise` before it serializes the page.
  * A no-op in the browser, so it can wrap any data load unconditionally.
  *
  * `fetch()` calls are awaited automatically; register anything else the
  * rendered content depends on (a timer, IndexedDB, a worker).
  *
  * @param promise Work the rendered page depends on.
+ * @param label Names the work in a server render's timeout diagnostics.
  * @returns `promise`, unchanged.
  *
  * @example
@@ -33,6 +91,6 @@ declare function prerenderRoute(): string | null;
  * const products = prerenderWait(loadProductsFromCache());
  * ```
  */
-declare function prerenderWait<T extends PromiseLike<unknown>>(promise: T): T;
+declare function prerenderWait<T extends PromiseLike<unknown>>(promise: T, label?: string): T;
 
-export { isPrerendering, prerenderRoute, prerenderWait };
+export { type RenderHandlerOptions, RenderRouteOptions, RouteRenderResult, createRenderHandler, isPrerendering, prerenderRoute, prerenderWait };

package/dist/ssr.d.ts

@@ -1,7 +1,63 @@
-export { A as ActionFn, a as ActionResult, H as Head, I as ISROptions, L as LoadRemoteModuleOptions, b as LoadWasmOptions, M as MicroApp, c as MicroAppConfig, d as MiddlewareFn, S as SSGOptions, e as SSGResult, f as ScrollRestorationOptions, g as ServiceWorkerState, h as SharedScope, U as UseWorkerFnReturn, i as UseWorkerReturn, W as WasmConfig, j as WasmModuleState, k as WorkerPool, l as clearWasmCache, m as composeMiddleware, n as createAction, o as createISR, p as createMicroApp, q as createMiddlewareChain, r as createSharedScope, s as createWasmBridge, t as createWorkerPool, u as defineRemoteComponent, v as generateStaticSite, w as isWasmCached, x as loadRemoteModule, y as loadWasmModule, z as loadWasmModuleWithOptions, B as preloadWasm, C as scrollRestoration, D as serviceWorker, E as setCanonical, F as setStructuredData, G as wasm, J as worker, K as workerFn } from './routeMiddleware-B1sp4P7a.js';
-export { H as HydrateOptions, a as HydrationMismatch, T as TrustedHTML, c as collectStream, d as deserializeState, e as escapeScriptJson, h as hydrate, b as hydrateIslands, f as hydrateProgressively, i as isDangerousMetaRefresh, g as island, r as renderToDocument, j as renderToReadableStream, k as renderToStream, l as renderToString, m as renderToSuspenseStream, n as resetSSRState, s as serializeState, o as ssrSuspense, p as suspenseSwapScript, t as trustHTML } from './ssr-Db0Sgdu3.js';
+export { A as ActionFn, a as ActionResult, H as Head, I as ISROptions, L as LoadRemoteModuleOptions, b as LoadWasmOptions, M as MicroApp, c as MicroAppConfig, d as MiddlewareFn, S as SSGOptions, e as SSGResult, f as ScrollRestorationOptions, g as ServiceWorkerState, h as SharedScope, U as UseWorkerFnReturn, i as UseWorkerReturn, W as WasmConfig, j as WasmModuleState, k as WorkerPool, l as clearWasmCache, m as composeMiddleware, n as createAction, o as createISR, p as createMicroApp, q as createMiddlewareChain, r as createSharedScope, s as createWasmBridge, t as createWorkerPool, u as defineRemoteComponent, v as generateStaticSite, w as isWasmCached, x as loadRemoteModule, y as loadWasmModule, z as loadWasmModuleWithOptions, B as preloadWasm, C as scrollRestoration, D as serviceWorker, E as setCanonical, F as setStructuredData, G as wasm, J as worker, K as workerFn } from './routeMiddleware-BySbueoE.js';
+export { v as ADOPT_ID_ATTR, w as AdoptMismatch, x as AdoptOptions, y as AdoptResult, A as AsyncRenderOptions, C as ComponentIslandOptions, z as DEFAULT_SETTLE_TIMEOUT, B as DEFAULT_TRANSFER_MAX_BYTES, D as DocumentOptions, H as HydrateOptions, a as HydrationMismatch, I as ISLAND_PROPS_ATTR, E as RenderDiagnostics, R as RenderResult, S as SerializeOptions, F as SettleOptions, G as SettleResult, J as StreamRenderOptions, T as TrustedHTML, b as assembleDocument, c as collectStream, K as componentIsland, L as describeNodePath, d as deserializeState, e as escapeScriptJson, M as formatRenderDiagnostics, h as hydrate, f as hydrateIslands, g as hydrateProgressively, i as isDangerousMetaRefresh, j as island, N as islandComponent, O as renderFailure, r as renderToDocument, P as renderToDocumentAsync, k as renderToReadableStream, l as renderToStream, m as renderToString, Q as renderToStringAsync, n as renderToStringWith, o as renderToSuspenseStream, p as resetSSRState, s as serializeState, U as settled, q as ssrSuspense, t as suspenseSwapScript, u as trustHTML } from './ssr-JpGpHnpC.js';
+import { a as RouteDef } from './routeHead-DzVxPviY.js';
+import { R as RenderRouteOptions, a as RouteRenderResult } from './renderRoute-fxgsm2Ir.js';
+export { b as RenderedRoute, c as RouteRenderMode, r as renderRoute } from './renderRoute-fxgsm2Ir.js';
 import './types-CJFViL6Q.js';
 
+/** Options of {@link createRenderHandler}. */
+interface RenderHandlerOptions extends RenderRouteOptions {
+    /**
+     * Keep rendered pages in memory. `max` entries (default 500), each for `ttl`
+     * ms (default 60 000); `version()` is part of the key, so changing what it
+     * returns makes every cached page stale at once. The cache also holds at
+     * most `maxBytes` of HTML (default 32 MB): any query string is a distinct
+     * key, so a client inventing them evicts the oldest pages but cannot grow the
+     * process without bound.
+     *
+     * A page is stored only when it is a 200 or 404 that did not time out AND
+     * its `Cache-Control` (from `cacheControl`) allows a shared cache: no
+     * `no-store`, `no-cache` or `private` directive. This cache is shared by
+     * every visitor, so a personalized page must say `private` (or `no-store`)
+     * — that is the opt-out, and the default 404 (`no-store`) is not stored
+     * either. `x-sibu-cache` says what happened: `hit`, `miss` (rendered and
+     * stored) or `bypass` (rendered, not stored).
+     */
+    cache?: {
+        max?: number;
+        ttl?: number;
+        maxBytes?: number;
+        version?: () => string | number;
+    };
+    /**
+     * The `Cache-Control` value for a result. Default: 200 →
+     * `public, max-age=0, s-maxage=60, stale-while-revalidate=600`; 301/308 →
+     * `public, max-age=3600`; a timed-out render and anything else → `no-store`.
+     * Return `null` to send none.
+     */
+    cacheControl?: (result: RouteRenderResult) => string | null;
+}
+/**
+ * Serve server-rendered pages from a route table.
+ *
+ * @param routes The app's route table.
+ * @param options `renderRoute` options (a `document` is used by default, so the
+ * response is a full page), plus `cache` and `cacheControl`.
+ * @returns A `Request → Response` handler. GET and HEAD only (others: 405). A
+ * render that throws answers a bare 500 (`no-store`, no error details) and is
+ * logged with `console.error`; the handler itself never rejects.
+ *
+ * @example
+ * ```ts
+ * const handle = createRenderHandler(routes, {
+ *   router: { head },
+ *   document: { scripts: ["/assets/main.js"] },
+ *   cache: { version: () => catalogVersion },
+ * });
+ * ```
+ */
+declare function createRenderHandler(routes: RouteDef[], options?: RenderHandlerOptions): (request: Request) => Promise<Response>;
+
 /**
  * Whether this code is running inside the build-time pre-renderer.
  *
@@ -19,13 +75,15 @@ declare function isPrerendering(): boolean;
  */
 declare function prerenderRoute(): string | null;
 /**
- * Make the pre-renderer wait for `promise` before it serializes the page.
+ * Make the pre-renderer — and an async server render (`renderToStringAsync`,
+ * `renderRoute`) — wait for `promise` before it serializes the page.
  * A no-op in the browser, so it can wrap any data load unconditionally.
  *
  * `fetch()` calls are awaited automatically; register anything else the
  * rendered content depends on (a timer, IndexedDB, a worker).
  *
  * @param promise Work the rendered page depends on.
+ * @param label Names the work in a server render's timeout diagnostics.
  * @returns `promise`, unchanged.
  *
  * @example
@@ -33,6 +91,6 @@ declare function prerenderRoute(): string | null;
  * const products = prerenderWait(loadProductsFromCache());
  * ```
  */
-declare function prerenderWait<T extends PromiseLike<unknown>>(promise: T): T;
+declare function prerenderWait<T extends PromiseLike<unknown>>(promise: T, label?: string): T;
 
-export { isPrerendering, prerenderRoute, prerenderWait };
+export { type RenderHandlerOptions, RenderRouteOptions, RouteRenderResult, createRenderHandler, isPrerendering, prerenderRoute, prerenderWait };

package/dist/ssr.js

@@ -1,8 +1,11 @@
+import {
+  renderRoute
+} from "./chunk-GVAMIU6K.js";
 import {
   isPrerendering,
   prerenderRoute,
   prerenderWait
-} from "./chunk-B36ADEIR.js";
+} from "./chunk-VM2U5LEL.js";
 import {
   Head,
   clearWasmCache,
@@ -28,56 +31,168 @@ import {
   wasm,
   worker,
   workerFn
-} from "./chunk-MNEITZ27.js";
+} from "./chunk-BNXRWZZV.js";
 import "./chunk-52XFPGSN.js";
-import "./chunk-L3QHS4O4.js";
+import "./chunk-7ILEHTVX.js";
 import {
+  ADOPT_ID_ATTR,
+  DEFAULT_SETTLE_TIMEOUT,
+  DEFAULT_TRANSFER_MAX_BYTES,
+  ISLAND_PROPS_ATTR,
+  assembleDocument,
   collectStream,
+  componentIsland,
+  describeNodePath,
   deserializeState,
   escapeScriptJson,
+  formatRenderDiagnostics,
   hydrate,
   hydrateIslands,
   hydrateProgressively,
   isDangerousMetaRefresh,
   island,
+  islandComponent,
+  renderFailure,
   renderToDocument,
+  renderToDocumentAsync,
   renderToReadableStream,
   renderToStream,
   renderToString,
+  renderToStringAsync,
+  renderToStringWith,
   renderToSuspenseStream,
   resetSSRState,
   serializeState,
+  settled,
   ssrSuspense,
   suspenseSwapScript,
   trustHTML
-} from "./chunk-2F4PSJ5Z.js";
-import "./chunk-AM6DZLBM.js";
+} from "./chunk-BOYKGGVD.js";
+import "./chunk-CNPT6NKV.js";
+import "./chunk-LJMX4SQ7.js";
+import "./chunk-3HZOSMPX.js";
 import "./chunk-62BDYGAG.js";
-import "./chunk-346BYZL2.js";
-import "./chunk-HDKDBC6V.js";
-import "./chunk-F2UWOZ6J.js";
+import "./chunk-CJ7KS3DF.js";
+import "./chunk-HQIAL7F2.js";
+import "./chunk-RVWJGWCL.js";
 import "./chunk-7ZHH77QA.js";
-import "./chunk-BRRRVLHQ.js";
-import "./chunk-EXXSN3BW.js";
-import "./chunk-7XHATCIH.js";
-import "./chunk-GNSRXK34.js";
-import "./chunk-HVVRXRGO.js";
-import "./chunk-NYNYSPK7.js";
+import "./chunk-AE32RGWX.js";
+import "./chunk-B3HOT4TK.js";
+import "./chunk-UYTYNCMZ.js";
+import "./chunk-4FJSAUKB.js";
+import "./chunk-MIRKTVH4.js";
+import "./chunk-S37PZD6I.js";
+import "./chunk-NT3ZYB5S.js";
+import "./chunk-R5U7XKVJ.js";
+
+// src/platform/renderHandler.ts
+var encoder = new TextEncoder();
+function sharedCacheable(control) {
+  if (!control) return true;
+  for (const part of control.split(",")) {
+    const name = part.split("=")[0].trim().toLowerCase();
+    if (name === "no-store" || name === "no-cache" || name === "private") return false;
+  }
+  return true;
+}
+function defaultCacheControl(result) {
+  if (result.diagnostics.timedOut) return "no-store";
+  if (result.status === 200) return "public, max-age=0, s-maxage=60, stale-while-revalidate=600";
+  if (result.status === 301 || result.status === 308) return "public, max-age=3600";
+  return "no-store";
+}
+function createRenderHandler(routes, options = {}) {
+  const { cache, cacheControl = defaultCacheControl, ...renderOptions } = options;
+  const document = renderOptions.document ?? {};
+  const store = cache ? /* @__PURE__ */ new Map() : null;
+  const max = cache?.max ?? 500;
+  const ttl = cache?.ttl ?? 6e4;
+  const maxBytes = cache?.maxBytes ?? 32 * 1024 * 1024;
+  let cachedBytes = 0;
+  const evict = (key) => {
+    const entry = store?.get(key);
+    if (!entry) return;
+    store?.delete(key);
+    cachedBytes -= entry.bytes;
+  };
+  const respond = (status, html, head, headers) => new Response(head || status === 204 || status >= 300 && status < 400 ? null : html, {
+    status,
+    headers: { "content-type": "text/html; charset=utf-8", ...headers }
+  });
+  return async (request) => {
+    const method = request.method.toUpperCase();
+    if (method !== "GET" && method !== "HEAD") {
+      return new Response(null, { status: 405, headers: { allow: "GET, HEAD" } });
+    }
+    const url = new URL(request.url);
+    const path = url.pathname + url.search;
+    const key = store ? `${cache?.version?.() ?? ""}\0${path}` : "";
+    const head = method === "HEAD";
+    if (store) {
+      const hit = store.get(key);
+      if (hit && hit.expires > Date.now()) {
+        store.delete(key);
+        store.set(key, hit);
+        const hitHeaders = { "x-sibu-cache": "hit" };
+        if (hit.control) hitHeaders["cache-control"] = hit.control;
+        return respond(hit.status, hit.html, head, hitHeaders);
+      }
+      if (hit) evict(key);
+    }
+    let result;
+    try {
+      result = await renderRoute(routes, path, { ...renderOptions, document });
+    } catch (err) {
+      console.error(`[SibuJS SSR] render of ${path} failed:`, err);
+      return new Response(head ? null : "Internal Server Error", {
+        status: 500,
+        headers: { "content-type": "text/plain; charset=utf-8", "cache-control": "no-store" }
+      });
+    }
+    const headers = {};
+    const control = cacheControl(result);
+    if (control) headers["cache-control"] = control;
+    if (result.location) headers.location = result.location;
+    if (store) {
+      const eligible = (result.status === 200 || result.status === 404) && !result.diagnostics.timedOut && sharedCacheable(control);
+      const bytes = eligible ? encoder.encode(result.html).byteLength : 0;
+      if (eligible && bytes <= maxBytes) {
+        evict(key);
+        store.set(key, { status: result.status, html: result.html, control, expires: Date.now() + ttl, bytes });
+        cachedBytes += bytes;
+        while (store.size > max || cachedBytes > maxBytes) evict(store.keys().next().value);
+        headers["x-sibu-cache"] = "miss";
+      } else {
+        headers["x-sibu-cache"] = "bypass";
+      }
+    }
+    return respond(result.status, result.html, head, headers);
+  };
+}
 export {
+  ADOPT_ID_ATTR,
+  DEFAULT_SETTLE_TIMEOUT,
+  DEFAULT_TRANSFER_MAX_BYTES,
   Head,
+  ISLAND_PROPS_ATTR,
+  assembleDocument,
   clearWasmCache,
   collectStream,
+  componentIsland,
   composeMiddleware,
   createAction,
   createISR,
   createMicroApp,
   createMiddlewareChain,
+  createRenderHandler,
   createSharedScope,
   createWasmBridge,
   createWorkerPool,
   defineRemoteComponent,
+  describeNodePath,
   deserializeState,
   escapeScriptJson,
+  formatRenderDiagnostics,
   generateStaticSite,
   hydrate,
   hydrateIslands,
@@ -86,16 +201,22 @@ export {
   isPrerendering,
   isWasmCached,
   island,
+  islandComponent,
   loadRemoteModule,
   loadWasmModule,
   loadWasmModuleWithOptions,
   preloadWasm,
   prerenderRoute,
   prerenderWait,
+  renderFailure,
+  renderRoute,
   renderToDocument,
+  renderToDocumentAsync,
   renderToReadableStream,
   renderToStream,
   renderToString,
+  renderToStringAsync,
+  renderToStringWith,
   renderToSuspenseStream,
   resetSSRState,
   scrollRestoration,
@@ -103,6 +224,7 @@ export {
   serviceWorker,
   setCanonical,
   setStructuredData,
+  settled,
   ssrSuspense,
   suspenseSwapScript,
   trustHTML,