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

UI getSelf regirected moved to REST /api/getself

Browse source 
removed dead code
This commit is contained in:
Mihail Slobodyanuk 2022-12-15 16:01:57 +02:00
parent 0c6f0cbf8c
commit 609ba1a3cd
3 changed files with 22 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,15 +1,6 @@
var $ = id => document.getElementById(id) var $ = id => document.getElementById(id)
var $$ = clazz => document.getElementsByClassName(clazz) var $$ = clazz => document.getElementsByClassName(clazz)
function setFieldValue(id, value) {
//console.log(`setFieldValue(${id}, ${value})`);
if (id === 'peers') {
return;
}
var field = $(id);
field.innerHTML = value;
}
function setPingValue(peer, value) { function setPingValue(peer, value) {
var cellText; var cellText;
var peerCell = $(peer); var peerCell = $(peer);
@ -294,6 +285,23 @@ ui.lookupCountryCodeByAddress = (address) => {
return ui._allPeers[c][peer].countryCode; return ui._allPeers[c][peer].countryCode;
} }
ui.getSelfInfo = () =>
fetch('api/getself')
.then((response) => response.json())
ui.updateSelfInfo = () =>
ui.getSelfInfo()
.then((info) => {
$("ipv6").innerText = info.address;
$("pub_key").innerText = info.key;
$("priv_key").innerText = info.private_key;
$("ipv6").innerText = info.address;
$("version").innerText = info.build_version;
}).catch((error) => {
$("ipv6").innerText = error.message;
});
function main() { function main() {
fetch('country.json') fetch('country.json')
@ -302,8 +310,12 @@ function main() {
window.addEventListener("load", () => { window.addEventListener("load", () => {
$("showAllPeersBtn").addEventListener("click", ui.showAllPeers); $("showAllPeersBtn").addEventListener("click", ui.showAllPeers);
ui.getAllPeers().then(() => ui.updateConnectedPeers()); ui.getAllPeers().then(() => ui.updateConnectedPeers());
setInterval(ui.updateConnectedPeers, 5000); setInterval(ui.updateConnectedPeers, 5000);
ui.updateSelfInfo();
setInterval(ui.updateSelfInfo, 5000);
}); });
} }

2
contrib/ui/mesh-ui/ui/index.html
View file

@ -14,7 +14,7 @@
<script type="application/javascript" src="assets/mesh-ui.js"></script> <script type="application/javascript" src="assets/mesh-ui.js"></script>
</head> </head>
<body onload="onLoad();"> <body>
<div class="container hero is-fullheight"> <div class="container hero is-fullheight">
<div class="box is-hidden" id="notification_window"> <div class="box is-hidden" id="notification_window">
<div style="z-index: 9;" class="notification is-primary"> <div style="z-index: 9;" class="notification is-primary">

61
contrib/ui/mesh-ui/webview.go
View file

@ -119,10 +119,6 @@ func main() {
} }
} }
w.Bind("onLoad", func() {
log.Println("page loaded")
go run(w)
})
w.Bind("savePeers", func(peer_list string) { w.Bind("savePeers", func(peer_list string) {
//log.Println("peers saved ", peer_list) //log.Println("peers saved ", peer_list)
var peers []string var peers []string
@ -176,14 +172,6 @@ func check(peer string) int64 {
return d.Milliseconds() return d.Milliseconds()
} }
func run(w webview.WebView) {
get_self(w)
get_peers(w)
_ = time.AfterFunc(10*time.Second, func() {
run(w)
})
}
func add_peers(uri string) { func add_peers(uri string) {
_, err := run_command_with_arg("addpeers", "uri="+uri) _, err := run_command_with_arg("addpeers", "uri="+uri)
if err != nil { if err != nil {
@ -195,55 +183,6 @@ func remove_peers() {
run_command("removepeers") run_command("removepeers")
} }
func get_self(w webview.WebView) {
res := &admin.GetSelfResponse{}
out := run_command("getSelf")
if err := json.Unmarshal(out, &res); err != nil {
go setFieldValue(w, "ipv6", err.Error())
return
}
//found ipv6
fmt.Printf("IPv6: %s\n", res.IPAddress)
go setFieldValue(w, "ipv6", res.IPAddress)
go setFieldValue(w, "pub_key", res.PublicKey)
go setFieldValue(w, "priv_key", res.PrivateKey)
go setFieldValue(w, "version", fmt.Sprintf("v%v/%v", res.BuildVersion, uiVersion))
//found subnet
fmt.Printf("Subnet: %s\n", res.Subnet)
go setFieldValue(w, "subnet", res.Subnet)
out = run_command("getPeers")
//go setFieldValue(w, "peers", string(out))
}
func get_peers(w webview.WebView) {
res := &admin.GetPeersResponse{}
out := run_command("getPeers")
if err := json.Unmarshal(out, &res); err != nil {
go setFieldValue(w, "peers", err.Error())
return
}
var m []string
for _, s := range res.Peers {
m = append(m, s.Remote)
}
for k := range m {
// Loop
fmt.Println(k)
}
inner_html := strings.Join(m[:], "<br>")
strings.Join(m[:], "<br>")
go setFieldValue(w, "peers", inner_html)
}
func setFieldValue(p webview.WebView, id string, value string) {
p.Dispatch(func() {
p.Eval("setFieldValue('" + id + "','" + value + "');")
})
}
func setPingValue(p webview.WebView, peer string, value string) { func setPingValue(p webview.WebView, peer string, value string) {
p.Dispatch(func() { p.Dispatch(func() {
p.Eval("setPingValue('" + peer + "','" + value + "');") p.Eval("setPingValue('" + peer + "','" + value + "');")