feat(desktop, network): Fehlerhandling verbessert, Tools-Menü erweitert und mDNS-Discovery optimiert

Signed-off-by: Stefan Mogeritsch <stefan.mo.co@gmail.com>
2026-05-07 17:18:12 +02:00
parent a2d94bbc7e
commit 3aaf5cc59c
9 changed files with 201 additions and 24 deletions
@@ -19,12 +19,23 @@ class JmDnsDiscoveryService : NetworkDiscoveryService {
  private val jmdnsInstances = mutableListOf<JmDNS>()
  private val SERVICE_TYPE = "_meldestelle._tcp.local."
  private val discoveredServicesMap = ConcurrentHashMap<String, DiscoveredService>()
+  private val registeredSet = ConcurrentHashMap.newKeySet<String>() // key: "${name}@${addr.hostAddress}:$port"
+
+  // Debounce/Guards
+  @Volatile private var lastStartRequestedAt: Long = 0L
+  @Volatile private var lastStartIp: String? = null

  private val _discoveredServices = MutableStateFlow<List<DiscoveredService>>(emptyList())
  override val discoveredServices: StateFlow<List<DiscoveredService>> = _discoveredServices.asStateFlow()

  override fun startDiscovery(preferredIp: String?) {
-    if (jmdnsInstances.isNotEmpty()) return
+    // Debounce schnelle Folgeaufrufe mit identischer IP
+    val now = System.currentTimeMillis()
+    if (jmdnsInstances.isNotEmpty() && lastStartIp == preferredIp && (now - lastStartRequestedAt) < 500) {
+      return
+    }
+    lastStartRequestedAt = now
+    lastStartIp = preferredIp

    val addresses = getRelevantAddresses(preferredIp)
    if (addresses.isEmpty()) {
@@ -112,8 +123,13 @@ class JmDnsDiscoveryService : NetworkDiscoveryService {
        )
      )
      try {
-        jmdns.registerService(serviceInfo)
-        println("[Discovery] Dienst '$name' auf ${jmdns.inetAddress} registriert (Port $port)")
+        val key = "${name}@${jmdns.inetAddress.hostAddress}:$port"
+        if (registeredSet.add(key)) {
+          jmdns.registerService(serviceInfo)
+          println("[Discovery] Dienst '$name' auf ${jmdns.inetAddress} registriert (Port $port)")
+        } else {
+          // bereits registriert – kein Spam
+        }
      } catch (e: Exception) {
        println("[Discovery] Fehler bei Registrierung auf ${jmdns.inetAddress}: ${e.message}")
      }
@@ -130,13 +146,19 @@ class JmDnsDiscoveryService : NetworkDiscoveryService {
      val interfaces = NetworkInterface.getNetworkInterfaces()
      while (interfaces.hasMoreElements()) {
        val iface = interfaces.nextElement()
+        val name = iface.name.lowercase()
+        // Filtere Docker/Bridged/VETH/VM-Schnittstellen heraus
        if (iface.isLoopback || !iface.isUp || iface.isVirtual) continue
+        if (name.startsWith("br-") || name.startsWith("docker") || name.startsWith("veth") || name.contains("vmnet") || name.contains("virbr")) continue

        val inetAddresses = iface.inetAddresses
        while (inetAddresses.hasMoreElements()) {
          val addr = inetAddresses.nextElement()
          // Nur IPv4 für maximale Kompatibilität in lokalen Netzen (ÖTO/FEI Standardumgebungen)
          if (addr is java.net.Inet4Address) {
+            // Exkludiere Link-Local
+            val host = addr.hostAddress
+            if (host.startsWith("169.254.")) continue
            addresses.add(addr)
          }
        }
@@ -145,7 +167,15 @@ class JmDnsDiscoveryService : NetworkDiscoveryService {
      println("[Discovery] Fehler beim Auflisten der Interfaces: ${e.message}")
    }

-    return if (addresses.isEmpty()) listOf(InetAddress.getLocalHost()) else addresses
+    if (addresses.isEmpty()) return listOf(InetAddress.getLocalHost())
+
+    // Bevorzuge private LAN IPv4 (192.168.x.x, 10.x.x.x, 172.16-31.x.x)
+    fun isPrivateIPv4(a: InetAddress): Boolean {
+      val h = a.hostAddress
+      return h.startsWith("192.168.") || h.startsWith("10.") || (h.startsWith("172.") && h.split('.').getOrNull(1)?.toIntOrNull() in 16..31)
+    }
+    return addresses.sortedWith(compareByDescending<InetAddress> { isPrivateIPv4(it) }
+      .thenBy { it.hostAddress })
  }

  override fun getDiscoveredServices(): List<DiscoveredService> {