refactor(android): return sendNodeEvent status to callers

This commit is contained in:
Ayaan Zaidi
2026-02-25 11:32:19 +05:30
committed by Ayaan Zaidi
parent b065265b73
commit 81752564e9
4 changed files with 24 additions and 25 deletions

View File

@@ -378,7 +378,7 @@ class NodeRuntime(context: Context) {
"Restore canvas now for session=$sessionKey source=$source. " +
"If existing A2UI state exists, replay it immediately. " +
"If not, create and render a compact mobile-friendly dashboard in Canvas."
try {
val sent =
nodeSession.sendNodeEvent(
event = "agent.request",
payloadJson =
@@ -389,15 +389,7 @@ class NodeRuntime(context: Context) {
put("deliver", JsonPrimitive(false))
}.toString(),
)
scope.launch {
delay(20_000)
if (canvasRehydrateSeq.get() != requestId) return@launch
if (!_canvasRehydratePending.value) return@launch
if (_canvasA2uiHydrated.value) return@launch
_canvasRehydratePending.value = false
_canvasRehydrateErrorText.value = "No canvas update yet. Tap to retry."
}
} catch (err: Throwable) {
if (!sent) {
if (!force) {
didAutoRequestCanvasRehydrate = false
}
@@ -405,7 +397,16 @@ class NodeRuntime(context: Context) {
_canvasRehydratePending.value = false
_canvasRehydrateErrorText.value = "Failed to request restore. Tap to retry."
}
Log.w("OpenClawCanvas", "canvas rehydrate request failed (${source}): ${err.message}")
Log.w("OpenClawCanvas", "canvas rehydrate request failed ($source): transport unavailable")
return@launch
}
scope.launch {
delay(20_000)
if (canvasRehydrateSeq.get() != requestId) return@launch
if (!_canvasRehydratePending.value) return@launch
if (_canvasA2uiHydrated.value) return@launch
_canvasRehydratePending.value = false
_canvasRehydrateErrorText.value = "No canvas update yet. Tap to retry."
}
}
}
@@ -733,7 +734,7 @@ class NodeRuntime(context: Context) {
val connected = _nodeConnected.value
var error: String? = null
if (connected) {
try {
val sent =
nodeSession.sendNodeEvent(
event = "agent.request",
payloadJson =
@@ -745,8 +746,8 @@ class NodeRuntime(context: Context) {
put("key", JsonPrimitive(actionId))
}.toString(),
)
} catch (e: Throwable) {
error = e.message ?: "send failed"
if (!sent) {
error = "send failed"
}
} else {
error = "gateway not connected"

View File

@@ -261,11 +261,7 @@ class ChatController(
val key = _sessionKey.value
try {
if (supportsChatSubscribe) {
try {
session.sendNodeEvent("chat.subscribe", """{"sessionKey":"$key"}""")
} catch (_: Throwable) {
// best-effort
}
session.sendNodeEvent("chat.subscribe", """{"sessionKey":"$key"}""")
}
val historyJson = session.request("chat.history", """{"sessionKey":"$key"}""")

View File

@@ -131,8 +131,8 @@ class GatewaySession(
fun currentCanvasHostUrl(): String? = canvasHostUrl
fun currentMainSessionKey(): String? = mainSessionKey
suspend fun sendNodeEvent(event: String, payloadJson: String?) {
val conn = currentConnection ?: return
suspend fun sendNodeEvent(event: String, payloadJson: String?): Boolean {
val conn = currentConnection ?: return false
val parsedPayload = payloadJson?.let { parseJsonOrNull(it) }
val params =
buildJsonObject {
@@ -147,8 +147,10 @@ class GatewaySession(
}
try {
conn.request("node.event", params, timeoutMs = 8_000)
return true
} catch (err: Throwable) {
Log.w("OpenClawGateway", "node.event failed: ${err.message ?: err::class.java.simpleName}")
return false
}
}

View File

@@ -385,12 +385,12 @@ class TalkModeManager(
val key = sessionKey.trim()
if (key.isEmpty()) return
if (chatSubscribedSessionKey == key) return
try {
session.sendNodeEvent("chat.subscribe", """{"sessionKey":"$key"}""")
val sent = session.sendNodeEvent("chat.subscribe", """{"sessionKey":"$key"}""")
if (sent) {
chatSubscribedSessionKey = key
Log.d(tag, "chat.subscribe ok sessionKey=$key")
} catch (err: Throwable) {
Log.w(tag, "chat.subscribe failed sessionKey=$key err=${err.message ?: err::class.java.simpleName}")
} else {
Log.w(tag, "chat.subscribe failed sessionKey=$key")
}
}