Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions internal/dmsg-discovery/api/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -443,9 +443,10 @@ func (a *API) getAllServers() http.HandlerFunc {
}
}

// allClientsByServer returns all client entries grouped by the server they are delegated to
// allClientsByServer returns all client PKs grouped by the server they are delegated to
// URI: /dmsg-discovery/servers/clients
// Method: GET
// Response: { "server_pk": ["client_pk1", "client_pk2", ...], ... }
func (a *API) allClientsByServer() http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
entries, err := a.db.AllClientEntries(r.Context())
Expand All @@ -454,23 +455,25 @@ func (a *API) allClientsByServer() http.HandlerFunc {
return
}

result := make(map[string][]*disc.Entry)
result := make(map[string][]string)
for _, entry := range entries {
if entry.Client == nil {
continue
}
clientPK := entry.Static.Hex()
for _, serverPK := range entry.Client.DelegatedServers {
result[serverPK.Hex()] = append(result[serverPK.Hex()], entry)
result[serverPK.Hex()] = append(result[serverPK.Hex()], clientPK)
}
}

a.writeJSON(w, r, http.StatusOK, result)
}
}

// clientsByServer returns all client entries delegated to a specific server
// clientsByServer returns all client PKs delegated to a specific server
// URI: /dmsg-discovery/server/{pk}/clients
// Method: GET
// Response: ["client_pk1", "client_pk2", ...]
func (a *API) clientsByServer() http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
serverPK := cipher.PubKey{}
Expand All @@ -485,14 +488,14 @@ func (a *API) clientsByServer() http.HandlerFunc {
return
}

var result []*disc.Entry
var result []string
for _, entry := range entries {
if entry.Client == nil {
continue
}
for _, delegatedPK := range entry.Client.DelegatedServers {
if delegatedPK == serverPK {
result = append(result, entry)
result = append(result, entry.Static.Hex())
break
}
}
Expand Down
Loading