@ms-cloudpack/cli 0.23.14 → 0.23.15

package/lib/commands/start/appServer/createRoutes.d.ts

@@ -0,0 +1,14 @@
+import type { PackageJson } from '@ms-cloudpack/bundler-types';
+import type { Express } from '@ms-cloudpack/create-express-app';
+import type { ApiServer, BundleServer, CloudpackConfig, Session } from '../../../types.js';
+/**
+ * Creates the routes for the express app, considering how the config is defined.
+ */
+export declare function createRoutes({ app, session, definition, bundleServer, apiServer, config, }: {
+    app: Express;
+    session: Session;
+    definition: PackageJson;
+    bundleServer: BundleServer;
+    apiServer: ApiServer;
+    config: CloudpackConfig;
+}): void;

package/lib/commands/start/appServer/createRoutes.js

@@ -0,0 +1,69 @@
+import { express } from '@ms-cloudpack/create-express-app';
+import { createImportMap } from '@ms-cloudpack/package-utilities';
+import { slash } from '@ms-cloudpack/path-string-parsing';
+import path from 'path';
+import { error } from './error.js';
+import { getHtmlResponse } from './getHtmlResponse.js';
+import { handleSessionVersion } from './handleSessionVersion.js';
+import { inlineScripts } from './inlineScripts.js';
+import { log } from './log.js';
+import { setHeaders } from './setHeaders.js';
+/**
+ * Creates the routes for the express app, considering how the config is defined.
+ */
+export function createRoutes({ app, session, definition, bundleServer, apiServer, config, }) {
+    const routes = [...(config.devServer?.routes || [])];
+    const hasDefaultRoute = routes.some((route) => route.match === '*' || route.match === '/');
+    if (!hasDefaultRoute) {
+        routes.push({
+            match: '*',
+            exportEntry: '.',
+        });
+    }
+    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) => {
+                (async () => {
+                    // Build the import map if it hasn't been built yet for this session version.
+                    const sessionVersion = handleSessionVersion(session, req);
+                    const importMap = session.getImportMap() ||
+                        session.setImportMap(await createImportMap(session.resolveMap, bundleServer.url, {
+                            sessionVersion,
+                            targetVersions: session.targetVersions,
+                        }));
+                    // 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 apppropriate 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 });
+                    const { html, statusCode } = await getHtmlResponse({
+                        route,
+                        importMap,
+                        overlayScript,
+                        entryScript,
+                        session,
+                        definition,
+                        inlineScripts,
+                    });
+                    // Send the result.
+                    res.status(statusCode).send(html).end();
+                    log(`App server: Request: ${requestPath}, ext: ${requestExt}`);
+                })().catch((err) => {
+                    error(err?.stack || err);
+                    res.status(500).send(`Error loading app: ${err}`);
+                });
+            });
+        }
+    }
+}
+//# sourceMappingURL=createRoutes.js.map

package/lib/commands/start/appServer/createRoutes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createRoutes.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/createRoutes.ts"],"names":[],"mappings":"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"}

package/lib/commands/start/appServer/error.d.ts

@@ -0,0 +1 @@
+export declare function error(...messages: unknown[]): void;

package/lib/commands/start/appServer/error.js

@@ -0,0 +1,4 @@
+export function error(...messages) {
+    console.error(`AppServer:`, ...messages);
+}
+//# sourceMappingURL=error.js.map

package/lib/commands/start/appServer/error.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/error.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,KAAK,CAAC,GAAG,QAAmB;IAC1C,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,GAAG,QAAQ,CAAC,CAAC;AAC3C,CAAC"}

package/lib/commands/start/appServer/exitIfPortUnavailable.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Report the error and exit if the port is already in use.
+ */
+export declare function exitIfPortUnavailable(err: unknown, projectName: string, ports: number | number[]): void;

package/lib/commands/start/appServer/exitIfPortUnavailable.js

@@ -0,0 +1,15 @@
+import { error } from './error.js';
+/**
+ * Report the error and exit if the port is already in use.
+ */
+export function exitIfPortUnavailable(err, projectName, ports) {
+    const portRange = typeof ports === 'number' ? [ports] : ports;
+    if (err instanceof Error && err.message === 'Specified port not available') {
+        const portNeedsPrivileges = portRange.some((port) => port < 1024)
+            ? '\nNote: for Mac/Linux/WSL users, you may need to run Cloudpack with elevated privileges to use port numbers less than 1024. Try running `sudo cloudpack start`.'
+            : '';
+        error(`Cloudpack could not start "${projectName}" because no port from the allowed list was available: ${portRange.join(', ')}. Close other programs and try again.`, portNeedsPrivileges);
+        process.exit(1);
+    }
+}
+//# sourceMappingURL=exitIfPortUnavailable.js.map

