From 8b34405594792facbf6443d23b825f66c0bd6c5d Mon Sep 17 00:00:00 2001 From: Finn Date: Sun, 18 Jan 2026 18:52:31 +0100 Subject: [PATCH] Updated to new Protocol Version --- pom.xml | 8 +++-- .../webclient/Main.java | 2 ++ .../webclient/network/WebClient.java | 8 ++--- .../network/handlers/ClassicHandler.java | 35 ++++++++++++------- .../network/handlers/ServerPacketHandler.java | 2 +- .../packetlistener/PacketListener.java | 4 +-- 6 files changed, 37 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index 5db6f0d..4b107af 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.openautonomousconnection WebClient - 1.0.0-BETA.1.1 + 1.0.0-BETA.1.2 Open Autonomous Connection https://open-autonomous-connection.org/ @@ -88,6 +88,10 @@ projectlombok https://github.com/projectlombok/lombok?tab=License-1-ov-file + + Eclipse Public License v2.0 + https://www.eclipse.org/legal/epl-2.0/ + @@ -104,7 +108,7 @@ org.openautonomousconnection Protocol - 1.0.0-BETA.5.2 + 1.0.0-BETA.5.4 org.projectlombok diff --git a/src/main/java/org/openautonomousconnection/webclient/Main.java b/src/main/java/org/openautonomousconnection/webclient/Main.java index 8a3f94f..30ee531 100644 --- 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); } diff --git a/src/main/java/org/openautonomousconnection/webclient/network/WebClient.java b/src/main/java/org/openautonomousconnection/webclient/network/WebClient.java index 4ad230c..b66a0d4 100644 --- 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 Promise> 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> getIndex() { try { - this.getClientWebConnection().sendPacket(new WebRequestPacket( + this.getClientServerConnection().sendPacket(new WebRequestPacket( "index.html", WebRequestMethod.GET, Map.of(), diff --git a/src/main/java/org/openautonomousconnection/webclient/network/handlers/ClassicHandler.java b/src/main/java/org/openautonomousconnection/webclient/network/handlers/ClassicHandler.java index c5e0796..d5deab2 100644 --- 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); } } diff --git a/src/main/java/org/openautonomousconnection/webclient/network/handlers/ServerPacketHandler.java b/src/main/java/org/openautonomousconnection/webclient/network/handlers/ServerPacketHandler.java index 6c38526..7abfcaa 100644 --- 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; diff --git a/src/main/java/org/openautonomousconnection/webclient/packetlistener/PacketListener.java b/src/main/java/org/openautonomousconnection/webclient/packetlistener/PacketListener.java index e799e04..8f732ff 100644 --- 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 {