From e0ff9c99941a85c1526e0a1bf2472e3d2e8cdf91 Mon Sep 17 00:00:00 2001 From: vadym Date: Wed, 21 Dec 2022 20:18:20 +0200 Subject: [PATCH 1/5] Added coords info foeld and update it with timer --- contrib/ui/mesh-ui/ui/assets/mesh-ui-es5.js | 11 ++++++++++- contrib/ui/mesh-ui/ui/assets/mesh-ui.js | 10 ++++++++++ contrib/ui/mesh-ui/ui/index.html | 9 +++++++-- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/contrib/ui/mesh-ui/ui/assets/mesh-ui-es5.js b/contrib/ui/mesh-ui/ui/assets/mesh-ui-es5.js index 3a1c20d0..bd35f6f3 100644 --- a/contrib/ui/mesh-ui/ui/assets/mesh-ui-es5.js +++ b/contrib/ui/mesh-ui/ui/assets/mesh-ui-es5.js @@ -363,6 +363,7 @@ ui.updateConnectedPeers = function () { $("peers").innerText = error.message; ui.updateStatus(); ui.updateSpeed(); + ui.updateCoordsInfo(); }); }; @@ -384,6 +385,7 @@ ui.updateSelfInfo = function () { return ui.getSelfInfo().then(function (info) { $("ipv6").innerText = info.address; $("subnet").innerText = info.subnet; + $("coordinates").innerText = info.coords; $("pub_key").innerText = info.key; $("priv_key").innerText = info.private_key; $("ipv6").innerText = info.address; @@ -393,6 +395,14 @@ ui.updateSelfInfo = function () { }); }; +ui.updateCoordsInfo = function () { + return ui.getSelfInfo().then(function (info) { + $("coordinates").innerText = info.coords; + }).catch(function (error) { + $("ipv6").innerText = error.message; + }); +}; + ui.sse = new EventSource('/api/sse'); function main() { @@ -406,7 +416,6 @@ function main() { setInterval(ui.updateConnectedPeers, 5000); ui.updateSelfInfo(); - //setInterval(ui.updateSelfInfo, 5000); ui.sse.addEventListener("ping", function (e) { var data = JSON.parse(e.data); diff --git a/contrib/ui/mesh-ui/ui/assets/mesh-ui.js b/contrib/ui/mesh-ui/ui/assets/mesh-ui.js index 37f17914..3669716b 100644 --- a/contrib/ui/mesh-ui/ui/assets/mesh-ui.js +++ b/contrib/ui/mesh-ui/ui/assets/mesh-ui.js @@ -343,6 +343,7 @@ ui.updateConnectedPeers = () => $("peers").innerText = error.message; ui.updateStatus(); ui.updateSpeed(); + ui.updateCoordsInfo(); }); ui.lookupCountryCodeByAddress = (address) => { @@ -361,6 +362,7 @@ ui.updateSelfInfo = () => .then((info) => { $("ipv6").innerText = info.address; $("subnet").innerText = info.subnet; + $("coordinates").innerText = info.coords; $("pub_key").innerText = info.key; $("priv_key").innerText = info.private_key; $("ipv6").innerText = info.address; @@ -369,6 +371,14 @@ ui.updateSelfInfo = () => $("ipv6").innerText = error.message; }); +ui.updateCoordsInfo = function () { + return ui.getSelfInfo().then(function (info) { + $("coordinates").innerText = info.coords; + }).catch(function (error) { + $("ipv6").innerText = error.message; + }); +}; + ui.sse = new EventSource('/api/sse'); function main() { diff --git a/contrib/ui/mesh-ui/ui/index.html b/contrib/ui/mesh-ui/ui/index.html index b006f4ea..c67918e3 100755 --- a/contrib/ui/mesh-ui/ui/index.html +++ b/contrib/ui/mesh-ui/ui/index.html @@ -132,15 +132,20 @@
+
Coordinates
+
N/A
+
+ +
+
+
Peers
-
-
From 951f0a163110c681a5943ff15bc2843e7a93684f Mon Sep 17 00:00:00 2001 From: vadym Date: Wed, 21 Dec 2022 20:53:57 +0200 Subject: [PATCH 2/5] Changed coords format to [a b c ...] --- contrib/ui/mesh-ui/ui/assets/mesh-ui-es5.js | 6 +++++- contrib/ui/mesh-ui/ui/assets/mesh-ui.js | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/contrib/ui/mesh-ui/ui/assets/mesh-ui-es5.js b/contrib/ui/mesh-ui/ui/assets/mesh-ui-es5.js index bd35f6f3..dd21a243 100644 --- a/contrib/ui/mesh-ui/ui/assets/mesh-ui-es5.js +++ b/contrib/ui/mesh-ui/ui/assets/mesh-ui-es5.js @@ -381,11 +381,15 @@ ui.getSelfInfo = function () { }); }; +function replaceAll(string, search, replace) { + return string.split(search).join(replace); +} + ui.updateSelfInfo = function () { return ui.getSelfInfo().then(function (info) { $("ipv6").innerText = info.address; $("subnet").innerText = info.subnet; - $("coordinates").innerText = info.coords; + $("coordinates").innerText = "".concat('[',replaceAll(info.coords, ',', ' '),']'); $("pub_key").innerText = info.key; $("priv_key").innerText = info.private_key; $("ipv6").innerText = info.address; diff --git a/contrib/ui/mesh-ui/ui/assets/mesh-ui.js b/contrib/ui/mesh-ui/ui/assets/mesh-ui.js index 3669716b..f873a7b9 100644 --- a/contrib/ui/mesh-ui/ui/assets/mesh-ui.js +++ b/contrib/ui/mesh-ui/ui/assets/mesh-ui.js @@ -357,12 +357,16 @@ ui.getSelfInfo = () => fetch('api/self') .then((response) => response.json()) +function replaceAll(string, search, replace) { + return string.split(search).join(replace); +} + ui.updateSelfInfo = () => ui.getSelfInfo() .then((info) => { $("ipv6").innerText = info.address; $("subnet").innerText = info.subnet; - $("coordinates").innerText = info.coords; + $("coordinates").innerText = "".concat('[',replaceAll(info.coords, ',', ' '),']'); $("pub_key").innerText = info.key; $("priv_key").innerText = info.private_key; $("ipv6").innerText = info.address; From 9e5ed66dbb01c337edc0a12709b2f41ab355d8dd Mon Sep 17 00:00:00 2001 From: vadym Date: Wed, 21 Dec 2022 21:04:08 +0200 Subject: [PATCH 3/5] string format fix --- contrib/ui/mesh-ui/ui/assets/mesh-ui-es5.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/ui/mesh-ui/ui/assets/mesh-ui-es5.js b/contrib/ui/mesh-ui/ui/assets/mesh-ui-es5.js index dd21a243..41b868e6 100644 --- a/contrib/ui/mesh-ui/ui/assets/mesh-ui-es5.js +++ b/contrib/ui/mesh-ui/ui/assets/mesh-ui-es5.js @@ -389,7 +389,7 @@ ui.updateSelfInfo = function () { return ui.getSelfInfo().then(function (info) { $("ipv6").innerText = info.address; $("subnet").innerText = info.subnet; - $("coordinates").innerText = "".concat('[',replaceAll(info.coords, ',', ' '),']'); + $("coordinates").innerText = replaceAll(JSON.stringify(info.coords), ',', ' '); $("pub_key").innerText = info.key; $("priv_key").innerText = info.private_key; $("ipv6").innerText = info.address; From 369e878f5707d6aa61d6106a07a6aac43b666d4e Mon Sep 17 00:00:00 2001 From: vadym Date: Thu, 22 Dec 2022 13:41:02 +0200 Subject: [PATCH 4/5] put join instead of replace --- contrib/ui/mesh-ui/ui/assets/mesh-ui-es5.js | 6 +----- contrib/ui/mesh-ui/ui/assets/mesh-ui.js | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/contrib/ui/mesh-ui/ui/assets/mesh-ui-es5.js b/contrib/ui/mesh-ui/ui/assets/mesh-ui-es5.js index 41b868e6..ff23bd8d 100644 --- a/contrib/ui/mesh-ui/ui/assets/mesh-ui-es5.js +++ b/contrib/ui/mesh-ui/ui/assets/mesh-ui-es5.js @@ -381,15 +381,11 @@ ui.getSelfInfo = function () { }); }; -function replaceAll(string, search, replace) { - return string.split(search).join(replace); -} - ui.updateSelfInfo = function () { return ui.getSelfInfo().then(function (info) { $("ipv6").innerText = info.address; $("subnet").innerText = info.subnet; - $("coordinates").innerText = replaceAll(JSON.stringify(info.coords), ',', ' '); + $("coordinates").innerText = ''.concat('[',info.coords.join(' '),']'); $("pub_key").innerText = info.key; $("priv_key").innerText = info.private_key; $("ipv6").innerText = info.address; diff --git a/contrib/ui/mesh-ui/ui/assets/mesh-ui.js b/contrib/ui/mesh-ui/ui/assets/mesh-ui.js index f873a7b9..baee9231 100644 --- a/contrib/ui/mesh-ui/ui/assets/mesh-ui.js +++ b/contrib/ui/mesh-ui/ui/assets/mesh-ui.js @@ -357,16 +357,12 @@ ui.getSelfInfo = () => fetch('api/self') .then((response) => response.json()) -function replaceAll(string, search, replace) { - return string.split(search).join(replace); -} - ui.updateSelfInfo = () => ui.getSelfInfo() .then((info) => { $("ipv6").innerText = info.address; $("subnet").innerText = info.subnet; - $("coordinates").innerText = "".concat('[',replaceAll(info.coords, ',', ' '),']'); + $("coordinates").innerText = ''.concat('[',info.coords.join(' '),']'); $("pub_key").innerText = info.key; $("priv_key").innerText = info.private_key; $("ipv6").innerText = info.address; From b7434eac485c8d483e1609f7908d4586764bd930 Mon Sep 17 00:00:00 2001 From: vadym Date: Thu, 22 Dec 2022 13:55:39 +0200 Subject: [PATCH 5/5] Added [] for realoded coords --- contrib/ui/mesh-ui/ui/assets/mesh-ui-es5.js | 2 +- contrib/ui/mesh-ui/ui/assets/mesh-ui.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/ui/mesh-ui/ui/assets/mesh-ui-es5.js b/contrib/ui/mesh-ui/ui/assets/mesh-ui-es5.js index c40b687d..d8916fcc 100644 --- a/contrib/ui/mesh-ui/ui/assets/mesh-ui-es5.js +++ b/contrib/ui/mesh-ui/ui/assets/mesh-ui-es5.js @@ -393,7 +393,7 @@ ui.updateSelfInfo = function () { ui.updateCoordsInfo = function () { return ui.getSelfInfo().then(function (info) { - $("coordinates").innerText = info.coords; + $("coordinates").innerText = ''.concat('[',info.coords.join(' '),']'); }).catch(function (error) { $("ipv6").innerText = error.message; }); diff --git a/contrib/ui/mesh-ui/ui/assets/mesh-ui.js b/contrib/ui/mesh-ui/ui/assets/mesh-ui.js index f46fa46f..8caa39bc 100644 --- a/contrib/ui/mesh-ui/ui/assets/mesh-ui.js +++ b/contrib/ui/mesh-ui/ui/assets/mesh-ui.js @@ -370,7 +370,7 @@ ui.updateSelfInfo = () => ui.updateCoordsInfo = function () { return ui.getSelfInfo().then(function (info) { - $("coordinates").innerText = info.coords; + $("coordinates").innerText = ''.concat('[',info.coords.join(' '),']'); }).catch(function (error) { $("ipv6").innerText = error.message; });