From d4d5749ccc6e7939c9ab19a34e5048cd277eeaee Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 6 Mar 2026 10:01:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20OPC=20UA=20event=5Floop=20?=
 =?UTF-8?q?=E7=9B=91=E6=8E=A7=E5=92=8C=E9=87=8D=E8=BF=9E=E6=9C=BA=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/connection.rs | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/src/connection.rs b/src/connection.rs
index 2dba2fa..c173d7b 100644
--- a/src/connection.rs
+++ b/src/connection.rs
@@ -99,6 +99,7 @@ pub struct ConnectionStatus {
     poll_handle: Option<JoinHandle<()>>, // 统一的轮询任务句柄
     heartbeat_handle: Option<JoinHandle<()>>, // 心跳任务句柄
     event_loop_handle: Option<JoinHandle<opcua::types::StatusCode>>, // event_loop 任务句柄
+    event_loop_monitor_handle: Option<JoinHandle<()>>, // event_loop 监控任务句柄
 }
 
 #[derive(Clone)]
@@ -579,6 +580,33 @@ impl ConnectionManager {
         };
 
         let event_loop_handle = event_loop.spawn();
+
+        // 添加监控任务来捕获 event_loop 结束事件
+        let manager = self.clone();
+        let source_id_copy = source_id;
+        let event_loop_monitor_handle = tokio::spawn(async move {
+            match event_loop_handle.await {
+                Ok(status) => {
+                    tracing::warn!(
+                        "OPCUA event loop ended for source {}: {:?}",
+                        source_id_copy,
+                        status
+                    );
+                }
+                Err(e) => {
+                    tracing::error!(
+                        "OPCUA event loop panic for source {}: {}",
+                        source_id_copy,
+                        e
+                    );
+                }
+            }
+
+            // 统一触发重连
+            if let Some(tx) = manager.reconnect_tx.as_ref() {
+                let _ = tx.send(source_id_copy);
+            }
+        });
         
         if !session.wait_for_connection().await {
             let error = "Session connection failed".to_string();
@@ -601,7 +629,8 @@ impl ConnectionManager {
                 poll_points: Arc::new(Vec::new()),
                 poll_handle: None,
                 heartbeat_handle: None,
-                event_loop_handle: Some(event_loop_handle),
+                event_loop_handle: None, // event_loop_handle 已被移动到监控任务中
+                event_loop_monitor_handle: Some(event_loop_monitor_handle),
             },
         );
         drop(status); // 显式释放锁，在调用 start_unified_poll_task 之前
@@ -633,6 +662,7 @@ impl ConnectionManager {
                 poll_handle: None,
                 heartbeat_handle: None,
                 event_loop_handle: None,
+                event_loop_monitor_handle: None,
             },
         );
     }
@@ -673,6 +703,10 @@ impl ConnectionManager {
                 if let Some(handle) = conn_status.event_loop_handle.take() {
                     handle.abort();
                 }
+                // 停止 event_loop 监控任务
+                if let Some(handle) = conn_status.event_loop_monitor_handle.take() {
+                    handle.abort();
+                }
             }
         }
 
@@ -709,6 +743,10 @@ impl ConnectionManager {
                     if let Some(handle) = conn_status.event_loop_handle.take() {
                         handle.abort();
                     }
+                    // 停止 event_loop 监控任务
+                    if let Some(handle) = conn_status.event_loop_monitor_handle.take() {
+                        handle.abort();
+                    }
                 }
             }