From 1a268a4496dd0ac354dd821ded9c288a024ecc9e Mon Sep 17 00:00:00 2001
From: Rainnny7 <braydonrainnny@gmail.com>
Date: Sat, 6 Apr 2024 22:35:59 -0400
Subject: [PATCH] Proper error handling

---
 .../pinger/impl/JavaMinecraftServerPinger.java    | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/me/braydon/mc/service/pinger/impl/JavaMinecraftServerPinger.java b/src/main/java/me/braydon/mc/service/pinger/impl/JavaMinecraftServerPinger.java
index 34f0b68..85cdd4c 100644
--- a/src/main/java/me/braydon/mc/service/pinger/impl/JavaMinecraftServerPinger.java
+++ b/src/main/java/me/braydon/mc/service/pinger/impl/JavaMinecraftServerPinger.java
@@ -6,6 +6,7 @@ import me.braydon.mc.RESTfulMC;
 import me.braydon.mc.common.DNSUtils;
 import me.braydon.mc.common.packet.impl.PacketHandshakingInSetProtocol;
 import me.braydon.mc.common.packet.impl.PacketStatusInStart;
+import me.braydon.mc.exception.impl.BadRequestException;
 import me.braydon.mc.exception.impl.ResourceNotFoundException;
 import me.braydon.mc.model.server.JavaMinecraftServer;
 import me.braydon.mc.model.token.JavaServerStatusToken;
@@ -14,10 +15,7 @@ import me.braydon.mc.service.pinger.MinecraftServerPinger;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.net.UnknownHostException;
+import java.net.*;
 
 /**
  * The {@link MinecraftServerPinger} for
@@ -35,10 +33,11 @@ public final class JavaMinecraftServerPinger implements MinecraftServerPinger<Ja
      * @param hostname the hostname of the server
      * @param port     the port of the server
      * @return the server that was pinged
-     * @throws ResourceNotFoundException if the hostname could not be resolved
+     * @throws BadRequestException if the hostname is unknown
+     * @throws ResourceNotFoundException if the server could not be found
      */
     @Override
-    public JavaMinecraftServer ping(@NonNull String hostname, int port) throws ResourceNotFoundException {
+    public JavaMinecraftServer ping(@NonNull String hostname, int port) throws BadRequestException, ResourceNotFoundException {
         InetAddress inetAddress = DNSUtils.resolveA(hostname); // Resolve the hostname to an IP address
         String ip = inetAddress == null ? null : inetAddress.getHostAddress(); // Get the IP address
         if (ip != null) { // Was the IP resolved?
@@ -68,7 +67,9 @@ public final class JavaMinecraftServerPinger implements MinecraftServerPinger<Ja
             }
         } catch (IOException ex) {
             if (ex instanceof UnknownHostException) {
-                throw new ResourceNotFoundException("Unknown hostname: %s".formatted(hostname));
+                throw new BadRequestException("Unknown hostname: %s".formatted(hostname));
+            } else if (ex instanceof ConnectException) {
+                throw new ResourceNotFoundException(ex);
             }
             log.error("An error occurred pinging %s:%s:".formatted(hostname, port), ex);
         }