Moved API configuration to file

Author: devgianlu

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

@@ -14,10 +14,12 @@
 public class ApiServer {
     private static final Logger LOGGER = Logger.getLogger(ApiServer.class);
     private final int port;
+    private final String host;
     private Undertow undertow = null;
 
-    public ApiServer(int port) {
-        this.port = port;
+    public ApiServer(@NotNull ApiConfiguration conf) {
+        this.port = conf.apiPort();
+        this.host = conf.apiHost();
 
         Runtime.getRuntime().addShutdownHook(new Thread(() -> {
             if (undertow != null) undertow.stop();
@@ -39,7 +41,7 @@ public void start(@NotNull Session session) {
         corsFilter.setPolicyParam(null);
         corsFilter.setUrlPattern(".*");
 
-        undertow = Undertow.builder().addHttpListener(port, "", corsFilter).build();
+        undertow = Undertow.builder().addHttpListener(port, host, corsFilter).build();
         undertow.start();
         LOGGER.info(String.format("Server started on port %d!", port));
     }

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

@@ -17,8 +17,7 @@ public class Main {
 
     public static void main(String[] args) throws IOException, MercuryClient.MercuryException, GeneralSecurityException, Session.SpotifyAuthenticationException {
         AbsConfiguration conf = new FileConfiguration(args);
-
-        ApiServer server = new ApiServer(conf.getCustomOptionInt("api.port", 24879));
+        ApiServer server = new ApiServer(conf);
         if (conf.authStrategy() == AuthConfiguration.Strategy.ZEROCONF) {
             ZeroconfServer.create(conf).addSessionListener(server::restart);
         } else {

core/src/main/java/xyz/gianlu/librespot/AbsConfiguration.java

@@ -3,6 +3,7 @@
 import com.spotify.connectstate.model.Connect;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import xyz.gianlu.librespot.api.ApiConfiguration;
 import xyz.gianlu.librespot.cache.CacheManager;
 import xyz.gianlu.librespot.core.AuthConfiguration;
 import xyz.gianlu.librespot.core.TimeProvider;
@@ -12,7 +13,7 @@
 /**
  * @author Gianlu
  */
-public abstract class AbsConfiguration implements TimeProvider.Configuration, Player.Configuration, CacheManager.Configuration, AuthConfiguration, ZeroconfServer.Configuration {
+public abstract class AbsConfiguration implements ApiConfiguration, TimeProvider.Configuration, Player.Configuration, CacheManager.Configuration, AuthConfiguration, ZeroconfServer.Configuration {
 
     public abstract int getCustomOptionInt(@NotNull String key, int fallback);
 

core/src/main/java/xyz/gianlu/librespot/FileConfiguration.java

@@ -369,6 +369,16 @@ public int timeManualCorrection() {
         return config.get("time.manualCorrection");
     }
 
+    @Override
+    public int apiPort() {
+        return config.get("api.port");
+    }
+
+    @Override
+    public @NotNull String apiHost() {
+        return config.get("api.host");
+    }
+
     private final static class PropertiesFormat implements ConfigFormat<Config> {
         @Override
         public ConfigWriter createWriter() {

core/src/main/java/xyz/gianlu/librespot/api/ApiConfiguration.java

@@ -0,0 +1,13 @@
+package xyz.gianlu.librespot.api;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Configuration parameters used for the `api` module
+ */
+public interface ApiConfiguration {
+    int apiPort();
+
+    @NotNull
+    String apiHost();
+}

core/src/main/resources/default.toml

@@ -37,4 +37,8 @@ crossfadeDuration = 0 # Crossfade overlap time (in milliseconds)
 output = "MIXER" # Audio output device (MIXER, PIPE, STDOUT)
 releaseLineDelay = 20 # Release mixer line after set delay (in seconds)
 pipe = "" # Output raw (signed) PCM to this file (`player.output` must be PIPE)
-stopPlaybackOnChunkError = false # Whether the playback should be stopped when the current chunk cannot be downloaded
+stopPlaybackOnChunkError = false # Whether the playback should be stopped when the current chunk cannot be downloaded
+
+[api]
+port = 24879 # API port (`api` module only)
+host = "0.0.0.0" # API listen interface (`api` module only)