@ms-cloudpack/app-server 0.4.4 → 0.6.0

package/lib/createRoutes.d.ts

@@ -1,22 +1,15 @@
-import type { CloudpackConfig, PackageDefinitionsCache, PackageJson } from '@ms-cloudpack/common-types';
+import type { Context } from '@ms-cloudpack/api-server';
+import type { PackageJson } from '@ms-cloudpack/common-types';
 import type { Express } from '@ms-cloudpack/create-express-app';
-import type { BundleServer } from '@ms-cloudpack/bundle-server';
-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 based on the config.
- */
-export declare function createRoutes(params: {
+interface CreateRoutesOptions {
     app: Express;
     url: string;
-    session: Session;
     definition: PackageJson;
-    bundleServer: BundleServer;
-    apiServer: ApiServer;
-    config: CloudpackConfig;
-    packages: PackageDefinitionsCache;
-    packageImportPaths: PackageImportPaths;
-    packageHashes: PackageHashes;
-}): void;
+}
+export type CreateRoutesContext = Pick<Context, 'packages' | 'packageImportPaths' | 'packageHashes' | 'session'>;
+/**
+ * Creates the routes for the express app based on the config.
+ */
+export declare function createRoutes(options: CreateRoutesOptions, context: CreateRoutesContext): void;
+export {};
 //# sourceMappingURL=createRoutes.d.ts.map

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,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,QA+BA"}
+{"version":3,"file":"createRoutes.d.ts","sourceRoot":"","sources":["../src/createRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAS,MAAM,4BAA4B,CAAC;AACrE,OAAO,KAAK,EAAE,OAAO,EAAqB,MAAM,kCAAkC,CAAC;AASnF,UAAU,mBAAmB;IAC3B,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,WAAW,CAAC;CACzB;AAED,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,OAAO,EAAE,UAAU,GAAG,oBAAoB,GAAG,eAAe,GAAG,SAAS,CAAC,CAAC;AAEjH;;GAEG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,mBAAmB,EAAE,OAAO,EAAE,mBAAmB,QA6BtF"}

package/lib/createRoutes.js

@@ -2,35 +2,34 @@ 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 { renderRoute } from './renderRoute/renderRoute.js';
 import { getInlineScripts } from './inlineScripts/getInlineScripts.js';
+import { renderRoute } from './renderRoute/renderRoute.js';
 import { setHeaders } from './setHeaders.js';
 /**
  * Creates the routes for the express app based on the config.
  */
-export function createRoutes(params) {
-    const { app, session, config, packageHashes } = params;
-    const routes = [...(config.devServer?.routes || [])];
+export function createRoutes(options, context) {
+    const { app, ...otherOptions } = options;
+    const { session } = context;
+    const routes = [...(session.config.devServer?.routes || [])];
     // Only as a basic fallback if no routes are specified, add a default catch-all route.
     // Adding this automatically has the risk of hiding errors, like if an unexpected path
     // being requested, or a JS file somehow being loaded from the app server unexpectedly.
-    if (!config.devServer?.routes?.length) {
-        routes.push({
+    if (!routes.length) {
+        const fallbackRoute = {
             match: '*',
             exportEntry: '.',
-        });
+            isDefaultFallback: true, // this internal property is read by renderRoute
+        };
+        routes.push(fallbackRoute);
     }
-    // Hashes from external packages to be used in the import map.
-    const getPackageHash = (packagePath) => {
-        return packageHashes.get({ packagePath, isSourceHashingEnabled: false });
-    };
     for (const route of routes) {
         if (route.staticPath) {
             app.use(route.match, express.static(path.resolve(session.appPath, route.staticPath)));
         }
         else {
             app.get(route.match, (req, res) => {
-                handleRequest({ ...params, route, req, res, getPackageHash }).catch((err) => {
+                handleRequest({ ...otherOptions, route, req, res }, context).catch((err) => {
                     console.error(err?.stack || err);
                     res.status(500).send(`Error loading app: ${err}`);
                 });
@@ -38,15 +37,11 @@ export function createRoutes(params) {
         }
     }
 }
-async function handleRequest(params) {
-    const { req, res, session, definition, route, bundleServer, apiServer, packages, getPackageHash, packageImportPaths, url, } = params;
+async function handleRequest(options, context) {
+    const { req, res, definition, route, url } = options;
+    const { session } = context;
     // Build the import map if it hasn't been built yet for this session version.
-    const importMap = (session.importMap ??= await createImportMap({
-        resolveMap: session.resolveMap,
-        bundleServerUrl: bundleServer.url,
-        sessionVersion: session.sessionVersion,
-        targetVersions: session.targetVersions,
-    }, { packages, packageImportPaths, getPackageHash, config: session.config }));
+    const importMap = (session.importMap ??= await createImportMap({ ...context, ...context.session }));
     // Parse the request path, extension, grab the overlay script path.
     const requestPath = slash(req.path.substring(1));
     const requestExt = path.extname(requestPath);
@@ -58,10 +53,11 @@ async function handleRequest(params) {
     // 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 });
+    setHeaders({ res, session });
     const inlineScripts = await getInlineScripts();
     const { content, statusCode, contentType } = await renderRoute({
-        ...params,
+        ...options,
+        session,
         baseUrl: url,
         importMap,
         overlayScript,

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 { 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\n  // Only as a basic fallback if no routes are specified, add a default catch-all route.\n  // Adding this automatically has the risk of hiding errors, like if an unexpected path\n  // being requested, or a JS file somehow being loaded from the app server unexpectedly.\n  if (!config.devServer?.routes?.length) {\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 = (session.importMap ??= await createImportMap(\n    {\n      resolveMap: session.resolveMap,\n      bundleServerUrl: bundleServer.url,\n      sessionVersion: session.sessionVersion,\n      targetVersions: session.targetVersions,\n    },\n    { packages, packageImportPaths, getPackageHash, config: session.config },\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"]}
+{"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 type { PackageJson, Route } 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, type RouteInternal } from './renderRoute/renderRoute.js';\nimport { setHeaders } from './setHeaders.js';\n\ninterface CreateRoutesOptions {\n  app: Express;\n  url: string;\n  definition: PackageJson;\n}\n\nexport type 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 routes = [...(session.config.devServer?.routes || [])];\n\n  // Only as a basic fallback if no routes are specified, add a default catch-all route.\n  // Adding this automatically has the risk of hiding errors, like if an unexpected path\n  // being requested, or a JS file somehow being loaded from the app server unexpectedly.\n  if (!routes.length) {\n    const fallbackRoute: RouteInternal = {\n      match: '*',\n      exportEntry: '.',\n      isDefaultFallback: true, // this internal property is read by renderRoute\n    };\n    routes.push(fallbackRoute);\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({ ...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    }\n  }\n}\n\nasync function handleRequest(\n  options: Omit<CreateRoutesOptions, 'app'> & {\n    req: Request;\n    res: Response;\n    route: Route;\n  },\n  context: CreateRoutesContext,\n) {\n  const { req, res, definition, route, url } = options;\n  const { session } = context;\n\n  // Build the import map if it hasn't been built yet for this session version.\n  const importMap = (session.importMap ??= await createImportMap({ ...context, ...context.session }));\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 });\n\n  const inlineScripts = await getInlineScripts();\n  const { content, statusCode, contentType } = await renderRoute({\n    ...options,\n    session,\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/inlineScripts/getInlineScripts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getInlineScripts.d.ts","sourceRoot":"","sources":["../../src/inlineScripts/getInlineScripts.ts"],"names":[],"mappings":"AAKA,wBAAsB,gBAAgB,sBAOrC"}
+{"version":3,"file":"getInlineScripts.d.ts","sourceRoot":"","sources":["../../src/inlineScripts/getInlineScripts.ts"],"names":[],"mappings":"AAKA,wBAAsB,gBAAgB,sBASrC"}

package/lib/inlineScripts/getInlineScripts.js

@@ -5,6 +5,8 @@ export async function getInlineScripts() {
     if (!inlineScripts) {
         const inlineScriptFiles = await globSourceFiles(import.meta.url, '*.inline');
         inlineScripts = await Promise.all(inlineScriptFiles.map((filename) => fsPromises.readFile(filename, 'utf-8')));
+        // Remove source maps from inline scripts to avoid warnings in the browser.
+        inlineScripts = inlineScripts.map((script) => script.replace('# sourceMappingURL=', ' '));
     }
     return inlineScripts;
 }

package/lib/inlineScripts/getInlineScripts.js.map

@@ -1 +1 @@
-{"version":3,"file":"getInlineScripts.js","sourceRoot":"","sources":["../../src/inlineScripts/getInlineScripts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,UAAU,MAAM,aAAa,CAAC;AAErC,IAAI,aAAmC,CAAC;AAExC,MAAM,CAAC,KAAK,UAAU,gBAAgB;IACpC,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,iBAAiB,GAAG,MAAM,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QAC7E,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACjH,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC","sourcesContent":["import { globSourceFiles } from '@ms-cloudpack/path-utilities';\nimport fsPromises from 'fs/promises';\n\nlet inlineScripts: string[] | undefined;\n\nexport async function getInlineScripts() {\n  if (!inlineScripts) {\n    const inlineScriptFiles = await globSourceFiles(import.meta.url, '*.inline');\n    inlineScripts = await Promise.all(inlineScriptFiles.map((filename) => fsPromises.readFile(filename, 'utf-8')));\n  }\n\n  return inlineScripts;\n}\n"]}
+{"version":3,"file":"getInlineScripts.js","sourceRoot":"","sources":["../../src/inlineScripts/getInlineScripts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,UAAU,MAAM,aAAa,CAAC;AAErC,IAAI,aAAmC,CAAC;AAExC,MAAM,CAAC,KAAK,UAAU,gBAAgB;IACpC,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,iBAAiB,GAAG,MAAM,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QAC7E,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;QAC/G,2EAA2E;QAC3E,aAAa,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC,CAAC;IAC5F,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC","sourcesContent":["import { globSourceFiles } from '@ms-cloudpack/path-utilities';\nimport fsPromises from 'fs/promises';\n\nlet inlineScripts: string[] | undefined;\n\nexport async function getInlineScripts() {\n  if (!inlineScripts) {\n    const inlineScriptFiles = await globSourceFiles(import.meta.url, '*.inline');\n    inlineScripts = await Promise.all(inlineScriptFiles.map((filename) => fsPromises.readFile(filename, 'utf-8')));\n    // Remove source maps from inline scripts to avoid warnings in the browser.\n    inlineScripts = inlineScripts.map((script) => script.replace('# sourceMappingURL=', ' '));\n  }\n\n  return inlineScripts;\n}\n"]}

package/lib/renderRoute/renderRoute.d.ts

@@ -1,5 +1,9 @@
-import type { CompleteRenderRouteResult } from '../types/RenderRouteResult.js';
+import type { Route } from '@ms-cloudpack/common-types';
 import type { RenderRouteOptions } from '../types/RenderRouteOptions.js';
+import type { CompleteRenderRouteResult } from '../types/RenderRouteResult.js';
+export type RouteInternal = Route & {
+    isDefaultFallback?: boolean;
+};
 /**
  * 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.

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

@@ -1 +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"}
+{"version":3,"file":"renderRoute.d.ts","sourceRoot":"","sources":["../../src/renderRoute/renderRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AAMxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,KAAK,EAAE,yBAAyB,EAAqB,MAAM,+BAA+B,CAAC;AAMlG,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG;IAAE,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAEpE;;;GAGG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAoDjG"}

package/lib/renderRoute/renderRoute.js

@@ -1,19 +1,26 @@
+import fsPromises from 'fs/promises';
+import { JSDOM } from 'jsdom';
 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';
+import { makeUrl } from '@ms-cloudpack/path-string-parsing';
 /**
  * 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;
+    const { route, session, req } = options;
+    // Get the request path and extension (the URL.pathname conversion gets rid of any query or hash)
+    const requestPath = makeUrl(req.url, options.baseUrl).pathname;
+    const requestExt = path.extname(requestPath);
+    // Determine whether HTML is (probably) an acceptable response type (can be refined later if needed).
+    // In theory we should be able to use req.accepts() but not all requests set the accept header.
+    const isHtmlAcceptable = (!requestExt || requestExt.startsWith('.htm')) && !req.xhr && isHtmlType(req.headers.accept || '*/*');
     // 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 renderScriptPath = route.renderScript && path.resolve(session.appPath, route.renderScript);
+    if (renderScriptPath) {
         const scriptExt = path.extname(renderScriptPath).toLowerCase();
         if (scriptExt === '.html' || scriptExt === '.htm') {
             rawResult = await readStaticHtml(renderScriptPath);
@@ -30,15 +37,36 @@ export async function renderRoute(options) {
         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) {
+    // If it's HTML and a success statusCode, inject the import map and appropriate scripts.
+    if (result.statusCode === 200 && isHtmlType(result.contentType)) {
+        // First verify that we're not accidentally returning HTML if a different file type is requested.
+        // This could happen for overly broad route matches such as '*', or if no routes are configured.
+        if (!isHtmlAcceptable) {
+            const renderer = route.renderScript ? `renderScript "${renderScriptPath}"` : 'the default renderer';
+            const content = route.isDefaultFallback
+                ? // no routes configured
+                    `Cloudpack's default route can only return HTML, but this appears to be a non-HTML request. ` +
+                        `Please add a route under devServer.routes in the cloudpack config.`
+                : // route with or without custom renderer
+                    `Route "${route.match}" with ${renderer} returned HTML, but this appears to be a non-HTML request. ` +
+                        `This is likely a misconfiguration of devServer.routes in the cloudpack config.`;
+            return { statusCode: 500, contentType: 'text/plain', content };
+        }
+        // Inject the import map and scripts.
         injectScripts(options, result);
     }
     return result;
 }
+function isHtmlType(acceptOrContentType) {
+    // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Accept
+    // https://developer.mozilla.org/en-US/docs/Web/HTTP/Content_negotiation/List_of_default_Accept_values
+    // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Type
+    // https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types
+    return acceptOrContentType
+        .split(',')
+        .map((s) => s.split(';')[0].trim())
+        .some((mime) => mime === '*/*' || /xml|x?html/i.test(mime) || /^(text|application)\/\*$/.test(mime));
+}
 /**
  * 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.
@@ -97,7 +125,7 @@ function injectScripts(options, result) {
     const { route, overlayScript, entryScript, inlineScripts, importMap } = options;
     let jsdom;
     try {
-        jsdom = new JSDOM(result.content);
+        jsdom = new JSDOM(result.content, { contentType: result.contentType });
     }
     catch (e) {
         // Trying to write a test for the above, it seemed very permissive, but catch just in case

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 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"]}
+{"version":3,"file":"renderRoute.js","sourceRoot":"","sources":["../../src/renderRoute/renderRoute.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Route } from '@ms-cloudpack/common-types';\nimport fsPromises from 'fs/promises';\nimport { JSDOM } from 'jsdom';\nimport path from 'path';\nimport { pathToFileURL } from 'url';\nimport type { RenderRouteFunction } from '../types/RenderRouteFunction.js';\nimport type { RenderRouteOptions } from '../types/RenderRouteOptions.js';\nimport type { CompleteRenderRouteResult, RenderRouteResult } from '../types/RenderRouteResult.js';\nimport type { RenderRouteScript } from '../types/RenderRouteScript.js';\nimport { getDefaultHtmlResponse } from './getDefaultHtmlResponse.js';\nimport { getHtmlErrorResponse } from './getHtmlErrorResponse.js';\nimport { makeUrl } from '@ms-cloudpack/path-string-parsing';\n\nexport type RouteInternal = Route & { isDefaultFallback?: boolean };\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, req } = options;\n\n  // Get the request path and extension (the URL.pathname conversion gets rid of any query or hash)\n  const requestPath = makeUrl(req.url, options.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  const isHtmlAcceptable =\n    (!requestExt || requestExt.startsWith('.htm')) && !req.xhr && isHtmlType(req.headers.accept || '*/*');\n\n  // Get an initial result from either the render script or default handler.\n  let rawResult: RenderRouteResult;\n  const renderScriptPath = route.renderScript && path.resolve(session.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  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 a success statusCode, inject the import map and appropriate scripts.\n  if (result.statusCode === 200 && isHtmlType(result.contentType)) {\n    // First verify that we're not accidentally returning HTML if a different file type is requested.\n    // This could happen for overly broad route matches such as '*', or if no routes are configured.\n    if (!isHtmlAcceptable) {\n      const renderer = route.renderScript ? `renderScript \"${renderScriptPath}\"` : 'the default renderer';\n      const content = (route as RouteInternal).isDefaultFallback\n        ? // no routes configured\n          `Cloudpack's default route can only return HTML, but this appears to be a non-HTML request. ` +\n          `Please add a route under devServer.routes in the cloudpack config.`\n        : // route with or without custom renderer\n          `Route \"${route.match}\" with ${renderer} returned HTML, but this appears to be a non-HTML request. ` +\n          `This is likely a misconfiguration of devServer.routes in the cloudpack config.`;\n      return { statusCode: 500, contentType: 'text/plain', content };\n    }\n\n    // Inject the import map and scripts.\n    injectScripts(options, result);\n  }\n\n  return result;\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: 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, { 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    // 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/setHeaders.d.ts

@@ -1,13 +1,10 @@
 import type { Response } from '@ms-cloudpack/create-express-app';
-import type { ApiServer, Session } from '@ms-cloudpack/api-server';
-import type { BundleServer } from '@ms-cloudpack/bundle-server';
+import type { Session } from '@ms-cloudpack/api-server';
 /**
  * Set the Cloudpack headers and cookies in the response.
  */
 export declare function setHeaders(params: {
     res: Response;
-    session: Session;
-    apiServer: ApiServer;
-    bundleServer: BundleServer;
+    session: Pick<Session, 'id' | 'sequence' | 'projectName' | 'sessionVersion' | 'urls'>;
 }): void;
 //# sourceMappingURL=setHeaders.d.ts.map

package/lib/setHeaders.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setHeaders.d.ts","sourceRoot":"","sources":["../src/setHeaders.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGhE;;GAEG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE;IACjC,GAAG,EAAE,QAAQ,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,YAAY,CAAC;CAC5B,QAWA"}
+{"version":3,"file":"setHeaders.d.ts","sourceRoot":"","sources":["../src/setHeaders.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAGxD;;GAEG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE;IACjC,GAAG,EAAE,QAAQ,CAAC;IACd,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,GAAG,UAAU,GAAG,aAAa,GAAG,gBAAgB,GAAG,MAAM,CAAC,CAAC;CACvF,QAYA"}

package/lib/setHeaders.js

@@ -3,13 +3,14 @@ import { cookieNames, getCloudpackSessionVersionCookie } from './cookieNames.js'
  * Set the Cloudpack headers and cookies in the response.
  */
 export function setHeaders(params) {
-    const { res, session, apiServer, bundleServer } = params;
+    const { res, session } = params;
+    const { apiServer, bundleServer } = session.urls;
     res.header('Cache-Control', 'no-cache');
     res.header('Access-Control-Allow-Origin', '*');
     res.cookie(cookieNames.sessionId, session.id);
     res.cookie(cookieNames.sessionSequence, session.sequence);
     res.cookie(getCloudpackSessionVersionCookie(session.projectName), session.sessionVersion);
-    res.cookie(cookieNames.apiUrl, apiServer.url);
-    res.cookie(cookieNames.bundleServerUrl, bundleServer.url);
+    res.cookie(cookieNames.apiUrl, apiServer);
+    res.cookie(cookieNames.bundleServerUrl, bundleServer);
 }
 //# sourceMappingURL=setHeaders.js.map

package/lib/setHeaders.js.map

@@ -1 +1 @@
-{"version":3,"file":"setHeaders.js","sourceRoot":"","sources":["../src/setHeaders.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,gCAAgC,EAAE,MAAM,kBAAkB,CAAC;AAEjF;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,MAK1B;IACC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;IAEzD,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;IACxC,GAAG,CAAC,MAAM,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;IAE/C,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IAC9C,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,eAAe,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC1D,GAAG,CAAC,MAAM,CAAC,gCAAgC,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IAC1F,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;IAC9C,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,eAAe,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC;AAC5D,CAAC","sourcesContent":["import type { Response } from '@ms-cloudpack/create-express-app';\nimport type { ApiServer, Session } from '@ms-cloudpack/api-server';\nimport type { BundleServer } from '@ms-cloudpack/bundle-server';\nimport { cookieNames, getCloudpackSessionVersionCookie } from './cookieNames.js';\n\n/**\n * Set the Cloudpack headers and cookies in the response.\n */\nexport function setHeaders(params: {\n  res: Response;\n  session: Session;\n  apiServer: ApiServer;\n  bundleServer: BundleServer;\n}) {\n  const { res, session, apiServer, bundleServer } = params;\n\n  res.header('Cache-Control', 'no-cache');\n  res.header('Access-Control-Allow-Origin', '*');\n\n  res.cookie(cookieNames.sessionId, session.id);\n  res.cookie(cookieNames.sessionSequence, session.sequence);\n  res.cookie(getCloudpackSessionVersionCookie(session.projectName), session.sessionVersion);\n  res.cookie(cookieNames.apiUrl, apiServer.url);\n  res.cookie(cookieNames.bundleServerUrl, bundleServer.url);\n}\n"]}
+{"version":3,"file":"setHeaders.js","sourceRoot":"","sources":["../src/setHeaders.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,gCAAgC,EAAE,MAAM,kBAAkB,CAAC;AAEjF;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,MAG1B;IACC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAChC,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAEjD,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;IACxC,GAAG,CAAC,MAAM,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;IAE/C,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IAC9C,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,eAAe,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC1D,GAAG,CAAC,MAAM,CAAC,gCAAgC,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IAC1F,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC1C,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;AACxD,CAAC","sourcesContent":["import type { Response } from '@ms-cloudpack/create-express-app';\nimport type { Session } from '@ms-cloudpack/api-server';\nimport { cookieNames, getCloudpackSessionVersionCookie } from './cookieNames.js';\n\n/**\n * Set the Cloudpack headers and cookies in the response.\n */\nexport function setHeaders(params: {\n  res: Response;\n  session: Pick<Session, 'id' | 'sequence' | 'projectName' | 'sessionVersion' | 'urls'>;\n}) {\n  const { res, session } = params;\n  const { apiServer, bundleServer } = session.urls;\n\n  res.header('Cache-Control', 'no-cache');\n  res.header('Access-Control-Allow-Origin', '*');\n\n  res.cookie(cookieNames.sessionId, session.id);\n  res.cookie(cookieNames.sessionSequence, session.sequence);\n  res.cookie(getCloudpackSessionVersionCookie(session.projectName), session.sessionVersion);\n  res.cookie(cookieNames.apiUrl, apiServer);\n  res.cookie(cookieNames.bundleServerUrl, bundleServer);\n}\n"]}

package/lib/startAppServer.d.ts

@@ -1,11 +1,8 @@
 /// <reference types="node" resolution-mode="require"/>
-import type { BundleServer } from '@ms-cloudpack/bundle-server';
-import type { CloudpackConfig, PackageDefinitionsCache, PackageJson } from '@ms-cloudpack/common-types';
-import { type TaskReporter } from '@ms-cloudpack/task-reporter';
-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';
+import type { PartialContext } from '@ms-cloudpack/api-server';
+import type { PackageJson } from '@ms-cloudpack/common-types';
 import type { Server } from 'http';
+import { type CreateRoutesContext } from './createRoutes.js';
 import type { AppServer } from './types/AppServer.js';
 /**
  * The app server hosts the appropriate routes for the web app, primarily returning html content
@@ -15,17 +12,9 @@ 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(params: {
-    session: Session;
+export declare function startAppServer(options: {
     definition: PackageJson;
-    bundleServer: BundleServer;
-    apiServer: ApiServer;
-    config: CloudpackConfig;
-    packages: PackageDefinitionsCache;
-    packageImportPaths: PackageImportPaths;
-    reporter: TaskReporter;
-    packageHashes: PackageHashes;
     middlewareMode?: boolean;
     server?: Server;
-}): Promise<AppServer>;
+}, context: PartialContext<'reporter', 'config' | 'projectName'> & CreateRoutesContext): Promise<AppServer>;
 //# sourceMappingURL=startAppServer.d.ts.map

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,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"}
+{"version":3,"file":"startAppServer.d.ts","sourceRoot":"","sources":["../src/startAppServer.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAG9D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,EAAgB,KAAK,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAE3E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEtD;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE;IACP,UAAU,EAAE,WAAW,CAAC;IACxB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,EACD,OAAO,EAAE,cAAc,CAAC,UAAU,EAAE,QAAQ,GAAG,aAAa,CAAC,GAAG,mBAAmB,GAClF,OAAO,CAAC,SAAS,CAAC,CAkCpB"}

package/lib/startAppServer.js

@@ -1,7 +1,7 @@
 import { createExpressApp } from '@ms-cloudpack/create-express-app';
+import { cyan } from '@ms-cloudpack/task-reporter';
 import { createRoutes } from './createRoutes.js';
 import { handleErrorPortUnavailable } from './handleErrorPortUnavailable.js';
-import { cyan } from '@ms-cloudpack/task-reporter';
 /**
  * The app server hosts the appropriate routes for the web app, primarily returning html content
  * which loads resources from the bundle server.
@@ -10,12 +10,14 @@ 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(params) {
-    const { session, definition, config, reporter, middlewareMode, server } = params;
+export async function startAppServer(options, context) {
+    const { definition, middlewareMode, server } = options;
+    const { session, reporter } = context;
+    const { config } = session;
     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];
+    const requireSpecifiedPort = devServer.port !== undefined;
+    const ports = devServer.port ?? [5000, 5001, 5002, 5003];
     const task = reporter.addTask(`Starting app server for "${definition.name}"`);
     try {
         const { app, close, port, url } = await createExpressApp({
@@ -27,7 +29,7 @@ export async function startAppServer(params) {
             middlewareMode,
             server,
         });
-        createRoutes({ ...params, app, url });
+        createRoutes({ ...options, app, url }, context);
         task.complete({ message: `Available @ ${cyan(url)}`, forceShow: true });
         return { app, close, port, url };
     }

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,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"]}
+{"version":3,"file":"startAppServer.js","sourceRoot":"","sources":["../src/startAppServer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAEnD,OAAO,EAAE,YAAY,EAA4B,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAG7E;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,OAIC,EACD,OAAmF;IAEnF,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACvD,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACtC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,MAAM,CAAC;IAElC,mEAAmE;IACnE,MAAM,oBAAoB,GAAG,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC;IAC1D,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAEzD,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,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;QAEhD,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 type { PartialContext } from '@ms-cloudpack/api-server';\nimport type { PackageJson } from '@ms-cloudpack/common-types';\nimport { createExpressApp } from '@ms-cloudpack/create-express-app';\nimport { cyan } from '@ms-cloudpack/task-reporter';\nimport type { Server } from 'http';\nimport { createRoutes, type CreateRoutesContext } from './createRoutes.js';\nimport { handleErrorPortUnavailable } from './handleErrorPortUnavailable.js';\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  options: {\n    definition: PackageJson;\n    middlewareMode?: boolean;\n    server?: Server;\n  },\n  context: PartialContext<'reporter', 'config' | 'projectName'> & CreateRoutesContext,\n): Promise<AppServer> {\n  const { definition, middlewareMode, server } = options;\n  const { session, reporter } = context;\n  const { config } = session;\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({ ...options, app, url }, context);\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/RenderRouteResult.d.ts

@@ -2,8 +2,11 @@
  * The complete expected result of the `renderScript` custom server render function.
  */
 export interface CompleteRenderRouteResult {
+    /** Response body */
     content: string;
+    /** Standard HTTP status code - https://developer.mozilla.org/en-US/docs/Web/HTTP/Status */
     statusCode: number;
+    /** MIME type for the response - https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types */
     contentType: string;
 }
 /**

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

@@ -1 +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"}
+{"version":3,"file":"RenderRouteResult.d.ts","sourceRoot":"","sources":["../../src/types/RenderRouteResult.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC,oBAAoB;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,2FAA2F;IAC3F,UAAU,EAAE,MAAM,CAAC;IACnB,4HAA4H;IAC5H,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.map

@@ -1 +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"]}
+{"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  /** Response body */\n  content: string;\n  /** Standard HTTP status code - https://developer.mozilla.org/en-US/docs/Web/HTTP/Status */\n  statusCode: number;\n  /** MIME type for the response - https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types */\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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/app-server",
-  "version": "0.4.4",
+  "version": "0.6.0",
   "description": "An implementation of the App server for Cloudpack.",
   "license": "MIT",
   "type": "module",
@@ -14,15 +14,13 @@
     }
   },
   "dependencies": {
-    "@ms-cloudpack/api-server": "^0.41.0",
-    "@ms-cloudpack/bundle-server": "^0.2.61",
-    "@ms-cloudpack/common-types": "^0.4.0",
-    "@ms-cloudpack/create-express-app": "^1.6.8",
-    "@ms-cloudpack/import-map": "^0.3.2",
-    "@ms-cloudpack/overlay": "^0.16.110",
-    "@ms-cloudpack/package-hashes": "^0.5.12",
-    "@ms-cloudpack/path-string-parsing": "^1.2.1",
-    "@ms-cloudpack/path-utilities": "^2.7.5",
+    "@ms-cloudpack/api-server": "^0.42.1",
+    "@ms-cloudpack/common-types": "^0.5.0",
+    "@ms-cloudpack/create-express-app": "^1.6.10",
+    "@ms-cloudpack/import-map": "^0.4.0",
+    "@ms-cloudpack/overlay": "^0.16.112",
+    "@ms-cloudpack/path-string-parsing": "^1.2.2",
+    "@ms-cloudpack/path-utilities": "^2.7.7",
     "@ms-cloudpack/task-reporter": "^0.14.0",
     "jsdom": "^22.0.0"
   },