Handle errors happen during streaming components

lib/react_on_rails/helper.rb

@@ -570,6 +570,22 @@ def props_string(props)
       props.is_a?(String) ? props : props.to_json
     end
 
+    def raise_prerender_error(json_result, react_component_name, props, js_code)
+      raise ReactOnRails::PrerenderError.new(
+        component_name: react_component_name,
+        props: sanitized_props_string(props),
+        err: nil,
+        js_code: js_code,
+        console_messages: json_result["consoleReplayScript"]
+      )
+    end
+
+    def should_raise_streaming_prerender_error?(chunk_json_result, render_options)
+      chunk_json_result["hasErrors"] &&
+        ((render_options.raise_on_prerender_error && !chunk_json_result["isShellReady"]) ||
+         (render_options.raise_non_shell_server_rendering_errors && chunk_json_result["isShellReady"]))
+    end
+
     # Returns object with values that are NOT html_safe!
     def server_rendered_react_component(render_options)
       return { "html" => "", "consoleReplayScript" => "" } unless render_options.prerender
@@ -617,19 +633,18 @@ def server_rendered_react_component(render_options)
                                                js_code: js_code)
       end
 
-      # TODO: handle errors for streams
-      return result if render_options.stream?
-
-      if result["hasErrors"] && render_options.raise_on_prerender_error
-        # We caught this exception on our backtrace handler
-        raise ReactOnRails::PrerenderError.new(component_name: react_component_name,
-                                               # Sanitize as this might be browser logged
-                                               props: sanitized_props_string(props),
-                                               err: nil,
-                                               js_code: js_code,
-                                               console_messages: result["consoleReplayScript"])
-
+      if render_options.stream?
+        result.transform do |chunk_json_result|
+          if should_raise_streaming_prerender_error?(chunk_json_result, render_options)
+            raise_prerender_error(chunk_json_result, react_component_name, props, js_code)
+          end
+          # It doesn't make any transformation, it listens to the streamed chunks and raise error if it has errors
+          chunk_json_result
+        end
+      elsif result["hasErrors"] && render_options.raise_on_prerender_error
+        raise_prerender_error(result, react_component_name, props, js_code)
       end
+
       result
     end
 

lib/react_on_rails/react_component/render_options.rb

@@ -87,6 +87,10 @@ def raise_on_prerender_error
         retrieve_configuration_value_for(:raise_on_prerender_error)
       end
 
+      def raise_non_shell_server_rendering_errors
+        retrieve_react_on_rails_pro_config_value_for(:raise_non_shell_server_rendering_errors)
+      end
+
       def logging_on_server
         retrieve_configuration_value_for(:logging_on_server)
       end
@@ -128,6 +132,14 @@ def retrieve_configuration_value_for(key)
           ReactOnRails.configuration.public_send(key)
         end
       end
+
+      def retrieve_react_on_rails_pro_config_value_for(key)
+        options.fetch(key) do
+          return nil unless ReactOnRails::Utils.react_on_rails_pro?
+
+          ReactOnRailsPro.configuration.public_send(key)
+        end
+      end
     end
   end
 end

node_package/src/serverRenderReactComponent.ts

@@ -1,5 +1,5 @@
 import ReactDOMServer from 'react-dom/server';
-import { PassThrough, Readable, Transform } from 'stream';
+import { PassThrough, Readable } from 'stream';
 import type { ReactElement } from 'react';
 
 import ComponentRegistry from './ComponentRegistry';
@@ -195,16 +195,19 @@ const serverRenderReactComponent: typeof serverRenderReactComponentInternal = (o
 
 const stringToStream = (str: string): Readable => {
   const stream = new PassThrough();
-  stream.push(str);
-  stream.push(null);
+  stream.write(str);
+  stream.end();
   return stream;
 };
 
 export const streamServerRenderedReactComponent = (options: RenderParams): Readable => {
   const { name: componentName, domNodeId, trace, props, railsContext, throwJsErrors } = options;
 
   let renderResult: null | Readable = null;
+  let hasErrors = false;
+  let isShellReady = false;
   let previouslyReplayedConsoleMessages: number = 0;
+  let consoleHistory: typeof console['history'] | undefined;
 
   try {
     const componentObj = ComponentRegistry.get(componentName);
@@ -222,8 +225,8 @@ export const streamServerRenderedReactComponent = (options: RenderParams): Reada
       throw new Error('Server rendering of streams is not supported for server render hashes or promises.');
     }
 
-    const consoleHistory = console.history;
-    const transformStream = new Transform({
+    consoleHistory = console.history;
+    const transformStream = new PassThrough({
       transform(chunk, _, callback) {
         const htmlChunk = chunk.toString();
         const consoleReplayScript = buildConsoleReplay(consoleHistory, previouslyReplayedConsoleMessages);
@@ -232,14 +235,38 @@ export const streamServerRenderedReactComponent = (options: RenderParams): Reada
         const jsonChunk = JSON.stringify({
           html: htmlChunk,
           consoleReplayScript,
+          hasErrors,
+          isShellReady,
         });
-        
+
         this.push(jsonChunk);
         callback();
       }
     });
 
-    ReactDOMServer.renderToPipeableStream(reactRenderingResult).pipe(transformStream);
+    const renderingStream = ReactDOMServer.renderToPipeableStream(reactRenderingResult, {
+      onShellError(e) {
+        // Can't through error here if throwJsErrors is true because the error will happen inside the stream
+        // And will not be handled by any catch clause
+        hasErrors = true;
+        const error = e instanceof Error ? e : new Error(String(e));
+        transformStream.write(handleError({
+          e: error,
+          name: componentName,
+          serverSide: true,
+        }));
+        transformStream.end();
+      },
+      onShellReady() {
+        isShellReady = true;
+        renderingStream.pipe(transformStream);
+      },
+      onError() {
+        // Can't through error here if throwJsErrors is true because the error will happen inside the stream
+        // And will not be handled by any catch clause
+        hasErrors = true;
+      },
+    });
 
     renderResult = transformStream;
   } catch (e) {
@@ -248,10 +275,15 @@ export const streamServerRenderedReactComponent = (options: RenderParams): Reada
     }
 
     const error = e instanceof Error ? e : new Error(String(e));
-    renderResult = stringToStream(handleError({
-      e: error,
-      name: componentName,
-      serverSide: true,
+    renderResult = stringToStream(JSON.stringify({
+      html: handleError({
+        e: error,
+        name: componentName,
+        serverSide: true,
+      }),
+      consoleReplayScript: buildConsoleReplay(consoleHistory, previouslyReplayedConsoleMessages),
+      hasErrors: true,
+      isShellReady,
     }));
   }