freifunk/hopglass
8
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[!!!][TASK] Use eslint default

Browse source
This commit is contained in:
Milan Pässler 2017-03-18 15:33:49 +01:00
parent a627e2febc
commit a8c19ba44c
19 changed files with 379 additions and 158 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app.js
View file

@ -11,7 +11,7 @@ require.config({
"d3": "../bower_components/d3/d3.min", "d3": "../bower_components/d3/d3.min",
"virtual-dom": "../bower_components/virtual-dom/dist/virtual-dom", "virtual-dom": "../bower_components/virtual-dom/dist/virtual-dom",
"rbush": "../bower_components/rbush/rbush", "rbush": "../bower_components/rbush/rbush",
"helper": "../helper" "helper": "utils/helper"
}, },
shim: { shim: {
"leaflet.label": ["leaflet"], "leaflet.label": ["leaflet"],
@ -23,6 +23,6 @@ require.config({
} }
}); });
require(["main", "helper"], function (main) { require(["main", "helper"], function (main, helper) {
getJSON("config.json").then(main); helper.getJSON("config.json").then(main);
}); });

4
lib/filters/genericnode.js
View file

@ -1,4 +1,4 @@
define([], function () { define(["helper"], function (helper) {
return function (name, key, value, f) { return function (name, key, value, f) {
var negate = false; var negate = false;
var refresh; var refresh;
@ -9,7 +9,7 @@ define([], function () {
label.appendChild(strong); label.appendChild(strong);
function run(d) { function run(d) {
var o = dictGet(d, key.slice(0)); var o = helper.dictGet(d, key.slice(0));
if (f) { if (f) {
o = f(o); o = f(o);

6
lib/forcegraph.js
View file

@ -1,4 +1,4 @@
define(["d3"], function (d3) { define(["d3", "helper"], function (d3, helper) {
var margin = 200; var margin = 200;
var NODE_RADIUS = 15; var NODE_RADIUS = 15;
var LINE_RADIUS = 7; var LINE_RADIUS = 7;
@ -32,7 +32,7 @@ define(["d3"], function (d3) {
} }
function savePositions() { function savePositions() {
if (!localStorageTest()) { if (!helper.localStorageTest()) {
return; return;
} }
@ -773,7 +773,7 @@ define(["d3"], function (d3) {
return !d.o.node; return !d.o.node;
}); });
if (localStorageTest()) { if (helper.localStorageTest()) {
var save = JSON.parse(localStorage.getItem("graph/nodeposition")); var save = JSON.parse(localStorage.getItem("graph/nodeposition"));
if (save) { if (save) {

18
lib/infobox/link.js
View file

@ -1,11 +1,11 @@
define(function () { define(["helper"], function (helper) {
function showStatImg(o, d) { function showStatImg(o, d) {
var subst = {}; var subst = {};
subst["{SOURCE}"] = d.source.node_id; subst["{SOURCE}"] = d.source.node_id;
subst["{SOURCE_NAME}"] = d.source.node.nodeinfo.hostname ? d.source.node.nodeinfo.hostname : "unknown"; subst["{SOURCE_NAME}"] = d.source.node.nodeinfo.hostname ? d.source.node.nodeinfo.hostname : "unknown";
subst["{TARGET}"] = d.target.node_id; subst["{TARGET}"] = d.target.node_id;
subst["{TARGET_NAME}"] = d.target.node.nodeinfo.hostname ? d.target.node.nodeinfo.hostname : "unknown"; subst["{TARGET_NAME}"] = d.target.node.nodeinfo.hostname ? d.target.node.nodeinfo.hostname : "unknown";
return showStat(o, subst); return helper.showStat(o, subst);
} }
return function (config, el, router, d) { return function (config, el, router, d) {
@ -19,7 +19,7 @@ define(function () {
a1.textContent = unknown ? d.source.id : d.source.node.nodeinfo.hostname; a1.textContent = unknown ? d.source.id : d.source.node.nodeinfo.hostname;
h2.appendChild(a1); h2.appendChild(a1);
h2.appendChild(document.createTextNode(" \uF3D6 ")); h2.appendChild(document.createTextNode(" \uF3D6 "));
h2.className = 'ion-inside'; h2.className = "ion-inside";
var a2 = document.createElement("a"); var a2 = document.createElement("a");
a2.href = "#"; a2.href = "#";
a2.onclick = router.node(d.target.node); a2.onclick = router.node(d.target.node);
@ -30,12 +30,12 @@ define(function () {
var attributes = document.createElement("table"); var attributes = document.createElement("table");
attributes.classList.add("attributes"); attributes.classList.add("attributes");
attributeEntry(attributes, "TQ", showTq(d)); helper.attributeEntry(attributes, "TQ", helper.showTq(d));
attributeEntry(attributes, "Entfernung", showDistance(d)); helper.attributeEntry(attributes, "Entfernung", helper.showDistance(d));
attributeEntry(attributes, "Typ", d.type); helper.attributeEntry(attributes, "Typ", d.type);
var hw1 = unknown ? null : dictGet(d.source.node.nodeinfo, ["hardware", "model"]); var hw1 = unknown ? null : helper.dictGet(d.source.node.nodeinfo, ["hardware", "model"]);
var hw2 = dictGet(d.target.node.nodeinfo, ["hardware", "model"]); var hw2 = helper.dictGet(d.target.node.nodeinfo, ["hardware", "model"]);
attributeEntry(attributes, "Hardware", (hw1 != null ? hw1 : "unbekannt") + " – " + (hw2 != null ? hw2 : "unbekannt")); helper.attributeEntry(attributes, "Hardware", (hw1 != null ? hw1 : "unbekannt") + " – " + (hw2 != null ? hw2 : "unbekannt"));
el.appendChild(attributes); el.appendChild(attributes);
if (config.linkInfos) { if (config.linkInfos) {

6
lib/infobox/location.js
View file

@ -1,10 +1,10 @@
define(function () { define(["helper"], function (helper) {
return function (config, el, router, d) { return function (config, el, router, d) {
var sidebarTitle = document.createElement("h2"); var sidebarTitle = document.createElement("h2");
sidebarTitle.textContent = "Location: " + d.toString(); sidebarTitle.textContent = "Location: " + d.toString();
el.appendChild(sidebarTitle); el.appendChild(sidebarTitle);
getJSON("https://nominatim.openstreetmap.org/reverse?format=json&lat=" + d.lat + "&lon=" + d.lng + "&zoom=18&addressdetails=0") helper.getJSON("https://nominatim.openstreetmap.org/reverse?format=json&lat=" + d.lat + "&lon=" + d.lng + "&zoom=18&addressdetails=0")
.then(function (result) { .then(function (result) {
if (result.display_name) { if (result.display_name) {
sidebarTitle.textContent = result.display_name; sidebarTitle.textContent = result.display_name;
@ -84,7 +84,7 @@ define(function () {
try { try {
document.execCommand("copy"); document.execCommand("copy");
} catch (err) { } catch (err) {
console.log(err); console.warn(err);
} }
} }

6
lib/infobox/main.js
View file

@ -33,17 +33,17 @@ define(["infobox/link", "infobox/node", "infobox/location"], function (Link, Nod
self.gotoNode = function (d) { self.gotoNode = function (d) {
create(); create();
new Node(config, el, router, d); Node(config, el, router, d);
}; };
self.gotoLink = function (d) { self.gotoLink = function (d) {
create(); create();
new Link(config, el, router, d); Link(config, el, router, d);
}; };
self.gotoLocation = function (d) { self.gotoLocation = function (d) {
create(); create();
new Location(config, el, router, d); Location(config, el, router, d);
}; };
return self; return self;

106
lib/infobox/node.js
View file

@ -1,5 +1,5 @@
define(["moment", "tablesort", "moment.de"], define(["moment", "tablesort", "helper", "moment.de"],
function (moment, Tablesort) { function (moment, Tablesort, helper) {
function showGeoURI(d) { function showGeoURI(d) {
function showLatitude(d) { function showLatitude(d) {
var suffix = Math.sign(d) > -1 ? "' N" : "' S"; var suffix = Math.sign(d) > -1 ? "' N" : "' S";
@ -21,7 +21,7 @@ define(["moment", "tablesort", "moment.de"],
return a + "° " + min.toFixed(3) + suffix; return a + "° " + min.toFixed(3) + suffix;
} }
if (!has_location(d)) { if (!helper.hasLocation(d)) {
return undefined; return undefined;
} }
@ -49,8 +49,8 @@ define(["moment", "tablesort", "moment.de"],
} }
function showFirmware(d) { function showFirmware(d) {
var release = dictGet(d.nodeinfo, ["software", "firmware", "release"]); var release = helper.dictGet(d.nodeinfo, ["software", "firmware", "release"]);
var base = dictGet(d.nodeinfo, ["software", "firmware", "base"]); var base = helper.dictGet(d.nodeinfo, ["software", "firmware", "base"]);
if (release === null || base === null) { if (release === null || base === null) {
return undefined; return undefined;
@ -60,7 +60,7 @@ define(["moment", "tablesort", "moment.de"],
} }
function showSite(d, config) { function showSite(d, config) {
var site = dictGet(d.nodeinfo, ["system", "site_code"]); var site = helper.dictGet(d.nodeinfo, ["system", "site_code"]);
var rt = site; var rt = site;
if (config.siteNames) { if (config.siteNames) {
config.siteNames.forEach(function (t) { config.siteNames.forEach(function (t) {
@ -220,7 +220,7 @@ define(["moment", "tablesort", "moment.de"],
} }
function showIPs(d) { function showIPs(d) {
var ips = dictGet(d.nodeinfo, ["network", "addresses"]); var ips = helper.dictGet(d.nodeinfo, ["network", "addresses"]);
if (ips === null) { if (ips === null) {
return undefined; return undefined;
} }
@ -340,13 +340,13 @@ define(["moment", "tablesort", "moment.de"],
function showGateway(d, router) { function showGateway(d, router) {
var nh; var nh;
if (dictGet(d.statistics, ["nexthop"])) { if (helper.dictGet(d.statistics, ["nexthop"])) {
nh = dictGet(d.statistics, ["nexthop"]); nh = helper.dictGet(d.statistics, ["nexthop"]);
} }
if (dictGet(d.statistics, ["gateway_nexthop"])) { if (helper.dictGet(d.statistics, ["gateway_nexthop"])) {
nh = dictGet(d.statistics, ["gateway_nexthop"]); nh = helper.dictGet(d.statistics, ["gateway_nexthop"]);
} }
var gw = dictGet(d.statistics, ["gateway"]); var gw = helper.dictGet(d.statistics, ["gateway"]);
if (!gw) { if (!gw) {
return null; return null;
@ -362,16 +362,16 @@ define(["moment", "tablesort", "moment.de"],
if (!nh.node || !nh.node.statistics) { if (!nh.node || !nh.node.statistics) {
break; break;
} }
if (!dictGet(nh.node.statistics, ["gateway"]) || !dictGet(nh.node.statistics, ["gateway"]).id) { if (!helper.dictGet(nh.node.statistics, ["gateway"]) || !helper.dictGet(nh.node.statistics, ["gateway"]).id) {
break; break;
} }
if (dictGet(nh.node.statistics, ["gateway"]).id !== gw.id) { if (helper.dictGet(nh.node.statistics, ["gateway"]).id !== gw.id) {
break; break;
} }
if (dictGet(nh.node.statistics, ["gateway_nexthop"])) { if (helper.dictGet(nh.node.statistics, ["gateway_nexthop"])) {
nh = dictGet(nh.node.statistics, ["gateway_nexthop"]); nh = helper.dictGet(nh.node.statistics, ["gateway_nexthop"]);
} else if (dictGet(nh.node.statistics, ["nexthop"])) { } else if (helper.dictGet(nh.node.statistics, ["nexthop"])) {
nh = dictGet(nh.node.statistics, ["nexthop"]); nh = helper.dictGet(nh.node.statistics, ["nexthop"]);
} else { } else {
break; break;
} }
@ -391,7 +391,7 @@ define(["moment", "tablesort", "moment.de"],
} }
function showPages(d) { function showPages(d) {
var webpages = dictGet(d.nodeinfo, ["pages"]); var webpages = helper.dictGet(d.nodeinfo, ["pages"]);
if (webpages === null) { if (webpages === null) {
return undefined; return undefined;
} }
@ -425,7 +425,7 @@ define(["moment", "tablesort", "moment.de"],
} }
function showAutoupdate(d) { function showAutoupdate(d) {
var au = dictGet(d.nodeinfo, ["software", "autoupdater"]); var au = helper.dictGet(d.nodeinfo, ["software", "autoupdater"]);
if (!au) { if (!au) {
return undefined; return undefined;
} }
@ -469,8 +469,8 @@ define(["moment", "tablesort", "moment.de"],
function showStatImg(o, d) { function showStatImg(o, d) {
var subst = {}; var subst = {};
subst["{NODE_ID}"] = d.nodeinfo.node_id ? d.nodeinfo.node_id : "unknown"; subst["{NODE_ID}"] = d.nodeinfo.node_id ? d.nodeinfo.node_id : "unknown";
subst["{NODE_NAME}"] = d.nodeinfo.hostname ? d.nodeinfo.hostname.replace(/[^a-z0-9\-]/ig, '_') : "unknown"; subst["{NODE_NAME}"] = d.nodeinfo.hostname ? d.nodeinfo.hostname.replace(/[^a-z0-9\-]/ig, "_") : "unknown";
return showStat(o, subst); return helper.showStat(o, subst);
} }
return function (config, el, router, d) { return function (config, el, router, d) {
@ -483,47 +483,47 @@ define(["moment", "tablesort", "moment.de"],
try { try {
config.hwImg.forEach(function (hwImg) { config.hwImg.forEach(function (hwImg) {
try { try {
top.appendChild(showNodeImg(hwImg, dictGet(d, ["nodeinfo", "hardware", "model"]))); top.appendChild(showNodeImg(hwImg, helper.dictGet(d, ["nodeinfo", "hardware", "model"])));
} catch (err) { } catch (err) {
console.log(err.message); console.warn(err.message);
} }
}); });
} catch (err) { } catch (err) {
console.log(err.message); console.warn(err.message);
} }
attributeEntry(attributes, top, d.nodeinfo.hostname); helper.attributeEntry(attributes, top, d.nodeinfo.hostname);
} else { } else {
var h2 = document.createElement("h2"); var h2 = document.createElement("h2");
h2.textContent = d.nodeinfo.hostname; h2.textContent = d.nodeinfo.hostname;
el.appendChild(h2); el.appendChild(h2);
} }
attributeEntry(attributes, "Status", showStatus(d)); helper.attributeEntry(attributes, "Status", showStatus(d));
attributeEntry(attributes, "Gateway", d.flags.gateway ? "ja" : null); helper.attributeEntry(attributes, "Gateway", d.flags.gateway ? "ja" : null);
attributeEntry(attributes, "Koordinaten", showGeoURI(d)); helper.attributeEntry(attributes, "Koordinaten", showGeoURI(d));
if (config.showContact) { if (config.showContact) {
attributeEntry(attributes, "Kontakt", dictGet(d.nodeinfo, ["owner", "contact"])); helper.attributeEntry(attributes, "Kontakt", helper.dictGet(d.nodeinfo, ["owner", "contact"]));
} }
attributeEntry(attributes, "Hardware", dictGet(d.nodeinfo, ["hardware", "model"])); helper.attributeEntry(attributes, "Hardware", helper.dictGet(d.nodeinfo, ["hardware", "model"]));
attributeEntry(attributes, "Primäre MAC", dictGet(d.nodeinfo, ["network", "mac"])); helper.attributeEntry(attributes, "Primäre MAC", helper.dictGet(d.nodeinfo, ["network", "mac"]));
attributeEntry(attributes, "Node ID", dictGet(d.nodeinfo, ["node_id"])); helper.attributeEntry(attributes, "Node ID", helper.dictGet(d.nodeinfo, ["node_id"]));
attributeEntry(attributes, "Firmware", showFirmware(d)); helper.attributeEntry(attributes, "Firmware", showFirmware(d));
attributeEntry(attributes, "Site", showSite(d, config)); helper.attributeEntry(attributes, "Site", showSite(d, config));
attributeEntry(attributes, "Uptime", showUptime(d)); helper.attributeEntry(attributes, "Uptime", showUptime(d));
attributeEntry(attributes, "Teil des Netzes", showFirstseen(d)); helper.attributeEntry(attributes, "Teil des Netzes", showFirstseen(d));
attributeEntry(attributes, "Kanal 2.4 GHz", showWifiChannel(dictGet(d.nodeinfo, ["wireless", "chan2"]))); helper.attributeEntry(attributes, "Kanal 2.4 GHz", showWifiChannel(helper.dictGet(d.nodeinfo, ["wireless", "chan2"])));
attributeEntry(attributes, "Kanal 5 GHz", showWifiChannel(dictGet(d.nodeinfo, ["wireless", "chan5"]))); helper.attributeEntry(attributes, "Kanal 5 GHz", showWifiChannel(helper.dictGet(d.nodeinfo, ["wireless", "chan5"])));
attributeEntry(attributes, "Airtime 2.4 GHz", showAirtime(2, dictGet(d.statistics, ["wireless", "airtime2"]))); helper.attributeEntry(attributes, "Airtime 2.4 GHz", showAirtime(2, helper.dictGet(d.statistics, ["wireless", "airtime2"])));
attributeEntry(attributes, "Airtime 5 GHz", showAirtime(5, dictGet(d.statistics, ["wireless", "airtime5"]))); helper.attributeEntry(attributes, "Airtime 5 GHz", showAirtime(5, helper.dictGet(d.statistics, ["wireless", "airtime5"])));
attributeEntry(attributes, "Systemlast", showLoad(d)); helper.attributeEntry(attributes, "Systemlast", showLoad(d));
attributeEntry(attributes, "Arbeitsspeicher", showRAM(d)); helper.attributeEntry(attributes, "Arbeitsspeicher", showRAM(d));
attributeEntry(attributes, "IP Adressen", showIPs(d)); helper.attributeEntry(attributes, "IP Adressen", showIPs(d));
attributeEntry(attributes, "Webseite", showPages(d)); helper.attributeEntry(attributes, "Webseite", showPages(d));
attributeEntry(attributes, "Gewähltes Gateway", showGateway(d, router)); helper.attributeEntry(attributes, "Gewähltes Gateway", showGateway(d, router));
attributeEntry(attributes, "Autom. Updates", showAutoupdate(d)); helper.attributeEntry(attributes, "Autom. Updates", showAutoupdate(d));
attributeEntry(attributes, "Clients", showClients(d), showMeshClients(d)); helper.attributeEntry(attributes, "Clients", showClients(d), showMeshClients(d));
el.appendChild(attributes); el.appendChild(attributes);
@ -577,14 +577,14 @@ define(["moment", "tablesort", "moment.de"],
var tr = document.createElement("tr"); var tr = document.createElement("tr");
var td1 = document.createElement("td"); var td1 = document.createElement("td");
td1.className = 'ion-inside'; td1.className = "ion-inside";
td1.appendChild(document.createTextNode(d.incoming ? " \uF3D5 " : " \uF3D6 ")); td1.appendChild(document.createTextNode(d.incoming ? " \uF3D5 " : " \uF3D6 "));
tr.appendChild(td1); tr.appendChild(td1);
var td2 = document.createElement("td"); var td2 = document.createElement("td");
td2.appendChild(createLink(d, router)); td2.appendChild(createLink(d, router));
if (!unknown && has_location(d.node)) { if (!unknown && helper.hasLocation(d.node)) {
var span = document.createElement("span"); var span = document.createElement("span");
span.classList.add("icon"); span.classList.add("icon");
span.classList.add("ion-location"); span.classList.add("ion-location");
@ -596,7 +596,7 @@ define(["moment", "tablesort", "moment.de"],
var td3 = document.createElement("td"); var td3 = document.createElement("td");
var a2 = document.createElement("a"); var a2 = document.createElement("a");
a2.href = "#"; a2.href = "#";
a2.textContent = showTq(d.link); a2.textContent = helper.showTq(d.link);
a2.onclick = router.link(d.link); a2.onclick = router.link(d.link);
td3.appendChild(a2); td3.appendChild(a2);
tr.appendChild(td3); tr.appendChild(td3);
@ -612,7 +612,7 @@ define(["moment", "tablesort", "moment.de"],
var td5 = document.createElement("td"); var td5 = document.createElement("td");
var a4 = document.createElement("a"); var a4 = document.createElement("a");
a4.href = "#"; a4.href = "#";
a4.textContent = showDistance(d.link); a4.textContent = helper.showDistance(d.link);
a4.onclick = router.link(d.link); a4.onclick = router.link(d.link);
td5.appendChild(a4); td5.appendChild(a4);
td5.setAttribute("data-sort", d.link.distance !== undefined ? -d.link.distance : 1); td5.setAttribute("data-sort", d.link.distance !== undefined ? -d.link.distance : 1);
@ -624,7 +624,7 @@ define(["moment", "tablesort", "moment.de"],
table.appendChild(tbody); table.appendChild(tbody);
table.className = "node-links"; table.className = "node-links";
new Tablesort(table); Tablesort(table);
el.appendChild(table); el.appendChild(table);
} }

6
lib/linklist.js
View file

@ -1,4 +1,4 @@
define(["sorttable", "virtual-dom"], function (SortTable, V) { define(["sorttable", "virtual-dom", "helper"], function (SortTable, V, helper) {
function linkName(d) { function linkName(d) {
return (d.source.node ? d.source.node.nodeinfo.hostname : d.source.id) + " – " + d.target.node.nodeinfo.hostname; return (d.source.node ? d.source.node.nodeinfo.hostname : d.source.id) + " – " + d.target.node.nodeinfo.hostname;
} }
@ -40,9 +40,9 @@ define(["sorttable", "virtual-dom"], function (SortTable, V) {
var td1Content = [V.h("a", {href: "#", onclick: router.link(d)}, linkName(d))]; var td1Content = [V.h("a", {href: "#", onclick: router.link(d)}, linkName(d))];
var td1 = V.h("td", td1Content); var td1 = V.h("td", td1Content);
var td2 = V.h("td", {style: {color: linkScale(d.tq).hex()}}, showTq(d)); var td2 = V.h("td", {style: {color: linkScale(d.tq).hex()}}, helper.showTq(d));
var td3 = V.h("td", d.type); var td3 = V.h("td", d.type);
var td4 = V.h("td", showDistance(d)); var td4 = V.h("td", helper.showDistance(d));
return V.h("tr", [td1, td2, td3, td4]); return V.h("tr", [td1, td2, td3, td4]);
} }

17
lib/main.js
View file

@ -1,5 +1,5 @@
define(["moment", "router", "leaflet", "gui", "moment.de"], define(["moment", "router", "leaflet", "gui", "helper", "moment.de"],
function (moment, Router, L, GUI) { function (moment, Router, L, GUI, helper) {
return function (config) { return function (config) {
function handleData(data) { function handleData(data) {
var dataNodes = {}; var dataNodes = {};
@ -21,7 +21,7 @@ define(["moment", "router", "leaflet", "gui", "moment.de"],
if (i % 2) { if (i % 2) {
if (data[i].version !== 1) { if (data[i].version !== 1) {
vererr = "Unsupported graph version: " + data[i].version; vererr = "Unsupported graph version: " + data[i].version;
console.log(vererr); //silent fail console.error(vererr); //silent fail
} else { } else {
data[i].batadv.links.forEach(rearrangeLinks); data[i].batadv.links.forEach(rearrangeLinks);
dataGraph.batadv.nodes = dataGraph.batadv.nodes.concat(data[i].batadv.nodes); dataGraph.batadv.nodes = dataGraph.batadv.nodes.concat(data[i].batadv.nodes);
@ -30,7 +30,7 @@ define(["moment", "router", "leaflet", "gui", "moment.de"],
} }
} else if (data[i].version !== 2) { } else if (data[i].version !== 2) {
vererr = "Unsupported nodes version: " + data[i].version; vererr = "Unsupported nodes version: " + data[i].version;
console.log(vererr); //silent fail console.error(vererr); //silent fail
} else { } else {
data[i].nodes.forEach(fillData); data[i].nodes.forEach(fillData);
dataNodes.timestamp = data[i].timestamp; dataNodes.timestamp = data[i].timestamp;
@ -60,8 +60,8 @@ define(["moment", "router", "leaflet", "gui", "moment.de"],
var now = moment(); var now = moment();
var age = moment(now).subtract(config.maxAge, "days"); var age = moment(now).subtract(config.maxAge, "days");
var newnodes = limit("firstseen", age, sortByKey("firstseen", nodes).filter(online)); var newnodes = helper.limit("firstseen", age, helper.sortByKey("firstseen", nodes).filter(helper.online));
var lostnodes = limit("lastseen", age, sortByKey("lastseen", nodes).filter(offline)); var lostnodes = helper.limit("lastseen", age, helper.sortByKey("lastseen", nodes).filter(helper.offline));
var graphnodes = {}; var graphnodes = {};
@ -197,6 +197,7 @@ define(["moment", "router", "leaflet", "gui", "moment.de"],
} }
}; };
} }
moment.locale("de"); moment.locale("de");
var router = new Router(); var router = new Router();
@ -213,7 +214,7 @@ define(["moment", "router", "leaflet", "gui", "moment.de"],
} }
function update() { function update() {
return Promise.all(urls.map(getJSON)) return Promise.all(urls.map(helper.getJSON))
.then(handleData); .then(handleData);
} }
@ -233,7 +234,7 @@ define(["moment", "router", "leaflet", "gui", "moment.de"],
}) })
.catch(function (e) { .catch(function (e) {
document.body.textContent = e; document.body.textContent = e;
console.log(e); console.warn(e);
}); });
}; };
}); });

36
lib/map.js
View file

@ -1,7 +1,7 @@
define(["map/clientlayer", "map/labelslayer", define(["map/clientlayer", "map/labelslayer",
"d3", "leaflet", "moment", "locationmarker", "rbush", "d3", "leaflet", "moment", "locationmarker", "rbush", "helper",
"leaflet.label", "leaflet.providers", "moment.de"], "leaflet.label", "leaflet.providers", "moment.de"],
function (ClientLayer, LabelsLayer, d3, L, moment, LocationMarker, rbush) { function (ClientLayer, LabelsLayer, d3, L, moment, LocationMarker, rbush, helper) {
var options = { var options = {
worldCopyJump: true, worldCopyJump: true,
zoomControl: false zoomControl: false
@ -149,7 +149,7 @@ define(["map/clientlayer", "map/labelslayer",
line.setStyle(opts); line.setStyle(opts);
}; };
line.bindLabel(d.source.node.nodeinfo.hostname + " – " + d.target.node.nodeinfo.hostname + "<br><strong>" + showDistance(d) + " / " + showTq(d) + "</strong>"); line.bindLabel(d.source.node.nodeinfo.hostname + " – " + d.target.node.nodeinfo.hostname + "<br><strong>" + helper.showDistance(d) + " / " + helper.showTq(d) + "</strong>");
line.on("click", router.link(d)); line.on("click", router.link(d));
dict[d.id] = line; dict[d.id] = line;
@ -307,7 +307,7 @@ define(["map/clientlayer", "map/labelslayer",
layerControl.addBaseLayer(layer, layerName); layerControl.addBaseLayer(layer, layerName);
customLayers[layerName] = layer; customLayers[layerName] = layer;
if (localStorageTest()) { if (helper.localStorageTest()) {
localStorage.setItem("map/customLayers", JSON.stringify(Object.keys(customLayers))); localStorage.setItem("map/customLayers", JSON.stringify(Object.keys(customLayers)));
} }
} catch (e) { } catch (e) {
@ -354,7 +354,7 @@ define(["map/clientlayer", "map/labelslayer",
layerControl = L.control.layers(baseLayers, [], {position: "bottomright"}); layerControl = L.control.layers(baseLayers, [], {position: "bottomright"});
layerControl.addTo(map); layerControl.addTo(map);
if (localStorageTest()) { if (helper.localStorageTest()) {
var d = JSON.parse(localStorage.getItem("map/customLayers")); var d = JSON.parse(localStorage.getItem("map/customLayers"));
if (d) { if (d) {
@ -385,7 +385,7 @@ define(["map/clientlayer", "map/labelslayer",
if (map.getZoom() > map.options.maxZoom) { if (map.getZoom() > map.options.maxZoom) {
map.setZoom(map.options.maxZoom); map.setZoom(map.options.maxZoom);
} }
if (localStorageTest()) { if (helper.localStorageTest()) {
localStorage.setItem("map/selectedLayer", JSON.stringify({name: e.name})); localStorage.setItem("map/selectedLayer", JSON.stringify({name: e.name}));
} }
}); });
@ -531,30 +531,30 @@ define(["map/clientlayer", "map/labelslayer",
groupLines = L.featureGroup(lines).addTo(map); groupLines = L.featureGroup(lines).addTo(map);
if (typeof config.fixedCenter === "undefined") { if (typeof config.fixedCenter === "undefined") {
barycenter = calcBarycenter(data.nodes.all.filter(has_location)); barycenter = calcBarycenter(data.nodes.all.filter(helper.hasLocation));
} else { } else {
barycenter = L.circle(L.latLng(new L.LatLng(config.fixedCenter.lat, config.fixedCenter.lng)), config.fixedCenter.radius * 1000); barycenter = L.circle(L.latLng(new L.LatLng(config.fixedCenter.lat, config.fixedCenter.lng)), config.fixedCenter.radius * 1000);
} }
var nodesOnline = subtract(data.nodes.all.filter(online), data.nodes.new); var nodesOnline = helper.subtract(data.nodes.all.filter(helper.online), data.nodes.new);
var nodesOffline = subtract(data.nodes.all.filter(offline), data.nodes.lost); var nodesOffline = helper.subtract(data.nodes.all.filter(helper.offline), data.nodes.lost);
var markersOnline = nodesOnline.filter(has_location) var markersOnline = nodesOnline.filter(helper.hasLocation)
.map(mkMarker(nodeDict, function () { .map(mkMarker(nodeDict, function () {
return iconOnline; return iconOnline;
}, router)); }, router));
var markersOffline = nodesOffline.filter(has_location) var markersOffline = nodesOffline.filter(helper.hasLocation)
.map(mkMarker(nodeDict, function () { .map(mkMarker(nodeDict, function () {
return iconOffline; return iconOffline;
}, router)); }, router));
var markersNew = data.nodes.new.filter(has_location) var markersNew = data.nodes.new.filter(helper.hasLocation)
.map(mkMarker(nodeDict, function () { .map(mkMarker(nodeDict, function () {
return iconNew; return iconNew;
}, router)); }, router));
var markersLost = data.nodes.lost.filter(has_location) var markersLost = data.nodes.lost.filter(helper.hasLocation)
.map(mkMarker(nodeDict, function (d) { .map(mkMarker(nodeDict, function (d) {
if (d.lastseen.isAfter(moment(data.now).subtract(3, "days"))) { if (d.lastseen.isAfter(moment(data.now).subtract(3, "days"))) {
return iconAlert; return iconAlert;
@ -572,14 +572,14 @@ define(["map/clientlayer", "map/labelslayer",
var rtreeOnlineAll = rbush(9); var rtreeOnlineAll = rbush(9);
rtreeOnlineAll.load(data.nodes.all.filter(online).filter(has_location).map(mapRTree)); rtreeOnlineAll.load(data.nodes.all.filter(helper.online).filter(helper.hasLocation).map(mapRTree));
clientLayer.setData(rtreeOnlineAll); clientLayer.setData(rtreeOnlineAll);
labelsLayer.setData({ labelsLayer.setData({
online: nodesOnline.filter(has_location), online: nodesOnline.filter(helper.hasLocation),
offline: nodesOffline.filter(has_location), offline: nodesOffline.filter(helper.hasLocation),
new: data.nodes.new.filter(has_location), new: data.nodes.new.filter(helper.hasLocation),
lost: data.nodes.lost.filter(has_location) lost: data.nodes.lost.filter(helper.hasLocation)
}); });
updateView(true); updateView(true);

18
lib/meshstats.js
View file

@ -1,20 +1,20 @@
define(function () { define(["helper"], function (helper) {
return function (config) { return function (config) {
var self = this; var self = this;
var stats, timestamp; var stats, timestamp;
self.setData = function (d) { self.setData = function (d) {
var totalNodes = sum(d.nodes.all.map(one)); var totalNodes = helper.sum(d.nodes.all.map(helper.one));
var totalOnlineNodes = sum(d.nodes.all.filter(online).map(one)); var totalOnlineNodes = helper.sum(d.nodes.all.filter(helper.online).map(helper.one));
var totalOfflineNodes = sum(d.nodes.all.filter(function (node) { var totalOfflineNodes = helper.sum(d.nodes.all.filter(function (node) {
return !node.flags.online; return !node.flags.online;
}).map(one)); }).map(helper.one));
var totalNewNodes = sum(d.nodes.new.map(one)); var totalNewNodes = helper.sum(d.nodes.new.map(helper.one));
var totalLostNodes = sum(d.nodes.lost.map(one)); var totalLostNodes = helper.sum(d.nodes.lost.map(helper.one));
var totalClients = sum(d.nodes.all.filter(online).map(function (d) { var totalClients = helper.sum(d.nodes.all.filter(helper.online).map(function (d) {
return d.statistics.clients ? d.statistics.clients : 0; return d.statistics.clients ? d.statistics.clients : 0;
})); }));
var totalGateways = sum(Array.from(new Set(d.nodes.all.filter(online).map(function (d) { var totalGateways = helper.sum(Array.from(new Set(d.nodes.all.filter(helper.online).map(function (d) {
return ("gateway" in d.statistics && d.statistics.gateway.id) ? d.statistics.gateway.id : d.statistics.gateway; return ("gateway" in d.statistics && d.statistics.gateway.id) ? d.statistics.gateway.id : d.statistics.gateway;
}).concat(d.nodes.all.filter(function (d) { }).concat(d.nodes.all.filter(function (d) {
return d.flags.gateway; return d.flags.gateway;

4
lib/nodelist.js
View file

@ -1,4 +1,4 @@
define(["sorttable", "virtual-dom"], function (SortTable, V) { define(["sorttable", "virtual-dom", "helper"], function (SortTable, V, helper) {
function getUptime(now, d) { function getUptime(now, d) {
if (d.flags.online && "uptime" in d.statistics) { if (d.flags.online && "uptime" in d.statistics) {
return Math.round(d.statistics.uptime); return Math.round(d.statistics.uptime);
@ -68,7 +68,7 @@ define(["sorttable", "virtual-dom"], function (SortTable, V) {
href: "#!n:" + d.nodeinfo.node_id href: "#!n:" + d.nodeinfo.node_id
}, d.nodeinfo.hostname)); }, d.nodeinfo.hostname));
if (has_location(d)) { if (helper.hasLocation(d)) {
td1Content.push(V.h("span", {className: "icon ion-location"})); td1Content.push(V.h("span", {className: "icon ion-location"}));
} }

20
lib/proportions.js
View file

@ -1,5 +1,5 @@
define(["chroma-js", "virtual-dom", "filters/genericnode"], define(["chroma-js", "virtual-dom", "filters/genericnode", "helper"],
function (Chroma, V, Filter) { function (Chroma, V, Filter, helper) {
return function (config, filterManager) { return function (config, filterManager) {
var self = this; var self = this;
@ -33,14 +33,14 @@ define(["chroma-js", "virtual-dom", "filters/genericnode"],
siteTable.classList.add("proportion"); siteTable.classList.add("proportion");
function showStatGlobal(o) { function showStatGlobal(o) {
return showStat(o); return helper.showStat(o);
} }
function count(nodes, key, f) { function count(nodes, key, f) {
var dict = {}; var dict = {};
nodes.forEach(function (d) { nodes.forEach(function (d) {
var v = dictGet(d, key.slice(0)); var v = helper.dictGet(d, key.slice(0));
if (f !== undefined) { if (f !== undefined) {
v = f(v); v = f(v);
@ -62,7 +62,7 @@ define(["chroma-js", "virtual-dom", "filters/genericnode"],
var dict = {}; var dict = {};
nodes.forEach(function (d) { nodes.forEach(function (d) {
var v = dictGet(d, key.slice(0)); var v = helper.dictGet(d, key.slice(0));
if (f !== undefined) { if (f !== undefined) {
v = f(v); v = f(v);
@ -127,7 +127,7 @@ define(["chroma-js", "virtual-dom", "filters/genericnode"],
} }
self.setData = function (data) { self.setData = function (data) {
var onlineNodes = data.nodes.all.filter(online); var onlineNodes = data.nodes.all.filter(helper.online);
var nodes = onlineNodes.concat(data.nodes.lost); var nodes = onlineNodes.concat(data.nodes.lost);
var nodeDict = {}; var nodeDict = {};
@ -214,8 +214,12 @@ define(["chroma-js", "virtual-dom", "filters/genericnode"],
return b[1] - a[1]; return b[1] - a[1];
})); }));
fillTable("Firmware", fwTable, fwDict.sort(function (a, b) { fillTable("Firmware", fwTable, fwDict.sort(function (a, b) {
if(b[0] < a[0]) return -1; if (b[0] < a[0]) {
if(b[0] > a[0]) return 1; return -1;
}
if (b[0] > a[0]) {
return 1;
}
return 0; return 0;
})); }));
fillTable("Hardware", hwTable, hwDict.sort(function (a, b) { fillTable("Hardware", hwTable, hwDict.sort(function (a, b) {

4
lib/router.js
View file

@ -1,4 +1,4 @@
define(function () { define(["helper"], function (helper) {
return function () { return function () {
var self = this; var self = this;
var objects = {nodes: {}, links: {}}; var objects = {nodes: {}, links: {}};
@ -31,7 +31,7 @@ define(function () {
} }
function resetView(push) { function resetView(push) {
push = trueDefault(push); push = helper.trueDefault(push);
targets.forEach(function (t) { targets.forEach(function (t) {
t.resetView(); t.resetView();

4
lib/simplenodelist.js
View file

@ -1,4 +1,4 @@
define(["moment", "virtual-dom", "moment.de"], function (moment, V) { define(["moment", "virtual-dom", "helper", "moment.de"], function (moment, V, helper) {
return function (nodes, field, router, title) { return function (nodes, field, router, title) {
var self = this; var self = this;
var el, tbody; var el, tbody;
@ -46,7 +46,7 @@ define(["moment", "virtual-dom", "moment.de"], function (moment, V) {
href: "#!n:" + d.nodeinfo.node_id href: "#!n:" + d.nodeinfo.node_id
}, d.nodeinfo.hostname)); }, d.nodeinfo.hostname));
if (has_location(d)) { if (helper.hasLocation(d)) {
td1Content.push(V.h("span", {className: "icon ion-location"})); td1Content.push(V.h("span", {className: "icon ion-location"}));
} }

241
lib/utils/helper.js Normal file
View file

@ -0,0 +1,241 @@
define({
get: function (url) {
return new Promise(function (resolve, reject) {
var req = new XMLHttpRequest();
req.open("GET", url);
req.onload = function () {
if (req.status == 200) {
resolve(req.response);
}
else {
reject(Error(req.statusText));
}
};
req.onerror = function () {
reject(Error("Network Error"));
};
req.send();
});
},
getJSON: function (url) {
return require("helper").get(url).then(JSON.parse);
},
sortByKey: function (key, d) {
return d.slice().sort(function (a, b) {
return a[key] - b[key];
}).reverse();
},
limit: function (key, m, d) {
return d.filter(function (d) {
return d[key].isAfter(m);
});
},
sum: function (a) {
return a.reduce(function (a, b) {
return a + b;
}, 0);
},
one: function () {
return 1;
},
trueDefault: function (d) {
return d === undefined ? true : d;
},
dictGet: function (dict, key) {
var k = key.shift();
if (!(k in dict)) {
return null;
}
if (key.length == 0) {
return dict[k];
}
return this.dictGet(dict[k], key);
},
localStorageTest: function () {
var test = "test";
try {
localStorage.setItem(test, test);
localStorage.removeItem(test);
return true;
} catch (e) {
return false;
}
},
listReplace: function (s, subst) {
for (key in subst) {
var re = new RegExp(key, "g");
s = s.replace(re, subst[key]);
}
return s;
},
/* Helpers working with nodes */
offline: function (d) {
return !d.flags.online;
},
online: function (d) {
return d.flags.online;
},
hasLocation: function (d) {
return "location" in d.nodeinfo &&
Math.abs(d.nodeinfo.location.latitude) < 90 &&
Math.abs(d.nodeinfo.location.longitude) < 180;
},
subtract: function (a, b) {
var ids = {};
b.forEach(function (d) {
ids[d.nodeinfo.node_id] = true;
});
return a.filter(function (d) {
return !(d.nodeinfo.node_id in ids);
});
},
/* Helpers working with links */
showDistance: function (d) {
if (isNaN(d.distance)) {
return;
}
return d.distance.toFixed(0) + " m";
},
showTq: function (d) {
return (1 / d.tq * 100).toFixed(0) + "%";
},
attributeEntry: function (el, label, value) {
if (value === null || value == undefined) {
return;
}
var tr = document.createElement("tr");
var th = document.createElement("th");
if (typeof label === "string") {
th.textContent = label;
} else {
th.appendChild(label);
tr.classList.add("routerpic");
}
tr.appendChild(th);
var td = document.createElement("td");
if (typeof value == "function") {
value(td);
} else {
td.appendChild(document.createTextNode(value));
}
tr.appendChild(td);
el.appendChild(tr);
return td;
},
createIframe: function (opt, width, height) {
var el = document.createElement("iframe");
width = typeof width !== "undefined" ? width : "525px";
height = typeof height !== "undefined" ? height : "350px";
if (opt.src) {
el.src = opt.src;
} else {
el.src = opt;
}
if (opt.frameBorder) {
el.frameBorder = opt.frameBorder;
} else {
el.frameBorder = 1;
}
if (opt.width) {
el.width = opt.width;
} else {
el.width = width;
}
if (opt.height) {
el.height = opt.height;
} else {
el.height = height;
}
el.scrolling = "no";
el.seamless = "seamless";
return el;
},
showStat: function (o, subst) {
var content, caption;
subst = typeof subst !== "undefined" ? subst : {};
if (o.thumbnail) {
content = document.createElement("img");
content.src = require("helper").listReplace(o.thumbnail, subst);
}
if (o.caption) {
caption = require("helper").listReplace(o.caption, subst);
if (!content) {
content = document.createTextNode(caption);
}
}
if (o.iframe) {
content = require("helper").createIframe(o.iframe, o.width, o.height);
if (o.iframe.src) {
content.src = require("helper").listReplace(o.iframe.src, subst);
} else {
content.src = require("helper").listReplace(o.iframe, subst);
}
}
var p = document.createElement("p");
if (o.href) {
var link = document.createElement("a");
link.target = "_blank";
link.href = require("helper").listReplace(o.href, subst);
link.appendChild(content);
if (caption && o.thumbnail) {
link.title = caption;
}
p.appendChild(link);
} else {
p.appendChild(content);
}
return p;
}
});

20
package.json
View file

@ -5,6 +5,8 @@
}, },
"devDependencies": { "devDependencies": {
"autoprefixer": "^6.3.6", "autoprefixer": "^6.3.6",
"eslint": "^2.10.2",
"eslint-config-defaults": "^9.0.0",
"grunt": "^1.0.1", "grunt": "^1.0.1",
"grunt-bower-install-simple": "^1.2.3", "grunt-bower-install-simple": "^1.2.3",
"grunt-check-dependencies": "^0.12.0", "grunt-check-dependencies": "^0.12.0",
@ -26,24 +28,6 @@
"amd": true, "amd": true,
"es6": true, "es6": true,
"node": true "node": true
},
"globals": {
"showStat": false,
"attributeEntry": false,
"dictGet": false,
"getJSON": false,
"has_location": false,
"limit": false,
"localStorageTest": false,
"offline": false,
"one": false,
"online": false,
"showDistance": false,
"showTq": false,
"sortByKey": false,
"subtract": false,
"sum": false,
"trueDefault": false
} }
} }
} }

6
tasks/development.js
View file

@ -4,9 +4,9 @@ module.exports = function (grunt) {
server: { server: {
options: { options: {
base: { base: {
path: 'build', path: "build",
options: { options: {
index: 'index.html' index: "index.html"
} }
}, },
livereload: true livereload: true
@ -18,7 +18,7 @@ module.exports = function (grunt) {
options: { options: {
livereload: true livereload: true
}, },
files: ["*.css", "app.js", "helper.js", "lib/**/*.js", "*.html"], files: ["*.css", "app.js", "lib/**/*.js", "*.html"],
tasks: ["dev"] tasks: ["dev"]
}, },
config: { config: {

9
tasks/linting.js
View file

@ -12,15 +12,6 @@ module.exports = function (grunt) {
npm: {} npm: {}
}, },
eslint: { eslint: {
options: {
extends: [
"defaults/configurations/eslint"
],
rules: {
"semi": [2, "always"],
"no-undef": 0
}
},
sources: { sources: {
src: ["app.js", "!Gruntfile.js", "lib/**/*.js"] src: ["app.js", "!Gruntfile.js", "lib/**/*.js"]
}, },