vite-plugin-react-server 1.1.20 → 1.2.0-alpha.0

package/dist/plugin/react-client/createWorkerStream.d.ts

@@ -1,7 +1,17 @@
 import type { Logger } from "vite";
-import type { RscRenderMessage } from "../worker/types.js";
+import type { RscRenderMessage } from "../worker/rsc/types.js";
 import type { Worker as NodeWorker } from "node:worker_threads";
 import type { StreamHandlers } from "../worker/types.js";
+export type CreateWorkerStreamFn = (props: {
+    worker: NodeWorker;
+    message: Omit<RscRenderMessage, "type" | "id"> & Partial<Pick<RscRenderMessage, "id">> & {
+        type?: "RSC_RENDER";
+    };
+    logger: Logger;
+    handlers: Pick<StreamHandlers, "onHmrAccept" | "onHmrUpdate" | "onMetrics"> & Partial<Pick<StreamHandlers, "onError" | "onServerAction" | "onServerActionResponse" | "onCssFile">>;
+    verbose?: boolean;
+    rscTimeout?: number;
+}) => AsyncGenerator<Uint8Array>;
 /**
  * Creates an async generator that yields RSC chunks from the worker.
  * Handles both module requests and RSC streaming.
@@ -12,13 +22,5 @@ import type { StreamHandlers } from "../worker/types.js";
  * @param rscWorkerLoaderPort - Optional loader port for module loading
  * @returns An async generator that yields RSC chunks
  */
-export declare function createWorkerStream({ worker, message, logger, handlers: { onHmrAccept, onHmrUpdate, onMetrics, onError, onData, onEnd, onServerAction, onServerActionResponse, onCssFile, }, verbose, }: {
-    worker: NodeWorker;
-    message: Omit<RscRenderMessage, "type" | "id"> & Partial<Pick<RscRenderMessage, "id">> & {
-        type?: "RSC_RENDER";
-    };
-    logger: Logger;
-    handlers: Pick<StreamHandlers, "onHmrAccept" | "onHmrUpdate" | "onMetrics"> & Partial<Pick<StreamHandlers, "onError" | "onData" | "onEnd" | "onServerAction" | "onServerActionResponse" | "onCssFile">>;
-    verbose?: boolean;
-}): AsyncGenerator<Uint8Array>;
+export declare const createWorkerStream: CreateWorkerStreamFn;
 //# sourceMappingURL=createWorkerStream.d.ts.map

