tungsten 0.3.2 → 0.3.4

package/dist/Servers/ProdServer.js

@@ -4,7 +4,7 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 import express from 'express';
 import { join } from 'path';
 import { existsSync } from 'fs';
-import { staticFolder, assetsFolder, packageNameCapitalized, publicFolder, componentCssFolder } from "../settings.js";
+import { staticFolder, assetsFolder, packageNameCapitalized, publicFolder, componentCssFolder, frameworkCssFolder } from "../settings.js";
 import { rootToHtml as renderRootToHtml } from "../render/rootToHtml.js";
 import { contentToHtml as renderContentToHtml } from "../render/contentToHtml.js";
 import { Instance } from "../Instance/Instance.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>
@@ -240,6 +314,7 @@ export class ProdServer extends TungstenServer {
     }
     this.app.use('/bundle', express.static(this.compilationInfo.bundleLocation));
     this.app.use(`/${componentCssFolder}/`, express.static(join(this.compilationInfo.buildLocation, componentCssFolder)));
+    this.app.use(`/${frameworkCssFolder}/`, express.static(join(this.compilationInfo.buildLocation, frameworkCssFolder)));
     const publicLocation = join(this.compilationInfo.buildLocation, publicFolder);
     //console.log('publicLocation', publicLocation, existsSync(publicLocation))
     if (existsSync(publicLocation)) this.app.use(express.static(publicLocation)); // files from public folder
@@ -263,8 +338,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;
@@ -283,7 +358,16 @@ export class ProdServer extends TungstenServer {
       });
     });
   }
-  stop() {
-    if (this.server !== undefined) this.server.close();
+  // close() alone only stops new connections arriving - keep-alive sockets (fetch/undici
+  // holds them open) keep the handle, and so the event loop, alive until they time out
+  async stop() {
+    const server = this.server;
+    if (server === undefined) return;
+    await new Promise((resolve, reject) => {
+      server.close(error => error === undefined ? resolve() : reject(error));
+      server.closeAllConnections();
+    });
+    delete this.server;
+    this.location = null;
   }
 }

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 ?? '')
 //             })

package/dist/Servers/hono/ProdServerHono.js

@@ -1,11 +1,9 @@
-// import type { AddressInfo } from 'net'
-// //import express from 'express'
-// import { Hono } from 'hono'
-// import { serve } from '@hono/node-server'
-// import { Server } from 'http'
+// Status/known gaps: see ./README.md
+// import { Context, Hono } from 'hono'
+// import { serve, type ServerType } from '@hono/node-server'
+// import { serveStatic } from '@hono/node-server/serve-static'
 // import { join } from 'path'
 // import { existsSync } from 'fs'
-// //import { SxyServer } from './SxyServer.js'
 // import type { FrameworkConfigComplete } from '../../FrameworkConfig.js'
 // import type { CompilationInfo } from '../../build/CompilationInfo.js'
 // import type { ApiRoutes } from '../../api/ApiRoutes.js'
@@ -17,7 +15,6 @@
 // import { Framework } from '../../Framework.js'
 // import { TungstenError } from '../../TungstenError.js'
 // import { makeInstanceConfigFromFrameworkConfig } from '../../makeInstanceConfigFromFrameworkConfig.js'
-// //import { addRequireResolveHooks } from '../reRouting/addRequireResolveHooks.js'
 // import { standardizeWebPath } from '../../standardizeWebPath.js'
 // import { throwError } from '../../throwError.js'
 // import { AnyComponentType } from '../../AnyComponentType.js'
@@ -27,11 +24,8 @@
 // import { globalDataFunc } from '../../routing/registerGlobalData.js'
 // import { ServerDataLoading } from '../../Store/ServerDataLoading.js'
 // import { ServerMiddleware } from '../ServerMiddleware.js'
-// import { TungstenServer } from '../TungstenServer.jsx'
 // import { portError } from '../portError.js'
 // import { initStores } from '../initStores.js'
