M5: mDNS - Service-Bekanntmachung (zeroconf) und Discovery
This commit is contained in:
@@ -2,4 +2,15 @@ module git.jlserver.de/goSportpunktetafel
|
||||
|
||||
go 1.19
|
||||
|
||||
require github.com/gvalkov/golang-evdev v0.0.0-20220815104727-7e27d6ce89b6
|
||||
require (
|
||||
github.com/grandcat/zeroconf v1.0.0
|
||||
github.com/gvalkov/golang-evdev v0.0.0-20220815104727-7e27d6ce89b6
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
|
||||
github.com/miekg/dns v1.1.27 // indirect
|
||||
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 // indirect
|
||||
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa // indirect
|
||||
golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe // indirect
|
||||
)
|
||||
|
||||
@@ -1,2 +1,28 @@
|
||||
github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
|
||||
github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
|
||||
github.com/grandcat/zeroconf v1.0.0 h1:uHhahLBKqwWBV6WZUDAT71044vwOTL+McW0mBJvo6kE=
|
||||
github.com/grandcat/zeroconf v1.0.0/go.mod h1:lTKmG1zh86XyCoUeIHSA4FJMBwCJiQmGfcP2PdzytEs=
|
||||
github.com/gvalkov/golang-evdev v0.0.0-20220815104727-7e27d6ce89b6 h1:K9b8efT9f1NkITNgNAm2A1LuoamhG4pAhXVjz5Sfa5Q=
|
||||
github.com/gvalkov/golang-evdev v0.0.0-20220815104727-7e27d6ce89b6/go.mod h1:SAzVFKCRezozJTGavF3GX8MBUruETCqzivVLYiywouA=
|
||||
github.com/miekg/dns v1.1.27 h1:aEH/kqUzUxGJ/UHcEKdJY+ugH6WEzsEBBSPa8zuy1aM=
|
||||
github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
|
||||
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8=
|
||||
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
|
||||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa h1:F+8P+gmewFQYRk6JoLQLwjBCTu3mcIURZfNkVweuRKA=
|
||||
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
|
||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe h1:6fAMxZRR6sl1Uq8U61gxU+kPTs2tR8uOySCbBP7BN/M=
|
||||
golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
||||
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
|
||||
@@ -0,0 +1,122 @@
|
||||
// Package mdns provides mDNS (Multicast DNS) advertising and discovery for the scoreboard.
|
||||
package mdns
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"net"
|
||||
"os"
|
||||
"time"
|
||||
|
||||
"github.com/grandcat/zeroconf"
|
||||
)
|
||||
|
||||
// ServiceName is the mDNS service name identifier.
|
||||
const ServiceName = "_sportscore._tcp"
|
||||
|
||||
// Server advertises the scoreboard via mDNS.
|
||||
type Server struct {
|
||||
server *zeroconf.Server
|
||||
}
|
||||
|
||||
// NewServer creates a new mDNS server that advertises the scoreboard.
|
||||
func NewServer(instanceName string, port int) (*Server, error) {
|
||||
// Get local network interfaces
|
||||
ifaces, err := net.Interfaces()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to get network interfaces: %w", err)
|
||||
}
|
||||
|
||||
// Filter to only non-loopback interfaces with IPv4
|
||||
var validIfaces []net.Interface
|
||||
for _, iface := range ifaces {
|
||||
if iface.Flags&net.FlagLoopback != 0 {
|
||||
continue
|
||||
}
|
||||
if iface.Flags&net.FlagUp == 0 {
|
||||
continue
|
||||
}
|
||||
validIfaces = append(validIfaces, iface)
|
||||
}
|
||||
|
||||
if len(validIfaces) == 0 {
|
||||
return nil, fmt.Errorf("no suitable network interfaces found")
|
||||
}
|
||||
|
||||
server, err := zeroconf.Register(
|
||||
instanceName,
|
||||
ServiceName,
|
||||
"local.",
|
||||
port,
|
||||
[]string{fmt.Sprintf("port=%d", port)},
|
||||
validIfaces,
|
||||
)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to register mDNS service: %w", err)
|
||||
}
|
||||
|
||||
fmt.Fprintf(os.Stderr, "[mdns] Registered mDNS service: %s.%s.local. on port %d\n", instanceName, ServiceName, port)
|
||||
|
||||
return &Server{server: server}, nil
|
||||
}
|
||||
|
||||
// Stop stops the mDNS server.
|
||||
func (s *Server) Stop() {
|
||||
if s.server != nil {
|
||||
s.server.Shutdown()
|
||||
}
|
||||
}
|
||||
|
||||
// DiscoveryResult contains information about a discovered scoreboard instance.
|
||||
type DiscoveryResult struct {
|
||||
Instance string
|
||||
Host string
|
||||
Port int
|
||||
Addr string
|
||||
}
|
||||
|
||||
// Discover scans the network for scoreboard instances.
|
||||
// Returns a list of discovered instances or an error.
|
||||
func Discover() ([]*DiscoveryResult, error) {
|
||||
results := make([]*DiscoveryResult, 0)
|
||||
|
||||
resolver, err := zeroconf.NewResolver(nil)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to create mDNS resolver: %w", err)
|
||||
}
|
||||
|
||||
entries := make(chan *zeroconf.ServiceEntry)
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
|
||||
go func() {
|
||||
defer cancel()
|
||||
err := resolver.Browse(ctx, ServiceName, "local.", entries)
|
||||
if err != nil {
|
||||
fmt.Fprintf(os.Stderr, "[mdns] Browse error: %v\n", err)
|
||||
}
|
||||
close(entries)
|
||||
}()
|
||||
|
||||
for entry := range entries {
|
||||
var addr string
|
||||
if len(entry.AddrIPv4) > 0 {
|
||||
addr = net.JoinHostPort(entry.AddrIPv4[0].String(), fmt.Sprintf("%d", entry.Port))
|
||||
} else {
|
||||
addr = net.JoinHostPort(entry.HostName, fmt.Sprintf("%d", entry.Port))
|
||||
}
|
||||
|
||||
result := &DiscoveryResult{
|
||||
Instance: entry.Instance,
|
||||
Host: entry.HostName,
|
||||
Port: int(entry.Port),
|
||||
Addr: addr,
|
||||
}
|
||||
results = append(results, result)
|
||||
}
|
||||
|
||||
return results, nil
|
||||
}
|
||||
|
||||
// GetServiceName returns the mDNS service name.
|
||||
func GetServiceName() string {
|
||||
return ServiceName
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
package mdns
|
||||
|
||||
import (
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestGetServiceName(t *testing.T) {
|
||||
expected := "_sportscore._tcp"
|
||||
got := GetServiceName()
|
||||
if got != expected {
|
||||
t.Errorf("GetServiceName() = %q, want %q", got, expected)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDiscoveryResult(t *testing.T) {
|
||||
result := &DiscoveryResult{
|
||||
Instance: "test-scoreboard",
|
||||
Host: "myhost.local",
|
||||
Port: 3000,
|
||||
Addr: "192.168.1.100:3000",
|
||||
}
|
||||
|
||||
if result.Instance != "test-scoreboard" {
|
||||
t.Errorf("Instance = %q, want %q", result.Instance, "test-scoreboard")
|
||||
}
|
||||
if result.Port != 3000 {
|
||||
t.Errorf("Port = %d, want 3000", result.Port)
|
||||
}
|
||||
if result.Addr != "192.168.1.100:3000" {
|
||||
t.Errorf("Addr = %q, want %q", result.Addr, "192.168.1.100:3000")
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user