yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-06-16 22:25:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revamped GET /api/peers response format

Browse source
This commit is contained in:
Mihail Slobodyanuk 2022-12-17 12:22:42 +02:00
parent 0ff6a63df5
commit b129d689a3
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
contrib/ui/mesh-ui/ui/assets/mesh-ui.js
View file

@ -279,11 +279,11 @@ ui.getConnectedPeers = () =>
fetch('api/peers') fetch('api/peers')
.then((response) => response.json()) .then((response) => response.json())
ui.updateConnectedPeersHandler = (cont) => { ui.updateConnectedPeersHandler = (peers) => {
$("peers").innerText = ""; $("peers").innerText = "";
const regexStrip = /%[^\]]*/gm; const regexStrip = /%[^\]]*/gm;
const regexMulticast = /:\/\/\[fe80::/; const regexMulticast = /:\/\/\[fe80::/;
const sorted = cont.peers.map(peer => ({"url": peer["remote"], "isMulticast": peer["remote"].match(regexMulticast)})) const sorted = peers.map(peer => ({"url": peer["remote"], "isMulticast": peer["remote"].match(regexMulticast)}))
.sort((a, b) => a.isMulticast > b.isMulticast); .sort((a, b) => a.isMulticast > b.isMulticast);
sorted.forEach(peer => { sorted.forEach(peer => {
let row = $("peers").appendChild(document.createElement('div')); let row = $("peers").appendChild(document.createElement('div'));

2
src/admin/admin.go
View file

@ -325,7 +325,7 @@ func (a *AdminSocket) StartHttpServer(configFn string, nc *config.NodeConfig) {
if err := a.getPeersHandler(req, res); err != nil { if err := a.getPeersHandler(req, res); err != nil {
http.Error(w, err.Error(), 503) http.Error(w, err.Error(), 503)
} }
b, err := json.Marshal(res) b, err := json.Marshal(res.Peers)
if err != nil { if err != nil {
http.Error(w, err.Error(), 503) http.Error(w, err.Error(), 503)
} }