Skip to content

Agent Mesh

add service registration api

Antonio Ojea5cc0afbc054b
diff --git a/api/sam.pb.go b/api/sam.pb.go
index 55f27f5b..5d0e3185 100644
--- a/api/sam.pb.go
+++ b/api/sam.pb.go
@@ -395,6 +395,118 @@ func (x *EnrollResponse) GetKnownPeers() []string {
return nil
}
+type ServiceInfo struct {
+ state protoimpl.MessageState `protogen:"open.v1"`
+ Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
+ Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+ Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
+}
+
+func (x *ServiceInfo) Reset() {
+ *x = ServiceInfo{}
+ mi := &file_api_sam_proto_msgTypes[5]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+}
+
+func (x *ServiceInfo) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ServiceInfo) ProtoMessage() {}
+
+func (x *ServiceInfo) ProtoReflect() protoreflect.Message {
+ mi := &file_api_sam_proto_msgTypes[5]
+ if x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use ServiceInfo.ProtoReflect.Descriptor instead.
+func (*ServiceInfo) Descriptor() ([]byte, []int) {
+ return file_api_sam_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *ServiceInfo) GetType() string {
+ if x != nil {
+ return x.Type
+ }
+ return ""
+}
+
+func (x *ServiceInfo) GetName() string {
+ if x != nil {
+ return x.Name
+ }
+ return ""
+}
+
+func (x *ServiceInfo) GetDescription() string {
+ if x != nil {
+ return x.Description
+ }
+ return ""
+}
+
+type DiscoveredProvider struct {
+ state protoimpl.MessageState `protogen:"open.v1"`
+ PeerId string `protobuf:"bytes,1,opt,name=peer_id,json=peerId,proto3" json:"peer_id,omitempty"`
+ LocalProxyUrl string `protobuf:"bytes,2,opt,name=local_proxy_url,json=localProxyUrl,proto3" json:"local_proxy_url,omitempty"`
+ unknownFields protoimpl.UnknownFields
+ sizeCache protoimpl.SizeCache
+}
+
+func (x *DiscoveredProvider) Reset() {
+ *x = DiscoveredProvider{}
+ mi := &file_api_sam_proto_msgTypes[6]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+}
+
+func (x *DiscoveredProvider) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DiscoveredProvider) ProtoMessage() {}
+
+func (x *DiscoveredProvider) ProtoReflect() protoreflect.Message {
+ mi := &file_api_sam_proto_msgTypes[6]
+ if x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use DiscoveredProvider.ProtoReflect.Descriptor instead.
+func (*DiscoveredProvider) Descriptor() ([]byte, []int) {
+ return file_api_sam_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *DiscoveredProvider) GetPeerId() string {
+ if x != nil {
+ return x.PeerId
+ }
+ return ""
+}
+
+func (x *DiscoveredProvider) GetLocalProxyUrl() string {
+ if x != nil {
+ return x.LocalProxyUrl
+ }
+ return ""
+}
+
var File_api_sam_proto protoreflect.FileDescriptor
const file_api_sam_proto_rawDesc = "" +
@@ -429,7 +541,14 @@ const file_api_sam_proto_rawDesc = "" +
"expiration\x18\x05 \x01(\x03R\n" +
"expiration\x12\x1f\n" +
"\vknown_peers\x18\x06 \x03(\tR\n" +
- "knownPeersB\x1bZ\x19github.com/google/sam/apib\x06proto3"
+ "knownPeers\"W\n" +
+ "\vServiceInfo\x12\x12\n" +
+ "\x04type\x18\x01 \x01(\tR\x04type\x12\x12\n" +
+ "\x04name\x18\x02 \x01(\tR\x04name\x12 \n" +
+ "\vdescription\x18\x03 \x01(\tR\vdescription\"U\n" +
+ "\x12DiscoveredProvider\x12\x17\n" +
+ "\apeer_id\x18\x01 \x01(\tR\x06peerId\x12&\n" +
+ "\x0flocal_proxy_url\x18\x02 \x01(\tR\rlocalProxyUrlB\x1bZ\x19github.com/google/sam/apib\x06proto3"
var (
file_api_sam_proto_rawDescOnce sync.Once
@@ -444,14 +563,16 @@ func file_api_sam_proto_rawDescGZIP() []byte {
}
var file_api_sam_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_api_sam_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
+var file_api_sam_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
var file_api_sam_proto_goTypes = []any{
- (MeshEvent_Type)(0), // 0: sam.v1.MeshEvent.Type
- (*AuthFrame)(nil), // 1: sam.v1.AuthFrame
- (*AuthResponse)(nil), // 2: sam.v1.AuthResponse
- (*MeshEvent)(nil), // 3: sam.v1.MeshEvent
- (*EnrollRequest)(nil), // 4: sam.v1.EnrollRequest
- (*EnrollResponse)(nil), // 5: sam.v1.EnrollResponse
+ (MeshEvent_Type)(0), // 0: sam.v1.MeshEvent.Type
+ (*AuthFrame)(nil), // 1: sam.v1.AuthFrame
+ (*AuthResponse)(nil), // 2: sam.v1.AuthResponse
+ (*MeshEvent)(nil), // 3: sam.v1.MeshEvent
+ (*EnrollRequest)(nil), // 4: sam.v1.EnrollRequest
+ (*EnrollResponse)(nil), // 5: sam.v1.EnrollResponse
+ (*ServiceInfo)(nil), // 6: sam.v1.ServiceInfo
+ (*DiscoveredProvider)(nil), // 7: sam.v1.DiscoveredProvider
}
var file_api_sam_proto_depIdxs = []int32{
0, // 0: sam.v1.MeshEvent.type:type_name -> sam.v1.MeshEvent.Type
@@ -473,7 +594,7 @@ func file_api_sam_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: unsafe.Slice(unsafe.StringData(file_api_sam_proto_rawDesc), len(file_api_sam_proto_rawDesc)),
NumEnums: 1,
- NumMessages: 5,
+ NumMessages: 7,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/api/sam.proto b/api/sam.proto
index 75ddc830..8e4707fa 100644
--- a/api/sam.proto
+++ b/api/sam.proto
@@ -56,3 +56,14 @@ message EnrollResponse {
int64 expiration = 5;
repeated string known_peers = 6;
}
+
+message ServiceInfo {
+ string type = 1;
+ string name = 2;
+ string description = 3;
+}
+
+message DiscoveredProvider {
+ string peer_id = 1;
+ string local_proxy_url = 2;
+}
diff --git a/cmd/sam-node/mcp.go b/cmd/sam-node/mcp.go
index bde99d5f..eac995aa 100644
--- a/cmd/sam-node/mcp.go
+++ b/cmd/sam-node/mcp.go
@@ -60,6 +60,46 @@ func NewMCPHandler(node *SamNode) http.Handler {
Description: "Send a message to another agent in the mesh",
}, handleSendMessage)
+ // Add list_local_services tool
+ mcp.AddTool(mcpServer, &mcp.Tool{
+ Name: "list_local_services",
+ Description: "List services registered on the local node",
+ }, func(ctx context.Context, req *mcp.CallToolRequest, params struct{}) (*mcp.CallToolResult, any, error) {
+ services := node.ListLocalServices()
+ respData, err := json.Marshal(services)
+ if err != nil {
+ return nil, nil, err
+ }
+ return &mcp.CallToolResult{
+ Content: []mcp.Content{
+ &mcp.TextContent{Text: string(respData)},
+ },
+ }, nil, nil
+ })
+
+ // Add discover_remote_services tool
+ mcp.AddTool(mcpServer, &mcp.Tool{
+ Name: "discover_remote_services",
+ Description: "Discover remote services in the mesh",
+ }, func(ctx context.Context, req *mcp.CallToolRequest, params struct {
+ Type string `json:"type" jsonschema:"Service type (mcp, inference, a2a)"`
+ Name string `json:"name" jsonschema:"Service name"`
+ }) (*mcp.CallToolResult, any, error) {
+ providers, err := node.DiscoverRemoteServices(ctx, params.Type, params.Name)
+ if err != nil {
+ return nil, nil, err
+ }
+ respData, err := json.Marshal(providers)
+ if err != nil {
+ return nil, nil, err
+ }
+ return &mcp.CallToolResult{
+ Content: []mcp.Content{
+ &mcp.TextContent{Text: string(respData)},
+ },
+ }, nil, nil
+ })
+
// Add the mesh_pubsub_broadcast tool.
mcp.AddTool(mcpServer, &mcp.Tool{
Name: "mesh_pubsub_broadcast",
diff --git a/cmd/sam-node/node.go b/cmd/sam-node/node.go
index af7bca24..10f4da2f 100644
--- a/cmd/sam-node/node.go
+++ b/cmd/sam-node/node.go
@@ -84,8 +84,9 @@ type SamNode struct {
trustedKeys []TrustedKey
keysMu sync.RWMutex
rateLimiter *PeerRateLimiter
- services map[string]bool
+ services map[string]*api.ServiceInfo
servicesMu sync.RWMutex
+ BoundHTTPAddr string
}
// NewSamNode creates a new Agent instance secured with the 4-layer pipeline.
@@ -101,7 +102,7 @@ func NewSamNode(ctx context.Context, privKey crypto.PrivKey, hubPubKey ed25519.P
knownPeers: make(map[string]bool),
receivedMsgs: make(map[string][]string),
topics: make(map[string]*pubsub.Topic),
- services: make(map[string]bool),
+ services: make(map[string]*api.ServiceInfo),
LocalPolicy: localPolicy,
}
@@ -608,18 +609,17 @@ func (n *SamNode) verifyBiscuit(biscuitData []byte, remotePeer peer.ID) (*biscui
return nil, fmt.Errorf("no valid key found")
}
-func serviceNameToCID(name string) (cid.Cid, error) {
- pref := cid.Prefix{
- Version: 1,
- Codec: cid.Raw,
- MhType: multihash.SHA2_256,
- MhLength: -1, // default length
+func serviceNameToCID(serviceType, serviceName string) (cid.Cid, error) {
+ serviceKey := fmt.Sprintf("sam:service:%s:%s", serviceType, serviceName)
+ hash, err := multihash.Sum([]byte(serviceKey), multihash.SHA2_256, -1)
+ if err != nil {
+ return cid.Undef, err
}
- return pref.Sum([]byte(name))
+ return cid.NewCidV1(cid.Raw, hash), nil
}
-func (n *SamNode) RegisterService(ctx context.Context, serviceName string) error {
- c, err := serviceNameToCID(serviceName)
+func (n *SamNode) RegisterService(ctx context.Context, info *api.ServiceInfo) error {
+ c, err := serviceNameToCID(info.Type, info.Name)
if err != nil {
return err
}
@@ -633,10 +633,10 @@ func (n *SamNode) RegisterService(ctx context.Context, serviceName string) error
}
n.servicesMu.Lock()
- n.services[serviceName] = true
+ n.services[info.Name] = info
n.servicesMu.Unlock()
- logger.Infof("[ServiceRegistry] Registering service %s (CID: %s)", serviceName, c)
+ logger.Infof("[ServiceRegistry] Registering service %s/%s (CID: %s)", info.Type, info.Name, c)
return nil
}
@@ -653,11 +653,12 @@ func (n *SamNode) UnregisterService(ctx context.Context, serviceName string) err
func (n *SamNode) IsServiceRegistered(serviceName string) bool {
n.servicesMu.RLock()
defer n.servicesMu.RUnlock()
- return n.services[serviceName]
+ _, ok := n.services[serviceName]
+ return ok
}
-func (n *SamNode) FindProviders(ctx context.Context, serviceName string) ([]peer.AddrInfo, error) {
- c, err := serviceNameToCID(serviceName)
+func (n *SamNode) FindProviders(ctx context.Context, serviceType, serviceName string) ([]peer.AddrInfo, error) {
+ c, err := serviceNameToCID(serviceType, serviceName)
if err != nil {
return nil, err
}
@@ -673,3 +674,45 @@ func (n *SamNode) FindProviders(ctx context.Context, serviceName string) ([]peer
}
return providerInfos, nil
}
+
+func (n *SamNode) DiscoverRemoteServices(ctx context.Context, serviceType, serviceName string) ([]*api.DiscoveredProvider, error) {
+ providers, err := n.FindProviders(ctx, serviceType, serviceName)
+ if err != nil {
+ return nil, err
+ }
+
+ var discovered []*api.DiscoveredProvider
+ for _, p := range providers {
+ if p.ID == n.Host.ID() {
+ continue
+ }
+
+ // Construct local proxy URL
+ // We need to know our own bound port. We'll assume it's set in node.BoundHTTPAddr
+ // Format: http://localhost:<sam_port>/sam/{peer_id}/{service_type}/{service_name}
+ localURL := fmt.Sprintf("http://%s/sam/%s/%s/%s",
+ n.BoundHTTPAddr,
+ p.ID.String(),
+ serviceType,
+ serviceName,
+ )
+
+ discovered = append(discovered, &api.DiscoveredProvider{
+ PeerId: p.ID.String(),
+ LocalProxyUrl: localURL,
+ })
+ }
+
+ return discovered, nil
+}
+
+func (n *SamNode) ListLocalServices() []*api.ServiceInfo {
+ n.servicesMu.RLock()
+ defer n.servicesMu.RUnlock()
+
+ var services []*api.ServiceInfo
+ for _, info := range n.services {
+ services = append(services, info)
+ }
+ return services
+}
diff --git a/cmd/sam-node/sidecar.go b/cmd/sam-node/sidecar.go
index a5ebc257..72b68373 100644
--- a/cmd/sam-node/sidecar.go
+++ b/cmd/sam-node/sidecar.go
@@ -23,6 +23,8 @@ import (
"net/http"
"os"
"strings"
+
+ "github.com/google/sam/api"
)
func startSidecarServer(node *SamNode, addr, token, certFile, keyFile, caFile string) {
@@ -58,6 +60,7 @@ func startSidecarServer(node *SamNode, addr, token, certFile, keyFile, caFile st
}
actualAddr := listener.Addr().String()
+ node.BoundHTTPAddr = actualAddr
if (certFile != "") != (keyFile != "") {
logger.Errorf("Both --tls-cert and --tls-key must be provided to enable TLS")
@@ -160,18 +163,18 @@ func handleRegisterService(node *SamNode, w http.ResponseWriter, r *http.Request
return
}
- var req ServiceRequest
+ var req api.ServiceInfo
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
http.Error(w, "Invalid request body", http.StatusBadRequest)
return
}
- if req.ServiceName == "" {
- http.Error(w, "service_name is required", http.StatusBadRequest)
+ if req.Name == "" || req.Type == "" {
+ http.Error(w, "name and type are required", http.StatusBadRequest)
return
}
- if err := node.RegisterService(r.Context(), req.ServiceName); err != nil {
+ if err := node.RegisterService(r.Context(), &req); err != nil {
http.Error(w, fmt.Sprintf("Failed to register service: %v", err), http.StatusInternalServerError)
return
}
@@ -188,18 +191,18 @@ func handleUnregisterService(node *SamNode, w http.ResponseWriter, r *http.Reque
return
}
- var req ServiceRequest
+ var req api.ServiceInfo
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
http.Error(w, "Invalid request body", http.StatusBadRequest)
return
}
- if req.ServiceName == "" {
- http.Error(w, "service_name is required", http.StatusBadRequest)
+ if req.Name == "" {
+ http.Error(w, "name is required", http.StatusBadRequest)
return
}
- if err := node.UnregisterService(r.Context(), req.ServiceName); err != nil {
+ if err := node.UnregisterService(r.Context(), req.Name); err != nil {
http.Error(w, fmt.Sprintf("Failed to unregister service: %v", err), http.StatusInternalServerError)
return
}
@@ -217,12 +220,13 @@ func handleDiscoverService(node *SamNode, w http.ResponseWriter, r *http.Request
}
serviceName := r.URL.Query().Get("name")
- if serviceName == "" {
- http.Error(w, "name query parameter is required", http.StatusBadRequest)
+ serviceType := r.URL.Query().Get("type")
+ if serviceName == "" || serviceType == "" {
+ http.Error(w, "name and type query parameters are required", http.StatusBadRequest)
return
}
- providers, err := node.FindProviders(r.Context(), serviceName)
+ providers, err := node.DiscoverRemoteServices(r.Context(), serviceType, serviceName)
if err != nil {
http.Error(w, fmt.Sprintf("Failed to discover services: %v", err), http.StatusInternalServerError)
return
diff --git a/cmd/sam-node/sidecar_test.go b/cmd/sam-node/sidecar_test.go
index 221785cf..b5bc37a4 100644
--- a/cmd/sam-node/sidecar_test.go
+++ b/cmd/sam-node/sidecar_test.go
@@ -23,6 +23,7 @@ import (
"testing"
"time"
+ "github.com/google/sam/api"
"github.com/libp2p/go-libp2p"
dht "github.com/libp2p/go-libp2p-kad-dht"
"github.com/libp2p/go-libp2p/core/peer"
@@ -142,12 +143,15 @@ func TestHandleRegisterService(t *testing.T) {
time.Sleep(100 * time.Millisecond)
node := &SamNode{
- services: make(map[string]bool),
+ services: make(map[string]*api.ServiceInfo),
DHT: d,
}
- reqBody := ServiceRequest{ServiceName: "test-service"}
- body, _ := json.Marshal(reqBody)
+ reqBody := &api.ServiceInfo{Type: "mcp", Name: "test-service", Description: "test desc"}
+ body, err := json.Marshal(reqBody)
+ if err != nil {
+ t.Fatalf("Failed to marshal request body: %v", err)
+ }
req := httptest.NewRequest("POST", "/sam/service/register", bytes.NewBuffer(body))
rr := httptest.NewRecorder()
@@ -165,12 +169,15 @@ func TestHandleRegisterService(t *testing.T) {
func TestHandleUnregisterService(t *testing.T) {
node := &SamNode{
- services: make(map[string]bool),
+ services: make(map[string]*api.ServiceInfo),
}
- node.services["test-service"] = true
+ node.services["test-service"] = &api.ServiceInfo{Name: "test-service"}
- reqBody := ServiceRequest{ServiceName: "test-service"}
- body, _ := json.Marshal(reqBody)
+ reqBody := &api.ServiceInfo{Name: "test-service"}
+ body, err := json.Marshal(reqBody)
+ if err != nil {
+ t.Fatalf("Failed to marshal request body: %v", err)
+ }
req := httptest.NewRequest("POST", "/sam/service/unregister", bytes.NewBuffer(body))
rr := httptest.NewRecorder()
@@ -185,3 +192,91 @@ func TestHandleUnregisterService(t *testing.T) {
t.Errorf("expected service to be unregistered")
}
}
+
+func TestHandleDiscoverService(t *testing.T) {
+ h, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer func() { _ = h.Close() }()
+ d, err := dht.New(context.Background(), h, dht.Mode(dht.ModeServer), dht.ProtocolPrefix("/sam"))
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer func() { _ = d.Close() }()
+
+ node := &SamNode{
+ services: make(map[string]*api.ServiceInfo),
+ DHT: d,
+ Host: h,
+ BoundHTTPAddr: "127.0.0.1:8080",
+ }
+
+ // Register a service on another host to be discovered
+ h2, err := libp2p.New(libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"))
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer func() { _ = h2.Close() }()
+ d2, err := dht.New(context.Background(), h2, dht.Mode(dht.ModeServer), dht.ProtocolPrefix("/sam"))
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer func() { _ = d2.Close() }()
+
+ err = h.Connect(context.Background(), peer.AddrInfo{ID: h2.ID(), Addrs: h2.Addrs()})
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ serviceInfo := &api.ServiceInfo{Type: "mcp", Name: "remote-service"}
+ c, err := serviceNameToCID(serviceInfo.Type, serviceInfo.Name)
+ if err != nil {
+ t.Fatal(err)
+ }
+ // We don't strictly need Provide to succeed if we can mock the DHT lookup,
+ // but here we are using real DHT. If it fails because table is empty,
+ // we might need to ensure routing table is populated.
+ // Let's ignore the error for now to see if it works without it (maybe DHT cache works).
+ _ = d2.Provide(context.Background(), c, true)
+
+ time.Sleep(100 * time.Millisecond) // Wait for DHT
+
+ req := httptest.NewRequest("GET", "/sam/service/discover?type=mcp&name=remote-service", nil)
+ rr := httptest.NewRecorder()
+
+ handleDiscoverService(node, rr, req)
+
+ if rr.Code != http.StatusOK {
+ t.Errorf("expected status OK, got %d, body: %s", rr.Code, rr.Body.String())
+ }
+
+ var providers []*api.DiscoveredProvider
+ if err := json.NewDecoder(rr.Body).Decode(&providers); err != nil {
+ t.Fatal(err)
+ }
+
+ if len(providers) != 1 {
+ t.Errorf("expected 1 provider, got %d", len(providers))
+ } else if providers[0].PeerId != h2.ID().String() {
+ t.Errorf("expected provider %s, got %s", h2.ID().String(), providers[0].PeerId)
+ }
+}
+
+func TestListLocalServices(t *testing.T) {
+ node := &SamNode{
+ services: make(map[string]*api.ServiceInfo),
+ }
+
+ service1 := &api.ServiceInfo{Type: "mcp", Name: "service1"}
+ service2 := &api.ServiceInfo{Type: "inference", Name: "service2"}
+
+ node.services["service1"] = service1
+ node.services["service2"] = service2
+
+ services := node.ListLocalServices()
+
+ if len(services) != 2 {
+ t.Errorf("expected 2 services, got %d", len(services))
+ }
+}
diff --git a/tests/integration/service_discovery_test.go b/tests/integration/service_discovery_test.go
index 68fbb814..dfaa02a3 100644
--- a/tests/integration/service_discovery_test.go
+++ b/tests/integration/service_discovery_test.go
@@ -24,6 +24,7 @@ import (
"testing"
"time"
+ "github.com/google/sam/api"
"github.com/libp2p/go-libp2p/core/peer"
)
@@ -142,7 +143,7 @@ func waitForAPI(t *testing.T, addr string) {
func registerService(t *testing.T, apiAddr, token, serviceName string) {
t.Helper()
- reqBody := map[string]string{"service_name": serviceName}
+ reqBody := map[string]string{"Type": "mcp", "Name": serviceName, "Description": "test desc"}
body, _ := json.Marshal(reqBody)
req, _ := http.NewRequest("POST", "http://"+apiAddr+"/sam/service/register", bytes.NewBuffer(body))
req.Header.Set("Authorization", "Bearer "+token)
@@ -161,7 +162,7 @@ func registerService(t *testing.T, apiAddr, token, serviceName string) {
func unregisterService(t *testing.T, apiAddr, token, serviceName string) {
t.Helper()
- reqBody := map[string]string{"service_name": serviceName}
+ reqBody := map[string]string{"Name": serviceName}
body, _ := json.Marshal(reqBody)
req, _ := http.NewRequest("POST", "http://"+apiAddr+"/sam/service/unregister", bytes.NewBuffer(body))
req.Header.Set("Authorization", "Bearer "+token)
@@ -179,7 +180,7 @@ func unregisterService(t *testing.T, apiAddr, token, serviceName string) {
func discoverService(t *testing.T, apiAddr, token, serviceName string) []peer.AddrInfo {
t.Helper()
- req, _ := http.NewRequest("GET", "http://"+apiAddr+"/sam/service/discover?name="+serviceName, nil)
+ req, _ := http.NewRequest("GET", "http://"+apiAddr+"/sam/service/discover?type=mcp&name="+serviceName, nil)
req.Header.Set("Authorization", "Bearer "+token)
resp, err := http.DefaultClient.Do(req)
@@ -191,11 +192,22 @@ func discoverService(t *testing.T, apiAddr, token, serviceName string) []peer.Ad
t.Fatalf("Discover service failed with status: %d", resp.StatusCode)
}
- var providers []peer.AddrInfo
+ var providers []api.DiscoveredProvider
if err := json.NewDecoder(resp.Body).Decode(&providers); err != nil {
t.Fatalf("Failed to decode providers: %v", err)
}
- return providers
+
+ var addrInfos []peer.AddrInfo
+ for i := range providers {
+ p := &providers[i]
+ pid, err := peer.Decode(p.PeerId)
+ if err != nil {
+ t.Logf("Failed to decode peer ID %s: %v", p.PeerId, err)
+ continue
+ }
+ addrInfos = append(addrInfos, peer.AddrInfo{ID: pid})
+ }
+ return addrInfos
}
func getPeerIDFromAddr(addr string) peer.ID {