tungsten 0.3.1 → 0.3.3

package/dist/Servers/DevServer.js

@@ -2,7 +2,8 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import express from 'express';
-import { join } from 'path';
+import { join, relative } from 'path';
+import slash from 'slash';
 import "../moduleReloader.js"; // V important ES module cache control
 import { allObj as promiseAllObj } from 'sxy-lib/promises.js';
 import { staticFolder, assetsFolder, publicFolder, packagesFolder, clientFolder, componentCssFolder } from "../settings.js";
@@ -24,9 +25,12 @@ import { TungstenServer } from "./TungstenServer.js";
 import { portError } from "./portError.js";
 import { loadEnvsDev } from "./loadEnvsDev.js";
 import { initStores } from "./initStores.js";
+import { makeTungstenErrorInfo } from "../routing/TungstenErrorInfo.js";
 import { MatchedRoute } from "../routing/MatchedRoute.js";
 import { iterationQueryString } from "../iterationQueryString.js";
-import { onReloadEvent } from "../dev/liveReloadHub.js";
+import { onReloadEvent } from "../hmr/liveReloadHub.js";
+import { importDevModuleWithRetry } from "../importDevModuleWithRetry.js";
+import { devErrorPageAutoRetryScript } from "./devErrorPageAutoRetry.js";
 //import cookieParser from 'cookie-parser'
 function debug(...texts) {
   // console.log(...texts)
@@ -51,6 +55,10 @@ export class DevServer extends TungstenServer {
     _defineProperty(this, "serverIterationCount", 0);
     _defineProperty(this, "liveReloadClients", new Set());
     _defineProperty(this, "unsubscribeReload", null);
+    // Sent as the first event on every live-reload connection (see handleLiveReloadStream), so
+    // the client can tell a fresh reconnect (server process restarted, e.g. by tungsten devmon)
+    // apart from its first-ever connection, and reload only in the former case.
+    _defineProperty(this, "bootId", `${Date.now()}-${Math.random()}`);
     _defineProperty(this, "addServerMiddleware", serverMiddleware => {
       //console.log('addServerMiddleware')
       const [middlewareFile, middlewareExportName, middlewarePath] = serverMiddleware;
@@ -83,7 +91,7 @@ export class DevServer extends TungstenServer {
           //const load = await createLoad(import.meta.url, sxyLoaderConfig)
           const fullFilePath = 'file://' + join(this.compilationInfo.codeLocation, middlewareFile);
           //const middlewareModule = await load(fullFilePath)
-          const middlewareModule = await import(iterationQueryString(fullFilePath, this.serverIterationCount++, 'middleware'));
+          const middlewareModule = await importDevModuleWithRetry(iterationQueryString(fullFilePath, this.serverIterationCount++, 'middleware'));
           if (!(middlewareExportName in middlewareModule)) {
             throwError('DevServer', `export ${middlewareExportName} not found in ${middlewareFile}` + ` when trying to load server middleware`);
           }
@@ -121,6 +129,9 @@ export class DevServer extends TungstenServer {
       res.setHeader('Cache-Control', 'no-cache');
       res.setHeader('Connection', 'keep-alive');
       res.flushHeaders();
+      res.write(`event: boot\ndata: ${JSON.stringify({
+        bootId: this.bootId
+      })}\n\n`);
       this.liveReloadClients.add(res);
       req.on('close', () => {
         this.liveReloadClients.delete(res);
@@ -128,21 +139,43 @@ export class DevServer extends TungstenServer {
     });
     _defineProperty(this, "reloadDebounceTimer", null);
     _defineProperty(this, "pendingReloadKind", null);
-    _defineProperty(this, "broadcastReloadEvent", kind => {
+    _defineProperty(this, "pendingReloadFiles", new Set());
+    _defineProperty(this, "broadcastReloadEvent", ({
+      kind,
+      file
+    }) => {
       // A single save can fire several filesystem events in quick succession -
       // tsc's writer often truncates a file before writing its new contents, and each
       // of those steps runs back through this framework's own watch -> transform -> write
       // cycle. Reloading on the first signal can land the browser on a momentarily
       // half-written file, so wait for the burst to go quiet before actually reloading.
       this.pendingReloadKind = this.pendingReloadKind === 'js' || kind === 'js' ? 'js' : kind;
+      if (file !== undefined) this.pendingReloadFiles.add(file);
       if (this.reloadDebounceTimer !== null) clearTimeout(this.reloadDebounceTimer);
       this.reloadDebounceTimer = setTimeout(() => {
         const finalKind = this.pendingReloadKind ?? kind;
-        for (const client of this.liveReloadClients) client.write(`event: ${finalKind}\ndata: reload\n\n`);
+        // 'files' carries the compiled-URL path of every changed component file, so the
+        // browser can attempt an in-place HMR swap instead of a full reload. Left empty for
+        // css events, or if a js event arrived with no known source file - the client falls
+        // back to a full reload in both cases.
+        const files = finalKind === 'js' ? [...this.pendingReloadFiles].map(this.sourceFileToUrlPath) : [];
+        const payload = JSON.stringify({
+          files
+        });
+        for (const client of this.liveReloadClients) client.write(`event: ${finalKind}\ndata: ${payload}\n\n`);
         this.reloadDebounceTimer = null;
         this.pendingReloadKind = null;
+        this.pendingReloadFiles.clear();
       }, DevServer.reloadDebounceMs);
     });
+    _defineProperty(this, "sourceFileToUrlPath", file => {
+      let rel = slash(relative(this.compilationInfo.codeLocation, file));
+      // compileJavascript strips the trailing 'x' off '.jsx' when writing the compiled
+      // output (the file no longer contains literal JSX after the babel transform) - match
+      // that here so the URL points at the file that's actually served.
+      if (rel.endsWith('.jsx')) rel = rel.slice(0, -1);
+      return `/${this.compilationInfo.codeSubPath}/${rel}`;
+    });
     _defineProperty(this, "handleRequestApi", async (req, res, next) => {
       req.params.foo;
       this.apiRoutes = await getApiRoutes(this.config, this.compilationInfo, 'dev');
@@ -168,7 +201,19 @@ export class DevServer extends TungstenServer {
         res.status(404).end();
         return;
       }
+      cliLog('handling ' + req.url);
       const errorTrack = [];
+      // Captured as soon as each resolves, independent of the promiseAllObj combinators
+      // below - those are all-or-nothing, so if routing/data-fetching/rendering fails
+      // afterwards, the destructured `routes`/`RootComponentClass` locals never get
+      // assigned even though resolving them didn't fail. The catch block below uses these
+      // to tell "app routes resolved fine, something later failed" apart from "routes
+      // themselves couldn't be resolved" - only the former can show the app's 'error' route.
+      let capturedRoutes;
+      let capturedRootComponentClass = null;
+      // Defaults to {} to match the "no global data function registered" branch below,
+      // which resolves synchronously to {} and is never itself a failure case.
+      let capturedGlobalData = {};
       try {
         const _firstRender = this.firstRender;
         this.firstRender = false;
@@ -205,11 +250,15 @@ export class DevServer extends TungstenServer {
         //const routingPromise = getRoutesDev(this.compilationInfo, this.config, load).then(
         const routingPromise = getRoutesDev(this.compilationInfo, this.config, iteration).then(async appRoutes => {
           const routes = typeof appRoutes === 'function' ? appRoutes(reqRes) : appRoutes;
+          capturedRoutes = routes;
           // load data, and do routing
           return promiseAllObj({
             appRoutes,
             routes,
-            globalData: globalDataFunc.value !== undefined ? this.getGlobalData(globalDataFunc.value, reqRes).catch(e => {
+            globalData: globalDataFunc.value !== undefined ? this.getGlobalData(globalDataFunc.value, reqRes).then(globalData => {
+              capturedGlobalData = globalData;
+              return globalData;
+            }).catch(e => {
               const msg = 'Error getting global data';
               cliError(msg);
               errorTrack.push(msg);
@@ -253,7 +302,10 @@ export class DevServer extends TungstenServer {
           } = await promiseAllObj({
             routing: routingPromise,
             //RootComponentClass: getComponentDev(rootComponentFileFull, this.config.rootComponent, load)
-            RootComponentClass: getComponentDev(rootComponentFileFull, this.config.rootComponent, iteration)
+            RootComponentClass: getComponentDev(rootComponentFileFull, this.config.rootComponent, iteration).then(c => {
+              capturedRootComponentClass = c;
+              return c;
+            })
           })
           // .catch(e => {
           //     cliError('ROUTING AND ROOT ERR')
@@ -315,11 +367,60 @@ export class DevServer extends TungstenServer {
         res.send(html);
       } catch (e) {
         cliLog('error in TungstenServer handleRequest', e);
-        res.setHeader('Content-Type', 'text/html');
-        res.status(500);
         this.errorLog(e);
         cliLog('');
-        res.send(this.errorPage(e, errorTrack));
+        const errorRouteHtml = await this.tryRenderErrorRoute(req, res, capturedRoutes, capturedRootComponentClass, capturedGlobalData, e);
+        res.setHeader('Content-Type', 'text/html');
+        res.status(500);
+        res.send(errorRouteHtml ?? this.errorPage(e, errorTrack));
+      }
+    });
+    // Attempts to render the app's own 'error' route instead of the dev server's generic
+    // error dump, using whatever `routes`/`RootComponentClass`/`globalData` handleRequest
+    // above managed to capture before it failed. Global data and route data are independent
+    // tRPC calls (batched together, but batching doesn't couple their success/failure - see
+    // resolveResponse.ts in @trpc/server), so global data commonly did resolve even when
+    // route data or rendering is what actually failed; passing the real value through here
+    // (rather than defaulting to {}) lets the error route render with it, e.g. the real theme
+    // colour or username instead of framework defaults. Only succeeds when routes actually
+    // resolved (so `routes` is defined) and the app defines an 'error' route. Never throws -
+    // falls back to null (the caller's default error page) on any failure, since we're
+    // already handling one error and can't risk a second, unhandled one taking the dev
+    // server down.
+    _defineProperty(this, "tryRenderErrorRoute", async (req, res, routes, RootComponentClass, globalData, error) => {
+      try {
+        if (routes === undefined) return null;
+        const errorRouteDef = routes.error;
+        if (errorRouteDef === undefined) return null;
+        if (this.framework.clientImportAliases === undefined) {
+          throwError('DevServer.tryRenderErrorRoute()', 'framework.clientImportAliases is undefined');
+        }
+        const reqRes = {
+          req,
+          res
+        };
+        const instanceConfig = makeInstanceConfigFromFrameworkConfig(this.config, true);
+        const matchedRouteInfo = {
+          key: 'error',
+          params: {},
+          content: errorRouteDef.content,
+          data: makeTungstenErrorInfo(error)
+        };
+        const serverDataLoading = {
+          value: false
+        };
+        const {
+          internalStore,
+          stores,
+          storeSubscriptions
+        } = initStores(req.url, reqRes, globalData, matchedRouteInfo, serverDataLoading);
+        const instance = new Instance(req.url, instanceConfig, reqRes, routes, routes, internalStore, stores, storeSubscriptions, globalData, matchedRouteInfo);
+        return await renderRootToHtmlDev(this.compilationInfo, this.framework.clientImportAliases, RootComponentClass ?? MatchedRoute, instance, this.config, global.tungstenPublicEnv, '' // siteBasePathOverride
+        );
+      } catch (renderError) {
+        cliError('Error rendering app error route, falling back to default error page');
+        cliLog(renderError);
+        return null;
       }
     });
     // private async handlePost(req: express.Request, res: express.Response): Promise<void> {
@@ -340,11 +441,13 @@ export class DevServer extends TungstenServer {
       log('end error log');
     });
     _defineProperty(this, "errorPage", (error, errorTrack) => {
+      const autoRetryScript = devErrorPageAutoRetryScript(error);
       return `<!DOCTYPE html>
-</html>
+<html>
   <head>
     <title>Error</title>
     <style>html { font-family: arial }</style>
+    ${autoRetryScript ? `<script>${autoRetryScript}</script>` : ''}
   </head>
   <body>
     <h1>Application Error</h1>
@@ -381,8 +484,8 @@ export class DevServer extends TungstenServer {
       //         + '\n Ensure that you have an env schema with this field, and a matching env file'
       //     )
       // }
-      const proto = tungstenPrivateEnv.FRONTEND_PROTO ?? 'http';
-      const host = tungstenPrivateEnv.FRONTEND_HOST ?? 'localhost';
+      const proto = tungstenPublicEnv.FRONTEND_PROTO ?? 'http';
+      const host = tungstenPublicEnv.FRONTEND_HOST ?? 'localhost';
       const port = tungstenPrivateEnv.TUNGSTEN_SERVER_PORT ?? 3000;
       if (isNaN(port) || port === 0) throwError('DevServer', portError(port));
       this.port = port;

package/dist/Servers/MatchedRouteInfo.d.ts

@@ -5,7 +5,7 @@ import type { RouteContentFunction } from '../routing/RouteContentFunction.js';
 export type MatchedRouteInfo = {
     key: RouteKey | null;
     params: Record<string, string>;
-    content: ContentNode | RouteContentFunction;
+    content: ContentNode | RouteContentFunction<any, any>;
     data?: unknown | RoutingRedirect;
 };
 //# sourceMappingURL=MatchedRouteInfo.d.ts.map

package/dist/Servers/MatchedRouteInfo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MatchedRouteInfo.d.ts","sourceRoot":"","sources":["../../src/Servers/MatchedRouteInfo.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AACxD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AAE9E,MAAM,MAAM,gBAAgB,GAAG;IAC3B,GAAG,EAAE,QAAQ,GAAG,IAAI,CAAC;IAErB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC9B,OAAO,EAAE,WAAW,GAAG,oBAAoB,CAAA;IAC3C,IAAI,CAAC,EAAE,OAAO,GAAG,eAAe,CAAA;CACnC,CAAA"}
+{"version":3,"file":"MatchedRouteInfo.d.ts","sourceRoot":"","sources":["../../src/Servers/MatchedRouteInfo.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AACxD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AAE9E,MAAM,MAAM,gBAAgB,GAAG;IAC3B,GAAG,EAAE,QAAQ,GAAG,IAAI,CAAC;IAErB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAK9B,OAAO,EAAE,WAAW,GAAG,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IACrD,IAAI,CAAC,EAAE,OAAO,GAAG,eAAe,CAAA;CACnC,CAAA"}

package/dist/Servers/ProdServer.d.ts

@@ -22,6 +22,7 @@ export declare class ProdServer extends TungstenServer {
     constructor(framework: Framework, config: FrameworkConfigComplete, compilationInfo: CompilationInfo, appRoutes: AppRoutes, RootComponentOrNull: AnyComponentType | null, serverMiddleware: ServerMiddleware | null);
     private handleRequestApi;
     handleRequest: (req: express.Request, res: express.Response) => Promise<void>;
+    private tryRenderErrorRoute;
     errorPage: () => string;
     start(portOverride?: number | null, mute?: boolean): Promise<string>;
     stop(): void;

package/dist/Servers/ProdServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProdServer.d.ts","sourceRoot":"","sources":["../../src/Servers/ProdServer.ts"],"names":[],"mappings":"AAEA,OAAO,OAAO,MAAM,SAAS,CAAA;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAI7B,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAQpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAM3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAKnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AASrD,qBAAa,UAAW,SAAQ,cAAc;IAC1C,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,uBAAuB,CAAA;IAC/B,eAAe,EAAE,eAAe,CAAA;IAChC,SAAS,EAAE,SAAS,CAAA;IACpB,mBAAmB,EAAE,gBAAgB,GAAG,IAAI,CAAA;IAK5C,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAO;IAC9B,GAAG,EAAE,OAAO,CAAC,WAAW,CAAA;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;IACrC,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,MAAM,CAAC,EAAE,MAAM,CAAA;gBAEX,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,uBAAuB,EAC/B,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,SAAS,EACpB,mBAAmB,EAAE,gBAAgB,GAAG,IAAI,EAC5C,gBAAgB,EAAE,gBAAgB,GAAG,IAAI;IA8H7C,OAAO,CAAC,gBAAgB,CAgBvB;IACD,aAAa,GAAU,KAAK,OAAO,CAAC,OAAO,EAAE,KAAK,OAAO,CAAC,QAAQ,KAAG,OAAO,CAAC,IAAI,CAAC,CA6GjF;IACD,SAAS,eASR;IAMD,KAAK,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAwBlE,IAAI;CAKP"}
+{"version":3,"file":"ProdServer.d.ts","sourceRoot":"","sources":["../../src/Servers/ProdServer.ts"],"names":[],"mappings":"AAEA,OAAO,OAAO,MAAM,SAAS,CAAA;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAI7B,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAQpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAM3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAKnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAWrD,qBAAa,UAAW,SAAQ,cAAc;IAC1C,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,uBAAuB,CAAA;IAC/B,eAAe,EAAE,eAAe,CAAA;IAChC,SAAS,EAAE,SAAS,CAAA;IACpB,mBAAmB,EAAE,gBAAgB,GAAG,IAAI,CAAA;IAK5C,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAO;IAC9B,GAAG,EAAE,OAAO,CAAC,WAAW,CAAA;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;IACrC,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,MAAM,CAAC,EAAE,MAAM,CAAA;gBAEX,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,uBAAuB,EAC/B,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,SAAS,EACpB,mBAAmB,EAAE,gBAAgB,GAAG,IAAI,EAC5C,gBAAgB,EAAE,gBAAgB,GAAG,IAAI;IA8H7C,OAAO,CAAC,gBAAgB,CAgBvB;IACD,aAAa,GAAU,KAAK,OAAO,CAAC,OAAO,EAAE,KAAK,OAAO,CAAC,QAAQ,KAAG,OAAO,CAAC,IAAI,CAAC,CA2HjF;IASD,OAAO,CAAC,mBAAmB,CA+C1B;IACD,SAAS,eASR;IAMD,KAAK,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAwBlE,IAAI;CAKP"}

package/dist/Servers/ProdServer.js

@@ -19,6 +19,7 @@ import { globalDataFunc } from "../routing/registerGlobalData.js";
 import { TungstenServer } from "./TungstenServer.js";
 import { portError } from "./portError.js";
 import { initStores } from "./initStores.js";
+import { makeTungstenErrorInfo } from "../routing/TungstenErrorInfo.js";
 function debug(...texts) {
   // console.log(...texts)
 }
@@ -83,6 +84,14 @@ export class ProdServer extends TungstenServer {
         res.status(404).end();
         return;
       }
+      // Captured as soon as it resolves, independent of the Promise.all below - that's
+      // all-or-nothing, so if routing/route-data-fetching fails afterwards, `globalData`
+      // never gets assigned even though fetching it didn't fail (global data and route data
+      // are independent tRPC calls, batched together but not coupled - see
+      // resolveResponse.ts in @trpc/server). tryRenderErrorRoute uses this to render the
+      // app's error route with the real global data (theme colour, username, ...) rather
+      // than framework defaults, when it did resolve.
+      let capturedGlobalData = {};
       try {
         const location = req.url;
         const instanceConfig = makeInstanceConfigFromFrameworkConfig(this.config);
@@ -115,7 +124,10 @@ export class ProdServer extends TungstenServer {
           value: false
         };
         const routes = typeof appRoutes === 'function' ? appRoutes(reqRes) : appRoutes;
-        const [globalData, matchedRouteInfo] = await Promise.all([globalDataFunc.value !== undefined ? globalDataFunc.value(reqRes) : {}, routing(location, routes, serverDataLoading)]);
+        const [globalData, matchedRouteInfo] = await Promise.all([globalDataFunc.value !== undefined ? globalDataFunc.value(reqRes).then(globalData => {
+          capturedGlobalData = globalData;
+          return globalData;
+        }) : {}, routing(location, routes, serverDataLoading)]);
         //instance.matchedRouteInfo = 
         //cliTodo('Can we move redirect handling to base class?')
         // // 2025-03-14 copied this code here from Dev server,
@@ -165,14 +177,76 @@ export class ProdServer extends TungstenServer {
         res.send(html);
       } catch (e) {
         cliLog('handleRequest() error', e);
+        const errorRouteHtml = await this.tryRenderErrorRoute(req, res, capturedGlobalData, e);
         res.setHeader('Content-Type', 'text/html');
         res.status(500);
-        res.send(this.errorPage());
+        res.send(errorRouteHtml ?? this.errorPage());
+      }
+    });
+    // Attempts to render the app's own 'error' route in place of the framework's generic
+    // error page, using whatever `globalData` handleRequest above managed to capture before
+    // it failed (see the capturedGlobalData comment there for why that's not always {}). Only
+    // usable when the app routes themselves could be resolved (this runs from the catch block
+    // of handleRequest, so anything from route resolution onward may have failed) and the app
+    // actually defines an 'error' route. Never throws - falls back to null (the caller's
+    // default error page) on any failure, since we're already handling one error and can't
+    // risk a second, unhandled one taking the server down.
+    _defineProperty(this, "tryRenderErrorRoute", async (req, res, globalData, error) => {
+      try {
+        if (this.framework.clientImportAliases === undefined) {
+          throwError('ProdServer.tryRenderErrorRoute()', 'framework.clientImportAliases is undefined');
+        }
+        const {
+          config,
+          appRoutes,
+          RootComponentOrNull
+        } = this;
+        const reqRes = {
+          req,
+          res
+        };
+        const routes = typeof appRoutes === 'function' ? appRoutes(reqRes) : appRoutes;
+        const errorRouteDef = routes.error;
+        if (errorRouteDef === undefined) return null;
+        const location = req.url;
+        const instanceConfig = makeInstanceConfigFromFrameworkConfig(this.config);
+        const matchedRouteInfo = {
+          key: 'error',
+          params: {},
+          content: errorRouteDef.content,
+          data: makeTungstenErrorInfo(error)
+        };
+        const serverDataLoading = {
+          value: false
+        };
+        const {
+          internalStore,
+          stores,
+          storeSubscriptions
+        } = initStores(location, reqRes, globalData, matchedRouteInfo, serverDataLoading);
+        const instance = new Instance(location, instanceConfig, reqRes, appRoutes, routes, internalStore, stores, storeSubscriptions, globalData, matchedRouteInfo);
+        if (RootComponentOrNull !== null) {
+          return await renderRootToHtml(this.compilationInfo, this.framework.clientImportAliases, RootComponentOrNull, instance, config, this.config.siteBasePath);
+        }
+        const {
+          params,
+          data
+        } = matchedRouteInfo;
+        let {
+          content
+        } = matchedRouteInfo;
+        if (typeof content === 'function') {
+          content = content(data, params, {} /* props */, globalData, location);
+        }
+        return await renderContentToHtml(this.compilationInfo, this.framework.clientImportAliases, content, instance, config, this.config.siteBasePath);
+      } catch (renderError) {
+        cliLog('Error rendering app error route, falling back to default error page', renderError);
+        return null;
       }
     });
     _defineProperty(this, "errorPage", () => {
       return `<!DOCTYPE html>
-</html>
+<html>
   <head><title>Error</title></head>
   <body>
     <h1>Internal error</h1>
@@ -263,8 +337,8 @@ export class ProdServer extends TungstenServer {
   // I don't think we ever override the port, not sure why
   start(portOverride, mute = false) {
     return new Promise(resolve => {
-      const proto = tungstenPrivateEnv.FRONTEND_PROTO ?? 'http';
-      const host = tungstenPrivateEnv.FRONTEND_HOST ?? 'localhost';
+      const proto = tungstenPublicEnv.FRONTEND_PROTO ?? 'http';
+      const host = tungstenPublicEnv.FRONTEND_HOST ?? 'localhost';
       let port;
       if (portOverride !== undefined) {
         port = portOverride;

package/dist/Servers/devErrorPageAutoRetry.d.ts

@@ -0,0 +1,4 @@
+export declare const maxAutoRetryAttempts = 8;
+export declare function devErrorPageAutoRetryScript(error: unknown): string;
+export declare const devErrorPageClearRetryScript = "try{sessionStorage.removeItem('tungstenDevErrorRetryCount')}catch(e){}";
+//# sourceMappingURL=devErrorPageAutoRetry.d.ts.map

package/dist/Servers/devErrorPageAutoRetry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"devErrorPageAutoRetry.d.ts","sourceRoot":"","sources":["../../src/Servers/devErrorPageAutoRetry.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,oBAAoB,IAAI,CAAA;AAGrC,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAqBlE;AAKD,eAAO,MAAM,4BAA4B,2EAC6B,CAAA"}

package/dist/Servers/devErrorPageAutoRetry.js

@@ -0,0 +1,26 @@
+// devErrorPageAutoRetry
+// exports devErrorPageAutoRetryScript, devErrorPageClearRetryScript, maxAutoRetryAttempts
+//
+// Dev-only. importDevModuleWithRetry.ts already rides out the common case of a transient,
+// self-resolving module-shape error from a multi-file edit landing mid-compile - but under heavy
+// load its bounded retry budget can still be exhausted before the underlying tsc/babel pipeline
+// settles (see docs/hmr.md), leaving the developer looking at a dead dev error page for what's
+// still, in fact, a self-resolving situation. If the error that reached the error page still
+// looks like that same transient shape, embed a tiny script that auto-reloads a few times before
+// giving up - capped via sessionStorage so a genuine, permanent error doesn't loop forever.
+import { isTransientDevModuleError } from "../importDevModuleWithRetry.js";
+const sessionStorageKey = 'tungstenDevErrorRetryCount';
+export const maxAutoRetryAttempts = 8;
+const retryDelayMs = 500;
+export function devErrorPageAutoRetryScript(error) {
+  if (!isTransientDevModuleError(error)) return '';
+  // Wrapped in try/catch: sessionStorage can throw (some private-browsing modes, restrictive
+  // embedding contexts) rather than just being absent. Without a working store there's no way
+  // to safely cap attempts, so degrade to doing nothing rather than risk retrying unbounded -
+  // same as if this feature didn't exist, not worse.
+  return `(function(){` + `try{` + `var key='${sessionStorageKey}';` + `var count=parseInt(sessionStorage.getItem(key)||'0',10);` + `if(count<${maxAutoRetryAttempts}){` + `sessionStorage.setItem(key,String(count+1));` + `setTimeout(function(){location.reload()},${retryDelayMs})` + `}else{` + `console.error('[tungsten-dev] gave up auto-retrying a transient-looking error after ` + `${maxAutoRetryAttempts} attempts - this may be a real error, not a transient compile race')` + `}` + `}catch(e){` + `console.error('[tungsten-dev] could not auto-retry - sessionStorage unavailable',e)` + `}` + `})();`;
+}
+// Injected into every successfully-rendered dev page (see processHead.ts), so a later, unrelated
+// transient error starts its own retry budget from zero rather than inheriting a stale count.
+// Same try/catch reasoning as above - a successful render should never itself error out over this.
+export const devErrorPageClearRetryScript = `try{sessionStorage.removeItem('${sessionStorageKey}')}catch(e){}`;

package/dist/Servers/hono/DevServerHono.js

@@ -1,8 +1,7 @@
-// import type { Server } from 'http'
-// //import express, { Request, Response, NextFunction, RequestHandler } from 'express'
+// Status/known gaps: see ./README.md
 // import { Context, Hono } from 'hono'
 // import type { BlankEnv, BlankSchema, Handler, Next } from 'hono/types'
-// import { serve } from '@hono/node-server'
+// import { serve, type ServerType } from '@hono/node-server'
 // import { serveStatic } from '@hono/node-server/serve-static'
 // import { join } from 'path'
 // import { allObj as promiseAllObj } from 'sxy-lib/promises.js'
@@ -35,7 +34,6 @@
 // import { ServerDataLoading } from '../../Store/ServerDataLoading.js'
 // import { TungstenServer } from '../TungstenServer.jsx'
 // import { Routes } from '../../routing/Routes.js'
-// import { RedirectCode, RoutingRedirect } from '../../routing/RoutingRedirect.js'
 // import { portError } from '../portError.js'
 // import { loadEnvsDev } from '../loadEnvsDev.js'
 // import { initStores } from '../initStores.js'
@@ -45,7 +43,6 @@
 // import { MatchedRoute } from '../../routing/MatchedRoute.js'
 // import { ContentNodeIsClassComponent } from '../../ContentNode.js'
 // import { $props, $type } from '../../contentNodeSymbols.js'
-// import { RedirectComponent } from '../../components/RedirectComponent.js'
 // import { Path } from '../../routing/RouteTypes.js'
 // import type { ApiRoutesHono } from '../../api/ApiRoutesHono.js'
 // import { TungstenServerHono } from './TungstenServerHono.jsx'
@@ -64,9 +61,10 @@ export {};
 //     app: Hono<BlankEnv, BlankSchema, '/'>
 //     apiRoutes?: ApiRoutesHono
 //     apiPath?: string
-//     server?: Server
+//     server?: ServerType
 //     reqId: number
 //     firstRender: boolean = true
+//     iterationCount: number = 0
 //     constructor(
 //         framework: Framework, config: FrameworkConfigComplete, compilationInfo: CompilationInfo,
 //         initialProcessEnv: Record<string, string> = {}/* FIX ME */
@@ -83,8 +81,8 @@ export {};
 //             //         + '\n Ensure that you have an env schema with this field, and a matching env file'
 //             //     )
 //             // }
-//             const proto = tungstenPrivateEnv.FRONTEND_PROTO ?? 'http'
-//             const host = tungstenPrivateEnv.FRONTEND_HOST ?? 'localhost'
+//             const proto = tungstenPublicEnv.FRONTEND_PROTO ?? 'http'
+//             const host = tungstenPublicEnv.FRONTEND_HOST ?? 'localhost'
 //             const port = tungstenPrivateEnv.TUNGSTEN_SERVER_PORT ?? 3000
 //             if (isNaN(port) || port === 0) throwError('DevServer', portError(port))
 //             this.port = port
@@ -301,21 +299,24 @@ export {};
 //                 )
 //             }
 //             globalDataFunc.value = undefined
-//             const load = await createLoad(import.meta.url, sxyLoaderConfig)
-//             await loadEnvsDev(this.config, load, this.initialProcessEnv, false)
-//             // we are delaying instance creation until after we load the app code, to lets things initialise?
-//             //const reqRes: ReqRes = { req, res }
-//             //const honoContext = c
+//             const iteration = this.iterationCount++
+//             await loadEnvsDev(this.config, iteration, this.initialProcessEnv, false)
+//             // ReqRes is Express-shaped ({req, res}) and Hono's Context isn't - this cast is a
+//             // type-only bridge so the (Express-only) Instance/initStores/routing plumbing below
+//             // still compiles. Not behaviorally correct; fine since this dev server isn't wired
+//             // up anywhere live (see Framework.createDevServer, which only builds DevServer).
+//             // eslint-disable-next-line no-type-assertion/no-type-assertion -- see comment above
+//             const reqRes = c as unknown as ReqRes
 //             // Save some state. I think this is a placeholder for later
 //             const serverDataLoading: ServerDataLoading = { value: false }
-//             const routingPromise = getRoutesDev(this.compilationInfo, this.config, load).then(
+//             const routingPromise = getRoutesDev(this.compilationInfo, this.config, iteration).then(
 //                 async (appRoutes) => {
-//                     const routes = (typeof appRoutes === 'function') ? appRoutes(c) : appRoutes
+//                     const routes = (typeof appRoutes === 'function') ? appRoutes(reqRes) : appRoutes
 //                     // load data, and do routing
 //                     return promiseAllObj({
 //                         appRoutes,
 //                         routes,
-//                         globalData: (globalDataFunc.value !== undefined) ? globalDataFunc.value(c) : {},
+//                         globalData: (globalDataFunc.value !== undefined) ? globalDataFunc.value(reqRes) : {},
 //                         matchedRouteInfo: routing(location, routes, serverDataLoading)
 //                     })
 //                 }
@@ -330,7 +331,7 @@ export {};
 //                 ;({ routing: { appRoutes, routes, globalData, matchedRouteInfo }, RootComponentClass }
 //                     = await promiseAllObj({
 //                         routing: routingPromise,
-//                         RootComponentClass: getComponentDev(rootComponentFileFull, this.config.rootComponent, load)
+//                         RootComponentClass: getComponentDev(rootComponentFileFull, this.config.rootComponent, iteration)
 //                     }))
 //             } else {
 //                 ({ appRoutes, routes, globalData, matchedRouteInfo } = await routingPromise)
@@ -344,13 +345,13 @@ export {};
 //             //     routing(location, routes, serverDataLoading)
 //             // ])
 //             const redirected = this.handleRedirects(c, matchedRouteInfo)
-//             if (redirected) return // end early
+//             if (redirected !== false) return redirected // end early
 //             // make stores
 //             const { internalStore, stores, storeSubscriptions }
-//                 = initStores(location, c, globalData, matchedRouteInfo, serverDataLoading)
+//                 = initStores(location, reqRes, globalData, matchedRouteInfo, serverDataLoading)
 //             // create the instance
-//             const instance = new Instance(    
-//                 location, instanceConfig, c, appRoutes, routes, internalStore,
+//             const instance = new Instance(
+//                 location, instanceConfig, reqRes, appRoutes, routes, internalStore,
 //                 stores, storeSubscriptions, globalData, matchedRouteInfo
 //             )
 //             let html: string
@@ -379,16 +380,11 @@ export {};
 //                 //     '' // siteBasePathOverride
 //                 // )
 //             }
-//             //debug('html', html)
-//             res.setHeader('Content-Type', 'text/html')
-//             res.status((instance.matchedRouteInfo.key === '404') ? 404 : 200)
-//             res.send(html)
+//             return c.html(html, (instance.matchedRouteInfo.key === '404') ? 404 : 200)
 //         } catch(e) {
 //             cliLog('error', e)
-//             res.setHeader('Content-Type', 'text/html')
-//             res.status(500)
 //             this.errorLog(e)
-//             res.send(this.errorPage(e))
+//             return c.html(this.errorPage(e), 500)
 //         }
 //     }
 //     // private async handlePost(req: express.Request, res: express.Response): Promise<void> {
@@ -414,7 +410,7 @@ export {};
 //     }
 //     start = (): Promise<string> => {
 //         return new Promise( resolve => {
-//             this.server = this.app.listen(this.port, () => {
+//             this.server = serve({ fetch: this.app.fetch, port: this.port }, () => {
 //                 cliNews(`Dev server ready at ${this.location}`)
 //                 resolve(this.location ?? '')
 //             })