snr: ${obj.snr} - ${timestamp}
@@ -1327,11 +1340,10 @@ var TimeDifference = (new Date().getTime()/1000) - obj.timestamp
var message_html = obj.msg.replaceAll(/\n/g, "
");
if (obj.type == "received") {
- if (obj.new == 1)
- {
- showOsPopUp("Message received from " + obj.dxcallsign,obj.msg);
+ if (obj.new == 1) {
+ showOsPopUp("Message received from " + obj.dxcallsign, obj.msg);
}
-
+
var new_message = `
@@ -1442,8 +1454,6 @@ var TimeDifference = (new Date().getTime()/1000) - obj.timestamp
//console.log("Low graphics enabled for chat module");
}
-
-
var new_message = `
${controlarea_transmit}
@@ -1478,10 +1488,8 @@ var TimeDifference = (new Date().getTime()/1000) - obj.timestamp
obj.percent
}" aria-valuemin="0" aria-valuemax="100">
${percent_value} % - ${
- obj.bytesperminute
- } Bpm
+ obj._id
+ }-progress-information">${percent_value} % - ${obj.bytesperminute} Bpm
@@ -1498,11 +1506,8 @@ var TimeDifference = (new Date().getTime()/1000) - obj.timestamp
//console.log("element already exists......");
//console.log(obj);
- // console.log(obj.status)
- // console.log(obj.attempt)
-
-
-
+ // console.log(obj.status)
+ // console.log(obj.attempt)
if (
!obj.status == "broadcast_transmit" ||
@@ -1525,40 +1530,33 @@ var TimeDifference = (new Date().getTime()/1000) - obj.timestamp
obj.attempt + "/" + max_retry_attempts;
}
-
if (obj.status == "transmit") {
-
- document.getElementById("msg-" + obj._id + "-status").innerHTML =
+ document.getElementById("msg-" + obj._id + "-status").innerHTML =
get_icon_for_state(obj.status);
-if (typeof obj.percent !== "undefined") {
- document
- .getElementById("msg-" + obj._id + "-progress")
- .setAttribute("aria-valuenow", obj.percent);
- document
- .getElementById("msg-" + obj._id + "-progress")
- .setAttribute("style", "width:" + obj.percent + "%;");
- document.getElementById(
- "msg-" + obj._id + "-progress-information"
- ).innerHTML = obj.percent + "% - " + obj.bytesperminute + " Bpm";
+ if (typeof obj.percent !== "undefined") {
+ document
+ .getElementById("msg-" + obj._id + "-progress")
+ .setAttribute("aria-valuenow", obj.percent);
+ document
+ .getElementById("msg-" + obj._id + "-progress")
+ .setAttribute("style", "width:" + obj.percent + "%;");
+ document.getElementById(
+ "msg-" + obj._id + "-progress-information"
+ ).innerHTML = obj.percent + "% - " + obj.bytesperminute + " Bpm";
+ } else {
+ document
+ .getElementById("msg-" + obj._id + "-progress")
+ .setAttribute("aria-valuenow", 0);
+ document
+ .getElementById("msg-" + obj._id + "-progress")
+ .setAttribute("style", "width:0%;");
+ document.getElementById(
+ "msg-" + obj._id + "-progress-information"
+ ).innerHTML = "0% - 0 Bpm";
+ }
- } else {
- document
- .getElementById("msg-" + obj._id + "-progress")
- .setAttribute("aria-valuenow", 0);
- document
- .getElementById("msg-" + obj._id + "-progress")
- .setAttribute("style", "width:0%;");
- document.getElementById(
- "msg-" + obj._id + "-progress-information"
- ).innerHTML = "0% - 0 Bpm";
-
- }
-
-
-
-
- document.getElementById("msg-" + obj._id + "-attempts").innerHTML =
+ document.getElementById("msg-" + obj._id + "-attempts").innerHTML =
obj.attempt + "/" + max_retry_attempts;
}
@@ -1602,15 +1600,13 @@ if (typeof obj.percent !== "undefined") {
.getElementById("msg-" + obj._id + "-progress")
.classList.add("bg-danger");
- console.log(document
- .getElementById("msg-" + obj._id + "-progress")
- .classList)
+ console.log(
+ document.getElementById("msg-" + obj._id + "-progress").classList
+ );
document.getElementById(
"msg-" + obj._id + "-progress-information"
).innerHTML = "TRANSMISSION FAILED - " + obj.bytesperminute + " Bpm";
-
-
}
//document.getElementById(id).className = message_class;
@@ -2194,7 +2190,7 @@ async function updateAllChat(clear) {
await db
.createIndex({
index: {
- fields: [{ timestamp: "asc" }],
+ fields: [{ dxcallsign: "asc" }, { timestamp: "asc" }],
},
})
.then(async function (result) {
@@ -2202,14 +2198,14 @@ async function updateAllChat(clear) {
await db
.find({
selector: {
- $and: [{ timestamp: { $exists: true } }, { $or: chatFilter }],
+ $and: [
+ { dxcallsign: { $exists: true } },
+ { timestamp: { $exists: true } },
+ { $or: chatFilter },
+ ],
//$or: chatFilter
},
- sort: [
- {
- timestamp: "asc",
- },
- ],
+ sort: [{ dxcallsign: "asc" }, { timestamp: "asc" }],
})
.then(async function (result) {
console.log(result);
@@ -2272,7 +2268,6 @@ function getSetUserSharedFolder(selected_callsign) {
.then(function (data) {
console.log(data);
-
if (typeof data.user_shared_folder !== "undefined") {
console.log(data.user_shared_folder);
// shared folder table
@@ -2661,11 +2656,15 @@ ipcRenderer.on("update-config", (event, data) => {
});
ipcRenderer.on("action-update-unread-messages", (event) => {
- checkForNewMessages().then(function(count) {
- ipcRenderer.send("request-update-unread-messages-main",count);
+ checkForNewMessages().then(function (count) {
+ ipcRenderer.send("request-update-unread-messages-main", count);
});
});
+ipcRenderer.on("action-clean-db", (event) => {
+ dbClean();
+});
+
// https://stackoverflow.com/a/18650828
function formatBytes(bytes, decimals = 2) {
if (!+bytes) return "0 Bytes";
@@ -2796,44 +2795,49 @@ function checkForWaitingMessages(dxcall) {
});
}
-async function checkForNewMessages()
-{
+async function checkForNewMessages() {
var newmsgs;
- await db.find({
- selector: {
- new: {$eq: 1},
- }, limit:1,
- })
+ await db
+ .find({
+ selector: {
+ new: { $eq: 1 },
+ },
+ limit: 1,
+ })
.then(function (result) {
- if (result.docs.length >0)
- newmsgs=true;
- else
- newmsgs=false;
+ if (result.docs.length > 0) newmsgs = true;
+ else newmsgs = false;
})
.catch(function (err) {
console.log(err);
});
- return newmsgs;
+ return newmsgs;
}
function clearUnreadMessages(dxcall) {
//console.log(dxcall);
+ //Selector of dxcall and new $eq: 1 isn't working, don't know why
+ //For now parse all messages of callsign to clear new flag
db.find({
- selector: {
- dxcallsign: dxcall,
- new: {$eq: 1},
- }
+ //{
+ selector:
+ //$and:[
+ { dxcallsign: dxcall }, //, {new: { $gte: 1}}
+ //]
+ // }
})
.then(function (result) {
//console.log(result);
//console.log ("New messages count to clear for " + dxcall + ": " + result.docs.length)
- result.docs.forEach(function (item) {
+ result.docs.forEach(function (item) {
+ if (item.new == 1) {
db.upsert(item._id, function (doc) {
- doc.new=0;
+ doc.new = 0;
//console.log("Clearing new on _id " + item._id);
return doc;
- });
- });
+ });
+ }
+ });
})
.catch(function (err) {
console.log(err);
@@ -2841,10 +2845,68 @@ function clearUnreadMessages(dxcall) {
}
//Have the operating system show a notification popup
-function showOsPopUp(title, message)
-{
- if (config.notification == 0) return;
+function showOsPopUp(title, message) {
+ if (config.enable_sys_notification == 0) return;
const NOTIFICATION_TITLE = title;
const NOTIFICATION_BODY = message;
new Notification(NOTIFICATION_TITLE, { body: NOTIFICATION_BODY });
-}
\ No newline at end of file
+}
+
+//Function to clean old beacons and optimize database
+async function dbClean() {
+ //Only keep the most x latest days of beacons
+ let beaconKeep = 7;
+ let itemCount = 0;
+ let timestampPurge = Math.floor(
+ (Date.now() - beaconKeep * 24 * 60 * 60 * 1000) / 1000
+ );
+ if (
+ confirm(
+ "Delete beacons and pings older than " +
+ beaconKeep +
+ " days and compact database?"
+ )
+ ) {
+ } else {
+ return;
+ }
+
+ //Items to purge from database
+ var purgeFilter = [
+ { type: "beacon" },
+ { type: "ping-ack" },
+ { type: "ping" },
+ ];
+
+ await db
+ .find({
+ selector: {
+ $and: [{ timestamp: { $lt: timestampPurge } }, { $or: purgeFilter }],
+ },
+ })
+ .then(async function (result) {
+ //console.log("Purging " + result.docs.length + " beacons received before " + timestampPurge);
+ itemCount = result.docs.length;
+ result.docs.forEach(async function (item) {
+ await db
+ .get(item._id)
+ .then(async function (doc) {
+ await db.remove(doc);
+ })
+ .catch(function (err) {
+ console.log(err);
+ });
+ });
+ })
+ .catch(function (err) {
+ console.log(err);
+ });
+
+ //Compact database
+ await db.compact();
+ window.alert(
+ "Database maintenance is complete. " +
+ itemCount +
+ " items removed from database. It's recommended you now restart the GUI."
+ );
+}
diff --git a/gui/preload-main.js b/gui/preload-main.js
index 5fe94d3a..7f511d81 100644
--- a/gui/preload-main.js
+++ b/gui/preload-main.js
@@ -71,10 +71,10 @@ var noise_level_raw = 0;
//Global version variable
var appVer = null;
- //Track the number of times TNC has been started
- //So that warning is shown when using auto start and 2nd start
- //if hamlib is not running
- var tncStartCount = 0;
+//Track the number of times TNC has been started
+//So that warning is shown when using auto start and 2nd start
+//if hamlib is not running
+var tncStartCount = 0;
// START INTERVALL COMMAND EXECUTION FOR STATES
//setInterval(sock.getRxBuffer, 1000);
@@ -390,7 +390,7 @@ window.addEventListener("DOMContentLoaded", () => {
document.getElementById("AutoStartSwitch").checked = false;
}
- if (config.notification == 1) {
+ if (config.enable_sys_notification == 1) {
document.getElementById("NotificationSwitch").checked = true;
} else {
document.getElementById("NotificationSwitch").checked = false;
@@ -1219,12 +1219,14 @@ window.addEventListener("DOMContentLoaded", () => {
FD.saveConfig(config, configPath);
});
- //Handle change of Notification settings
- document.getElementById("NotificationSwitch").addEventListener("click", () => {
+ //Handle change of Notification settings
+ document
+ .getElementById("NotificationSwitch")
+ .addEventListener("click", () => {
if (document.getElementById("NotificationSwitch").checked == true) {
- config.notification = 1;
+ config.enable_sys_notification = 1;
} else {
- config.notification = 0;
+ config.enable_sys_notification = 0;
}
//fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
FD.saveConfig(config, configPath);
@@ -1610,6 +1612,11 @@ window.addEventListener("DOMContentLoaded", () => {
daemon.stopTNC();
});
+ // btnCleanDB button clicked
+ document.getElementById("btnCleanDB").addEventListener("click", () => {
+ ipcRenderer.send("request-clean-db");
+ });
+
// TEST HAMLIB
document.getElementById("testHamlib").addEventListener("click", () => {
var data_bits = document.getElementById("hamlib_data_bits").value;
@@ -1955,14 +1962,14 @@ function signal_quality_perc_quad(rssi, perfect_rssi = 10, worst_rssi = -150) {
}
var lastHeard = "";
-var checkForNewMessageWait=85;
+var checkForNewMessageWait = 85;
ipcRenderer.on("action-update-tnc-state", (event, arg) => {
//check for new messages
- if (checkForNewMessageWait >= 100){
+ if (checkForNewMessageWait >= 100) {
//This is very expensive
ipcRenderer.send("request-update-unread-messages");
- checkForNewMessageWait=-1;
+ checkForNewMessageWait = -1;
}
checkForNewMessageWait++;
// update FFT
@@ -2436,15 +2443,16 @@ function updateHeardStations(arg) {
timestampRaw = arg.stations[i]["timestamp"];
var datetime = new Date(timestampRaw * 1000).toLocaleString(
- navigator.language,{
- hourCycle: 'h23',
+ navigator.language,
+ {
+ hourCycle: "h23",
year: "numeric",
month: "2-digit",
day: "2-digit",
hour: "2-digit",
minute: "2-digit",
- second: "2-digit"
- }
+ second: "2-digit",
+ }
);
//var hours = date.getHours();
//var minutes = "0" + date.getMinutes();
@@ -2767,7 +2775,7 @@ ipcRenderer.on("action-update-tnc-connection", (event, arg) => {
set_CPU_mode();
//GUI will auto connect to TNC if already running, if that is the case increment start count if 0
- if (tncStartCount==0) tncStartCount++;
+ if (tncStartCount == 0) tncStartCount++;
} else {
/*
document.getElementById('hamlib_deviceid').disabled = false;
@@ -2922,21 +2930,17 @@ ipcRenderer.on("run-tnc-command-fec-iswriting", (event) => {
});
//Change background color of RF Chat button if new messages are available
-ipcRenderer.on("action-update-unread-messages-main", (event,data) => {
+ipcRenderer.on("action-update-unread-messages-main", (event, data) => {
//Do something
- if (data == true)
- {
- document.getElementById("openRFChat").classList.add("btn-warning")
- document.getElementById("openRFChat").classList.remove("btn-secondary")
- }
- else
- {
- document.getElementById("openRFChat").classList.remove("btn-warning")
- document.getElementById("openRFChat").classList.add("btn-secondary")
+ if (data == true) {
+ document.getElementById("openRFChat").classList.add("btn-warning");
+ document.getElementById("openRFChat").classList.remove("btn-secondary");
+ } else {
+ document.getElementById("openRFChat").classList.remove("btn-warning");
+ document.getElementById("openRFChat").classList.add("btn-secondary");
}
});
-
ipcRenderer.on("run-tnc-command", (event, arg) => {
if (arg.command == "enable_mesh") {
@@ -3133,7 +3137,7 @@ ipcRenderer.on("action-show-cq-toast-received", (event, data) => {
let dxcallsign = data["data"][0]["dxcallsign"];
let dxgrid = data["data"][0]["dxgrid"];
let content = `cq from