package/dist/plugin/react-client/createWorkerStream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createWorkerStream.d.ts","sourceRoot":"","sources":["../../../plugin/react-client/createWorkerStream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,KAAK,EAEV,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAIzD;;;;;;;;;GASG;AACH,wBAAuB,kBAAkB,CAAC,EACxC,MAAM,EACN,OAAO,EACP,MAAM,EACN,QAAQ,EAAE,EACR,WAAW,EACX,WAAW,EACX,SAAS,EACT,OAAO,EACP,MAAM,EACN,KAAK,EACL,cAAc,EACd,sBAAsB,EACtB,SAAS,GACV,EACD,OAAe,GAChB,EAAE;IACD,MAAM,EAAE,UAAU,CAAC;IACnB,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC,GAC5C,OAAO,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,GAAG;QAAE,IAAI,CAAC,EAAE,YAAY,CAAA;KAAE,CAAC;IAClE,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,IAAI,CAAC,cAAc,EAAE,aAAa,GAAG,aAAa,GAAG,WAAW,CAAC,GACzE,OAAO,CACL,IAAI,CACF,cAAc,EACZ,SAAS,GACT,QAAQ,GACR,OAAO,GACP,gBAAgB,GAChB,wBAAwB,GACxB,WAAW,CACd,CACF,CAAC;IACJ,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GAAG,cAAc,CAAC,UAAU,CAAC,CAsJ7B"}
+{"version":3,"file":"createWorkerStream.d.ts","sourceRoot":"","sources":["../../../plugin/react-client/createWorkerStream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,KAAK,EAEV,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGzD,MAAM,MAAM,oBAAoB,GAAG,CAAC,KAAK,EAAE;IACzC,MAAM,EAAE,UAAU,CAAC;IACnB,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC,GAC5C,OAAO,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,GAAG;QACtC,IAAI,CAAC,EAAE,YAAY,CAAC;KACrB,CAAC;IACJ,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,IAAI,CAAC,cAAc,EAAE,aAAa,GAAG,aAAa,GAAG,WAAW,CAAC,GACzE,OAAO,CACL,IAAI,CACF,cAAc,EACZ,SAAS,GACT,gBAAgB,GAChB,wBAAwB,GACxB,WAAW,CACd,CACF,CAAC;IACJ,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,KAAK,cAAc,CAAC,UAAU,CAAC,CAAC;AAEjC;;;;;;;;;GASG;AACH,eAAO,MAAM,kBAAkB,EAAE,oBAwKhC,CAAA"}

package/dist/plugin/react-client/createWorkerStream.js

@@ -4,9 +4,8 @@
  * MIT License
  */
 import { createMessageHandler } from './createMessageHandlers.js';
-import { logError } from '../error/toError.js';
 
-async function* createWorkerStream({
+const createWorkerStream = async function* _createWorkerStream({
   worker,
   message,
   logger,
@@ -15,50 +14,48 @@ async function* createWorkerStream({
     onHmrUpdate,
     onMetrics,
     onError,
-    onData,
-    onEnd,
     onServerAction,
     onServerActionResponse,
     onCssFile
   },
-  verbose = false
+  verbose = false,
+  rscTimeout = 5e3
 }) {
   if (!worker) {
     throw new Error("Worker is not running");
   }
   let messageHandler = null;
   let currentResolve = null;
+  let isStreamClosed = false;
   const handlers = {
     onError: (id, error, errorInfo) => {
-      logError(error, logger);
-      if (errorInfo) {
-        logError(errorInfo.componentStack, logger);
-      }
+      isStreamClosed = true;
       if (typeof onError === "function") {
         onError(id, error, errorInfo);
       }
     },
     onData: (id, chunk) => {
-      currentResolve?.(chunk);
+      if (currentResolve && !isStreamClosed) {
+        currentResolve(chunk);
+        currentResolve = null;
+      }
       if (verbose) {
         logger.info(
           `[react-client] received chunk ${id} ${Buffer.from(chunk).byteLength} bytes`
         );
       }
-      if (typeof onData === "function") {
-        onData(id, chunk);
-      }
     },
-    onEnd: (id) => {
-      currentResolve?.(new Uint8Array());
+    onEnd: () => {
+      if (currentResolve) {
+        currentResolve(null);
+        currentResolve = null;
+      }
+      isStreamClosed = true;
       if (verbose) logger.info(`[react-client] received end`);
       if (messageHandler) {
         worker.removeListener("message", messageHandler);
         messageHandler = null;
       }
-      if (typeof onEnd === "function") {
-        onEnd(id);
-      }
     },
     onMetrics: (id, metrics) => {
       if (verbose)
@@ -97,11 +94,7 @@ async function* createWorkerStream({
       if (verbose)
         logger.info(`[react-client] received server action response ${id}`);
       if (typeof onServerActionResponse === "function") {
-        const response = {
-          type: "server-action-response",
-          returnValue: error ? { success: false, error } : result
-        };
-        onServerActionResponse(id, response);
+        onServerActionResponse(id, result, error);
       }
     }
   };
@@ -118,12 +111,14 @@ async function* createWorkerStream({
     });
     if (verbose) logger.info(`[react-client] waiting for message handler`);
     let workerTimeout = null;
-    yield await new Promise((resolve) => {
+    const initialChunk = await new Promise((resolve) => {
       workerTimeout = setTimeout(() => {
         if (verbose) logger.info(`worker timeout`);
         worker.terminate();
-      }, 5e3);
-      currentResolve = resolve;
+      }, rscTimeout);
+      currentResolve = (chunk) => {
+        resolve(chunk);
+      };
       messageHandler = createMessageHandler({
         handlers,
         logger,
@@ -135,6 +130,9 @@ async function* createWorkerStream({
       clearTimeout(workerTimeout);
     }
     if (verbose) logger.info(`[react-client] received message handler`);
+    if (initialChunk !== null) {
+      yield initialChunk;
+    }
     while (true) {
       const chunk = await new Promise((resolve) => {
         currentResolve = resolve;
@@ -148,7 +146,7 @@ async function* createWorkerStream({
         });
         worker.on("message", messageHandler);
       });
-      if (chunk.length === 0) {
+      if (chunk === null) {
         break;
       }
       yield chunk;
@@ -159,7 +157,7 @@ async function* createWorkerStream({
       messageHandler = null;
     }
   }
-}
+};
 
 export { createWorkerStream };
-//# sourceMappingURL=createWorkerStream.js.map
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"createWorkerStream.js","sources":["../../../plugin/react-client/createWorkerStream.ts"],"sourcesContent":["import type { Logger } from \"vite\";\nimport type {\n  RscWorkerOutputMessage,\n  RscRenderMessage,\n} from \"../worker/rsc/types.js\";\nimport type { StreamMetrics } from \"../types.js\";\nimport type { Worker as NodeWorker } from \"node:worker_threads\";\nimport type { StreamHandlers } from \"../worker/types.js\";\nimport { createMessageHandler } from \"./createMessageHandlers.js\";\n\nexport type CreateWorkerStreamFn = (props: {\n  worker: NodeWorker;\n  message: Omit<RscRenderMessage, \"type\" | \"id\"> &\n    Partial<Pick<RscRenderMessage, \"id\">> & {\n      type?: \"RSC_RENDER\";\n    };\n  logger: Logger;\n  handlers: Pick<StreamHandlers, \"onHmrAccept\" | \"onHmrUpdate\" | \"onMetrics\"> & \n    Partial<\n      Pick<\n        StreamHandlers,\n        | \"onError\"\n        | \"onServerAction\"\n        | \"onServerActionResponse\"\n        | \"onCssFile\"\n      >\n    >;\n  verbose?: boolean;\n  rscTimeout?: number;\n}) => AsyncGenerator<Uint8Array>;\n\n/**\n * Creates an async generator that yields RSC chunks from the worker.\n * Handles both module requests and RSC streaming.\n *\n * @param worker - The worker thread\n * @param server - The Vite dev server\n * @param message - The RSC render message\n * @param rscWorkerLoaderPort - Optional loader port for module loading\n * @returns An async generator that yields RSC chunks\n */\nexport const createWorkerStream: CreateWorkerStreamFn = async function* _createWorkerStream({\n  worker,\n  message,\n  logger,\n  handlers: {\n    onHmrAccept,\n    onHmrUpdate,\n    onMetrics,\n    onError,\n    onServerAction,\n    onServerActionResponse,\n    onCssFile,\n  },\n  verbose = false,\n  rscTimeout = 5000,\n}) {\n  if (!worker) {\n    throw new Error(\"Worker is not running\");\n  }\n  let messageHandler:\n    | ((message: RscWorkerOutputMessage | undefined) => void)\n    | null = null;\n  let currentResolve: ((chunk: Uint8Array | null) => void) | null = null;\n  let isStreamClosed = false;\n  const handlers: StreamHandlers = {\n    onError: (id, error, errorInfo) => {\n      isStreamClosed = true;\n      if (typeof onError === \"function\") {\n        onError(id, error, errorInfo);\n      }\n    },\n    onData: (id: string, chunk: Uint8Array) => {\n      // Handle generator flow - resolve the current promise with the chunk\n      if (currentResolve && !isStreamClosed) {\n        currentResolve(chunk);\n        currentResolve = null;\n      }\n      if (verbose) {\n        logger.info(\n          `[react-client] received chunk ${id} ${\n            Buffer.from(chunk).byteLength\n          } bytes`\n        );\n      }\n    },\n    onEnd: () => {\n      // Handle generator flow - resolve with null to signal end\n      if (currentResolve) {\n        currentResolve(null);\n        currentResolve = null;\n      }\n      isStreamClosed = true;\n      if (verbose) logger.info(`[react-client] received end`);\n      if (messageHandler) {\n        worker.removeListener(\"message\", messageHandler);\n        messageHandler = null;\n      }\n    },\n    onMetrics: (id: string, metrics: StreamMetrics) => {\n      if (verbose)\n        logger.info(`[react-client] received chunks ${metrics.chunks}`);\n      if (typeof onMetrics === \"function\") {\n        onMetrics(id, metrics);\n      }\n    },\n    onHmrAccept: (id: string, routes?: string[]) => {\n      if (verbose)\n        logger.info(`[react-client] received hmr accept ${routes?.join(\", \")}`);\n      if (typeof onHmrAccept === \"function\") {\n        onHmrAccept(id, routes);\n      }\n    },\n    onHmrUpdate: (id: string, routes?: string[]) => {\n      if (verbose)\n        logger.info(`[react-client] received hmr update ${routes?.join(\", \")}`);\n      if (typeof onHmrUpdate === \"function\") {\n        onHmrUpdate(id, routes);\n      }\n    },\n    onCssFile: (id: string, code: string) => {\n      if (verbose) logger.info(`[react-client] received css file ${id}`);\n      if (typeof onCssFile === \"function\") {\n        onCssFile(id, code);\n      }\n    },\n    onServerAction: (id: string, args: unknown[]) => {\n      if (verbose) logger.info(`[react-client] received server action ${id}`);\n      if (typeof onServerAction === \"function\") {\n        onServerAction(id, args);\n      }\n    },\n    onServerActionResponse: (id: string, result?: unknown, error?: string) => {\n      if (verbose)\n        logger.info(`[react-client] received server action response ${id}`);\n      if (typeof onServerActionResponse === \"function\") {\n        onServerActionResponse(id, result, error);\n      }\n    },\n  };\n\n  try {\n    // Remove any existing message handler before starting\n    if (messageHandler) {\n      worker.removeListener(\"message\", messageHandler);\n      messageHandler = null;\n    }\n    if (verbose) logger.info(`[react-client] sending message RSC_RENDER`);\n    worker.postMessage({\n      ...message,\n      type: \"RSC_RENDER\",\n      id: message?.id ?? message.route,\n    });\n\n    if (verbose) logger.info(`[react-client] waiting for message handler`);\n    let workerTimeout: NodeJS.Timeout | null = null;\n    const initialChunk = await new Promise<Uint8Array | null>((resolve) => {\n      workerTimeout = setTimeout(() => {\n        if (verbose) logger.info(`worker timeout`);\n        worker.terminate();\n      }, rscTimeout);\n      currentResolve = (chunk: Uint8Array | null) => {\n        resolve(chunk);\n      };\n      messageHandler = createMessageHandler({\n        handlers,\n        logger,\n        verbose,\n      });\n      worker.on(\"message\", messageHandler);\n    });\n    if (workerTimeout) {\n      clearTimeout(workerTimeout);\n    }\n    if (verbose) logger.info(`[react-client] received message handler`);\n    \n    // Only yield the initial chunk if it's not null\n    if (initialChunk !== null) {\n      yield initialChunk;\n    }\n    \n    while (true) {\n      const chunk = await new Promise<Uint8Array | null>((resolve) => {\n        currentResolve = resolve;\n        // Create new message handler for each iteration\n        if (messageHandler) {\n          worker.removeListener(\"message\", messageHandler);\n        }\n        messageHandler = createMessageHandler({\n          handlers,\n          logger,\n          verbose,\n        });\n        worker.on(\"message\", messageHandler);\n      });\n\n      if (chunk === null) {\n        break; // End of stream\n      }\n\n      yield chunk;\n    }\n  } finally {\n    // Clean up message handler in finally block\n    if (messageHandler) {\n      worker.removeListener(\"message\", messageHandler);\n      messageHandler = null;\n    }\n  }\n}\n"],"names":[],"mappings":"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"}

package/dist/plugin/react-client/handleWorkerRscStream.d.ts

@@ -1,6 +1,17 @@
 import type { Logger } from "vite";
-import type { RscRenderMessage, StreamHandlers } from "../worker/types.js";
+import type { RscRenderMessage } from "../worker/rsc/types.js";
+import type { StreamHandlers } from "../worker/types.js";
 import type { Worker as NodeWorker } from "node:worker_threads";
+export type HandleWorkerRscStreamFn = (props: {
+    worker: NodeWorker;
+    message: Omit<RscRenderMessage, "type" | "id"> & Partial<Pick<RscRenderMessage, "id">> & {
+        type?: "RSC_RENDER";
+    };
+    logger: Logger;
+    handlers: Pick<StreamHandlers, "onMetrics" | "onHmrAccept" | "onHmrUpdate"> & Partial<Pick<StreamHandlers, "onError" | "onData" | "onEnd" | "onServerAction" | "onServerActionResponse" | "onCssFile">>;
+    verbose?: boolean;
+    rscTimeout?: number;
+}) => ReadableStream<Uint8Array>;
 /**
  * Handles the RSC stream from the worker.
  * Creates a ReadableStream that pipes RSC chunks to the response.
@@ -9,11 +20,5 @@ import type { Worker as NodeWorker } from "node:worker_threads";
  * @param message - The RSC render message
  * @returns A ReadableStream that yields RSC chunks
  */
-export declare function handleWorkerRscStream({ worker, message, logger, handlers, verbose }: {
-    worker: NodeWorker;
-    message: Omit<RscRenderMessage, "type" | "id">;
-    logger: Logger;
-    handlers: Pick<StreamHandlers, "onMetrics" | "onHmrAccept" | "onHmrUpdate"> & Partial<Pick<StreamHandlers, "onError" | "onData" | "onEnd" | "onServerAction" | "onServerActionResponse">>;
-    verbose?: boolean;
-}): ReadableStream<Uint8Array>;
+export declare const handleWorkerRscStream: HandleWorkerRscStreamFn;
 //# sourceMappingURL=handleWorkerRscStream.d.ts.map

package/dist/plugin/react-client/handleWorkerRscStream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handleWorkerRscStream.d.ts","sourceRoot":"","sources":["../../../plugin/react-client/handleWorkerRscStream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAE3E,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAChE;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,EACpC,MAAM,EACN,OAAO,EACP,MAAM,EACN,QAAQ,EACR,OAAe,EAChB,EAAE;IACD,MAAM,EAAE,UAAU,CAAC;IACnB,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC;IAC/C,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,IAAI,CAAC,cAAc,EAAE,WAAW,GAAG,aAAa,GAAG,aAAa,CAAC,GACzE,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,QAAQ,GAAG,OAAO,GAAG,gBAAgB,GAAG,wBAAwB,CAAC,CAAC,CAAC;IAC9G,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,GAAG,cAAc,CAAC,UAAU,CAAC,CAkD7B"}
+{"version":3,"file":"handleWorkerRscStream.d.ts","sourceRoot":"","sources":["../../../plugin/react-client/handleWorkerRscStream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGhE,MAAM,MAAM,uBAAuB,GAAG,CAAC,KAAK,EAAE;IAC5C,MAAM,EAAE,UAAU,CAAC;IACnB,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC,GAC5C,OAAO,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,GAAG;QACtC,IAAI,CAAC,EAAE,YAAY,CAAC;KACrB,CAAC;IACJ,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,IAAI,CAAC,cAAc,EAAE,WAAW,GAAG,aAAa,GAAG,aAAa,CAAC,GACzE,OAAO,CACL,IAAI,CACF,cAAc,EACZ,SAAS,GACT,QAAQ,GACR,OAAO,GACP,gBAAgB,GAChB,wBAAwB,GACxB,WAAW,CACd,CACF,CAAC;IACJ,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,KAAK,cAAc,CAAC,UAAU,CAAC,CAAC;AAEjC;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,EAAE,uBAqHjC,CAAC"}

package/dist/plugin/react-client/handleWorkerRscStream.js

@@ -4,17 +4,44 @@
  * MIT License
  */
 import { createWorkerStream } from './createWorkerStream.js';
+import { toError } from '../error/toError.js';
 
-function handleWorkerRscStream({
+const handleWorkerRscStream = function _handleWorkerRscStream({
   worker,
   message,
   logger,
   handlers,
-  verbose = false
+  verbose = false,
+  rscTimeout
 }) {
   let isFlowing = false;
+  let isClosed = false;
+  let hasError = false;
   return new ReadableStream({
     async start(controller) {
+      const handleError = (error, errorInfo) => {
+        if (hasError) return;
+        hasError = true;
+        const errorToThrow = toError(error);
+        const messageToLog = typeof errorToThrow.message === "string" ? errorToThrow.message : void 0;
+        const stackToLog = errorToThrow.stack ? errorToThrow.stack : void 0;
+        if (messageToLog && !stackToLog) {
+          logger.error(`[rsc-worker-error] ${messageToLog}`, { error: errorToThrow });
+        }
+        if (stackToLog) {
+          logger.error(`[rsc-worker-stack] ${stackToLog}`, { error: errorToThrow });
+        }
+        if (errorInfo != null && typeof errorInfo === "object" && "reason" in errorInfo && typeof errorInfo["reason"] === "string") {
+          logger.error(errorInfo["reason"]);
+        }
+        if (!isClosed) {
+          isClosed = true;
+          try {
+            controller.close();
+          } catch {
+          }
+        }
+      };
       try {
         if (verbose) logger.info("[react-client] Starting stream");
         for await (const chunk of createWorkerStream({
@@ -22,43 +49,51 @@ function handleWorkerRscStream({
           message,
           logger,
           handlers: {
-            ...handlers,
-            onServerAction: (id, args) => {
-              if (verbose) logger.info(`[react-client] Forwarding server action ${id} to worker`);
-              handlers.onServerAction?.(id, args);
-            },
-            onServerActionResponse: (id, result, error) => {
-              if (verbose) logger.info(`[react-client] Forwarding server action response ${id} from worker`);
-              if (typeof handlers.onServerActionResponse === "function") {
-                const response = {
-                  type: "server-action-response",
-                  returnValue: error ? { success: false, error } : result
-                  // Direct result, no success/data wrapper
-                };
-                handlers.onServerActionResponse(id, response);
+            // Only keep non-data handlers for side effects
+            onMetrics: handlers.onMetrics,
+            onHmrAccept: handlers.onHmrAccept,
+            onHmrUpdate: handlers.onHmrUpdate,
+            onServerAction: handlers.onServerAction,
+            onServerActionResponse: handlers.onServerActionResponse,
+            onCssFile: handlers.onCssFile,
+            onError: (id, error, errorInfo) => {
+              handleError(error, errorInfo);
+              if (handlers.onError) {
+                handlers.onError(id, error, errorInfo);
               }
             }
           },
-          verbose
+          verbose,
+          rscTimeout
         })) {
           if (!isFlowing) {
             isFlowing = true;
             if (verbose) logger.info("[react-client] Stream is flowing");
           }
-          controller.enqueue(chunk);
+          if (!isClosed && !hasError) {
+            controller.enqueue(chunk);
+          }
+          if (handlers.onData) {
+            handlers.onData(message?.id ?? message.route, chunk);
+          }
         }
-      } catch (error) {
-        controller.error(error);
-      } finally {
         if (isFlowing) {
           isFlowing = false;
           if (verbose) logger.info("[react-client] Stream closing");
         }
-        controller.close();
+        if (!isClosed && !hasError) {
+          isClosed = true;
+          controller.close();
+        }
+        if (handlers.onEnd) {
+          handlers.onEnd(message?.id ?? message.route);
+        }
+      } catch (error) {
+        handleError(error);
       }
     }
   });
-}
+};
 
 export { handleWorkerRscStream };
-//# sourceMappingURL=handleWorkerRscStream.js.map
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"handleWorkerRscStream.js","sources":["../../../plugin/react-client/handleWorkerRscStream.ts"],"sourcesContent":["import type { Logger } from \"vite\";\nimport type { RscRenderMessage } from \"../worker/rsc/types.js\";\nimport type { StreamHandlers } from \"../worker/types.js\";\nimport { createWorkerStream } from \"./createWorkerStream.js\";\nimport type { Worker as NodeWorker } from \"node:worker_threads\";\nimport { toError } from \"../error/toError.js\";\n\nexport type HandleWorkerRscStreamFn = (props: {\n  worker: NodeWorker;\n  message: Omit<RscRenderMessage, \"type\" | \"id\"> &\n    Partial<Pick<RscRenderMessage, \"id\">> & {\n      type?: \"RSC_RENDER\";\n    };\n  logger: Logger;\n  handlers: Pick<StreamHandlers, \"onMetrics\" | \"onHmrAccept\" | \"onHmrUpdate\"> &\n    Partial<\n      Pick<\n        StreamHandlers,\n        | \"onError\"\n        | \"onData\"\n        | \"onEnd\"\n        | \"onServerAction\"\n        | \"onServerActionResponse\"\n        | \"onCssFile\"\n      >\n    >;\n  verbose?: boolean;\n  rscTimeout?: number;\n}) => ReadableStream<Uint8Array>;\n\n/**\n * Handles the RSC stream from the worker.\n * Creates a ReadableStream that pipes RSC chunks to the response.\n *\n * @param worker - The worker thread\n * @param message - The RSC render message\n * @returns A ReadableStream that yields RSC chunks\n */\nexport const handleWorkerRscStream: HandleWorkerRscStreamFn =\n  function _handleWorkerRscStream({\n    worker,\n    message,\n    logger,\n    handlers,\n    verbose = false,\n    rscTimeout,\n  }) {\n    // Create a ReadableStream from the async generator\n    let isFlowing = false;\n    let isClosed = false;\n    let hasError = false;\n\n    return new ReadableStream<Uint8Array>({\n      async start(controller) {\n        const handleError = (\n          error: unknown,\n          errorInfo?: Record<string, unknown>\n        ) => {\n          if (hasError) return; // Prevent double error handling\n          hasError = true;\n          const errorToThrow = toError(error);\n\n          // Ensure we log the error message properly, even if it's somehow an object\n          const messageToLog =\n            typeof errorToThrow.message === \"string\"\n              ? errorToThrow.message\n              : undefined;\n\n          const stackToLog = errorToThrow.stack\n            ? errorToThrow.stack\n            : undefined;\n          if (messageToLog && !stackToLog) {\n            logger.error(`[rsc-worker-error] ${messageToLog}`, {error: errorToThrow});\n          }\n          if (stackToLog) {\n            logger.error(`[rsc-worker-stack] ${stackToLog}`, {error: errorToThrow});\n          }\n          if (errorInfo != null && typeof errorInfo === \"object\" && 'reason' in errorInfo && typeof errorInfo[\"reason\"] === \"string\") {\n            logger.error(errorInfo[\"reason\"]);  \n          }\n          if (!isClosed) {\n            isClosed = true;\n            try {\n              controller.close();\n            } catch {\n              // Ignore errors from trying to close an already closed controller\n            }\n          }\n        };\n\n        try {\n          if (verbose) logger.info(\"[react-client] Starting stream\");\n\n          // Pure generator approach - process chunks directly\n          for await (const chunk of createWorkerStream({\n            worker,\n            message,\n            logger,\n            handlers: {\n              // Only keep non-data handlers for side effects\n              onMetrics: handlers.onMetrics,\n              onHmrAccept: handlers.onHmrAccept,\n              onHmrUpdate: handlers.onHmrUpdate,\n              onServerAction: handlers.onServerAction,\n              onServerActionResponse: handlers.onServerActionResponse,\n              onCssFile: handlers.onCssFile,\n              onError: (\n                id: string,\n                error: unknown,\n                errorInfo?: Record<string, unknown>\n              ) => {\n                handleError(error, errorInfo);\n                if (handlers.onError) {\n                  handlers.onError(id, error, errorInfo);\n                }\n              },\n            },\n            verbose,\n            rscTimeout,\n          })) {\n            // Process chunks directly from generator\n            if (!isFlowing) {\n              isFlowing = true;\n              if (verbose) logger.info(\"[react-client] Stream is flowing\");\n            }\n\n            if (!isClosed && !hasError) {\n              controller.enqueue(chunk);\n            }\n\n            // Call onData handler if provided\n            if (handlers.onData) {\n              handlers.onData(message?.id ?? message.route, chunk);\n            }\n          }\n\n          // Stream ended naturally\n          if (isFlowing) {\n            isFlowing = false;\n            if (verbose) logger.info(\"[react-client] Stream closing\");\n          }\n          if (!isClosed && !hasError) {\n            isClosed = true;\n            controller.close();\n          }\n\n          // Call onEnd handler if provided\n          if (handlers.onEnd) {\n            handlers.onEnd(message?.id ?? message.route);\n          }\n        } catch (error) {\n          handleError(error);\n        }\n      },\n    });\n  };\n"],"names":[],"mappings":"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"}

package/dist/plugin/react-client/handleWorkerServerAction.d.ts

@@ -1,5 +1,6 @@
 import type { ViteDevServer } from "vite";
 import type { Worker } from "node:worker_threads";
+import type { IncomingMessage, ServerResponse } from "node:http";
 /**
  * Handles server action requests in the worker scenario.
  *
@@ -8,5 +9,5 @@ import type { Worker } from "node:worker_threads";
  * @param worker - The worker thread
  * @param logger - The Vite logger
  */
-export declare function handleWorkerServerAction(req: any, res: any, worker: Worker, logger: ViteDevServer["config"]["logger"]): Promise<void>;
+export declare function handleWorkerServerAction(req: IncomingMessage, res: ServerResponse, worker: Worker, logger: ViteDevServer["config"]["logger"]): Promise<void>;
 //# sourceMappingURL=handleWorkerServerAction.d.ts.map

package/dist/plugin/react-client/handleWorkerServerAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handleWorkerServerAction.d.ts","sourceRoot":"","sources":["../../../plugin/react-client/handleWorkerServerAction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAUlD;;;;;;;GAOG;AACH,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,iBAkD1C"}
+{"version":3,"file":"handleWorkerServerAction.d.ts","sourceRoot":"","sources":["../../../plugin/react-client/handleWorkerServerAction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAUlD,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAGjE;;;;;;;GAOG;AACH,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,cAAc,EACnB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,iBAqE1C"}

package/dist/plugin/react-client/handleWorkerServerAction.js

@@ -3,45 +3,60 @@
  * Copyright (c) Nico Brinkkemper
  * MIT License
  */
-import { logError } from '../error/toError.js';
-import { parseServerActionRequest, setupServerActionHeaders, createServerActionStream, handleServerActionError } from '../helpers/handleServerAction.js';
+import { createServerActionStream, parseServerActionRequest, setupServerActionHeaders, handleServerActionError } from '../helpers/handleServerAction.js';
+import { cleanupWorkerServerAction } from './cleanupWorkerServerAction.js';
 
 async function handleWorkerServerAction(req, res, worker, logger) {
+  let messageHandler = null;
+  const passThrough = createServerActionStream(res);
   try {
     const chunks = [];
     for await (const chunk of req) {
       chunks.push(chunk);
     }
     const body = Buffer.concat(chunks).toString();
-    const { id, args } = parseServerActionRequest(body, req.url);
-    setupServerActionHeaders(res);
-    worker.postMessage({
-      type: "SERVER_ACTION",
-      id,
-      args
-    });
-    const passThrough = createServerActionStream(res);
-    const messageHandler = (message) => {
-      if (message.type === "RSC_CHUNK") {
-        passThrough.write(message.chunk);
-      } else if (message.type === "RSC_END") {
-        passThrough.end();
-        worker.removeListener("message", messageHandler);
-      } else if (message.type === "ERROR") {
-        passThrough.end();
-        worker.removeListener("message", messageHandler);
-        logError(message.error, logger);
+    try {
+      const { id, args } = parseServerActionRequest(body, req.url);
+      setupServerActionHeaders(res);
+      worker.postMessage({
+        type: "SERVER_ACTION",
+        id,
+        args
+      });
+      messageHandler = (message) => {
+        if (message.type === "RSC_CHUNK") {
+          passThrough.write(message.chunk);
+        } else if (message.type === "RSC_END") {
+          if (messageHandler) {
+            cleanupWorkerServerAction(passThrough, worker, messageHandler, res);
+          }
+        } else if (message.type === "ERROR") {
+          if (messageHandler) {
+            cleanupWorkerServerAction(passThrough, worker, messageHandler, res, message.error, logger);
+          }
+        }
+      };
+      worker.on("message", messageHandler);
+      passThrough.on("error", (error) => {
+        if (messageHandler) {
+          cleanupWorkerServerAction(passThrough, worker, messageHandler, res, error, logger);
+        }
+      });
+    } catch (parseError) {
+      if (passThrough && messageHandler) {
+        cleanupWorkerServerAction(passThrough, worker, messageHandler, res, parseError, logger);
+      } else {
+        handleServerActionError(parseError, res, logger);
       }
-    };
-    worker.on("message", messageHandler);
-    passThrough.on("error", (error) => {
-      logError(error, logger);
-      res.end();
-    });
+    }
   } catch (error) {
-    handleServerActionError(error, res, logger);
+    if (passThrough && messageHandler) {
+      cleanupWorkerServerAction(passThrough, worker, messageHandler, res, error, logger);
+    } else {
+      handleServerActionError(error, res, logger);
+    }
   }
 }
 
 export { handleWorkerServerAction };
-//# sourceMappingURL=handleWorkerServerAction.js.map
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGFuZGxlV29ya2VyU2VydmVyQWN0aW9uLmpzIiwic291cmNlcyI6WyIuLi8uLi8uLi9wbHVnaW4vcmVhY3QtY2xpZW50L2hhbmRsZVdvcmtlclNlcnZlckFjdGlvbi50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgdHlwZSB7IFZpdGVEZXZTZXJ2ZXIgfSBmcm9tIFwidml0ZVwiO1xuaW1wb3J0IHR5cGUgeyBXb3JrZXIgfSBmcm9tIFwibm9kZTp3b3JrZXJfdGhyZWFkc1wiO1xuaW1wb3J0IHR5cGUgeyBSc2NDaHVua091dHB1dE1lc3NhZ2UsIFJzY1dvcmtlcklucHV0TWVzc2FnZSwgUnNjV29ya2VyT3V0cHV0TWVzc2FnZSB9IGZyb20gXCIuLi93b3JrZXIvcnNjL3R5cGVzLmpzXCI7XG5pbXBvcnQge1xuICBwYXJzZVNlcnZlckFjdGlvblJlcXVlc3QsXG4gIHNldHVwU2VydmVyQWN0aW9uSGVhZGVycyxcbiAgY3JlYXRlU2VydmVyQWN0aW9uU3RyZWFtLFxuICBoYW5kbGVTZXJ2ZXJBY3Rpb25FcnJvclxufSBmcm9tIFwiLi4vaGVscGVycy9oYW5kbGVTZXJ2ZXJBY3Rpb24uanNcIjtcbmltcG9ydCB0eXBlIHsgTWVzc2FnZUhhbmRsZXIgfSBmcm9tIFwiLi4vdHlwZXMuanNcIjtcbmltcG9ydCB7IGNsZWFudXBXb3JrZXJTZXJ2ZXJBY3Rpb24gfSBmcm9tIFwiLi9jbGVhbnVwV29ya2VyU2VydmVyQWN0aW9uLmpzXCI7XG5pbXBvcnQgdHlwZSB7IEluY29taW5nTWVzc2FnZSwgU2VydmVyUmVzcG9uc2UgfSBmcm9tIFwibm9kZTpodHRwXCI7XG5cblxuLyoqXG4gKiBIYW5kbGVzIHNlcnZlciBhY3Rpb24gcmVxdWVzdHMgaW4gdGhlIHdvcmtlciBzY2VuYXJpby5cbiAqIFxuICogQHBhcmFtIHJlcSAtIFRoZSBpbmNvbWluZyByZXF1ZXN0XG4gKiBAcGFyYW0gcmVzIC0gVGhlIHJlc3BvbnNlIG9iamVjdFxuICogQHBhcmFtIHdvcmtlciAtIFRoZSB3b3JrZXIgdGhyZWFkXG4gKiBAcGFyYW0gbG9nZ2VyIC0gVGhlIFZpdGUgbG9nZ2VyXG4gKi9cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiBoYW5kbGVXb3JrZXJTZXJ2ZXJBY3Rpb24oXG4gIHJlcTogSW5jb21pbmdNZXNzYWdlLFxuICByZXM6IFNlcnZlclJlc3BvbnNlLFxuICB3b3JrZXI6IFdvcmtlcixcbiAgbG9nZ2VyOiBWaXRlRGV2U2VydmVyW1wiY29uZmlnXCJdW1wibG9nZ2VyXCJdXG4pIHtcbiAgbGV0IG1lc3NhZ2VIYW5kbGVyOiBNZXNzYWdlSGFuZGxlcjxSc2NDaHVua091dHB1dE1lc3NhZ2U+IHwgbnVsbCA9IG51bGw7XG5cbiAgY29uc3QgcGFzc1Rocm91Z2ggPSBjcmVhdGVTZXJ2ZXJBY3Rpb25TdHJlYW0ocmVzKTtcbiAgdHJ5IHtcbiAgICAvLyBSZWFkIHJlcXVlc3QgYm9keVxuICAgIGNvbnN0IGNodW5rczogQnVmZmVyW10gPSBbXTtcbiAgICBmb3IgYXdhaXQgKGNvbnN0IGNodW5rIG9mIHJlcSkge1xuICAgICAgY2h1bmtzLnB1c2goY2h1bmspO1xuICAgIH1cbiAgICBjb25zdCBib2R5ID0gQnVmZmVyLmNvbmNhdChjaHVua3MpLnRvU3RyaW5nKCk7XG5cbiAgICB0cnkge1xuICAgICAgLy8gUGFyc2UgdGhlIHNlcnZlciBhY3Rpb24gcmVxdWVzdFxuICAgICAgY29uc3QgeyBpZCwgYXJncyB9ID0gcGFyc2VTZXJ2ZXJBY3Rpb25SZXF1ZXN0KGJvZHksIHJlcS51cmwpO1xuXG4gICAgICAvLyBTZXQgdXAgcmVzcG9uc2UgaGVhZGVyc1xuICAgICAgc2V0dXBTZXJ2ZXJBY3Rpb25IZWFkZXJzKHJlcyk7XG5cbiAgICAgIC8vIFNlbmQgc2VydmVyIGFjdGlvbiByZXF1ZXN0IHRvIHdvcmtlclxuICAgICAgd29ya2VyLnBvc3RNZXNzYWdlKHtcbiAgICAgICAgdHlwZTogXCJTRVJWRVJfQUNUSU9OXCIsXG4gICAgICAgIGlkLFxuICAgICAgICBhcmdzLFxuICAgICAgfSBzYXRpc2ZpZXMgUnNjV29ya2VySW5wdXRNZXNzYWdlKTtcblxuICAgICAgLy8gQ3JlYXRlIGEgcGFzcy10aHJvdWdoIHN0cmVhbSBmb3IgdGhlIHJlc3BvbnNlXG5cbiAgICAgIC8vIEhhbmRsZSB3b3JrZXIgbWVzc2FnZXNcbiAgICAgIG1lc3NhZ2VIYW5kbGVyID0gKG1lc3NhZ2U6IFJzY1dvcmtlck91dHB1dE1lc3NhZ2UpID0+IHtcbiAgICAgICAgaWYgKG1lc3NhZ2UudHlwZSA9PT0gXCJSU0NfQ0hVTktcIikge1xuICAgICAgICAgIHBhc3NUaHJvdWdoLndyaXRlKG1lc3NhZ2UuY2h1bmspO1xuICAgICAgICB9IGVsc2UgaWYgKG1lc3NhZ2UudHlwZSA9PT0gXCJSU0NfRU5EXCIpIHtcbiAgICAgICAgICBpZiAobWVzc2FnZUhhbmRsZXIpIHtcbiAgICAgICAgICAgIGNsZWFudXBXb3JrZXJTZXJ2ZXJBY3Rpb24ocGFzc1Rocm91Z2gsIHdvcmtlciwgbWVzc2FnZUhhbmRsZXIsIHJlcyk7XG4gICAgICAgICAgfVxuICAgICAgICB9IGVsc2UgaWYgKG1lc3NhZ2UudHlwZSA9PT0gXCJFUlJPUlwiKSB7XG4gICAgICAgICAgaWYgKG1lc3NhZ2VIYW5kbGVyKSB7XG4gICAgICAgICAgICBjbGVhbnVwV29ya2VyU2VydmVyQWN0aW9uKHBhc3NUaHJvdWdoLCB3b3JrZXIsIG1lc3NhZ2VIYW5kbGVyLCByZXMsIG1lc3NhZ2UuZXJyb3IsIGxvZ2dlcik7XG4gICAgICAgICAgfVxuICAgICAgICB9XG4gICAgICB9O1xuXG4gICAgICB3b3JrZXIub24oXCJtZXNzYWdlXCIsIG1lc3NhZ2VIYW5kbGVyKTtcblxuICAgICAgLy8gSGFuZGxlIGVycm9yc1xuICAgICAgcGFzc1Rocm91Z2gub24oXCJlcnJvclwiLCAoZXJyb3I6IHVua25vd24pID0+IHtcbiAgICAgICAgaWYgKG1lc3NhZ2VIYW5kbGVyKSB7XG4gICAgICAgICAgY2xlYW51cFdvcmtlclNlcnZlckFjdGlvbihwYXNzVGhyb3VnaCwgd29ya2VyLCBtZXNzYWdlSGFuZGxlciwgcmVzLCBlcnJvciwgbG9nZ2VyKTtcbiAgICAgICAgfVxuICAgICAgfSk7XG4gICAgfSBjYXRjaCAocGFyc2VFcnJvcikge1xuICAgICAgLy8gSGFuZGxlIHBhcnNpbmcgZXJyb3JzXG4gICAgICBpZiAocGFzc1Rocm91Z2ggJiYgbWVzc2FnZUhhbmRsZXIpIHtcbiAgICAgICAgY2xlYW51cFdvcmtlclNlcnZlckFjdGlvbihwYXNzVGhyb3VnaCwgd29ya2VyLCBtZXNzYWdlSGFuZGxlciwgcmVzLCBwYXJzZUVycm9yLCBsb2dnZXIpO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgaGFuZGxlU2VydmVyQWN0aW9uRXJyb3IocGFyc2VFcnJvciwgcmVzLCBsb2dnZXIpO1xuICAgICAgfVxuICAgIH1cbiAgfSBjYXRjaCAoZXJyb3I6IHVua25vd24pIHtcbiAgICAvLyBJZiB3ZSBoYXZlIGEgcGFzcy10aHJvdWdoIHN0cmVhbSwgY2xlYW4gaXQgdXBcbiAgICBpZiAocGFzc1Rocm91Z2ggJiYgbWVzc2FnZUhhbmRsZXIpIHtcbiAgICAgIGNsZWFudXBXb3JrZXJTZXJ2ZXJBY3Rpb24ocGFzc1Rocm91Z2gsIHdvcmtlciwgbWVzc2FnZUhhbmRsZXIsIHJlcywgZXJyb3IsIGxvZ2dlcik7XG4gICAgfSBlbHNlIHtcbiAgICAgIC8vIElmIHdlIGhhdmVuJ3Qgc2V0IHVwIHRoZSBzdHJlYW0geWV0LCB1c2UgdGhlIHN0YW5kYXJkIGVycm9yIGhhbmRsZXJcbiAgICAgIGhhbmRsZVNlcnZlckFjdGlvbkVycm9yKGVycm9yLCByZXMsIGxvZ2dlcik7XG4gICAgfVxuICB9XG59ICJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7OztBQXNCQSxlQUFzQix3QkFDcEIsQ0FBQSxHQUFBLEVBQ0EsR0FDQSxFQUFBLE1BQUEsRUFDQSxNQUNBLEVBQUE7QUFDQSxFQUFBLElBQUksY0FBK0QsR0FBQSxJQUFBO0FBRW5FLEVBQU0sTUFBQSxXQUFBLEdBQWMseUJBQXlCLEdBQUcsQ0FB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

package/dist/plugin/react-client/index.d.ts

@@ -1,2 +1,5 @@
-export { reactClientPlugin } from "./plugin.js";
+export * from "./createWorkerStream.js";
+export * from "./handleWorkerRscStream.js";
+export * from "./handleWorkerServerAction.js";
+export { reactClientPlugin as vitePluginReactClient } from "./plugin.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/plugin/react-client/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../plugin/react-client/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../plugin/react-client/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,+BAA+B,CAAC;AAC9C,OAAO,EAAE,iBAAiB,IAAI,qBAAqB,EAAE,MAAM,aAAa,CAAC"}

package/dist/plugin/react-client/index.js

@@ -1 +1,10 @@
-export { reactClientPlugin } from "./plugin.js";
+/**
+ * vite-plugin-react-server
+ * Copyright (c) Nico Brinkkemper
+ * MIT License
+ */
+export { createWorkerStream } from './createWorkerStream.js';
+export { handleWorkerRscStream } from './handleWorkerRscStream.js';
+export { handleWorkerServerAction } from './handleWorkerServerAction.js';
+export { reactClientPlugin as vitePluginReactClient } from './plugin.js';
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VzIjpbXSwic291cmNlc0NvbnRlbnQiOltdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7OzsifQ==

package/dist/plugin/react-client/plugin.d.ts

@@ -1,4 +1,6 @@
-import { type Plugin } from "vite";
-import type { InlineCssOpt, PagePropOpt, StreamPluginOptions } from "../types.js";
-export declare function reactClientPlugin<T extends PagePropOpt = PagePropOpt, InlineCSS extends InlineCssOpt = InlineCssOpt>(options: StreamPluginOptions<T, InlineCSS>): Plugin;
+import type { ReactStreamPluginFn, ReactStreamPluginMeta } from "../types.js";
+export type ReactClientPluginFn = ReactStreamPluginFn<{
+    meta: ReactStreamPluginMeta;
+}>;
+export declare const reactClientPlugin: ReactClientPluginFn;
 //# sourceMappingURL=plugin.d.ts.map

package/dist/plugin/react-client/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../plugin/react-client/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,MAAM,EAAE,MAAM,MAAM,CAAC;AACnD,OAAO,KAAK,EAEV,YAAY,EACZ,WAAW,EAGX,mBAAmB,EACpB,MAAM,aAAa,CAAC;AAQrB,wBAAgB,iBAAiB,CAC/B,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,SAAS,SAAS,YAAY,GAAG,YAAY,EAC7C,OAAO,EAAE,mBAAmB,CAAC,CAAC,EAAE,SAAS,CAAC,GAAG,MAAM,CAqIpD"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../plugin/react-client/plugin.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAEV,mBAAmB,EACnB,qBAAqB,EAEtB,MAAM,aAAa,CAAC;AAQrB,MAAM,MAAM,mBAAmB,GAAG,mBAAmB,CAAC;IACpD,IAAI,EAAE,qBAAqB,CAAC;CAC7B,CAAC,CAAC;AAEH,eAAO,MAAM,iBAAiB,EAAE,mBAqI/B,CAAA"}

package/dist/plugin/react-client/plugin.js

@@ -11,8 +11,7 @@ import { configureWorkerRequestHandler } from './configureWorkerRequestHandler.j
 import { configurePreviewServer } from '../react-static/configurePreviewServer.js';
 import { MessageChannel } from 'node:worker_threads';
 
-function reactClientPlugin(options) {
-  let userOptions;
+const reactClientPlugin = function _reactClientPlugin(options) {
   let userConfig;
   let configEnv;
   let root;
@@ -22,7 +21,7 @@ function reactClientPlugin(options) {
   if (resolvedOptions.type === "error") {
     throw resolvedOptions.error;
   }
-  userOptions = resolvedOptions.userOptions;
+  const userOptions = resolvedOptions.userOptions;
   root = userOptions.projectRoot;
   return {
     name: "vite:react-client",
@@ -74,19 +73,18 @@ function reactClientPlugin(options) {
       }
     },
     // setup dev server
-    async configureServer(server) {
+    configureServer(server) {
       hmrChannel = new MessageChannel();
-      await configureWorkerRequestHandler({
+      configureWorkerRequestHandler({
         server,
         autoDiscoveredFiles,
         userOptions,
-        hmrChannel,
-        onMetrics: userOptions.onMetrics
+        hmrChannel
       });
     },
-    async handleHotUpdate({ file, server, read, timestamp, ...ctx }) {
+    async handleHotUpdate({ file, server, timestamp, ...ctx }) {
       try {
-        const isPageFile = userOptions.autoDiscover.modulePattern(file);
+        const isPageFile = userOptions.autoDiscover.modulePattern.test(file);
         if (!isPageFile) return;
         const [, value] = userOptions.normalizer(file);
         const affectedRoutes = autoDiscoveredFiles.routeMap.get(value) || [];
@@ -117,7 +115,7 @@ function reactClientPlugin(options) {
       }
     }
   };
-}
+};
 
 export { reactClientPlugin };
-//# sourceMappingURL=plugin.js.map
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"plugin.js","sources":["../../../plugin/react-client/plugin.ts"],"sourcesContent":["import { type ConfigEnv } from \"vite\";\nimport type {\n  AutoDiscoveredFiles,\n  ReactStreamPluginFn,\n  ReactStreamPluginMeta,\n  ResolvedUserConfig,\n} from \"../types.js\";\nimport { resolveOptions } from \"../config/resolveOptions.js\";\nimport { resolveUserConfig } from \"../config/resolveUserConfig.js\";\nimport { resolveAutoDiscover } from \"../config/autoDiscover/resolveAutoDiscover.js\";\nimport { configureWorkerRequestHandler } from \"./configureWorkerRequestHandler.js\";\nimport { configurePreviewServer } from \"../react-static/configurePreviewServer.js\";\nimport { MessageChannel } from \"node:worker_threads\";\n\nexport type ReactClientPluginFn = ReactStreamPluginFn<{\n  meta: ReactStreamPluginMeta;\n}>;\n\nexport const reactClientPlugin: ReactClientPluginFn = function _reactClientPlugin(\n  options\n) {\n  let userConfig: ResolvedUserConfig;\n  let configEnv: ConfigEnv;\n  let root: string;\n  let autoDiscoveredFiles: AutoDiscoveredFiles;\n  let hmrChannel: MessageChannel | null = null;\n\n  const resolvedOptions = resolveOptions(options);\n  if (resolvedOptions.type === \"error\") {\n    throw resolvedOptions.error;\n  }\n  const userOptions = resolvedOptions.userOptions;\n  root = userOptions.projectRoot;\n\n  return {\n    name: \"vite:react-client\",\n\n    async config(config, viteConfigEnv) {\n      configEnv = viteConfigEnv;\n      if (\n        typeof config.root === \"string\" &&\n        config.root !== root &&\n        config.root !== process.cwd() &&\n        config.root !== \"\"\n      ) {\n        root = config.root;\n        userOptions.projectRoot = root;\n      }\n\n      const autoDiscoverResult = await resolveAutoDiscover({\n        config,\n        configEnv,\n        userOptions,\n        condition: \"react-client\",\n      });\n      if (autoDiscoverResult.type === \"error\") {\n        throw autoDiscoverResult.error;\n      }\n      autoDiscoveredFiles = autoDiscoverResult.autoDiscoveredFiles;\n\n      const resolvedConfig = resolveUserConfig({\n        condition: \"react-client\",\n        config,\n        configEnv,\n        userOptions,\n        autoDiscoveredFiles,\n      });\n\n      if (resolvedConfig.type === \"error\") {\n        throw resolvedConfig.error;\n      }\n\n      userConfig = resolvedConfig.userConfig;\n      return userConfig;\n    },\n    async configurePreviewServer(server) {\n      await configurePreviewServer({\n        server,\n        userOptions,\n      });\n    },\n    async writeBundle(options, bundle) {\n      if (userOptions.onEvent) {\n        userOptions.onEvent({\n          type: `build.writeBundle.${\n            userConfig.build.ssr ? \"client\" : \"static-client\"\n          }`,\n          data: {\n            pages: [...autoDiscoveredFiles.routeMap.keys()],\n            options,\n            bundle,\n          },\n        });\n      }\n    },\n    // setup dev server\n    configureServer(server) {\n      // Create HMR message channel\n      hmrChannel = new MessageChannel();\n      configureWorkerRequestHandler({\n        server,\n        autoDiscoveredFiles,\n        userOptions,\n        hmrChannel,\n      });\n    },\n\n    async handleHotUpdate({ file, server, timestamp, ...ctx }) {\n      try {\n        // Check if the file is a page or props file\n        const isPageFile = userOptions.autoDiscover.modulePattern.test(file);\n        if (!isPageFile) return;\n\n        // Get the route for this file\n        const [, value] = userOptions.normalizer(file);\n\n        // Find all routes affected by this file change\n        const affectedRoutes = autoDiscoveredFiles.routeMap.get(value) || [];\n\n        // Send HMR update directly to worker through MessageChannel\n        if (hmrChannel?.port1) {\n          hmrChannel.port1.postMessage({\n            type: \"HMR_UPDATE\",\n            path: file,\n            timestamp,\n            routes: affectedRoutes,\n          });\n\n          // Trigger a full page refresh for affected routes\n          for (const route of affectedRoutes) {\n            server.ws.send({\n              type: \"full-reload\",\n              path: route,\n            });\n          }\n        }\n\n        // Let Vite handle the HMR update\n        return ctx.modules;\n      } catch (error) {\n        if (hmrChannel?.port1) {\n          hmrChannel.port1.postMessage({\n            type: \"HMR_ERROR\",\n            path: file,\n            error: error instanceof Error ? error.message : String(error),\n          });\n        }\n        return ctx.modules;\n      }\n    },\n  };\n}\n"],"names":["options"],"mappings":";;;;;;;;;;;;;AAkBa,MAAA,iBAAA,GAAyC,SAAS,kBAAA,CAC7D,OACA,EAAA;AACA,EAAI,IAAA,UAAA;AACJ,EAAI,IAAA,SAAA;AACJ,EAAI,IAAA,IAAA;AACJ,EAAI,IAAA,mBAAA;AACJ,EAAA,IAAI,UAAoC,GAAA,IAAA;AAExC,EAAM,MAAA,eAAA,GAAkB,eAAe,OAAO,CAAA;AAC9C,EAAI,IAAA,eAAA,CAAgB,SAAS,OAAS,EAAA;AACpC,IAAA,MAAM,eAAgB,CAAA,KAAA;AAAA;AAExB,EAAA,MAAM,cAAc,eAAgB,CAAA,WAAA;AACpC,EAAA,IAAA,GAAO,WAAY,CAAA,WAAA;AAEnB,EAAO,OAAA;AAAA,IACL,IAAM,EAAA,mBAAA;AAAA,IAEN,MAAM,MAAO,CAAA,MAAA,EAAQ,aAAe,EAAA;AAClC,MAAY,SAAA,GAAA,aAAA;AACZ,MAAA,IACE,OAAO,MAAA,CAAO,IAAS,KAAA,QAAA,IACvB,OAAO,IAAS,KAAA,IAAA,IAChB,MAAO,CAAA,IAAA,KAAS,OAAQ,CAAA,GAAA,EACxB,IAAA,MAAA,CAAO,SAAS,EAChB,EAAA;AACA,QAAA,IAAA,GAAO,MAAO,CAAA,IAAA;AACd,QAAA,WAAA,CAAY,WAAc,GAAA,IAAA;AAAA;AAG5B,MAAM,MAAA,kBAAA,GAAqB,MAAM,mBAAoB,CAAA;AAAA,QACnD,MAAA;AAAA,QACA,SAAA;AAAA,QACA,WAAA;AAAA,QACA,SAAW,EAAA;AAAA,OACZ,CAAA;AACD,MAAI,IAAA,kBAAA,CAAmB,SAAS,OAAS,EAAA;AACvC,QAAA,MAAM,kBAAmB,CAAA,KAAA;AAAA;AAE3B,MAAA,mBAAA,GAAsB,kBAAmB,CAAA,mBAAA;AAEzC,MAAA,MAAM,iBAAiB,iBAAkB,CAAA;AAAA,QACvC,SAAW,EAAA,cAAA;AAAA,QACX,MAAA;AAAA,QACA,SAAA;AAAA,QACA,WAAA;AAAA,QACA;AAAA,OACD,CAAA;AAED,MAAI,IAAA,cAAA,CAAe,SAAS,OAAS,EAAA;AACnC,QAAA,MAAM,cAAe,CAAA,KAAA;AAAA;AAGvB,MAAA,UAAA,GAAa,cAAe,CAAA,UAAA;AAC5B,MAAO,OAAA,UAAA;AAAA,KACT;AAAA,IACA,MAAM,uBAAuB,MAAQ,EAAA;AACnC,MAAA,MAAM,sBAAuB,CAAA;AAAA,QAC3B,MAAA;AAAA,QACA;AAAA,OACD,CAAA;AAAA,KACH;AAAA,IACA,MAAM,WAAYA,CAAAA,QAAAA,EAAS,MAAQ,EAAA;AACjC,MAAA,IAAI,YAAY,OAAS,EAAA;AACvB,QAAA,WAAA,CAAY,OAAQ,CAAA;AAAA,UAClB,MAAM,CACJ,kBAAA,EAAA,UAAA,CAAW,KAAM,CAAA,GAAA,GAAM,WAAW,eACpC,CAAA,CAAA;AAAA,UACA,IAAM,EAAA;AAAA,YACJ,OAAO,CAAC,GAAG,mBAAoB,CAAA,QAAA,CAAS,MAAM,CAAA;AAAA,YAC9C,OAAAA,EAAAA,QAAAA;AAAA,YACA;AAAA;AACF,SACD,CAAA;AAAA;AACH,KACF;AAAA;AAAA,IAEA,gBAAgB,MAAQ,EAAA;AAEtB,MAAA,UAAA,GAAa,IAAI,cAAe,EAAA;AAChC,MAA8B,6BAAA,CAAA;AAAA,QAC5B,MAAA;AAAA,QACA,mBAAA;AAAA,QACA,WAAA;AAAA,QACA;AAAA,OACD,CAAA;AAAA,KACH;AAAA,IAEA,MAAM,gBAAgB,EAAE,IAAA,EAAM,QAAQ,SAAW,EAAA,GAAG,KAAO,EAAA;AACzD,MAAI,IAAA;AAEF,QAAA,MAAM,UAAa,GAAA,WAAA,CAAY,YAAa,CAAA,aAAA,CAAc,KAAK,IAAI,CAAA;AACnE,QAAA,IAAI,CAAC,UAAY,EAAA;AAGjB,QAAA,MAAM,GAAG,KAAK,CAAI,GAAA,WAAA,CAAY,WAAW,IAAI,CAAA;AAG7C,QAAA,MAAM,iBAAiB,mBAAoB,CAAA,QAAA,CAAS,GAAI,CAAA,KAAK,KAAK,EAAC;AAGnE,QAAA,IAAI,YAAY,KAAO,EAAA;AACrB,UAAA,UAAA,CAAW,MAAM,WAAY,CAAA;AAAA,YAC3B,IAAM,EAAA,YAAA;AAAA,YACN,IAAM,EAAA,IAAA;AAAA,YACN,SAAA;AAAA,YACA,MAAQ,EAAA;AAAA,WACT,CAAA;AAGD,UAAA,KAAA,MAAW,SAAS,cAAgB,EAAA;AAClC,YAAA,MAAA,CAAO,GAAG,IAAK,CAAA;AAAA,cACb,IAAM,EAAA,aAAA;AAAA,cACN,IAAM,EAAA;AAAA,aACP,CAAA;AAAA;AACH;AAIF,QAAA,OAAO,GAAI,CAAA,OAAA;AAAA,eACJ,KAAO,EAAA;AACd,QAAA,IAAI,YAAY,KAAO,EAAA;AACrB,UAAA,UAAA,CAAW,MAAM,WAAY,CAAA;AAAA,YAC3B,IAAM,EAAA,WAAA;AAAA,YACN,IAAM,EAAA,IAAA;AAAA,YACN,OAAO,KAAiB,YAAA,KAAA,GAAQ,KAAM,CAAA,OAAA,GAAU,OAAO,KAAK;AAAA,WAC7D,CAAA;AAAA;AAEH,QAAA,OAAO,GAAI,CAAA,OAAA;AAAA;AACb;AACF,GACF;AACF;;;;"}