From da4b030234e62775143247da071cadd47aed7b25 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Mon, 27 Oct 2025 11:50:33 +0800
Subject: [PATCH] =?UTF-8?q?udp=E4=BB=A3=E7=90=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../client/core/UdpProxyChannelHandler.java   | 12 +++--
 .../client/core/UdpRealServerHandler.java     |  2 +
 .../client/util/LockChannel.java              |  4 +-
 .../client/util/UdpServerUtil.java            | 48 +++++++++++++++----
 4 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/UdpProxyChannelHandler.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/UdpProxyChannelHandler.java
index 8504e20f..4d940921 100644
--- a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/UdpProxyChannelHandler.java
+++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/UdpProxyChannelHandler.java
@@ -63,16 +63,18 @@ public class UdpProxyChannelHandler extends SimpleChannelInboundHandler<ProxyMes
             IdleStateEvent event = (IdleStateEvent)evt;
             switch (event.state()) {
                 case READER_IDLE:
-                    // 读超时，断开连接
-                    log.info("[UDP Proxy Channel]Read timeout");
-                    ctx.channel().close();
+                    if (ctx.channel().isWritable()) {
+                        // 读超时，断开连接
+                        log.info("[UDP Proxy Channel]Read timeout");
+                        ctx.channel().close();
+                    }
                     break;
                 case WRITER_IDLE:
                     ctx.channel().writeAndFlush(ProxyMessage.buildHeartbeatMessage());
                     break;
                 case ALL_IDLE:
-                    log.debug("[UDP Proxy Channel]ReadWrite timeout");
-                    ctx.close();
+                    // log.debug("[UDP Proxy Channel]ReadWrite timeout");
+                    // ctx.close();
                     break;
             }
         }
diff --git a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/UdpRealServerHandler.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/UdpRealServerHandler.java
index 1a288e88..e48b4500 100644
--- a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/UdpRealServerHandler.java
+++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/UdpRealServerHandler.java
@@ -9,6 +9,7 @@ import org.dromara.neutrinoproxy.client.util.UdpChannelBindInfo;
 import org.dromara.neutrinoproxy.core.ProxyMessage;
 
 import java.net.InetSocketAddress;