package/lib/commands/start/appServer/exitIfPortUnavailable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"exitIfPortUnavailable.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/exitIfPortUnavailable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC;;GAEG;AACH,MAAM,UAAU,qBAAqB,CAAC,GAAY,EAAE,WAAmB,EAAE,KAAwB;IAC/F,MAAM,SAAS,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAC9D,IAAI,GAAG,YAAY,KAAK,IAAI,GAAG,CAAC,OAAO,KAAK,8BAA8B,EAAE;QAC1E,MAAM,mBAAmB,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,CAAC;YAC/D,CAAC,CAAC,iKAAiK;YACnK,CAAC,CAAC,EAAE,CAAC;QACP,KAAK,CACH,8BAA8B,WAAW,0DAA0D,SAAS,CAAC,IAAI,CAC/G,IAAI,CACL,uCAAuC,EACxC,mBAAmB,CACpB,CAAC;QAEF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC"}

package/lib/commands/start/appServer/getDefaultHtmlResponse.d.ts

@@ -0,0 +1,5 @@
+import type { CreateHtmlOptions, CreateHtmlResult } from '../../../types.js';
+/**
+ * Return the default HTML response.
+ */
+export declare function getDefaultHtmlResponse({ definition }: CreateHtmlOptions): CreateHtmlResult;

package/lib/commands/start/appServer/getDefaultHtmlResponse.js

@@ -0,0 +1,18 @@
+/**
+ * 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/commands/start/appServer/getDefaultHtmlResponse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getDefaultHtmlResponse.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/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"}

package/lib/commands/start/appServer/getHtmlResponse.d.ts

@@ -0,0 +1,5 @@
+import type { CreateHtmlOptions, CreateHtmlResult } from '../../../types.js';
+/**
+ * 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<Exclude<CreateHtmlResult, string>>;

package/lib/commands/start/appServer/getHtmlResponse.js

@@ -0,0 +1,108 @@
+import path from 'path';
+import { pathToFileURL } from 'url';
+import { getDefaultHtmlResponse } from './getDefaultHtmlResponse.js';
+import { JSDOM } from 'jsdom';
+import { inlineScripts } from './inlineScripts.js';
+import fs from 'fs';
+import { error } from './error.js';
+const { stat, readFile } = 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 } = options;
+    let createHtml = getDefaultHtmlResponse;
+    if (route.renderScript) {
+        const renderScriptPath = path.resolve(session.appPath, route.renderScript);
+        let cacheBreakerQueryParam = `?t=${Date.now()}`;
+        try {
+            const { mtime } = await 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) {
+                error(`Error importing render script at "${renderScriptUrl}":`, e);
+            }
+        }
+        if (!createHtml) {
+            error(`The render script at "${renderScriptPath}" does not export a default function.`);
+        }
+    }
+    const htmlResult = await createHtml(options);
+    let html = typeof htmlResult === 'string' ? htmlResult : htmlResult.html;
+    const statusCode = typeof htmlResult === 'string' ? 200 : htmlResult.statusCode || 200;
+    try {
+        const htmlDocument = new JSDOM(html);
+        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);
+        }
+        // inject inline scripts.
+        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);
+        html = htmlDocument.serialize();
+    }
+    catch (e) {
+        error(`Error parsing html response for rendering route "${route.match}"`, e);
+    }
+    return {
+        html,
+        statusCode,
+    };
+}
+/**
+ * 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(path) {
+    // path has an .htm or .html extension; case insensitive.
+    return path.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 readFile(htmlPath, 'utf8')) || '';
+        }
+        catch (e) {
+            error(`Error reading HTML file at "${htmlPath}".`, e);
+        }
+    }
+    return html;
+}
+//# sourceMappingURL=getHtmlResponse.js.map

package/lib/commands/start/appServer/getHtmlResponse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getHtmlResponse.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/getHtmlResponse.ts"],"names":[],"mappings":"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"}

package/lib/commands/start/appServer/handleSessionVersion.d.ts

@@ -0,0 +1,7 @@
+import type { Request } from '@ms-cloudpack/create-express-app';
+import type { Session } from '../../../types.js';
+/**
+ * Get the latest refresh version either from the cookie in request or from the session.
+ * Update the session with the latest refresh version.
+ */
+export declare function handleSessionVersion(session: Session, req: Request): number;

package/lib/commands/start/appServer/handleSessionVersion.js

