@bleedingdev/modern-js-renderer-octane 3.9.3-ultramodern.6 → 3.9.3-ultramodern.8

package/src/server.ts

@@ -9,6 +9,8 @@ import {
   type ResponsePolicy,
   untilAborted,
 } from '@modern-js/renderer-core/session';
+import type { AnyRouter } from '@octanejs/tanstack-router';
+import { transformReadableStreamWithRouter } from '@octanejs/tanstack-router/ssr/server';
 import {
   createElement,
   earlySignalBootstrapScript,
@@ -56,6 +58,8 @@ export interface RenderOctaneApplicationOptions<
   readonly props?: unknown;
   /** Native router serialization, owned by this request's router SSR context. */
   readonly injection?: StreamOptions['injection'];
+  readonly router?: AnyRouter;
+  readonly routerSerializationTimeoutMs?: number;
   /** This server compilation's native Module Federation runtime. */
   readonly federation?: NativeFederationBinding;
 }
@@ -292,7 +296,18 @@ export async function renderOctaneApplication<Bindings extends object>(
       },
       { highWaterMark: 0 },
     );
-    return session.respond(body);
+    return session.respond(
+      input.router
+        ? transformReadableStreamWithRouter(input.router, body, {
+            signal: session.signal,
+            rendererSafePoint: 'script-close',
+            timeoutMs: input.routerSerializationTimeoutMs,
+            onAbort: reason => {
+              void session.fail(reason);
+            },
+          })
+        : body,
+    );
   } catch (error) {
     await session.fail(error);
     throw error;

package/dist/cjs/router-injection.js

@@ -1,139 +0,0 @@
-"use strict";
-var __webpack_require__ = {};
-(()=>{
-    __webpack_require__.d = (exports1, getters, values)=>{
-        var define = (defs, kind)=>{
-            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-                enumerable: true,
-                [kind]: defs[key]
-            });
-        };
-        define(getters, "get");
-        define(values, "value");
-    };
-})();
-(()=>{
-    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
-})();
-(()=>{
-    __webpack_require__.r = (exports1)=>{
-        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
-            value: 'Module'
-        });
-        Object.defineProperty(exports1, '__esModule', {
-            value: true
-        });
-    };
-})();
-var __webpack_exports__ = {};
-__webpack_require__.r(__webpack_exports__);
-__webpack_require__.d(__webpack_exports__, {
-    createOctaneRouterInjection: ()=>createOctaneRouterInjection
-});
-const external_router_server_cleanup_js_namespaceObject = require("./router-server-cleanup.js");
-const SERIALIZATION_TIMEOUT_MS = 60000;
-function createOctaneRouterInjection(router, session, options = {}) {
-    const serverSsr = router.serverSsr;
-    if (!serverSsr) throw new Error('Native Octane router.serverSsr is required for streaming');
-    const timeoutMs = options.serializationTimeoutMs ?? SERIALIZATION_TIMEOUT_MS;
-    if (!Number.isInteger(timeoutMs) || timeoutMs <= 0 || timeoutMs > SERIALIZATION_TIMEOUT_MS) throw new TypeError('Octane router serialization timeout must be 1 to 60000 ms');
-    session.signal.throwIfAborted();
-    let settled = false;
-    let released = false;
-    let renderFinished = false;
-    let timer;
-    let stopSerialization;
-    const subscriptions = new Set();
-    let resolveDone;
-    let rejectDone;
-    const done = new Promise((resolve, reject)=>{
-        resolveDone = resolve;
-        rejectDone = reject;
-    });
-    done.catch(()=>{});
-    const settle = (error)=>{
-        if (settled) return;
-        settled = true;
-        if (void 0 !== timer) clearTimeout(timer);
-        timer = void 0;
-        stopSerialization?.();
-        stopSerialization = void 0;
-        if (void 0 === error) resolveDone();
-        else rejectDone(error);
-    };
-    const release = ()=>{
-        if (released) return;
-        released = true;
-        if (void 0 !== timer) clearTimeout(timer);
-        timer = void 0;
-        stopSerialization?.();
-        stopSerialization = void 0;
-        for (const unsubscribe of subscriptions)unsubscribe();
-        subscriptions.clear();
-        session.signal.removeEventListener('abort', onAbort);
-        if (!settled) settle(session.signal.reason ?? new Error('Octane router serialization was interrupted'));
-    };
-    function onAbort() {
-        settle(session.signal.reason ?? new DOMException('Octane request aborted', 'AbortError'));
-        release();
-    }
-    if (serverSsr.isSerializationFinished()) settle();
-    else stopSerialization = serverSsr.onSerializationFinished(()=>settle());
-    serverSsr.onCleanup(release);
-    session.signal.addEventListener('abort', onAbort, {
-        once: true
-    });
-    try {
-        session.registerCleanup(()=>{
-            release();
-            (0, external_router_server_cleanup_js_namespaceObject.cleanupOctaneRouterSSR)(router);
-        });
-    } catch (error) {
-        release();
-        (0, external_router_server_cleanup_js_namespaceObject.cleanupOctaneRouterSSR)(router);
-        throw error;
-    }
-    return {
-        take () {
-            if (released) return '';
-            serverSsr.liftScriptBarrier();
-            return serverSsr.takeBufferedHtml() ?? '';
-        },
-        subscribe (notify) {
-            if (released) return ()=>{};
-            const stop = serverSsr.onInjectedHtml(notify);
-            let subscribed = true;
-            const unsubscribe = ()=>{
-                if (!subscribed) return;
-                subscribed = false;
-                subscriptions.delete(unsubscribe);
-                stop();
-            };
-            subscriptions.add(unsubscribe);
-            return unsubscribe;
-        },
-        done,
-        cancel (reason) {
-            settle(reason ?? new DOMException('Octane rendering cancelled', 'AbortError'));
-            release();
-            session.abort(reason);
-        },
-        renderComplete () {
-            if (released || renderFinished) return;
-            renderFinished = true;
-            serverSsr.setRenderFinished();
-            if (!serverSsr.isSerializationFinished() && !settled) timer = setTimeout(()=>{
-                const error = new Error('Octane router serialization timed out after app rendering');
-                settle(error);
-                session.fail(error);
-            }, timeoutMs);
-        }
-    };
-}
-exports.createOctaneRouterInjection = __webpack_exports__.createOctaneRouterInjection;
-for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "createOctaneRouterInjection"
-].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
-Object.defineProperty(exports, '__esModule', {
-    value: true
-});

