@bleedingdev/modern-js-runtime 3.9.0-ultramodern.3 → 3.9.0-ultramodern.5

package/dist/esm/core/server/stream/createReadableStream.mjs

@@ -1,147 +1,232 @@
 import { storage } from "@modern-js/runtime-utils/node";
 import { SSR_HYDRATION_ID_PREFIX } from "@modern-js/utils/universal/constants";
-import { PassThrough, Readable, Transform } from "stream";
+import { PassThrough, Readable, Transform, finished, pipeline } from "stream";
 import { ESCAPED_SHELL_STREAM_END_MARK } from "../../../common.mjs";
 import { RenderLevel } from "../../constants.mjs";
-import { getGlobalInternalRuntimeContext } from "../../context/index.mjs";
+import { getGlobalEnableRsc, getGlobalInternalRuntimeContext } from "../../context/index.mjs";
 import { getMonitors } from "../../context/monitors/index.mjs";
+import { wrapRuntimeComponentResolver } from "../../react/wrapper.mjs";
 import { createReplaceHelemt, getHelmetData } from "../helmet.mjs";
+import { createSSRRenderLifecycle, createSSRStreamErrorReporter, observeSSRStream, orderSSRStreamTransforms } from "../shared.mjs";
 import { enqueueFromEntries } from "./deferredScript.mjs";
 import { ShellChunkStatus, getReadableStreamFromString, resolveStreamingMode } from "./shared.mjs";
 import { getTemplates } from "./template.mjs";
