miravo 0.2.2 → 0.3.0

package/console-dist/favicon.svg

@@ -0,0 +1,20 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+  <defs>
+    <clipPath id="rounded">
+      <rect width="64" height="64" rx="14" ry="14" fill="white"/>
+    </clipPath>
+  </defs>
+  <g clip-path="url(#rounded)">
+    <!-- background -->
+    <rect width="64" height="64" fill="#0a0a0f"/>
+
+    <!-- left M half -->
+    <polygon points="12,52 12,18 28,32 28,52" fill="#1FA6A6"/>
+
+    <!-- right M half -->
+    <polygon points="52,52 52,18 36,32 36,52" fill="#2F4258"/>
+
+    <!-- mirror divider -->
+    <rect x="31" y="14" width="2" height="40" fill="#5A6B7F"/>
+  </g>
+</svg>

package/console-dist/index.html

@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Miravo</title>
+    <script type="module" crossorigin src="/assets/index-ChSocZFW.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-BXtW73cF.css">
+  </head>
+  <body>
+    <div id="root"></div>
+  </body>
+</html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miravo",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "type": "module",
   "description": "Industrial environment platform with canonical asset models and MQTT + OPC UA protocol adapters",
   "license": "Apache-2.0",
@@ -27,19 +27,22 @@
     "miravo": "./src/index.ts"
   },
   "files": [
-    "src/"
+    "src/",
+    "console-dist/"
   ],
   "dependencies": {
     "@clack/prompts": "^1.1.0",
-    "@miravo/core": "0.2.1",
-    "@miravo/mqtt": "0.2.1",
-    "@miravo/opcua": "0.2.1",
-    "@miravo/shared": "0.2.1",
+    "@miravo/core": "0.3.0",
+    "@miravo/mqtt": "0.3.0",
+    "@miravo/opcua": "0.3.0",
+    "@miravo/shared": "0.3.0",
     "commander": "^13.0.0",
     "consola": "^3.4.0",
-    "mqtt": "^5.15.0"
+    "mqtt": "^5.15.0",
+    "zod": "^4.3.6"
   },
   "devDependencies": {
+    "@miravo/console": "0.0.0",
     "node-opcua-client": "^2.163.1",
     "node-opcua-variant": "^2.163.0",
     "yaml": "^2.8.1"

package/src/__tests__/integration/executable-methods-runner.ts

@@ -9,6 +9,7 @@ import { MQTTAdapter } from "@miravo/mqtt";
 import { OPCUAAdapter } from "@miravo/opcua";
 import type { MiravoTemplate, TwinModel } from "@miravo/shared";
 import { startAdminServer } from "../../lib/admin-server.ts";
+import { buildUNSBasePath, forEachTwin } from "../../lib/template-utils.ts";
 
 interface RunnerArgs {
   readonly template: string;
@@ -18,6 +19,10 @@ interface RunnerArgs {
   readonly rbeDeadband: number;
 }
 
+interface ReadyHealthPayload {
+  readonly status?: unknown;
+}
+
 function parseArgs(argv: readonly string[]): RunnerArgs {
   const values = new Map<string, string>();
   for (let index = 0; index < argv.length; index += 2) {
@@ -57,20 +62,6 @@ function resolveSimulationName(template: MiravoTemplate): string {
   return namespace.prefix.toLowerCase();
 }
 
-function buildUNSBasePath(template: MiravoTemplate, areaName: string, lineName: string): string {
-  const segments: string[] = [];
-  const namespace = template.namespace;
-  if (namespace !== undefined) {
-    if ("enterprise" in namespace) {
-      segments.push(namespace.enterprise, namespace.site);
-    } else {
-      segments.push(namespace.prefix);
-    }
-  }
-  segments.push(areaName, lineName);
-  return segments.join("/");
-}
-
 async function loadModels(
   template: MiravoTemplate,
   modelsDir: string,
@@ -83,13 +74,9 @@ async function loadModels(
   }
 
   const referencedModelNames = new Set<string>();
-  for (const area of template.areas) {
-    for (const line of area.lines) {
-      for (const twin of line.twins) {
-        referencedModelNames.add(twin.model);
-      }
-    }
-  }
+  forEachTwin(template, (_area, _line, twin) => {
+    referencedModelNames.add(twin.model);
+  });
 
   for (const modelName of referencedModelNames) {
     if (models.has(modelName)) {
@@ -103,6 +90,26 @@ async function loadModels(
   return models;
 }
 
+async function waitForAdminReady(adminUrl: string, timeoutMs: number): Promise<void> {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    try {
+      const response = await fetch(new URL("/readyz", `${adminUrl}/`));
+      if (response.status === 200) {
+        const payload = (await response.json()) as ReadyHealthPayload;
+        if (payload.status === "ok") {
+          return;
+        }
+      }
+    } catch {
+      // Admin server can still be binding or the engine may not be running yet.
+    }
+    await Bun.sleep(25);
+  }
+
+  throw new Error(`Smoke runtime did not report ready within ${timeoutMs}ms.`);
+}
+
 async function main(): Promise<void> {
   const args = parseArgs(process.argv.slice(2));
   const template = await loadTemplate(args.template);
@@ -127,17 +134,13 @@ async function main(): Promise<void> {
     engine.runtime.registerModel(model);
   }
 
-  for (const area of template.areas) {
-    for (const line of area.lines) {
-      for (const twin of line.twins) {
-        engine.runtime.spawn(twin.model, twin.count, {
-          variation: twin.variation,
-          unsBasePath: buildUNSBasePath(template, area.name, line.name),
-          ...(twin.parameters !== undefined ? { parameterOverrides: twin.parameters } : {}),
-        });
-      }
-    }
-  }
+  forEachTwin(template, (area, line, twin) => {
+    engine.runtime.spawn(twin.model, twin.count, {
+      variation: twin.variation,
+      unsBasePath: buildUNSBasePath(template, area.name, line.name),
+      ...(twin.parameters !== undefined ? { parameterOverrides: twin.parameters } : {}),
+    });
+  });
 
   const mqttAdapter = new MQTTAdapter(engine.bus);
   await mqttAdapter.start({
@@ -184,19 +187,23 @@ async function main(): Promise<void> {
 
   const adminServer = startAdminServer({
     engine,
-    host: "127.0.0.1",
-    port: 0,
-    tickIntervalMs,
-    mqttEnabled: true,
-    isMqttConnected: () => mqttAdapter.getMetrics().connected,
-    opcuaEnabled: true,
-    isOpcuaConnected: () => opcuaAdapter.getMetrics().connected,
-    getLastTickProgressAt: () => lastTickProgressAt,
+    network: { host: "127.0.0.1", port: 0, tickIntervalMs },
+    protocols: {
+      getLastTickProgressAt: () => lastTickProgressAt,
+    },
+    ws: {
+      bus: engine.bus,
+      getEngineState: () => engine.getMetrics().core.state,
+      getTickInfo: () => ({
+        tick: engine.getMetrics().core.tickCount,
+        simulationTime: engine.getMetrics().core.simulationTimeSeconds,
+        instanceCount: engine.getMetrics().core.instanceCount,
+      }),
+    },
   });
 
-  engine.start();
-
-  await Bun.sleep(Math.max(250, tickIntervalMs * 3));
+  await engine.start();
+  await waitForAdminReady(adminServer.endpoint, Math.max(5_000, tickIntervalMs * 20));
 
   const [instanceId, instance] = [...engine.runtime.getInstances()][0] ?? [];
   if (!instanceId || !instance) {
@@ -237,10 +244,10 @@ async function main(): Promise<void> {
     process.exit(0);
   };
 
-  process.on("SIGINT", () => {
+  process.once("SIGINT", () => {
     void shutdown();
   });
-  process.on("SIGTERM", () => {
+  process.once("SIGTERM", () => {
     void shutdown();
   });