tungsten 0.7.2 → 0.8.0

package/dist/Servers/DevServer.js

@@ -7,6 +7,7 @@ import { join, relative } from 'path';
 // DevServer on the prod path too, so it is registered in createDevServer() instead
 import { allObj as promiseAllObj } from 'sxy-lib/promises.js';
 import { existsSync } from 'fs';
+import { inspect } from 'util';
 import { fixExtension } from '../fixExtension.js';
 import { serverModuleLocation } from '../serverModuleLocation.js';
 import slash from '../slash.js';
@@ -18,7 +19,6 @@ import { makeInstanceConfigFromFrameworkConfig } from '../makeInstanceConfigFrom
 import { cliNews, cliOut, cliWarn, cliLog, cliError } from '../cliOutput.js';
 import { getApiRoutes } from '../api/getApiRoutes.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';
@@ -27,7 +27,7 @@ import { serveStatic } from './serveStatic.js';
 import { routing } from "./routing.js";
 import { globalDataFunc } from '../routing/registerGlobalData.js';
 import { createNetworkedData } from '../routing/routingRegistry.js';
-import { TungstenServer } from "./TungstenServer.js";
+import { appRoutesFor, runnerOf, TungstenServer } from "./TungstenServer.js";
 import { portError } from './portError.js';
 import { loadEnvsDev } from './loadEnvsDev.js';
 import { initStores } from './initStores.js';
@@ -38,17 +38,22 @@ import { MatchedRoute } from '../routing/MatchedRoute.js';
 import { responseStatus } from '../routing/MatchedRouteInfo.js';
 import { toRoutes } from '../routing/routesArray.js';
 import { resetRegistrations } from './resetRegistrations.js';
-import { PipelineRequestHandler } from '../pipeline/PipelineRequestHandler.js';
 import { importRoutesModule } from '../pipeline/importRoutesModule.js';
+import { runStep } from '../pipeline/runPipeline.js';
 import { iterationQueryString } from '../iterationQueryString.js';
 import { onReloadEvent } from '../hmr/liveReloadHub.js';
 import { importDevModuleWithRetry } from '../importDevModuleWithRetry.js';
+import { ignoreGlobs } from '../build/ignoreGlobs.js';
+import { middlewaresExport, watchedServerMiddleware } from './watchedServerMiddleware.js';
 import { listenVerified, registerBootProbe } from './listenVerified.js';
 import { JSONstringify } from '../json.js';
+import { htmlEntities } from '../htmlEntities.js';
 //import cookieParser from 'cookie-parser'
 function debug(...texts) {
   // console.log(...texts)
 }
