代码优化

neutrino-core/src/test/java/fun/asgc/neutrino/core/aop/AsgcProxyGeneratorTest.java

@@ -56,6 +56,7 @@ public class AsgcProxyGeneratorTest {
 	}
 
 	public static class A implements Handler<String,String>{
+		@Override
 		public void handle(String s, String s2) {
 			System.out.println("hello");
 		}

neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ClientChannelHandler.java

@@ -26,7 +26,7 @@ import fun.asgc.neutrino.core.base.DefaultDispatcher;
 import fun.asgc.neutrino.core.base.Dispatcher;
 import fun.asgc.neutrino.core.util.BeanManager;
 import fun.asgc.neutrino.core.util.LockUtil;
-import fun.asgc.neutrino.proxy.client.util.ClientChannelMannager;
+import fun.asgc.neutrino.proxy.client.util.ProxyUtil;
 import fun.asgc.neutrino.proxy.core.*;
 import io.netty.channel.*;
 import lombok.extern.slf4j.Slf4j;
@@ -75,10 +75,10 @@ public class ClientChannelHandler extends SimpleChannelInboundHandler<ProxyMessa
     @Override
     public void channelInactive(ChannelHandlerContext ctx) throws Exception {
         // 控制连接
-        if (ClientChannelMannager.getCmdChannel() == ctx.channel()) {
+        if (ProxyUtil.getCmdChannel() == ctx.channel()) {
             log.info("与服务端断开连接");
-            ClientChannelMannager.setCmdChannel(null);
+            ProxyUtil.setCmdChannel(null);
-            ClientChannelMannager.clearRealServerChannels();
+            ProxyUtil.clearRealServerChannels();
         } else {
             // 数据传输连接
             Channel realServerChannel = ctx.channel().attr(Constants.NEXT_CHANNEL).get();
@@ -87,7 +87,7 @@ public class ClientChannelHandler extends SimpleChannelInboundHandler<ProxyMessa
             }
         }
 
-        ClientChannelMannager.removeProxyChanel(ctx.channel());
+        ProxyUtil.removeProxyChanel(ctx.channel());
         super.channelInactive(ctx);
     }
 

neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/ProxyClientRunner.java

@@ -31,7 +31,7 @@ import fun.asgc.neutrino.core.util.ArrayUtil;
 import fun.asgc.neutrino.core.util.FileUtil;
 import fun.asgc.neutrino.core.util.StringUtil;
 import fun.asgc.neutrino.proxy.client.config.ProxyConfig;
-import fun.asgc.neutrino.proxy.client.util.ClientChannelMannager;
+import fun.asgc.neutrino.proxy.client.util.ProxyUtil;
 import fun.asgc.neutrino.proxy.core.*;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.ChannelFuture;
@@ -114,7 +114,7 @@ public class ProxyClientRunner implements ApplicationRunner {
 				public void operationComplete(ChannelFuture future) throws Exception {
 					if (future.isSuccess()) {
 						// 连接成功，向服务器发送客户端认证信息（clientKey）
-						ClientChannelMannager.setCmdChannel(future.channel());
+						ProxyUtil.setCmdChannel(future.channel());
 						future.channel().writeAndFlush(ProxyMessage.buildAuthMessage(proxyConfig.getLicenseKey()));
 						log.info("连接代理服务成功.");
 					} else {

neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/core/RealServerChannelHandler.java

@@ -22,7 +22,7 @@
 
 package fun.asgc.neutrino.proxy.client.core;
 
-import fun.asgc.neutrino.proxy.client.util.ClientChannelMannager;
+import fun.asgc.neutrino.proxy.client.util.ProxyUtil;
 import fun.asgc.neutrino.proxy.core.Constants;
 import fun.asgc.neutrino.proxy.core.ProxyMessage;
 import io.netty.buffer.ByteBuf;
@@ -49,7 +49,7 @@ public class RealServerChannelHandler extends SimpleChannelInboundHandler<ByteBu
         } else {
             byte[] bytes = new byte[buf.readableBytes()];
             buf.readBytes(bytes);
-            String userId = ClientChannelMannager.getRealServerChannelUserId(realServerChannel);
+            String userId = ProxyUtil.getRealServerChannelUserId(realServerChannel);
             channel.writeAndFlush(ProxyMessage.buildTransferMessage(userId, bytes));
         }
     }
@@ -62,8 +62,8 @@ public class RealServerChannelHandler extends SimpleChannelInboundHandler<ByteBu
     @Override
     public void channelInactive(ChannelHandlerContext ctx) throws Exception {
         Channel realServerChannel = ctx.channel();
-        String userId = ClientChannelMannager.getRealServerChannelUserId(realServerChannel);
+        String userId = ProxyUtil.getRealServerChannelUserId(realServerChannel);
-        ClientChannelMannager.removeRealServerChannel(userId);
+        ProxyUtil.removeRealServerChannel(userId);
         Channel channel = realServerChannel.attr(Constants.NEXT_CHANNEL).get();
         if (channel != null) {
             channel.writeAndFlush(ProxyMessage.buildDisconnectMessage(userId));

neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageConnectHandler.java

@@ -28,7 +28,7 @@ import fun.asgc.neutrino.core.annotation.Match;
 import fun.asgc.neutrino.core.annotation.NonIntercept;
 import fun.asgc.neutrino.proxy.client.config.ProxyConfig;
 import fun.asgc.neutrino.proxy.client.core.ProxyChannelBorrowListener;
-import fun.asgc.neutrino.proxy.client.util.ClientChannelMannager;
+import fun.asgc.neutrino.proxy.client.util.ProxyUtil;
 import fun.asgc.neutrino.proxy.core.*;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.*;
@@ -66,7 +66,7 @@ public class ProxyMessageConnectHandler implements ProxyMessageHandler {
 					realServerChannel.config().setOption(ChannelOption.AUTO_READ, false);
 
 					// 获取连接
-					ClientChannelMannager.borrowProxyChanel(bootstrap, new ProxyChannelBorrowListener() {
+					ProxyUtil.borrowProxyChanel(bootstrap, new ProxyChannelBorrowListener() {
 
 						@Override
 						public void success(Channel channel) {
@@ -78,8 +78,8 @@ public class ProxyMessageConnectHandler implements ProxyMessageHandler {
 							channel.writeAndFlush(ProxyMessage.buildConnectMessage(userId + "@" + ProxyConfig.instance.getLicenseKey()));
 
 							realServerChannel.config().setOption(ChannelOption.AUTO_READ, true);
-							ClientChannelMannager.addRealServerChannel(userId, realServerChannel);
+							ProxyUtil.addRealServerChannel(userId, realServerChannel);
-							ClientChannelMannager.setRealServerChannelUserId(realServerChannel, userId);
+							ProxyUtil.setRealServerChannelUserId(realServerChannel, userId);
 						}
 
 						@Override

neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/handler/ProxyMessageDisconnectHandler.java

@@ -25,7 +25,7 @@ package fun.asgc.neutrino.proxy.client.handler;
 import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.annotation.Match;
 import fun.asgc.neutrino.core.annotation.NonIntercept;
-import fun.asgc.neutrino.proxy.client.util.ClientChannelMannager;
+import fun.asgc.neutrino.proxy.client.util.ProxyUtil;
 import fun.asgc.neutrino.proxy.core.Constants;
 import fun.asgc.neutrino.proxy.core.ProxyDataTypeEnum;
 import fun.asgc.neutrino.proxy.core.ProxyMessage;
@@ -50,7 +50,7 @@ public class ProxyMessageDisconnectHandler implements ProxyMessageHandler {
 		Channel realServerChannel = ctx.channel().attr(Constants.NEXT_CHANNEL).get();
 		if (realServerChannel != null) {
 			ctx.channel().attr(Constants.NEXT_CHANNEL).remove();
-			ClientChannelMannager.returnProxyChanel(ctx.channel());
+			ProxyUtil.returnProxyChanel(ctx.channel());
 			realServerChannel.writeAndFlush(Unpooled.EMPTY_BUFFER).addListener(ChannelFutureListener.CLOSE);
 		}
 	}

neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/util/ClientChannelMannager.java

@@ -1,139 +0,0 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package fun.asgc.neutrino.proxy.client.util;
-
-import fun.asgc.neutrino.proxy.client.config.ProxyConfig;
-import fun.asgc.neutrino.proxy.client.core.ProxyChannelBorrowListener;
-import fun.asgc.neutrino.proxy.core.Constants;
-import fun.asgc.neutrino.proxy.core.ProxyClientConfig;
-import io.netty.bootstrap.Bootstrap;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelFutureListener;
-import io.netty.channel.ChannelOption;
-import io.netty.util.AttributeKey;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-/**
- *
- * @author: aoshiguchen
- * @date: 2022/6/16
- */
-public class ClientChannelMannager {
-
-    private static final AttributeKey<Boolean> USER_CHANNEL_WRITEABLE = AttributeKey.newInstance("user_channel_writeable");
-
-    private static final AttributeKey<Boolean> CLIENT_CHANNEL_WRITEABLE = AttributeKey.newInstance("client_channel_writeable");
-
-    private static final int MAX_POOL_SIZE = 100;
-
-    private static Map<String, Channel> realServerChannels = new ConcurrentHashMap<String, Channel>();
-
-    private static ConcurrentLinkedQueue<Channel> proxyChannelPool = new ConcurrentLinkedQueue<Channel>();
-
-    private static volatile Channel cmdChannel;
-
-    public static void borrowProxyChanel(Bootstrap bootstrap, final ProxyChannelBorrowListener borrowListener) {
-        Channel channel = proxyChannelPool.poll();
-        if (channel != null) {
-            borrowListener.success(channel);
-            return;
-        }
-
-        bootstrap.connect(ProxyConfig.instance.getClient().getServerIp(), ProxyConfig.instance.getClient().getServerPort()).addListener(new ChannelFutureListener() {
-
-            @Override
-            public void operationComplete(ChannelFuture future) throws Exception {
-                if (future.isSuccess()) {
-                    borrowListener.success(future.channel());
-                } else {
-                    borrowListener.error(future.cause());
-                }
-            }
-        });
-    }
-
-    public static void returnProxyChanel(Channel proxyChanel) {
-        if (proxyChannelPool.size() > MAX_POOL_SIZE) {
-            proxyChanel.close();
-        } else {
-            proxyChanel.config().setOption(ChannelOption.AUTO_READ, true);
-            proxyChanel.attr(Constants.NEXT_CHANNEL).remove();
-            proxyChannelPool.offer(proxyChanel);
-        }
-    }
-
-    public static void removeProxyChanel(Channel proxyChanel) {
-        proxyChannelPool.remove(proxyChanel);
-    }
-
-    public static void setCmdChannel(Channel cmdChannel) {
-        ClientChannelMannager.cmdChannel = cmdChannel;
-    }
-
-    public static Channel getCmdChannel() {
-        return cmdChannel;
-    }
-
-    public static void setRealServerChannelUserId(Channel realServerChannel, String userId) {
-        realServerChannel.attr(Constants.USER_ID).set(userId);
-    }
-
-    public static String getRealServerChannelUserId(Channel realServerChannel) {
-        return realServerChannel.attr(Constants.USER_ID).get();
-    }
-
-    public static Channel getRealServerChannel(String userId) {
-        return realServerChannels.get(userId);
-    }
-
-    public static void addRealServerChannel(String userId, Channel realServerChannel) {
-        realServerChannels.put(userId, realServerChannel);
-    }
-
-    public static Channel removeRealServerChannel(String userId) {
-        return realServerChannels.remove(userId);
-    }
-
-    public static boolean isRealServerReadable(Channel realServerChannel) {
-        return realServerChannel.attr(CLIENT_CHANNEL_WRITEABLE).get() && realServerChannel.attr(USER_CHANNEL_WRITEABLE).get();
-    }
-
-    public static void clearRealServerChannels() {
-        Iterator<Entry<String, Channel>> ite = realServerChannels.entrySet().iterator();
-        while (ite.hasNext()) {
-            Channel realServerChannel = ite.next().getValue();
-            if (realServerChannel.isActive()) {
-                realServerChannel.writeAndFlush(Unpooled.EMPTY_BUFFER).addListener(ChannelFutureListener.CLOSE);
-            }
-        }
-
-        realServerChannels.clear();
-    }
-}

neutrino-proxy-client/src/main/java/fun/asgc/neutrino/proxy/client/util/ProxyUtil.java

@@ -0,0 +1,135 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.client.util;
+
+import fun.asgc.neutrino.proxy.client.config.ProxyConfig;
+import fun.asgc.neutrino.proxy.client.core.ProxyChannelBorrowListener;
+import fun.asgc.neutrino.proxy.core.Constants;
+import io.netty.bootstrap.Bootstrap;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelOption;
+import io.netty.util.AttributeKey;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+/**
+ *
+ * @author: aoshiguchen
+ * @date: 2022/8/31
+ */
+public class ProxyUtil {
+	private static final AttributeKey<Boolean> USER_CHANNEL_WRITEABLE = AttributeKey.newInstance("user_channel_writeable");
+
+	private static final AttributeKey<Boolean> CLIENT_CHANNEL_WRITEABLE = AttributeKey.newInstance("client_channel_writeable");
+
+	private static final int MAX_POOL_SIZE = 100;
+
+	private static Map<String, Channel> realServerChannels = new ConcurrentHashMap<String, Channel>();
+
+	private static ConcurrentLinkedQueue<Channel> proxyChannelPool = new ConcurrentLinkedQueue<Channel>();
+
+	private static volatile Channel cmdChannel;
+
+	public static void borrowProxyChanel(Bootstrap bootstrap, final ProxyChannelBorrowListener borrowListener) {
+		Channel channel = proxyChannelPool.poll();
+		if (channel != null) {
+			borrowListener.success(channel);
+			return;
+		}
+
+		bootstrap.connect(ProxyConfig.instance.getClient().getServerIp(), ProxyConfig.instance.getClient().getServerPort()).addListener(new ChannelFutureListener() {
+
+			@Override
+			public void operationComplete(ChannelFuture future) throws Exception {
+				if (future.isSuccess()) {
+					borrowListener.success(future.channel());
+				} else {
+					borrowListener.error(future.cause());
+				}
+			}
+		});
+	}
+
+	public static void returnProxyChanel(Channel proxyChanel) {
+		if (proxyChannelPool.size() > MAX_POOL_SIZE) {
+			proxyChanel.close();
+		} else {
+			proxyChanel.config().setOption(ChannelOption.AUTO_READ, true);
+			proxyChanel.attr(Constants.NEXT_CHANNEL).remove();
+			proxyChannelPool.offer(proxyChanel);
+		}
+	}
+
+	public static void removeProxyChanel(Channel proxyChanel) {
+		proxyChannelPool.remove(proxyChanel);
+	}
+
+	public static void setCmdChannel(Channel cmdChannel) {
+		ProxyUtil.cmdChannel = cmdChannel;
+	}
+
+	public static Channel getCmdChannel() {
+		return cmdChannel;
+	}
+
+	public static void setRealServerChannelUserId(Channel realServerChannel, String userId) {
+		realServerChannel.attr(Constants.USER_ID).set(userId);
+	}
+
+	public static String getRealServerChannelUserId(Channel realServerChannel) {
+		return realServerChannel.attr(Constants.USER_ID).get();
+	}
+
+	public static Channel getRealServerChannel(String userId) {
+		return realServerChannels.get(userId);
+	}
+
+	public static void addRealServerChannel(String userId, Channel realServerChannel) {
+		realServerChannels.put(userId, realServerChannel);
+	}
+
+	public static Channel removeRealServerChannel(String userId) {
+		return realServerChannels.remove(userId);
+	}
+
+	public static boolean isRealServerReadable(Channel realServerChannel) {
+		return realServerChannel.attr(CLIENT_CHANNEL_WRITEABLE).get() && realServerChannel.attr(USER_CHANNEL_WRITEABLE).get();
+	}
+
+	public static void clearRealServerChannels() {
+		Iterator<Map.Entry<String, Channel>> ite = realServerChannels.entrySet().iterator();
+		while (ite.hasNext()) {
+			Channel realServerChannel = ite.next().getValue();
+			if (realServerChannel.isActive()) {
+				realServerChannel.writeAndFlush(Unpooled.EMPTY_BUFFER).addListener(ChannelFutureListener.CLOSE);
+			}
+		}
+
+		realServerChannels.clear();
+	}
+}