Updated to new Protocol Version

2026-01-18 18:52:31 +01:00
parent 82c889448b
commit 8b34405594
6 changed files with 37 additions and 22 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@

    <groupId>org.openautonomousconnection</groupId>
    <artifactId>WebClient</artifactId>
-    <version>1.0.0-BETA.1.1</version>
+    <version>1.0.0-BETA.1.2</version>
    <organization>
        <name>Open Autonomous Connection</name>
        <url>https://open-autonomous-connection.org/</url>
@@ -88,6 +88,10 @@
            <name>projectlombok</name>
            <url>https://github.com/projectlombok/lombok?tab=License-1-ov-file</url>
        </license>
+        <license>
+            <name>Eclipse Public License v2.0</name>
+            <url>https://www.eclipse.org/legal/epl-2.0/</url>
+        </license>
    </licenses>

    <repositories>
@@ -104,7 +108,7 @@
        <dependency>
            <groupId>org.openautonomousconnection</groupId>
            <artifactId>Protocol</artifactId>
-            <version>1.0.0-BETA.5.2</version>
+            <version>1.0.0-BETA.5.4</version>
        </dependency>
        <dependency>
            <groupId>org.projectlombok</groupId>
--- a/src/main/java/org/openautonomousconnection/webclient/Main.java
+++ b/src/main/java/org/openautonomousconnection/webclient/Main.java
@@ -10,6 +10,7 @@ import org.openautonomousconnection.protocol.ProtocolBridge;
 import org.openautonomousconnection.protocol.ProtocolSettings;
 import org.openautonomousconnection.protocol.versions.ProtocolVersion;
 import org.openautonomousconnection.webclient.network.WebClient;
+import org.openautonomousconnection.webclient.network.handlers.ClassicHandler;
 import org.openautonomousconnection.webclient.network.handlers.ServerPacketHandler;
 import org.openautonomousconnection.webclient.packetlistener.listeners.WebPacketListener;
 import org.openautonomousconnection.webclient.ui.MainFrame;
@@ -63,6 +64,7 @@ public class Main {
                    PROTOCOL_VERSION,
                    new File("logs")
                    );
+            bridge.setClassicHandlerClient(new ClassicHandler(bridge));
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
--- a/src/main/java/org/openautonomousconnection/webclient/network/WebClient.java
+++ b/src/main/java/org/openautonomousconnection/webclient/network/WebClient.java
@@ -5,7 +5,7 @@
 package org.openautonomousconnection.webclient.network;

 import lombok.Getter;
-import org.openautonomousconnection.protocol.packets.v1_0_0.beta.WebRequestPacket;
+import org.openautonomousconnection.protocol.packets.v1_0_0.beta.web.WebRequestPacket;
 import org.openautonomousconnection.protocol.side.client.ProtocolClient;
 import org.openautonomousconnection.protocol.versions.v1_0_0.beta.INSRecord;
 import org.openautonomousconnection.protocol.versions.v1_0_0.beta.INSResponseStatus;
