feat: aggiunta Focus Mode e tab decodifica traffico APRS

This commit is contained in:
2026-10-31 13:58:04 +01:00
parent 2ed2ea58ea
commit 793b06b4e3
4 changed files with 619 additions and 282 deletions
+31 -1
View File
@@ -1,5 +1,6 @@
import json import json
import re import re
import datetime
from paho.mqtt import client as mqtt_client from paho.mqtt import client as mqtt_client
from core.config import config, logger from core.config import config, logger
from core.database import save_to_sqlite from core.database import save_to_sqlite
@@ -18,7 +19,7 @@ def on_connect(client, userdata, flags, reason_code, properties=None):
default_topics = [ default_topics = [
"servizi/+/stat", "dmr-gateway/+/json", "devices/+/services", "servizi/+/stat", "dmr-gateway/+/json", "devices/+/services",
"nxdn-gateway/+/json", "ysf-gateway/+/json", "p25-gateway/+/json", "nxdn-gateway/+/json", "ysf-gateway/+/json", "p25-gateway/+/json",
"dstar-gateway/+/json", "mmdvm/+/json", "data/#" "dstar-gateway/+/json", "mmdvm/+/json", "data/#", "aprs-gateway/aprs"
] ]
topics_list = config.get('mqtt', {}).get('topics', default_topics) topics_list = config.get('mqtt', {}).get('topics', default_topics)
@@ -42,6 +43,35 @@ def on_message(client, userdata, msg):
try: try:
topic = msg.topic topic = msg.topic
payload = msg.payload.decode('utf-8', errors='replace').strip() payload = msg.payload.decode('utf-8', errors='replace').strip()
# NUOVO BLOCCO APRS
if topic == "aprs-gateway/aprs":
try:
raw_aprs = payload
# Formato atteso: SOURCE>DEST,PATH:PAYLOAD
if ">" in raw_aprs and ":" in raw_aprs:
header, aprs_payload = raw_aprs.split(":", 1)
source, rest = header.split(">", 1)
if "," in rest:
dest, path = rest.split(",", 1)
else:
dest = rest
path = ""
aprs_data = {
"time": datetime.datetime.now().strftime("%H:%M:%S"),
"source": source.strip(),
"dest": dest.strip(),
"path": path.strip(),
"payload": aprs_payload.strip()
}
state.socketio.emit('aprs_msg', aprs_data)
except Exception as e:
logger.error(f"Errore decodifica APRS: {e}")
return # Esci per non processare il resto della logica su questo topic
parts = topic.split('/') parts = topic.split('/')
if len(parts) < 2: if len(parts) < 2:
return return
+244 -47
View File
@@ -16,27 +16,56 @@ let viewMode = localStorage.getItem('fleetViewMode') || 'grid';
let fleetMap = null; let fleetMap = null;
let mapMarkers = {}; let mapMarkers = {};
let currentFocusedNode = null;
function switchView(viewName) { function switchView(viewName) {
currentFocusedNode = null;
document.getElementById('view-focus').style.display = 'none';
document.getElementById('view-home').style.display = 'none'; document.getElementById('view-home').style.display = 'none';
document.getElementById('view-nodes').style.display = 'none'; document.getElementById('view-nodes').style.display = 'none';
document.getElementById('view-map').style.display = 'none'; document.getElementById('view-map').style.display = 'none';
document.getElementById('view-aprs').style.display = 'none';
document.getElementById('tab-home').classList.remove('active'); document.getElementById('tab-home').classList.remove('active');
document.getElementById('tab-nodes').classList.remove('active'); document.getElementById('tab-nodes').classList.remove('active');
document.getElementById('tab-map').classList.remove('active'); document.getElementById('tab-map').classList.remove('active');
document.getElementById('tab-aprs').classList.remove('active');
document.getElementById(`view-${viewName}`).style.display = 'block'; document.getElementById(`view-${viewName}`).style.display = 'block';
document.getElementById(`tab-${viewName}`).classList.add('active'); document.getElementById(`tab-${viewName}`).classList.add('active');
localStorage.setItem('fleetDefaultView', viewName); localStorage.setItem('fleetDefaultView', viewName);
// Riporta la pagina in cima con un'animazione fluida
window.scrollTo({ top: 0, behavior: 'smooth' }); window.scrollTo({ top: 0, behavior: 'smooth' });
if (viewName === 'nodes') { applyViewMode(); } if (viewName === 'nodes') { applyViewMode(); }
else if (viewName === 'map') { else if (viewName === 'map') { setTimeout(() => { initOrUpdateMap(); }, 100); }
setTimeout(() => { }
initOrUpdateMap();
}, 100); function openNodeFocus(clientId) {
} currentFocusedNode = clientId;
document.getElementById('view-home').style.display = 'none';
document.getElementById('view-nodes').style.display = 'none';
document.getElementById('view-map').style.display = 'none';
document.getElementById('view-aprs').style.display = 'none';
document.getElementById('tab-home').classList.remove('active');
document.getElementById('tab-nodes').classList.remove('active');
document.getElementById('tab-map').classList.remove('active');
document.getElementById('tab-aprs').classList.remove('active');
document.getElementById('view-focus').style.display = 'block';
window.scrollTo({ top: 0, behavior: 'smooth' });
refreshStates();
refreshLogs();
}
function closeNodeFocus() {
currentFocusedNode = null;
document.getElementById('view-focus').style.display = 'none';
switchView(localStorage.getItem('fleetDefaultView') || 'home');
} }
window.addEventListener('DOMContentLoaded', () => { window.addEventListener('DOMContentLoaded', () => {
@@ -48,6 +77,7 @@ window.addEventListener('DOMContentLoaded', () => {
setInterval(() => { refreshLogs(); refreshStats(); }, 60000); setInterval(() => { refreshLogs(); refreshStats(); }, 60000);
checkServerUpdate(); checkServerUpdate();
setInterval(checkServerUpdate, 3600000); setInterval(checkServerUpdate, 3600000);
refreshAprs(); // Fetch iniziale APRS
}); });
// --- FUNZIONI FILTRO E LAYOUT --- // --- FUNZIONI FILTRO E LAYOUT ---
@@ -165,18 +195,18 @@ function confirmSwitch(id, mode) {
const data = globalHealthData[id.toLowerCase()]; const data = globalHealthData[id.toLowerCase()];
let profileName = mode === 'A' ? "PROF A" : "PROF B"; let profileName = mode === 'A' ? "PROF A" : "PROF B";
if (data && data.profiles && data.profiles[mode]) profileName = data.profiles[mode]; if (data && data.profiles && data.profiles[mode]) profileName = data.profiles[mode];
const title = `🔄 ${t('titleSwitch')}`; const title = `[ SW_PROFILE ]`;
const msg = `${t('confSwitch')} <b>${esc(profileName)}</b> -> <b>${id.toUpperCase()}</b>?`; const msg = `${t('confSwitch')} <b>${esc(profileName)}</b> -> <b>${id.toUpperCase()}</b>?`;
const color = mode === 'A' ? "var(--accent)" : "var(--primary)"; const color = mode === 'A' ? "var(--accent)" : "var(--primary)";
sendCommand(id, mode, title, msg, color); sendCommand(id, mode, title, msg, color);
} }
function confirmReboot(id) { sendCommand(id, 'REBOOT', `🔄 ${t('titleBoot')}`, `${t('confBoot')}<b>${id.toUpperCase()}</b>?`, "var(--danger)"); } function confirmReboot(id) { sendCommand(id, 'REBOOT', `[ REBOOT ]`, `${t('confBoot')}<b>${id.toUpperCase()}</b>?`, "var(--danger)"); }
function confirmUpdateAgent(id) { sendCommand(id, 'UPDATE_AGENT', `⬇️ UPDATE OTA`, `Confermi l'aggiornamento dello script tramite git pull sul nodo <b>${id.toUpperCase()}</b>?`, "var(--primary)"); } function confirmUpdateAgent(id) { sendCommand(id, 'UPDATE_AGENT', `[ OTA_UPDATE ]`, `${t('confOta')}<b>${id.toUpperCase()}</b>?`, "var(--primary)"); }
function sendTgCommand(clientId, comando) { function sendTgCommand(clientId, comando) {
const msg = (comando === 'TG:ON') ? t('confTgOn') : t('confTgOff'); const msg = (comando === 'TG:ON') ? t('confTgOn') : t('confTgOff');
customConfirm("💬 TELEGRAM", `${msg}<b>${clientId.toUpperCase()}</b>?`, "var(--primary)", async () => { customConfirm("[ TELEGRAM ]", `${msg}<b>${clientId.toUpperCase()}</b>?`, "var(--primary)", async () => {
try { try {
const res = await fetch('/api/command', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ clientId: clientId, type: comando }) }); const res = await fetch('/api/command', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ clientId: clientId, type: comando }) });
const data = await res.json(); const data = await res.json();
@@ -234,7 +264,7 @@ async function initUI() {
return ` return `
<div class="card" id="card-${c.id}" data-status="offline" data-gateways="" data-loc="" data-has-warn="false"> <div class="card" id="card-${c.id}" data-status="offline" data-gateways="" data-loc="" data-has-warn="false">
<div class="card-header"> <div class="card-header">
<span class="client-name" title="${esc(c.name)}">${esc(c.name)}</span> <span class="client-name" title="${esc(c.name)}"><span class="tactical-led" id="led-status-${c.id}"></span> ${esc(c.name)}</span>
<div class="header-badges"> <div class="header-badges">
<span class="badge-id">NET-ID: ${c.id.toUpperCase()}</span> <span class="badge-id">NET-ID: ${c.id.toUpperCase()}</span>
<span class="badge-id" id="agent-badge-${c.id}" style="display: none; color: var(--primary);"></span> <span class="badge-id" id="agent-badge-${c.id}" style="display: none; color: var(--primary);"></span>
@@ -272,7 +302,7 @@ async function initUI() {
</div> </div>
<div class="dmr-info" id="dmr-alt-${c.id}" style="display: none; text-align: center; font-weight: 400;"></div> <div class="dmr-info" id="dmr-alt-${c.id}" style="display: none; text-align: center; font-weight: 400;"></div>
<div class="terminal-log" id="sys-log-${c.id}">${t('waitNet')}</div> <div class="terminal-log" id="sys-log-${c.id}">> AWAITING_STREAM...</div>
<div id="svc-warn-${c.id}" class="blink" style="display: none; text-align: center; margin-bottom: 15px; border: 1px dashed var(--danger); padding: 10px; color: var(--danger);"> <div id="svc-warn-${c.id}" class="blink" style="display: none; text-align: center; margin-bottom: 15px; border: 1px dashed var(--danger); padding: 10px; color: var(--danger);">
<span style="font-size: 0.85rem; font-family: 'JetBrains Mono';" data-i18n="warnDaemon">${t('warnDaemon')}</span> <span style="font-size: 0.85rem; font-family: 'JetBrains Mono';" data-i18n="warnDaemon">${t('warnDaemon')}</span>
@@ -289,7 +319,7 @@ async function initUI() {
${showReboot ? ` ${showReboot ? `
<details class="admin-dropdown" style="width: 100%;"> <details class="admin-dropdown" style="width: 100%;">
<summary id="admin-summary-${c.id}" class="btn-cmd" style="color: var(--text-muted) !important;">[ SYS_TOOLS ]</summary> <summary id="admin-summary-${c.id}" class="btn-cmd" style="color: var(--text-muted) !important;">[ SYS_TOOLS ]</summary>
<div style="display: grid; grid-template-columns: 1fr 1fr; gap: 8px; padding-top: 10px;"> <div style="display: grid; grid-template-columns: 1fr 1fr 1fr; gap: 8px; padding-top: 10px;">
<button class="btn-cmd" style="border-color: var(--primary); color: var(--primary) !important;" title="Versioni Software" onclick="openVersionsModal('${c.id}')">INFO</button> <button class="btn-cmd" style="border-color: var(--primary); color: var(--primary) !important;" title="Versioni Software" onclick="openVersionsModal('${c.id}')">INFO</button>
<button id="btn-svc-${c.id}" class="btn-cmd" style="border-color: var(--text-main);" title="${t('ttSvc')}" onclick="openServicesModal('${c.id}')">${t('btnSvc')}</button> <button id="btn-svc-${c.id}" class="btn-cmd" style="border-color: var(--text-main);" title="${t('ttSvc')}" onclick="openServicesModal('${c.id}')">${t('btnSvc')}</button>
<button class="btn-cmd" style="border-color: var(--accent); color: var(--accent) !important;" title="${t('ttFile')}" onclick="openConfigsModal('${c.id}')">${t('btnFile')}</button> <button class="btn-cmd" style="border-color: var(--accent); color: var(--accent) !important;" title="${t('ttFile')}" onclick="openConfigsModal('${c.id}')">${t('btnFile')}</button>
@@ -305,7 +335,7 @@ async function initUI() {
const miniGrid = document.getElementById('home-mini-nodes'); const miniGrid = document.getElementById('home-mini-nodes');
if (miniGrid) { if (miniGrid) {
miniGrid.innerHTML = clients.map(c => ` miniGrid.innerHTML = clients.map(c => `
<div id="mini-card-${c.id}" class="mini-card" onclick="switchView('nodes'); setTimeout(()=>document.getElementById('card-${c.id}').scrollIntoView({behavior:'smooth', block: 'center'}), 200);"> <div id="mini-card-${c.id}" class="mini-card" onclick="openNodeFocus('${c.id}')">
<div class="mini-card-content"> <div class="mini-card-content">
<div id="mini-name-${c.id}" class="mini-card-name" title="${esc(c.name)}">${esc(c.name)}</div> <div id="mini-name-${c.id}" class="mini-card-name" title="${esc(c.name)}">${esc(c.name)}</div>
<div id="mini-id-${c.id}" style="font-family: 'JetBrains Mono', monospace; font-size: 0.65rem; color: var(--text-muted); margin-top: 2px;">ID: ${c.id.toUpperCase()}</div> <div id="mini-id-${c.id}" style="font-family: 'JetBrains Mono', monospace; font-size: 0.65rem; color: var(--text-muted); margin-top: 2px;">ID: ${c.id.toUpperCase()}</div>
@@ -348,6 +378,7 @@ function initOrUpdateMap() {
let bounds = []; let bounds = [];
clients.forEach(c => { clients.forEach(c => {
try {
const cid = c.id.toLowerCase(); const cid = c.id.toLowerCase();
const info = latestStatesData.info && latestStatesData.info[cid]; const info = latestStatesData.info && latestStatesData.info[cid];
const gen = latestStatesData.general && latestStatesData.general[cid]; const gen = latestStatesData.general && latestStatesData.general[cid];
@@ -392,7 +423,7 @@ function initOrUpdateMap() {
<div style="font-size: 0.8rem; color: var(--danger);">TX: ${esc(info.tx)}</div> <div style="font-size: 0.8rem; color: var(--danger);">TX: ${esc(info.tx)}</div>
<div style="font-size: 0.8rem; color: var(--success); margin-bottom: 6px;">RX: ${esc(info.rx)}</div> <div style="font-size: 0.8rem; color: var(--success); margin-bottom: 6px;">RX: ${esc(info.rx)}</div>
${health ? `<div style="font-size: 0.75rem; margin-bottom: 8px; color: var(--border-main);">TMP: <b>${health.temp}°C</b> | CPU: <b>${health.cpu}%</b></div>` : ''} ${health ? `<div style="font-size: 0.75rem; margin-bottom: 8px; color: var(--border-main);">TMP: <b>${health.temp}°C</b> | CPU: <b>${health.cpu}%</b></div>` : ''}
<button onclick="switchView('nodes'); setTimeout(()=>document.getElementById('card-${c.id}').scrollIntoView({behavior:'smooth', block: 'center'}), 200);" class="btn-cmd" style="width: 100%; margin-top:5px;">[ FOCUS_NODE ]</button> <button onclick="openNodeFocus('${c.id}')" class="btn-cmd" style="width: 100%; margin-top:5px;">[ FOCUS_NODE ]</button>
</div> </div>
`; `;
@@ -404,6 +435,7 @@ function initOrUpdateMap() {
mapMarkers[cid].setPopupContent(popupContent); mapMarkers[cid].setPopupContent(popupContent);
} }
} }
} catch(err) { console.error("Map rendering error for node", c.id, err); }
}); });
if (bounds.length > 0 && !fleetMap._hasFitted) { if (bounds.length > 0 && !fleetMap._hasFitted) {
@@ -419,19 +451,49 @@ async function refreshStates() {
globalVersionsData = data.versions || {}; globalVersionsData = data.versions || {};
clients.forEach(c => { clients.forEach(c => {
const statusDiv = document.getElementById(`status-${c.id}`); const cardDiv = document.getElementById(`card-${c.id}`); try {
if (!statusDiv || !cardDiv) return;
let stateValue = data.states[c.id.toLowerCase()] || data.states[c.id] || "OFFLINE"; let stateValue = data.states[c.id.toLowerCase()] || data.states[c.id] || "OFFLINE";
stateValue = String(stateValue).trim().toUpperCase(); statusDiv.innerText = stateValue; stateValue = String(stateValue).trim().toUpperCase();
const isOnline = !stateValue.includes("OFF") && stateValue !== ""; const isOnline = !stateValue.includes("OFF") && stateValue !== "";
let genObj = data.general && data.general[c.id.toLowerCase()];
let healthObj = data.health && data.health[c.id.toLowerCase()];
let infoObj = data.info && data.info[c.id.toLowerCase()];
let telemetryObj = data.telemetry[c.id.toLowerCase()] || data.telemetry[c.id] || { ts1: "...", ts2: "...", alt: "", idle: true };
if (typeof telemetryObj === 'string') telemetryObj = { ts1: telemetryObj, ts2: "...", alt: "", idle: true };
const role = me.role || '';
const allowedList = String(me.allowed_nodes || '').split(',').map(x => x.trim().toLowerCase()).filter(Boolean);
let canControl = isAuthenticated && (role === 'admin' || allowedList.includes('all') || allowedList.includes(c.id.toLowerCase()));
let showReboot = (role === 'admin');
let isTx = false; let activeModeColor = "var(--primary)"; let isIdle = telemetryObj.idle === true;
if (telemetryObj.alt && telemetryObj.alt !== "") {
let altText = telemetryObj.alt.toUpperCase();
if (altText.includes("NXDN")) activeModeColor = "var(--success)"; else if (altText.includes("YSF")) activeModeColor = "var(--primary)"; else if (altText.includes("D-STAR")) activeModeColor = "var(--primary)"; else if (altText.includes("P25")) activeModeColor = "var(--accent)";
isTx = altText.includes("🟢") || altText.includes("🟣") || altText.includes("🔵") || altText.includes("🟠");
} else {
let v1 = String(telemetryObj.ts1 ?? '');
let v2 = String(telemetryObj.ts2 ?? '');
if (v1.includes("🎙️") || v1.includes("TX") || v2.includes("🎙️") || v2.includes("TX")) {
isTx = true;
}
}
// Aggiorna logic card nel grid normale
const statusDiv = document.getElementById(`status-${c.id}`);
const cardDiv = document.getElementById(`card-${c.id}`);
if (cardDiv) {
cardDiv.dataset.status = isOnline ? 'online' : 'offline'; cardDiv.dataset.status = isOnline ? 'online' : 'offline';
if (statusDiv) statusDiv.innerText = stateValue;
renderSeen(c, data, isOnline); renderSeen(c, data, isOnline);
const warns = (data.warnings && data.warnings[c.id.toLowerCase()]) || []; const warns = (data.warnings && data.warnings[c.id.toLowerCase()]) || [];
const diagDiv = document.getElementById(`diag-warn-${c.id}`);
cardDiv.dataset.hasWarn = (warns.length > 0) ? 'true' : 'false'; cardDiv.dataset.hasWarn = (warns.length > 0) ? 'true' : 'false';
const diagDiv = document.getElementById(`diag-warn-${c.id}`);
if (diagDiv) { if (diagDiv) {
if (warns.length > 0 && isOnline) { if (warns.length > 0 && isOnline) {
diagDiv.style.display = 'block'; diagDiv.style.display = 'block';
@@ -442,7 +504,6 @@ async function refreshStates() {
} }
} }
let genObj = data.general && data.general[c.id.toLowerCase()];
const nameSpan = cardDiv.querySelector('.client-name'); const nameSpan = cardDiv.querySelector('.client-name');
const idBadge = cardDiv.querySelector('.badge-id'); const idBadge = cardDiv.querySelector('.badge-id');
const typeBadge = document.getElementById(`type-badge-${c.id}`); const typeBadge = document.getElementById(`type-badge-${c.id}`);
@@ -461,25 +522,18 @@ async function refreshStates() {
if (typeBadge) typeBadge.style.display = 'none'; if (typeBadge) typeBadge.style.display = 'none';
} }
let telemetryObj = data.telemetry[c.id.toLowerCase()] || data.telemetry[c.id] || { ts1: "...", ts2: "...", alt: "", idle: true };
if (typeof telemetryObj === 'string') telemetryObj = { ts1: telemetryObj, ts2: "...", alt: "", idle: true };
const tsContainer = document.getElementById(`ts-container-${c.id}`); const ts1Div = document.getElementById(`dmr-ts1-${c.id}`); const ts2Div = document.getElementById(`dmr-ts2-${c.id}`); const altDiv = document.getElementById(`dmr-alt-${c.id}`); const tsContainer = document.getElementById(`ts-container-${c.id}`); const ts1Div = document.getElementById(`dmr-ts1-${c.id}`); const ts2Div = document.getElementById(`dmr-ts2-${c.id}`); const altDiv = document.getElementById(`dmr-alt-${c.id}`);
let isTx = false; let activeModeColor = "var(--success)"; let isIdle = telemetryObj.idle === true;
if (telemetryObj.alt && telemetryObj.alt !== "") { if (telemetryObj.alt && telemetryObj.alt !== "") {
if (tsContainer) tsContainer.style.display = "none"; if (tsContainer) tsContainer.style.display = "none";
if (altDiv) { if (altDiv) {
altDiv.style.display = "block"; altDiv.innerText = telemetryObj.alt; let altText = telemetryObj.alt.toUpperCase(); altDiv.style.display = "block"; altDiv.innerText = telemetryObj.alt;
if (altText.includes("NXDN")) activeModeColor = "var(--success)"; else if (altText.includes("YSF")) activeModeColor = "var(--primary)"; else if (altText.includes("D-STAR")) activeModeColor = "var(--primary)"; else if (altText.includes("P25")) activeModeColor = "var(--accent)";
isTx = altText.includes("🟢") || altText.includes("🟣") || altText.includes("🔵") || altText.includes("🟠");
if (isTx) { altDiv.style.color = activeModeColor; altDiv.style.borderColor = activeModeColor; } if (isTx) { altDiv.style.color = activeModeColor; altDiv.style.borderColor = activeModeColor; }
else { altDiv.style.color = "var(--text-muted)"; altDiv.style.borderColor = "var(--border-light)"; } else { altDiv.style.color = "var(--text-muted)"; altDiv.style.borderColor = "var(--border-light)"; }
} }
} else { } else {
if (altDiv) altDiv.style.display = "none"; if (altDiv) altDiv.style.display = "none";
if (tsContainer) tsContainer.style.display = "flex"; if (tsContainer) tsContainer.style.display = "flex";
activeModeColor = "var(--primary)";
if (ts1Div && ts2Div) { if (ts1Div && ts2Div) {
let isSimplex = (genObj && genObj.duplex === "0"); let isSimplex = (genObj && genObj.duplex === "0");
ts1Div.style.display = isSimplex ? 'none' : 'block'; ts1Div.style.display = isSimplex ? 'none' : 'block';
@@ -487,14 +541,12 @@ async function refreshStates() {
if (isSimplex && idx === 0) return; if (isSimplex && idx === 0) return;
const val = String((idx === 0 ? telemetryObj.ts1 : telemetryObj.ts2) ?? ''); const val = String((idx === 0 ? telemetryObj.ts1 : telemetryObj.ts2) ?? '');
div.innerText = `TS${idx + 1}: ${val}`; div.innerText = `TS${idx + 1}: ${val}`;
if (val.includes("🎙️") || val.includes("TX")) { isTx = true; div.style.color = activeModeColor; div.style.borderColor = activeModeColor; } if (val.includes("🎙️") || val.includes("TX")) { div.style.color = activeModeColor; div.style.borderColor = activeModeColor; }
else { div.style.color = "var(--text-muted)"; div.style.borderColor = "var(--border-light)"; } else { div.style.color = "var(--text-muted)"; div.style.borderColor = "var(--border-light)"; }
}); });
} }
} }
let healthObj = data.health && data.health[c.id.toLowerCase()];
let infoObj = data.info && data.info[c.id.toLowerCase()];
const freqContainer = document.getElementById(`freq-container-${c.id}`); const freqTx = document.getElementById(`freq-tx-${c.id}`); const freqRx = document.getElementById(`freq-rx-${c.id}`); const freqContainer = document.getElementById(`freq-container-${c.id}`); const freqTx = document.getElementById(`freq-tx-${c.id}`); const freqRx = document.getElementById(`freq-rx-${c.id}`);
const metaContainer = document.getElementById(`meta-container-${c.id}`); const metaContainer = document.getElementById(`meta-container-${c.id}`);
const locSpan = document.getElementById(`loc-${c.id}`); const locSpan = document.getElementById(`loc-${c.id}`);
@@ -517,8 +569,9 @@ async function refreshStates() {
const healthContainer = document.getElementById(`health-${c.id}`); const cpuSpan = document.getElementById(`cpu-${c.id}`); const tempSpan = document.getElementById(`temp-${c.id}`); const ramSpan = document.getElementById(`ram-${c.id}`); const diskSpan = document.getElementById(`disk-${c.id}`); const healthContainer = document.getElementById(`health-${c.id}`); const cpuSpan = document.getElementById(`cpu-${c.id}`); const tempSpan = document.getElementById(`temp-${c.id}`); const ramSpan = document.getElementById(`ram-${c.id}`); const diskSpan = document.getElementById(`disk-${c.id}`);
const gwBar = document.getElementById(`gw-bar-${c.id}`); const gwBar = document.getElementById(`gw-bar-${c.id}`);
let gwHtml = "";
if (gwBar && healthObj) { if (gwBar && healthObj) {
let gwHtml = ""; let gwData = data.gateway_states && data.gateway_states[c.id.toLowerCase()] ? data.gateway_states[c.id.toLowerCase()] : {}; let processes = healthObj.processes || {}; let activeGatewaysStr = ""; let gwData = data.gateway_states && data.gateway_states[c.id.toLowerCase()] ? data.gateway_states[c.id.toLowerCase()] : {}; let processes = healthObj.processes || {}; let activeGatewaysStr = "";
const gwMap = [{ id: 'dmrgateway', label: 'DMR', color: 'var(--primary)', proto: 'DMR' }, { id: 'ysfgateway', label: 'YSF', color: '#8b5cf6', proto: 'YSF' }, { id: 'dstargateway', label: 'D-STAR', color: 'var(--primary)', proto: 'D-STAR' }, { id: 'nxdngateway', label: 'NXDN', color: 'var(--success)', proto: 'NXDN' }, { id: 'p25gateway', label: 'P25', color: 'var(--accent)', proto: 'P25' }]; const gwMap = [{ id: 'dmrgateway', label: 'DMR', color: 'var(--primary)', proto: 'DMR' }, { id: 'ysfgateway', label: 'YSF', color: '#8b5cf6', proto: 'YSF' }, { id: 'dstargateway', label: 'D-STAR', color: 'var(--primary)', proto: 'D-STAR' }, { id: 'nxdngateway', label: 'NXDN', color: 'var(--success)', proto: 'NXDN' }, { id: 'p25gateway', label: 'P25', color: 'var(--accent)', proto: 'P25' }];
if (isOnline) { if (isOnline) {
@@ -548,7 +601,6 @@ async function refreshStates() {
healthContainer.style.display = 'grid'; healthContainer.style.display = 'grid';
cpuSpan.innerText = healthObj.cpu; tempSpan.innerText = healthObj.temp; ramSpan.innerText = healthObj.ram; diskSpan.innerText = healthObj.disk; cpuSpan.innerText = healthObj.cpu; tempSpan.innerText = healthObj.temp; ramSpan.innerText = healthObj.ram; diskSpan.innerText = healthObj.disk;
let upSpan = document.getElementById(`up-${c.id}`); if (upSpan && healthObj.uptime) { upSpan.innerText = fmtAge(healthObj.uptime); } let upSpan = document.getElementById(`up-${c.id}`); if (upSpan && healthObj.uptime) { upSpan.innerText = fmtAge(healthObj.uptime); }
let agentBadge = document.getElementById(`agent-badge-${c.id}`); if (agentBadge && healthObj.agent_version) { agentBadge.innerText = `AGT:v${healthObj.agent_version}`; agentBadge.style.display = 'inline-block'; }
const profBtnsDiv = document.getElementById(`prof-btns-${c.id}`); const profBtnsDiv = document.getElementById(`prof-btns-${c.id}`);
const profKeys = JSON.stringify(healthObj.profiles || {}); const profKeys = JSON.stringify(healthObj.profiles || {});
@@ -567,11 +619,8 @@ async function refreshStates() {
} }
} else { } else {
if (healthContainer) healthContainer.style.display = 'none'; if (healthContainer) healthContainer.style.display = 'none';
let agentBadge = document.getElementById(`agent-badge-${c.id}`); if (agentBadge) agentBadge.style.display = 'none';
} }
globalHealthData[c.id.toLowerCase()] = healthObj;
let hasOfflineService = false; let hasOfflineService = false;
if (healthObj && healthObj.processes) { for (const [svcName, svcStatus] of Object.entries(healthObj.processes)) { if (svcStatus.toLowerCase() !== 'online') { hasOfflineService = true; break; } } } if (healthObj && healthObj.processes) { for (const [svcName, svcStatus] of Object.entries(healthObj.processes)) { if (svcStatus.toLowerCase() !== 'online') { hasOfflineService = true; break; } } }
const warnBadge = document.getElementById(`svc-warn-${c.id}`); const btnSvc = document.getElementById(`btn-svc-${c.id}`); const warnBadge = document.getElementById(`svc-warn-${c.id}`); const btnSvc = document.getElementById(`btn-svc-${c.id}`);
@@ -603,30 +652,113 @@ async function refreshStates() {
cardDiv.classList.remove('online'); statusDiv.classList.add('status-offline'); cardDiv.classList.remove('online'); statusDiv.classList.add('status-offline');
cardDiv.style.borderColor = "var(--border-light)"; cardDiv.style.borderColor = "var(--border-light)";
} }
}
// Aggiornamento Mini-Cards
const miniCard = document.getElementById(`mini-card-${c.id}`); const miniStatus = document.getElementById(`mini-status-${c.id}`); const miniName = document.getElementById(`mini-name-${c.id}`); const miniId = document.getElementById(`mini-id-${c.id}`); const miniCard = document.getElementById(`mini-card-${c.id}`); const miniStatus = document.getElementById(`mini-status-${c.id}`); const miniName = document.getElementById(`mini-name-${c.id}`); const miniId = document.getElementById(`mini-id-${c.id}`);
if (miniCard && miniStatus) { if (miniCard && miniStatus) {
if (genObj && isOnline) { if (miniName) miniName.innerText = genObj.callsign; if (miniId) miniId.innerText = `ID:${genObj.radio_id}`; } if (genObj && isOnline) { if (miniName) miniName.innerText = genObj.callsign; if (miniId) miniId.innerText = `ID:${genObj.radio_id}`; }
else { if (miniName) miniName.innerText = c.name; if (miniId) miniId.innerText = `ID:${c.id.toUpperCase()}`; } else { if (miniName) miniName.innerText = c.name; if (miniId) miniId.innerText = `ID:${c.id.toUpperCase()}`; }
if (isOnline) { if (isOnline) {
let timeSinceTx = Date.now() - (parseInt(cardDiv.dataset.lastTx) || 0); let timeSinceTx = (cardDiv && cardDiv.dataset.lastTx) ? Date.now() - parseInt(cardDiv.dataset.lastTx) : 0;
let showActiveColor = isTx || (!isIdle && timeSinceTx < HANG_TIME_MS); let showActiveColor = isTx || (!isIdle && timeSinceTx < HANG_TIME_MS);
if (showActiveColor) { if (showActiveColor) {
miniCard.style.borderColor = activeModeColor; miniCard.style.borderColor = activeModeColor;
miniStatus.innerText = "( TX )"; miniStatus.title = "Transmitting..."; miniStatus.style.color = activeModeColor; miniStatus.style.borderColor = activeModeColor; miniStatus.innerText = "( TX )"; miniStatus.title = "Transmitting..."; miniStatus.style.color = activeModeColor; miniStatus.style.borderColor = activeModeColor;
} else if (warns.length > 0) { } else {
const warns = (data.warnings && data.warnings[c.id.toLowerCase()]) || [];
if (warns.length > 0) {
miniCard.style.borderColor = "var(--accent)"; miniCard.style.borderColor = "var(--accent)";
miniStatus.innerText = "(!) ALERT"; miniStatus.title = warns.join(" | "); miniStatus.style.color = "var(--accent)"; miniStatus.style.borderColor = "var(--accent)"; miniStatus.innerText = "(!) ALERT"; miniStatus.title = warns.join(" | "); miniStatus.style.color = "var(--accent)"; miniStatus.style.borderColor = "var(--accent)";
} else { } else {
miniCard.style.borderColor = "var(--border-main)"; miniCard.style.borderColor = "var(--border-main)";
miniStatus.innerText = stateValue; miniStatus.title = stateValue; miniStatus.style.color = "var(--success)"; miniStatus.style.borderColor = "var(--border-light)"; miniStatus.innerText = stateValue; miniStatus.title = stateValue; miniStatus.style.color = "var(--success)"; miniStatus.style.borderColor = "var(--border-light)";
} }
}
} else { } else {
miniCard.style.borderColor = "var(--border-light)"; miniCard.style.borderColor = "var(--border-light)";
miniStatus.innerText = "OFFLINE"; miniStatus.title = "OFFLINE"; miniStatus.style.color = "var(--danger)"; miniStatus.style.borderColor = "var(--border-light)"; miniStatus.innerText = "OFFLINE"; miniStatus.title = "OFFLINE"; miniStatus.style.color = "var(--danger)"; miniStatus.style.borderColor = "var(--border-light)";
} }
} }
// Aggiornamento Focus View (se il nodo corrente è in focus)
if (currentFocusedNode === c.id) {
let timeSinceTx = (cardDiv && cardDiv.dataset.lastTx) ? Date.now() - parseInt(cardDiv.dataset.lastTx) : 0;
let showActiveColor = isTx || (!isIdle && timeSinceTx < HANG_TIME_MS);
document.getElementById('focus-name').innerHTML = `<span style="display:inline-block; border-radius:50%; width:20px; height:20px; border:2px solid ${isOnline ? (showActiveColor ? activeModeColor : 'var(--success)') : 'var(--border-light)'}; background:${isOnline && showActiveColor ? activeModeColor : 'transparent'}"></span> ${esc(genObj ? genObj.callsign : c.name)}`;
document.getElementById('focus-id').innerText = `NET-ID: ${genObj ? genObj.radio_id : c.id.toUpperCase()}`;
let focusStatus = document.getElementById('focus-status');
focusStatus.innerText = stateValue;
focusStatus.style.color = isOnline ? (showActiveColor ? activeModeColor : 'var(--success)') : 'var(--danger)';
document.getElementById('focus-cpu').innerText = healthObj && isOnline ? healthObj.cpu + "%" : "--";
document.getElementById('focus-temp').innerText = healthObj && isOnline ? healthObj.temp + "°C" : "--";
document.getElementById('focus-ram').innerText = healthObj && isOnline ? healthObj.ram + "%" : "--";
document.getElementById('focus-disk').innerText = healthObj && isOnline ? healthObj.disk + "%" : "--";
document.getElementById('focus-up').innerText = healthObj && isOnline ? fmtAge(healthObj.uptime) : "--";
document.getElementById('focus-tx').innerText = infoObj && isOnline ? infoObj.tx : "--";
document.getElementById('focus-rx').innerText = infoObj && isOnline ? infoObj.rx : "--";
document.getElementById('focus-loc').innerText = infoObj && isOnline ? infoObj.loc : "--";
// Gateway riciclati dal loop
let gwBar = document.getElementById(`gw-bar-${c.id}`);
document.getElementById('focus-gw').innerHTML = (gwBar && gwBar.innerHTML) ? gwBar.innerHTML : '<span style="color:var(--border-main); font-family:JetBrains Mono;">NO_ACTIVE_GATEWAYS</span>';
// TS
let focusTsHtml = "";
if (telemetryObj.alt && telemetryObj.alt !== "") {
focusTsHtml = `<div style="padding: 10px; border: 1px dashed var(--border-light); color: ${activeModeColor}">${esc(telemetryObj.alt)}</div>`;
} else {
let isSimplex = (genObj && genObj.duplex === "0");
let v1 = String(telemetryObj.ts1 ?? '');
let v2 = String(telemetryObj.ts2 ?? '');
if(!isSimplex) {
focusTsHtml += `<div style="padding: 10px; border: 1px dashed var(--border-light); color: ${v1.includes('🎙️')||v1.includes('TX') ? activeModeColor : 'var(--text-main)'}">TS1: ${esc(v1)}</div>`;
}
focusTsHtml += `<div style="padding: 10px; border: 1px dashed var(--border-light); color: ${v2.includes('🎙️')||v2.includes('TX') ? activeModeColor : 'var(--text-main)'}">TS2: ${esc(v2)}</div>`;
}
document.getElementById('focus-ts').innerHTML = focusTsHtml || "--";
// Controlli Admin
const focusControls = document.getElementById('focus-controls');
if (canControl || showReboot) {
focusControls.style.display = 'block';
let btnHtml = '';
if (canControl) {
btnHtml += `<button class="btn-cmd" style="padding: 12px 25px; font-size: 1.1rem; flex: none; width: auto;" onclick="sendTgCommand('${c.id}', 'TG:ON')">[ TG_ON ]</button>`;
btnHtml += `<button class="btn-cmd" style="padding: 12px 25px; font-size: 1.1rem; flex: none; width: auto;" onclick="sendTgCommand('${c.id}', 'TG:OFF')">[ TG_OFF ]</button>`;
if (healthObj && healthObj.profiles) {
const colors = ["var(--accent)", "var(--success)", "var(--primary)"]; let idx = 0;
for (const [pKey, pLabel] of Object.entries(healthObj.profiles)) {
let col = colors[idx % colors.length];
btnHtml += `<button class="btn-cmd" style="padding: 12px 25px; font-size: 1.1rem; flex: none; width: auto; border-color: ${col}; color:${col} !important;" onclick="confirmSwitch('${c.id}', ${q(pKey)})">[ ${esc(pLabel)} ]</button>`;
idx++;
}
}
}
if (showReboot) {
btnHtml += `<button class="btn-cmd" style="padding: 12px 25px; font-size: 1.1rem; flex: none; width: auto; border-color: var(--primary); color: var(--primary) !important;" onclick="openVersionsModal('${c.id}')">[ INFO ]</button>`;
btnHtml += `<button class="btn-cmd" style="padding: 12px 25px; font-size: 1.1rem; flex: none; width: auto; border-color: var(--text-main);" onclick="openServicesModal('${c.id}')">[ SVC ]</button>`;
btnHtml += `<button class="btn-cmd" style="padding: 12px 25px; font-size: 1.1rem; flex: none; width: auto; border-color: var(--accent); color: var(--accent) !important;" onclick="openConfigsModal('${c.id}')">[ CFG ]</button>`;
btnHtml += `<button class="btn-cmd" style="padding: 12px 25px; font-size: 1.1rem; flex: none; width: auto; border-color: var(--danger); color: var(--danger) !important;" onclick="confirmHatReset('${c.id}')">[ HAT ]</button>`;
btnHtml += `<button class="btn-cmd" style="padding: 12px 25px; font-size: 1.1rem; flex: none; width: auto; border-color: var(--danger); color: var(--danger) !important;" onclick="confirmReboot('${c.id}')">[ RBT ]</button>`;
let otaColor = (healthObj && healthObj.agent_update_available) ? 'var(--danger)' : 'var(--primary)';
btnHtml += `<button class="btn-cmd" style="padding: 12px 25px; font-size: 1.1rem; flex: none; width: auto; border-color: ${otaColor}; color: ${otaColor} !important;" onclick="confirmUpdateAgent('${c.id}')">[ OTA ]</button>`;
}
document.getElementById('focus-admin-btns').innerHTML = btnHtml;
} else {
focusControls.style.display = 'none';
}
}
globalHealthData[c.id.toLowerCase()] = healthObj;
} catch(err) { console.error("Error updating state for node", c.id, err); }
}); });
applyFilters(); applyFilters();
@@ -640,15 +772,61 @@ function changeLogLimit(val) {
refreshLogs(); refreshLogs();
} }
async function refreshAprs() {
try {
const res = await fetch('/api/aprs');
if (!res.ok) return;
const logs = await res.json();
const tbody = document.getElementById('aprs-body');
if (!tbody) return;
let html = "";
logs.forEach(msg => {
html += formatAprsRow(msg);
});
tbody.innerHTML = html;
} catch (e) { console.error(e); }
}
function formatAprsRow(msg) {
const time = msg.time || new Date().toLocaleTimeString('it-IT', { hour12: false });
const srcHtml = `<a href="https://aprs.fi/info/a/${encodeURIComponent(msg.source)}" target="_blank" style="color: var(--success); text-decoration: none;">${esc(msg.source)}</a>`;
return `<tr>
<td style="color:var(--text-muted);">${esc(time)}</td>
<td style="font-weight:bold;">${srcHtml}</td>
<td style="color:var(--primary);">${esc(msg.dest)}</td>
<td style="color:var(--border-main); font-size:0.75rem;">${esc(msg.path)}</td>
<td style="font-family:'JetBrains Mono',monospace;">${esc(msg.payload)}</td>
</tr>`;
}
function addLiveAprs(msg) {
const tbody = document.getElementById('aprs-body');
if (!tbody) return;
const tr = document.createElement('tr');
tr.innerHTML = formatAprsRow(msg);
tbody.insertBefore(tr, tbody.firstChild);
// Limita a 100 righe nel frontend per non appesantire il DOM
if (tbody.children.length > 100) {
tbody.removeChild(tbody.lastChild);
}
}
async function refreshLogs() { async function refreshLogs() {
try { try {
const savedLimit = localStorage.getItem('fleetLogLimit') || ''; const savedLimit = localStorage.getItem('fleetLogLimit') || '';
const url = savedLimit ? `/api/logs?limit=${encodeURIComponent(savedLimit)}` : '/api/logs'; const url = savedLimit ? `/api/logs?limit=${encodeURIComponent(savedLimit)}` : '/api/logs';
const res = await fetch(url); const logs = await res.json(); const res = await fetch(url); const logs = await res.json();
const tbody = document.getElementById('log-body'); let tableHTML = ""; let networkLogs = {}; const tbody = document.getElementById('log-body');
const focusTbody = document.getElementById('focus-lastheard-body');
let tableHTML = "";
let focusTableHTML = "";
let networkLogs = {};
logs.forEach(row => { logs.forEach(row => {
const time = row[0] ? row[0].split(' ')[1] : "--:--"; const time = row[0] ? row[0].split(' ')[1] : "--:--";
const clientId = row[1]; const protocol = row[2] || "DMR"; let source = row[3] || "---"; const target = row[4] || "---"; const clientId = String(row[1]).toLowerCase();
const protocol = row[2] || "DMR"; let source = row[3] || "---"; const target = row[4] || "---";
const rawSlot = row[5]; const source_ext = row[8]; const rawRssi = row[9]; const sourceConn = row[10]; const ysfMode = row[11]; const rawSlot = row[5]; const source_ext = row[8]; const rawRssi = row[9]; const sourceConn = row[10]; const ysfMode = row[11];
let sourceHtml = esc(source); let sourceHtml = esc(source);
@@ -677,10 +855,10 @@ async function refreshLogs() {
networkLogs[clientId] += `<div><span style="color:var(--text-muted);">[${esc(time)}]</span> <span style="color:${protoColor};">[${esc(protocol)}]</span> ${esc(source.replace("🌐", "").trim())}</div>`; networkLogs[clientId] += `<div><span style="color:var(--text-muted);">[${esc(time)}]</span> <span style="color:${protoColor};">[${esc(protocol)}]</span> ${esc(source.replace("🌐", "").trim())}</div>`;
} else { } else {
const selectedFilter = document.getElementById('stat-node-filter').value; const selectedFilter = document.getElementById('stat-node-filter').value;
if (selectedFilter === 'all' || String(clientId).toLowerCase() === selectedFilter) {
tableHTML += `<tr> let rowFull = `<tr>
<td data-label="${t('thTime')}">${esc(time)}</td> <td data-label="${t('thTime')}">${esc(time)}</td>
<td data-label="${t('thRep')}"><b style="color:var(--text-main);">${esc(String(clientId).toUpperCase())}</b></td> <td data-label="${t('thRep')}"><b style="color:var(--text-main);">${esc(String(row[1]).toUpperCase())}</b></td>
<td data-label="${t('thMode')}"><span style="color:${protoColor}; border:1px solid ${protoColor}; padding:2px 4px;">${esc(protocol)}</span></td> <td data-label="${t('thMode')}"><span style="color:${protoColor}; border:1px solid ${protoColor}; padding:2px 4px;">${esc(protocol)}</span></td>
<td data-label="YSF Mode" style="text-align:center;">${modeDisplay}</td> <td data-label="YSF Mode" style="text-align:center;">${modeDisplay}</td>
<td data-label="Source" style="text-align:center; font-family:'JetBrains Mono',monospace;">${sourceBadge}</td> <td data-label="Source" style="text-align:center; font-family:'JetBrains Mono',monospace;">${sourceBadge}</td>
@@ -691,11 +869,28 @@ async function refreshLogs() {
<td data-label="BER">${esc(row[7])}%</td> <td data-label="BER">${esc(row[7])}%</td>
<td data-label="RSSI" style="font-family:'JetBrains Mono',monospace;">${rssiDisplay}</td> <td data-label="RSSI" style="font-family:'JetBrains Mono',monospace;">${rssiDisplay}</td>
</tr>`; </tr>`;
if (selectedFilter === 'all' || clientId === selectedFilter) {
tableHTML += rowFull;
}
if (currentFocusedNode && clientId === currentFocusedNode.toLowerCase()) {
focusTableHTML += rowFull;
} }
} }
}); });
tbody.innerHTML = tableHTML; tbody.innerHTML = tableHTML;
clients.forEach(c => { const localDiv = document.getElementById(`sys-log-${c.id}`); if (localDiv && networkLogs[c.id]) { localDiv.innerHTML = networkLogs[c.id]; } }); if (focusTbody) focusTbody.innerHTML = focusTableHTML;
clients.forEach(c => {
const localDiv = document.getElementById(`sys-log-${c.id}`);
if (localDiv && networkLogs[c.id]) { localDiv.innerHTML = networkLogs[c.id]; }
if (currentFocusedNode === c.id) {
const focusLogDiv = document.getElementById('focus-log');
if (focusLogDiv && networkLogs[c.id]) focusLogDiv.innerHTML = networkLogs[c.id];
}
});
} catch (e) { console.error(e); } } catch (e) { console.error(e); }
} }
@@ -749,5 +944,7 @@ if (typeof io !== 'undefined') {
const socket = io(); const socket = io();
socket.on('mqtt_status', function(data) { const badge = document.getElementById('mqtt-badge'); if (badge) { if (data.connected) { badge.innerText = "MQTT: OK"; badge.className = "mqtt-badge mqtt-online"; } else { badge.innerText = "MQTT: ERR"; badge.className = "mqtt-badge mqtt-offline"; } } }); socket.on('mqtt_status', function(data) { const badge = document.getElementById('mqtt-badge'); if (badge) { if (data.connected) { badge.innerText = "MQTT: OK"; badge.className = "mqtt-badge mqtt-online"; } else { badge.innerText = "MQTT: ERR"; badge.className = "mqtt-badge mqtt-offline"; } } });
socket.on('connect', () => { refreshStates(); refreshLogs(); refreshStats(); }); socket.on('connect', () => { refreshStates(); refreshLogs(); refreshStats(); });
socket.on('dati_aggiornati', refreshStatesSoon); socket.on('log_aggiornato', refreshLogsSoon); socket.on('dati_aggiornati', refreshStatesSoon);
socket.on('log_aggiornato', refreshLogsSoon);
socket.on('aprs_msg', function(data) { addLiveAprs(data); });
} }
+3 -1
View File
@@ -13,6 +13,7 @@ const i18n = {
warnEdit: "[WARN] DIRECT EDIT ACTIVE", warnEdit: "[WARN] DIRECT EDIT ACTIVE",
btnEdit: "EDIT", btnStart: "START", btnRestart: "RST", btnStop: "STOP", btnSave: "WRITE_FILE", btnEdit: "EDIT", btnStart: "START", btnRestart: "RST", btnStop: "STOP", btnSave: "WRITE_FILE",
btnHat: "RST_HAT", confHat: "PHYSICAL RESET MMDVM ON: ", btnHat: "RST_HAT", confHat: "PHYSICAL RESET MMDVM ON: ",
confOta: "EXECUTE GIT PULL ON NODE ",
confOp: "Confirm operation on ", confTgOn: "ENABLE Telegram notifications for ", confTgOff: "MUTE Telegram notifications for ", confOvr: "Are you sure you want to overwrite file on ", confOp: "Confirm operation on ", confTgOn: "ENABLE Telegram notifications for ", confTgOff: "MUTE Telegram notifications for ", confOvr: "Are you sure you want to overwrite file on ",
warnDaemon: "[WARN] DAEMON OFFLINE", warnDaemon: "[WARN] DAEMON OFFLINE",
promptOvr: "GLOBAL OVERRIDE", promptOvrConfirm: "Confirm sending to ENTIRE network?", promptOvr: "GLOBAL OVERRIDE", promptOvrConfirm: "Confirm sending to ENTIRE network?",
@@ -44,6 +45,7 @@ const i18n = {
warnEdit: "[WARN] DIRECT EDIT ACTIVE", warnEdit: "[WARN] DIRECT EDIT ACTIVE",
btnEdit: "EDIT", btnStart: "START", btnRestart: "RST", btnStop: "STOP", btnSave: "WRITE_FILE", btnEdit: "EDIT", btnStart: "START", btnRestart: "RST", btnStop: "STOP", btnSave: "WRITE_FILE",
btnHat: "RST_HAT", confHat: "PHYSICAL RESET MMDVM ON: ", btnHat: "RST_HAT", confHat: "PHYSICAL RESET MMDVM ON: ",
confOta: "ESEGUIRE GIT PULL SUL NODO ",
confOp: "Confermi l'operazione su ", confTgOn: "Vuoi ATTIVARE le notifiche Telegram per il nodo ", confTgOff: "Vuoi SILENZIARE le notifiche Telegram per il nodo ", confOvr: "Sei sicuro di voler sovrascrivere il file su ", confOp: "Confermi l'operazione su ", confTgOn: "Vuoi ATTIVARE le notifiche Telegram per il nodo ", confTgOff: "Vuoi SILENZIARE le notifiche Telegram per il nodo ", confOvr: "Sei sicuro di voler sovrascrivere il file su ",
warnDaemon: "[WARN] DAEMON OFFLINE", warnDaemon: "[WARN] DAEMON OFFLINE",
promptOvr: "GBL_OVR", promptOvrConfirm: "Confermi l'invio a TUTTA la rete?", promptOvr: "GBL_OVR", promptOvrConfirm: "Confermi l'invio a TUTTA la rete?",
@@ -256,7 +258,7 @@ function openConfigsModal(clientId) {
} else { } else {
listDiv.innerHTML = listaFile.map(f => `<div style="display:flex; justify-content:space-between; align-items:center; padding:10px 0; border-bottom:1px dashed var(--border-light); width:100%;"> listDiv.innerHTML = listaFile.map(f => `<div style="display:flex; justify-content:space-between; align-items:center; padding:10px 0; border-bottom:1px dashed var(--border-light); width:100%;">
<span style="font-weight:400; font-family:'JetBrains Mono',monospace; flex: 1; text-align: left; overflow:hidden; text-overflow:ellipsis; padding-right:20px;">${esc(fileLabel(f, fileNames))}</span> <span style="font-weight:400; font-family:'JetBrains Mono',monospace; flex: 1; text-align: left; overflow:hidden; text-overflow:ellipsis; padding-right:20px;">${esc(fileLabel(f, fileNames))}</span>
<button onclick="closeConfigsModal(); openEditorModal(${q(clientId)}, ${q(f)})" class="btn-cmd" style="border-color:var(--accent); color:var(--accent) !important; width: 100px; flex: 0 0 100px; padding: 8px;">${t('btnEdit')}</button> <button onclick="closeConfigsModal(); openEditorModal(${q(clientId)}, ${q(f)})" class="btn-cmd" style="border-color:var(--accent); color:var(--accent) !important; width: 80px; flex: 0 0 80px; padding: 6px;">${t('btnEdit')}</button>
</div>`).join(''); </div>`).join('');
} }
document.getElementById('configs-modal').style.display = 'flex'; document.getElementById('configs-modal').style.display = 'flex';
+116 -8
View File
@@ -18,8 +18,8 @@
<!-- Libreria Mappa Leaflet CSS --> <!-- Libreria Mappa Leaflet CSS -->
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" /> <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" />
<!-- Foglio di Stile Esterno Modularizzato --> <!-- Foglio di Stile Esterno Modularizzato (Cache Buster) -->
<link rel="stylesheet" href="/static/css/style.css?v=blueprint3"> <link rel="stylesheet" href="/static/css/style.css?v=blueprint-aprs">
</head> </head>
<body> <body>
@@ -31,6 +31,7 @@
<button class="nav-tab active" onclick="switchView('home')" id="tab-home">HOME</button> <button class="nav-tab active" onclick="switchView('home')" id="tab-home">HOME</button>
<button class="nav-tab" onclick="switchView('nodes')" id="tab-nodes">NODES</button> <button class="nav-tab" onclick="switchView('nodes')" id="tab-nodes">NODES</button>
<button class="nav-tab" onclick="switchView('map')" id="tab-map">MAP</button> <button class="nav-tab" onclick="switchView('map')" id="tab-map">MAP</button>
<button class="nav-tab" onclick="switchView('aprs')" id="tab-aprs">APRS</button>
</div> </div>
<div class="top-bar-right"> <div class="top-bar-right">
@@ -47,7 +48,117 @@
<div id="map-container"></div> <div id="map-container"></div>
</div> </div>
<!-- VISTA NODI --> <!-- VISTA APRS LOGS -->
<div id="view-aprs" style="display: none;">
<div style="max-width: 1400px; margin: 0 auto 30px auto; padding: 0 20px;">
<div style="display: flex; justify-content: space-between; align-items: center; border-bottom: 1px dashed var(--border-main); padding-bottom: 5px; margin-bottom: 15px;">
<h3 style="margin: 0; font-weight: 300; letter-spacing: 2px; color: var(--text-main);">[ APRS_TRAFFIC ]</h3>
<button class="btn-cmd" onclick="document.getElementById('aprs-body').innerHTML='';" style="width: auto; padding: 4px 12px; flex: none;">[ CLEAR ]</button>
</div>
<div class="table-container" style="max-height: calc(100vh - 200px);">
<table>
<thead>
<tr>
<th style="width: 100px;">TIME</th>
<th style="width: 120px;">SOURCE</th>
<th style="width: 120px;">DEST</th>
<th style="width: 200px;">PATH</th>
<th>PAYLOAD</th>
</tr>
</thead>
<tbody id="aprs-body"></tbody>
</table>
</div>
</div>
</div>
<!-- VISTA FOCUS NODO SINGOLO (FULL SCREEN) -->
<div id="view-focus" style="display: none;">
<div style="max-width: 1400px; margin: 0 auto; padding: 0 20px;">
<!-- Header Ritorno e Titolo -->
<div style="display: flex; justify-content: space-between; align-items: center; border-bottom: 2px dashed var(--border-main); padding-bottom: 15px; margin-bottom: 25px; flex-wrap: wrap; gap: 15px;">
<button class="btn-cmd" style="width: auto; padding: 12px 25px; font-size: 1.1rem; border-color: var(--accent); color: var(--accent) !important;" onclick="closeNodeFocus()">[ < RETURN TO OVERVIEW ]</button>
<div style="text-align: right; flex-grow: 1;">
<h2 id="focus-name" style="margin: 0; color: var(--text-main); font-weight: 300; font-size: 2.5rem; letter-spacing: 2px; display: flex; align-items: center; justify-content: flex-end; gap: 15px;">--</h2>
<div id="focus-id" style="color: var(--primary); font-family: 'JetBrains Mono', monospace; font-size: 1.2rem; margin-top: 5px;">--</div>
<div id="focus-status" style="font-family: 'JetBrains Mono', monospace; font-size: 1.2rem; margin-top: 5px; font-weight: bold;">--</div>
</div>
</div>
<div class="grid" style="grid-template-columns: repeat(auto-fit, minmax(450px, 1fr));">
<!-- COLONNA SX: HARDWARE E RF -->
<div style="display: flex; flex-direction: column; gap: 20px;">
<div class="card" style="border-width: 1px !important;">
<h3 style="margin: 0 0 20px 0; color: var(--accent); font-weight: 300; font-size: 1.3rem; letter-spacing: 2px;">[ HARDWARE_TELEMETRY ]</h3>
<div style="font-size: 1.2rem; font-family: 'JetBrains Mono', monospace; display: flex; flex-direction: column; gap: 15px;">
<div style="display: flex; justify-content: space-between; border-bottom: 1px dashed var(--border-light); padding-bottom: 8px;"><span>CPU_LOAD:</span> <span id="focus-cpu">--</span></div>
<div style="display: flex; justify-content: space-between; border-bottom: 1px dashed var(--border-light); padding-bottom: 8px;"><span>SYS_TEMP:</span> <span id="focus-temp">--</span></div>
<div style="display: flex; justify-content: space-between; border-bottom: 1px dashed var(--border-light); padding-bottom: 8px;"><span>RAM_USAGE:</span> <span id="focus-ram">--</span></div>
<div style="display: flex; justify-content: space-between; border-bottom: 1px dashed var(--border-light); padding-bottom: 8px;"><span>DISK_SPACE:</span> <span id="focus-disk">--</span></div>
<div style="display: flex; justify-content: space-between; border-bottom: 1px dashed var(--border-light); padding-bottom: 8px;"><span>UPTIME:</span> <span id="focus-up">--</span></div>
</div>
</div>
<div class="card" style="border-width: 1px !important;">
<h3 style="margin: 0 0 20px 0; color: var(--primary); font-weight: 300; font-size: 1.3rem; letter-spacing: 2px;">[ RF_CONFIGURATION ]</h3>
<div style="font-size: 1.2rem; font-family: 'JetBrains Mono', monospace; display: flex; flex-direction: column; gap: 15px;">
<div style="display: flex; justify-content: space-between; border-bottom: 1px dashed var(--border-light); padding-bottom: 8px;"><span>TX_FREQ:</span> <span id="focus-tx" style="color: var(--danger);">--</span></div>
<div style="display: flex; justify-content: space-between; border-bottom: 1px dashed var(--border-light); padding-bottom: 8px;"><span>RX_FREQ:</span> <span id="focus-rx" style="color: var(--success);">--</span></div>
<div style="display: flex; justify-content: space-between; border-bottom: 1px dashed var(--border-light); padding-bottom: 8px;"><span>LOCATION:</span> <span id="focus-loc" style="color: var(--text-main);">--</span></div>
</div>
</div>
</div>
<!-- COLONNA DX: SOFTWARE E LOG -->
<div style="display: flex; flex-direction: column; gap: 20px;">
<div class="card" style="border-width: 1px !important; flex: 1;">
<h3 style="margin: 0 0 20px 0; color: var(--success); font-weight: 300; font-size: 1.3rem; letter-spacing: 2px;">[ ACTIVE_GATEWAYS ]</h3>
<div id="focus-gw" style="display: flex; flex-wrap: wrap; gap: 10px; margin-bottom: 20px; min-height: 40px; font-size: 0.9rem;"></div>
<h3 style="margin: 0 0 20px 0; color: var(--primary); font-weight: 300; font-size: 1.3rem; letter-spacing: 2px;">[ TIMESLOTS_MODES ]</h3>
<div id="focus-ts" style="display: flex; flex-direction: column; gap: 15px; margin-bottom: 25px; font-family: 'JetBrains Mono', monospace; font-size: 1.2rem;"></div>
<h3 style="margin: 0 0 15px 0; color: var(--border-main); font-weight: 300; font-size: 1.3rem; letter-spacing: 2px;">[ LIVE_TERMINAL ]</h3>
<div id="focus-log" class="terminal-log" style="height: 320px; max-height: 320px; font-size: 0.95rem; border-color: var(--border-main);">> AWAITING_STREAM...</div>
</div>
</div>
</div>
<!-- FOCUS LASTHEARD -->
<div style="margin-top: 30px; border-top: 1px dashed var(--border-light); padding-top: 20px;">
<h3 style="margin: 0 0 15px 0; color: var(--text-main); font-weight: 300; font-size: 1.3rem; letter-spacing: 2px;">[ NODE_LASTHEARD ]</h3>
<div class="table-container" style="margin: 0; max-height: 400px;">
<table>
<thead>
<tr>
<th data-i18n="thTime">TIME</th>
<th data-i18n="thRep">REPEATER</th>
<th data-i18n="thMode">MODE</th>
<th style="text-align: center;">YSF_MODE</th>
<th style="text-align: center;">SOURCE</th>
<th style="text-align: center;">REF/SLOT</th>
<th data-i18n="thCall">CALLSIGN</th>
<th>TARGET</th>
<th data-i18n="thDur">DUR</th>
<th>BER</th>
<th>RSSI</th>
</tr>
</thead>
<tbody id="focus-lastheard-body"></tbody>
</table>
</div>
</div>
<!-- CONTROLLI ADMIN DEL NODO -->
<div id="focus-controls" style="display: none; margin-top: 30px; border: 1px dashed var(--danger); padding: 30px; background: rgba(6, 36, 111, 0.6); backdrop-filter: blur(2px);">
<h3 style="margin: 0 0 20px 0; color: var(--danger); font-weight: 300; font-size: 1.5rem; text-align: center; letter-spacing: 2px;">[ ADMIN_CONTROLS ]</h3>
<div id="focus-admin-btns" style="display: flex; gap: 15px; flex-wrap: wrap; justify-content: center;">
</div>
</div>
</div>
</div>
<!-- VISTA NODI IN GRIGLIA -->
<div id="view-nodes" style="display: none;"> <div id="view-nodes" style="display: none;">
<div style="max-width: 1400px; margin: 0 auto; padding: 0 20px;"> <div style="max-width: 1400px; margin: 0 auto; padding: 0 20px;">
<div class="filter-bar"> <div class="filter-bar">
@@ -74,7 +185,6 @@
<!-- VISTA HOME --> <!-- VISTA HOME -->
<div id="view-home"> <div id="view-home">
<!-- STATUS RAPIDO NODI -->
<div style="max-width: 1400px; margin: 0 auto 20px auto; padding: 0 20px;"> <div style="max-width: 1400px; margin: 0 auto 20px auto; padding: 0 20px;">
<h3 style="margin: 0 0 15px 0; font-weight: 300; letter-spacing: 2px; color: var(--text-main); border-bottom: 1px dashed var(--border-main); padding-bottom: 5px;"> <h3 style="margin: 0 0 15px 0; font-weight: 300; letter-spacing: 2px; color: var(--text-main); border-bottom: 1px dashed var(--border-main); padding-bottom: 5px;">
[ FLEET_STATUS ] [ FLEET_STATUS ]
@@ -82,7 +192,6 @@
<div id="home-mini-nodes" style="display: flex; flex-wrap: wrap; justify-content: center; gap: 15px;"></div> <div id="home-mini-nodes" style="display: flex; flex-wrap: wrap; justify-content: center; gap: 15px;"></div>
</div> </div>
<!-- LASTHEARD -->
<div style="max-width: 1400px; margin: 0 auto 30px auto;"> <div style="max-width: 1400px; margin: 0 auto 30px auto;">
<div style="padding: 0 20px; display: flex; justify-content: space-between; align-items: center; flex-wrap: wrap; gap: 10px; margin-bottom: 15px; border-bottom: 1px dashed var(--border-main); padding-bottom: 5px;"> <div style="padding: 0 20px; display: flex; justify-content: space-between; align-items: center; flex-wrap: wrap; gap: 10px; margin-bottom: 15px; border-bottom: 1px dashed var(--border-main); padding-bottom: 5px;">
<h3 style="margin: 0; font-weight: 300; letter-spacing: 2px; color: var(--text-main);" data-i18n="lastTransits">[ LASTHEARD ]</h3> <h3 style="margin: 0; font-weight: 300; letter-spacing: 2px; color: var(--text-main);" data-i18n="lastTransits">[ LASTHEARD ]</h3>
@@ -123,7 +232,6 @@
</div> </div>
</div> </div>
<!-- DAILY STATISTICS -->
<div style="max-width: 1400px; margin: 0 auto 30px auto; padding: 0 20px;"> <div style="max-width: 1400px; margin: 0 auto 30px auto; padding: 0 20px;">
<h3 style="margin: 0 0 15px 0; font-weight: 300; letter-spacing: 2px; color: var(--text-main); border-bottom: 1px dashed var(--border-main); padding-bottom: 5px;" data-i18n="statTitle">[ DAILY_STATISTICS ]</h3> <h3 style="margin: 0 0 15px 0; font-weight: 300; letter-spacing: 2px; color: var(--text-main); border-bottom: 1px dashed var(--border-main); padding-bottom: 5px;" data-i18n="statTitle">[ DAILY_STATISTICS ]</h3>
<div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(300px, 1fr)); gap: 20px;"> <div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(300px, 1fr)); gap: 20px;">
@@ -324,8 +432,8 @@
<script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"></script> <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"></script>
<!-- MOTORE MODULARIZZATO JS (Cache Buster aggiunto per forzare il refresh) --> <!-- MOTORE MODULARIZZATO JS (Cache Buster aggiunto per forzare il refresh) -->
<script src="/static/js/modals.js?v=blueprint3"></script> <script src="/static/js/modals.js?v=blueprint4"></script>
<script src="/static/js/app.js?v=blueprint2"></script> <script src="/static/js/app.js?v=blueprint-aprs-final"></script>
<!-- SERVICE WORKER --> <!-- SERVICE WORKER -->
<script> <script>