Refactor clab-ui host integration

Author: FloSch62

apps/standalone/server/topologyProxy.ts

@@ -13,16 +13,13 @@ import type { ClabApiClient } from "./clabApiClient.js";
 import { ClabApiFileSystemAdapter } from "./clabApiFileSystem.js";
 import { getTokenFromRequest } from "./middleware.js";
 import { TopologyHostCore } from "@srl-labs/clab-ui/core/host/TopologyHostCore";
-import type {
-  ContainerDataProvider,
-  ContainerInfo,
-  InterfaceInfo
-} from "@srl-labs/clab-ui/core/parsing/types";
 import type {
   TopologyHostCommand,
   TopologyHostResponseMessage,
   TopologySnapshot
 } from "@srl-labs/clab-ui/core/types/messages";
+import { createRuntimeContainerDataProvider } from "@srl-labs/clab-ui/topology/runtime";
+import type { HostRuntimeContainer, HostRuntimeInterface } from "@srl-labs/clab-ui/host";
 
 interface RuntimeContainerPayload {
   name: string;
@@ -59,6 +56,56 @@ interface RuntimeInterfacePayload {
   stats?: RuntimeInterfaceStatsPayload;
 }
 
+function toFiniteNumber(value: number | string | undefined): number | undefined {
+  if (typeof value === "number") {
+    return Number.isFinite(value) ? value : undefined;
+  }
+  if (typeof value === "string" && value.trim().length > 0) {
+    const parsed = Number(value);
+    return Number.isFinite(parsed) ? parsed : undefined;
+  }
+  return undefined;
+}
+
+function toRuntimeInterface(iface: RuntimeInterfacePayload): HostRuntimeInterface {
+  return {
+    name: iface.name ?? "",
+    alias: iface.alias ?? "",
+    mac: iface.mac ?? "",
+    mtu: toFiniteNumber(iface.mtu) ?? 0,
+    state: iface.state ?? "",
+    type: iface.type ?? "",
+    ifIndex: toFiniteNumber(iface.ifIndex),
+    stats: iface.stats
+      ? {
+          rxBps: toFiniteNumber(iface.stats.rxBps),
+          txBps: toFiniteNumber(iface.stats.txBps),
+          rxPps: toFiniteNumber(iface.stats.rxPps),
+          txPps: toFiniteNumber(iface.stats.txPps),
+          rxBytes: toFiniteNumber(iface.stats.rxBytes),
+          txBytes: toFiniteNumber(iface.stats.txBytes),
+          rxPackets: toFiniteNumber(iface.stats.rxPackets),
+          txPackets: toFiniteNumber(iface.stats.txPackets),
+          statsIntervalSeconds: toFiniteNumber(iface.stats.statsIntervalSeconds)
+        }
+      : undefined
+  };
+}
+
+function toRuntimeContainers(containers: RuntimeContainerPayload[]): HostRuntimeContainer[] {
+  return containers.map((container) => ({
+    name: container.name ?? "",
+    nodeName: container.nodeName ?? "",
+    labName: container.labName ?? "",
+    state: container.state ?? "",
+    kind: container.kind ?? "",
+    image: container.image ?? "",
+    ipv4Address: container.ipv4Address ?? "",
+    ipv6Address: container.ipv6Address ?? "",
+    interfaces: (container.interfaces ?? []).map((iface) => toRuntimeInterface(iface))
+  }));
+}
+
 interface SnapshotRequest {
   path: string;
   mode?: "edit" | "view";
@@ -119,128 +166,6 @@ function extractLabName(filePath: string): string {
   return basename.replace(/\.clab\.ya?ml$/i, "");
 }
 
-function normalizeLabName(labName: string): string {
-  return labName.trim().toLowerCase();
-}
-
-function shortContainerName(container: RuntimeContainerPayload): string {
-  if (container.nodeName && container.nodeName.length > 0) {
-    return container.nodeName;
-  }
-  const fullName = container.name ?? "";
-  const prefix = container.labName ? `clab-${container.labName}-` : "";
-  if (prefix && fullName.startsWith(prefix)) {
-    return fullName.slice(prefix.length);
-  }
-  return fullName;
-}
-
-function stripCidr(address: string | undefined): string {
-  if (!address) {
-    return "";
-  }
-  const [value] = address.split("/");
-  return value ?? "";
-}
-
-function toFiniteNumber(value: number | string | undefined): number | undefined {
-  if (typeof value === "number") {
-    return Number.isFinite(value) ? value : undefined;
-  }
-  if (typeof value === "string" && value.trim().length > 0) {
-    const parsed = Number(value);
-    return Number.isFinite(parsed) ? parsed : undefined;
-  }
-  return undefined;
-}
-
-function toInterfaceInfo(iface: RuntimeInterfacePayload): InterfaceInfo {
-  return {
-    name: iface.name ?? "",
-    alias: iface.alias ?? "",
-    mac: iface.mac ?? "",
-    mtu: toFiniteNumber(iface.mtu) ?? 0,
-    state: iface.state ?? "",
-    type: iface.type ?? "",
-    ifIndex: toFiniteNumber(iface.ifIndex),
-    stats: iface.stats
-      ? {
-          rxBps: toFiniteNumber(iface.stats.rxBps),
-          txBps: toFiniteNumber(iface.stats.txBps),
-          rxPps: toFiniteNumber(iface.stats.rxPps),
-          txPps: toFiniteNumber(iface.stats.txPps),
-          rxBytes: toFiniteNumber(iface.stats.rxBytes),
-          txBytes: toFiniteNumber(iface.stats.txBytes),
-          rxPackets: toFiniteNumber(iface.stats.rxPackets),
-          txPackets: toFiniteNumber(iface.stats.txPackets),
-          statsIntervalSeconds: toFiniteNumber(iface.stats.statsIntervalSeconds)
-        }
-      : undefined
-  };
-}
-
-function createContainerDataProvider(containers: RuntimeContainerPayload[]): ContainerDataProvider {
-  const containersByLab = new Map<string, RuntimeContainerPayload[]>();
-  for (const container of containers) {
-    const labName = normalizeLabName(container.labName ?? "");
-    const existing = containersByLab.get(labName);
-    if (existing) {
-      existing.push(container);
-    } else {
-      containersByLab.set(labName, [container]);
-    }
-  }
-
-  const findContainerEntry = (
-    containerName: string,
-    labName: string
-  ): RuntimeContainerPayload | undefined => {
-    const labContainers = containersByLab.get(normalizeLabName(labName)) ?? [];
-    return labContainers.find((container) => {
-      if (container.name === containerName) return true;
-      if (container.nodeName === containerName) return true;
-      return shortContainerName(container) === containerName;
-    });
-  };
-
-  const toContainerInfo = (container: RuntimeContainerPayload): ContainerInfo => ({
-    name: container.name ?? "",
-    name_short: shortContainerName(container),
-    rootNodeName: container.nodeName ?? "",
-    state: container.state ?? "",
-    kind: container.kind ?? "",
-    image: container.image ?? "",
-    IPv4Address: stripCidr(container.ipv4Address),
-    IPv6Address: stripCidr(container.ipv6Address),
-    interfaces: (container.interfaces ?? []).map((iface) => toInterfaceInfo(iface)),
-    label: container.nodeName || container.name
-  });
-
-  return {
-    findContainer(containerName: string, labName: string): ContainerInfo | undefined {
-      const container = findContainerEntry(containerName, labName);
-      return container ? toContainerInfo(container) : undefined;
-    },
-    findInterface(containerName: string, ifaceName: string, labName: string): InterfaceInfo | undefined {
-      const container = findContainerEntry(containerName, labName);
-      if (!container) {
-        return undefined;
-      }
-      const needle = ifaceName.trim().toLowerCase();
-      if (!needle) {
-        return undefined;
-      }
-
-      const iface = (container.interfaces ?? []).find((entry) => {
-        const byName = entry.name?.trim().toLowerCase();
-        const byAlias = entry.alias?.trim().toLowerCase();
-        return byName === needle || byAlias === needle;
-      });
-      return iface ? toInterfaceInfo(iface) : undefined;
-    }
-  };
-}
-
 async function getOrCreateHost(
   client: ClabApiClient,
   token: string,
@@ -320,7 +245,9 @@ export function registerTopologyProxy(app: FastifyInstance, getClient: ClientRes
       try {
         const deploymentState = body.deploymentState ?? "undeployed";
         const mode = body.mode ?? (deploymentState === "deployed" ? "view" : "edit");
-        const containerDataProvider = createContainerDataProvider(body.runtimeContainers ?? []);
+        const containerDataProvider = createRuntimeContainerDataProvider(
+          toRuntimeContainers(body.runtimeContainers ?? [])
+        );
         const host = await getOrCreateHost(
           client,
           token,
@@ -364,7 +291,9 @@ export function registerTopologyProxy(app: FastifyInstance, getClient: ClientRes
       try {
         const deploymentState = body.deploymentState ?? "undeployed";
         const mode = body.mode ?? (deploymentState === "deployed" ? "view" : "edit");
-        const containerDataProvider = createContainerDataProvider(body.runtimeContainers ?? []);
+        const containerDataProvider = createRuntimeContainerDataProvider(
+          toRuntimeContainers(body.runtimeContainers ?? [])
+        );
         const host = await getOrCreateHost(
           client,
           token,