Merge Packetlib and Maintain History

Jenkinsfile

@@ -23,6 +23,31 @@ pipeline {
             when {
                 branch "master"
             }
+pipeline {
+    agent any
+    tools {
+        maven 'Maven 3'
+        jdk 'Java 8'
+    }
+    options {
+        buildDiscarder(logRotator(artifactNumToKeepStr: '20'))
+    }
+    stages {
+        stage ('Build') {
+            steps {
+                sh 'mvn clean package'
+            }
+            post {
+                success {
+                    archiveArtifacts artifacts: 'target/*.jar', excludes: 'target/*-sources.jar', fingerprint: true
+                }
+            }
+        }
+
+        stage ('Deploy') {
+            when {
+                branch "master"
+            }
 
             steps {
                 rtMavenDeployer(
@@ -50,4 +75,4 @@ pipeline {
             }
         }
     }
-}
+}

example/com/github/steveice10/packetlib/test/ClientSessionListener.java

@@ -0,0 +1,50 @@
+package com.github.steveice10.packetlib.test;
+
+import com.github.steveice10.packetlib.Session;
+import com.github.steveice10.packetlib.event.session.ConnectedEvent;
+import com.github.steveice10.packetlib.event.session.DisconnectedEvent;
+import com.github.steveice10.packetlib.event.session.DisconnectingEvent;
+import com.github.steveice10.packetlib.event.session.SessionAdapter;
+import com.github.steveice10.packetlib.packet.Packet;
+
+public class ClientSessionListener extends SessionAdapter {
+    @Override
+    public void packetReceived(Session session, Packet packet) {
+        if (packet instanceof PingPacket) {
+            String id = ((PingPacket) packet).getPingId();
+
+            System.out.println("CLIENT Received: " + id);
+
+            if (id.equals("hello")) {
+                session.send(new PingPacket("exit"));
+            } else if (id.equals("exit")) {
+                session.disconnect("Finished");
+            }
+        }
+    }
+
+    @Override
+    public void packetSent(Session session, Packet packet) {
+        if (packet instanceof PingPacket) {
+            System.out.println("CLIENT Sent: " + ((PingPacket) packet).getPingId());
+        }
+    }
+
+    @Override
+    public void connected(ConnectedEvent event) {
+        System.out.println("CLIENT Connected");
+
+        event.getSession().enableEncryption(((TestProtocol) event.getSession().getPacketProtocol()).getEncryption());
+        event.getSession().send(new PingPacket("hello"));
+    }
+
+    @Override
+    public void disconnecting(DisconnectingEvent event) {
+        System.out.println("CLIENT Disconnecting: " + event.getReason());
+    }
+
+    @Override
+    public void disconnected(DisconnectedEvent event) {
+        System.out.println("CLIENT Disconnected: " + event.getReason());
+    }
+}

example/com/github/steveice10/packetlib/test/PingPacket.java

@@ -0,0 +1,32 @@
+package com.github.steveice10.packetlib.test;
+
+import com.github.steveice10.packetlib.codec.PacketCodecHelper;
+import com.github.steveice10.packetlib.packet.Packet;
+
+import java.io.IOException;
+
+public class PingPacket implements Packet {
+    private final String id;
+
+    public PingPacket(ByteBuf buf, PacketCodecHelper codecHelper) throws IOException {
+        this.id = codecHelper.readString(buf);
+    }
+
+    public PingPacket(String id) {
+        this.id = id;
+    }
+
+    public String getPingId() {
+        return this.id;
+    }
+
+    @Override
+    public void write(ByteBuf buf, PacketCodecHelper codecHelper) throws IOException {
+        codecHelper.writeString(buf, this.id);
+    }
+
+    @Override
+    public boolean isPriority() {
+        return false;
+    }
+}

example/com/github/steveice10/packetlib/test/PingServerTest.java

@@ -0,0 +1,31 @@
+package com.github.steveice10.packetlib.test;
+
+import com.github.steveice10.packetlib.Server;
+import com.github.steveice10.packetlib.Session;
+import com.github.steveice10.packetlib.tcp.TcpClientSession;
+import com.github.steveice10.packetlib.tcp.TcpServer;
+
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import java.security.NoSuchAlgorithmException;
+
+public class PingServerTest {
+    public static void main(String[] args) {
+        SecretKey key;
+        try {
+            KeyGenerator gen = KeyGenerator.getInstance("AES");
+            gen.init(128);
+            key = gen.generateKey();
+        } catch(NoSuchAlgorithmException e) {
+            System.err.println("AES algorithm not supported, exiting...");
+            return;
+        }
+
+        Server server = new TcpServer("127.0.0.1", 25565, TestProtocol::new);
+        server.addListener(new ServerListener(key));
+        server.bind();
+
+        Session client = new TcpClientSession("127.0.0.1", 25565, new TestProtocol(key));
+        client.connect();
+    }
+}

example/com/github/steveice10/packetlib/test/ServerListener.java

@@ -0,0 +1,46 @@
+package com.github.steveice10.packetlib.test;
+
+import com.github.steveice10.packetlib.event.server.ServerAdapter;
+import com.github.steveice10.packetlib.event.server.ServerBoundEvent;
+import com.github.steveice10.packetlib.event.server.ServerClosedEvent;
+import com.github.steveice10.packetlib.event.server.ServerClosingEvent;
+import com.github.steveice10.packetlib.event.server.SessionAddedEvent;
+import com.github.steveice10.packetlib.event.server.SessionRemovedEvent;
+
+import javax.crypto.SecretKey;
+
+public class ServerListener extends ServerAdapter {
+    private SecretKey key;
+
+    public ServerListener(SecretKey key) {
+        this.key = key;
+    }
+
+    @Override
+    public void serverBound(ServerBoundEvent event) {
+        System.out.println("SERVER Bound: " + event.getServer().getHost() + ":" + event.getServer().getPort());
+    }
+
+    @Override
+    public void serverClosing(ServerClosingEvent event) {
+        System.out.println("CLOSING SERVER...");
+    }
+
+    @Override
+    public void serverClosed(ServerClosedEvent event) {
+        System.out.println("SERVER CLOSED");
+    }
+
+    @Override
+    public void sessionAdded(SessionAddedEvent event) {
+        System.out.println("SERVER Session Added: " + event.getSession().getHost() + ":" + event.getSession().getPort());
+        ((TestProtocol) event.getSession().getPacketProtocol()).setSecretKey(this.key);
+        event.getSession().enableEncryption(((TestProtocol) event.getSession().getPacketProtocol()).getEncryption());
+    }
+
+    @Override
+    public void sessionRemoved(SessionRemovedEvent event) {
+        System.out.println("SERVER Session Removed: " + event.getSession().getHost() + ":" + event.getSession().getPort());
+        event.getServer().close(false);
+    }
+}

example/com/github/steveice10/packetlib/test/ServerSessionListener.java

@@ -0,0 +1,40 @@
+package com.github.steveice10.packetlib.test;
+
+import com.github.steveice10.packetlib.Session;
+import com.github.steveice10.packetlib.event.session.ConnectedEvent;
+import com.github.steveice10.packetlib.event.session.DisconnectedEvent;
+import com.github.steveice10.packetlib.event.session.DisconnectingEvent;
+import com.github.steveice10.packetlib.event.session.SessionAdapter;
+import com.github.steveice10.packetlib.packet.Packet;
+
+public class ServerSessionListener extends SessionAdapter {
+    @Override
+    public void packetReceived(Session session, Packet packet) {
+        if (packet instanceof PingPacket) {
+            System.out.println("SERVER Received: " + ((PingPacket) packet).getPingId());
+            session.send(packet);
+        }
+    }
+
+    @Override
+    public void packetSent(Session session, Packet packet) {
+        if (packet instanceof PingPacket) {
+            System.out.println("SERVER Sent: " + ((PingPacket) packet).getPingId());
+        }
+    }
+
+    @Override
+    public void connected(ConnectedEvent event) {
+        System.out.println("SERVER Connected");
+    }
+
+    @Override
+    public void disconnecting(DisconnectingEvent event) {
+        System.out.println("SERVER Disconnecting: " + event.getReason());
+    }
+
+    @Override
+    public void disconnected(DisconnectedEvent event) {
+        System.out.println("SERVER Disconnected: " + event.getReason());
+    }
+}

example/com/github/steveice10/packetlib/test/TestProtocol.java

@@ -0,0 +1,62 @@
+package com.github.steveice10.packetlib.test;
+
+import com.github.steveice10.packetlib.Server;
+import com.github.steveice10.packetlib.Session;
+import com.github.steveice10.packetlib.crypt.AESEncryption;
+import com.github.steveice10.packetlib.crypt.PacketEncryption;
+import com.github.steveice10.packetlib.packet.DefaultPacketHeader;
+import com.github.steveice10.packetlib.packet.PacketHeader;
+import com.github.steveice10.packetlib.packet.PacketProtocol;
+
+import javax.crypto.SecretKey;
+import java.security.GeneralSecurityException;
+
+public class TestProtocol extends PacketProtocol {
+    private final PacketHeader header = new DefaultPacketHeader();
+    private AESEncryption encrypt;
+
+    @SuppressWarnings("unused")
+    public TestProtocol() {
+    }
+
+    public TestProtocol(SecretKey key) {
+        this.setSecretKey(key);
+    }
+
+    public PacketCodecHelper createHelper() {
+        return new BasePacketCodecHelper();
+    }
+
+    public void setSecretKey(SecretKey key) {
+        this.register(0, PingPacket.class, PingPacket::new);
+        try {
+            this.encrypt = new AESEncryption(key);
+        } catch(GeneralSecurityException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public String getSRVRecordPrefix() {
+        return "_test";
+    }
+
+    @Override
+    public PacketHeader getPacketHeader() {
+        return this.header;
+    }
+
+    public PacketEncryption getEncryption() {
+        return this.encrypt;
+    }
+
+    @Override
+    public void newClientSession(Session session) {
+        session.addListener(new ClientSessionListener());
+    }
+
+    @Override
+    public void newServerSession(Server server, Session session) {
+        session.addListener(new ServerSessionListener());
+    }
+}

pom.xml

@@ -87,12 +87,6 @@
             <version>1.4</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.github.steveice10</groupId>
-            <artifactId>packetlib</artifactId>
-            <version>3.0.1</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>com.github.GeyserMC</groupId>
             <artifactId>mcauthlib</artifactId>
@@ -135,6 +129,37 @@
             <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <version>4.1.66.Final</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec-haproxy</artifactId>
+            <version>4.1.66.Final</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>io.netty.incubator</groupId>
+            <artifactId>netty-incubator-transport-native-io_uring</artifactId>
+            <version>0.0.8.Final</version>
+            <classifier>linux-x86_64</classifier>
+        </dependency>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <version>4.3.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.nukkitx.fastutil</groupId>
+            <artifactId>fastutil-int-object-maps</artifactId>
+            <version>8.5.2</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>