-// import { RoutingRedirect } from '../../routing/RoutingRedirect.js'
-// import { RedirectComponent } from 'tungsten/components/RedirectComponent.js'
 // import { TungstenServerHono } from './TungstenServerHono.jsx'
 export {};
 // function debug(...texts: any[]) { // eslint-disable-line @typescript-eslint/no-unused-vars
@@ -43,15 +37,11 @@ export {};
 //     compilationInfo: CompilationInfo
 //     appRoutes: AppRoutes
 //     RootComponentOrNull: AnyComponentType | null
-//     // projectDir: string
-//     // prodBuildLocation: string
-//     // bundleLocation: string
-//     //port: number
 //     location: string | null = null
-//     app: express.Application
+//     app: Hono
 //     apiRoutesPromise?: Promise<ApiRoutes>
 //     apiRoutes?: ApiRoutes
-//     server?: Server
+//     server?: ServerType
 //     constructor(
 //         framework: Framework,
 //         config: FrameworkConfigComplete,
@@ -66,40 +56,29 @@ export {};
 //         this.compilationInfo = compilationInfo
 //         this.appRoutes = appRoutes
 //         this.RootComponentOrNull = RootComponentOrNull
-//         // if (tungstenPrivateEnv.TUNGSTEN_SERVER_PORT === -999) {
-//         //     throwError('ProdServer', 'TUNGSTEN_SERVER_PORT environment variable has not been set')
-//         // }
-//         // !! I wrote this line while drunk. Please check this over. I think its wrong
-//         //const _port = Number((typeof tungstenPrivateEnv !== 'undefined')
-//         //    ? tungstenPrivateEnv.TUNGSTEN_SERVER_PORT
-//         //    : process.env.TUNGSTEN_SERVER_PORT)
-//         // seems like all we need is:
-//         this.app = express()
+//         this.app = new Hono()
 //         if (tungstenPrivateEnv.DEBUG === true) {
 //             let reqId = 0
-//             this.app.use((req, res, next) => {
+//             this.app.use(async (c, next) => {
 //                 reqId++
-//                 cliDebug(`Received request [${reqId}] for ${req.url}`)
-//                 next()   
+//                 cliDebug(`Received request [${reqId}] for ${c.req.url}`)
+//                 await next()
 //             })
 //         }
 //         const requestLog = (tungstenPrivateEnv.DEBUG === true)
 //         const originMismatchWarning = (this.config.suppressOriginMismatchWarning !== true)
 //         if (requestLog || originMismatchWarning) {
-//             this.app.use((req, res, next) => {
-//                 const target = req.protocol + '://' + String(req.header('host')) + req.url
-//                 const origin = req.header('origin')
-//                 // request log
+//             this.app.use(async (c, next) => {
+//                 const urlObj = new URL(c.req.url)
+//                 const target = urlObj.origin + c.req.url
+//                 const origin = c.req.header('origin')
 //                 if (requestLog) {
 //                     let message = 'Received request at ' + target
 //                     if (origin !== undefined) {
-//                         message += ' from ' + String(req.header('origin'))
-//                         // should we use referrer as a backup option?
-//                         // not sure what that is
+//                         message += ' from ' + String(c.req.header('origin'))
 //                     }
 //                     cliOut(message)
 //                 }
-//                 // origin-target mismatch warning
 //                 if (originMismatchWarning) {
 //                     if (origin !== undefined && origin === this.location && origin !== target) {
 //                         cliWarn(
@@ -110,131 +89,70 @@ export {};
 //                         )
 //                     }
 //                 }
-//                 next()
+//                 await next()
 //             })
 //         }
+//         // serverMiddleware isn't ported to Hono yet - it's a list of Express RequestHandlers,
+//         // which Hono's middleware signature can't run directly.
 //         if (serverMiddleware) {
-//             const { path, middlewares } = serverMiddleware
-//             this.app.use(path, middlewares)
+//             cliWarn('ProdServerHono: serverMiddleware is not yet supported on the Hono server')
 //         }
