@nitronjs/framework 0.3.9 → 0.3.11

package/lib/Console/Stubs/rsc-consumer.tsx

@@ -1,90 +1,77 @@
-import React from "react";
-import { hydrateRoot } from "react-dom/client";
-// @ts-ignore — no type declarations for this package
-import { createFromReadableStream } from "react-server-dom-webpack/client.browser";
-
-declare global {
-    interface Window {
-        __NITRON_FLIGHT__?: string;
-        __NITRON_RSC__?: {
-            root: any;
-            navigate: (payload: string) => void;
-        };
-    }
-}
-
-// Convert Flight payload string to a ReadableStream
-function payloadToStream(payload: string): ReadableStream<Uint8Array> {
-    return new ReadableStream({
-        start(controller) {
-            controller.enqueue(new TextEncoder().encode(payload));
-            controller.close();
-        }
-    });
-}
-
-// Navigate to a new page using RSC payload (called by spa.js)
-function navigateWithPayload(payload: string) {
-    const rsc = window.__NITRON_RSC__;
-
-    if (!rsc || !rsc.root) return;
-
-    const stream = payloadToStream(payload);
-    const response = createFromReadableStream(stream);
-
-    function Root() {
-        return React.use(response);
-    }
-
-    rsc.root.render(React.createElement(Root));
-}
-
-async function mount() {
-    const payload = window.__NITRON_FLIGHT__;
-
-    if (!payload) return;
-
-    const stream = payloadToStream(payload);
-    const rscResponse = createFromReadableStream(stream);
-
-    // Wait for the RSC response to fully resolve before hydrating.
-    //
-    // Without this, hydrateRoot starts rendering AFTER the ReadableStream
-    // has already closed. React then tries to look up component chunks
-    // that no longer exist in the stream, causing "Connection closed" errors.
-    //
-    // By awaiting here, all component modules are loaded and ready BEFORE
-    // React starts rendering. This prevents the race condition entirely.
-    try {
-        await rscResponse;
-    }
-    catch (err) {
-        console.error('[rsc-consumer] RSC response failed to resolve:', err);
-        return;
-    }
-
-    function Root(): React.ReactNode {
-        return React.use(rscResponse) as React.ReactNode;
-    }
-
-    const container = document.getElementById("app");
-
-    if (!container) return;
-
-    const root = hydrateRoot(container, React.createElement(Root));
-
-    // Expose RSC functions for SPA navigation
-    window.__NITRON_RSC__ = {
-        root,
-        navigate: navigateWithPayload
-    };
-
-    delete window.__NITRON_FLIGHT__;
-}
-
-if (document.readyState === "loading") {
-    document.addEventListener("DOMContentLoaded", mount);
-}
-else {
-    mount();
-}
+import React from "react";
+import { hydrateRoot } from "react-dom/client";
+// @ts-ignore — no type declarations for this package
+import { createFromReadableStream } from "react-server-dom-webpack/client.browser";
+
+declare global {
+    interface Window {
+        __NITRON_FLIGHT__?: string;
+        __NITRON_RSC__?: {
+            root: any;
+            navigate: (payload: string) => void;
+        };
+    }
+}
+
+function payloadToStream(payload: string): ReadableStream<Uint8Array> {
+    return new ReadableStream({
+        start(controller) {
+            controller.enqueue(new TextEncoder().encode(payload));
+            controller.close();
+        }
+    });
+}
+
+let rscResponse: any = null;
+
+function Root(): React.ReactNode {
+    return React.use(rscResponse) as React.ReactNode;
+}
+
+function navigateWithPayload(payload: string) {
+    const rsc = window.__NITRON_RSC__;
+
+    if (!rsc || !rsc.root) return;
+
+    const stream = payloadToStream(payload);
+    rscResponse = createFromReadableStream(stream);
+
+    rsc.root.render(React.createElement(Root));
+}
+
+async function mount() {
+    const payload = window.__NITRON_FLIGHT__;
+
+    if (!payload) return;
+
+    const stream = payloadToStream(payload);
+    rscResponse = createFromReadableStream(stream);
+
+    try {
+        await rscResponse;
+    }
+    catch (err) {
+        console.error('[rsc-consumer] RSC response failed to resolve:', err);
+        return;
+    }
+
+    const container = document.getElementById("app");
+
+    if (!container) return;
+
+    const root = hydrateRoot(container, React.createElement(Root));
+
+    window.__NITRON_RSC__ = {
+        root,
+        navigate: navigateWithPayload
+    };
+
+    delete window.__NITRON_FLIGHT__;
+}
+
+if (document.readyState === "loading") {
+    document.addEventListener("DOMContentLoaded", mount);
+}
+else {
+    mount();
+}

package/lib/View/View.js

@@ -731,8 +731,8 @@ class View {
         runtimeScript += `</script>`;
 
         if (hasFlightPayload) {
-            const escapedPayload = flightPayload.replace(/</g, "\\u003c").replace(/>/g, "\\u003e");
-            runtimeScript += `<script${nonceAttr}>window.__NITRON_FLIGHT__=${JSON.stringify(escapedPayload)};</script>`;
+            const safePayload = JSON.stringify(flightPayload).replace(/</g, "\\u003c").replace(/>/g, "\\u003e");
+            runtimeScript += `<script${nonceAttr}>window.__NITRON_FLIGHT__=${safePayload};</script>`;
         }
 
         const refreshScript = this.#isDev
@@ -823,7 +823,7 @@ ${refreshScript}${vendorScript}${hmrScript}${consumerScript}${spaScript}${devInd
                 images: hasWildcard ? ["*"] : urls,
                 scripts: hasWildcard ? ["*"] : urls,
                 connect: hasWildcard ? ["*"] : urls,
-                frames: hasWildcard ? ["*"] : [],
+                frames: hasWildcard ? ["*"] : urls,
             };
         }
         else {
@@ -849,9 +849,9 @@ ${refreshScript}${vendorScript}${hmrScript}${consumerScript}${spaScript}${devInd
         const imgSrc = buildSrc(["'self'", "data:", "blob:"], whitelist.images);
         const scriptSrc = buildSrc(["'self'", `'nonce-${nonce}'`], whitelist.scripts);
         const connectSrcFinal = buildSrc([connectSrc], whitelist.connect);
-        const frameSrc = whitelist.frames.length 
-            ? (whitelist.frames.includes("*") ? "*" : whitelist.frames.join(" ")) 
-            : "'none'";
+        const frameSrc = whitelist.frames.length
+            ? buildSrc(["'self'"], whitelist.frames)
+            : "'self'";
 
         const csp = [
             "default-src 'self'",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nitronjs/framework",
-	"version": "0.3.9",
+	"version": "0.3.11",
 	"description": "NitronJS is a modern and extensible Node.js MVC framework built on Fastify. It focuses on clean architecture, modular structure, and developer productivity, offering built-in routing, middleware, configuration management, CLI tooling, and native React integration for scalable full-stack applications.",
 	"bin": {
 		"njs": "./cli/njs.js"