From b129d689a374c752b824bb19965ec2b2a2606493 Mon Sep 17 00:00:00 2001 From: Mihail Slobodyanuk Date: Sat, 17 Dec 2022 12:22:42 +0200 Subject: [PATCH] Revamped GET /api/peers response format --- contrib/ui/mesh-ui/ui/assets/mesh-ui.js | 6 +++--- src/admin/admin.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/ui/mesh-ui/ui/assets/mesh-ui.js b/contrib/ui/mesh-ui/ui/assets/mesh-ui.js index 61c2bd57..12c44a32 100644 --- a/contrib/ui/mesh-ui/ui/assets/mesh-ui.js +++ b/contrib/ui/mesh-ui/ui/assets/mesh-ui.js @@ -279,12 +279,12 @@ ui.getConnectedPeers = () => fetch('api/peers') .then((response) => response.json()) -ui.updateConnectedPeersHandler = (cont) => { +ui.updateConnectedPeersHandler = (peers) => { $("peers").innerText = ""; const regexStrip = /%[^\]]*/gm; const regexMulticast = /:\/\/\[fe80::/; - const sorted = cont.peers.map(peer => ({"url": peer["remote"], "isMulticast": peer["remote"].match(regexMulticast)})) - .sort((a, b) => a.isMulticast > b.isMulticast); + const sorted = peers.map(peer => ({"url": peer["remote"], "isMulticast": peer["remote"].match(regexMulticast)})) + .sort((a, b) => a.isMulticast > b.isMulticast); sorted.forEach(peer => { let row = $("peers").appendChild(document.createElement('div')); row.className = "overflow-ellipsis" diff --git a/src/admin/admin.go b/src/admin/admin.go index cefd9bdd..7db6f4a6 100644 --- a/src/admin/admin.go +++ b/src/admin/admin.go @@ -325,7 +325,7 @@ func (a *AdminSocket) StartHttpServer(configFn string, nc *config.NodeConfig) { if err := a.getPeersHandler(req, res); err != nil { http.Error(w, err.Error(), 503) } - b, err := json.Marshal(res) + b, err := json.Marshal(res.Peers) if err != nil { http.Error(w, err.Error(), 503) }