Rewrite mDNS processing

pkg/hap/conn.go

@@ -8,7 +8,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/AlexxIT/go2rtc/pkg/core"
-	"github.com/AlexxIT/go2rtc/pkg/hap/mdns"
+	"github.com/AlexxIT/go2rtc/pkg/mdns"
 	"github.com/brutella/hap"
 	"github.com/brutella/hap/chacha20poly1305"
 	"github.com/brutella/hap/curve25519"
@@ -61,28 +61,29 @@ func NewConn(rawURL string) (*Conn, error) {
 }
 
 func Pair(deviceID, pin string) (*Conn, error) {
-	entry := mdns.GetEntry(deviceID)
-	if entry == nil {
+	var addr string
+	var mfi bool
+
+	_ = mdns.Discovery(mdns.ServiceHAP, func(entry *mdns.ServiceEntry) bool {
+		if entry.Complete() && entry.Info["id"] == deviceID {
+			addr = entry.Addr()
+			mfi = entry.Info["ff"] == "1"
+			return true
+		}
+		return false
+	})
+
+	if addr == "" {
 		return nil, errors.New("can't find device via mDNS")
 	}
 
 	c := &Conn{
-		DeviceAddress: fmt.Sprintf("%s:%d", entry.AddrV4.String(), entry.Port),
+		DeviceAddress: addr,
 		DeviceID:      deviceID,
 		ClientID:      GenerateUUID(),
 		ClientPrivate: GenerateKey(),
 	}
 
-	var mfi bool
-	for _, field := range entry.InfoFields {
-		if field[:2] == "ff" {
-			if field[3] == '1' {
-				mfi = true
-			}
-			break
-		}
-	}
-
 	return c, c.Pair(mfi, pin)
 }
 
@@ -106,9 +107,13 @@ func (c *Conn) DialAndServe() error {
 
 func (c *Conn) Dial() error {
 	// update device host before dial
-	if host := mdns.GetAddress(c.DeviceID); host != "" {
-		c.DeviceAddress = host
-	}
+	_ = mdns.Discovery(mdns.ServiceHAP, func(entry *mdns.ServiceEntry) bool {
+		if entry.Complete() && entry.Info["id"] == c.DeviceID {
+			c.DeviceAddress = entry.Addr()
+			return true
+		}
+		return false
+	})
 
 	var err error
 	c.conn, err = net.DialTimeout("tcp", c.DeviceAddress, time.Second*5)

pkg/hap/mdns/client.go

@@ -1,42 +0,0 @@
-package mdns
-
-import (
-	"fmt"
-	"github.com/hashicorp/mdns"
-	"strings"
-)
-
-const Suffix = "._hap._tcp.local."
-
-func GetAll() chan *mdns.ServiceEntry {
-	entries := make(chan *mdns.ServiceEntry)
-	params := &mdns.QueryParam{
-		Service: "_hap._tcp", Entries: entries, DisableIPv6: true,
-	}
-
-	go func() {
-		_ = mdns.Query(params)
-		close(entries)
-	}()
-
-	return entries
-}
-
-func GetAddress(deviceID string) string {
-	for entry := range GetAll() {
-		if strings.Contains(entry.Info, deviceID) {
-			return fmt.Sprintf("%s:%d", entry.AddrV4.String(), entry.Port)
-		}
-	}
-
-	return ""
-}
-
-func GetEntry(deviceID string) *mdns.ServiceEntry {
-	for entry := range GetAll() {
-		if strings.Contains(entry.Info, deviceID) {
-			return entry
-		}
-	}
-	return nil
-}

pkg/hap/mdns/server.go

@@ -1,53 +0,0 @@
-package mdns
-
-import (
-	"github.com/hashicorp/mdns"
-	"net"
-)
-
-const HostHeaderTail = "._hap._tcp.local"
-
-func NewServer(name string, port int, ips []net.IP, txt []string) (*mdns.Server, error) {
-	if ips == nil || ips[0] == nil {
-		ips = LocalIPs()
-	}
-
-	// important to set hostName manually with any value and `.local.` tail
-	// important to set ips manually
-	service, _ := mdns.NewMDNSService(
-		name, "_hap._tcp", "", name+".local.", port, ips, txt,
-	)
-
-	return mdns.NewServer(&mdns.Config{Zone: service})
-}
-
-func LocalIPs() []net.IP {
-	ifaces, err := net.Interfaces()
-	if err != nil {
-		return nil
-	}
-
-	var ips []net.IP
-	for _, iface := range ifaces {
-		if iface.Flags&net.FlagUp == 0 {
-			continue // interface down
-		}
-		if iface.Flags&net.FlagLoopback != 0 {
-			continue // loopback interface
-		}
-
-		var addrs []net.Addr
-		if addrs, err = iface.Addrs(); err != nil {
-			continue
-		}
-		for _, addr := range addrs {
-			switch addr := addr.(type) {
-			case *net.IPNet:
-				ips = append(ips, addr.IP)
-			case *net.IPAddr:
-				ips = append(ips, addr.IP)
-			}
-		}
-	}
-	return ips
-}