package/dist/esm/router-injection.mjs

@@ -1,101 +0,0 @@
-import { cleanupOctaneRouterSSR } from "./router-server-cleanup.mjs";
-const SERIALIZATION_TIMEOUT_MS = 60000;
-function createOctaneRouterInjection(router, session, options = {}) {
-    const serverSsr = router.serverSsr;
-    if (!serverSsr) throw new Error('Native Octane router.serverSsr is required for streaming');
-    const timeoutMs = options.serializationTimeoutMs ?? SERIALIZATION_TIMEOUT_MS;
-    if (!Number.isInteger(timeoutMs) || timeoutMs <= 0 || timeoutMs > SERIALIZATION_TIMEOUT_MS) throw new TypeError('Octane router serialization timeout must be 1 to 60000 ms');
-    session.signal.throwIfAborted();
-    let settled = false;
-    let released = false;
-    let renderFinished = false;
-    let timer;
-    let stopSerialization;
-    const subscriptions = new Set();
-    let resolveDone;
-    let rejectDone;
-    const done = new Promise((resolve, reject)=>{
-        resolveDone = resolve;
-        rejectDone = reject;
-    });
-    done.catch(()=>{});
-    const settle = (error)=>{
-        if (settled) return;
-        settled = true;
-        if (void 0 !== timer) clearTimeout(timer);
-        timer = void 0;
-        stopSerialization?.();
-        stopSerialization = void 0;
-        if (void 0 === error) resolveDone();
-        else rejectDone(error);
-    };
-    const release = ()=>{
-        if (released) return;
-        released = true;
-        if (void 0 !== timer) clearTimeout(timer);
-        timer = void 0;
-        stopSerialization?.();
-        stopSerialization = void 0;
-        for (const unsubscribe of subscriptions)unsubscribe();
-        subscriptions.clear();
-        session.signal.removeEventListener('abort', onAbort);
-        if (!settled) settle(session.signal.reason ?? new Error('Octane router serialization was interrupted'));
-    };
-    function onAbort() {
-        settle(session.signal.reason ?? new DOMException('Octane request aborted', 'AbortError'));
-        release();
-    }
-    if (serverSsr.isSerializationFinished()) settle();
-    else stopSerialization = serverSsr.onSerializationFinished(()=>settle());
-    serverSsr.onCleanup(release);
-    session.signal.addEventListener('abort', onAbort, {
-        once: true
-    });
-    try {
-        session.registerCleanup(()=>{
-            release();
-            cleanupOctaneRouterSSR(router);
-        });
-    } catch (error) {
-        release();
-        cleanupOctaneRouterSSR(router);
-        throw error;
-    }
-    return {
-        take () {
-            if (released) return '';
-            serverSsr.liftScriptBarrier();
-            return serverSsr.takeBufferedHtml() ?? '';
-        },
-        subscribe (notify) {
-            if (released) return ()=>{};
-            const stop = serverSsr.onInjectedHtml(notify);
-            let subscribed = true;
-            const unsubscribe = ()=>{
-                if (!subscribed) return;
-                subscribed = false;
-                subscriptions.delete(unsubscribe);
-                stop();
-            };
-            subscriptions.add(unsubscribe);
-            return unsubscribe;
-        },
-        done,
-        cancel (reason) {
-            settle(reason ?? new DOMException('Octane rendering cancelled', 'AbortError'));
-            release();
-            session.abort(reason);
-        },
-        renderComplete () {
-            if (released || renderFinished) return;
-            renderFinished = true;
-            serverSsr.setRenderFinished();
-            if (!serverSsr.isSerializationFinished() && !settled) timer = setTimeout(()=>{
-                const error = new Error('Octane router serialization timed out after app rendering');
-                settle(error);
-                session.fail(error);
-            }, timeoutMs);
-        }
-    };
-}
-export { createOctaneRouterInjection };

