refactor: move Zeroconf options to a struct

Author: devgianlu

cmd/daemon/main.go

@@ -244,7 +244,17 @@ func (app *App) withAppPlayer(ctx context.Context, appPlayerFunc func(context.Co
 	}
 
 	// start zeroconf server and dispatch
-	z, err := zeroconf.NewZeroconf(app.log, app.cfg.ZeroconfPort, app.cfg.DeviceName, app.deviceId, app.deviceType, app.cfg.ZeroconfInterfacesToAdvertise)
+	z, err := zeroconf.NewZeroconf(zeroconf.Options{
+		Log: app.log,
+
+		Port: app.cfg.ZeroconfPort,
+
+		DeviceName: app.cfg.DeviceName,
+		DeviceId:   app.deviceId,
+		DeviceType: app.deviceType,
+
+		InterfacesToAdvertise: app.cfg.ZeroconfInterfacesToAdvertise,
+	})
 	if err != nil {
 		return fmt.Errorf("failed initializing zeroconf: %w", err)
 	}

zeroconf/zeroconf.go

@@ -17,6 +17,7 @@ import (
 	"github.com/devgianlu/go-librespot/dh"
 	devicespb "github.com/devgianlu/go-librespot/proto/spotify/connectstate/devices"
 	"github.com/grandcat/zeroconf"
+	log "github.com/sirupsen/logrus"
 )
 
 type Zeroconf struct {
@@ -46,16 +47,29 @@ type NewUserRequest struct {
 	result chan bool
 }
 
-func NewZeroconf(log librespot.Logger, port int, deviceName, deviceId string, deviceType devicespb.DeviceType, interfacesToAdvertise []string) (_ *Zeroconf, err error) {
-	z := &Zeroconf{log: log, deviceId: deviceId, deviceName: deviceName, deviceType: deviceType}
+type Options struct {
+	Log librespot.Logger
+
+	Port int
+
+	DeviceName string
+	DeviceId   string
+	DeviceType devicespb.DeviceType
+
+	DiscoveryImplementation string
+	InterfacesToAdvertise   []string
+}
+
+func NewZeroconf(opts Options) (_ *Zeroconf, err error) {
+	z := &Zeroconf{log: opts.Log, deviceId: opts.DeviceId, deviceName: opts.DeviceName, deviceType: opts.DeviceType}
 	z.reqsChan = make(chan NewUserRequest)
 
 	z.dh, err = dh.NewDiffieHellman()
 	if err != nil {
 		return nil, fmt.Errorf("failed initializing diffiehellman: %w", err)
 	}
 
-	z.listener, err = net.Listen("tcp", fmt.Sprintf("0.0.0.0:%d", port))
+	z.listener, err = net.Listen("tcp", fmt.Sprintf("0.0.0.0:%d", opts.Port))
 	if err != nil {
 		return nil, fmt.Errorf("failed starting zeroconf listener: %w", err)
 	}
@@ -64,7 +78,7 @@ func NewZeroconf(log librespot.Logger, port int, deviceName, deviceId string, de
 	log.Infof("zeroconf server listening on port %d", listenPort)
 
 	var ifaces []net.Interface
-	for _, ifaceName := range interfacesToAdvertise {
+	for _, ifaceName := range opts.InterfacesToAdvertise {
 		liface, err := net.InterfaceByName(ifaceName)
 		if err != nil {
 			return nil, fmt.Errorf("failed to get info for network interface %s: %w", ifaceName, err)
@@ -74,7 +88,7 @@ func NewZeroconf(log librespot.Logger, port int, deviceName, deviceId string, de
 		log.Info(fmt.Sprintf("advertising on network interface %s", ifaceName))
 	}
 
-	z.server, err = zeroconf.Register(deviceName, "_spotify-connect._tcp", "local.", listenPort, []string{"CPath=/", "VERSION=1.0", "Stack=SP"}, ifaces)
+	z.server, err = zeroconf.Register(z.deviceName, "_spotify-connect._tcp", "local.", listenPort, []string{"CPath=/", "VERSION=1.0", "Stack=SP"}, ifaces)
 	if err != nil {
 		return nil, fmt.Errorf("failed registering zeroconf server: %w", err)
 	}