tungsten 0.1.70 → 0.1.72

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;AAMpD,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;IAI5C,IAAI,EAAE,MAAM,CAAA;IACZ,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;IAwF7C,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;IAID,KAAK,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAYlE,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;AAMpD,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;IAuH7C,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"}

package/dist/Servers/ProdServer.js

@@ -8,7 +8,7 @@ import { staticFolder, assetsFolder, packageNameCapitalized, publicFolder } from
 import { rootToHtml as renderRootToHtml } from "../render/rootToHtml.js";
 import { contentToHtml as renderContentToHtml } from "../render/contentToHtml.js";
 import { Instance } from "../Instance/Instance.js";
-import { cliOut, cliLog, cliNews, cliDebug } from "../cliOutput.js"; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { cliOut, cliWarn, cliLog, cliNews, cliDebug } from "../cliOutput.js"; // eslint-disable-line @typescript-eslint/no-unused-vars
 import { TungstenError } from "../TungstenError.js";
 import { makeInstanceConfigFromFrameworkConfig } from "../makeInstanceConfigFromFrameworkConfig.js";
 //import { addRequireResolveHooks } from '../reRouting/addRequireResolveHooks.js'
@@ -33,7 +33,7 @@ export class ProdServer extends TungstenServer {
     // projectDir: string
     // prodBuildLocation: string
     // bundleLocation: string
-    _defineProperty(this, "port", void 0);
+    //port: number
     _defineProperty(this, "location", null);
     _defineProperty(this, "app", void 0);
     _defineProperty(this, "apiRoutesPromise", void 0);
@@ -115,7 +115,7 @@ export class ProdServer extends TungstenServer {
           value: false
         };
         const routes = typeof appRoutes === 'function' ? appRoutes(reqRes) : appRoutes;
-        const [globalData, matchedRouteInfo] = await Promise.all([globalDataFunc !== undefined ? globalDataFunc(reqRes) : {}, routing(location, routes, serverDataLoading)]);
+        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,
@@ -185,15 +185,14 @@ export class ProdServer extends TungstenServer {
     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');
-    }
+    // 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);
+    //const _port = Number((typeof tungstenPrivateEnv !== 'undefined')
+    //    ? tungstenPrivateEnv.TUNGSTEN_SERVER_PORT
+    //    : process.env.TUNGSTEN_SERVER_PORT)
     // seems like all we need is:
-    //const _port = tungstenPrivateEnv.TUNGSTEN_SERVER_PORT
-    if (isNaN(_port) || _port === 0) throwError('ProdServer', portError(_port));
-    this.port = _port;
     this.app = express();
     if (tungstenPrivateEnv.DEBUG === true) {
       let reqId = 0;
@@ -203,6 +202,31 @@ export class ProdServer extends TungstenServer {
         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
+        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
+          }
+          cliOut(message);
+        }
+        // origin-target mismatch warning
+        if (originMismatchWarning) {
+          if (origin !== undefined && origin === this.location && origin !== target) {
+            cliWarn(`Received a request from the frontend, but it's origin` + ` is not the same as the request origin.` + ` This may indicate a misconfiguration, and may prevent` + ` the passing of cookies to the tungsten server.`);
+          }
+        }
+        next();
+      });
+    }
     if (serverMiddleware) {
       const {
         path,
@@ -235,12 +259,24 @@ export class ProdServer extends TungstenServer {
   // 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, mute = false) {
     return new Promise(resolve => {
-      const port = portOverride !== undefined ? portOverride : this.port;
+      const proto = tungstenPrivateEnv.FRONTEND_PROTO ?? 'http';
+      const host = tungstenPrivateEnv.FRONTEND_HOST ?? 'localhost';
+      let port;
+      if (portOverride !== undefined) {
+        port = portOverride;
+      } else {
+        const _port = tungstenPrivateEnv.TUNGSTEN_SERVER_PORT ?? 3000;
+        if (isNaN(_port) || _port === 0) throwError('ProdServer', portError(_port));
+        port = _port;
+      }
+      //const port = (portOverride !== undefined) ? portOverride : port
       // eslint-disable-next-line no-console
       this.server = this.app.listen(port, () => {
-        this.location = `http://localhost:${this.server.address().port}`; // eslint-disable-line @typescript-eslint/no-non-null-assertion
+        const serverAddress = this.server.address(); // eslint-disable-line @typescript-eslint/no-non-null-assertion, no-type-assertion/no-type-assertion
+        this.location = `${proto}://${host}:${serverAddress.port}`;
         if (!mute) cliNews(`${packageNameCapitalized} prod server ready at ${this.location}`);
         resolve(this.location);
       });

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

@@ -1 +1 @@
-{"version":3,"file":"TungstenServer.d.ts","sourceRoot":"","sources":["../../src/Servers/TungstenServer.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAE7D,OAAO,KAAK,EAAE,QAAQ,IAAI,eAAe,EAAE,MAAM,SAAS,CAAA;AAc1D,qBAAa,cAAc;IACvB,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,eAAe,EAAE,gBAAgB,EAAE,gBAAgB,GAAG,OAAO;CAqC/F"}
+{"version":3,"file":"TungstenServer.d.ts","sourceRoot":"","sources":["../../src/Servers/TungstenServer.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAE7D,OAAO,KAAK,EAAE,QAAQ,IAAI,eAAe,EAAE,MAAM,SAAS,CAAA;AAiB1D,qBAAa,cAAc;IACvB,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,eAAe,EAAE,gBAAgB,EAAE,gBAAgB,GAAG,OAAO;CAoD/F"}

package/dist/Servers/TungstenServer.js

@@ -1,8 +1,10 @@
 import { ContentNodeIsClassComponent } from "../ContentNode.js";
 import { RoutingRedirect } from "../routing/RoutingRedirect.js";
 import { cliTodo } from "../cliOutput.js";
-import { RedirectComponent } from "../components/RedirectComponent.js";
+import { RouteRedirectComponent } from "../components/RouteRedirectComponent.js";
+import { WebRedirectComponent } from "../components/WebRedirectComponent.js";
 import { $props, $type } from "../contentNodeSymbols.js";
+import { WebRedirect } from "../routing/WebRedirect.js";
 function debug(...texts) {
   // console.log(...texts)
 }
@@ -13,6 +15,10 @@ export class TungstenServer {
       const redirect = matchedRouteInfo.data;
       res.redirect(redirect.code, redirect.to);
       return true;
+    } else if (matchedRouteInfo.data instanceof WebRedirect) {
+      const redirect = matchedRouteInfo.data;
+      res.redirect(redirect.code, redirect.to);
+      return true;
     }
     // console.log('content', matchedRouteInfo.content)
     // console.log('is func', typeof matchedRouteInfo.content !== 'function')
@@ -23,12 +29,20 @@ export class TungstenServer {
     // console.log('$type', (matchedRouteInfo as any).content[$type])
     //console.log('content[$type]', matchedRouteInfo.content[$type])
     //console.log('instanceof', matchedRouteInfo.content instanceof RedirectComponent)
-    if (typeof matchedRouteInfo.content !== 'function' && ContentNodeIsClassComponent(matchedRouteInfo.content) && (matchedRouteInfo.content[$type] === RedirectComponent || matchedRouteInfo.content[$type].prototype instanceof RedirectComponent)) {
-      cliTodo('consider type of RedirectComponent props');
-      const code = matchedRouteInfo.content[$props].code || 302;
-      const to = matchedRouteInfo.content[$props].to;
-      res.redirect(code, to);
-      return true;
+    if (typeof matchedRouteInfo.content !== 'function' && ContentNodeIsClassComponent(matchedRouteInfo.content)) {
+      if (matchedRouteInfo.content[$type] === RouteRedirectComponent || matchedRouteInfo.content[$type].prototype instanceof RouteRedirectComponent) {
+        cliTodo('consider type of RedirectComponent props');
+        const code = matchedRouteInfo.content[$props].code || 302;
+        const to = matchedRouteInfo.content[$props].to;
+        res.redirect(code, to);
+        return true;
+      } else if (matchedRouteInfo.content[$type] === WebRedirectComponent || matchedRouteInfo.content[$type].prototype instanceof WebRedirectComponent) {
+        cliTodo('consider type of RedirectComponent props');
+        const code = matchedRouteInfo.content[$props].code || 302;
+        const to = matchedRouteInfo.content[$props].to;
+        res.redirect(code, to);
+        return true;
+      }
     }
     return false;
   }

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=DevServerHono.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"DevServerHono.d.ts","sourceRoot":"","sources":["../../../src/Servers/hono/DevServerHono.ts"],"names":[],"mappings":""}

package/dist/Servers/hono/DevServerHono.js

@@ -0,0 +1,427 @@
+// import type { Server } from 'http'
+// //import express, { Request, Response, NextFunction, RequestHandler } from 'express'
+// import { Context, Hono } from 'hono'
+// import type { BlankEnv, BlankSchema, Handler, Next } from 'hono/types'
+// import { serve } 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'
+// import type { FrameworkConfigComplete, ServerMiddlewareInfo } from '../../FrameworkConfig.js'
+// import type { CompilationInfo } from '../../build/CompilationInfo.js'
+// import type { ApiRoutes } from '../../api/ApiRoutes.js'
+// import {
+//     staticFolder, assetsFolder, publicFolder, packagesFolder, clientFolder, componentCssFolder
+// } from '../../settings.js'
+// import { rootToHtmlDev as renderRootToHtmlDev } from '../../render/rootToHtmlDev.js'
+// import { contentToHtmlDev as renderContentToHtmlDev } from '../../render/contentToHtmlDev.js'
+// import { Instance } from '../../Instance/Instance.js'
+// import { Framework } from '../../Framework.js'
+// import { TungstenError } from '../../TungstenError.js'
+// import { makeInstanceConfigFromFrameworkConfig } from '../../makeInstanceConfigFromFrameworkConfig.js'
+// import { cliNews, cliOut, cliWarn, cliLog, cliDebug, cliTodo, cliAlert } from '../../cliOutput.js' // eslint-disable-line @typescript-eslint/no-unused-vars
+// import { existsSync } from 'fs'
+// import { getApiRoutes } from '../../api/getApiRoutes.js'
+// import { getApiRoutesHono } from '../../api/getApiRoutesHono.js'
+// import { standardizeWebPath } from '../../standardizeWebPath.js'
+// import { log } from '../../appOutput.js'
+// import { throwError } from '../../throwError.js'
+// import { getRoutesDev } from '../../getRoutesDevs.js'
+// import { getComponentDev } from '../../getComponentDev.js'
+// import { ReqRes } from '../../ReqRes.js'
+// import sxyLoaderConfig from '../../../sxy-loader.config.js'
+// import { createLoad } from 'sxy-loader'
+// import { routing } from '../routing.jsx'
+// import { GlobalData, globalDataFunc } from '../../routing/registerGlobalData.js'
+// 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'
+// import { AppRoutes } from '../../routing/AppRoutes.js'
+// import { AnyComponentType } from '../../AnyComponentType.js'
+// import { MatchedRouteInfo } from '../MatchedRouteInfo.js'
+// 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'
+export {};
+// //import cookieParser from 'cookie-parser'
+// function debug(...texts: any[]) { // eslint-disable-line @typescript-eslint/no-unused-vars
+//     // console.log(...texts)
+// }
+// export class DevServerHono extends TungstenServerHono { 
+//     framework: Framework
+//     config: FrameworkConfigComplete
+//     compilationInfo: CompilationInfo
+//     port: number
+//     location: string | null = null
+//     initialProcessEnv: Record<string, string>
+//     app: Hono<BlankEnv, BlankSchema, '/'>
+//     apiRoutes?: ApiRoutesHono
+//     apiPath?: string
+//     server?: Server
+//     reqId: number
+//     firstRender: boolean = true
+//     constructor(
+//         framework: Framework, config: FrameworkConfigComplete, compilationInfo: CompilationInfo,
+//         initialProcessEnv: Record<string, string> = {}/* FIX ME */
+//     ) {
+//         super()
+//         try {
+//             this.framework = framework
+//             this.config = config
+//             this.compilationInfo = compilationInfo
+//             // if (tungstenPrivateEnv.TUNGSTEN_SERVER_PORT === -999) {
+//             //     throwError(
+//             //         'DevServer',
+//             //         'TUNGSTEN_SERVER_PORT environment variable has not been set,'
+//             //         + '\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 port = tungstenPrivateEnv.TUNGSTEN_SERVER_PORT ?? 3000
+//             if (isNaN(port) || port === 0) throwError('DevServer', portError(port))
+//             this.port = port
+//             //this.port = _port
+//             this.location = `${proto}://${host}:${port}` 
+//             this.initialProcessEnv = initialProcessEnv
+//             this.app = new Hono()
+//             this.reqId = 0
+//             //this.app.use(cookieParser)
+//             let reqId = 0
+//             this.app.use(async (c, next) => {
+//                 reqId++
+//                 await next()   
+//             })
+//             //if (tungstenPrivateEnv.DEBUG === true) {
+//             this.app.use(async (c, next) => {
+//                 const { req } = c
+//                 const urlObj = new URL(c.req.url)
+//                 //const targetOrigin = urlObj.protocol + '://' + String(req.header('host'))
+//                 const targetOrigin = urlObj.origin
+//                 const target = targetOrigin + req.url
+//                 const origin = req.header('origin')
+//                 // request log
+//                 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
+//                 }
+//                 cliOut(message)
+//                 if ((this.config.suppressOriginMismatchWarning !== true)) {
+//                 // origin-target mismatch warning
+//                     if (origin !== undefined && origin === this.location && origin !== targetOrigin) {
+//                         cliWarn(
+//                             `Received a request from the frontend, but it's origin`
+//                         + ` is not the same as the request origin.`
+//                         + ` This may indicate a misconfiguration, and may prevent`
+//                         + ` the passing of cookies to the tungsten server.`
+//                         )
+//                         cliWarn(`source: ${targetOrigin}`)
+//                         cliWarn(`target: ${target}`)
+//                     }
+//                 }
+//                 next()
+//             })
+//                 // this.app.use((req, res, next) => {
+//                 //     cliDebug(`Received request [${res.locals.reqId}] for ${req.url}`)
+//                 //     next()   
+//                 // })
+//             //}
+//             if (config.serverMiddleware) { this.addServerMiddleware(config.serverMiddleware) }
+//             /// CHECK: Do we need to do this with hono?
+//             // can we set the mime type for .cjs files?
+//             //express.static.mime.define({'application/javascript': ['cjs']})
+//             this.app.use(
+//                 `/.tungsten.config.js`,
+//                 //express.static(join(this.compilationInfo.location, '.tungsten.config.js'))
+//                 serveStatic({ root: join(this.compilationInfo.location, '.tungsten.config.js') })
+//             ) // config file
+//             this.app.use(
+//                 `/${packagesFolder}/`,
+//                 //express.static(join(this.compilationInfo.location, packagesFolder))
+//                 serveStatic({ root: join(this.compilationInfo.location, packagesFolder) })
+//             ) // compiled packages
+//             this.app.use(
+//                 `/${clientFolder}/`,
+//                 //express.static(join(this.compilationInfo.location, clientFolder))
+//                 serveStatic({ root: join(this.compilationInfo.location, clientFolder) })
+//             ) // ?
+//             this.app.use(
+//                 `/${componentCssFolder}/`,
+//                 //express.static(join(this.compilationInfo.location, componentCssFolder))
+//                 serveStatic({ root: join(this.compilationInfo.location, componentCssFolder) })
+//             ) // app component css?/s
+//             this.app.use(
+//                 //express.static(join(this.compilationInfo.location, staticFolder))
+//                 serveStatic({ root: join(this.compilationInfo.location, staticFolder) })
+//             ) // compiled stylesheets? -- etag: false to disable caching (from express days...)
+//             const publicLocation = join(this.compilationInfo.location, publicFolder)
+//             if (existsSync(publicLocation)) {
+//                 //this.app.use(express.static(publicLocation)) // files from public folder
+//                 this.app.use(serveStatic({ root: publicLocation })) // files from public folder
+//             }
+//             //cliWarn(`assets dir:`, this.config.assetsDir)
+//             if (this.config.assetsDir !== undefined) {
+//                 this.app.use(
+//                     `/${this.config.assetsDir}`,
+//                     //express.static(join(this.compilationInfo.location, assetsFolder))
+//                     serveStatic({ root: join(this.compilationInfo.location, assetsFolder) })
+//                 ) // files from assets folder
+//             }
+//             this.app.use(
+//                 //express.static(this.compilationInfo.location, { dotfiles:'allow' })
+//                 serveStatic({ root: this.compilationInfo.location })
+//             ) // serving the app files themselves
+//             //this.app.use('/__server_rpc__', this.handleRpc)
+//             // seems there was a plan to have API routes built into the main app
+//             // can't remember this much
+//             if (typeof config.apiRoutes === 'string' && config.apiRoutes !== '') {
+//                 const apiPath = this.apiPath = standardizeWebPath(this.config.apiPath)
+//                 cliOut(`API listening at ${this.apiPath}`)
+//                 // should not be needed with hono
+//                 // this.app.use(apiPath, express.json())
+//                 //throwError('DevServerHono', 'Support for app apiRoutes not yet implemented')
+//                 this.app.use(apiPath, this.handleRequestApi)
+//             }
+//             this.app.use(this.handleRequest)
+//             // !!! obsolete?
+//             // start hooking into require to rewrite react requires to tungsten
+//             //addRequireResolveHooks() // we need this for server side
+//             // we will need a server side import loader too
+//         } catch (e) {
+//             throw new TungstenError(`${this.constructor.name} construction error: ${e}`)
+//         }
+//     }
+//     private addServerMiddleware = (serverMiddleware: ServerMiddlewareInfo): void => {
+//         //console.log('addServerMiddleware')
+//         const [middlewareFile, middlewareExportName, middlewarePath] = serverMiddleware
+//         const path = middlewarePath.startsWith('/') ? middlewarePath : '/' + middlewarePath
+//         this.app.use(path, async (c) => {
+//             // this is going to reload the server application on each request
+//             // will cause trouble if anything depends on memory
+//             // but should be OK for an ordinary DB based system, including DB based sessions
+//             // [*] We could look into replacing this with a watcher + reload based system
+//             // we'd have to set up a watcher which triggers a reload of middleware to
+//             // a variable that can be accessed here. Probably in a promise format so
+//             // that a loading middleware can be awaited instead of running the outdated
+//             // code
+//             // [*] const middlewares = await middlewaresPromise
+//             const load = await createLoad(import.meta.url, sxyLoaderConfig)
+//             const fullFilePath = 'file://' + join(this.compilationInfo.codeLocation, middlewareFile)
+//             const middlewareModule = await load(fullFilePath)
+//             if ( ! (middlewareExportName in middlewareModule) ) {
+//                 throwError(
+//                     'DevServer',
+//                     `export ${middlewareExportName} not found in ${middlewareFile}`
+//                     + ` when trying to load server middleware`
+//                 )
+//             }
+//             const middlewares = middlewareModule[middlewareExportName] as Handler[] // eslint-disable-line no-type-assertion/no-type-assertion
+//             // TODO should we add a manual type check here?
+//             if (!Array.isArray(middlewares)) throwError('addServerMiddleware', `Expected middlewares to be an array`)
+//             if (!(0 in middlewares)) throwError('addServerMiddleware', `No middleware entry at index 0`)
+//             const firstMiddleware = middlewares[0]
+//             if (!(typeof firstMiddleware === 'function')) {
+//                 throwError('addServerMiddleware', `Expected middleware to be a function`)
+//             }
+//             // mimicing hono here so we can modify behaviour on each run
+//             let i = 0
+//             const next: Next = async () => {
+//                 i++
+//                 const m = middlewares[i]
+//                 if (m !== undefined) {
+//                     m(c, next)
+//                 }
+//             }
+//             firstMiddleware(c, next)
+//         })
+//         cliOut(`Server Middleware added to server at ${path}`)
+//     }
+//     // private handleRpc = async (req: Request, res: Response, next: NextFunction) => {
+//     //     //
+//     //     console.log('Server is handling server rpc')
+//     // }
+//     private handleRequestApi = async (c: Context, next: Next): Promise<Response> => {
+//         const { req } = c
+//         this.apiRoutes = await getApiRoutesHono(this.config, this.compilationInfo, 'dev')
+//         //const requestPath = standardizeWebPath(req.baseUrl + req.path)
+//         const subPath = standardizeWebPath(req.path)
+//         //console.log('received an API req', req.originalUrl, res.locals.reqId)
+//         for (const [path, route] of Object.entries(this.apiRoutes)) {
+//             if (route.method === req.method && standardizeWebPath(path) === subPath) {
+//                 //console.log('API route matched', path)
+//                 return await route.endpoint(c, next)
+//             }
+//         }
+//         // otherwise
+//         //res.sendStatus(404)
+//         return c.notFound()
+//     }
+//     private handleRequest = async (c: Context, next: Next): Promise<Response> => {
+//         const { req } = c
+//         if (/\.(css|scss|sass|js|jsx|png|jpg|jpeg|svg|ico)$/.test(req.path)) {
+//             // warn(
+//             //     `Dev server received request ${req.url} which was not matched by a static file.`
+//             //     + '\nBlocking request to prevent pointless app render'
+//             // )
+//             cliLog(`Requested asset file ${req.url} was not found`)
+//             return c.notFound()
+//             //res.status(404).end()
+//             //return
+//         }
+//         try {
+//             const _firstRender = this.firstRender
+//             this.firstRender = false
+//             //console.log('received a frontend req', req.originalUrl, res.locals.reqId)
+//             //// I think we need to pass req, (res?) to the app
+//             //// so that it can set response codes
+//             //// or
+//             //// the app has to return some data other than response string
+//             ////
+//             //// perhaps, set some return data in the instance
+//             //// then return html string + other data
+//             const location = req.url
+//             const instanceConfig = makeInstanceConfigFromFrameworkConfig(this.config, true)
+//             if (this.framework.frameworkModules === undefined) {
+//                 throwError('DevServer.handleRequest()',
+//                     'framework.frameworkModules is undefined'
+//                 )
+//             }
+//             if (this.framework.clientImportAliases === undefined) {
+//                 throwError('DevServer.handleRequest()',
+//                     'framework.frameworkModules is undefined'
+//                 )
+//             }
+//             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
+//             // 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(
+//                 async (appRoutes) => {
+//                     const routes = (typeof appRoutes === 'function') ? appRoutes(c) : appRoutes
+//                     // load data, and do routing
+//                     return promiseAllObj({
+//                         appRoutes,
+//                         routes,
+//                         globalData: (globalDataFunc.value !== undefined) ? globalDataFunc.value(c) : {},
+//                         matchedRouteInfo: routing(location, routes, serverDataLoading)
+//                     })
+//                 }
+//             )
+//             let appRoutes: AppRoutes
+//             let routes: Routes
+//             let globalData: GlobalData
+//             let matchedRouteInfo: MatchedRouteInfo
+//             let RootComponentClass: AnyComponentType | null = null
+//             if (this.config.useRootComponent) {
+//                 const rootComponentFileFull = join(this.compilationInfo.location, this.config.rootComponent)
+//                 ;({ routing: { appRoutes, routes, globalData, matchedRouteInfo }, RootComponentClass }
+//                     = await promiseAllObj({
+//                         routing: routingPromise,
+//                         RootComponentClass: getComponentDev(rootComponentFileFull, this.config.rootComponent, load)
+//                     }))
+//             } else {
+//                 ({ appRoutes, routes, globalData, matchedRouteInfo } = await routingPromise)
+//                 //throwError('DevServer', 'useRootComponent = false not implemented yet')
+//             }
+//             // get routes (running the getRoutes function if needed)
+//             //const routes = (typeof appRoutes === 'function') ? appRoutes(reqRes) : appRoutes
+//             // load data, and do routing
+//             // const [globalData, matchedRouteInfo] = await Promise.all([
+//             //     (globalDataFunc !== undefined) ? globalDataFunc(reqRes) : {},
+//             //     routing(location, routes, serverDataLoading)
+//             // ])
+//             const redirected = this.handleRedirects(c, matchedRouteInfo)
+//             if (redirected) return // end early
+//             // make stores
+//             const { internalStore, stores, storeSubscriptions }
+//                 = initStores(location, c, globalData, matchedRouteInfo, serverDataLoading)
+//             // create the instance
+//             const instance = new Instance(    
+//                 location, instanceConfig, c, appRoutes, routes, internalStore,
+//                 stores, storeSubscriptions, globalData, matchedRouteInfo
+//             )
+//             let html: string
+//             if (RootComponentClass) {
+//                 html = await renderRootToHtmlDev(
+//                     this.compilationInfo, this.framework.clientImportAliases,
+//                     RootComponentClass, instance, this.config, global.tungstenPublicEnv,
+//                     '' // siteBasePathOverride
+//                 )
+//             } else {
+//                 html = await renderRootToHtmlDev(
+//                     this.compilationInfo, this.framework.clientImportAliases,
+//                     MatchedRoute, instance, this.config, global.tungstenPublicEnv,
+//                     '' // siteBasePathOverride
+//                 )
+//                 // const { params, data } = matchedRouteInfo
+//                 // let { content } = matchedRouteInfo
+//                 // if (typeof content === 'function') {
+//                 //     content = content(data, params, {} /* props */, globalData, location)
+//                 //     //throwError('DevServer', 'route content is a function')
+//                 // }
+//                 // //console.log('content to render', content)
+//                 // html = await renderContentToHtmlDev(
+//                 //     this.compilationInfo, this.framework.clientImportAliases,
+//                 //     content, instance, this.config, global.tungstenPublicEnv,
+//                 //     '' // siteBasePathOverride
+//                 // )
+//             }
+//             //debug('html', html)
+//             res.setHeader('Content-Type', 'text/html')
+//             res.status((instance.matchedRouteInfo.key === '404') ? 404 : 200)
+//             res.send(html)
+//         } catch(e) {
+//             cliLog('error', e)
+//             res.setHeader('Content-Type', 'text/html')
+//             res.status(500)
+//             this.errorLog(e)
+//             res.send(this.errorPage(e))
+//         }
+//     }
+//     // private async handlePost(req: express.Request, res: express.Response): Promise<void> {
+//     //     throw new TungstenError(`Err - Dev server received a post request. Not supported yet.`)
+//     // }
+//     errorLog = (error: unknown) => {
+//         log((typeof error === 'object' && error !== null && 'stack' in error) ? error.stack : error)
+//     }
+//     errorPage = (error: unknown) => {
+//         return `<!DOCTYPE html>
+// </html>
+//   <head>
+//     <title>Error</title>
+//     <style>html { font-family: arial }</style>
+//   </head>
+//   <body>
+//     <h1>Application Error</h1>
+//     <section>
+//         <pre>${(typeof error === 'object' && error !== null && 'stack' in error) ? error.stack : error}</pre>
+//     </section>
+//   </body>
+// </html>`
+//     }
+//     start = (): Promise<string> => {
+//         return new Promise( resolve => {
+//             this.server = this.app.listen(this.port, () => {
+//                 cliNews(`Dev server ready at ${this.location}`)
+//                 resolve(this.location ?? '')
+//             })
+//         })
+//     }
+//     stop = () => {
+//         if (this.server !== undefined) this.server.close()
+//     }
+//     //treeToHtml = treeToHtml
+// }

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=ProdServerHono.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ProdServerHono.d.ts","sourceRoot":"","sources":["../../../src/Servers/hono/ProdServerHono.ts"],"names":[],"mappings":""}