Server: patch crashing applications blocks monitor

clients/cli/build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "com.jaytux.phoebench"
-version = rootProject.version as PhoebenchVersion
+version = PhoebenchVersion(1, 2, 1, "patch0")
 
 if((version as PhoebenchVersion) < (rootProject.version as PhoebenchVersion))
     throw GradleException("CLI Client version must be at least as high as protocol/common version")

clients/cli/src/main/kotlin/com/jaytux/phoebench/clients/cli/PersistentStorage.kt

@@ -57,6 +57,7 @@ object PersistentStorage {
 
         override fun write(key: String, value: String) {
             prefs.put(key, value)
+            prefs.flush()
         }
 
         override fun erase(key: String) {

clients/compose/build.gradle.kts

@@ -13,7 +13,7 @@ plugins {
     alias(libs.plugins.buildconfig)
 }
 
-version = rootProject.version as PhoebenchVersion
+version = PhoebenchVersion(1, 2, 1, "autoscroll")
 
 if((version as PhoebenchVersion) < (rootProject.version as PhoebenchVersion))
     throw GradleException("UI Clients version must be at least as high as protocol/common version")

clients/compose/src/commonMain/kotlin/com/jaytux/phoebench/clients/data/ProjectVM.kt

@@ -138,7 +138,11 @@ class ProjectVM(
         when(event) {
             ProjectEvent.Deleted -> back()
             is ProjectEvent.EntryDeleted -> _benchmarks.value = _benchmarks.value.replace({ it.id == event.benchmarkId }) { it.remove(event.id) }
-            is ProjectEvent.VersionChanged -> _labels.value += (event.label.id to Version.fromResponse(event.label))
+            is ProjectEvent.VersionChanged -> {
+                val updVersion = Version.fromResponse(event.label)
+                _labels.value += (event.label.id to updVersion)
+                _benchmarks.value = _benchmarks.value.map { b -> b.copy(entries = b.entries.map { e -> if(e.label.id == event.label.id) e.copy(label = updVersion) else e }) }
+            }
             is ProjectEvent.VersionDeleted -> {
                 _labels.value = _labels.value.filter { it.value.id != event.id }
                 _benchmarks.value = _benchmarks.value.map { it.copy(entries = it.entries.filter { e -> e.label.id != event.id }) }

clients/compose/src/commonMain/kotlin/com/jaytux/phoebench/clients/ui/ProjectView.kt

@@ -6,6 +6,7 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
@@ -161,6 +162,15 @@ fun MonitorMessage(msg: ServerMonitorEvent.ITextEvent) = when(msg) {
 
 @Composable
 fun MonitorDialog(name: String, logs: List<ServerMonitorEvent.ITextEvent>, onClose: () -> Unit, onClear: () -> Unit) {
+    var autoFollow by remember { mutableStateOf(true) }
+    val state = rememberLazyListState()
+
+    LaunchedEffect(autoFollow, logs) {
+        if(autoFollow) {
+            state.animateScrollToItem(logs.size - 1)
+        }
+    }
+
     Dialog(onDismissRequest = onClose, properties = DialogProperties(usePlatformDefaultWidth = false)) {
         Surface(Modifier.padding(15.dp).fillMaxHeight(0.8f).widthIn(min = 300.dp, max = 2000.dp), shape = MaterialTheme.shapes.medium) {
             Column(Modifier.padding(8.dp)) {
@@ -175,9 +185,20 @@ fun MonitorDialog(name: String, logs: List<ServerMonitorEvent.ITextEvent>, onClo
                 }
                 else {
                     CompositionLocalProvider(LocalTextStyle provides LocalTextStyle.current.makeMonospaced()) {
-                        LazyColumn(Modifier.weight(1f).padding(10.dp).background(MaterialTheme.colorScheme.surfaceDim)) {
+                        Box(Modifier.weight(1f)) {
-                            items(logs) {
+                            LazyColumn(Modifier.fillMaxHeight().fillMaxWidth().padding(10.dp).background(MaterialTheme.colorScheme.surfaceDim), state) {
-                                MonitorMessage(it)
+                                items(logs) {
+                                    MonitorMessage(it)
+                                }
+                            }
+
+                            Box(Modifier.align(Alignment.TopEnd).padding(25.dp)) {
+                                val colors = if(autoFollow)
+                                        IconButtonDefaults.iconButtonColors(containerColor = LocalContentColor.current, contentColor = MaterialTheme.colorScheme.surface)
+                                    else IconButtonDefaults.iconButtonColors(containerColor = MaterialTheme.colorScheme.surface, contentColor = LocalContentColor.current)
+                                IconButton({ autoFollow = !autoFollow }, colors = colors) {
+                                    Icon(Lucide.ArrowDownToLine, "Follow")
+                                }
                             }
                         }
                     }

server/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "com.jaytux.phoebench"
-version = rootProject.version as PhoebenchVersion
+version = PhoebenchVersion(1, 2, 1, "patch1")
 
 if((version as PhoebenchVersion) < (rootProject.version as PhoebenchVersion))
     throw GradleException("Server version must be at least as high as protocol/common version")

server/src/main/kotlin/com/jaytux/phoebench/server/Main.kt

@@ -185,7 +185,7 @@ fun Application.module() {
 
             cseAuth(Routes.CSE.monitor,
                 { id, user -> transaction { accessibleProjectCSE(user, id, true) } },
-                ProjectHandler::monitorSetup) { _, _, bus, event ->
+                ProjectHandler::monitorSetup, ProjectHandler::monitorTeardown) { _, _, bus, event ->
                 try {
                     when(event) {
                         is ClientMonitorEvent.ApplicationFinished -> bus.end(ServerMonitorEvent.ApplicationEnd(Clock.System.now(), event.exitCode))

server/src/main/kotlin/com/jaytux/phoebench/server/handlers/Bridge.kt

@@ -282,6 +282,7 @@ inline fun <reified TParams: Any, reified TEvent: Any, TInter, TExtra> Route.wra
     api: CSERoute<TParams, TEvent>,
     noinline extra: suspend (ApplicationCall, TParams) -> TInter,
     noinline setup: suspend (TParams, TInter) -> TExtra,
+    noinline onClose: suspend (TParams, TInter, TExtra) -> Unit,
     noinline handler: suspend (TParams, TInter, TExtra, TEvent) -> Unit
 ) {
     webSocket(api.pattern) {
@@ -292,11 +293,15 @@ inline fun <reified TParams: Any, reified TEvent: Any, TInter, TExtra> Route.wra
 
             val converter = KotlinxWebsocketSerializationConverter(Json)
             val extra = setup(params, inter)
-            for(frame in incoming) {
+            try {
-                handler(params, inter, extra, converter.deserialize<TEvent>(frame))
+                for (frame in incoming) {
+                    handler(params, inter, extra, converter.deserialize<TEvent>(frame))
+                }
+            }
+            finally {
+                onClose(params, inter, extra)
             }
         }
-        catch(e: ClosedReceiveChannelException) {}
         catch(e: RouteError.CSERouteError) {
             close(CloseReason(e.code, e.message ?: "Unknown error"))
         }
@@ -310,6 +315,7 @@ inline fun <reified TParams: Any, reified TEvent: Any, TExtra> Route.wrapAuthCSE
     api: CSERoute<TParams, TEvent>,
     noinline verifyUser: suspend (TParams, User) -> Unit,
     noinline setup: suspend (TParams, User) -> TExtra,
+    noinline onClose: suspend (TParams, User, TExtra) -> Unit,
     noinline handler: suspend (TParams, User, TExtra, TEvent) -> Unit
 ) = wrapCSE<TParams, TEvent, User, TExtra>(
     api = api,
@@ -327,28 +333,32 @@ inline fun <reified TParams: Any, reified TEvent: Any, TExtra> Route.wrapAuthCSE
         user
     },
     setup = setup,
+    onClose = onClose,
     handler = handler
 )
 
 inline fun <reified TParams: Any, reified TEvent: Any, TExtra> Route.cse(
     api: CSERoute<TParams, TEvent>,
-    noinline setup: suspend (TParams, Unit) -> TExtra,
+    noinline setup: suspend (TParams) -> TExtra,
+    noinline onClose: suspend (TParams, TExtra) -> Unit,
     noinline handler: suspend (TParams, TExtra, TEvent) -> Unit
 ) {
     if(api.elevation != Elevation.UN_AUTH) throw IllegalArgumentException("CSE ${api.pattern} can only be used with ${api.elevation}")
-    wrapCSE(api, { _, _ -> }, setup) { params, _, extra, event -> handler(params, extra, event) }
+    wrapCSE(api, { _, _ -> }, { it, _ -> setup(it) }, { p, _, extra -> onClose(p, extra) }) { params, _, extra, event -> handler(params, extra, event) }
 }
 
 inline fun <reified TParams: Any, reified TEvent: Any, TExtra> Route.cseAuth(
     api: CSERoute<TParams, TEvent>, noinline verifyUser: suspend (TParams, User) -> Unit,
-    noinline setup: suspend (TParams, User) -> TExtra, noinline handler: suspend (TParams, User, TExtra, TEvent) -> Unit
+    noinline setup: suspend (TParams, User) -> TExtra, noinline onClose: suspend (TParams, User, TExtra) -> Unit,
+    noinline handler: suspend (TParams, User, TExtra, TEvent) -> Unit
 ) {
     if(api.elevation != Elevation.AUTH) throw IllegalArgumentException("CSE ${api.pattern} can only be used with ${api.elevation}")
-    wrapAuthCSE(api, verifyUser, setup, handler)
+    wrapAuthCSE(api, verifyUser, setup, onClose, handler)
 }
 
 inline fun <reified TParams: Any, reified TEvent: Any, TExtra> Route.cseAdmin(
     api: CSERoute<TParams, TEvent>, noinline setup: suspend (TParams, User) -> TExtra,
+    noinline onClose: suspend (TParams, User, TExtra) -> Unit,
     noinline handler: suspend (TParams, User, TExtra, TEvent) -> Unit
 ) {
     if(api.elevation != Elevation.ADMIN) throw IllegalArgumentException("CSE ${api.pattern} can only be used with ${api.elevation}")
@@ -356,5 +366,5 @@ inline fun <reified TParams: Any, reified TEvent: Any, TExtra> Route.cseAdmin(
         if(!user.isAdmin) {
             throw RouteError.CSERouteError("Admin access required", CloseReasons.NOT_AUTHORIZED)
         }
-    }, setup, handler)
+    }, setup, onClose, handler)
 }

server/src/main/kotlin/com/jaytux/phoebench/server/handlers/ProjectHandler.kt

@@ -402,6 +402,14 @@ object ProjectHandler {
         }
     }
 
+    suspend fun monitorTeardown(
+        id: Uuid, user: User,
+        bus: SSEBus.MonitorSSEBus<ServerMonitorEvent, ServerMonitorEvent.ApplicationStart, ServerMonitorEvent.Message,
+                ServerMonitorEvent.ApplicationEnd, ServerMonitorEvent.Backlog>
+    ) {
+        bus.end(ServerMonitorEvent.ApplicationEnd(Clock.System.now(), -1))
+    }
+
     fun deleteMonitor(user: User, req: Uuid) = transaction {
         checkMigration(user)
         accessibleProject(user, req, true)