Enhance error handling in server component rendering and RSC payload processing by adding catch blocks for promise rejections and error events in streams.

Author: AbanoubGhadban

node_package/src/ReactOnRailsRSC.ts

@@ -50,9 +50,12 @@ const streamRenderRSCComponent = (
 
   const initializeAndRender = async () => {
     if (!serverRendererPromise) {
-      serverRendererPromise = loadJsonFile<BundleManifest>(reactClientManifestFileName).then(
-        (reactClientManifest) => buildServerRenderer(reactClientManifest),
-      );
+      serverRendererPromise = loadJsonFile<BundleManifest>(reactClientManifestFileName)
+        .then((reactClientManifest) => buildServerRenderer(reactClientManifest))
+        .catch((err: unknown) => {
+          serverRendererPromise = undefined;
+          throw err;
+        });
     }
 
     const { renderToPipeableStream } = await serverRendererPromise;

node_package/src/getReactServerComponent.server.ts

@@ -21,9 +21,14 @@ const createFromReactOnRailsNodeStream = async (
     clientRendererPromise = Promise.all([
       loadJsonFile<BundleManifest>(reactServerManifestFileName),
       loadJsonFile<BundleManifest>(reactClientManifestFileName),
-    ]).then(([reactServerManifest, reactClientManifest]) =>
-      buildClientRenderer(reactClientManifest, reactServerManifest),
-    );
+    ])
+      .then(([reactServerManifest, reactClientManifest]) =>
+        buildClientRenderer(reactClientManifest, reactServerManifest),
+      )
+      .catch((err: unknown) => {
+        clientRendererPromise = undefined;
+        throw err;
+      });
   }
 
   const { createFromNodeStream } = await clientRendererPromise;

node_package/src/injectRSCPayload.ts

@@ -122,6 +122,10 @@ export default function injectRSCPayload(
     }, 0);
   });
 
+  htmlStream.on('error', (err) => {
+    resultStream.emit('error', err);
+  });
+
   htmlStream.on('end', () => {
     if (timeout) {
       clearTimeout(timeout);

node_package/src/types/index.ts

@@ -481,11 +481,10 @@ export interface ReactOnRailsInternal extends ReactOnRails {
   ) => Promise<NodeJS.ReadableStream>;
 
   /**
-   /**
-    * Retrieves all React Server Component (RSC) payload streams generated for a specific rendering request.
-    * @param railsContext - The Rails context of the current rendering request.
-    * @returns An array of objects, each containing the component name and its corresponding NodeJS.ReadableStream.
-    */
+   * Retrieves all React Server Component (RSC) payload streams generated for a specific rendering request.
+   * @param railsContext - The Rails context of the current rendering request.
+   * @returns An array of objects, each containing the component name and its corresponding NodeJS.ReadableStream.
+   */
   getRSCPayloadStreams?: (railsContext: RailsContextWithServerComponentCapabilities) => {
     componentName: string;
     props: unknown;