akanjs 3.0.0-beta.25 → 3.0.0-beta.27

package/server/hmr/devHmrController.ts

@@ -1,9 +1,11 @@
 import fs from "node:fs";
 import path from "node:path";
 import { Logger } from "akanjs/common";
+import { CrossSiteGuard } from "../../signal/CrossSiteGuard";
 import {
   BuilderRpc,
   type ClientManifest,
+  DevBuildRecovery,
   type DevBuildStatus,
   type HmrTrace,
   RouteClientCache,
@@ -13,6 +15,7 @@ import {
 import type { RscReloadFailure, RscWorker } from "../rscWorkerHost";
 import type { RenderState } from "../types";
 import { CSR_DEV_DIRNAME, CSR_DEV_MANIFEST_FILE, type CsrDevManifest, SSR_DEV_DIRNAME } from "./csrDevManifest";
+import { DevArtifactPruner } from "./devArtifactPruner";
 import { isAkanRuntimeMetadataFile } from "./runtimeMetadataFile";
 import { type SsrUpdateMessage, SsrUpdateQueue } from "./ssrUpdateQueue";
 import { type ChangeKind, type HmrMessage, type HmrWsData, HmrWsHub } from "./wsHub";
@@ -49,11 +52,7 @@ export function devBuildStatusToHmrMessage(
       files: status.files.length,
     };
   }
-  if (!previous || previous.ok) return null;
-  
-  const sameGeneration = status.phase === "backend" || status.phase === "scan" || status.phase === "route";
-  const recovered = sameGeneration ? status.generation >= previous.generation : status.generation > previous.generation;
-  if (!recovered) return null;
+  if (!DevBuildRecovery.recovers(previous, status)) return null;
   return {
     type: "build-status",
     status: "ok",
@@ -85,6 +84,8 @@ export class DevHmrController {
   readonly #ssrUpdates = new SsrUpdateQueue((message) => this.#sendSsrUpdate(message));
   readonly #builderRpc: BuilderRpc;
   readonly routeCache: RouteClientCache;
+  #recheckingRoute = false;
+  #recheckAgain: DevBuildStatus | null = null;
   readonly #recentClientEntries = new Set<string>();
   /** File to the newest save that invalidated its routes already: that save's pages build must not drop them again. */
   readonly #earlyInvalidated = new Map<string, number>();
@@ -97,10 +98,12 @@ export class DevHmrController {
   readonly #buildStatusByPhase = new Map<DevBuildStatus["phase"], DevBuildStatus>();
   #graphSeeds: string[];
   #runningBundlePath: string | null;
+  readonly #pruner: DevArtifactPruner;
 
   constructor({ artifactDir, renderState, rsc, seedIndex, upgradeHmrWs, pagesBundlePath }: DevHmrControllerOptions) {
     this.#artifactDir = artifactDir;
     this.#runningBundlePath = pagesBundlePath ? path.resolve(pagesBundlePath) : null;
+    this.#pruner = new DevArtifactPruner(artifactDir);
     this.#renderState = renderState;
     this.#rsc = rsc;
     this.#seedIndex = seedIndex;
@@ -155,28 +158,17 @@ export class DevHmrController {
   }
 
   handleWs(req: Request): Response | undefined {
+
+    try {
+      CrossSiteGuard.assertOrigin(req, new URL(req.url), "hmr");
+    } catch {
+      return new Response("Forbidden", { status: 403 });
+    }
     const client = new URL(req.url).searchParams.get("client") === "csr" ? "csr" : "ssr";
     if (this.#upgradeHmrWs(req, { kind: "akan-hmr", openedAt: Date.now(), client })) return;
     return new Response("Failed to upgrade HMR WebSocket", { status: 500 });
   }
 
-  async ensureRoute(url: URL) {
-    const started = Date.now();
-    const matched =
-      RouteSeedIndexStore.match(url.pathname, this.#seedIndex.entries) ??
-      RouteSeedIndexStore.matchPrefix(url.pathname, this.#seedIndex.entries);
-    if (matched) await this.routeCache.ensure(matched.entry.routeId, matched.entry.seeds);
-    this.#logger.verbose(
-      `[route-cache] ensure pathname=${url.pathname} routeId=${matched?.entry.routeId ?? "(none)"} in ${Date.now() - started}ms`,
-    );
-    return this.routeCache.snapshot();
-  }
-
-  routeIdsForPath(pathname: string): string[] | undefined {
-    const matched = RouteSeedIndexStore.match(pathname, this.#seedIndex.entries);
-    return matched ? [matched.entry.routeId] : undefined;
-  }
-
   #sendSsrUpdate(message: SsrUpdateMessage): void {
     this.#renderState.ssrGeneration = message.generation;
     this.#hub.broadcast({ ...message, trace: DevHmrController.#broadcastTrace(message.trace) });
@@ -235,6 +227,7 @@ export class DevHmrController {
         this.#renderState.cssBytesByUrl = cssBytesByUrl;
         this.#rsc.updateCssAssets(this.#renderState.cssAssets);
         this.#hub.broadcast({ type: "css-update", cssAssets: this.#renderState.cssAssets });
+        void this.#pruner.pruneStyles(this.#renderState.cssAssets);
         this.#logger.verbose(
           `css-update assets=${Object.keys(this.#renderState.cssAssets).length} generation=${css.generation ?? "(unknown)"} files=${css.changedFiles?.length ?? 0} in ${Date.now() - started}ms (ipc)`,
         );
@@ -266,6 +259,7 @@ export class DevHmrController {
         const manifest = this.routeCache.snapshot();
 
         const running = bundlePath ? path.resolve(bundlePath) : null;
+        let tabBuildId = buildId;
         if (serverTouched === false && !clearAll && running === this.#runningBundlePath) {
           this.#logger.verbose(
             `[SSR] pages bundle unchanged for the server; buildId ${this.#renderState.buildId} kept`,
@@ -275,25 +269,29 @@ export class DevHmrController {
           this.#renderState.buildId = buildId;
           const reloadStarted = Date.now();
           try {
-            this.#runningBundlePath = path.resolve(
-              await this.#rsc.reload({
-                clientManifest: manifest.clientManifest,
-                cssAssets: this.#renderState.cssAssets,
-                buildId,
-                pagesBundlePath: bundlePath,
-              }),
-            );
+            const adopted = await this.#rsc.reload({
+              clientManifest: manifest.clientManifest,
+              cssAssets: this.#renderState.cssAssets,
+              buildId,
+              pagesBundlePath: bundlePath,
+            });
+            this.#adoptBundle(adopted.pagesBundlePath);
+            
+            tabBuildId = adopted.buildId;
           } catch (error) {
             const failure = DevHmrController.#reloadFailure(error);
             
             if (failure) {
               this.#renderState.buildId = failure.adopted.buildId;
-              this.#runningBundlePath = path.resolve(failure.adopted.pagesBundlePath);
+              this.#adoptBundle(failure.adopted.pagesBundlePath);
             } else if (this.#renderState.buildId === buildId) this.#renderState.buildId = previousBuildId;
             
-            if (failure?.superseded) this.#ssrUpdates.release(generation);
-            else this.#failPagesReload(generation, files, error);
-            return;
+            if (failure?.adopted.buildId !== buildId) {
+
+              if (failure && failure.failed.buildId !== buildId) this.#ssrUpdates.release(generation);
+              else this.#failPagesReload(generation, files, error);
+              return;
+            }
           }
           this.#logger.verbose(`[SSR] rsc reload buildId=${buildId} in ${Date.now() - reloadStarted}ms`);
         }
@@ -301,7 +299,7 @@ export class DevHmrController {
         const broadcastTrace = DevHmrController.#broadcastTrace(trace);
         if (shouldReload) this.#ssrUpdates.clear(generation);
         const released = shouldReload ? { released: 0, reload: false } : this.#ssrUpdates.release(generation);
-        if (shouldReload) this.#hub.broadcast({ type: "reload", buildId });
+        if (shouldReload) this.#hub.broadcast({ type: "reload", buildId: tabBuildId });
         else if (released.reload)
           this.#logger.verbose(`[hmr] generation=${generation} released a registry reload; no RSC refresh needed`);
         else if (serverTouched === false)
@@ -311,7 +309,7 @@ export class DevHmrController {
         else
           this.#hub.broadcast({
             type: "rsc-refresh",
-            buildId,
+            buildId: tabBuildId,
             generation,
             changedFiles,
             routeIds,
@@ -324,6 +322,13 @@ export class DevHmrController {
     });
   }
 
+  #adoptBundle(bundlePath: string): void {
+    const running = path.resolve(bundlePath);
+    if (running === this.#runningBundlePath) return;
+    this.#runningBundlePath = running;
+    void this.#pruner.prunePages(running);
+  }
+
   static #reloadFailure(error: unknown): RscReloadFailure | null {
     return error instanceof Error && "adopted" in error ? (error as RscReloadFailure) : null;
   }
@@ -351,6 +356,7 @@ export class DevHmrController {
   }
 
   #recordBuildStatus(status: DevBuildStatus): void {
+    this.#recheckFailedRoute(status);
     const previous = this.#buildStatusByPhase.get(status.phase);
     const message = devBuildStatusToHmrMessage(status, previous);
 
@@ -363,6 +369,26 @@ export class DevHmrController {
     );
   }
 
+  #recheckFailedRoute(status: DevBuildStatus, { again = false }: { again?: boolean } = {}): void {
+    if (!status.ok || (status.phase !== "pages" && status.phase !== "ssr")) return;
+    if (this.#recheckingRoute) {
+      this.#recheckAgain = status;
+      return;
+    }
+    const failed = this.#buildStatusByPhase.get("route");
+    if (!failed || failed.ok || !failed.scope || (!again && failed.generation >= status.generation)) return;
+    this.#recheckingRoute = true;
+    void this.routeCache
+      .ensure(failed.scope, failed.files)
+      .catch(() => undefined)
+      .finally(() => {
+        this.#recheckingRoute = false;
+        const next = this.#recheckAgain;
+        this.#recheckAgain = null;
+        if (next) this.#recheckFailedRoute(next, { again: true });
+      });
+  }
+
   #createRouteCache() {
     return new RouteClientCache({
       buildRoute: async (routeId, { seeds, knownEntries, generation }) => {
@@ -387,17 +413,16 @@ export class DevHmrController {
         if (delta.newEntries.length === 0 && removedEntries.size === 0) return;
         this.#rememberClientDeps(routeId, delta.clientDeps, delta.clientDepsByEntry);
         try {
-          this.#runningBundlePath = path.resolve(
-            await this.#rsc.reload({
-              clientManifest: nextMerged.clientManifest,
-              cssAssets: this.#renderState.cssAssets,
-              buildId: this.#renderState.buildId,
-            }),
-          );
+          const adopted = await this.#rsc.reload({
+            clientManifest: nextMerged.clientManifest,
+            cssAssets: this.#renderState.cssAssets,
+            buildId: this.#renderState.buildId,
+          });
+          this.#adoptBundle(adopted.pagesBundlePath);
         } catch (error) {
 
           const failure = DevHmrController.#reloadFailure(error);
-          if (failure) this.#runningBundlePath = path.resolve(failure.adopted.pagesBundlePath);
+          if (failure) this.#adoptBundle(failure.adopted.pagesBundlePath);
           this.#logger.warn(`[SSR] route ${routeId} merged, but the worker did not reload: ${String(error)}`);
         }
         this.#logger.verbose(

package/server/hmr/ssrDevShim.ts

@@ -52,9 +52,15 @@ export class SsrDevShim {
     var hello = self.__AKAN_SSR_HELLO_GENERATION__;
     if (typeof hello === "number") self.__akan.catchUp(hello, c.prefix);
   }
+  function runtime(attempt) {
+    return script(c.runtime).catch(function (error) {
+      if (attempt >= 3) throw error;
+      return wait(500).then(state).then(function () { return runtime(attempt + 1); });
+    });
+  }
   function boot() {
     if (!booting)
-      booting = self.__AKAN_SSR_BOOT__ = script(c.runtime).then(function () {
+      booting = self.__AKAN_SSR_BOOT__ = runtime(0).then(function () {
         var early = self.__AKAN_SSR_EARLY_UPDATES__ || [];
         self.__AKAN_SSR_EARLY_UPDATES__ = null;
         for (var i = 0; i < early.length; i++) self.__akan.hot(early[i]);

package/server/routeTreeBuilder.ts

@@ -15,8 +15,9 @@ import {
   getRouteExports,
   Logger,
   matchRoutePattern,
-  parseBasePaths,
   parseRouteModuleKey,
+  type RouteLayer,
+  RouteLayering,
   routeSegmentToTreePath,
 } from "akanjs/common";
 import { createElement } from "react";
@@ -54,15 +55,12 @@ export class RouteTreeBuilder {
   };
 
   readonly #context: PagesContext;
-  readonly #baseLayoutPaths: string[];
   readonly #routeMap = new Map<string, Route>();
   readonly #pagePatterns: { key: string; pattern: string }[] = [];
   readonly #fallbackRoutes: LayoutFallbackRoute[] = [];
 
   constructor(context: PagesContext) {
     this.#context = context;
-    const basePaths = process.env.AKAN_PUBLIC_BASE_PATHS ? parseBasePaths(process.env.AKAN_PUBLIC_BASE_PATHS) : null;
-    this.#baseLayoutPaths = ["/", "/:lang", ...(basePaths?.map((bp) => `/:lang/${bp}`) ?? [])];
     this.#routeMap.set("/", { path: "/", children: new Map() });
   }
 
@@ -169,7 +167,7 @@ export class RouteTreeBuilder {
     targetRouteMap.set(targetPath, {
       ...(targetRouteMap.get(targetPath) ?? { path: targetPath, children: new Map<string, Route>() }),
       ...(parsed.kind === "layout"
-        ? { renderLayout: routeRender }
+        ? { renderLayout: routeRender, isRootLayout: parsed.isInternalRootLayout }
         : {
             renderPage: routeRender,
             pageIncludesOwnLayout: parsed.leaf === "_index",
@@ -178,48 +176,27 @@ export class RouteTreeBuilder {
     } as Route);
   }
 
-  #getPathRoutes(
-    route: Route,
-    parentRootLayouts: RouteRender[] = [],
-    parentLayouts: RouteRender[] = [],
-    parentPaths: string[] = [],
-    parentHead?: ResolveHead,
-    parentRootRenders: RouteRender[] = [],
-  ): PathRoute[] {
-    const parentPath = parentPaths.filter((p) => p !== "/").join("");
-    const currentPathSegment = /^\/\(.*\)$/.test(route.path) ? "" : route.path;
-    const isRoot = this.#baseLayoutPaths.includes(parentPath + currentPathSegment) && parentRootLayouts.length < 2;
-    const routePath = parentPath + currentPathSegment;
-    const pathSegments = [...parentPaths, ...(currentPathSegment ? [currentPathSegment] : [])];
-    const currentRootLayout = isRoot && route.renderLayout ? route.renderLayout : null;
-
-    const currentOverrideRenders = route.renderOverrides ? [route.renderOverrides] : [];
-    const nodeRenders = [...currentOverrideRenders, ...(route.renderLayout ? [route.renderLayout] : [])];
-    const rootLayoutStack = [...parentRootLayouts, ...(currentRootLayout ? [currentRootLayout] : [])];
-    const renderRootLayouts = isRoot ? [...parentRootRenders, ...nodeRenders] : parentRootRenders;
-    const renderLayouts = isRoot ? parentLayouts : [...parentLayouts, ...nodeRenders];
+  #getPathRoutes(route: Route, parent: RouteLayer<RouteRender> | null = null, parentHead?: ResolveHead): PathRoute[] {
+    const layer = RouteLayering.of(route, parent);
     if (route.renderLayout) {
       this.#fallbackRoutes.push({
-        path: routePath,
-        pathSegments,
-        renderRootLayouts,
-        renderLayouts,
+        path: layer.path,
+        pathSegments: layer.pathSegments,
+        renderRootLayouts: layer.renderRootLayouts,
+        renderLayouts: layer.renderLayouts,
       });
     }
     const routeHead = RouteTreeBuilder.#composeHeadResolvers(route.renderLayout?.resolveHead, parentHead);
-    const pageNodeRenders = route.pageIncludesOwnLayout === false ? currentOverrideRenders : nodeRenders;
-    const pageRenderRootLayouts = isRoot ? [...parentRootRenders, ...pageNodeRenders] : parentRootRenders;
-    const pageRenderLayouts = isRoot ? parentLayouts : [...parentLayouts, ...pageNodeRenders];
     const pageHead = route.pageIncludesOwnLayout === false ? parentHead : routeHead;
     return [
       ...(route.renderPage
         ? [
             {
-              path: routePath,
-              pathSegments,
+              path: layer.path,
+              pathSegments: layer.pathSegments,
               renderPage: route.renderPage,
-              renderRootLayouts: pageRenderRootLayouts,
-              renderLayouts: pageRenderLayouts,
+              renderRootLayouts: layer.pageRenderRootLayouts,
+              renderLayouts: layer.pageRenderLayouts,
               resolveHead: RouteTreeBuilder.#composeHeadResolvers(route.renderPage.resolveHead, pageHead),
               isSpecialRoute: route.isSpecialRoute,
               pageState: route.pageState ?? defaultPageState,
@@ -227,9 +204,7 @@ export class RouteTreeBuilder {
           ]
         : []),
       ...(route.children.size
-        ? [...route.children.values()].flatMap((child) =>
-            this.#getPathRoutes(child, rootLayoutStack, renderLayouts, pathSegments, routeHead, renderRootLayouts),
-          )
+        ? [...route.children.values()].flatMap((child) => this.#getPathRoutes(child, layer, routeHead))
         : []),
     ];
   }

package/server/rscWorker.tsx

@@ -387,7 +387,12 @@ export class RscRenderer {
       this.#resultCache.clear();
       this.#patchResultCache.clear();
       this.#logger.verbose(`reload complete buildId=${msg.buildId} in ${Date.now() - startedAt}ms`);
-      this.#send({ type: "reloaded", buildId: msg.buildId, reloadId: msg.reloadId });
+      this.#send({
+        type: "reloaded",
+        buildId: msg.buildId,
+        reloadId: msg.reloadId,
+        pagesBundlePath: nextPagesBundlePath,
+      });
     } catch (error) {
       this.#logger.error(
         `reload failed buildId=${msg.buildId}: ${error instanceof Error ? (error.stack ?? error.message) : String(error)}`,
@@ -399,6 +404,7 @@ export class RscRenderer {
         requestId: "__reload__",
         buildId: msg.buildId,
         reloadId: msg.reloadId,
+        running: { pagesBundlePath: this.#pagesBundlePath, buildId: this.#pagesBundleBuildId },
         message: error instanceof Error ? error.message : String(error),
       });
     }