package/dist/types/router-injection.d.ts

@@ -1,8 +0,0 @@
-import type { RequestSession } from '@modern-js/renderer-core/session';
-import type { AnyRouter } from '@octanejs/tanstack-router';
-import type { StreamInjectionSource } from 'octane/server';
-export interface OctaneRouterInjectionOptions {
-    serializationTimeoutMs?: number;
-}
-/** Couple native router serialization to the response's single stream owner. */
-export declare function createOctaneRouterInjection(router: AnyRouter, session: RequestSession, options?: OctaneRouterInjectionOptions): StreamInjectionSource;

package/src/router-injection.ts

@@ -1,145 +0,0 @@
-import type { RequestSession } from '@modern-js/renderer-core/session';
-import type { AnyRouter } from '@octanejs/tanstack-router';
-import type { StreamInjectionSource } from 'octane/server';
-import { cleanupOctaneRouterSSR } from './router-server-cleanup';
-
-const SERIALIZATION_TIMEOUT_MS = 60_000;
-
-export interface OctaneRouterInjectionOptions {
-  serializationTimeoutMs?: number;
-}
-
-/** Couple native router serialization to the response's single stream owner. */
-export function createOctaneRouterInjection(
-  router: AnyRouter,
-  session: RequestSession,
-  options: OctaneRouterInjectionOptions = {},
-): StreamInjectionSource {
-  const serverSsr = router.serverSsr;
-  if (!serverSsr) {
-    throw new Error('Native Octane router.serverSsr is required for streaming');
-  }
-  const timeoutMs = options.serializationTimeoutMs ?? SERIALIZATION_TIMEOUT_MS;
-  if (
-    !Number.isInteger(timeoutMs) ||
-    timeoutMs <= 0 ||
-    timeoutMs > SERIALIZATION_TIMEOUT_MS
-  ) {
-    throw new TypeError(
-      'Octane router serialization timeout must be 1 to 60000 ms',
-    );
-  }
-  session.signal.throwIfAborted();
-  let settled = false;
-  let released = false;
-  let renderFinished = false;
-  let timer: ReturnType<typeof setTimeout> | undefined;
-  let stopSerialization: (() => void) | undefined;
-  const subscriptions = new Set<() => void>();
-  let resolveDone!: () => void;
-  let rejectDone!: (error: unknown) => void;
-  const done = new Promise<void>((resolve, reject) => {
-    resolveDone = resolve;
-    rejectDone = reject;
-  });
-  // The caller may fail before attaching the injection to its native renderer.
-  void done.catch(() => {});
-
-  const settle = (error?: unknown) => {
-    if (settled) return;
-    settled = true;
-    if (timer !== undefined) clearTimeout(timer);
-    timer = undefined;
-    stopSerialization?.();
-    stopSerialization = undefined;
-    if (error === undefined) resolveDone();
-    else rejectDone(error);
-  };
-  const release = () => {
-    if (released) return;
-    released = true;
-    if (timer !== undefined) clearTimeout(timer);
-    timer = undefined;
-    stopSerialization?.();
-    stopSerialization = undefined;
-    for (const unsubscribe of subscriptions) unsubscribe();
-    subscriptions.clear();
-    session.signal.removeEventListener('abort', onAbort);
-    if (!settled) {
-      settle(
-        session.signal.reason ??
-          new Error('Octane router serialization was interrupted'),
-      );
-    }
-  };
-  function onAbort() {
-    settle(
-      session.signal.reason ??
-        new DOMException('Octane request aborted', 'AbortError'),
-    );
-    release();
-  }
-
-  if (serverSsr.isSerializationFinished()) settle();
-  else stopSerialization = serverSsr.onSerializationFinished(() => settle());
-  serverSsr.onCleanup(release);
-  session.signal.addEventListener('abort', onAbort, { once: true });
-  try {
-    session.registerCleanup(() => {
-      release();
-      cleanupOctaneRouterSSR(router);
-    });
-  } catch (error) {
-    release();
-    cleanupOctaneRouterSSR(router);
-    throw error;
-  }
-
-  return {
-    take() {
-      if (released) return '';
-      // Octane takes injected HTML only once the shell is rendered, so the
-      // router's Scripts has already moved the $_TSR bootstrap into its
-      // barrier script. Lift the barrier here, not on subscribe: streamed
-      // signals subscribe before rendering. Deferred $_TSR chunks then stream
-      // as they settle instead of waiting for setRenderFinished.
-      serverSsr.liftScriptBarrier();
-      return serverSsr.takeBufferedHtml() ?? '';
-    },
-    subscribe(notify) {
-      if (released) return () => {};
-      const stop = serverSsr.onInjectedHtml(notify);
-      let subscribed = true;
-      const unsubscribe = () => {
-        if (!subscribed) return;
-        subscribed = false;
-        subscriptions.delete(unsubscribe);
-        stop();
-      };
-      subscriptions.add(unsubscribe);
-      return unsubscribe;
-    },
-    done,
-    cancel(reason) {
-      settle(
-        reason ?? new DOMException('Octane rendering cancelled', 'AbortError'),
-      );
-      release();
-      void session.abort(reason);
-    },
-    renderComplete() {
-      if (released || renderFinished) return;
-      renderFinished = true;
-      serverSsr.setRenderFinished();
-      if (!serverSsr.isSerializationFinished() && !settled) {
-        timer = setTimeout(() => {
-          const error = new Error(
-            'Octane router serialization timed out after app rendering',
-          );
-          settle(error);
-          void session.fail(error);
-        }, timeoutMs);
-      }
-    },
-  };
-}