diff --git a/app/src/main/kotlin/com/powercess/mbrain/remote/FrpcController.kt b/app/src/main/kotlin/com/powercess/mbrain/remote/FrpcController.kt index 720ee29..78cbc76 100644 --- a/app/src/main/kotlin/com/powercess/mbrain/remote/FrpcController.kt +++ b/app/src/main/kotlin/com/powercess/mbrain/remote/FrpcController.kt @@ -132,6 +132,9 @@ class FrpcController( entries.keys.toList().forEach(::stop) scope.cancel() } + + // Await asynchronous process/config cleanup before deleting the owner's directory. + internal suspend fun awaitTermination() { scope.coroutineContext.job.join() } } private fun privateFile(directory: File, name: String, text: String): File = File(directory, name).apply { diff --git a/app/src/test/kotlin/com/powercess/mbrain/remote/FrpcControllerTest.kt b/app/src/test/kotlin/com/powercess/mbrain/remote/FrpcControllerTest.kt index 0c6a2d7..241daa7 100644 --- a/app/src/test/kotlin/com/powercess/mbrain/remote/FrpcControllerTest.kt +++ b/app/src/test/kotlin/com/powercess/mbrain/remote/FrpcControllerTest.kt @@ -2,6 +2,7 @@ package com.powercess.mbrain.remote import org.junit.Assert.* import org.junit.Test +import kotlinx.coroutines.runBlocking import java.io.* import java.nio.file.Files import java.util.concurrent.CopyOnWriteArrayList @@ -62,7 +63,7 @@ class FrpcControllerTest { await { processes.none { it.isAlive } && directory.listFiles().orEmpty().isEmpty() } Thread.sleep(1100) assertEquals(4, processes.size) - } finally { controller.close(); directory.deleteRecursively() } + } finally { controller.close(); runBlocking { controller.awaitTermination() }; directory.deleteRecursively() } } @Test fun `custom service survives MCP shutdown and endpoint edits restart only its process`() { @@ -95,7 +96,7 @@ class FrpcControllerTest { assertTrue(replacementProcess.isAlive) controller.close() await { processes.none { it.isAlive } && directory.listFiles().orEmpty().isEmpty() } - } finally { controller.close(); directory.deleteRecursively() } + } finally { controller.close(); runBlocking { controller.awaitTermination() }; directory.deleteRecursively() } } @Test fun `repeated retries retain one error until connection recovers`() { val directory = Files.createTempDirectory("frpc-retry-test").toFile() @@ -123,7 +124,7 @@ class FrpcControllerTest { process.line("start proxy success") await { states[tunnel.id]?.phase == TunnelPhase.CONNECTED } assertNull(states.getValue(tunnel.id).error) - } finally { controller.close(); directory.deleteRecursively() } + } finally { controller.close(); runBlocking { controller.awaitTermination() }; directory.deleteRecursively() } } }