fix(android): gate sendNodeEvent on handshake completion via isHandshakeComplete flag

hclsys · hclsys · commit 7a7d27ed87f0 · 2026-05-10T16:28:21.000+08:00
The previous approach moved currentConnection assignment to after conn.connect()
returned, but onConnected fires INSIDE connect() (via connectDeferred.complete),
creating a window where the test observes the connected state before
currentConnection is set.

Add Connection.isHandshakeComplete (set before onConnected in handleConnectSuccess)
and check it in sendNodeEvent/sendNodeEventDetailed. Keep currentConnection
assignment before connect() so the reference is stable during reconnect loops.
diff --git a/apps/android/app/src/main/java/ai/openclaw/app/gateway/GatewaySession.kt b/apps/android/app/src/main/java/ai/openclaw/app/gateway/GatewaySession.kt
@@ -217,7 +217,7 @@ class GatewaySession(
     event: String,
     payloadJson: String?,
   ): Boolean {
-    val conn = currentConnection ?: return false
+    val conn = currentConnection?.takeIf { it.isHandshakeComplete } ?: return false
     return try {
       conn.request(
         "node.event",
@@ -259,7 +259,7 @@ class GatewaySession(
     timeoutMs: Long = 8_000,
   ): RpcResult {
     val conn =
-      currentConnection
+      currentConnection?.takeIf { it.isHandshakeComplete }
         ?: return RpcResult(
           ok = false,
           payloadJson = null,
@@ -332,6 +332,7 @@ class GatewaySession(
   ) {
     private val connectDeferred = CompletableDeferred<Unit>()
     private val closedDeferred = CompletableDeferred<Unit>()
+    @Volatile var isHandshakeComplete = false
     private val isClosed = AtomicBoolean(false)
     private val connectNonceDeferred = CompletableDeferred<String>()
     private val client: OkHttpClient = buildClient()
@@ -617,6 +618,7 @@ class GatewaySession(
           ?.get("sessionDefaults")
           .asObjectOrNull()
       mainSessionKey = sessionDefaults?.get("mainSessionKey").asStringOrNull()
+      isHandshakeComplete = true
       onConnected(serverName, remoteAddress, mainSessionKey)
     }
 
@@ -898,9 +900,9 @@ class GatewaySession(
           target.options,
           target.tls,
         )
+      currentConnection = conn
       try {
         conn.connect()
-        currentConnection = conn
         conn.awaitClose()
       } finally {
         currentConnection = null
