open-autonomous-connection/INSServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Updated frontend to new Protocol

Browse Source
This commit is contained in:
UnlegitDqrk
2026-02-27 20:40:59 +01:00
parent 09dd207bb1
commit f81cb0ee15
5 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dependency-reduced-pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.openautonomousconnection</groupId> <groupId>org.openautonomousconnection</groupId>
<artifactId>INSServer</artifactId> <artifactId>INSServer</artifactId>
<version>1.0.1-BETA.0.1</version> <version>1.0.1-BETA.0.2</version>
<description>The default INS-Server</description> <description>The default INS-Server</description>
<url>https://open-autonomous-connection.org/</url> <url>https://open-autonomous-connection.org/</url>
<issueManagement> <issueManagement>

4
pom.xml
View File

@@ -6,7 +6,7 @@
<groupId>org.openautonomousconnection</groupId> <groupId>org.openautonomousconnection</groupId>
<artifactId>INSServer</artifactId> <artifactId>INSServer</artifactId>
<version>1.0.1-BETA.0.1</version> <version>1.0.1-BETA.0.2</version>
<organization> <organization>
<name>Open Autonomous Connection</name> <name>Open Autonomous Connection</name>
<url>https://open-autonomous-connection.org/</url> <url>https://open-autonomous-connection.org/</url>
@@ -69,7 +69,7 @@
<dependency> <dependency>
<groupId>org.openautonomousconnection</groupId> <groupId>org.openautonomousconnection</groupId>
<artifactId>Protocol</artifactId> <artifactId>Protocol</artifactId>
<version>1.0.1-BETA.0.3</version> <version>1.0.1-BETA.0.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mariadb.jdbc</groupId> <groupId>org.mariadb.jdbc</groupId>

10
src/main/java/org/openautonomousconnection/insserver/DatabaseINSServer.java
View File

@@ -71,7 +71,7 @@ public final class DatabaseINSServer extends ProtocolINSServer {
out.sort(recordComparator(type)); out.sort(recordComparator(type));
return out; return out;
} catch (SQLException ex) { } catch (SQLException ex) {
getProtocolBridge().getLogger().exception( getProtocolBridge().getProtocolValues().logger.exception(
"INS resolve failed for " + formatName(tln, name, sub) + " type=" + type, "INS resolve failed for " + formatName(tln, name, sub) + " type=" + type,
ex ex
); );
@@ -100,7 +100,7 @@ public final class DatabaseINSServer extends ProtocolINSServer {
if (rs.next()) return rs.getString("info"); if (rs.next()) return rs.getString("info");
} }
} catch (SQLException ex) { } catch (SQLException ex) {
getProtocolBridge().getLogger().exception("Failed to resolve TLN info site for tln=" + tln, ex); getProtocolBridge().getProtocolValues().logger.exception("Failed to resolve TLN info site for tln=" + tln, ex);
} }
return null; return null;
@@ -131,12 +131,12 @@ public final class DatabaseINSServer extends ProtocolINSServer {
String canonical = formatName(tln, name, sub).toLowerCase(Locale.ROOT); String canonical = formatName(tln, name, sub).toLowerCase(Locale.ROOT);
if (!visited.add(canonical)) { if (!visited.add(canonical)) {
// loop detected // loop detected
getProtocolBridge().getLogger().warn("CNAME loop detected for " + canonical + " type=" + requestedType); getProtocolBridge().getProtocolValues().logger.warn("CNAME loop detected for " + canonical + " type=" + requestedType);
return new ArrayList<>(); return new ArrayList<>();
} }
if (depth > MAX_CNAME_DEPTH) { if (depth > MAX_CNAME_DEPTH) {
getProtocolBridge().getLogger().warn("CNAME recursion limit exceeded for " + canonical + " type=" + requestedType); getProtocolBridge().getProtocolValues().logger.warn("CNAME recursion limit exceeded for " + canonical + " type=" + requestedType);
return new ArrayList<>(); return new ArrayList<>();
} }
@@ -169,7 +169,7 @@ public final class DatabaseINSServer extends ProtocolINSServer {
for (INSRecord cname : cnames) { for (INSRecord cname : cnames) {
TargetName target = parseCnameTarget(cname.value); TargetName target = parseCnameTarget(cname.value);
if (target == null) { if (target == null) {
getProtocolBridge().getLogger().warn("Invalid CNAME target '" + cname.value + "' on " + canonical); getProtocolBridge().getProtocolValues().logger.warn("Invalid CNAME target '" + cname.value + "' on " + canonical);
continue; continue;
} }

4
src/main/java/org/openautonomousconnection/insserver/Listener.java
View File

@@ -10,11 +10,11 @@ public class Listener extends EventListener {
public void onCommandNotFound(CommandNotFoundEvent event) { public void onCommandNotFound(CommandNotFoundEvent event) {
StringBuilder argsBuilder = new StringBuilder(); StringBuilder argsBuilder = new StringBuilder();
for (String arg : event.getArgs()) argsBuilder.append(arg).append(" "); for (String arg : event.getArgs()) argsBuilder.append(arg).append(" ");
Main.getProtocolBridge().getLogger().error("Command '" + event.getName() + argsBuilder.toString() + "' not found!"); Main.getProtocolBridge().getProtocolValues().logger.error("Command '" + event.getName() + argsBuilder.toString() + "' not found!");
} }
@dev.unlegitdqrk.unlegitlibrary.event.Listener @dev.unlegitdqrk.unlegitlibrary.event.Listener
public void onMissingCommandPermission(CommandExecutorMissingPermissionEvent event) { public void onMissingCommandPermission(CommandExecutorMissingPermissionEvent event) {
Main.getProtocolBridge().getLogger().error("You do not have enough permissions to execute this command!"); Main.getProtocolBridge().getProtocolValues().logger.error("You do not have enough permissions to execute this command!");
} }
} }

8
src/main/java/org/openautonomousconnection/insserver/Main.java
View File

@@ -31,10 +31,15 @@ public class Main {
private static ProtocolValues values; private static ProtocolValues values;
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
if (!new File("logs").exists()) new File("logs").mkdir();
Logger logger = new Logger(new File("logs"), false, true);
values = new ProtocolValues(); values = new ProtocolValues();
values.packetHandler = new PacketHandler(); values.packetHandler = new PacketHandler();
values.eventManager = new EventManager(); values.eventManager = new EventManager();
values.protocolVersion = ProtocolVersion.PV_1_0_1_BETA;
values.eventManager.registerListener(new Listener()); values.eventManager.registerListener(new Listener());
values.logger = logger;
if (!new File("config.properties").exists()) { if (!new File("config.properties").exists()) {
new File("config.properties").createNewFile(); new File("config.properties").createNewFile();
@@ -86,8 +91,7 @@ public class Main {
String frontend = config.getString("ins.frontend"); String frontend = config.getString("ins.frontend");
DatabaseINSServer server = new DatabaseINSServer(info, frontend, url, user, password); DatabaseINSServer server = new DatabaseINSServer(info, frontend, url, user, password);
Logger logger = new Logger(new File("logs"), false, true); protocolBridge = new ProtocolBridge(server, values);
protocolBridge = new ProtocolBridge(server, values, ProtocolVersion.PV_1_0_1_BETA, logger, new AddonLoader(values.eventManager, logger));
server.start(tcpPort); server.start(tcpPort);
commandManager = new CommandManager(values.eventManager); commandManager = new CommandManager(values.eventManager);