Refactor v5.0: Architettura modulare backend/frontend e PWA v6
This commit is contained in:
@@ -0,0 +1,70 @@
|
||||
import os
|
||||
import json
|
||||
import secrets
|
||||
import logging
|
||||
import threading
|
||||
from logging.handlers import RotatingFileHandler
|
||||
|
||||
# --- PERCORSI DINAMICI ---
|
||||
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
|
||||
DB_PATH = os.path.join(BASE_DIR, 'monitor.db')
|
||||
CACHE_FILE = os.path.join(BASE_DIR, 'telemetry_cache.json')
|
||||
CONFIG_PATH = os.path.join(BASE_DIR, 'config.json')
|
||||
DMR_IDS_PATH = os.path.join(BASE_DIR, 'dmrid.dat')
|
||||
NXDN_IDS_PATH = os.path.join(BASE_DIR, 'nxdn.csv')
|
||||
CLIENTS_PATH = os.path.join(BASE_DIR, 'clients.json')
|
||||
LOG_FILE = os.path.join(BASE_DIR, 'fleet_console.log')
|
||||
|
||||
# --- CONFIG LOADER ---
|
||||
config_lock = threading.Lock()
|
||||
|
||||
def read_config():
|
||||
try:
|
||||
with open(CONFIG_PATH, 'r') as f:
|
||||
return json.load(f)
|
||||
except Exception:
|
||||
return {}
|
||||
|
||||
def write_config(cfg):
|
||||
tmp = CONFIG_PATH + '.tmp'
|
||||
with config_lock:
|
||||
with open(tmp, 'w') as f:
|
||||
json.dump(cfg, f, indent=4)
|
||||
try:
|
||||
os.chmod(tmp, os.stat(CONFIG_PATH).st_mode & 0o777)
|
||||
except OSError:
|
||||
pass
|
||||
os.replace(tmp, CONFIG_PATH)
|
||||
|
||||
config = read_config()
|
||||
web_cfg = config.get('web', {})
|
||||
|
||||
# --- LOGGING ROTATIVO ---
|
||||
log_max_mb = int(config.get('log_max_mb', 50))
|
||||
log_backup_count = int(config.get('log_backup_count', 10))
|
||||
max_bytes_val = log_max_mb * 1024 * 1024 if log_max_mb > 0 else 0
|
||||
|
||||
logging.basicConfig(
|
||||
handlers=[
|
||||
RotatingFileHandler(LOG_FILE, maxBytes=max_bytes_val, backupCount=log_backup_count),
|
||||
logging.StreamHandler()
|
||||
],
|
||||
level=logging.INFO,
|
||||
format='[%(asctime)s] %(levelname)s - %(message)s',
|
||||
datefmt='%Y-%m-%d %H:%M:%S'
|
||||
)
|
||||
logger = logging.getLogger("FleetHub")
|
||||
logging.getLogger('werkzeug').setLevel(logging.ERROR)
|
||||
|
||||
def get_secret_key():
|
||||
key = os.environ.get('FLEET_SECRET_KEY') or config.get('secret_key')
|
||||
if not key or key == 'ari_fvg_secret_ultra_secure':
|
||||
key = secrets.token_hex(32)
|
||||
config['secret_key'] = key
|
||||
try:
|
||||
write_config(config)
|
||||
logger.warning("🔑 Nuova secret_key generata e salvata in config.json.")
|
||||
except Exception as e:
|
||||
logger.error(f"Impossibile salvare la secret_key in config.json ({e}).")
|
||||
return key
|
||||
@@ -0,0 +1,122 @@
|
||||
import sqlite3
|
||||
import secrets
|
||||
from contextlib import closing
|
||||
from werkzeug.security import generate_password_hash
|
||||
from core.config import DB_PATH, config, read_config, logger
|
||||
from core.state import notify_update
|
||||
|
||||
def db_connect(row=False):
|
||||
conn = sqlite3.connect(DB_PATH, timeout=10)
|
||||
if row:
|
||||
conn.row_factory = sqlite3.Row
|
||||
return conn
|
||||
|
||||
def init_db():
|
||||
conn = sqlite3.connect(DB_PATH, timeout=10)
|
||||
c = conn.cursor()
|
||||
|
||||
c.execute('PRAGMA journal_mode=WAL;')
|
||||
|
||||
c.execute('''CREATE TABLE IF NOT EXISTS radio_logs
|
||||
(id INTEGER PRIMARY KEY AUTOINCREMENT, timestamp DATETIME, client_id TEXT,
|
||||
source_id TEXT, target TEXT, slot INTEGER, duration REAL, ber REAL, loss REAL)''')
|
||||
try:
|
||||
c.execute("ALTER TABLE radio_logs ADD COLUMN protocol TEXT DEFAULT 'DMR'")
|
||||
except sqlite3.OperationalError: pass
|
||||
|
||||
try:
|
||||
c.execute("ALTER TABLE radio_logs ADD COLUMN source_ext TEXT DEFAULT ''")
|
||||
except sqlite3.OperationalError: pass
|
||||
|
||||
try:
|
||||
c.execute("ALTER TABLE radio_logs ADD COLUMN rssi REAL DEFAULT 0")
|
||||
except sqlite3.OperationalError: pass
|
||||
|
||||
try:
|
||||
c.execute("ALTER TABLE radio_logs ADD COLUMN source_conn TEXT DEFAULT ''")
|
||||
except sqlite3.OperationalError: pass
|
||||
|
||||
try:
|
||||
c.execute("ALTER TABLE radio_logs ADD COLUMN ysf_mode TEXT DEFAULT ''")
|
||||
except sqlite3.OperationalError: pass
|
||||
|
||||
c.execute('''CREATE TABLE IF NOT EXISTS users
|
||||
(id INTEGER PRIMARY KEY AUTOINCREMENT, username TEXT UNIQUE, password_hash TEXT,
|
||||
role TEXT, allowed_nodes TEXT)''')
|
||||
|
||||
c.execute('''CREATE TABLE IF NOT EXISTS push_subscriptions
|
||||
(id INTEGER PRIMARY KEY AUTOINCREMENT, username TEXT, subscription TEXT UNIQUE)''')
|
||||
|
||||
c.execute('''CREATE TABLE IF NOT EXISTS audit_logs
|
||||
(id INTEGER PRIMARY KEY AUTOINCREMENT, timestamp DATETIME, username TEXT,
|
||||
client_id TEXT, command TEXT)''')
|
||||
|
||||
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_audit_logs_ts ON audit_logs(timestamp)")
|
||||
|
||||
c.execute("SELECT COUNT(*) FROM users")
|
||||
if c.fetchone()[0] == 0:
|
||||
adm_cfg = config.get("web_admin", {})
|
||||
def_user = adm_cfg.get("default_user", "admin")
|
||||
def_pass = adm_cfg.get("default_pass", "")
|
||||
generated = False
|
||||
if not def_pass or def_pass == "admin123":
|
||||
def_pass = secrets.token_urlsafe(9)
|
||||
generated = True
|
||||
|
||||
c.execute("INSERT INTO users (username, password_hash, role, allowed_nodes) VALUES (?,?,?,?)",
|
||||
(def_user, generate_password_hash(def_pass), 'admin', 'all'))
|
||||
if generated:
|
||||
logger.warning(f">>> DEFAULT USER CREATED - User: {def_user} | Temporary password: {def_pass} | CHANGE IT NOW <<<")
|
||||
else:
|
||||
logger.info(f">>> DEFAULT USER CREATED - User: {def_user} (password from config.json) <<<")
|
||||
|
||||
conn.commit()
|
||||
conn.close()
|
||||
|
||||
def save_to_sqlite(client_id, data, protocol="DMR"):
|
||||
conn = sqlite3.connect(DB_PATH, timeout=10)
|
||||
c = conn.cursor()
|
||||
|
||||
rssi_val = 0
|
||||
if 'rssi' in data and isinstance(data['rssi'], dict):
|
||||
rssi_val = data['rssi'].get('ave', 0)
|
||||
elif 'rssi' in data:
|
||||
rssi_val = data['rssi']
|
||||
|
||||
c.execute("""INSERT INTO radio_logs
|
||||
(timestamp, client_id, protocol, source_id, target, slot, duration, ber, source_ext, rssi, source_conn, ysf_mode)
|
||||
VALUES (datetime('now', 'localtime'), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)""",
|
||||
(client_id, protocol, str(data.get('src_id', '---')), str(data.get('dst_id', '---')),
|
||||
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', ''))))
|
||||
conn.commit()
|
||||
conn.close()
|
||||
notify_update('log_aggiornato')
|
||||
|
||||
def audit(username, client_id, command):
|
||||
try:
|
||||
with closing(db_connect()) as conn:
|
||||
conn.execute("INSERT INTO audit_logs (timestamp, username, client_id, command) VALUES (datetime('now','localtime'), ?, ?, ?)",
|
||||
(username, client_id, command))
|
||||
conn.commit()
|
||||
except Exception as e:
|
||||
logger.error(f"Audit log error: {e}")
|
||||
|
||||
def prune_old_data():
|
||||
try:
|
||||
cfg = read_config()
|
||||
radio_days = int(cfg.get("retention_days", 90))
|
||||
audit_days = int(cfg.get("audit_retention_days", 365))
|
||||
with closing(db_connect()) as conn:
|
||||
c = conn.cursor()
|
||||
c.execute("DELETE FROM radio_logs WHERE timestamp < datetime('now', 'localtime', ?)", (f"-{radio_days} days",))
|
||||
n1 = c.rowcount
|
||||
c.execute("DELETE FROM audit_logs WHERE timestamp < datetime('now', 'localtime', ?)", (f"-{audit_days} days",))
|
||||
n2 = c.rowcount
|
||||
conn.commit()
|
||||
if n1 or n2:
|
||||
logger.info(f"🧹 Pulizia DB: {n1} ascolti e {n2} audit rimossi.")
|
||||
except Exception as e:
|
||||
logger.error(f"❌ Errore pulizia DB: {e}")
|
||||
+135
@@ -0,0 +1,135 @@
|
||||
import os
|
||||
import json
|
||||
import time
|
||||
import threading
|
||||
import sqlite3
|
||||
from contextlib import closing
|
||||
from flask_socketio import SocketIO
|
||||
from core.config import CACHE_FILE, DB_PATH, DMR_IDS_PATH, NXDN_IDS_PATH, logger, web_cfg
|
||||
|
||||
# --- WEBSOCKET SOCKETIO ---
|
||||
socketio = SocketIO(cors_allowed_origins=web_cfg.get('cors_origins', '*'))
|
||||
|
||||
# --- NOTIFICHE WEBSOCKET ---
|
||||
NOTIFY_DELAY = 0.3
|
||||
_notify_lock = threading.Lock()
|
||||
_notify_pending = set()
|
||||
|
||||
def notify_update(event='dati_aggiornati'):
|
||||
with _notify_lock:
|
||||
if event in _notify_pending:
|
||||
return
|
||||
_notify_pending.add(event)
|
||||
|
||||
def _fire():
|
||||
with _notify_lock:
|
||||
_notify_pending.discard(event)
|
||||
try:
|
||||
socketio.emit(event)
|
||||
except Exception as e:
|
||||
logger.error(f"Errore emit WebSocket '{event}': {e}")
|
||||
|
||||
timer = threading.Timer(NOTIFY_DELAY, _fire)
|
||||
timer.daemon = True
|
||||
timer.start()
|
||||
|
||||
# --- STATI GLOBALI IN MEMORIA ---
|
||||
START_TIME = time.time()
|
||||
client_states = {}
|
||||
device_configs = {}
|
||||
client_telemetry = {}
|
||||
last_notified_errors = {}
|
||||
device_health = {}
|
||||
last_seen_reflector = {}
|
||||
node_info = {}
|
||||
node_general = {}
|
||||
node_versions = {}
|
||||
gateway_states = {}
|
||||
active_warnings = {}
|
||||
active_calls = {}
|
||||
|
||||
# Caricamento iniziale cache telemetria
|
||||
if os.path.exists(CACHE_FILE):
|
||||
try:
|
||||
with open(CACHE_FILE, 'r') as f:
|
||||
client_telemetry = json.load(f)
|
||||
except Exception:
|
||||
client_telemetry = {}
|
||||
|
||||
def save_cache(data):
|
||||
try:
|
||||
tmp = CACHE_FILE + '.tmp'
|
||||
with open(tmp, 'w') as f:
|
||||
json.dump(data, f)
|
||||
os.replace(tmp, CACHE_FILE)
|
||||
except Exception as e:
|
||||
logger.error(f"Errore salvataggio cache telemetria: {e}")
|
||||
notify_update()
|
||||
|
||||
# --- GESTIONE LAST SEEN ---
|
||||
last_seen = {}
|
||||
last_seen_lock = threading.Lock()
|
||||
|
||||
def touch_seen(cid, kind):
|
||||
with last_seen_lock:
|
||||
last_seen.setdefault(cid, {})[kind] = time.time()
|
||||
|
||||
def seen_ages():
|
||||
now = time.time()
|
||||
with last_seen_lock:
|
||||
return {cid: {k: round(now - ts, 1) for k, ts in kinds.items()} for cid, kinds in last_seen.items()}
|
||||
|
||||
def seed_last_seen():
|
||||
try:
|
||||
with closing(sqlite3.connect(DB_PATH, timeout=10)) as conn:
|
||||
rows = conn.execute("""SELECT LOWER(client_id), MAX(timestamp) FROM radio_logs
|
||||
WHERE source_id NOT LIKE '🌐%' GROUP BY LOWER(client_id)""").fetchall()
|
||||
for cid, ts in rows:
|
||||
try:
|
||||
parsed = time.mktime(time.strptime(ts, '%Y-%m-%d %H:%M:%S'))
|
||||
except (TypeError, ValueError):
|
||||
continue
|
||||
with last_seen_lock:
|
||||
last_seen.setdefault(cid, {}).setdefault('mmdvm', parsed)
|
||||
except Exception as e:
|
||||
logger.error(f"seed_last_seen: {e}")
|
||||
|
||||
# --- DATABASE ID DMR / NXDN ---
|
||||
user_db = {}
|
||||
nxdn_db = {}
|
||||
|
||||
def load_ids():
|
||||
global user_db, nxdn_db
|
||||
new_dmr, new_nxdn = {}, {}
|
||||
|
||||
if os.path.exists(DMR_IDS_PATH):
|
||||
with open(DMR_IDS_PATH, 'r', encoding='utf-8', errors='ignore') as f:
|
||||
for l in f:
|
||||
l = l.replace('"', '')
|
||||
if ',' in l: p = l.strip().split(',')
|
||||
elif '\t' in l: p = l.strip().split('\t')
|
||||
elif ';' in l: p = l.strip().split(';')
|
||||
else: p = l.strip().split()
|
||||
|
||||
if len(p) >= 2 and p[0].strip().isdigit():
|
||||
new_dmr[p[0].strip()] = p[1].strip()
|
||||
|
||||
if os.path.exists(NXDN_IDS_PATH):
|
||||
with open(NXDN_IDS_PATH, 'r', encoding='utf-8', errors='ignore') as f:
|
||||
for l in f:
|
||||
sep = '\t' if '\t' in l else (',' if ',' in l else ';')
|
||||
p = l.strip().split(sep)
|
||||
if len(p) >= 2 and p[0].strip().isdigit():
|
||||
new_nxdn[p[0].strip()] = p[1].strip()
|
||||
|
||||
if new_dmr: user_db = new_dmr
|
||||
if new_nxdn: nxdn_db = new_nxdn
|
||||
|
||||
def get_call(id_val, proto="DMR"):
|
||||
sid = str(id_val)
|
||||
if proto == "NXDN":
|
||||
return nxdn_db.get(sid, sid)
|
||||
return user_db.get(sid, sid)
|
||||
|
||||
# Inizializzazione automatica ID
|
||||
load_ids()
|
||||
Reference in New Issue
Block a user