@ilha/router 0.11.2 → 0.11.4

package/dist/plugin.d.ts

@@ -33,7 +33,7 @@ export interface IlhaPagesOptions {
      * when islands serve private data. Production equivalents register via
      * `setFrameGuard()` from `@ilha/router/ssr`.
      */
-    frameGuard?: (request: Request) => Response | void | Promise<Response | void>;
+    frameGuard?: (request: Request) => Response | undefined | Promise<Response | undefined>;
     /**
      * Explicit trusted origins for frame/loader requests (e.g. a `.vercel.app`
      * or custom domain). When unset, origin checks compare the `Origin` header
@@ -51,28 +51,28 @@ export interface IlhaPagesOptions {
      */
     strict?: boolean;
 }
-export declare function resolvePluginPaths(root: string, options: IlhaPagesOptions): {
-    pagesDir: string;
+export declare const resolvePluginPaths: (root: string, options: IlhaPagesOptions) => {
+    clientFile: string;
     outDir: string;
+    pagesDir: string;
     serverFile: string;
-    clientFile: string;
 };
 export interface PagesPluginState {
     pagesDir: string;
     outDir: string;
     serverFile: string;
     clientFile: string;
-    setPaths(root: string): void;
-    regen(): Promise<void>;
-    shouldRegenOnChange(file: string): boolean;
-    isUnderPagesDir(file: string): boolean;
+    setPaths: (root: string) => void;
+    regen: () => Promise<void>;
+    shouldRegenOnChange: (file: string) => boolean;
+    isUnderPagesDir: (file: string) => boolean;
 }
-export declare function createPagesPluginState(options: IlhaPagesOptions): PagesPluginState;
-export declare function regenFromPagesChange(state: PagesPluginState, file: string, shouldRegen: (file: string) => boolean): Promise<void>;
-export declare function resolvePagesId(state: PagesPluginState, id: string, importer?: string): string | undefined;
-export declare function loadPagesModule(state: PagesPluginState, id: string): string | undefined;
-type InvalidateModules = () => void | Promise<void>;
-export declare function createStructuralInvalidate(state: PagesPluginState, invalidate: InvalidateModules): (file: string) => Promise<void>;
-export declare function setupRspackPagesWatcher(state: PagesPluginState, structuralInvalidate: (file: string) => void | Promise<void>): () => void;
+export declare const createPagesPluginState: (options: IlhaPagesOptions) => PagesPluginState;
+export declare const regenFromPagesChange: (state: PagesPluginState, file: string, shouldRegen: (file: string) => boolean) => Promise<void>;
+export declare const resolvePagesId: (state: PagesPluginState, id: string, importer?: string) => string | undefined;
+export declare const loadPagesModule: (state: PagesPluginState, id: string) => string | undefined;
+type InvalidateModules = () => Promise<void>;
+export declare const createStructuralInvalidate: (state: PagesPluginState, invalidate: InvalidateModules) => (file: string) => Promise<void>;
+export declare const setupRspackPagesWatcher: (state: PagesPluginState, structuralInvalidate: (file: string) => Promise<void>) => () => void;
 export declare const ilhaPages: import("unplugin").UnpluginInstance<IlhaPagesOptions | undefined, boolean>;
 export {};

package/dist/request-scope.d.ts

@@ -13,11 +13,9 @@
  * storage without importing `node:async_hooks`; this node-only module is the
  * sole place that constructs it.
  */
-import { REQUEST_ALS_KEY } from "./als-key";
-import type { IslandContext } from "./index";
-export { REQUEST_ALS_KEY };
+export { REQUEST_ALS_KEY } from "./als-key";
+export type { IslandContext } from "./index";
 /** Run `fn` with `request` available to `useContext().request`. When oxidejs
  * is loaded, its action scope is entered too, so `useRequest()` works in
  * island renders and streamed frames. */
-export declare function runWithIslandRequest<T>(request: Request, fn: () => T): T;
-export type { IslandContext };
+export declare const runWithIslandRequest: <T>(request: Request, fn: () => T) => T;

package/dist/route-error.d.ts

@@ -0,0 +1,6 @@
+export declare class RouteError {
+    readonly __ilhaRouteError: true;
+    readonly status: number;
+    readonly message: string;
+    constructor(status: number, message: string);
+}

package/dist/route-match.d.ts

@@ -11,12 +11,12 @@ export interface ParsedPattern {
     segments: string[];
     kinds: number[];
 }
-export declare function parsePattern(pattern: string): ParsedPattern;
+export declare const parsePattern: (pattern: string) => ParsedPattern;
 /**
  * Match `segments` against a pathname. Returns raw (still-encoded) captured
  * params, or `null` when the path doesn't match — the caller decides whether to
  * decode via {@link safeDecode}.
  */
-export declare function matchSegments(segments: string[], pathname: string): Record<string, string> | null;
+export declare const matchSegments: (segments: string[], pathname: string) => Record<string, string> | null;
 /** Decode a route-param value, tolerating malformed percent-encoding. */
-export declare function safeDecode(value: string): string;
+export declare const safeDecode: (value: string) => string;

package/dist/rsbuild.d.ts

@@ -1,6 +1,6 @@
-export type { LayoutHandler, ErrorHandler, RouteSnapshot, AppError } from "./index";
+import type { IlhaPagesOptions } from "./plugin";
+export type { LayoutHandler, ErrorHandler, RouteSnapshot, AppError, } from "./index";
 export { ilhaPages, type IlhaPagesOptions } from "./plugin";
-import { type IlhaPagesOptions } from "./plugin";
 /** Rsbuild plugin — use via `@ilha/router/rsbuild`. */
-export declare function pages(options?: IlhaPagesOptions): any;
+export declare const pages: (options?: IlhaPagesOptions) => any;
 export default pages;

package/dist/rsbuild.js

@@ -1,10 +1,8 @@
-import { t as ilhaPages } from "./plugin-Bfnn44nu.js";
+import { t as ilhaPages } from "./plugin-DCdQ9yO8.js";
 
 //#region src/rsbuild.ts
 /** Rsbuild plugin — use via `@ilha/router/rsbuild`. */
-function pages(options = {}) {
-	return ilhaPages.rsbuild(options);
-}
+const pages = (options = {}) => ilhaPages.rsbuild(options);
 
 //#endregion
 export { pages as default, pages, ilhaPages };

package/dist/server-island.d.ts

@@ -14,27 +14,35 @@
  *   `[data-ilha-on]` event sentinels to named actions using the
  *   `data-ilha-actions` manifest emitted by `hydratable()`.
  */
+import type { SnapshotObject, SnapshotValue } from "./snapshot";
+/** Symbol.for keeps brands stable across duplicate ilha copies in one realm. */
+declare const ISLAND: unique symbol;
+declare const ISLAND_SLOT_TAG: unique symbol;
+export declare const ISLAND_MOUNT_INTERNAL: unique symbol;
 declare const ISLAND_CALL: unique symbol;
-/** @internal Repaint every mounted island from the same `*.server` module. */
-export declare function __ilhaRepaintServerModule(moduleKey: string): void;
-export type ServerStreamFn = (signal: AbortSignal) => AsyncGenerator<unknown> | Generator<unknown>;
+/** @internal */
+export declare const __ilhaRepaintServerModule: (moduleKey: string) => void;
+export type ServerStreamFn = (signal: AbortSignal) => AsyncGenerator<SnapshotValue> | Generator<SnapshotValue>;
+/** JSON-serializable value — the wire format for server-action payloads. */
+export type ServerActionPayload = SnapshotValue;
+export type ServerIslandProps = SnapshotObject;
 export interface ServerIslandWiring {
     /** Stream key → client transport. The plugin wires these to tacho stubs. */
     streams?: Record<string, ServerStreamFn>;
     /** Action key → client transport. Event payloads are not serializable;
      * handlers receive `undefined` and should read island state instead. */
-    actions?: Record<string, (payload?: unknown) => unknown>;
+    actions?: Record<string, (payload?: ServerActionPayload) => SnapshotValue | Promise<SnapshotValue>>;
     /** Frame transport: re-renders the island with the latest parent props. */
-    frame?: (props?: Record<string, unknown>) => unknown;
+    frame?: (props?: ServerIslandProps) => string | Promise<string> | SnapshotValue;
     /** Client-capable islands nested in the server render, keyed by opaque ref. */
-    children?: Record<string, unknown>;
+    children?: Record<string, ServerIslandCallable>;
 }
 export interface ServerIslandHandle {
     unmount: () => void;
-    updateProps: (props?: Record<string, unknown>) => void;
+    updateProps: (props?: ServerIslandProps) => void;
 }
-/** @internal Apply head entries returned with a server-page frame. */
-export declare function __ilhaApplyHead(entries: unknown): void;
+/** @internal */
+export declare const __ilhaApplyHead: <T>(entries: T) => void;
 /**
  * Create a client proxy island for a server-defined island. Called by
  * generated virtual modules — not by application code.
@@ -43,16 +51,19 @@ export declare function __ilhaApplyHead(entries: unknown): void;
  * @param as - Slot tag declared by the server island's `{ as }` option (default div).
  * @param wiring - Stream/action transports wired to tacho stubs by codegen.
  */
-interface IslandCallShape {
+interface IslandCallPayload {
     [ISLAND_CALL]: true;
     island: ServerIslandCallable;
-    props?: Record<string, unknown>;
+    props?: ServerIslandProps;
     key: string;
 }
-export type ServerIslandCallable = Record<symbol, unknown> & ((props?: Record<string, unknown>) => string) & {
-    mount: (host: Element, props?: Record<string, unknown>) => () => void;
+export type ServerIslandCallable = ((props?: ServerIslandProps) => string) & {
+    [ISLAND]: true;
+    [ISLAND_SLOT_TAG]: string;
+    mount: (host: Element, props?: ServerIslandProps) => () => void;
     toString: () => string;
-    key: (slotKey: string) => (props?: Record<string, unknown>) => IslandCallShape;
+    key: (slotKey: string) => (props?: ServerIslandProps) => IslandCallPayload;
+    [ISLAND_MOUNT_INTERNAL]: (host: Element, props?: ServerIslandProps) => ServerIslandHandle;
 };
-export declare function __ilhaServerIsland(id: string, as: string, wiring?: ServerIslandWiring, moduleKey?: string): ServerIslandCallable;
+export declare const __ilhaServerIsland: (id: string, as: string, wiring?: ServerIslandWiring, moduleKey?: string) => ServerIslandCallable;
 export {};

package/dist/server-island.js

@@ -1,5 +1,5 @@
-import { t as applyHeadEntriesToDocument } from "./head-DpYV3bHH.js";
-import { t as parseSnapshotAttr } from "./snapshot-C0E2OGwL.js";
+import { t as applyHeadEntriesToDocument } from "./head-BLtm0xtK.js";
+import { t as parseSnapshotAttr } from "./snapshot-XpAkSV8s.js";
 
 //#region src/server-island.ts
 /**
@@ -18,21 +18,25 @@ import { t as parseSnapshotAttr } from "./snapshot-C0E2OGwL.js";
 *   `[data-ilha-on]` event sentinels to named actions using the
 *   `data-ilha-actions` manifest emitted by `hydratable()`.
 */
+const objectTag = (value) => Object.prototype.toString.call(value);
+const isString = (value) => objectTag(value) === "[object String]";
+const isObject = (value) => value !== null && objectTag(value) === "[object Object]";
 /** Symbol.for keeps brands stable across duplicate ilha copies in one realm. */
 const ISLAND = Symbol.for("ilha.island");
 const ISLAND_SLOT_TAG = Symbol.for("ilha.islandSlotTag");
 const ISLAND_MOUNT_INTERNAL = Symbol.for("ilha.islandMountInternal");
+const ISLAND_CALL = Symbol.for("ilha.islandCall");
 const STATE_ATTR = "data-ilha-state";
 const EVENT_SENTINEL_ATTR = "data-ilha-on";
 const ACTIONS_ATTR = "data-ilha-actions";
 const PROPS_ATTR = "data-ilha-props";
 const CLIENT_REF_ATTR = "data-ilha-client-ref";
 const moduleRepaints = /* @__PURE__ */ new Map();
-/** @internal Repaint every mounted island from the same `*.server` module. */
-function __ilhaRepaintServerModule(moduleKey) {
+/** @internal */
+const __ilhaRepaintServerModule = (moduleKey) => {
 	for (const repaint of moduleRepaints.get(moduleKey) ?? []) repaint();
-}
-function linkServerModuleRepaints(moduleKey, repaint) {
+};
+const linkServerModuleRepaints = (moduleKey, repaint) => {
 	let set = moduleRepaints.get(moduleKey);
 	if (!set) {
 		set = /* @__PURE__ */ new Set();
@@ -40,72 +44,97 @@ function linkServerModuleRepaints(moduleKey, repaint) {
 	}
 	set.add(repaint);
 	return () => {
-		set.delete(repaint);
-		if (set.size === 0) moduleRepaints.delete(moduleKey);
+		const live = moduleRepaints.get(moduleKey);
+		if (!live) return;
+		live.delete(repaint);
+		if (live.size === 0) moduleRepaints.delete(moduleKey);
 	};
-}
-/** @internal Apply head entries returned with a server-page frame. */
-function __ilhaApplyHead(entries) {
+};
+/** @internal */
+const __ilhaApplyHead = (entries) => {
 	if (Array.isArray(entries)) applyHeadEntriesToDocument(entries);
-}
+};
 /** Defensive snapshot parse — reuses the shared guarded parser (size cap,
 * plain-object check, depth cap, prototype-key stripping). */
-function assertValidTag(tag) {
+const assertValidTag = (tag) => {
 	const trimmed = tag.trim();
-	if (/^[a-z][a-z0-9-]*$/i.test(trimmed)) return trimmed.toLowerCase();
+	if (/^[a-z][a-z0-9-]*$/iu.test(trimmed)) return trimmed.toLowerCase();
 	return "div";
-}
+};
 /** True when `candidate` is owned by `host`: walking up must not cross another
 * island or slot boundary before reaching it. */
-function belongsToHost(host, candidate) {
+const belongsToHost = (host, candidate) => {
 	let el = candidate.parentElement;
 	while (el && el !== host) {
-		if (el.hasAttribute("data-ilha")) return false;
-		if (el.hasAttribute("data-ilha-slot") && el.style.display !== "contents") return false;
+		if (el.matches("[data-ilha]")) return false;
+		if (el.matches("[data-ilha-slot]") && el instanceof HTMLElement && el.style.display !== "contents") return false;
 		el = el.parentElement;
 	}
 	return el === host;
-}
-/** Dev cold-start can race a warming `virtual:oxide/actions` graph — retry briefly. */
-async function startServerStream(fn, signal) {
-	let last;
-	for (let attempt = 0; attempt < 4; attempt++) {
-		if (signal.aborted) throw last ?? new DOMException("The operation was aborted.", "AbortError");
-		let gen;
-		try {
-			gen = await fn(signal);
-			const first = await gen.next();
-			return {
-				gen,
-				first
-			};
-		} catch (err) {
-			last = err;
-			if (gen) Promise.resolve(gen.return?.(void 0)).catch(() => {});
-			if (signal.aborted) throw err;
-			const msg = String(err);
-			if (!msg.includes("404") && !msg.includes("503")) throw err;
-			if (attempt === 3) throw err;
-			await new Promise((resolve, reject) => {
-				const timer = setTimeout(() => {
-					signal.removeEventListener("abort", onAbort);
-					resolve();
-				}, 50 * (attempt + 1));
-				const onAbort = () => {
-					clearTimeout(timer);
-					reject(err);
-				};
-				signal.addEventListener("abort", onAbort, { once: true });
-				if (signal.aborted) onAbort();
-			});
+};
+const sleepMs = (ms) => {
+	const { promise, resolve } = Promise.withResolvers();
+	setTimeout(() => {
+		resolve(null);
+	}, ms);
+	return promise;
+};
+const abortAwareDelay = async (ms, signal, abortError) => {
+	if (signal.aborted) throw abortError;
+	await sleepMs(ms);
+	if (signal.aborted) throw abortError;
+};
+const isRetryableRpcFailure = (error) => {
+	const msg = String(error);
+	return msg.includes("404") || msg.includes("503") || msg.includes("empty HTTP response") || msg.includes("HttpError") || msg.includes("RpcClientDefect") || msg.includes("RpcClientError") || msg.includes("TransportError") || msg.includes("InvalidUrlError");
+};
+const isAbortLike = (error, signal) => {
+	if (signal.aborted) return true;
+	return error.name === "AbortError";
+};
+const closeStream = async (gen) => {
+	if (!gen) return;
+	try {
+		await gen.return?.(void 0);
+	} catch {}
+};
+const pullStream = async (gen, step, key, state, signal, onValue) => {
+	if (signal.aborted || step.done) return;
+	state[key] = step.value;
+	onValue();
+	const next = await gen.next();
+	await pullStream(gen, next, key, state, signal, onValue);
+};
+/**
+* Pull a wired server stream until it ends or the island unmounts.
+* Dev cold-start and flaky Oxide RPC transports (empty bodies, aborted
+* fetches during Vite dep reloads) are retried with the same generator
+* factory — including failures after the first chunk.
+*/
+const resumeServerStream = async (fn, key, state, controller, onValue, attempt = 0) => {
+	if (controller.signal.aborted) return;
+	let gen;
+	try {
+		gen = await fn(controller.signal);
+		const first = await gen.next();
+		await pullStream(gen, first, key, state, controller.signal, onValue);
+		await closeStream(gen);
+	} catch (error) {
+		await closeStream(gen);
+		if (isAbortLike(error, controller.signal)) return;
+		if (!isRetryableRpcFailure(error) || attempt >= 3) {
+			console.error(`[ilha-router] stream "${key}" failed:`, error);
+			return;
 		}
+		await abortAwareDelay(50 * (attempt + 1), controller.signal, error);
+		return resumeServerStream(fn, key, state, controller, onValue, attempt + 1);
 	}
-	throw last;
-}
-function hydrateServerIsland(host, id, wiring, props, moduleKey) {
+};
+const hydrateServerIsland = (host, id, wiring, props, moduleKey) => {
 	const controller = new AbortController();
-	const cleanups = [];
-	cleanups.push(() => controller.abort());
+	const cleanups = [() => {
+		controller.abort();
+	}];
 	const state = {};
 	const rawState = host.getAttribute(STATE_ATTR);
 	if (rawState) {
@@ -114,30 +143,12 @@ function hydrateServerIsland(host, id, wiring, props, moduleKey) {
 			for (const [key, value] of Object.entries(parsed)) if (!key.startsWith("_")) state[key] = value;
 		}
 	}
-	const frame = wiring.frame;
+	const { frame } = wiring;
 	let currentProps = props;
 	let repaintChain = Promise.resolve();
-	const scheduleRepaint = () => {
-		if (!frame || controller.signal.aborted) return;
-		const sent = currentProps;
-		repaintChain = repaintChain.then(async () => {
-			if (controller.signal.aborted || !host.isConnected) return;
-			const html = await frame(sent);
-			if (controller.signal.aborted || typeof html !== "string") return;
-			const parsed = new DOMParser().parseFromString(`<div>${html}</div>`, "text/html");
-			host.replaceChildren(...Array.from(parsed.body.firstElementChild?.childNodes ?? []));
-			syncChildren();
-			wireEvents();
-		}).catch((err) => {
-			if (!controller.signal.aborted) console.error(`[ilha-router] frame render failed for "${id}":`, err);
-		});
-	};
-	const repaintModule = () => {
-		if (moduleKey) __ilhaRepaintServerModule(moduleKey);
-		else scheduleRepaint();
-	};
-	if (moduleKey) cleanups.push(linkServerModuleRepaints(moduleKey, scheduleRepaint));
 	const attached = [];
+	const mountedChildren = /* @__PURE__ */ new Map();
+	const hooks = { repaintModule: () => {} };
 	const readManifest = () => {
 		const raw = host.querySelector(`:scope > template[${ACTIONS_ATTR}], template[${ACTIONS_ATTR}]`)?.getAttribute(ACTIONS_ATTR) ?? host.getAttribute(ACTIONS_ATTR) ?? null;
 		return raw ? parseSnapshotAttr(raw) : void 0;
@@ -147,7 +158,7 @@ function hydrateServerIsland(host, id, wiring, props, moduleKey) {
 		attached.length = 0;
 		const manifest = readManifest();
 		if (!manifest) return;
-		const sentinels = [host, ...Array.from(host.querySelectorAll(`[${EVENT_SENTINEL_ATTR}]`))];
+		const sentinels = [host, ...host.querySelectorAll(`[${EVENT_SENTINEL_ATTR}]`)];
 		for (const el of sentinels) {
 			if (!el.hasAttribute(EVENT_SENTINEL_ATTR)) continue;
 			if (el !== host && !belongsToHost(host, el)) continue;
@@ -155,48 +166,60 @@ function hydrateServerIsland(host, id, wiring, props, moduleKey) {
 			for (const part of spec.split(",")) {
 				const sep = part.lastIndexOf(":");
 				if (sep < 1) continue;
-				const type = part.slice(0, sep);
+				const eventType = part.slice(0, sep);
 				const entry = manifest[part];
 				let actionKey;
 				let callArgs = [];
-				if (typeof entry === "string") actionKey = entry;
-				else if (entry && typeof entry === "object") {
+				if (isString(entry)) actionKey = entry;
+				else if (entry && isObject(entry)) {
 					actionKey = String(entry.k);
 					if (Array.isArray(entry.a)) callArgs = entry.a;
 				}
-				const action = actionKey == null ? void 0 : wiring.actions?.[actionKey];
-				if (!action) continue;
+				const actionFn = actionKey === null || actionKey === void 0 ? void 0 : wiring.actions?.[actionKey];
+				if (!actionFn) continue;
+				const boundKey = actionKey;
 				const listener = () => {
-					Promise.resolve(action(...callArgs)).then(() => repaintModule()).catch((err) => {
-						console.error(`[ilha-router] action "${String(actionKey)}" failed:`, err);
-					});
+					const run = async () => {
+						try {
+							await Promise.resolve(actionFn(...callArgs));
+							hooks.repaintModule();
+						} catch (error) {
+							console.error(`[ilha-router] action "${String(boundKey)}" failed:`, error);
+						}
+					};
+					run();
 				};
-				el.addEventListener(type, listener);
+				el.addEventListener(eventType, listener);
 				attached.push({
 					el,
-					type,
-					listener
+					listener,
+					type: eventType
 				});
 			}
 		}
 	};
-	wireEvents();
-	const mountedChildren = /* @__PURE__ */ new Map();
-	const reviveChildProps = (props) => {
-		if (!props) return void 0;
-		for (const [key, value] of Object.entries(props)) {
-			if (!value || typeof value !== "object") continue;
+	const reviveChildProps = (childProps) => {
+		if (!childProps) return;
+		const next = { ...childProps };
+		for (const [key, value] of Object.entries(childProps)) {
+			if (!value || !isObject(value)) continue;
 			const marker = value;
-			if (marker.__ilha !== "action" || typeof marker.k !== "string") continue;
-			const action = wiring.actions?.[marker.k];
-			if (!action) continue;
-			const args = Array.isArray(marker.a) ? marker.a : [];
-			props[key] = (..._runtimeArgs) => Promise.resolve(action(...args)).then((result) => {
-				repaintModule();
-				return result;
-			});
+			if (marker.__ilha !== "action" || !isString(marker.k)) continue;
+			const actionFn = wiring.actions?.[marker.k];
+			if (!actionFn) continue;
+			let args = [];
+			if (Array.isArray(marker.a)) args = marker.a;
+			const revived = (..._runtimeArgs) => {
+				const run = async () => {
+					const result = await Promise.resolve(actionFn(...args));
+					hooks.repaintModule();
+					return result;
+				};
+				return run();
+			};
+			Object.assign(next, { [key]: revived });
 		}
-		return props;
+		return next;
 	};
 	const syncChildren = () => {
 		for (const [el, handle] of mountedChildren) {
@@ -206,38 +229,46 @@ function hydrateServerIsland(host, id, wiring, props, moduleKey) {
 		}
 		for (const el of host.querySelectorAll(`[${CLIENT_REF_ATTR}]`)) {
 			if (!belongsToHost(host, el)) continue;
-			const props = reviveChildProps(parseSnapshotAttr(el.getAttribute(PROPS_ATTR) ?? "") ?? void 0);
+			const childProps = reviveChildProps(parseSnapshotAttr(el.getAttribute(PROPS_ATTR) ?? "") ?? void 0);
 			const mounted = mountedChildren.get(el);
 			if (mounted) {
-				mounted.updateProps(props);
+				mounted.updateProps(childProps);
 				continue;
 			}
 			const mount = (wiring.children?.[el.getAttribute(CLIENT_REF_ATTR) ?? ""])?.[ISLAND_MOUNT_INTERNAL];
-			if (mount) mountedChildren.set(el, mount(el, props));
+			if (mount) mountedChildren.set(el, mount(el, childProps));
 		}
 	};
-	syncChildren();
-	for (const [key, fn] of Object.entries(wiring.streams ?? {})) (async () => {
-		try {
-			const { gen, first } = await startServerStream(fn, controller.signal);
+	const applyFrameHtml = async (sent) => {
+		if (!frame || controller.signal.aborted || !host.isConnected) return;
+		const html = await frame(sent);
+		if (controller.signal.aborted || !isString(html)) return;
+		const parsed = new DOMParser().parseFromString(`<div>${html}</div>`, "text/html");
+		host.replaceChildren(...parsed.body.firstElementChild?.childNodes ?? []);
+		syncChildren();
+		wireEvents();
+	};
+	const scheduleRepaint = () => {
+		if (!frame || controller.signal.aborted) return;
+		const sent = currentProps;
+		const previous = repaintChain;
+		repaintChain = (async () => {
+			await previous;
 			try {
-				let step = first;
-				for (;;) {
-					const { done, value } = step;
-					if (controller.signal.aborted || done) break;
-					state[key] = value;
-					repaintModule();
-					step = await gen.next();
-				}
-			} catch (err) {
-				if (!controller.signal.aborted && err?.name !== "AbortError") console.error(`[ilha-router] stream "${key}" failed:`, err);
-			} finally {
-				Promise.resolve(gen.return?.(void 0)).catch(() => {});
+				await applyFrameHtml(sent);
+			} catch (error) {
+				if (!controller.signal.aborted) console.error(`[ilha-router] frame render failed for "${id}":`, error);
 			}
-		} catch (err) {
-			if (!controller.signal.aborted && err?.name !== "AbortError") console.error(`[ilha-router] stream "${key}" failed:`, err);
-		}
-	})();
+		})();
+	};
+	hooks.repaintModule = () => {
+		if (moduleKey) __ilhaRepaintServerModule(moduleKey);
+		else scheduleRepaint();
+	};
+	if (moduleKey) cleanups.push(linkServerModuleRepaints(moduleKey, scheduleRepaint));
+	wireEvents();
+	syncChildren();
+	for (const [key, fn] of Object.entries(wiring.streams ?? {})) resumeServerStream(fn, key, state, controller, hooks.repaintModule);
 	if (frame && !host.hasAttribute(STATE_ATTR) && host.childNodes.length === 0) scheduleRepaint();
 	return {
 		unmount: () => {
@@ -253,8 +284,8 @@ function hydrateServerIsland(host, id, wiring, props, moduleKey) {
 			scheduleRepaint();
 		}
 	};
-}
-function __ilhaServerIsland(id, as, wiring = {}, moduleKey) {
+};
+const __ilhaServerIsland = (id, as, wiring = {}, moduleKey) => {
 	const slotTag = assertValidTag(as);
 	const island = ((props) => {
 		return "";
@@ -262,20 +293,19 @@ function __ilhaServerIsland(id, as, wiring = {}, moduleKey) {
 	island[ISLAND] = true;
 	island[ISLAND_SLOT_TAG] = slotTag;
 	island.toString = () => "";
-	const ISLAND_CALL = Symbol.for("ilha.islandCall");
 	island.key = (slotKey) => {
-		if (typeof slotKey !== "string" || slotKey.trim().length === 0 || slotKey.includes(":")) throw new Error("server island key() requires a non-empty key without \":\".");
-		return (props) => ({
+		if (!isString(slotKey) || slotKey.trim().length === 0 || slotKey.includes(":")) throw new Error("server island key() requires a non-empty key without \":\".");
+		return (callProps) => ({
 			[ISLAND_CALL]: true,
 			island,
-			props,
-			key: slotKey
+			key: slotKey,
+			props: callProps
 		});
 	};
 	island[ISLAND_MOUNT_INTERNAL] = (host, mountProps) => hydrateServerIsland(host, id, wiring, mountProps, moduleKey);
 	island.mount = (host, mountProps) => hydrateServerIsland(host, id, wiring, mountProps, moduleKey).unmount;
 	return island;
-}
+};
 
 //#endregion
-export { __ilhaApplyHead, __ilhaRepaintServerModule, __ilhaServerIsland };
+export { ISLAND_MOUNT_INTERNAL, __ilhaApplyHead, __ilhaRepaintServerModule, __ilhaServerIsland };