systemview 2.1.0 → 2.2.1

package/cli/index.js

@@ -25,27 +25,40 @@ const DEFAULT_PORT = 3000;
 const VERSION = require("../package.json").version;
 const UI_URL = `http://localhost:${DEFAULT_PORT}`;
 
-const MANIFEST_FILE = flags.manifest || path.join(process.cwd(), "systemview.manifest.json");
+const MANIFEST_FILE =
+  flags.manifest || path.join(process.cwd(), "systemview.manifest.json");
 const connectedUrls = new Set();
 
-function loadManifest() {
+async function loadManifest() {
   if (!fs.existsSync(MANIFEST_FILE)) return;
   try {
     const manifest = JSON.parse(fs.readFileSync(MANIFEST_FILE, "utf8"));
+    const { projectCode } = manifest;
     const services = manifest.services || [manifest];
-    for (const { system } of services) {
-      if (system && system.connectionData) {
-        Client.createService(system.connectionData);
-        connectedUrls.add(system.connectionData.serviceUrl);
-      }
-    }
-  } catch {}
+    log.info(`Reading manifest: ${projectCode} — ${services.length} service(s)`);
+    const api = `http://localhost:${DEFAULT_PORT}/systemview/api`;
+    const { SystemView } = await Client.loadService(api);
+    await Promise.all(
+      services.map(async ({ system, serviceId, specList }) => {
+        if (!system || !system.connectionData) return;
+        const alive = await appIsRunning(system.connectionData.serviceUrl);
+        if (alive) {
+          Client.createService(system.connectionData);
+          connectedUrls.add(system.connectionData.serviceUrl);
+          try { await SystemView.connect({ system, projectCode, serviceId, specList }); } catch {}
+        }
+        log.info(`  ${serviceId || system.connectionData.serviceUrl} — ${alive ? "live" : "offline"}`);
+      }),
+    );
+  } catch (err) {
+    log.warn("Failed to read manifest: " + err.message);
+  }
 }
 
 async function startApp() {
   const port = isNaN(input[1]) ? DEFAULT_PORT : Number(input[1]);
   try {
-    await launchApp(port, { interactive: true, connectedUrls, client: Client });
+    await launchApp(port, { interactive: true, connectedUrls, onReady: loadManifest });
   } catch (error) {
     log.error("Launch failed: " + error.message);
   }
@@ -56,6 +69,7 @@ async function startTest() {
   const namespace = input[2];
   try {
     await launchApp(DEFAULT_PORT);
+    await loadManifest();
     const exitCode = await runTests(UI_URL, project_code, namespace, {
       json: flags.json,
       verbose: flags.verbose,
@@ -137,7 +151,6 @@ async function quitApp() {
   }
 
   init();
-  loadManifest();
 
   const command = input[0];
 

package/cli/launchApp.js

@@ -4,7 +4,7 @@ const launchSystemView = require("../api");
 const startLineReader = require("./startLineReader");
 const listTests = require("./listTests");
 
-module.exports = async function launchApp(port, { interactive = false, connectedUrls = new Set() } = {}) {
+module.exports = async function launchApp(port, { interactive = false, connectedUrls = new Set(), onReady } = {}) {
   const ui = `http://localhost:${port}`;
   const api = `${ui}/systemview/api`;
 
@@ -18,6 +18,7 @@ module.exports = async function launchApp(port, { interactive = false, connected
     if (interactive) {
       log.warn(`SystemView already running on port ${port} — attaching.`);
       logConnection();
+      if (onReady) await onReady();
       await listTests(ui, null, null, { connectedUrls });
       return startLineReader(ui, { connectedUrls });
     }
@@ -29,6 +30,7 @@ module.exports = async function launchApp(port, { interactive = false, connected
   logConnection();
 
   if (interactive) {
+    if (onReady) await onReady();
     await listTests(ui, null, null, { connectedUrls });
     return startLineReader(ui, { connectedUrls });
   }

package/cli/logs.js

@@ -31,7 +31,7 @@ const SKIP_KEYS = new Set([
   "moduleMethod",
   "traceId",
   "level",
-  "message",
+  "scope",
   "duration",
 ]);
 
@@ -45,7 +45,7 @@ function formatRow(entry, verbose, extraFields) {
   const service = entry.serviceId || "—";
   const method = entry.moduleMethod || "—";
   const level = colorLevel(entry.level);
-  const msg = entry.message || "";
+  const msg = entry.scope || "";
   const dur = entry.duration != null ? chalk.dim(` ${entry.duration}ms`) : "";
   const traceId = chalk.dim(entry.traceId || "—");
   let row = `  ${chalk.dim(time)}  ${chalk.cyan(project)} › ${chalk.cyan(service)}   ${method.padEnd(15)}  ${level}  ${traceId}  ${msg}${dur}`;
@@ -116,7 +116,7 @@ const DISPLAY_SKIP = new Set([
   "moduleMethod",
   "traceId",
   "level",
-  "message",
+  "scope",
   "duration",
 ]);
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "systemview",
   "description": "A documentation and testing suite for SystemLynx",
-  "version": "2.1.0",
+  "version": "2.2.1",
   "license": "UNLICENSED",
   "bin": {
     "systemview": "cli/index.js"
@@ -16,7 +16,7 @@
     "chalk": "^4.1.2",
     "express": "^4.18.2",
     "moment": "^2.29.1",
-    "systemlynx": "^2.0.0",
+    "systemlynx": "^2.1.0",
     "systemlynx-client": "^2.0.0",
     "web-vitals": "^0.2.4"
   },