Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d81ba078be | ||
|
|
00feb2df6c | ||
|
|
311c4053f0 | ||
|
|
93fc177911 | ||
|
|
c7c95d877c | ||
|
|
a06e5cd7b7 | ||
|
|
e7bbd080b0 | ||
|
|
019e518534 | ||
|
|
e199fb8f29 | ||
|
|
43e0e77790 |
@@ -0,0 +1,41 @@
|
|||||||
|
# Modifiche di sicurezza e correzioni / Security fixes & changes
|
||||||
|
|
||||||
|
Tutte le modifiche mantengono il comportamento precedente **per default**; ciò che cambia
|
||||||
|
visibilmente è indicato esplicitamente. / Every change keeps the previous behaviour **by default**;
|
||||||
|
visible differences are listed explicitly.
|
||||||
|
|
||||||
|
## Correzioni attive subito / Active immediately
|
||||||
|
|
||||||
|
| # | Modifica | Effetto visibile |
|
||||||
|
|---|----------|------------------|
|
||||||
|
| 1 | **Scheduler**: i profili/comandi vengono validati come in `/api/command`. `REBOOT`, `RESET_HAT`, `UPDATE_AGENT` possono essere schedulati solo da un `admin` (controllo al salvataggio **e** all'esecuzione). I nodi target vengono validati. | Un `node_admin` non può più programmare comandi riservati agli admin. Schedulazioni già presenti create da non-admin con quei comandi non vengono più eseguite (warning nel log). |
|
||||||
|
| 2 | **WebSocket `live_log_<nodo>`**: inviato solo ai socket con sessione valida **e** autorizzati su quel nodo (ruolo/`allowed_nodes` rivalidati ogni 2 min). | Nessuno per l'uso normale: la console log già richiedeva il login via `/api/logs/<nodo>`. Chi non è loggato non riceve più i log in diretta. |
|
||||||
|
| 3 | **Rate limit login dietro reverse proxy**: se la richiesta arriva da loopback con `X-Forwarded-For`, si usa l'IP reale (ultimo valore, aggiunto dal proxy). Con `trust_proxy: true` il comportamento è invariato. | Un utente che sbaglia la password non blocca più il login a tutti gli altri. |
|
||||||
|
| 4 | **Scheduler su thread dedicato**: non è più ritardato dal download degli ID DMR/NXDN. | Le schedulazioni partono puntuali anche durante i download. |
|
||||||
|
| 5 | **Pruning**: `telemetry_logs` (default 90 giorni) e `config_backups` (ultimi 100 per nodo/servizio) ora vengono potati. | Dati più vecchi di quelle soglie vengono eliminati; configurabile (0 = disattiva). |
|
||||||
|
| 6 | `save_to_sqlite` chiude sempre la connessione; `__main__` usa `web.port`; emoji corrotta nel log; `test-push.py` funzionante; nomi file in `install.txt` corretti; `chart.js` fissato alla versione 4.4.1. | Nessuno. |
|
||||||
|
|
||||||
|
## Opzioni nuove (tutte disattivate / invariate di default) / New opt-in options
|
||||||
|
|
||||||
|
Nel blocco `web` di `config.json` (vedi `config.json.example`):
|
||||||
|
|
||||||
|
* `require_login_for_read: true` – richiede il login per `/api/states`, `/api/logs`, `/api/stats`, `/api/clients` e limita `aprs_msg` ai soli utenti loggati. **Attenzione:** la vista pubblica della dashboard resterà vuota finché non si fa il login.
|
||||||
|
* `cors_origins: "https://tuo.dominio"` – restringe le origini ammesse per Socket.IO (default `"*"`, invariato).
|
||||||
|
* `ota_enabled: false` – disabilita l'aggiornamento OTA da interfaccia (`git pull` + riavvio).
|
||||||
|
* `trust_proxy`, `cookie_secure` (consigliato `true` dietro HTTPS), `session_hours`.
|
||||||
|
|
||||||
|
Nel blocco `mqtt`: `"tls": true` (+ `"ca_certs"`, porta tipicamente 8883) per cifrare la connessione al broker.
|
||||||
|
Altre chiavi: `telemetry_retention_days`, `config_backups_keep`.
|
||||||
|
|
||||||
|
## Non modificato di proposito / Deliberately left as is
|
||||||
|
|
||||||
|
* **Servizio come root e bind su 0.0.0.0**: cambiarlo di default romperebbe le installazioni esistenti
|
||||||
|
(permessi su cartella/log, accesso diretto alla porta 9000). È incluso
|
||||||
|
`systemd/fleet-console.hardened.service.example` con utente dedicato e hardening, da adottare quando vuoi.
|
||||||
|
* **CSP e SRI**: la UI usa molti stili e handler inline, quindi una CSP rigida la romperebbe; l'SRI richiede
|
||||||
|
gli hash delle librerie (calcolabili con `curl -s URL | openssl dgst -sha384 -binary | openssl base64 -A`).
|
||||||
|
* **Broker MQTT**: l'autenticazione dei messaggi e le ACL per nodo si configurano sul broker (es. Mosquitto
|
||||||
|
`acl_file`), non nel server.
|
||||||
|
* **Backup di config in chiaro**: i file `.ini` salvati in `config_backups` possono contenere password di rete.
|
||||||
|
Proteggere `monitor.db` con permessi `600`.
|
||||||
|
* **Schedulazioni sovrapposte** sugli stessi nodi e ripristino del "profilo precedente": non gestiti.
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
# 📡 Fleet Control Console - Server (Central Hub)
|
# 📡 Fleet Control Console - Server (Central Hub) v6.0.0
|
||||||
|
|
||||||
🌍 *[Read in English](#english) | 🇮🇹 [Leggi in Italiano](#italiano)*
|
🌍 *[Read in English](#english) | 🇮🇹 [Leggi in Italiano](#italiano)*
|
||||||
|
|
||||||
@@ -14,58 +14,49 @@
|
|||||||
> ℹ️ **Note:** This is the Central Server repository. To monitor remote repeaters, you must install the [Fleet Control Agent](https://git.arifvg.it/iv3jdv/fleet-node-agent.git) on each node.
|
> ℹ️ **Note:** This is the Central Server repository. To monitor remote repeaters, you must install the [Fleet Control Agent](https://git.arifvg.it/iv3jdv/fleet-node-agent.git) on each node.
|
||||||
|
|
||||||
### 🏗️ Architecture & Technology Stack
|
### 🏗️ Architecture & Technology Stack
|
||||||
The server acts as the brain of the network, built on a highly scalable foundation (v5.0+):
|
The server acts as the brain of the network, built on a highly scalable foundation (v6.0.0):
|
||||||
* **Modular Backend:** Completely decoupled architecture (`core/`, `services/`, `routes/`) for high maintainability and robust background task handling.
|
* **Modular Backend:** Completely decoupled architecture (`core/`, `services/`, `routes/`) for high maintainability and robust background task handling.
|
||||||
* **Core Engine:** Flask (Python) with `gevent` for high-concurrency WebSocket handling.
|
* **Core Engine:** Flask (Python) with `gevent` for high-concurrency WebSocket handling.
|
||||||
* **Database:** SQLite (WAL mode) for robust User Management, Audit Logs, and Radio Traffic storage.
|
* **Database:** SQLite (WAL mode) for robust User Management, Audit Logs, Schedules, and Radio Traffic storage.
|
||||||
* **Communication:** MQTT for instant data routing + WebSockets (SocketIO) for zero-latency UI updates.
|
* **Communication:** MQTT for instant data routing + WebSockets (SocketIO) for zero-latency UI updates.
|
||||||
* **Frontend:** Vanilla JS with a modern *Glassmorphism* NOC (Network Operations Center) design and separated logic (`app.js`, `modals.js`).
|
* **Frontend:** Vanilla JS with a modern *Glassmorphism Borderless Executive* NOC (Network Operations Center) design. Full i18n (Internationalization) support for English and Italian.
|
||||||
|
|
||||||
### ✨ Ultimate Features
|
### ✨ Ultimate Features (v6.0.0)
|
||||||
|
|
||||||
#### 🛡️ Proactive Diagnostics (Watchdog)
|
#### 🗓️ Calendar Profile Scheduler [NEW]
|
||||||
* **Hardware Monitoring:** Continuous analysis of remote CPU temperatures and disk space saturation. Automatically triggers Push Notifications before critical failures (e.g., CPU throttling or log overflow) occur.
|
* Plan automated profile switches (e.g., Regional Nets, Contests, Civil Defense drills) across multiple nodes.
|
||||||
* **RF Anomaly Detection:** Real-time monitoring of local RF BER (Bit Error Rate). Detects hardware RF degradation on local transits and alerts admins instantly.
|
* Seamless background execution: the system automatically triggers the `Target Profile` at the specified start time and gracefully falls back to the `Restore Profile` once the event ends.
|
||||||
|
|
||||||
#### ⚡ Zero-Latency Real-Time Dashboard
|
#### 🗺️ Tactical APRS Map [NEW]
|
||||||
* **WebSocket Powered:** The dashboard updates instantly upon radio traffic or telemetry changes. No heavy HTTP polling, no page reloads.
|
* Real-time GIS map showing both your fixed repeater locations and **roaming APRS stations**.
|
||||||
* **Live MQTT Status:** A real-time badge continuously monitors the connection to the MQTT broker, instantly alerting you if the backend loses connectivity.
|
* Automatically extracts and parses APRS payloads from gateway logs.
|
||||||
* **PWA Ready v6:** Install the dashboard as a Progressive Web App on iOS/Android for a native, full-screen mobile experience with offline asset caching.
|
* Features a smart Garbage Collector that automatically cleans up roaming pins after 2 hours of inactivity.
|
||||||
|
|
||||||
#### 🔔 Web Push Notifications
|
#### 🛠️ Advanced Remote Control & Visual Diff [NEW]
|
||||||
* Get instant, native alerts directly on your desktop or mobile device when:
|
* **Time Machine Config Editor:** Edit daemon configuration files (e.g., MMDVMHost.ini) directly from the web interface, with the ability to rollback to previous historical backups.
|
||||||
* A node goes offline or comes back online.
|
* **Semantic Visual Diff:** Compare your local unsaved edits against the running config with a rich Green/Red semantic diff viewer before safely committing changes to the node.
|
||||||
* A critical system daemon crashes (Auto-healing failed).
|
* **OTA Server Updates:** Apply server-side Git updates directly from the admin dashboard without SSH access.
|
||||||
* The Watchdog detects thermal warnings, disk full alerts, or high RF BER.
|
* **Service Management & Hardware:** Start/Stop/Restart remote daemons, trigger physical OS reboots, or hard GPIO resets of the MMDVM HAT.
|
||||||
* Works securely even when the web app is closed or in the background.
|
|
||||||
|
|
||||||
#### 🛠️ Advanced Remote Control & Maintenance
|
#### 📈 Dynamic Analytics & Monitoring [NEW]
|
||||||
* **OTA Server Updates:** Apply server-side Git updates with a single click directly from the admin dashboard (Over-The-Air) without SSH access.
|
* **Timeframe Analytics:** Interactive historical charts (Chart.js) for CPU/Temp and RF Transits/BER. Zoom dynamically across 12H, 24H, 48H, or 7D timeframes with smart axis labeling.
|
||||||
* **Remote .INI Editor:** Edit daemon configuration files (e.g., MMDVMHost.ini) directly from the web interface.
|
* **Live WebSocket Console:** Zero-latency terminal streams for node daemons. Real-time active operator tracking (see who is logged in and managing the dashboard).
|
||||||
* **Service Management:** Start, Stop, or Restart remote system daemons.
|
* **Proactive Diagnostics (Watchdog):** Continuous analysis of remote CPU temperatures, disk space, and RF BER. Triggers automated Web Push Notifications.
|
||||||
* **Global Overrides:** Switch profiles (e.g., Profile A/B) or force updates simultaneously on all nodes in the fleet.
|
|
||||||
* **Hardware Interventions:** Trigger a physical OS reboot or a hard GPIO reset of the MMDVM HAT directly from the web panel.
|
|
||||||
|
|
||||||
#### 📊 Unified Monitoring & Statistics
|
#### 🔐 Strict Security & Access Control
|
||||||
* **Interactive Fleet Map:** Real-time GIS map showing repeater locations, online/offline status, active TX states (pulsing pins), and active watchdog warnings.
|
* **Role-Based Access Control (RBAC):** True Zero-Trust architecture. Node management is bound to explicitly assigned nodes (`allowed_nodes`) for both *Operators* and *Node Admins*.
|
||||||
* **Live Heard Log:** A centralized view of radio traffic across the entire network, auto-resolving DMR and NXDN IDs into callsigns.
|
* **System Administration:** Admins retain exclusive rights to global server settings, schedules, and user management.
|
||||||
* **Software & Firmware Tracking:** Instantly view MMDVM firmware versions and Pi-Star/Gateway component versions for each node.
|
* **Security Audit Trail:** Every critical action (reboots, config edits, schedules) is securely logged with username, timestamp, and target node.
|
||||||
* **Daily Analytics:** Automatically tracks Top Talkgroups, Top Callsigns, Average duration, and daily transit counts.
|
|
||||||
|
|
||||||
#### 🔐 Security & Access Control
|
|
||||||
* **Role-Based Access Control (RBAC):** Create `admin` and `operator` accounts.
|
|
||||||
* **Granular Permissions:** Restrict operators to view/control only specific repeaters.
|
|
||||||
* **Audit Trail:** Every critical action (reboots, config edits, daemon restarts) is logged with the username, timestamp, and target node.
|
|
||||||
|
|
||||||
### ⚠️ Security Requirement: HTTPS
|
### ⚠️ Security Requirement: HTTPS
|
||||||
Please note that **Web Push Notifications** and the **Service Worker** require a secure connection to function. For security reasons, modern browsers only enable these features over **HTTPS**. If you are accessing the console via HTTP (outside of `localhost`), the "Push" button and notification registration will not work. We recommend using a reverse proxy (like Nginx, Caddy, or Traefik) with an SSL certificate.
|
**Web Push Notifications** and the **Service Worker** require a secure connection. Modern browsers only enable these features over **HTTPS**. We recommend using a reverse proxy (like Nginx, Caddy, or Apache) with an SSL certificate.
|
||||||
|
|
||||||
### ⚠️ Reverse Proxy & WebSocket Configuration
|
### ⚠️ Reverse Proxy & WebSocket Configuration
|
||||||
If you expose the Fleet Console through a reverse proxy like **Apache** on a public IP (HTTPS), standard HTTP proxying will drop Socket.IO real-time connections. You must enable the WebSocket tunnel in Apache:
|
If using a reverse proxy like **Apache** on HTTPS, you must enable WebSocket tunneling:
|
||||||
```bash
|
```bash
|
||||||
sudo a2enmod proxy_wstunnel rewrite headers
|
sudo a2enmod proxy_wstunnel rewrite headers
|
||||||
```
|
```
|
||||||
And insert the **Rewrite** rules *before* the `ProxyPass` directives inside your `<VirtualHost *:443>` block:
|
Insert the **Rewrite** rules *before* the `ProxyPass` directives in your `<VirtualHost *:443>`:
|
||||||
```apache
|
```apache
|
||||||
RewriteEngine On
|
RewriteEngine On
|
||||||
RewriteCond %{HTTP:Upgrade} =websocket [NC]
|
RewriteCond %{HTTP:Upgrade} =websocket [NC]
|
||||||
@@ -80,164 +71,46 @@ ProxyPass / http://127.0.0.1:9000/
|
|||||||
ProxyPassReverse / http://127.0.0.1:9000/
|
ProxyPassReverse / http://127.0.0.1:9000/
|
||||||
```
|
```
|
||||||
|
|
||||||
### 🚀 Installation Guide
|
|
||||||
|
|
||||||
#### 0. Root Privileges
|
|
||||||
All installation steps must be executed as the `root` user.
|
|
||||||
```bash
|
|
||||||
apt update
|
|
||||||
apt install build-essential python3-dev libssl-dev libffi-dev python3-pip python3-venv
|
|
||||||
```
|
|
||||||
#### 1. Clone Repository
|
|
||||||
Clone the repository into the /opt directory to ensure all systemd paths work correctly:
|
|
||||||
```bash
|
|
||||||
git clone https://git.arifvg.it/iv3jdv/fleet-control-server.git /opt/fleet-control-server
|
|
||||||
cd /opt/fleet-control-server
|
|
||||||
```
|
|
||||||
#### 2. Virtual Environment Setup (Recommended)
|
|
||||||
To prevent conflicts with OS packages (PEP 668), create an isolated environment:
|
|
||||||
```bash
|
|
||||||
cd /opt/fleet-control-server
|
|
||||||
python3 -m venv venv
|
|
||||||
source venv/bin/activate
|
|
||||||
pip install --upgrade pip setuptools wheel
|
|
||||||
pip install -r requirements.txt
|
|
||||||
```
|
|
||||||
|
|
||||||
#### 3. Configuration
|
|
||||||
1. Copy `config.example.json` to `config.json`.
|
|
||||||
2. Configure your MQTT broker credentials.
|
|
||||||
3. Define your repeaters in `clients.json`.
|
|
||||||
4. Generate VAPID keys at [vapidkeys.com](https://vapidkeys.com/) and add them to `config.json` to enable Web Push notifications. *(Note: Push notifications require HTTPS).*
|
|
||||||
5. Configure dynamic log rotation sizes (`log_max_mb` and `log_backup_count`) directly in `config.json` to manage disk space.
|
|
||||||
|
|
||||||
#### 4. Running as a Service
|
|
||||||
To run the server continuously in production using Gunicorn:
|
|
||||||
```bash
|
|
||||||
cp fleet-console.service /etc/systemd/system/
|
|
||||||
systemctl daemon-reload
|
|
||||||
systemctl enable fleet-console
|
|
||||||
systemctl start fleet-console
|
|
||||||
```
|
|
||||||
*(Ensure the `.service` file points to the `gunicorn` executable inside your `venv`)*.
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
<a name="italiano"></a>
|
<a name="italiano"></a>
|
||||||
## 🇮🇹 Italiano
|
## 🇮🇹 Italiano
|
||||||
|
|
||||||
**Fleet Control Console** è una dashboard di comando e controllo (C2) professionale in tempo reale, progettata per le reti di ripetitori radioamatoriali (MMDVM). Questo repository contiene il **Server (Central Hub)**, che fornisce un'interfaccia web centralizzata per monitorare e gestire una flotta di nodi digitali remoti (DMR, NXDN, YSF, P25).
|
**Fleet Control Console** è una dashboard di comando e controllo (C2) professionale in tempo reale, progettata per le reti di ripetitori radioamatoriali (MMDVM). Questo repository contiene il **Server (Central Hub)**, che fornisce un'interfaccia web centralizzata per monitorare e gestire una flotta di nodi digitali remoti.
|
||||||
|
|
||||||
> ℹ️ **Nota:** Questo è il repository del Server Centrale. Per monitorare i ripetitori, devi installare il [Fleet Control Agent](https://git.arifvg.it/iv3jdv/fleet-node-agent.git) su ciascun nodo remoto.
|
> ℹ️ **Nota:** Questo è il repository del Server Centrale. Per monitorare i ripetitori, devi installare il [Fleet Control Agent](https://git.arifvg.it/iv3jdv/fleet-node-agent.git) su ciascun nodo remoto.
|
||||||
|
|
||||||
### 🏗️ Architettura e Tecnologie
|
### 🏗️ Architettura e Tecnologie (v6.0.0)
|
||||||
Il server agisce da cervello della rete, basato su fondamenta altamente scalabili (v5.0+):
|
* **Backend Modulare:** Architettura completamente disaccoppiata (`core/`, `services/`, `routes/`) per un'elevata manutenibilità e gestione asincrona.
|
||||||
* **Backend Modulare:** Architettura completamente disaccoppiata (`core/`, `services/`, `routes/`) per un'elevata manutenibilità e gestione robusta dei task in background.
|
|
||||||
* **Motore Core:** Flask (Python) con `gevent` per la gestione ad alta concorrenza dei WebSocket.
|
* **Motore Core:** Flask (Python) con `gevent` per la gestione ad alta concorrenza dei WebSocket.
|
||||||
* **Database:** SQLite (in modalità WAL) per gestire in sicurezza Utenti, Log operativi e traffico radio.
|
* **Database:** SQLite (in modalità WAL) per gestire Utenti, Log Sicurezza, Schedulazioni e traffico radio.
|
||||||
* **Comunicazione:** MQTT per il routing istantaneo dei dati + WebSockets (SocketIO) per aggiornare la UI a latenza zero.
|
* **Frontend Bilingue:** Vanilla JS con layout *Borderless Executive* in stile NOC. Traduzioni dinamiche (Inglese/Italiano) attivabili in tempo reale.
|
||||||
* **Frontend:** Vanilla JS con un moderno design *Glassmorphism* in stile NOC (Network Operations Center) e logica completamente separata (`app.js`, `modals.js`).
|
|
||||||
|
|
||||||
### ✨ Funzionalità Principali
|
### ✨ Funzionalità Principali v6.0.0
|
||||||
|
|
||||||
#### 🛡️ Diagnostica Proattiva (Watchdog)
|
#### 🗓️ Calendario Pianificazione Profili [NUOVO]
|
||||||
* **Monitoraggio Hardware:** Analisi continua delle temperature CPU e della saturazione disco da remoto. Innesca automaticamente notifiche Push prima che si verifichino guasti critici (es. thermal throttling o blocco log MMDVM).
|
* Schedula i cambi di profilo automatici (es. Net Regionali, Contest, Esercitazioni) su nodi multipli.
|
||||||
* **Rilevamento Anomalie RF:** Monitoraggio in tempo reale del BER (Bit Error Rate) sul traffico RF locale. Rileva il degrado hardware in radiofrequenza avvisando istantaneamente gli amministratori.
|
* Esecuzione in background: il sistema innesca il `Profilo Target` all'orario di inizio e ripristina automaticamente il `Profilo di Ritorno` alla scadenza della finestra temporale.
|
||||||
|
|
||||||
#### ⚡ Dashboard Real-Time a Latenza Zero
|
#### 🗺️ Mappa Tattica APRS [NUOVO]
|
||||||
* **Motore WebSocket:** La dashboard scatta all'istante al passaggio di traffico radio o ai cambi di telemetria. Nessun polling HTTP pesante, nessun refresh della pagina.
|
* Mappa GIS in tempo reale che mostra sia i ripetitori fissi che i **passanti APRS in mobilità**.
|
||||||
* **Stato MQTT Live:** Un badge in tempo reale monitora continuamente la connessione al broker MQTT, avvisandoti istantaneamente in caso di problemi di rete.
|
* Intercetta e formatta istantaneamente i payload APRS dai log dei gateway.
|
||||||
* **PWA Ready v6:** Installabile su smartphone Android e iOS come Progressive Web App per un'esperienza nativa a schermo intero con cache offline intelligente.
|
* Include un sistema di pulizia automatica (Garbage Collector) che rimuove i pin mobili dopo 2 ore di inattività.
|
||||||
|
|
||||||
#### 🔔 Notifiche Web Push
|
#### 🛠️ Editor Avanzato & Visual Diff [NUOVO]
|
||||||
* Ricevi avvisi nativi e immediati su PC o smartphone quando:
|
* **Editor Config .INI "Macchina del Tempo":** Modifica i file operativi direttamente dal pannello web, con possibilità di ripristinare i backup storici salvati automaticamente nel database.
|
||||||
* Un nodo va offline o torna operativo.
|
* **Visual Diff Semantico:** Controlla visivamente le differenze (in verde le aggiunte, in rosso le rimozioni) tra le tue modifiche in bozza e la configurazione attualmente in esecuzione prima di salvare.
|
||||||
* Un demone di sistema remoto si blocca (fallimento auto-healing).
|
* **Interventi Hardware & Servizi:** Avvia/arresta demoni, forza il riavvio del SO o esegui un reset hardware GPIO sulla scheda MMDVM.
|
||||||
* Il Watchdog rileva allarmi termici, disco pieno o anomalie BER.
|
|
||||||
* Funzionano in modo sicuro anche quando la web app è chiusa o in background.
|
|
||||||
|
|
||||||
#### 🛠️ Controllo Remoto & Manutenzione Avanzata
|
#### 📈 Analitiche Dinamiche & Console Live [NUOVO]
|
||||||
* **Aggiornamenti Server OTA:** Applica gli aggiornamenti del server tramite Git direttamente dalla dashboard di amministrazione (Over-The-Air) con un clic, senza usare SSH.
|
* **Grafici Temporali:** Analizza l'andamento di CPU/Temp e Transiti/BER esplorando finestre temporali dinamiche da 12 Ore fino a 7 Giorni, con rendering fluido via Chart.js.
|
||||||
* **Editor .INI Remoto:** Modifica i file di configurazione (es. MMDVMHost.ini) direttamente dal pannello web.
|
* **Console WebSocket:** Terminale a latenza zero per analizzare i log dei demoni.
|
||||||
* **Gestione Demoni:** Avvia, arresta o riavvia i servizi di sistema remoti.
|
* **Tracciamento Operatori:** Visualizza in tempo reale quali amministratori sono connessi e operativi sulla dashboard.
|
||||||
* **Override Globali:** Cambia i profili operativi (es. Profilo A/B) simultaneamente su tutta la rete.
|
* **Watchdog Proattivo:** Analisi continua di surriscaldamenti e degrado RF, con avvisi inviati via notifiche Web Push.
|
||||||
* **Interventi Hardware:** Innesca un riavvio del sistema operativo o un reset fisico (tramite pin GPIO) della scheda MMDVM.
|
|
||||||
|
|
||||||
#### 📊 Monitoraggio & Statistiche
|
|
||||||
* **Mappa Interattiva di Flotta:** Mappa GIS in tempo reale che mostra la posizione dei ripetitori, stato online/offline, trasmissione attiva (pin lampeggianti) e allarmi diagnostici in corso.
|
|
||||||
* **Log Ascolti Live:** Vista unificata in tempo reale del traffico radio di tutta la rete, con traduzione automatica degli ID DMR e NXDN in nominativi.
|
|
||||||
* **Tracciamento Versioni:** Controlla all'istante le versioni firmware MMDVM e software (Pi-Star/Gateway) a bordo di ciascun nodo.
|
|
||||||
* **Analisi Giornaliera:** Statistiche automatiche su Top Talkgroups, Top Callsign, durata media e numero totale di transiti.
|
|
||||||
|
|
||||||
#### 🔐 Sicurezza e Controllo Accessi
|
#### 🔐 Sicurezza e Controllo Accessi
|
||||||
* **Gestione Ruoli (RBAC):** Creazione di account `admin` e `operator`.
|
* **Role-Based Access Control (RBAC):** Gestione nodi limitata esclusivamente ai ripetitori assegnati (`allowed_nodes`) per Operatori e `node_admin`.
|
||||||
* **Permessi Granulari:** Limita un operatore al controllo e alla visualizzazione di specifici ripetitori.
|
* **Audit Trail di Sicurezza:** Ogni comando operativo e configurazione viene tracciato con timestamp, utente e obiettivo.
|
||||||
* **Audit Trail:** Ogni azione critica (riavvii, modifiche file, gestione demoni) viene registrata con data, ora, utente e nodo di destinazione.
|
|
||||||
|
|
||||||
### ⚠️ Sicurezza Richiesta: HTTPS
|
### ⚠️ Sicurezza Richiesta: HTTPS
|
||||||
Si prega di notare che le **Notifiche Web Push** e il **Service Worker** richiedono una connessione sicura per funzionare. Per motivi di sicurezza, i browser moderni abilitano queste funzionalità solo su **HTTPS**. Se accedi alla console via HTTP (al di fuori di `localhost`), il tasto "Push" e la registrazione delle notifiche non saranno attivi. Si consiglia l'uso di un reverse proxy (come Nginx, Caddy o Traefik) con certificato SSL.
|
Le **Notifiche Web Push** e il **Service Worker** richiedono obbligatoriamente una connessione HTTPS per funzionare. Si consiglia l'uso di un reverse proxy (come Apache o Nginx) con certificato SSL Let's Encrypt.
|
||||||
|
|
||||||
### ⚠️ Configurazione Reverse Proxy & WebSocket
|
|
||||||
Se esponi la Fleet Console tramite un reverse proxy come **Apache** su IP pubblico (HTTPS), il proxy HTTP standard farà cadere continuamente la connessione in tempo reale di Socket.IO.
|
|
||||||
Devi abilitare il tunnel WebSocket in Apache:
|
|
||||||
```bash
|
|
||||||
sudo a2enmod proxy_wstunnel rewrite headers
|
|
||||||
```
|
|
||||||
E inserire le regole di **Rewrite** *prima* del `ProxyPass` all'interno del tuo blocco `<VirtualHost *:443>`:
|
|
||||||
```apache
|
|
||||||
RewriteEngine On
|
|
||||||
RewriteCond %{HTTP:Upgrade} =websocket [NC]
|
|
||||||
RewriteRule /(.*) ws://127.0.0.1:9000/$1 [P,L]
|
|
||||||
RewriteCond %{HTTP:Upgrade} !=websocket [NC]
|
|
||||||
RewriteRule /(.*) http://127.0.0.1:9000/$1 [P,L]
|
|
||||||
|
|
||||||
ProxyPass /socket.io/ ws://127.0.0.1:9000/socket.io/
|
|
||||||
ProxyPassReverse /socket.io/ ws://127.0.0.1:9000/socket.io/
|
|
||||||
|
|
||||||
ProxyPass / http://127.0.0.1:9000/
|
|
||||||
ProxyPassReverse / http://127.0.0.1:9000/
|
|
||||||
```
|
|
||||||
|
|
||||||
### 🚀 Guida all'Installazione
|
|
||||||
|
|
||||||
#### 0. Privilegi di Root
|
|
||||||
Tutti i passaggi di installazione devono essere eseguiti come utente `root`.
|
|
||||||
```bash
|
|
||||||
apt update
|
|
||||||
apt install build-essential python3-dev libssl-dev libffi-dev python3-pip python3-venv
|
|
||||||
```
|
|
||||||
#### 1. Clonazione dei Repository
|
|
||||||
Clona il repository nella cartella /opt per assicurarti che tutti i percorsi dei servizi systemd siano corretti:
|
|
||||||
```bash
|
|
||||||
git clone https://git.arifvg.it/iv3jdv/fleet-control-server.git /opt/fleet-control-server
|
|
||||||
cd /opt/fleet-control-server
|
|
||||||
```
|
|
||||||
#### 2. Setup Ambiente Virtuale (Consigliato)
|
|
||||||
Per evitare conflitti con i pacchetti di sistema (regola PEP 668), crea una "bolla" isolata:
|
|
||||||
```bash
|
|
||||||
cd /opt/fleet-control-server
|
|
||||||
python3 -m venv venv
|
|
||||||
source venv/bin/activate
|
|
||||||
pip install --upgrade pip setuptools wheel
|
|
||||||
pip install -r requirements.txt
|
|
||||||
```
|
|
||||||
|
|
||||||
#### 3. Configurazione Base
|
|
||||||
1. Copia `config.example.json` in `config.json`.
|
|
||||||
2. Inserisci le credenziali del broker MQTT.
|
|
||||||
3. Definisci i ripetitori nel file `clients.json`.
|
|
||||||
4. Genera le chiavi VAPID su [vapidkeys.com](https://vapidkeys.com/) e inseriscile in `config.json` per attivare le notifiche Push. *(Attenzione: le notifiche Push richiedono obbligatoriamente un certificato HTTPS).*
|
|
||||||
5. Configura le dimensioni della rotazione dei log (`log_max_mb` e `log_backup_count`) direttamente nel `config.json` per gestire lo spazio su disco.
|
|
||||||
|
|
||||||
#### 4. Esecuzione come Servizio (systemd)
|
|
||||||
Per eseguire il server in produzione in modo continuo e stabile con Gunicorn:
|
|
||||||
```bash
|
|
||||||
cp fleet-console.service /etc/systemd/system/
|
|
||||||
systemctl daemon-reload
|
|
||||||
systemctl enable fleet-console
|
|
||||||
systemctl start fleet-console
|
|
||||||
```
|
|
||||||
*(Assicurati che il file `.service` punti all'eseguibile `gunicorn` situato all'interno della cartella `venv`).*
|
|
||||||
|
|
||||||
---
|
|
||||||
*Created by IV3JDV @ ARIFVG - 2026*
|
|
||||||
|
|||||||
@@ -4,22 +4,26 @@ gevent.monkey.patch_all()
|
|||||||
import os
|
import os
|
||||||
import subprocess
|
import subprocess
|
||||||
import threading
|
import threading
|
||||||
from flask import Flask, render_template, request
|
import time
|
||||||
from flask_socketio import emit
|
from contextlib import closing
|
||||||
|
from flask import Flask, render_template, request, jsonify
|
||||||
|
from flask_socketio import emit, SocketIO
|
||||||
|
|
||||||
# --- IMPORT MODULI CORE ---
|
# --- IMPORT MODULI CORE ---
|
||||||
from core.config import BASE_DIR, get_secret_key, web_cfg, logger
|
from core.config import BASE_DIR, get_secret_key, web_cfg, logger
|
||||||
from core.database import init_db
|
from core.database import init_db, get_last_known_states
|
||||||
import core.state as state
|
import core.state as state
|
||||||
|
from core.state import clear_all_nodes, update_node_state
|
||||||
|
|
||||||
# --- IMPORT SERVIZI ---
|
# --- IMPORT SERVIZI ---
|
||||||
from services.push_service import push_worker
|
from services.push_service import push_worker
|
||||||
from services.watchdog_service import watchdog_loop
|
from services.watchdog_service import watchdog_loop
|
||||||
from services.scheduler_service import auto_update_ids
|
from services.scheduler_service import auto_update_ids, schedule_loop
|
||||||
import services.mqtt_service as mqtt_svc
|
import services.mqtt_service as mqtt_svc
|
||||||
|
|
||||||
# --- IMPORT ROTTE / BLUEPRINTS ---
|
# --- IMPORT ROTTE / BLUEPRINTS ---
|
||||||
from routes.auth_routes import auth_bp
|
from routes.auth_routes import auth_bp, get_auth
|
||||||
|
from core.database import db_connect
|
||||||
from routes.api_routes import api_bp
|
from routes.api_routes import api_bp
|
||||||
|
|
||||||
# Inizializzazione Flask
|
# Inizializzazione Flask
|
||||||
@@ -36,12 +40,31 @@ app.config.update(
|
|||||||
)
|
)
|
||||||
|
|
||||||
# Collegamento SocketIO
|
# Collegamento SocketIO
|
||||||
state.socketio.init_app(app)
|
socketio = SocketIO(app, cors_allowed_origins="*", async_mode='gevent')
|
||||||
|
|
||||||
|
# Rendiamo disponibile l'istanza globale socketio nel modulo state
|
||||||
|
# in modo che gli altri servizi (mqtt_service, push_service, api_routes)
|
||||||
|
# che importano `from core.state import socketio` continuino a funzionare.
|
||||||
|
state.socketio = socketio
|
||||||
|
|
||||||
# Registrazione Blueprint
|
# Registrazione Blueprint
|
||||||
app.register_blueprint(auth_bp)
|
app.register_blueprint(auth_bp)
|
||||||
app.register_blueprint(api_bp)
|
app.register_blueprint(api_bp)
|
||||||
|
|
||||||
|
# Aggiungi la funzione di sincronizzazione
|
||||||
|
def init_fleet_state():
|
||||||
|
"""Bootloader: sincronizza Redis con il DB all'avvio del worker."""
|
||||||
|
app.logger.info("Inizializzazione stato flotta su Redis...")
|
||||||
|
clear_all_nodes()
|
||||||
|
|
||||||
|
last_states = get_last_known_states()
|
||||||
|
for node_id, data in last_states.items():
|
||||||
|
data["status"] = "RECONNECTING"
|
||||||
|
update_node_state(node_id, data)
|
||||||
|
|
||||||
|
# Esegui la sincronizzazione prima di far partire i servizi
|
||||||
|
init_fleet_state()
|
||||||
|
|
||||||
# Security Headers
|
# Security Headers
|
||||||
@app.after_request
|
@app.after_request
|
||||||
def add_security_headers(resp):
|
def add_security_headers(resp):
|
||||||
@@ -52,6 +75,17 @@ def add_security_headers(resp):
|
|||||||
resp.headers['Cache-Control'] = 'no-store'
|
resp.headers['Cache-Control'] = 'no-store'
|
||||||
return resp
|
return resp
|
||||||
|
|
||||||
|
# Se in config.json -> "web": {"require_login_for_read": true} le API di sola lettura richiedono il login.
|
||||||
|
# Default: disattivato (la dashboard pubblica funziona come prima).
|
||||||
|
READ_PROTECTED_PATHS = ('/api/states', '/api/logs', '/api/stats', '/api/clients')
|
||||||
|
|
||||||
|
@app.before_request
|
||||||
|
def enforce_read_login():
|
||||||
|
if web_cfg.get('require_login_for_read') and request.path in READ_PROTECTED_PATHS:
|
||||||
|
if not get_auth():
|
||||||
|
return jsonify({"success": False, "error": "Login richiesto"}), 401
|
||||||
|
return None
|
||||||
|
|
||||||
def get_git_commit():
|
def get_git_commit():
|
||||||
try:
|
try:
|
||||||
return subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD'], cwd=BASE_DIR).decode('utf-8').strip()
|
return subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD'], cwd=BASE_DIR).decode('utf-8').strip()
|
||||||
@@ -64,21 +98,60 @@ SERVER_COMMIT = get_git_commit()
|
|||||||
def index():
|
def index():
|
||||||
return render_template('index.html', git_commit=SERVER_COMMIT)
|
return render_template('index.html', git_commit=SERVER_COMMIT)
|
||||||
|
|
||||||
@state.socketio.on('connect')
|
@socketio.on('connect')
|
||||||
def handle_connect():
|
def handle_connect():
|
||||||
|
state.connected_web_clients.add(request.sid)
|
||||||
|
|
||||||
|
# Se l'utente è loggato (session), associamo il suo username al SID
|
||||||
|
auth = get_auth()
|
||||||
|
if auth:
|
||||||
|
state.active_logged_users[request.sid] = auth['username']
|
||||||
|
state.socket_auth[request.sid] = {
|
||||||
|
"username": auth['username'], "role": auth['role'],
|
||||||
|
"allowed_nodes": auth['allowed_nodes'], "ts": time.time()
|
||||||
|
}
|
||||||
|
|
||||||
emit('mqtt_status', {'connected': mqtt_svc.mqtt_connected_status})
|
emit('mqtt_status', {'connected': mqtt_svc.mqtt_connected_status})
|
||||||
|
|
||||||
|
# Prepariamo la lista unica degli utenti loggati attivi (togliendo i duplicati se un utente ha più tab aperti)
|
||||||
|
logged_names = list(set(state.active_logged_users.values()))
|
||||||
|
socketio.emit('web_users_count', {'count': len(state.connected_web_clients), 'users': logged_names})
|
||||||
|
|
||||||
|
@socketio.on('disconnect')
|
||||||
|
def handle_disconnect():
|
||||||
|
state.connected_web_clients.discard(request.sid)
|
||||||
|
state.active_logged_users.pop(request.sid, None)
|
||||||
|
state.socket_auth.pop(request.sid, None)
|
||||||
|
|
||||||
|
logged_names = list(set(state.active_logged_users.values()))
|
||||||
|
socketio.emit('web_users_count', {'count': len(state.connected_web_clients), 'users': logged_names})
|
||||||
|
|
||||||
|
def _lookup_auth(username):
|
||||||
|
"""Ruolo/nodi aggiornati di un utente (usato per rivalidare i socket gia' connessi)."""
|
||||||
|
try:
|
||||||
|
with closing(db_connect(row=True)) as conn:
|
||||||
|
row = conn.execute("SELECT role, allowed_nodes FROM users WHERE username = ?", (username,)).fetchone()
|
||||||
|
if not row:
|
||||||
|
return None
|
||||||
|
return {"role": row['role'], "allowed_nodes": row['allowed_nodes'] or ''}
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"lookup auth socket: {e}")
|
||||||
|
return None
|
||||||
|
|
||||||
|
state.auth_lookup = _lookup_auth
|
||||||
|
|
||||||
# --- INIZIALIZZAZIONE SISTEMA & THREAD ---
|
# --- INIZIALIZZAZIONE SISTEMA & THREAD ---
|
||||||
init_db()
|
init_db()
|
||||||
state.seed_last_seen()
|
state.seed_last_seen()
|
||||||
mqtt_svc.start_mqtt()
|
mqtt_svc.start_mqtt()
|
||||||
|
|
||||||
threading.Thread(target=auto_update_ids, daemon=True).start()
|
threading.Thread(target=auto_update_ids, daemon=True).start()
|
||||||
|
threading.Thread(target=schedule_loop, daemon=True).start()
|
||||||
threading.Thread(target=push_worker, daemon=True).start()
|
threading.Thread(target=push_worker, daemon=True).start()
|
||||||
threading.Thread(target=watchdog_loop, daemon=True).start()
|
threading.Thread(target=watchdog_loop, daemon=True).start()
|
||||||
|
|
||||||
logger.info(f"🚀 Fleet Control Console modulare pronta (Git Rev: {SERVER_COMMIT})")
|
logger.info(f"🚀 Fleet Control Console modulare pronta (Git Rev: {SERVER_COMMIT})")
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
port = int(config.get('web', {}).get('port', 9000)) if 'config' in locals() else 9000
|
port = int(web_cfg.get('port', 9000))
|
||||||
state.socketio.run(app, host='0.0.0.0', port=port)
|
socketio.run(app, host='0.0.0.0', port=port)
|
||||||
|
|||||||
+18
-2
@@ -17,8 +17,10 @@
|
|||||||
"devices/#",
|
"devices/#",
|
||||||
"data/#",
|
"data/#",
|
||||||
"aprs-gateway/aprs"
|
"aprs-gateway/aprs"
|
||||||
]
|
],
|
||||||
|
"tls": false
|
||||||
},
|
},
|
||||||
|
|
||||||
"web_admin": {
|
"web_admin": {
|
||||||
"default_user": "admin",
|
"default_user": "admin",
|
||||||
"default_pass": "admin123"
|
"default_pass": "admin123"
|
||||||
@@ -41,5 +43,19 @@
|
|||||||
},
|
},
|
||||||
"log_max_mb": 50,
|
"log_max_mb": 50,
|
||||||
"log_backup_count": 10,
|
"log_backup_count": 10,
|
||||||
"last_heard_limit": 60
|
"last_heard_limit": 60,
|
||||||
|
"web": {
|
||||||
|
"port": 9000,
|
||||||
|
"redis_url": "redis://localhost:6379/0",
|
||||||
|
"cookie_secure": false,
|
||||||
|
"session_hours": 12,
|
||||||
|
"trust_proxy": false,
|
||||||
|
"cors_origins": "*",
|
||||||
|
"require_login_for_read": false,
|
||||||
|
"ota_enabled": true
|
||||||
|
},
|
||||||
|
"retention_days": 90,
|
||||||
|
"audit_retention_days": 365,
|
||||||
|
"telemetry_retention_days": 90,
|
||||||
|
"config_backups_keep": 100
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,10 @@ import logging
|
|||||||
import threading
|
import threading
|
||||||
from logging.handlers import RotatingFileHandler
|
from logging.handlers import RotatingFileHandler
|
||||||
|
|
||||||
|
settings = {
|
||||||
|
"REDIS_URL": os.getenv("REDIS_URL", "redis://localhost:6379/0")
|
||||||
|
}
|
||||||
|
|
||||||
# --- PERCORSI DINAMICI ---
|
# --- PERCORSI DINAMICI ---
|
||||||
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||||
|
|
||||||
|
|||||||
+68
-4
@@ -51,6 +51,24 @@ def init_db():
|
|||||||
(id INTEGER PRIMARY KEY AUTOINCREMENT, timestamp DATETIME, username TEXT,
|
(id INTEGER PRIMARY KEY AUTOINCREMENT, timestamp DATETIME, username TEXT,
|
||||||
client_id TEXT, command TEXT)''')
|
client_id TEXT, command TEXT)''')
|
||||||
|
|
||||||
|
c.execute('''CREATE TABLE IF NOT EXISTS config_backups
|
||||||
|
(id INTEGER PRIMARY KEY AUTOINCREMENT, timestamp DATETIME, client_id TEXT,
|
||||||
|
service TEXT, config_text TEXT, username TEXT)''')
|
||||||
|
|
||||||
|
c.execute('''CREATE TABLE IF NOT EXISTS telemetry_logs
|
||||||
|
(id INTEGER PRIMARY KEY AUTOINCREMENT, timestamp DATETIME, client_id TEXT,
|
||||||
|
cpu REAL, temp REAL, ram REAL, disk REAL)''')
|
||||||
|
|
||||||
|
c.execute("CREATE INDEX IF NOT EXISTS idx_telemetry_logs_client_ts ON telemetry_logs(client_id, timestamp)")
|
||||||
|
|
||||||
|
c.execute('''CREATE TABLE IF NOT EXISTS profile_schedules
|
||||||
|
(id INTEGER PRIMARY KEY AUTOINCREMENT, title TEXT, target_nodes TEXT,
|
||||||
|
target_profile TEXT, restore_profile TEXT, start_time DATETIME,
|
||||||
|
end_time DATETIME, status TEXT DEFAULT 'SCHEDULED', created_by TEXT,
|
||||||
|
created_at DATETIME DEFAULT (datetime('now', 'localtime')))''')
|
||||||
|
|
||||||
|
c.execute("CREATE INDEX IF NOT EXISTS idx_sched_status_time ON profile_schedules(status, start_time, end_time)")
|
||||||
|
|
||||||
c.execute("CREATE INDEX IF NOT EXISTS idx_radio_logs_ts ON radio_logs(timestamp)")
|
c.execute("CREATE INDEX IF NOT EXISTS idx_radio_logs_ts ON radio_logs(timestamp)")
|
||||||
c.execute("CREATE INDEX IF NOT EXISTS idx_radio_logs_client_ts ON radio_logs(client_id, timestamp)")
|
c.execute("CREATE INDEX IF NOT EXISTS idx_radio_logs_client_ts ON radio_logs(client_id, timestamp)")
|
||||||
c.execute("CREATE INDEX IF NOT EXISTS idx_audit_logs_ts ON audit_logs(timestamp)")
|
c.execute("CREATE INDEX IF NOT EXISTS idx_audit_logs_ts ON audit_logs(timestamp)")
|
||||||
@@ -77,6 +95,13 @@ def init_db():
|
|||||||
|
|
||||||
def save_to_sqlite(client_id, data, protocol="DMR"):
|
def save_to_sqlite(client_id, data, protocol="DMR"):
|
||||||
conn = sqlite3.connect(DB_PATH, timeout=10)
|
conn = sqlite3.connect(DB_PATH, timeout=10)
|
||||||
|
try:
|
||||||
|
_save_to_sqlite(conn, client_id, data, protocol)
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
notify_update('log_aggiornato')
|
||||||
|
|
||||||
|
def _save_to_sqlite(conn, client_id, data, protocol):
|
||||||
c = conn.cursor()
|
c = conn.cursor()
|
||||||
|
|
||||||
rssi_val = 0
|
rssi_val = 0
|
||||||
@@ -92,8 +117,6 @@ def save_to_sqlite(client_id, data, protocol="DMR"):
|
|||||||
data.get('slot', 0), round(data.get('duration', 0), 1), round(data.get('ber', 0), 2),
|
data.get('slot', 0), round(data.get('duration', 0), 1), round(data.get('ber', 0), 2),
|
||||||
str(data.get('src_ext', '')), rssi_val, str(data.get('source', '')), str(data.get('mode', ''))))
|
str(data.get('src_ext', '')), rssi_val, str(data.get('source', '')), str(data.get('mode', ''))))
|
||||||
conn.commit()
|
conn.commit()
|
||||||
conn.close()
|
|
||||||
notify_update('log_aggiornato')
|
|
||||||
|
|
||||||
def audit(username, client_id, command):
|
def audit(username, client_id, command):
|
||||||
try:
|
try:
|
||||||
@@ -115,8 +138,49 @@ def prune_old_data():
|
|||||||
n1 = c.rowcount
|
n1 = c.rowcount
|
||||||
c.execute("DELETE FROM audit_logs WHERE timestamp < datetime('now', 'localtime', ?)", (f"-{audit_days} days",))
|
c.execute("DELETE FROM audit_logs WHERE timestamp < datetime('now', 'localtime', ?)", (f"-{audit_days} days",))
|
||||||
n2 = c.rowcount
|
n2 = c.rowcount
|
||||||
|
# Telemetria e backup config non venivano mai potati (default generosi, configurabili)
|
||||||
|
tele_days = int(cfg.get("telemetry_retention_days", 90))
|
||||||
|
n3 = 0
|
||||||
|
if tele_days > 0:
|
||||||
|
c.execute("DELETE FROM telemetry_logs WHERE timestamp < datetime('now', 'localtime', ?)", (f"-{tele_days} days",))
|
||||||
|
n3 = c.rowcount
|
||||||
|
keep = int(cfg.get("config_backups_keep", 100))
|
||||||
|
n4 = 0
|
||||||
|
if keep > 0:
|
||||||
|
c.execute("""DELETE FROM config_backups WHERE id NOT IN (
|
||||||
|
SELECT id FROM config_backups b
|
||||||
|
WHERE b.client_id = config_backups.client_id AND b.service = config_backups.service
|
||||||
|
ORDER BY id DESC LIMIT ?)""", (keep,))
|
||||||
|
n4 = c.rowcount
|
||||||
conn.commit()
|
conn.commit()
|
||||||
if n1 or n2:
|
if n1 or n2 or n3 or n4:
|
||||||
logger.info(f"🧹 Pulizia DB: {n1} ascolti e {n2} audit rimossi.")
|
logger.info(f"🧹 Pulizia DB: {n1} ascolti, {n2} audit, {n3} telemetrie e {n4} backup config rimossi.")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"❌ Errore pulizia DB: {e}")
|
logger.error(f"❌ Errore pulizia DB: {e}")
|
||||||
|
|
||||||
|
def save_telemetry_to_sqlite(client_id, health_data):
|
||||||
|
try:
|
||||||
|
with closing(db_connect()) as conn:
|
||||||
|
conn.execute("INSERT INTO telemetry_logs (timestamp, client_id, cpu, temp, ram, disk) VALUES (datetime('now', 'localtime'), ?, ?, ?, ?, ?)",
|
||||||
|
(client_id, health_data.get('cpu', 0), health_data.get('temp', 0), health_data.get('ram', 0), health_data.get('disk', 0)))
|
||||||
|
conn.commit()
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Errore salvataggio telemetria: {e}")
|
||||||
|
|
||||||
|
def get_last_known_states() -> dict:
|
||||||
|
"""
|
||||||
|
Recupera l'ultimo stato noto della flotta dal database.
|
||||||
|
Usato dal bootloader in app.py al riavvio del servizio.
|
||||||
|
"""
|
||||||
|
return {}
|
||||||
|
|
||||||
|
import logging
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
def archive_node_error(node_id: str, state_data: dict) -> None:
|
||||||
|
"""
|
||||||
|
Salva il nodo su database relazionale (PostgreSQL/SQLite)
|
||||||
|
quando entra in uno stato di errore severo e prolungato.
|
||||||
|
"""
|
||||||
|
logger.error(f"[DB] Archiviazione stato critico per nodo {node_id}: {state_data}")
|
||||||
|
# TODO: Inserire qui la vera query di inserimento nel DB
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
"""Controllo permessi sui nodi, condiviso da API, push e WebSocket (nessuna dipendenza interna)."""
|
||||||
|
|
||||||
|
|
||||||
|
def node_allowed(role, allowed_nodes, cid):
|
||||||
|
if role == 'admin':
|
||||||
|
return True
|
||||||
|
allowed = (allowed_nodes or '').strip().lower()
|
||||||
|
if allowed == 'all':
|
||||||
|
return True
|
||||||
|
return cid in [x.strip().lower() for x in allowed.split(',') if x.strip()]
|
||||||
+151
-2
@@ -3,9 +3,11 @@ import json
|
|||||||
import time
|
import time
|
||||||
import threading
|
import threading
|
||||||
import sqlite3
|
import sqlite3
|
||||||
|
import redis
|
||||||
from contextlib import closing
|
from contextlib import closing
|
||||||
from flask_socketio import SocketIO
|
from flask_socketio import SocketIO
|
||||||
from core.config import CACHE_FILE, DB_PATH, DMR_IDS_PATH, NXDN_IDS_PATH, logger, web_cfg
|
from core.config import CACHE_FILE, DB_PATH, DMR_IDS_PATH, NXDN_IDS_PATH, logger, web_cfg
|
||||||
|
from core.permissions import node_allowed
|
||||||
|
|
||||||
# --- WEBSOCKET SOCKETIO ---
|
# --- WEBSOCKET SOCKETIO ---
|
||||||
socketio = SocketIO(cors_allowed_origins=web_cfg.get('cors_origins', '*'))
|
socketio = SocketIO(cors_allowed_origins=web_cfg.get('cors_origins', '*'))
|
||||||
@@ -33,8 +35,20 @@ def notify_update(event='dati_aggiornati'):
|
|||||||
timer.daemon = True
|
timer.daemon = True
|
||||||
timer.start()
|
timer.start()
|
||||||
|
|
||||||
|
# --- REDIS CLIENT & NAMESPACE ---
|
||||||
|
REDIS_URL = os.getenv("REDIS_URL", web_cfg.get("redis_url", "redis://localhost:6379/0"))
|
||||||
|
try:
|
||||||
|
redis_client = redis.from_url(REDIS_URL, decode_responses=True)
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Errore connessione Redis ({REDIS_URL}): {e}")
|
||||||
|
redis_client = None
|
||||||
|
|
||||||
|
NAMESPACE = "fleet:node:"
|
||||||
|
|
||||||
# --- STATI GLOBALI IN MEMORIA ---
|
# --- STATI GLOBALI IN MEMORIA ---
|
||||||
START_TIME = time.time()
|
START_TIME = time.time()
|
||||||
|
state_lock = threading.RLock()
|
||||||
|
|
||||||
client_states = {}
|
client_states = {}
|
||||||
device_configs = {}
|
device_configs = {}
|
||||||
client_telemetry = {}
|
client_telemetry = {}
|
||||||
@@ -48,6 +62,38 @@ gateway_states = {}
|
|||||||
active_warnings = {}
|
active_warnings = {}
|
||||||
active_calls = {}
|
active_calls = {}
|
||||||
operating_modes = {}
|
operating_modes = {}
|
||||||
|
node_logs = {} # In-memory circular buffer for live logs
|
||||||
|
connected_web_clients = set()
|
||||||
|
active_logged_users = {}
|
||||||
|
socket_auth = {} # sid -> {"username","role","allowed_nodes","ts"} (solo socket con sessione valida)
|
||||||
|
auth_lookup = None # impostato da app.py: username -> dict auth aggiornato oppure None
|
||||||
|
|
||||||
|
AUTH_REFRESH_SEC = 120
|
||||||
|
|
||||||
|
def emit_to_authorized(event, data, cid=None):
|
||||||
|
"""Invia l'evento solo ai socket autenticati (e, se cid e' dato, autorizzati su quel nodo)."""
|
||||||
|
now = time.time()
|
||||||
|
for sid, a in list(socket_auth.items()):
|
||||||
|
try:
|
||||||
|
# Rilegge periodicamente ruolo/nodi: utenti rimossi o declassati perdono l'accesso live
|
||||||
|
if auth_lookup and now - a.get('ts', 0) > AUTH_REFRESH_SEC:
|
||||||
|
fresh = auth_lookup(a['username'])
|
||||||
|
if not fresh:
|
||||||
|
socket_auth.pop(sid, None)
|
||||||
|
continue
|
||||||
|
a.update(fresh)
|
||||||
|
a['ts'] = now
|
||||||
|
if cid is None or node_allowed(a.get('role'), a.get('allowed_nodes'), cid):
|
||||||
|
socketio.emit(event, data, to=sid)
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"emit_to_authorized '{event}': {e}")
|
||||||
|
|
||||||
|
def emit_aprs(data):
|
||||||
|
"""APRS live: broadcast come prima, oppure solo utenti loggati se web.require_login_for_read."""
|
||||||
|
if web_cfg.get('require_login_for_read'):
|
||||||
|
emit_to_authorized('aprs_msg', data)
|
||||||
|
else:
|
||||||
|
socketio.emit('aprs_msg', data)
|
||||||
|
|
||||||
# Caricamento iniziale cache telemetria
|
# Caricamento iniziale cache telemetria
|
||||||
if os.path.exists(CACHE_FILE):
|
if os.path.exists(CACHE_FILE):
|
||||||
@@ -95,6 +141,109 @@ def seed_last_seen():
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"seed_last_seen: {e}")
|
logger.error(f"seed_last_seen: {e}")
|
||||||
|
|
||||||
|
# --- FUNZIONI DI GESTIONE STATO & REDIS ---
|
||||||
|
def update_node_state(node_id: str, payload: dict) -> None:
|
||||||
|
"""Aggiorna lo stato del nodo sia in memoria locale che su Redis in modo sicuro."""
|
||||||
|
if not node_id:
|
||||||
|
return
|
||||||
|
|
||||||
|
with state_lock:
|
||||||
|
current = client_states.get(node_id)
|
||||||
|
# Se lo stato attuale è una stringa semplice, convertilo in dizionario
|
||||||
|
if not isinstance(current, dict):
|
||||||
|
current = {"status": current} if isinstance(current, str) else {}
|
||||||
|
client_states[node_id] = current
|
||||||
|
|
||||||
|
if isinstance(payload, dict):
|
||||||
|
current.update(payload)
|
||||||
|
elif isinstance(payload, str):
|
||||||
|
current["status"] = payload
|
||||||
|
|
||||||
|
touch_seen(node_id, 'mqtt')
|
||||||
|
|
||||||
|
# Scrittura asincrona/pipeline su Redis
|
||||||
|
if redis_client:
|
||||||
|
try:
|
||||||
|
key = f"{NAMESPACE}{node_id}"
|
||||||
|
if isinstance(payload, dict):
|
||||||
|
flat_payload = {
|
||||||
|
k: (json.dumps(v) if isinstance(v, (dict, list)) else str(v))
|
||||||
|
for k, v in payload.items()
|
||||||
|
}
|
||||||
|
else:
|
||||||
|
flat_payload = {"status": str(payload)}
|
||||||
|
|
||||||
|
if flat_payload:
|
||||||
|
pipeline = redis_client.pipeline()
|
||||||
|
pipeline.hset(key, mapping=flat_payload)
|
||||||
|
pipeline.execute()
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Errore update Redis nodo {node_id}: {e}")
|
||||||
|
|
||||||
|
notify_update()
|
||||||
|
|
||||||
|
def get_node_state(node_id: str) -> dict:
|
||||||
|
"""Recupera lo stato del nodo da Redis, con fallback sulla memoria locale."""
|
||||||
|
if redis_client:
|
||||||
|
try:
|
||||||
|
key = f"{NAMESPACE}{node_id}"
|
||||||
|
data = redis_client.hgetall(key)
|
||||||
|
if data:
|
||||||
|
for k, v in data.items():
|
||||||
|
try:
|
||||||
|
if str(v).startswith(("{", "[")):
|
||||||
|
data[k] = json.loads(v)
|
||||||
|
except (ValueError, TypeError):
|
||||||
|
pass
|
||||||
|
return data
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Errore lettura Redis nodo {node_id}: {e}")
|
||||||
|
|
||||||
|
with state_lock:
|
||||||
|
return dict(client_states.get(node_id, {}))
|
||||||
|
|
||||||
|
def get_all_nodes() -> dict:
|
||||||
|
"""Scansiona tutti i nodi registrati in Redis o memoria."""
|
||||||
|
if redis_client:
|
||||||
|
try:
|
||||||
|
nodes = {}
|
||||||
|
for key in redis_client.scan_iter(match=f"{NAMESPACE}*"):
|
||||||
|
node_id = key.split(":")[-1]
|
||||||
|
nodes[node_id] = get_node_state(node_id)
|
||||||
|
if nodes:
|
||||||
|
return nodes
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Errore get_all_nodes Redis: {e}")
|
||||||
|
|
||||||
|
with state_lock:
|
||||||
|
return dict(client_states)
|
||||||
|
|
||||||
|
def delete_node(node_id: str) -> None:
|
||||||
|
"""Rimuove il nodo da Redis e dalla memoria locale."""
|
||||||
|
with state_lock:
|
||||||
|
client_states.pop(node_id, None)
|
||||||
|
|
||||||
|
if redis_client:
|
||||||
|
try:
|
||||||
|
key = f"{NAMESPACE}{node_id}"
|
||||||
|
redis_client.delete(key)
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Errore delete Redis nodo {node_id}: {e}")
|
||||||
|
|
||||||
|
notify_update()
|
||||||
|
|
||||||
|
def clear_all_nodes() -> None:
|
||||||
|
"""Svuota la cache nodi da Redis e memoria locale (usato al boot)."""
|
||||||
|
with state_lock:
|
||||||
|
client_states.clear()
|
||||||
|
|
||||||
|
if redis_client:
|
||||||
|
try:
|
||||||
|
for key in redis_client.scan_iter(match=f"{NAMESPACE}*"):
|
||||||
|
redis_client.delete(key)
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Errore clear_all_nodes Redis: {e}")
|
||||||
|
|
||||||
# --- DATABASE ID DMR / NXDN ---
|
# --- DATABASE ID DMR / NXDN ---
|
||||||
user_db = {}
|
user_db = {}
|
||||||
nxdn_db = {}
|
nxdn_db = {}
|
||||||
@@ -108,7 +257,7 @@ def load_ids():
|
|||||||
for l in f:
|
for l in f:
|
||||||
l = l.replace('"', '')
|
l = l.replace('"', '')
|
||||||
if ',' in l: p = l.strip().split(',')
|
if ',' in l: p = l.strip().split(',')
|
||||||
elif '\t' in l: p = l.strip().split('\t')
|
elif ' ' in l: p = l.strip().split(' ')
|
||||||
elif ';' in l: p = l.strip().split(';')
|
elif ';' in l: p = l.strip().split(';')
|
||||||
else: p = l.strip().split()
|
else: p = l.strip().split()
|
||||||
|
|
||||||
@@ -118,7 +267,7 @@ def load_ids():
|
|||||||
if os.path.exists(NXDN_IDS_PATH):
|
if os.path.exists(NXDN_IDS_PATH):
|
||||||
with open(NXDN_IDS_PATH, 'r', encoding='utf-8', errors='ignore') as f:
|
with open(NXDN_IDS_PATH, 'r', encoding='utf-8', errors='ignore') as f:
|
||||||
for l in f:
|
for l in f:
|
||||||
sep = '\t' if '\t' in l else (',' if ',' in l else ';')
|
sep = ' ' if ' ' in l else (',' if ',' in l else ';')
|
||||||
p = l.strip().split(sep)
|
p = l.strip().split(sep)
|
||||||
if len(p) >= 2 and p[0].strip().isdigit():
|
if len(p) >= 2 and p[0].strip().isdigit():
|
||||||
new_nxdn[p[0].strip()] = p[1].strip()
|
new_nxdn[p[0].strip()] = p[1].strip()
|
||||||
|
|||||||
+6
-6
@@ -1,5 +1,5 @@
|
|||||||
============================================================
|
============================================================
|
||||||
INSTALLATION GUIDE - FLEET CONTROL CONSOLE (SERVER)
|
INSTALLATION GUIDE - FLEET CONTROL CONSOLE (v6.0.0)
|
||||||
============================================================
|
============================================================
|
||||||
|
|
||||||
------------------------------------------------------------
|
------------------------------------------------------------
|
||||||
@@ -36,7 +36,7 @@ Install project requirements:
|
|||||||
The server handles the web interface and user permissions.
|
The server handles the web interface and user permissions.
|
||||||
|
|
||||||
Steps:
|
Steps:
|
||||||
1. Configure 'config.json' using 'config.example.json'.
|
1. Configure 'config.json' using 'config.json.example'.
|
||||||
2. Enter MQTT credentials and VAPID keys.
|
2. Enter MQTT credentials and VAPID keys.
|
||||||
3. Define repeaters in the 'clients.json' file.
|
3. Define repeaters in the 'clients.json' file.
|
||||||
4. Install production WSGI server packages (if not in requirements):
|
4. Install production WSGI server packages (if not in requirements):
|
||||||
@@ -59,7 +59,7 @@ They will NOT work over standard HTTP.
|
|||||||
4. RUNNING AS A SERVICE (SYSTEMD)
|
4. RUNNING AS A SERVICE (SYSTEMD)
|
||||||
------------------------------------------------------------
|
------------------------------------------------------------
|
||||||
⚠️ IMPORTANT (VENV USERS): Before copying the service file,
|
⚠️ IMPORTANT (VENV USERS): Before copying the service file,
|
||||||
open 'fleet-control.service' and ensure the paths point to your
|
open 'fleet-console.service' and ensure the paths point to your
|
||||||
virtual environment.
|
virtual environment.
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
@@ -74,7 +74,7 @@ Configuration:
|
|||||||
4. Start service: systemctl start fleet-console
|
4. Start service: systemctl start fleet-console
|
||||||
|
|
||||||
============================================================
|
============================================================
|
||||||
GUIDA ALL'INSTALLAZIONE - SERVER (ITALIANO)
|
GUIDA ALL'INSTALLAZIONE - SERVER v6.0.0 (ITALIANO)
|
||||||
============================================================
|
============================================================
|
||||||
|
|
||||||
------------------------------------------------------------
|
------------------------------------------------------------
|
||||||
@@ -110,7 +110,7 @@ Installa i requisiti del progetto:
|
|||||||
2. SETUP DEL SERVER
|
2. SETUP DEL SERVER
|
||||||
------------------------------------------------------------
|
------------------------------------------------------------
|
||||||
Passaggi:
|
Passaggi:
|
||||||
1. Configura 'config.json' partendo da 'config.example.json'.
|
1. Configura 'config.json' partendo da 'config.json.example'.
|
||||||
2. Inserisci credenziali MQTT e chiavi VAPID.
|
2. Inserisci credenziali MQTT e chiavi VAPID.
|
||||||
3. Definisci i ripetitori in 'clients.json'.
|
3. Definisci i ripetitori in 'clients.json'.
|
||||||
4. Avvia il server di produzione:
|
4. Avvia il server di produzione:
|
||||||
@@ -128,7 +128,7 @@ Passaggi:
|
|||||||
4. ESECUZIONE COME SERVIZIO (SYSTEMD)
|
4. ESECUZIONE COME SERVIZIO (SYSTEMD)
|
||||||
------------------------------------------------------------
|
------------------------------------------------------------
|
||||||
⚠️ IMPORTANTE (PER UTENTI VENV): Prima di copiare il file di
|
⚠️ IMPORTANTE (PER UTENTI VENV): Prima di copiare il file di
|
||||||
servizio, apri 'fleet-control.service' e assicurati che i percorsi
|
servizio, apri 'fleet-console.service' e assicurati che i percorsi
|
||||||
puntino al tuo ambiente virtuale!
|
puntino al tuo ambiente virtuale!
|
||||||
|
|
||||||
Esempio:
|
Esempio:
|
||||||
|
|||||||
Executable
+41
@@ -0,0 +1,41 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
|
||||||
|
config_path = "config.json"
|
||||||
|
|
||||||
|
if not os.path.exists(config_path):
|
||||||
|
print(f"⚠️ {config_path} non trovato. Nessuna migrazione necessaria.")
|
||||||
|
sys.exit(0)
|
||||||
|
|
||||||
|
try:
|
||||||
|
with open(config_path, "r", encoding="utf-8") as f:
|
||||||
|
cfg = json.load(f)
|
||||||
|
except Exception as e:
|
||||||
|
print(f"❌ Errore nella lettura di {config_path}: {e}")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
if "web" not in cfg:
|
||||||
|
cfg["web"] = {}
|
||||||
|
|
||||||
|
if "redis_url" not in cfg["web"]:
|
||||||
|
print("🔧 Aggiunta della configurazione Redis a config.json...")
|
||||||
|
cfg["web"]["redis_url"] = "redis://localhost:6379/0"
|
||||||
|
|
||||||
|
bak_path = config_path + ".bak"
|
||||||
|
try:
|
||||||
|
with open(config_path, "r", encoding="utf-8") as rf:
|
||||||
|
with open(bak_path, "w", encoding="utf-8") as wf:
|
||||||
|
wf.write(rf.read())
|
||||||
|
print(f"💾 Backup creato in {bak_path}")
|
||||||
|
except Exception as e:
|
||||||
|
print(f"⚠️ Impossibile creare backup: {e}")
|
||||||
|
|
||||||
|
tmp_path = config_path + ".tmp"
|
||||||
|
with open(tmp_path, "w", encoding="utf-8") as f:
|
||||||
|
json.dump(cfg, f, indent=4)
|
||||||
|
os.replace(tmp_path, config_path)
|
||||||
|
print("✅ config.json aggiornato con successo!")
|
||||||
|
else:
|
||||||
|
print("ℹ️ config.json contiene già la configurazione Redis.")
|
||||||
+2
-8
@@ -1,8 +1,2 @@
|
|||||||
Flask
|
redis>=5.0.1
|
||||||
Flask-SocketIO
|
# ... (aggiungi qui le altre dipendenze preesistenti come Flask, paho-mqtt, ecc.)
|
||||||
Werkzeug
|
|
||||||
pywebpush
|
|
||||||
paho-mqtt
|
|
||||||
gunicorn
|
|
||||||
gevent
|
|
||||||
gevent-websocket
|
|
||||||
|
|||||||
+326
-24
@@ -14,6 +14,7 @@ import core.state as state
|
|||||||
from services.mqtt_service import mqtt_publish
|
from services.mqtt_service import mqtt_publish
|
||||||
from services.push_service import node_allowed
|
from services.push_service import node_allowed
|
||||||
from routes.auth_routes import get_auth, json_body, err
|
from routes.auth_routes import get_auth, json_body, err
|
||||||
|
from services.scheduler_service import PRIVILEGED_COMMANDS as SCHED_PRIVILEGED
|
||||||
|
|
||||||
# --- AGGIUNTE PER GITEA BACKGROUND CHECK ---
|
# --- AGGIUNTE PER GITEA BACKGROUND CHECK ---
|
||||||
GLOBAL_SERVER_UPDATE_AVAILABLE = False
|
GLOBAL_SERVER_UPDATE_AVAILABLE = False
|
||||||
@@ -109,7 +110,9 @@ def get_states():
|
|||||||
"versions": clean_versions,
|
"versions": clean_versions,
|
||||||
"gateway_states": enriched_gateway_states,
|
"gateway_states": enriched_gateway_states,
|
||||||
"warnings": state.active_warnings,
|
"warnings": state.active_warnings,
|
||||||
"modes": getattr(state, "operating_modes", {})
|
"modes": getattr(state, "operating_modes", {}),
|
||||||
|
"web_users": len(getattr(state, "connected_web_clients", [])),
|
||||||
|
"logged_users": list(set(getattr(state, "active_logged_users", {}).values()))
|
||||||
})
|
})
|
||||||
|
|
||||||
@api_bp.route('/api/stats')
|
@api_bp.route('/api/stats')
|
||||||
@@ -132,7 +135,8 @@ def get_stats():
|
|||||||
top_tgs = [{"target": row[0], "count": row[1]} for row in c.fetchall()]
|
top_tgs = [{"target": row[0], "count": row[1]} for row in c.fetchall()]
|
||||||
|
|
||||||
c.execute(f"""SELECT source_id, COUNT(*) as cnt FROM radio_logs
|
c.execute(f"""SELECT source_id, COUNT(*) as cnt FROM radio_logs
|
||||||
WHERE source_id NOT LIKE '倹%'
|
WHERE source_id NOT LIKE '🌐%'
|
||||||
|
AND source_id NOT LIKE '%'
|
||||||
AND timestamp >= date('now', 'localtime') AND timestamp < date('now', 'localtime', '+1 day'){node_filter}
|
AND timestamp >= date('now', 'localtime') AND timestamp < date('now', 'localtime', '+1 day'){node_filter}
|
||||||
GROUP BY source_id ORDER BY cnt DESC LIMIT 5""", params)
|
GROUP BY source_id ORDER BY cnt DESC LIMIT 5""", params)
|
||||||
top_calls = [{"call": row[0], "count": row[1]} for row in c.fetchall()]
|
top_calls = [{"call": row[0], "count": row[1]} for row in c.fetchall()]
|
||||||
@@ -185,8 +189,9 @@ def cmd():
|
|||||||
if not mqtt_publish(f"servizi/{cid}/cmnd", cmd_type):
|
if not mqtt_publish(f"servizi/{cid}/cmnd", cmd_type):
|
||||||
return err("Broker MQTT non raggiungibile - comando non inviato", 503)
|
return err("Broker MQTT non raggiungibile - comando non inviato", 503)
|
||||||
|
|
||||||
audit(auth['username'], cid, cmd_type)
|
audit_label = f"SWITCH_PROFILE_{cmd_type.upper()}" if cmd_type in known_profile_keys(cid) else cmd_type
|
||||||
state.client_telemetry[cid] = {"ts1": "売 Inviato...", "ts2": "売 Inviato...", "alt": ""}
|
audit(auth['username'], cid, audit_label)
|
||||||
|
state.client_telemetry[cid] = {"ts1": "[>] Inviato...", "ts2": "[>] Inviato...", "alt": ""}
|
||||||
return jsonify({"success": True})
|
return jsonify({"success": True})
|
||||||
|
|
||||||
@api_bp.route('/api/global_command', methods=['POST'])
|
@api_bp.route('/api/global_command', methods=['POST'])
|
||||||
@@ -221,11 +226,14 @@ def global_cmd():
|
|||||||
@api_bp.route('/api/service_control', methods=['POST'])
|
@api_bp.route('/api/service_control', methods=['POST'])
|
||||||
def service_control():
|
def service_control():
|
||||||
auth = get_auth()
|
auth = get_auth()
|
||||||
if not auth or auth['role'] != 'admin':
|
if not auth or (auth['role'] != 'admin' and auth['role'] != 'node_admin'):
|
||||||
return err("Non autorizzato", 403)
|
return err("Non autorizzato", 403)
|
||||||
|
|
||||||
d = json_body()
|
d = json_body()
|
||||||
cid = str(d.get('clientId', '')).strip().lower()
|
cid = str(d.get('clientId', '')).strip().lower()
|
||||||
|
|
||||||
|
if not node_allowed(auth['role'], auth['allowed_nodes'], cid):
|
||||||
|
return err("Permesso negato per questo nodo", 403)
|
||||||
action = str(d.get('action', '')).strip().lower()
|
action = str(d.get('action', '')).strip().lower()
|
||||||
service = str(d.get('service', '')).strip()
|
service = str(d.get('service', '')).strip()
|
||||||
if not CID_RE.match(cid):
|
if not CID_RE.match(cid):
|
||||||
@@ -247,7 +255,7 @@ def update_nodes():
|
|||||||
return err("Non autorizzato", 403)
|
return err("Non autorizzato", 403)
|
||||||
if not mqtt_publish("devices/control/request", "update"):
|
if not mqtt_publish("devices/control/request", "update"):
|
||||||
return err("Broker MQTT non raggiungibile", 503)
|
return err("Broker MQTT non raggiungibile", 503)
|
||||||
logger.info(f"討 REQ CONFIG inviata a tutta la flotta da {auth['username']}")
|
logger.info(f"🔄 REQ CONFIG inviata a tutta la flotta da {auth['username']}")
|
||||||
audit(auth['username'], '*', 'REQ_CONFIG_ALL')
|
audit(auth['username'], '*', 'REQ_CONFIG_ALL')
|
||||||
return jsonify({"success": True})
|
return jsonify({"success": True})
|
||||||
|
|
||||||
@@ -320,9 +328,11 @@ def save_config_api():
|
|||||||
@api_bp.route('/api/config_file/<cid>/<service>', methods=['GET'])
|
@api_bp.route('/api/config_file/<cid>/<service>', methods=['GET'])
|
||||||
def get_config_file(cid, service):
|
def get_config_file(cid, service):
|
||||||
auth = get_auth()
|
auth = get_auth()
|
||||||
if not auth or auth['role'] != 'admin':
|
if not auth or (auth['role'] != 'admin' and auth['role'] != 'node_admin'):
|
||||||
return err("Non autorizzato", 403)
|
return err("Non autorizzato", 403)
|
||||||
cid = cid.lower()
|
cid = cid.lower()
|
||||||
|
if not node_allowed(auth['role'], auth['allowed_nodes'], cid):
|
||||||
|
return err("Permesso negato per questo nodo", 403)
|
||||||
service = service.lower()
|
service = service.lower()
|
||||||
if not CID_RE.match(cid) or not SERVICE_RE.match(service):
|
if not CID_RE.match(cid) or not SERVICE_RE.match(service):
|
||||||
return err("Parametri non validi")
|
return err("Parametri non validi")
|
||||||
@@ -334,11 +344,14 @@ def get_config_file(cid, service):
|
|||||||
@api_bp.route('/api/config_file', methods=['POST'])
|
@api_bp.route('/api/config_file', methods=['POST'])
|
||||||
def save_config_file():
|
def save_config_file():
|
||||||
auth = get_auth()
|
auth = get_auth()
|
||||||
if not auth or auth['role'] != 'admin':
|
if not auth or (auth['role'] != 'admin' and auth['role'] != 'node_admin'):
|
||||||
return err("Non autorizzato", 403)
|
return err("Non autorizzato", 403)
|
||||||
|
|
||||||
d = json_body()
|
d = json_body()
|
||||||
cid = str(d.get('clientId', '')).strip().lower()
|
cid = str(d.get('clientId', '')).strip().lower()
|
||||||
|
|
||||||
|
if not node_allowed(auth['role'], auth['allowed_nodes'], cid):
|
||||||
|
return err("Permesso negato per questo nodo", 403)
|
||||||
service = str(d.get('service', '')).strip().lower()
|
service = str(d.get('service', '')).strip().lower()
|
||||||
new_config = d.get('config_data')
|
new_config = d.get('config_data')
|
||||||
if not CID_RE.match(cid) or not SERVICE_RE.match(service):
|
if not CID_RE.match(cid) or not SERVICE_RE.match(service):
|
||||||
@@ -352,6 +365,15 @@ def save_config_file():
|
|||||||
return err("Broker MQTT non raggiungibile", 503)
|
return err("Broker MQTT non raggiungibile", 503)
|
||||||
audit(auth['username'], cid, f"EDIT_CONFIG_{service.upper()}")
|
audit(auth['username'], cid, f"EDIT_CONFIG_{service.upper()}")
|
||||||
|
|
||||||
|
# Salva Backup
|
||||||
|
try:
|
||||||
|
with closing(db_connect()) as conn:
|
||||||
|
conn.execute("INSERT INTO config_backups (timestamp, client_id, service, config_text, username) VALUES (datetime('now', 'localtime'), ?, ?, ?, ?)",
|
||||||
|
(cid, service, new_config['raw_text'], auth['username']))
|
||||||
|
conn.commit()
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Errore salvataggio backup config: {e}")
|
||||||
|
|
||||||
if cid not in state.device_configs:
|
if cid not in state.device_configs:
|
||||||
state.device_configs[cid] = {}
|
state.device_configs[cid] = {}
|
||||||
state.device_configs[cid][service] = new_config
|
state.device_configs[cid][service] = new_config
|
||||||
@@ -360,28 +382,28 @@ def save_config_file():
|
|||||||
|
|
||||||
# --- AGGIORNAMENTO SERVER OTA ---
|
# --- AGGIORNAMENTO SERVER OTA ---
|
||||||
|
|
||||||
def background_gitea_check():
|
|
||||||
global GLOBAL_SERVER_UPDATE_AVAILABLE, LAST_GITEA_CHECK_TIME
|
|
||||||
try:
|
|
||||||
subprocess.run(['git', 'fetch'], timeout=10, cwd=BASE_DIR)
|
|
||||||
local_hash = subprocess.check_output(['git', 'rev-parse', 'HEAD'], cwd=BASE_DIR).decode('utf-8').strip()
|
|
||||||
remote_hash = subprocess.check_output(['git', 'rev-parse', '@{u}'], cwd=BASE_DIR).decode('utf-8').strip()
|
|
||||||
GLOBAL_SERVER_UPDATE_AVAILABLE = (local_hash != remote_hash)
|
|
||||||
LAST_GITEA_CHECK_TIME = time.time()
|
|
||||||
except Exception as e:
|
|
||||||
logger.error(f"Errore controllo Gitea in background: {e}")
|
|
||||||
|
|
||||||
@api_bp.route('/api/server_update/check', methods=['GET'])
|
@api_bp.route('/api/server_update/check', methods=['GET'])
|
||||||
def get_server_update_status():
|
def get_server_update_status():
|
||||||
global LAST_GITEA_CHECK_TIME
|
global LAST_GITEA_CHECK_TIME, GLOBAL_SERVER_UPDATE_AVAILABLE
|
||||||
auth = get_auth()
|
auth = get_auth()
|
||||||
if not auth or auth['role'] != 'admin':
|
if not auth or auth['role'] != 'admin':
|
||||||
return err("Non autorizzato", 403)
|
return err("Non autorizzato", 403)
|
||||||
|
|
||||||
# Se è passata più di un'ora (3600 secondi) dall'ultimo controllo, avvia il thread
|
force_check = request.args.get('force') == '1'
|
||||||
if time.time() - LAST_GITEA_CHECK_TIME > 3600:
|
|
||||||
import threading
|
# Eseguiamo il controllo sincrono se è passata 1 ora OPPURE se forzato dal client
|
||||||
threading.Thread(target=background_gitea_check, daemon=True).start()
|
if force_check or (time.time() - LAST_GITEA_CHECK_TIME > 3600):
|
||||||
|
try:
|
||||||
|
# Timeout molto basso per evitare di killare il worker Gunicorn
|
||||||
|
subprocess.run(['git', 'fetch'], timeout=2, cwd=BASE_DIR)
|
||||||
|
local_hash = subprocess.check_output(['git', 'rev-parse', 'HEAD'], cwd=BASE_DIR, timeout=1).decode('utf-8').strip()
|
||||||
|
remote_hash = subprocess.check_output(['git', 'rev-parse', '@{u}'], cwd=BASE_DIR, timeout=1).decode('utf-8').strip()
|
||||||
|
GLOBAL_SERVER_UPDATE_AVAILABLE = (local_hash != remote_hash)
|
||||||
|
LAST_GITEA_CHECK_TIME = time.time()
|
||||||
|
except subprocess.TimeoutExpired:
|
||||||
|
logger.warning("Gitea check andato in timeout, ignorato per non bloccare Gunicorn.")
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Errore controllo Gitea: {e}")
|
||||||
|
|
||||||
return jsonify({"success": True, "update_available": GLOBAL_SERVER_UPDATE_AVAILABLE})
|
return jsonify({"success": True, "update_available": GLOBAL_SERVER_UPDATE_AVAILABLE})
|
||||||
|
|
||||||
@@ -390,6 +412,8 @@ def apply_server_update():
|
|||||||
auth = get_auth()
|
auth = get_auth()
|
||||||
if not auth or auth['role'] != 'admin':
|
if not auth or auth['role'] != 'admin':
|
||||||
return err("Non autorizzato", 403)
|
return err("Non autorizzato", 403)
|
||||||
|
if read_config().get('web', {}).get('ota_enabled', True) is False:
|
||||||
|
return err("Aggiornamento OTA disabilitato dalla configurazione", 403)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
audit(auth['username'], 'SERVER', 'SERVER_OTA_UPDATE')
|
audit(auth['username'], 'SERVER', 'SERVER_OTA_UPDATE')
|
||||||
@@ -444,3 +468,281 @@ def serve_sw():
|
|||||||
@api_bp.route('/icon-512.png')
|
@api_bp.route('/icon-512.png')
|
||||||
def serve_icon():
|
def serve_icon():
|
||||||
return send_from_directory(BASE_DIR, 'icon-512.png')
|
return send_from_directory(BASE_DIR, 'icon-512.png')
|
||||||
|
|
||||||
|
|
||||||
|
@api_bp.route('/api/logs/<cid>', methods=['GET'])
|
||||||
|
def get_node_logs(cid):
|
||||||
|
auth = get_auth()
|
||||||
|
if not auth:
|
||||||
|
return err("Non autorizzato", 401)
|
||||||
|
|
||||||
|
cid = cid.strip().lower()
|
||||||
|
if not node_allowed(auth['role'], auth['allowed_nodes'], cid):
|
||||||
|
return err("Permesso negato per questo nodo", 403)
|
||||||
|
|
||||||
|
logs = list(state.node_logs.get(cid, []))
|
||||||
|
return jsonify({"success": True, "logs": logs})
|
||||||
|
|
||||||
|
@api_bp.route('/api/config_backups/<cid>/<service>', methods=['GET'])
|
||||||
|
def get_config_backups(cid, service):
|
||||||
|
auth = get_auth()
|
||||||
|
if not auth or auth['role'] != 'admin':
|
||||||
|
return err("Non autorizzato", 403)
|
||||||
|
|
||||||
|
cid = cid.strip().lower()
|
||||||
|
if not node_allowed(auth['role'], auth['allowed_nodes'], cid):
|
||||||
|
return err("Permesso negato per questo nodo", 403)
|
||||||
|
|
||||||
|
try:
|
||||||
|
with closing(db_connect()) as conn:
|
||||||
|
c = conn.cursor()
|
||||||
|
c.execute("SELECT id, timestamp, username FROM config_backups WHERE client_id = ? AND service = ? ORDER BY id DESC LIMIT 20", (cid, service))
|
||||||
|
rows = [{"id": r[0], "timestamp": r[1], "username": r[2]} for r in c.fetchall()]
|
||||||
|
return jsonify({"success": True, "backups": rows})
|
||||||
|
except Exception as e:
|
||||||
|
return err(str(e))
|
||||||
|
|
||||||
|
@api_bp.route('/api/config_backups/<int:backup_id>', methods=['GET'])
|
||||||
|
def get_config_backup_content(backup_id):
|
||||||
|
auth = get_auth()
|
||||||
|
if not auth or auth['role'] != 'admin':
|
||||||
|
return err("Non autorizzato", 403)
|
||||||
|
|
||||||
|
try:
|
||||||
|
with closing(db_connect()) as conn:
|
||||||
|
c = conn.cursor()
|
||||||
|
c.execute("SELECT client_id, config_text FROM config_backups WHERE id = ?", (backup_id,))
|
||||||
|
row = c.fetchone()
|
||||||
|
if not row:
|
||||||
|
return err("Backup non trovato", 404)
|
||||||
|
if not node_allowed(auth['role'], auth['allowed_nodes'], row[0]):
|
||||||
|
return err("Permesso negato", 403)
|
||||||
|
return jsonify({"success": True, "text": row[1]})
|
||||||
|
except Exception as e:
|
||||||
|
return err(str(e))
|
||||||
|
|
||||||
|
import zipfile
|
||||||
|
import io
|
||||||
|
from flask import send_file
|
||||||
|
|
||||||
|
@api_bp.route('/api/fleet_backup', methods=['GET'])
|
||||||
|
def get_fleet_backup():
|
||||||
|
auth = get_auth()
|
||||||
|
if not auth or auth['role'] != 'admin':
|
||||||
|
return err("Non autorizzato", 403)
|
||||||
|
|
||||||
|
memory_file = io.BytesIO()
|
||||||
|
with zipfile.ZipFile(memory_file, 'w', zipfile.ZIP_DEFLATED) as zf:
|
||||||
|
for cid, configs in state.device_configs.items():
|
||||||
|
for service, conf in configs.items():
|
||||||
|
if isinstance(conf, dict) and 'raw_text' in conf:
|
||||||
|
zf.writestr(f"{cid}/{service.upper()}.ini", conf['raw_text'])
|
||||||
|
memory_file.seek(0)
|
||||||
|
audit(auth['username'], '-', "DOWNLOAD_FLEET_BACKUP")
|
||||||
|
return send_file(memory_file, download_name=f"fleet_configs_{time.strftime('%Y%m%d')}.zip", as_attachment=True)
|
||||||
|
|
||||||
|
@api_bp.route('/api/analytics/<cid>', methods=['GET'])
|
||||||
|
def get_analytics(cid):
|
||||||
|
auth = get_auth()
|
||||||
|
if not auth:
|
||||||
|
return err("Non autorizzato", 401)
|
||||||
|
|
||||||
|
cid = cid.strip().lower()
|
||||||
|
if not node_allowed(auth['role'], auth['allowed_nodes'], cid):
|
||||||
|
return err("Permesso negato per questo nodo", 403)
|
||||||
|
|
||||||
|
try:
|
||||||
|
hours = int(request.args.get('hours', 24))
|
||||||
|
except ValueError:
|
||||||
|
hours = 24
|
||||||
|
|
||||||
|
try:
|
||||||
|
with closing(db_connect()) as conn:
|
||||||
|
c = conn.cursor()
|
||||||
|
|
||||||
|
# Telemetria: aggreghiamo per ora
|
||||||
|
c.execute(f"""SELECT strftime('%Y-%m-%d %H:00:00', timestamp) as hr,
|
||||||
|
AVG(cpu), MAX(temp), AVG(ram)
|
||||||
|
FROM telemetry_logs
|
||||||
|
WHERE client_id = ? AND timestamp >= datetime('now', 'localtime', ?)
|
||||||
|
GROUP BY hr ORDER BY hr""", (cid, f"-{hours} hours"))
|
||||||
|
telemetry_data = [{"time": r[0], "cpu": round(r[1], 1) if r[1] else 0, "temp": round(r[2], 1) if r[2] else 0, "ram": round(r[3], 1) if r[3] else 0} for r in c.fetchall()]
|
||||||
|
|
||||||
|
# RF BER & Transiti (ignoriamo rete e beacon, prendiamo solo traffico vero locale)
|
||||||
|
c.execute(f"""SELECT strftime('%Y-%m-%d %H:00:00', timestamp) as hr,
|
||||||
|
COUNT(*), AVG(ber), AVG(rssi)
|
||||||
|
FROM radio_logs
|
||||||
|
WHERE LOWER(client_id) = ? AND timestamp >= datetime('now', 'localtime', ?)
|
||||||
|
AND source_id NOT LIKE '🌐%'
|
||||||
|
AND source_id NOT LIKE '%'
|
||||||
|
AND (LOWER(source_conn) = 'rf' OR source_conn = '')
|
||||||
|
GROUP BY hr ORDER BY hr""", (cid, f"-{hours} hours"))
|
||||||
|
rf_data = [{"time": r[0], "count": r[1], "ber": round(r[2], 2) if r[2] else 0, "rssi": round(r[3], 1) if r[3] else 0} for r in c.fetchall()]
|
||||||
|
|
||||||
|
return jsonify({"success": True, "telemetry": telemetry_data, "rf": rf_data})
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Analytics query error: {e}")
|
||||||
|
return err(str(e))
|
||||||
|
|
||||||
|
@api_bp.route('/api/audit_logs', methods=['GET'])
|
||||||
|
def get_audit_logs():
|
||||||
|
auth = get_auth()
|
||||||
|
if not auth or auth['role'] != 'admin':
|
||||||
|
return err("Non autorizzato", 403)
|
||||||
|
|
||||||
|
try:
|
||||||
|
with closing(db_connect()) as conn:
|
||||||
|
c = conn.cursor()
|
||||||
|
c.execute("SELECT timestamp, username, client_id, command FROM audit_logs ORDER BY id DESC LIMIT 50")
|
||||||
|
rows = [{"time": r[0], "user": r[1], "node": r[2], "cmd": r[3]} for r in c.fetchall()]
|
||||||
|
return jsonify({"success": True, "logs": rows})
|
||||||
|
except Exception as e:
|
||||||
|
return err(str(e))
|
||||||
|
|
||||||
|
@api_bp.route('/api/aprs', methods=['GET'])
|
||||||
|
def get_aprs():
|
||||||
|
auth = get_auth()
|
||||||
|
if not auth:
|
||||||
|
return err("Non autorizzato", 401)
|
||||||
|
msgs = list(getattr(state, 'aprs_msgs', []))
|
||||||
|
# msgs è una lista di dizionari dal più vecchio al più nuovo, la restituiamo direttamente
|
||||||
|
return jsonify(msgs)
|
||||||
|
|
||||||
|
# --- SCHEDULAZIONE PROFILI (CALENDAR SCHEDULER) ---
|
||||||
|
|
||||||
|
@api_bp.route('/api/schedules', methods=['GET'])
|
||||||
|
def get_schedules():
|
||||||
|
auth = get_auth()
|
||||||
|
if not auth or auth['role'] not in ('admin', 'node_admin'):
|
||||||
|
return err("Non autorizzato", 403)
|
||||||
|
|
||||||
|
try:
|
||||||
|
with closing(db_connect(row=True)) as conn:
|
||||||
|
c = conn.cursor()
|
||||||
|
c.execute("""SELECT id, title, target_nodes, target_profile, restore_profile,
|
||||||
|
start_time, end_time, status, created_by, created_at
|
||||||
|
FROM profile_schedules
|
||||||
|
ORDER BY id DESC LIMIT 50""")
|
||||||
|
rows = [dict(r) for r in c.fetchall()]
|
||||||
|
|
||||||
|
# Filtro per node_admin se non ha 'all'
|
||||||
|
if auth['role'] == 'node_admin' and 'all' not in auth['allowed_nodes'].split(','):
|
||||||
|
allowed_set = set(x.strip().lower() for x in auth['allowed_nodes'].split(','))
|
||||||
|
filtered = []
|
||||||
|
for r in rows:
|
||||||
|
t_nodes = set(x.strip().lower() for x in r['target_nodes'].split(','))
|
||||||
|
if t_nodes.issubset(allowed_set):
|
||||||
|
filtered.append(r)
|
||||||
|
rows = filtered
|
||||||
|
|
||||||
|
return jsonify({"success": True, "schedules": rows})
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Errore caricamento schedulazioni: {e}")
|
||||||
|
return err(str(e))
|
||||||
|
|
||||||
|
@api_bp.route('/api/schedules', methods=['POST'])
|
||||||
|
def add_schedule():
|
||||||
|
auth = get_auth()
|
||||||
|
if not auth or auth['role'] not in ('admin', 'node_admin'):
|
||||||
|
return err("Non autorizzato", 403)
|
||||||
|
|
||||||
|
d = json_body()
|
||||||
|
title = str(d.get('title', '')).strip()
|
||||||
|
target_nodes = str(d.get('target_nodes', '')).strip().lower()
|
||||||
|
target_profile = str(d.get('target_profile', '')).strip().upper()
|
||||||
|
restore_profile = str(d.get('restore_profile', 'NONE')).strip().upper()
|
||||||
|
start_time = str(d.get('start_time', '')).strip()
|
||||||
|
end_time = str(d.get('end_time', '')).strip()
|
||||||
|
|
||||||
|
if not title:
|
||||||
|
return err("Titolo evento obbligatorio")
|
||||||
|
if not target_nodes:
|
||||||
|
return err("Nodi target obbligatori")
|
||||||
|
if not target_profile:
|
||||||
|
return err("Profilo target obbligatorio")
|
||||||
|
if not start_time or not end_time:
|
||||||
|
return err("Date di inizio e fine obbligatorie")
|
||||||
|
|
||||||
|
# Validazione profili: stessa logica di /api/command (i comandi privilegiati solo per admin)
|
||||||
|
profiles_to_check = [target_profile] + ([restore_profile] if restore_profile != 'NONE' else [])
|
||||||
|
for prof in profiles_to_check:
|
||||||
|
if prof in SCHED_PRIVILEGED:
|
||||||
|
if auth['role'] != 'admin':
|
||||||
|
return err("Solo gli amministratori possono schedulare questo comando.", 403)
|
||||||
|
elif not (PROFILE_KEY_RE.match(prof) or prof in SIMPLE_COMMANDS):
|
||||||
|
return err("Profilo non valido")
|
||||||
|
|
||||||
|
# Validazione nodi target
|
||||||
|
if target_nodes != 'all':
|
||||||
|
node_list = [x.strip() for x in target_nodes.split(',') if x.strip()]
|
||||||
|
if not node_list or not all(CID_RE.match(x) for x in node_list):
|
||||||
|
return err("ID nodo non valido")
|
||||||
|
target_nodes = ','.join(node_list)
|
||||||
|
|
||||||
|
# Verifica permessi per node_admin
|
||||||
|
if auth['role'] == 'node_admin':
|
||||||
|
allowed = set(x.strip().lower() for x in auth['allowed_nodes'].split(','))
|
||||||
|
if 'all' not in allowed:
|
||||||
|
if target_nodes == 'all':
|
||||||
|
return err("Come Node Admin non puoi schedulare su tutta la flotta", 403)
|
||||||
|
req_nodes = set(x.strip().lower() for x in target_nodes.split(','))
|
||||||
|
if not req_nodes.issubset(allowed):
|
||||||
|
return err("Non hai i permessi per tutti i nodi selezionati", 403)
|
||||||
|
|
||||||
|
# Normalizza formati orari (accetta 'YYYY-MM-DDTHH:MM' o 'YYYY-MM-DD HH:MM')
|
||||||
|
st_norm = start_time.replace('T', ' ')
|
||||||
|
if len(st_norm) == 16: st_norm += ':00'
|
||||||
|
end_norm = end_time.replace('T', ' ')
|
||||||
|
if len(end_norm) == 16: end_norm += ':00'
|
||||||
|
|
||||||
|
if st_norm >= end_norm:
|
||||||
|
return err("L'orario di fine deve essere successivo a quello di inizio")
|
||||||
|
|
||||||
|
try:
|
||||||
|
with closing(db_connect()) as conn:
|
||||||
|
conn.execute("""INSERT INTO profile_schedules
|
||||||
|
(title, target_nodes, target_profile, restore_profile, start_time, end_time, status, created_by)
|
||||||
|
VALUES (?, ?, ?, ?, ?, ?, 'SCHEDULED', ?)""",
|
||||||
|
(title, target_nodes, target_profile, restore_profile, st_norm, end_norm, auth['username']))
|
||||||
|
conn.commit()
|
||||||
|
audit(auth['username'], target_nodes, f"CREATE_SCHED_{title}_{target_profile}")
|
||||||
|
return jsonify({"success": True})
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Errore salvataggio schedulazione: {e}")
|
||||||
|
return err(str(e))
|
||||||
|
|
||||||
|
@api_bp.route('/api/schedules/<int:sid>', methods=['DELETE'])
|
||||||
|
def cancel_schedule(sid):
|
||||||
|
auth = get_auth()
|
||||||
|
if not auth or auth['role'] not in ('admin', 'node_admin'):
|
||||||
|
return err("Non autorizzato", 403)
|
||||||
|
|
||||||
|
try:
|
||||||
|
with closing(db_connect(row=True)) as conn:
|
||||||
|
c = conn.cursor()
|
||||||
|
c.execute("SELECT id, title, target_nodes, status, restore_profile, created_by FROM profile_schedules WHERE id = ?", (sid,))
|
||||||
|
row = c.fetchone()
|
||||||
|
if not row:
|
||||||
|
return err("Schedulazione non trovata", 404)
|
||||||
|
|
||||||
|
# Controllo permessi node_admin
|
||||||
|
if auth['role'] == 'node_admin' and 'all' not in auth['allowed_nodes'].split(','):
|
||||||
|
allowed = set(x.strip().lower() for x in auth['allowed_nodes'].split(','))
|
||||||
|
t_nodes = set(x.strip().lower() for x in row['target_nodes'].split(','))
|
||||||
|
if not t_nodes.issubset(allowed):
|
||||||
|
return err("Non autorizzato per questa schedulazione", 403)
|
||||||
|
|
||||||
|
# Se era attiva, ripristina subito il profilo
|
||||||
|
if row['status'] == 'ACTIVE' and row['restore_profile'] and row['restore_profile'] != 'NONE':
|
||||||
|
from services.scheduler_service import apply_scheduled_profile, _is_admin
|
||||||
|
apply_scheduled_profile(row['target_nodes'], row['restore_profile'], "CANCEL_RESTORE",
|
||||||
|
allow_privileged=_is_admin(conn, row['created_by']))
|
||||||
|
|
||||||
|
conn.execute("UPDATE profile_schedules SET status = 'CANCELLED' WHERE id = ?", (sid,))
|
||||||
|
conn.commit()
|
||||||
|
|
||||||
|
audit(auth['username'], row['target_nodes'], f"CANCEL_SCHED_{sid}_{row['title']}")
|
||||||
|
return jsonify({"success": True})
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Errore annullamento schedulazione: {e}")
|
||||||
|
return err(str(e))
|
||||||
|
|||||||
+11
-2
@@ -12,7 +12,7 @@ from core.database import db_connect, audit
|
|||||||
auth_bp = Blueprint('auth', __name__)
|
auth_bp = Blueprint('auth', __name__)
|
||||||
|
|
||||||
# --- COSTANTI & REGEX VALIDAZIONE ---
|
# --- COSTANTI & REGEX VALIDAZIONE ---
|
||||||
VALID_ROLES = ('admin', 'operator')
|
VALID_ROLES = ('admin', 'node_admin', 'operator')
|
||||||
USERNAME_RE = re.compile(r'^[A-Za-z0-9_.@\-]{3,32}$')
|
USERNAME_RE = re.compile(r'^[A-Za-z0-9_.@\-]{3,32}$')
|
||||||
MIN_PASSWORD_LEN = 8
|
MIN_PASSWORD_LEN = 8
|
||||||
|
|
||||||
@@ -57,11 +57,20 @@ LOGIN_WINDOW_SEC = 300
|
|||||||
login_attempts = {}
|
login_attempts = {}
|
||||||
login_lock = threading.Lock()
|
login_lock = threading.Lock()
|
||||||
|
|
||||||
|
LOOPBACK_ADDRS = ('127.0.0.1', '::1')
|
||||||
|
|
||||||
def client_ip():
|
def client_ip():
|
||||||
|
fwd = request.headers.get('X-Forwarded-For', '')
|
||||||
if config.get('web', {}).get('trust_proxy'):
|
if config.get('web', {}).get('trust_proxy'):
|
||||||
fwd = request.headers.get('X-Forwarded-For', '')
|
|
||||||
if fwd:
|
if fwd:
|
||||||
return fwd.split(',')[0].strip()
|
return fwd.split(',')[0].strip()
|
||||||
|
elif fwd and request.remote_addr in LOOPBACK_ADDRS:
|
||||||
|
# Connessione dal proxy locale: solo lui puo' avere remote_addr loopback, quindi
|
||||||
|
# fidarsi dell'ultimo valore (quello aggiunto dal proxy) e' sicuro e evita che
|
||||||
|
# tutti gli utenti condividano 127.0.0.1 (lockout globale del login).
|
||||||
|
last = fwd.split(',')[-1].strip()
|
||||||
|
if last:
|
||||||
|
return last
|
||||||
return request.remote_addr or 'unknown'
|
return request.remote_addr or 'unknown'
|
||||||
|
|
||||||
def login_blocked(ip):
|
def login_blocked(ip):
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
import json
|
import json
|
||||||
import re
|
import re
|
||||||
|
import time
|
||||||
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, save_telemetry_to_sqlite
|
||||||
import core.state as state
|
import core.state as state
|
||||||
from services.push_service import broadcast_push_notification
|
from services.push_service import broadcast_push_notification
|
||||||
|
|
||||||
@@ -24,6 +25,9 @@ def on_connect(client, userdata, flags, reason_code, properties=None):
|
|||||||
topics_list = config.get('mqtt', {}).get('topics', default_topics)
|
topics_list = config.get('mqtt', {}).get('topics', default_topics)
|
||||||
subscribe_list = [(topic, 0) for topic in topics_list]
|
subscribe_list = [(topic, 0) for topic in topics_list]
|
||||||
subscribe_list.append(("+/+/log", 0))
|
subscribe_list.append(("+/+/log", 0))
|
||||||
|
subscribe_list.append(("/+/+/log", 0))
|
||||||
|
subscribe_list.append(("+/+/Log", 0))
|
||||||
|
subscribe_list.append(("/+/+/Log", 0))
|
||||||
|
|
||||||
client.subscribe(subscribe_list)
|
client.subscribe(subscribe_list)
|
||||||
logger.info(f"Sottoscritto a {len(subscribe_list)} topic MQTT.")
|
logger.info(f"Sottoscritto a {len(subscribe_list)} topic MQTT.")
|
||||||
@@ -40,7 +44,7 @@ def on_disconnect(client, userdata, disconnect_flags, reason_code, properties=No
|
|||||||
|
|
||||||
def on_message(client, userdata, msg):
|
def on_message(client, userdata, msg):
|
||||||
try:
|
try:
|
||||||
topic = msg.topic
|
topic = msg.topic.strip('/')
|
||||||
payload = msg.payload.decode('utf-8', errors='replace').strip()
|
payload = msg.payload.decode('utf-8', errors='replace').strip()
|
||||||
parts = topic.split('/')
|
parts = topic.split('/')
|
||||||
if len(parts) < 2:
|
if len(parts) < 2:
|
||||||
@@ -50,8 +54,26 @@ def on_message(client, userdata, msg):
|
|||||||
p0 = parts[0].lower().replace('-', '')
|
p0 = parts[0].lower().replace('-', '')
|
||||||
p2 = parts[2].lower().replace('-', '') if len(parts) > 2 else ""
|
p2 = parts[2].lower().replace('-', '') if len(parts) > 2 else ""
|
||||||
|
|
||||||
# --- 1. LOG SOFTWARE & FIRMWARE ---
|
# --- 1. LOG SOFTWARE, FIRMWARE & LIVE STREAM ---
|
||||||
if len(parts) >= 3 and parts[2].lower() == 'log':
|
if len(parts) >= 3 and parts[2].lower() == 'log':
|
||||||
|
svc_name = p0
|
||||||
|
|
||||||
|
# A) Salva in memoria per il Live Log
|
||||||
|
if cid not in state.node_logs:
|
||||||
|
from collections import deque
|
||||||
|
state.node_logs[cid] = deque(maxlen=100)
|
||||||
|
|
||||||
|
log_entry = {
|
||||||
|
"time": time.strftime("%H:%M:%S"),
|
||||||
|
"service": svc_name,
|
||||||
|
"text": payload
|
||||||
|
}
|
||||||
|
state.node_logs[cid].append(log_entry)
|
||||||
|
|
||||||
|
# Inoltra in tempo reale via WebSocket
|
||||||
|
state.emit_to_authorized(f"live_log_{cid}", log_entry, cid=cid)
|
||||||
|
|
||||||
|
# B) Parsa le versioni
|
||||||
if cid not in state.node_versions:
|
if cid not in state.node_versions:
|
||||||
state.node_versions[cid] = {}
|
state.node_versions[cid] = {}
|
||||||
|
|
||||||
@@ -84,6 +106,38 @@ def on_message(client, userdata, msg):
|
|||||||
if "GitID" not in state.node_versions[cid][last_prog]:
|
if "GitID" not in state.node_versions[cid][last_prog]:
|
||||||
state.node_versions[cid][last_prog] += f" (GitID #{git_id})"
|
state.node_versions[cid][last_prog] += f" (GitID #{git_id})"
|
||||||
state.notify_update()
|
state.notify_update()
|
||||||
|
|
||||||
|
# C) Estrazione APRS/DPRS raw dai log dei Gateway
|
||||||
|
if ('DPRS' in payload or 'APRS' in payload) and '>' in payload and ':' in payload:
|
||||||
|
# Es: I: 2026-11-08 12:30:58.615 DPRS IV3JDV /ID51 IV3JDV-9 IV3JDV-9>API51,DSTAR*:/115922h4503.75N/00731.49E[034/002/
|
||||||
|
m_aprs = re.search(r'([A-Z0-9\-]{3,9})>([^:]+):(.+)', payload)
|
||||||
|
if m_aprs:
|
||||||
|
src_part = m_aprs.group(1).strip()
|
||||||
|
header_part = m_aprs.group(2).strip()
|
||||||
|
pld_part = m_aprs.group(3).strip()
|
||||||
|
|
||||||
|
header_tokens = header_part.split(",")
|
||||||
|
dest_part = header_tokens[0]
|
||||||
|
path_str = ",".join(header_tokens[1:]) if len(header_tokens) > 1 else ""
|
||||||
|
|
||||||
|
aprs_data = {
|
||||||
|
"source": src_part,
|
||||||
|
"dest": dest_part,
|
||||||
|
"path": path_str,
|
||||||
|
"payload": pld_part,
|
||||||
|
"time": time.strftime("%H:%M:%S")
|
||||||
|
}
|
||||||
|
|
||||||
|
if not hasattr(state, 'aprs_msgs'):
|
||||||
|
from collections import deque
|
||||||
|
state.aprs_msgs = deque(maxlen=100)
|
||||||
|
|
||||||
|
state.aprs_msgs.append(aprs_data)
|
||||||
|
logger.info(f"📍 APRS (da log {svc_name}): {src_part} -> {dest_part}")
|
||||||
|
state.emit_aprs(aprs_data)
|
||||||
|
|
||||||
|
# NOTA: Rimosso il return incondizionato qui, perché il log deve completare la sua corsa
|
||||||
|
# e non bloccare eventuali altre logiche!
|
||||||
return
|
return
|
||||||
|
|
||||||
# Aggiornamento timestamp last_seen
|
# Aggiornamento timestamp last_seen
|
||||||
@@ -160,6 +214,16 @@ def on_message(client, userdata, msg):
|
|||||||
|
|
||||||
health_changed = state.device_health.get(cid) != new_health
|
health_changed = state.device_health.get(cid) != new_health
|
||||||
state.device_health[cid] = new_health
|
state.device_health[cid] = new_health
|
||||||
|
|
||||||
|
# Salvataggio storico nel DB (campionamento max 1 volta ogni 15 minuti)
|
||||||
|
now_ts = time.time()
|
||||||
|
last_save = getattr(state, 'last_telemetry_save', {}).get(cid, 0)
|
||||||
|
if now_ts - last_save >= 900: # 15 minuti (900 secondi)
|
||||||
|
save_telemetry_to_sqlite(cid, new_health)
|
||||||
|
if not hasattr(state, 'last_telemetry_save'):
|
||||||
|
state.last_telemetry_save = {}
|
||||||
|
state.last_telemetry_save[cid] = now_ts
|
||||||
|
|
||||||
if health_changed:
|
if health_changed:
|
||||||
state.notify_update()
|
state.notify_update()
|
||||||
|
|
||||||
@@ -331,7 +395,11 @@ def on_message(client, userdata, msg):
|
|||||||
logger.warning(f"Formato APRS non decodificato: {payload}")
|
logger.warning(f"Formato APRS non decodificato: {payload}")
|
||||||
|
|
||||||
logger.info(f"📍 Inoltro pacchetto APRS al frontend: {data['source']} -> {data['dest']} via [{data['path']}]")
|
logger.info(f"📍 Inoltro pacchetto APRS al frontend: {data['source']} -> {data['dest']} via [{data['path']}]")
|
||||||
state.socketio.emit('aprs_msg', data)
|
if not hasattr(state, 'aprs_msgs'):
|
||||||
|
from collections import deque
|
||||||
|
state.aprs_msgs = deque(maxlen=100)
|
||||||
|
state.aprs_msgs.append(data)
|
||||||
|
state.emit_aprs(data)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"Errore parsing APRS: {e}")
|
logger.error(f"Errore parsing APRS: {e}")
|
||||||
|
|
||||||
@@ -459,6 +527,16 @@ def on_message(client, userdata, msg):
|
|||||||
mqtt_id = config.get('mqtt', {}).get('client_id', 'flask_backend_generic')
|
mqtt_id = config.get('mqtt', {}).get('client_id', 'flask_backend_generic')
|
||||||
mqtt_backend = mqtt_client.Client(mqtt_client.CallbackAPIVersion.VERSION2, mqtt_id)
|
mqtt_backend = mqtt_client.Client(mqtt_client.CallbackAPIVersion.VERSION2, mqtt_id)
|
||||||
mqtt_backend.username_pw_set(config.get('mqtt', {}).get('user', ''), config.get('mqtt', {}).get('password', ''))
|
mqtt_backend.username_pw_set(config.get('mqtt', {}).get('user', ''), config.get('mqtt', {}).get('password', ''))
|
||||||
|
# TLS opzionale (default: disattivato, comportamento invariato). In config.json:
|
||||||
|
# "mqtt": { ..., "port": 8883, "tls": true, "ca_certs": "/etc/ssl/certs/ca-certificates.crt" }
|
||||||
|
if config.get('mqtt', {}).get('tls'):
|
||||||
|
import ssl
|
||||||
|
try:
|
||||||
|
mqtt_backend.tls_set(ca_certs=config.get('mqtt', {}).get('ca_certs') or None,
|
||||||
|
cert_reqs=ssl.CERT_REQUIRED)
|
||||||
|
logger.info("🔒 MQTT: TLS abilitato")
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"MQTT TLS non configurabile: {e}")
|
||||||
mqtt_backend.on_connect = on_connect
|
mqtt_backend.on_connect = on_connect
|
||||||
mqtt_backend.on_disconnect = on_disconnect
|
mqtt_backend.on_disconnect = on_disconnect
|
||||||
mqtt_backend.on_message = on_message
|
mqtt_backend.on_message = on_message
|
||||||
|
|||||||
@@ -4,17 +4,10 @@ from contextlib import closing
|
|||||||
from pywebpush import webpush, WebPushException
|
from pywebpush import webpush, WebPushException
|
||||||
from core.config import config, logger
|
from core.config import config, logger
|
||||||
from core.database import db_connect
|
from core.database import db_connect
|
||||||
|
from core.permissions import node_allowed # noqa: F401 (re-export per compatibilita')
|
||||||
|
|
||||||
push_queue = queue.Queue(maxsize=200)
|
push_queue = queue.Queue(maxsize=200)
|
||||||
|
|
||||||
def node_allowed(role, allowed_nodes, cid):
|
|
||||||
if role == 'admin':
|
|
||||||
return True
|
|
||||||
allowed = (allowed_nodes or '').strip().lower()
|
|
||||||
if allowed == 'all':
|
|
||||||
return True
|
|
||||||
return cid in [x.strip().lower() for x in allowed.split(',') if x.strip()]
|
|
||||||
|
|
||||||
def broadcast_push_notification(title, body, cid=None):
|
def broadcast_push_notification(title, body, cid=None):
|
||||||
if not config.get('webpush'):
|
if not config.get('webpush'):
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -46,5 +46,104 @@ def auto_update_ids():
|
|||||||
prune_old_data()
|
prune_old_data()
|
||||||
time.sleep(65)
|
time.sleep(65)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"⚠️ Errore nel thread update: {e}")
|
logger.error(f"⚠️ Errore nel thread aggiornamento ID: {e}")
|
||||||
time.sleep(30)
|
time.sleep(15)
|
||||||
|
|
||||||
|
def schedule_loop():
|
||||||
|
"""Thread dedicato alle schedulazioni: non e' piu' bloccato dai download degli ID."""
|
||||||
|
while True:
|
||||||
|
try:
|
||||||
|
check_profile_schedules()
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"⚠️ Errore nel thread schedulazioni: {e}")
|
||||||
|
time.sleep(15)
|
||||||
|
|
||||||
|
from contextlib import closing
|
||||||
|
from core.database import db_connect, audit
|
||||||
|
|
||||||
|
# Comandi che le API riservano agli admin: una schedulazione li puo' inviare solo se creata da un admin.
|
||||||
|
PRIVILEGED_COMMANDS = {'REBOOT', 'RESET_HAT', 'UPDATE_AGENT'}
|
||||||
|
|
||||||
|
def _is_admin(conn, username):
|
||||||
|
row = conn.execute("SELECT role FROM users WHERE username = ?", (username,)).fetchone()
|
||||||
|
return bool(row) and row[0] == 'admin'
|
||||||
|
|
||||||
|
def apply_scheduled_profile(target_nodes, profile, action_type="SWITCH", allow_privileged=False):
|
||||||
|
if str(profile).strip().upper() in PRIVILEGED_COMMANDS and not allow_privileged:
|
||||||
|
logger.warning(f"🚫 Scheduler: comando privilegiato '{profile}' ignorato (schedulazione non creata da un admin)")
|
||||||
|
return
|
||||||
|
from services.mqtt_service import mqtt_publish
|
||||||
|
from core.config import CLIENTS_PATH
|
||||||
|
import json
|
||||||
|
import re
|
||||||
|
|
||||||
|
CID_RE = re.compile(r'^[a-z0-9][a-z0-9_\-]{0,63}$')
|
||||||
|
nodes = []
|
||||||
|
if target_nodes.strip().lower() == 'all':
|
||||||
|
if os.path.exists(CLIENTS_PATH):
|
||||||
|
try:
|
||||||
|
with open(CLIENTS_PATH, 'r') as f:
|
||||||
|
clist = json.load(f)
|
||||||
|
nodes = [str(c.get('id', '')).lower() for c in clist if CID_RE.match(str(c.get('id', '')).lower())]
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Errore lettura clients per schedule: {e}")
|
||||||
|
else:
|
||||||
|
nodes = [x.strip().lower() for x in target_nodes.split(',') if CID_RE.match(x.strip().lower())]
|
||||||
|
|
||||||
|
logger.info(f"📅 Scheduler applica profilo [{profile}] su {len(nodes)} nodi ({target_nodes})")
|
||||||
|
for cid in nodes:
|
||||||
|
mqtt_publish(f"servizi/{cid}/cmnd", profile)
|
||||||
|
if cid in state.client_telemetry and isinstance(state.client_telemetry[cid], dict):
|
||||||
|
state.client_telemetry[cid]["alt"] = f"📅 SCHED: {profile}"
|
||||||
|
state.notify_update()
|
||||||
|
|
||||||
|
def check_profile_schedules():
|
||||||
|
try:
|
||||||
|
now_str = time.strftime('%Y-%m-%d %H:%M:%S')
|
||||||
|
with closing(db_connect(row=True)) as conn:
|
||||||
|
c = conn.cursor()
|
||||||
|
c.execute("""SELECT id, title, target_nodes, target_profile, restore_profile,
|
||||||
|
start_time, end_time, status, created_by
|
||||||
|
FROM profile_schedules
|
||||||
|
WHERE status IN ('SCHEDULED', 'ACTIVE')""")
|
||||||
|
rows = c.fetchall()
|
||||||
|
|
||||||
|
for row in rows:
|
||||||
|
sid = row['id']
|
||||||
|
title = row['title']
|
||||||
|
nodes = row['target_nodes']
|
||||||
|
target_prof = row['target_profile']
|
||||||
|
restore_prof = row['restore_profile']
|
||||||
|
st_time = row['start_time']
|
||||||
|
end_time = row['end_time']
|
||||||
|
status = row['status']
|
||||||
|
|
||||||
|
# Formattiamo le date nel caso abbiano una 'T' (input HTML5 datetime-local)
|
||||||
|
st_norm = st_time.replace('T', ' ')
|
||||||
|
if len(st_norm) == 16: st_norm += ':00'
|
||||||
|
end_norm = end_time.replace('T', ' ')
|
||||||
|
if len(end_norm) == 16: end_norm += ':00'
|
||||||
|
|
||||||
|
if status == 'SCHEDULED':
|
||||||
|
if st_norm <= now_str < end_norm:
|
||||||
|
logger.info(f"▶️ Avvio schedulazione ID {sid} - '{title}' -> Profilo {target_prof}")
|
||||||
|
apply_scheduled_profile(nodes, target_prof, "START", allow_privileged=_is_admin(conn, row['created_by']))
|
||||||
|
conn.execute("UPDATE profile_schedules SET status = 'ACTIVE' WHERE id = ?", (sid,))
|
||||||
|
conn.commit()
|
||||||
|
audit("SCHEDULER", nodes, f"START_SCHED_{sid}_{target_prof}")
|
||||||
|
elif now_str >= end_norm:
|
||||||
|
# Scaduta prima di iniziare
|
||||||
|
logger.warning(f"⌛ Schedulazione ID {sid} - '{title}' scaduta senza esecuzione.")
|
||||||
|
conn.execute("UPDATE profile_schedules SET status = 'EXPIRED' WHERE id = ?", (sid,))
|
||||||
|
conn.commit()
|
||||||
|
|
||||||
|
elif status == 'ACTIVE':
|
||||||
|
if now_str >= end_norm:
|
||||||
|
logger.info(f"⏹️ Fine schedulazione ID {sid} - '{title}' -> Ripristino {restore_prof}")
|
||||||
|
if restore_prof and restore_prof.upper() != 'NONE':
|
||||||
|
apply_scheduled_profile(nodes, restore_prof, "RESTORE", allow_privileged=_is_admin(conn, row['created_by']))
|
||||||
|
conn.execute("UPDATE profile_schedules SET status = 'COMPLETED' WHERE id = ?", (sid,))
|
||||||
|
conn.commit()
|
||||||
|
audit("SCHEDULER", nodes, f"RESTORE_SCHED_{sid}_{restore_prof}")
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Errore controllo schedulazioni profili: {e}")
|
||||||
|
|||||||
@@ -1,88 +1,46 @@
|
|||||||
import time
|
import time
|
||||||
import sqlite3
|
import json
|
||||||
from contextlib import closing
|
import logging
|
||||||
from core.config import DB_PATH, logger
|
from core.state import get_all_nodes, update_node_state, delete_node, last_seen as global_last_seen
|
||||||
import core.state as state
|
from core.database import archive_node_error
|
||||||
from services.push_service import broadcast_push_notification
|
|
||||||
|
|
||||||
watchdog_notified = {}
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
def run_diagnostics():
|
|
||||||
new_warnings = {}
|
|
||||||
|
|
||||||
# 1. Analisi Hardware (Temperatura e Spazio Disco)
|
|
||||||
for cid, health in list(state.device_health.items()):
|
|
||||||
node_warns = []
|
|
||||||
state_up = str(state.client_states.get(cid, '')).upper()
|
|
||||||
if 'OFF' in state_up or state_up == '':
|
|
||||||
continue
|
|
||||||
|
|
||||||
temp = health.get('temp', 0)
|
|
||||||
disk = health.get('disk', 0)
|
|
||||||
|
|
||||||
# Allarme Temperatura CPU (Soglia 75°C, rientro 68°C)
|
|
||||||
key_temp = f"{cid}_TEMP"
|
|
||||||
if temp >= 75.0:
|
|
||||||
node_warns.append(f"🌡️ Alta Temperatura ({temp}°C)")
|
|
||||||
if not watchdog_notified.get(key_temp):
|
|
||||||
broadcast_push_notification(f"🌡️ ALLARME TERMICO: {cid.upper()}", f"CPU surriscaldata a {temp}°C! Verificare ventilazione.", cid=cid)
|
|
||||||
watchdog_notified[key_temp] = True
|
|
||||||
elif temp < 68.0 and watchdog_notified.get(key_temp):
|
|
||||||
broadcast_push_notification(f"✅ TEMPERATURA OK: {cid.upper()}", f"Temperatura CPU rientrata a {temp}°C.", cid=cid)
|
|
||||||
del watchdog_notified[key_temp]
|
|
||||||
|
|
||||||
# Allarme Spazio Disco (Soglia 90%, rientro 85%)
|
|
||||||
key_disk = f"{cid}_DISK"
|
|
||||||
if disk >= 90.0:
|
|
||||||
node_warns.append(f"💾 Spazio Disco Quasi Pieno ({disk}%)")
|
|
||||||
if not watchdog_notified.get(key_disk):
|
|
||||||
broadcast_push_notification(f"💾 DISCO CRITICO: {cid.upper()}", f"Utilizzo disco al {disk}%. Rischio blocco log MMDVM.", cid=cid)
|
|
||||||
watchdog_notified[key_disk] = True
|
|
||||||
elif disk < 85.0 and watchdog_notified.get(key_disk):
|
|
||||||
del watchdog_notified[key_disk]
|
|
||||||
|
|
||||||
if node_warns:
|
|
||||||
new_warnings.setdefault(cid, []).extend(node_warns)
|
|
||||||
|
|
||||||
# 2. Analisi Radio RF (Media BER sulle ultime 2 ore, solo transiti RF locali)
|
|
||||||
try:
|
|
||||||
with closing(sqlite3.connect(DB_PATH, timeout=10)) as conn:
|
|
||||||
cur = conn.cursor()
|
|
||||||
cur.execute("""
|
|
||||||
SELECT LOWER(client_id), AVG(ber), COUNT(*)
|
|
||||||
FROM radio_logs
|
|
||||||
WHERE timestamp >= datetime('now', 'localtime', '-5 minutes')
|
|
||||||
AND source_id NOT LIKE '🌐%'
|
|
||||||
AND (source_conn IS NULL OR LOWER(source_conn) != 'network')
|
|
||||||
GROUP BY LOWER(client_id)
|
|
||||||
""")
|
|
||||||
rows = cur.fetchall()
|
|
||||||
|
|
||||||
for cid, avg_ber, cnt in rows:
|
|
||||||
key_ber = f"{cid}_BER"
|
|
||||||
if cnt >= 2 and avg_ber is not None and avg_ber >= 5.0:
|
|
||||||
new_warnings.setdefault(cid, []).append(f"⚠️ Alto BER RF ({avg_ber:.1f}%)")
|
|
||||||
if not watchdog_notified.get(key_ber):
|
|
||||||
broadcast_push_notification(f"⚠️ ANOMALIA RF: {cid.upper()}", f"Rilevato BER medio del {avg_ber:.1f}% negli ultimi {cnt} passaggi RF.", cid=cid)
|
|
||||||
watchdog_notified[key_ber] = True
|
|
||||||
elif avg_ber is not None and avg_ber < 3.0:
|
|
||||||
if watchdog_notified.get(key_ber):
|
|
||||||
del watchdog_notified[key_ber]
|
|
||||||
except Exception as e:
|
|
||||||
logger.error(f"Errore diagnostica BER Watchdog: {e}")
|
|
||||||
|
|
||||||
# Aggiorna il dizionario globale condiviso preservando i riferimenti in memoria
|
|
||||||
changed = new_warnings != state.active_warnings
|
|
||||||
state.active_warnings.clear()
|
|
||||||
state.active_warnings.update(new_warnings)
|
|
||||||
if changed:
|
|
||||||
state.notify_update()
|
|
||||||
|
|
||||||
def watchdog_loop():
|
def watchdog_loop():
|
||||||
time.sleep(15) # Attesa iniziale all'avvio
|
logger.info("Watchdog service started.")
|
||||||
while True:
|
while True:
|
||||||
try:
|
try:
|
||||||
run_diagnostics()
|
now = time.time()
|
||||||
|
nodes = get_all_nodes()
|
||||||
|
|
||||||
|
for node_id, state in nodes.items():
|
||||||
|
# 1. Normalizza lo stato se è una stringa (es. "ONLINE" o JSON serializzato)
|
||||||
|
if isinstance(state, str):
|
||||||
|
try:
|
||||||
|
state = json.loads(state)
|
||||||
|
except Exception:
|
||||||
|
state = {"status": state}
|
||||||
|
elif not isinstance(state, dict):
|
||||||
|
continue
|
||||||
|
|
||||||
|
# 2. Recupera last_seen (dal dict, dalla mappa globale di state.py o now)
|
||||||
|
node_seen = global_last_seen.get(node_id, {})
|
||||||
|
last_seen_ts = max(node_seen.values()) if node_seen else now
|
||||||
|
last_seen = float(state.get("last_seen") or last_seen_ts)
|
||||||
|
status = state.get("status", "UNKNOWN")
|
||||||
|
|
||||||
|
# 3. Rilevamento disconnessione (nessun heartbeat per 60 secondi)
|
||||||
|
if now - last_seen > 60 and status not in ["OFFLINE", "ERROR"]:
|
||||||
|
update_node_state(node_id, {"status": "OFFLINE"})
|
||||||
|
logger.warning(f"Nodo {node_id} marcato come OFFLINE (timeout heartbeat)")
|
||||||
|
|
||||||
|
# 4. Archiviazione errori critici (in errore per più di 5 minuti)
|
||||||
|
if status == "ERROR" and (now - last_seen > 300):
|
||||||
|
archive_node_error(node_id, state)
|
||||||
|
delete_node(node_id)
|
||||||
|
logger.error(f"Nodo {node_id} rimosso da Redis e archiviato su DB per errore prolungato.")
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"Errore nel loop del Watchdog: {e}")
|
logger.error(f"Errore nel ciclo di watchdog: {e}")
|
||||||
time.sleep(60)
|
|
||||||
|
time.sleep(10)
|
||||||
|
|||||||
@@ -31,8 +31,8 @@ body {
|
|||||||
#top-bar { padding: 12px 20px; display: flex; flex-wrap: wrap; justify-content: space-between; align-items: center; gap: 15px; border: 1px solid var(--border-main); width: 100%; max-width: 1400px; background: rgba(6, 36, 111, 0.5); }
|
#top-bar { padding: 12px 20px; display: flex; flex-wrap: wrap; justify-content: space-between; align-items: center; gap: 15px; border: 1px solid var(--border-main); width: 100%; max-width: 1400px; background: rgba(6, 36, 111, 0.5); }
|
||||||
.title-brand { font-size: 1.2rem; font-weight: 300; letter-spacing: 4px; color: var(--text-main); text-transform: uppercase; white-space: nowrap; flex-shrink: 0; margin-right: 10px;}
|
.title-brand { font-size: 1.2rem; font-weight: 300; letter-spacing: 4px; color: var(--text-main); text-transform: uppercase; white-space: nowrap; flex-shrink: 0; margin-right: 10px;}
|
||||||
|
|
||||||
.nav-tabs { display: flex; gap: 10px; flex: 1 1 auto; min-width: 250px; flex-wrap: wrap; justify-content: flex-start; margin-left: 0;}
|
.nav-tabs { display: flex; gap: 10px; flex-wrap: nowrap; justify-content: flex-start; margin-left: 0;}
|
||||||
.nav-tab { background: transparent; border: 1px solid transparent; color: var(--text-muted); font-size: 0.85rem; font-weight: 300; letter-spacing: 2px; cursor: pointer; padding: 6px 16px; transition: all 0.2s ease; text-transform: uppercase; white-space: nowrap;}
|
.nav-tab { background: transparent; border: 1px solid transparent; color: var(--text-muted); font-size: 0.85rem; font-weight: 300; letter-spacing: 2px; cursor: pointer; padding: 6px 14px; transition: all 0.2s ease; text-transform: uppercase; white-space: nowrap;}
|
||||||
.nav-tab:hover { color: var(--text-main); border: 1px solid var(--border-light); }
|
.nav-tab:hover { color: var(--text-main); border: 1px solid var(--border-light); }
|
||||||
.nav-tab.active { color: var(--text-main); border: 1px solid var(--border-main); }
|
.nav-tab.active { color: var(--text-main); border: 1px solid var(--border-main); }
|
||||||
|
|
||||||
@@ -40,7 +40,7 @@ body {
|
|||||||
.theme-switch:hover { background: rgba(255,255,255,0.1); }
|
.theme-switch:hover { background: rgba(255,255,255,0.1); }
|
||||||
|
|
||||||
/* Container for right side items (auth and other buttons) */
|
/* Container for right side items (auth and other buttons) */
|
||||||
.top-bar-right { display: flex; align-items: center; gap: 10px; flex-wrap: wrap; justify-content: flex-end; flex: 1 1 auto; }
|
.top-bar-right { display: flex; align-items: center; gap: 8px; flex-wrap: nowrap; justify-content: flex-end; flex: none; }
|
||||||
|
|
||||||
/* FILTRI E CONTROLLI VIEW */
|
/* FILTRI E CONTROLLI VIEW */
|
||||||
.filter-bar { background: rgba(6, 36, 111, 0.90); border: 1px solid var(--border-main); padding: 10px 20px; display: flex; gap: 15px; flex-wrap: wrap; align-items: center; justify-content: space-between; margin-bottom: 20px; }
|
.filter-bar { background: rgba(6, 36, 111, 0.90); border: 1px solid var(--border-main); padding: 10px 20px; display: flex; gap: 15px; flex-wrap: wrap; align-items: center; justify-content: space-between; margin-bottom: 20px; }
|
||||||
|
|||||||
+277
-24
@@ -10,6 +10,7 @@ function updateClock() {
|
|||||||
|
|
||||||
// --- VARIABILI GLOBALI E UI VIEW ---
|
// --- VARIABILI GLOBALI E UI VIEW ---
|
||||||
let clients = [];
|
let clients = [];
|
||||||
|
let activeLoggedUsers = [];
|
||||||
let me = { logged_in: false, user: '', role: '', allowed_nodes: '' };
|
let me = { logged_in: false, user: '', role: '', allowed_nodes: '' };
|
||||||
let isAuthenticated = false;
|
let isAuthenticated = false;
|
||||||
let usersCache = {};
|
let usersCache = {};
|
||||||
@@ -24,6 +25,7 @@ let searchQuery = '';
|
|||||||
let viewMode = localStorage.getItem('fleetViewMode') || 'grid';
|
let viewMode = localStorage.getItem('fleetViewMode') || 'grid';
|
||||||
let fleetMap = null;
|
let fleetMap = null;
|
||||||
let mapMarkers = {};
|
let mapMarkers = {};
|
||||||
|
let aprsMarkers = {};
|
||||||
|
|
||||||
let currentFocusedNode = null;
|
let currentFocusedNode = null;
|
||||||
let currentMmdvmConfig = "";
|
let currentMmdvmConfig = "";
|
||||||
@@ -112,7 +114,7 @@ function openNodeFocus(clientId) {
|
|||||||
|
|
||||||
const role = me.role || '';
|
const role = me.role || '';
|
||||||
const allowedList = String(me.allowed_nodes || '').split(',').map(x => x.trim().toLowerCase()).filter(Boolean);
|
const allowedList = String(me.allowed_nodes || '').split(',').map(x => x.trim().toLowerCase()).filter(Boolean);
|
||||||
let canControl = isAuthenticated && (role === 'admin' || allowedList.includes('all') || allowedList.includes(clientId.toLowerCase()));
|
let canControl = isAuthenticated && (allowedList.includes('all') || allowedList.includes(clientId.toLowerCase()));
|
||||||
|
|
||||||
const modesCard = document.getElementById('focus-modes-card');
|
const modesCard = document.getElementById('focus-modes-card');
|
||||||
if (modesCard) {
|
if (modesCard) {
|
||||||
@@ -126,6 +128,7 @@ function openNodeFocus(clientId) {
|
|||||||
|
|
||||||
refreshStates();
|
refreshStates();
|
||||||
refreshLogs();
|
refreshLogs();
|
||||||
|
setTimeout(loadNodeAnalytics, 300);
|
||||||
}
|
}
|
||||||
|
|
||||||
function closeNodeFocus() {
|
function closeNodeFocus() {
|
||||||
@@ -148,6 +151,7 @@ window.addEventListener('DOMContentLoaded', () => {
|
|||||||
checkServerUpdate();
|
checkServerUpdate();
|
||||||
setInterval(checkServerUpdate, 3600000);
|
setInterval(checkServerUpdate, 3600000);
|
||||||
refreshAprs();
|
refreshAprs();
|
||||||
|
setInterval(cleanupAprsMarkers, 60000);
|
||||||
});
|
});
|
||||||
|
|
||||||
// --- FUNZIONI FILTRO E LAYOUT ---
|
// --- FUNZIONI FILTRO E LAYOUT ---
|
||||||
@@ -208,6 +212,16 @@ function applyFilters() {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function showActiveUsers() {
|
||||||
|
if (!activeLoggedUsers || activeLoggedUsers.length === 0) {
|
||||||
|
customAlert("[ USERS ]", "Nessun operatore attualmente loggato.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const html = activeLoggedUsers.map(u => `<div style="padding: 5px; border-bottom: 1px dashed var(--border-light); color: var(--success); font-family: 'JetBrains Mono'; font-size: 0.9rem;">🟢 ${esc(u.toUpperCase())}</div>`).join('');
|
||||||
|
customAlert("[ SYS_OPS_ONLINE ]", html);
|
||||||
|
}
|
||||||
|
|
||||||
function fmtAge(sec) {
|
function fmtAge(sec) {
|
||||||
sec = Math.max(0, Math.round(sec));
|
sec = Math.max(0, Math.round(sec));
|
||||||
if (sec < 60) return sec + 's';
|
if (sec < 60) return sec + 's';
|
||||||
@@ -290,7 +304,7 @@ function sendTgCommand(clientId, comando) {
|
|||||||
async function fetchNodeConfigForModes(clientId) {
|
async function fetchNodeConfigForModes(clientId) {
|
||||||
const role = me.role || '';
|
const role = me.role || '';
|
||||||
const allowedList = String(me.allowed_nodes || '').split(',').map(x => x.trim().toLowerCase()).filter(Boolean);
|
const allowedList = String(me.allowed_nodes || '').split(',').map(x => x.trim().toLowerCase()).filter(Boolean);
|
||||||
let canControl = isAuthenticated && (role === 'admin' || allowedList.includes('all') || allowedList.includes(clientId.toLowerCase()));
|
let canControl = isAuthenticated && (allowedList.includes('all') || allowedList.includes(clientId.toLowerCase()));
|
||||||
const modesCard = document.getElementById('focus-modes-card');
|
const modesCard = document.getElementById('focus-modes-card');
|
||||||
if (!canControl) {
|
if (!canControl) {
|
||||||
if (modesCard) modesCard.style.display = 'none';
|
if (modesCard) modesCard.style.display = 'none';
|
||||||
@@ -349,7 +363,7 @@ async function fetchNodeConfigForModes(clientId) {
|
|||||||
function renderModeToggles(clientId, statusMsg = "") {
|
function renderModeToggles(clientId, statusMsg = "") {
|
||||||
const role = me.role || '';
|
const role = me.role || '';
|
||||||
const allowedList = String(me.allowed_nodes || '').split(',').map(x => x.trim().toLowerCase()).filter(Boolean);
|
const allowedList = String(me.allowed_nodes || '').split(',').map(x => x.trim().toLowerCase()).filter(Boolean);
|
||||||
let canControl = isAuthenticated && (role === 'admin' || allowedList.includes('all') || allowedList.includes(clientId.toLowerCase()));
|
let canControl = isAuthenticated && (allowedList.includes('all') || allowedList.includes(clientId.toLowerCase()));
|
||||||
|
|
||||||
const modesCard = document.getElementById('focus-modes-card');
|
const modesCard = document.getElementById('focus-modes-card');
|
||||||
if (modesCard) {
|
if (modesCard) {
|
||||||
@@ -530,23 +544,28 @@ async function initUI() {
|
|||||||
const allowedList = String(me.allowed_nodes || '').split(',').map(x => x.trim().toLowerCase()).filter(Boolean);
|
const allowedList = String(me.allowed_nodes || '').split(',').map(x => x.trim().toLowerCase()).filter(Boolean);
|
||||||
|
|
||||||
if (isAuthenticated) {
|
if (isAuthenticated) {
|
||||||
let adminBtn = role === 'admin' ? `
|
const hasAllNodes = allowedList.includes('all');
|
||||||
<button id="server-update-btn" onclick="confirmServerUpdate()" class="auth-btn" style="border-color:var(--danger); color:var(--danger) !important; display:none;" title="Aggiornamento Server Disponibile">[ UPD_SERVER ]</button>
|
const canOverride = hasAllNodes;
|
||||||
<button onclick="sendGlobalUpdate()" class="auth-btn" style="color:var(--accent);" data-i18n-title="ttReqCfg" title="${t('ttReqCfg')}">[ ${t('btnReqCfg')} ]</button>
|
|
||||||
<button onclick="triggerGlobalEmergency()" class="auth-btn" style="color:var(--danger);" data-i18n-title="ttGlobal" title="${t('ttGlobal')}">[ ${t('btnGlobal')} ]</button>
|
|
||||||
<button onclick="openAdmin()" class="auth-btn" style="color:var(--primary);" data-i18n-title="ttAdmin" title="${t('ttAdmin')}">[ ${t('btnAdmin')} ]</button>` : '';
|
|
||||||
|
|
||||||
authContainer.innerHTML = `${adminBtn}
|
// 1. Nella barra principale in alto teniamo SOLO [ SYS_ADM ], UTENTE e CONTROLLI SESSIONE
|
||||||
<span style="font-weight:300; font-size:0.85rem; margin: 0 10px; font-family:'JetBrains Mono', monospace; color:var(--primary);">USR: ${esc(String(me.user).toUpperCase())}</span>
|
let topBarAdminBtn = '';
|
||||||
<button onclick="changeMyPassword()" class="auth-btn" data-i18n-title="ttPass" title="${t('ttPass')}">[ ${t('btnPass')} ]</button>
|
if (role === 'admin' || role === 'node_admin') {
|
||||||
<button onclick="logout()" class="auth-btn" data-i18n-title="ttLogout" title="${t('ttLogout')}">[ ${t('btnLogout')} ]</button>`;
|
topBarAdminBtn = `<button onclick="openAdmin()" class="auth-btn" style="color:var(--primary);" data-i18n-title="ttAdmin" title="${t('ttAdmin')}">[ ${t('btnAdmin')} ]</button>`;
|
||||||
|
}
|
||||||
|
|
||||||
|
authContainer.innerHTML = `<div style="display:flex; align-items:center; gap:8px; justify-content:flex-end; flex-wrap:nowrap; width:100%;">
|
||||||
|
${topBarAdminBtn}
|
||||||
|
<span style="font-weight:400; font-size:0.75rem; margin: 0 4px; font-family:'JetBrains Mono', monospace; color:var(--primary); white-space:nowrap; letter-spacing: 1px;">USR: ${esc(String(me.user).toUpperCase())}</span>
|
||||||
|
<button onclick="changeMyPassword()" class="auth-btn" data-i18n-title="ttPass" title="${t('ttPass')}" style="padding:4px 10px; font-size:0.75rem;">[ ${t('btnPass')} ]</button>
|
||||||
|
<button onclick="logout()" class="auth-btn" data-i18n-title="ttLogout" title="${t('ttLogout')}" style="padding:4px 10px; font-size:0.75rem;">[ ${t('btnLogout')} ]</button>
|
||||||
|
</div>`;
|
||||||
} else {
|
} else {
|
||||||
authContainer.innerHTML = `<button onclick="openLoginModal()" class="auth-btn" style="color:var(--success);">[ AUTH ]</button>`;
|
authContainer.innerHTML = `<button onclick="openLoginModal()" class="auth-btn" style="color:var(--success);">[ AUTH ]</button>`;
|
||||||
}
|
}
|
||||||
|
|
||||||
grid.innerHTML = clients.map(c => {
|
grid.innerHTML = clients.map(c => {
|
||||||
let canControl = isAuthenticated && (role === 'admin' || allowedList.includes('all') || allowedList.includes(c.id.toLowerCase()));
|
let canControl = isAuthenticated && (allowedList.includes('all') || allowedList.includes(c.id.toLowerCase()));
|
||||||
let showReboot = (role === 'admin');
|
let showReboot = (role === 'admin' || role === 'node_admin') && canControl;
|
||||||
|
|
||||||
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">
|
||||||
@@ -610,6 +629,7 @@ async function initUI() {
|
|||||||
<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>
|
||||||
|
<button class="btn-cmd" style="border-color: var(--success); color: var(--success) !important;" title="${t('liveTerminal')}" onclick="openLogModal('${c.id}')">LOG</button>
|
||||||
<button class="btn-cmd" style="border-color: var(--danger); color: var(--danger) !important;" title="${t('ttHat')}" onclick="confirmHatReset('${c.id}')">${t('btnHat')}</button>
|
<button class="btn-cmd" style="border-color: var(--danger); color: var(--danger) !important;" title="${t('ttHat')}" onclick="confirmHatReset('${c.id}')">${t('btnHat')}</button>
|
||||||
<button class="btn-cmd" style="border-color: var(--danger); color: var(--danger) !important;" title="${t('ttBoot')}" onclick="confirmReboot('${c.id}')">${t('btnBoot')}</button>
|
<button class="btn-cmd" style="border-color: var(--danger); color: var(--danger) !important;" title="${t('ttBoot')}" onclick="confirmReboot('${c.id}')">${t('btnBoot')}</button>
|
||||||
<button id="btn-ota-${c.id}" class="btn-cmd" style="border-color: var(--primary); color: var(--primary) !important;" title="Update OTA" onclick="confirmUpdateAgent('${c.id}')">OTA</button>
|
<button id="btn-ota-${c.id}" class="btn-cmd" style="border-color: var(--primary); color: var(--primary) !important;" title="Update OTA" onclick="confirmUpdateAgent('${c.id}')">OTA</button>
|
||||||
@@ -733,6 +753,13 @@ function initOrUpdateMap() {
|
|||||||
fleetMap.fitBounds(bounds, { padding: [40, 40] });
|
fleetMap.fitBounds(bounds, { padding: [40, 40] });
|
||||||
fleetMap._hasFitted = true;
|
fleetMap._hasFitted = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Assicurati che i marker APRS siano renderizzati
|
||||||
|
for (const [src, data] of Object.entries(aprsMarkers)) {
|
||||||
|
if (!fleetMap.hasLayer(data.marker)) {
|
||||||
|
data.marker.addTo(fleetMap);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function refreshStates() {
|
async function refreshStates() {
|
||||||
@@ -740,6 +767,18 @@ async function refreshStates() {
|
|||||||
const res = await fetch('/api/states'); const data = await res.json();
|
const res = await fetch('/api/states'); const data = await res.json();
|
||||||
latestStatesData = data;
|
latestStatesData = data;
|
||||||
globalVersionsData = data.versions || {};
|
globalVersionsData = data.versions || {};
|
||||||
|
if (data.web_users !== undefined) {
|
||||||
|
const uEl = document.getElementById('active-users-count');
|
||||||
|
if (uEl) uEl.innerText = data.web_users;
|
||||||
|
const uBadge = document.getElementById('users-badge');
|
||||||
|
if (uBadge) {
|
||||||
|
uBadge.style.cursor = 'pointer';
|
||||||
|
uBadge.onclick = showActiveUsers;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (data.logged_users !== undefined) {
|
||||||
|
activeLoggedUsers = data.logged_users;
|
||||||
|
}
|
||||||
|
|
||||||
clients.forEach(c => {
|
clients.forEach(c => {
|
||||||
try {
|
try {
|
||||||
@@ -756,8 +795,8 @@ async function refreshStates() {
|
|||||||
|
|
||||||
const role = me.role || '';
|
const role = me.role || '';
|
||||||
const allowedList = String(me.allowed_nodes || '').split(',').map(x => x.trim().toLowerCase()).filter(Boolean);
|
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 canControl = isAuthenticated && (allowedList.includes('all') || allowedList.includes(c.id.toLowerCase()));
|
||||||
let showReboot = (role === 'admin');
|
let showReboot = (role === 'admin' || role === 'node_admin') && canControl;
|
||||||
|
|
||||||
let isTx = false;
|
let isTx = false;
|
||||||
let activeModeColor = "var(--primary)";
|
let activeModeColor = "var(--primary)";
|
||||||
@@ -1196,6 +1235,7 @@ async function refreshStates() {
|
|||||||
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(--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(--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(--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(--success); color: var(--success) !important;" onclick="openLogModal('${c.id}')">[ LOG ]</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="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>`;
|
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)';
|
let otaColor = (healthObj && healthObj.agent_update_available) ? 'var(--danger)' : 'var(--primary)';
|
||||||
@@ -1233,11 +1273,98 @@ async function refreshAprs() {
|
|||||||
let html = "";
|
let html = "";
|
||||||
logs.forEach(msg => {
|
logs.forEach(msg => {
|
||||||
html += formatAprsRow(msg);
|
html += formatAprsRow(msg);
|
||||||
|
plotAprsOnMap(msg); // Popola mappa all'avvio
|
||||||
});
|
});
|
||||||
tbody.innerHTML = html;
|
tbody.innerHTML = html;
|
||||||
} catch (e) { console.error(e); }
|
} catch (e) { console.error(e); }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function parseAprsPosition(payload) {
|
||||||
|
// Cerca pattern standard APRS (es. 4603.25N/01315.60E)
|
||||||
|
const posRegex = /([0-9]{2})([0-9]{2}\.[0-9]{1,2})([NS])(.)([0-1][0-9]{2})([0-9]{2}\.[0-9]{1,2})([EOW])/i;
|
||||||
|
const match = payload.match(posRegex);
|
||||||
|
if (match) {
|
||||||
|
let latDeg = parseInt(match[1], 10);
|
||||||
|
let latMin = parseFloat(match[2]);
|
||||||
|
let lat = latDeg + (latMin / 60.0);
|
||||||
|
if (match[3].toUpperCase() === 'S') lat = -lat;
|
||||||
|
|
||||||
|
let lonDeg = parseInt(match[5], 10);
|
||||||
|
let lonMin = parseFloat(match[6]);
|
||||||
|
let lon = lonDeg + (lonMin / 60.0);
|
||||||
|
if (match[7].toUpperCase() === 'W' || match[7].toUpperCase() === 'O') lon = -lon;
|
||||||
|
|
||||||
|
return { lat, lon };
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function plotAprsOnMap(msg) {
|
||||||
|
const pos = parseAprsPosition(msg.payload);
|
||||||
|
if (!pos) return;
|
||||||
|
|
||||||
|
const source = msg.source;
|
||||||
|
const sourceBase = source.split('-')[0].toLowerCase();
|
||||||
|
|
||||||
|
// Escludiamo dalla mappa i pacchetti provenienti dai nodi della flotta
|
||||||
|
let isFleetNode = false;
|
||||||
|
for (let i = 0; i < clients.length; i++) {
|
||||||
|
let cid = clients[i].id.toLowerCase();
|
||||||
|
let cname = (clients[i].name || "").split('-')[0].toLowerCase();
|
||||||
|
let ccall = "";
|
||||||
|
if (latestStatesData && latestStatesData.general && latestStatesData.general[cid]) {
|
||||||
|
ccall = (latestStatesData.general[cid].callsign || "").split('-')[0].toLowerCase();
|
||||||
|
}
|
||||||
|
if (sourceBase === cid || sourceBase === cname || (ccall && sourceBase === ccall)) {
|
||||||
|
isFleetNode = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (isFleetNode) return;
|
||||||
|
|
||||||
|
if (aprsMarkers[source] && fleetMap) {
|
||||||
|
fleetMap.removeLayer(aprsMarkers[source].marker);
|
||||||
|
}
|
||||||
|
|
||||||
|
const customIcon = L.divIcon({
|
||||||
|
className: 'custom-div-icon',
|
||||||
|
html: `<div style="width: 14px; height: 14px; background-color: #f97316; border-radius: 50%; border: 2px solid #04102e; box-shadow: 0 0 10px rgba(249, 115, 22, 0.8);"></div>`,
|
||||||
|
iconSize: [14, 14],
|
||||||
|
iconAnchor: [7, 7]
|
||||||
|
});
|
||||||
|
|
||||||
|
const popupContent = `
|
||||||
|
<div style="font-family: 'JetBrains Mono', monospace; min-width: 150px;">
|
||||||
|
<div style="font-weight: bold; color: #f97316; margin-bottom: 5px;">${esc(source)} <span style="font-size:0.7rem; color:var(--text-muted);">(APRS)</span></div>
|
||||||
|
<div style="font-size: 0.75rem; color: var(--text-muted); margin-bottom: 5px;">${esc(msg.time)} via ${esc(msg.path.split(',')[0])}</div>
|
||||||
|
<div style="font-size: 0.75rem; color: var(--text-main); word-wrap: break-word; margin-bottom: 8px;">${esc(msg.payload)}</div>
|
||||||
|
<a href="https://aprs.fi/info/a/${encodeURIComponent(source)}" target="_blank" class="btn-cmd" style="padding: 2px 6px; font-size: 0.7rem; width: 100%; border-color: #f97316; color: #f97316 !important; text-align: center; text-decoration: none; display: block; box-sizing: border-box;">[ APRS.FI ]</a>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
|
||||||
|
const marker = L.marker([pos.lat, pos.lon], { icon: customIcon }).bindPopup(popupContent);
|
||||||
|
|
||||||
|
aprsMarkers[source] = {
|
||||||
|
marker: marker,
|
||||||
|
timestamp: Date.now()
|
||||||
|
};
|
||||||
|
|
||||||
|
if (fleetMap) {
|
||||||
|
marker.addTo(fleetMap);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function cleanupAprsMarkers() {
|
||||||
|
const now = Date.now();
|
||||||
|
for (const [src, data] of Object.entries(aprsMarkers)) {
|
||||||
|
if (now - data.timestamp > 7200000) { // 2 ore
|
||||||
|
if (fleetMap) fleetMap.removeLayer(data.marker);
|
||||||
|
delete aprsMarkers[src];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function formatAprsRow(msg) {
|
function formatAprsRow(msg) {
|
||||||
const time = msg.time || new Date().toLocaleTimeString('it-IT', { hour12: false });
|
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>`;
|
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>`;
|
||||||
@@ -1260,6 +1387,7 @@ function addLiveAprs(msg) {
|
|||||||
if (tbody.children.length > 100) {
|
if (tbody.children.length > 100) {
|
||||||
tbody.removeChild(tbody.lastChild);
|
tbody.removeChild(tbody.lastChild);
|
||||||
}
|
}
|
||||||
|
plotAprsOnMap(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function refreshLogs() {
|
async function refreshLogs() {
|
||||||
@@ -1376,9 +1504,18 @@ async function checkPushStatus() {
|
|||||||
|
|
||||||
function urlB64ToUint8Array(base64String) { const padding = '='.repeat((4 - base64String.length % 4) % 4); const base64 = (base64String + padding).replace(/\-/g, '+').replace(/_/g, '/'); const rawData = window.atob(base64); const outputArray = new Uint8Array(rawData.length); for (let i = 0; i < rawData.length; ++i) outputArray[i] = rawData.charCodeAt(i); return outputArray; }
|
function urlB64ToUint8Array(base64String) { const padding = '='.repeat((4 - base64String.length % 4) % 4); const base64 = (base64String + padding).replace(/\-/g, '+').replace(/_/g, '/'); const rawData = window.atob(base64); const outputArray = new Uint8Array(rawData.length); for (let i = 0; i < rawData.length; ++i) outputArray[i] = rawData.charCodeAt(i); return outputArray; }
|
||||||
|
|
||||||
async function checkServerUpdate() {
|
async function checkServerUpdate(force = false) {
|
||||||
if (!isAuthenticated || me.role !== 'admin') return;
|
if (!isAuthenticated || me.role !== 'admin') return;
|
||||||
try { const res = await fetch('/api/server_update/check'); if (!res.ok) return; const data = await res.json(); const btn = document.getElementById('server-update-btn'); if (btn) { btn.style.display = data.update_available ? 'inline-block' : 'none'; } } catch (e) { console.error(e); }
|
try {
|
||||||
|
const url = force ? '/api/server_update/check?force=1' : '/api/server_update/check';
|
||||||
|
const res = await fetch(url);
|
||||||
|
if (!res.ok) return;
|
||||||
|
const data = await res.json();
|
||||||
|
const btn = document.getElementById('server-update-btn');
|
||||||
|
if (btn) {
|
||||||
|
btn.style.display = data.update_available ? 'inline-block' : 'none';
|
||||||
|
}
|
||||||
|
} catch (e) { console.error(e); }
|
||||||
}
|
}
|
||||||
|
|
||||||
function confirmServerUpdate() {
|
function confirmServerUpdate() {
|
||||||
@@ -1392,10 +1529,126 @@ const refreshStatesSoon = debounce(refreshStates, 300);
|
|||||||
const refreshLogsSoon = debounce(() => { refreshLogs(); refreshStats(); }, 500);
|
const refreshLogsSoon = debounce(() => { refreshLogs(); refreshStats(); }, 500);
|
||||||
|
|
||||||
if (typeof io !== 'undefined') {
|
if (typeof io !== 'undefined') {
|
||||||
const socket = io();
|
window.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"; } } });
|
window.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(); });
|
window.socket.on('connect', () => { refreshStates(); refreshLogs(); refreshStats(); });
|
||||||
socket.on('dati_aggiornati', refreshStatesSoon);
|
window.socket.on('dati_aggiornati', refreshStatesSoon);
|
||||||
socket.on('log_aggiornato', refreshLogsSoon);
|
window.socket.on('log_aggiornato', refreshLogsSoon);
|
||||||
socket.on('aprs_msg', function(data) { addLiveAprs(data); });
|
window.socket.on('aprs_msg', function(data) { addLiveAprs(data); });
|
||||||
|
window.socket.on('web_users_count', function(data) {
|
||||||
|
const el = document.getElementById('active-users-count');
|
||||||
|
if (el && data && data.count !== undefined) {
|
||||||
|
el.innerText = data.count;
|
||||||
|
}
|
||||||
|
if (data && data.users) {
|
||||||
|
activeLoggedUsers = data.users;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// --- LOGICA ANALYTICS E CHART.JS ---
|
||||||
|
let hwChart = null;
|
||||||
|
let rfChart = null;
|
||||||
|
let currentAnalyticsHours = 24;
|
||||||
|
|
||||||
|
Chart.defaults.color = 'rgba(255, 255, 255, 0.6)';
|
||||||
|
Chart.defaults.font.family = "'JetBrains Mono', monospace";
|
||||||
|
|
||||||
|
function setAnalyticsTimeframe(hours) {
|
||||||
|
currentAnalyticsHours = hours;
|
||||||
|
|
||||||
|
// Update active class on pills
|
||||||
|
[12, 24, 48, 168].forEach(h => {
|
||||||
|
const btn = document.getElementById('btn-ana-' + h);
|
||||||
|
if (btn) {
|
||||||
|
if (h === hours) btn.classList.add('active');
|
||||||
|
else btn.classList.remove('active');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Update label text
|
||||||
|
const labelEl = document.getElementById('analytics-time-label');
|
||||||
|
if (labelEl) {
|
||||||
|
labelEl.innerText = hours === 168 ? '7D' : hours + 'H';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reload data
|
||||||
|
loadNodeAnalytics();
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadNodeAnalytics() {
|
||||||
|
if (!currentFocusedNode) return;
|
||||||
|
try {
|
||||||
|
const res = await fetch(`/api/analytics/${currentFocusedNode}?hours=${currentAnalyticsHours}`);
|
||||||
|
const data = await res.json();
|
||||||
|
|
||||||
|
if (!data.success) return;
|
||||||
|
|
||||||
|
// Dati Telemetria (Ore o Giorni/Ore)
|
||||||
|
const formatLabel = (dTime) => {
|
||||||
|
if (currentAnalyticsHours > 48) {
|
||||||
|
const parts = dTime.split(' ');
|
||||||
|
const dateParts = parts[0].split('-'); // YYYY-MM-DD
|
||||||
|
return `${dateParts[2]}/${dateParts[1]} ${parts[1].substring(0, 5)}`;
|
||||||
|
}
|
||||||
|
return dTime.split(' ')[1].substring(0, 5);
|
||||||
|
};
|
||||||
|
const hwLabels = data.telemetry.map(d => formatLabel(d.time));
|
||||||
|
const tempD = data.telemetry.map(d => d.temp);
|
||||||
|
const cpuD = data.telemetry.map(d => d.cpu);
|
||||||
|
|
||||||
|
if (hwChart) hwChart.destroy();
|
||||||
|
const ctxHw = document.getElementById('chart-hw').getContext('2d');
|
||||||
|
hwChart = new Chart(ctxHw, {
|
||||||
|
type: 'line',
|
||||||
|
data: {
|
||||||
|
labels: hwLabels,
|
||||||
|
datasets: [
|
||||||
|
{ label: t('chartTemp'), data: tempD, borderColor: '#ef4444', backgroundColor: 'rgba(239,68,68,0.1)', fill: true, tension: 0.3, yAxisID: 'y' },
|
||||||
|
{ label: t('chartCpu'), data: cpuD, borderColor: '#3b82f6', backgroundColor: 'rgba(59,130,246,0.1)', fill: true, tension: 0.3, yAxisID: 'y1' }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
options: {
|
||||||
|
responsive: true,
|
||||||
|
maintainAspectRatio: false,
|
||||||
|
plugins: { legend: { display: true, position: 'top' } },
|
||||||
|
scales: {
|
||||||
|
x: { grid: { color: 'rgba(255,255,255,0.05)' } },
|
||||||
|
y: { type: 'linear', display: true, position: 'left', grid: { color: 'rgba(255,255,255,0.05)' }, min: 20 },
|
||||||
|
y1: { type: 'linear', display: true, position: 'right', grid: { drawOnChartArea: false }, min: 0, max: 100 }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Dati RF
|
||||||
|
const rfLabels = data.rf.map(d => formatLabel(d.time));
|
||||||
|
const countD = data.rf.map(d => d.count);
|
||||||
|
const berD = data.rf.map(d => d.ber);
|
||||||
|
|
||||||
|
if (rfChart) rfChart.destroy();
|
||||||
|
const ctxRf = document.getElementById('chart-rf').getContext('2d');
|
||||||
|
rfChart = new Chart(ctxRf, {
|
||||||
|
type: 'bar',
|
||||||
|
data: {
|
||||||
|
labels: rfLabels,
|
||||||
|
datasets: [
|
||||||
|
{ label: t('chartTransits'), data: countD, backgroundColor: '#10b981', yAxisID: 'y' },
|
||||||
|
{ label: t('chartBer'), data: berD, type: 'line', borderColor: '#f59e0b', backgroundColor: 'transparent', tension: 0.3, yAxisID: 'y1' }
|
||||||
|
]
|
||||||
|
},
|
||||||
|
options: {
|
||||||
|
responsive: true,
|
||||||
|
maintainAspectRatio: false,
|
||||||
|
plugins: { legend: { display: true, position: 'top' } },
|
||||||
|
scales: {
|
||||||
|
x: { grid: { color: 'rgba(255,255,255,0.05)' } },
|
||||||
|
y: { type: 'linear', display: true, position: 'left', grid: { color: 'rgba(255,255,255,0.05)' }, min: 0 },
|
||||||
|
y1: { type: 'linear', display: true, position: 'right', grid: { drawOnChartArea: false }, min: 0 }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
} catch (e) { console.error("Error loading analytics:", e); }
|
||||||
}
|
}
|
||||||
|
|||||||
+621
-20
@@ -2,6 +2,17 @@
|
|||||||
const i18n = {
|
const i18n = {
|
||||||
en: {
|
en: {
|
||||||
lblLogLimit: "Rows:",
|
lblLogLimit: "Rows:",
|
||||||
|
btnSched: "SCHED", ttSchedule: "Calendar Profile Scheduler", schedTitle: "CALENDAR PROFILE SCHEDULER",
|
||||||
|
schedNew: "NEW SCHEDULED EVENT", lblSchedTitle: "Event Name:", lblSchedNodes: "Target Nodes:",
|
||||||
|
lblSchedTargetProf: "Target Profile:", lblSchedRestoreProf: "Restore Profile:",
|
||||||
|
lblSchedStart: "Start Date/Time:", lblSchedEnd: "End Date/Time:", btnAddSched: "CREATE SCHEDULE",
|
||||||
|
thSchedTitle: "Title", thSchedNodes: "Nodes", thSchedProf: "Profile", thSchedStart: "Start",
|
||||||
|
thSchedEnd: "End", thSchedStatus: "Status", thSchedActs: "Actions",
|
||||||
|
statusScheduled: "SCHEDULED", statusActive: "ACTIVE", statusCompleted: "COMPLETED", statusCancelled: "CANCELLED", statusExpired: "EXPIRED",
|
||||||
|
confCancelSched: "Cancel this scheduled event?", msgSchedCreated: "SCHEDULE CREATED", msgSchedCancelled: "SCHEDULE CANCELLED",
|
||||||
|
errSchedDates: "End date must be after start date!", errMissingSchedData: "Please fill all required fields!",
|
||||||
|
optAllNodes: "ALL NODES (FLEET)", optNone: "NONE (Leave current)",
|
||||||
|
|
||||||
lastTransits: "Lastheard", loginTitle: "SYSTEM_LOGIN",
|
lastTransits: "Lastheard", loginTitle: "SYSTEM_LOGIN",
|
||||||
thTime: "Time", thRep: "Repeater", thMode: "Mode", thCall: "Callsign", thDur: "Duration",
|
thTime: "Time", thRep: "Repeater", thMode: "Mode", thCall: "Callsign", thDur: "Duration",
|
||||||
thUser: "User", thRole: "Role", thNodes: "Nodes", thActs: "Actions",
|
thUser: "User", thRole: "Role", thNodes: "Nodes", thActs: "Actions",
|
||||||
@@ -44,6 +55,17 @@ const i18n = {
|
|||||||
},
|
},
|
||||||
it: {
|
it: {
|
||||||
lblLogLimit: "Righe:",
|
lblLogLimit: "Righe:",
|
||||||
|
btnSched: "SCHED", ttSchedule: "Pianificazione Calendario Profili", schedTitle: "CALENDARIO PIANIFICAZIONE PROFILI",
|
||||||
|
schedNew: "NUOVO EVENTO PROGRAMMATO", lblSchedTitle: "Nome Evento:", lblSchedNodes: "Nodi Coinvolti:",
|
||||||
|
lblSchedTargetProf: "Profilo Attivazione:", lblSchedRestoreProf: "Profilo Ripristino:",
|
||||||
|
lblSchedStart: "Data/Ora Inizio:", lblSchedEnd: "Data/Ora Fine:", btnAddSched: "CREA PIANIFICAZIONE",
|
||||||
|
thSchedTitle: "Titolo", thSchedNodes: "Nodi", thSchedProf: "Profilo", thSchedStart: "Inizio",
|
||||||
|
thSchedEnd: "Fine", thSchedStatus: "Stato", thSchedActs: "Azioni",
|
||||||
|
statusScheduled: "PROGRAMMATO", statusActive: "ATTIVO", statusCompleted: "COMPLETATO", statusCancelled: "ANNULLATO", statusExpired: "SCADUTO",
|
||||||
|
confCancelSched: "Annullare questo evento programmato?", msgSchedCreated: "PIANIFICAZIONE CREATA", msgSchedCancelled: "PIANIFICAZIONE ANNULLATA",
|
||||||
|
errSchedDates: "La data di fine deve essere successiva a quella di inizio!", errMissingSchedData: "Compilare tutti i campi obbligatori!",
|
||||||
|
optAllNodes: "TUTTI I NODI (FLOTTA)", optNone: "NESSUNO (Mantieni attivo)",
|
||||||
|
|
||||||
lastTransits: "Ultimi ascolti", loginTitle: "ACCESSO SISTEMA",
|
lastTransits: "Ultimi ascolti", loginTitle: "ACCESSO SISTEMA",
|
||||||
thTime: "Ora", thRep: "Ripetitore", thMode: "Modo", thCall: "Nominativo", thDur: "Durata",
|
thTime: "Ora", thRep: "Ripetitore", thMode: "Modo", thCall: "Nominativo", thDur: "Durata",
|
||||||
thUser: "Utente", thRole: "Ruolo", thNodes: "Nodi", thActs: "Azioni",
|
thUser: "Utente", thRole: "Ruolo", thNodes: "Nodi", thActs: "Azioni",
|
||||||
@@ -82,7 +104,9 @@ const i18n = {
|
|||||||
lblSysUptime: "Tempo di attività sistema", lblSwVersions: "Versioni Software", lblOtaUpdate: "Aggiornamento OTA", waitConfig: "IN ATTESA DELLA CONFIGURAZIONE...",
|
lblSysUptime: "Tempo di attività sistema", lblSwVersions: "Versioni Software", lblOtaUpdate: "Aggiornamento OTA", waitConfig: "IN ATTESA DELLA CONFIGURAZIONE...",
|
||||||
noDaemonData: "NESSUN DATO DAL DEMONE. RETENTATIVO...", cfgEmpty: "[!] MEMORIA CFG VUOTA", netError: "ERRORE DI RETE", noModesFound: "NESSUN MODO TROVATO NELLA CONFIGURAZIONE",
|
noDaemonData: "NESSUN DATO DAL DEMONE. RETENTATIVO...", cfgEmpty: "[!] MEMORIA CFG VUOTA", netError: "ERRORE DI RETE", noModesFound: "NESSUN MODO TROVATO NELLA CONFIGURAZIONE",
|
||||||
accessDenied: "[ ACCESSO NEGATO ]", savingRestart: "⏳ SALVATAGGIO & RIAVVIO IN CORSO...", stateUpdated: "✅ STATO AGGIORNATO CON SUCCESSO!",
|
accessDenied: "[ ACCESSO NEGATO ]", savingRestart: "⏳ SALVATAGGIO & RIAVVIO IN CORSO...", stateUpdated: "✅ STATO AGGIORNATO CON SUCCESSO!",
|
||||||
phSearch: "CERCA ID/CALL...", btnGrid: "[ GRIGLIA ]", btnList: "[ LISTA ]"
|
phSearch: "CERCA ID/CALL...", btnGrid: "[ GRIGLIA ]", btnList: "[ LISTA ]",
|
||||||
|
liveLogTitle: "[ LIVE_LOG: ", filterAll: "TUTTI I DEMONI", btnScrollOn: "SCROLL: ON", btnScrollOff: "SCROLL: OFF", btnClear: "PULISCI",
|
||||||
|
logConnWait: "Connessione in corso... In attesa dei log per ", logNoData: "Nessun log recente in memoria per ", logApplyFilter: "Applicazione filtro...", btnDownloadZip: "[ SCARICA_TUTTI_CFG_ZIP ]", lblHistory: "STORICO:", optCurrentUnsaved: "Attuale (Non salvata)", btnPreviewDiff: "[ ANTEPRIMA_DIFF ]", btnCancelDiff: "ANNULLA", titleAuditLogs: "[ LOG_SICUREZZA_AUDIT ]", btnRefresh: "AGGIORNA", btnRefreshBracket: "[ AGGIORNA ]", waitLoading: "In attesa di caricamento...", titleAnalytics: "[ ANALITICHE_NODO ]", msgNoAudit: "Nessun log di sicurezza presente.", msgNoModifications: "[ NESSUNA MODIFICA RILEVATA RISPETTO ALLA CONFIGURAZIONE ATTIVA ]", warnUnverifiedDiff: "Non hai verificato il Diff visivo. Sicuro di voler sovrascrivere?", chartTemp: "Temp °C", chartCpu: "CPU %", chartTransits: "Transiti", chartBer: "BER Medio %"
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -177,7 +201,44 @@ async function executeUpdateRequest() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// --- MODALE ADMIN & UTENTI ---
|
// --- MODALE ADMIN & UTENTI ---
|
||||||
async function openAdmin() { document.getElementById('admin-modal').style.display = 'flex'; loadUsers(); loadSettings(); cancelEdit(); }
|
async function openAdmin() {
|
||||||
|
document.getElementById('admin-modal').style.display = 'flex';
|
||||||
|
|
||||||
|
// Inietto i bottoni operativi dentro l'header del pannello admin
|
||||||
|
let adminBtnsHtml = '';
|
||||||
|
const role = me.role || '';
|
||||||
|
const allowedList = String(me.allowed_nodes || '').split(',').map(x => x.trim().toLowerCase()).filter(Boolean);
|
||||||
|
const hasAllNodes = allowedList.includes('all');
|
||||||
|
const canOverride = hasAllNodes;
|
||||||
|
|
||||||
|
if (role === 'admin') {
|
||||||
|
adminBtnsHtml += `<button id="server-update-btn-modal" onclick="confirmServerUpdate(); closeAdmin();" class="btn-cmd" style="border-color:var(--danger); color:var(--danger) !important; display:none; width:auto; padding: 4px 10px; font-size: 0.75rem;">[ UPD_SERVER ]</button>`;
|
||||||
|
adminBtnsHtml += `<button onclick="sendGlobalUpdate(); closeAdmin();" class="btn-cmd" style="border-color:var(--accent); color:var(--accent) !important; width:auto; padding: 4px 10px; font-size: 0.75rem;">[ REQ_CFG ]</button>`;
|
||||||
|
}
|
||||||
|
if (role === 'admin' || role === 'node_admin') {
|
||||||
|
adminBtnsHtml += `<button onclick="openScheduleModal(); closeAdmin();" class="btn-cmd" style="border-color:var(--accent); color:var(--accent) !important; width:auto; padding: 4px 10px; font-size: 0.75rem;">[ SCHED ]</button>`;
|
||||||
|
}
|
||||||
|
if (canOverride) {
|
||||||
|
adminBtnsHtml += `<button onclick="triggerGlobalEmergency(); closeAdmin();" class="btn-cmd" style="border-color:var(--danger); color:var(--danger) !important; width:auto; padding: 4px 10px; font-size: 0.75rem;">[ GBL_OVR ]</button>`;
|
||||||
|
}
|
||||||
|
|
||||||
|
const adminActionDiv = document.getElementById('admin-action-btns');
|
||||||
|
if (adminActionDiv) {
|
||||||
|
adminActionDiv.innerHTML = adminBtnsHtml;
|
||||||
|
// Se siamo admin eseguiamo anche un check per l'update del server per mostrare/nascondere il tasto
|
||||||
|
if (role === 'admin' && typeof GLOBAL_SERVER_UPDATE_AVAILABLE !== 'undefined' && GLOBAL_SERVER_UPDATE_AVAILABLE) {
|
||||||
|
const upBtn = document.getElementById('server-update-btn-modal');
|
||||||
|
if(upBtn) upBtn.style.display = 'inline-block';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (me.role === 'admin') {
|
||||||
|
loadUsers();
|
||||||
|
loadSettings();
|
||||||
|
cancelEdit();
|
||||||
|
}
|
||||||
|
loadAuditLogs();
|
||||||
|
}
|
||||||
function closeAdmin() { document.getElementById('admin-modal').style.display = 'none'; cancelEdit(); }
|
function closeAdmin() { document.getElementById('admin-modal').style.display = 'none'; cancelEdit(); }
|
||||||
|
|
||||||
async function loadUsers() {
|
async function loadUsers() {
|
||||||
@@ -230,8 +291,13 @@ async function saveSettings() {
|
|||||||
|
|
||||||
// --- GLOBAL OVERRIDE ---
|
// --- GLOBAL OVERRIDE ---
|
||||||
function triggerGlobalEmergency() {
|
function triggerGlobalEmergency() {
|
||||||
|
const role = me.role || '';
|
||||||
|
const allowedList = String(me.allowed_nodes || '').split(',').map(x => x.trim().toLowerCase()).filter(Boolean);
|
||||||
|
const hasAll = allowedList.includes('all');
|
||||||
|
|
||||||
let uniqueProfiles = {};
|
let uniqueProfiles = {};
|
||||||
for (const id in globalHealthData) {
|
for (const id in globalHealthData) {
|
||||||
|
if (!hasAll && !allowedList.includes(id.toLowerCase())) continue;
|
||||||
if (globalHealthData[id] && globalHealthData[id].profiles) {
|
if (globalHealthData[id] && globalHealthData[id].profiles) {
|
||||||
for (const [k, v] of Object.entries(globalHealthData[id].profiles)) { uniqueProfiles[k] = v; }
|
for (const [k, v] of Object.entries(globalHealthData[id].profiles)) { uniqueProfiles[k] = v; }
|
||||||
}
|
}
|
||||||
@@ -243,14 +309,36 @@ function triggerGlobalEmergency() {
|
|||||||
idx++;
|
idx++;
|
||||||
}
|
}
|
||||||
if (Object.keys(uniqueProfiles).length === 0) { html = `<p style="color:var(--danger); font-weight:400; font-family:'JetBrains Mono',monospace;">NO_PROFS_FOUND</p>`; }
|
if (Object.keys(uniqueProfiles).length === 0) { html = `<p style="color:var(--danger); font-weight:400; font-family:'JetBrains Mono',monospace;">NO_PROFS_FOUND</p>`; }
|
||||||
container.innerHTML = html; document.getElementById('override-desc').innerText = t('msgOvrSel'); document.getElementById('override-modal').style.display = 'flex';
|
container.innerHTML = html;
|
||||||
|
|
||||||
|
const descText = hasAll ? t('msgOvrSel') : (currentLang === 'it' ? `SELEZIONA PROFILO (NODI ASSEGNATI: ${allowedList.length}):` : `SELECT PROFILE (NODES: ${allowedList.length}):`);
|
||||||
|
document.getElementById('override-desc').innerText = descText;
|
||||||
|
document.getElementById('override-modal').style.display = 'flex';
|
||||||
}
|
}
|
||||||
|
|
||||||
function sendGlobalAction(action) {
|
function sendGlobalAction(action) {
|
||||||
document.getElementById('override-modal').style.display = 'none';
|
document.getElementById('override-modal').style.display = 'none';
|
||||||
customConfirm(t('titleGlobal'), t('promptOvrConfirm'), "var(--danger)", async () => {
|
const role = me.role || '';
|
||||||
try { const res = await fetch('/api/global_command', { method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({type: action}) }); const d = await res.json();
|
const allowedList = String(me.allowed_nodes || '').split(',').map(x => x.trim().toLowerCase()).filter(Boolean);
|
||||||
if(d.success) customAlert(t('titleSuccess'), t('msgOvrOk')); else customAlert(t('titleError'), esc(d.error), true); refreshStates();
|
const hasAll = allowedList.includes('all');
|
||||||
|
|
||||||
|
const confirmMsg = hasAll
|
||||||
|
? t('promptOvrConfirm')
|
||||||
|
: (currentLang === 'it'
|
||||||
|
? `Confermi l'invio ai tuoi nodi autorizzati (${allowedList.map(n => n.toUpperCase()).join(', ')})?`
|
||||||
|
: `Confirm sending to your authorized nodes (${allowedList.map(n => n.toUpperCase()).join(', ')})?`);
|
||||||
|
|
||||||
|
customConfirm(t('titleGlobal'), confirmMsg, "var(--danger)", async () => {
|
||||||
|
try {
|
||||||
|
const res = await fetch('/api/global_command', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {'Content-Type': 'application/json'},
|
||||||
|
body: JSON.stringify({type: action})
|
||||||
|
});
|
||||||
|
const d = await res.json();
|
||||||
|
if(d.success) customAlert(t('titleSuccess'), t('msgOvrOk'));
|
||||||
|
else customAlert(t('titleError'), esc(d.error), true);
|
||||||
|
refreshStates();
|
||||||
} catch(e) { console.error(e); }
|
} catch(e) { console.error(e); }
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -327,16 +415,29 @@ function controlService(clientId, service, action) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- MODALE EDITOR INI ---
|
// --- MODALE EDITOR INI E BACKUP HISTORY ---
|
||||||
let currentEditClient = ""; let currentEditService = "";
|
let currentEditClient = ""; let currentEditService = ""; let currentOriginalConfig = ""; let isDiffMode = false;
|
||||||
|
let historyConfigs = {}; // Cache per i backup
|
||||||
|
|
||||||
async function openEditorModal(clientId, service) {
|
async function openEditorModal(clientId, service) {
|
||||||
currentEditClient = clientId; currentEditService = service; document.getElementById('editor-title').innerText = `${service.toUpperCase()} @ ${clientId.toUpperCase()}`;
|
currentEditClient = clientId; currentEditService = service; isDiffMode = false;
|
||||||
document.getElementById('config-textarea').value = "AWAITING_STREAM..."; document.getElementById('editor-status').innerText = ""; document.getElementById('editor-modal').style.display = 'flex';
|
document.getElementById('editor-title').innerText = `${service.toUpperCase()} @ ${clientId.toUpperCase()}`;
|
||||||
|
document.getElementById('config-textarea').value = "AWAITING_STREAM...";
|
||||||
|
document.getElementById('config-textarea').style.display = 'block';
|
||||||
|
document.getElementById('diff-view').style.display = 'none';
|
||||||
|
document.getElementById('btn-cancel-diff').style.display = 'none';
|
||||||
|
document.getElementById('editor-status').innerText = "";
|
||||||
|
document.getElementById('editor-modal').style.display = 'flex';
|
||||||
|
document.getElementById('config-history-select').innerHTML = `<option value="">${t('optCurrentUnsaved')}</option>`;
|
||||||
|
historyConfigs = {};
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const res = await fetch(`/api/config_file/${encodeURIComponent(clientId)}/${encodeURIComponent(service)}`);
|
const res = await fetch(`/api/config_file/${encodeURIComponent(clientId)}/${encodeURIComponent(service)}`);
|
||||||
const data = await res.json();
|
const data = await res.json();
|
||||||
if (data.success) {
|
if (data.success) {
|
||||||
document.getElementById('config-textarea').value = data.data.raw_text || "EMPTY";
|
currentOriginalConfig = data.data.raw_text || "";
|
||||||
|
document.getElementById('config-textarea').value = currentOriginalConfig;
|
||||||
|
fetchConfigHistory(clientId, service);
|
||||||
} else {
|
} else {
|
||||||
document.getElementById('config-textarea').value = "ERR:\n" + data.error;
|
document.getElementById('config-textarea').value = "ERR:\n" + data.error;
|
||||||
}
|
}
|
||||||
@@ -344,18 +445,118 @@ async function openEditorModal(clientId, service) {
|
|||||||
document.getElementById('config-textarea').value = "NET_ERR";
|
document.getElementById('config-textarea').value = "NET_ERR";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function fetchConfigHistory(clientId, service) {
|
||||||
|
try {
|
||||||
|
const res = await fetch(`/api/config_backups/${encodeURIComponent(clientId)}/${encodeURIComponent(service)}`);
|
||||||
|
const data = await res.json();
|
||||||
|
if (data.success && data.backups.length > 0) {
|
||||||
|
const select = document.getElementById('config-history-select');
|
||||||
|
data.backups.forEach(b => {
|
||||||
|
const opt = document.createElement('option');
|
||||||
|
opt.value = b.id;
|
||||||
|
opt.text = `${b.timestamp} (${b.username})`;
|
||||||
|
select.appendChild(opt);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} catch(e) { console.error("History fetch error:", e); }
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadHistoryConfig() {
|
||||||
|
const val = document.getElementById('config-history-select').value;
|
||||||
|
if (!val) {
|
||||||
|
// Ripristina testualmente la versione corrente se scelgono "Attuale"
|
||||||
|
document.getElementById('config-textarea').value = currentOriginalConfig;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (historyConfigs[val]) {
|
||||||
|
document.getElementById('config-textarea').value = historyConfigs[val];
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const res = await fetch(`/api/config_backups/${val}`);
|
||||||
|
const data = await res.json();
|
||||||
|
if (data.success) {
|
||||||
|
historyConfigs[val] = data.text;
|
||||||
|
document.getElementById('config-textarea').value = data.text;
|
||||||
|
}
|
||||||
|
} catch (e) { console.error(e); }
|
||||||
|
}
|
||||||
|
|
||||||
|
function previewConfigDiff() {
|
||||||
|
const newText = document.getElementById('config-textarea').value;
|
||||||
|
const diffView = document.getElementById('diff-view');
|
||||||
|
const textarea = document.getElementById('config-textarea');
|
||||||
|
|
||||||
|
if (isDiffMode) {
|
||||||
|
// Torna all'editor
|
||||||
|
textarea.style.display = 'block';
|
||||||
|
diffView.style.display = 'none';
|
||||||
|
document.getElementById('btn-cancel-diff').style.display = 'none';
|
||||||
|
isDiffMode = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Calcola il diff visivo
|
||||||
|
const dmp = new diff_match_patch();
|
||||||
|
const diffs = dmp.diff_main(currentOriginalConfig, newText);
|
||||||
|
dmp.diff_cleanupSemantic(diffs);
|
||||||
|
|
||||||
|
let html = "";
|
||||||
|
diffs.forEach(part => {
|
||||||
|
const type = part[0]; // -1 rimossa, 1 aggiunta, 0 uguale
|
||||||
|
const text = esc(part[1]);
|
||||||
|
if (type === 1) html += `<span style="background-color: rgba(46, 204, 113, 0.2); color: #2ecc71;">${text}</span>`;
|
||||||
|
else if (type === -1) html += `<span style="background-color: rgba(231, 76, 60, 0.2); color: #e74c3c; text-decoration: line-through;">${text}</span>`;
|
||||||
|
else html += `<span style="color: var(--text-muted); opacity: 0.8;">${text}</span>`;
|
||||||
|
});
|
||||||
|
|
||||||
|
if (diffs.length === 1 && diffs[0][0] === 0) {
|
||||||
|
html = `<span style="color: var(--success); font-weight: bold;">${t('msgNoModifications')}</span>\n\n` + html;
|
||||||
|
}
|
||||||
|
|
||||||
|
diffView.innerHTML = html;
|
||||||
|
textarea.style.display = 'none';
|
||||||
|
diffView.style.display = 'block';
|
||||||
|
document.getElementById('btn-cancel-diff').style.display = 'block';
|
||||||
|
isDiffMode = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function cancelDiff() {
|
||||||
|
document.getElementById('config-textarea').style.display = 'block';
|
||||||
|
document.getElementById('diff-view').style.display = 'none';
|
||||||
|
document.getElementById('btn-cancel-diff').style.display = 'none';
|
||||||
|
isDiffMode = false;
|
||||||
|
}
|
||||||
|
|
||||||
function closeEditorModal() { document.getElementById('editor-modal').style.display = 'none'; }
|
function closeEditorModal() { document.getElementById('editor-modal').style.display = 'none'; }
|
||||||
|
|
||||||
function saveConfig() {
|
function saveConfig() {
|
||||||
const textValue = document.getElementById('config-textarea').value; const statusSpan = document.getElementById('editor-status');
|
const textValue = document.getElementById('config-textarea').value;
|
||||||
customConfirm(t('titleSave'), `${t('confOvr')}<b>${currentEditClient.toUpperCase()}</b>?`, "var(--danger)", async () => {
|
const statusSpan = document.getElementById('editor-status');
|
||||||
statusSpan.innerText = "WRITING..."; statusSpan.style.color = "var(--success)";
|
|
||||||
try {
|
if (!isDiffMode && textValue !== currentOriginalConfig) {
|
||||||
const res = await fetch('/api/config_file', { method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({ clientId: currentEditClient, service: currentEditService, config_data: { "raw_text": textValue } }) });
|
customConfirm(t('titleSave'), t('warnUnverifiedDiff'), "var(--accent)", () => executeSave(textValue, statusSpan));
|
||||||
const data = await res.json();
|
} else {
|
||||||
if (data.success) { customAlert(t('titleSuccess'), "FILE_WRITTEN"); closeEditorModal(); } else { customAlert(t('titleError'), "ERR: " + esc(data.error), true); statusSpan.innerText = "ERR"; }
|
customConfirm(t('titleSave'), `${t('confOvr')}<b>${currentEditClient.toUpperCase()}</b>?`, "var(--danger)", () => executeSave(textValue, statusSpan));
|
||||||
} catch(e) { customAlert(t('titleError'), t('msgNetErr'), true); statusSpan.innerText = "NET_ERR"; }
|
}
|
||||||
});
|
}
|
||||||
|
|
||||||
|
async function executeSave(textValue, statusSpan) {
|
||||||
|
statusSpan.innerText = "WRITING..."; statusSpan.style.color = "var(--success)";
|
||||||
|
try {
|
||||||
|
const res = await fetch('/api/config_file', { method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({ clientId: currentEditClient, service: currentEditService, config_data: { "raw_text": textValue } }) });
|
||||||
|
const data = await res.json();
|
||||||
|
if (data.success) {
|
||||||
|
customAlert(t('titleSuccess'), "FILE_WRITTEN");
|
||||||
|
currentOriginalConfig = textValue; // Aggiorna l'originale corrente
|
||||||
|
closeEditorModal();
|
||||||
|
} else {
|
||||||
|
customAlert(t('titleError'), "ERR: " + esc(data.error), true); statusSpan.innerText = "ERR";
|
||||||
|
}
|
||||||
|
} catch(e) { customAlert(t('titleError'), t('msgNetErr'), true); statusSpan.innerText = "NET_ERR"; }
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- MODALE VERSIONI SOFTWARE ---
|
// --- MODALE VERSIONI SOFTWARE ---
|
||||||
@@ -366,3 +567,403 @@ function openVersionsModal(clientId) {
|
|||||||
document.getElementById('versions-modal').style.display = 'flex';
|
document.getElementById('versions-modal').style.display = 'flex';
|
||||||
}
|
}
|
||||||
function closeVersionsModal() { document.getElementById('versions-modal').style.display = 'none'; }
|
function closeVersionsModal() { document.getElementById('versions-modal').style.display = 'none'; }
|
||||||
|
|
||||||
|
|
||||||
|
// -------------------- LIVE LOG MODAL --------------------
|
||||||
|
let currentLogClientId = null;
|
||||||
|
|
||||||
|
function openLogModal(clientId) {
|
||||||
|
currentLogClientId = clientId.toLowerCase();
|
||||||
|
document.getElementById('log-modal-title').innerText = clientId.toUpperCase();
|
||||||
|
document.getElementById('log-console').innerHTML = `<span style="color: #8b949e;">${t('logConnWait')} ${clientId.toUpperCase()}...</span>\n`;
|
||||||
|
document.getElementById('log-modal').style.display = 'flex';
|
||||||
|
document.getElementById('log-service-filter').value = 'ALL';
|
||||||
|
|
||||||
|
// 1. Fetch initial logs
|
||||||
|
fetch(`/api/logs/${clientId}`)
|
||||||
|
.then(res => res.json())
|
||||||
|
.then(data => {
|
||||||
|
if (data.success && data.logs.length > 0) {
|
||||||
|
document.getElementById('log-console').innerHTML = '';
|
||||||
|
data.logs.forEach(log => appendLog(log));
|
||||||
|
} else {
|
||||||
|
document.getElementById('log-console').innerHTML = `<span style="color: #8b949e;">${t('logNoData')} ${clientId.toUpperCase()}.</span>\n`;
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(err => console.error("Errore fetch logs:", err));
|
||||||
|
|
||||||
|
// 2. Subscribe WebSocket
|
||||||
|
window.socket.on('live_log_' + currentLogClientId, function(logEntry) {
|
||||||
|
appendLog(logEntry);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function closeLogModal() {
|
||||||
|
document.getElementById('log-modal').style.display = 'none';
|
||||||
|
if (currentLogClientId) {
|
||||||
|
window.socket.off('live_log_' + currentLogClientId);
|
||||||
|
}
|
||||||
|
currentLogClientId = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
let autoScroll = true;
|
||||||
|
|
||||||
|
function toggleAutoScroll() {
|
||||||
|
autoScroll = !autoScroll;
|
||||||
|
const btn = document.getElementById('btn-autoscroll');
|
||||||
|
if (autoScroll) {
|
||||||
|
btn.innerText = t('btnScrollOn') || 'SCROLL: ON';
|
||||||
|
btn.style.borderColor = 'var(--accent)';
|
||||||
|
btn.style.setProperty('color', 'var(--accent)', 'important');
|
||||||
|
scrollToBottom();
|
||||||
|
} else {
|
||||||
|
btn.innerText = t('btnScrollOff') || 'SCROLL: OFF';
|
||||||
|
btn.style.borderColor = 'var(--text-muted)';
|
||||||
|
btn.style.setProperty('color', 'var(--text-muted)', 'important');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function clearLogs() {
|
||||||
|
document.getElementById('log-console').innerHTML = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
function scrollToBottom() {
|
||||||
|
const box = document.getElementById('log-console');
|
||||||
|
box.scrollTop = box.scrollHeight;
|
||||||
|
}
|
||||||
|
|
||||||
|
function appendLog(log) {
|
||||||
|
const filter = document.getElementById('log-service-filter').value.toLowerCase();
|
||||||
|
const logSvc = log.service.toLowerCase();
|
||||||
|
if (filter !== 'all' && !logSvc.includes(filter)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const box = document.getElementById('log-console');
|
||||||
|
|
||||||
|
let color = '#c9d1d9';
|
||||||
|
let prefix = log.service.toLowerCase();
|
||||||
|
|
||||||
|
if (prefix.includes('mmdvm')) color = '#58a6ff';
|
||||||
|
else if (prefix.includes('dmr')) color = '#3fb950';
|
||||||
|
else if (prefix.includes('ysf')) color = '#8b5cf6'; // Violetto per YSF
|
||||||
|
else if (prefix.includes('dstar') || prefix.includes('d-star')) color = '#f97316'; // Arancio per D-Star
|
||||||
|
else if (prefix.includes('nxdn')) color = '#10b981'; // Verde NXDN
|
||||||
|
else if (prefix.includes('p25')) color = '#ffcc00'; // Giallo P25
|
||||||
|
|
||||||
|
const span = document.createElement('div');
|
||||||
|
span.style.marginBottom = '2px';
|
||||||
|
|
||||||
|
const timeSpan = `<span style="color: #8b949e;">[${log.time}]</span>`;
|
||||||
|
const svcSpan = `<span style="color: ${color}; font-weight: bold;">[${log.service}]</span>`;
|
||||||
|
|
||||||
|
span.innerHTML = `${timeSpan} ${svcSpan} ${escapeHtml(log.text)}`;
|
||||||
|
|
||||||
|
// Remove default "Connessione in corso..." if present
|
||||||
|
if (box.innerHTML.includes(t('logConnWait'))) {
|
||||||
|
box.innerHTML = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
box.appendChild(span);
|
||||||
|
|
||||||
|
// Keep max 1000 lines in DOM to prevent lag
|
||||||
|
if (box.childElementCount > 1000) {
|
||||||
|
box.removeChild(box.firstChild);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (autoScroll) scrollToBottom();
|
||||||
|
}
|
||||||
|
|
||||||
|
function escapeHtml(unsafe) {
|
||||||
|
return unsafe
|
||||||
|
.replace(/&/g, "&")
|
||||||
|
.replace(/</g, "<")
|
||||||
|
.replace(/>/g, ">")
|
||||||
|
.replace(/"/g, """)
|
||||||
|
.replace(/'/g, "'");
|
||||||
|
}
|
||||||
|
|
||||||
|
function renderLogs() {
|
||||||
|
// When filter changes, we just clear and wait for new logs, or we could refetch.
|
||||||
|
// For simplicity, we clear the console and fetch again from server.
|
||||||
|
if (currentLogClientId) {
|
||||||
|
document.getElementById('log-console').innerHTML = `<span style="color: #8b949e;">${t('logApplyFilter')}</span>\n`;
|
||||||
|
fetch(`/api/logs/${currentLogClientId}`)
|
||||||
|
.then(res => res.json())
|
||||||
|
.then(data => {
|
||||||
|
document.getElementById('log-console').innerHTML = '';
|
||||||
|
if (data.success) {
|
||||||
|
data.logs.forEach(log => appendLog(log));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// --- SECURITY AUDIT LOGS ---
|
||||||
|
async function loadAuditLogs() {
|
||||||
|
try {
|
||||||
|
const res = await fetch('/api/audit_logs');
|
||||||
|
const data = await res.json();
|
||||||
|
const container = document.getElementById('audit-logs-container');
|
||||||
|
if (data.success && data.logs) {
|
||||||
|
if (data.logs.length === 0) {
|
||||||
|
container.innerHTML = `<span style="color: var(--text-muted);">${t('msgNoAudit')}</span>`;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let html = '';
|
||||||
|
data.logs.forEach(log => {
|
||||||
|
html += `<div style="border-bottom: 1px dashed var(--border-light); padding: 4px 0; display: flex; gap: 15px;">
|
||||||
|
<span style="color: var(--text-muted); flex: 0 0 140px;">[${log.time}]</span>
|
||||||
|
<span style="color: var(--primary); flex: 0 0 100px;">${esc(log.user.toUpperCase())}</span>
|
||||||
|
<span style="color: var(--success); flex: 0 0 80px;">${esc(log.node.toUpperCase())}</span>
|
||||||
|
<span style="color: var(--text-main); flex: 1;">${esc(log.cmd)}</span>
|
||||||
|
</div>`;
|
||||||
|
});
|
||||||
|
container.innerHTML = html;
|
||||||
|
}
|
||||||
|
} catch(e) { console.error("Error loading audit logs:", e); }
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// --- MODALE CALENDARIO SCHEDULAZIONE PROFILI ---
|
||||||
|
async function openScheduleModal() {
|
||||||
|
document.getElementById('schedule-modal').style.display = 'flex';
|
||||||
|
populateScheduleNodeOptions();
|
||||||
|
loadSchedules();
|
||||||
|
|
||||||
|
// Inizializza le date con orari coerenti (Inizio: adesso + 5 min, Fine: adesso + 2 ore)
|
||||||
|
const now = new Date();
|
||||||
|
const in5m = new Date(now.getTime() + 5 * 60000);
|
||||||
|
const in2h = new Date(now.getTime() + 125 * 60000);
|
||||||
|
|
||||||
|
const toLocalISO = (d) => {
|
||||||
|
const pad = (n) => String(n).padStart(2, '0');
|
||||||
|
return `${d.getFullYear()}-${pad(d.getMonth()+1)}-${pad(d.getDate())}T${pad(d.getHours())}:${pad(d.getMinutes())}`;
|
||||||
|
};
|
||||||
|
|
||||||
|
document.getElementById('sched-start').value = toLocalISO(in5m);
|
||||||
|
document.getElementById('sched-end').value = toLocalISO(in2h);
|
||||||
|
}
|
||||||
|
|
||||||
|
function closeScheduleModal() {
|
||||||
|
document.getElementById('schedule-modal').style.display = 'none';
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateScheduleProfileOptions() {
|
||||||
|
const selNodes = document.getElementById('sched-nodes-select');
|
||||||
|
const selTarget = document.getElementById('sched-target-prof');
|
||||||
|
const selRestore = document.getElementById('sched-restore-prof');
|
||||||
|
if (!selNodes || !selTarget || !selRestore) return;
|
||||||
|
|
||||||
|
// Proviamo a estrarre i nomi dei profili dal primo nodo selezionato
|
||||||
|
const selectedCid = selNodes.value;
|
||||||
|
let profiles = { "A": "Profilo A", "B": "Profilo B" }; // Default
|
||||||
|
|
||||||
|
if (selectedCid !== 'all' && globalHealthData[selectedCid] && globalHealthData[selectedCid].profiles) {
|
||||||
|
profiles = globalHealthData[selectedCid].profiles;
|
||||||
|
} else {
|
||||||
|
// Se è 'all', cerchiamo il primo nodo disponibile che abbia i profili valorizzati
|
||||||
|
for (let cid in globalHealthData) {
|
||||||
|
if (globalHealthData[cid] && globalHealthData[cid].profiles && Object.keys(globalHealthData[cid].profiles).length > 0) {
|
||||||
|
profiles = globalHealthData[cid].profiles;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Aggiorniamo le select
|
||||||
|
let htmlTarget = "";
|
||||||
|
let htmlRestore = "";
|
||||||
|
|
||||||
|
for (const [pKey, pLabel] of Object.entries(profiles)) {
|
||||||
|
htmlTarget += `<option value="${pKey}">${pKey} (${esc(pLabel)})</option>`;
|
||||||
|
htmlRestore += `<option value="${pKey}">${pKey} (${esc(pLabel)})</option>`;
|
||||||
|
}
|
||||||
|
htmlRestore += `<option value="NONE" data-i18n="optNone">NONE (Leave active)</option>`;
|
||||||
|
|
||||||
|
// Salviamo i valori attuali se possibile per non resettarli
|
||||||
|
const currTarget = selTarget.value;
|
||||||
|
const currRestore = selRestore.value;
|
||||||
|
|
||||||
|
selTarget.innerHTML = htmlTarget;
|
||||||
|
selRestore.innerHTML = htmlRestore;
|
||||||
|
|
||||||
|
if(currTarget && [...selTarget.options].some(o => o.value === currTarget)) selTarget.value = currTarget;
|
||||||
|
if(currRestore && [...selRestore.options].some(o => o.value === currRestore)) selRestore.value = currRestore;
|
||||||
|
|
||||||
|
// Riapplichiamo le traduzioni per l'opzione NONE se in italiano
|
||||||
|
if (currentLang === 'it') {
|
||||||
|
const noneOpt = selRestore.querySelector('option[value="NONE"]');
|
||||||
|
if(noneOpt) noneOpt.innerText = "NESSUNO (Mantieni attivo)";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function populateScheduleNodeOptions() {
|
||||||
|
const sel = document.getElementById('sched-nodes-select');
|
||||||
|
if (!sel) return;
|
||||||
|
|
||||||
|
const role = me.role || '';
|
||||||
|
const allowedList = String(me.allowed_nodes || '').split(',').map(x => x.trim().toLowerCase()).filter(Boolean);
|
||||||
|
const hasAll = allowedList.includes('all');
|
||||||
|
|
||||||
|
let html = '';
|
||||||
|
if (hasAll || role === 'admin') {
|
||||||
|
html += `<option value="all">${t('optAllNodes')}</option>`;
|
||||||
|
}
|
||||||
|
|
||||||
|
clients.forEach(c => {
|
||||||
|
if (hasAll || allowedList.includes(c.id.toLowerCase())) {
|
||||||
|
html += `<option value="${c.id}">${esc(c.name)} (${c.id.toUpperCase()})</option>`;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
sel.innerHTML = html;
|
||||||
|
sel.addEventListener('change', updateScheduleProfileOptions);
|
||||||
|
updateScheduleProfileOptions();
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadSchedules() {
|
||||||
|
const tbody = document.getElementById('schedules-table-body');
|
||||||
|
if (!tbody) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const res = await fetch('/api/schedules');
|
||||||
|
const data = await res.json();
|
||||||
|
|
||||||
|
if (!data.success || !data.schedules || data.schedules.length === 0) {
|
||||||
|
tbody.innerHTML = `<tr><td colspan="7" style="text-align:center; color:var(--text-muted); padding:15px;">NO_SCHEDULES_FOUND</td></tr>`;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
tbody.innerHTML = data.schedules.map(s => {
|
||||||
|
let statusColor = "var(--text-muted)";
|
||||||
|
let statusClass = "";
|
||||||
|
let statusText = s.status;
|
||||||
|
|
||||||
|
if (s.status === 'SCHEDULED') {
|
||||||
|
statusColor = "#f59e0b";
|
||||||
|
statusText = t('statusScheduled');
|
||||||
|
} else if (s.status === 'ACTIVE') {
|
||||||
|
statusColor = "var(--success)";
|
||||||
|
statusClass = "blink";
|
||||||
|
statusText = t('statusActive');
|
||||||
|
} else if (s.status === 'COMPLETED') {
|
||||||
|
statusColor = "var(--text-muted)";
|
||||||
|
statusText = t('statusCompleted');
|
||||||
|
} else if (s.status === 'CANCELLED') {
|
||||||
|
statusColor = "var(--danger)";
|
||||||
|
statusText = t('statusCancelled');
|
||||||
|
} else if (s.status === 'EXPIRED') {
|
||||||
|
statusColor = "var(--text-muted)";
|
||||||
|
statusText = t('statusExpired');
|
||||||
|
}
|
||||||
|
|
||||||
|
const isFinished = ['COMPLETED', 'CANCELLED', 'EXPIRED'].includes(s.status);
|
||||||
|
|
||||||
|
|
||||||
|
// Tentativo di dedurre il profilo di partenza dal primo nodo o dai nodi target
|
||||||
|
let startProf = "?";
|
||||||
|
let cids = s.target_nodes.toLowerCase() === 'all' ? Object.keys(globalHealthData) : s.target_nodes.toLowerCase().split(',');
|
||||||
|
for (let i = 0; i < cids.length; i++) {
|
||||||
|
let cid = cids[i].trim();
|
||||||
|
let card = document.getElementById(`card-${cid}`);
|
||||||
|
if (card && card.dataset.lastMode) {
|
||||||
|
startProf = card.dataset.lastMode;
|
||||||
|
// Se leggiamo DMR o D-STAR non è un nome di profilo. Dobbiamo guardare se nel telemetry c'è una hint
|
||||||
|
let tel = latestStatesData && latestStatesData.telemetry && latestStatesData.telemetry[cid] ? latestStatesData.telemetry[cid] : {};
|
||||||
|
if(tel.alt && tel.alt.includes('SCHED:')) {
|
||||||
|
startProf = tel.alt.split(':')[1].trim();
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (startProf === "?" || startProf.length > 5) startProf = "CURR"; // Current
|
||||||
|
|
||||||
|
let profDisplay = `<span style="color:var(--text-muted);">${esc(startProf)}</span> ➔ <b style="color:var(--accent);">${esc(s.target_profile)}</b>`;
|
||||||
|
if (s.restore_profile !== 'NONE') {
|
||||||
|
profDisplay += ` ➔ <span style="color:var(--success);">${esc(s.restore_profile)}</span>`;
|
||||||
|
}
|
||||||
|
|
||||||
|
return `<tr>
|
||||||
|
<td style="font-weight:bold; color:var(--text-main);">${esc(s.title)}</td>
|
||||||
|
<td><span style="color:var(--primary); font-family:'JetBrains Mono',monospace;">${esc(s.target_nodes.toUpperCase())}</span></td>
|
||||||
|
<td style="font-family:'JetBrains Mono',monospace;">${profDisplay}</td>
|
||||||
|
<td style="font-size:0.8rem; color:var(--text-muted);">${esc(s.start_time.substring(5, 16))}</td>
|
||||||
|
<td style="font-size:0.8rem; color:var(--text-muted);">${esc(s.end_time.substring(5, 16))}</td>
|
||||||
|
<td><span class="${statusClass}" style="color:${statusColor}; font-weight:bold; font-size:0.8rem;">[ ${statusText} ]</span></td>
|
||||||
|
<td style="text-align:right;">
|
||||||
|
${!isFinished ? `<button onclick="cancelSchedule(${s.id})" class="btn-cmd" style="border-color:var(--danger); color:var(--danger)!important; padding:4px 8px; font-size:0.75rem; width:auto; flex:none;">DEL</button>` : '—'}
|
||||||
|
</td>
|
||||||
|
</tr>`;
|
||||||
|
}).join('');
|
||||||
|
|
||||||
|
} catch(e) {
|
||||||
|
console.error("Error loading schedules:", e);
|
||||||
|
tbody.innerHTML = `<tr><td colspan="7" style="text-align:center; color:var(--danger); padding:15px;">NET_ERR</td></tr>`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function submitSchedule() {
|
||||||
|
const title = document.getElementById('sched-title').value.trim();
|
||||||
|
const targetNodes = document.getElementById('sched-nodes-select').value;
|
||||||
|
const targetProf = document.getElementById('sched-target-prof').value.trim().toUpperCase();
|
||||||
|
const restoreProf = document.getElementById('sched-restore-prof').value.trim().toUpperCase();
|
||||||
|
const startTime = document.getElementById('sched-start').value;
|
||||||
|
const endTime = document.getElementById('sched-end').value;
|
||||||
|
|
||||||
|
if (!title || !targetNodes || !targetProf || !startTime || !endTime) {
|
||||||
|
return customAlert(t('titleError'), t('errMissingSchedData'), true);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (startTime >= endTime) {
|
||||||
|
return customAlert(t('titleError'), t('errSchedDates'), true);
|
||||||
|
}
|
||||||
|
|
||||||
|
const payload = {
|
||||||
|
title: title,
|
||||||
|
target_nodes: targetNodes,
|
||||||
|
target_profile: targetProf,
|
||||||
|
restore_profile: restoreProf,
|
||||||
|
start_time: startTime,
|
||||||
|
end_time: endTime
|
||||||
|
};
|
||||||
|
|
||||||
|
try {
|
||||||
|
const res = await fetch('/api/schedules', {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {'Content-Type': 'application/json'},
|
||||||
|
body: JSON.stringify(payload)
|
||||||
|
});
|
||||||
|
const data = await res.json();
|
||||||
|
|
||||||
|
if (data.success) {
|
||||||
|
customAlert(t('titleSuccess'), t('msgSchedCreated'));
|
||||||
|
document.getElementById('sched-title').value = '';
|
||||||
|
loadSchedules();
|
||||||
|
} else {
|
||||||
|
customAlert(t('titleError'), esc(data.error), true);
|
||||||
|
}
|
||||||
|
} catch(e) {
|
||||||
|
console.error(e);
|
||||||
|
customAlert(t('titleError'), t('msgNetErr'), true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function cancelSchedule(sid) {
|
||||||
|
customConfirm(t('titleAction'), t('confCancelSched'), "var(--danger)", async () => {
|
||||||
|
try {
|
||||||
|
const res = await fetch(`/api/schedules/${sid}`, { method: 'DELETE' });
|
||||||
|
const data = await res.json();
|
||||||
|
if (data.success) {
|
||||||
|
customAlert(t('titleSuccess'), t('msgSchedCancelled'));
|
||||||
|
loadSchedules();
|
||||||
|
} else {
|
||||||
|
customAlert(t('titleError'), esc(data.error), true);
|
||||||
|
}
|
||||||
|
} catch(e) {
|
||||||
|
console.error(e);
|
||||||
|
customAlert(t('titleError'), t('msgNetErr'), true);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
# VERSIONE PIU' SICURA (opzionale) del servizio. Il file fleet-console.service originale resta invariato.
|
||||||
|
#
|
||||||
|
# Preparazione (una tantum, da root):
|
||||||
|
# useradd --system --home /opt/fleet-control-server --shell /usr/sbin/nologin fleet
|
||||||
|
# chown -R fleet:fleet /opt/fleet-control-server
|
||||||
|
# cp systemd/fleet-console.hardened.service.example /etc/systemd/system/fleet-console.service
|
||||||
|
# systemctl daemon-reload && systemctl restart fleet-console
|
||||||
|
#
|
||||||
|
# Se usi un reverse proxy (consigliato) cambia anche il bind in 127.0.0.1:9000 qui sotto.
|
||||||
|
# L'aggiornamento OTA (git pull) continua a funzionare perche' l'utente "fleet" possiede la cartella.
|
||||||
|
[Unit]
|
||||||
|
Description=Fleet Control Console - Central Hub
|
||||||
|
After=network.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=simple
|
||||||
|
User=fleet
|
||||||
|
Group=fleet
|
||||||
|
WorkingDirectory=/opt/fleet-control-server
|
||||||
|
ExecStart=/opt/fleet-control-server/venv/bin/gunicorn -k "geventwebsocket.gunicorn.workers.GeventWebSocketWorker" -w 1 --graceful-timeout 2 --bind 0.0.0.0:9000 app:app
|
||||||
|
TimeoutStopSec=3
|
||||||
|
Restart=always
|
||||||
|
RestartSec=5
|
||||||
|
|
||||||
|
# Hardening
|
||||||
|
NoNewPrivileges=true
|
||||||
|
PrivateTmp=true
|
||||||
|
ProtectSystem=full
|
||||||
|
ProtectHome=true
|
||||||
|
ReadWritePaths=/opt/fleet-control-server
|
||||||
|
|
||||||
|
StandardOutput=syslog
|
||||||
|
StandardError=syslog
|
||||||
|
SyslogIdentifier=fleet-console
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
+205
-41
@@ -25,18 +25,18 @@
|
|||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
<div id="top-bar-container" style="border-bottom: 2px solid var(--border-main); background: var(--bg-main, #04102e);">
|
<div id="top-bar-container" style="border-bottom: 2px solid var(--border-main); background: var(--bg-main, #04102e); padding: 0; margin-bottom: 25px;">
|
||||||
<div id="top-bar" style="display: flex; justify-content: space-between; align-items: stretch; padding: 0; min-height: 90px; flex-wrap: wrap;">
|
<div id="top-bar" style="display: flex; justify-content: space-between; align-items: stretch; padding: 0; min-height: 90px; width: 100%; max-width: 100%; box-sizing: border-box;">
|
||||||
|
|
||||||
<!-- HEADER SX: BANNER CON RIEMPIMENTO ASSOLUTO A FILO -->
|
<!-- HEADER SX: BANNER ANCORATO SENZA CROP -->
|
||||||
<div id="master-banner-container" style="display: none; flex: 0 0 45%; max-width: 45%; border-right: 2px solid var(--border-main); background: #020b1e; align-items: stretch; justify-content: stretch; padding: 0; box-sizing: border-box; overflow: hidden;">
|
<div id="master-banner-container" style="display: none; flex: 0 0 42%; max-width: 42%; border-right: 2px solid var(--border-main); background: #020b1e; align-items: center; justify-content: center; padding: 0; box-sizing: border-box; overflow: hidden;">
|
||||||
<img src="/static/banners/banner.png" style="width: 100%; height: 100%; object-fit: cover; object-position: center; display: block;"
|
<img src="/static/banners/banner.png" style="width: 100%; height: 100%; object-fit: contain; object-position: center; display: block;"
|
||||||
onload="this.parentElement.style.display='flex';"
|
onload="this.parentElement.style.display='flex';"
|
||||||
onerror="this.parentElement.style.display='none';">
|
onerror="this.parentElement.style.display='none';">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- HEADER DX: STRUTTURA FLUIDA A 3 RIGHE -->
|
<!-- HEADER DX: STRUTTURA FLUIDA A 3 RIGHE -->
|
||||||
<div id="header-right-controls" style="flex: 1; display: flex; flex-direction: column; gap: 10px; justify-content: center; padding: 12px 20px; box-sizing: border-box; background: rgba(0, 15, 45, 0.25); min-width: 350px;">
|
<div id="header-right-controls" style="flex: 1; display: flex; flex-direction: column; gap: 8px; justify-content: center; padding: 10px 18px; box-sizing: border-box; background: rgba(0, 15, 45, 0.25); min-width: 350px;">
|
||||||
|
|
||||||
<!-- RIGA 1: BRAND E OROLOGIO -->
|
<!-- RIGA 1: BRAND E OROLOGIO -->
|
||||||
<div style="display: flex; justify-content: space-between; align-items: baseline; flex-wrap: wrap; gap: 10px; border-bottom: 1px dashed var(--border-light, rgba(255,255,255,0.15)); padding-bottom: 4px;">
|
<div style="display: flex; justify-content: space-between; align-items: baseline; flex-wrap: wrap; gap: 10px; border-bottom: 1px dashed var(--border-light, rgba(255,255,255,0.15)); padding-bottom: 4px;">
|
||||||
@@ -44,22 +44,25 @@
|
|||||||
<span id="live-clock" style="font-family: 'JetBrains Mono', monospace; font-size: 0.8rem; color: var(--primary); letter-spacing: 1px;">SYS_TIME: --:--:--</span>
|
<span id="live-clock" style="font-family: 'JetBrains Mono', monospace; font-size: 0.8rem; color: var(--primary); letter-spacing: 1px;">SYS_TIME: --:--:--</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- RIGA 2: TASTI DI NAVIGAZIONE -->
|
<!-- RIGA 2: TASTI DI NAVIGAZIONE (SX) + BADGES (DX) -->
|
||||||
<div class="nav-tabs" style="display: flex; flex-wrap: wrap; gap: 8px; border: none; margin: 0; padding: 0; width: 100%;">
|
<div style="display: flex; justify-content: space-between; align-items: center; gap: 10px; width: 100%;">
|
||||||
<button class="nav-tab active" onclick="switchView('home')" id="tab-home" style="flex: 1; min-width: 80px; padding: 6px 0; font-size: 0.85rem; font-weight: bold; letter-spacing: 1.5px; text-align: center; border-radius: 4px;">HOME</button>
|
<div class="nav-tabs" style="display: flex; gap: 6px; border: none; margin: 0; padding: 0;">
|
||||||
<button class="nav-tab" onclick="switchView('nodes')" id="tab-nodes" style="flex: 1; min-width: 80px; padding: 6px 0; font-size: 0.85rem; font-weight: bold; letter-spacing: 1.5px; text-align: center; border-radius: 4px;">NODES</button>
|
<button class="nav-tab active" onclick="switchView('home')" id="tab-home" style="padding: 6px 14px; font-size: 0.85rem; font-weight: bold; letter-spacing: 1px; border-radius: 4px;">HOME</button>
|
||||||
<button class="nav-tab" onclick="switchView('map')" id="tab-map" style="flex: 1; min-width: 80px; padding: 6px 0; font-size: 0.85rem; font-weight: bold; letter-spacing: 1.5px; text-align: center; border-radius: 4px;">MAP</button>
|
<button class="nav-tab" onclick="switchView('nodes')" id="tab-nodes" style="padding: 6px 14px; font-size: 0.85rem; font-weight: bold; letter-spacing: 1px; border-radius: 4px;">NODES</button>
|
||||||
<button class="nav-tab" onclick="switchView('aprs')" id="tab-aprs" style="flex: 1; min-width: 80px; padding: 6px 0; font-size: 0.85rem; font-weight: bold; letter-spacing: 1.5px; text-align: center; border-radius: 4px;">APRS</button>
|
<button class="nav-tab" onclick="switchView('map')" id="tab-map" style="padding: 6px 14px; font-size: 0.85rem; font-weight: bold; letter-spacing: 1px; border-radius: 4px;">MAP</button>
|
||||||
|
<button class="nav-tab" onclick="switchView('aprs')" id="tab-aprs" style="padding: 6px 14px; font-size: 0.85rem; font-weight: bold; letter-spacing: 1px; border-radius: 4px;">APRS</button>
|
||||||
|
</div>
|
||||||
|
<div class="top-bar-right" style="display: flex; align-items: center; gap: 6px; margin: 0; padding: 0; justify-content: flex-end;">
|
||||||
|
<span id="mqtt-badge" class="mqtt-badge mqtt-offline" style="padding: 4px 8px; font-size: 0.75rem; font-weight: bold; letter-spacing: 1px;">MQTT: CHK</span>
|
||||||
|
<span id="users-badge" class="mqtt-badge" style="padding: 4px 8px; font-size: 0.75rem; font-weight: bold; letter-spacing: 1px; border-color: var(--primary); color: var(--primary); cursor: pointer;" title="Operatori attivi (clicca per info)" onclick="showActiveUsers()">👥 <span id="active-users-count">1</span></span>
|
||||||
|
<button class="theme-switch" id="layout-btn" onclick="cycleLayout()" title="Cambia Layout" style="padding: 4px 8px; font-size: 0.75rem;">[ L: BLU ]</button>
|
||||||
|
<button class="theme-switch" id="lang-btn" onclick="toggleLang()" data-i18n-title="ttLang" style="padding: 4px 8px; font-size: 0.75rem;">ITA</button>
|
||||||
|
<button class="theme-switch" id="push-btn" onclick="subscribeToPush()" style="padding: 4px 8px; font-size: 0.75rem;">PUSH</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- RIGA 3: BADGES E TASTI ADMIN -->
|
<!-- RIGA 3: UTENTE E CONTROLLI AMMINISTRATIVI (DX) -->
|
||||||
<div class="top-bar-right" style="display: flex; flex-wrap: wrap; justify-content: flex-end; align-items: center; gap: 6px; border: none; margin: 0; padding: 0; width: 100%;">
|
<div id="auth-container" style="display: flex; justify-content: flex-end; align-items: center; width: 100%; margin: 0; padding: 0;"></div>
|
||||||
<span id="mqtt-badge" class="mqtt-badge mqtt-offline" style="padding: 4px 10px; font-size: 0.75rem; font-weight: bold; letter-spacing: 1px;">MQTT: CHK</span>
|
|
||||||
<button class="theme-switch" id="layout-btn" onclick="cycleLayout()" title="Cambia Layout" style="padding: 4px 10px; font-size: 0.75rem;">[ L: BLU ]</button>
|
|
||||||
<button class="theme-switch" id="lang-btn" onclick="toggleLang()" data-i18n-title="ttLang" style="padding: 4px 10px; font-size: 0.75rem;">ITA</button>
|
|
||||||
<button class="theme-switch" id="push-btn" onclick="subscribeToPush()" style="padding: 4px 10px; font-size: 0.75rem;">PUSH</button>
|
|
||||||
<div id="auth-container" style="display: flex; flex-wrap: wrap; align-items: center; gap: 6px; justify-content: flex-end;"></div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -177,6 +180,34 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- FOCUS ANALYTICS -->
|
||||||
|
<div style="margin-top: 30px; border-top: 1px dashed var(--border-light); padding-top: 20px;">
|
||||||
|
<div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 15px; flex-wrap: wrap; gap: 10px;">
|
||||||
|
<h3 style="margin: 0; color: var(--text-main); font-weight: 300; font-size: 1.3rem; letter-spacing: 2px;">
|
||||||
|
<span data-i18n="titleAnalytics">[ NODE_ANALYTICS ]</span> <span id="analytics-time-label" style="color: var(--primary);">24H</span>
|
||||||
|
</h3>
|
||||||
|
<div style="display: flex; gap: 8px; flex-wrap: wrap; align-items: center;">
|
||||||
|
<button class="filter-pill" onclick="setAnalyticsTimeframe(12)" id="btn-ana-12">12H</button>
|
||||||
|
<button class="filter-pill active" onclick="setAnalyticsTimeframe(24)" id="btn-ana-24">24H</button>
|
||||||
|
<button class="filter-pill" onclick="setAnalyticsTimeframe(48)" id="btn-ana-48">48H</button>
|
||||||
|
<button class="filter-pill" onclick="setAnalyticsTimeframe(168)" id="btn-ana-168">7D</button>
|
||||||
|
<div style="width: 1px; background: var(--border-light); margin: 0 5px; height: 20px;"></div>
|
||||||
|
<button class="btn-cmd" onclick="loadNodeAnalytics()" style="width: auto; padding: 4px 12px; flex: none;" data-i18n="btnRefreshBracket">[ REFRESH ]</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="grid" style="grid-template-columns: repeat(auto-fit, minmax(400px, 1fr)); gap: 20px;">
|
||||||
|
<!-- Telemetria HW (CPU / Temp) -->
|
||||||
|
<div class="card" style="border-width: 1px !important; padding: 15px; height: 250px;">
|
||||||
|
<canvas id="chart-hw"></canvas>
|
||||||
|
</div>
|
||||||
|
<!-- Stat RF (Transiti / BER) -->
|
||||||
|
<div class="card" style="border-width: 1px !important; padding: 15px; height: 250px;">
|
||||||
|
<canvas id="chart-rf"></canvas>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- CONTROLLI ADMIN DEL NODO -->
|
<!-- 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);">
|
<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;"><span data-i18n="adminControls">[ ADMIN_CONTROLS ]</span></h3>
|
<h3 style="margin: 0 0 20px 0; color: var(--danger); font-weight: 300; font-size: 1.5rem; text-align: center; letter-spacing: 2px;"><span data-i18n="adminControls">[ ADMIN_CONTROLS ]</span></h3>
|
||||||
@@ -318,36 +349,59 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="admin-modal" class="modal-overlay">
|
<div id="admin-modal" class="modal-overlay">
|
||||||
<div class="modal-content" style="max-width:900px;">
|
<div class="modal-content" style="max-width:1200px; width:95%;">
|
||||||
<div style="display:flex; justify-content:space-between; align-items:center; border-bottom:1px dashed var(--border-main); padding-bottom:10px; margin-bottom:20px;">
|
<div style="display:flex; justify-content:space-between; align-items:center; border-bottom:1px dashed var(--border-main); padding-bottom:10px; margin-bottom:20px; flex-wrap: wrap; gap: 10px;">
|
||||||
<h2 style="margin:0; color:var(--text-main); font-weight:300;" data-i18n="adminTitle">[ SYS_ADMIN ]</h2>
|
<div style="display:flex; align-items:center; gap: 15px;">
|
||||||
|
<h2 style="margin:0; color:var(--text-main); font-weight:300;" data-i18n="adminTitle">[ SYS_ADMIN ]</h2>
|
||||||
|
<div id="admin-action-btns" style="display:flex; gap: 10px;"></div>
|
||||||
|
</div>
|
||||||
<button onclick="closeAdmin()" class="btn-cmd" style="border-color:var(--danger); color:var(--danger) !important; width: 24px; height: 24px; flex: 0 0 24px; padding: 0; display: flex; align-items: center; justify-content: center; font-size: 0.8rem;">X</button>
|
<button onclick="closeAdmin()" class="btn-cmd" style="border-color:var(--danger); color:var(--danger) !important; width: 24px; height: 24px; flex: 0 0 24px; padding: 0; display: flex; align-items: center; justify-content: center; font-size: 0.8rem;">X</button>
|
||||||
</div>
|
</div>
|
||||||
<div style="display:flex; flex-wrap:wrap; gap:10px; margin-bottom:20px; background:rgba(0,0,0,0.2); padding:15px; align-items:center; border: 1px solid var(--border-light);">
|
<div style="display:flex; flex-wrap:wrap; gap:10px; margin-bottom:20px; background:rgba(0,0,0,0.2); padding:15px; align-items:center; border: 1px solid var(--border-light);">
|
||||||
<input type="text" id="new-user" placeholder="USR" style="flex:1; min-width:120px;">
|
<input type="text" id="new-user" placeholder="USR" style="flex:1; min-width:120px;">
|
||||||
<input type="password" id="new-pass" placeholder="PWD" style="flex:1; min-width:120px;">
|
<input type="password" id="new-pass" placeholder="PWD" style="flex:1; min-width:120px;">
|
||||||
<select id="new-role" style="flex:none; width: 80px;"><option value="operator" data-i18n="roleOp">OP</option><option value="admin">ADM</option></select>
|
<select id="new-role" style="flex:none; width: auto;"><option value="operator" data-i18n="roleOp">OP</option><option value="node_admin">N_ADM</option><option value="admin">ADM</option></select>
|
||||||
<input type="text" id="new-nodes" placeholder="NODES (IR3UIC,IR3Q)" style="flex:2; min-width:150px;">
|
<input type="text" id="new-nodes" placeholder="NODES (IR3UIC,IR3Q)" style="flex:2; min-width:150px;">
|
||||||
<button id="btn-user-submit" onclick="submitUser()" class="btn-cmd" style="border-color:var(--success); color:var(--success) !important; flex:none; width: 80px;" data-i18n="btnAdd">ADD</button>
|
<button id="btn-user-submit" onclick="submitUser()" class="btn-cmd" style="border-color:var(--success); color:var(--success) !important; flex:none; width: 80px;" data-i18n="btnAdd">ADD</button>
|
||||||
<button id="btn-user-cancel" onclick="cancelEdit()" class="btn-cmd" style="display:none; width: 24px; height: 24px; flex: 0 0 24px; padding: 0; align-items: center; justify-content: center; font-size: 0.8rem;">X</button>
|
<button id="btn-user-cancel" onclick="cancelEdit()" class="btn-cmd" style="display:none; width: 24px; height: 24px; flex: 0 0 24px; padding: 0; align-items: center; justify-content: center; font-size: 0.8rem;">X</button>
|
||||||
</div>
|
</div>
|
||||||
<div style="margin-bottom:20px; background:rgba(0,0,0,0.2); padding:20px; border: 1px solid var(--border-light);">
|
<div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(450px, 1fr)); gap: 20px; align-items: start;">
|
||||||
<h4 style="margin:0 0 15px 0; color:var(--primary); font-weight:300;" data-i18n="adminDBSync">[ DB_SYNC_CFG ]</h4>
|
<!-- COLONNA SINISTRA: Impostazioni & Utenti -->
|
||||||
<div style="display:grid; grid-template-columns: 1fr 1fr; gap:15px; margin-bottom:15px;">
|
<div style="display: flex; flex-direction: column; gap: 20px;">
|
||||||
<div><label style="font-size:0.8rem; font-weight:300; display:block; margin-bottom:5px; color:var(--text-muted);">URL_DMR (.dat):</label><input type="text" id="url-dmr-input" style="width:100%;"></div>
|
<div style="background:rgba(0,0,0,0.2); padding:20px; border: 1px solid var(--border-light);">
|
||||||
<div><label style="font-size:0.8rem; font-weight:300; display:block; margin-bottom:5px; color:var(--text-muted);">URL_NXDN (.csv):</label><input type="text" id="url-nxdn-input" style="width:100%;"></div>
|
<div style="display:flex; justify-content:space-between; align-items:center; border-bottom: 1px dashed var(--border-main); padding-bottom: 15px; margin-bottom: 20px;">
|
||||||
|
<h4 style="margin:0; color:var(--primary); font-weight:300;" data-i18n="adminDBSync">[ DB_SYNC_CFG ]</h4>
|
||||||
|
<a href="/api/fleet_backup" class="btn-cmd" style="border-color:var(--accent); color:var(--accent) !important; text-decoration:none; display:flex; font-size: 0.75rem; padding: 6px 12px; width: auto; flex: none;" data-i18n="btnDownloadZip">[ DOWNLOAD_ALL_CFG_ZIP ]</a>
|
||||||
|
</div>
|
||||||
|
<div style="display:grid; grid-template-columns: 1fr 1fr; gap:15px; margin-bottom:15px;">
|
||||||
|
<div><label style="font-size:0.8rem; font-weight:300; display:block; margin-bottom:5px; color:var(--text-muted);">URL_DMR (.dat):</label><input type="text" id="url-dmr-input" style="width:100%;"></div>
|
||||||
|
<div><label style="font-size:0.8rem; font-weight:300; display:block; margin-bottom:5px; color:var(--text-muted);">URL_NXDN (.csv):</label><input type="text" id="url-nxdn-input" style="width:100%;"></div>
|
||||||
|
</div>
|
||||||
|
<div style="display:flex; justify-content:space-between; align-items:center; border-top:1px dashed var(--border-light); padding-top:15px;">
|
||||||
|
<div style="display:flex; align-items:center; gap:10px;"><label style="font-size:0.8rem; font-weight:300;" data-i18n="adminTime">CRON_TIME:</label><input type="time" id="update-time-input"></div>
|
||||||
|
<button onclick="saveSettings()" class="btn-cmd" style="border-color:var(--accent); color:var(--accent) !important; max-width: 250px; flex: none;" data-i18n="adminSave">SAVE_CFG</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div style="overflow-x:auto;">
|
||||||
|
<table style="width:100%; border-collapse:collapse; text-align:left;">
|
||||||
|
<thead style="background: transparent;"><tr><th>ID</th><th data-i18n="thUser">USR</th><th data-i18n="thRole">ROLE</th><th data-i18n="thNodes">NODES</th><th style="text-align:center;" data-i18n="thActs">CMD</th></tr></thead>
|
||||||
|
<tbody id="users-table-body"></tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div style="display:flex; justify-content:space-between; align-items:center; border-top:1px dashed var(--border-light); padding-top:15px;">
|
|
||||||
<div style="display:flex; align-items:center; gap:10px;"><label style="font-size:0.8rem; font-weight:300;" data-i18n="adminTime">CRON_TIME:</label><input type="time" id="update-time-input"></div>
|
<!-- COLONNA DESTRA: Security Audit Logs -->
|
||||||
<button onclick="saveSettings()" class="btn-cmd" style="border-color:var(--accent); color:var(--accent) !important; max-width: 250px; flex: none;" data-i18n="adminSave">SAVE_CFG</button>
|
<div style="background:rgba(0,0,0,0.2); padding:20px; border: 1px solid var(--border-light); height: 100%; box-sizing: border-box; display: flex; flex-direction: column;">
|
||||||
|
<div style="display:flex; justify-content:space-between; align-items:center; border-bottom: 1px dashed var(--border-main); padding-bottom: 15px; margin-bottom: 15px;">
|
||||||
|
<h4 style="margin:0; color:var(--accent); font-weight:300;" data-i18n="titleAuditLogs">[ SECURITY_AUDIT_LOGS ]</h4>
|
||||||
|
<button onclick="loadAuditLogs()" class="btn-cmd" style="padding: 4px 10px; font-size: 0.75rem; width: auto; flex: none;" data-i18n="btnRefresh">REFRESH</button>
|
||||||
|
</div>
|
||||||
|
<div id="audit-logs-container" style="flex: 1; min-height: 250px; max-height: 500px; overflow-y: auto; font-family: 'JetBrains Mono', monospace; font-size: 0.75rem; line-height: 1.6; padding-right: 5px;">
|
||||||
|
<span style="color: var(--text-muted);" data-i18n="waitLoading">In attesa di caricamento...</span>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div style="overflow-x:auto;">
|
|
||||||
<table style="width:100%; border-collapse:collapse; text-align:left;">
|
|
||||||
<thead style="background: transparent;"><tr><th>ID</th><th data-i18n="thUser">USR</th><th data-i18n="thRole">ROLE</th><th data-i18n="thNodes">NODES</th><th style="text-align:center;" data-i18n="thActs">CMD</th></tr></thead>
|
|
||||||
<tbody id="users-table-body"></tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -377,10 +431,23 @@
|
|||||||
<h3 style="margin:0; color:var(--accent); font-weight:300;">[ <span data-i18n="modEditTitle">EDIT:</span> <span id="editor-title" style="color:var(--text-main);"></span> ]</h3>
|
<h3 style="margin:0; color:var(--accent); font-weight:300;">[ <span data-i18n="modEditTitle">EDIT:</span> <span id="editor-title" style="color:var(--text-main);"></span> ]</h3>
|
||||||
<button onclick="closeEditorModal()" class="btn-cmd" style="border-color:var(--danger); color:var(--danger) !important; width: 24px; height: 24px; flex: 0 0 24px; padding: 0; display: flex; align-items: center; justify-content: center; font-size: 0.8rem;">X</button>
|
<button onclick="closeEditorModal()" class="btn-cmd" style="border-color:var(--danger); color:var(--danger) !important; width: 24px; height: 24px; flex: 0 0 24px; padding: 0; display: flex; align-items: center; justify-content: center; font-size: 0.8rem;">X</button>
|
||||||
</div>
|
</div>
|
||||||
<textarea id="config-textarea" spellcheck="false" style="width:100%; height:55vh; background:rgba(0,0,0,0.3); color:var(--text-main); font-family:'JetBrains Mono', monospace; font-size:0.85rem; padding:15px; border:1px solid var(--border-light); resize:none; outline:none; margin-top: 15px;"></textarea>
|
<div style="display:flex; justify-content:space-between; align-items:center; margin-bottom: 10px;">
|
||||||
|
<div style="display:flex; gap: 10px; align-items: center;">
|
||||||
|
<span style="font-size: 0.85rem; color: var(--text-muted);" data-i18n="lblHistory">STORICO:</span>
|
||||||
|
<select id="config-history-select" onchange="loadHistoryConfig()" style="font-size: 0.8rem; padding: 4px 10px;">
|
||||||
|
<option value="" data-i18n="optCurrentUnsaved">Attuale (Non salvata)</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<button onclick="previewConfigDiff()" class="btn-cmd" style="border-color:var(--accent); color:var(--accent) !important; width: auto; padding: 4px 15px; flex: none;" data-i18n="btnPreviewDiff">[ PREVIEW_DIFF ]</button>
|
||||||
|
</div>
|
||||||
|
<div id="diff-view" style="display:none; width:100%; height:55vh; overflow-y:auto; background:rgba(0,0,0,0.4); font-family:'JetBrains Mono', monospace; font-size:0.85rem; border:1px solid var(--border-main); padding: 15px; white-space: pre-wrap; line-height: 1.4;"></div>
|
||||||
|
<textarea id="config-textarea" spellcheck="false" style="width:100%; height:55vh; background:rgba(0,0,0,0.3); color:var(--text-main); font-family:'JetBrains Mono', monospace; font-size:0.85rem; padding:15px; border:1px solid var(--border-light); resize:none; outline:none;"></textarea>
|
||||||
<div style="display:flex; justify-content:space-between; margin-top:20px; align-items:center;">
|
<div style="display:flex; justify-content:space-between; margin-top:20px; align-items:center;">
|
||||||
<span id="editor-status" style="font-size:0.9rem; font-weight:300; font-family:'JetBrains Mono',monospace;"></span>
|
<span id="editor-status" style="font-size:0.9rem; font-weight:300; font-family:'JetBrains Mono',monospace;"></span>
|
||||||
<button onclick="saveConfig()" class="btn-cmd" style="border-color:var(--danger); color:var(--danger) !important; max-width: 250px; flex: none;" data-i18n="btnSave">WRITE_FILE</button>
|
<div style="display:flex; gap:10px;">
|
||||||
|
<button id="btn-cancel-diff" onclick="cancelDiff()" class="btn-cmd" style="display:none; border-color:var(--text-muted); color:var(--text-muted) !important;" data-i18n="btnCancelDiff">ANNULLA</button>
|
||||||
|
<button id="btn-save-cfg" onclick="saveConfig()" class="btn-cmd" style="border-color:var(--danger); color:var(--danger) !important; max-width: 250px; flex: none;" data-i18n="btnSave">WRITE_FILE</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -436,7 +503,33 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="update-modal" class="modal-overlay">
|
|
||||||
|
<!-- Live Log Modal -->
|
||||||
|
<div id="log-modal" class="modal-overlay">
|
||||||
|
<div class="modal-content" style="max-width:900px; padding: 20px;">
|
||||||
|
<div style="display:flex; justify-content:space-between; align-items:center; border-bottom:1px dashed var(--border-main); padding-bottom:10px; margin-bottom:15px; flex-wrap: wrap; gap: 10px;">
|
||||||
|
<h2 style="margin:0; color:var(--success); font-weight:300;"><span data-i18n="liveLogTitle">[ LIVE_LOG: </span> <span id="log-modal-title" style="color:var(--text-main);"></span> ]</h2>
|
||||||
|
<div style="display: flex; gap: 10px; align-items: center;">
|
||||||
|
<select id="log-service-filter" style="width: auto; padding: 4px 10px; font-size: 0.85rem;" onchange="renderLogs()">
|
||||||
|
<option value="ALL" data-i18n="filterAll">ALL DAEMONS</option>
|
||||||
|
<option value="mmdvm">MMDVMHost</option>
|
||||||
|
<option value="dmrgateway">DMRGateway</option>
|
||||||
|
<option value="ysfgateway">YSFGateway</option>
|
||||||
|
<option value="dstargateway">DStarGateway</option>
|
||||||
|
<option value="nxdngateway">NXDNGateway</option>
|
||||||
|
<option value="p25gateway">P25Gateway</option>
|
||||||
|
</select>
|
||||||
|
<button class="btn-cmd" onclick="toggleAutoScroll()" id="btn-autoscroll" style="border-color:var(--accent); color:var(--accent) !important; padding: 4px 10px;" data-i18n="btnScrollOn">SCROLL: ON</button>
|
||||||
|
<button class="btn-cmd" onclick="clearLogs()" style="border-color:var(--danger); color:var(--danger) !important; padding: 4px 10px;" data-i18n="btnClear">CLEAR</button>
|
||||||
|
<button onclick="closeLogModal()" class="btn-cmd" style="border-color:var(--danger); color:var(--danger) !important; width: 24px; height: 24px; flex: 0 0 24px; padding: 0; display: flex; align-items: center; justify-content: center; font-size: 0.8rem;">X</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div id="log-console" class="terminal-log" style="height: 500px; max-height: 500px; font-size: 0.85rem; border: 1px solid var(--border-light); padding: 15px; background: rgba(0,0,0,0.4);">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="update-modal" class="modal-overlay">
|
||||||
<div class="modal-content" style="max-width:400px; text-align:center;">
|
<div class="modal-content" style="max-width:400px; text-align:center;">
|
||||||
<h2 style="margin-top:0; color:var(--primary); border-bottom: 1px dashed var(--border-main); padding-bottom: 10px; font-weight:300;" data-i18n="modUpdateTitle">[ GBL_UPDATE ]</h2>
|
<h2 style="margin-top:0; color:var(--primary); border-bottom: 1px dashed var(--border-main); padding-bottom: 10px; font-weight:300;" data-i18n="modUpdateTitle">[ GBL_UPDATE ]</h2>
|
||||||
<p style="margin-bottom:25px; font-weight: 300;" data-i18n="confUpdate">REQ DATA?</p>
|
<p style="margin-bottom:25px; font-weight: 300;" data-i18n="confUpdate">REQ DATA?</p>
|
||||||
@@ -457,7 +550,78 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<div id="schedule-modal" class="modal-overlay">
|
||||||
|
<div class="modal-content" style="max-width:1050px; width:95%;">
|
||||||
|
<div style="display:flex; justify-content:space-between; align-items:center; border-bottom:1px dashed var(--border-main); padding-bottom:10px; margin-bottom:20px;">
|
||||||
|
<h2 style="margin:0; color:var(--text-main); font-weight:300;" data-i18n="schedTitle">[ CALENDAR_PROFILE_SCHEDULER ]</h2>
|
||||||
|
<button onclick="closeScheduleModal()" class="btn-cmd" style="border-color:var(--danger); color:var(--danger) !important; width: 24px; height: 24px; flex: 0 0 24px; padding: 0; display: flex; align-items: center; justify-content: center; font-size: 0.8rem;">X</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- FORM CREAZIONE EVENTO -->
|
||||||
|
<div style="background:rgba(0,0,0,0.2); padding:15px; border:1px solid var(--border-light); margin-bottom:20px;">
|
||||||
|
<h4 style="margin:0 0 15px 0; color:var(--primary); font-weight:300;" data-i18n="schedNew">[ NEW_SCHEDULED_EVENT ]</h4>
|
||||||
|
<div style="display:grid; grid-template-columns: repeat(auto-fit, minmax(210px, 1fr)); gap:12px; margin-bottom:15px;">
|
||||||
|
<div>
|
||||||
|
<label style="font-size:0.75rem; color:var(--text-muted); display:block; margin-bottom:4px;" data-i18n="lblSchedTitle">EVENT_TITLE:</label>
|
||||||
|
<input type="text" id="sched-title" placeholder="Es. Net Regionale / Esercitazione" style="width:100%;">
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label style="font-size:0.75rem; color:var(--text-muted); display:block; margin-bottom:4px;" data-i18n="lblSchedNodes">TARGET_NODES:</label>
|
||||||
|
<select id="sched-nodes-select" style="width:100%;"></select>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label style="font-size:0.75rem; color:var(--text-muted); display:block; margin-bottom:4px;" data-i18n="lblSchedTargetProf">TARGET_PROFILE:</label>
|
||||||
|
<select id="sched-target-prof" style="width:100%;">
|
||||||
|
<option value="B">B (Profilo B)</option>
|
||||||
|
<option value="A">A (Profilo A)</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label style="font-size:0.75rem; color:var(--text-muted); display:block; margin-bottom:4px;" data-i18n="lblSchedRestoreProf">RESTORE_PROFILE:</label>
|
||||||
|
<select id="sched-restore-prof" style="width:100%;">
|
||||||
|
<option value="A">A (Profilo A)</option>
|
||||||
|
<option value="B">B (Profilo B)</option>
|
||||||
|
<option value="NONE" data-i18n="optNone">NONE (Leave active)</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label style="font-size:0.75rem; color:var(--text-muted); display:block; margin-bottom:4px;" data-i18n="lblSchedStart">START_TIME:</label>
|
||||||
|
<input type="datetime-local" id="sched-start" style="width:100%;">
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label style="font-size:0.75rem; color:var(--text-muted); display:block; margin-bottom:4px;" data-i18n="lblSchedEnd">END_TIME:</label>
|
||||||
|
<input type="datetime-local" id="sched-end" style="width:100%;">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div style="text-align:right;">
|
||||||
|
<button onclick="submitSchedule()" class="btn-cmd" style="border-color:var(--success); color:var(--success) !important; width:auto; padding:6px 20px; font-size:0.85rem; display:inline-block; flex:none;" data-i18n="btnAddSched">CREATE_SCHEDULE</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- TABELLA SCHEDULAZIONI -->
|
||||||
|
<div style="overflow-x:auto; max-height:300px;">
|
||||||
|
<table style="width:100%; border-collapse:collapse; text-align:left;">
|
||||||
|
<thead style="background: transparent;">
|
||||||
|
<tr>
|
||||||
|
<th data-i18n="thSchedTitle">TITLE</th>
|
||||||
|
<th data-i18n="thSchedNodes">NODES</th>
|
||||||
|
<th data-i18n="thSchedProf">PROFILE</th>
|
||||||
|
<th data-i18n="thSchedStart">START</th>
|
||||||
|
<th data-i18n="thSchedEnd">END</th>
|
||||||
|
<th data-i18n="thSchedStatus">STATUS</th>
|
||||||
|
<th style="text-align:right;" data-i18n="thSchedActs">CMD</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody id="schedules-table-body"></tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- LIBRERIE ESTERNE -->
|
<!-- LIBRERIE ESTERNE -->
|
||||||
|
<script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.1/dist/chart.umd.js"></script>
|
||||||
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/diff_match_patch/20121119/diff_match_patch.js"></script>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.7.2/socket.io.min.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.7.2/socket.io.min.js"></script>
|
||||||
<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>
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
import sqlite3
|
|
||||||
import json
|
|
||||||
from app import broadcast_push_notification, init_db
|
|
||||||
|
|
||||||
# Proviamo a inviare una notifica a tutti gli iscritti nel DB
|
|
||||||
print("🚀 Starting notification test...")
|
|
||||||
broadcast_push_notification(
|
|
||||||
"⚠️ ALLERTA FLOTTA",
|
|
||||||
"Test Push Notification: System Online!"
|
|
||||||
)
|
|
||||||
print("✅ Command sent.")
|
|
||||||
Executable
+114
@@ -0,0 +1,114 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
# Forza l'esecuzione nella cartella in cui risiede lo script
|
||||||
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
cd "$SCRIPT_DIR"
|
||||||
|
|
||||||
|
echo "============================================================"
|
||||||
|
echo " Fleet Control Server - Aggiornamento & Migrazione v7.0.0"
|
||||||
|
echo "============================================================"
|
||||||
|
|
||||||
|
# 1. Installazione del pacchetto di sistema Redis
|
||||||
|
if ! command -v redis-server &> /dev/null; then
|
||||||
|
echo "📦 Installazione del demone Redis via APT..."
|
||||||
|
sudo apt update
|
||||||
|
sudo apt install -y redis-server
|
||||||
|
else
|
||||||
|
echo "✅ redis-server già installato."
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 2. Configurazione di /etc/redis/redis.conf (Persistenza AOF)
|
||||||
|
REDIS_CONF="/etc/redis/redis.conf"
|
||||||
|
if [ -f "$REDIS_CONF" ]; then
|
||||||
|
echo "⚙️ Configurazione persistenza in $REDIS_CONF..."
|
||||||
|
# Imposta appendonly yes
|
||||||
|
if grep -q "^#* *appendonly" "$REDIS_CONF"; then
|
||||||
|
sudo sed -i 's/^#* *appendonly .*/appendonly yes/' "$REDIS_CONF"
|
||||||
|
else
|
||||||
|
echo "appendonly yes" | sudo tee -a "$REDIS_CONF" > /dev/null
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Imposta appendfsync everysec
|
||||||
|
if grep -q "^#* *appendfsync" "$REDIS_CONF"; then
|
||||||
|
sudo sed -i 's/^#* *appendfsync .*/appendfsync everysec/' "$REDIS_CONF"
|
||||||
|
else
|
||||||
|
echo "appendfsync everysec" | sudo tee -a "$REDIS_CONF" > /dev/null
|
||||||
|
fi
|
||||||
|
echo "✅ redis.conf aggiornato con 'appendonly yes'."
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 3. Riavvio e verifica del servizio Redis
|
||||||
|
echo "🚀 Riavvio del servizio Redis..."
|
||||||
|
sudo systemctl enable redis-server
|
||||||
|
sudo systemctl restart redis-server
|
||||||
|
|
||||||
|
if redis-cli ping | grep -q "PONG"; then
|
||||||
|
echo "✅ Redis è attivo e risponde correttamente (PONG)."
|
||||||
|
else
|
||||||
|
echo "❌ Errore: Redis non risponde sulla porta 6379."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 4. Aggiornamento dipendenze Python nel virtualenv
|
||||||
|
if [ -d "venv" ]; then
|
||||||
|
echo "🐍 Aggiornamento dipendenze nel venv (inclusa libreria redis)..."
|
||||||
|
venv/bin/pip install --upgrade pip
|
||||||
|
venv/bin/pip install -r requirements.txt
|
||||||
|
else
|
||||||
|
echo "⚠️ Cartella venv non trovata. Esegui 'pip install -r requirements.txt' nel tuo ambiente."
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 5. Migrazione automatica di config.json (eseguita inline da Python)
|
||||||
|
echo "⚙️ Controllo e allineamento di config.json..."
|
||||||
|
PYTHON_BIN="python3"
|
||||||
|
[ -f "venv/bin/python3" ] && PYTHON_BIN="venv/bin/python3"
|
||||||
|
|
||||||
|
$PYTHON_BIN - << 'EOF'
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
|
||||||
|
config_path = "config.json"
|
||||||
|
|
||||||
|
if not os.path.exists(config_path):
|
||||||
|
print(f"⚠️ {config_path} non trovato. Nulla da migrare.")
|
||||||
|
sys.exit(0)
|
||||||
|
|
||||||
|
try:
|
||||||
|
with open(config_path, "r", encoding="utf-8") as f:
|
||||||
|
cfg = json.load(f)
|
||||||
|
except Exception as e:
|
||||||
|
print(f"❌ Errore nella lettura di {config_path}: {e}")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
if "web" not in cfg:
|
||||||
|
cfg["web"] = {}
|
||||||
|
|
||||||
|
if "redis_url" not in cfg["web"]:
|
||||||
|
print("🔧 Aggiunta della direttiva 'redis_url' in config.json...")
|
||||||
|
cfg["web"]["redis_url"] = "redis://localhost:6379/0"
|
||||||
|
|
||||||
|
# Backup di sicurezza preventivo
|
||||||
|
bak_path = config_path + ".bak"
|
||||||
|
try:
|
||||||
|
with open(config_path, "r", encoding="utf-8") as rf:
|
||||||
|
with open(bak_path, "w", encoding="utf-8") as wf:
|
||||||
|
wf.write(rf.read())
|
||||||
|
print(f"💾 Backup salvato in {bak_path}")
|
||||||
|
except Exception as e:
|
||||||
|
print(f"⚠️ Impossibile salvare backup: {e}")
|
||||||
|
|
||||||
|
# Scrittura atomica per evitare file vuoti o corrotti
|
||||||
|
tmp_path = config_path + ".tmp"
|
||||||
|
with open(tmp_path, "w", encoding="utf-8") as f:
|
||||||
|
json.dump(cfg, f, indent=4)
|
||||||
|
os.replace(tmp_path, config_path)
|
||||||
|
print("✅ config.json aggiornato con successo.")
|
||||||
|
else:
|
||||||
|
print("ℹ️ config.json contiene già la configurazione Redis.")
|
||||||
|
EOF
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "🎉 Aggiornamento completato con successo!"
|
||||||
|
echo "Puoi avviare o riavviare il servizio: sudo systemctl restart fleet-control"
|
||||||
Reference in New Issue
Block a user