-//         //this.app.set('etag', false)
 //         if (this.compilationInfo.bundleLocation === undefined) {
-//             throwError('ProdServer', 'compilationInfo.bundleLocation is unset/undefined')
+//             throwError('ProdServerHono', 'compilationInfo.bundleLocation is unset/undefined')
 //         }
-//         this.app.use('/bundle', express.static(this.compilationInfo.bundleLocation))
+//         this.app.use('/bundle/*', serveStatic({ root: this.compilationInfo.bundleLocation }))
 //         const publicLocation = join(this.compilationInfo.location, publicFolder)
-//         //console.log('publicLocation', publicLocation, existsSync(publicLocation))
-//         if (existsSync(publicLocation)) this.app.use(express.static(publicLocation)) // files from public folder
-//         //console.log("serving static files with etag")
-//         this.app.use(express.static(join(this.compilationInfo.location, staticFolder)))
+//         if (existsSync(publicLocation)) this.app.use(serveStatic({ root: publicLocation })) // files from public folder
+//         this.app.use(serveStatic({ root: join(this.compilationInfo.location, staticFolder) }))
 //         if (this.config.assetsDir !== undefined) {
-//             this.app.use('/assets', express.static(join(this.compilationInfo.location, assetsFolder)))
+//             this.app.use('/assets/*', serveStatic({ root: join(this.compilationInfo.location, assetsFolder) }))
 //         }
-//         this.app.use(express.static(this.compilationInfo.location))
+//         this.app.use(serveStatic({ root: this.compilationInfo.location }))
 //         if (typeof config.apiRoutes === 'string' && config.apiRoutes !== '') {
 //             const apiPath = standardizeWebPath(this.config.apiPath)
 //             cliOut(`API listening at ${apiPath}`)
-//             this.app.use(apiPath, express.json())
 //             this.app.use(apiPath, this.handleRequestApi)
 //         }
 //         this.app.use(this.handleRequest)
 //     }
-//     // private addServerMiddleware = (serverMiddleware: ServerMiddlewareInfo): void => {
-//     //     const [middlewareFile, middlewareExportName, middlewarePath] = serverMiddleware
-//     //     const fullFilePath = 'file://' + join(this.compilationInfo.codeLocation, middlewareFile)
-//     //     const middlewareModule = await import(fullFilePath)
-//     //     if ( ! (middlewareExportName in middlewareModule) ) {
-//     //         throwError('DevServer', `export ${middlewareExportName} not found in ${middlewareFile} when trying to load server middleware`)
-//     //     }
-//     //     const middleware = middlewareModule[middlewareExportName] as RequestHandler[]
-//     //     console.log('prod middleware', middleware)
-//     //     const path = middlewarePath.startsWith('/') ? middlewarePath : '/' + middlewarePath
-//     //     console.log('path', `|${path}|`)
-//     //     console.log('this.app', this.app)
-//     //     this.app.use('/api', (req, res, next) => {
-//     //         console.log('request to api 1')
-//     //         next()   
-//     //     })
-//     //     this.app.use(path, (req, res, next) => {
-//     //         console.log('request to api')
-//     //         next()   
-//     //     })
-//     //     this.app.use(path, middleware)
-//     //     cliOut(`Server Middleware added to server at ${path}`)
-//     // }
-//     private handleRequestApi = async (
-//         req: express.Request, res: express.Response, next: express.NextFunction
-//     ): Promise<void> => {
+//     private handleRequestApi = async (c: Context): Promise<Response> => { // eslint-disable-line @typescript-eslint/no-unused-vars
 //         //this.apiRoutes = await this.apiRoutesPromise
 //         throw new TungstenError(`handleRequestApi incomplete in dev server - add to get the API in the build step`)
-//         // const requestPath = standardizeWebPath(req.baseUrl + req.path)
-//         // for (const [path, route] of Object.entries(this.apiRoutes)) {
-//         //     //console.log(path, 'vs', requestPath)
-//         //     //console.log('path', path, standardizeWebPath(path))
-//         //     if (standardizeWebPath(path) === requestPath) {
-//         //         //console.log('API route matched', path)
-//         //         return route.endpoint(req, res)
-//         //     }
-//         // }
-//         // // else
-//         // res.sendStatus(404)
 //     }
