@ms-cloudpack/cli 0.23.14 → 0.24.0

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

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

package/lib/commands/start/startAppServer.js

@@ -1,155 +0,0 @@
-import path from 'path';
-import { slash } from '@ms-cloudpack/path-string-parsing';
-import { createImportMap, PackageDefinitions } from '@ms-cloudpack/package-utilities';
-import { createExpressApp, parseHttpsConfig } from '@ms-cloudpack/create-express-app';
-import { inlineScripts } from './inlineScripts.js';
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const log = (...messages) => {
-    // console.log(`AppServer:`, ...messages);
-};
-const error = (...messages) => {
-    console.error(`AppServer:`, ...messages);
-};
-/**
- * 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, options, }) {
-    const definition = await PackageDefinitions.getInstance().get(session.appPath);
-    const { devServer = {} } = options || {};
-    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.publicDir ?? 'public');
-    try {
-        const { server, protocol, domain, port } = await createExpressApp({
-            portRange: ports,
-            requireSpecifiedPort,
-            hostname: devServer?.domain,
-            sslOptions: parseHttpsConfig(https),
-            publicDir,
-            setupCallback: (app) => {
-                // Set up the express app routes.
-                app
-                    .get('/__/dashboard', (req, res) => {
-                    (async () => {
-                        const sessionVersion = handleSessionVersion(session, req);
-                        const importMap = session.getImportMap() ||
-                            session.setImportMap(await createImportMap(session.resolveMap, bundleServer.url, {
-                                sessionVersion,
-                                targetVersions: session.targetVersions,
-                            }));
-                        const overlayScript = importMap.imports['@ms-cloudpack/overlay'];
-                        const dashboardScript = importMap.imports['@ms-cloudpack/overlay'];
-                        sendHtmlResponse({
-                            session,
-                            title: 'Cloudpack dashboard',
-                            importMap,
-                            apiServer,
-                            bodyScripts: [overlayScript, dashboardScript],
-                            res,
-                        });
-                    })().catch((err) => {
-                        error(err?.stack || err);
-                        res.status(500).send(`Error loading overlay: ${err}`);
-                    });
-                })
-                    .get('*', (req, res) => {
-                    if (!definition) {
-                        res.status(500).send(`There was no package.json located at "${session.appPath}".`);
-                        return;
-                    }
-                    (async () => {
-                        const sessionVersion = handleSessionVersion(session, req);
-                        const importMap = session.getImportMap() ||
-                            session.setImportMap(await createImportMap(session.resolveMap, bundleServer.url, {
-                                sessionVersion,
-                                targetVersions: session.targetVersions,
-                            }));
-                        const requestPath = slash(req.path.substring(1));
-                        const requestExt = path.extname(requestPath);
-                        const overlayScript = importMap.imports['@ms-cloudpack/overlay'];
-                        const entryScript = importMap.imports[definition.name || ''];
-                        log(`App server: Request: ${requestPath}, ext: ${requestExt}, ${port}`);
-                        sendHtmlResponse({
-                            session,
-                            title: definition.name || '',
-                            importMap,
-                            apiServer,
-                            headScripts: [overlayScript, entryScript],
-                            res,
-                        });
-                    })().catch((err) => {
-                        error(err?.stack || err);
-                        res.status(500).send(`Error loading app: ${err}`);
-                    });
-                });
-            },
-        });
-        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;
-    }
-}
-/**
- * Get the latest refresh version either from the cookie in request or from the session.
- * Update the session with the latest refresh version.
- */
-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();
-}
-function sendHtmlResponse({ session, title, importMap, apiServer, headScripts, bodyScripts, res, }) {
-    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);
-    res.send([
-        `<!DOCTYPE html>`,
-        `<html lang="en">`,
-        `<head>`,
-        `<title>${title}</title>`,
-        inlineScripts?.map((script) => `<script>${script}</script>`).join('\n') || '',
-        `<script type="importmap">${JSON.stringify(importMap, null, 2)}</script>`,
-        headScripts?.map((scriptUrl) => `<script type="module" src="${scriptUrl}"></script>`).join('\n') || '',
-        `</head>`,
-        `<body>`,
-        `<div id="root"></div>`,
-        bodyScripts?.map((scriptUrl) => `<script type="module" src="${scriptUrl}" async></script>`).join('\n') || '',
-        `</body>`,
-        `</html>`,
-    ].join('\n'));
-}
-/**
- * Report the error and exit if the port is already in use.
- */
-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=startAppServer.js.map

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

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