From feff334c91a4317184505d3e4a5ad3788c6835c6 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 9 Nov 2026 13:15:54 -0500 Subject: [PATCH] fix(agent): a native command's stdin is written beside its timeout --- .../java/com/droiddeck/launcher/agent/AgentNative.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentNative.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentNative.kt index ef35dd145..0d2fffc73 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentNative.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentNative.kt @@ -30,7 +30,14 @@ object AgentNative { Thread { drain(process.inputStream, out) }, Thread { drain(process.errorStream, err) }, ).onEach { it.isDaemon = true; it.start() } - process.outputStream.use { stdin -> request.optString("stdin").takeIf { it.isNotEmpty() }?.let { stdin.write(it.toByteArray()) } } + // written beside the wait: a program that never reads more than a pipe holds would block it + val input = request.optString("stdin").toByteArray() + Thread { + try { + process.outputStream.use { stdin -> if (input.isNotEmpty()) stdin.write(input) } + } catch (_: java.io.IOException) { + } + }.apply { isDaemon = true; start() } val finished = process.waitFor(timeoutMs, TimeUnit.MILLISECONDS) if (!finished) process.destroyForcibly().waitFor() readers.forEach { it.join(2000) }