grpcv1: share list-RPC response helpers

hscontrol/grpcv1.go

@@ -4,6 +4,7 @@
 package hscontrol
 
 import (
+	"cmp"
 	"context"
 	"errors"
 	"fmt"
@@ -11,7 +12,6 @@ import (
 	"net/netip"
 	"os"
 	"slices"
-	"sort"
 	"strings"
 	"time"
 
@@ -44,6 +44,13 @@ func newHeadscaleV1APIServer(h *Headscale) v1.HeadscaleServiceServer {
 	}
 }
 
+// sortByID sorts a slice of proto messages by ascending Id.
+func sortByID[T interface{ GetId() uint64 }](s []T) {
+	slices.SortFunc(s, func(a, b T) int {
+		return cmp.Compare(a.GetId(), b.GetId())
+	})
+}
+
 func (api headscaleV1APIServer) CreateUser(
 	ctx context.Context,
 	request *v1.CreateUserRequest,
@@ -137,9 +144,7 @@ func (api headscaleV1APIServer) ListUsers(
 		response[index] = user.Proto()
 	}
 
-	sort.Slice(response, func(i, j int) bool {
-		return response[i].Id < response[j].Id
-	})
+	sortByID(response)
 
 	return &v1.ListUsersResponse{Users: response}, nil
 }
@@ -223,9 +228,7 @@ func (api headscaleV1APIServer) ListPreAuthKeys(
 		response[index] = key.Proto()
 	}
 
-	sort.Slice(response, func(i, j int) bool {
-		return response[i].Id < response[j].Id
-	})
+	sortByID(response)
 
 	return &v1.ListPreAuthKeysResponse{PreAuthKeys: response}, nil
 }
@@ -527,24 +530,19 @@ func (api headscaleV1APIServer) ListNodes(
 	ctx context.Context,
 	request *v1.ListNodesRequest,
 ) (*v1.ListNodesResponse, error) {
-	// TODO(kradalby): it looks like this can be simplified a lot,
-	// the filtering of nodes by user, vs nodes as a whole can
-	// probably be done once.
 	// TODO(kradalby): This should be done in one tx.
+	var nodes views.Slice[types.NodeView]
 	if request.GetUser() != "" {
 		user, err := api.h.state.GetUserByName(request.GetUser())
 		if err != nil {
 			return nil, err
 		}
 
-		nodes := api.h.state.ListNodesByUser(types.UserID(user.ID))
-
-		response := nodesToProto(api.h.state, nodes)
-		return &v1.ListNodesResponse{Nodes: response}, nil
+		nodes = api.h.state.ListNodesByUser(types.UserID(user.ID))
+	} else {
+		nodes = api.h.state.ListNodes()
 	}
 
-	nodes := api.h.state.ListNodes()
-
 	response := nodesToProto(api.h.state, nodes)
 	return &v1.ListNodesResponse{Nodes: response}, nil
 }
@@ -564,9 +562,7 @@ func nodesToProto(state *state.State, nodes views.Slice[types.NodeView]) []*v1.N
 		response[index] = resp
 	}
 
-	sort.Slice(response, func(i, j int) bool {
-		return response[i].Id < response[j].Id
-	})
+	sortByID(response)
 
 	return response
 }
@@ -661,9 +657,7 @@ func (api headscaleV1APIServer) ListApiKeys(
 		response[index] = key.Proto()
 	}
 
-	sort.Slice(response, func(i, j int) bool {
-		return response[i].Id < response[j].Id
-	})
+	sortByID(response)
 
 	return &v1.ListApiKeysResponse{ApiKeys: response}, nil
 }