-//     handleRequest = async (req: express.Request, res: express.Response): Promise<void> => {
-//         if (/\.(css|scss|sass|js|jsx|png|jpg|jpeg|svg|ico|txt)$/.test(req.url)) {
+//     handleRequest = async (c: Context): Promise<Response> => {
+//         const { req } = c
+//         if (/\.(css|scss|sass|js|jsx|png|jpg|jpeg|svg|ico|txt)$/.test(req.path)) {
 //             cliLog(`Requested asset file ${req.url} was not found`)
-//             res.status(404).end()
-//             return
+//             return c.notFound()
 //         }
 //         try {
 //             const location = req.url
 //             const instanceConfig = makeInstanceConfigFromFrameworkConfig(this.config)
 //             if (this.framework.frameworkModules === undefined) {
-//                 throwError('ProdServer.handleRequest()',
+//                 throwError('ProdServerHono.handleRequest()',
 //                     'framework.frameworkModules is undefined'
 //                 )
 //             }
 //             if (this.framework.clientImportAliases === undefined) {
-//                 throwError('ProdServer.handleRequest()',
+//                 throwError('ProdServerHono.handleRequest()',
 //                     'framework.clientImportAliases is undefined'
 //                 )
 //             }
-//             // const appRoutes: AppRoutes = await getRoutes(this.compilationInfo, this.config)
-//             // let RootComponentClass: AnyComponentType
-//             // if (this.config.useRootComponent) {
-//             //     const rootComponentFileFull = join(this.compilationInfo.location, this.config.rootComponent)
-//             //     RootComponentClass = await getComponent(rootComponentFileFull, this.config.rootComponent)
-//             // } else {
-//             //     throwError('DevServer', 'useRootComponent = false not implemented yet')
-//             // }
 //             const { compilationInfo, config, appRoutes, RootComponentOrNull } = this
-//             const reqRes: ReqRes = { req, res }
-//             //const routes = instance.getRoutes()
+//             // 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 prod server isn't wired
+//             // up anywhere live.
+//             // eslint-disable-next-line no-type-assertion/no-type-assertion -- see comment above
+//             const reqRes = c as unknown as ReqRes
 //             const serverDataLoading: ServerDataLoading = { 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)
 //             ])
-//             //instance.matchedRouteInfo = 
-//             //cliTodo('Can we move redirect handling to base class?')
-//             // // 2025-03-14 copied this code here from Dev server,
-//             // // because it looked like it was missing
-//             // if (matchedRouteInfo.data instanceof RoutingRedirect) {
-//             //     const redirect = matchedRouteInfo.data
-//             //     res.redirect(redirect.code, redirect.to)
-//             //     return
-//             // }
-//             // // handle redirect components
-//             // if (
-//             //     matchedRouteInfo.content instanceof RedirectComponent
-//             //     //&& matchedRouteInfo.content.__tungstenComponentType === 'redirect'
-//             // ) {
-//             //     const { code = 302, to } = matchedRouteInfo.content.props
-//             //     res.redirect(code, to)
-//             //     return
-//             // }
-//             const redirected = this.handleRedirects(res, matchedRouteInfo)
-//             if (redirected) return // end early
+//             const redirected = this.handleRedirects(c, matchedRouteInfo)
+//             if (redirected !== false) return redirected // end early
 //             const { internalStore, stores, storeSubscriptions }
 //                 = initStores(location, reqRes, globalData, matchedRouteInfo, serverDataLoading)
 //             const instance = new Instance(
@@ -252,22 +170,16 @@ export {};
 //                 let { content } = matchedRouteInfo
 //                 if (typeof content === 'function') {
 //                     content = content(data, params, {} /* props */, globalData, location)
