github/SlimeVR-Server
1
1
Fork 0
mirror of https://github.com/SlimeVR/SlimeVR-Server.git synced 2026-04-06 02:01:58 +02:00
Code Issues 159 Packages Projects Releases Wiki Activity

Proper handling of the reconnect on ota and serial

Browse Source
This commit is contained in:
loucass003
2026-03-26 19:05:40 +01:00
parent 5946ca1b7a
commit fc476a1683
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/core/src/main/java/dev/slimevr/firmware/ota.kt
View File

@@ -12,6 +12,9 @@ import io.ktor.utils.io.core.writeFully
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.withContext
import kotlinx.coroutines.withTimeout
@@ -154,14 +157,15 @@ suspend fun doOtaFlash(
onStatus(FirmwareUpdateStatus.REBOOTING, 0)
// wait for the tracker with the correct id to come online
// Wait for the device to come back online after reboot.
// flatMapLatest switches to the matched device's own state flow so that
// status changes (which don't emit a new VRServerState) are also observed.
@OptIn(ExperimentalCoroutinesApi::class)
val connected = withTimeoutOrNull(60_000) {
server.context.state
.map { state ->
state.devices.values.any {
it.context.state.value.id.toUByte() == deviceId.id &&
it.context.state.value.status != TrackerStatus.DISCONNECTED
}
.flatMapLatest { state ->
val device = state.devices.values.find { it.context.state.value.id.toUByte() == deviceId.id }
device?.context?.state?.map { it.status != TrackerStatus.DISCONNECTED } ?: flowOf(false)
}
.filter { it }
.first()

11
server/core/src/main/java/dev/slimevr/firmware/serial.kt
View File

@@ -10,6 +10,8 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.mapNotNull
import kotlinx.coroutines.launch
@@ -181,13 +183,12 @@ internal suspend fun doSerialFlashPostFlash(
}
// wait for the tracker with that MAC to connect to the server via UDP
@OptIn(ExperimentalCoroutinesApi::class)
val connected = withTimeoutOrNull(60_000) {
server.context.state
.map { state ->
state.devices.values.any {
it.context.state.value.macAddress?.uppercase() == macAddress &&
it.context.state.value.status != TrackerStatus.DISCONNECTED
}
.flatMapLatest { state ->
val device = state.devices.values.find { it.context.state.value.macAddress?.uppercase() == macAddress }
device?.context?.state?.map { it.status != TrackerStatus.DISCONNECTED } ?: flowOf(false)
}
.filter { it }
.first()