@@ -0,0 +1,12 @@
+/**
+ * Get the latest refresh version either from the cookie in request or from the session.
+ * Update the session with the latest refresh version.
+ */
+export function handleSessionVersion(session, req) {
+    const lastSessionVersion = Number(req.headers.cookie
+        ?.match('(^|;)\\s*' + `cloudpack-sessionVersion-${session.projectName}` + '\\s*=\\s*([^;]+)')
+        ?.pop() || '0');
+    session.incrementSessionVersion(lastSessionVersion);
+    return session.getSessionVersion();
+}
+//# sourceMappingURL=handleSessionVersion.js.map

package/lib/commands/start/appServer/handleSessionVersion.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"handleSessionVersion.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/handleSessionVersion.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAC,OAAgB,EAAE,GAAY;IACjE,MAAM,kBAAkB,GAAG,MAAM,CAC/B,GAAG,CAAC,OAAO,CAAC,MAAM;QAChB,EAAE,KAAK,CAAC,WAAW,GAAG,4BAA4B,OAAO,CAAC,WAAW,EAAE,GAAG,kBAAkB,CAAC;QAC7F,EAAE,GAAG,EAAE,IAAI,GAAG,CACjB,CAAC;IACF,OAAO,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,CAAC;IAEpD,OAAO,OAAO,CAAC,iBAAiB,EAAE,CAAC;AACrC,CAAC"}

package/lib/commands/start/appServer/inlineScripts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"inlineScripts.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/inlineScripts.ts"],"names":[],"mappings":"AAAA,kDAAkD;AAClD,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B;;;6FAG2F;IAC3F;;;kHAGgH;CACjH,CAAC"}

package/lib/commands/start/appServer/log.d.ts

@@ -0,0 +1 @@
+export declare const log: (...messages: unknown[]) => void;

package/lib/commands/start/appServer/log.js

@@ -0,0 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export const log = (...messages) => {
+    // console.log(`AppServer:`, ...messages);
+};
+//# sourceMappingURL=log.js.map

package/lib/commands/start/appServer/log.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/log.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,GAAG,QAAmB,EAAE,EAAE;IAC5C,0CAA0C;AAC5C,CAAC,CAAC"}

package/lib/commands/start/appServer/setHeaders.d.ts

@@ -0,0 +1,10 @@
+import type { Response } from '@ms-cloudpack/create-express-app';
+import type { ApiServer, Session } from '../../../types.js';
+/**
+ * Set the Cloudpack headers and cookies in the response.
+ */
+export declare function setHeaders({ res, session, apiServer }: {
+    res: Response;
+    session: Session;
+    apiServer: ApiServer;
+}): void;

package/lib/commands/start/appServer/setHeaders.js

@@ -0,0 +1,13 @@
+/**
+ * Set the Cloudpack headers and cookies in the response.
+ */
+export function setHeaders({ res, session, apiServer }) {
+    res.header('Content-Type', 'text/html');
+    res.header('Cache-Control', 'no-cache');
+    res.header('Access-Control-Allow-Origin', '*');
+    res.cookie('cloudpack-session-id', session.id);
+    res.cookie('cloudpack-session-sequence', session.sequence);
+    res.cookie(`cloudpack-sessionVersion-${session.projectName}`, session.getSessionVersion());
+    res.cookie('cloudpack-api-url', apiServer.url);
+}
+//# sourceMappingURL=setHeaders.js.map

package/lib/commands/start/appServer/setHeaders.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"setHeaders.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/setHeaders.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAA6D;IAC/G,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;IACxC,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,sBAAsB,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IAC/C,GAAG,CAAC,MAAM,CAAC,4BAA4B,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC3D,GAAG,CAAC,MAAM,CAAC,4BAA4B,OAAO,CAAC,WAAW,EAAE,EAAE,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAC3F,GAAG,CAAC,MAAM,CAAC,mBAAmB,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;AACjD,CAAC"}

package/lib/commands/start/{startAppServer.d.ts → appServer/startAppServer.d.ts}

