Better handling of network switching. Better handling of exceptions with mdns

This commit is contained in:
loucass003 committed 2026-10-27 19:15:33 +01:00
1 parent e52e2f8bc0
commit 4bef38a4fd
15 files changed
+265 -67

No files matched your search

@@ -28,6 +28,7 @@ import dev.slimevr.android.serial.AndroidFirmwareFlasher
import dev.slimevr.android.serial.createAndroidSerialServer
import dev.slimevr.android.timing.createAndroidWaiter
import dev.slimevr.android.udp.bindAndroidUdp
import dev.slimevr.android.vrchat.observeAndroidLocalIpAddress
import dev.slimevr.android.vrchat.resolveAndroidLocalIpAddress
import dev.slimevr.bvh.BVHManager
import dev.slimevr.config.AppConfig
@@ -180,11 +181,11 @@ class ForegroundService : Service() {
val boneRouting = BoneRoutingManager.create(scope = scope)
val bvhManager = BVHManager.create(skeleton = skeleton, storage = storage, scope = scope)
val vmcManager = VMCManager.create(scope = scope)
val oscQueryAddress = resolveAndroidLocalIpAddress()
val mdns = createMdns(scope = scope, address = oscQueryAddress, bind = ::bindAndroidMulticast)
val localIpAddress = observeAndroidLocalIpAddress(context = this@ForegroundService, scope = scope)
val mdns = createMdns(scope = scope, localAddress = localIpAddress, bind = ::bindAndroidMulticast)
val vrcOscManager = VRCOSCManager.create(
scope = scope,
oscQueryAddress = oscQueryAddress,
oscQueryAddress = localIpAddress,
browse = mdns.browse,
advertise = mdns.advertise,
)
@@ -1,5 +1,19 @@
package dev.slimevr.android.vrchat
import android.content.Context
import android.net.ConnectivityManager
import android.net.LinkProperties
import android.net.Network
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.callbackFlow
import kotlinx.coroutines.flow.conflate
import kotlinx.coroutines.flow.flowOn
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.stateIn
import java.net.InetAddress
import java.net.NetworkInterface
import java.util.Collections
@@ -18,3 +32,27 @@ fun resolveAndroidLocalIpAddress(): String = try {
} catch (_: Exception) {
InetAddress.getLoopbackAddress().hostAddress
}
/** [resolveAndroidLocalIpAddress], resolved again whenever the default network or its addresses change. */
fun observeAndroidLocalIpAddress(context: Context, scope: CoroutineScope): StateFlow<String> = callbackFlow {
val connectivity = context.getSystemService(ConnectivityManager::class.java)
val callback = object : ConnectivityManager.NetworkCallback() {
override fun onAvailable(network: Network) {
trySend(Unit)
}
override fun onLinkPropertiesChanged(network: Network, linkProperties: LinkProperties) {
trySend(Unit)
}
override fun onLost(network: Network) {
trySend(Unit)
}
}
connectivity.registerDefaultNetworkCallback(callback)
awaitClose { connectivity.unregisterNetworkCallback(callback) }
}
.conflate()
.map { resolveAndroidLocalIpAddress() }
.flowOn(Dispatchers.IO)
.stateIn(scope, SharingStarted.Eagerly, resolveAndroidLocalIpAddress())