-import * as __rspack_external__modern_js_runtime_extensions_node_f016b1ee from "@modern-js/runtime-extensions/node";
-const defaultExtender = {
-    modifyRootElement: (rootElement)=>rootElement,
-    getStyleTags: ()=>'',
-    processStream: (stream)=>stream
-};
 const createReadableStreamFromElement = async (request, rootElement, options)=>{
     const { renderToPipeableStream } = await import("react-dom/server");
-    const { runtimeContext, htmlTemplate, config, ssrConfig, entryName, moduleFederationCssAssets } = options;
-    let shellChunkStatus = ShellChunkStatus.START;
-    let renderLevel = RenderLevel.SERVER_RENDER;
+    const { runtimeContext, htmlTemplate, config, ssrConfig, entryName, resource } = options;
+    const hooks = getGlobalInternalRuntimeContext().hooks;
+    const isRsc = true === getGlobalEnableRsc();
+    const extenders = hooks.extendStreamSSR.call({
+        runtimeContext,
+        request,
+        resource,
+        config,
+        platform: 'node',
+        mode: 'stream',
+        isRsc,
+        terminalMarker: ESCAPED_SHELL_STREAM_END_MARK
+    }) || [];
+    const lifecycle = createSSRRenderLifecycle(extenders);
+    const reportError = createSSRStreamErrorReporter(options.onError);
     const forceStream2String = Boolean(process.env.MODERN_JS_STREAM_TO_STRING);
     const { onReady } = resolveStreamingMode(request, forceStream2String);
-    const internalRuntimeContext = getGlobalInternalRuntimeContext();
-    const hooks = internalRuntimeContext.hooks;
-    const extenders = hooks.extendStreamSSR.call() || [];
-    if (0 === extenders.length) extenders.push(defaultExtender);
-    extenders.forEach((extender)=>{
-        if (extender.init) extender.init({
-            rootElement,
-            forceStream2String
-        });
-    });
-    let processedRootElement = rootElement;
-    extenders.forEach((extender)=>{
-        if (extender.modifyRootElement) processedRootElement = extender.modifyRootElement(processedRootElement);
-    });
-    const chunkVec = [];
+    let renderLevel = RenderLevel.SERVER_RENDER;
     let hasStartedPipe = false;
-    __rspack_external__modern_js_runtime_extensions_node_f016b1ee.beginHeadRender(runtimeContext);
-    const reportError = __rspack_external__modern_js_runtime_extensions_node_f016b1ee.createOnceErrorReporter(options.onError);
-    return new Promise((resolve)=>{
-        const { pipe: reactStreamingPipe } = renderToPipeableStream(processedRootElement, {
-            nonce: config.nonce,
-            identifierPrefix: SSR_HYDRATION_ID_PREFIX,
-            [onReady] () {
-                if (hasStartedPipe) return;
-                hasStartedPipe = true;
-                let styledComponentsStyleTags = '';
-                extenders.forEach((extender)=>{
-                    if (extender.getStyleTags) styledComponentsStyleTags += extender.getStyleTags();
+    let failed = false;
+    let reactStream;
+    const ownedStreams = new Set();
+    const streamCompletions = [];
+    let teardown;
+    return new Promise((resolve, reject)=>{
+        const destroyOwnedStreams = (reason)=>{
+            if (teardown) return teardown;
+            const error = void 0 === reason ? void 0 : reason instanceof Error ? reason : new Error(String(reason));
+            for (const stream of ownedStreams){
+                const destroyable = stream;
+                destroyable.destroy?.(error);
+            }
+            teardown = Promise.all(streamCompletions).then((errors)=>{
+                const cleanupError = errors.find((value)=>void 0 !== value && value !== error && 'ERR_STREAM_PREMATURE_CLOSE' !== value.code);
+                if (cleanupError) throw cleanupError;
+            });
+            return teardown;
+        };
+        const abortReact = (reason)=>reactStream?.abort(reason);
+        const fail = (error)=>{
+            if (failed) return;
+            failed = true;
+            request.signal.removeEventListener('abort', onStartupAbort);
+            if (request.signal.aborted) lifecycle.finish({
+                status: 'cancelled',
+                reason: request.signal.reason
+            });
+            else {
+                lifecycle.finish({
+                    status: 'error',
+                    error
                 });
-                options[onReady]?.();
-                getTemplates(htmlTemplate, {
-                    request,
-                    ssrConfig,
-                    renderLevel,
-                    runtimeContext,
-                    config,
-                    entryName,
-                    moduleFederationCssAssets,
-                    styledComponentsStyleTags
-                }).then(({ shellAfter, shellBefore })=>{
-                    const pendingScripts = [];
-                    const body = new Transform({
-                        transform (chunk, _encoding, callback) {
-                            try {
-                                if (shellChunkStatus !== ShellChunkStatus.FINISH) {
-                                    chunkVec.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
-                                    const concatedChunk = Buffer.concat(chunkVec).toString('utf-8');
-                                    const markerIndex = concatedChunk.indexOf(ESCAPED_SHELL_STREAM_END_MARK);
-                                    if (-1 !== markerIndex) {
-                                        const beforeMark = concatedChunk.slice(0, markerIndex);
-                                        const afterMark = concatedChunk.slice(markerIndex + ESCAPED_SHELL_STREAM_END_MARK.length);
-                                        __rspack_external__modern_js_runtime_extensions_node_f016b1ee.publishHeadRender(runtimeContext);
-                                        const completedShellBefore = createReplaceHelemt(getHelmetData(runtimeContext))(shellBefore);
-                                        shellChunkStatus = ShellChunkStatus.FINISH;
-                                        this.push(`${completedShellBefore}${beforeMark}${shellAfter}`);
-                                        if (afterMark) this.push(afterMark);
-                                        if (pendingScripts.length > 0) for (const s of pendingScripts)this.push(s);
-                                    }
-                                } else this.push(chunk);
-                                callback();
-                            } catch (e) {
-                                e instanceof Error ? callback(e) : callback(new Error('Received unknown error when streaming'));
-                            }
+                reportError(error);
+            }
+            abortReact(error);
+            destroyOwnedStreams(error).then(()=>reject(error), ()=>reject(error));
+        };
+        const own = (stream)=>{
+            if (!ownedStreams.has(stream)) {
+                ownedStreams.add(stream);
+                streamCompletions.push(new Promise((done)=>{
+                    finished(stream, (error)=>done(error ?? void 0));
+                }));
+                stream.on('error', fail);
+            }
+            return stream;
+        };
+        const onStartupAbort = ()=>fail(request.signal.reason);
+        const deliver = (source)=>{
+            const stream = observeSSRStream(source, {
+                lifecycle,
+                signal: request.signal,
+                async onError (error) {
+                    failed = true;
+                    abortReact(error);
+                    await destroyOwnedStreams(error);
+                    reportError(error);
+                },
+                onCancel (reason) {
+                    failed = true;
+                    const cleanup = destroyOwnedStreams();
+                    abortReact(reason);
+                    return cleanup;
+                }
+            });
+            request.signal.removeEventListener('abort', onStartupAbort);
+            resolve(stream);
+        };
+        const templateOptions = ()=>({
+                request,
+                ssrConfig,
+                renderLevel,
+                runtimeContext,
+                config,
+                entryName,
+                lifecycle
+            });
+        const startOutput = async ()=>{
+            if (hasStartedPipe || failed) return;
+            hasStartedPipe = true;
+            const styledComponentsStyleTags = extenders.map((extender)=>extender.getStyleTags?.() ?? '').join('');
+            options[onReady]?.();
+            const { shellBefore, shellAfter } = await getTemplates(htmlTemplate, {
+                ...templateOptions(),
+                styledComponentsStyleTags
+            });
+            if (failed) return;
+            const chunks = [];
+            const marker = Buffer.from(ESCAPED_SHELL_STREAM_END_MARK);
+            const pendingScripts = [];
+            let shellChunkStatus = ShellChunkStatus.START;
+            const emitShell = (destination, buffered, markerIndex)=>{
+                const beforeMark = lifecycle.completedBody(buffered.subarray(0, markerIndex).toString('utf8'), 'shell');
+                const completedShellBefore = createReplaceHelemt(getHelmetData(extenders))(shellBefore);
+                shellChunkStatus = ShellChunkStatus.FINISH;
+                chunks.length = 0;
+                destination.push(`${completedShellBefore}${beforeMark}${shellAfter}`);
+                const afterMark = buffered.subarray(markerIndex + marker.length);
+                if (afterMark.length > 0) destination.push(afterMark);
+                for (const script of pendingScripts)destination.push(script);
+                pendingScripts.length = 0;
+            };
+            const body = new Transform({
+                transform (chunk, _encoding, callback) {
+                    try {
+                        if (shellChunkStatus === ShellChunkStatus.FINISH) this.push(chunk);
+                        else {
+                            chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+                            const buffered = Buffer.concat(chunks);
+                            const markerIndex = buffered.indexOf(marker);
+                            if (-1 !== markerIndex) emitShell(this, buffered, markerIndex);
                         }
-                    });
-                    const passThrough = new PassThrough();
-                    const stream = Readable.toWeb(body);
-                    resolve(stream);
-                    let processedStream = passThrough;
-                    extenders.forEach((extender)=>{
-                        if (extender.processStream) processedStream = extender.processStream(processedStream);
-                    });
-                    __rspack_external__modern_js_runtime_extensions_node_f016b1ee.pipeNodeHeadStream({
-                        source: processedStream,
-                        destination: body,
-                        context: runtimeContext,
-                        terminalMarker: ESCAPED_SHELL_STREAM_END_MARK,
-                        onError: reportError
-                    });
-                    reactStreamingPipe(passThrough);
+                        callback();
+                    } catch (error) {
+                        callback(error instanceof Error ? error : new Error(String(error)));
+                    }
+                },
+                flush (callback) {
                     try {
-                        const storageContext = storage.useContext?.();
-                        const activeDeferreds = storageContext?.activeDeferreds;
-                        const entries = activeDeferreds instanceof Map ? Array.from(activeDeferreds.entries()) : [];
-                        if (entries.length > 0) {
-                            const enqueueScript = (s)=>{
-                                if (shellChunkStatus === ShellChunkStatus.FINISH) body.write(s);
-                                else pendingScripts.push(s);
-                            };
-                            enqueueFromEntries(entries, config.nonce, (s)=>enqueueScript(s));
+                        if (shellChunkStatus !== ShellChunkStatus.FINISH) {
+                            const buffered = Buffer.concat(chunks);
+                            emitShell(this, buffered, buffered.length);
                         }
-                    } catch (err) {
-                        const monitors = getMonitors();
-                        monitors.error("cannot inject router data script", err);
+                        callback();
+                    } catch (error) {
+                        callback(error instanceof Error ? error : new Error(String(error)));
                     }
+                }
+            });
+            own(body);
+            const passThrough = new PassThrough();
+            let processedStream = own(passThrough);
+            for (const extender of orderSSRStreamTransforms(extenders))if (extender.processStream) processedStream = own(extender.processStream(processedStream));
+            pipeline(processedStream, body, (error)=>{
+                if (null != error && !failed) fail(error);
+            });
+            deliver(Readable.toWeb(body));
+            reactStream.pipe(passThrough);
+            try {
+                const activeDeferreds = storage.useContext?.()?.activeDeferreds;
+                const entries = activeDeferreds instanceof Map ? Array.from(activeDeferreds.entries()) : [];
+                enqueueFromEntries(entries, config.nonce, (script)=>{
+                    if (failed || body.destroyed || body.writableEnded) return;
+                    if (shellChunkStatus === ShellChunkStatus.FINISH) body.write(script);
+                    else pendingScripts.push(script);
                 });
-            },
-            onShellError (error) {
-                __rspack_external__modern_js_runtime_extensions_node_f016b1ee.abortHeadRender(runtimeContext);
-                renderLevel = RenderLevel.CLIENT_RENDER;
-                getTemplates(htmlTemplate, {
-                    request,
-                    ssrConfig,
-                    renderLevel,
-                    runtimeContext,
-                    entryName,
-                    config,
-                    moduleFederationCssAssets
-                }).then(({ shellAfter, shellBefore })=>{
-                    const fallbackHtml = `${shellBefore}${shellAfter}`;
-                    const readableStream = getReadableStreamFromString(fallbackHtml);
-                    resolve(readableStream);
-                    options?.onShellError?.(error);
-                });
-            },
-            onError (error) {
-                renderLevel = RenderLevel.CLIENT_RENDER;
-                reportError(error);
+            } catch (error) {
+                getMonitors().error("cannot inject router data script", error);
             }
+        };
+        const renderFallback = async (error)=>{
+            if (failed || hasStartedPipe) return;
+            lifecycle.finish({
+                status: 'fallback',
+                error
+            });
+            renderLevel = RenderLevel.CLIENT_RENDER;
+            const { shellBefore, shellAfter } = await getTemplates(htmlTemplate, {
+                ...templateOptions(),
+                helmetData: getHelmetData(extenders)
+            });
+            if (failed) return;
+            options.onShellError?.(error);
+            deliver(getReadableStreamFromString(`${shellBefore}${shellAfter}`));
+        };
+        request.signal.addEventListener('abort', onStartupAbort, {
+            once: true
         });
+        try {
+            request.signal.throwIfAborted();
+            for (const extender of extenders)extender.init?.({
+                rootElement,
+                forceStream2String
+            });
+            let processedRootElement = isRsc && false === runtimeContext.isBrowser ? wrapRuntimeComponentResolver(rootElement, hooks) : rootElement;
+            for (const extender of extenders)processedRootElement = extender.modifyRootElement?.(processedRootElement) ?? processedRootElement;
+            lifecycle.beforeReact();
+            reactStream = renderToPipeableStream(processedRootElement, {
+                nonce: config.nonce,
+                identifierPrefix: SSR_HYDRATION_ID_PREFIX,
+                [onReady] () {
+                    startOutput().catch(fail);
+                },
+                onShellError (error) {
+                    renderFallback(error).catch(fail);
+                },
+                onError (error) {
+                    renderLevel = RenderLevel.CLIENT_RENDER;
+                    if (!request.signal.aborted && !failed) reportError(error);
+                }
+            });
+        } catch (error) {
+            fail(error);
+        }
     });
 };
 export { createReadableStreamFromElement };

package/dist/esm/core/server/stream/createReadableStream.worker.mjs

@@ -1,121 +1,180 @@
 import { renderSSRStream } from "@modern-js/render/ssr";
 import { storage } from "@modern-js/runtime-utils/node";
+import react from "react";
 import { ESCAPED_SHELL_STREAM_END_MARK } from "../../../common.mjs";
 import { RenderLevel } from "../../constants.mjs";
+import { getGlobalEnableRsc, getGlobalInternalRuntimeContext } from "../../context/index.mjs";
+import { wrapRuntimeComponentResolver } from "../../react/wrapper.mjs";
 import { createReplaceHelemt, getHelmetData } from "../helmet.mjs";
+import { createSSRRenderLifecycle, createSSRStreamErrorReporter, observeSSRStream, orderSSRStreamTransforms } from "../shared.mjs";
 import { enqueueFromEntries } from "./deferredScript.mjs";
-import { ShellChunkStatus, encodeForWebStream, getReadableStreamFromString, resolveStreamingMode } from "./shared.mjs";
+import { ShellChunkStatus, getReadableStreamFromString, resolveStreamingMode } from "./shared.mjs";
 import { getTemplates } from "./template.mjs";
-import * as __rspack_external__modern_js_runtime_extensions_ce611631 from "@modern-js/runtime-extensions";
 const createReadableStreamFromElement = async (request, rootElement, options)=>{
-    let shellChunkStatus = ShellChunkStatus.START;
-    const chunkVec = [];
-    const { htmlTemplate, runtimeContext, config, ssrConfig, entryName, moduleFederationCssAssets, rscManifest, rscRoot } = options;
-    __rspack_external__modern_js_runtime_extensions_ce611631.beginHeadRender(runtimeContext);
-    const { shellBefore, shellAfter } = await getTemplates(htmlTemplate, {
-        renderLevel: RenderLevel.SERVER_RENDER,
+    const { htmlTemplate, runtimeContext, config, ssrConfig, entryName, resource, rscManifest, rscRoot } = options;
+    const hooks = getGlobalInternalRuntimeContext().hooks;
+    const isRsc = true === getGlobalEnableRsc();
+    const extenders = hooks.extendStreamSSR.call({
+        runtimeContext,
+        request,
+        resource,
+        config,
+        platform: 'web',
+        mode: 'stream',
+        isRsc,
+        terminalMarker: ESCAPED_SHELL_STREAM_END_MARK
+    }) || [];
+    const lifecycle = createSSRRenderLifecycle(extenders);
+    const reportOnce = createSSRStreamErrorReporter(options.onError);
+    const reportError = (error)=>{
+        if (!request.signal.aborted && lifecycle.terminal?.status !== 'cancelled') reportOnce(error);
+    };
+    const forceStream2String = Boolean("u" > typeof process && process.env?.MODERN_JS_STREAM_TO_STRING);
+    let pendingSource;
+    let bodyOpen = true;
+    let bodyPipe;
+    const templateOptions = {
         runtimeContext,
         ssrConfig,
         request,
         config,
         entryName,
-        moduleFederationCssAssets
-    });
+        lifecycle
+    };
     try {
+        request.signal.throwIfAborted();
+        for (const extender of extenders)extender.init?.({
+            rootElement,
+            forceStream2String
+        });
         const readableOriginal = await renderSSRStream(rootElement, {
             request,
+            signal: request.signal,
             nonce: config.nonce,
             rscManifest,
             rscRoot: rscRoot,
             routes: runtimeContext.routes,
-            onError (error) {
-                options.onError?.(error);
+            onError: reportError,
+            wrapHtmlRoot (root) {
+                let element = react.isValidElement(root) ? root : react.createElement(react.Fragment, null, root);
+                if (isRsc && false === runtimeContext.isBrowser) element = wrapRuntimeComponentResolver(element, hooks);
+                for (const extender of extenders)element = extender.modifyRootElement?.(element) ?? element;
+                lifecycle.beforeReact();
+                return element;
             }
         });
+        pendingSource = readableOriginal;
         options.onShellReady?.();
-        readableOriginal.allReady.then(()=>{
-            options?.onAllReady?.();
-        });
-        const forceStreamToString = Boolean("u" > typeof process && process.env?.MODERN_JS_STREAM_TO_STRING);
-        const { waitForAllReady } = resolveStreamingMode(request, forceStreamToString);
+        readableOriginal.allReady.then(()=>options.onAllReady?.()).catch(reportError);
+        const { waitForAllReady } = resolveStreamingMode(request, forceStream2String);
         if (waitForAllReady) await readableOriginal.allReady;
-        const reader = __rspack_external__modern_js_runtime_extensions_ce611631.createConservingWebShellStream(readableOriginal, runtimeContext, ESCAPED_SHELL_STREAM_END_MARK, options.onError).getReader();
-        const stream = new ReadableStream({
+        request.signal.throwIfAborted();
+        const styledComponentsStyleTags = extenders.map((extender)=>extender.getStyleTags?.() ?? '').join('');
+        const { shellBefore, shellAfter } = await getTemplates(htmlTemplate, {
+            ...templateOptions,
+            renderLevel: RenderLevel.SERVER_RENDER,
+            styledComponentsStyleTags
+        });
+        for (const extender of orderSSRStreamTransforms(extenders))if (void 0 !== extender.processReadableStream) pendingSource = extender.processReadableStream(pendingSource);
+        const decoder = new TextDecoder();
+        const encoder = new TextEncoder();
+        const pendingScripts = [];
+        let buffered = '';
+        let shellChunkStatus = ShellChunkStatus.START;
+        let bodyController;
+        const emit = (chunk, controller)=>{
+            if (shellChunkStatus === ShellChunkStatus.FINISH) {
+                if (chunk.length > 0) controller.enqueue(encoder.encode(chunk));
+                return;
+            }
+            buffered += chunk;
+            const markerIndex = buffered.indexOf(ESCAPED_SHELL_STREAM_END_MARK);
+            if (-1 === markerIndex) return;
+            const beforeMark = lifecycle.completedBody(buffered.slice(0, markerIndex), 'shell');
+            const afterMark = buffered.slice(markerIndex + ESCAPED_SHELL_STREAM_END_MARK.length);
+            const completedShellBefore = createReplaceHelemt(getHelmetData(extenders))(shellBefore);
+            shellChunkStatus = ShellChunkStatus.FINISH;
+            buffered = '';
+            controller.enqueue(encoder.encode(`${completedShellBefore}${beforeMark}${shellAfter}`));
+            if (afterMark.length > 0) controller.enqueue(encoder.encode(afterMark));
+            for (const script of pendingScripts)controller.enqueue(encoder.encode(script));
+            pendingScripts.length = 0;
+        };
+        const body = new TransformStream({
             start (controller) {
-                const pendingScripts = [];
-                let isClosed = false;
-                const safeEnqueue = (chunk)=>{
-                    if (isClosed) return;
-                    try {
-                        controller.enqueue(chunk);
-                    } catch  {
-                        isClosed = true;
-                    }
-                };
-                const closeController = ()=>{
-                    if (!isClosed) {
-                        isClosed = true;
-                        try {
-                            controller.close();
-                        } catch  {}
-                    }
-                };
-                const flushPendingScripts = ()=>{
-                    for (const s of pendingScripts)safeEnqueue(encodeForWebStream(s));
-                    pendingScripts.length = 0;
-                };
-                const enqueueScript = (script)=>{
-                    if (shellChunkStatus === ShellChunkStatus.FINISH) safeEnqueue(encodeForWebStream(script));
-                    else pendingScripts.push(script);
-                };
-                const storageContext = storage.useContext?.();
-                const activeDeferreds = storageContext?.activeDeferreds;
-                const entries = activeDeferreds instanceof Map ? Array.from(activeDeferreds.entries()) : [];
-                if (entries.length > 0) enqueueFromEntries(entries, config.nonce, enqueueScript);
-                async function push() {
-                    try {
-                        const { done, value } = await reader.read();
-                        if (done) return void closeController();
-                        if (isClosed) return;
-                        if (shellChunkStatus !== ShellChunkStatus.FINISH) {
-                            chunkVec.push(new TextDecoder().decode(value));
-                            const concatedChunk = chunkVec.join('');
-                            const markerIndex = concatedChunk.indexOf(ESCAPED_SHELL_STREAM_END_MARK);
-                            if (-1 !== markerIndex) {
-                                const beforeMark = concatedChunk.slice(0, markerIndex);
-                                const afterMark = concatedChunk.slice(markerIndex + ESCAPED_SHELL_STREAM_END_MARK.length);
-                                __rspack_external__modern_js_runtime_extensions_ce611631.publishHeadRender(runtimeContext);
-                                const completedShellBefore = createReplaceHelemt(getHelmetData(runtimeContext))(shellBefore);
-                                shellChunkStatus = ShellChunkStatus.FINISH;
-                                safeEnqueue(encodeForWebStream(`${completedShellBefore}${beforeMark}${shellAfter}`));
-                                if (afterMark.length > 0) safeEnqueue(encodeForWebStream(afterMark));
-                                flushPendingScripts();
-                            }
-                        } else safeEnqueue(value);
-                        if (!isClosed) push();
-                    } catch (error) {
-                        __rspack_external__modern_js_runtime_extensions_ce611631.abortHeadRender(runtimeContext);
-                        if (!isClosed) {
-                            isClosed = true;
-                            try {
-                                controller.error(error);
-                            } catch  {}
-                        }
-                    }
-                }
-                push();
+                bodyController = controller;
+            },
+            transform (chunk, controller) {
+                emit(decoder.decode(chunk, {
+                    stream: true
+                }), controller);
             },
-            cancel (reason) {
-                __rspack_external__modern_js_runtime_extensions_ce611631.abortHeadRender(runtimeContext);
-                reader.cancel(reason).catch(()=>{});
+            flush (controller) {
+                bodyOpen = false;
+                emit(decoder.decode(), controller);
+                if (shellChunkStatus !== ShellChunkStatus.FINISH) throw new Error('React SSR stream ended before the shell marker');
             }
         });
-        return stream;
-    } catch (e) {
-        __rspack_external__modern_js_runtime_extensions_ce611631.abortHeadRender(runtimeContext);
-        const fallbackHtml = `${shellBefore}${shellAfter}`;
-        const stream = getReadableStreamFromString(fallbackHtml);
-        return stream;
+        bodyPipe = pendingSource.pipeTo(body.writable);
+        bodyPipe.catch(()=>{});
+        pendingSource = body.readable;
+        const activeDeferreds = storage.useContext?.()?.activeDeferreds;
+        const entries = activeDeferreds instanceof Map ? Array.from(activeDeferreds.entries()) : [];
+        enqueueFromEntries(entries, config.nonce, (script)=>{
+            if (!bodyOpen) return;
+            if (shellChunkStatus === ShellChunkStatus.FINISH) try {
+                bodyController.enqueue(encoder.encode(script));
+            } catch  {
+                bodyOpen = false;
+            }
+            else pendingScripts.push(script);
+        });
+        return observeSSRStream(pendingSource, {
+            lifecycle,
+            async onError (error) {
+                bodyOpen = false;
+                await bodyPipe?.catch(()=>{});
+                reportError(error);
+            },
+            signal: request.signal,
+            async onCancel (reason) {
+                bodyOpen = false;
+                await bodyPipe?.catch((error)=>{
+                    if (error !== reason) throw error;
+                });
+            },
+            onComplete: ()=>bodyPipe
+        });
+    } catch (error) {
+        bodyOpen = false;
+        if (void 0 !== pendingSource) try {
+            await pendingSource.cancel(error);
+            await bodyPipe?.catch(()=>{});
+        } catch (cancelError) {
+            if (!request.signal.aborted) reportError(cancelError);
+        }
+        if (request.signal.aborted) {
+            lifecycle.finish({
+                status: 'cancelled',
+                reason: request.signal.reason
+            });
+            throw request.signal.reason;
+        }
+        lifecycle.finish({
+            status: 'fallback',
+            error
+        });
+        reportError(error);
+        const { shellBefore, shellAfter } = await getTemplates(htmlTemplate, {
+            ...templateOptions,
+            renderLevel: RenderLevel.CLIENT_RENDER,
+            helmetData: getHelmetData(extenders)
+        });
+        return observeSSRStream(getReadableStreamFromString(`${shellBefore}${shellAfter}`), {
+            lifecycle,
+            onError: reportError,
+            signal: request.signal
+        });
     }
 };
 export { createReadableStreamFromElement };

package/dist/esm/core/server/stream/deferredScript.mjs

@@ -20,13 +20,13 @@ function isDeferredDataLike(v) {
     return hasPending && hasData;
 }
 function isPromiseLike(value) {
-    return !!value && 'function' == typeof value.then;
+    return Boolean(value) && 'function' == typeof value.then;
 }
 function toErrorInfo(error) {
     if (shouldRedactServerError()) return {
         message: 'Unexpected Server Error'
     };
-    if (error && 'object' == typeof error) {
+    if (null !== error && 'object' == typeof error) {
         const maybeMsg = error.message;
         const maybeStack = error.stack;
         return {
@@ -41,7 +41,7 @@ function toErrorInfo(error) {
 function buildDeferredDataScript(nonce, args) {
     const payload = JSON.stringify(args);
     const escaped = escapeAttr(payload);
-    const nonceAttr = nonce ? ` nonce="${nonce}"` : '';
+    const nonceAttr = void 0 !== nonce && '' !== nonce ? ` nonce="${nonce}"` : '';
     return `<script async${nonceAttr} data-fn-name="r" data-script-src="modern-run-router-data-fn" data-fn-args='${escaped}' suppressHydrationWarning>${runRouterDataFnStr}</script>`;
 }
 function enqueueFromEntries(entries, nonce, emit) {