Use zeroconf-java instead of JmDNS

Author: devgianlu

core/pom.xml

@@ -63,11 +63,11 @@
             <version>1.0.2-gdx</version>
         </dependency>
 
-        <!-- mDNS -->
+        <!-- Zeroconf -->
         <dependency>
-            <groupId>org.jmdns</groupId>
-            <artifactId>jmdns</artifactId>
-            <version>3.5.5</version>
+            <groupId>xyz.gianlu.zeroconf</groupId>
+            <artifactId>zeroconf</artifactId>
+            <version>1.1.0</version>
         </dependency>
 
         <!-- H2 (cache) -->

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

@@ -12,13 +12,13 @@
 import xyz.gianlu.librespot.common.proto.Authentication;
 import xyz.gianlu.librespot.crypto.DiffieHellman;
 import xyz.gianlu.librespot.mercury.MercuryClient;
+import xyz.gianlu.zeroconf.Service;
+import xyz.gianlu.zeroconf.Zeroconf;
 
 import javax.crypto.Cipher;
 import javax.crypto.Mac;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
-import javax.jmdns.JmDNS;
-import javax.jmdns.ServiceInfo;
 import java.io.Closeable;
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -82,9 +82,9 @@ public class ZeroconfServer implements Closeable {
     private final HttpRunner runner;
     private final Session.Inner inner;
     private final DiffieHellman keys;
-    private final JmDNS[] instances;
     private final List<SessionListener> sessionListeners;
     private volatile Session session;
+    private final Zeroconf zeroconf;
 
     private ZeroconfServer(Session.Inner inner, Configuration conf) throws IOException {
         this.inner = inner;
@@ -97,48 +97,46 @@ private ZeroconfServer(Session.Inner inner, Configuration conf) throws IOExcepti
 
         new Thread(this.runner = new HttpRunner(port), "zeroconf-http-server").start();
 
-        InetAddress[] bound;
+        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+            try {
+                close();
+            } catch (IOException ignored) {
+            }
+        }));
+
+        List<NetworkInterface> nics;
         if (conf.zeroconfListenAll()) {
-            bound = getAllInterfacesAddresses();
+            nics = getAllInterfaces();
         } else {
             String[] interfaces = conf.zeroconfInterfaces();
             if (interfaces == null || interfaces.length == 0) {
-                bound = new InetAddress[]{InetAddress.getLoopbackAddress()};
+                nics = getAllInterfaces();
             } else {
-                List<InetAddress> list = new ArrayList<>();
-                for (String str : interfaces) addAddressForInterfaceName(list, str);
-                bound = list.toArray(new InetAddress[0]);
+                nics = new ArrayList<>();
+                for (String str : interfaces) {
+                    NetworkInterface nif = NetworkInterface.getByName(str);
+                    if (nif == null) {
+                        LOGGER.warn(String.format("Interface %s doesn't exists.", str));
+                        continue;
+                    }
+
+                    checkInterface(nics, nif, true);
+                }
             }
         }
 
-        LOGGER.debug("Registering service on " + Arrays.toString(bound));
+        zeroconf = new Zeroconf();
+        zeroconf.addSendListener(packet -> System.out.println("SEND: " + packet));
+        zeroconf.addReceiveListener(packet -> System.out.println("RECV: " + packet));
+        zeroconf.addNetworkInterfaces(nics);
 
         Map<String, String> txt = new HashMap<>();
         txt.put("CPath", "/");
         txt.put("VERSION", "1.0");
+        Service service = new Service(inner.deviceName, "spotify-connect", port);
+        service.setText(txt);
 
-        boolean atLeastOne = false;
-        instances = new JmDNS[bound.length];
-        for (int i = 0; i < instances.length; i++) {
-            try {
-                instances[i] = JmDNS.create(bound[i], bound[i].getHostName());
-                ServiceInfo serviceInfo = ServiceInfo.create("_spotify-connect._tcp.local.", "librespot-java-" + i, port, 0, 0, txt);
-                instances[i].registerService(serviceInfo);
-                atLeastOne = true;
-            } catch (SocketException ex) {
-                LOGGER.warn("Failed creating socket for " + bound[i], ex);
-            }
-        }
-
-        if (atLeastOne) LOGGER.info("SpotifyConnect service registered successfully!");
-        else throw new IllegalStateException("Could not register the service anywhere!");
-
-        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
-            try {
-                close();
-            } catch (IOException ignored) {
-            }
-        }));
+        zeroconf.announce(service);
     }
 
     @NotNull
@@ -147,16 +145,6 @@ public static ZeroconfServer create(@NotNull AbsConfiguration conf) throws IOExc
         return new ZeroconfServer(Session.Inner.from(conf), conf);
     }
 
-    private static void addAddressForInterfaceName(List<InetAddress> list, @NotNull String name) throws SocketException {
-        NetworkInterface nif = NetworkInterface.getByName(name);
-        if (nif == null) {
-            LOGGER.warn(String.format("Interface %s doesn't exists.", name));
-            return;
-        }
-
-        addAddressOfInterface(list, nif, false);
-    }
-
     private static boolean isVirtual(@NotNull NetworkInterface nif) throws SocketException {
         byte[] mac = nif.getHardwareAddress();
         if (mac == null) return true;
@@ -174,7 +162,7 @@ private static boolean isVirtual(@NotNull NetworkInterface nif) throws SocketExc
         return false;
     }
 
-    private static void addAddressOfInterface(List<InetAddress> list, @NotNull NetworkInterface nif, boolean checkVirtual) throws SocketException {
+    private static void checkInterface(List<NetworkInterface> list, @NotNull NetworkInterface nif, boolean checkVirtual) throws SocketException {
         if (nif.isLoopback()) return;
 
         if (isVirtual(nif)) {
@@ -184,18 +172,15 @@ private static void addAddressOfInterface(List<InetAddress> list, @NotNull Netwo
                 LOGGER.warn(String.format("Interface %s is suspected to be virtual, mac: %s", nif.getName(), Utils.bytesToHex(nif.getHardwareAddress())));
         }
 
-        LOGGER.trace(String.format("Adding addresses of %s {displayName: %s, mac: %s}", nif.getName(), nif.getDisplayName(), Utils.bytesToHex(nif.getHardwareAddress())));
-        Enumeration<InetAddress> ias = nif.getInetAddresses();
-        while (ias.hasMoreElements())
-            list.add(ias.nextElement());
+        list.add(nif);
     }
 
     @NotNull
-    private static InetAddress[] getAllInterfacesAddresses() throws SocketException {
-        List<InetAddress> list = new ArrayList<>();
+    private static List<NetworkInterface> getAllInterfaces() throws SocketException {
+        List<NetworkInterface> list = new ArrayList<>();
         Enumeration<NetworkInterface> is = NetworkInterface.getNetworkInterfaces();
-        while (is.hasMoreElements()) addAddressOfInterface(list, is.nextElement(), true);
-        return list.toArray(new InetAddress[0]);
+        while (is.hasMoreElements()) checkInterface(list, is.nextElement(), true);
+        return list;
     }
 
     @NotNull
@@ -208,11 +193,7 @@ private static Map<String, String> parsePath(@NotNull String path) {
 
     @Override
     public void close() throws IOException {
-        for (JmDNS instance : instances) {
-            if (instance != null) instance.unregisterAllServices();
-        }
-
-        LOGGER.trace("SpotifyConnect service unregistered successfully.");
+        zeroconf.close();
         runner.close();
     }