@ms-cloudpack/app-server 0.3.13 → 0.4.0

package/lib/createRoutes.d.ts

@@ -5,9 +5,9 @@ import type { ApiServer, Session } from '@ms-cloudpack/api-server';
 import type { PackageImportPaths } from '@ms-cloudpack/import-map';
 import type { PackageHashes } from '@ms-cloudpack/package-hashes';
 /**
- * Creates the routes for the express app, considering how the config is defined.
+ * Creates the routes for the express app based on the config.
  */
-export declare function createRoutes({ app, url, session, definition, bundleServer, apiServer, config, packages, packageImportPaths, packageHashes, }: {
+export declare function createRoutes(params: {
     app: Express;
     url: string;
     session: Session;

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,eAAe,EAAE,uBAAuB,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACxG,OAAO,KAAK,EAAE,OAAO,EAAqB,MAAM,kCAAkC,CAAC;AAKnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAInE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE;;GAEG;AACH,wBAAgB,YAAY,CAAC,EAC3B,GAAG,EACH,GAAG,EACH,OAAO,EACP,UAAU,EACV,YAAY,EACZ,SAAS,EACT,MAAM,EACN,QAAQ,EACR,kBAAkB,EAClB,aAAa,GACd,EAAE;IACD,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,YAAY,EAAE,YAAY,CAAC;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,uBAAuB,CAAC;IAClC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,aAAa,EAAE,aAAa,CAAC;CAC9B,QAyEA"}
+{"version":3,"file":"createRoutes.d.ts","sourceRoot":"","sources":["../src/createRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACxG,OAAO,KAAK,EAAE,OAAO,EAAqB,MAAM,kCAAkC,CAAC;AAKnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAInE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE;;GAEG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE;IACnC,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,YAAY,EAAE,YAAY,CAAC;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,uBAAuB,CAAC;IAClC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,aAAa,EAAE,aAAa,CAAC;CAC9B,QA6BA"}

package/lib/createRoutes.js

@@ -2,13 +2,14 @@ import { express } from '@ms-cloudpack/create-express-app';
 import { createImportMap } from '@ms-cloudpack/import-map';
 import { slash } from '@ms-cloudpack/path-string-parsing';
 import path from 'path';
-import { getHtmlResponse } from './getHtmlResponse.js';
+import { renderRoute } from './renderRoute/renderRoute.js';
 import { getInlineScripts } from './inlineScripts/getInlineScripts.js';
 import { setHeaders } from './setHeaders.js';
 /**
- * Creates the routes for the express app, considering how the config is defined.
+ * Creates the routes for the express app based on the config.
  */
-export function createRoutes({ app, url, session, definition, bundleServer, apiServer, config, packages, packageImportPaths, packageHashes, }) {
+export function createRoutes(params) {
+    const { app, session, config, packageHashes } = params;
     const routes = [...(config.devServer?.routes || [])];
     const hasDefaultRoute = routes.some((route) => route.match === '*' || route.match === '/');
     if (!hasDefaultRoute) {
@@ -27,43 +28,7 @@ export function createRoutes({ app, url, session, definition, bundleServer, apiS
         }
         else {
             app.get(route.match, (req, res) => {
-                (async () => {
-                    // Build the import map if it hasn't been built yet for this session version.
-                    const importMap = session.getImportMap() ||
-                        session.setImportMap(await createImportMap({
-                            resolveMap: session.resolveMap,
-                            bundleServerUrl: bundleServer.url,
-                            sessionVersion: session.getSessionVersion(),
-                            targetVersions: session.targetVersions,
-                        }, { packages, packageImportPaths, getPackageHash, config: session.config }));
-                    // Parse the request path, extension, grab the overlay script path.
-                    const requestPath = slash(req.path.substring(1));
-                    const requestExt = path.extname(requestPath);
-                    const overlayScript = importMap.imports['@ms-cloudpack/overlay'];
-                    const entryScript = 
-                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                    route.exportEntry && importMap.imports[slash(path.join(definition.name, route.exportEntry))];
-                    // Set the appropriate Cloudpack headers/cookies in the response.
-                    // TODO: setting the headers here prohibits cases where the page rendering is owned by existing server code
-                    // that can only accept changing the scripts. We should consider moving to a model where an initial script
-                    // fetch loads the import map and sets Cloudpack settings in local storage rather than headers/cookies.
-                    setHeaders({ res, session, apiServer, bundleServer });
-                    const inlineScripts = await getInlineScripts();
-                    const { content, statusCode, contentType } = await getHtmlResponse({
-                        route,
-                        baseUrl: url,
-                        importMap,
-                        overlayScript,
-                        entryScript,
-                        session,
-                        definition,
-                        inlineScripts,
-                        req,
-                        res,
-                    });
-                    res.type(contentType).status(statusCode).send(content).end();
-                    console.debug(`App server: Request: ${requestPath}, ext: ${requestExt}`);
-                })().catch((err) => {
+                handleRequest({ ...params, route, req, res, getPackageHash }).catch((err) => {
                     console.error(err?.stack || err);
                     res.status(500).send(`Error loading app: ${err}`);
                 });
@@ -71,4 +36,38 @@ export function createRoutes({ app, url, session, definition, bundleServer, apiS
         }
     }
 }
+async function handleRequest(params) {
+    const { req, res, session, definition, route, bundleServer, apiServer, packages, getPackageHash, packageImportPaths, url, } = params;
+    // Build the import map if it hasn't been built yet for this session version.
+    const importMap = session.getImportMap() ||
+        session.setImportMap(await createImportMap({
+            resolveMap: session.resolveMap,
+            bundleServerUrl: bundleServer.url,
+            sessionVersion: session.getSessionVersion(),
+            targetVersions: session.targetVersions,
+        }, { packages, packageImportPaths, getPackageHash, config: session.config }));
+    // Parse the request path, extension, grab the overlay script path.
+    const requestPath = slash(req.path.substring(1));
+    const requestExt = path.extname(requestPath);
+    const overlayScript = importMap.imports['@ms-cloudpack/overlay'];
+    const entryScript = 
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    route.exportEntry && importMap.imports[slash(path.join(definition.name, route.exportEntry))];
+    // Set the appropriate Cloudpack headers/cookies in the response.
+    // TODO: setting the headers here prohibits cases where the page rendering is owned by existing server code
+    // that can only accept changing the scripts. We should consider moving to a model where an initial script
+    // fetch loads the import map and sets Cloudpack settings in local storage rather than headers/cookies.
+    setHeaders({ res, session, apiServer, bundleServer });
+    const inlineScripts = await getInlineScripts();
+    const { content, statusCode, contentType } = await renderRoute({
+        ...params,
+        baseUrl: url,
+        importMap,
+        overlayScript,
+        entryScript,
+        inlineScripts,
+    });
+    res.type(contentType).status(statusCode).send(content).end();
+    console.debug(`App server: Request: ${requestPath}, ext: ${requestExt}`);
+}
 //# sourceMappingURL=createRoutes.js.map

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 { CloudpackConfig, PackageDefinitionsCache, PackageJson } 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 type { BundleServer } from '@ms-cloudpack/bundle-server';\nimport type { ApiServer, Session } from '@ms-cloudpack/api-server';\nimport { getHtmlResponse } from './getHtmlResponse.js';\nimport { getInlineScripts } from './inlineScripts/getInlineScripts.js';\nimport { setHeaders } from './setHeaders.js';\nimport type { PackageImportPaths } from '@ms-cloudpack/import-map';\nimport type { PackageHashes } from '@ms-cloudpack/package-hashes';\n\n/**\n * Creates the routes for the express app, considering how the config is defined.\n */\nexport function createRoutes({\n  app,\n  url,\n  session,\n  definition,\n  bundleServer,\n  apiServer,\n  config,\n  packages,\n  packageImportPaths,\n  packageHashes,\n}: {\n  app: Express;\n  url: string;\n  session: Session;\n  definition: PackageJson;\n  bundleServer: BundleServer;\n  apiServer: ApiServer;\n  config: CloudpackConfig;\n  packages: PackageDefinitionsCache;\n  packageImportPaths: PackageImportPaths;\n  packageHashes: PackageHashes;\n}) {\n  const routes = [...(config.devServer?.routes || [])];\n  const hasDefaultRoute = routes.some((route) => route.match === '*' || route.match === '/');\n\n  if (!hasDefaultRoute) {\n    routes.push({\n      match: '*',\n      exportEntry: '.',\n    });\n  }\n\n  // Hashes from external packages to be used in the import map.\n  const getPackageHash = (packagePath: string) => {\n    return packageHashes.get({ packagePath, isSourceHashingEnabled: false });\n  };\n\n  for (const route of routes) {\n    if (route.staticPath) {\n      app.use(route.match, express.static(path.resolve(session.appPath, route.staticPath)));\n    } else {\n      app.get(route.match, (req: Request, res: Response) => {\n        (async () => {\n          // Build the import map if it hasn't been built yet for this session version.\n          const importMap =\n            session.getImportMap() ||\n            session.setImportMap(\n              await createImportMap(\n                {\n                  resolveMap: session.resolveMap,\n                  bundleServerUrl: bundleServer.url,\n                  sessionVersion: session.getSessionVersion(),\n                  targetVersions: session.targetVersions,\n                },\n                { packages, packageImportPaths, getPackageHash, config: session.config },\n              ),\n            );\n\n          // Parse the request path, extension, grab the overlay script path.\n          const requestPath = slash(req.path.substring(1));\n          const requestExt = path.extname(requestPath);\n          const overlayScript = importMap.imports['@ms-cloudpack/overlay'];\n          const entryScript =\n            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n            route.exportEntry && importMap.imports[slash(path.join(definition.name!, route.exportEntry))];\n          // Set the appropriate Cloudpack headers/cookies in the response.\n          // TODO: setting the headers here prohibits cases where the page rendering is owned by existing server code\n          // that can only accept changing the scripts. We should consider moving to a model where an initial script\n          // fetch loads the import map and sets Cloudpack settings in local storage rather than headers/cookies.\n          setHeaders({ res, session, apiServer, bundleServer });\n          const inlineScripts = await getInlineScripts();\n          const { content, statusCode, contentType } = await getHtmlResponse({\n            route,\n            baseUrl: url,\n            importMap,\n            overlayScript,\n            entryScript,\n            session,\n            definition,\n            inlineScripts,\n            req,\n            res,\n          });\n\n          res.type(contentType).status(statusCode).send(content).end();\n\n          console.debug(`App server: Request: ${requestPath}, ext: ${requestExt}`);\n        })().catch((err) => {\n          console.error((err as Error)?.stack || err);\n          res.status(500).send(`Error loading app: ${err}`);\n        });\n      });\n    }\n  }\n}\n"]}
+{"version":3,"file":"createRoutes.js","sourceRoot":"","sources":["../src/createRoutes.ts"],"names":[],"mappings":"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","sourcesContent":["import type { CloudpackConfig, PackageDefinitionsCache, PackageJson } 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 type { BundleServer } from '@ms-cloudpack/bundle-server';\nimport type { ApiServer, Session } from '@ms-cloudpack/api-server';\nimport { renderRoute } from './renderRoute/renderRoute.js';\nimport { getInlineScripts } from './inlineScripts/getInlineScripts.js';\nimport { setHeaders } from './setHeaders.js';\nimport type { PackageImportPaths } from '@ms-cloudpack/import-map';\nimport type { PackageHashes } from '@ms-cloudpack/package-hashes';\n\n/**\n * Creates the routes for the express app based on the config.\n */\nexport function createRoutes(params: {\n  app: Express;\n  url: string;\n  session: Session;\n  definition: PackageJson;\n  bundleServer: BundleServer;\n  apiServer: ApiServer;\n  config: CloudpackConfig;\n  packages: PackageDefinitionsCache;\n  packageImportPaths: PackageImportPaths;\n  packageHashes: PackageHashes;\n}) {\n  const { app, session, config, packageHashes } = params;\n  const routes = [...(config.devServer?.routes || [])];\n  const hasDefaultRoute = routes.some((route) => route.match === '*' || route.match === '/');\n\n  if (!hasDefaultRoute) {\n    routes.push({\n      match: '*',\n      exportEntry: '.',\n    });\n  }\n\n  // Hashes from external packages to be used in the import map.\n  const getPackageHash = (packagePath: string) => {\n    return packageHashes.get({ packagePath, isSourceHashingEnabled: false });\n  };\n\n  for (const route of routes) {\n    if (route.staticPath) {\n      app.use(route.match, express.static(path.resolve(session.appPath, route.staticPath)));\n    } else {\n      app.get(route.match, (req: Request, res: Response) => {\n        handleRequest({ ...params, route, req, res, getPackageHash }).catch((err) => {\n          console.error((err as Error)?.stack || err);\n          res.status(500).send(`Error loading app: ${err}`);\n        });\n      });\n    }\n  }\n}\n\nasync function handleRequest(params: {\n  req: Request;\n  res: Response;\n  session: Session;\n  definition: PackageJson;\n  route: { match: string; exportEntry?: string; staticPath?: string };\n  bundleServer: BundleServer;\n  apiServer: ApiServer;\n  packages: PackageDefinitionsCache;\n  packageImportPaths: PackageImportPaths;\n  getPackageHash: (packagePath: string) => Promise<string>;\n  url: string;\n}) {\n  const {\n    req,\n    res,\n    session,\n    definition,\n    route,\n    bundleServer,\n    apiServer,\n    packages,\n    getPackageHash,\n    packageImportPaths,\n    url,\n  } = params;\n\n  // Build the import map if it hasn't been built yet for this session version.\n  const importMap =\n    session.getImportMap() ||\n    session.setImportMap(\n      await createImportMap(\n        {\n          resolveMap: session.resolveMap,\n          bundleServerUrl: bundleServer.url,\n          sessionVersion: session.getSessionVersion(),\n          targetVersions: session.targetVersions,\n        },\n        { packages, packageImportPaths, getPackageHash, config: session.config },\n      ),\n    );\n\n  // Parse the request path, extension, grab the overlay script path.\n  const requestPath = slash(req.path.substring(1));\n  const requestExt = path.extname(requestPath);\n  const overlayScript = importMap.imports['@ms-cloudpack/overlay'];\n  const entryScript =\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n    route.exportEntry && importMap.imports[slash(path.join(definition.name!, route.exportEntry))];\n\n  // Set the appropriate Cloudpack headers/cookies in the response.\n  // TODO: setting the headers here prohibits cases where the page rendering is owned by existing server code\n  // that can only accept changing the scripts. We should consider moving to a model where an initial script\n  // fetch loads the import map and sets Cloudpack settings in local storage rather than headers/cookies.\n  setHeaders({ res, session, apiServer, bundleServer });\n\n  const inlineScripts = await getInlineScripts();\n  const { content, statusCode, contentType } = await renderRoute({\n    ...params,\n    baseUrl: url,\n    importMap,\n    overlayScript,\n    entryScript,\n    inlineScripts,\n  });\n\n  res.type(contentType).status(statusCode).send(content).end();\n\n  console.debug(`App server: Request: ${requestPath}, ext: ${requestExt}`);\n}\n"]}

package/lib/index.d.ts

@@ -1,3 +1,7 @@
 export { startAppServer } from './startAppServer.js';
 export type { AppServer } from './types/AppServer.js';
+export type { RenderRouteFunction } from './types/RenderRouteFunction.js';
+export type { RenderRouteOptions } from './types/RenderRouteOptions.js';
+export type { RenderRouteResult } from './types/RenderRouteResult.js';
+export type { RenderRouteScript } from './types/RenderRouteScript.js';
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,YAAY,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,YAAY,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,YAAY,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAC1E,YAAY,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACxE,YAAY,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACtE,YAAY,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC"}

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC","sourcesContent":["export { startAppServer } from './startAppServer.js';\nexport type { AppServer } from './types/AppServer.js';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC","sourcesContent":["export { startAppServer } from './startAppServer.js';\nexport type { AppServer } from './types/AppServer.js';\nexport type { RenderRouteFunction } from './types/RenderRouteFunction.js';\nexport type { RenderRouteOptions } from './types/RenderRouteOptions.js';\nexport type { RenderRouteResult } from './types/RenderRouteResult.js';\nexport type { RenderRouteScript } from './types/RenderRouteScript.js';\n"]}

package/lib/renderRoute/getDefaultHtmlResponse.d.ts

@@ -0,0 +1,6 @@
+import type { RenderRouteFunction } from '../types/RenderRouteFunction.js';
+/**
+ * Return the default HTML response.
+ */
+export declare const getDefaultHtmlResponse: RenderRouteFunction;
+//# sourceMappingURL=getDefaultHtmlResponse.d.ts.map

package/lib/renderRoute/getDefaultHtmlResponse.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getDefaultHtmlResponse.d.ts","sourceRoot":"","sources":["../../src/renderRoute/getDefaultHtmlResponse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAE3E;;GAEG;AACH,eAAO,MAAM,sBAAsB,EAAE,mBAUpC,CAAC"}

package/lib/renderRoute/getDefaultHtmlResponse.js

@@ -0,0 +1,15 @@
+/**
+ * Return the default HTML response.
+ */
+export const getDefaultHtmlResponse = (options) => {
+    return `<!DOCTYPE html>
+<html lang="en">
+<head>
+  <title>${options.definition.name}</title>
+</head>
+<body>
+  <div id="root"></div>
+</body>
+</html>`;
+};
+//# sourceMappingURL=getDefaultHtmlResponse.js.map

package/lib/renderRoute/getDefaultHtmlResponse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getDefaultHtmlResponse.js","sourceRoot":"","sources":["../../src/renderRoute/getDefaultHtmlResponse.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAwB,CAAC,OAAO,EAAE,EAAE;IACrE,OAAO;;;WAGE,OAAO,CAAC,UAAU,CAAC,IAAI;;;;;QAK1B,CAAC;AACT,CAAC,CAAC","sourcesContent":["import type { RenderRouteFunction } from '../types/RenderRouteFunction.js';\n\n/**\n * Return the default HTML response.\n */\nexport const getDefaultHtmlResponse: RenderRouteFunction = (options) => {\n  return `<!DOCTYPE html>\n<html lang=\"en\">\n<head>\n  <title>${options.definition.name}</title>\n</head>\n<body>\n  <div id=\"root\"></div>\n</body>\n</html>`;\n};\n"]}

package/lib/renderRoute/getHtmlErrorResponse.d.ts

@@ -0,0 +1,6 @@
+import type { CompleteRenderRouteResult } from '../types/RenderRouteResult.js';
+/**
+ * Get an error response: an HTML page with the given text, and a 500 status code.
+ */
+export declare function getHtmlErrorResponse(errorText: string): CompleteRenderRouteResult;
+//# sourceMappingURL=getHtmlErrorResponse.d.ts.map

package/lib/renderRoute/getHtmlErrorResponse.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getHtmlErrorResponse.d.ts","sourceRoot":"","sources":["../../src/renderRoute/getHtmlErrorResponse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAE/E;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,yBAAyB,CAiBjF"}

package/lib/renderRoute/getHtmlErrorResponse.js

@@ -0,0 +1,22 @@
+/**
+ * Get an error response: an HTML page with the given text, and a 500 status code.
+ */
+export function getHtmlErrorResponse(errorText) {
+    return {
+        content: [
+            `<!DOCTYPE html>`,
+            `<html lang="en">`,
+            `<head>`,
+            `  <title>Error</title>`,
+            `</head>`,
+            `<body>`,
+            `  <h1>Error</h1>`,
+            `  <pre>${errorText}</pre>`,
+            `</body>`,
+            `</html>`,
+        ].join('\n'),
+        statusCode: 500,
+        contentType: 'text/html',
+    };
+}
+//# sourceMappingURL=getHtmlErrorResponse.js.map

package/lib/renderRoute/getHtmlErrorResponse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getHtmlErrorResponse.js","sourceRoot":"","sources":["../../src/renderRoute/getHtmlErrorResponse.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAAC,SAAiB;IACpD,OAAO;QACL,OAAO,EAAE;YACP,iBAAiB;YACjB,kBAAkB;YAClB,QAAQ;YACR,wBAAwB;YACxB,SAAS;YACT,QAAQ;YACR,kBAAkB;YAClB,UAAU,SAAS,QAAQ;YAC3B,SAAS;YACT,SAAS;SACV,CAAC,IAAI,CAAC,IAAI,CAAC;QACZ,UAAU,EAAE,GAAG;QACf,WAAW,EAAE,WAAW;KACzB,CAAC;AACJ,CAAC","sourcesContent":["import type { CompleteRenderRouteResult } from '../types/RenderRouteResult.js';\n\n/**\n * Get an error response: an HTML page with the given text, and a 500 status code.\n */\nexport function getHtmlErrorResponse(errorText: string): CompleteRenderRouteResult {\n  return {\n    content: [\n      `<!DOCTYPE html>`,\n      `<html lang=\"en\">`,\n      `<head>`,\n      `  <title>Error</title>`,\n      `</head>`,\n      `<body>`,\n      `  <h1>Error</h1>`,\n      `  <pre>${errorText}</pre>`,\n      `</body>`,\n      `</html>`,\n    ].join('\\n'),\n    statusCode: 500,\n    contentType: 'text/html',\n  };\n}\n"]}

package/lib/renderRoute/renderRoute.d.ts

@@ -0,0 +1,8 @@
+import type { CompleteRenderRouteResult } from '../types/RenderRouteResult.js';
+import type { RenderRouteOptions } from '../types/RenderRouteOptions.js';
+/**
+ * Get the response for the given route. If the route has a custom render script, use that.
+ * Returns an error response if the file referenced by the script doesn't exist or throws an error.
+ */
+export declare function renderRoute(options: RenderRouteOptions): Promise<CompleteRenderRouteResult>;
+//# sourceMappingURL=renderRoute.d.ts.map

package/lib/renderRoute/renderRoute.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"renderRoute.d.ts","sourceRoot":"","sources":["../../src/renderRoute/renderRoute.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,yBAAyB,EAAqB,MAAM,+BAA+B,CAAC;AAClG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAIzE;;;GAGG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAgCjG"}

package/lib/renderRoute/renderRoute.js

@@ -0,0 +1,161 @@
+import path from 'path';
+import { pathToFileURL } from 'url';
+import { getDefaultHtmlResponse } from './getDefaultHtmlResponse.js';
+import { JSDOM } from 'jsdom';
+import fsPromises from 'fs/promises';
+import { getHtmlErrorResponse } from './getHtmlErrorResponse.js';
+/**
+ * Get the response for the given route. If the route has a custom render script, use that.
+ * Returns an error response if the file referenced by the script doesn't exist or throws an error.
+ */
+export async function renderRoute(options) {
+    const { route, session } = options;
+    // Get an initial result from either the render script or default handler.
+    let rawResult;
+    if (route.renderScript) {
+        const renderScriptPath = path.resolve(session.appPath, route.renderScript);
+        const scriptExt = path.extname(renderScriptPath).toLowerCase();
+        if (scriptExt === '.html' || scriptExt === '.htm') {
+            rawResult = await readStaticHtml(renderScriptPath);
+        }
+        else {
+            rawResult = await renderCustomScript({ ...options, renderScriptPath });
+        }
+    }
+    else {
+        rawResult = await getDefaultHtmlResponse(options);
+    }
+    const result = {
+        contentType: 'text/html',
+        statusCode: 200,
+        ...(typeof rawResult === 'string' ? { content: rawResult } : rawResult),
+    };
+    // If it's HTML and not an error, inject the import map and appropriate scripts.
+    // endsWith('html') covers: 'html', '.html', and 'text/html'
+    // (Might need to modify the status check in the future if there are other codes where injecting
+    // scripts is appropriate, but for now, only do this for 200.)
+    if (result.contentType.endsWith('html') && result.statusCode === 200) {
+        injectScripts(options, result);
+    }
+    return result;
+}
+/**
+ * Load the default export from a JS file passed as the `renderScript` in a route,
+ * and return either the result of running the function, or an error page if something fails.
+ */
+async function renderCustomScript(params) {
+    const { renderScriptPath, ...options } = params;
+    // Get the html factory function from a script default export.
+    const renderScriptUrl = pathToFileURL(renderScriptPath).toString();
+    // Note: because there isn't a way to purge the require cache, we need to add a cache breaker query param to the
+    // script path to ensure we get the latest version of the script. This could be improved by using the git hash of
+    // the file if it exists, or a hash of the content, or even the timestamp of the file.
+    let cacheBreakerQueryParam = `?t=${Date.now()}`;
+    try {
+        const { mtime } = await fsPromises.stat(renderScriptPath);
+        cacheBreakerQueryParam = `?t=${mtime.getTime()}`;
+    }
+    catch {
+        /* no-op */
+    }
+    // Try importing the script
+    let createHtml;
+    let errorMessage;
+    try {
+        const importResult = (await import(renderScriptUrl + cacheBreakerQueryParam)).default;
+        if (typeof importResult === 'function') {
+            createHtml = importResult;
+        }
+        else {
+            errorMessage = `The render script at "${renderScriptPath}" does not export a default function.`;
+        }
+    }
+    catch (e) {
+        errorMessage = `Error importing render script at "${renderScriptUrl}":\n${e.stack || e}`;
+    }
+    if (createHtml) {
+        // Try running the script
+        try {
+            return await createHtml(options);
+        }
+        catch (e) {
+            errorMessage = `Error running render script at "${renderScriptPath}":\n${e.stack || e}`;
+        }
+    }
+    // Return an error page. Doing this instead of returning a default or empty response ensures that
+    // the user is aware of any configuration issues.
+    errorMessage ??= `Unknown error loading render script at "${renderScriptPath}".`;
+    console.error(errorMessage);
+    return getHtmlErrorResponse(errorMessage);
+}
+/**
+ * Modify the HTML response by injecting the import map, inline scripts, and entry/overlay scripts.
+ *
+ * Note that this just logs an error rather than returning an error response if something fails, for now.
+ */
+function injectScripts(options, result) {
+    const { route, overlayScript, entryScript, inlineScripts, importMap } = options;
+    let jsdom;
+    try {
+        jsdom = new JSDOM(result.content);
+    }
+    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}`);
+        return;
+    }
+    try {
+        const { document } = jsdom.window;
+        // inject the import map.
+        if (entryScript || overlayScript) {
+            addScript({ document, type: 'importmap', content: JSON.stringify(importMap, null, 2) });
+        }
+        for (const inlineScript of inlineScripts) {
+            addScript({ document, content: inlineScript });
+        }
+        // inject the overlay and entry scripts
+        addScript({ document, url: overlayScript });
+        addScript({ document, url: entryScript });
+        result.content = jsdom.serialize();
+    }
+    catch (e) {
+        console.error(`Error injecting scripts for route "${route.match}":\n${e.stack || e}`);
+    }
+}
+/**
+ * Helper function to add a script to the document.
+ */
+function addScript(params) {
+    const { document, type = 'module', prepend, url, content } = params;
+    if (!url && !content) {
+        return;
+    }
+    const script = document.createElement('script');
+    script.type = type;
+    if (url) {
+        script.src = url;
+    }
+    else if (content) {
+        script.innerHTML = content;
+    }
+    if (prepend) {
+        document.head.prepend(script);
+    }
+    else {
+        document.head.appendChild(script);
+    }
+}
+/**
+ * Read a static HTML file, or return an error response if the file can't be read.
+ */
+async function readStaticHtml(renderScriptPath) {
+    try {
+        return (await fsPromises.readFile(renderScriptPath, 'utf8')) || '';
+    }
+    catch (e) {
+        const message = `Error reading HTML file at "${renderScriptPath}":\n${e.stack || e}`;
+        console.error(message);
+        return getHtmlErrorResponse(message);
+    }
+}
+//# sourceMappingURL=renderRoute.js.map

package/lib/renderRoute/renderRoute.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"renderRoute.js","sourceRoot":"","sources":["../../src/renderRoute/renderRoute.ts"],"names":[],"mappings":"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","sourcesContent":["import path from 'path';\nimport { pathToFileURL } from 'url';\nimport { getDefaultHtmlResponse } from './getDefaultHtmlResponse.js';\nimport { JSDOM } from 'jsdom';\nimport fsPromises from 'fs/promises';\nimport { getHtmlErrorResponse } from './getHtmlErrorResponse.js';\nimport type { CompleteRenderRouteResult, RenderRouteResult } from '../types/RenderRouteResult.js';\nimport type { RenderRouteOptions } from '../types/RenderRouteOptions.js';\nimport type { RenderRouteFunction } from '../types/RenderRouteFunction.js';\nimport type { RenderRouteScript } from '../types/RenderRouteScript.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: RenderRouteOptions): Promise<CompleteRenderRouteResult> {\n  const { route, session } = options;\n\n  // Get an initial result from either the render script or default handler.\n  let rawResult: RenderRouteResult;\n  if (route.renderScript) {\n    const renderScriptPath = path.resolve(session.appPath, route.renderScript);\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  const result: CompleteRenderRouteResult = {\n    contentType: 'text/html',\n    statusCode: 200,\n    ...(typeof rawResult === 'string' ? { content: rawResult } : rawResult),\n  };\n\n  // If it's HTML and not an error, inject the import map and appropriate scripts.\n  // endsWith('html') covers: 'html', '.html', and 'text/html'\n  // (Might need to modify the status check in the future if there are other codes where injecting\n  // scripts is appropriate, but for now, only do this for 200.)\n  if (result.contentType.endsWith('html') && result.statusCode === 200) {\n    injectScripts(options, result);\n  }\n\n  return result;\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: RenderRouteOptions & { renderScriptPath: string },\n): Promise<RenderRouteResult> {\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: RenderRouteFunction | undefined;\n  let errorMessage: string | undefined;\n  try {\n    const importResult = ((await import(renderScriptUrl + cacheBreakerQueryParam)) as RenderRouteScript).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: RenderRouteOptions, result: CompleteRenderRouteResult): void {\n  const { route, overlayScript, entryScript, inlineScripts, importMap } = options;\n  let jsdom: JSDOM;\n  try {\n    jsdom = new JSDOM(result.content);\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    // inject the import map.\n    if (entryScript || overlayScript) {\n      addScript({ document, type: 'importmap', content: JSON.stringify(importMap, null, 2) });\n    }\n\n    for (const inlineScript of inlineScripts) {\n      addScript({ document, content: inlineScript });\n    }\n\n    // inject the overlay and entry scripts\n    addScript({ document, url: overlayScript });\n    addScript({ document, url: entryScript });\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 */\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<RenderRouteResult> {\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/lib/startAppServer.d.ts

@@ -15,7 +15,7 @@ import type { AppServer } from './types/AppServer.js';
  * can support whichever routes the app needs, while the bundle server can provide package
  * assets in various forms using its own routing.
  */
-export declare function startAppServer({ session, bundleServer, apiServer, definition, config, packages, packageImportPaths, reporter, packageHashes, middlewareMode, server, }: {
+export declare function startAppServer(params: {
     session: Session;
     definition: PackageJson;
     bundleServer: BundleServer;

package/lib/startAppServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"startAppServer.d.ts","sourceRoot":"","sources":["../src/startAppServer.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAGxG,OAAO,EAAE,KAAK,YAAY,EAAQ,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEtD;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAAC,EACnC,OAAO,EACP,YAAY,EACZ,SAAS,EACT,UAAU,EACV,MAA8B,EAC9B,QAAQ,EACR,kBAAkB,EAClB,QAAQ,EACR,aAAa,EACb,cAAc,EACd,MAAM,GACP,EAAE;IACD,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,YAAY,EAAE,YAAY,CAAC;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,uBAAuB,CAAC;IAClC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,QAAQ,EAAE,YAAY,CAAC;IACvB,aAAa,EAAE,aAAa,CAAC;IAC7B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,SAAS,CAAC,CAoDrB"}
+{"version":3,"file":"startAppServer.d.ts","sourceRoot":"","sources":["../src/startAppServer.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAGxG,OAAO,EAAE,KAAK,YAAY,EAAQ,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEtD;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAAC,MAAM,EAAE;IAC3C,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,YAAY,EAAE,YAAY,CAAC;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,uBAAuB,CAAC;IAClC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,QAAQ,EAAE,YAAY,CAAC;IACvB,aAAa,EAAE,aAAa,CAAC;IAC7B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,SAAS,CAAC,CAgCrB"}

package/lib/startAppServer.js

@@ -10,14 +10,12 @@ import { cyan } from '@ms-cloudpack/task-reporter';
  * can support whichever routes the app needs, while the bundle server can provide package
  * assets in various forms using its own routing.
  */
-export async function startAppServer({ session, bundleServer, apiServer, definition, config = {}, packages, packageImportPaths, reporter, packageHashes, middlewareMode, server, }) {
-    const { devServer = {} } = config || {};
+export async function startAppServer(params) {
+    const { session, definition, config, reporter, middlewareMode, server } = params;
+    const { devServer = {} } = config;
     // Read the port from the config file or default to array of ports.
     const requireSpecifiedPort = devServer?.port !== undefined;
     const ports = devServer?.port ?? [5000, 5001, 5002, 5003];
-    // Directory to serve as plain static assets. Defaults to "public".
-    // Can be overridden by setting the 'publicDir' option in the cloudpack config.
-    // const publicDir = path.resolve(devServer.publicPath ?? 'public');
     const task = reporter.addTask(`Starting app server for "${definition.name}"`);
     try {
         const { app, close, port, url } = await createExpressApp({
@@ -25,30 +23,13 @@ export async function startAppServer({ session, bundleServer, apiServer, definit
             requireSpecifiedPort,
             hostname: devServer?.domain,
             requestHeaders: devServer?.requestHeaders,
-            sslOptions: config.devServer?.https,
-            //  publicDir,
+            sslOptions: devServer?.https,
             middlewareMode,
             server,
         });
-        createRoutes({
-            app,
-            url,
-            session,
-            definition,
-            bundleServer,
-            apiServer,
-            config,
-            packages,
-            packageImportPaths,
-            packageHashes,
-        });
+        createRoutes({ ...params, app, url });
         task.complete({ message: `Available @ ${cyan(url)}`, forceShow: true });
-        return {
-            app,
-            close,
-            port,
-            url,
-        };
+        return { app, close, port, url };
     }
     catch (err) {
         task.complete({ status: 'fail', message: 'Failed to start app server', forceShow: true });

package/lib/startAppServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"startAppServer.js","sourceRoot":"","sources":["../src/startAppServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAqB,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAOtE;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EACnC,OAAO,EACP,YAAY,EACZ,SAAS,EACT,UAAU,EACV,MAAM,GAAG,EAAqB,EAC9B,QAAQ,EACR,kBAAkB,EAClB,QAAQ,EACR,aAAa,EACb,cAAc,EACd,MAAM,GAaP;IACC,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,MAAM,IAAK,EAAsB,CAAC;IAE7D,mEAAmE;IACnE,MAAM,oBAAoB,GAAG,SAAS,EAAE,IAAI,KAAK,SAAS,CAAC;IAC3D,MAAM,KAAK,GAAG,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAE1D,mEAAmE;IACnE,+EAA+E;IAC/E,oEAAoE;IAEpE,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,4BAA4B,UAAU,CAAC,IAAI,GAAG,CAAC,CAAC;IAE9E,IAAI,CAAC;QACH,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,gBAAgB,CAAC;YACvD,SAAS,EAAE,KAAK;YAChB,oBAAoB;YACpB,QAAQ,EAAE,SAAS,EAAE,MAAM;YAC3B,cAAc,EAAE,SAAS,EAAE,cAAc;YACzC,UAAU,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK;YACnC,cAAc;YACd,cAAc;YACd,MAAM;SACP,CAAC,CAAC;QAEH,YAAY,CAAC;YACX,GAAG;YACH,GAAG;YACH,OAAO;YACP,UAAU;YACV,YAAY;YACZ,SAAS;YACT,MAAM;YACN,QAAQ;YACR,kBAAkB;YAClB,aAAa;SACd,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,eAAe,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAExE,OAAO;YACL,GAAG;YACH,KAAK;YACL,IAAI;YACJ,GAAG;SACJ,CAAC;IACJ,CAAC;IAAC,OAAO,GAAY,EAAE,CAAC;QACtB,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,4BAA4B,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1F,0BAA0B,CAAC,GAAG,EAAE,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAE5D,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC","sourcesContent":["import { createExpressApp } from '@ms-cloudpack/create-express-app';\nimport type { BundleServer } from '@ms-cloudpack/bundle-server';\nimport type { CloudpackConfig, PackageDefinitionsCache, PackageJson } from '@ms-cloudpack/common-types';\nimport { createRoutes } from './createRoutes.js';\nimport { handleErrorPortUnavailable } from './handleErrorPortUnavailable.js';\nimport { type TaskReporter, cyan } from '@ms-cloudpack/task-reporter';\nimport type { ApiServer, Session } from '@ms-cloudpack/api-server';\nimport type { PackageImportPaths } from '@ms-cloudpack/import-map';\nimport type { PackageHashes } from '@ms-cloudpack/package-hashes';\nimport type { Server } from 'http';\nimport type { AppServer } from './types/AppServer.js';\n\n/**\n * The app server hosts the appropriate routes for the web app, primarily returning html content\n * which loads resources from the bundle server.\n *\n * Separating the app server from the bundle service keeps the routes separate - the app server\n * can support whichever routes the app needs, while the bundle server can provide package\n * assets in various forms using its own routing.\n */\nexport async function startAppServer({\n  session,\n  bundleServer,\n  apiServer,\n  definition,\n  config = {} as CloudpackConfig,\n  packages,\n  packageImportPaths,\n  reporter,\n  packageHashes,\n  middlewareMode,\n  server,\n}: {\n  session: Session;\n  definition: PackageJson;\n  bundleServer: BundleServer;\n  apiServer: ApiServer;\n  config: CloudpackConfig;\n  packages: PackageDefinitionsCache;\n  packageImportPaths: PackageImportPaths;\n  reporter: TaskReporter;\n  packageHashes: PackageHashes;\n  middlewareMode?: boolean;\n  server?: Server;\n}): Promise<AppServer> {\n  const { devServer = {} } = config || ({} as CloudpackConfig);\n\n  // Read the port from the config file or default to array of ports.\n  const requireSpecifiedPort = devServer?.port !== undefined;\n  const ports = devServer?.port ?? [5000, 5001, 5002, 5003];\n\n  // Directory to serve as plain static assets. Defaults to \"public\".\n  // Can be overridden by setting the 'publicDir' option in the cloudpack config.\n  // const publicDir = path.resolve(devServer.publicPath ?? 'public');\n\n  const task = reporter.addTask(`Starting app server for \"${definition.name}\"`);\n\n  try {\n    const { app, close, port, url } = await createExpressApp({\n      portRange: ports,\n      requireSpecifiedPort,\n      hostname: devServer?.domain,\n      requestHeaders: devServer?.requestHeaders,\n      sslOptions: config.devServer?.https,\n      //  publicDir,\n      middlewareMode,\n      server,\n    });\n\n    createRoutes({\n      app,\n      url,\n      session,\n      definition,\n      bundleServer,\n      apiServer,\n      config,\n      packages,\n      packageImportPaths,\n      packageHashes,\n    });\n\n    task.complete({ message: `Available @ ${cyan(url)}`, forceShow: true });\n\n    return {\n      app,\n      close,\n      port,\n      url,\n    };\n  } catch (err: unknown) {\n    task.complete({ status: 'fail', message: 'Failed to start app server', forceShow: true });\n    handleErrorPortUnavailable(err, session.projectName, ports);\n\n    throw err;\n  }\n}\n"]}
+{"version":3,"file":"startAppServer.js","sourceRoot":"","sources":["../src/startAppServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAqB,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAOtE;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,MAYpC;IACC,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IACjF,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,MAAM,CAAC;IAElC,mEAAmE;IACnE,MAAM,oBAAoB,GAAG,SAAS,EAAE,IAAI,KAAK,SAAS,CAAC;IAC3D,MAAM,KAAK,GAAG,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAE1D,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,4BAA4B,UAAU,CAAC,IAAI,GAAG,CAAC,CAAC;IAE9E,IAAI,CAAC;QACH,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,gBAAgB,CAAC;YACvD,SAAS,EAAE,KAAK;YAChB,oBAAoB;YACpB,QAAQ,EAAE,SAAS,EAAE,MAAM;YAC3B,cAAc,EAAE,SAAS,EAAE,cAAc;YACzC,UAAU,EAAE,SAAS,EAAE,KAAK;YAC5B,cAAc;YACd,MAAM;SACP,CAAC,CAAC;QAEH,YAAY,CAAC,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QAEtC,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,eAAe,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAExE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;IACnC,CAAC;IAAC,OAAO,GAAY,EAAE,CAAC;QACtB,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,4BAA4B,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1F,0BAA0B,CAAC,GAAG,EAAE,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAE5D,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC","sourcesContent":["import { createExpressApp } from '@ms-cloudpack/create-express-app';\nimport type { BundleServer } from '@ms-cloudpack/bundle-server';\nimport type { CloudpackConfig, PackageDefinitionsCache, PackageJson } from '@ms-cloudpack/common-types';\nimport { createRoutes } from './createRoutes.js';\nimport { handleErrorPortUnavailable } from './handleErrorPortUnavailable.js';\nimport { type TaskReporter, cyan } from '@ms-cloudpack/task-reporter';\nimport type { ApiServer, Session } from '@ms-cloudpack/api-server';\nimport type { PackageImportPaths } from '@ms-cloudpack/import-map';\nimport type { PackageHashes } from '@ms-cloudpack/package-hashes';\nimport type { Server } from 'http';\nimport type { AppServer } from './types/AppServer.js';\n\n/**\n * The app server hosts the appropriate routes for the web app, primarily returning html content\n * which loads resources from the bundle server.\n *\n * Separating the app server from the bundle service keeps the routes separate - the app server\n * can support whichever routes the app needs, while the bundle server can provide package\n * assets in various forms using its own routing.\n */\nexport async function startAppServer(params: {\n  session: Session;\n  definition: PackageJson;\n  bundleServer: BundleServer;\n  apiServer: ApiServer;\n  config: CloudpackConfig;\n  packages: PackageDefinitionsCache;\n  packageImportPaths: PackageImportPaths;\n  reporter: TaskReporter;\n  packageHashes: PackageHashes;\n  middlewareMode?: boolean;\n  server?: Server;\n}): Promise<AppServer> {\n  const { session, definition, config, reporter, middlewareMode, server } = params;\n  const { devServer = {} } = config;\n\n  // Read the port from the config file or default to array of ports.\n  const requireSpecifiedPort = devServer?.port !== undefined;\n  const ports = devServer?.port ?? [5000, 5001, 5002, 5003];\n\n  const task = reporter.addTask(`Starting app server for \"${definition.name}\"`);\n\n  try {\n    const { app, close, port, url } = await createExpressApp({\n      portRange: ports,\n      requireSpecifiedPort,\n      hostname: devServer?.domain,\n      requestHeaders: devServer?.requestHeaders,\n      sslOptions: devServer?.https,\n      middlewareMode,\n      server,\n    });\n\n    createRoutes({ ...params, app, url });\n\n    task.complete({ message: `Available @ ${cyan(url)}`, forceShow: true });\n\n    return { app, close, port, url };\n  } catch (err: unknown) {\n    task.complete({ status: 'fail', message: 'Failed to start app server', forceShow: true });\n    handleErrorPortUnavailable(err, session.projectName, ports);\n\n    throw err;\n  }\n}\n"]}

package/lib/types/RenderRouteFunction.d.ts

@@ -0,0 +1,7 @@
+import type { RenderRouteOptions } from './RenderRouteOptions.js';
+import type { RenderRouteResult } from './RenderRouteResult.js';
+/**
+ * A custom server render function that can be used to override the default HTML response.
+ */
+export type RenderRouteFunction = (options: RenderRouteOptions) => Promise<RenderRouteResult> | RenderRouteResult;
+//# sourceMappingURL=RenderRouteFunction.d.ts.map

package/lib/types/RenderRouteFunction.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RenderRouteFunction.d.ts","sourceRoot":"","sources":["../../src/types/RenderRouteFunction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAEhE;;GAEG;AACH,MAAM,MAAM,mBAAmB,GAAG,CAAC,OAAO,EAAE,kBAAkB,KAAK,OAAO,CAAC,iBAAiB,CAAC,GAAG,iBAAiB,CAAC"}

package/lib/types/RenderRouteFunction.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=RenderRouteFunction.js.map

package/lib/types/RenderRouteFunction.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RenderRouteFunction.js","sourceRoot":"","sources":["../../src/types/RenderRouteFunction.ts"],"names":[],"mappings":"","sourcesContent":["import type { RenderRouteOptions } from './RenderRouteOptions.js';\nimport type { RenderRouteResult } from './RenderRouteResult.js';\n\n/**\n * A custom server render function that can be used to override the default HTML response.\n */\nexport type RenderRouteFunction = (options: RenderRouteOptions) => Promise<RenderRouteResult> | RenderRouteResult;\n"]}

package/lib/types/RenderRouteOptions.d.ts

@@ -0,0 +1,20 @@
+import type { ImportMap } from '@ms-cloudpack/import-map';
+import type { PackageJson, Route } from '@ms-cloudpack/common-types';
+import type { Request, Response } from '@ms-cloudpack/create-express-app';
+import type { Session } from '@ms-cloudpack/api-server';
+/**
+ * The input options for a `renderScript` custom server render function.
+ */
+export interface RenderRouteOptions {
+    session: Session;
+    route: Route;
+    baseUrl: string;
+    definition: PackageJson;
+    importMap: ImportMap;
+    overlayScript: string | undefined;
+    entryScript: string | undefined;
+    inlineScripts: string[];
+    req: Request;
+    res: Response;
+}
+//# sourceMappingURL=RenderRouteOptions.d.ts.map

package/lib/types/RenderRouteOptions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RenderRouteOptions.d.ts","sourceRoot":"","sources":["../../src/types/RenderRouteOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAExD;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,WAAW,CAAC;IACxB,SAAS,EAAE,SAAS,CAAC;IACrB,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,QAAQ,CAAC;CACf"}

package/lib/types/RenderRouteOptions.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=RenderRouteOptions.js.map

package/lib/types/RenderRouteOptions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RenderRouteOptions.js","sourceRoot":"","sources":["../../src/types/RenderRouteOptions.ts"],"names":[],"mappings":"","sourcesContent":["import type { ImportMap } from '@ms-cloudpack/import-map';\nimport type { PackageJson, Route } from '@ms-cloudpack/common-types';\nimport type { Request, Response } from '@ms-cloudpack/create-express-app';\nimport type { Session } from '@ms-cloudpack/api-server';\n\n/**\n * The input options for a `renderScript` custom server render function.\n */\nexport interface RenderRouteOptions {\n  session: Session;\n  route: Route;\n  baseUrl: string;\n  definition: PackageJson;\n  importMap: ImportMap;\n  overlayScript: string | undefined;\n  entryScript: string | undefined;\n  inlineScripts: string[];\n  req: Request;\n  res: Response;\n}\n"]}

package/lib/types/RenderRouteResult.d.ts

@@ -0,0 +1,19 @@
+/**
+ * The complete expected result of the `renderScript` custom server render function.
+ */
+export interface CompleteRenderRouteResult {
+    content: string;
+    statusCode: number;
+    contentType: string;
+}
+/**
+ * The expected result of the `renderScript` custom server render function.
+ *
+ * If the result is a string, it's assumed to be the HTML content.
+ *
+ * If an object and the `content` is non-HTML, `contentType` must be set.
+ */
+export type RenderRouteResult = string | ({
+    content: string;
+} & Partial<CompleteRenderRouteResult>);
+//# sourceMappingURL=RenderRouteResult.d.ts.map

package/lib/types/RenderRouteResult.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RenderRouteResult.d.ts","sourceRoot":"","sources":["../../src/types/RenderRouteResult.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;GAMG;AACH,MAAM,MAAM,iBAAiB,GAAG,MAAM,GAAG,CAAC;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC,CAAC"}

package/lib/types/RenderRouteResult.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=RenderRouteResult.js.map

package/lib/types/RenderRouteResult.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RenderRouteResult.js","sourceRoot":"","sources":["../../src/types/RenderRouteResult.ts"],"names":[],"mappings":"","sourcesContent":["/**\n * The complete expected result of the `renderScript` custom server render function.\n */\nexport interface CompleteRenderRouteResult {\n  content: string;\n  statusCode: number;\n  contentType: string;\n}\n\n/**\n * The expected result of the `renderScript` custom server render function.\n *\n * If the result is a string, it's assumed to be the HTML content.\n *\n * If an object and the `content` is non-HTML, `contentType` must be set.\n */\nexport type RenderRouteResult = string | ({ content: string } & Partial<CompleteRenderRouteResult>);\n"]}

package/lib/types/RenderRouteScript.d.ts

@@ -0,0 +1,8 @@
+import type { RenderRouteFunction } from './RenderRouteFunction.js';
+/**
+ * The expected shape of the `renderScript` custom server render function script.
+ */
+export type RenderRouteScript = {
+    default: RenderRouteFunction;
+};
+//# sourceMappingURL=RenderRouteScript.d.ts.map

package/lib/types/RenderRouteScript.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RenderRouteScript.d.ts","sourceRoot":"","sources":["../../src/types/RenderRouteScript.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAEpE;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAAE,OAAO,EAAE,mBAAmB,CAAA;CAAE,CAAC"}

package/lib/types/RenderRouteScript.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=RenderRouteScript.js.map

package/lib/types/RenderRouteScript.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RenderRouteScript.js","sourceRoot":"","sources":["../../src/types/RenderRouteScript.ts"],"names":[],"mappings":"","sourcesContent":["import type { RenderRouteFunction } from './RenderRouteFunction.js';\n\n/**\n * The expected shape of the `renderScript` custom server render function script.\n */\nexport type RenderRouteScript = { default: RenderRouteFunction };\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/app-server",
-  "version": "0.3.13",
+  "version": "0.4.0",
   "description": "An implementation of the App server for Cloudpack.",
   "license": "MIT",
   "type": "module",
@@ -14,15 +14,15 @@
     }
   },
   "dependencies": {
-    "@ms-cloudpack/api-server": "^0.37.5",
-    "@ms-cloudpack/bundle-server": "^0.2.57",
-    "@ms-cloudpack/common-types": "^0.2.5",
-    "@ms-cloudpack/create-express-app": "^1.6.6",
-    "@ms-cloudpack/import-map": "^0.2.8",
-    "@ms-cloudpack/overlay": "^0.16.106",
-    "@ms-cloudpack/package-hashes": "^0.5.8",
+    "@ms-cloudpack/api-server": "^0.38.0",
+    "@ms-cloudpack/bundle-server": "^0.2.58",
+    "@ms-cloudpack/common-types": "^0.3.0",
+    "@ms-cloudpack/create-express-app": "^1.6.7",
+    "@ms-cloudpack/import-map": "^0.2.9",
+    "@ms-cloudpack/overlay": "^0.16.107",
+    "@ms-cloudpack/package-hashes": "^0.5.9",
     "@ms-cloudpack/path-string-parsing": "^1.2.1",
-    "@ms-cloudpack/path-utilities": "^2.7.3",
+    "@ms-cloudpack/path-utilities": "^2.7.4",
     "@ms-cloudpack/task-reporter": "^0.13.1",
     "jsdom": "^22.0.0"
   },

package/lib/getDefaultHtmlResponse.d.ts

@@ -1,6 +0,0 @@
-import type { CreateHtmlResult, CreateHtmlOptions } from '@ms-cloudpack/api-server';
-/**
- * Return the default HTML response.
- */
-export declare function getDefaultHtmlResponse({ definition }: CreateHtmlOptions): CreateHtmlResult;
-//# sourceMappingURL=getDefaultHtmlResponse.d.ts.map

package/lib/getDefaultHtmlResponse.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getDefaultHtmlResponse.d.ts","sourceRoot":"","sources":["../src/getDefaultHtmlResponse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAEpF;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,UAAU,EAAE,EAAE,iBAAiB,GAAG,gBAAgB,CAc1F"}

package/lib/getDefaultHtmlResponse.js

@@ -1,18 +0,0 @@
-/**
- * Return the default HTML response.
- */
-export function getDefaultHtmlResponse({ definition }) {
-    const { name } = definition;
-    return [
-        `<!DOCTYPE html>`,
-        `<html lang="en">`,
-        `<head>`,
-        `  <title>${name}</title>`,
-        `</head>`,
-        `<body>`,
-        `<div id="root"></div>`,
-        `</body>`,
-        `</html>`,
-    ].join('\n');
-}
-//# sourceMappingURL=getDefaultHtmlResponse.js.map

package/lib/getDefaultHtmlResponse.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getDefaultHtmlResponse.js","sourceRoot":"","sources":["../src/getDefaultHtmlResponse.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,UAAU,sBAAsB,CAAC,EAAE,UAAU,EAAqB;IACtE,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC;IAE5B,OAAO;QACL,iBAAiB;QACjB,kBAAkB;QAClB,QAAQ;QACR,YAAY,IAAI,UAAU;QAC1B,SAAS;QACT,QAAQ;QACR,uBAAuB;QACvB,SAAS;QACT,SAAS;KACV,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC","sourcesContent":["import type { CreateHtmlResult, CreateHtmlOptions } from '@ms-cloudpack/api-server';\n\n/**\n * Return the default HTML response.\n */\nexport function getDefaultHtmlResponse({ definition }: CreateHtmlOptions): CreateHtmlResult {\n  const { name } = definition;\n\n  return [\n    `<!DOCTYPE html>`,\n    `<html lang=\"en\">`,\n    `<head>`,\n    `  <title>${name}</title>`,\n    `</head>`,\n    `<body>`,\n    `<div id=\"root\"></div>`,\n    `</body>`,\n    `</html>`,\n  ].join('\\n');\n}\n"]}

package/lib/getHtmlResponse.d.ts

@@ -1,6 +0,0 @@
-import type { CreateHtmlResult, CreateHtmlOptions } from '@ms-cloudpack/api-server';
-/**
- * Get the HTML response for the given route. If the route has a custom render script, use that.
- */
-export declare function getHtmlResponse(options: CreateHtmlOptions): Promise<Required<Exclude<CreateHtmlResult, string>>>;
-//# sourceMappingURL=getHtmlResponse.d.ts.map

package/lib/getHtmlResponse.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getHtmlResponse.d.ts","sourceRoot":"","sources":["../src/getHtmlResponse.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAGV,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,0BAA0B,CAAC;AAKlC;;GAEG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC,CAAC,CAwFtD"}

package/lib/getHtmlResponse.js

@@ -1,117 +0,0 @@
-import path from 'path';
-import { pathToFileURL } from 'url';
-import { getDefaultHtmlResponse } from './getDefaultHtmlResponse.js';
-import { JSDOM } from 'jsdom';
-import fsPromises from 'fs/promises';
-/**
- * Get the HTML response for the given route. If the route has a custom render script, use that.
- */
-export async function getHtmlResponse(options) {
-    const { route, session, overlayScript, entryScript, inlineScripts } = options;
-    let createHtml = getDefaultHtmlResponse;
-    if (route.renderScript) {
-        const renderScriptPath = path.resolve(session.appPath, route.renderScript);
-        let cacheBreakerQueryParam = `?t=${Date.now()}`;
-        try {
-            const { mtime } = await fsPromises.stat(path.resolve(session.appPath, route.renderScript));
-            cacheBreakerQueryParam = `?t=${mtime.getTime()}`;
-        }
-        catch {
-            /* no-op */
-        }
-        if (isHtml(renderScriptPath)) {
-            createHtml = readStaticHtml;
-        }
-        else {
-            // Get the html factory function from a script default export.
-            const renderScriptUrl = pathToFileURL(renderScriptPath).toString();
-            // Note: because there isn't a way to purge the require cache, we need to add a cache breaker query param to the
-            // script path to ensure we get the latest version of the script. This could be improved by using the git hash of
-            // the file if it exists, or a hash of the content, or even the timestamp of the file.
-            try {
-                createHtml = (await import(renderScriptUrl + cacheBreakerQueryParam)).default;
-            }
-            catch (e) {
-                console.error(`Error importing render script at "${renderScriptUrl}":`, e);
-            }
-        }
-        if (!createHtml) {
-            console.error(`The render script at "${renderScriptPath}" does not export a default function.`);
-        }
-    }
-    let content;
-    let contentType = 'html';
-    let statusCode = 200;
-    const result = await createHtml(options);
-    if (typeof result === 'string') {
-        content = result;
-    }
-    else {
-        content = result.content;
-        contentType = result.contentType ?? contentType;
-        statusCode = result.statusCode ?? statusCode;
-    }
-    // endsWith('html') covers: 'html', '.html', and 'text/html'
-    if (contentType.endsWith('html')) {
-        try {
-            const htmlDocument = new JSDOM(content);
-            const { document } = htmlDocument.window;
-            // inject the import map.
-            if (entryScript || overlayScript) {
-                const script = document.createElement('script');
-                script.type = 'importmap';
-                script.innerHTML = JSON.stringify(session.getImportMap(), null, 2);
-                document.head.prepend(script);
-            }
-            for (const inlineScript of inlineScripts) {
-                const script = document.createElement('script');
-                script.type = 'module';
-                script.innerHTML = inlineScript;
-                document.head.appendChild(script);
-            }
-            // inject the overlay script.
-            addScript(document.head, overlayScript);
-            // inject the entry script.
-            addScript(document.head, entryScript);
-            content = htmlDocument.serialize();
-        }
-        catch (e) {
-            console.error(`Error parsing html response for rendering route "${route.match}"`, e);
-        }
-    }
-    return {
-        content,
-        statusCode,
-        contentType,
-    };
-}
-/**
- * Helper function to add a script to the document.
- */
-function addScript(parentElement, url) {
-    if (url) {
-        const script = parentElement.ownerDocument.createElement('script');
-        script.type = 'module';
-        script.src = url;
-        parentElement.appendChild(script);
-    }
-}
-function isHtml(scriptPath) {
-    // path has an .htm or .html extension; case insensitive.
-    return scriptPath.toLowerCase().match(/\.htm(l)?$/) !== null;
-}
-async function readStaticHtml(options) {
-    const { route } = options;
-    let html = '';
-    if (route.renderScript) {
-        const htmlPath = path.resolve(options.session.appPath, route.renderScript);
-        try {
-            html = (await fsPromises.readFile(htmlPath, 'utf8')) || '';
-        }
-        catch (e) {
-            console.error(`Error reading HTML file at "${htmlPath}".`, e);
-        }
-    }
-    return html;
-}
-//# sourceMappingURL=getHtmlResponse.js.map

package/lib/getHtmlResponse.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getHtmlResponse.js","sourceRoot":"","sources":["../src/getHtmlResponse.ts"],"names":[],"mappings":"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","sourcesContent":["import path from 'path';\nimport { pathToFileURL } from 'url';\nimport type {\n  CreateHtmlScript,\n  CreateHtmlFunction,\n  CreateHtmlResult,\n  CreateHtmlOptions,\n} from '@ms-cloudpack/api-server';\nimport { getDefaultHtmlResponse } from './getDefaultHtmlResponse.js';\nimport { JSDOM } from 'jsdom';\nimport fsPromises from 'fs/promises';\n\n/**\n * Get the HTML response for the given route. If the route has a custom render script, use that.\n */\nexport async function getHtmlResponse(\n  options: CreateHtmlOptions,\n): Promise<Required<Exclude<CreateHtmlResult, string>>> {\n  const { route, session, overlayScript, entryScript, inlineScripts } = options;\n  let createHtml: CreateHtmlFunction = getDefaultHtmlResponse;\n\n  if (route.renderScript) {\n    const renderScriptPath = path.resolve(session.appPath, route.renderScript);\n    let cacheBreakerQueryParam = `?t=${Date.now()}`;\n\n    try {\n      const { mtime } = await fsPromises.stat(path.resolve(session.appPath, route.renderScript));\n\n      cacheBreakerQueryParam = `?t=${mtime.getTime()}`;\n    } catch {\n      /* no-op */\n    }\n\n    if (isHtml(renderScriptPath)) {\n      createHtml = readStaticHtml;\n    } else {\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      try {\n        createHtml = ((await import(renderScriptUrl + cacheBreakerQueryParam)) as CreateHtmlScript).default;\n      } catch (e) {\n        console.error(`Error importing render script at \"${renderScriptUrl}\":`, e);\n      }\n    }\n\n    if (!createHtml) {\n      console.error(`The render script at \"${renderScriptPath}\" does not export a default function.`);\n    }\n  }\n\n  let content;\n  let contentType = 'html';\n  let statusCode = 200;\n\n  const result = await createHtml(options);\n  if (typeof result === 'string') {\n    content = result;\n  } else {\n    content = result.content;\n    contentType = result.contentType ?? contentType;\n    statusCode = result.statusCode ?? statusCode;\n  }\n\n  // endsWith('html') covers: 'html', '.html', and 'text/html'\n  if (contentType.endsWith('html')) {\n    try {\n      const htmlDocument = new JSDOM(content);\n      const { document } = htmlDocument.window;\n\n      // inject the import map.\n      if (entryScript || overlayScript) {\n        const script = document.createElement('script');\n        script.type = 'importmap';\n        script.innerHTML = JSON.stringify(session.getImportMap(), null, 2);\n        document.head.prepend(script);\n      }\n\n      for (const inlineScript of inlineScripts) {\n        const script = document.createElement('script');\n        script.type = 'module';\n        script.innerHTML = inlineScript;\n        document.head.appendChild(script);\n      }\n\n      // inject the overlay script.\n      addScript(document.head, overlayScript);\n\n      // inject the entry script.\n      addScript(document.head, entryScript);\n\n      content = htmlDocument.serialize();\n    } catch (e) {\n      console.error(`Error parsing html response for rendering route \"${route.match}\"`, e);\n    }\n  }\n\n  return {\n    content,\n    statusCode,\n    contentType,\n  };\n}\n\n/**\n * Helper function to add a script to the document.\n */\nfunction addScript(parentElement: HTMLElement, url: string | undefined) {\n  if (url) {\n    const script = parentElement.ownerDocument.createElement('script');\n\n    script.type = 'module';\n    script.src = url;\n    parentElement.appendChild(script);\n  }\n}\n\nfunction isHtml(scriptPath: string): boolean {\n  // path has an .htm or .html extension; case insensitive.\n  return scriptPath.toLowerCase().match(/\\.htm(l)?$/) !== null;\n}\n\nasync function readStaticHtml(options: CreateHtmlOptions): Promise<string> {\n  const { route } = options;\n  let html = '';\n\n  if (route.renderScript) {\n    const htmlPath = path.resolve(options.session.appPath, route.renderScript);\n\n    try {\n      html = (await fsPromises.readFile(htmlPath, 'utf8')) || '';\n    } catch (e) {\n      console.error(`Error reading HTML file at \"${htmlPath}\".`, e);\n    }\n  }\n\n  return html;\n}\n"]}