arcway 0.4.13 → 0.4.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arcway",
-  "version": "0.4.13",
+  "version": "0.4.14",
   "description": "A convention-based framework for building modular monoliths with strict domain boundaries.",
   "license": "MIT",
   "type": "module",

package/server/pages/handler.js

@@ -118,6 +118,29 @@ function createPagesHandler(options) {
     if (!reloadEmitter) return;
     reloadEmitter.emit('update', event);
   }
+  async function renderRuntimeError(err, res) {
+    if (manifest.errorBundle && !res.headersSent) {
+      const errorMessage = devMode
+        ? err instanceof Error
+          ? err.stack || err.message
+          : String(err)
+        : 'An unexpected error occurred';
+      await renderErrorPage(
+        manifest.errorBundle,
+        500,
+        { error: errorMessage },
+        outDir,
+        res,
+        componentCache,
+        manifest,
+        cacheVersion,
+        projectReact,
+      );
+    } else if (!res.headersSent) {
+      res.writeHead(500, getHtmlHeaders());
+      res.end('<h1>500 - Internal Server Error</h1>');
+    }
+  }
   async function handle(req, res) {
     const method = req.method ?? 'GET';
     const url = req.url ?? '/';
@@ -237,29 +260,10 @@ function createPagesHandler(options) {
         projectReact,
         devMode,
         viteDev,
+        (err) => renderRuntimeError(err, res),
       );
     } catch (err) {
-      if (manifest.errorBundle && !res.headersSent) {
-        const errorMessage = devMode
-          ? err instanceof Error
-            ? err.stack || err.message
-            : String(err)
-          : 'An unexpected error occurred';
-        await renderErrorPage(
-          manifest.errorBundle,
-          500,
-          { error: errorMessage },
-          outDir,
-          res,
-          componentCache,
-          manifest,
-          cacheVersion,
-          projectReact,
-        );
-      } else if (!res.headersSent) {
-        res.writeHead(500, getHtmlHeaders());
-        res.end('<h1>500 - Internal Server Error</h1>');
-      }
+      await renderRuntimeError(err, res);
     }
     return true;
   }

package/server/pages/lazy-context.js

@@ -381,6 +381,26 @@ async function createLazyPagesContext(options) {
     return /^(components|hooks|client|packages)\//.test(rel);
   }
 