+import java.util.Date;
 
 /**
  * @author: aoshiguchen
@@ -36,6 +37,7 @@ public class UdpRealServerHandler extends SimpleChannelInboundHandler<DatagramPa
             );
 
             udpChannelBindInfo.getLockChannel().setResponseCount(udpChannelBindInfo.getLockChannel().getResponseCount() + 1);
+            udpChannelBindInfo.getLockChannel().setLastActiveTime(new Date());
         }
     }
 }
diff --git a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/util/LockChannel.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/util/LockChannel.java
index d694ba83..3339afb6 100644
--- a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/util/LockChannel.java
+++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/util/LockChannel.java
@@ -23,6 +23,8 @@ public class LockChannel {
     private long proxyTimeoutMs;
     // 被获取的时间
     private Date takeTime;
-    // 已经响应的次数
+    // 最后一次活跃的时间（最后发生读写的时间）,每次发送或响应需要重置
+    private Date lastActiveTime;
+    // 已经响应的次数(相对于最后一次发送的时，每次发送后需要重置)
     private int responseCount;
 }
diff --git a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/util/UdpServerUtil.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/util/UdpServerUtil.java
index 02f47437..8f269ae5 100644
--- a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/util/UdpServerUtil.java
+++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/util/UdpServerUtil.java
@@ -133,28 +133,40 @@ public class UdpServerUtil {
      * @return
      */
     public static synchronized Channel takeChannel(ProxyMessage.UdpBaseInfo info, Channel tunnelChannel) {
-        if (info.getProxyResponses() <= 0 || info.getProxyTimeoutMs() <= 0) {
+        Channel realServerChannel = tunnelChannel.attr(org.dromara.neutrinoproxy.core.Constants.NEXT_CHANNEL).get();
+        if (null != realServerChannel) {
+            UdpChannelBindInfo udpChannelBindInfo = realServerChannel.attr(Constants.UDP_CHANNEL_BIND_KEY).get();
+            // 每次发送前重置
+            udpChannelBindInfo.getLockChannel().setResponseCount(0);
+            udpChannelBindInfo.getLockChannel().setLastActiveTime(new Date());
+
+            return realServerChannel;
+        }
+        // 响应数量为零、超时时间<=0，则不需要响应（注意：响应数量为-1 则不限制响应数量）
+        if (info.getProxyResponses() == 0 || info.getProxyTimeoutMs() <= 0) {
             return defaultUdpServerChannel;
         }
+        // 没有空闲的 傀儡端口，降级为不需要响应
         Integer port = udpServerFreePortPool.poll();
         if (null == port) {
             return defaultUdpServerChannel;
         }
-        Channel channel = portToChannelMap.get(port);
-        if (null == channel) {
-            channel = bindPort(port);
-            portToChannelMap.put(port, channel);
+        realServerChannel = portToChannelMap.get(port);
+        if (null == realServerChannel) {
+            realServerChannel = bindPort(port);
+            portToChannelMap.put(port, realServerChannel);
         }
         // 添加到锁定队列
         LockChannel lockChannel = new LockChannel()
                 .setPort(port)
-                .setChannel(channel)
+                .setChannel(realServerChannel)
                 .setProxyResponses(info.getProxyResponses())
                 .setProxyTimeoutMs(info.getProxyTimeoutMs())
                 .setTakeTime(new Date())
+                .setLastActiveTime(new Date())
                 .setResponseCount(0);
         lockChannelList.add(lockChannel);
-        channel.attr(Constants.UDP_CHANNEL_BIND_KEY).set(new UdpChannelBindInfo()
+        realServerChannel.attr(Constants.UDP_CHANNEL_BIND_KEY).set(new UdpChannelBindInfo()
                 .setTunnelChannel(tunnelChannel)
                 .setVisitorId(info.getVisitorId())
                 .setVisitorIp(info.getVisitorIp())
@@ -164,7 +176,12 @@ public class UdpServerUtil {
                 .setTargetPort(info.getTargetPort())
                 .setLockChannel(lockChannel)
         );
-        return channel;
+
+        // 连接绑定
+        realServerChannel.attr(org.dromara.neutrinoproxy.core.Constants.NEXT_CHANNEL).set(tunnelChannel);
+        tunnelChannel.attr(org.dromara.neutrinoproxy.core.Constants.NEXT_CHANNEL).set(realServerChannel);
+
+        return realServerChannel;
     }
 
     /**
@@ -177,8 +194,8 @@ public class UdpServerUtil {
         Iterator<LockChannel> iter = lockChannelList.iterator();
         if (iter.hasNext()) {
             LockChannel lockChannel = iter.next();
-            if (lockChannel.getResponseCount() >= lockChannel.getProxyResponses() ||
-                    System.currentTimeMillis() - lockChannel.getTakeTime().getTime() >= lockChannel.getProxyTimeoutMs()
+            if ((lockChannel.getProxyResponses() > 0 && lockChannel.getResponseCount() >= lockChannel.getProxyResponses()) ||
+                    System.currentTimeMillis() - lockChannel.getLastActiveTime().getTime() > lockChannel.getProxyTimeoutMs()
             ) {
                 iter.remove();
                 UdpChannelBindInfo udpChannelBindInfo = lockChannel.getChannel().attr(Constants.UDP_CHANNEL_BIND_KEY).get();
@@ -186,6 +203,17 @@ public class UdpServerUtil {
                 closeChannel(udpChannelBindInfo.getTunnelChannel());
                 lockChannel.getChannel().attr(Constants.UDP_CHANNEL_BIND_KEY).set(null);
                 udpServerFreePortPool.offer(lockChannel.getPort());
+
+                // 连接解绑
+                Channel realServerChannel = lockChannel.getChannel();
+                Channel tunnelChannel = realServerChannel.attr(org.dromara.neutrinoproxy.core.Constants.NEXT_CHANNEL).get();
+                if (null != realServerChannel) {
+                    realServerChannel.attr(org.dromara.neutrinoproxy.core.Constants.NEXT_CHANNEL).set(null);
+                }
+                if (null != tunnelChannel) {
+                    tunnelChannel.attr(org.dromara.neutrinoproxy.core.Constants.NEXT_CHANNEL).set(null);
+                }
+
                 log.debug("[udp channel]release udp channel port:{}", lockChannel.getPort());
             }
         }