Replace the SetupServer with the Rust version

This now means that Rust is used practically within
the mod now, and all access restrictions are gone!

projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/KitTunes.java

@@ -1,6 +1,5 @@
 package net.pixaurora.kitten_heart.impl;
 
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.Executor;
@@ -20,7 +19,6 @@
 import net.pixaurora.kitten_heart.impl.service.MinecraftUICompat;
 import net.pixaurora.kitten_heart.impl.service.ServiceLoading;
 import net.pixaurora.kitten_thoughts.impl.KittenThoughts;
-import net.pixaurora.kitten_thoughts.impl.http.server.Server;
 
 public class KitTunes {
     public static final Logger LOGGER = LoggerFactory.getLogger(Constants.MOD_ID);
@@ -46,18 +44,6 @@ public static void init() {
                 MusicMetadataLoader.trackFiles());
 
         KittenThoughts.init();
-
-        Server server = Server.create("token");
-
-        try {
-            String token = server.runServer();
-
-            KitTunes.LOGGER.info(token);
-        } catch (IOException e) {
-            KitTunes.LOGGER.info("Failed to run native code!", e);
-        } finally {
-            server.close();
-        }
     }
 
     public static void tick() {

projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/network/HttpHelper.java

@@ -18,13 +18,11 @@
 import net.pixaurora.kitten_heart.impl.error.UnhandledKitTunesException;
 
 public class HttpHelper {
-    @SuppressWarnings("resource")
     public static InputStream get(String endpoint, Map<String, String> queryParameters)
             throws UnhandledKitTunesException {
         return UnhandledKitTunesException.runOrThrow(() -> handleRequest("GET", endpoint, queryParameters));
     }
 
-    @SuppressWarnings("resource")
     public static InputStream post(String endpoint, Map<String, String> queryParameters)
             throws UnhandledKitTunesException {
         return UnhandledKitTunesException.runOrThrow(() -> handleRequest("POST", endpoint, queryParameters));

projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/scrobble/LastFMScrobbler.java

@@ -26,7 +26,7 @@ public class LastFMScrobbler implements Scrobbler {
     public static final String SETUP_URL = "https://last.fm/api/auth?api_key=" + API_KEY;
 
     public static final ScrobblerType<LastFMScrobbler> TYPE = new ScrobblerType<>("last.fm", LastFMScrobbler.class,
-            SETUP_URL, "token=", LastFMScrobbler::setup);
+            SETUP_URL, LastFMScrobbler::setup);
 
     private final LastFMSession session;
 

projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/scrobble/Scrobbler.java

@@ -10,7 +10,5 @@ public interface Scrobbler extends SimpleScrobbler, SpecifiesType<Scrobbler> {
     public static final DispatchGroup<Scrobbler, ScrobblerType<? extends Scrobbler>> TYPES = new DispatchGroup<>(
             "scrobbler", Arrays.asList(LastFMScrobbler.TYPE));
 
-    public static final int SETUP_PORT = 19686;
-
     public String username() throws KitTunesException;
 }

projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/scrobble/ScrobblerSetup.java

@@ -1,23 +1,33 @@
 package net.pixaurora.kitten_heart.impl.scrobble;
 
+import java.io.Closeable;
+import java.io.IOException;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import net.pixaurora.kitten_heart.impl.network.SetupServer;
+import net.pixaurora.kitten_thoughts.impl.http.server.Server;
 
-public class ScrobblerSetup<T extends Scrobbler> {
-    private final SetupServer server;
+public class ScrobblerSetup<T extends Scrobbler> implements Closeable {
+    private final Server server;
     private final CompletableFuture<T> awaitedScrobbler;
 
-    public ScrobblerSetup(SetupServer server, ScrobblerType<T> scrobblerType, long timeout, TimeUnit unit) {
+    public ScrobblerSetup(Server server, ScrobblerType<T> scrobblerType, long timeout, TimeUnit unit) {
         this.server = server;
-        this.awaitedScrobbler = server.awaitedToken().whenComplete((token, error) -> server.cleanup())
+        this.awaitedScrobbler = CompletableFuture.supplyAsync(this::run).whenComplete((token, error) -> server.close())
                 .thenApply(token -> {
                     return scrobblerType.setupMethod().createScrobbler(token);
                 });
     }
 
+    private String run() {
+        try {
+            return this.server.runServer();
+        } catch (IOException e) {
+            throw new RuntimeException("Couldn't finish running server!", e);
+        }
+    }
+
     public boolean isComplete() {
         return this.awaitedScrobbler.isDone();
     }
@@ -27,7 +37,12 @@ public T get() throws ExecutionException, InterruptedException {
     }
 
     public void cancel() {
+        this.close();
         this.awaitedScrobbler.cancel(false);
-        this.server.cleanup();
+    }
+
+    @Override
+    public void close() {
+        this.server.close();
     }
 }

projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/scrobble/ScrobblerType.java

@@ -5,27 +5,24 @@
 
 import net.pixaurora.kitten_heart.impl.config.dispatch.DispatchType;
 import net.pixaurora.kitten_heart.impl.error.KitTunesException;
-import net.pixaurora.kitten_heart.impl.network.SetupServer;
+import net.pixaurora.kitten_thoughts.impl.http.server.Server;
 
 public class ScrobblerType<T extends Scrobbler> implements DispatchType<Scrobbler> {
     private final String name;
     private final Class<T> targetClass;
     private final String setupURL;
-    private final String tokenPrefix;
     private final SetupMethod<T> setupMethod;
 
-    public ScrobblerType(String name, Class<T> targetClass, String setupURL, String tokenPrefix,
-            SetupMethod<T> setupMethod) {
+    public ScrobblerType(String name, Class<T> targetClass, String setupURL, SetupMethod<T> setupMethod) {
         super();
         this.name = name;
         this.targetClass = targetClass;
         this.setupURL = setupURL;
-        this.tokenPrefix = tokenPrefix;
         this.setupMethod = setupMethod;
     }
 
     public ScrobblerSetup<T> setup(long timeout, TimeUnit unit) throws IOException {
-        SetupServer server = SetupServer.create(this.tokenPrefix);
+        Server server = Server.create();
 
         return new ScrobblerSetup<>(server, this, timeout, unit);
     }
@@ -44,10 +41,6 @@ public String setupURL() {
         return setupURL;
     }
 
-    public String tokenPrefix() {
-        return tokenPrefix;
-    }
-
     public SetupMethod<T> setupMethod() {
         return setupMethod;
     }