+  function isSpecialPageSource(filePath) {
+    const absolutePath = path.resolve(filePath);
+    return [errorPages.errorPage, errorPages.notFoundPage]
+      .filter(Boolean)
+      .some((pagePath) => path.resolve(pagePath) === absolutePath);
+  }
+
+  async function rebuildErrorPages() {
+    const errorBundles = await buildErrorPageBundles(errorPages, outDir, serverTarget, {
+      rootDir,
+      devMode,
+      minify,
+      limit,
+    });
+    if (errorBundles.error) manifest.errorBundle = errorBundles.error;
+    else delete manifest.errorBundle;
+    if (errorBundles.notFound) manifest.notFoundBundle = errorBundles.notFound;
+    else delete manifest.notFoundBundle;
+  }
+
   function markAffectedStale(filePath) {
     const affected = mapFileToAffected(filePath, manifest);
     if (shouldInvalidateWholeTree(filePath, affected)) {
@@ -433,12 +453,21 @@ async function createLazyPagesContext(options) {
 
   async function handleSourceChange(filePath) {
     if (disposed) throw new Error('Lazy pages context is disposed');
+    const specialPageSource = isSpecialPageSource(filePath);
+    const rebuildSpecialPages =
+      specialPageSource ||
+      shouldInvalidateWholeTree(filePath, { pages: [], layouts: [], middlewares: [] });
     const { touched, affected } = markAffectedStale(filePath);
-    if (!touched) return { touched: false, affected, hmr: null };
+    if (!touched && !rebuildSpecialPages) return { touched: false, affected, hmr: null };
     if (viteDev) {
+      if (rebuildSpecialPages) await rebuildErrorPages();
       bumpVersion();
       emit('update', { type: 'invalidate', filePath, affected, version: manifest.version });
-      return { touched: true, affected, hmr: null };
+      const hmr = specialPageSource ? { type: 'reload', timestamp: Date.now() } : null;
+      if (hmr) {
+        emit('update', { ...hmr, filePath, reason: 'special-page', version: manifest.version });
+      }
+      return { touched: true, affected, hmr };
     }
     if (inFlightClientRefresh) return inFlightClientRefresh;
 
@@ -449,6 +478,7 @@ async function createLazyPagesContext(options) {
       const [clientResult, cssBundle] = await Promise.all([
         clientCtx?.rebuild() ?? Promise.resolve(null),
         buildCssBundle(pagesDir, outDir, minify, stylesPath, fontFaceCss, rootDir),
+        rebuildSpecialPages ? rebuildErrorPages() : Promise.resolve(),
       ]);
 
       if (clientResult) {
@@ -459,8 +489,15 @@ async function createLazyPagesContext(options) {
       bumpVersion();
       emit('update', { type: 'invalidate', filePath, affected, version: manifest.version });
 
-      let hmr = null;
-      if (clientResult && previousMetafile) {
+      let hmr = specialPageSource ? { type: 'reload', timestamp } : null;
+      if (hmr) {
+        emit('update', {
+          ...hmr,
+          filePath,
+          reason: 'special-page',
+          version: manifest.version,
+        });
+      } else if (clientResult && previousMetafile) {
         const diff = diffClientMetafiles(previousMetafile, clientResult.metafile, outDir);
         const modules = [...diff.changedHydrationBundles, ...diff.changedNavBundles];
         const routeBundles = {};

package/server/pages/ssr.js

@@ -19,10 +19,7 @@ function syncReactInternals(projectReactModule) {
     const projectInternals = projectReactModule[REACT_INTERNALS_KEY];
     const fwInternals = fwReact[REACT_INTERNALS_KEY];
     if (projectInternals && fwInternals && projectInternals !== fwInternals) {
-      const keys = new Set([
-        ...Object.keys(projectInternals),
-        ...Object.keys(fwInternals),
-      ]);
+      const keys = new Set([...Object.keys(projectInternals), ...Object.keys(fwInternals)]);
       for (const key of keys) {
         Object.defineProperty(fwInternals, key, {
           get() {
@@ -51,7 +48,10 @@ async function loadComponent(bundlePath, cacheKey, componentCache, cacheVersion)
     componentCache.set(cacheKey, Component);
     return Component;
   } catch (error) {
-    console.error(`[arcway] failed to load component ${cacheKey} from ${bundlePath}:`, error && error.stack ? error.stack : error);
+    console.error(
+      `[arcway] failed to load component ${cacheKey} from ${bundlePath}:`,
+      error && error.stack ? error.stack : error,
+    );
     // Component failed to load (missing file, syntax error) — caller handles null
     return null;
   }
@@ -152,6 +152,7 @@ async function renderPage(
   react,
   devMode,
   viteDev = false,
+  onRenderFailure = null,
 ) {
   const { createElement, renderToPipeableStream } = react;
   const bundlePath = path.join(outDir, route.serverBundle);
@@ -198,9 +199,16 @@ async function renderPage(
   const { PassThrough } = await import('node:stream');
   let pass = null;
   let closed = false;
+  let renderFailureHandled = false;
+  let resolveRender;
+  const renderComplete = new Promise((resolve) => {
+    resolveRender = resolve;
+  });
   const { pipe, abort } = renderToPipeableStream(element, {
     onAllReady() {
-      if (res.headersSent || closed) return;
+      // React may call onAllReady after onShellError but before the recovery
+      // promise starts. Never let the failed stream win that race and commit 200.
+      if (res.headersSent || closed || renderFailureHandled) return;
       res.writeHead(200, getHtmlHeaders());
       const headHtml = renderHeadToString(headData);
       const shell = buildHtmlShell({
@@ -225,19 +233,38 @@ ${liveReloadTag}`,
           res.end();
         }
         clearSSRHeadData();
+        resolveRender();
       });
       pipe(pass);
     },
     onError(err) {
-      clearSSRHeadData();
       // A client disconnect aborts the render and surfaces here; that's a normal
       // peer disconnect, not a server fault — don't log it or write to a dead res.
       if (closed) return;
       console.error('SSR render error:', err);
-      if (!res.headersSent) {
+    },
+    onShellError(err) {
+      clearSSRHeadData();
+      if (closed || res.headersSent || renderFailureHandled) return;
+      renderFailureHandled = true;
+
+      if (!onRenderFailure) {
         res.writeHead(500, getHtmlHeaders());
         res.end('<h1>500 - Render Error</h1>');
+        resolveRender();
+        return;
       }
+
+      Promise.resolve()
+        .then(() => onRenderFailure(err))
+        .catch((renderError) => {
+          console.error('SSR error-page render error:', renderError);
+          if (!closed && !res.headersSent) {
+            res.writeHead(500, getHtmlHeaders());
+            res.end('<h1>500 - Internal Server Error</h1>');
+          }
+        })
+        .finally(resolveRender);
     },
   });
   // Client gone (mid-stream, or before the shell was ready): stop React from
@@ -247,7 +274,9 @@ ${liveReloadTag}`,
     closed = true;
     abort();
     if (pass) pass.destroy();
+    resolveRender();
   });
+  await renderComplete;
 }
 async function renderErrorPage(
   bundlePath,
@@ -289,6 +318,10 @@ async function renderErrorPage(
   const { PassThrough } = await import('node:stream');
   let pass = null;
   let closed = false;
+  let resolveRender;
+  const renderComplete = new Promise((resolve) => {
+    resolveRender = resolve;
+  });
   const { pipe, abort } = renderToPipeableStream(element, {
     onAllReady() {
       if (res.headersSent || closed) return;
@@ -306,6 +339,7 @@ async function renderErrorPage(
           res.end();
         }
         clearSSRHeadData();
+        resolveRender();
       });
       pipe(pass);
     },
@@ -319,6 +353,7 @@ async function renderErrorPage(
           `<h1>${statusCode} - ${statusCode === 404 ? 'Not Found' : 'Internal Server Error'}</h1>`,
         );
       }
+      resolveRender();
     },
   });
   res.on('close', () => {
@@ -326,7 +361,9 @@ async function renderErrorPage(
     closed = true;
     abort();
     if (pass) pass.destroy();
+    resolveRender();
   });
+  await renderComplete;
 }
 export {
   buildCssLinkTag,