-//                     //throwError('DevServer', 'route content is a function')
 //                 }
 //                 html = await renderContentToHtml(
 //                     this.compilationInfo, this.framework.clientImportAliases,
 //                     content, instance, config, this.config.siteBasePath
 //                 )
 //             }
-//             //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('handleRequest() error', e)
-//             res.setHeader('Content-Type', 'text/html')
-//             res.status(500)
-//             res.send(this.errorPage())
+//             return c.html(this.errorPage(), 500)
 //         }
 //     }
 //     errorPage = () => {
@@ -280,27 +192,23 @@ export {};
 //   </body>
 // </html>`
 //     }
-//     // private async handlePost(req: express.Request, res: express.Response): Promise<void> {
-//     //     throw new TungstenError(`Err - Dev server received a post request. Not supported yet.`)
-//     // }
 //     // I don't think we ever override the port, not sure why
 //     start(portOverride?: number | null, mute = false): Promise<string> {
 //         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: number | null
 //             if (portOverride !== undefined) {
 //                 port = portOverride
 //             } else {
 //                 const _port = tungstenPrivateEnv.TUNGSTEN_SERVER_PORT ?? 3000
-//                 if (isNaN(_port) || _port === 0) throwError('ProdServer', portError(_port))
+//                 if (isNaN(_port) || _port === 0) throwError('ProdServerHono', portError(_port))
 //                 port = _port
 //             }
-//             //const port = (portOverride !== undefined) ? portOverride : port
-//             // eslint-disable-next-line no-console
-//             this.server = this.app.listen(port, () => {
-//                 const serverAddress = this.server!.address() as AddressInfo // eslint-disable-line @typescript-eslint/no-non-null-assertion, no-type-assertion/no-type-assertion
-//                 this.location = `${proto}://${host}:${serverAddress.port}`
+//             if (port === null) throwError('ProdServerHono', portError(NaN))
+//             if (isNaN(port) || port === 0) throwError('ProdServerHono', portError(port))
+//             this.server = serve({ fetch: this.app.fetch, port }, info => {
+//                 this.location = `${proto}://${host}:${info.port}`
 //                 if (!mute) cliNews(`${packageNameCapitalized} prod server ready at ${this.location}`)
 //                 resolve(this.location)
 //             })
@@ -309,5 +217,4 @@ export {};
 //     stop() {
 //         if (this.server !== undefined) this.server.close()
 //     }
-//     //treeToHtml = treeToHtml
 // }

package/dist/Servers/hono/TungstenServerHono.d.ts

@@ -1,6 +1,6 @@
 import type { MatchedRouteInfo } from '../MatchedRouteInfo.js';
 import { Context } from 'hono';
 export declare class TungstenServerHono {
-    protected handleRedirects(c: Context, matchedRouteInfo: MatchedRouteInfo): boolean;
+    protected handleRedirects(c: Context, matchedRouteInfo: MatchedRouteInfo): Response | false;
 }
 //# sourceMappingURL=TungstenServerHono.d.ts.map

package/dist/Servers/hono/TungstenServerHono.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TungstenServerHono.d.ts","sourceRoot":"","sources":["../../../src/Servers/hono/TungstenServerHono.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAG9D,OAAO,EAAQ,OAAO,EAAE,MAAM,MAAM,CAAA;AAuBpC,qBAAa,kBAAkB;IAC3B,SAAS,CAAC,eAAe,CAAC,CAAC,EAAE,OAAO,EAAY,gBAAgB,EAAE,gBAAgB,GAAG,OAAO;CA6C/F"}
+{"version":3,"file":"TungstenServerHono.d.ts","sourceRoot":"","sources":["../../../src/Servers/hono/TungstenServerHono.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAE9D,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAU9B,qBAAa,kBAAkB;IAI3B,SAAS,CAAC,eAAe,CAAC,CAAC,EAAE,OAAO,EAAY,gBAAgB,EAAE,gBAAgB,GAAG,QAAQ,GAAG,KAAK;CAoCxG"}