Add RemoteConnectionActiveEvent

Author: acrylic-style

api/src/main/java/net/azisaba/simpleProxy/api/event/connection/ChannelEvent.java

@@ -0,0 +1,21 @@
+package net.azisaba.simpleProxy.api.event.connection;
+
+import io.netty.channel.Channel;
+import net.azisaba.simpleProxy.api.event.Event;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Objects;
+
+public abstract class ChannelEvent extends Event {
+    protected final Channel channel;
+
+    public ChannelEvent(@NotNull Channel channel) {
+        Objects.requireNonNull(channel, "channel");
+        this.channel = channel;
+    }
+
+    @NotNull
+    public Channel getChannel() {
+        return channel;
+    }
+}

api/src/main/java/net/azisaba/simpleProxy/api/event/connection/ConnectionInitEvent.java

@@ -2,25 +2,18 @@
 
 import io.netty.channel.Channel;
 import net.azisaba.simpleProxy.api.config.ListenerInfo;
-import net.azisaba.simpleProxy.api.event.Event;
 import org.jetbrains.annotations.NotNull;
 
-public class ConnectionInitEvent extends Event {
+public class ConnectionInitEvent extends ChannelEvent {
     private final ListenerInfo listenerInfo;
-    private final Channel channel;
 
     public ConnectionInitEvent(@NotNull ListenerInfo listenerInfo, @NotNull Channel channel) {
+        super(channel);
         this.listenerInfo = listenerInfo;
-        this.channel = channel;
     }
 
     @NotNull
     public ListenerInfo getListenerInfo() {
         return listenerInfo;
     }
-
-    @NotNull
-    public Channel getChannel() {
-        return channel;
-    }
 }

api/src/main/java/net/azisaba/simpleProxy/api/event/connection/RemoteConnectionActiveEvent.java

@@ -0,0 +1,16 @@
+package net.azisaba.simpleProxy.api.event.connection;
+
+import io.netty.channel.Channel;
+import net.azisaba.simpleProxy.api.config.ListenerInfo;
+import org.jetbrains.annotations.NotNull;
+
+import java.net.SocketAddress;
+
+/**
+ * Fired when the remote connection is active and now ready to send/receive data.
+ */
+public class RemoteConnectionActiveEvent extends RemoteConnectionInitEvent {
+    public RemoteConnectionActiveEvent(@NotNull ListenerInfo listenerInfo, @NotNull Channel channel, @NotNull Channel sourceChannel, @NotNull SocketAddress sourceAddress) {
+        super(listenerInfo, channel, sourceChannel, sourceAddress);
+    }
+}

proxy/src/main/java/net/azisaba/simpleProxy/proxy/connection/MessageForwarder.java

@@ -8,6 +8,7 @@
 import io.netty.handler.codec.haproxy.HAProxyMessage;
 import net.azisaba.simpleProxy.api.config.ListenerInfo;
 import net.azisaba.simpleProxy.api.config.ServerInfo;
+import net.azisaba.simpleProxy.api.event.connection.RemoteConnectionActiveEvent;
 import net.azisaba.simpleProxy.proxy.ProxyInstance;
 import net.azisaba.simpleProxy.proxy.config.ProxyConfigInstance;
 import org.apache.logging.log4j.LogManager;
@@ -51,6 +52,25 @@ public void channelActive(@NotNull ChannelHandlerContext ctx) throws Exception {
         }
     }
 
+    @Override
+    public void handlerAdded(ChannelHandlerContext ctx) throws Exception {
+        if (ctx.channel().isActive()) {
+            // handler added while the channel is active (added by plugin)
+            ctx.read();
+            if (ProxyConfigInstance.debug) {
+                LOGGER.info("Forwarder: Established connection: " + ctx.channel());
+            }
+            if (remote == null && !remoteConnecting) {
+                remoteConnecting = true;
+                ChannelFuture future = ProxyInstance.getInstance()
+                        .getConnectionListener()
+                        .connect(this, remoteServerInfo);
+                remote = future.channel();
+            }
+        }
+        super.handlerAdded(ctx);
+    }
+
     @Override
     public void channelInactive(@NotNull ChannelHandlerContext ctx) throws Exception {
         super.channelInactive(ctx);
@@ -117,6 +137,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
     void remoteActive() {
         isRemoteActive = true;
         flushQueue();
+        new RemoteConnectionActiveEvent(listenerInfo, remote, channel, sourceAddress).callEvent();
     }
 
     public void flushQueue() {