+// 'request' re-imports serverMiddleware on every request, the earlier model, kept beside 'watch'
+const serverMiddlewareReload = 'watch';
 // what Chrome DevTools fetches to auto-connect a localhost project as a workspace
 const chromeDevtoolsProjectSettingsPath = '/.well-known/appspecific/com.chrome.devtools.json';
 export class DevServer extends TungstenServer {
@@ -70,17 +75,46 @@ export class DevServer extends TungstenServer {
     _defineProperty(this, "apiRoutes", void 0);
     _defineProperty(this, "apiPath", void 0);
     _defineProperty(this, "server", void 0);
-    _defineProperty(this, "reqId", void 0);
     _defineProperty(this, "firstRender", true);
     _defineProperty(this, "iterationCount", 0);
     _defineProperty(this, "serverIterationCount", 0);
     _defineProperty(this, "liveReloadClients", new Set());
     _defineProperty(this, "unsubscribeReload", null);
+    _defineProperty(this, "watchedMiddleware", null);
     // Sent as the first event on every live-reload connection (see handleLiveReloadStream), so
     // the client can tell a fresh reconnect (server process restarted, e.g. by tungsten devmon)
     // apart from its first-ever connection, and reload only in the former case.
     _defineProperty(this, "bootId", `${Date.now()}-${Math.random()}`);
     _defineProperty(this, "addServerMiddleware", serverMiddleware => {
+      if (serverMiddlewareReload === 'watch') this.addWatchedServerMiddleware(serverMiddleware);else this.addPerRequestServerMiddleware(serverMiddleware);
+    });
+    _defineProperty(this, "addWatchedServerMiddleware", serverMiddleware => {
+      const [middlewareFile, middlewareExportName, middlewarePath] = serverMiddleware;
+      const path = middlewarePath.startsWith('/') ? middlewarePath : '/' + middlewarePath;
+      const {
+        projectDir,
+        codeLocation,
+        buildLocation
+      } = this.compilationInfo;
+      const {
+        testDirs,
+        testPatterns,
+        serverIgnoreDirs,
+        serverIgnorePatterns
+      } = this.config;
+      const load = async () => {
+        const location = serverModuleLocation(projectDir, 'dev', codeLocation, middlewareFile);
+        const file = 'file://' + location;
+        const module = await importDevModuleWithRetry(iterationQueryString(file, this.serverIterationCount++, 'middleware'));
+        return middlewaresExport(module, middlewareExportName, middlewareFile);
+      };
+      const ignored = ['**/node_modules/**', slash(`${buildLocation}/**`), ...ignoreGlobs(codeLocation, testDirs, testPatterns), ...ignoreGlobs(codeLocation, serverIgnoreDirs, serverIgnorePatterns)];
+      const watched = slash(`${codeLocation}/**/*.js`);
+      this.watchedMiddleware = watchedServerMiddleware(load, watched, ignored);
+      this.app.use(path, this.watchedMiddleware.handler);
+      cliOut(`Server Middleware added to server at ${path}`);
+    });
+    _defineProperty(this, "addPerRequestServerMiddleware", serverMiddleware => {
       //console.log('addServerMiddleware')
       const [middlewareFile, middlewareExportName, middlewarePath] = serverMiddleware;
       const path = middlewarePath.startsWith('/') ? middlewarePath : '/' + middlewarePath;
@@ -195,35 +229,6 @@ export class DevServer extends TungstenServer {
       const rel = fixExtension(slash(relative(this.compilationInfo.codeLocation, file)));
       return `/${this.compilationInfo.codeSubPath}/${rel}`;
     });
-    // pages under config.registration 'pipeline': the app is re-imported per request, as below
-    _defineProperty(this, "pipelineHandler", () => new PipelineRequestHandler({
-      dev: true,
-      config: this.config,
-      instanceConfig: () => makeInstanceConfigFromFrameworkConfig(this.config, true),
-      fileVersions: undefined,
-      loadApp: async () => {
-        this.firstRender = false;
-        const iteration = this.iterationCount++;
-        resetRegistrations();
-        await loadEnvsDev(this.config, iteration, this.initialProcessEnv, false);
-        const [app, Root] = await Promise.all([importRoutesModule(this.compilationInfo, this.config, iteration), this.config.useRootComponent ? getComponentDev(join(this.compilationInfo.buildCodeLocation, this.config.rootComponent), this.config.rootComponent, iteration) : null]);
-        return {
-          Root,
-          app
-        };
-      },
-      render: async (Root, instance) => {
-        if (this.framework.clientImportAliases === undefined) {
-          throwError('DevServer', 'framework.clientImportAliases is undefined');
-        }
-        return renderRootToHtmlDev(this.compilationInfo, this.framework.clientImportAliases, Root, instance, this.config, global.tungstenPublicEnv, '' // siteBasePathOverride
-        );
-      },
-      errorPage: error => {
-        this.errorLog(error);
-        return this.errorPage(error, []);
-      }
-    }));
     _defineProperty(this, "handleRequestApi", async (req, res, next) => {
       req.params.foo;
       this.apiRoutes = await getApiRoutes(this.config, this.compilationInfo, 'dev');
@@ -274,18 +279,10 @@ export class DevServer extends TungstenServer {
       let capturedContext = {};
       let capturedNetworkedData = {};
       try {
-        //const _firstRender = this.firstRender
         this.firstRender = false;
         const iteration = this.iterationCount++;
-        //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;
+        // make a cut down version of the app config that will be given to the instance
         const instanceConfig = makeInstanceConfigFromFrameworkConfig(this.config, true);
         if (this.framework.frameworkModules === undefined) {
           throwError('DevServer.handleRequest()', 'framework.frameworkModules is undefined');
@@ -293,23 +290,22 @@ export class DevServer extends TungstenServer {
         if (this.framework.clientImportAliases === undefined) {
           throwError('DevServer.handleRequest()', 'framework.frameworkModules is undefined');
         }
+        // ?
         resetRegistrations();
-        //const load = await createLoad(import.meta.url, sxyLoaderConfig)
+        // load env vars per request
         await loadEnvsDev(this.config, iteration, this.initialProcessEnv, false);
-        // we are delaying instance creation until after we load the app code, to lets things initialise?
         const reqRes = {
           req,
           res
         };
-        // Save some state. I think this is a placeholder for later
+        // I think this is now unused, was probably related to networked stores
         const serverDataLoading = {
           value: false
         };
-        // the app's modules load, which registers its stores; none of its functions run
-        if (this.config.serverSideRouting === false && this.config.useRootComponent) {
+        if (this.config.serverSideRouting === false) {
           const [appRoutes, Root] = await Promise.all([getRoutesDev(this.compilationInfo, this.config, iteration), getComponentDev(join(this.compilationInfo.buildCodeLocation, this.config.rootComponent), this.config.rootComponent, iteration)]);
           const instance = stubInstance(location, instanceConfig, reqRes, appRoutes);
-          sendStub(reqRes, undefined, await renderRootToHtmlDev(this.compilationInfo, this.framework.clientImportAliases, Root, instance, this.config, global.tungstenPublicEnv, ''));
+          sendStub(reqRes, undefined, await renderRootToHtmlDev(this.compilationInfo, this.framework.clientImportAliases, Root, instance, this.config, globalThis.tungstenPublicEnv, ''));
           return;
         }
         //const routingPromise = getRoutesDev(this.compilationInfo, this.config, load).then(
@@ -322,35 +318,26 @@ export class DevServer extends TungstenServer {
           return promiseAllObj({
             appRoutes,
             routes,
-            globalData: globalDataFunc.value !== undefined ? this.getGlobalData(globalDataFunc.value, reqRes, capturedContext, capturedNetworkedData).then(globalData => {
+            globalData: globalDataFunc.value !== undefined ? this.getGlobalData(globalDataFunc.value, reqRes, capturedContext, capturedNetworkedData, location).then(globalData => {
               capturedGlobalData = globalData;
               return globalData;
             }).catch(e => {
               const msg = 'Error getting global data';
+              console.log('cliError 1');
               cliError(msg);
               errorTrack.push(msg);
               throw e;
             }) : {},
+            // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
             matchedRouteInfo: routing(location, routes, capturedContext, capturedNetworkedData, serverDataLoading).catch(e => {
               const msg = 'Error performing routing';
+              console.log('cliError 2');
               cliError(msg);
               errorTrack.push(msg);
               throw e;
             })
           });
-          // .catch(e => {
-          //     const msg = 'Error when generating routes, getting global data, or performing routing'
-          //     cliError(msg)
-          //     errorTrack.push(msg)
-          //     //cliError(e)
-          //     throw e
-          // })
         });
-        // routingPromise.catch(e => {
-        //     cliError('ROUTING PROMISE ERR')
-        //     //cliError(e)
-        //     throw e
-        // })
         let appRoutes;
         let routes;
         let globalData;
@@ -368,37 +355,20 @@ export class DevServer extends TungstenServer {
             RootComponentClass
           } = await promiseAllObj({
             routing: routingPromise,
-            //RootComponentClass: getComponentDev(rootComponentFileFull, this.config.rootComponent, load)
             RootComponentClass: getComponentDev(rootComponentFileFull, this.config.rootComponent, iteration).then(c => {
               capturedRootComponentClass = c;
               return c;
             })
-          })
-          // .catch(e => {
-          //     cliError('ROUTING AND ROOT ERR')
-          //     //cliError(e)
-          //     throw e
-          //     //return undefined as any
-          // })
-          );
+          }));
         } else {
-          //console.log('do routing')
           ({
             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(res, matchedRouteInfo);
+        const redirected = this.handleRedirects(res, matchedRouteInfo, instanceConfig, globalData);
         if (redirected) return; // end early
         // make stores
         const {
@@ -412,23 +382,11 @@ export class DevServer extends TungstenServer {
         instance.networkedData = capturedNetworkedData;
         let html;
         if (RootComponentClass) {
-          html = await renderRootToHtmlDev(this.compilationInfo, this.framework.clientImportAliases, RootComponentClass, instance, this.config, global.tungstenPublicEnv, '' // siteBasePathOverride
+          html = await renderRootToHtmlDev(this.compilationInfo, this.framework.clientImportAliases, RootComponentClass, instance, this.config, globalThis.tungstenPublicEnv, '' // siteBasePathOverride
           );
         } else {
-          html = await renderRootToHtmlDev(this.compilationInfo, this.framework.clientImportAliases, MatchedRoute, instance, this.config, global.tungstenPublicEnv, '' // siteBasePathOverride
+          html = await renderRootToHtmlDev(this.compilationInfo, this.framework.clientImportAliases, MatchedRoute, instance, this.config, globalThis.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
-          // )
         }
         // a goto() during the render has already answered with a redirect
         if (instance.redirected !== undefined) return;
@@ -437,8 +395,8 @@ export class DevServer extends TungstenServer {
         res.status(responseStatus(instance.matchedRouteInfo));
         res.send(html);
       } catch (e) {
-        cliLog('error in TungstenServer handleRequest', e);
-        this.errorLog(e);
+        cliLog('error in DevServer.handleRequest');
+        this.printError(e);
         cliLog('');
         // too late for an error page once a redirect has gone out
         if (res.headersSent) return;
@@ -448,6 +406,124 @@ export class DevServer extends TungstenServer {
         res.send(errorRouteHtml ?? this.errorPage(e, errorTrack));
       }
     });
+    // pages under config.registration 'pipeline': the app is re-imported per request, as above
+    _defineProperty(this, "handleRequestPipeline", async (req, res) => {
+      if (this.staticFileRegex.test(req.url)) {
+        cliLog(`Requested asset file ${req.url} was not found`);
+        res.status(404).end();
+        return;
+      }
+      // as handleRequest: a 404 without the render
+      if (req.url === chromeDevtoolsProjectSettingsPath) {
+        cliLog(`Chrome DevTools asked for ${req.url} - not supported yet, skipping the render`);
+        res.status(404).end();
+        return;
+      }
+      cliLog('handling ' + req.url);
+      const location = req.url;
+      const reqRes = {
+        req,
+        res
+      };
+      const instanceConfig = makeInstanceConfigFromFrameworkConfig(this.config, true);
+      // what the request reached, for the error page and the error track
+      let loaded;
+      const progress = {};
+      try {
+        if (this.framework.frameworkModules === undefined) {
+          throwError('DevServer.handleRequestPipeline()', 'framework.frameworkModules unset');
+        }
+        this.firstRender = false;
+        const iteration = this.iterationCount++;
+        resetRegistrations();
+        await loadEnvsDev(this.config, iteration, this.initialProcessEnv, false);
+        const [app, Root] = await Promise.all([importRoutesModule(this.compilationInfo, this.config, iteration), this.config.useRootComponent ? getComponentDev(join(this.compilationInfo.buildCodeLocation, this.config.rootComponent), this.config.rootComponent, iteration) : null]);
+        loaded = app;
+        if (this.config.serverSideRouting === false) {
+          const appRoutes = appRoutesFor(app, undefined, true);
+          const instance = stubInstance(location, instanceConfig, reqRes, appRoutes);
+          sendStub(reqRes, undefined, await this.renderPipelinePage(Root ?? MatchedRoute, instance));
+          return;
+        }
+        const serverDataLoading = {
+          value: false
+        };
+        const runner = runnerOf(app);
+        const {
+          init,
+          routes,
+          allRoutesData,
+          matchedRouteInfo,
+          recoveredFrom
+        } = await runner.route(app, reqRes, location, serverDataLoading, true, progress);
+        if (this.handleRedirects(res, matchedRouteInfo, instanceConfig, allRoutesData)) return;
+        if (recoveredFrom !== undefined) {
+          cliLog('DevServer.handleRequestPipeline recovered, rendering the error route');
+          const errorTrack = (progress.failedSteps ?? []).map(step => `Error during ${step}`);
+          this.printError(recoveredFrom, errorTrack);
+          cliLog('');
+        }
+        const post = await runStep(progress, 'Post', () => runner.post(app, reqRes, init, allRoutesData));
+        const instance = this.pipelineInstance({
+          location,
+          reqRes,
+          instanceConfig,
+          fileVersions: undefined,
+          appRoutes: appRoutesFor(app, init, true),
+          routes,
+          matchedRouteInfo,
+          serverDataLoading,
+          allRoutesData,
+          context: runner.context(init, post),
+          networked: runner.networked(init, post)
+        });
+        const html = await runStep(progress, 'render', () => this.renderPipelinePage(Root ?? MatchedRoute, instance));
+        // a goto() during the render has already answered with a redirect
+        if (instance.redirected !== undefined) return;
+        res.setHeader('Content-Type', 'text/html');
+        res.status(responseStatus(instance.matchedRouteInfo));
+        res.send(html);
+      } catch (e) {
+        const errorTrack = (progress.failedSteps ?? []).map(step => `Error during ${step}`);
+        //console.log('cliLog 1')
+        cliLog('error in DevServer.handleRequestPipeline');
+        this.printError(e, errorTrack);
+        cliLog('');
+        // too late for an error page once a redirect has gone out
+        if (res.headersSent) return;
+        const errorPage = this.pipelineErrorPage(loaded, progress, e, {
+          location,
+          reqRes,
+          instanceConfig,
+          fileVersions: undefined
+        });
+        let html;
+        if (errorPage !== undefined) {
+          const {
+            ErrorPage,
+            instance,
+            errorInfo
+          } = errorPage;
+          try {
+            html = await this.renderPipelinePage(ErrorPage, instance, errorInfo);
+          } catch (renderError) {
+            cliError('Error rendering the app\'s error page, falling back to the default one');
+            cliLog(renderError);
+          }
+        }
+        res.setHeader('Content-Type', 'text/html');
+        res.status(500);
+        res.send(html ?? this.errorPage(e, errorTrack));
+      }
+    });
+    _defineProperty(this, "renderPipelinePage", async (Root, instance, props) => {
+      if (this.framework.clientImportAliases === undefined) {
+        throwError('DevServer', 'framework.clientImportAliases is undefined');
+      }
+      return renderRootToHtmlDev(this.compilationInfo, this.framework.clientImportAliases, Root, instance, this.config, globalThis.tungstenPublicEnv, '',
+      // siteBasePathOverride
+      props);
+    });
     // Attempts to render the app's own 'error' route instead of the dev server's generic
     // error dump, using whatever `routes`/`RootComponentClass`/`globalData` handleRequest
     // above managed to capture before it failed. Global data and route data are independent
@@ -490,7 +566,7 @@ export class DevServer extends TungstenServer {
         const instance = new Instance(req.url, instanceConfig, reqRes, routes, routes, internalStore, stores, storeSubscriptions, globalData, matchedRouteInfo);
         instance.context = context;
         instance.networkedData = networkedData;
-        return await renderRootToHtmlDev(this.compilationInfo, this.framework.clientImportAliases, RootComponentClass ?? MatchedRoute, instance, this.config, global.tungstenPublicEnv, '' // siteBasePathOverride
+        return await renderRootToHtmlDev(this.compilationInfo, this.framework.clientImportAliases, RootComponentClass ?? MatchedRoute, instance, this.config, globalThis.tungstenPublicEnv, '' // siteBasePathOverride
         );
       } catch (renderError) {
         cliError('Error rendering app error route, falling back to default error page');
@@ -501,32 +577,43 @@ export class DevServer 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.`)
     // }
-    _defineProperty(this, "getGlobalData", async (func, reqRes, context, networkedData) => {
+    _defineProperty(this, "getGlobalData", async (func, reqRes, context, networkedData, location) => {
       try {
-        return await func(reqRes, context, networkedData);
+        return await func(reqRes, context, networkedData, location);
       } catch (e) {
         cliError('Error fetching global data');
         //cliError(e)
         throw e;
       }
     });
-    _defineProperty(this, "errorLog", error => {
-      log('error log');
-      log(typeof error === 'object' && error !== null && 'stack' in error ? error.stack : error);
-      log('end error log');
+    _defineProperty(this, "printError", (error, errorSites = []) => {
+      for (const step of errorSites) {
+        cliError(step);
+      }
+      //log((typeof error === 'object' && error !== null && 'stack' in error) ? error.stack : error)
+      cliLog(error);
     });
-    _defineProperty(this, "errorPage", (error, errorTrack) => {
+    _defineProperty(this, "errorPage", (error, errorSites) => {
+      // const escapeHtml = (text: string) =>
+      //     text.replaceAll('&', '&amp;').replaceAll('<', '&lt;').replaceAll('>', '&gt;')
       return `<!DOCTYPE html>
 <html>
   <head>
     <title>Error</title>
-    <style>html { font-family: arial }</style>
+    <style>
+        html { font-family: arial; background-color: #2c3853; color: white; }
+        body { margin: 0 5%; }
+        h3.site { color: #ff3d3d; }
+        pre { white-space: pre-wrap; overflow-wrap: anywhere; }
+    </style>
   </head>
   <body>
     <h1>Application Error</h1>
     <section>
-        ${errorTrack.length > 0 ? '<pre>' + errorTrack.join('\n') + '</pre>' : ''}
-        <pre>${typeof error === 'object' && error !== null && 'stack' in error ? error.stack : error}</pre>
+        ${errorSites.map(s => '<h3 class="site">' + s + '</h3>')}
+        <pre>${htmlEntities(inspect(error, {
+        depth: 6
+      }))}</pre>
     </section>
   </body>
 </html>`;
@@ -570,6 +657,7 @@ export class DevServer extends TungstenServer {
     _defineProperty(this, "stop", () => {
       if (this.server !== undefined) this.server.close();
       this.unsubscribeReload?.();
+      void this.watchedMiddleware?.close();
       if (this.reloadDebounceTimer !== null) clearTimeout(this.reloadDebounceTimer);
       for (const client of this.liveReloadClients) client.end();
       this.liveReloadClients.clear();
@@ -591,13 +679,8 @@ export class DevServer extends TungstenServer {
       this.requestedPort = port;
       this.initialProcessEnv = initialProcessEnv;
       this.app = express();
-      this.reqId = 0;
       registerBootProbe(this.app, this.bootId); // first, so start() can prove it owns the port
       //this.app.use(cookieParser)
-      this.app.use((req, res, next) => {
-        res.locals.reqId = this.reqId++;
-        next();
-      });
       //if (tungstenPrivateEnv.DEBUG === true) {
       this.app.use((req, res, next) => {
         const host = String(req.header('host')); // host:port, the port left out when default
@@ -663,7 +746,7 @@ export class DevServer extends TungstenServer {
         this.app.use(apiPath, express.json());
         this.app.use(apiPath, this.handleRequestApi);
       }
-      this.app.use(config.registration === 'pipeline' ? this.pipelineHandler().handle : this.handleRequest);
+      this.app.use(config.registration === 'pipeline' ? this.handleRequestPipeline : this.handleRequest);
       // !!! obsolete?
       // start hooking into require to rewrite react requires to tungsten
       //addRequireResolveHooks() // we need this for server side

package/dist/Servers/ProdServer.d.ts

@@ -23,8 +23,10 @@ export declare class ProdServer extends TungstenServer {
     server?: Server;
     private bootId;
     constructor(framework: Framework, config: FrameworkConfigComplete, compilationInfo: CompilationInfo, appRoutes: AppRoutes<any>, RootComponentOrNull: AnyComponentType | null, serverMiddleware: ServerMiddleware | null, pipelineApp?: PipelineApp | null);
-    readonly requestHandler: (req: express.Request, res: express.Response) => Promise<void>;
+    private readonly pipelineApp;
     private handleRequestApi;
+    handleRequestPipeline: (req: express.Request, res: express.Response) => Promise<void>;
+    private renderPipelinePage;
     handleRequest: (req: express.Request, res: express.Response) => Promise<void>;
     private tryRenderErrorRoute;
     private stubRoot;