@@ -1,4 +1,5 @@
-import type { ApiServer, BundleServer, DevServer, Session } from '../../types.js';
+import type { ApiServer, BundleServer, CloudpackConfig, Session } from '../../../types.js';
+import type { PackageJson } from '@ms-cloudpack/bundler-types';
 /**
  * The app server hosts the appropriate routes for the web app, primarily returning html content
  * which loads resources from the bundle server.
@@ -7,13 +8,12 @@ import type { ApiServer, BundleServer, DevServer, Session } from '../../types.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, options, }: {
+export declare function startAppServer({ session, bundleServer, apiServer, definition, config, }: {
     session: Session;
+    definition: PackageJson;
     bundleServer: BundleServer;
     apiServer: ApiServer;
-    options?: {
-        devServer?: DevServer;
-    };
+    config: CloudpackConfig;
 }): Promise<{
     close: () => Promise<void>;
     port: number;

package/lib/commands/start/appServer/startAppServer.js

@@ -0,0 +1,48 @@
+import { createExpressApp, parseHttpsConfig } from '@ms-cloudpack/create-express-app';
+import { createRoutes } from './createRoutes.js';
+import { exitIfPortUnavailable } from './exitIfPortUnavailable.js';
+/**
+ * The app server hosts the appropriate routes for the web app, primarily returning html content
+ * which loads resources from the bundle server.
+ *
+ * Separating the app server from the bundle service keeps the routes separate - the app server
+ * 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 = {}, }) {
+    const { devServer = {} } = config || {};
+    const { https = {} } = devServer;
+    // 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');
+    try {
+        const { server, protocol, domain, port } = await createExpressApp({
+            portRange: ports,
+            requireSpecifiedPort,
+            hostname: devServer?.domain,
+            sslOptions: parseHttpsConfig(https),
+            //  publicDir,
+            setupCallback: (app) => createRoutes({
+                app,
+                session,
+                definition,
+                bundleServer,
+                apiServer,
+                config,
+            }),
+        });
+        return {
+            close: () => new Promise((resolve, reject) => server.close((err) => (err ? reject(err) : resolve()))),
+            port,
+            url: `${protocol}://${domain}:${port}`,
+        };
+    }
+    catch (err) {
+        exitIfPortUnavailable(err, session.projectName, ports);
+        throw err;
+    }
+}
+//# sourceMappingURL=startAppServer.js.map

package/lib/commands/start/appServer/startAppServer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"startAppServer.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/startAppServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAGtF,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAEnE;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EACnC,OAAO,EACP,YAAY,EACZ,SAAS,EACT,UAAU,EACV,MAAM,GAAG,EAAqB,GAO/B;IACC,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,MAAM,IAAK,EAAsB,CAAC;IAC7D,MAAM,EAAE,KAAK,GAAG,EAAE,EAAE,GAAG,SAAS,CAAC;IAEjC,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,IAAI;QACF,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,gBAAgB,CAAC;YAChE,SAAS,EAAE,KAAK;YAChB,oBAAoB;YACpB,QAAQ,EAAE,SAAS,EAAE,MAAM;YAC3B,UAAU,EAAE,gBAAgB,CAAC,KAAK,CAAC;YACnC,cAAc;YACd,aAAa,EAAE,CAAC,GAAG,EAAE,EAAE,CACrB,YAAY,CAAC;gBACX,GAAG;gBACH,OAAO;gBACP,UAAU;gBACV,YAAY;gBACZ,SAAS;gBACT,MAAM;aACP,CAAC;SACL,CAAC,CAAC;QAEH,OAAO;YACL,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YAC3G,IAAI;YACJ,GAAG,EAAE,GAAG,QAAQ,MAAM,MAAM,IAAI,IAAI,EAAE;SACvC,CAAC;KACH;IAAC,OAAO,GAAY,EAAE;QACrB,qBAAqB,CAAC,GAAG,EAAE,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QACvD,MAAM,GAAG,CAAC;KACX;AACH,CAAC"}

package/lib/commands/start/createBundleTask.js

@@ -16,7 +16,6 @@ export function createBundleTask(bundleRequest, options) {
         watch: !isExternal,
         async execute() {
             let bundleResult = bundleRequest;
-            log(`Finished ensureDir: "${packageName}@${version}"`);
             // If force is set, dispose the existing result.
             if (force && bundleRequest.result?.dispose) {
                 bundleRequest.result.dispose();

package/lib/commands/start/createBundleTask.js.map

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

package/lib/commands/start/start.js

@@ -3,7 +3,7 @@ import { readJson } from '@ms-cloudpack/json-utilities';
 import path from 'path';
 import { createSession } from './createSession.js';
 import { startBundleServer } from './startBundleServer.js';
-import { startAppServer } from './startAppServer.js';
+import { startAppServer } from './appServer/startAppServer.js';
 import { openBrowser } from './openBrowser.js';
 import { startApiServer } from './startApiServer.js';
 import { createPackageOverrideTransform } from '../../common/createPackageOverrideTransform.js';
@@ -17,6 +17,14 @@ export async function start() {
     const devServer = cloudpackConfig?.devServer || {};
     // Initialize package overrides.
     PackageDefinitions.getInstance().registerTransform(createPackageOverrideTransform(cloudpackConfig));
+    // Make sure the package has a valid definition.
+    const definition = await PackageDefinitions.getInstance().get(appPath);
+    if (!definition) {
+        throw new Error(`There was no package.json located at "${appPath}".`);
+    }
+    if (!definition.name || !definition.version) {
+        throw new Error(`The package.json at "${appPath}" did not have a name and/or version.`);
+    }
     // Initialize session definition.
     const session = await createSession({ appPath });
     // Start api server for tracking status and handling remote requests.
@@ -25,11 +33,11 @@ export async function start() {
     const bundleServer = await startBundleServer({ session, apiServer });
     const appServer = await startAppServer({
         session,
+        definition,
         bundleServer,
         apiServer,
-        options: { devServer },
+        config: { devServer },
     });
-    let sigintCount = 0;
     const cleanup = async () => {
         for (const server of [bundleServer, appServer, apiServer]) {
             console.log(`Closing server: ${server.url}`);
@@ -42,6 +50,7 @@ export async function start() {
         }
     };
     // Setup cleanup and close things on completion.
+    let sigintCount = 0;
     process.on('SIGINT', () => {
         sigintCount++;
         if (sigintCount > 1) {

package/lib/commands/start/start.js.map

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

package/lib/index.d.ts

@@ -3,3 +3,4 @@
  * within the "./commands" folder.
  */
 export declare function start(): Promise<void>;
