fix

2026-07-26 15:26:13 +00:00
parent b24cfcd560
commit 7dec7284f3
4 changed files with 237 additions and 6 deletions
@@ -104,3 +104,104 @@ func TestBuildServicesNilConfig(t *testing.T) {
 		t.Errorf("want nil for a nil config, got %+v", got)
 	}
 }
+
+// TestGroupServices pins the grouping the overview relies on: hosts fronted by
+// one tailnet node collapse into a single group, a public destination stays on
+// its own, and the hosts within a group keep buildServices' stable order.
+func TestGroupServices(t *testing.T) {
+	cfg := &core.Config{
+		Connect: map[string][]core.ConnectRule{
+			"sfcraft":  {{Protocol: "minecraft", LocalPort: 25566, DstAddr: "sfcraft.mc.homelab.ice:25565"}},
+			"mayday":   {{Protocol: "minecraft", LocalPort: 25571, DstAddr: "mayday.mc.homelab.ice:25565"}},
+			"l4d2_tcp": {{Protocol: "tcp", LocalPort: 27015, DstAddr: "server.l4d2.homelab.ice:27015"}},
+			// A public host resolves to no peer and must stand alone.
+			"voice": {{Protocol: "udp", LocalPort: 24454, DstAddr: "mc.lxns.net:24454"}},
+		},
+	}
+	// All three homelab hosts resolve to one subnet router.
+	snap := core.PeerSnapshot{Peers: []core.PeerInfo{{
+		ID: "n1", DisplayName: "tsdns-homelab", Online: true,
+		Linked: true, LinkTags: []string{"sfcraft", "mayday", "l4d2_tcp"},
+	}}}
+
+	groups := groupServices(buildServices(cfg, snap))
+	if len(groups) != 2 {
+		t.Fatalf("want 2 groups, got %d: %+v", len(groups), groups)
+	}
+
+	var homelab, relay *serviceGroup
+	for i := range groups {
+		switch groups[i].Title() {
+		case "tsdns-homelab":
+			homelab = &groups[i]
+		case "mc.lxns.net":
+			relay = &groups[i]
+		}
+	}
+
+	if homelab == nil {
+		t.Fatal("no group titled tsdns-homelab")
+	}
+	if len(homelab.Servers) != 3 {
+		t.Fatalf("homelab group should carry 3 hosts, got %d", len(homelab.Servers))
+	}
+	// Hosts stay host-sorted so the group does not reshuffle between frames.
+	wantHosts := []string{"mayday.mc.homelab.ice", "server.l4d2.homelab.ice", "sfcraft.mc.homelab.ice"}
+	for i, w := range wantHosts {
+		if homelab.Servers[i].Host != w {
+			t.Errorf("homelab host[%d] = %q, want %q", i, homelab.Servers[i].Host, w)
+		}
+	}
+	if !homelab.Online() {
+		t.Error("a group behind an online peer must not render as offline")
+	}
+
+	if relay == nil {
+		t.Fatal("no standalone group for the public relay")
+	}
+	if relay.Peer != nil {
+		t.Error("a public destination must not be attached to a peer")
+	}
+	if len(relay.Servers) != 1 {
+		t.Errorf("standalone group should carry 1 host, got %d", len(relay.Servers))
+	}
+
+	// Grouping must be deterministic: repeated builds agree, or the section
+	// jitters between frames.
+	for i := 0; i < 20; i++ {
+		again := groupServices(buildServices(cfg, snap))
+		if len(again) != len(groups) {
+			t.Fatalf("group count is unstable: %d vs %d", len(again), len(groups))
+		}
+		for j := range again {
+			if again[j].Title() != groups[j].Title() {
+				t.Fatalf("group order is unstable: %q vs %q", again[j].Title(), groups[j].Title())
+			}
+		}
+	}
+}
+
+// TestGroupServicesSeparatesPeers checks that two distinct peers do not merge:
+// grouping is by node identity, not by a shared DNS suffix.
+func TestGroupServicesSeparatesPeers(t *testing.T) {
+	cfg := &core.Config{
+		Connect: map[string][]core.ConnectRule{
+			"a": {{Protocol: "tcp", LocalPort: 1000, DstAddr: "a.homelab.ice:1000"}},
+			"b": {{Protocol: "tcp", LocalPort: 2000, DstAddr: "b.homelab.ice:2000"}},
+		},
+	}
+	snap := core.PeerSnapshot{Peers: []core.PeerInfo{
+		{ID: "n1", DisplayName: "box-a", Online: true, Linked: true, LinkTags: []string{"a"}},
+		{ID: "n2", DisplayName: "box-b", Online: true, Linked: true, LinkTags: []string{"b"}},
+	}}
+
+	groups := groupServices(buildServices(cfg, snap))
+	if len(groups) != 2 {
+		t.Fatalf("want 2 groups for 2 distinct peers, got %d", len(groups))
+	}
+	for _, g := range groups {
+		if len(g.Servers) != 1 {
+			t.Errorf("group %q should carry 1 host, got %d", g.Title(), len(g.Servers))
+		}
+	}
+}