Fixed #77

Author: devgianlu

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

@@ -303,23 +303,35 @@ private void authenticatePartial(@NotNull Authentication.LoginCredentials creden
 
     @Override
     public void close() throws IOException {
-        receiver.stop();
-        receiver = null;
+        if (receiver != null) {
+            receiver.stop();
+            receiver = null;
+        }
 
-        player.close();
-        player = null;
+        if (player != null) {
+            player.close();
+            player = null;
+        }
 
-        audioKeyManager.close();
-        audioKeyManager = null;
+        if (audioKeyManager != null) {
+            audioKeyManager.close();
+            audioKeyManager = null;
+        }
 
-        channelManager.close();
-        channelManager = null;
+        if (channelManager != null) {
+            channelManager.close();
+            channelManager = null;
+        }
 
-        spirc.close();
-        spirc = null;
+        if (spirc != null) {
+            spirc.close();
+            spirc = null;
+        }
 
-        mercuryClient.close();
-        mercuryClient = null;
+        if (mercuryClient != null) {
+            mercuryClient.close();
+            mercuryClient = null;
+        }
 
         executorService.shutdown();
         conn.socket.close();
@@ -419,6 +431,10 @@ public boolean valid() {
         return apWelcome != null && conn != null && !conn.socket.isClosed();
     }
 
+    public boolean isConnecting() {
+        return cipherPair == null || authLock.get();
+    }
+
     @NotNull
     public String deviceId() {
         return inner.deviceId;

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

@@ -25,6 +25,8 @@
 import java.security.GeneralSecurityException;
 import java.security.MessageDigest;
 import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * @author Gianlu
@@ -78,7 +80,7 @@ public class ZeroconfServer implements Closeable {
     private final Session.Inner inner;
     private final DiffieHellman keys;
     private final JmDNS[] instances;
-    private Session session;
+    private volatile Session session;
 
     private ZeroconfServer(Session.Inner inner, Configuration conf) throws IOException {
         this.inner = inner;
@@ -119,7 +121,7 @@ private ZeroconfServer(Session.Inner inner, Configuration conf) throws IOExcepti
                 instances[i].registerService(serviceInfo);
                 atLeastOne = true;
             } catch (SocketException ex) {
-                LOGGER.warn("Failed creating socket for " + bound[i]);
+                LOGGER.warn("Failed creating socket for " + bound[i], ex);
             }
         }
 
@@ -274,6 +276,21 @@ private void handleAddUser(OutputStream out, Map<String, String> params, String
         aes.init(Cipher.DECRYPT_MODE, new SecretKeySpec(Arrays.copyOfRange(encryptionKey, 0, 16), "AES"), new IvParameterSpec(iv));
         byte[] decrypted = aes.doFinal(encrypted);
 
+
+        String resp = DEFAULT_SUCCESSFUL_ADD_USER.toString();
+        out.write(httpVersion.getBytes());
+        out.write(" 200 OK".getBytes());
+        out.write(EOL);
+        out.write("Content-Length: ".getBytes());
+        out.write(String.valueOf(resp.length()).getBytes());
+        out.write(EOL);
+        out.flush();
+
+        out.write(EOL);
+        out.write(resp.getBytes());
+        out.flush();
+
+
         try {
             Authentication.LoginCredentials credentials = inner.decryptBlob(username, decrypted);
             if (hasValidSession()) {
@@ -289,22 +306,7 @@ private void handleAddUser(OutputStream out, Map<String, String> params, String
         } catch (Session.SpotifyAuthenticationException | SpotifyIrc.IrcException ex) {
             LOGGER.fatal("Failed handling connection! Going away.", ex);
             close();
-            return;
         }
-
-        String resp = DEFAULT_SUCCESSFUL_ADD_USER.toString();
-
-        out.write(httpVersion.getBytes());
-        out.write(" 200 OK".getBytes());
-        out.write(EOL);
-        out.write("Content-Length: ".getBytes());
-        out.write(String.valueOf(resp.length()).getBytes());
-        out.write(EOL);
-        out.flush();
-
-        out.write(EOL);
-        out.write(resp.getBytes());
-        out.flush();
     }
 
     public interface Configuration {
@@ -318,6 +320,7 @@ public interface Configuration {
 
     private class HttpRunner implements Runnable, Closeable {
         private final ServerSocket serverSocket;
+        private final ExecutorService executorService = Executors.newCachedThreadPool();
         private volatile boolean shouldStop = false;
 
         HttpRunner(int port) throws IOException {
@@ -328,10 +331,18 @@ private class HttpRunner implements Runnable, Closeable {
         @Override
         public void run() {
             while (!shouldStop) {
-                try (Socket socket = serverSocket.accept()) { // We don't need this to be async
-                    handle(socket);
+                try {
+                    Socket socket = serverSocket.accept();
+                    executorService.execute(() -> {
+                        try {
+                            handle(socket);
+                            socket.close();
+                        } catch (IOException ex) {
+                            LOGGER.fatal("Failed handling request!", ex);
+                        }
+                    });
                 } catch (IOException ex) {
-                    LOGGER.fatal("Failed handling request!", ex);
+                    LOGGER.fatal("Failed handling connection!", ex);
                 }
             }
         }