diff --git a/pom.xml b/pom.xml index 4b107af..0266999 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.openautonomousconnection WebClient - 1.0.0-BETA.1.2 + 1.0.0-BETA.1.3 Open Autonomous Connection https://open-autonomous-connection.org/ @@ -108,7 +108,7 @@ org.openautonomousconnection Protocol - 1.0.0-BETA.5.4 + 1.0.0-BETA.6.0 org.projectlombok diff --git a/src/main/java/org/openautonomousconnection/webclient/Main.java b/src/main/java/org/openautonomousconnection/webclient/Main.java index 30ee531..0888da3 100644 --- a/src/main/java/org/openautonomousconnection/webclient/Main.java +++ b/src/main/java/org/openautonomousconnection/webclient/Main.java @@ -7,10 +7,9 @@ package org.openautonomousconnection.webclient; import dev.unlegitdqrk.unlegitlibrary.event.EventManager; import dev.unlegitdqrk.unlegitlibrary.network.system.packets.PacketHandler; import org.openautonomousconnection.protocol.ProtocolBridge; -import org.openautonomousconnection.protocol.ProtocolSettings; +import org.openautonomousconnection.protocol.ProtocolValues; 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; @@ -21,9 +20,10 @@ import java.io.File; public class Main { public static MainFrame mainFrame; - public static final String DEFAULT_HOST = "ins.open-autonomous-connection.org"; + public static final String DEFAULT_INS = "ins.open-autonomous-connection.org"; - public static final int DEFAULT_PORT = 1023; + public static final int DEFAULT_INS_PORT_TCP = 1026; + public static final int DEFAULT_INS_PORT_UDP = 1025; private static final ProtocolVersion PROTOCOL_VERSION = ProtocolVersion.PV_1_0_0_BETA; @@ -49,29 +49,25 @@ public class Main { private static void initProtocol() { client = new WebClient(); - ProtocolSettings settings = new ProtocolSettings(); + ProtocolValues values = new ProtocolValues(); - settings.packetHandler = new PacketHandler(); - settings.eventManager = new EventManager(); - - settings.host = DEFAULT_HOST; - settings.port = DEFAULT_PORT; + values.packetHandler = new PacketHandler(); + values.eventManager = new EventManager(); try { bridge = new ProtocolBridge( client, - settings, + values, PROTOCOL_VERSION, new File("logs") ); - bridge.setClassicHandlerClient(new ClassicHandler(bridge)); } catch (Exception e) { throw new RuntimeException(e); } } private static void registerEventHandlers() throws Exception { - EventManager eventManager = bridge.getProtocolSettings().eventManager; + EventManager eventManager = bridge.getProtocolValues().eventManager; eventManager.registerListener(ServerPacketHandler.class); } diff --git a/src/main/java/org/openautonomousconnection/webclient/network/WebClient.java b/src/main/java/org/openautonomousconnection/webclient/network/WebClient.java index b66a0d4..c403c44 100644 --- a/src/main/java/org/openautonomousconnection/webclient/network/WebClient.java +++ b/src/main/java/org/openautonomousconnection/webclient/network/WebClient.java @@ -4,12 +4,15 @@ package org.openautonomousconnection.webclient.network; +import dev.unlegitdqrk.unlegitlibrary.network.system.utils.Transport; import lombok.Getter; import org.openautonomousconnection.protocol.packets.v1_0_0.beta.web.WebRequestPacket; import org.openautonomousconnection.protocol.side.client.ProtocolClient; +import org.openautonomousconnection.protocol.side.client.ProtocolWebClient; import org.openautonomousconnection.protocol.versions.v1_0_0.beta.INSRecord; import org.openautonomousconnection.protocol.versions.v1_0_0.beta.INSResponseStatus; import org.openautonomousconnection.protocol.versions.v1_0_0.beta.WebRequestMethod; +import org.openautonomousconnection.webclient.Main; import org.openautonomousconnection.webclient.network.type.NTFType; import org.openautonomousconnection.webclient.network.type.text.NetTransmitDocument; import org.openautonomousconnection.webclient.network.type.NetTransmitFile; @@ -25,7 +28,7 @@ import java.util.Map; * Suppressing "unchecked" warnings because of generic casts */ @SuppressWarnings("unchecked") -public class WebClient extends ProtocolClient { +public class WebClient extends ProtocolWebClient { /** * Global protocol timeout = 30 seconds */ @@ -65,7 +68,7 @@ public class WebClient extends ProtocolClient { WebRequestMethod.GET, Map.of(), null - )); + ), Transport.TCP); } catch (IOException | ClassNotFoundException e) { throw new RuntimeException(e); @@ -81,7 +84,7 @@ public class WebClient extends ProtocolClient { WebRequestMethod.POST, Map.of(), null - )); + ), Transport.TCP); } catch (IOException | ClassNotFoundException e) { throw new RuntimeException(e); } @@ -94,7 +97,7 @@ public class WebClient extends ProtocolClient { WebRequestMethod.GET, Map.of(), null - )); + ), Transport.TCP); } catch (IOException | ClassNotFoundException e) { throw new RuntimeException(e); } diff --git a/src/main/java/org/openautonomousconnection/webclient/network/handlers/ClassicHandler.java b/src/main/java/org/openautonomousconnection/webclient/network/handlers/ClassicHandler.java deleted file mode 100644 index d5deab2..0000000 --- a/src/main/java/org/openautonomousconnection/webclient/network/handlers/ClassicHandler.java +++ /dev/null @@ -1,52 +0,0 @@ -/* Author: Maple - * Dec. 12 2025 - * */ - -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; - -/** - * Handle deprecated (classic) versions - */ - -@SuppressWarnings("deprecated") -public class ClassicHandler extends ClientClassic { - public ClassicHandler(ProtocolBridge bridge) { - super(bridge); - } - - @Override - 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 onUnsupportedClassicPacket(String className, Object[] content) { - super.onUnsupportedClassicPacket(className, content); - } - - /** - * Optional callback - * - * @param message The Message - * @param protocolVersion the Classic version - */ - @Override - 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 7abfcaa..9521869 100644 --- a/src/main/java/org/openautonomousconnection/webclient/network/handlers/ServerPacketHandler.java +++ b/src/main/java/org/openautonomousconnection/webclient/network/handlers/ServerPacketHandler.java @@ -5,8 +5,9 @@ package org.openautonomousconnection.webclient.network.handlers; import dev.unlegitdqrk.unlegitlibrary.event.EventListener; -import dev.unlegitdqrk.unlegitlibrary.network.system.client.events.C_PacketReceivedEvent; +import dev.unlegitdqrk.unlegitlibrary.network.system.client.events.packets.receive.C_PacketReceivedEvent; import dev.unlegitdqrk.unlegitlibrary.network.system.packets.Packet; +import dev.unlegitdqrk.unlegitlibrary.network.system.utils.Transport; import org.openautonomousconnection.protocol.packets.v1_0_0.beta.AuthPacket; import org.openautonomousconnection.protocol.packets.v1_0_0.beta.web.WebResponsePacket; import org.openautonomousconnection.webclient.packetlistener.PacketListener; @@ -25,11 +26,12 @@ public class ServerPacketHandler extends EventListener { public void onPacketReceived(C_PacketReceivedEvent packetReceivedEvent) { Packet packet = packetReceivedEvent.getPacket(); + Transport transport = packetReceivedEvent.getTransport(); switch (packet.getPacketID()) { case 4 -> listeners - .forEach(l -> l.onAuthPacketReceived((AuthPacket) packet)); + .forEach(l -> l.onAuthPacketReceived((AuthPacket) packet, transport)); case 9 -> listeners - .forEach(l -> l.onWebResponsePacketReceived((WebResponsePacket) packet));} + .forEach(l -> l.onWebResponsePacketReceived((WebResponsePacket) packet, transport));} } } diff --git a/src/main/java/org/openautonomousconnection/webclient/packetlistener/PacketListener.java b/src/main/java/org/openautonomousconnection/webclient/packetlistener/PacketListener.java index 8f732ff..3e61c8c 100644 --- a/src/main/java/org/openautonomousconnection/webclient/packetlistener/PacketListener.java +++ b/src/main/java/org/openautonomousconnection/webclient/packetlistener/PacketListener.java @@ -4,21 +4,22 @@ package org.openautonomousconnection.webclient.packetlistener; +import dev.unlegitdqrk.unlegitlibrary.network.system.utils.Transport; import org.openautonomousconnection.protocol.packets.v1_0_0.beta.AuthPacket; 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 { - public void onAuthPacketReceived(AuthPacket authPacket) { + public void onAuthPacketReceived(AuthPacket authPacket, Transport transport) { } - public void onAuthPacketSent(AuthPacket authPacket) { + public void onAuthPacketSent(AuthPacket authPacket, Transport transport) { } - public void onWebResponsePacketReceived(WebResponsePacket webResponsePacket) { + public void onWebResponsePacketReceived(WebResponsePacket webResponsePacket, Transport transport) { } - public void onWebRequestPacketSent(WebRequestPacket webRequestPacket) { + public void onWebRequestPacketSent(WebRequestPacket webRequestPacket, Transport transport) { } } diff --git a/src/main/java/org/openautonomousconnection/webclient/packetlistener/listeners/WebPacketListener.java b/src/main/java/org/openautonomousconnection/webclient/packetlistener/listeners/WebPacketListener.java index 3255ca7..c39c2a8 100644 --- a/src/main/java/org/openautonomousconnection/webclient/packetlistener/listeners/WebPacketListener.java +++ b/src/main/java/org/openautonomousconnection/webclient/packetlistener/listeners/WebPacketListener.java @@ -4,9 +4,10 @@ package org.openautonomousconnection.webclient.packetlistener.listeners; +import dev.unlegitdqrk.unlegitlibrary.network.system.utils.Transport; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; -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.Main; import org.openautonomousconnection.webclient.network.type.NTFType; import org.openautonomousconnection.webclient.network.type.NetTransmitFile; @@ -19,7 +20,7 @@ import javax.swing.*; public class WebPacketListener extends PacketListener { @Override - public void onWebResponsePacketReceived(WebResponsePacket packet) { + public void onWebResponsePacketReceived(WebResponsePacket packet, Transport transport) { NTFType type = NTFType.UNKNOWN; NetTransmitFile file = null;