@@ -60,7 +60,7 @@ public class WebClient extends ProtocolClient {

    public <T> Promise<? extends NetTransmitFile<T>> get(NTFType type, String path, T test) {
        try {
-            this.getClientWebConnection().sendPacket(new WebRequestPacket(
+            this.getClientServerConnection().sendPacket(new WebRequestPacket(
                path,
                WebRequestMethod.GET,
                Map.of(),
@@ -76,7 +76,7 @@ public class WebClient extends ProtocolClient {

    public void post(String path) {
        try {
-            this.getClientWebConnection().sendPacket(new WebRequestPacket(
+            this.getClientServerConnection().sendPacket(new WebRequestPacket(
                    path,
                    WebRequestMethod.POST,
                    Map.of(),
@@ -89,7 +89,7 @@ public class WebClient extends ProtocolClient {

    public Promise<NetTransmitFile<Document>> getIndex() {
        try {
-            this.getClientWebConnection().sendPacket(new WebRequestPacket(
+            this.getClientServerConnection().sendPacket(new WebRequestPacket(
                    "index.html",
                    WebRequestMethod.GET,
                    Map.of(),
--- a/src/main/java/org/openautonomousconnection/webclient/network/handlers/ClassicHandler.java
+++ b/src/main/java/org/openautonomousconnection/webclient/network/handlers/ClassicHandler.java
@@ -4,9 +4,11 @@

 package org.openautonomousconnection.webclient.network.handlers;

+import org.openautonomousconnection.protocol.ProtocolBridge;
 import org.openautonomousconnection.protocol.side.client.ProtocolClient;
 import org.openautonomousconnection.protocol.versions.v1_0_0.beta.INSResponseStatus;
 import org.openautonomousconnection.protocol.versions.v1_0_0.classic.handlers.ClassicHandlerClient;
+import org.openautonomousconnection.protocol.versions.v1_0_0.classic.handlers.builtin.ClientClassic;
 import org.openautonomousconnection.protocol.versions.v1_0_0.classic.objects.Classic_Domain;
 import org.openautonomousconnection.protocol.versions.v1_0_0.classic.site.Classic_SiteType;
 import org.openautonomousconnection.protocol.versions.v1_0_0.classic.utils.Classic_ProtocolVersion;
@@ -16,28 +18,35 @@ import org.openautonomousconnection.protocol.versions.v1_0_0.classic.utils.Class
 */

@SuppressWarnings("deprecated")
-public class ClassicHandler extends ClassicHandlerClient {
-    public ClassicHandler(ProtocolClient client) {
-        super(client);
+public class ClassicHandler extends ClientClassic {
+    public ClassicHandler(ProtocolBridge bridge) {
+        super(bridge);
    }

    @Override
-    public void unsupportedClassicPacket(String className, Object[] objects) {
+    public void handleHTMLContent(Classic_SiteType siteType, Classic_Domain domain, String html) {

    }

+    /**
+     * Optional callback
+     *
+     * @param className The class name
+     * @param content   The content
+     */
    @Override
-    public void handleHTMLContent(Classic_SiteType classicSiteType, Classic_Domain classicDomain, String s) {
-
+    public void onUnsupportedClassicPacket(String className, Object[] content) {
+        super.onUnsupportedClassicPacket(className, content);
    }

+    /**
+     * Optional callback
+     *
+     * @param message         The Message
+     * @param protocolVersion the Classic version
+     */
    @Override
-    public void handleMessage(String message, Classic_ProtocolVersion classicProtocolVersion) {
-
-    }
-
-    @Override
-    public void validationCompleted(Classic_Domain classicDomain, INSResponseStatus insResponseStatus) {
-
+    public void onMessage(String message, Classic_ProtocolVersion protocolVersion) {
+        super.onMessage(message, protocolVersion);
    }
 }
--- a/src/main/java/org/openautonomousconnection/webclient/network/handlers/ServerPacketHandler.java
+++ b/src/main/java/org/openautonomousconnection/webclient/network/handlers/ServerPacketHandler.java
@@ -8,7 +8,7 @@ import dev.unlegitdqrk.unlegitlibrary.event.EventListener;
 import dev.unlegitdqrk.unlegitlibrary.network.system.client.events.C_PacketReceivedEvent;
 import dev.unlegitdqrk.unlegitlibrary.network.system.packets.Packet;
 import org.openautonomousconnection.protocol.packets.v1_0_0.beta.AuthPacket;
-import org.openautonomousconnection.protocol.packets.v1_0_0.beta.WebResponsePacket;
+import org.openautonomousconnection.protocol.packets.v1_0_0.beta.web.WebResponsePacket;
 import org.openautonomousconnection.webclient.packetlistener.PacketListener;

 import java.util.ArrayList;
--- a/src/main/java/org/openautonomousconnection/webclient/packetlistener/PacketListener.java
+++ b/src/main/java/org/openautonomousconnection/webclient/packetlistener/PacketListener.java
@@ -5,8 +5,8 @@
 package org.openautonomousconnection.webclient.packetlistener;

 import org.openautonomousconnection.protocol.packets.v1_0_0.beta.AuthPacket;
-import org.openautonomousconnection.protocol.packets.v1_0_0.beta.WebRequestPacket;
-import org.openautonomousconnection.protocol.packets.v1_0_0.beta.WebResponsePacket;
+import org.openautonomousconnection.protocol.packets.v1_0_0.beta.web.WebRequestPacket;
+import org.openautonomousconnection.protocol.packets.v1_0_0.beta.web.WebResponsePacket;

 public abstract class PacketListener {