clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-24 06:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Retry Android desktop bridge startup on bind races

Browse Source 
Co-authored-by: Codex <noreply@openai.com>
This commit is contained in:
Iliyan Malchev
2026-03-30 11:01:08 -07:00
parent 08b3c19b8c
commit c122ff283f
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
android/app/src/main/java/com/openai/codex/agent/DesktopBridgeServer.kt
View File

@@ -29,6 +29,7 @@ object DesktopBridgeServer {
private const val ATTACH_THREAD_WAIT_MS = 5_000L
private const val ATTACH_THREAD_POLL_MS = 100L
private const val BRIDGE_STARTUP_WAIT_MS = 5_000L
private const val BRIDGE_STARTUP_RETRY_DELAY_MS = 100L
private val authorizedTokens = ConcurrentHashMap.newKeySet<String>()
private val attachTokens = ConcurrentHashMap<String, AttachedSessionTarget>()
@@ -61,7 +62,10 @@ object DesktopBridgeServer {
runCatching { running.stop(100) }
server = null
}
AgentDesktopBridgeSocketServer(context.applicationContext).also { candidate ->
val startupDeadline = SystemClock.elapsedRealtime() + BRIDGE_STARTUP_WAIT_MS
while (SystemClock.elapsedRealtime() < startupDeadline) {
val candidate = AgentDesktopBridgeSocketServer(context.applicationContext)
candidate.setReuseAddr(true)
server = candidate
candidate.start()
if (candidate.awaitStartup(BRIDGE_STARTUP_WAIT_MS)) {
@@ -69,16 +73,25 @@ object DesktopBridgeServer {
return
}
val startupFailure = candidate.startupFailureMessage()
runCatching { candidate.stop(100) }
if (server === candidate) {
server = null
}
if (
startupFailure?.contains("Address already in use", ignoreCase = true) == true &&
SystemClock.elapsedRealtime() + BRIDGE_STARTUP_RETRY_DELAY_MS < startupDeadline
) {
SystemClock.sleep(BRIDGE_STARTUP_RETRY_DELAY_MS)
continue
}
if (startupFailure != null) {
Log.w(TAG, "Desktop bridge failed to start after bootstrap: $startupFailure")
} else {
Log.w(TAG, "Desktop bridge failed to start within ${BRIDGE_STARTUP_WAIT_MS}ms; clearing state")
}
runCatching { candidate.stop(100) }
if (server === candidate) {
server = null
}
return
}
Log.w(TAG, "Desktop bridge startup retries exhausted within ${BRIDGE_STARTUP_WAIT_MS}ms")
}
}