@ms-cloudpack/cli 0.2.13 → 0.4.0

package/CHANGELOG.json

@@ -2,7 +2,90 @@
   "name": "@ms-cloudpack/cli",
   "entries": [
     {
-      "date": "Fri, 05 Aug 2022 08:12:06 GMT",
+      "date": "Sat, 13 Aug 2022 08:13:57 GMT",
+      "tag": "@ms-cloudpack/cli_v0.4.0",
+      "version": "0.4.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "dzearing@microsoft.com",
+            "package": "@ms-cloudpack/cli",
+            "commit": "69781360664cac5e13e889efa2dc02bc55a60315",
+            "comment": "Updates to the CLI to host the overlay."
+          },
+          {
+            "author": "beachball",
+            "package": "@ms-cloudpack/cli",
+            "comment": "Bump @ms-cloudpack/bundler to v0.3.2",
+            "commit": "64ce73b69d840630fd4330720cdd5141f664535c"
+          },
+          {
+            "author": "beachball",
+            "package": "@ms-cloudpack/cli",
+            "comment": "Bump @ms-cloudpack/overlay to v0.1.0",
+            "commit": "64ce73b69d840630fd4330720cdd5141f664535c"
+          }
+        ],
+        "patch": [
+          {
+            "author": "email not defined",
+            "package": "@ms-cloudpack/cli",
+            "commit": "de8a826010b5c4db76b73057199dc860e2f59c36",
+            "comment": "Pin devDependencies to 2.1.3"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Fri, 12 Aug 2022 08:12:39 GMT",
+      "tag": "@ms-cloudpack/cli_v0.3.1",
+      "version": "0.3.1",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ms-cloudpack/cli",
+            "comment": "Bump @ms-cloudpack/bundler to v0.3.1",
+            "commit": "06b0e23a9cff634baf090a7310f9af625ca3922e"
+          },
+          {
+            "author": "beachball",
+            "package": "@ms-cloudpack/cli",
+            "comment": "Bump @ms-cloudpack/data-bus to v0.1.0",
+            "commit": "06b0e23a9cff634baf090a7310f9af625ca3922e"
+          },
+          {
+            "author": "beachball",
+            "package": "@ms-cloudpack/cli",
+            "comment": "Bump @ms-cloudpack/package-utilities to v0.6.1",
+            "commit": "06b0e23a9cff634baf090a7310f9af625ca3922e"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Sat, 06 Aug 2022 08:15:40 GMT",
+      "tag": "@ms-cloudpack/cli_v0.3.0",
+      "version": "0.3.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "dzearing@microsoft.com",
+            "package": "@ms-cloudpack/cli",
+            "commit": "70b5e51ee1e2bbb80d6b6fef1dbbf819d3634a0b",
+            "comment": "Adding api server and overlay integration."
+          },
+          {
+            "author": "beachball",
+            "package": "@ms-cloudpack/cli",
+            "comment": "Bump @ms-cloudpack/bundler to v0.3.0",
+            "commit": "b51ce22d9bb8d691916c1d41cf201b76ebd82bfa"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Fri, 05 Aug 2022 08:12:21 GMT",
       "tag": "@ms-cloudpack/cli_v0.2.13",
       "version": "0.2.13",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,45 @@
 # Change Log - @ms-cloudpack/cli
 
-This log was last generated on Fri, 05 Aug 2022 08:12:06 GMT and should not be manually modified.
+This log was last generated on Sat, 13 Aug 2022 08:13:57 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.4.0
+
+Sat, 13 Aug 2022 08:13:57 GMT
+
+### Minor changes
+
+- Updates to the CLI to host the overlay. (dzearing@microsoft.com)
+- Bump @ms-cloudpack/bundler to v0.3.2
+- Bump @ms-cloudpack/overlay to v0.1.0
+
+### Patches
+
+- Pin devDependencies to 2.1.3 (email not defined)
+
+## 0.3.1
+
+Fri, 12 Aug 2022 08:12:39 GMT
+
+### Patches
+
+- Bump @ms-cloudpack/bundler to v0.3.1
+- Bump @ms-cloudpack/data-bus to v0.1.0
+- Bump @ms-cloudpack/package-utilities to v0.6.1
+
+## 0.3.0
+
+Sat, 06 Aug 2022 08:15:40 GMT
+
+### Minor changes
+
+- Adding api server and overlay integration. (dzearing@microsoft.com)
+- Bump @ms-cloudpack/bundler to v0.3.0
+
 ## 0.2.13
 
-Fri, 05 Aug 2022 08:12:06 GMT
+Fri, 05 Aug 2022 08:12:21 GMT
 
 ### Patches
 

package/lib/commands/start/createSession.js

@@ -1,15 +1,19 @@
 import { v4 as uuid } from 'uuid';
-import { createResolveMap } from '@ms-cloudpack/package-utilities';
+import { createResolveMap, resolve } from '@ms-cloudpack/package-utilities';
 import fs from 'fs';
 import path from 'path';
+import { fileURLToPath } from 'url';
+const dashboardPackageName = '@ms-cloudpack/overlay';
+const dashboardPackagePath = (await resolve(dashboardPackageName, path.dirname(fileURLToPath(import.meta.url)))) || '';
 export async function createSession(options) {
     const { appPath } = options;
     const id = uuid();
     // Grab the installed dependency locations.
     console.log(`Resolving dependencies...`);
-    const resolveMap = await createResolveMap({ appPath });
+    const startTime = new Date().getTime();
+    const resolveMap = await createResolveMap({ appPath, additionalPaths: [dashboardPackagePath] });
     fs.writeFileSync(path.join(process.cwd(), 'resolve-map.json'), JSON.stringify(resolveMap, null, 2));
-    console.log(`Resolved dependencies. (${Object.keys(resolveMap).length} total)`);
+    console.log(`Resolved dependencies. (${Object.keys(resolveMap).length} total, ${new Date().getTime() - startTime}ms)`);
     return {
         id,
         appPath,

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

@@ -1 +1 @@
-{"version":3,"file":"createSession.js","sourceRoot":"","sources":["../../../src/commands/start/createSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,IAAI,IAAI,EAAE,MAAM,MAAM,CAAC;AAElC,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAMxB,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,OAAuB;IACzD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,EAAE,GAAG,IAAI,EAAE,CAAC;IAElB,2CAA2C;IAC3C,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;IAEzC,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAEvD,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,kBAAkB,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAEpG,OAAO,CAAC,GAAG,CAAC,2BAA2B,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,SAAS,CAAC,CAAC;IAEhF,OAAO;QACL,EAAE;QACF,OAAO;QACP,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,SAAS;QACf,UAAU;KACX,CAAC;AACJ,CAAC"}
+{"version":3,"file":"createSession.js","sourceRoot":"","sources":["../../../src/commands/start/createSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,IAAI,IAAI,EAAE,MAAM,MAAM,CAAC;AAElC,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAC5E,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,MAAM,oBAAoB,GAAG,uBAAuB,CAAC;AACrD,MAAM,oBAAoB,GAAG,CAAC,MAAM,OAAO,CAAC,oBAAoB,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AAMvH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,OAAuB;IACzD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,EAAE,GAAG,IAAI,EAAE,CAAC;IAElB,2CAA2C;IAC3C,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;IAEzC,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;IACvC,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC;IAEhG,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,kBAAkB,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAEpG,OAAO,CAAC,GAAG,CACT,2BAA2B,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,WAAW,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,SAAS,KAAK,CAC1G,CAAC;IAEF,OAAO;QACL,EAAE;QACF,OAAO;QACP,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,SAAS;QACf,UAAU;KACX,CAAC;AACJ,CAAC"}

package/lib/commands/start/start.js

@@ -2,6 +2,7 @@ import { createSession } from './createSession.js';
 import { startBundleServer } from './startBundleServer.js';
 import { startAppServer } from './startAppServer.js';
 import { openBrowser } from './openBrowser.js';
+import { startApiServer } from './startApiServer.js';
 /**
  * Defines the "start" verb entry point.
  */
@@ -9,12 +10,20 @@ export async function start() {
     const appPath = process.cwd();
     // Initialize session definition.
     const session = await createSession({ appPath });
-    const bundleServer = await startBundleServer(session);
-    const appServer = await startAppServer(session, `http://localhost:${bundleServer.port}`);
-    // Close things on completion.
+    // Start api server for tracking status and handling remote requests.
+    const apiServer = await startApiServer({ session });
+    // Then start bundle and app servers for hosting the app.
+    const bundleServer = await startBundleServer({ session, apiServer });
+    const appServer = await startAppServer({
+        session,
+        bundleServer,
+        apiServer,
+    });
+    // Setup cleanup and close things on completion.
     process.on('SIGINT', async function () {
-        bundleServer.close();
-        appServer.close();
+        await bundleServer.close();
+        await appServer.close();
+        await apiServer.close();
         process.exit(0);
     });
     // Open the browser.

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

@@ -1 +1 @@
-{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/commands/start/start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK;IACzB,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAE9B,iCAAiC;IACjC,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IACjD,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE,oBAAoB,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;IAEzF,8BAA8B;IAC9B,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK;QACxB,YAAY,CAAC,KAAK,EAAE,CAAC;QACrB,SAAS,CAAC,KAAK,EAAE,CAAC;QAClB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,oBAAoB;IACpB,WAAW,CAAC,oBAAoB,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;AACpD,CAAC"}
+{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/commands/start/start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK;IACzB,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAE9B,iCAAiC;IACjC,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAEjD,qEAAqE;IACrE,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAEpD,yDAAyD;IACzD,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC;IACrE,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC;QACrC,OAAO;QACP,YAAY;QACZ,SAAS;KACV,CAAC,CAAC;IAEH,gDAAgD;IAChD,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK;QACxB,MAAM,YAAY,CAAC,KAAK,EAAE,CAAC;QAC3B,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;QACxB,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;QACxB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,oBAAoB;IACpB,WAAW,CAAC,oBAAoB,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;AACpD,CAAC"}

package/lib/commands/start/startApiServer.d.ts

@@ -0,0 +1,53 @@
+import type { Session } from './types.js';
+export interface SessionStats {
+    status: 'idle' | 'pending';
+    remainingTasks: number;
+    totalTasks: number;
+    totalErrors: number;
+    totalWarnings: number;
+}
+export interface ApiServer {
+    url: string;
+    port: number;
+    notifyReload: () => void;
+    reportStart: (options: TaskStartDescription) => void;
+    reportEnd: (options: TaskEndDescription) => void;
+    close: () => void;
+}
+interface TaskError {
+    message: string;
+    pluginName: string;
+    stack: string;
+    fileLocation: string;
+    lineNumber: number;
+    columnNumber: number;
+}
+interface TaskStartDescription {
+    id: string;
+    name: string;
+    inputPath: string;
+    outputPath: string;
+}
+interface TaskEndDescription {
+    id: string;
+    errors?: TaskError[];
+    warnings?: TaskError[];
+}
+/**
+ * The api server handles the data pub/sub (for things like reporting build status)
+ * and hosting the dashboard verb backend (for executing actions like loading vscode,
+ * changing dependencies, connecting new projects to the running session, etc.)
+ *
+ * Each time `cloudpack start` is run, an api server will start up for that session. The
+ * hosted web page will have a "cloudpack-api-server" header which points
+ * to the websocket server.
+ *
+ * The bundle server will call the api server to publish build status updates.
+ *
+ * The app server will burn the api server url on the host html, so that client-side
+ * javascript can connect and subscribe to page changes.
+ */
+export declare function startApiServer({ session }: {
+    session: Session;
+}): Promise<ApiServer>;
+export {};

package/lib/commands/start/startApiServer.js

@@ -0,0 +1,147 @@
+import os from 'os';
+import getPort from 'get-port';
+import path from 'path';
+import WebSocket, { WebSocketServer } from 'ws';
+import { createDataBus } from '@ms-cloudpack/data-bus';
+import { execSync } from 'child_process';
+/**
+ * The api server handles the data pub/sub (for things like reporting build status)
+ * and hosting the dashboard verb backend (for executing actions like loading vscode,
+ * changing dependencies, connecting new projects to the running session, etc.)
+ *
+ * Each time `cloudpack start` is run, an api server will start up for that session. The
+ * hosted web page will have a "cloudpack-api-server" header which points
+ * to the websocket server.
+ *
+ * The bundle server will call the api server to publish build status updates.
+ *
+ * The app server will burn the api server url on the host html, so that client-side
+ * javascript can connect and subscribe to page changes.
+ */
+export async function startApiServer({ session }) {
+    const port = await getPort({ port: [9890, 9891, 9892, 9893] });
+    const bus = createDataBus();
+    const sessionStats = {
+        status: 'idle',
+        remainingTasks: 0,
+        totalTasks: 0,
+        totalErrors: 0,
+        totalWarnings: 0,
+    };
+    const allTasks = new Map();
+    bus.publish([session.id, 'status'], sessionStats);
+    // Create a websocket server which listens for subscriptions and verb requests,
+    // and broadcasts the data to all connected clients.
+    const server = new WebSocketServer({ port }, () => {
+        // console.log(`ApiServer: Started on port ${port}`);
+    }).on('connection', (socket) => {
+        const disposables = new Map();
+        // console.log('ApiServer: Client connected');
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        function sendMessage(message) {
+            socket.send(JSON.stringify(message, null, 2));
+        }
+        socket
+            .on('message', async (rawData) => {
+            const request = JSON.parse(rawData.toString());
+            // console.log(`ApiServer: Received message: ${JSON.stringify(request, null, 2)}`);
+            switch (request.type) {
+                case 'subscribe': {
+                    const { path: subscriptionPath, id } = request.data;
+                    disposables.set(id, bus.subscribe(subscriptionPath, 
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    (data) => sendMessage({ type: 'notify', id, path: subscriptionPath, data })));
+                    break;
+                }
+                case 'unsubscribe': {
+                    const { id } = request.data;
+                    if (id) {
+                        const dispose = disposables.get(id);
+                        if (dispose) {
+                            dispose();
+                            disposables.delete(id);
+                        }
+                    }
+                    break;
+                }
+                case 'openSource': {
+                    const { rootPath, relativePath = '', line, column } = request.data;
+                    const fullPath = path.join(rootPath, relativePath);
+                    console.log(`Opening VSCode with path: ${fullPath}`);
+                    execSync(`code --goto ${fullPath}:${line}:${column}`, { cwd: process.cwd() });
+                    break;
+                }
+                case 'open': {
+                    const { rootPath, relativePath = '' } = request.data;
+                    const fullPath = path.join(rootPath, relativePath);
+                    console.log(`Opening path: ${fullPath}`);
+                    const openCommand = os.platform() == 'win32' ? 'start' : 'open';
+                    execSync(`${openCommand} ${fullPath}`, { cwd: process.cwd() });
+                    break;
+                }
+            }
+        })
+            .on('close', () => {
+            for (const d of disposables.values()) {
+                d();
+            }
+        });
+    });
+    return {
+        url: `ws://localhost:${port}`,
+        port,
+        notifyReload: () => {
+            server.clients.forEach((socket) => {
+                if (socket.readyState === WebSocket.OPEN) {
+                    socket.send(JSON.stringify({
+                        type: 'reload',
+                        data: { sessionId: session.id },
+                    }));
+                }
+            });
+        },
+        reportStart(taskStart) {
+            const previousResult = allTasks.get(taskStart.id);
+            const now = new Date().getTime();
+            if (!previousResult) {
+                sessionStats.totalTasks++;
+            }
+            if (previousResult?.status === 'complete') {
+                sessionStats.totalErrors -= previousResult.errors?.length || 0;
+                sessionStats.totalWarnings -= previousResult.warnings?.length || 0;
+            }
+            sessionStats.remainingTasks++;
+            sessionStats.status = 'pending';
+            allTasks.set(taskStart.id, {
+                ...taskStart,
+                status: 'pending',
+                startTime: now,
+            });
+            bus.publish([session.id, 'status'], sessionStats);
+            bus.publish([session.id, 'status-details'], { tasks: Array.from(allTasks.values()) });
+        },
+        reportEnd: (end) => {
+            const previousResult = allTasks.get(end.id);
+            const now = new Date().getTime();
+            if (previousResult) {
+                sessionStats.remainingTasks--;
+                sessionStats.totalErrors += end.errors?.length || 0;
+                sessionStats.totalWarnings += end.warnings?.length || 0;
+                allTasks.set(end.id, {
+                    ...previousResult,
+                    ...end,
+                    status: 'complete',
+                    durationMilliseconds: now - previousResult.startTime,
+                    lastUpdated: now,
+                });
+                if (sessionStats.remainingTasks === 0) {
+                    sessionStats.status = 'idle';
+                }
+                bus.publish([session.id, 'status'], sessionStats);
+                bus.publish([session.id, 'status-details'], { tasks: Array.from(allTasks.values()) });
+            }
+        },
+        close: () => server.close(),
+    };
+}
+//# sourceMappingURL=startApiServer.js.map

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

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

package/lib/commands/start/startAppServer.d.ts

@@ -1,5 +1,7 @@
 /// <reference types="node" resolution-mode="require"/>
 import type { Session } from './types.js';
+import type { ApiServer } from './startApiServer.js';
+import type { BundleServer } from './startBundleServer.js';
 /**
  * The app server hosts the appropriate routes for the web app, primarily returning html content
  * which loads resources from the bundle server.
@@ -8,7 +10,11 @@ import type { 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: Session, bundleServerUrl: string): Promise<{
+export declare function startAppServer({ session, bundleServer, apiServer, }: {
+    session: Session;
+    bundleServer: BundleServer;
+    apiServer: ApiServer;
+}): Promise<{
     close: () => import("http").Server;
     port: number;
 }>;

package/lib/commands/start/startAppServer.js

@@ -3,6 +3,10 @@ import path from 'path';
 import { slash } from '@ms-cloudpack/path-utilities';
 import { createImportMap, getPackageDefinition } from '@ms-cloudpack/package-utilities';
 import { createExpressApp } from '@ms-cloudpack/create-express-app';
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const log = (messages) => {
+    // console.log(`BundleServer:`, ...messages);
+};
 /**
  * The app server hosts the appropriate routes for the web app, primarily returning html content
  * which loads resources from the bundle server.
@@ -11,32 +15,41 @@ import { createExpressApp } from '@ms-cloudpack/create-express-app';
  * 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, bundleServerUrl) {
-    const importMap = await createImportMap(session.resolveMap, bundleServerUrl);
+export async function startAppServer({ session, bundleServer, apiServer, }) {
+    const importMap = await createImportMap(session.resolveMap, bundleServer.url);
     const definition = await getPackageDefinition(session.appPath, true);
+    const dashboardClientScript = importMap.imports['@ms-cloudpack/overlay'];
+    const dashboardScript = importMap.imports['@ms-cloudpack/overlay'];
     const { server, port } = await createExpressApp([5000, 5001, 5002, 5003], (app) => {
         // Set up the express app routes.
-        app.get('*', async (req, res) => {
+        app
+            .get('/__/dashboard', (req, res) => {
+            sendHtmlResponse({
+                session,
+                title: 'Cloudpack dashboard',
+                importMap,
+                apiServer,
+                bodyScripts: [dashboardClientScript, dashboardScript],
+                res,
+            });
+        })
+            .get('*', async (req, res) => {
             if (!definition) {
                 res.status(500).send(`There was no package.json located at "${session.appPath}".`);
                 return;
             }
             const requestPath = slash(req.path.substring(1));
             const requestExt = path.extname(requestPath);
-            // TODO: this should derive which scripts load for each route. getEntryScript(requestPath);
-            const entryScript = `${bundleServerUrl}/${definition.name}@${definition.version}/lib/index.js`;
-            console.log(`App server: Request: ${requestPath}, ext: ${requestExt}, ${port}`);
-            res.cookie('cloudpack-session-id', session.id);
-            res.set('Content-Security-Policy', `connect-src 'self' ws:;`);
-            res.send(`<!DOCTYPE html>
-<html>
-  <head>
-    <script type="importmap">${JSON.stringify(importMap, null, 2)}</script>
-  </head>
-  <body>
-    <script type="module" src="${entryScript}"></script>
-  </body>
-</html>`);
+            const entryScript = importMap.imports[definition.name || ''];
+            log(`App server: Request: ${requestPath}, ext: ${requestExt}, ${port}`);
+            sendHtmlResponse({
+                session,
+                title: definition.name || '',
+                importMap,
+                apiServer,
+                bodyScripts: [dashboardClientScript, entryScript],
+                res,
+            });
         });
     });
     return {
@@ -44,4 +57,25 @@ export async function startAppServer(session, bundleServerUrl) {
         port,
     };
 }
+function sendHtmlResponse({ session, title, importMap, apiServer, headScripts, bodyScripts, res, }) {
+    res.header('Content-Type', 'text/html');
+    res.header('Cache-Control', 'no-cache');
+    res.header('Content-Security-Policy', `connect-src 'self' ws:;`);
+    res.header('Access-Control-Allow-Origin', '*');
+    res.cookie('cloudpack-session-id', session.id);
+    res.cookie('cloudpack-api-url', apiServer.url);
+    res.send([
+        `<!DOCTYPE html>`,
+        `<html>`,
+        `<head>`,
+        `<title>${title}</title>`,
+        `<script type="importmap">${JSON.stringify(importMap, null, 2)}</script>`,
+        headScripts?.map((scriptUrl) => `<script type="module" src="${scriptUrl}"></script>`).join('\n') || '',
+        `</head>`,
+        `<body>`,
+        bodyScripts?.map((scriptUrl) => `<script type="module" src="${scriptUrl}" async></script>`).join('\n') || '',
+        `</body>`,
+        `</html>`,
+    ].join('\n'));
+}
 //# sourceMappingURL=startAppServer.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"startAppServer.js","sourceRoot":"","sources":["../../../src/commands/start/startAppServer.ts"],"names":[],"mappings":"AAAA,6CAA6C;AAC7C,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACxF,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAGpE;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,OAAgB,EAAE,eAAuB;IAC5E,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;IAC7E,MAAM,UAAU,GAAG,MAAM,oBAAoB,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAErE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,gBAAgB,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE;QAChF,iCAAiC;QACjC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YAC9B,IAAI,CAAC,UAAU,EAAE;gBACf,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,yCAAyC,OAAO,CAAC,OAAO,IAAI,CAAC,CAAC;gBACnF,OAAO;aACR;YAED,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAE7C,2FAA2F;YAC3F,MAAM,WAAW,GAAG,GAAG,eAAe,IAAI,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,OAAO,eAAe,CAAC;YAE/F,OAAO,CAAC,GAAG,CAAC,wBAAwB,WAAW,UAAU,UAAU,KAAK,IAAI,EAAE,CAAC,CAAC;YAEhF,GAAG,CAAC,MAAM,CAAC,sBAAsB,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;YAC/C,GAAG,CAAC,GAAG,CAAC,yBAAyB,EAAE,yBAAyB,CAAC,CAAC;YAE9D,GAAG,CAAC,IAAI,CACN;;;+BAGuB,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;;;iCAGhC,WAAW;;QAEpC,CACD,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE;QAC3B,IAAI;KACL,CAAC;AACJ,CAAC"}
+{"version":3,"file":"startAppServer.js","sourceRoot":"","sources":["../../../src/commands/start/startAppServer.ts"],"names":[],"mappings":"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"}

package/lib/commands/start/startBundleServer.d.ts

@@ -1,5 +1,16 @@
 import type { Session } from './types.js';
-export declare function startBundleServer(session: Session): Promise<{
-    close: () => void;
+import type { ApiServer } from './startApiServer.js';
+export interface BundleServer {
+    url: string;
     port: number;
-}>;
+    close: () => void;
+}
+/**
+ * The bundle server handles package requests and returns bundled resources.
+ * Resources are bundled on demand and cached locally to avoid re-bundling
+ * on each request.
+ */
+export declare function startBundleServer({ session, apiServer, }: {
+    session: Session;
+    apiServer: ApiServer;
+}): Promise<BundleServer>;

package/lib/commands/start/startBundleServer.js

@@ -1,6 +1,6 @@
 import { bundlePackage } from '@ms-cloudpack/bundler';
 import { createExpressApp } from '@ms-cloudpack/create-express-app';
-import { readJson, writeJsonSync } from '@ms-cloudpack/json-utilities';
+import { readJson, writeJson } from '@ms-cloudpack/json-utilities';
 import { isExternalPackage } from '@ms-cloudpack/package-utilities';
 import { isFolder, slash } from '@ms-cloudpack/path-utilities';
 import filenamify from 'filenamify';
@@ -9,10 +9,19 @@ import hash from 'object-hash';
 import os from 'os';
 import path from 'path';
 import { parseRequestInfo } from './parseRequestInfo.js';
+import chokidar from 'chokidar';
 const { ensureDir } = fsExtra;
-const bundleLookupPath = path.join(os.tmpdir(), 'cloudpack-output', 'all-bundles.json');
-export async function startBundleServer(session) {
-    const createdBundles = (await readJson(bundleLookupPath)) || {};
+// const bundleLookupPath = path.join(os.tmpdir(), 'cloudpack-output', 'all-bundles.json');
+const log = (...messages) => {
+    console.log(`BundleServer:`, ...messages);
+};
+/**
+ * The bundle server handles package requests and returns bundled resources.
+ * Resources are bundled on demand and cached locally to avoid re-bundling
+ * on each request.
+ */
+export async function startBundleServer({ session, apiServer, }) {
+    const createdBundles = {};
     const pendingBundles = {};
     const { resolveMap } = session;
     const { server, port } = await createExpressApp([5500, 5501, 5502, 5503], (app) => {
@@ -25,10 +34,10 @@ export async function startBundleServer(session) {
                 ? packageEntry?.path
                 : packageEntry?.scopedVersions?.[version]?.path;
             const force = req.query.force !== undefined;
-            console.log(`BundleServer: Request: "${packageName}@${version}${filePath}"`);
+            log(`Request: "${packageName}@${version}${filePath}"`);
             // If the package is missing, invalid arguments.
             if (!requestPath || !packageName) {
-                console.log(`BundleServer: Response (400): "${packageName}@${version}${filePath}"`);
+                log(`Response (400): "${packageName}@${version}${filePath}"`);
                 res.status(400).send(`Requests must be in the format "/{packageName}@{version}/path/file.ext".`);
                 return;
             }
@@ -36,7 +45,7 @@ export async function startBundleServer(session) {
             if (!version) {
                 const resolvedPackage = resolveMap[packageName];
                 if (!resolvedPackage) {
-                    console.log(`BundleServer: Response (404): Unrecognized package "${packageName}"`);
+                    log(`Response (404): Unrecognized package "${packageName}"`);
                     res.status(404).send(`Unrecognized package "${packageName}".`);
                     return;
                 }
@@ -45,7 +54,7 @@ export async function startBundleServer(session) {
             }
             // If it's an unrecognized package, 404.
             if (!packagePath) {
-                console.log(`BundleServer: Response (404): "${packageName}@${version}${filePath}"`);
+                log(`BundleServer: Response (404): "${packageName}@${version}${filePath}"`);
                 res
                     .status(404)
                     .send(`The requested package "${packageName}@${version}${filePath}" was not found in the resolve map.`);
@@ -61,7 +70,7 @@ export async function startBundleServer(session) {
             // Derive where the output should be.
             const outputPath = path.join(os.tmpdir(), 'cloudpack-output', `${filenamify(packageName)}-${version}-${bundleId}`);
             let action = createdBundles[bundleId];
-            // Clear the created bundle if the folder doesn't exist.
+            // Clear the created bundle if we think the bundle was created, but the folder doesn't exist.
             if (action && !isFolder(outputPath)) {
                 action = undefined;
                 delete createdBundles[bundleId];
@@ -72,67 +81,182 @@ export async function startBundleServer(session) {
                 // Either latch on to a pending request or create a new one.
                 if (!pendingAction) {
                     pendingAction = pendingBundles[bundleId] = new Promise((resolve) => {
+                        const bundleRequest = {
+                            id: bundleId,
+                            packageName,
+                            version: version,
+                            packagePath,
+                            outputPath,
+                            isExternal,
+                        };
                         // Async helper so that we can await and call resolve.
                         async function createBundle() {
+                            // Start tracking work.
+                            apiServer.reportStart({
+                                id: bundleId,
+                                name: `Bundle ${packageName}@${version}`,
+                                inputPath: packagePath || '',
+                                outputPath,
+                            });
                             try {
-                                console.log(`BundleServer: No previous action found, bundling: "${packageName}@${version}${filePath}"`);
+                                log(`No previous action found, bundling: "${packageName}@${version}"`);
                                 await ensureDir(outputPath);
+                                log(`Finished ensureDir: "${packageName}@${version}"`);
                                 // This check shouldn't be required because we throw above if packagePath is undefined,
                                 // but TypeScript insists it is necessary.
                                 if (packagePath) {
-                                    const bundlerResult = await bundlePackage({
-                                        packagePath,
-                                        outputPath,
-                                        outputType: 'library',
-                                    });
-                                    console.log(`BundleServer: Bundle complete: ${outputPath}`);
-                                    createdBundles[bundleId] = {
-                                        id: bundleId,
-                                        packageName: packageName,
-                                        packageVersion: version,
-                                        packagePath,
-                                        outputPath,
-                                        result: bundlerResult.errors?.length == 0 ? 'success' : 'errors',
-                                        errors: bundlerResult.errors,
-                                        warnings: bundlerResult.warnings,
-                                    };
+                                    log(`Trying to bundle "${packageName}@${version}"`);
+                                    await bundle(bundleRequest, force);
+                                    // If this is going to be incremental, start a watcher to re-bundle when source
+                                    // changes.
+                                    if (!isExternal) {
+                                        initializeFileWatcher(session, bundleId, outputPath, bundleRequest, pendingBundles, apiServer);
+                                        log(`Bundle complete: ${outputPath}`);
+                                    }
                                 }
                             }
-                            finally {
-                                delete pendingBundles[bundleId];
+                            catch (_) {
+                                /* no-op */
                             }
-                            return createdBundles[bundleId];
                         }
                         // Call the async function and tie it in with the promise.
-                        createBundle().then(resolve);
+                        createBundle().then(() => {
+                            // If an existing bundle was created, dispose.
+                            if (createdBundles[bundleId]) {
+                                createdBundles[bundleId].dispose?.();
+                            }
+                            createdBundles[bundleId] = bundleRequest;
+                            delete pendingBundles[bundleId];
+                            // TODO: errors and warnings typings don't match up. We need to reconcile.
+                            apiServer.reportEnd({
+                                id: bundleId,
+                                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                                errors: bundleRequest.result?.errors,
+                                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                                warnings: bundleRequest.result?.warnings,
+                            });
+                            resolve(bundleRequest);
+                        });
                     });
                 }
                 else {
-                    console.log(`BundleServer: Previous action found, waiting: "${packageName}@${version}${filePath}"`);
+                    log(`BundleServer: Previous action found, waiting: "${packageName}@${version}${filePath}"`);
                 }
                 action = await pendingAction;
             }
             else {
-                console.log(`BundleServer: Bundle cached, returning: "${packageName}@${version}${filePath}"`);
+                log(`BundleServer: Bundle cached, returning: "${packageName}@${version}${filePath}"`);
+            }
+            // If this is a pre-built local package we haven't set up for incremental builds, set it up.
+            if (!isExternal && !action.dispose) {
+                initializeFileWatcher(session, bundleId, outputPath, action, pendingBundles, apiServer);
             }
-            // At this point we should have an action compeleted.
-            if (action.result === 'errors') {
+            // At this point we should have an action completed.
+            if ((action.result?.errors?.length || 0) > 0) {
                 res.status(500).type('json').send(action);
             }
             else {
-                console.log(`BundleServer: Bundle returning: "${packageName}@${version}${filePath}"`);
+                log(`BundleServer: Bundle returning: "${packageName}@${version}${filePath}"`);
                 // Try to return the result.
+                if (isExternal) {
+                    res.setHeader('Cache-Control', 'public, max-age=31536000');
+                }
                 res.sendFile(path.join(outputPath, filePath));
             }
         });
     });
-    console.log(`BundleServer: started (http://localhost:${port})`);
+    const url = `http://localhost:${port}`;
+    log(`BundleServer: started (${url})`);
     return {
-        close: () => {
-            writeJsonSync(bundleLookupPath, createdBundles);
+        close: async () => {
+            // await writeJson(bundleLookupPath, createdBundles);
             server.close();
         },
         port,
+        url,
+    };
+}
+async function bundle(bundleRequest, force) {
+    const { packagePath, outputPath, isExternal } = bundleRequest;
+    // Rehydrate the result if not incremental.
+    if (isExternal && !force) {
+        bundleRequest.result = await readJson(path.join(outputPath, 'result.json'));
+    }
+    const isCacheUsable = bundleRequest.result?.errors?.length === 0;
+    // Only use cached result if it's successful.
+    if (!isCacheUsable) {
+        bundleRequest.result = await bundlePackage({
+            packagePath,
+            outputPath,
+            outputType: 'library',
+            incremental: !isExternal,
+        });
+        // Write the result to disk.
+        if (isExternal) {
+            await writeJson(path.join(outputPath, 'result.json'), bundleRequest.result);
+        }
+    }
+    else {
+        log(`Bundle cached, returning: "${bundleRequest.packageName}@${bundleRequest.version}"`);
+    }
+    return bundleRequest;
+}
+function initializeFileWatcher(session, bundleId, outputPath, bundleRequest, pendingBundles, apiServer) {
+    const { id, packageName, packagePath, version } = bundleRequest;
+    let bundleOutput = bundleRequest.result;
+    log(`Initializing file watcher for ${packageName}@${version}`);
+    // TODO: This is a bit of a hack. We should be able to use the watch API, but it doesn't seem to work.
+    const watcher = chokidar.watch(path.join(packagePath, 'src')).on('change', (event) => {
+        if (!pendingBundles[id]) {
+            bundleRequest.isRebuildRequired = true;
+            log(`Detected change "${event}", rebuilding "${packageName}@${version}"`);
+            // eslint-disable-next-line no-async-promise-executor
+            pendingBundles[id] = new Promise(async (resolveIncremental) => {
+                do {
+                    bundleRequest.isRebuildRequired = false;
+                    log(`[Start] >> Bundling "${packageName}@${version}" to "${outputPath}"`);
+                    // Start tracking work.
+                    apiServer.reportStart({
+                        id: bundleId,
+                        name: `Rebundle ${packageName}@${version}`,
+                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                        inputPath: packagePath,
+                        outputPath,
+                    });
+                    if (!bundleOutput?.rebuild) {
+                        bundleOutput = (await bundle(bundleRequest)).result;
+                    }
+                    else if (bundleOutput?.rebuild) {
+                        bundleOutput = await bundleOutput.rebuild();
+                    }
+                    // TODO: Fix typings
+                    apiServer.reportEnd({
+                        id: bundleId,
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                        errors: bundleOutput?.errors,
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                        warnings: bundleOutput?.warnings,
+                    });
+                    log(`[ End ] << Bundled "${packageName}@${version}" (${bundleOutput?.outputFiles?.length || 0} file(s), ${bundleOutput?.errors?.length || 0} errors)`);
+                } while (bundleRequest.isRebuildRequired);
+                delete pendingBundles[id];
+                if (!bundleOutput?.errors?.length) {
+                    log(`Notifying rebuild: ${packageName}@${version}`);
+                    apiServer.notifyReload();
+                }
+                resolveIncremental(bundleRequest);
+            });
+        }
+        else {
+            // A change was made while we were bundling. We need to wait for the current
+            // bundle to finish before we can rebuild.
+            bundleRequest.isRebuildRequired = true;
+            log(`Detected change "${event}", already waiting for "${packageName}@${version}"`);
+        }
+    });
+    bundleRequest.dispose = () => {
+        watcher.close();
+        bundleOutput?.dispose?.();
     };
 }
 //# sourceMappingURL=startBundleServer.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"startBundleServer.js","sourceRoot":"","sources":["../../../src/commands/start/startBundleServer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"startBundleServer.js","sourceRoot":"","sources":["../../../src/commands/start/startBundleServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EAAE,gBAAgB,EAAgB,MAAM,kCAAkC,CAAC;AAClF,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,OAAO,MAAM,UAAU,CAAC;AAC/B,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGzD,OAAO,QAAQ,MAAM,UAAU,CAAC;AAEhC,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;AAE9B,2FAA2F;AAE3F,MAAM,GAAG,GAAG,CAAC,GAAG,QAAmB,EAAE,EAAE;IACrC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,GAAG,QAAQ,CAAC,CAAC;AAC5C,CAAC,CAAC;AAwBF;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,EACtC,OAAO,EACP,SAAS,GAIV;IACC,MAAM,cAAc,GAAkC,EAAE,CAAC;IACzD,MAAM,cAAc,GAA2C,EAAE,CAAC;IAClE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAC/B,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,gBAAgB,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,GAAY,EAAE,EAAE;QACzF,iCAAiC;QACjC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YAC9B,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC;YACzE,MAAM,YAAY,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;YAC7C,MAAM,WAAW,GACf,CAAC,CAAC,OAAO,IAAI,YAAY,EAAE,OAAO,KAAK,OAAO;gBAC5C,CAAC,CAAC,YAAY,EAAE,IAAI;gBACpB,CAAC,CAAC,YAAY,EAAE,cAAc,EAAE,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC;YACpD,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC;YAE5C,GAAG,CAAC,aAAa,WAAW,IAAI,OAAO,GAAG,QAAQ,GAAG,CAAC,CAAC;YAEvD,gDAAgD;YAChD,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,EAAE;gBAChC,GAAG,CAAC,oBAAoB,WAAW,IAAI,OAAO,GAAG,QAAQ,GAAG,CAAC,CAAC;gBAE9D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,0EAA0E,CAAC,CAAC;gBACjG,OAAO;aACR;YAED,8DAA8D;YAC9D,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,eAAe,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;gBAEhD,IAAI,CAAC,eAAe,EAAE;oBACpB,GAAG,CAAC,yCAAyC,WAAW,GAAG,CAAC,CAAC;oBAE7D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,yBAAyB,WAAW,IAAI,CAAC,CAAC;oBAC/D,OAAO;iBACR;gBAED,GAAG,CAAC,QAAQ,CAAC,IAAI,WAAW,IAAI,eAAe,CAAC,OAAO,GAAG,QAAQ,EAAE,CAAC,CAAC;gBACtE,OAAO;aACR;YAED,wCAAwC;YACxC,IAAI,CAAC,WAAW,EAAE;gBAChB,GAAG,CAAC,kCAAkC,WAAW,IAAI,OAAO,GAAG,QAAQ,GAAG,CAAC,CAAC;gBAE5E,GAAG;qBACA,MAAM,CAAC,GAAG,CAAC;qBACX,IAAI,CAAC,0BAA0B,WAAW,IAAI,OAAO,GAAG,QAAQ,qCAAqC,CAAC,CAAC;gBAE1G,OAAO;aACR;YAED,uCAAuC;YACvC,MAAM,UAAU,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;YAClD,MAAM,QAAQ,GAAG,IAAI,CAAC;gBACpB,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW;gBAC3C,IAAI,EAAE,OAAO,CAAC,IAAI;aACnB,CAAC,CAAC;YAEH,qCAAqC;YACrC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAC1B,EAAE,CAAC,MAAM,EAAE,EACX,kBAAkB,EAClB,GAAG,UAAU,CAAC,WAAW,CAAC,IAAI,OAAO,IAAI,QAAQ,EAAE,CACpD,CAAC;YAEF,IAAI,MAAM,GAA8B,cAAc,CAAC,QAAQ,CAAC,CAAC;YAEjE,6FAA6F;YAC7F,IAAI,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;gBACnC,MAAM,GAAG,SAAS,CAAC;gBACnB,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;aACjC;YAED,mFAAmF;YACnF,IAAI,CAAC,MAAM,IAAI,KAAK,EAAE;gBACpB,IAAI,aAAa,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;gBAE7C,4DAA4D;gBAC5D,IAAI,CAAC,aAAa,EAAE;oBAClB,aAAa,GAAG,cAAc,CAAC,QAAQ,CAAC,GAAG,IAAI,OAAO,CAAgB,CAAC,OAAO,EAAE,EAAE;wBAChF,MAAM,aAAa,GAAkB;4BACnC,EAAE,EAAE,QAAQ;4BACZ,WAAW;4BACX,OAAO,EAAE,OAAO;4BAChB,WAAW;4BACX,UAAU;4BACV,UAAU;yBACX,CAAC;wBAEF,sDAAsD;wBACtD,KAAK,UAAU,YAAY;4BACzB,uBAAuB;4BACvB,SAAS,CAAC,WAAW,CAAC;gCACpB,EAAE,EAAE,QAAQ;gCACZ,IAAI,EAAE,UAAU,WAAW,IAAI,OAAO,EAAE;gCACxC,SAAS,EAAE,WAAW,IAAI,EAAE;gCAC5B,UAAU;6BACX,CAAC,CAAC;4BAEH,IAAI;gCACF,GAAG,CAAC,wCAAwC,WAAW,IAAI,OAAO,GAAG,CAAC,CAAC;gCAEvE,MAAM,SAAS,CAAC,UAAU,CAAC,CAAC;gCAE5B,GAAG,CAAC,wBAAwB,WAAW,IAAI,OAAO,GAAG,CAAC,CAAC;gCAEvD,uFAAuF;gCACvF,0CAA0C;gCAC1C,IAAI,WAAW,EAAE;oCACf,GAAG,CAAC,qBAAqB,WAAW,IAAI,OAAO,GAAG,CAAC,CAAC;oCACpD,MAAM,MAAM,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;oCAEnC,+EAA+E;oCAC/E,WAAW;oCACX,IAAI,CAAC,UAAU,EAAE;wCACf,qBAAqB,CAAC,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;wCAC/F,GAAG,CAAC,oBAAoB,UAAU,EAAE,CAAC,CAAC;qCACvC;iCACF;6BACF;4BAAC,OAAO,CAAC,EAAE;gCACV,WAAW;6BACZ;wBACH,CAAC;wBAED,0DAA0D;wBAC1D,YAAY,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;4BACvB,8CAA8C;4BAC9C,IAAI,cAAc,CAAC,QAAQ,CAAC,EAAE;gCAC5B,cAAc,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;6BACtC;4BAED,cAAc,CAAC,QAAQ,CAAC,GAAG,aAAa,CAAC;4BACzC,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;4BAEhC,0EAA0E;4BAC1E,SAAS,CAAC,SAAS,CAAC;gCAClB,EAAE,EAAE,QAAQ;gCACZ,8DAA8D;gCAC9D,MAAM,EAAE,aAAa,CAAC,MAAM,EAAE,MAAa;gCAC3C,8DAA8D;gCAC9D,QAAQ,EAAE,aAAa,CAAC,MAAM,EAAE,QAAe;6BAChD,CAAC,CAAC;4BAEH,OAAO,CAAC,aAAa,CAAC,CAAC;wBACzB,CAAC,CAAC,CAAC;oBACL,CAAC,CAAC,CAAC;iBACJ;qBAAM;oBACL,GAAG,CAAC,kDAAkD,WAAW,IAAI,OAAO,GAAG,QAAQ,GAAG,CAAC,CAAC;iBAC7F;gBAED,MAAM,GAAG,MAAM,aAAa,CAAC;aAC9B;iBAAM;gBACL,GAAG,CAAC,4CAA4C,WAAW,IAAI,OAAO,GAAG,QAAQ,GAAG,CAAC,CAAC;aACvF;YAED,4FAA4F;YAC5F,IAAI,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;gBAClC,qBAAqB,CAAC,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;aACzF;YAED,oDAAoD;YACpD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE;gBAC5C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAC3C;iBAAM;gBACL,GAAG,CAAC,oCAAoC,WAAW,IAAI,OAAO,GAAG,QAAQ,GAAG,CAAC,CAAC;gBAC9E,4BAA4B;gBAC5B,IAAI,UAAU,EAAE;oBACd,GAAG,CAAC,SAAS,CAAC,eAAe,EAAE,0BAA0B,CAAC,CAAC;iBAC5D;gBAED,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;aAC/C;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,oBAAoB,IAAI,EAAE,CAAC;IACvC,GAAG,CAAC,0BAA0B,GAAG,GAAG,CAAC,CAAC;IAEtC,OAAO;QACL,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,qDAAqD;YACrD,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC;QACD,IAAI;QACJ,GAAG;KACJ,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,MAAM,CAAC,aAA4B,EAAE,KAAe;IACjE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC;IAE9D,2CAA2C;IAC3C,IAAI,UAAU,IAAI,CAAC,KAAK,EAAE;QACxB,aAAa,CAAC,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC;KAC7E;IAED,MAAM,aAAa,GAAG,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC,CAAC;IAEjE,6CAA6C;IAC7C,IAAI,CAAC,aAAa,EAAE;QAClB,aAAa,CAAC,MAAM,GAAG,MAAM,aAAa,CAAC;YACzC,WAAW;YACX,UAAU;YACV,UAAU,EAAE,SAAS;YACrB,WAAW,EAAE,CAAC,UAAU;SACzB,CAAC,CAAC;QAEH,4BAA4B;QAC5B,IAAI,UAAU,EAAE;YACd,MAAM,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;SAC7E;KACF;SAAM;QACL,GAAG,CAAC,8BAA8B,aAAa,CAAC,WAAW,IAAI,aAAa,CAAC,OAAO,GAAG,CAAC,CAAC;KAC1F;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,SAAS,qBAAqB,CAC5B,OAAgB,EAChB,QAAgB,EAChB,UAAkB,EAClB,aAA4B,EAC5B,cAAsD,EACtD,SAAoB;IAEpB,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;IAChE,IAAI,YAAY,GAAG,aAAa,CAAC,MAAM,CAAC;IAExC,GAAG,CAAC,iCAAiC,WAAW,IAAI,OAAO,EAAE,CAAC,CAAC;IAE/D,sGAAsG;IACtG,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;QAC3F,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE;YACvB,aAAa,CAAC,iBAAiB,GAAG,IAAI,CAAC;YACvC,GAAG,CAAC,oBAAoB,KAAK,kBAAkB,WAAW,IAAI,OAAO,GAAG,CAAC,CAAC;YAE1E,qDAAqD;YACrD,cAAc,CAAC,EAAE,CAAC,GAAG,IAAI,OAAO,CAAC,KAAK,EAAE,kBAAkB,EAAE,EAAE;gBAC5D,GAAG;oBACD,aAAa,CAAC,iBAAiB,GAAG,KAAK,CAAC;oBAExC,GAAG,CAAC,wBAAwB,WAAW,IAAI,OAAO,SAAS,UAAU,GAAG,CAAC,CAAC;oBAC1E,uBAAuB;oBACvB,SAAS,CAAC,WAAW,CAAC;wBACpB,EAAE,EAAE,QAAQ;wBACZ,IAAI,EAAE,YAAY,WAAW,IAAI,OAAO,EAAE;wBAC1C,oEAAoE;wBACpE,SAAS,EAAE,WAAY;wBACvB,UAAU;qBACX,CAAC,CAAC;oBAEH,IAAI,CAAC,YAAY,EAAE,OAAO,EAAE;wBAC1B,YAAY,GAAG,CAAC,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC;qBACrD;yBAAM,IAAI,YAAY,EAAE,OAAO,EAAE;wBAChC,YAAY,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,CAAC;qBAC7C;oBAED,oBAAoB;oBACpB,SAAS,CAAC,SAAS,CAAC;wBAClB,EAAE,EAAE,QAAQ;wBACZ,8DAA8D;wBAC9D,MAAM,EAAE,YAAY,EAAE,MAAa;wBACnC,8DAA8D;wBAC9D,QAAQ,EAAE,YAAY,EAAE,QAAe;qBACxC,CAAC,CAAC;oBAEH,GAAG,CACD,uBAAuB,WAAW,IAAI,OAAO,MAAM,YAAY,EAAE,WAAW,EAAE,MAAM,IAAI,CAAC,aACvF,YAAY,EAAE,MAAM,EAAE,MAAM,IAAI,CAClC,UAAU,CACX,CAAC;iBACH,QAAQ,aAAa,CAAC,iBAAiB,EAAE;gBAE1C,OAAO,cAAc,CAAC,EAAE,CAAC,CAAC;gBAC1B,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE;oBACjC,GAAG,CAAC,sBAAsB,WAAW,IAAI,OAAO,EAAE,CAAC,CAAC;oBACpD,SAAS,CAAC,YAAY,EAAE,CAAC;iBAC1B;gBAED,kBAAkB,CAAC,aAAa,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,4EAA4E;YAC5E,0CAA0C;YAC1C,aAAa,CAAC,iBAAiB,GAAG,IAAI,CAAC;YAEvC,GAAG,CAAC,oBAAoB,KAAK,2BAA2B,WAAW,IAAI,OAAO,GAAG,CAAC,CAAC;SACpF;IACH,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,OAAO,GAAG,GAAG,EAAE;QAC3B,OAAO,CAAC,KAAK,EAAE,CAAC;QAEhB,YAAY,EAAE,OAAO,EAAE,EAAE,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/cli",
-  "version": "0.2.13",
+  "version": "0.4.0",
   "description": "The Cloudpack command line interface - a tool for managing fast inner and outer looping in web apps.",
   "license": "MIT",
   "type": "module",
@@ -16,11 +16,14 @@
     "cloudpack": "./lib/cloudpack.js"
   },
   "dependencies": {
-    "@ms-cloudpack/bundler": "^0.2.1",
+    "@ms-cloudpack/bundler": "^0.3.2",
     "@ms-cloudpack/create-express-app": "^0.1.0",
+    "@ms-cloudpack/data-bus": "^0.1.0",
     "@ms-cloudpack/json-utilities": "^0.0.3",
-    "@ms-cloudpack/package-utilities": "^0.6.0",
+    "@ms-cloudpack/overlay": "^0.1.0",
+    "@ms-cloudpack/package-utilities": "^0.6.1",
     "@ms-cloudpack/path-utilities": "^0.3.1",
+    "chokidar": "^3.5.3",
     "commander": "^9.1.0",
     "filenamify": "^5.1.0",
     "fs-extra": "^10.1.0",
@@ -33,6 +36,7 @@
     "@ms-cloudpack/bundler-types": "*",
     "@ms-cloudpack/eslint-config-base": "*",
     "@ms-cloudpack/scripts": "*",
+    "@types/chokidar": "2.1.3",
     "@types/fs-extra": "9.0.13",
     "@types/glob": "7.2.0",
     "@types/object-hash": "2.2.1",