@ms-cloudpack/app-server 0.16.7 → 0.17.0

package/lib/createRoutes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createRoutes.d.ts","sourceRoot":"","sources":["../src/createRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAML,KAAK,WAAW,EAGjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,OAAO,EAAqB,MAAM,kCAAkC,CAAC;AAUnF,UAAU,mBAAmB;IAC3B,GAAG,EAAE,OAAO,CAAC;IACb,8CAA8C;IAC9C,GAAG,EAAE,MAAM,CAAC;IACZ,+BAA+B;IAC/B,UAAU,EAAE,WAAW,CAAC;CACzB;AAED,KAAK,mBAAmB,GAAG,IAAI,CAAC,OAAO,EAAE,UAAU,GAAG,oBAAoB,GAAG,eAAe,GAAG,SAAS,CAAC,CAAC;AAE1G;;GAEG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,mBAAmB,EAAE,OAAO,EAAE,mBAAmB,QAuCtF"}
+{"version":3,"file":"createRoutes.d.ts","sourceRoot":"","sources":["../src/createRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAML,KAAK,WAAW,EAIjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,OAAO,EAAqB,MAAM,kCAAkC,CAAC;AAWnF,UAAU,mBAAmB;IAC3B,GAAG,EAAE,OAAO,CAAC;IACb,8CAA8C;IAC9C,GAAG,EAAE,MAAM,CAAC;IACZ,+BAA+B;IAC/B,UAAU,EAAE,WAAW,CAAC;CACzB;AAED,KAAK,mBAAmB,GAAG,IAAI,CAAC,OAAO,EAAE,UAAU,GAAG,oBAAoB,GAAG,eAAe,GAAG,SAAS,CAAC,CAAC;AAc1G;;GAEG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,mBAAmB,EAAE,OAAO,EAAE,mBAAmB,QA6CtF"}

package/lib/createRoutes.js

@@ -7,6 +7,17 @@ import { getInlineScripts } from './inlineScripts/getInlineScripts.js';
 import { renderRoute } from './renderRoute/renderRoute.js';
 import { renderBootstrapRoute } from './renderBootstrapRoute.js';
 import { createPageSessionContext } from './createPageSessionContext.js';
+import { parseMatch } from './parseMatch.js';
+/** Express middleware that will match the domain to continue the route execution. */
+function matchDomain(domain) {
+    return (req, _, next) => {
+        if (!domain || domain.test(req.hostname)) {
+            return next();
+        }
+        // Jump to next route.
+        return next('route');
+    };
+}
 /**
  * Creates the routes for the express app based on the config.
  */
@@ -29,24 +40,28 @@ export function createRoutes(options, context) {
         });
     }
     for (const route of routes) {
-        if (isStaticRoute(route)) {
-            app.use(route.match, express.static(path.resolve(appPath, route.staticPath)));
-        }
-        else if (isRedirectRoute(route)) {
-            app.get(route.match, (req, res) => {
-                res.redirect(route.redirectTo);
-            });
-        }
-        else if (isRenderedRoute(route) || isBootstrapRoute(route)) {
-            app.get(route.match, (req, res) => {
-                handleRequest({ ...otherOptions, route, req, res }, context).catch((err) => {
-                    console.error(err?.stack || err);
-                    res.status(500).send(`Error loading app: ${err}`);
+        const matches = Array.isArray(route.match) ? route.match : [route.match];
+        for (const match of matches) {
+            const { pathMatch, domainMatch } = parseMatch(match);
+            if (isStaticRoute(route)) {
+                app.use(pathMatch, matchDomain(domainMatch), express.static(path.resolve(appPath, route.staticPath)));
+            }
+            else if (isRedirectRoute(route)) {
+                app.get(pathMatch, matchDomain(domainMatch), (req, res) => {
+                    res.redirect(route.redirectTo);
                 });
-            });
-        }
-        else {
-            throw new Error(`Unknown route: ${JSON.stringify(route)}`);
+            }
+            else if (isRenderedRoute(route) || isBootstrapRoute(route)) {
+                app.get(pathMatch, matchDomain(domainMatch), (req, res) => {
+                    handleRequest({ ...otherOptions, route, req, res }, context).catch((err) => {
+                        console.error(err?.stack || err);
+                        res.status(500).send(`Error loading app: ${err}`);
+                    });
+                });
+            }
+            else {
+                throw new Error(`Unknown route: ${JSON.stringify(route)}`);
+            }
         }
     }
 }

package/lib/createRoutes.js.map

@@ -1 +1 @@
-{"version":3,"file":"createRoutes.js","sourceRoot":"","sources":["../src/createRoutes.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Context } from '@ms-cloudpack/api-server';\nimport {\n  isBootstrapRoute,\n  isRedirectRoute,\n  isRenderedRoute,\n  isStaticRoute,\n  type BootstrapRoute,\n  type PackageJson,\n  type RenderedRoute,\n  type ExpandedRenderFunctionResult,\n} from '@ms-cloudpack/common-types';\nimport type { Express, Request, Response } from '@ms-cloudpack/create-express-app';\nimport { express } from '@ms-cloudpack/create-express-app';\nimport { createImportMap } from '@ms-cloudpack/import-map';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport path from 'path';\nimport { getInlineScripts } from './inlineScripts/getInlineScripts.js';\nimport { renderRoute } from './renderRoute/renderRoute.js';\nimport { renderBootstrapRoute } from './renderBootstrapRoute.js';\nimport { createPageSessionContext } from './createPageSessionContext.js';\n\ninterface CreateRoutesOptions {\n  app: Express;\n  /** Base app server URL, including the port */\n  url: string;\n  /** package.json for the app */\n  definition: PackageJson;\n}\n\ntype CreateRoutesContext = Pick<Context, 'packages' | 'packageImportPaths' | 'packageHashes' | 'session'>;\n\n/**\n * Creates the routes for the express app based on the config.\n */\nexport function createRoutes(options: CreateRoutesOptions, context: CreateRoutesContext) {\n  const { app, ...otherOptions } = options;\n  const { session } = context;\n  const { config } = session;\n  const { appPath } = config;\n  const routes = [...(session.config.routes || [])];\n\n  if (!options.definition.name) {\n    throw new Error('Name field is required in the package.json file.');\n  }\n\n  if (!routes.length) {\n    // If no routes have been defined, register a default (no path) route only.\n    // This will render default HTML which includes the app's default path ('.') from the import map.\n    routes.push({\n      match: '/',\n      // sourcePath and requestPath are required by types but unused in this case.\n      entry: [{ importPath: '.', sourcePath: '' }],\n    });\n  }\n\n  for (const route of routes) {\n    if (isStaticRoute(route)) {\n      app.use(route.match, express.static(path.resolve(appPath, route.staticPath)));\n    } else if (isRedirectRoute(route)) {\n      app.get(route.match, (req, res) => {\n        res.redirect(route.redirectTo);\n      });\n    } else if (isRenderedRoute(route) || isBootstrapRoute(route)) {\n      app.get(route.match, (req, res) => {\n        handleRequest({ ...otherOptions, route, req, res }, context).catch((err) => {\n          console.error((err as Error)?.stack || err);\n          res.status(500).send(`Error loading app: ${err}`);\n        });\n      });\n    } else {\n      throw new Error(`Unknown route: ${JSON.stringify(route)}`);\n    }\n  }\n}\n\nasync function handleRequest(\n  options: Omit<CreateRoutesOptions, 'app'> & {\n    req: Request;\n    res: Response;\n    route: RenderedRoute | BootstrapRoute;\n  },\n  context: CreateRoutesContext,\n) {\n  const { req, res, definition, route, url } = options;\n  const { session } = context;\n  const { bundleServer, appServer } = session.urls;\n\n  if (!bundleServer) {\n    throw new Error('The bundle server URL is not yet set in the session (this is a Cloudpack bug).');\n  }\n\n  if (!appServer) {\n    throw new Error('The app server URL is not yet set in the session (this is a Cloudpack bug).');\n  }\n\n  // Build the import map if it hasn't been built yet for this session version.\n  // (TS can't infer that urls.bundleServer is set on session from a check above.)\n  const importMap = (session.importMap ??= await createImportMap({\n    ...context,\n    ...session,\n    urls: { bundleServer, appServer },\n  }));\n\n  // For production mode, no overlay script.\n  const overlayScript = session.config.mode !== 'production' ? importMap.imports['@ms-cloudpack/overlay'] : undefined;\n\n  // Get all entry scripts for the route.\n  const entryScripts = route.entry?.map(\n    (entry) => importMap.imports[slash(path.join(definition.name, entry.importPath))],\n  );\n\n  const pageSessionContextScript =\n    `window.__cloudpack ??= {};\\n` +\n    `window.__cloudpack.pageSessionContext = ${JSON.stringify(createPageSessionContext(session, req.path))};`;\n\n  // Add the pageSessionContext to the top of the inlineScripts\n  const inlineScripts = [pageSessionContextScript, ...(await getInlineScripts())];\n\n  // Set the appropriate Cloudpack headers in the response.\n  res.header('Cache-Control', 'no-cache');\n  res.header('Access-Control-Allow-Origin', '*');\n\n  let rendered: ExpandedRenderFunctionResult | null;\n\n  if (isBootstrapRoute(route)) {\n    // Render the bootstrap script\n    rendered = await renderBootstrapRoute({\n      session,\n      importMap,\n      overlayScript,\n      inlineScripts,\n      entryScripts,\n      requestPath: req.path,\n    });\n  } else {\n    // HTML or custom script rendering\n    rendered = await renderRoute({\n      ...options,\n      session,\n      baseUrl: url,\n      importMap,\n      overlayScript,\n      inlineScripts,\n      entryScripts,\n    });\n  }\n\n  if (rendered) {\n    res.type(rendered.contentType).status(rendered.statusCode).send(rendered.content).end();\n  }\n\n  console.debug(`App server: Request: ${req.path}`);\n}\n"]}
+{"version":3,"file":"createRoutes.js","sourceRoot":"","sources":["../src/createRoutes.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Context } from '@ms-cloudpack/api-server';\nimport {\n  isBootstrapRoute,\n  isRedirectRoute,\n  isRenderedRoute,\n  isStaticRoute,\n  type BootstrapRoute,\n  type PackageJson,\n  type RenderedRoute,\n  type ExpandedRenderFunctionResult,\n  type RequestHandler,\n} from '@ms-cloudpack/common-types';\nimport type { Express, Request, Response } from '@ms-cloudpack/create-express-app';\nimport { express } from '@ms-cloudpack/create-express-app';\nimport { createImportMap } from '@ms-cloudpack/import-map';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport path from 'path';\nimport { getInlineScripts } from './inlineScripts/getInlineScripts.js';\nimport { renderRoute } from './renderRoute/renderRoute.js';\nimport { renderBootstrapRoute } from './renderBootstrapRoute.js';\nimport { createPageSessionContext } from './createPageSessionContext.js';\nimport { parseMatch } from './parseMatch.js';\n\ninterface CreateRoutesOptions {\n  app: Express;\n  /** Base app server URL, including the port */\n  url: string;\n  /** package.json for the app */\n  definition: PackageJson;\n}\n\ntype CreateRoutesContext = Pick<Context, 'packages' | 'packageImportPaths' | 'packageHashes' | 'session'>;\n\n/** Express middleware that will match the domain to continue the route execution. */\nfunction matchDomain(domain?: RegExp): RequestHandler {\n  return (req, _, next) => {\n    if (!domain || domain.test(req.hostname)) {\n      return next();\n    }\n\n    // Jump to next route.\n    return next('route');\n  };\n}\n\n/**\n * Creates the routes for the express app based on the config.\n */\nexport function createRoutes(options: CreateRoutesOptions, context: CreateRoutesContext) {\n  const { app, ...otherOptions } = options;\n  const { session } = context;\n  const { config } = session;\n  const { appPath } = config;\n  const routes = [...(session.config.routes || [])];\n\n  if (!options.definition.name) {\n    throw new Error('Name field is required in the package.json file.');\n  }\n\n  if (!routes.length) {\n    // If no routes have been defined, register a default (no path) route only.\n    // This will render default HTML which includes the app's default path ('.') from the import map.\n    routes.push({\n      match: '/',\n      // sourcePath and requestPath are required by types but unused in this case.\n      entry: [{ importPath: '.', sourcePath: '' }],\n    });\n  }\n\n  for (const route of routes) {\n    const matches = Array.isArray(route.match) ? route.match : [route.match];\n\n    for (const match of matches) {\n      const { pathMatch, domainMatch } = parseMatch(match);\n\n      if (isStaticRoute(route)) {\n        app.use(pathMatch, matchDomain(domainMatch), express.static(path.resolve(appPath, route.staticPath)));\n      } else if (isRedirectRoute(route)) {\n        app.get(pathMatch, matchDomain(domainMatch), (req, res) => {\n          res.redirect(route.redirectTo);\n        });\n      } else if (isRenderedRoute(route) || isBootstrapRoute(route)) {\n        app.get(pathMatch, matchDomain(domainMatch), (req, res) => {\n          handleRequest({ ...otherOptions, route, req, res }, context).catch((err) => {\n            console.error((err as Error)?.stack || err);\n            res.status(500).send(`Error loading app: ${err}`);\n          });\n        });\n      } else {\n        throw new Error(`Unknown route: ${JSON.stringify(route)}`);\n      }\n    }\n  }\n}\n\nasync function handleRequest(\n  options: Omit<CreateRoutesOptions, 'app'> & {\n    req: Request;\n    res: Response;\n    route: RenderedRoute | BootstrapRoute;\n  },\n  context: CreateRoutesContext,\n) {\n  const { req, res, definition, route, url } = options;\n  const { session } = context;\n  const { bundleServer, appServer } = session.urls;\n\n  if (!bundleServer) {\n    throw new Error('The bundle server URL is not yet set in the session (this is a Cloudpack bug).');\n  }\n\n  if (!appServer) {\n    throw new Error('The app server URL is not yet set in the session (this is a Cloudpack bug).');\n  }\n\n  // Build the import map if it hasn't been built yet for this session version.\n  // (TS can't infer that urls.bundleServer is set on session from a check above.)\n  const importMap = (session.importMap ??= await createImportMap({\n    ...context,\n    ...session,\n    urls: { bundleServer, appServer },\n  }));\n\n  // For production mode, no overlay script.\n  const overlayScript = session.config.mode !== 'production' ? importMap.imports['@ms-cloudpack/overlay'] : undefined;\n\n  // Get all entry scripts for the route.\n  const entryScripts = route.entry?.map(\n    (entry) => importMap.imports[slash(path.join(definition.name, entry.importPath))],\n  );\n\n  const pageSessionContextScript =\n    `window.__cloudpack ??= {};\\n` +\n    `window.__cloudpack.pageSessionContext = ${JSON.stringify(createPageSessionContext(session, req.path))};`;\n\n  // Add the pageSessionContext to the top of the inlineScripts\n  const inlineScripts = [pageSessionContextScript, ...(await getInlineScripts())];\n\n  // Set the appropriate Cloudpack headers in the response.\n  res.header('Cache-Control', 'no-cache');\n  res.header('Access-Control-Allow-Origin', '*');\n\n  let rendered: ExpandedRenderFunctionResult | null;\n\n  if (isBootstrapRoute(route)) {\n    // Render the bootstrap script\n    rendered = await renderBootstrapRoute({\n      session,\n      importMap,\n      overlayScript,\n      inlineScripts,\n      entryScripts,\n      requestPath: req.path,\n    });\n  } else {\n    // HTML or custom script rendering\n    rendered = await renderRoute({\n      ...options,\n      session,\n      baseUrl: url,\n      importMap,\n      overlayScript,\n      inlineScripts,\n      entryScripts,\n    });\n  }\n\n  if (rendered) {\n    res.type(rendered.contentType).status(rendered.statusCode).send(rendered.content).end();\n  }\n\n  console.debug(`App server: Request: ${req.path}`);\n}\n"]}

package/lib/parseMatch.d.ts

@@ -0,0 +1,11 @@
+import type { RouteMatch } from '../../common-types/lib/Route.js';
+/**
+ * Helper which parses the route "match" value into an object, ensuring that if a domain were provided,
+ * that it is translated into a regular expression that can be tested against the hostname in the express
+ * request.
+ */
+export declare function parseMatch(match: RouteMatch): {
+    pathMatch: string;
+    domainMatch?: RegExp;
+};
+//# sourceMappingURL=parseMatch.d.ts.map

package/lib/parseMatch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parseMatch.d.ts","sourceRoot":"","sources":["../src/parseMatch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAElE;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,CAsBzF"}

package/lib/parseMatch.js

@@ -0,0 +1,25 @@
+/**
+ * Helper which parses the route "match" value into an object, ensuring that if a domain were provided,
+ * that it is translated into a regular expression that can be tested against the hostname in the express
+ * request.
+ */
+export function parseMatch(match) {
+    const pathMatch = typeof match === 'string' ? match : match.path;
+    const domainString = typeof match === 'string' ? undefined : match.domain;
+    if (!domainString) {
+        return {
+            pathMatch,
+        };
+    }
+    // Escape special regex characters except '*', then replace '*' with '.*'
+    const escapedDomain = domainString
+        .replace(/[-/\\^$+?.()|[\]{}]/g, '\\$&') // Escape regex special chars
+        .replace(/\*/g, '.*'); // Convert wildcards to regex pattern
+    // Adjust regex to account for optional port matching
+    const domainMatch = new RegExp(`^${escapedDomain}(?::\\d+)?$`);
+    return {
+        pathMatch: pathMatch || '/',
+        domainMatch,
+    };
+}
+//# sourceMappingURL=parseMatch.js.map

package/lib/parseMatch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parseMatch.js","sourceRoot":"","sources":["../src/parseMatch.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,KAAiB;IAC1C,MAAM,SAAS,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;IACjE,MAAM,YAAY,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC;IAE1E,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO;YACL,SAAS;SACV,CAAC;IACJ,CAAC;IAED,yEAAyE;IACzE,MAAM,aAAa,GAAG,YAAY;SAC/B,OAAO,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC,6BAA6B;SACrE,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,qCAAqC;IAE9D,qDAAqD;IACrD,MAAM,WAAW,GAAG,IAAI,MAAM,CAAC,IAAI,aAAa,aAAa,CAAC,CAAC;IAE/D,OAAO;QACL,SAAS,EAAE,SAAS,IAAI,GAAG;QAC3B,WAAW;KACZ,CAAC;AACJ,CAAC","sourcesContent":["import type { RouteMatch } from '../../common-types/lib/Route.js';\n\n/**\n * Helper which parses the route \"match\" value into an object, ensuring that if a domain were provided,\n * that it is translated into a regular expression that can be tested against the hostname in the express\n * request.\n */\nexport function parseMatch(match: RouteMatch): { pathMatch: string; domainMatch?: RegExp } {\n  const pathMatch = typeof match === 'string' ? match : match.path;\n  const domainString = typeof match === 'string' ? undefined : match.domain;\n\n  if (!domainString) {\n    return {\n      pathMatch,\n    };\n  }\n\n  // Escape special regex characters except '*', then replace '*' with '.*'\n  const escapedDomain = domainString\n    .replace(/[-/\\\\^$+?.()|[\\]{}]/g, '\\\\$&') // Escape regex special chars\n    .replace(/\\*/g, '.*'); // Convert wildcards to regex pattern\n\n  // Adjust regex to account for optional port matching\n  const domainMatch = new RegExp(`^${escapedDomain}(?::\\\\d+)?$`);\n\n  return {\n    pathMatch: pathMatch || '/',\n    domainMatch,\n  };\n}\n"]}

package/lib/renderRoute/renderRoute.js

@@ -162,7 +162,7 @@ function injectScripts(options, result) {
     }
     catch (e) {
         // Trying to write a test for the above, it seemed very permissive, but catch just in case
-        console.error(`Error parsing html response for rendering route "${route.match}":\n${e.stack || e}`);
+        console.error(`Error parsing html response for rendering route "${JSON.stringify(route.match)}":\n${e.stack || e}`);
         return;
     }
     try {
@@ -186,7 +186,7 @@ function injectScripts(options, result) {
         result.content = jsdom.serialize();
     }
     catch (e) {
-        console.error(`Error injecting scripts for route "${route.match}":\n${e.stack || e}`);
+        console.error(`Error injecting scripts for route "${JSON.stringify(route.match)}":\n${e.stack || e}`);
     }
 }
 /**

package/lib/renderRoute/renderRoute.js.map

@@ -1 +1 @@
-{"version":3,"file":"renderRoute.js","sourceRoot":"","sources":["../../src/renderRoute/renderRoute.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  RenderFunction,\n  RenderFunctionOptions,\n  RenderFunctionResult,\n  ExpandedRenderFunctionResult,\n  RenderedRoute,\n  Request,\n  RenderFunctionScript,\n} from '@ms-cloudpack/common-types';\nimport { makeUrl } from '@ms-cloudpack/path-string-parsing';\nimport fsPromises from 'fs/promises';\nimport { JSDOM } from 'jsdom';\nimport path from 'path';\nimport { pathToFileURL } from 'url';\nimport { getDefaultHtmlResponse } from './getDefaultHtmlResponse.js';\nimport { getHtmlErrorResponse } from './getHtmlErrorResponse.js';\n\n/**\n * Get the response for the given route. If the route has a custom render script, use that.\n * Returns an error response if the file referenced by the script doesn't exist or throws an error.\n */\nexport async function renderRoute(options: RenderFunctionOptions): Promise<ExpandedRenderFunctionResult | null> {\n  const { route, session } = options;\n  const { config } = session;\n  const { appPath } = config;\n\n  // Get an initial result from either the render script or default handler.\n  let rawResult: RenderFunctionResult;\n  const renderScriptPath = route.renderScript && path.resolve(appPath, route.renderScript);\n  if (renderScriptPath) {\n    const scriptExt = path.extname(renderScriptPath).toLowerCase();\n    if (scriptExt === '.html' || scriptExt === '.htm') {\n      rawResult = await readStaticHtml(renderScriptPath);\n    } else {\n      rawResult = await renderCustomScript({ ...options, renderScriptPath });\n    }\n  } else {\n    rawResult = await getDefaultHtmlResponse(options);\n  }\n\n  if (rawResult === null) {\n    // This means the custom renderScript fully handled the request.\n    return null;\n  }\n\n  if (rawResult === undefined) {\n    return makeErrorResponse({\n      message:\n        `returned undefined. If the renderScript fully handled the request (sent a response), ` +\n        `return null instead. Otherwise ensure that the function returns the content to be rendered.`,\n      route,\n      req: options.req,\n      renderScriptPath,\n    });\n  }\n\n  const result: ExpandedRenderFunctionResult = {\n    contentType: 'text/html',\n    statusCode: 200,\n    ...(typeof rawResult === 'string' ? { content: rawResult } : rawResult),\n  };\n\n  // If it's HTML and a success statusCode, inject the import map and appropriate scripts.\n  if (result.statusCode === 200 && isHtmlType(result.contentType)) {\n    if (isHtmlAcceptable(options)) {\n      // Inject the import map and scripts.\n      injectScripts(options, result);\n    } else {\n      // It appears we're accidentally returning HTML when a different file type was requested.\n      // This could happen for overly broad route matches such as '*', or if no routes are configured.\n      return makeErrorResponse({\n        message:\n          'returned HTML, but this appears to be a non-HTML request. This is likely due to an ' +\n          'overly broad match or other misconfiguration of server.routes in the cloudpack config.',\n        route,\n        renderScriptPath,\n        req: options.req,\n      });\n    }\n  }\n\n  return result;\n}\n\n/**\n * Fill in details of the message, log to console.error, and return an error response.\n * `Route ${route.match} with renderScript \"${renderScriptPath}\" ${message}`\n */\nfunction makeErrorResponse(params: {\n  message: string;\n  route: RenderedRoute;\n  renderScriptPath: string | undefined;\n  req: Request;\n}): ExpandedRenderFunctionResult {\n  const { message, route, renderScriptPath, req } = params;\n  const renderer = renderScriptPath ? `renderScript \"${renderScriptPath}\"` : 'the default renderer';\n  const content = `Route ${JSON.stringify(route.match)} with ${renderer} ${message}`;\n  console.error(`App server: request ${req.url} - ${content}`);\n\n  return { statusCode: 500, contentType: 'text/plain', content };\n}\n\nfunction isHtmlAcceptable(options: Pick<RenderFunctionOptions, 'req' | 'baseUrl'>) {\n  const { req, baseUrl } = options;\n  // Get the request path and extension (the URL.pathname conversion gets rid of any query or hash)\n  const requestPath = makeUrl(req.url, baseUrl).pathname;\n  const requestExt = path.extname(requestPath);\n  // Determine whether HTML is (probably) an acceptable response type (can be refined later if needed).\n  // In theory we should be able to use req.accepts() but not all requests set the accept header.\n  return (!requestExt || requestExt.startsWith('.htm')) && !req.xhr && isHtmlType(req.headers.accept || '*/*');\n}\n\nfunction isHtmlType(acceptOrContentType: string) {\n  // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Accept\n  // https://developer.mozilla.org/en-US/docs/Web/HTTP/Content_negotiation/List_of_default_Accept_values\n  // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Type\n  // https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types\n  return acceptOrContentType\n    .split(',')\n    .map((s) => s.split(';')[0].trim())\n    .some((mime) => mime === '*/*' || /xml|x?html/i.test(mime) || /^(text|application)\\/\\*$/.test(mime));\n}\n\n/**\n * Load the default export from a JS file passed as the `renderScript` in a route,\n * and return either the result of running the function, or an error page if something fails.\n */\nasync function renderCustomScript(\n  params: RenderFunctionOptions & { renderScriptPath: string },\n): Promise<RenderFunctionResult> {\n  const { renderScriptPath, ...options } = params;\n  // Get the html factory function from a script default export.\n  const renderScriptUrl = pathToFileURL(renderScriptPath).toString();\n\n  // Note: because there isn't a way to purge the require cache, we need to add a cache breaker query param to the\n  // script path to ensure we get the latest version of the script. This could be improved by using the git hash of\n  // the file if it exists, or a hash of the content, or even the timestamp of the file.\n  let cacheBreakerQueryParam = `?t=${Date.now()}`;\n  try {\n    const { mtime } = await fsPromises.stat(renderScriptPath);\n    cacheBreakerQueryParam = `?t=${mtime.getTime()}`;\n  } catch {\n    /* no-op */\n  }\n\n  // Try importing the script\n  let createHtml: RenderFunction | undefined;\n  let errorMessage: string | undefined;\n  try {\n    const importResult = ((await import(renderScriptUrl + cacheBreakerQueryParam)) as RenderFunctionScript).default;\n    if (typeof importResult === 'function') {\n      createHtml = importResult;\n    } else {\n      errorMessage = `The render script at \"${renderScriptPath}\" does not export a default function.`;\n    }\n  } catch (e) {\n    errorMessage = `Error importing render script at \"${renderScriptUrl}\":\\n${(e as Error).stack || e}`;\n  }\n\n  if (createHtml) {\n    // Try running the script\n    try {\n      return await createHtml(options);\n    } catch (e) {\n      errorMessage = `Error running render script at \"${renderScriptPath}\":\\n${(e as Error).stack || e}`;\n    }\n  }\n\n  // Return an error page. Doing this instead of returning a default or empty response ensures that\n  // the user is aware of any configuration issues.\n  errorMessage ??= `Unknown error loading render script at \"${renderScriptPath}\".`;\n  console.error(errorMessage);\n  return getHtmlErrorResponse(errorMessage);\n}\n\n/**\n * Modify the HTML response by injecting the import map, inline scripts, and entry/overlay scripts.\n *\n * Note that this just logs an error rather than returning an error response if something fails, for now.\n */\nfunction injectScripts(options: RenderFunctionOptions, result: ExpandedRenderFunctionResult): void {\n  const { route, overlayScript, entryScripts, inlineScripts, importMap } = options;\n  let jsdom: JSDOM;\n  try {\n    // TODO: JSDOM is overkill for what we're doing here--a full browser-like environment isn't\n    // needed to just parse and modify the HTML. If it becomes a perf concern (less likely since\n    // HTML page rendering is probably just done once per page load), we could switch to\n    // a pure parser like parse5 or htmlparser2.\n    jsdom = new JSDOM(result.content, { contentType: result.contentType } as ConstructorParameters<typeof JSDOM>[1]);\n  } catch (e) {\n    // Trying to write a test for the above, it seemed very permissive, but catch just in case\n    console.error(`Error parsing html response for rendering route \"${route.match}\":\\n${(e as Error).stack || e}`);\n    return;\n  }\n\n  try {\n    const { document } = jsdom.window;\n\n    if (entryScripts || overlayScript) {\n      // Inject the import map at the top of the head, in case other scripts use it\n      addScript({ document, type: 'importmap', prepend: true, content: JSON.stringify(importMap, null, 2) });\n    }\n\n    if (inlineScripts) {\n      for (const inlineScript of inlineScripts) {\n        addScript({ document, content: inlineScript });\n      }\n    }\n\n    // inject the overlay and entry scripts\n    addScript({ document, url: overlayScript });\n\n    if (entryScripts) {\n      for (const entryScript of entryScripts) {\n        addScript({ document, url: entryScript });\n      }\n    }\n\n    result.content = jsdom.serialize();\n  } catch (e) {\n    console.error(`Error injecting scripts for route \"${route.match}\":\\n${(e as Error).stack || e}`);\n  }\n}\n\n/**\n * Helper function to add a script to the document.\n * No-op if neither `url` nor `content` is provided.\n */\nfunction addScript(params: { document: Document; type?: string; prepend?: boolean; url?: string; content?: string }) {\n  const { document, type = 'module', prepend, url, content } = params;\n  if (!url && !content) {\n    return;\n  }\n\n  const script = document.createElement('script');\n  script.type = type;\n  if (url) {\n    script.src = url;\n  } else if (content) {\n    script.innerHTML = content;\n  }\n\n  if (prepend) {\n    document.head.prepend(script);\n  } else {\n    document.head.appendChild(script);\n  }\n}\n\n/**\n * Read a static HTML file, or return an error response if the file can't be read.\n */\nasync function readStaticHtml(renderScriptPath: string): Promise<RenderFunctionResult> {\n  try {\n    return (await fsPromises.readFile(renderScriptPath, 'utf8')) || '';\n  } catch (e) {\n    const message = `Error reading HTML file at \"${renderScriptPath}\":\\n${(e as Error).stack || e}`;\n    console.error(message);\n    return getHtmlErrorResponse(message);\n  }\n}\n"]}
+{"version":3,"file":"renderRoute.js","sourceRoot":"","sources":["../../src/renderRoute/renderRoute.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  RenderFunction,\n  RenderFunctionOptions,\n  RenderFunctionResult,\n  ExpandedRenderFunctionResult,\n  RenderedRoute,\n  Request,\n  RenderFunctionScript,\n} from '@ms-cloudpack/common-types';\nimport { makeUrl } from '@ms-cloudpack/path-string-parsing';\nimport fsPromises from 'fs/promises';\nimport { JSDOM } from 'jsdom';\nimport path from 'path';\nimport { pathToFileURL } from 'url';\nimport { getDefaultHtmlResponse } from './getDefaultHtmlResponse.js';\nimport { getHtmlErrorResponse } from './getHtmlErrorResponse.js';\n\n/**\n * Get the response for the given route. If the route has a custom render script, use that.\n * Returns an error response if the file referenced by the script doesn't exist or throws an error.\n */\nexport async function renderRoute(options: RenderFunctionOptions): Promise<ExpandedRenderFunctionResult | null> {\n  const { route, session } = options;\n  const { config } = session;\n  const { appPath } = config;\n\n  // Get an initial result from either the render script or default handler.\n  let rawResult: RenderFunctionResult;\n  const renderScriptPath = route.renderScript && path.resolve(appPath, route.renderScript);\n  if (renderScriptPath) {\n    const scriptExt = path.extname(renderScriptPath).toLowerCase();\n    if (scriptExt === '.html' || scriptExt === '.htm') {\n      rawResult = await readStaticHtml(renderScriptPath);\n    } else {\n      rawResult = await renderCustomScript({ ...options, renderScriptPath });\n    }\n  } else {\n    rawResult = await getDefaultHtmlResponse(options);\n  }\n\n  if (rawResult === null) {\n    // This means the custom renderScript fully handled the request.\n    return null;\n  }\n\n  if (rawResult === undefined) {\n    return makeErrorResponse({\n      message:\n        `returned undefined. If the renderScript fully handled the request (sent a response), ` +\n        `return null instead. Otherwise ensure that the function returns the content to be rendered.`,\n      route,\n      req: options.req,\n      renderScriptPath,\n    });\n  }\n\n  const result: ExpandedRenderFunctionResult = {\n    contentType: 'text/html',\n    statusCode: 200,\n    ...(typeof rawResult === 'string' ? { content: rawResult } : rawResult),\n  };\n\n  // If it's HTML and a success statusCode, inject the import map and appropriate scripts.\n  if (result.statusCode === 200 && isHtmlType(result.contentType)) {\n    if (isHtmlAcceptable(options)) {\n      // Inject the import map and scripts.\n      injectScripts(options, result);\n    } else {\n      // It appears we're accidentally returning HTML when a different file type was requested.\n      // This could happen for overly broad route matches such as '*', or if no routes are configured.\n      return makeErrorResponse({\n        message:\n          'returned HTML, but this appears to be a non-HTML request. This is likely due to an ' +\n          'overly broad match or other misconfiguration of server.routes in the cloudpack config.',\n        route,\n        renderScriptPath,\n        req: options.req,\n      });\n    }\n  }\n\n  return result;\n}\n\n/**\n * Fill in details of the message, log to console.error, and return an error response.\n * `Route ${route.match} with renderScript \"${renderScriptPath}\" ${message}`\n */\nfunction makeErrorResponse(params: {\n  message: string;\n  route: RenderedRoute;\n  renderScriptPath: string | undefined;\n  req: Request;\n}): ExpandedRenderFunctionResult {\n  const { message, route, renderScriptPath, req } = params;\n  const renderer = renderScriptPath ? `renderScript \"${renderScriptPath}\"` : 'the default renderer';\n  const content = `Route ${JSON.stringify(route.match)} with ${renderer} ${message}`;\n  console.error(`App server: request ${req.url} - ${content}`);\n\n  return { statusCode: 500, contentType: 'text/plain', content };\n}\n\nfunction isHtmlAcceptable(options: Pick<RenderFunctionOptions, 'req' | 'baseUrl'>) {\n  const { req, baseUrl } = options;\n  // Get the request path and extension (the URL.pathname conversion gets rid of any query or hash)\n  const requestPath = makeUrl(req.url, baseUrl).pathname;\n  const requestExt = path.extname(requestPath);\n  // Determine whether HTML is (probably) an acceptable response type (can be refined later if needed).\n  // In theory we should be able to use req.accepts() but not all requests set the accept header.\n  return (!requestExt || requestExt.startsWith('.htm')) && !req.xhr && isHtmlType(req.headers.accept || '*/*');\n}\n\nfunction isHtmlType(acceptOrContentType: string) {\n  // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Accept\n  // https://developer.mozilla.org/en-US/docs/Web/HTTP/Content_negotiation/List_of_default_Accept_values\n  // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Type\n  // https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types\n  return acceptOrContentType\n    .split(',')\n    .map((s) => s.split(';')[0].trim())\n    .some((mime) => mime === '*/*' || /xml|x?html/i.test(mime) || /^(text|application)\\/\\*$/.test(mime));\n}\n\n/**\n * Load the default export from a JS file passed as the `renderScript` in a route,\n * and return either the result of running the function, or an error page if something fails.\n */\nasync function renderCustomScript(\n  params: RenderFunctionOptions & { renderScriptPath: string },\n): Promise<RenderFunctionResult> {\n  const { renderScriptPath, ...options } = params;\n  // Get the html factory function from a script default export.\n  const renderScriptUrl = pathToFileURL(renderScriptPath).toString();\n\n  // Note: because there isn't a way to purge the require cache, we need to add a cache breaker query param to the\n  // script path to ensure we get the latest version of the script. This could be improved by using the git hash of\n  // the file if it exists, or a hash of the content, or even the timestamp of the file.\n  let cacheBreakerQueryParam = `?t=${Date.now()}`;\n  try {\n    const { mtime } = await fsPromises.stat(renderScriptPath);\n    cacheBreakerQueryParam = `?t=${mtime.getTime()}`;\n  } catch {\n    /* no-op */\n  }\n\n  // Try importing the script\n  let createHtml: RenderFunction | undefined;\n  let errorMessage: string | undefined;\n  try {\n    const importResult = ((await import(renderScriptUrl + cacheBreakerQueryParam)) as RenderFunctionScript).default;\n    if (typeof importResult === 'function') {\n      createHtml = importResult;\n    } else {\n      errorMessage = `The render script at \"${renderScriptPath}\" does not export a default function.`;\n    }\n  } catch (e) {\n    errorMessage = `Error importing render script at \"${renderScriptUrl}\":\\n${(e as Error).stack || e}`;\n  }\n\n  if (createHtml) {\n    // Try running the script\n    try {\n      return await createHtml(options);\n    } catch (e) {\n      errorMessage = `Error running render script at \"${renderScriptPath}\":\\n${(e as Error).stack || e}`;\n    }\n  }\n\n  // Return an error page. Doing this instead of returning a default or empty response ensures that\n  // the user is aware of any configuration issues.\n  errorMessage ??= `Unknown error loading render script at \"${renderScriptPath}\".`;\n  console.error(errorMessage);\n  return getHtmlErrorResponse(errorMessage);\n}\n\n/**\n * Modify the HTML response by injecting the import map, inline scripts, and entry/overlay scripts.\n *\n * Note that this just logs an error rather than returning an error response if something fails, for now.\n */\nfunction injectScripts(options: RenderFunctionOptions, result: ExpandedRenderFunctionResult): void {\n  const { route, overlayScript, entryScripts, inlineScripts, importMap } = options;\n  let jsdom: JSDOM;\n  try {\n    // TODO: JSDOM is overkill for what we're doing here--a full browser-like environment isn't\n    // needed to just parse and modify the HTML. If it becomes a perf concern (less likely since\n    // HTML page rendering is probably just done once per page load), we could switch to\n    // a pure parser like parse5 or htmlparser2.\n    jsdom = new JSDOM(result.content, { contentType: result.contentType } as ConstructorParameters<typeof JSDOM>[1]);\n  } catch (e) {\n    // Trying to write a test for the above, it seemed very permissive, but catch just in case\n    console.error(\n      `Error parsing html response for rendering route \"${JSON.stringify(route.match)}\":\\n${(e as Error).stack || e}`,\n    );\n    return;\n  }\n\n  try {\n    const { document } = jsdom.window;\n\n    if (entryScripts || overlayScript) {\n      // Inject the import map at the top of the head, in case other scripts use it\n      addScript({ document, type: 'importmap', prepend: true, content: JSON.stringify(importMap, null, 2) });\n    }\n\n    if (inlineScripts) {\n      for (const inlineScript of inlineScripts) {\n        addScript({ document, content: inlineScript });\n      }\n    }\n\n    // inject the overlay and entry scripts\n    addScript({ document, url: overlayScript });\n\n    if (entryScripts) {\n      for (const entryScript of entryScripts) {\n        addScript({ document, url: entryScript });\n      }\n    }\n\n    result.content = jsdom.serialize();\n  } catch (e) {\n    console.error(`Error injecting scripts for route \"${JSON.stringify(route.match)}\":\\n${(e as Error).stack || e}`);\n  }\n}\n\n/**\n * Helper function to add a script to the document.\n * No-op if neither `url` nor `content` is provided.\n */\nfunction addScript(params: { document: Document; type?: string; prepend?: boolean; url?: string; content?: string }) {\n  const { document, type = 'module', prepend, url, content } = params;\n  if (!url && !content) {\n    return;\n  }\n\n  const script = document.createElement('script');\n  script.type = type;\n  if (url) {\n    script.src = url;\n  } else if (content) {\n    script.innerHTML = content;\n  }\n\n  if (prepend) {\n    document.head.prepend(script);\n  } else {\n    document.head.appendChild(script);\n  }\n}\n\n/**\n * Read a static HTML file, or return an error response if the file can't be read.\n */\nasync function readStaticHtml(renderScriptPath: string): Promise<RenderFunctionResult> {\n  try {\n    return (await fsPromises.readFile(renderScriptPath, 'utf8')) || '';\n  } catch (e) {\n    const message = `Error reading HTML file at \"${renderScriptPath}\":\\n${(e as Error).stack || e}`;\n    console.error(message);\n    return getHtmlErrorResponse(message);\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/app-server",
-  "version": "0.16.7",
+  "version": "0.17.0",
   "description": "An implementation of the App server for Cloudpack.",
   "license": "MIT",
   "type": "module",
@@ -14,14 +14,14 @@
     }
   },
   "dependencies": {
-    "@ms-cloudpack/api-server": "^0.54.3",
-    "@ms-cloudpack/bundle-server": "^0.6.7",
-    "@ms-cloudpack/common-types": "^0.22.0",
-    "@ms-cloudpack/create-express-app": "^1.10.0",
-    "@ms-cloudpack/import-map": "^0.8.5",
-    "@ms-cloudpack/overlay": "^0.17.79",
+    "@ms-cloudpack/api-server": "^0.54.5",
+    "@ms-cloudpack/bundle-server": "^0.6.9",
+    "@ms-cloudpack/common-types": "^0.23.0",
+    "@ms-cloudpack/create-express-app": "^1.10.1",
+    "@ms-cloudpack/import-map": "^0.8.6",
+    "@ms-cloudpack/overlay": "^0.17.81",
     "@ms-cloudpack/path-string-parsing": "^1.2.4",
-    "@ms-cloudpack/path-utilities": "^2.7.48",
+    "@ms-cloudpack/path-utilities": "^2.7.49",
     "@ms-cloudpack/task-reporter": "^0.14.5",
     "jsdom": "^24.0.0"
   },