mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
Merge branch 'develop' into dependabot/npm_and_yarn/gui/develop/mime-4.0.1
This commit is contained in:
commit
57d69f88a1
4 changed files with 0 additions and 7161 deletions
File diff suppressed because it is too large
Load diff
|
@ -1,186 +0,0 @@
|
||||||
const path = require("path");
|
|
||||||
const { ipcRenderer } = require("electron");
|
|
||||||
|
|
||||||
// https://stackoverflow.com/a/26227660
|
|
||||||
var appDataFolder =
|
|
||||||
process.env.APPDATA ||
|
|
||||||
(process.platform == "darwin"
|
|
||||||
? process.env.HOME + "/Library/Application Support"
|
|
||||||
: process.env.HOME + "/.config");
|
|
||||||
var configFolder = path.join(appDataFolder, "FreeDATA");
|
|
||||||
var configPath = path.join(configFolder, "config.json");
|
|
||||||
const config = require(configPath);
|
|
||||||
|
|
||||||
// WINDOW LISTENER
|
|
||||||
window.addEventListener("DOMContentLoaded", () => {
|
|
||||||
document
|
|
||||||
.getElementById("enable_filter_info")
|
|
||||||
.addEventListener("click", () => {
|
|
||||||
if (document.getElementById("enable_filter_info").checked) {
|
|
||||||
display_class("table-info", true);
|
|
||||||
} else {
|
|
||||||
display_class("table-info", false);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
document
|
|
||||||
.getElementById("enable_filter_debug")
|
|
||||||
.addEventListener("click", () => {
|
|
||||||
if (document.getElementById("enable_filter_debug").checked) {
|
|
||||||
display_class("table-debug", true);
|
|
||||||
} else {
|
|
||||||
display_class("table-debug", false);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
document
|
|
||||||
.getElementById("enable_filter_warning")
|
|
||||||
.addEventListener("click", () => {
|
|
||||||
if (document.getElementById("enable_filter_warning").checked) {
|
|
||||||
display_class("table-warning", true);
|
|
||||||
} else {
|
|
||||||
display_class("table-warning", false);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
document
|
|
||||||
.getElementById("enable_filter_error")
|
|
||||||
.addEventListener("click", () => {
|
|
||||||
if (document.getElementById("enable_filter_error").checked) {
|
|
||||||
display_class("table-danger", true);
|
|
||||||
} else {
|
|
||||||
display_class("table-danger", false);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
function display_class(class_name, state) {
|
|
||||||
var collection = document.getElementsByClassName(class_name);
|
|
||||||
console.log(collection);
|
|
||||||
for (let i = 0; i < collection.length; i++) {
|
|
||||||
if (state == true) {
|
|
||||||
collection[i].style.display = "table-row";
|
|
||||||
} else {
|
|
||||||
collection[i].style.display = "None";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ipcRenderer.on("action-update-log", (event, arg) => {
|
|
||||||
var entry = arg.entry;
|
|
||||||
|
|
||||||
// remove ANSI characters from string, caused by color logging
|
|
||||||
// https://stackoverflow.com/a/29497680
|
|
||||||
entry = entry.replace(
|
|
||||||
/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,
|
|
||||||
"",
|
|
||||||
);
|
|
||||||
|
|
||||||
var tbl = document.getElementById("log");
|
|
||||||
var row = document.createElement("tr");
|
|
||||||
|
|
||||||
var timestamp = document.createElement("td");
|
|
||||||
var timestampText = document.createElement("span");
|
|
||||||
|
|
||||||
//datetime = new Date();
|
|
||||||
//timestampText.innerText = datetime.toISOString();
|
|
||||||
timestampText.innerText = entry.slice(0, 19);
|
|
||||||
timestamp.appendChild(timestampText);
|
|
||||||
|
|
||||||
var type = document.createElement("td");
|
|
||||||
var typeText = document.createElement("span");
|
|
||||||
// typeText.innerText = entry.slice(10, 30).match(/[\[](.*)[^\]]/g);
|
|
||||||
console.log(entry.match(/\[[^\]]+\]/g));
|
|
||||||
|
|
||||||
try {
|
|
||||||
typeText.innerText = entry.match(/\[[^\]]+\]/g)[0];
|
|
||||||
} catch (e) {
|
|
||||||
typeText.innerText = "-";
|
|
||||||
}
|
|
||||||
|
|
||||||
// let res = str.match(/[\[](.*)[^\]]/g);
|
|
||||||
|
|
||||||
type.appendChild(typeText);
|
|
||||||
|
|
||||||
var area = document.createElement("td");
|
|
||||||
var areaText = document.createElement("span");
|
|
||||||
//areaText.innerText = entry.slice(10, 50).match(/[\] \[](.*)[^\]]/g);
|
|
||||||
//areaText.innerText = entry.match(/\[[^\]]+\]/g)[1];
|
|
||||||
|
|
||||||
try {
|
|
||||||
areaText.innerText = entry.match(/\[[^\]]+\]/g)[1];
|
|
||||||
} catch (e) {
|
|
||||||
areaText.innerText = "-";
|
|
||||||
}
|
|
||||||
area.appendChild(areaText);
|
|
||||||
|
|
||||||
var logEntry = document.createElement("td");
|
|
||||||
var logEntryText = document.createElement("span");
|
|
||||||
try {
|
|
||||||
logEntryText.innerText = entry.split("]")[2];
|
|
||||||
} catch (e) {
|
|
||||||
logEntryText.innerText = "-";
|
|
||||||
}
|
|
||||||
logEntry.appendChild(logEntryText);
|
|
||||||
|
|
||||||
row.appendChild(timestamp);
|
|
||||||
row.appendChild(type);
|
|
||||||
row.appendChild(area);
|
|
||||||
row.appendChild(logEntry);
|
|
||||||
|
|
||||||
//row.classList.add("table-blablubb");
|
|
||||||
/*
|
|
||||||
if (logEntryText.innerText.includes('ALSA lib pcm')) {
|
|
||||||
row.classList.add("table-secondary");
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
if (typeText.innerText.includes("info")) {
|
|
||||||
row.classList.add("table-info");
|
|
||||||
}
|
|
||||||
if (typeText.innerText.includes("debug")) {
|
|
||||||
row.classList.add("table-secondary");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (typeText.innerText.includes("warning")) {
|
|
||||||
row.classList.add("table-warning");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (typeText.innerText.includes("error")) {
|
|
||||||
row.classList.add("table-danger");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (document.getElementById("enable_filter_info").checked) {
|
|
||||||
row.style.display = "table-row";
|
|
||||||
display_class("table-info", true);
|
|
||||||
} else {
|
|
||||||
row.style.display = "None";
|
|
||||||
display_class("table-info", false);
|
|
||||||
}
|
|
||||||
if (document.getElementById("enable_filter_debug").checked) {
|
|
||||||
row.style.display = "table-row";
|
|
||||||
display_class("table-secondary", true);
|
|
||||||
} else {
|
|
||||||
row.style.display = "None";
|
|
||||||
display_class("table-secondary", false);
|
|
||||||
}
|
|
||||||
if (document.getElementById("enable_filter_warning").checked) {
|
|
||||||
row.style.display = "table-row";
|
|
||||||
display_class("table-warning", true);
|
|
||||||
} else {
|
|
||||||
row.style.display = "None";
|
|
||||||
display_class("table-warning", false);
|
|
||||||
}
|
|
||||||
if (document.getElementById("enable_filter_error").checked) {
|
|
||||||
row.style.display = "table-row";
|
|
||||||
display_class("table-danger", true);
|
|
||||||
} else {
|
|
||||||
row.style.display = "None";
|
|
||||||
display_class("table-danger", false);
|
|
||||||
}
|
|
||||||
|
|
||||||
tbl.appendChild(row);
|
|
||||||
|
|
||||||
// scroll to bottom of page
|
|
||||||
// https://stackoverflow.com/a/11715670
|
|
||||||
window.scrollTo(0, document.body.scrollHeight);
|
|
||||||
});
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,231 +0,0 @@
|
||||||
const path = require("path");
|
|
||||||
const { ipcRenderer } = require("electron");
|
|
||||||
|
|
||||||
// https://stackoverflow.com/a/26227660
|
|
||||||
var appDataFolder =
|
|
||||||
process.env.APPDATA ||
|
|
||||||
(process.platform == "darwin"
|
|
||||||
? process.env.HOME + "/Library/Application Support"
|
|
||||||
: process.env.HOME + "/.config");
|
|
||||||
var configFolder = path.join(appDataFolder, "FreeDATA");
|
|
||||||
var configPath = path.join(configFolder, "config.json");
|
|
||||||
const config = require(configPath);
|
|
||||||
|
|
||||||
var callsignPath = path.join(configFolder, "callsigns.json");
|
|
||||||
const callsigns = require(callsignPath);
|
|
||||||
|
|
||||||
// WINDOW LISTENER
|
|
||||||
window.addEventListener("DOMContentLoaded", () => {
|
|
||||||
// startPing button clicked
|
|
||||||
document
|
|
||||||
.getElementById("transmit_mesh_ping")
|
|
||||||
.addEventListener("click", () => {
|
|
||||||
var dxcallsign = document
|
|
||||||
.getElementById("dxCallMesh")
|
|
||||||
.value.toUpperCase();
|
|
||||||
if (dxcallsign == "" || dxcallsign == null || dxcallsign == undefined)
|
|
||||||
return;
|
|
||||||
//pauseButton(document.getElementById("transmit_mesh_ping"), 2000);
|
|
||||||
ipcRenderer.send("run-tnc-command", {
|
|
||||||
command: "mesh_ping",
|
|
||||||
dxcallsign: dxcallsign,
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
ipcRenderer.on("action-update-mesh-table", (event, arg) => {
|
|
||||||
var routes = arg.routing_table;
|
|
||||||
|
|
||||||
if (typeof routes == "undefined") {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var tbl = document.getElementById("mesh-table");
|
|
||||||
if (tbl !== null) {
|
|
||||||
tbl.innerHTML = "";
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i < routes.length; i++) {
|
|
||||||
var row = document.createElement("tr");
|
|
||||||
var datetime = new Date(routes[i]["timestamp"] * 1000).toLocaleString(
|
|
||||||
navigator.language,
|
|
||||||
{
|
|
||||||
hourCycle: "h23",
|
|
||||||
year: "numeric",
|
|
||||||
month: "2-digit",
|
|
||||||
day: "2-digit",
|
|
||||||
hour: "2-digit",
|
|
||||||
minute: "2-digit",
|
|
||||||
second: "2-digit",
|
|
||||||
},
|
|
||||||
);
|
|
||||||
var timestamp = document.createElement("td");
|
|
||||||
var timestampText = document.createElement("span");
|
|
||||||
timestampText.innerText = datetime;
|
|
||||||
timestamp.appendChild(timestampText);
|
|
||||||
|
|
||||||
var dxcall = document.createElement("td");
|
|
||||||
var dxcallText = document.createElement("span");
|
|
||||||
dxcallText.innerText = routes[i]["dxcall"];
|
|
||||||
|
|
||||||
// check for callsign in callsign list, else use checksum
|
|
||||||
for (let call in callsigns) {
|
|
||||||
if (callsigns[call] == routes[i]["dxcall"]) {
|
|
||||||
dxcallText.innerText += " (" + call + ")";
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
dxcall.appendChild(dxcallText);
|
|
||||||
|
|
||||||
var router = document.createElement("td");
|
|
||||||
var routerText = document.createElement("span");
|
|
||||||
routerText.innerText = routes[i]["router"];
|
|
||||||
|
|
||||||
// check for callsign in callsign list, else use checksum
|
|
||||||
for (let call in callsigns) {
|
|
||||||
if (callsigns[call] == routes[i]["router"]) {
|
|
||||||
routerText.innerHTML += `<span class="badge ms-2 bg-secondary">${call}</span>`;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
router.appendChild(routerText);
|
|
||||||
|
|
||||||
var hops = document.createElement("td");
|
|
||||||
var hopsText = document.createElement("span");
|
|
||||||
hopsText.innerText = routes[i]["hops"];
|
|
||||||
hops.appendChild(hopsText);
|
|
||||||
|
|
||||||
var score = document.createElement("td");
|
|
||||||
var scoreText = document.createElement("span");
|
|
||||||
scoreText.innerText = routes[i]["score"];
|
|
||||||
score.appendChild(scoreText);
|
|
||||||
|
|
||||||
var snr = document.createElement("td");
|
|
||||||
var snrText = document.createElement("span");
|
|
||||||
snrText.innerText = routes[i]["snr"];
|
|
||||||
snr.appendChild(snrText);
|
|
||||||
|
|
||||||
row.appendChild(timestamp);
|
|
||||||
row.appendChild(dxcall);
|
|
||||||
row.appendChild(router);
|
|
||||||
row.appendChild(hops);
|
|
||||||
row.appendChild(score);
|
|
||||||
row.appendChild(snr);
|
|
||||||
|
|
||||||
tbl.appendChild(row);
|
|
||||||
}
|
|
||||||
/*-------------------------------------------*/
|
|
||||||
var routes = arg.mesh_signalling_table;
|
|
||||||
|
|
||||||
//console.log(routes);
|
|
||||||
if (typeof routes == "undefined") {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var tbl = document.getElementById("mesh-signalling-table");
|
|
||||||
if (tbl !== null) {
|
|
||||||
tbl.innerHTML = "";
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i < routes.length; i++) {
|
|
||||||
var row = document.createElement("tr");
|
|
||||||
var datetime = new Date(routes[i]["timestamp"] * 1000).toLocaleString(
|
|
||||||
navigator.language,
|
|
||||||
{
|
|
||||||
hourCycle: "h23",
|
|
||||||
year: "numeric",
|
|
||||||
month: "2-digit",
|
|
||||||
day: "2-digit",
|
|
||||||
hour: "2-digit",
|
|
||||||
minute: "2-digit",
|
|
||||||
second: "2-digit",
|
|
||||||
},
|
|
||||||
);
|
|
||||||
var timestamp = document.createElement("td");
|
|
||||||
var timestampText = document.createElement("span");
|
|
||||||
timestampText.innerText = datetime;
|
|
||||||
timestamp.appendChild(timestampText);
|
|
||||||
|
|
||||||
var destination = document.createElement("td");
|
|
||||||
var destinationText = document.createElement("span");
|
|
||||||
destinationText.innerText = routes[i]["destination"];
|
|
||||||
// check for callsign in callsign list, else use checksum
|
|
||||||
for (let call in callsigns) {
|
|
||||||
if (callsigns[call] == routes[i]["destination"]) {
|
|
||||||
destinationText.innerHTML += `<span class="badge ms-2 bg-secondary">${call}</span>`;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
destination.appendChild(destinationText);
|
|
||||||
|
|
||||||
var origin = document.createElement("td");
|
|
||||||
var originText = document.createElement("span");
|
|
||||||
originText.innerText = routes[i]["origin"];
|
|
||||||
// check for callsign in callsign list, else use checksum
|
|
||||||
for (let call in callsigns) {
|
|
||||||
if (callsigns[call] == routes[i]["origin"]) {
|
|
||||||
originText.innerHTML += `<span class="badge ms-2 bg-secondary">${call}</span>`;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
origin.appendChild(originText);
|
|
||||||
|
|
||||||
var frametype = document.createElement("td");
|
|
||||||
var frametypeText = document.createElement("span");
|
|
||||||
frametypeText.innerText = routes[i]["frametype"];
|
|
||||||
frametype.appendChild(frametypeText);
|
|
||||||
|
|
||||||
var payload = document.createElement("td");
|
|
||||||
var payloadText = document.createElement("span");
|
|
||||||
payloadText.innerText = routes[i]["payload"];
|
|
||||||
payload.appendChild(payloadText);
|
|
||||||
|
|
||||||
var attempt = document.createElement("td");
|
|
||||||
var attemptText = document.createElement("span");
|
|
||||||
attemptText.innerText = routes[i]["attempt"];
|
|
||||||
attempt.appendChild(attemptText);
|
|
||||||
|
|
||||||
var status = document.createElement("td");
|
|
||||||
var statusText = document.createElement("span");
|
|
||||||
//statusText.innerText = routes[i]["status"];
|
|
||||||
switch (routes[i]["status"]) {
|
|
||||||
case "acknowledged":
|
|
||||||
var status_icon = '<i class="bi bi-check-circle-fill"></i>';
|
|
||||||
var status_color = "bg-success";
|
|
||||||
break;
|
|
||||||
case "acknowledging":
|
|
||||||
var status_icon = '<i class="bi bi-check-circle"></i>';
|
|
||||||
var status_color = "bg-warning";
|
|
||||||
break;
|
|
||||||
case "forwarding":
|
|
||||||
var status_icon = '<i class="bi bi-arrow-left-right"></i>';
|
|
||||||
var status_color = "bg-secondary";
|
|
||||||
break;
|
|
||||||
case "awaiting_ack":
|
|
||||||
var status_icon = '<i class="bi bi-clock-history"></i>';
|
|
||||||
var status_color = "bg-info";
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
var status_icon = '<i class="bi bi-question-circle-fill"></i>';
|
|
||||||
var status_color = "bg-primary";
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
statusText.innerHTML = `
|
|
||||||
<span class="badge ${status_color}">${status_icon}</span>
|
|
||||||
<span class="badge ${status_color}">${routes[i]["status"]}</span>
|
|
||||||
`;
|
|
||||||
status.appendChild(statusText);
|
|
||||||
|
|
||||||
row.appendChild(timestamp);
|
|
||||||
row.appendChild(destination);
|
|
||||||
row.appendChild(origin);
|
|
||||||
row.appendChild(frametype);
|
|
||||||
row.appendChild(payload);
|
|
||||||
row.appendChild(attempt);
|
|
||||||
row.appendChild(status);
|
|
||||||
|
|
||||||
tbl.appendChild(row);
|
|
||||||
}
|
|
||||||
});
|
|
Loading…
Reference in a new issue