From 3e3eec0fb1f691f52e3b696c11ed8a21c507d48e Mon Sep 17 00:00:00 2001
From: Max <max@privatevoid.net>
Date: Mon, 22 Apr 2024 15:04:33 +0200
Subject: [PATCH] packages/hyprspace: select peers by name or ID prefix

---
 .../networking/hyprspace/config/config.go     | 27 +++++++++++++++++++
 packages/networking/hyprspace/rpc/server.go   | 16 ++---------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/packages/networking/hyprspace/config/config.go b/packages/networking/hyprspace/config/config.go
index ac036f0..3b69644 100644
--- a/packages/networking/hyprspace/config/config.go
+++ b/packages/networking/hyprspace/config/config.go
@@ -162,6 +162,33 @@ func FindPeer(peers []Peer, needle peer.ID) (*Peer, bool) {
 	return nil, false
 }
 
+func FindPeerByName(peers []Peer, needle string) (*Peer, bool) {
+	for _, p := range peers {
+		if p.Name == needle {
+			return &p, true
+		}
+	}
+	return nil, false
+}
+
+func FindPeerByIDPrefix(peers []Peer, needle string) (*Peer, bool) {
+	for _, p := range peers {
+		if strings.HasPrefix(p.ID.String(), needle) {
+			return &p, true
+		}
+	}
+	return nil, false
+}
+
+func FindPeerByCLIRef(peers []Peer, needle string) (*Peer, bool) {
+	if strings.HasPrefix(needle, "@") {
+		name := strings.TrimPrefix(needle, "@")
+		return FindPeerByName(peers, name)
+	} else {
+		return FindPeerByIDPrefix(peers, needle)
+	}
+}
+
 func (cfg Config) FindRoute(needle net.IPNet) (*RouteTableEntry, bool) {
 	networks, err := cfg.PeerLookup.ByRoute.CoveredNetworks(needle)
 	if err != nil {
diff --git a/packages/networking/hyprspace/rpc/server.go b/packages/networking/hyprspace/rpc/server.go
index ff9cddf..fbf8b54 100644
--- a/packages/networking/hyprspace/rpc/server.go
+++ b/packages/networking/hyprspace/rpc/server.go
@@ -111,19 +111,7 @@ func (hsr *HyprspaceRPC) Route(args *RouteArgs, reply *RouteReply) error {
 		if err != nil {
 			return err
 		}
-		peerId, err := peer.Decode(args.Args[1])
-		if err != nil {
-			return err
-		}
-		var target config.Peer
-		var found bool
-		for _, p := range hsr.config.Peers {
-			if p.ID == peerId {
-				target = p
-				found = true
-				break
-			}
-		}
+		target, found := config.FindPeerByCLIRef(hsr.config.Peers, args.Args[1])
 		if !found {
 			return errors.New("no such peer")
 		}
@@ -134,7 +122,7 @@ func (hsr *HyprspaceRPC) Route(args *RouteArgs, reply *RouteReply) error {
 
 		hsr.config.PeerLookup.ByRoute.Insert(&config.RouteTableEntry{
 			Net:    *network,
-			Target: target,
+			Target: *target,
 		})
 	case Del:
 		if len(args.Args) != 1 {