Refactoring api (removed old, added player endpoints)

Author: devgianlu

api/pom.xml

@@ -49,5 +49,11 @@
             <artifactId>librespot-core</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>io.undertow</groupId>
+            <artifactId>undertow-core</artifactId>
+            <version>2.0.27.Final</version>
+        </dependency>
     </dependencies>
 </project>

api/src/main/java/xyz/gianlu/librespot/api/ApiServer.java

@@ -0,0 +1,51 @@
+package xyz.gianlu.librespot.api;
+
+import io.undertow.Undertow;
+import io.undertow.server.RoutingHandler;
+import io.undertow.websockets.WebSocketProtocolHandshakeHandler;
+import org.apache.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
+import xyz.gianlu.librespot.api.handlers.PlayerHandler;
+import xyz.gianlu.librespot.core.Session;
+
+public class ApiServer {
+    private static final Logger LOGGER = Logger.getLogger(ApiServer.class);
+    private final int port;
+    private Undertow undertow = null;
+
+    public ApiServer(int port) {
+        this.port = port;
+
+        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+            if (undertow != null) undertow.stop();
+        }));
+    }
+
+    private static void prepareHandlers(@NotNull RoutingHandler root, @NotNull Session session) {
+        root.post("/player/{cmd}", new PlayerHandler(session))
+                .get("/events", new WebSocketProtocolHandshakeHandler(new EventsDispatcher(session)));
+    }
+
+    public void start(@NotNull Session session) {
+        RoutingHandler handler = new RoutingHandler();
+        prepareHandlers(handler, session);
+
+        undertow = Undertow.builder().addHttpListener(port, "", handler).build();
+        undertow.start();
+        LOGGER.info(String.format("Server started on port %d!", port));
+    }
+
+    public void stop() {
+        if (undertow != null) {
+            undertow.stop();
+            undertow = null;
+        }
+
+        LOGGER.info("Server stopped!");
+    }
+
+    public void restart(@NotNull Session session) {
+        stop();
+        start(session);
+    }
+}

api/src/main/java/xyz/gianlu/librespot/api/ApiUtils.java

@@ -0,0 +1,20 @@
+package xyz.gianlu.librespot.api;
+
+import io.undertow.websockets.WebSocketConnectionCallback;
+import io.undertow.websockets.core.WebSocketChannel;
+import io.undertow.websockets.spi.WebSocketHttpExchange;
+import org.jetbrains.annotations.NotNull;
+import xyz.gianlu.librespot.core.Session;
+
+public class EventsDispatcher implements WebSocketConnectionCallback {
+    private final Session session;
+
+    public EventsDispatcher(@NotNull Session session) {
+        this.session = session;
+    }
+
+    @Override
+    public void onConnect(WebSocketHttpExchange exchange, WebSocketChannel channel) {
+        // TODO
+    }
+}

api/src/main/java/xyz/gianlu/librespot/api/EventsDispatcher.java

@@ -2,8 +2,6 @@
 
 import xyz.gianlu.librespot.AbsConfiguration;
 import xyz.gianlu.librespot.FileConfiguration;
-import xyz.gianlu.librespot.api.server.ApiServer;
-import xyz.gianlu.librespot.api.server.ZeroconfApiServer;
 import xyz.gianlu.librespot.core.AuthConfiguration;
 import xyz.gianlu.librespot.core.Session;
 import xyz.gianlu.librespot.core.ZeroconfServer;
@@ -17,17 +15,14 @@
  */
 public class Main {
 
-    public static void main(String[] args) throws IOException, GeneralSecurityException, Session.SpotifyAuthenticationException, MercuryClient.MercuryException {
+    public static void main(String[] args) throws IOException, MercuryClient.MercuryException, GeneralSecurityException, Session.SpotifyAuthenticationException {
+        ApiServer server = new ApiServer(24879);
+
         AbsConfiguration conf = new FileConfiguration(args);
         if (conf.authStrategy() == AuthConfiguration.Strategy.ZEROCONF) {
-            ZeroconfServer.create(conf).addSessionListener(new ZeroconfApiServer(24879));
+            ZeroconfServer.create(conf).addSessionListener(server::restart);
         } else {
-            Session session = new Session.Builder(conf).create();
-
-            ApiServer server = new ApiServer(24879);
-            server.registerHandler(new PlayerHandler(session));
-            server.registerHandler(new MetadataHandler(session));
-            server.registerHandler(new MercuryHandler(session));
+            server.start(new Session.Builder(conf).create());
         }
     }
 }