+export type { ApiServer, BundleRequest, BundleServer, BundleTaskOptions, CloudpackConfig, CreateHtmlFunction, CreateHtmlOptions, CreateHtmlResult, CreateHtmlScript, DevServer, PackageOverride, Route, Session, SessionStats, Task, TaskDescription, TaskEndDescription, TaskError, TaskOptions, TaskStartDescription, Watcher, } from './types.js';

package/lib/types.d.ts

@@ -150,6 +150,28 @@ export interface PackageOverride {
     isInternal?: boolean;
     overrides: PackageJson;
 }
+export interface Route {
+    /**
+     * The url path part to match. Start paths with a leading slash, e.g. `'/my-route'`. You can also
+     * use wildcards (`*`), e.g. `'/my-route/*'` to match all paths starting with `'/my-route'`.
+     */
+    match: string;
+    /**
+     * The path relative to the app root to static assets. If this is provided, renderScript/exportEntry
+     * will be ignored.
+     */
+    staticPath?: string;
+    /**
+     * Path to a .js or .html file used for rendering the route. If a script is provided, it must
+     * export a default function implementing `CreateHtmlFunction` defined in @ms-cloudpack/cli.
+     */
+    renderScript?: string;
+    /**
+     * The key in the exports map which represents the entry point app script for this route.
+     * Default is '.', meaning the main package export key.
+     */
+    exportEntry?: string;
+}
 export interface DevServer {
     /**
      * The domain name of the server.
@@ -171,14 +193,55 @@ export interface DevServer {
     https?: HttpsConfig;
     /**
      * If provided, will override where the publicDir is located, relative to the app package folder.
-     * Defaults to `./public`.
+     * Defaults to `./public`. The same thing can be achieved with `routes`, using route: '*' and
+     * staticPath: './public', so the `publicPath` setting may be removed in the future.
      */
-    publicDir?: string;
+    publicPath?: string;
+    /**
+     * If provided, will register routes with the dev server to host various pages.
+     */
+    routes?: Route[];
 }
 /**
  * Per-application configuration for Cloudpack.
  */
 export interface CloudpackConfig {
+    /**
+     * An array of PackageOverride objects, used to provide overrides for packages without modifying their
+     * definitions directly. This is primarily used for providing exports maps for packages that don't have them.
+     */
     packageOverrides?: PackageOverride[];
+    /**
+     * A set of options for configuring how the dev server works.
+     */
     devServer?: DevServer;
 }
+/**
+ * The input options for a createHtml custom server render function.
+ */
+export type CreateHtmlOptions = {
+    session: Session;
+    route: Route;
+    definition: PackageJson;
+    importMap: ImportMap;
+    overlayScript: string | undefined;
+    entryScript: string | undefined;
+    inlineScripts: string[];
+};
+/**
+ * The expected result of the createHtml custom server render function.
+ */
+export type CreateHtmlResult = string | {
+    html: string;
+    statusCode: number;
+};
+/**
+ * A custom server render function that can be used to override the default HTML response.
+ */
+export type CreateHtmlFunction = (options: CreateHtmlOptions) => Promise<CreateHtmlResult> | CreateHtmlResult;
+/**
+ * The expected shape of the createHtml custom server render function script.
+ */
+export type CreateHtmlScript = {
+    default: CreateHtmlFunction;
+};