增加客户端在线状态

proxy-server/src/main/java/org/fengfei/lanproxy/server/ProxyChannelManager.java

@@ -39,9 +39,11 @@ public class ProxyChannelManager {
 
     private static final AttributeKey<String> CHANNEL_CLIENT_KEY = AttributeKey.newInstance("channel_client_key");
 
-    private static final AttributeKey<Boolean> PROXY_CHANNEL_WRITEABLE = AttributeKey.newInstance("proxy_channel_writeable");
+    private static final AttributeKey<Boolean> PROXY_CHANNEL_WRITEABLE = AttributeKey
+            .newInstance("proxy_channel_writeable");
 
-    private static final AttributeKey<Boolean> REAL_BACKEND_SERVER_CHANNEL_WRITEABLE = AttributeKey.newInstance("real_backend_server_channel_writeable");
+    private static final AttributeKey<Boolean> REAL_BACKEND_SERVER_CHANNEL_WRITEABLE = AttributeKey
+            .newInstance("real_backend_server_channel_writeable");
 
     private static Map<Integer, Channel> portChannelMapping = new ConcurrentHashMap<Integer, Channel>();
 
@@ -68,7 +70,8 @@ public class ProxyChannelManager {
                     }
 
                     if (proxyChannel.isActive()) {
-                        List<Integer> inetPorts = new ArrayList<Integer>(ProxyConfig.getInstance().getClientInetPorts(clientKey));
+                        List<Integer> inetPorts = new ArrayList<Integer>(
+                                ProxyConfig.getInstance().getClientInetPorts(clientKey));
                         Set<Integer> inetPortSet = new HashSet<Integer>(inetPorts);
                         List<Integer> channelInetPorts = new ArrayList<Integer>(proxyChannel.attr(CHANNEL_PORT).get());
 
@@ -111,7 +114,8 @@ public class ProxyChannelManager {
                 while (ite.hasNext()) {
                     Entry<String, Channel> entry = ite.next();
                     Channel proxyChannel = entry.getValue();
-                    logger.info("proxyChannel config, {}, {}, {} ,{}", entry.getKey(), proxyChannel, getUserChannels(proxyChannel).size(), proxyChannel.attr(CHANNEL_PORT).get());
+                    logger.info("proxyChannel config, {}, {}, {} ,{}", entry.getKey(), proxyChannel,
+                            getUserChannels(proxyChannel).size(), proxyChannel.attr(CHANNEL_PORT).get());
                 }
             }
 
@@ -218,6 +222,10 @@ public class ProxyChannelManager {
         return portChannelMapping.get(port);
     }
 
+    public static Channel getProxyChannel(String clientKey) {
+        return proxyChannels.get(clientKey);
+    }
+
     /**
      * 增加用户连接与代理客户端连接关系
      *
@@ -294,8 +302,10 @@ public class ProxyChannelManager {
      * @param client
      * @param proxy
      */
-    public static void setUserChannelReadability(Channel userChannel, Boolean realBackendServerChannelWriteability, Boolean proxyChannelWriteability) {
-        logger.info("update user channel readability, {} {} {}", userChannel, realBackendServerChannelWriteability, proxyChannelWriteability);
+    public static void setUserChannelReadability(Channel userChannel, Boolean realBackendServerChannelWriteability,
+            Boolean proxyChannelWriteability) {
+        logger.debug("update user channel readability, {} {} {}", userChannel, realBackendServerChannelWriteability,
+                proxyChannelWriteability);
         synchronized (userChannel) {
             if (realBackendServerChannelWriteability != null) {
                 userChannel.attr(REAL_BACKEND_SERVER_CHANNEL_WRITEABLE).set(realBackendServerChannelWriteability);
@@ -305,7 +315,8 @@ public class ProxyChannelManager {
                 userChannel.attr(PROXY_CHANNEL_WRITEABLE).set(proxyChannelWriteability);
             }
 
-            if (userChannel.attr(REAL_BACKEND_SERVER_CHANNEL_WRITEABLE).get() && userChannel.attr(PROXY_CHANNEL_WRITEABLE).get()) {
+            if (userChannel.attr(REAL_BACKEND_SERVER_CHANNEL_WRITEABLE).get()
+                    && userChannel.attr(PROXY_CHANNEL_WRITEABLE).get()) {
 
                 // 代理客户端与后端服务器连接状态均为可写时，用户连接状态为可读
                 userChannel.config().setOption(ChannelOption.AUTO_READ, true);

proxy-server/src/main/java/org/fengfei/lanproxy/server/config/ProxyConfig.java

@@ -320,6 +320,8 @@ public class ProxyConfig implements Serializable {
         /** 代理客户端与其后面的真实服务器映射关系 */
         private List<ClientProxyMapping> proxyMappings;
 
+        private int status;
+
         public String getClientKey() {
             return clientKey;
         }
@@ -344,6 +346,14 @@ public class ProxyConfig implements Serializable {
             this.name = name;
         }
 
+        public int getStatus() {
+            return status;
+        }
+
+        public void setStatus(int status) {
+            this.status = status;
+        }
+
     }
 
     /**

proxy-server/src/main/java/org/fengfei/lanproxy/server/config/web/routes/RouteConfig.java

@@ -6,6 +6,7 @@ import java.util.Map;
 import java.util.UUID;
 
 import org.fengfei.lanproxy.common.JsonUtil;
+import org.fengfei.lanproxy.server.ProxyChannelManager;
 import org.fengfei.lanproxy.server.config.ProxyConfig;
 import org.fengfei.lanproxy.server.config.ProxyConfig.Client;
 import org.fengfei.lanproxy.server.config.web.ApiRoute;
@@ -19,6 +20,7 @@ import org.slf4j.LoggerFactory;
 
 import com.google.gson.reflect.TypeToken;
 
+import io.netty.channel.Channel;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpHeaders;
 
@@ -79,7 +81,15 @@ public class RouteConfig {
 
             @Override
             public ResponseInfo request(FullHttpRequest request) {
-
+                List<Client> clients = ProxyConfig.getInstance().getClients();
+                for (Client client : clients) {
+                    Channel channel = ProxyChannelManager.getProxyChannel(client.getClientKey());
+                    if (channel != null) {
+                        client.setStatus(1);// online
+                    } else {
+                        client.setStatus(0);// offline
+                    }
+                }
                 return ResponseInfo.build(ProxyConfig.getInstance().getClients());
             }
         });

proxy-server/src/main/java/org/fengfei/lanproxy/server/handlers/ServerChannelHandler.java

@@ -108,7 +108,14 @@ public class ServerChannelHandler extends SimpleChannelInboundHandler<ProxyMessa
             return;
         }
 
-        logger.info("set port => channel, {} {}", clientKey, ports);
+        Channel channel = ProxyChannelManager.getProxyChannel(clientKey);
+        if (channel != null) {
+            logger.warn("exist channel for key {}, {}", clientKey, channel);
+            ctx.channel().close();
+            return;
+        }
+
+        logger.info("set port => channel, {}, {}, {}", clientKey, ports, ctx.channel());
         ProxyChannelManager.addProxyChannel(ports, clientKey, ctx.channel());
     }
 

proxy-server/src/test/resources/log4j.properties

@@ -1,4 +1,4 @@
-log4j.rootLogger=warn,stdout
+log4j.rootLogger=info,stdout
 
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout

proxy-server/webpages/i18n/lang_en.properties

@@ -33,6 +33,9 @@ client.notice.inputname=Client name is required
 client.notice.inputkey=Client key is required
 client.notice.addsuccess=New client has been added successfully
 client.edit=Edit client
+client.status=Status
+client.status.online=Up
+client.status.offline=Down
 
 lan.proxyconfig=Proxy config
 lan.addnewconfig=New proxy config

proxy-server/webpages/i18n/lang_zh_CN.properties

@@ -32,6 +32,9 @@ client.notice.inputname=请输入客户端备注名称
 client.notice.inputkey=请输入客户端通信密钥
 client.notice.addsuccess=客户端添加成功
 client.edit=编辑客户端
+client.status=状态
+client.status.online=在线
+client.status.offline=离线
 
 lan.proxyconfig=代理配置
 lan.addnewconfig=添加配置

proxy-server/webpages/lanproxy-config/html/client/list.html

@@ -37,11 +37,6 @@
 					})
 				});
 			});
-			$(".th-client-name").html($.i18n.prop('client.name'));
-			$(".th-client-key").html($.i18n.prop('client.key'));
-			$(".th-options").html($.i18n.prop('public.options'));
-			$(".client-edit").html($.i18n.prop('public.edit'));
-			$(".client-delete").html($.i18n.prop('public.delete'));
 		} else {
 			alert(data.message);
 		}
@@ -51,9 +46,10 @@
 <table class="layui-table" lay-skin="line">
     <thead>
         <tr>
-            <th class="th-client-name"></th>
-            <th class="th-client-key"></th>
-            <th class="th-options"></th>
+            <th class="th-client-name"><%:=$.i18n.prop('client.name')%></th>
+            <th class="th-client-key"><%:=$.i18n.prop('client.key')%></th>
+            <th class="th-status"><%:=$.i18n.prop('client.status')%></th>
+            <th class="th-options"><%:=$.i18n.prop('public.options')%></th>
         </tr>
     </thead>
     <tbody>
@@ -62,8 +58,15 @@
             <td><%:=data[i].name%></td>
             <td><%:=data[i].clientKey%></td>
             <td>
-              <a data-index="<%:=i%>" class="layui-btn layui-btn-mini client-edit"></a>
-              <a data-index="<%:=i%>" class="layui-btn layui-btn-danger layui-btn-mini client-delete"></a>
+                <% if(data[i].status == 1){ %>
+                <span class="layui-badge layui-bg-green"><%:=$.i18n.prop('client.status.online')%></span>
+                <% } else { %>
+                <span class="layui-badge layui-bg-gray"><%:=$.i18n.prop('client.status.offline')%></span>
+                <% }%>
+            </td>
+            <td>
+              <a data-index="<%:=i%>" class="layui-btn layui-btn-mini client-edit"><%:=$.i18n.prop('public.edit')%></a>
+              <a data-index="<%:=i%>" class="layui-btn layui-btn-danger layui-btn-mini client-delete"><%:=$.i18n.prop('public.delete')%></a>
             </td>
         </tr>
     <%}%>