tungsten 0.5.8 → 0.6.0

package/dist/.build-complete

@@ -1 +1 @@
-1789634748309
+1789682694258

package/dist/Instance/Instance.d.ts

@@ -36,9 +36,13 @@ export declare class Instance {
     runtimeContext: ClientRuntimeContext | undefined;
     registeredComponents: DisposableComponent[];
     constructor(location: string, instanceConfig: InstanceConfig, reqRes: ReqRes | null, appRoutes: AppRoutes, routes: Routes, internalStore: TrueStore<InternalStoreSchema>, stores: TrueStore<any>[], storeSubscriptions: StoreSubscriptionsMap, globalData: GlobalData, matchedRouteInfo: MatchedRouteInfo, runtimeContext?: ClientRuntimeContext);
+    routeKeyToUrl: (routeKey: RouteKey) => string;
+    urlToRouteKey: (pathname: string) => RouteKey;
     getRoutes: () => Routes;
     updateLocation: (location: string) => void;
-    goto: (routeKey: RouteKey) => Promise<void>;
+    goto: (routeKey: RouteKey, { pushHistory }?: {
+        pushHistory?: boolean;
+    }) => Promise<void>;
     redirect: (url: string, code?: RedirectCode) => void;
     setDefaultTitle: (defaultTitle: string) => void;
     setTitle: (title: string) => void;

package/dist/Instance/Instance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Instance.d.ts","sourceRoot":"","sources":["../../src/Instance/Instance.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Instance.d.ts","sourceRoot":"","sources":["../../src/Instance/Instance.ts"],"names":[],"mappings":"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"}

package/dist/Instance/Instance.js

@@ -4,6 +4,7 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 import { isClient } from '../isClient.js';
 import { routing } from "../Servers/routing.js";
 import { RoutingRedirect } from '../routing/RoutingRedirect.js';
+import { routeKeyToUrl, urlToRouteKey } from '../routing/routeUrl.js';
 import { isProd } from '../isProd.js';
 import { WebRedirect } from '../routing/WebRedirect.js';
 import { RouteRedirectComponent } from "../components/RouteRedirectComponent.js";
@@ -41,6 +42,14 @@ export class Instance {
     _defineProperty(this, "navigating", false);
     _defineProperty(this, "runtimeContext", void 0);
     _defineProperty(this, "registeredComponents", []);
+    _defineProperty(this, "routeKeyToUrl", routeKey => {
+      return routeKeyToUrl(routeKey, this.config.siteBasePath, isProd && this.config.staticSite);
+    });
+    // unchecked: goto's routing() does the pattern matching and 404 fallback
+    _defineProperty(this, "urlToRouteKey", pathname => {
+      const routeKey = urlToRouteKey(pathname, this.config.siteBasePath, isProd && this.config.staticSite);
+      return routeKey; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
+    });
     _defineProperty(this, "getRoutes", () => {
       return typeof this.appRoutes === 'function' ? this.appRoutes(this.reqRes) : this.appRoutes;
     });
@@ -51,7 +60,9 @@ export class Instance {
       this.location = location;
       this.internalStore.location.set(location);
     });
-    _defineProperty(this, "goto", async routeKey => {
+    _defineProperty(this, "goto", async (routeKey, {
+      pushHistory = true
+    } = {}) => {
       // get route data
       this.navigating = true;
       let matchedRouteInfo;
@@ -108,11 +119,9 @@ export class Instance {
       //console.log('location', location) 
       //console.log('final dest', this.config.siteBasePath + location)
       this.matchedRouteInfo = matchedRouteInfo;
-      const publicUrl = isProd && this.config.staticSite === true // add .html suffix for static sites
-      ? routeKey === '/' ? '/' : routeKey + '.html' : routeKey;
-      if (isClient) {
+      if (isClient && pushHistory) {
         const runtimeWindow = this.runtimeContext?.window ?? window;
-        runtimeWindow.history.pushState(null, '', this.config.siteBasePath + publicUrl);
+        runtimeWindow.history.pushState(null, '', this.routeKeyToUrl(routeKey));
       }
       this.setTitleToDefault();
       this.updateLocation(routeKey); // this.internalStore.set('location', to)
@@ -206,10 +215,10 @@ export class Instance {
       runtimeWindow.addEventListener('popstate', event => {
         //console.log('popstate', window.location.pathname)
         //this.updateLocation(window.location.pathname)
-        const newLocation = runtimeWindow.location.pathname;
-        // unchecked: goto's routing() does the pattern matching and 404 fallback
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-        void this.goto(newLocation);
+        const newLocation = this.urlToRouteKey(runtimeWindow.location.pathname);
+        void this.goto(newLocation, {
+          pushHistory: false
+        });
       });
     }
   }

package/dist/Servers/DevServer.d.ts

@@ -11,8 +11,9 @@ export declare class DevServer extends TungstenServer {
     framework: Framework;
     config: FrameworkConfigComplete;
     compilationInfo: CompilationInfo;
-    port: number;
-    location: string | null;
+    requestedPort: number;
+    publicOrigin: string | null;
+    expectedHost: string | null;
     initialProcessEnv: Record<string, string>;
     app: express.Application;
     apiRoutes?: ApiRoutes;
@@ -40,7 +41,11 @@ export declare class DevServer extends TungstenServer {
     getGlobalData: (func: GlobalDataFunction, reqRes: ReqRes) => Promise<GlobalData>;
     errorLog: (error: unknown) => void;
     errorPage: (error: unknown, errorTrack: string[]) => string;
-    start: () => Promise<string>;
+    start: () => Promise<{
+        localOrigin: string;
+        publicOrigin: string;
+        port: number;
+    }>;
     stop: () => void;
 }
 //# sourceMappingURL=DevServer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"DevServer.d.ts","sourceRoot":"","sources":["../../src/Servers/DevServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,OAAgF,MAAM,SAAS,CAAA;AAOtG,OAAO,KAAK,EAAE,uBAAuB,EAAwB,MAAM,uBAAuB,CAAA;AAC1F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AA0B1C,OAAO,EAAkB,KAAK,UAAU,EAAE,KAAK,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AAC3G,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAsBrD,qBAAa,SAAU,SAAQ,cAAc;IACzC,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,uBAAuB,CAAA;IAC/B,eAAe,EAAE,eAAe,CAAA;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAO;IAC9B,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACzC,GAAG,EAAE,OAAO,CAAC,WAAW,CAAA;IAExB,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,EAAE,OAAO,CAAO;IAC3B,cAAc,EAAE,MAAM,CAAI;IAC1B,oBAAoB,EAAE,MAAM,CAAI;IAChC,OAAO,CAAC,iBAAiB,CAA2B;IACpD,OAAO,CAAC,iBAAiB,CAA4B;IAIrD,OAAO,CAAC,MAAM,CAA2C;gBAErD,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,uBAAuB,EAAE,eAAe,EAAE,eAAe,EACvF,iBAAiB,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM;IAiIlD,OAAO,CAAC,mBAAmB,CA2E1B;IAKD,OAAO,CAAC,sBAAsB,CAQ7B;IACD,OAAO,CAAC,mBAAmB,CAA8B;IACzD,OAAO,CAAC,iBAAiB,CAA+B;IACxD,OAAO,CAAC,kBAAkB,CAAyB;IACnD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAM;IAC9C,OAAO,CAAC,oBAAoB,CAwB3B;IACD,OAAO,CAAC,mBAAmB,CAK1B;IACD,OAAO,CAAC,gBAAgB,CAcvB;IAED,OAAO,CAAC,aAAa,CAuOpB;IAaD,OAAO,CAAC,mBAAmB,CAsC1B;IAID,aAAa,GAAU,MAAM,kBAAkB,EAAE,QAAQ,MAAM,yBAQ9D;IACD,QAAQ,GAAI,OAAO,OAAO,UAIzB;IACD,SAAS,GAAI,OAAO,OAAO,EAAE,YAAY,MAAM,EAAE,YAiBhD;IAGD,KAAK,QAAa,OAAO,CAAC,MAAM,CAAC,CAKhC;IACD,IAAI,aAMH;CAGJ"}
+{"version":3,"file":"DevServer.d.ts","sourceRoot":"","sources":["../../src/Servers/DevServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,OAAgF,MAAM,SAAS,CAAA;AAOtG,OAAO,KAAK,EAAE,uBAAuB,EAAwB,MAAM,uBAAuB,CAAA;AAC1F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AA0B1C,OAAO,EAAkB,KAAK,UAAU,EAAE,KAAK,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AAC3G,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAsBrD,qBAAa,SAAU,SAAQ,cAAc;IACzC,SAAS,EAAE,SAAS,CAAA;IACpB,MAAM,EAAE,uBAAuB,CAAA;IAC/B,eAAe,EAAE,eAAe,CAAA;IAChC,aAAa,EAAE,MAAM,CAAA;IAGrB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAO;IAGlC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAO;IAClC,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACzC,GAAG,EAAE,OAAO,CAAC,WAAW,CAAA;IAExB,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,EAAE,OAAO,CAAO;IAC3B,cAAc,EAAE,MAAM,CAAI;IAC1B,oBAAoB,EAAE,MAAM,CAAI;IAChC,OAAO,CAAC,iBAAiB,CAA2B;IACpD,OAAO,CAAC,iBAAiB,CAA4B;IAIrD,OAAO,CAAC,MAAM,CAA2C;gBAErD,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,uBAAuB,EAAE,eAAe,EAAE,eAAe,EACvF,iBAAiB,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM;IAoIlD,OAAO,CAAC,mBAAmB,CA2E1B;IAKD,OAAO,CAAC,sBAAsB,CAQ7B;IACD,OAAO,CAAC,mBAAmB,CAA8B;IACzD,OAAO,CAAC,iBAAiB,CAA+B;IACxD,OAAO,CAAC,kBAAkB,CAAyB;IACnD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAM;IAC9C,OAAO,CAAC,oBAAoB,CAwB3B;IACD,OAAO,CAAC,mBAAmB,CAK1B;IACD,OAAO,CAAC,gBAAgB,CAcvB;IAED,OAAO,CAAC,aAAa,CAiOpB;IAaD,OAAO,CAAC,mBAAmB,CAsC1B;IAID,aAAa,GAAU,MAAM,kBAAkB,EAAE,QAAQ,MAAM,yBAQ9D;IACD,QAAQ,GAAI,OAAO,OAAO,UAIzB;IACD,SAAS,GAAI,OAAO,OAAO,EAAE,YAAY,MAAM,EAAE,YAiBhD;IAGD,KAAK;;;;OA+BJ;IACD,IAAI,aAMH;CAGJ"}

package/dist/Servers/DevServer.js

@@ -49,8 +49,13 @@ export class DevServer extends TungstenServer {
     _defineProperty(this, "framework", void 0);
     _defineProperty(this, "config", void 0);
     _defineProperty(this, "compilationInfo", void 0);
-    _defineProperty(this, "port", void 0);
-    _defineProperty(this, "location", null);
+    _defineProperty(this, "requestedPort", void 0);
+    // the origin the browser is expected to use (FRONTEND_*, so not this server's own when a proxy
+    // sits in front). Both are set in start(), once a random port has resolved
+    _defineProperty(this, "publicOrigin", null);
+    // the same thing as a host header: host:port, the port dropped when the public scheme's
+    // default. What the warning above compares a request's Origin against
+    _defineProperty(this, "expectedHost", null);
     _defineProperty(this, "initialProcessEnv", void 0);
     _defineProperty(this, "app", void 0);
     //apiRoutesPromise?: Promise<ApiRoutes>
@@ -475,11 +480,37 @@ export class DevServer extends TungstenServer {
     // the port - a swallowed failure here looked like "dev is up but not responding"
     _defineProperty(this, "start", async () => {
       const {
-        server
-      } = await listenVerified(this.app, this.port, this.bootId);
+        server,
+        port
+      } = await listenVerified(this.app, this.requestedPort, this.bootId);
       this.server = server;
-      cliNews(`Dev server ready at ${this.location}`);
-      return this.location ?? '';
+      const localOrigin = `http://localhost:${port}`;
+      cliNews(`Dev server ready at ${localOrigin}`);
+      // a fixed FRONTEND_PORT cannot track a port the OS re-picks on every boot
+      const {
+        FRONTEND_PROTO,
+        FRONTEND_HOSTNAME,
+        FRONTEND_PORT
+      } = tungstenPublicEnv;
+      const publicOrigin = this.makeOrigin(FRONTEND_PROTO ?? 'http', FRONTEND_HOSTNAME ?? 'localhost', FRONTEND_PORT || port);
+      this.publicOrigin = publicOrigin;
+      if (localOrigin !== publicOrigin) {
+        cliNews(`Dev server ready at ${publicOrigin}`);
+      }
+      // Tungsten only serves over http, so the seen origin will always
+      // be http even if the FRONTEND_PROTO is https. The hostname+port
+      // will match the frontend, so 'site.com' not 'site.com:443' when serving
+      // over https port 443. The results in an origin of 'http:site.com' for
+      // https requests
+      this.expectedHost = new URL(publicOrigin).host;
+      if (this.requestedPort === 0 && Number(FRONTEND_PORT) > 0) {
+        cliWarn(`Tungsten server is running on a random free port (${port}),` + ` but FRONTEND_PORT is set to ${FRONTEND_PORT}.` + ` This is likely an error because it will be difficult` + ` for a router to route requests to a randomly selected port`);
+      }
+      return {
+        localOrigin,
+        publicOrigin,
+        port
+      };
     });
     _defineProperty(this, "stop", () => {
       if (this.server !== undefined) this.server.close();
@@ -499,13 +530,10 @@ export class DevServer extends TungstenServer {
       //         + '\n Ensure that you have an env schema with this field, and a matching env file'
       //     )
       // }
-      const proto = tungstenPublicEnv.FRONTEND_PROTO ?? 'http';
-      const host = tungstenPublicEnv.FRONTEND_HOST ?? 'localhost';
+      // 0 asks the OS for a free port - start() reports the one it actually bound
       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}`;
+      if (isNaN(port)) throwError('DevServer', portError(port));
+      this.requestedPort = port;
       this.initialProcessEnv = initialProcessEnv;
       this.app = express();
       this.reqId = 0;
@@ -517,25 +545,32 @@ export class DevServer extends TungstenServer {
       });
       //if (tungstenPrivateEnv.DEBUG === true) {
       this.app.use((req, res, next) => {
-        const targetOrigin = req.protocol + '://' + String(req.header('host'));
-        const target = targetOrigin + req.url;
+        const host = String(req.header('host')); // host:port, the port left out when default
+        const target = `${req.protocol}://${host}${req.url}`;
         const origin = req.header('origin');
         if (tungstenPrivateEnv.DEBUG === true) {
           // request log
           let message = 'Received request at ' + target;
           if (origin !== undefined) {
-            message += ' from ' + String(req.header('origin'));
+            message += ' from ' + 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}`);
+        // Did the request arrive where the page it came from was loaded? Compared as hosts,
+        // not origins: req.protocol is always http (tungsten serves no https), while the
+        // browser's origin reads https wherever a proxy terminates TLS - so comparing whole
+        // origins reports a mismatch on every request of a perfectly good https deployment
+        if (this.config.suppressOriginMismatchWarning !== true && origin !== undefined) {
+          const originHost = this.hostOfOrigin(origin);
+          // only the configured frontend's own traffic can be misconfigured this way - a
+          // request from anywhere else is an ordinary cross-origin call
+          if (originHost !== null && originHost === this.expectedHost && originHost !== host) {
+            cliWarn(`Received a request from the frontend, but it did not arrive at the` + ` address the frontend was loaded from. This may indicate a` + ` misconfiguration, and may prevent the passing of cookies to the` + ` tungsten server.`);
+            cliWarn(`request: ${target}`);
+            cliWarn(`loaded from: ${origin}`);
+            cliWarn(`arrived at: ${host}`);
           }
         }
         next();

package/dist/Servers/ProdServer.d.ts

@@ -14,7 +14,8 @@ export declare class ProdServer extends TungstenServer {
     compilationInfo: CompilationInfo;
     appRoutes: AppRoutes;
     RootComponentOrNull: AnyComponentType | null;
-    location: string | null;
+    publicOrigin: string | null;
+    expectedHost: string | null;
     app: express.Application;
     apiRoutesPromise?: Promise<ApiRoutes>;
     apiRoutes?: ApiRoutes;

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

@@ -1 +1 @@
-{"version":3,"file":"ProdServer.d.ts","sourceRoot":"","sources":["../../src/Servers/ProdServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,OAAO,MAAM,SAAS,CAAA;AAK7B,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;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAGxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAiB7D,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;IACf,OAAO,CAAC,MAAM,CAAc;gBAExB,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;IAmI7C,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;IAOK,KAAK,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAoBlE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAY9B"}
+{"version":3,"file":"ProdServer.d.ts","sourceRoot":"","sources":["../../src/Servers/ProdServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,OAAO,MAAM,SAAS,CAAA;AAK7B,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;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAGxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAiB7D,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;IAO5C,YAAY,EAAE,MAAM,GAAG,IAAI,CAAO;IAGlC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAO;IAClC,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;IACf,OAAO,CAAC,MAAM,CAAc;gBAExB,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;IAqJ7C,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;IAOK,KAAK,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IA4BlE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAa9B"}

package/dist/Servers/ProdServer.js

@@ -37,7 +37,12 @@ export class ProdServer extends TungstenServer {
     // prodBuildLocation: string
     // bundleLocation: string
     //port: number
-    _defineProperty(this, "location", null);
+    // the origin the browser is expected to use (FRONTEND_*, so not this server's own when a proxy
+    // sits in front). Both are set in start()
+    _defineProperty(this, "publicOrigin", null);
+    // the same thing as a host header: host:port, the port dropped when the public scheme's
+    // default. What the warning below compares a request's Origin against
+    _defineProperty(this, "expectedHost", null);
     _defineProperty(this, "app", void 0);
     _defineProperty(this, "apiRoutesPromise", void 0);
     _defineProperty(this, "apiRoutes", void 0);
@@ -113,7 +118,6 @@ export class ProdServer extends TungstenServer {
         //     throwError('DevServer', 'useRootComponent = false not implemented yet')
         // }
         const {
-          compilationInfo,
           config,
           appRoutes,
           RootComponentOrNull
@@ -282,24 +286,42 @@ export class ProdServer extends TungstenServer {
     }
     const requestLog = tungstenPrivateEnv.DEBUG === true;
     const originMismatchWarning = this.config.suppressOriginMismatchWarning !== true;
+    // a misconfigured prod site mismatches on every request, so each host warns once a day
+    const originWarningInterval = 24 * 60 * 60 * 1000;
+    const originWarnedAt = new Map();
     if (requestLog || originMismatchWarning) {
       this.app.use((req, res, next) => {
-        const target = req.protocol + '://' + String(req.header('host')) + req.url;
+        const host = String(req.header('host')); // host:port, the port left out when default
+        const target = `${req.protocol}://${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'));
+            message += ' from ' + 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.`);
+        // Did the request arrive where the page it came from was loaded? Hosts, not
+        // origins - req.protocol is always http here, while the browser's origin reads
+        // https wherever a proxy terminates TLS. DevServer carries the same check
+        if (originMismatchWarning && origin !== undefined) {
+          const originHost = this.hostOfOrigin(origin);
+          if (originHost !== null && originHost === this.expectedHost && originHost !== host) {
+            const warnedAt = originWarnedAt.get(host);
+            const now = Date.now();
+            if (warnedAt === undefined || now - warnedAt >= originWarningInterval) {
+              // the host header is client-supplied, so cap the map rather than grow it
+              if (originWarnedAt.size >= 100) originWarnedAt.clear();
+              originWarnedAt.set(host, now);
+              cliWarn(`Received a request from the frontend, but it did not arrive at the` + ` address the frontend was loaded from. This may indicate a` + ` misconfiguration, and may prevent the passing of cookies to the` + ` tungsten server.`);
+              cliWarn(`request: ${target}`);
+              cliWarn(`loaded from: ${origin}`);
+              cliWarn(`arrived at: ${host}`);
+              cliWarn(`Further mismatches on ${host} are silenced for 24 hours`);
+            }
           }
         }
         next();
@@ -342,8 +364,6 @@ export class ProdServer extends TungstenServer {
   // I don't think we ever override the port, not sure why
   // rejects on a bind error, or if another process answers on the port (see listenVerified.ts)
   async start(portOverride, mute = false) {
-    const proto = tungstenPublicEnv.FRONTEND_PROTO ?? 'http';
-    const host = tungstenPublicEnv.FRONTEND_HOST ?? 'localhost';
     let port;
     if (portOverride !== undefined) {
       port = portOverride ?? 0; // null: any free port
@@ -354,9 +374,19 @@ export class ProdServer extends TungstenServer {
     }
     const listening = await listenVerified(this.app, port, this.bootId);
     this.server = listening.server;
-    this.location = `${proto}://${host}:${listening.port}`;
-    if (!mute) cliNews(`${packageNameCapitalized} prod server ready at ${this.location}`);
-    return this.location;
+    const localOrigin = this.makeOrigin('http', 'localhost', listening.port);
+    const {
+      FRONTEND_PROTO,
+      FRONTEND_HOSTNAME,
+      FRONTEND_PORT
+    } = tungstenPublicEnv;
+    const publicOrigin = this.makeOrigin(FRONTEND_PROTO ?? 'http', FRONTEND_HOSTNAME ?? 'localhost', FRONTEND_PORT || listening.port);
+    this.publicOrigin = publicOrigin;
+    // URL.host is the host header's own shape - a port only when it is not the public scheme's
+    // default, so an https site on 443 gives `site.example` rather than `site.example:443`
+    this.expectedHost = new URL(publicOrigin).host;
+    if (!mute) cliNews(`${packageNameCapitalized} prod server ready at ${localOrigin}`);
+    return localOrigin;
   }
   // 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
@@ -368,6 +398,7 @@ export class ProdServer extends TungstenServer {
       server.closeAllConnections();
     });
     delete this.server;
-    this.location = null;
+    this.publicOrigin = null;
+    this.expectedHost = null;
   }
 }

package/dist/Servers/TungstenServer.d.ts

@@ -1,6 +1,8 @@
 import type { Response as ExpressResponse } from 'express';
 import type { MatchedRouteInfo } from './MatchedRouteInfo.js';
 export declare class TungstenServer {
+    protected makeOrigin(proto: string, host: string, port: number): string;
+    protected hostOfOrigin(origin: string): string | null;
     protected handleRedirects(res: ExpressResponse, matchedRouteInfo: MatchedRouteInfo): boolean;
 }
 //# sourceMappingURL=TungstenServer.d.ts.map

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,QAAQ,IAAI,eAAe,EAAE,MAAM,SAAS,CAAA;AAE1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAgB7D,qBAAa,cAAc;IACvB,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,eAAe,EAAE,gBAAgB,EAAE,gBAAgB,GAAG,OAAO;CAoD/F"}
+{"version":3,"file":"TungstenServer.d.ts","sourceRoot":"","sources":["../../src/Servers/TungstenServer.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,IAAI,eAAe,EAAE,MAAM,SAAS,CAAA;AAE1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAgB7D,qBAAa,cAAc;IAGvB,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAI9D,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAOrD,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,eAAe,EAAE,gBAAgB,EAAE,gBAAgB,GAAG,OAAO;CAoD/F"}

package/dist/Servers/TungstenServer.js

@@ -9,6 +9,19 @@ function debug(...texts) {
   // console.log(...texts)
 }
 export class TungstenServer {
+  // URL drops the port when it is the scheme's default, so http://x:80 -> http://x, https://x:443
+  // -> https://x, and anything else keeps it. Throws on a host it cannot parse
+  makeOrigin(proto, host, port) {
+    return new URL(`${proto}://${host}:${port}`).origin;
+  }
+  // null for an origin that is not a URL - a sandboxed iframe or similar sends the literal `null`
+  hostOfOrigin(origin) {
+    try {
+      return new URL(origin).host;
+    } catch {
+      return null;
+    }
+  }
   handleRedirects(res, matchedRouteInfo) {
     // handle any redirect issued during routing
     if (matchedRouteInfo.data instanceof RoutingRedirect) {

package/dist/Servers/tungstenCorePrivateEnvSchema.d.ts

@@ -1,6 +1,6 @@
 import * as v from 'valibot';
 export declare const tungstenCorePrivateEnvSchema: v.LooseObjectSchema<{
-    readonly TUNGSTEN_SERVER_PORT: v.OptionalSchema<v.SchemaWithPipe<readonly [v.NumberSchema<undefined>, v.GtValueAction<number, 0, undefined>]>, undefined>;
+    readonly TUNGSTEN_SERVER_PORT: v.OptionalSchema<v.SchemaWithPipe<readonly [v.NumberSchema<undefined>, v.MinValueAction<number, 0, undefined>]>, undefined>;
     readonly DEBUG: v.OptionalSchema<v.BooleanSchema<undefined>, undefined>;
 }, undefined>;
 export type TungstenCorePrivateEnv = v.InferOutput<typeof tungstenCorePrivateEnvSchema>;

package/dist/Servers/tungstenCorePrivateEnvSchema.js

@@ -1,11 +1,11 @@
 import * as v from 'valibot';
 // non-mutative: looseObject passes unrecognised keys through untouched, so parsing against this
 // never drops or rewrites an app's own env values
-const portSchema = v.pipe(v.number(), v.gtValue(0));
+const portSchema = v.pipe(v.number(), v.minValue(0));
 export const tungstenCorePrivateEnvSchema = v.looseObject({
   TUNGSTEN_SERVER_PORT: v.optional(portSchema),
   // FRONTEND_PROTO: v.optional(v.picklist(['http', 'https'])),
-  // FRONTEND_HOST: v.optional(v.string()),
+  // FRONTEND_HOSTNAME: v.optional(v.string()),
   // FRONTEND_PORT: v.optional(portSchema),
   DEBUG: v.optional(v.boolean())
   // SUPPRESS: v.optional(v.object({

package/dist/Servers/tungstenCorePublicEnvSchema.d.ts

@@ -1,8 +1,8 @@
 import * as v from 'valibot';
 export declare const tungstenCorePublicEnvSchema: v.LooseObjectSchema<{
     readonly FRONTEND_PROTO: v.OptionalSchema<v.PicklistSchema<["http", "https"], undefined>, undefined>;
-    readonly FRONTEND_HOST: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
-    readonly FRONTEND_PORT: v.OptionalSchema<v.SchemaWithPipe<readonly [v.NumberSchema<undefined>, v.GtValueAction<number, 0, undefined>]>, undefined>;
+    readonly FRONTEND_HOSTNAME: v.OptionalSchema<v.StringSchema<undefined>, undefined>;
+    readonly FRONTEND_PORT: v.OptionalSchema<v.SchemaWithPipe<readonly [v.NumberSchema<undefined>, v.MinValueAction<number, 0, undefined>]>, undefined>;
 }, undefined>;
 export type TungstenCorePublicEnv = v.InferOutput<typeof tungstenCorePublicEnvSchema>;
 //# sourceMappingURL=tungstenCorePublicEnvSchema.d.ts.map

package/dist/Servers/tungstenCorePublicEnvSchema.js

@@ -1,13 +1,13 @@
 import * as v from 'valibot';
-// FRONTEND_PROTO/FRONTEND_HOST/FRONTEND_PORT are tungsten's own fields (used to
+// FRONTEND_PROTO/FRONTEND_HOSTNAME/FRONTEND_PORT are tungsten's own fields (used to
 // report the dev/prod server's own location - see DevServer.ts/ProdServer.ts).
 // Optional here because most apps keep them in the private env instead - see
 // tungstenCorePrivateEnvSchema.ts, which declares the same three fields. An
 // app is free to declare either or both; the servers check private first,
 // then public.
-const portSchema = v.pipe(v.number(), v.gtValue(0));
+const portSchema = v.pipe(v.number(), v.minValue(0));
 export const tungstenCorePublicEnvSchema = v.looseObject({
   FRONTEND_PROTO: v.optional(v.picklist(['http', 'https'])),
-  FRONTEND_HOST: v.optional(v.string()),
+  FRONTEND_HOSTNAME: v.optional(v.string()),
   FRONTEND_PORT: v.optional(portSchema)
 });

package/dist/Store/InternalStoreSchema.d.ts

@@ -6,5 +6,5 @@ export declare class InternalStoreSchema {
     popMessages: PopMessage[];
     constructor(location: string, matchedRouteInfo: MatchedRouteInfo);
 }
-export type PartialInternalStoreSchema = Pick<InternalStoreSchema, 'location' | 'popMessages'> & Partial<Omit<InternalStoreSchema, 'location' | 'popMessages'>>;
+export type PartialInternalStoreSchema = Pick<InternalStoreSchema, 'popMessages'> & Partial<Omit<InternalStoreSchema, 'popMessages'>>;
 //# sourceMappingURL=InternalStoreSchema.d.ts.map

package/dist/Store/InternalStoreSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InternalStoreSchema.d.ts","sourceRoot":"","sources":["../../src/Store/InternalStoreSchema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAGvD,qBAAa,mBAAmB;IAC5B,QAAQ,EAAE,MAAM,CAAA;IAChB,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,WAAW,EAAE,UAAU,EAAE,CAAK;gBAClB,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB;CAInE;AAGD,MAAM,MAAM,0BAA0B,GAChC,IAAI,CAAC,mBAAmB,EAAE,UAAU,GAAG,aAAa,CAAC,GACrD,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,UAAU,GAAG,aAAa,CAAC,CAAC,CAAA"}
+{"version":3,"file":"InternalStoreSchema.d.ts","sourceRoot":"","sources":["../../src/Store/InternalStoreSchema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAGvD,qBAAa,mBAAmB;IAC5B,QAAQ,EAAE,MAAM,CAAA;IAChB,gBAAgB,EAAE,gBAAgB,CAAA;IAClC,WAAW,EAAE,UAAU,EAAE,CAAK;gBAClB,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB;CAInE;AAGD,MAAM,MAAM,0BAA0B,GAChC,IAAI,CAAC,mBAAmB,EAAE,aAAa,CAAC,GACxC,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,aAAa,CAAC,CAAC,CAAA"}

package/dist/bin/commands/dev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/dev.ts"],"names":[],"mappings":"AA6EA,OAAO,EAAE,CAAA"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/dev.ts"],"names":[],"mappings":"AAiFA,OAAO,EAAE,CAAA"}

package/dist/bin/commands/dev.js

@@ -43,7 +43,9 @@ await sxyFramework.build('dev');
 // start a dev server
 const devServer = await sxyFramework.createDevServer();
 //cliOut('Dev server ready')
-const devServerLocation = await sxyFramework.profiler.timeProfileAsync('start dev server', () => devServer.start());
+const {
+  publicOrigin
+} = await sxyFramework.profiler.timeProfileAsync('start dev server', () => devServer.start());
 // devmon already restarts this process itself on a framework rebuild, so the warning
 // (which just tells you to restart manually) would be redundant noise under it - see devmon.ts.
 if (config.warnOnFrameworkChange && process.env.__TUNGSTEN_DEVMON !== 'true') {
@@ -54,6 +56,6 @@ if (config.warnOnFrameworkChange && process.env.__TUNGSTEN_DEVMON !== 'true') {
 if (boot) {
   cliOut('Booting to the dev site in your browser');
   // awaited only so it can be timed - open resolves once the browser process is spawned
-  await sxyFramework.profiler.timeProfileAsync('boot browser', () => open(devServerLocation));
+  await sxyFramework.profiler.timeProfileAsync('boot browser', () => open(publicOrigin));
 }
 reportRunTotal('total (dev startup)');

package/dist/build/compileUserApp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compileUserApp.d.ts","sourceRoot":"","sources":["../../src/build/compileUserApp.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AACpE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAWtC,OAAO,EAAsB,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAM1E,wBAAsB,cAAc,CAChC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,uBAAuB,EAAE,IAAI,EAAE,IAAI,EAClE,QAAQ,GAAE,YAAwC,EAAE,KAAK,UAAQ,EAAE,KAAK,UAAQ,EAAE,KAAK,UAAQ,GAChG,OAAO,CAAC,eAAe,CAAC,CAkF1B"}
+{"version":3,"file":"compileUserApp.d.ts","sourceRoot":"","sources":["../../src/build/compileUserApp.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAA;AACpE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAWtC,OAAO,EAAsB,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAM1E,wBAAsB,cAAc,CAChC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,uBAAuB,EAAE,IAAI,EAAE,IAAI,EAClE,QAAQ,GAAE,YAAwC,EAClD,KAAK,UAAQ,EAAE,KAAK,UAAQ,EAAE,KAAK,UAAQ,GAC5C,OAAO,CAAC,eAAe,CAAC,CAkF1B"}

package/dist/components/Link.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Link.d.ts","sourceRoot":"","sources":["../../src/components/Link.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAA;AAI3D,MAAM,MAAM,SAAS,GAAG;IACpB,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9B,EAAE,EAAE,IAAI,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,WAAW,CAAA;CACxB,CAAA;AAED,qBAAa,IAAK,SAAQ,uBAAuB,CAAC,SAAS,CAAC;IACxD,IAAI,SAIe;IACnB,KAAK,GAAI,OAAO,gBAAgB,UAgB/B;IACD,OAAO,uDAUN;CACJ"}
+{"version":3,"file":"Link.d.ts","sourceRoot":"","sources":["../../src/components/Link.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAA;AAG3D,MAAM,MAAM,SAAS,GAAG;IACpB,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9B,EAAE,EAAE,IAAI,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,WAAW,CAAA;CACxB,CAAA;AAED,qBAAa,IAAK,SAAQ,uBAAuB,CAAC,SAAS,CAAC;IACxD,IAAI,SAA+C;IACnD,KAAK,GAAI,OAAO,gBAAgB,UAgB/B;IACD,OAAO,uDAUN;CACJ"}

package/dist/components/Link.js

@@ -2,12 +2,11 @@ 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 { TungstenSimpleComponent } from "../Components.js";
-import { isProd } from '../isProd.js';
 import { jsx as _jsx } from "tungsten/jsx-runtime";
 export class Link extends TungstenSimpleComponent {
   constructor(...args) {
     super(...args);
-    _defineProperty(this, "href", isProd && this.__instance.config.staticSite ? this.props.to === '/' ? this.__instance.config.siteBasePath + '/' : this.__instance.config.siteBasePath + this.props.to + '.html' : this.props.to);
+    _defineProperty(this, "href", this.__instance.routeKeyToUrl(this.props.to));
     _defineProperty(this, "click", (event /* Event */) => {
       // GUARD if control key is pressed, allow the link to be opened in a new tab
       // should this only apply on chrome?

package/dist/hydrate/hydrate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hydrate.d.ts","sourceRoot":"","sources":["../../src/hydrate/hydrate.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAQnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAoCxD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAO7C,OAAO,EAGH,KAAK,yBAAyB,EAEjC,MAAM,mBAAmB,CAAA;AAE1B,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAiBlD,OAAO,EAC4B,KAAK,uBAAuB,EAC9D,MAAM,oCAAoC,CAAA;AAS3C,OAAO,0BAA0B,CAAA;AASjC,MAAM,MAAM,WAAW,GAAG;IACtB,UAAU,EAAE,OAAO,CAAA;IACnB,UAAU,EAAE,uBAAuB,EAAE,CAAA;IAGrC,WAAW,EAAE,OAAO,CAAA;CACvB,CAAA;AACD,wBAAgB,sBAAsB,IAAI,WAAW,CAEpD;AAID,wBAAsB,OAAO,CACzB,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,yBAAyB,GAAG,IAAI,EAC/C,cAAc,EAAE,cAAc,iBAgEjC;AAyBD,wBAAsB,oBAAoB,CACtC,aAAa,SAAS,yBAAyB,CAAC,GAAG,EAAE,GAAG,CAAC,EAEzD,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,WAAW,EAIjB,KAAK,GAAE,YAAY,CAAC,aAAa,CAAC,CAAC,OAAO,CAAM,EAChD,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,SAAS,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CA6DtC"}
+{"version":3,"file":"hydrate.d.ts","sourceRoot":"","sources":["../../src/hydrate/hydrate.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAQnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAoCxD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAO7C,OAAO,EAGH,KAAK,yBAAyB,EAEjC,MAAM,mBAAmB,CAAA;AAE1B,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAmBlD,OAAO,EAC4B,KAAK,uBAAuB,EAC9D,MAAM,oCAAoC,CAAA;AAS3C,OAAO,0BAA0B,CAAA;AASjC,MAAM,MAAM,WAAW,GAAG;IACtB,UAAU,EAAE,OAAO,CAAA;IACnB,UAAU,EAAE,uBAAuB,EAAE,CAAA;IAGrC,WAAW,EAAE,OAAO,CAAA;CACvB,CAAA;AACD,wBAAgB,sBAAsB,IAAI,WAAW,CAEpD;AAID,wBAAsB,OAAO,CACzB,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,yBAAyB,GAAG,IAAI,EAC/C,cAAc,EAAE,cAAc,iBAkEjC;AAyBD,wBAAsB,oBAAoB,CACtC,aAAa,SAAS,yBAAyB,CAAC,GAAG,EAAE,GAAG,CAAC,EAEzD,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,WAAW,EAIjB,KAAK,GAAE,YAAY,CAAC,aAAa,CAAC,CAAC,OAAO,CAAM,EAChD,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,SAAS,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CA6DtC"}

package/dist/hydrate/hydrate.js

@@ -27,6 +27,8 @@ import { checkedValueToBoolean } from '../checkedValueToBoolean.js';
 import { Default404 } from "../routing/Default404.js";
 import { MatchedRoute } from '../routing/MatchedRoute.js';
 import { isDev } from '../isDev.js';
+import { isProd } from '../isProd.js';
+import { urlToRouteKey } from '../routing/routeUrl.js';
 import { warn } from '../appOutput.js';
 import { reconcileHydratedAttributes } from './reconcileHydratedAttributes.js';
 import { markOptionSelected } from '../markOptionSelected.js';
@@ -58,7 +60,7 @@ export async function hydrate(appRoutes, RootComponent, instanceConfig) {
   // happens next (a read of its value throws below). Rendered again at the end, for the count.
   if (isDev) renderDocInitErrorBanner();
   //console.log('hydration global data ', __tungsten_global_data__)
-  const location = window.location.pathname;
+  const location = urlToRouteKey(window.location.pathname, instanceConfig.siteBasePath, isProd && instanceConfig.staticSite);
   const routes = typeof appRoutes === 'function' ? appRoutes(null) : appRoutes;
   const matchedRouteInfo = hydrationRouting(__tungsten_matched_route_info__, routes);
   const globalData = __tungsten_global_data__;

package/dist/routing/routeUrl.d.ts

@@ -0,0 +1,4 @@
+import type { SiteBasePath } from '../render/HeadData.js';
+export declare function routeKeyToUrl(routeKey: string, siteBasePath: SiteBasePath, staticFiles: boolean): string;
+export declare function urlToRouteKey(pathname: string, siteBasePath: SiteBasePath, staticFiles: boolean): string;
+//# sourceMappingURL=routeUrl.d.ts.map

package/dist/routing/routeUrl.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"routeUrl.d.ts","sourceRoot":"","sources":["../../src/routing/routeUrl.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAOzD,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,GAAG,MAAM,CASxG;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,GAAG,MAAM,CAWxG"}

package/dist/routing/routeUrl.js

@@ -0,0 +1,23 @@
+// staticFiles: the site is served as generated .html files (a prod static site)
+const trimBase = siteBasePath => siteBasePath.replace(/\/$/, '');
+export function routeKeyToUrl(routeKey, siteBasePath, staticFiles) {
+  const base = trimBase(siteBasePath);
+  if (!staticFiles) return base + routeKey;
+  const suffixIndex = routeKey.search(/[?#]/);
+  const path = suffixIndex === -1 ? routeKey : routeKey.slice(0, suffixIndex);
+  const suffix = suffixIndex === -1 ? '' : routeKey.slice(suffixIndex);
+  // a directory route links to the directory; the host serves its index.html
+  const file = path.endsWith('/') ? path : path + '.html';
+  return base + file + suffix;
+}
+export function urlToRouteKey(pathname, siteBasePath, staticFiles) {
+  const base = trimBase(siteBasePath);
+  let path = pathname;
+  if (base !== '' && (path === base || path.startsWith(base + '/'))) {
+    path = path.slice(base.length) || '/';
+  }
+  if (staticFiles) {
+    if (path.endsWith('/index.html')) path = path.slice(0, -'index.html'.length);else if (path.endsWith('.html')) path = path.slice(0, -'.html'.length);
+  }
+  return path;
+}

package/dist/staticGen/staticGenFunctions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"staticGenFunctions.d.ts","sourceRoot":"","sources":["../../src/staticGen/staticGenFunctions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,IAAI,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAGzE,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,UAM1C;AACD,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,UAMlE;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAQnD;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,UAM/E"}
+{"version":3,"file":"staticGenFunctions.d.ts","sourceRoot":"","sources":["../../src/staticGen/staticGenFunctions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,IAAI,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAIzE,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,UAM1C;AACD,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,UAElE;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAQnD;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,UAM/E"}

package/dist/staticGen/staticGenFunctions.js

@@ -1,3 +1,4 @@
+import { routeKeyToUrl } from '../routing/routeUrl.js';
 export function pathToFileName(path) {
   // Is this good?
   // /foo/ becomes /foo/index.html
@@ -5,10 +6,7 @@ export function pathToFileName(path) {
   if (path.endsWith('/')) return path + 'index.html';else return path + '.html';
 }
 export function pathToLink(path, siteBasePath) {
-  // Is this good?
-  // /foo/ becomes /foo/index.html
-  // seems like a bodge
-  if (path.endsWith('/')) return siteBasePath + path + 'index.html';else return siteBasePath + path + '.html';
+  return routeKeyToUrl(path, siteBasePath, true);
 }
 export function findLinks(content) {
   const matches = [...content.matchAll(/href="(.+?)"/g)].map(x => {

package/dist/testing/host.js

@@ -37,7 +37,9 @@ async function hostedRouting(options) {
   return {
     routes: options.routes,
     internalStore: {
-      location: location ?? '/',
+      ...(location !== undefined ? {
+        location
+      } : {}),
       ...(matchedRouteInfo !== undefined ? {
         matchedRouteInfo
       } : {}),

package/dist/testing/testingComponentPackage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testingComponentPackage.d.ts","sourceRoot":"","sources":["../../src/testing/testingComponentPackage.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AACnE,OAAO,KAAK,EAAuB,0BAA0B,EAAE,MAAM,iCAAiC,CAAA;AACtG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAA;AAElE,OAAO,EAAE,cAAc,EAAE,KAAK,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAGtE,MAAM,MAAM,8BAA8B,GAAG;IAIzC,KAAK,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;IAG/B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,UAAU,CAAA;IAMvB,aAAa,CAAC,EAAE,0BAA0B,CAAA;IAC1C,MAAM,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAGhC,SAAS,CAAC,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAA;IAIjC,WAAW,CAAC,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAA;IAGrC,SAAS,CAAC,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAA;IACjC,QAAQ,CAAC,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAA;IAG/B,IAAI,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAA;IACvB,QAAQ,CAAC,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAA;CAClC,CAAA;AASD,eAAO,MAAM,UAAU,GAAI,KAAK,EAAE,cAAc,KAAK;;;oBAK7B,KAAK;;;;CAK5B,CAAA;AAID,eAAO,MAAM,iBAAiB,GAAI,KAAK,EAAE,KAAK,MAAM;;eAEvC,KAAK;;;;gBAIJ,KAAK;CACjB,CAAA;AAuBF,eAAO,MAAM,uBAAuB,GAAI,KAAK,SAAS,MAAM,EACxD,OAAO,KAAK,EACZ,UAAS,8BAAmC,KAC7C,gBAAgB,CAAC,KAAK,EAAE,SAAS,CAyClC,CAAA"}
+{"version":3,"file":"testingComponentPackage.d.ts","sourceRoot":"","sources":["../../src/testing/testingComponentPackage.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AACnE,OAAO,KAAK,EAAuB,0BAA0B,EAAE,MAAM,iCAAiC,CAAA;AACtG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAA;AAElE,OAAO,EAAE,cAAc,EAAE,KAAK,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAItE,MAAM,MAAM,8BAA8B,GAAG;IAIzC,KAAK,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;IAG/B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,UAAU,CAAA;IAMvB,aAAa,CAAC,EAAE,0BAA0B,CAAA;IAC1C,MAAM,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAGhC,SAAS,CAAC,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAA;IAIjC,WAAW,CAAC,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAA;IAGrC,SAAS,CAAC,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAA;IACjC,QAAQ,CAAC,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAA;IAG/B,IAAI,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAA;IACvB,QAAQ,CAAC,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAA;CAClC,CAAA;AASD,eAAO,MAAM,UAAU,GAAI,KAAK,EAAE,cAAc,KAAK;;;oBAK7B,KAAK;;;;CAK5B,CAAA;AAID,eAAO,MAAM,iBAAiB,GAAI,KAAK,EAAE,KAAK,MAAM;;eAEvC,KAAK;;;;gBAIJ,KAAK;CACjB,CAAA;AAuBF,eAAO,MAAM,uBAAuB,GAAI,KAAK,SAAS,MAAM,EACxD,OAAO,KAAK,EACZ,UAAS,8BAAmC,KAC7C,gBAAgB,CAAC,KAAK,EAAE,SAAS,CA6ClC,CAAA"}

package/dist/testing/testingComponentPackage.js

@@ -1,4 +1,5 @@
 import { $trueStoreCell } from '../Store/makeStore.js';
+import { routeKeyToUrl } from '../routing/routeUrl.js';
 const missing = key => {
   throw new Error(`testingComponentPackage: no ${key} supplied. Pass one in the options if the value is part` + ` of the test, or use createTestApp() for a component that needs a real app.`);
 };
@@ -88,6 +89,17 @@ export const testingComponentPackage = (props, options = {}) => ({
     redirect: options.redirect ?? (to => {
       missing(`redirect (component redirected to '${to}')`);
     }),
+    routeKeyToUrl: routeKey => {
+      const {
+        siteBasePath,
+        prod,
+        staticSite
+      } = {
+        ...defaultConfig,
+        ...options.config
+      };
+      return routeKeyToUrl(routeKey, siteBasePath, prod && staticSite);
+    },
     ...(options.trackWork !== undefined ? {
       trackWork: options.trackWork
     } : {})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tungsten",
-  "version": "0.5.8",
+  "version": "0.6.0",
   "description": "",
   "type": "module",
   "bin": {
@@ -94,7 +94,7 @@
     "npm-run-all": "^4.1.5",
     "rimraf": "^5.0.10",
     "rollup-plugin-visualizer": "^5.14.0",
-    "sxy-test-runner": "^2.4.12",
+    "sxy-test-runner": "^2.4.17",
     "typescript": "^6.0.3",
     "typescript-eslint": "^8.70.0"
   },
@@ -120,13 +120,14 @@
     "__build": "pnpm clean && pnpm build-prep && pnpm build-watch",
     "build": "run-s -c clean build-prep build-watch",
     "clean": "rimraf intermed dist",
+    "build-prep": "pnpm build-ts-once",
+    "build-watch": "run-p build-ts build-babel",
+    "build-quick": "pnpm build-watch",
+    "build-tm": "rimraf dist && tscmon --on-first-success \"pnpm build-babel\"",
     "build-once": "rimraf intermed dist && pnpm build-ts-once && pnpm build-babel-once && pnpm build-component-styles",
     "build-component-styles": "node scripts/buildComponentStyles.ts",
     "build-vendor": "node scripts/bundleVendor.ts",
     "build-once-nd": "rimraf intermed dist.building && pnpm build-ts-once && pnpm build-babel-staged && node scripts/syncDist.ts && node scripts/writeBuildMarker.ts",
-    "build-quick": "pnpm build-watch",
-    "build-prep": "pnpm build-ts-once",
-    "build-watch": "run-p build-ts build-babel",
     "build-ts": "tscmon",
     "build-ts-once": "tsc",
     "build-babel": "node scripts/watchBabelAndMark.ts",

package/vendor/manifest.json

@@ -1,7 +1,7 @@
 {
     "lockfile": {
-        "size": 239826,
-        "mtimeMs": 1789513233215.041
+        "size": 238795,
+        "mtimeMs": 1789635426367.559
     },
     "specifiers": {
         "@babel/core": "babel-core",

package/dist/auth/ref/auth.d.ts

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

package/dist/auth/ref/auth.d.ts.map

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

package/dist/auth/ref/auth.js

@@ -1,23 +0,0 @@
-// export function doLogIn(req, user) {
-//     req.session.loggedIn = true
-//     req.session.userId = user.id
-//     req.session.userType = user.type
-export {};
-//     //console.log('session after doLogIn', req.session)
-// }
-// export function doLogOut(req) {
-//     req.session.loggedIn = false
-//     delete req.session.userId
-//     delete req.session.userType
-// }
-// export function permittedToUseBackendReq(req) {
-//     return req.session.loggedIn && permittedToUseBackend({ type: req.session.userType })
-// }
-// export function permittedToUseBackend(user) {
-//     return [
-//         'administrator',
-//         'editor',
-//         'writer',
-//         'guest'
-//     ].includes(user.type)
-// }

package/dist/auth/ref/checkPasswordResetToken.d.ts

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

package/dist/auth/ref/checkPasswordResetToken.d.ts.map

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

package/dist/auth/ref/checkPasswordResetToken.js

@@ -1,27 +0,0 @@
-// import crypto from 'crypto'
-// import { PasswordResetToken } from '../models/PasswordResetToken.js'
-export {};
-// export async function checkPasswordResetToken(user, token: string) {
-//     const hash = crypto.createHash('sha256').update(user.id + token).digest('base64url')
-//     const passwordResetToken
-//         = await PasswordResetToken.find({
-//             userId: user.id,
-//             hash
-//         })
-//     if (passwordResetToken === null) {
-//         return {
-//             success: false,
-//             reason: 'Invalid'
-//         }
-//     } else if (passwordResetToken.expiresAt < new Date()) {
-//         return {
-//             success: false,
-//             reason: 'Expired'
-//         }
-//     } else {
-//         return {
-//             success: true,
-//             reason: 'Valid'
-//         }
-//     }
-// }

package/dist/auth/ref/createPasswordResetToken.d.ts

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

package/dist/auth/ref/createPasswordResetToken.d.ts.map

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

package/dist/auth/ref/createPasswordResetToken.js

@@ -1,19 +0,0 @@
-// import crypto from 'crypto'
-// import { PasswordResetToken } from '../models/PasswordResetToken.js'
-export {};
-// export function createPasswordResetToken(user) {
-//     return new Promise( (resolve, reject) => {
-//         crypto.randomBytes(16, async (err, buffer) => {
-//             if (err) reject(err)
-//             const token = buffer.toString('base64url')
-//             const hash = crypto.createHash('sha256').update(user.id + token).digest('base64url')
-//             const passwordResetToken = new PasswordResetToken
-//             passwordResetToken.userId = user.id
-//             passwordResetToken.hash = hash
-//             const _1HourInMs = 1000*60*60
-//             passwordResetToken.expiresAt = new Date(Date.now() + _1HourInMs)
-//             await passwordResetToken.create()
-//             resolve(token)
-//         })
-//     })
-// }