Skip to content

A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.

feat(hostbridge): start guest host bridge over VM lifecycle

ExTv0aa513d60f25
diff --git a/app/src/main/java/com/excp/podroid/service/PodroidService.kt b/app/src/main/java/com/excp/podroid/service/PodroidService.kt
index 89b685d..8a2f0d4 100644
--- a/app/src/main/java/com/excp/podroid/service/PodroidService.kt
+++ b/app/src/main/java/com/excp/podroid/service/PodroidService.kt
@@ -48,6 +48,8 @@ class PodroidService : Service() {
@Inject lateinit var portForwardRepository: PortForwardRepository
@Inject lateinit var settingsRepository: SettingsRepository
@Inject lateinit var usbPassthroughManager: UsbPassthroughManager
+ @Inject lateinit var notificationPoster: com.excp.podroid.engine.hostbridge.AndroidNotificationPoster
+ private var hostRequestServer: com.excp.podroid.engine.hostbridge.HostRequestServer? = null
private val serviceScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
private var notificationJob: Job? = null
@@ -130,6 +132,7 @@ class PodroidService : Service() {
override fun onDestroy() {
super.onDestroy()
notificationJob?.cancel()
+ hostRequestServer?.stop()
usbPassthroughManager.stop()
releaseWakeLock()
serviceScope.cancel()
@@ -263,6 +266,33 @@ class PodroidService : Service() {
}
}
+ private fun ensureHostBridge(): com.excp.podroid.engine.hostbridge.HostRequestServer {
+ hostRequestServer?.let { return it }
+ val dispatcher = com.excp.podroid.engine.hostbridge.HostRequestDispatcher(
+ notifications = notificationPoster,
+ addForward = { portForwardRepository.addRule(it) },
+ removeForward = { portForwardRepository.removeRule(it) },
+ listForwards = { portForwardRepository.getRulesSnapshot() },
+ )
+ return com.excp.podroid.engine.hostbridge.HostRequestServer(
+ openTransport = { engine.openHostTransport() },
+ dispatcher = dispatcher,
+ scope = serviceScope,
+ ).also { hostRequestServer = it }
+ }
+
+ /** Always-on: starts the guest host bridge on Running, stops it on terminal. */
+ private suspend fun observeStateForHostBridge() {
+ engine.state.collect { state ->
+ when (state) {
+ is VmState.Running -> ensureHostBridge().start()
+ is VmState.Stopped, is VmState.Idle, is VmState.Error ->
+ hostRequestServer?.stop()
+ else -> {}
+ }
+ }
+ }
+
private fun launchPodroid() {
serviceScope.launch {
startNotificationUpdates()
@@ -304,6 +334,7 @@ class PodroidService : Service() {
x11Dpi = settingsRepository.getX11DpiSnapshot(),
usbPassthroughEnabled = settingsRepository.getUsbPassthroughEnabledSnapshot(),
)
+ serviceScope.launch { observeStateForHostBridge() }
if (config.usbPassthroughEnabled) {
serviceScope.launch { observeStateForUsb() }
}