Preserve device inventory across unavailable observations

2026-08-10 10:49:02 +03:00
parent f233660dc3
commit c89e56942a
6 changed files with 26 additions and 19 deletions
@@ -1015,6 +1015,7 @@ export function createDeviceInventoryService({
          const lastSeenAt = observation.active || !previous
            ? observationTime
            : previous.lastSeenAt;
+          const replaceAddress = observation.active || !previous;
          byMac.set(mac, {
            id: previous?.id || deviceId(mac),
            alias: previous?.alias || '',
@@ -1023,8 +1024,8 @@ export function createDeviceInventoryService({
            hostname: previous?.hostname || null,
            manufacturer: previous?.manufacturer || vendor(mac),
            mac,
-            ip: String(observation.ip || previous?.ip || ''),
-            interface: String(observation.interface || previous?.interface || ''),
+            ip: replaceAddress ? observation.ip : previous.ip,
+            interface: replaceAddress ? observation.interface : previous.interface,
            firstSeenAt: previous?.firstSeenAt || observationTime,
            lastSeenAt,
            source: 'neighbor',
@@ -1034,8 +1035,9 @@ export function createDeviceInventoryService({
          });
        }
        const cutoff = new Date(observedAt).getTime() - RETENTION_MS;
+        const sourceUnavailable = typeof result.error === 'string';
        const devices = [...byMac.values()].filter((device) => (
-          device.pinned || device.deprioritized || device.alias || new Date(device.lastSeenAt).getTime() >= cutoff
+          sourceUnavailable || new Date(device.lastSeenAt).getTime() >= cutoff
        ));
        let traffic = state.traffic;
        if (trafficResult) {