ruff

Ranamed 2 pages for easy or reading.

.github/workflows/container.yml

@@ -2,7 +2,6 @@ name: Build container
 
 on:
   push:
-  workflow_dispatch:
 
 jobs:
   docker:
@@ -24,8 +23,7 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
-            # publish :latest from the default branch
-            type=raw,value=latest,enable={{is_default_branch}}
+            type=match,pattern=v\d.\d.\d,value=latest
       - name: Login to GitHub Container Registry
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v3
@@ -51,4 +49,4 @@ jobs:
           platforms: linux/amd64,linux/arm64
           # optional cache (speeds up rebuilds)
           cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-to: type=gha,mode=max

.gitignore

@@ -2,6 +2,7 @@ env/*
 __pycache__/*
 meshview/__pycache__/*
 alembic/__pycache__/*
+meshtastic/protobuf/*
 
 # Database files
 packets.db
@@ -44,4 +45,3 @@ __pycache__/
 # OS
 .DS_Store
 Thumbs.db
-packets.db-journal

Containerfile

@@ -35,7 +35,7 @@ RUN uv pip install --no-cache-dir --upgrade pip \
 COPY --chown=${APP_USER}:${APP_USER} . .
 
 # Patch config
-COPY --chown=${APP_USER}:${APP_USER} container/config.ini /app/sample.config.ini
+RUN patch sample.config.ini < container/config.patch
 
 # Clean
 RUN rm -rf /app/.git* && \
@@ -77,3 +77,4 @@ CMD ["--pid_dir", "/tmp", "--py_exec", "/opt/venv/bin/python", "--config", "/etc
 
 EXPOSE 8081
 VOLUME [ "/etc/meshview", "/var/lib/meshview", "/var/log/meshview" ]
+

README-Docker.md

@@ -128,11 +128,7 @@ username =
 password =
 
 [database]
-# SQLAlchemy async connection string.
-# Examples:
-#   sqlite+aiosqlite:///var/lib/meshview/packets.db
-#   postgresql+asyncpg://user:pass@host:5432/meshview
-connection_string = sqlite+aiosqlite:////var/lib/meshview/packets.db
+connection_string = sqlite+aiosqlite:///var/lib/meshview/packets.db
 ```
 
 ### Database Backups

README.md

@@ -4,29 +4,6 @@
 
 The project serves as a real-time monitoring and diagnostic tool for the Meshtastic mesh network. It provides detailed insights into network activity, including message traffic, node positions, and telemetry data.
 
-### Version 3.0.4 — Late January 2026
-- Database: multi‑DB support, PostgreSQL scripts, WAL config for SQLite, cleanup query timing fixes, removal of import time columns, and various time‑handling fixes.
-- UI/UX: extensive updates to node.html, nodelist.html, top.html, and packet.html (paging, stats, distance, status/favorites), plus net view changes to 12‑hour window.
-- API/logic: weekly mesh query fix, node list performance improvement, backwards‑compatibility and other bug fixes.
-- MQTT reader: configurable skip‑node list and secondary decryption keys.
-- Docs/ops: multiple documentation updates, updated site list, container workflow fixes/tests, README updates.
-
-### Version 3.0.2 — January 2026
-- Changes to the Database to will make it so that there is a need for space when updating to the latest. SQlite requires to rebuild the database when droping a column. ( we are droping some of the old columns) so make sure you have 1.2x the size of the db of space in your environment. Depending on how big your db is it would take a long time.
-  
-### Version 3.0.1 — December 2025
-
-#### 🌐 Multi-Language Support (i18n)
-- New `/api/lang` endpoint for serving translations  
-- Section-based translation loading (e.g., `?section=firehose`)  
-- Default language controlled via config file language section
-- JSON-based translation files for easy expansion  
-- Core pages updated to support `data-translate-lang` attributes  
-
-### 🛠 Improvements
-- Updated UI elements across multiple templates for localization readiness  
-- General cleanup to support future language additions  
-
 ### Version 3.0.0 update - November 2025
 
 **Major Infrastructure Improvements:**
@@ -90,45 +67,23 @@ See [README-Docker.md](README-Docker.md) for container deployment and [docs/](do
 
 Samples of currently running instances:
 
-- https://meshview.bayme.sh (SF Bay Area - USA)
-- https://www.svme.sh (Sacramento Valley - USA)
-- https://meshview.nyme.sh (New York - USA)
-- https://meshview.socalmesh.org (Los Angenles - USA)
-- https://map.wpamesh.net (Western Pennsylvania - USA)
-- https://meshview.chicagolandmesh.org (Chicago - USA)
-- https://meshview.freq51.net/ (Salt Lake City - USA)
-- https://meshview.mt.gt (Canada)
-- https://canadaverse.org (Canada)
+- https://meshview.bayme.sh (SF Bay Area)
+- https://www.svme.sh (Sacramento Valley)
+- https://meshview.nyme.sh   (New York)
+- https://meshview.socalmesh.org (LA Area)
+- https://map.wpamesh.net (Western Pennsylvania)
+- https://meshview.chicagolandmesh.org (Chicago)
+- https://meshview.mt.gt (Canadaverse)
 - https://meshview.meshtastic.es (Spain)
-- https://view.mtnme.sh (North Georgia / East Tennessee - USA)
+- https://view.mtnme.sh (North Georgia / East Tennessee)
 - https://meshview.lsinfra.de (Hessen - Germany)
-- https://meshview.pvmesh.org (Pioneer Valley, Massachusetts - USA)
-- https://meshview.louisianamesh.org (Louisiana - USA)
-- https://www.swlamesh.com (Southwest Louisiana- USA)
-- https://meshview.meshcolombia.co (Colombia)
-- https://meshview-salzburg.jmt.gr (Salzburg / Austria)
-- https://map.cromesh.eu (Coatia)
-- https://view.meshdresden.eu (Dresden / Germany)
-- https://meshview.meshoregon.com (Oregon - USA)
-- https://meshview.gamesh.net (Georgia - USA)
-
+- https://map.nswmesh.au (Sydney - Australia)
+- https://meshview.pvmesh.org (Pioneer Valley, Massachusetts)
+- https://meshview.louisianamesh.org (Louisiana)
+- https://meshview.meshcolombia.co/ (Colombia)
+- https://meshview-salzburg.jmt.gr/ (Salzburg / Austria)
 ---
 
-
-
-### Updating from 2.x to 3.x
-We are adding the use of Alembic. If using GitHub
-Update your codebase by running the pull command
-```bash
-cd meshview
-git pull origin master
-```
-Install Alembic in your environment
-```bash
-./env/bin/pip install alembic
-```
-Start your scripts or services. This process will update your database with the latest schema.
-
 ## Installing
 
 ### Using Docker (Recommended)
@@ -229,9 +184,6 @@ acme_challenge =
 # The domain name of your site.
 domain =
 
-# Select language (this represents the name of the json file in the /lang directory)
-language = es
-
 # Site title to show in the browser title bar and headers.
 title = Bay Area Mesh
 
@@ -289,10 +241,7 @@ password = large4cats
 # Database Configuration
 # -------------------------
 [database]
-# SQLAlchemy async connection string.
-# Examples:
-#   sqlite+aiosqlite:///packets.db
-#   postgresql+asyncpg://user:pass@host:5432/meshview
+# SQLAlchemy connection string. This one uses SQLite with asyncio support.
 connection_string = sqlite+aiosqlite:///packets.db
 
 
@@ -326,20 +275,6 @@ db_cleanup_logfile = dbcleanup.log
 
 ---
 
-## NOTE (PostgreSQL setup)**  
-If you want to use PostgreSQL instead of SQLite:
-
-Install PostgreSQL for your OS.  
-Create a user and database:
-```
-`CREATE USER meshview WITH PASSWORD 'change_me';`
-`CREATE DATABASE meshview OWNER meshview;`
-```
-Update `config.ini` example:
-```
-`connection_string = postgresql+asyncpg://meshview:change_me@localhost:5432/meshview`
-```
-
 ## Running Meshview
 
 Start the database manager:
@@ -509,15 +444,16 @@ db_cleanup_logfile = dbcleanup.log
 ```
 Once changes are done you need to restart the script for changes to load.
 
-### Alternatively we can do it via your OS (This example is Ubuntu like OS)
+### Alternatively we can do it via your OS 
 - Create and save bash script below. (Modify /path/to/file/ to the correct path)
 - Name it cleanup.sh
 - Make it executable.
 ```bash
-#!/bin/bash
+ #!/bin/bash
 
 DB_FILE="/path/to/file/packets.db"
 
+
 # Stop DB service
 sudo systemctl stop meshview-db.service
 sudo systemctl stop meshview-web.service
@@ -526,22 +462,10 @@ sleep 5
 echo "Run cleanup..."
 # Run cleanup queries
 sqlite3 "$DB_FILE" <<EOF 
-DELETE FROM packet
-WHERE import_time_us IS NOT NULL
-  AND import_time_us < (strftime('%s','now','-14 days') * 1000000);
-SELECT 'packet deleted: ' || changes();
-DELETE FROM packet_seen
-WHERE import_time_us IS NOT NULL
-  AND import_time_us < (strftime('%s','now','-14 days') * 1000000);
-SELECT 'packet_seen deleted: ' || changes();
-DELETE FROM traceroute
-WHERE import_time_us IS NOT NULL
-  AND import_time_us < (strftime('%s','now','-14 days') * 1000000);
-SELECT 'traceroute deleted: ' || changes();
-DELETE FROM node
-WHERE last_seen_us IS NULL
-   OR last_seen_us < (strftime('%s','now','-14 days') * 1000000);
-SELECT 'node deleted: ' || changes();
+DELETE FROM packet WHERE import_time < datetime('now', '-14 day');
+DELETE FROM packet_seen WHERE import_time < datetime('now', '-14 day');
+DELETE FROM traceroute WHERE import_time < datetime('now', '-14 day');
+DELETE FROM node WHERE last_update < datetime('now', '-14 day') OR last_update IS NULL OR last_update = '';
 VACUUM;
 EOF
 
@@ -551,80 +475,6 @@ sudo systemctl start meshview-web.service
 
 echo "Database cleanup completed on $(date)"
 
-```
-- If you are using PostgreSQL, use this version instead (adjust credentials/DB name):
-```bash
-#!/bin/bash
-set -euo pipefail
-
-DB="postgresql://meshview@localhost:5432/meshview"
-RETENTION_DAYS=14
-BATCH_SIZE=100
-
-PSQL="/usr/bin/psql"
-
-echo "[$(date)] Starting batched cleanup..."
-
-while true; do
-  DELETED=$(
-    $PSQL "$DB" -At -v ON_ERROR_STOP=1 <<EOF
-WITH cutoff AS (
-  SELECT (EXTRACT(EPOCH FROM (NOW() - INTERVAL '${RETENTION_DAYS} days')) * 1000000)::bigint AS ts
-),
-old_packets AS (
-  SELECT id
-  FROM packet, cutoff
-  WHERE import_time_us IS NOT NULL
-    AND import_time_us < cutoff.ts
-  ORDER BY id
-  LIMIT ${BATCH_SIZE}
-),
-ps_del AS (
-  DELETE FROM packet_seen
-  WHERE packet_id IN (SELECT id FROM old_packets)
-  RETURNING 1
-),
-tr_del AS (
-  DELETE FROM traceroute
-  WHERE packet_id IN (SELECT id FROM old_packets)
-  RETURNING 1
-),
-p_del AS (
-  DELETE FROM packet
-  WHERE id IN (SELECT id FROM old_packets)
-  RETURNING 1
-)
-SELECT COUNT(*) FROM p_del;
-EOF
-  )
-
-  if [[ "$DELETED" -eq 0 ]]; then
-    break
-  fi
-  
-  sleep 0.1
-done
-
-echo "[$(date)] Packet cleanup complete"
-
-echo "[$(date)] Cleaning old nodes..."
-
-$PSQL "$DB" -v ON_ERROR_STOP=1 <<EOF
-DELETE FROM node
-WHERE last_seen_us IS NOT NULL
-  AND last_seen_us < (
-    EXTRACT(EPOCH FROM (NOW() - INTERVAL '${RETENTION_DAYS} days')) * 1000000
-  );
-EOF
-
-echo "[$(date)] Node cleanup complete"
-
-$PSQL "$DB" -c "VACUUM (ANALYZE) packet_seen;"
-$PSQL "$DB" -c "VACUUM (ANALYZE) traceroute;"
-$PSQL "$DB" -c "VACUUM (ANALYZE) packet;"
-$PSQL "$DB" -c "VACUUM (ANALYZE) node;"
-
-echo "[$(date)] Cleanup finished"
 ```
 - Schedule running the script on a regular basis. 
 - In this example it runs every night at 2:00am.

alembic/versions/23dad03d2e42_add_is_mqtt_gateway_to_node.py

@@ -1,27 +0,0 @@
-"""Add is_mqtt_gateway to node
-
-Revision ID: 23dad03d2e42
-Revises: a0c9c13e118f
-Create Date: 2026-02-13 00:00:00.000000
-
-"""
-
-from collections.abc import Sequence
-
-import sqlalchemy as sa
-
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision: str = "23dad03d2e42"
-down_revision: str | None = "a0c9c13e118f"
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-
-def upgrade() -> None:
-    op.add_column("node", sa.Column("is_mqtt_gateway", sa.Boolean(), nullable=True))
-
-
-def downgrade() -> None:
-    op.drop_column("node", "is_mqtt_gateway")

alembic/versions/9f3b1a8d2c4f_drop_import_time_columns.py

@@ -1,65 +0,0 @@
-"""Drop import_time columns.
-
-Revision ID: 9f3b1a8d2c4f
-Revises: 2b5a61bb2b75
-Create Date: 2026-01-09 09:55:00.000000
-"""
-
-from collections.abc import Sequence
-
-import sqlalchemy as sa
-
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision: str = "9f3b1a8d2c4f"
-down_revision: str | None = "2b5a61bb2b75"
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-
-def upgrade() -> None:
-    conn = op.get_bind()
-    inspector = sa.inspect(conn)
-
-    packet_indexes = {idx["name"] for idx in inspector.get_indexes("packet")}
-    packet_columns = {col["name"] for col in inspector.get_columns("packet")}
-
-    with op.batch_alter_table("packet", schema=None) as batch_op:
-        if "idx_packet_import_time" in packet_indexes:
-            batch_op.drop_index("idx_packet_import_time")
-        if "idx_packet_from_node_time" in packet_indexes:
-            batch_op.drop_index("idx_packet_from_node_time")
-        if "import_time" in packet_columns:
-            batch_op.drop_column("import_time")
-
-    packet_seen_columns = {col["name"] for col in inspector.get_columns("packet_seen")}
-    with op.batch_alter_table("packet_seen", schema=None) as batch_op:
-        if "import_time" in packet_seen_columns:
-            batch_op.drop_column("import_time")
-
-    traceroute_indexes = {idx["name"] for idx in inspector.get_indexes("traceroute")}
-    traceroute_columns = {col["name"] for col in inspector.get_columns("traceroute")}
-    with op.batch_alter_table("traceroute", schema=None) as batch_op:
-        if "idx_traceroute_import_time" in traceroute_indexes:
-            batch_op.drop_index("idx_traceroute_import_time")
-        if "import_time" in traceroute_columns:
-            batch_op.drop_column("import_time")
-
-
-def downgrade() -> None:
-    with op.batch_alter_table("traceroute", schema=None) as batch_op:
-        batch_op.add_column(sa.Column("import_time", sa.DateTime(), nullable=True))
-        batch_op.create_index("idx_traceroute_import_time", ["import_time"], unique=False)
-
-    with op.batch_alter_table("packet_seen", schema=None) as batch_op:
-        batch_op.add_column(sa.Column("import_time", sa.DateTime(), nullable=True))
-
-    with op.batch_alter_table("packet", schema=None) as batch_op:
-        batch_op.add_column(sa.Column("import_time", sa.DateTime(), nullable=True))
-        batch_op.create_index("idx_packet_import_time", [sa.text("import_time DESC")], unique=False)
-        batch_op.create_index(
-            "idx_packet_from_node_time",
-            ["from_node_id", sa.text("import_time DESC")],
-            unique=False,
-        )

alembic/versions/a0c9c13e118f_add_node_public_key.py

@@ -1,43 +0,0 @@
-"""Add node_public_key table
-
-Revision ID: a0c9c13e118f
-Revises: d4d7b0c2e1a4
-Create Date: 2026-02-06 00:00:00.000000
-
-"""
-
-from collections.abc import Sequence
-
-import sqlalchemy as sa
-
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision: str = "a0c9c13e118f"
-down_revision: str | None = "d4d7b0c2e1a4"
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-
-def upgrade() -> None:
-    op.create_table(
-        "node_public_key",
-        sa.Column("id", sa.Integer(), primary_key=True, autoincrement=True),
-        sa.Column("node_id", sa.BigInteger(), nullable=False),
-        sa.Column("public_key", sa.String(), nullable=False),
-        sa.Column("first_seen_us", sa.BigInteger(), nullable=True),
-        sa.Column("last_seen_us", sa.BigInteger(), nullable=True),
-    )
-    op.create_index("idx_node_public_key_node_id", "node_public_key", ["node_id"], unique=False)
-    op.create_index(
-        "idx_node_public_key_public_key",
-        "node_public_key",
-        ["public_key"],
-        unique=False,
-    )
-
-
-def downgrade() -> None:
-    op.drop_index("idx_node_public_key_public_key", table_name="node_public_key")
-    op.drop_index("idx_node_public_key_node_id", table_name="node_public_key")
-    op.drop_table("node_public_key")

alembic/versions/b7c3c2e3a1f0_add_last_update_us_to_node.py

@@ -1,94 +0,0 @@
-"""Add last_update_us to node and migrate data.
-
-Revision ID: b7c3c2e3a1f0
-Revises: 9f3b1a8d2c4f
-Create Date: 2026-01-12 10:12:00.000000
-"""
-
-from collections.abc import Sequence
-from datetime import UTC, datetime
-
-import sqlalchemy as sa
-
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision: str = "b7c3c2e3a1f0"
-down_revision: str | None = "9f3b1a8d2c4f"
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-
-def _parse_datetime(value):
-    if value is None:
-        return None
-    if isinstance(value, datetime):
-        dt = value
-    elif isinstance(value, str):
-        text = value.replace("Z", "+00:00")
-        try:
-            dt = datetime.fromisoformat(text)
-        except ValueError:
-            return None
-    else:
-        return None
-
-    if dt.tzinfo is None:
-        return dt.replace(tzinfo=UTC)
-    return dt.astimezone(UTC)
-
-
-def upgrade() -> None:
-    conn = op.get_bind()
-    op.add_column("node", sa.Column("last_update_us", sa.BigInteger(), nullable=True))
-    op.create_index("idx_node_last_update_us", "node", ["last_update_us"], unique=False)
-
-    node = sa.table(
-        "node",
-        sa.column("id", sa.String()),
-        sa.column("last_update", sa.DateTime()),
-        sa.column("last_update_us", sa.BigInteger()),
-    )
-
-    rows = conn.execute(sa.select(node.c.id, node.c.last_update)).all()
-    for node_id, last_update in rows:
-        dt = _parse_datetime(last_update)
-        if dt is None:
-            continue
-        last_update_us = int(dt.timestamp() * 1_000_000)
-        conn.execute(
-            sa.update(node).where(node.c.id == node_id).values(last_update_us=last_update_us)
-        )
-
-    if conn.dialect.name == "sqlite":
-        with op.batch_alter_table("node", schema=None) as batch_op:
-            batch_op.drop_column("last_update")
-    else:
-        op.drop_column("node", "last_update")
-
-
-def downgrade() -> None:
-    conn = op.get_bind()
-    op.add_column("node", sa.Column("last_update", sa.DateTime(), nullable=True))
-
-    node = sa.table(
-        "node",
-        sa.column("id", sa.String()),
-        sa.column("last_update", sa.DateTime()),
-        sa.column("last_update_us", sa.BigInteger()),
-    )
-
-    rows = conn.execute(sa.select(node.c.id, node.c.last_update_us)).all()
-    for node_id, last_update_us in rows:
-        if last_update_us is None:
-            continue
-        dt = datetime.fromtimestamp(last_update_us / 1_000_000, tz=UTC).replace(tzinfo=None)
-        conn.execute(sa.update(node).where(node.c.id == node_id).values(last_update=dt))
-
-    if conn.dialect.name == "sqlite":
-        with op.batch_alter_table("node", schema=None) as batch_op:
-            batch_op.drop_index("idx_node_last_update_us")
-            batch_op.drop_column("last_update_us")
-    else:
-        op.drop_index("idx_node_last_update_us", table_name="node")
-        op.drop_column("node", "last_update_us")

alembic/versions/d4d7b0c2e1a4_drop_last_update_us_from_node.py

@@ -1,34 +0,0 @@
-"""Drop last_update_us from node.
-
-Revision ID: d4d7b0c2e1a4
-Revises: b7c3c2e3a1f0
-Create Date: 2026-01-12 10:20:00.000000
-"""
-
-from collections.abc import Sequence
-
-import sqlalchemy as sa
-
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision: str = "d4d7b0c2e1a4"
-down_revision: str | None = "b7c3c2e3a1f0"
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-
-def upgrade() -> None:
-    conn = op.get_bind()
-    if conn.dialect.name == "sqlite":
-        with op.batch_alter_table("node", schema=None) as batch_op:
-            batch_op.drop_index("idx_node_last_update_us")
-            batch_op.drop_column("last_update_us")
-    else:
-        op.drop_index("idx_node_last_update_us", table_name="node")
-        op.drop_column("node", "last_update_us")
-
-
-def downgrade() -> None:
-    op.add_column("node", sa.Column("last_update_us", sa.BigInteger(), nullable=True))
-    op.create_index("idx_node_last_update_us", "node", ["last_update_us"], unique=False)

container/config.ini

@@ -1,90 +0,0 @@
-# -------------------------
-# Server Configuration
-# -------------------------
-[server]
-# The address to bind the server to. Use * to listen on all interfaces.
-bind = 0.0.0.0
-
-# Port to run the web server on.
-port = 8081
-
-# Path to TLS certificate (leave blank to disable HTTPS).
-tls_cert =
-
-# Path for the ACME challenge if using Let's Encrypt.
-acme_challenge =
-
-
-# -------------------------
-# Site Appearance & Behavior
-# -------------------------
-[site]
-domain =
-language = en
-title = Bay Area Mesh
-message = Real time data from around the bay area and beyond.
-starting = /chat
-
-nodes = True
-conversations = True
-everything = True
-graphs = True
-stats = True
-net = True
-map = True
-top = True
-
-map_top_left_lat = 39
-map_top_left_lon = -123
-map_bottom_right_lat = 36
-map_bottom_right_lon = -121
-
-map_interval = 3
-firehose_interal = 3
-
-weekly_net_message = Weekly Mesh check-in. We will keep it open on every Wednesday from 5:00pm for checkins. The message format should be (LONG NAME) - (CITY YOU ARE IN) #BayMeshNet.
-net_tag = #BayMeshNet
-
-
-# -------------------------
-# MQTT Broker Configuration
-# -------------------------
-[mqtt]
-server = mqtt.meshtastic.org
-topics = ["msh/US/bayarea/#", "msh/US/CA/mrymesh/#", "msh/US/CA/sacvalley"]
-port = 1883
-username = meshdev
-password = large4cats
-skip_node_ids =
-secondary_keys =
-
-
-# -------------------------
-# Database Configuration
-# -------------------------
-[database]
-connection_string = sqlite+aiosqlite:////var/lib/meshview/packets.db
-
-
-# -------------------------
-# Database Cleanup Configuration
-# -------------------------
-[cleanup]
-enabled = False
-days_to_keep = 14
-hour = 2
-minute = 00
-vacuum = False
-
-backup_enabled = False
-backup_dir = ./backups
-backup_hour = 2
-backup_minute = 00
-
-
-# -------------------------
-# Logging Configuration
-# -------------------------
-[logging]
-access_log = False
-db_cleanup_logfile = /var/log/meshview/dbcleanup.log

docker/README.md

@@ -0,0 +1,36 @@
+# MeshView Docker Container
+
+> **Note:** This directory contains legacy Docker build files.
+>
+> **For current Docker usage instructions, please see [README-Docker.md](../README-Docker.md) in the project root.**
+
+## Current Approach
+
+Pre-built container images are automatically built and published to GitHub Container Registry:
+
+```bash
+docker pull ghcr.io/pablorevilla-meshtastic/meshview:latest
+```
+
+See **[README-Docker.md](../README-Docker.md)** for:
+- Quick start instructions
+- Volume mount configuration
+- Docker Compose examples
+- Backup configuration
+- Troubleshooting
+
+## Legacy Build (Not Recommended)
+
+If you need to build your own image for development:
+
+```bash
+# From project root
+docker build -f Containerfile -t meshview:local .
+```
+
+The current Containerfile uses:
+- **Base Image**: `python:3.13-slim` (Debian-based)
+- **Build tool**: `uv` for fast dependency installation
+- **User**: Non-root user `app` (UID 10001)
+- **Exposed Port**: `8081`
+- **Volumes**: `/etc/meshview`, `/var/lib/meshview`, `/var/log/meshview`

docs/API_Documentation.md

@@ -1,38 +1,25 @@
+
 # API Documentation
 
-Base URL: `http(s)://<host>`
+## 1. Chat API
 
-All endpoints return JSON. Timestamps are either ISO 8601 strings or `*_us` values in
-microseconds since epoch.
+### GET `/api/chat`
+Returns the most recent chat messages.
 
-## 1. Nodes API
+**Query Parameters**
+- `limit` (optional, int): Maximum number of messages to return. Default: `100`.
 
-### GET `/api/nodes`
-Returns a list of nodes, with optional filtering.
-
-Query Parameters
-- `node_id` (optional, int): Exact node ID.
-- `role` (optional, string): Node role.
-- `channel` (optional, string): Channel name.
-- `hw_model` (optional, string): Hardware model.
-- `days_active` (optional, int): Nodes seen within the last N days.
-
-Response Example
+**Response Example**
 ```json
 {
-  "nodes": [
+  "packets": [
     {
-      "id": 42,
-      "node_id": 1234,
-      "long_name": "Alice",
-      "short_name": "A",
-      "hw_model": "T-Beam",
-      "firmware": "1.2.3",
-      "role": "client",
-      "last_lat": 377749000,
-      "last_long": -1224194000,
+      "id": 123,
+      "import_time": "2025-07-22T12:45:00",
+      "from_node_id": 987654,
+      "from_node": "Alice",
       "channel": "main",
-      "last_seen_us": 1736370123456789
+      "payload": "Hello, world!"
     }
   ]
 }
@@ -40,58 +27,102 @@ Response Example
 
 ---
 
-## 2. Packets API
+### GET `/api/chat/updates`
+Returns chat messages imported after a given timestamp.
+
+**Query Parameters**
+- `last_time` (optional, ISO timestamp): Only messages imported after this time are returned.
+
+**Response Example**
+```json
+{
+  "packets": [
+    {
+      "id": 124,
+      "import_time": "2025-07-22T12:50:00",
+      "from_node_id": 987654,
+      "from_node": "Alice",
+      "channel": "main",
+      "payload": "New message!"
+    }
+  ],
+  "latest_import_time": "2025-07-22T12:50:00"
+}
+```
+
+---
+
+## 2. Nodes API
+
+### GET `/api/nodes`
+Returns a list of all nodes, with optional filtering by last seen.
+
+**Query Parameters**
+- `hours` (optional, int): Return nodes seen in the last N hours.
+- `days` (optional, int): Return nodes seen in the last N days.
+- `last_seen_after` (optional, ISO timestamp): Return nodes seen after this time.
+
+**Response Example**
+```json
+{
+  "nodes": [
+    {
+      "node_id": 1234,
+      "long_name": "Alice",
+      "short_name": "A",
+      "channel": "main",
+      "last_seen": "2025-07-22T12:40:00",
+      "hardware": "T-Beam",
+      "firmware": "1.2.3",
+      "role": "client",
+      "last_lat": 37.7749,
+      "last_long": -122.4194
+    }
+  ]
+}
+```
+
+---
+
+## 3. Packets API
 
 ### GET `/api/packets`
-Returns packets with optional filters.
+Returns a list of packets with optional filters.
 
-Query Parameters
-- `packet_id` (optional, int): Return exactly one packet (overrides other filters).
-- `limit` (optional, int): Max packets to return, clamped 1-1000. Default: `50`.
-- `since` (optional, int): Only packets imported after this microsecond timestamp.
-- `portnum` (optional, int): Filter by port number.
-- `contains` (optional, string): Payload substring filter.
-- `from_node_id` (optional, int): Filter by sender node ID.
-- `to_node_id` (optional, int): Filter by recipient node ID.
-- `node_id` (optional, int): Legacy filter matching either from or to node ID.
+**Query Parameters**
+- `limit` (optional, int): Maximum number of packets to return. Default: `200`.
+- `since` (optional, ISO timestamp): Only packets imported after this timestamp are returned.
 
-Response Example
+**Response Example**
 ```json
 {
   "packets": [
     {
       "id": 123,
-      "import_time_us": 1736370123456789,
-      "channel": "main",
       "from_node_id": 5678,
       "to_node_id": 91011,
       "portnum": 1,
-      "long_name": "Alice",
-      "payload": "Hello, Bob!",
-      "to_long_name": "Bob",
-      "reply_id": 122
+      "import_time": "2025-07-22T12:45:00",
+      "payload": "Hello, Bob!"
     }
-  ],
-  "latest_import_time": 1736370123456789
+  ]
 }
 ```
 
-Notes
-- For `portnum=1` (text messages), packets are filtered to remove sequence-only payloads.
-- `latest_import_time` is returned when available for incremental polling (microseconds).
+---
 
 ---
 
-## 3. Channels API
+## 4. Channels API
 
 ### GET `/api/channels`
-Returns channels seen in a time period.
+Returns a list of channels seen in a given time period.
 
-Query Parameters
-- `period_type` (optional, string): `hour` or `day`. Default: `hour`.
+**Query Parameters**
+- `period_type` (optional, string): Time granularity (`hour` or `day`). Default: `hour`.
 - `length` (optional, int): Number of periods to look back. Default: `24`.
 
-Response Example
+**Response Example**
 ```json
 {
   "channels": ["LongFast", "MediumFast", "ShortFast"]
@@ -100,21 +131,29 @@ Response Example
 
 ---
 
-## 4. Stats API
+## 5. Statistics API
 
 ### GET `/api/stats`
-Returns packet statistics aggregated by time periods, with optional filtering.
 
-Query Parameters
-- `period_type` (optional, string): `hour` or `day`. Default: `hour`.
-- `length` (optional, int): Number of periods to include. Default: `24`.
-- `channel` (optional, string): Filter by channel (case-insensitive).
-- `portnum` (optional, int): Filter by port number.
-- `to_node` (optional, int): Filter by destination node ID.
-- `from_node` (optional, int): Filter by source node ID.
-- `node` (optional, int): If provided, return combined `sent` and `seen` totals for that node.
+Retrieve packet statistics aggregated by time periods, with optional filtering.
+
+---
+
+## Query Parameters
+
+| Parameter    | Type    | Required | Default  | Description                                                                                       |
+|--------------|---------|----------|----------|-------------------------------------------------------------------------------------------------|
+| `period_type` | string  | No       | `hour`   | Time granularity of the stats. Allowed values: `hour`, `day`.                                   |
+| `length`      | integer | No       | 24       | Number of periods to include (hours or days).                                                   |
+| `channel`     | string  | No       | —        | Filter results by channel name (case-insensitive).                                             |
+| `portnum`     | integer | No       | —        | Filter results by port number.                                                                  |
+| `to_node`     | integer | No       | —        | Filter results to packets sent **to** this node ID.                                            |
+| `from_node`   | integer | No       | —        | Filter results to packets sent **from** this node ID.                                          |
+
+---
+
+## Response
 
-Response Example (series)
 ```json
 {
   "period_type": "hour",
@@ -124,71 +163,42 @@ Response Example (series)
   "to_node": 12345678,
   "from_node": 87654321,
   "data": [
-    { "period": "2025-08-08 14:00", "count": 10 },
-    { "period": "2025-08-08 15:00", "count": 7 }
+    {
+      "period": "2025-08-08 14:00",
+      "count": 10
+    },
+    {
+      "period": "2025-08-08 15:00",
+      "count": 7
+    }
+    // more entries...
   ]
 }
 ```
 
-Response Example (`node` totals)
-```json
-{
-  "node_id": 12345678,
-  "period_type": "hour",
-  "length": 24,
-  "sent": 42,
-  "seen": 58
-}
-```
-
 ---
 
-### GET `/api/stats/count`
-Returns total packet counts, optionally filtered.
+## 6. Edges API
 
-Query Parameters
-- `packet_id` (optional, int): Filter packet_seen by packet ID.
-- `period_type` (optional, string): `hour` or `day`.
-- `length` (optional, int): Number of periods to include.
-- `channel` (optional, string): Filter by channel.
-- `from_node` (optional, int): Filter by source node ID.
-- `to_node` (optional, int): Filter by destination node ID.
+### GET `/api/edges`
+Returns network edges (connections between nodes) based on traceroutes and neighbor info.
 
-Response Example
+**Query Parameters**
+- `type` (optional, string): Filter by edge type (`traceroute` or `neighbor`). If omitted, returns both types.
+
+**Response Example**
 ```json
 {
-  "total_packets": 12345,
-  "total_seen": 67890
-}
-```
-
----
-
-### GET `/api/stats/top`
-Returns nodes sorted by packets seen, with pagination.
-
-Query Parameters
-- `period_type` (optional, string): `hour` or `day`. Default: `day`.
-- `length` (optional, int): Number of periods to include. Default: `1`.
-- `channel` (optional, string): Filter by channel.
-- `limit` (optional, int): Max nodes to return. Default: `20`, max `100`.
-- `offset` (optional, int): Pagination offset. Default: `0`.
-
-Response Example
-```json
-{
-  "total": 250,
-  "limit": 20,
-  "offset": 0,
-  "nodes": [
+  "edges": [
     {
-      "node_id": 1234,
-      "long_name": "Alice",
-      "short_name": "A",
-      "channel": "main",
-      "sent": 100,
-      "seen": 240,
-      "avg": 2.4
+      "from": 12345678,
+      "to": 87654321,
+      "type": "traceroute"
+    },
+    {
+      "from": 11111111,
+      "to": 22222222,
+      "type": "neighbor"
     }
   ]
 }
@@ -196,45 +206,22 @@ Response Example
 
 ---
 
-## 5. Edges API
-
-### GET `/api/edges`
-Returns network edges (connections between nodes) based on traceroutes and neighbor info.
-Traceroute edges are collected over the last 12 hours. Neighbor edges are based on
-port 71 packets.
-
-Query Parameters
-- `type` (optional, string): `traceroute` or `neighbor`. If omitted, returns both.
-- `node_id` (optional, int): Filter edges to only those touching a node.
-
-Response Example
-```json
-{
-  "edges": [
-    { "from": 12345678, "to": 87654321, "type": "traceroute" },
-    { "from": 11111111, "to": 22222222, "type": "neighbor" }
-  ]
-}
-```
-
----
-
-## 6. Config API
+## 7. Configuration API
 
 ### GET `/api/config`
-Returns a safe subset of server configuration.
+Returns the current site configuration (safe subset exposed to clients).
 
-Response Example
+**Response Example**
 ```json
 {
   "site": {
-    "domain": "example.com",
+    "domain": "meshview.example.com",
     "language": "en",
-    "title": "Meshview",
-    "message": "",
+    "title": "Bay Area Mesh",
+    "message": "Real time data from around the bay area",
     "starting": "/chat",
     "nodes": "true",
-    "chat": "true",
+    "conversations": "true",
     "everything": "true",
     "graphs": "true",
     "stats": "true",
@@ -249,11 +236,11 @@ Response Example
     "firehose_interval": 3,
     "weekly_net_message": "Weekly Mesh check-in message.",
     "net_tag": "#BayMeshNet",
-    "version": "3.0.0"
+    "version": "2.0.8 ~ 10-22-25"
   },
   "mqtt": {
-    "server": "mqtt.example.com",
-    "topics": ["msh/region/#"]
+    "server": "mqtt.bayme.sh",
+    "topics": ["msh/US/bayarea/#"]
   },
   "cleanup": {
     "enabled": "false",
@@ -267,126 +254,91 @@ Response Example
 
 ---
 
-## 7. Language API
+## 8. Language/Translations API
 
 ### GET `/api/lang`
-Returns translation strings.
+Returns translation strings for the UI.
 
-Query Parameters
-- `lang` (optional, string): Language code (e.g., `en`, `es`). Default from config or `en`.
-- `section` (optional, string): Return only one section (e.g., `nodelist`, `firehose`).
+**Query Parameters**
+- `lang` (optional, string): Language code (e.g., `en`, `es`). Defaults to site language setting.
+- `section` (optional, string): Specific section to retrieve translations for.
 
-Response Example
+**Response Example (full)**
 ```json
 {
-  "title": "Meshview",
-  "search_placeholder": "Search..."
-}
-```
-
----
-
-## 8. Packets Seen API
-
-### GET `/api/packets_seen/{packet_id}`
-Returns packet_seen entries for a packet.
-
-Path Parameters
-- `packet_id` (required, int): Packet ID.
-
-Response Example
-```json
-{
-  "seen": [
-    {
-      "packet_id": 123,
-      "node_id": 456,
-      "rx_time": "2025-07-22T12:45:00",
-      "hop_limit": 7,
-      "hop_start": 0,
-      "channel": "main",
-      "rx_snr": 5.0,
-      "rx_rssi": -90,
-      "topic": "msh/region/#",
-      "import_time_us": 1736370123456789
-    }
-  ]
-}
-```
-
----
-
-## 9. Traceroute API
-
-### GET `/api/traceroute/{packet_id}`
-Returns traceroute details and derived paths for a packet.
-
-Path Parameters
-- `packet_id` (required, int): Packet ID.
-
-Response Example
-```json
-{
-  "packet": {
-    "id": 123,
-    "from": 111,
-    "to": 222,
-    "channel": "main"
+  "chat": {
+    "title": "Chat",
+    "send": "Send"
   },
-  "traceroute_packets": [
-    {
-      "index": 0,
-      "gateway_node_id": 333,
-      "done": true,
-      "forward_hops": [111, 444, 222],
-      "reverse_hops": [222, 444, 111]
-    }
-  ],
-  "unique_forward_paths": [
-    { "path": [111, 444, 222], "count": 2 }
-  ],
-  "unique_reverse_paths": [
-    [222, 444, 111]
-  ],
-  "winning_paths": [
-    [111, 444, 222]
-  ]
+  "map": {
+    "title": "Map",
+    "zoom_in": "Zoom In"
+  }
+}
+```
+
+**Response Example (section-specific)**
+Request: `/api/lang?section=chat`
+```json
+{
+  "title": "Chat",
+  "send": "Send"
 }
 ```
 
 ---
 
-## 10. Health API
+## 9. Health Check API
 
 ### GET `/health`
-Returns service health and database status.
+Health check endpoint for monitoring, load balancers, and orchestration systems.
 
-Response Example
+**Response Example (Healthy)**
 ```json
 {
   "status": "healthy",
-  "timestamp": "2025-07-22T12:45:00+00:00",
-  "version": "3.0.3",
-  "git_revision": "abc1234",
+  "timestamp": "2025-11-03T14:30:00.123456Z",
+  "version": "3.0.0",
+  "git_revision": "6416978",
   "database": "connected",
-  "database_size": "12.34 MB",
-  "database_size_bytes": 12939444
+  "database_size": "853.03 MB",
+  "database_size_bytes": 894468096
+}
+```
+
+**Response Example (Unhealthy)**
+Status Code: `503 Service Unavailable`
+```json
+{
+  "status": "unhealthy",
+  "timestamp": "2025-11-03T14:30:00.123456Z",
+  "version": "2.0.8",
+  "git_revision": "6416978",
+  "database": "disconnected"
 }
 ```
 
 ---
 
-## 11. Version API
+## 10. Version API
 
 ### GET `/version`
-Returns version metadata.
+Returns detailed version information including semver, release date, and git revision.
 
-Response Example
+**Response Example**
 ```json
 {
-  "version": "3.0.3",
-  "release_date": "2026-1-15",
-  "git_revision": "abc1234",
-  "git_revision_short": "abc1234"
+  "version": "2.0.8",
+  "release_date": "2025-10-22",
+  "git_revision": "6416978a1b2c3d4e5f6g7h8i9j0k1l2m3n4o5p6q",
+  "git_revision_short": "6416978"
 }
 ```
+
+---
+
+## Notes
+- All timestamps (`import_time`, `last_seen`) are returned in ISO 8601 format.
+- `portnum` is an integer representing the packet type.
+- `payload` is always a UTF-8 decoded string.
+- Node IDs are integers (e.g., `12345678`).

docs/COVERAGE.md

@@ -1,37 +0,0 @@
-# Coverage 
-
-## Predicted coverage
-
-Meshview can display a predicted coverage boundary for a node. This is a **model**
-estimate, not a guarantee of real-world performance.
-
-### How it works
-
-The coverage boundary is computed using the Longley-Rice / ITM **area mode**
-propagation model. Area mode estimates average path loss over generic terrain
-and does not use a terrain profile. This means it captures general distance
-effects, but **does not** account for terrain shadows, buildings, or foliage.
-
-### What you are seeing
-
-The UI draws a **perimeter** (not a heatmap) that represents the furthest
-distance where predicted signal strength is above a threshold (default
-`-120 dBm`). The model is run radially from the node in multiple directions,
-and the last point above the threshold forms the outline.
-
-### Key parameters
-
-- **Frequency**: default `907 MHz`
-- **Transmit power**: default `20 dBm`
-- **Antenna heights**: default `5 m` (TX) and `1.5 m` (RX)
-- **Reliability**: default `0.5` (median)
-- **Terrain irregularity**: default `90 m` (average terrain)
-
-### Limitations
-
-- No terrain or building data is used (area mode only).
-- Results are sensitive to power, height, and threshold.
-- Environmental factors can cause large real-world deviations.
-
-
-

meshtastic/protobuf/UPSTREAM_REV.txt

@@ -1 +0,0 @@
-e1a6b3a868d735da72cd6c94c574d655129d390a

meshtastic/protobuf/admin_pb2.pyi

@@ -770,7 +770,6 @@ class SharedContact(google.protobuf.message.Message):
     NODE_NUM_FIELD_NUMBER: builtins.int
     USER_FIELD_NUMBER: builtins.int
     SHOULD_IGNORE_FIELD_NUMBER: builtins.int
-    MANUALLY_VERIFIED_FIELD_NUMBER: builtins.int
     node_num: builtins.int
     """
     The node number of the contact
@@ -779,10 +778,6 @@ class SharedContact(google.protobuf.message.Message):
     """
     Add this contact to the blocked / ignored list
     """
-    manually_verified: builtins.bool
-    """
-    Set the IS_KEY_MANUALLY_VERIFIED bit
-    """
     @property
     def user(self) -> meshtastic.protobuf.mesh_pb2.User:
         """
@@ -795,10 +790,9 @@ class SharedContact(google.protobuf.message.Message):
         node_num: builtins.int = ...,
         user: meshtastic.protobuf.mesh_pb2.User | None = ...,
         should_ignore: builtins.bool = ...,
-        manually_verified: builtins.bool = ...,
     ) -> None: ...
     def HasField(self, field_name: typing.Literal["user", b"user"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["manually_verified", b"manually_verified", "node_num", b"node_num", "should_ignore", b"should_ignore", "user", b"user"]) -> None: ...
+    def ClearField(self, field_name: typing.Literal["node_num", b"node_num", "should_ignore", b"should_ignore", "user", b"user"]) -> None: ...
 
 global___SharedContact = SharedContact
 

meshtastic/protobuf/apponly_pb2.py

@@ -15,14 +15,14 @@ from meshtastic.protobuf import channel_pb2 as meshtastic_dot_protobuf_dot_chann
 from meshtastic.protobuf import config_pb2 as meshtastic_dot_protobuf_dot_config__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!meshtastic/protobuf/apponly.proto\x12\x13meshtastic.protobuf\x1a!meshtastic/protobuf/channel.proto\x1a meshtastic/protobuf/config.proto\"\x81\x01\n\nChannelSet\x12\x36\n\x08settings\x18\x01 \x03(\x0b\x32$.meshtastic.protobuf.ChannelSettings\x12;\n\x0blora_config\x18\x02 \x01(\x0b\x32&.meshtastic.protobuf.Config.LoRaConfigBc\n\x14org.meshtastic.protoB\rAppOnlyProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!meshtastic/protobuf/apponly.proto\x12\x13meshtastic.protobuf\x1a!meshtastic/protobuf/channel.proto\x1a meshtastic/protobuf/config.proto\"\x81\x01\n\nChannelSet\x12\x36\n\x08settings\x18\x01 \x03(\x0b\x32$.meshtastic.protobuf.ChannelSettings\x12;\n\x0blora_config\x18\x02 \x01(\x0b\x32&.meshtastic.protobuf.Config.LoRaConfigBb\n\x13\x63om.geeksville.meshB\rAppOnlyProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.apponly_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\rAppOnlyProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\rAppOnlyProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
   _globals['_CHANNELSET']._serialized_start=128
   _globals['_CHANNELSET']._serialized_end=257
 # @@protoc_insertion_point(module_scope)

meshtastic/protobuf/atak_pb2.py

@@ -13,14 +13,14 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1emeshtastic/protobuf/atak.proto\x12\x13meshtastic.protobuf\"\xa5\x02\n\tTAKPacket\x12\x15\n\ris_compressed\x18\x01 \x01(\x08\x12-\n\x07\x63ontact\x18\x02 \x01(\x0b\x32\x1c.meshtastic.protobuf.Contact\x12)\n\x05group\x18\x03 \x01(\x0b\x32\x1a.meshtastic.protobuf.Group\x12+\n\x06status\x18\x04 \x01(\x0b\x32\x1b.meshtastic.protobuf.Status\x12\'\n\x03pli\x18\x05 \x01(\x0b\x32\x18.meshtastic.protobuf.PLIH\x00\x12,\n\x04\x63hat\x18\x06 \x01(\x0b\x32\x1c.meshtastic.protobuf.GeoChatH\x00\x12\x10\n\x06\x64\x65tail\x18\x07 \x01(\x0cH\x00\x42\x11\n\x0fpayload_variant\"\\\n\x07GeoChat\x12\x0f\n\x07message\x18\x01 \x01(\t\x12\x0f\n\x02to\x18\x02 \x01(\tH\x00\x88\x01\x01\x12\x18\n\x0bto_callsign\x18\x03 \x01(\tH\x01\x88\x01\x01\x42\x05\n\x03_toB\x0e\n\x0c_to_callsign\"_\n\x05Group\x12-\n\x04role\x18\x01 \x01(\x0e\x32\x1f.meshtastic.protobuf.MemberRole\x12\'\n\x04team\x18\x02 \x01(\x0e\x32\x19.meshtastic.protobuf.Team\"\x19\n\x06Status\x12\x0f\n\x07\x62\x61ttery\x18\x01 \x01(\r\"4\n\x07\x43ontact\x12\x10\n\x08\x63\x61llsign\x18\x01 \x01(\t\x12\x17\n\x0f\x64\x65vice_callsign\x18\x02 \x01(\t\"_\n\x03PLI\x12\x12\n\nlatitude_i\x18\x01 \x01(\x0f\x12\x13\n\x0blongitude_i\x18\x02 \x01(\x0f\x12\x10\n\x08\x61ltitude\x18\x03 \x01(\x05\x12\r\n\x05speed\x18\x04 \x01(\r\x12\x0e\n\x06\x63ourse\x18\x05 \x01(\r*\xc0\x01\n\x04Team\x12\x14\n\x10Unspecifed_Color\x10\x00\x12\t\n\x05White\x10\x01\x12\n\n\x06Yellow\x10\x02\x12\n\n\x06Orange\x10\x03\x12\x0b\n\x07Magenta\x10\x04\x12\x07\n\x03Red\x10\x05\x12\n\n\x06Maroon\x10\x06\x12\n\n\x06Purple\x10\x07\x12\r\n\tDark_Blue\x10\x08\x12\x08\n\x04\x42lue\x10\t\x12\x08\n\x04\x43yan\x10\n\x12\x08\n\x04Teal\x10\x0b\x12\t\n\x05Green\x10\x0c\x12\x0e\n\nDark_Green\x10\r\x12\t\n\x05\x42rown\x10\x0e*\x7f\n\nMemberRole\x12\x0e\n\nUnspecifed\x10\x00\x12\x0e\n\nTeamMember\x10\x01\x12\x0c\n\x08TeamLead\x10\x02\x12\x06\n\x02HQ\x10\x03\x12\n\n\x06Sniper\x10\x04\x12\t\n\x05Medic\x10\x05\x12\x13\n\x0f\x46orwardObserver\x10\x06\x12\x07\n\x03RTO\x10\x07\x12\x06\n\x02K9\x10\x08\x42`\n\x14org.meshtastic.protoB\nATAKProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1emeshtastic/protobuf/atak.proto\x12\x13meshtastic.protobuf\"\xa5\x02\n\tTAKPacket\x12\x15\n\ris_compressed\x18\x01 \x01(\x08\x12-\n\x07\x63ontact\x18\x02 \x01(\x0b\x32\x1c.meshtastic.protobuf.Contact\x12)\n\x05group\x18\x03 \x01(\x0b\x32\x1a.meshtastic.protobuf.Group\x12+\n\x06status\x18\x04 \x01(\x0b\x32\x1b.meshtastic.protobuf.Status\x12\'\n\x03pli\x18\x05 \x01(\x0b\x32\x18.meshtastic.protobuf.PLIH\x00\x12,\n\x04\x63hat\x18\x06 \x01(\x0b\x32\x1c.meshtastic.protobuf.GeoChatH\x00\x12\x10\n\x06\x64\x65tail\x18\x07 \x01(\x0cH\x00\x42\x11\n\x0fpayload_variant\"\\\n\x07GeoChat\x12\x0f\n\x07message\x18\x01 \x01(\t\x12\x0f\n\x02to\x18\x02 \x01(\tH\x00\x88\x01\x01\x12\x18\n\x0bto_callsign\x18\x03 \x01(\tH\x01\x88\x01\x01\x42\x05\n\x03_toB\x0e\n\x0c_to_callsign\"_\n\x05Group\x12-\n\x04role\x18\x01 \x01(\x0e\x32\x1f.meshtastic.protobuf.MemberRole\x12\'\n\x04team\x18\x02 \x01(\x0e\x32\x19.meshtastic.protobuf.Team\"\x19\n\x06Status\x12\x0f\n\x07\x62\x61ttery\x18\x01 \x01(\r\"4\n\x07\x43ontact\x12\x10\n\x08\x63\x61llsign\x18\x01 \x01(\t\x12\x17\n\x0f\x64\x65vice_callsign\x18\x02 \x01(\t\"_\n\x03PLI\x12\x12\n\nlatitude_i\x18\x01 \x01(\x0f\x12\x13\n\x0blongitude_i\x18\x02 \x01(\x0f\x12\x10\n\x08\x61ltitude\x18\x03 \x01(\x05\x12\r\n\x05speed\x18\x04 \x01(\r\x12\x0e\n\x06\x63ourse\x18\x05 \x01(\r*\xc0\x01\n\x04Team\x12\x14\n\x10Unspecifed_Color\x10\x00\x12\t\n\x05White\x10\x01\x12\n\n\x06Yellow\x10\x02\x12\n\n\x06Orange\x10\x03\x12\x0b\n\x07Magenta\x10\x04\x12\x07\n\x03Red\x10\x05\x12\n\n\x06Maroon\x10\x06\x12\n\n\x06Purple\x10\x07\x12\r\n\tDark_Blue\x10\x08\x12\x08\n\x04\x42lue\x10\t\x12\x08\n\x04\x43yan\x10\n\x12\x08\n\x04Teal\x10\x0b\x12\t\n\x05Green\x10\x0c\x12\x0e\n\nDark_Green\x10\r\x12\t\n\x05\x42rown\x10\x0e*\x7f\n\nMemberRole\x12\x0e\n\nUnspecifed\x10\x00\x12\x0e\n\nTeamMember\x10\x01\x12\x0c\n\x08TeamLead\x10\x02\x12\x06\n\x02HQ\x10\x03\x12\n\n\x06Sniper\x10\x04\x12\t\n\x05Medic\x10\x05\x12\x13\n\x0f\x46orwardObserver\x10\x06\x12\x07\n\x03RTO\x10\x07\x12\x06\n\x02K9\x10\x08\x42_\n\x13\x63om.geeksville.meshB\nATAKProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.atak_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\nATAKProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\nATAKProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
   _globals['_TEAM']._serialized_start=721
   _globals['_TEAM']._serialized_end=913
   _globals['_MEMBERROLE']._serialized_start=915

meshtastic/protobuf/cannedmessages_pb2.py

@@ -13,14 +13,14 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n(meshtastic/protobuf/cannedmessages.proto\x12\x13meshtastic.protobuf\"-\n\x19\x43\x61nnedMessageModuleConfig\x12\x10\n\x08messages\x18\x01 \x01(\tBo\n\x14org.meshtastic.protoB\x19\x43\x61nnedMessageConfigProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n(meshtastic/protobuf/cannedmessages.proto\x12\x13meshtastic.protobuf\"-\n\x19\x43\x61nnedMessageModuleConfig\x12\x10\n\x08messages\x18\x01 \x01(\tBn\n\x13\x63om.geeksville.meshB\x19\x43\x61nnedMessageConfigProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.cannedmessages_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\031CannedMessageConfigProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\031CannedMessageConfigProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
   _globals['_CANNEDMESSAGEMODULECONFIG']._serialized_start=65
   _globals['_CANNEDMESSAGEMODULECONFIG']._serialized_end=110
 # @@protoc_insertion_point(module_scope)

meshtastic/protobuf/channel_pb2.py

@@ -13,22 +13,22 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!meshtastic/protobuf/channel.proto\x12\x13meshtastic.protobuf\"\xc1\x01\n\x0f\x43hannelSettings\x12\x17\n\x0b\x63hannel_num\x18\x01 \x01(\rB\x02\x18\x01\x12\x0b\n\x03psk\x18\x02 \x01(\x0c\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\n\n\x02id\x18\x04 \x01(\x07\x12\x16\n\x0euplink_enabled\x18\x05 \x01(\x08\x12\x18\n\x10\x64ownlink_enabled\x18\x06 \x01(\x08\x12<\n\x0fmodule_settings\x18\x07 \x01(\x0b\x32#.meshtastic.protobuf.ModuleSettings\">\n\x0eModuleSettings\x12\x1a\n\x12position_precision\x18\x01 \x01(\r\x12\x10\n\x08is_muted\x18\x02 \x01(\x08\"\xb3\x01\n\x07\x43hannel\x12\r\n\x05index\x18\x01 \x01(\x05\x12\x36\n\x08settings\x18\x02 \x01(\x0b\x32$.meshtastic.protobuf.ChannelSettings\x12/\n\x04role\x18\x03 \x01(\x0e\x32!.meshtastic.protobuf.Channel.Role\"0\n\x04Role\x12\x0c\n\x08\x44ISABLED\x10\x00\x12\x0b\n\x07PRIMARY\x10\x01\x12\r\n\tSECONDARY\x10\x02\x42\x63\n\x14org.meshtastic.protoB\rChannelProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!meshtastic/protobuf/channel.proto\x12\x13meshtastic.protobuf\"\xc1\x01\n\x0f\x43hannelSettings\x12\x17\n\x0b\x63hannel_num\x18\x01 \x01(\rB\x02\x18\x01\x12\x0b\n\x03psk\x18\x02 \x01(\x0c\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\n\n\x02id\x18\x04 \x01(\x07\x12\x16\n\x0euplink_enabled\x18\x05 \x01(\x08\x12\x18\n\x10\x64ownlink_enabled\x18\x06 \x01(\x08\x12<\n\x0fmodule_settings\x18\x07 \x01(\x0b\x32#.meshtastic.protobuf.ModuleSettings\"E\n\x0eModuleSettings\x12\x1a\n\x12position_precision\x18\x01 \x01(\r\x12\x17\n\x0fis_client_muted\x18\x02 \x01(\x08\"\xb3\x01\n\x07\x43hannel\x12\r\n\x05index\x18\x01 \x01(\x05\x12\x36\n\x08settings\x18\x02 \x01(\x0b\x32$.meshtastic.protobuf.ChannelSettings\x12/\n\x04role\x18\x03 \x01(\x0e\x32!.meshtastic.protobuf.Channel.Role\"0\n\x04Role\x12\x0c\n\x08\x44ISABLED\x10\x00\x12\x0b\n\x07PRIMARY\x10\x01\x12\r\n\tSECONDARY\x10\x02\x42\x62\n\x13\x63om.geeksville.meshB\rChannelProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.channel_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\rChannelProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\rChannelProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
   _CHANNELSETTINGS.fields_by_name['channel_num']._options = None
   _CHANNELSETTINGS.fields_by_name['channel_num']._serialized_options = b'\030\001'
   _globals['_CHANNELSETTINGS']._serialized_start=59
   _globals['_CHANNELSETTINGS']._serialized_end=252
   _globals['_MODULESETTINGS']._serialized_start=254
-  _globals['_MODULESETTINGS']._serialized_end=316
-  _globals['_CHANNEL']._serialized_start=319
-  _globals['_CHANNEL']._serialized_end=498
-  _globals['_CHANNEL_ROLE']._serialized_start=450
-  _globals['_CHANNEL_ROLE']._serialized_end=498
+  _globals['_MODULESETTINGS']._serialized_end=323
+  _globals['_CHANNEL']._serialized_start=326
+  _globals['_CHANNEL']._serialized_end=505
+  _globals['_CHANNEL_ROLE']._serialized_start=457
+  _globals['_CHANNEL_ROLE']._serialized_end=505
 # @@protoc_insertion_point(module_scope)

meshtastic/protobuf/channel_pb2.pyi

@@ -127,23 +127,23 @@ class ModuleSettings(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
     POSITION_PRECISION_FIELD_NUMBER: builtins.int
-    IS_MUTED_FIELD_NUMBER: builtins.int
+    IS_CLIENT_MUTED_FIELD_NUMBER: builtins.int
     position_precision: builtins.int
     """
     Bits of precision for the location sent in position packets.
     """
-    is_muted: builtins.bool
+    is_client_muted: builtins.bool
     """
-    Controls whether or not the client / device should mute the current channel
+    Controls whether or not the phone / clients should mute the current channel
     Useful for noisy public channels you don't necessarily want to disable
     """
     def __init__(
         self,
         *,
         position_precision: builtins.int = ...,
-        is_muted: builtins.bool = ...,
+        is_client_muted: builtins.bool = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["is_muted", b"is_muted", "position_precision", b"position_precision"]) -> None: ...
+    def ClearField(self, field_name: typing.Literal["is_client_muted", b"is_client_muted", "position_precision", b"position_precision"]) -> None: ...
 
 global___ModuleSettings = ModuleSettings
 

meshtastic/protobuf/clientonly_pb2.py

@@ -15,14 +15,14 @@ from meshtastic.protobuf import localonly_pb2 as meshtastic_dot_protobuf_dot_loc
 from meshtastic.protobuf import mesh_pb2 as meshtastic_dot_protobuf_dot_mesh__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n$meshtastic/protobuf/clientonly.proto\x12\x13meshtastic.protobuf\x1a#meshtastic/protobuf/localonly.proto\x1a\x1emeshtastic/protobuf/mesh.proto\"\xc4\x03\n\rDeviceProfile\x12\x16\n\tlong_name\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x17\n\nshort_name\x18\x02 \x01(\tH\x01\x88\x01\x01\x12\x18\n\x0b\x63hannel_url\x18\x03 \x01(\tH\x02\x88\x01\x01\x12\x35\n\x06\x63onfig\x18\x04 \x01(\x0b\x32 .meshtastic.protobuf.LocalConfigH\x03\x88\x01\x01\x12\x42\n\rmodule_config\x18\x05 \x01(\x0b\x32&.meshtastic.protobuf.LocalModuleConfigH\x04\x88\x01\x01\x12:\n\x0e\x66ixed_position\x18\x06 \x01(\x0b\x32\x1d.meshtastic.protobuf.PositionH\x05\x88\x01\x01\x12\x15\n\x08ringtone\x18\x07 \x01(\tH\x06\x88\x01\x01\x12\x1c\n\x0f\x63\x61nned_messages\x18\x08 \x01(\tH\x07\x88\x01\x01\x42\x0c\n\n_long_nameB\r\n\x0b_short_nameB\x0e\n\x0c_channel_urlB\t\n\x07_configB\x10\n\x0e_module_configB\x11\n\x0f_fixed_positionB\x0b\n\t_ringtoneB\x12\n\x10_canned_messagesBf\n\x14org.meshtastic.protoB\x10\x43lientOnlyProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n$meshtastic/protobuf/clientonly.proto\x12\x13meshtastic.protobuf\x1a#meshtastic/protobuf/localonly.proto\x1a\x1emeshtastic/protobuf/mesh.proto\"\xc4\x03\n\rDeviceProfile\x12\x16\n\tlong_name\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x17\n\nshort_name\x18\x02 \x01(\tH\x01\x88\x01\x01\x12\x18\n\x0b\x63hannel_url\x18\x03 \x01(\tH\x02\x88\x01\x01\x12\x35\n\x06\x63onfig\x18\x04 \x01(\x0b\x32 .meshtastic.protobuf.LocalConfigH\x03\x88\x01\x01\x12\x42\n\rmodule_config\x18\x05 \x01(\x0b\x32&.meshtastic.protobuf.LocalModuleConfigH\x04\x88\x01\x01\x12:\n\x0e\x66ixed_position\x18\x06 \x01(\x0b\x32\x1d.meshtastic.protobuf.PositionH\x05\x88\x01\x01\x12\x15\n\x08ringtone\x18\x07 \x01(\tH\x06\x88\x01\x01\x12\x1c\n\x0f\x63\x61nned_messages\x18\x08 \x01(\tH\x07\x88\x01\x01\x42\x0c\n\n_long_nameB\r\n\x0b_short_nameB\x0e\n\x0c_channel_urlB\t\n\x07_configB\x10\n\x0e_module_configB\x11\n\x0f_fixed_positionB\x0b\n\t_ringtoneB\x12\n\x10_canned_messagesBe\n\x13\x63om.geeksville.meshB\x10\x43lientOnlyProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.clientonly_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\020ClientOnlyProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\020ClientOnlyProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
   _globals['_DEVICEPROFILE']._serialized_start=131
   _globals['_DEVICEPROFILE']._serialized_end=583
 # @@protoc_insertion_point(module_scope)

meshtastic/protobuf/config_pb2.pyi

@@ -64,7 +64,6 @@ class Config(google.protobuf.message.Message):
             Description: Infrastructure node for extending network coverage by relaying messages with minimal overhead. Not visible in Nodes list.
             Technical Details: Mesh packets will simply be rebroadcasted over this node. Nodes configured with this role will not originate NodeInfo, Position, Telemetry
               or any other packet type. They will simply rebroadcast any mesh packets on the same frequency, channel num, spread factor, and coding rate.
-            Deprecated in v2.7.11 because it creates "holes" in the mesh rebroadcast chain.
             """
             TRACKER: Config.DeviceConfig._Role.ValueType  # 5
             """
@@ -156,7 +155,6 @@ class Config(google.protobuf.message.Message):
         Description: Infrastructure node for extending network coverage by relaying messages with minimal overhead. Not visible in Nodes list.
         Technical Details: Mesh packets will simply be rebroadcasted over this node. Nodes configured with this role will not originate NodeInfo, Position, Telemetry
           or any other packet type. They will simply rebroadcast any mesh packets on the same frequency, channel num, spread factor, and coding rate.
-        Deprecated in v2.7.11 because it creates "holes" in the mesh rebroadcast chain.
         """
         TRACKER: Config.DeviceConfig.Role.ValueType  # 5
         """
@@ -940,20 +938,80 @@ class Config(google.protobuf.message.Message):
 
         DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
-        class _DeprecatedGpsCoordinateFormat:
+        class _GpsCoordinateFormat:
             ValueType = typing.NewType("ValueType", builtins.int)
             V: typing_extensions.TypeAlias = ValueType
 
-        class _DeprecatedGpsCoordinateFormatEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[Config.DisplayConfig._DeprecatedGpsCoordinateFormat.ValueType], builtins.type):
+        class _GpsCoordinateFormatEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[Config.DisplayConfig._GpsCoordinateFormat.ValueType], builtins.type):
             DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-            UNUSED: Config.DisplayConfig._DeprecatedGpsCoordinateFormat.ValueType  # 0
-
-        class DeprecatedGpsCoordinateFormat(_DeprecatedGpsCoordinateFormat, metaclass=_DeprecatedGpsCoordinateFormatEnumTypeWrapper):
+            DEC: Config.DisplayConfig._GpsCoordinateFormat.ValueType  # 0
             """
-            Deprecated in 2.7.4: Unused
+            GPS coordinates are displayed in the normal decimal degrees format:
+            DD.DDDDDD DDD.DDDDDD
+            """
+            DMS: Config.DisplayConfig._GpsCoordinateFormat.ValueType  # 1
+            """
+            GPS coordinates are displayed in the degrees minutes seconds format:
+            DD°MM'SS"C DDD°MM'SS"C, where C is the compass point representing the locations quadrant
+            """
+            UTM: Config.DisplayConfig._GpsCoordinateFormat.ValueType  # 2
+            """
+            Universal Transverse Mercator format:
+            ZZB EEEEEE NNNNNNN, where Z is zone, B is band, E is easting, N is northing
+            """
+            MGRS: Config.DisplayConfig._GpsCoordinateFormat.ValueType  # 3
+            """
+            Military Grid Reference System format:
+            ZZB CD EEEEE NNNNN, where Z is zone, B is band, C is the east 100k square, D is the north 100k square,
+            E is easting, N is northing
+            """
+            OLC: Config.DisplayConfig._GpsCoordinateFormat.ValueType  # 4
+            """
+            Open Location Code (aka Plus Codes).
+            """
+            OSGR: Config.DisplayConfig._GpsCoordinateFormat.ValueType  # 5
+            """
+            Ordnance Survey Grid Reference (the National Grid System of the UK).
+            Format: AB EEEEE NNNNN, where A is the east 100k square, B is the north 100k square,
+            E is the easting, N is the northing
             """
 
-        UNUSED: Config.DisplayConfig.DeprecatedGpsCoordinateFormat.ValueType  # 0
+        class GpsCoordinateFormat(_GpsCoordinateFormat, metaclass=_GpsCoordinateFormatEnumTypeWrapper):
+            """
+            How the GPS coordinates are displayed on the OLED screen.
+            """
+
+        DEC: Config.DisplayConfig.GpsCoordinateFormat.ValueType  # 0
+        """
+        GPS coordinates are displayed in the normal decimal degrees format:
+        DD.DDDDDD DDD.DDDDDD
+        """
+        DMS: Config.DisplayConfig.GpsCoordinateFormat.ValueType  # 1
+        """
+        GPS coordinates are displayed in the degrees minutes seconds format:
+        DD°MM'SS"C DDD°MM'SS"C, where C is the compass point representing the locations quadrant
+        """
+        UTM: Config.DisplayConfig.GpsCoordinateFormat.ValueType  # 2
+        """
+        Universal Transverse Mercator format:
+        ZZB EEEEEE NNNNNNN, where Z is zone, B is band, E is easting, N is northing
+        """
+        MGRS: Config.DisplayConfig.GpsCoordinateFormat.ValueType  # 3
+        """
+        Military Grid Reference System format:
+        ZZB CD EEEEE NNNNN, where Z is zone, B is band, C is the east 100k square, D is the north 100k square,
+        E is easting, N is northing
+        """
+        OLC: Config.DisplayConfig.GpsCoordinateFormat.ValueType  # 4
+        """
+        Open Location Code (aka Plus Codes).
+        """
+        OSGR: Config.DisplayConfig.GpsCoordinateFormat.ValueType  # 5
+        """
+        Ordnance Survey Grid Reference (the National Grid System of the UK).
+        Format: AB EEEEE NNNNN, where A is the east 100k square, B is the north 100k square,
+        E is the easting, N is the northing
+        """
 
         class _DisplayUnits:
             ValueType = typing.NewType("ValueType", builtins.int)
@@ -1163,13 +1221,12 @@ class Config(google.protobuf.message.Message):
         WAKE_ON_TAP_OR_MOTION_FIELD_NUMBER: builtins.int
         COMPASS_ORIENTATION_FIELD_NUMBER: builtins.int
         USE_12H_CLOCK_FIELD_NUMBER: builtins.int
-        USE_LONG_NODE_NAME_FIELD_NUMBER: builtins.int
         screen_on_secs: builtins.int
         """
         Number of seconds the screen stays on after pressing the user button or receiving a message
         0 for default of one minute MAXUINT for always on
         """
-        gps_format: global___Config.DisplayConfig.DeprecatedGpsCoordinateFormat.ValueType
+        gps_format: global___Config.DisplayConfig.GpsCoordinateFormat.ValueType
         """
         Deprecated in 2.7.4: Unused
         How the GPS coordinates are formatted on the OLED screen.
@@ -1217,16 +1274,11 @@ class Config(google.protobuf.message.Message):
         If false (default), the device will display the time in 24-hour format on screen.
         If true, the device will display the time in 12-hour format on screen.
         """
-        use_long_node_name: builtins.bool
-        """
-        If false (default), the device will use short names for various display screens.
-        If true, node names will show in long format
-        """
         def __init__(
             self,
             *,
             screen_on_secs: builtins.int = ...,
-            gps_format: global___Config.DisplayConfig.DeprecatedGpsCoordinateFormat.ValueType = ...,
+            gps_format: global___Config.DisplayConfig.GpsCoordinateFormat.ValueType = ...,
             auto_screen_carousel_secs: builtins.int = ...,
             compass_north_top: builtins.bool = ...,
             flip_screen: builtins.bool = ...,
@@ -1237,9 +1289,8 @@ class Config(google.protobuf.message.Message):
             wake_on_tap_or_motion: builtins.bool = ...,
             compass_orientation: global___Config.DisplayConfig.CompassOrientation.ValueType = ...,
             use_12h_clock: builtins.bool = ...,
-            use_long_node_name: builtins.bool = ...,
         ) -> None: ...
-        def ClearField(self, field_name: typing.Literal["auto_screen_carousel_secs", b"auto_screen_carousel_secs", "compass_north_top", b"compass_north_top", "compass_orientation", b"compass_orientation", "displaymode", b"displaymode", "flip_screen", b"flip_screen", "gps_format", b"gps_format", "heading_bold", b"heading_bold", "oled", b"oled", "screen_on_secs", b"screen_on_secs", "units", b"units", "use_12h_clock", b"use_12h_clock", "use_long_node_name", b"use_long_node_name", "wake_on_tap_or_motion", b"wake_on_tap_or_motion"]) -> None: ...
+        def ClearField(self, field_name: typing.Literal["auto_screen_carousel_secs", b"auto_screen_carousel_secs", "compass_north_top", b"compass_north_top", "compass_orientation", b"compass_orientation", "displaymode", b"displaymode", "flip_screen", b"flip_screen", "gps_format", b"gps_format", "heading_bold", b"heading_bold", "oled", b"oled", "screen_on_secs", b"screen_on_secs", "units", b"units", "use_12h_clock", b"use_12h_clock", "wake_on_tap_or_motion", b"wake_on_tap_or_motion"]) -> None: ...
 
     @typing.final
     class LoRaConfig(google.protobuf.message.Message):

meshtastic/protobuf/connection_status_pb2.py

@@ -13,14 +13,14 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n+meshtastic/protobuf/connection_status.proto\x12\x13meshtastic.protobuf\"\xd5\x02\n\x16\x44\x65viceConnectionStatus\x12<\n\x04wifi\x18\x01 \x01(\x0b\x32).meshtastic.protobuf.WifiConnectionStatusH\x00\x88\x01\x01\x12\x44\n\x08\x65thernet\x18\x02 \x01(\x0b\x32-.meshtastic.protobuf.EthernetConnectionStatusH\x01\x88\x01\x01\x12\x46\n\tbluetooth\x18\x03 \x01(\x0b\x32..meshtastic.protobuf.BluetoothConnectionStatusH\x02\x88\x01\x01\x12@\n\x06serial\x18\x04 \x01(\x0b\x32+.meshtastic.protobuf.SerialConnectionStatusH\x03\x88\x01\x01\x42\x07\n\x05_wifiB\x0b\n\t_ethernetB\x0c\n\n_bluetoothB\t\n\x07_serial\"p\n\x14WifiConnectionStatus\x12<\n\x06status\x18\x01 \x01(\x0b\x32,.meshtastic.protobuf.NetworkConnectionStatus\x12\x0c\n\x04ssid\x18\x02 \x01(\t\x12\x0c\n\x04rssi\x18\x03 \x01(\x05\"X\n\x18\x45thernetConnectionStatus\x12<\n\x06status\x18\x01 \x01(\x0b\x32,.meshtastic.protobuf.NetworkConnectionStatus\"{\n\x17NetworkConnectionStatus\x12\x12\n\nip_address\x18\x01 \x01(\x07\x12\x14\n\x0cis_connected\x18\x02 \x01(\x08\x12\x19\n\x11is_mqtt_connected\x18\x03 \x01(\x08\x12\x1b\n\x13is_syslog_connected\x18\x04 \x01(\x08\"L\n\x19\x42luetoothConnectionStatus\x12\x0b\n\x03pin\x18\x01 \x01(\r\x12\x0c\n\x04rssi\x18\x02 \x01(\x05\x12\x14\n\x0cis_connected\x18\x03 \x01(\x08\"<\n\x16SerialConnectionStatus\x12\x0c\n\x04\x62\x61ud\x18\x01 \x01(\r\x12\x14\n\x0cis_connected\x18\x02 \x01(\x08\x42\x66\n\x14org.meshtastic.protoB\x10\x43onnStatusProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n+meshtastic/protobuf/connection_status.proto\x12\x13meshtastic.protobuf\"\xd5\x02\n\x16\x44\x65viceConnectionStatus\x12<\n\x04wifi\x18\x01 \x01(\x0b\x32).meshtastic.protobuf.WifiConnectionStatusH\x00\x88\x01\x01\x12\x44\n\x08\x65thernet\x18\x02 \x01(\x0b\x32-.meshtastic.protobuf.EthernetConnectionStatusH\x01\x88\x01\x01\x12\x46\n\tbluetooth\x18\x03 \x01(\x0b\x32..meshtastic.protobuf.BluetoothConnectionStatusH\x02\x88\x01\x01\x12@\n\x06serial\x18\x04 \x01(\x0b\x32+.meshtastic.protobuf.SerialConnectionStatusH\x03\x88\x01\x01\x42\x07\n\x05_wifiB\x0b\n\t_ethernetB\x0c\n\n_bluetoothB\t\n\x07_serial\"p\n\x14WifiConnectionStatus\x12<\n\x06status\x18\x01 \x01(\x0b\x32,.meshtastic.protobuf.NetworkConnectionStatus\x12\x0c\n\x04ssid\x18\x02 \x01(\t\x12\x0c\n\x04rssi\x18\x03 \x01(\x05\"X\n\x18\x45thernetConnectionStatus\x12<\n\x06status\x18\x01 \x01(\x0b\x32,.meshtastic.protobuf.NetworkConnectionStatus\"{\n\x17NetworkConnectionStatus\x12\x12\n\nip_address\x18\x01 \x01(\x07\x12\x14\n\x0cis_connected\x18\x02 \x01(\x08\x12\x19\n\x11is_mqtt_connected\x18\x03 \x01(\x08\x12\x1b\n\x13is_syslog_connected\x18\x04 \x01(\x08\"L\n\x19\x42luetoothConnectionStatus\x12\x0b\n\x03pin\x18\x01 \x01(\r\x12\x0c\n\x04rssi\x18\x02 \x01(\x05\x12\x14\n\x0cis_connected\x18\x03 \x01(\x08\"<\n\x16SerialConnectionStatus\x12\x0c\n\x04\x62\x61ud\x18\x01 \x01(\r\x12\x14\n\x0cis_connected\x18\x02 \x01(\x08\x42\x65\n\x13\x63om.geeksville.meshB\x10\x43onnStatusProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.connection_status_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\020ConnStatusProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\020ConnStatusProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
   _globals['_DEVICECONNECTIONSTATUS']._serialized_start=69
   _globals['_DEVICECONNECTIONSTATUS']._serialized_end=410
   _globals['_WIFICONNECTIONSTATUS']._serialized_start=412

meshtastic/protobuf/device_ui_pb2.py

@@ -13,30 +13,28 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#meshtastic/protobuf/device_ui.proto\x12\x13meshtastic.protobuf\"\xff\x05\n\x0e\x44\x65viceUIConfig\x12\x0f\n\x07version\x18\x01 \x01(\r\x12\x19\n\x11screen_brightness\x18\x02 \x01(\r\x12\x16\n\x0escreen_timeout\x18\x03 \x01(\r\x12\x13\n\x0bscreen_lock\x18\x04 \x01(\x08\x12\x15\n\rsettings_lock\x18\x05 \x01(\x08\x12\x10\n\x08pin_code\x18\x06 \x01(\r\x12)\n\x05theme\x18\x07 \x01(\x0e\x32\x1a.meshtastic.protobuf.Theme\x12\x15\n\ralert_enabled\x18\x08 \x01(\x08\x12\x16\n\x0e\x62\x61nner_enabled\x18\t \x01(\x08\x12\x14\n\x0cring_tone_id\x18\n \x01(\r\x12/\n\x08language\x18\x0b \x01(\x0e\x32\x1d.meshtastic.protobuf.Language\x12\x34\n\x0bnode_filter\x18\x0c \x01(\x0b\x32\x1f.meshtastic.protobuf.NodeFilter\x12:\n\x0enode_highlight\x18\r \x01(\x0b\x32\".meshtastic.protobuf.NodeHighlight\x12\x18\n\x10\x63\x61libration_data\x18\x0e \x01(\x0c\x12*\n\x08map_data\x18\x0f \x01(\x0b\x32\x18.meshtastic.protobuf.Map\x12\x36\n\x0c\x63ompass_mode\x18\x10 \x01(\x0e\x32 .meshtastic.protobuf.CompassMode\x12\x18\n\x10screen_rgb_color\x18\x11 \x01(\r\x12\x1b\n\x13is_clockface_analog\x18\x12 \x01(\x08\x12K\n\ngps_format\x18\x13 \x01(\x0e\x32\x37.meshtastic.protobuf.DeviceUIConfig.GpsCoordinateFormat\"V\n\x13GpsCoordinateFormat\x12\x07\n\x03\x44\x45\x43\x10\x00\x12\x07\n\x03\x44MS\x10\x01\x12\x07\n\x03UTM\x10\x02\x12\x08\n\x04MGRS\x10\x03\x12\x07\n\x03OLC\x10\x04\x12\x08\n\x04OSGR\x10\x05\x12\x07\n\x03MLS\x10\x06\"\xa7\x01\n\nNodeFilter\x12\x16\n\x0eunknown_switch\x18\x01 \x01(\x08\x12\x16\n\x0eoffline_switch\x18\x02 \x01(\x08\x12\x19\n\x11public_key_switch\x18\x03 \x01(\x08\x12\x11\n\thops_away\x18\x04 \x01(\x05\x12\x17\n\x0fposition_switch\x18\x05 \x01(\x08\x12\x11\n\tnode_name\x18\x06 \x01(\t\x12\x0f\n\x07\x63hannel\x18\x07 \x01(\x05\"~\n\rNodeHighlight\x12\x13\n\x0b\x63hat_switch\x18\x01 \x01(\x08\x12\x17\n\x0fposition_switch\x18\x02 \x01(\x08\x12\x18\n\x10telemetry_switch\x18\x03 \x01(\x08\x12\x12\n\niaq_switch\x18\x04 \x01(\x08\x12\x11\n\tnode_name\x18\x05 \x01(\t\"=\n\x08GeoPoint\x12\x0c\n\x04zoom\x18\x01 \x01(\x05\x12\x10\n\x08latitude\x18\x02 \x01(\x05\x12\x11\n\tlongitude\x18\x03 \x01(\x05\"U\n\x03Map\x12+\n\x04home\x18\x01 \x01(\x0b\x32\x1d.meshtastic.protobuf.GeoPoint\x12\r\n\x05style\x18\x02 \x01(\t\x12\x12\n\nfollow_gps\x18\x03 \x01(\x08*>\n\x0b\x43ompassMode\x12\x0b\n\x07\x44YNAMIC\x10\x00\x12\x0e\n\nFIXED_RING\x10\x01\x12\x12\n\x0e\x46REEZE_HEADING\x10\x02*%\n\x05Theme\x12\x08\n\x04\x44\x41RK\x10\x00\x12\t\n\x05LIGHT\x10\x01\x12\x07\n\x03RED\x10\x02*\xc0\x02\n\x08Language\x12\x0b\n\x07\x45NGLISH\x10\x00\x12\n\n\x06\x46RENCH\x10\x01\x12\n\n\x06GERMAN\x10\x02\x12\x0b\n\x07ITALIAN\x10\x03\x12\x0e\n\nPORTUGUESE\x10\x04\x12\x0b\n\x07SPANISH\x10\x05\x12\x0b\n\x07SWEDISH\x10\x06\x12\x0b\n\x07\x46INNISH\x10\x07\x12\n\n\x06POLISH\x10\x08\x12\x0b\n\x07TURKISH\x10\t\x12\x0b\n\x07SERBIAN\x10\n\x12\x0b\n\x07RUSSIAN\x10\x0b\x12\t\n\x05\x44UTCH\x10\x0c\x12\t\n\x05GREEK\x10\r\x12\r\n\tNORWEGIAN\x10\x0e\x12\r\n\tSLOVENIAN\x10\x0f\x12\r\n\tUKRAINIAN\x10\x10\x12\r\n\tBULGARIAN\x10\x11\x12\t\n\x05\x43ZECH\x10\x12\x12\n\n\x06\x44\x41NISH\x10\x13\x12\x16\n\x12SIMPLIFIED_CHINESE\x10\x1e\x12\x17\n\x13TRADITIONAL_CHINESE\x10\x1f\x42\x64\n\x14org.meshtastic.protoB\x0e\x44\x65viceUIProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#meshtastic/protobuf/device_ui.proto\x12\x13meshtastic.protobuf\"\xda\x04\n\x0e\x44\x65viceUIConfig\x12\x0f\n\x07version\x18\x01 \x01(\r\x12\x19\n\x11screen_brightness\x18\x02 \x01(\r\x12\x16\n\x0escreen_timeout\x18\x03 \x01(\r\x12\x13\n\x0bscreen_lock\x18\x04 \x01(\x08\x12\x15\n\rsettings_lock\x18\x05 \x01(\x08\x12\x10\n\x08pin_code\x18\x06 \x01(\r\x12)\n\x05theme\x18\x07 \x01(\x0e\x32\x1a.meshtastic.protobuf.Theme\x12\x15\n\ralert_enabled\x18\x08 \x01(\x08\x12\x16\n\x0e\x62\x61nner_enabled\x18\t \x01(\x08\x12\x14\n\x0cring_tone_id\x18\n \x01(\r\x12/\n\x08language\x18\x0b \x01(\x0e\x32\x1d.meshtastic.protobuf.Language\x12\x34\n\x0bnode_filter\x18\x0c \x01(\x0b\x32\x1f.meshtastic.protobuf.NodeFilter\x12:\n\x0enode_highlight\x18\r \x01(\x0b\x32\".meshtastic.protobuf.NodeHighlight\x12\x18\n\x10\x63\x61libration_data\x18\x0e \x01(\x0c\x12*\n\x08map_data\x18\x0f \x01(\x0b\x32\x18.meshtastic.protobuf.Map\x12\x36\n\x0c\x63ompass_mode\x18\x10 \x01(\x0e\x32 .meshtastic.protobuf.CompassMode\x12\x18\n\x10screen_rgb_color\x18\x11 \x01(\r\x12\x1b\n\x13is_clockface_analog\x18\x12 \x01(\x08\"\xa7\x01\n\nNodeFilter\x12\x16\n\x0eunknown_switch\x18\x01 \x01(\x08\x12\x16\n\x0eoffline_switch\x18\x02 \x01(\x08\x12\x19\n\x11public_key_switch\x18\x03 \x01(\x08\x12\x11\n\thops_away\x18\x04 \x01(\x05\x12\x17\n\x0fposition_switch\x18\x05 \x01(\x08\x12\x11\n\tnode_name\x18\x06 \x01(\t\x12\x0f\n\x07\x63hannel\x18\x07 \x01(\x05\"~\n\rNodeHighlight\x12\x13\n\x0b\x63hat_switch\x18\x01 \x01(\x08\x12\x17\n\x0fposition_switch\x18\x02 \x01(\x08\x12\x18\n\x10telemetry_switch\x18\x03 \x01(\x08\x12\x12\n\niaq_switch\x18\x04 \x01(\x08\x12\x11\n\tnode_name\x18\x05 \x01(\t\"=\n\x08GeoPoint\x12\x0c\n\x04zoom\x18\x01 \x01(\x05\x12\x10\n\x08latitude\x18\x02 \x01(\x05\x12\x11\n\tlongitude\x18\x03 \x01(\x05\"U\n\x03Map\x12+\n\x04home\x18\x01 \x01(\x0b\x32\x1d.meshtastic.protobuf.GeoPoint\x12\r\n\x05style\x18\x02 \x01(\t\x12\x12\n\nfollow_gps\x18\x03 \x01(\x08*>\n\x0b\x43ompassMode\x12\x0b\n\x07\x44YNAMIC\x10\x00\x12\x0e\n\nFIXED_RING\x10\x01\x12\x12\n\x0e\x46REEZE_HEADING\x10\x02*%\n\x05Theme\x12\x08\n\x04\x44\x41RK\x10\x00\x12\t\n\x05LIGHT\x10\x01\x12\x07\n\x03RED\x10\x02*\xb4\x02\n\x08Language\x12\x0b\n\x07\x45NGLISH\x10\x00\x12\n\n\x06\x46RENCH\x10\x01\x12\n\n\x06GERMAN\x10\x02\x12\x0b\n\x07ITALIAN\x10\x03\x12\x0e\n\nPORTUGUESE\x10\x04\x12\x0b\n\x07SPANISH\x10\x05\x12\x0b\n\x07SWEDISH\x10\x06\x12\x0b\n\x07\x46INNISH\x10\x07\x12\n\n\x06POLISH\x10\x08\x12\x0b\n\x07TURKISH\x10\t\x12\x0b\n\x07SERBIAN\x10\n\x12\x0b\n\x07RUSSIAN\x10\x0b\x12\t\n\x05\x44UTCH\x10\x0c\x12\t\n\x05GREEK\x10\r\x12\r\n\tNORWEGIAN\x10\x0e\x12\r\n\tSLOVENIAN\x10\x0f\x12\r\n\tUKRAINIAN\x10\x10\x12\r\n\tBULGARIAN\x10\x11\x12\t\n\x05\x43ZECH\x10\x12\x12\x16\n\x12SIMPLIFIED_CHINESE\x10\x1e\x12\x17\n\x13TRADITIONAL_CHINESE\x10\x1f\x42\x63\n\x13\x63om.geeksville.meshB\x0e\x44\x65viceUIProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.device_ui_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\016DeviceUIProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
-  _globals['_COMPASSMODE']._serialized_start=1278
-  _globals['_COMPASSMODE']._serialized_end=1340
-  _globals['_THEME']._serialized_start=1342
-  _globals['_THEME']._serialized_end=1379
-  _globals['_LANGUAGE']._serialized_start=1382
-  _globals['_LANGUAGE']._serialized_end=1702
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\016DeviceUIProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  _globals['_COMPASSMODE']._serialized_start=1113
+  _globals['_COMPASSMODE']._serialized_end=1175
+  _globals['_THEME']._serialized_start=1177
+  _globals['_THEME']._serialized_end=1214
+  _globals['_LANGUAGE']._serialized_start=1217
+  _globals['_LANGUAGE']._serialized_end=1525
   _globals['_DEVICEUICONFIG']._serialized_start=61
-  _globals['_DEVICEUICONFIG']._serialized_end=828
-  _globals['_DEVICEUICONFIG_GPSCOORDINATEFORMAT']._serialized_start=742
-  _globals['_DEVICEUICONFIG_GPSCOORDINATEFORMAT']._serialized_end=828
-  _globals['_NODEFILTER']._serialized_start=831
-  _globals['_NODEFILTER']._serialized_end=998
-  _globals['_NODEHIGHLIGHT']._serialized_start=1000
-  _globals['_NODEHIGHLIGHT']._serialized_end=1126
-  _globals['_GEOPOINT']._serialized_start=1128
-  _globals['_GEOPOINT']._serialized_end=1189
-  _globals['_MAP']._serialized_start=1191
-  _globals['_MAP']._serialized_end=1276
+  _globals['_DEVICEUICONFIG']._serialized_end=663
+  _globals['_NODEFILTER']._serialized_start=666
+  _globals['_NODEFILTER']._serialized_end=833
+  _globals['_NODEHIGHLIGHT']._serialized_start=835
+  _globals['_NODEHIGHLIGHT']._serialized_end=961
+  _globals['_GEOPOINT']._serialized_start=963
+  _globals['_GEOPOINT']._serialized_end=1024
+  _globals['_MAP']._serialized_start=1026
+  _globals['_MAP']._serialized_end=1111
 # @@protoc_insertion_point(module_scope)

meshtastic/protobuf/device_ui_pb2.pyi

@@ -169,10 +169,6 @@ class _LanguageEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumT
     """
     Czech
     """
-    DANISH: _Language.ValueType  # 19
-    """
-    Danish
-    """
     SIMPLIFIED_CHINESE: _Language.ValueType  # 30
     """
     Simplified Chinese (experimental)
@@ -263,10 +259,6 @@ CZECH: Language.ValueType  # 18
 """
 Czech
 """
-DANISH: Language.ValueType  # 19
-"""
-Danish
-"""
 SIMPLIFIED_CHINESE: Language.ValueType  # 30
 """
 Simplified Chinese (experimental)
@@ -285,91 +277,6 @@ class DeviceUIConfig(google.protobuf.message.Message):
 
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
-    class _GpsCoordinateFormat:
-        ValueType = typing.NewType("ValueType", builtins.int)
-        V: typing_extensions.TypeAlias = ValueType
-
-    class _GpsCoordinateFormatEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[DeviceUIConfig._GpsCoordinateFormat.ValueType], builtins.type):
-        DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
-        DEC: DeviceUIConfig._GpsCoordinateFormat.ValueType  # 0
-        """
-        GPS coordinates are displayed in the normal decimal degrees format:
-        DD.DDDDDD DDD.DDDDDD
-        """
-        DMS: DeviceUIConfig._GpsCoordinateFormat.ValueType  # 1
-        """
-        GPS coordinates are displayed in the degrees minutes seconds format:
-        DD°MM'SS"C DDD°MM'SS"C, where C is the compass point representing the locations quadrant
-        """
-        UTM: DeviceUIConfig._GpsCoordinateFormat.ValueType  # 2
-        """
-        Universal Transverse Mercator format:
-        ZZB EEEEEE NNNNNNN, where Z is zone, B is band, E is easting, N is northing
-        """
-        MGRS: DeviceUIConfig._GpsCoordinateFormat.ValueType  # 3
-        """
-        Military Grid Reference System format:
-        ZZB CD EEEEE NNNNN, where Z is zone, B is band, C is the east 100k square, D is the north 100k square,
-        E is easting, N is northing
-        """
-        OLC: DeviceUIConfig._GpsCoordinateFormat.ValueType  # 4
-        """
-        Open Location Code (aka Plus Codes).
-        """
-        OSGR: DeviceUIConfig._GpsCoordinateFormat.ValueType  # 5
-        """
-        Ordnance Survey Grid Reference (the National Grid System of the UK).
-        Format: AB EEEEE NNNNN, where A is the east 100k square, B is the north 100k square,
-        E is the easting, N is the northing
-        """
-        MLS: DeviceUIConfig._GpsCoordinateFormat.ValueType  # 6
-        """
-        Maidenhead Locator System
-        Described here: https://en.wikipedia.org/wiki/Maidenhead_Locator_System
-        """
-
-    class GpsCoordinateFormat(_GpsCoordinateFormat, metaclass=_GpsCoordinateFormatEnumTypeWrapper):
-        """
-        How the GPS coordinates are displayed on the OLED screen.
-        """
-
-    DEC: DeviceUIConfig.GpsCoordinateFormat.ValueType  # 0
-    """
-    GPS coordinates are displayed in the normal decimal degrees format:
-    DD.DDDDDD DDD.DDDDDD
-    """
-    DMS: DeviceUIConfig.GpsCoordinateFormat.ValueType  # 1
-    """
-    GPS coordinates are displayed in the degrees minutes seconds format:
-    DD°MM'SS"C DDD°MM'SS"C, where C is the compass point representing the locations quadrant
-    """
-    UTM: DeviceUIConfig.GpsCoordinateFormat.ValueType  # 2
-    """
-    Universal Transverse Mercator format:
-    ZZB EEEEEE NNNNNNN, where Z is zone, B is band, E is easting, N is northing
-    """
-    MGRS: DeviceUIConfig.GpsCoordinateFormat.ValueType  # 3
-    """
-    Military Grid Reference System format:
-    ZZB CD EEEEE NNNNN, where Z is zone, B is band, C is the east 100k square, D is the north 100k square,
-    E is easting, N is northing
-    """
-    OLC: DeviceUIConfig.GpsCoordinateFormat.ValueType  # 4
-    """
-    Open Location Code (aka Plus Codes).
-    """
-    OSGR: DeviceUIConfig.GpsCoordinateFormat.ValueType  # 5
-    """
-    Ordnance Survey Grid Reference (the National Grid System of the UK).
-    Format: AB EEEEE NNNNN, where A is the east 100k square, B is the north 100k square,
-    E is the easting, N is the northing
-    """
-    MLS: DeviceUIConfig.GpsCoordinateFormat.ValueType  # 6
-    """
-    Maidenhead Locator System
-    Described here: https://en.wikipedia.org/wiki/Maidenhead_Locator_System
-    """
-
     VERSION_FIELD_NUMBER: builtins.int
     SCREEN_BRIGHTNESS_FIELD_NUMBER: builtins.int
     SCREEN_TIMEOUT_FIELD_NUMBER: builtins.int
@@ -388,7 +295,6 @@ class DeviceUIConfig(google.protobuf.message.Message):
     COMPASS_MODE_FIELD_NUMBER: builtins.int
     SCREEN_RGB_COLOR_FIELD_NUMBER: builtins.int
     IS_CLOCKFACE_ANALOG_FIELD_NUMBER: builtins.int
-    GPS_FORMAT_FIELD_NUMBER: builtins.int
     version: builtins.int
     """
     A version integer used to invalidate saved files when we make incompatible changes.
@@ -439,10 +345,6 @@ class DeviceUIConfig(google.protobuf.message.Message):
     Clockface analog style
     true for analog clockface, false for digital clockface
     """
-    gps_format: global___DeviceUIConfig.GpsCoordinateFormat.ValueType
-    """
-    How the GPS coordinates are formatted on the OLED screen.
-    """
     @property
     def node_filter(self) -> global___NodeFilter:
         """
@@ -482,10 +384,9 @@ class DeviceUIConfig(google.protobuf.message.Message):
         compass_mode: global___CompassMode.ValueType = ...,
         screen_rgb_color: builtins.int = ...,
         is_clockface_analog: builtins.bool = ...,
-        gps_format: global___DeviceUIConfig.GpsCoordinateFormat.ValueType = ...,
     ) -> None: ...
     def HasField(self, field_name: typing.Literal["map_data", b"map_data", "node_filter", b"node_filter", "node_highlight", b"node_highlight"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["alert_enabled", b"alert_enabled", "banner_enabled", b"banner_enabled", "calibration_data", b"calibration_data", "compass_mode", b"compass_mode", "gps_format", b"gps_format", "is_clockface_analog", b"is_clockface_analog", "language", b"language", "map_data", b"map_data", "node_filter", b"node_filter", "node_highlight", b"node_highlight", "pin_code", b"pin_code", "ring_tone_id", b"ring_tone_id", "screen_brightness", b"screen_brightness", "screen_lock", b"screen_lock", "screen_rgb_color", b"screen_rgb_color", "screen_timeout", b"screen_timeout", "settings_lock", b"settings_lock", "theme", b"theme", "version", b"version"]) -> None: ...
+    def ClearField(self, field_name: typing.Literal["alert_enabled", b"alert_enabled", "banner_enabled", b"banner_enabled", "calibration_data", b"calibration_data", "compass_mode", b"compass_mode", "is_clockface_analog", b"is_clockface_analog", "language", b"language", "map_data", b"map_data", "node_filter", b"node_filter", "node_highlight", b"node_highlight", "pin_code", b"pin_code", "ring_tone_id", b"ring_tone_id", "screen_brightness", b"screen_brightness", "screen_lock", b"screen_lock", "screen_rgb_color", b"screen_rgb_color", "screen_timeout", b"screen_timeout", "settings_lock", b"settings_lock", "theme", b"theme", "version", b"version"]) -> None: ...
 
 global___DeviceUIConfig = DeviceUIConfig
 

meshtastic/protobuf/deviceonly_pb2.py

@@ -19,14 +19,14 @@ from meshtastic.protobuf import telemetry_pb2 as meshtastic_dot_protobuf_dot_tel
 from meshtastic.protobuf import nanopb_pb2 as meshtastic_dot_protobuf_dot_nanopb__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n$meshtastic/protobuf/deviceonly.proto\x12\x13meshtastic.protobuf\x1a!meshtastic/protobuf/channel.proto\x1a meshtastic/protobuf/config.proto\x1a#meshtastic/protobuf/localonly.proto\x1a\x1emeshtastic/protobuf/mesh.proto\x1a#meshtastic/protobuf/telemetry.proto\x1a meshtastic/protobuf/nanopb.proto\"\x99\x01\n\x0cPositionLite\x12\x12\n\nlatitude_i\x18\x01 \x01(\x0f\x12\x13\n\x0blongitude_i\x18\x02 \x01(\x0f\x12\x10\n\x08\x61ltitude\x18\x03 \x01(\x05\x12\x0c\n\x04time\x18\x04 \x01(\x07\x12@\n\x0flocation_source\x18\x05 \x01(\x0e\x32\'.meshtastic.protobuf.Position.LocSource\"\x94\x02\n\x08UserLite\x12\x13\n\x07macaddr\x18\x01 \x01(\x0c\x42\x02\x18\x01\x12\x11\n\tlong_name\x18\x02 \x01(\t\x12\x12\n\nshort_name\x18\x03 \x01(\t\x12\x34\n\x08hw_model\x18\x04 \x01(\x0e\x32\".meshtastic.protobuf.HardwareModel\x12\x13\n\x0bis_licensed\x18\x05 \x01(\x08\x12;\n\x04role\x18\x06 \x01(\x0e\x32-.meshtastic.protobuf.Config.DeviceConfig.Role\x12\x12\n\npublic_key\x18\x07 \x01(\x0c\x12\x1c\n\x0fis_unmessagable\x18\t \x01(\x08H\x00\x88\x01\x01\x42\x12\n\x10_is_unmessagable\"\xf0\x02\n\x0cNodeInfoLite\x12\x0b\n\x03num\x18\x01 \x01(\r\x12+\n\x04user\x18\x02 \x01(\x0b\x32\x1d.meshtastic.protobuf.UserLite\x12\x33\n\x08position\x18\x03 \x01(\x0b\x32!.meshtastic.protobuf.PositionLite\x12\x0b\n\x03snr\x18\x04 \x01(\x02\x12\x12\n\nlast_heard\x18\x05 \x01(\x07\x12:\n\x0e\x64\x65vice_metrics\x18\x06 \x01(\x0b\x32\".meshtastic.protobuf.DeviceMetrics\x12\x0f\n\x07\x63hannel\x18\x07 \x01(\r\x12\x10\n\x08via_mqtt\x18\x08 \x01(\x08\x12\x16\n\thops_away\x18\t \x01(\rH\x00\x88\x01\x01\x12\x13\n\x0bis_favorite\x18\n \x01(\x08\x12\x12\n\nis_ignored\x18\x0b \x01(\x08\x12\x10\n\x08next_hop\x18\x0c \x01(\r\x12\x10\n\x08\x62itfield\x18\r \x01(\rB\x0c\n\n_hops_away\"\xa1\x03\n\x0b\x44\x65viceState\x12\x30\n\x07my_node\x18\x02 \x01(\x0b\x32\x1f.meshtastic.protobuf.MyNodeInfo\x12(\n\x05owner\x18\x03 \x01(\x0b\x32\x19.meshtastic.protobuf.User\x12\x36\n\rreceive_queue\x18\x05 \x03(\x0b\x32\x1f.meshtastic.protobuf.MeshPacket\x12\x0f\n\x07version\x18\x08 \x01(\r\x12\x38\n\x0frx_text_message\x18\x07 \x01(\x0b\x32\x1f.meshtastic.protobuf.MeshPacket\x12\x13\n\x07no_save\x18\t \x01(\x08\x42\x02\x18\x01\x12\x19\n\rdid_gps_reset\x18\x0b \x01(\x08\x42\x02\x18\x01\x12\x34\n\x0brx_waypoint\x18\x0c \x01(\x0b\x32\x1f.meshtastic.protobuf.MeshPacket\x12M\n\x19node_remote_hardware_pins\x18\r \x03(\x0b\x32*.meshtastic.protobuf.NodeRemoteHardwarePin\"}\n\x0cNodeDatabase\x12\x0f\n\x07version\x18\x01 \x01(\r\x12\\\n\x05nodes\x18\x02 \x03(\x0b\x32!.meshtastic.protobuf.NodeInfoLiteB*\x92?\'\x92\x01$std::vector<meshtastic_NodeInfoLite>\"N\n\x0b\x43hannelFile\x12.\n\x08\x63hannels\x18\x01 \x03(\x0b\x32\x1c.meshtastic.protobuf.Channel\x12\x0f\n\x07version\x18\x02 \x01(\r\"\x86\x02\n\x11\x42\x61\x63kupPreferences\x12\x0f\n\x07version\x18\x01 \x01(\r\x12\x11\n\ttimestamp\x18\x02 \x01(\x07\x12\x30\n\x06\x63onfig\x18\x03 \x01(\x0b\x32 .meshtastic.protobuf.LocalConfig\x12=\n\rmodule_config\x18\x04 \x01(\x0b\x32&.meshtastic.protobuf.LocalModuleConfig\x12\x32\n\x08\x63hannels\x18\x05 \x01(\x0b\x32 .meshtastic.protobuf.ChannelFile\x12(\n\x05owner\x18\x06 \x01(\x0b\x32\x19.meshtastic.protobuf.UserBn\n\x14org.meshtastic.protoB\nDeviceOnlyZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x92?\x0b\xc2\x01\x08<vector>b\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n$meshtastic/protobuf/deviceonly.proto\x12\x13meshtastic.protobuf\x1a!meshtastic/protobuf/channel.proto\x1a meshtastic/protobuf/config.proto\x1a#meshtastic/protobuf/localonly.proto\x1a\x1emeshtastic/protobuf/mesh.proto\x1a#meshtastic/protobuf/telemetry.proto\x1a meshtastic/protobuf/nanopb.proto\"\x99\x01\n\x0cPositionLite\x12\x12\n\nlatitude_i\x18\x01 \x01(\x0f\x12\x13\n\x0blongitude_i\x18\x02 \x01(\x0f\x12\x10\n\x08\x61ltitude\x18\x03 \x01(\x05\x12\x0c\n\x04time\x18\x04 \x01(\x07\x12@\n\x0flocation_source\x18\x05 \x01(\x0e\x32\'.meshtastic.protobuf.Position.LocSource\"\x94\x02\n\x08UserLite\x12\x13\n\x07macaddr\x18\x01 \x01(\x0c\x42\x02\x18\x01\x12\x11\n\tlong_name\x18\x02 \x01(\t\x12\x12\n\nshort_name\x18\x03 \x01(\t\x12\x34\n\x08hw_model\x18\x04 \x01(\x0e\x32\".meshtastic.protobuf.HardwareModel\x12\x13\n\x0bis_licensed\x18\x05 \x01(\x08\x12;\n\x04role\x18\x06 \x01(\x0e\x32-.meshtastic.protobuf.Config.DeviceConfig.Role\x12\x12\n\npublic_key\x18\x07 \x01(\x0c\x12\x1c\n\x0fis_unmessagable\x18\t \x01(\x08H\x00\x88\x01\x01\x42\x12\n\x10_is_unmessagable\"\xf0\x02\n\x0cNodeInfoLite\x12\x0b\n\x03num\x18\x01 \x01(\r\x12+\n\x04user\x18\x02 \x01(\x0b\x32\x1d.meshtastic.protobuf.UserLite\x12\x33\n\x08position\x18\x03 \x01(\x0b\x32!.meshtastic.protobuf.PositionLite\x12\x0b\n\x03snr\x18\x04 \x01(\x02\x12\x12\n\nlast_heard\x18\x05 \x01(\x07\x12:\n\x0e\x64\x65vice_metrics\x18\x06 \x01(\x0b\x32\".meshtastic.protobuf.DeviceMetrics\x12\x0f\n\x07\x63hannel\x18\x07 \x01(\r\x12\x10\n\x08via_mqtt\x18\x08 \x01(\x08\x12\x16\n\thops_away\x18\t \x01(\rH\x00\x88\x01\x01\x12\x13\n\x0bis_favorite\x18\n \x01(\x08\x12\x12\n\nis_ignored\x18\x0b \x01(\x08\x12\x10\n\x08next_hop\x18\x0c \x01(\r\x12\x10\n\x08\x62itfield\x18\r \x01(\rB\x0c\n\n_hops_away\"\xa1\x03\n\x0b\x44\x65viceState\x12\x30\n\x07my_node\x18\x02 \x01(\x0b\x32\x1f.meshtastic.protobuf.MyNodeInfo\x12(\n\x05owner\x18\x03 \x01(\x0b\x32\x19.meshtastic.protobuf.User\x12\x36\n\rreceive_queue\x18\x05 \x03(\x0b\x32\x1f.meshtastic.protobuf.MeshPacket\x12\x0f\n\x07version\x18\x08 \x01(\r\x12\x38\n\x0frx_text_message\x18\x07 \x01(\x0b\x32\x1f.meshtastic.protobuf.MeshPacket\x12\x13\n\x07no_save\x18\t \x01(\x08\x42\x02\x18\x01\x12\x19\n\rdid_gps_reset\x18\x0b \x01(\x08\x42\x02\x18\x01\x12\x34\n\x0brx_waypoint\x18\x0c \x01(\x0b\x32\x1f.meshtastic.protobuf.MeshPacket\x12M\n\x19node_remote_hardware_pins\x18\r \x03(\x0b\x32*.meshtastic.protobuf.NodeRemoteHardwarePin\"}\n\x0cNodeDatabase\x12\x0f\n\x07version\x18\x01 \x01(\r\x12\\\n\x05nodes\x18\x02 \x03(\x0b\x32!.meshtastic.protobuf.NodeInfoLiteB*\x92?\'\x92\x01$std::vector<meshtastic_NodeInfoLite>\"N\n\x0b\x43hannelFile\x12.\n\x08\x63hannels\x18\x01 \x03(\x0b\x32\x1c.meshtastic.protobuf.Channel\x12\x0f\n\x07version\x18\x02 \x01(\r\"\x86\x02\n\x11\x42\x61\x63kupPreferences\x12\x0f\n\x07version\x18\x01 \x01(\r\x12\x11\n\ttimestamp\x18\x02 \x01(\x07\x12\x30\n\x06\x63onfig\x18\x03 \x01(\x0b\x32 .meshtastic.protobuf.LocalConfig\x12=\n\rmodule_config\x18\x04 \x01(\x0b\x32&.meshtastic.protobuf.LocalModuleConfig\x12\x32\n\x08\x63hannels\x18\x05 \x01(\x0b\x32 .meshtastic.protobuf.ChannelFile\x12(\n\x05owner\x18\x06 \x01(\x0b\x32\x19.meshtastic.protobuf.UserBm\n\x13\x63om.geeksville.meshB\nDeviceOnlyZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x92?\x0b\xc2\x01\x08<vector>b\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.deviceonly_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\nDeviceOnlyZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000\222?\013\302\001\010<vector>'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\nDeviceOnlyZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000\222?\013\302\001\010<vector>'
   _USERLITE.fields_by_name['macaddr']._options = None
   _USERLITE.fields_by_name['macaddr']._serialized_options = b'\030\001'
   _DEVICESTATE.fields_by_name['no_save']._options = None

meshtastic/protobuf/interdevice_pb2.py

@@ -13,14 +13,14 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n%meshtastic/protobuf/interdevice.proto\x12\x13meshtastic.protobuf\"s\n\nSensorData\x12.\n\x04type\x18\x01 \x01(\x0e\x32 .meshtastic.protobuf.MessageType\x12\x15\n\x0b\x66loat_value\x18\x02 \x01(\x02H\x00\x12\x16\n\x0cuint32_value\x18\x03 \x01(\rH\x00\x42\x06\n\x04\x64\x61ta\"_\n\x12InterdeviceMessage\x12\x0e\n\x04nmea\x18\x01 \x01(\tH\x00\x12\x31\n\x06sensor\x18\x02 \x01(\x0b\x32\x1f.meshtastic.protobuf.SensorDataH\x00\x42\x06\n\x04\x64\x61ta*\xd5\x01\n\x0bMessageType\x12\x07\n\x03\x41\x43K\x10\x00\x12\x15\n\x10\x43OLLECT_INTERVAL\x10\xa0\x01\x12\x0c\n\x07\x42\x45\x45P_ON\x10\xa1\x01\x12\r\n\x08\x42\x45\x45P_OFF\x10\xa2\x01\x12\r\n\x08SHUTDOWN\x10\xa3\x01\x12\r\n\x08POWER_ON\x10\xa4\x01\x12\x0f\n\nSCD41_TEMP\x10\xb0\x01\x12\x13\n\x0eSCD41_HUMIDITY\x10\xb1\x01\x12\x0e\n\tSCD41_CO2\x10\xb2\x01\x12\x0f\n\nAHT20_TEMP\x10\xb3\x01\x12\x13\n\x0e\x41HT20_HUMIDITY\x10\xb4\x01\x12\x0f\n\nTVOC_INDEX\x10\xb5\x01\x42g\n\x14org.meshtastic.protoB\x11InterdeviceProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n%meshtastic/protobuf/interdevice.proto\x12\x13meshtastic.protobuf\"s\n\nSensorData\x12.\n\x04type\x18\x01 \x01(\x0e\x32 .meshtastic.protobuf.MessageType\x12\x15\n\x0b\x66loat_value\x18\x02 \x01(\x02H\x00\x12\x16\n\x0cuint32_value\x18\x03 \x01(\rH\x00\x42\x06\n\x04\x64\x61ta\"_\n\x12InterdeviceMessage\x12\x0e\n\x04nmea\x18\x01 \x01(\tH\x00\x12\x31\n\x06sensor\x18\x02 \x01(\x0b\x32\x1f.meshtastic.protobuf.SensorDataH\x00\x42\x06\n\x04\x64\x61ta*\xd5\x01\n\x0bMessageType\x12\x07\n\x03\x41\x43K\x10\x00\x12\x15\n\x10\x43OLLECT_INTERVAL\x10\xa0\x01\x12\x0c\n\x07\x42\x45\x45P_ON\x10\xa1\x01\x12\r\n\x08\x42\x45\x45P_OFF\x10\xa2\x01\x12\r\n\x08SHUTDOWN\x10\xa3\x01\x12\r\n\x08POWER_ON\x10\xa4\x01\x12\x0f\n\nSCD41_TEMP\x10\xb0\x01\x12\x13\n\x0eSCD41_HUMIDITY\x10\xb1\x01\x12\x0e\n\tSCD41_CO2\x10\xb2\x01\x12\x0f\n\nAHT20_TEMP\x10\xb3\x01\x12\x13\n\x0e\x41HT20_HUMIDITY\x10\xb4\x01\x12\x0f\n\nTVOC_INDEX\x10\xb5\x01\x42\x66\n\x13\x63om.geeksville.meshB\x11InterdeviceProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.interdevice_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\021InterdeviceProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\021InterdeviceProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
   _globals['_MESSAGETYPE']._serialized_start=277
   _globals['_MESSAGETYPE']._serialized_end=490
   _globals['_SENSORDATA']._serialized_start=62

meshtastic/protobuf/localonly_pb2.py

@@ -15,14 +15,14 @@ from meshtastic.protobuf import config_pb2 as meshtastic_dot_protobuf_dot_config
 from meshtastic.protobuf import module_config_pb2 as meshtastic_dot_protobuf_dot_module__config__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#meshtastic/protobuf/localonly.proto\x12\x13meshtastic.protobuf\x1a meshtastic/protobuf/config.proto\x1a\'meshtastic/protobuf/module_config.proto\"\xfa\x03\n\x0bLocalConfig\x12\x38\n\x06\x64\x65vice\x18\x01 \x01(\x0b\x32(.meshtastic.protobuf.Config.DeviceConfig\x12<\n\x08position\x18\x02 \x01(\x0b\x32*.meshtastic.protobuf.Config.PositionConfig\x12\x36\n\x05power\x18\x03 \x01(\x0b\x32\'.meshtastic.protobuf.Config.PowerConfig\x12:\n\x07network\x18\x04 \x01(\x0b\x32).meshtastic.protobuf.Config.NetworkConfig\x12:\n\x07\x64isplay\x18\x05 \x01(\x0b\x32).meshtastic.protobuf.Config.DisplayConfig\x12\x34\n\x04lora\x18\x06 \x01(\x0b\x32&.meshtastic.protobuf.Config.LoRaConfig\x12>\n\tbluetooth\x18\x07 \x01(\x0b\x32+.meshtastic.protobuf.Config.BluetoothConfig\x12\x0f\n\x07version\x18\x08 \x01(\r\x12<\n\x08security\x18\t \x01(\x0b\x32*.meshtastic.protobuf.Config.SecurityConfig\"\xf0\x07\n\x11LocalModuleConfig\x12:\n\x04mqtt\x18\x01 \x01(\x0b\x32,.meshtastic.protobuf.ModuleConfig.MQTTConfig\x12>\n\x06serial\x18\x02 \x01(\x0b\x32..meshtastic.protobuf.ModuleConfig.SerialConfig\x12[\n\x15\x65xternal_notification\x18\x03 \x01(\x0b\x32<.meshtastic.protobuf.ModuleConfig.ExternalNotificationConfig\x12K\n\rstore_forward\x18\x04 \x01(\x0b\x32\x34.meshtastic.protobuf.ModuleConfig.StoreForwardConfig\x12\x45\n\nrange_test\x18\x05 \x01(\x0b\x32\x31.meshtastic.protobuf.ModuleConfig.RangeTestConfig\x12\x44\n\ttelemetry\x18\x06 \x01(\x0b\x32\x31.meshtastic.protobuf.ModuleConfig.TelemetryConfig\x12M\n\x0e\x63\x61nned_message\x18\x07 \x01(\x0b\x32\x35.meshtastic.protobuf.ModuleConfig.CannedMessageConfig\x12<\n\x05\x61udio\x18\t \x01(\x0b\x32-.meshtastic.protobuf.ModuleConfig.AudioConfig\x12O\n\x0fremote_hardware\x18\n \x01(\x0b\x32\x36.meshtastic.protobuf.ModuleConfig.RemoteHardwareConfig\x12K\n\rneighbor_info\x18\x0b \x01(\x0b\x32\x34.meshtastic.protobuf.ModuleConfig.NeighborInfoConfig\x12Q\n\x10\x61mbient_lighting\x18\x0c \x01(\x0b\x32\x37.meshtastic.protobuf.ModuleConfig.AmbientLightingConfig\x12Q\n\x10\x64\x65tection_sensor\x18\r \x01(\x0b\x32\x37.meshtastic.protobuf.ModuleConfig.DetectionSensorConfig\x12\x46\n\npaxcounter\x18\x0e \x01(\x0b\x32\x32.meshtastic.protobuf.ModuleConfig.PaxcounterConfig\x12\x0f\n\x07version\x18\x08 \x01(\rBe\n\x14org.meshtastic.protoB\x0fLocalOnlyProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#meshtastic/protobuf/localonly.proto\x12\x13meshtastic.protobuf\x1a meshtastic/protobuf/config.proto\x1a\'meshtastic/protobuf/module_config.proto\"\xfa\x03\n\x0bLocalConfig\x12\x38\n\x06\x64\x65vice\x18\x01 \x01(\x0b\x32(.meshtastic.protobuf.Config.DeviceConfig\x12<\n\x08position\x18\x02 \x01(\x0b\x32*.meshtastic.protobuf.Config.PositionConfig\x12\x36\n\x05power\x18\x03 \x01(\x0b\x32\'.meshtastic.protobuf.Config.PowerConfig\x12:\n\x07network\x18\x04 \x01(\x0b\x32).meshtastic.protobuf.Config.NetworkConfig\x12:\n\x07\x64isplay\x18\x05 \x01(\x0b\x32).meshtastic.protobuf.Config.DisplayConfig\x12\x34\n\x04lora\x18\x06 \x01(\x0b\x32&.meshtastic.protobuf.Config.LoRaConfig\x12>\n\tbluetooth\x18\x07 \x01(\x0b\x32+.meshtastic.protobuf.Config.BluetoothConfig\x12\x0f\n\x07version\x18\x08 \x01(\r\x12<\n\x08security\x18\t \x01(\x0b\x32*.meshtastic.protobuf.Config.SecurityConfig\"\xf0\x07\n\x11LocalModuleConfig\x12:\n\x04mqtt\x18\x01 \x01(\x0b\x32,.meshtastic.protobuf.ModuleConfig.MQTTConfig\x12>\n\x06serial\x18\x02 \x01(\x0b\x32..meshtastic.protobuf.ModuleConfig.SerialConfig\x12[\n\x15\x65xternal_notification\x18\x03 \x01(\x0b\x32<.meshtastic.protobuf.ModuleConfig.ExternalNotificationConfig\x12K\n\rstore_forward\x18\x04 \x01(\x0b\x32\x34.meshtastic.protobuf.ModuleConfig.StoreForwardConfig\x12\x45\n\nrange_test\x18\x05 \x01(\x0b\x32\x31.meshtastic.protobuf.ModuleConfig.RangeTestConfig\x12\x44\n\ttelemetry\x18\x06 \x01(\x0b\x32\x31.meshtastic.protobuf.ModuleConfig.TelemetryConfig\x12M\n\x0e\x63\x61nned_message\x18\x07 \x01(\x0b\x32\x35.meshtastic.protobuf.ModuleConfig.CannedMessageConfig\x12<\n\x05\x61udio\x18\t \x01(\x0b\x32-.meshtastic.protobuf.ModuleConfig.AudioConfig\x12O\n\x0fremote_hardware\x18\n \x01(\x0b\x32\x36.meshtastic.protobuf.ModuleConfig.RemoteHardwareConfig\x12K\n\rneighbor_info\x18\x0b \x01(\x0b\x32\x34.meshtastic.protobuf.ModuleConfig.NeighborInfoConfig\x12Q\n\x10\x61mbient_lighting\x18\x0c \x01(\x0b\x32\x37.meshtastic.protobuf.ModuleConfig.AmbientLightingConfig\x12Q\n\x10\x64\x65tection_sensor\x18\r \x01(\x0b\x32\x37.meshtastic.protobuf.ModuleConfig.DetectionSensorConfig\x12\x46\n\npaxcounter\x18\x0e \x01(\x0b\x32\x32.meshtastic.protobuf.ModuleConfig.PaxcounterConfig\x12\x0f\n\x07version\x18\x08 \x01(\rBd\n\x13\x63om.geeksville.meshB\x0fLocalOnlyProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.localonly_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\017LocalOnlyProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\017LocalOnlyProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
   _globals['_LOCALCONFIG']._serialized_start=136
   _globals['_LOCALCONFIG']._serialized_end=642
   _globals['_LOCALMODULECONFIG']._serialized_start=645

meshtastic/protobuf/mesh_pb2.pyi

@@ -453,9 +453,9 @@ class _HardwareModelEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._
     """
     Seeed Tracker L1 EINK driver
     """
-    MUZI_R1_NEO: _HardwareModel.ValueType  # 101
+    QWANTZ_TINY_ARMS: _HardwareModel.ValueType  # 101
     """
-    Muzi Works R1 Neo
+    Reserved ID for future and past use
     """
     T_DECK_PRO: _HardwareModel.ValueType  # 102
     """
@@ -465,10 +465,9 @@ class _HardwareModelEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._
     """
     Lilygo TLora Pager
     """
-    M5STACK_RESERVED: _HardwareModel.ValueType  # 104
+    GAT562_MESH_TRIAL_TRACKER: _HardwareModel.ValueType  # 104
     """
-    M5Stack Reserved
-    0x68
+    GAT562 Mesh Trial Tracker
     """
     WISMESH_TAG: _HardwareModel.ValueType  # 105
     """
@@ -495,34 +494,6 @@ class _HardwareModelEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._
     """
     New Heltec LoRA32 with ESP32-S3 CPU
     """
-    M5STACK_C6L: _HardwareModel.ValueType  # 111
-    """
-    M5Stack C6L
-    """
-    M5STACK_CARDPUTER_ADV: _HardwareModel.ValueType  # 112
-    """
-    M5Stack Cardputer Adv
-    """
-    HELTEC_WIRELESS_TRACKER_V2: _HardwareModel.ValueType  # 113
-    """
-    ESP32S3 main controller with GPS and TFT screen.
-    """
-    T_WATCH_ULTRA: _HardwareModel.ValueType  # 114
-    """
-    LilyGo T-Watch Ultra
-    """
-    THINKNODE_M3: _HardwareModel.ValueType  # 115
-    """
-    Elecrow ThinkNode M3
-    """
-    WISMESH_TAP_V2: _HardwareModel.ValueType  # 116
-    """
-    RAK WISMESH_TAP_V2 with ESP32-S3 CPU
-    """
-    RAK3401: _HardwareModel.ValueType  # 117
-    """
-    RAK3401
-    """
     PRIVATE_HW: _HardwareModel.ValueType  # 255
     """
     ------------------------------------------------------------------------------------------------------------------------------------------
@@ -959,9 +930,9 @@ SEEED_WIO_TRACKER_L1_EINK: HardwareModel.ValueType  # 100
 """
 Seeed Tracker L1 EINK driver
 """
-MUZI_R1_NEO: HardwareModel.ValueType  # 101
+QWANTZ_TINY_ARMS: HardwareModel.ValueType  # 101
 """
-Muzi Works R1 Neo
+Reserved ID for future and past use
 """
 T_DECK_PRO: HardwareModel.ValueType  # 102
 """
@@ -971,10 +942,9 @@ T_LORA_PAGER: HardwareModel.ValueType  # 103
 """
 Lilygo TLora Pager
 """
-M5STACK_RESERVED: HardwareModel.ValueType  # 104
+GAT562_MESH_TRIAL_TRACKER: HardwareModel.ValueType  # 104
 """
-M5Stack Reserved
-0x68
+GAT562 Mesh Trial Tracker
 """
 WISMESH_TAG: HardwareModel.ValueType  # 105
 """
@@ -1001,34 +971,6 @@ HELTEC_V4: HardwareModel.ValueType  # 110
 """
 New Heltec LoRA32 with ESP32-S3 CPU
 """
-M5STACK_C6L: HardwareModel.ValueType  # 111
-"""
-M5Stack C6L
-"""
-M5STACK_CARDPUTER_ADV: HardwareModel.ValueType  # 112
-"""
-M5Stack Cardputer Adv
-"""
-HELTEC_WIRELESS_TRACKER_V2: HardwareModel.ValueType  # 113
-"""
-ESP32S3 main controller with GPS and TFT screen.
-"""
-T_WATCH_ULTRA: HardwareModel.ValueType  # 114
-"""
-LilyGo T-Watch Ultra
-"""
-THINKNODE_M3: HardwareModel.ValueType  # 115
-"""
-Elecrow ThinkNode M3
-"""
-WISMESH_TAP_V2: HardwareModel.ValueType  # 116
-"""
-RAK WISMESH_TAP_V2 with ESP32-S3 CPU
-"""
-RAK3401: HardwareModel.ValueType  # 117
-"""
-RAK3401
-"""
 PRIVATE_HW: HardwareModel.ValueType  # 255
 """
 ------------------------------------------------------------------------------------------------------------------------------------------

meshtastic/protobuf/module_config_pb2.pyi

@@ -874,7 +874,6 @@ class ModuleConfig(google.protobuf.message.Message):
         HEALTH_MEASUREMENT_ENABLED_FIELD_NUMBER: builtins.int
         HEALTH_UPDATE_INTERVAL_FIELD_NUMBER: builtins.int
         HEALTH_SCREEN_ENABLED_FIELD_NUMBER: builtins.int
-        DEVICE_TELEMETRY_ENABLED_FIELD_NUMBER: builtins.int
         device_update_interval: builtins.int
         """
         Interval in seconds of how often we should try to send our
@@ -935,11 +934,6 @@ class ModuleConfig(google.protobuf.message.Message):
         """
         Enable/Disable the health telemetry module on-device display
         """
-        device_telemetry_enabled: builtins.bool
-        """
-        Enable/Disable the device telemetry module to send metrics to the mesh
-        Note: We will still send telemtry to the connected phone / client every minute over the API
-        """
         def __init__(
             self,
             *,
@@ -956,9 +950,8 @@ class ModuleConfig(google.protobuf.message.Message):
             health_measurement_enabled: builtins.bool = ...,
             health_update_interval: builtins.int = ...,
             health_screen_enabled: builtins.bool = ...,
-            device_telemetry_enabled: builtins.bool = ...,
         ) -> None: ...
-        def ClearField(self, field_name: typing.Literal["air_quality_enabled", b"air_quality_enabled", "air_quality_interval", b"air_quality_interval", "device_telemetry_enabled", b"device_telemetry_enabled", "device_update_interval", b"device_update_interval", "environment_display_fahrenheit", b"environment_display_fahrenheit", "environment_measurement_enabled", b"environment_measurement_enabled", "environment_screen_enabled", b"environment_screen_enabled", "environment_update_interval", b"environment_update_interval", "health_measurement_enabled", b"health_measurement_enabled", "health_screen_enabled", b"health_screen_enabled", "health_update_interval", b"health_update_interval", "power_measurement_enabled", b"power_measurement_enabled", "power_screen_enabled", b"power_screen_enabled", "power_update_interval", b"power_update_interval"]) -> None: ...
+        def ClearField(self, field_name: typing.Literal["air_quality_enabled", b"air_quality_enabled", "air_quality_interval", b"air_quality_interval", "device_update_interval", b"device_update_interval", "environment_display_fahrenheit", b"environment_display_fahrenheit", "environment_measurement_enabled", b"environment_measurement_enabled", "environment_screen_enabled", b"environment_screen_enabled", "environment_update_interval", b"environment_update_interval", "health_measurement_enabled", b"health_measurement_enabled", "health_screen_enabled", b"health_screen_enabled", "health_update_interval", b"health_update_interval", "power_measurement_enabled", b"power_measurement_enabled", "power_screen_enabled", b"power_screen_enabled", "power_update_interval", b"power_update_interval"]) -> None: ...
 
     @typing.final
     class CannedMessageConfig(google.protobuf.message.Message):

meshtastic/protobuf/mqtt_pb2.py

@@ -15,14 +15,14 @@ from meshtastic.protobuf import config_pb2 as meshtastic_dot_protobuf_dot_config
 from meshtastic.protobuf import mesh_pb2 as meshtastic_dot_protobuf_dot_mesh__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1emeshtastic/protobuf/mqtt.proto\x12\x13meshtastic.protobuf\x1a meshtastic/protobuf/config.proto\x1a\x1emeshtastic/protobuf/mesh.proto\"j\n\x0fServiceEnvelope\x12/\n\x06packet\x18\x01 \x01(\x0b\x32\x1f.meshtastic.protobuf.MeshPacket\x12\x12\n\nchannel_id\x18\x02 \x01(\t\x12\x12\n\ngateway_id\x18\x03 \x01(\t\"\x83\x04\n\tMapReport\x12\x11\n\tlong_name\x18\x01 \x01(\t\x12\x12\n\nshort_name\x18\x02 \x01(\t\x12;\n\x04role\x18\x03 \x01(\x0e\x32-.meshtastic.protobuf.Config.DeviceConfig.Role\x12\x34\n\x08hw_model\x18\x04 \x01(\x0e\x32\".meshtastic.protobuf.HardwareModel\x12\x18\n\x10\x66irmware_version\x18\x05 \x01(\t\x12\x41\n\x06region\x18\x06 \x01(\x0e\x32\x31.meshtastic.protobuf.Config.LoRaConfig.RegionCode\x12H\n\x0cmodem_preset\x18\x07 \x01(\x0e\x32\x32.meshtastic.protobuf.Config.LoRaConfig.ModemPreset\x12\x1b\n\x13has_default_channel\x18\x08 \x01(\x08\x12\x12\n\nlatitude_i\x18\t \x01(\x0f\x12\x13\n\x0blongitude_i\x18\n \x01(\x0f\x12\x10\n\x08\x61ltitude\x18\x0b \x01(\x05\x12\x1a\n\x12position_precision\x18\x0c \x01(\r\x12\x1e\n\x16num_online_local_nodes\x18\r \x01(\r\x12!\n\x19has_opted_report_location\x18\x0e \x01(\x08\x42`\n\x14org.meshtastic.protoB\nMQTTProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1emeshtastic/protobuf/mqtt.proto\x12\x13meshtastic.protobuf\x1a meshtastic/protobuf/config.proto\x1a\x1emeshtastic/protobuf/mesh.proto\"j\n\x0fServiceEnvelope\x12/\n\x06packet\x18\x01 \x01(\x0b\x32\x1f.meshtastic.protobuf.MeshPacket\x12\x12\n\nchannel_id\x18\x02 \x01(\t\x12\x12\n\ngateway_id\x18\x03 \x01(\t\"\x83\x04\n\tMapReport\x12\x11\n\tlong_name\x18\x01 \x01(\t\x12\x12\n\nshort_name\x18\x02 \x01(\t\x12;\n\x04role\x18\x03 \x01(\x0e\x32-.meshtastic.protobuf.Config.DeviceConfig.Role\x12\x34\n\x08hw_model\x18\x04 \x01(\x0e\x32\".meshtastic.protobuf.HardwareModel\x12\x18\n\x10\x66irmware_version\x18\x05 \x01(\t\x12\x41\n\x06region\x18\x06 \x01(\x0e\x32\x31.meshtastic.protobuf.Config.LoRaConfig.RegionCode\x12H\n\x0cmodem_preset\x18\x07 \x01(\x0e\x32\x32.meshtastic.protobuf.Config.LoRaConfig.ModemPreset\x12\x1b\n\x13has_default_channel\x18\x08 \x01(\x08\x12\x12\n\nlatitude_i\x18\t \x01(\x0f\x12\x13\n\x0blongitude_i\x18\n \x01(\x0f\x12\x10\n\x08\x61ltitude\x18\x0b \x01(\x05\x12\x1a\n\x12position_precision\x18\x0c \x01(\r\x12\x1e\n\x16num_online_local_nodes\x18\r \x01(\r\x12!\n\x19has_opted_report_location\x18\x0e \x01(\x08\x42_\n\x13\x63om.geeksville.meshB\nMQTTProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.mqtt_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\nMQTTProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\nMQTTProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
   _globals['_SERVICEENVELOPE']._serialized_start=121
   _globals['_SERVICEENVELOPE']._serialized_end=227
   _globals['_MAPREPORT']._serialized_start=230

meshtastic/protobuf/paxcount_pb2.py

@@ -13,14 +13,14 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\"meshtastic/protobuf/paxcount.proto\x12\x13meshtastic.protobuf\"5\n\x08Paxcount\x12\x0c\n\x04wifi\x18\x01 \x01(\r\x12\x0b\n\x03\x62le\x18\x02 \x01(\r\x12\x0e\n\x06uptime\x18\x03 \x01(\rBd\n\x14org.meshtastic.protoB\x0ePaxcountProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\"meshtastic/protobuf/paxcount.proto\x12\x13meshtastic.protobuf\"5\n\x08Paxcount\x12\x0c\n\x04wifi\x18\x01 \x01(\r\x12\x0b\n\x03\x62le\x18\x02 \x01(\r\x12\x0e\n\x06uptime\x18\x03 \x01(\rBc\n\x13\x63om.geeksville.meshB\x0ePaxcountProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.paxcount_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\016PaxcountProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\016PaxcountProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
   _globals['_PAXCOUNT']._serialized_start=59
   _globals['_PAXCOUNT']._serialized_end=112
 # @@protoc_insertion_point(module_scope)

meshtastic/protobuf/portnums_pb2.py

@@ -13,14 +13,14 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\"meshtastic/protobuf/portnums.proto\x12\x13meshtastic.protobuf*\xf6\x04\n\x07PortNum\x12\x0f\n\x0bUNKNOWN_APP\x10\x00\x12\x14\n\x10TEXT_MESSAGE_APP\x10\x01\x12\x17\n\x13REMOTE_HARDWARE_APP\x10\x02\x12\x10\n\x0cPOSITION_APP\x10\x03\x12\x10\n\x0cNODEINFO_APP\x10\x04\x12\x0f\n\x0bROUTING_APP\x10\x05\x12\r\n\tADMIN_APP\x10\x06\x12\x1f\n\x1bTEXT_MESSAGE_COMPRESSED_APP\x10\x07\x12\x10\n\x0cWAYPOINT_APP\x10\x08\x12\r\n\tAUDIO_APP\x10\t\x12\x18\n\x14\x44\x45TECTION_SENSOR_APP\x10\n\x12\r\n\tALERT_APP\x10\x0b\x12\x18\n\x14KEY_VERIFICATION_APP\x10\x0c\x12\r\n\tREPLY_APP\x10 \x12\x11\n\rIP_TUNNEL_APP\x10!\x12\x12\n\x0ePAXCOUNTER_APP\x10\"\x12\x0e\n\nSERIAL_APP\x10@\x12\x15\n\x11STORE_FORWARD_APP\x10\x41\x12\x12\n\x0eRANGE_TEST_APP\x10\x42\x12\x11\n\rTELEMETRY_APP\x10\x43\x12\x0b\n\x07ZPS_APP\x10\x44\x12\x11\n\rSIMULATOR_APP\x10\x45\x12\x12\n\x0eTRACEROUTE_APP\x10\x46\x12\x14\n\x10NEIGHBORINFO_APP\x10G\x12\x0f\n\x0b\x41TAK_PLUGIN\x10H\x12\x12\n\x0eMAP_REPORT_APP\x10I\x12\x13\n\x0fPOWERSTRESS_APP\x10J\x12\x18\n\x14RETICULUM_TUNNEL_APP\x10L\x12\x0f\n\x0b\x43\x41YENNE_APP\x10M\x12\x10\n\x0bPRIVATE_APP\x10\x80\x02\x12\x13\n\x0e\x41TAK_FORWARDER\x10\x81\x02\x12\x08\n\x03MAX\x10\xff\x03\x42^\n\x14org.meshtastic.protoB\x08PortnumsZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\"meshtastic/protobuf/portnums.proto\x12\x13meshtastic.protobuf*\xf6\x04\n\x07PortNum\x12\x0f\n\x0bUNKNOWN_APP\x10\x00\x12\x14\n\x10TEXT_MESSAGE_APP\x10\x01\x12\x17\n\x13REMOTE_HARDWARE_APP\x10\x02\x12\x10\n\x0cPOSITION_APP\x10\x03\x12\x10\n\x0cNODEINFO_APP\x10\x04\x12\x0f\n\x0bROUTING_APP\x10\x05\x12\r\n\tADMIN_APP\x10\x06\x12\x1f\n\x1bTEXT_MESSAGE_COMPRESSED_APP\x10\x07\x12\x10\n\x0cWAYPOINT_APP\x10\x08\x12\r\n\tAUDIO_APP\x10\t\x12\x18\n\x14\x44\x45TECTION_SENSOR_APP\x10\n\x12\r\n\tALERT_APP\x10\x0b\x12\x18\n\x14KEY_VERIFICATION_APP\x10\x0c\x12\r\n\tREPLY_APP\x10 \x12\x11\n\rIP_TUNNEL_APP\x10!\x12\x12\n\x0ePAXCOUNTER_APP\x10\"\x12\x0e\n\nSERIAL_APP\x10@\x12\x15\n\x11STORE_FORWARD_APP\x10\x41\x12\x12\n\x0eRANGE_TEST_APP\x10\x42\x12\x11\n\rTELEMETRY_APP\x10\x43\x12\x0b\n\x07ZPS_APP\x10\x44\x12\x11\n\rSIMULATOR_APP\x10\x45\x12\x12\n\x0eTRACEROUTE_APP\x10\x46\x12\x14\n\x10NEIGHBORINFO_APP\x10G\x12\x0f\n\x0b\x41TAK_PLUGIN\x10H\x12\x12\n\x0eMAP_REPORT_APP\x10I\x12\x13\n\x0fPOWERSTRESS_APP\x10J\x12\x18\n\x14RETICULUM_TUNNEL_APP\x10L\x12\x0f\n\x0b\x43\x41YENNE_APP\x10M\x12\x10\n\x0bPRIVATE_APP\x10\x80\x02\x12\x13\n\x0e\x41TAK_FORWARDER\x10\x81\x02\x12\x08\n\x03MAX\x10\xff\x03\x42]\n\x13\x63om.geeksville.meshB\x08PortnumsZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.portnums_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\010PortnumsZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\010PortnumsZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
   _globals['_PORTNUM']._serialized_start=60
   _globals['_PORTNUM']._serialized_end=690
 # @@protoc_insertion_point(module_scope)

meshtastic/protobuf/powermon_pb2.py

@@ -13,14 +13,14 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\"meshtastic/protobuf/powermon.proto\x12\x13meshtastic.protobuf\"\xe0\x01\n\x08PowerMon\"\xd3\x01\n\x05State\x12\x08\n\x04None\x10\x00\x12\x11\n\rCPU_DeepSleep\x10\x01\x12\x12\n\x0e\x43PU_LightSleep\x10\x02\x12\x0c\n\x08Vext1_On\x10\x04\x12\r\n\tLora_RXOn\x10\x08\x12\r\n\tLora_TXOn\x10\x10\x12\x11\n\rLora_RXActive\x10 \x12\t\n\x05\x42T_On\x10@\x12\x0b\n\x06LED_On\x10\x80\x01\x12\x0e\n\tScreen_On\x10\x80\x02\x12\x13\n\x0eScreen_Drawing\x10\x80\x04\x12\x0c\n\x07Wifi_On\x10\x80\x08\x12\x0f\n\nGPS_Active\x10\x80\x10\"\x88\x03\n\x12PowerStressMessage\x12;\n\x03\x63md\x18\x01 \x01(\x0e\x32..meshtastic.protobuf.PowerStressMessage.Opcode\x12\x13\n\x0bnum_seconds\x18\x02 \x01(\x02\"\x9f\x02\n\x06Opcode\x12\t\n\x05UNSET\x10\x00\x12\x0e\n\nPRINT_INFO\x10\x01\x12\x0f\n\x0b\x46ORCE_QUIET\x10\x02\x12\r\n\tEND_QUIET\x10\x03\x12\r\n\tSCREEN_ON\x10\x10\x12\x0e\n\nSCREEN_OFF\x10\x11\x12\x0c\n\x08\x43PU_IDLE\x10 \x12\x11\n\rCPU_DEEPSLEEP\x10!\x12\x0e\n\nCPU_FULLON\x10\"\x12\n\n\x06LED_ON\x10\x30\x12\x0b\n\x07LED_OFF\x10\x31\x12\x0c\n\x08LORA_OFF\x10@\x12\x0b\n\x07LORA_TX\x10\x41\x12\x0b\n\x07LORA_RX\x10\x42\x12\n\n\x06\x42T_OFF\x10P\x12\t\n\x05\x42T_ON\x10Q\x12\x0c\n\x08WIFI_OFF\x10`\x12\x0b\n\x07WIFI_ON\x10\x61\x12\x0b\n\x07GPS_OFF\x10p\x12\n\n\x06GPS_ON\x10qBd\n\x14org.meshtastic.protoB\x0ePowerMonProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\"meshtastic/protobuf/powermon.proto\x12\x13meshtastic.protobuf\"\xe0\x01\n\x08PowerMon\"\xd3\x01\n\x05State\x12\x08\n\x04None\x10\x00\x12\x11\n\rCPU_DeepSleep\x10\x01\x12\x12\n\x0e\x43PU_LightSleep\x10\x02\x12\x0c\n\x08Vext1_On\x10\x04\x12\r\n\tLora_RXOn\x10\x08\x12\r\n\tLora_TXOn\x10\x10\x12\x11\n\rLora_RXActive\x10 \x12\t\n\x05\x42T_On\x10@\x12\x0b\n\x06LED_On\x10\x80\x01\x12\x0e\n\tScreen_On\x10\x80\x02\x12\x13\n\x0eScreen_Drawing\x10\x80\x04\x12\x0c\n\x07Wifi_On\x10\x80\x08\x12\x0f\n\nGPS_Active\x10\x80\x10\"\x88\x03\n\x12PowerStressMessage\x12;\n\x03\x63md\x18\x01 \x01(\x0e\x32..meshtastic.protobuf.PowerStressMessage.Opcode\x12\x13\n\x0bnum_seconds\x18\x02 \x01(\x02\"\x9f\x02\n\x06Opcode\x12\t\n\x05UNSET\x10\x00\x12\x0e\n\nPRINT_INFO\x10\x01\x12\x0f\n\x0b\x46ORCE_QUIET\x10\x02\x12\r\n\tEND_QUIET\x10\x03\x12\r\n\tSCREEN_ON\x10\x10\x12\x0e\n\nSCREEN_OFF\x10\x11\x12\x0c\n\x08\x43PU_IDLE\x10 \x12\x11\n\rCPU_DEEPSLEEP\x10!\x12\x0e\n\nCPU_FULLON\x10\"\x12\n\n\x06LED_ON\x10\x30\x12\x0b\n\x07LED_OFF\x10\x31\x12\x0c\n\x08LORA_OFF\x10@\x12\x0b\n\x07LORA_TX\x10\x41\x12\x0b\n\x07LORA_RX\x10\x42\x12\n\n\x06\x42T_OFF\x10P\x12\t\n\x05\x42T_ON\x10Q\x12\x0c\n\x08WIFI_OFF\x10`\x12\x0b\n\x07WIFI_ON\x10\x61\x12\x0b\n\x07GPS_OFF\x10p\x12\n\n\x06GPS_ON\x10qBc\n\x13\x63om.geeksville.meshB\x0ePowerMonProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.powermon_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\016PowerMonProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\016PowerMonProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
   _globals['_POWERMON']._serialized_start=60
   _globals['_POWERMON']._serialized_end=284
   _globals['_POWERMON_STATE']._serialized_start=73

meshtastic/protobuf/remote_hardware_pb2.py

@@ -13,14 +13,14 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n)meshtastic/protobuf/remote_hardware.proto\x12\x13meshtastic.protobuf\"\xdf\x01\n\x0fHardwareMessage\x12\x37\n\x04type\x18\x01 \x01(\x0e\x32).meshtastic.protobuf.HardwareMessage.Type\x12\x11\n\tgpio_mask\x18\x02 \x01(\x04\x12\x12\n\ngpio_value\x18\x03 \x01(\x04\"l\n\x04Type\x12\t\n\x05UNSET\x10\x00\x12\x0f\n\x0bWRITE_GPIOS\x10\x01\x12\x0f\n\x0bWATCH_GPIOS\x10\x02\x12\x11\n\rGPIOS_CHANGED\x10\x03\x12\x0e\n\nREAD_GPIOS\x10\x04\x12\x14\n\x10READ_GPIOS_REPLY\x10\x05\x42\x64\n\x14org.meshtastic.protoB\x0eRemoteHardwareZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n)meshtastic/protobuf/remote_hardware.proto\x12\x13meshtastic.protobuf\"\xdf\x01\n\x0fHardwareMessage\x12\x37\n\x04type\x18\x01 \x01(\x0e\x32).meshtastic.protobuf.HardwareMessage.Type\x12\x11\n\tgpio_mask\x18\x02 \x01(\x04\x12\x12\n\ngpio_value\x18\x03 \x01(\x04\"l\n\x04Type\x12\t\n\x05UNSET\x10\x00\x12\x0f\n\x0bWRITE_GPIOS\x10\x01\x12\x0f\n\x0bWATCH_GPIOS\x10\x02\x12\x11\n\rGPIOS_CHANGED\x10\x03\x12\x0e\n\nREAD_GPIOS\x10\x04\x12\x14\n\x10READ_GPIOS_REPLY\x10\x05\x42\x63\n\x13\x63om.geeksville.meshB\x0eRemoteHardwareZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.remote_hardware_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\016RemoteHardwareZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\016RemoteHardwareZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
   _globals['_HARDWAREMESSAGE']._serialized_start=67
   _globals['_HARDWAREMESSAGE']._serialized_end=290
   _globals['_HARDWAREMESSAGE_TYPE']._serialized_start=182

meshtastic/protobuf/rtttl_pb2.py

@@ -13,14 +13,14 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1fmeshtastic/protobuf/rtttl.proto\x12\x13meshtastic.protobuf\"\x1f\n\x0bRTTTLConfig\x12\x10\n\x08ringtone\x18\x01 \x01(\tBg\n\x14org.meshtastic.protoB\x11RTTTLConfigProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1fmeshtastic/protobuf/rtttl.proto\x12\x13meshtastic.protobuf\"\x1f\n\x0bRTTTLConfig\x12\x10\n\x08ringtone\x18\x01 \x01(\tBf\n\x13\x63om.geeksville.meshB\x11RTTTLConfigProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.rtttl_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\021RTTTLConfigProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\021RTTTLConfigProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
   _globals['_RTTTLCONFIG']._serialized_start=56
   _globals['_RTTTLCONFIG']._serialized_end=87
 # @@protoc_insertion_point(module_scope)

meshtastic/protobuf/storeforward_pb2.py

@@ -13,14 +13,14 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n&meshtastic/protobuf/storeforward.proto\x12\x13meshtastic.protobuf\"\xc0\x07\n\x0fStoreAndForward\x12@\n\x02rr\x18\x01 \x01(\x0e\x32\x34.meshtastic.protobuf.StoreAndForward.RequestResponse\x12@\n\x05stats\x18\x02 \x01(\x0b\x32/.meshtastic.protobuf.StoreAndForward.StatisticsH\x00\x12?\n\x07history\x18\x03 \x01(\x0b\x32,.meshtastic.protobuf.StoreAndForward.HistoryH\x00\x12\x43\n\theartbeat\x18\x04 \x01(\x0b\x32..meshtastic.protobuf.StoreAndForward.HeartbeatH\x00\x12\x0e\n\x04text\x18\x05 \x01(\x0cH\x00\x1a\xcd\x01\n\nStatistics\x12\x16\n\x0emessages_total\x18\x01 \x01(\r\x12\x16\n\x0emessages_saved\x18\x02 \x01(\r\x12\x14\n\x0cmessages_max\x18\x03 \x01(\r\x12\x0f\n\x07up_time\x18\x04 \x01(\r\x12\x10\n\x08requests\x18\x05 \x01(\r\x12\x18\n\x10requests_history\x18\x06 \x01(\r\x12\x11\n\theartbeat\x18\x07 \x01(\x08\x12\x12\n\nreturn_max\x18\x08 \x01(\r\x12\x15\n\rreturn_window\x18\t \x01(\r\x1aI\n\x07History\x12\x18\n\x10history_messages\x18\x01 \x01(\r\x12\x0e\n\x06window\x18\x02 \x01(\r\x12\x14\n\x0clast_request\x18\x03 \x01(\r\x1a.\n\tHeartbeat\x12\x0e\n\x06period\x18\x01 \x01(\r\x12\x11\n\tsecondary\x18\x02 \x01(\r\"\xbc\x02\n\x0fRequestResponse\x12\t\n\x05UNSET\x10\x00\x12\x10\n\x0cROUTER_ERROR\x10\x01\x12\x14\n\x10ROUTER_HEARTBEAT\x10\x02\x12\x0f\n\x0bROUTER_PING\x10\x03\x12\x0f\n\x0bROUTER_PONG\x10\x04\x12\x0f\n\x0bROUTER_BUSY\x10\x05\x12\x12\n\x0eROUTER_HISTORY\x10\x06\x12\x10\n\x0cROUTER_STATS\x10\x07\x12\x16\n\x12ROUTER_TEXT_DIRECT\x10\x08\x12\x19\n\x15ROUTER_TEXT_BROADCAST\x10\t\x12\x10\n\x0c\x43LIENT_ERROR\x10@\x12\x12\n\x0e\x43LIENT_HISTORY\x10\x41\x12\x10\n\x0c\x43LIENT_STATS\x10\x42\x12\x0f\n\x0b\x43LIENT_PING\x10\x43\x12\x0f\n\x0b\x43LIENT_PONG\x10\x44\x12\x10\n\x0c\x43LIENT_ABORT\x10jB\t\n\x07variantBk\n\x14org.meshtastic.protoB\x15StoreAndForwardProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n&meshtastic/protobuf/storeforward.proto\x12\x13meshtastic.protobuf\"\xc0\x07\n\x0fStoreAndForward\x12@\n\x02rr\x18\x01 \x01(\x0e\x32\x34.meshtastic.protobuf.StoreAndForward.RequestResponse\x12@\n\x05stats\x18\x02 \x01(\x0b\x32/.meshtastic.protobuf.StoreAndForward.StatisticsH\x00\x12?\n\x07history\x18\x03 \x01(\x0b\x32,.meshtastic.protobuf.StoreAndForward.HistoryH\x00\x12\x43\n\theartbeat\x18\x04 \x01(\x0b\x32..meshtastic.protobuf.StoreAndForward.HeartbeatH\x00\x12\x0e\n\x04text\x18\x05 \x01(\x0cH\x00\x1a\xcd\x01\n\nStatistics\x12\x16\n\x0emessages_total\x18\x01 \x01(\r\x12\x16\n\x0emessages_saved\x18\x02 \x01(\r\x12\x14\n\x0cmessages_max\x18\x03 \x01(\r\x12\x0f\n\x07up_time\x18\x04 \x01(\r\x12\x10\n\x08requests\x18\x05 \x01(\r\x12\x18\n\x10requests_history\x18\x06 \x01(\r\x12\x11\n\theartbeat\x18\x07 \x01(\x08\x12\x12\n\nreturn_max\x18\x08 \x01(\r\x12\x15\n\rreturn_window\x18\t \x01(\r\x1aI\n\x07History\x12\x18\n\x10history_messages\x18\x01 \x01(\r\x12\x0e\n\x06window\x18\x02 \x01(\r\x12\x14\n\x0clast_request\x18\x03 \x01(\r\x1a.\n\tHeartbeat\x12\x0e\n\x06period\x18\x01 \x01(\r\x12\x11\n\tsecondary\x18\x02 \x01(\r\"\xbc\x02\n\x0fRequestResponse\x12\t\n\x05UNSET\x10\x00\x12\x10\n\x0cROUTER_ERROR\x10\x01\x12\x14\n\x10ROUTER_HEARTBEAT\x10\x02\x12\x0f\n\x0bROUTER_PING\x10\x03\x12\x0f\n\x0bROUTER_PONG\x10\x04\x12\x0f\n\x0bROUTER_BUSY\x10\x05\x12\x12\n\x0eROUTER_HISTORY\x10\x06\x12\x10\n\x0cROUTER_STATS\x10\x07\x12\x16\n\x12ROUTER_TEXT_DIRECT\x10\x08\x12\x19\n\x15ROUTER_TEXT_BROADCAST\x10\t\x12\x10\n\x0c\x43LIENT_ERROR\x10@\x12\x12\n\x0e\x43LIENT_HISTORY\x10\x41\x12\x10\n\x0c\x43LIENT_STATS\x10\x42\x12\x0f\n\x0b\x43LIENT_PING\x10\x43\x12\x0f\n\x0b\x43LIENT_PONG\x10\x44\x12\x10\n\x0c\x43LIENT_ABORT\x10jB\t\n\x07variantBj\n\x13\x63om.geeksville.meshB\x15StoreAndForwardProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.storeforward_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\025StoreAndForwardProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\025StoreAndForwardProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
   _globals['_STOREANDFORWARD']._serialized_start=64
   _globals['_STOREANDFORWARD']._serialized_end=1024
   _globals['_STOREANDFORWARD_STATISTICS']._serialized_start=366

meshtastic/protobuf/telemetry_pb2.pyi

@@ -203,10 +203,6 @@ class _TelemetrySensorTypeEnumTypeWrapper(google.protobuf.internal.enum_type_wra
     """
     TSL2561 light sensor
     """
-    BH1750: _TelemetrySensorType.ValueType  # 45
-    """
-    BH1750 light sensor
-    """
 
 class TelemetrySensorType(_TelemetrySensorType, metaclass=_TelemetrySensorTypeEnumTypeWrapper):
     """
@@ -393,10 +389,6 @@ TSL2561: TelemetrySensorType.ValueType  # 44
 """
 TSL2561 light sensor
 """
-BH1750: TelemetrySensorType.ValueType  # 45
-"""
-BH1750 light sensor
-"""
 global___TelemetrySensorType = TelemetrySensorType
 
 @typing.final
@@ -1034,7 +1026,6 @@ class LocalStats(google.protobuf.message.Message):
     NUM_TX_RELAY_CANCELED_FIELD_NUMBER: builtins.int
     HEAP_TOTAL_BYTES_FIELD_NUMBER: builtins.int
     HEAP_FREE_BYTES_FIELD_NUMBER: builtins.int
-    NUM_TX_DROPPED_FIELD_NUMBER: builtins.int
     uptime_seconds: builtins.int
     """
     How long the device has been running since the last reboot (in seconds)
@@ -1089,10 +1080,6 @@ class LocalStats(google.protobuf.message.Message):
     """
     Number of bytes free in the heap
     """
-    num_tx_dropped: builtins.int
-    """
-    Number of packets that were dropped because the transmit queue was full.
-    """
     def __init__(
         self,
         *,
@@ -1109,9 +1096,8 @@ class LocalStats(google.protobuf.message.Message):
         num_tx_relay_canceled: builtins.int = ...,
         heap_total_bytes: builtins.int = ...,
         heap_free_bytes: builtins.int = ...,
-        num_tx_dropped: builtins.int = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["air_util_tx", b"air_util_tx", "channel_utilization", b"channel_utilization", "heap_free_bytes", b"heap_free_bytes", "heap_total_bytes", b"heap_total_bytes", "num_online_nodes", b"num_online_nodes", "num_packets_rx", b"num_packets_rx", "num_packets_rx_bad", b"num_packets_rx_bad", "num_packets_tx", b"num_packets_tx", "num_rx_dupe", b"num_rx_dupe", "num_total_nodes", b"num_total_nodes", "num_tx_dropped", b"num_tx_dropped", "num_tx_relay", b"num_tx_relay", "num_tx_relay_canceled", b"num_tx_relay_canceled", "uptime_seconds", b"uptime_seconds"]) -> None: ...
+    def ClearField(self, field_name: typing.Literal["air_util_tx", b"air_util_tx", "channel_utilization", b"channel_utilization", "heap_free_bytes", b"heap_free_bytes", "heap_total_bytes", b"heap_total_bytes", "num_online_nodes", b"num_online_nodes", "num_packets_rx", b"num_packets_rx", "num_packets_rx_bad", b"num_packets_rx_bad", "num_packets_tx", b"num_packets_tx", "num_rx_dupe", b"num_rx_dupe", "num_total_nodes", b"num_total_nodes", "num_tx_relay", b"num_tx_relay", "num_tx_relay_canceled", b"num_tx_relay_canceled", "uptime_seconds", b"uptime_seconds"]) -> None: ...
 
 global___LocalStats = LocalStats
 

meshtastic/protobuf/xmodem_pb2.py

@@ -13,14 +13,14 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n meshtastic/protobuf/xmodem.proto\x12\x13meshtastic.protobuf\"\xbf\x01\n\x06XModem\x12\x34\n\x07\x63ontrol\x18\x01 \x01(\x0e\x32#.meshtastic.protobuf.XModem.Control\x12\x0b\n\x03seq\x18\x02 \x01(\r\x12\r\n\x05\x63rc16\x18\x03 \x01(\r\x12\x0e\n\x06\x62uffer\x18\x04 \x01(\x0c\"S\n\x07\x43ontrol\x12\x07\n\x03NUL\x10\x00\x12\x07\n\x03SOH\x10\x01\x12\x07\n\x03STX\x10\x02\x12\x07\n\x03\x45OT\x10\x04\x12\x07\n\x03\x41\x43K\x10\x06\x12\x07\n\x03NAK\x10\x15\x12\x07\n\x03\x43\x41N\x10\x18\x12\t\n\x05\x43TRLZ\x10\x1a\x42\x62\n\x14org.meshtastic.protoB\x0cXmodemProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n meshtastic/protobuf/xmodem.proto\x12\x13meshtastic.protobuf\"\xbf\x01\n\x06XModem\x12\x34\n\x07\x63ontrol\x18\x01 \x01(\x0e\x32#.meshtastic.protobuf.XModem.Control\x12\x0b\n\x03seq\x18\x02 \x01(\r\x12\r\n\x05\x63rc16\x18\x03 \x01(\r\x12\x0e\n\x06\x62uffer\x18\x04 \x01(\x0c\"S\n\x07\x43ontrol\x12\x07\n\x03NUL\x10\x00\x12\x07\n\x03SOH\x10\x01\x12\x07\n\x03STX\x10\x02\x12\x07\n\x03\x45OT\x10\x04\x12\x07\n\x03\x41\x43K\x10\x06\x12\x07\n\x03NAK\x10\x15\x12\x07\n\x03\x43\x41N\x10\x18\x12\t\n\x05\x43TRLZ\x10\x1a\x42\x61\n\x13\x63om.geeksville.meshB\x0cXmodemProtosZ\"github.com/meshtastic/go/generated\xaa\x02\x14Meshtastic.Protobufs\xba\x02\x00\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'meshtastic.protobuf.xmodem_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
   DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\024org.meshtastic.protoB\014XmodemProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
+  DESCRIPTOR._serialized_options = b'\n\023com.geeksville.meshB\014XmodemProtosZ\"github.com/meshtastic/go/generated\252\002\024Meshtastic.Protobufs\272\002\000'
   _globals['_XMODEM']._serialized_start=58
   _globals['_XMODEM']._serialized_end=249
   _globals['_XMODEM_CONTROL']._serialized_start=166

meshview/__version__.py

@@ -3,8 +3,8 @@
 import subprocess
 from pathlib import Path
 
-__version__ = "3.0.5"
-__release_date__ = "2026-2-6"
+__version__ = "3.0.0"
+__release_date__ = "2025-11-05"
 
 
 def get_git_revision():

meshview/config.py

@@ -6,7 +6,7 @@ parser = argparse.ArgumentParser(description="MeshView Configuration Loader")
 parser.add_argument(
     "--config", type=str, default="config.ini", help="Path to config.ini file (default: config.ini)"
 )
-args, _ = parser.parse_known_args()
+args = parser.parse_args()
 
 # Initialize config parser
 config_parser = configparser.ConfigParser()

meshview/database.py

@@ -1,4 +1,3 @@
-from sqlalchemy.engine.url import make_url
 from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
 
 from meshview import models
@@ -10,19 +9,10 @@ async_session = None
 def init_database(database_connection_string):
     global engine, async_session
     kwargs = {"echo": False}
-    url = make_url(database_connection_string)
-    connect_args = {}
-
-    if url.drivername.startswith("sqlite"):
-        query = dict(url.query)
-        query.setdefault("mode", "ro")
-        url = url.set(query=query)
-        connect_args["uri"] = True
-
-    if connect_args:
-        kwargs["connect_args"] = connect_args
-
-    engine = create_async_engine(url, **kwargs)
+    # Ensure SQLite is opened in read-only mode
+    database_connection_string += "?mode=ro"
+    kwargs["connect_args"] = {"uri": True}
+    engine = create_async_engine(database_connection_string, **kwargs)
     async_session = async_sessionmaker(
         bind=engine,
         class_=AsyncSession,

meshview/deps.py

@@ -1,13 +0,0 @@
-import logging
-from importlib.util import find_spec
-
-logger = logging.getLogger(__name__)
-
-
-def check_optional_deps() -> None:
-    if find_spec("pyitm") is None:
-        logger.warning(
-            "Optional dependency missing: pyitm. "
-            "Coverage prediction is disabled. "
-            "Run: ./env/bin/pip install -r requirements.txt"
-        )

meshview/lang/en.json

@@ -13,118 +13,60 @@
       "go to node": "Go to Node",
       "all": "All",
       "portnum_options": {
-        "0": "Unknown",
         "1": "Text Message",
-        "2": "Remote Hardware",
         "3": "Position",
         "4": "Node Info",
-        "5": "Routing",
-        "6": "Admin",
-        "7": "Text (Compressed)",
-        "8": "Waypoint",
-        "9": "Audio",
-        "10": "Detection Sensor",
-        "11": "Alert",
-        "12": "Key Verification",
-        "32": "Reply",
-        "33": "IP Tunnel",
-        "34": "Paxcounter",
-        "35": "Store Forward++",
-        "36": "Node Status",
-        "64": "Serial",
-        "65": "Store & Forward",
-        "66": "Range Test",
         "67": "Telemetry",
-        "68": "ZPS",
-        "69": "Simulator",
         "70": "Traceroute",
-        "71": "Neighbor Info",
-        "72": "ATAK",
-        "73": "Map Report",
-        "74": "Power Stress",
-        "76": "Reticulum Tunnel",
-        "77": "Cayenne",
-        "256": "Private App",
-        "257": "ATAK Forwarder"
-      }
+        "71": "Neighbor Info"
+        }
       },
    "chat": {
-     "chat_title": "Chats:",
         "replying_to": "Replying to:",
         "view_packet_details": "View packet details"
    },
     "nodelist": {
-        "search_placeholder": "Search by name or ID...",
-        "all_roles": "All Roles",
-        "all_channels": "All Channels",
-        "all_hw": "All HW Models",
-        "all_firmware": "All Firmware",
-
-        "show_favorites": "⭐ Show Favorites",
-        "show_all": "⭐ Show All",
-        "export_csv": "Export CSV",
-        "clear_filters": "Clear Filters",
-
-        "showing_nodes": "Showing",
-        "nodes_suffix": "nodes",
-
-        "loading_nodes": "Loading nodes...",
-        "error_loading_nodes": "Error loading nodes",
-        "no_nodes_found": "No nodes found",
-
-        "short_name": "Short",
-        "long_name": "Long Name",
-        "hw_model": "HW Model",
-        "firmware": "Firmware",
-        "role": "Role",
-        "last_lat": "Last Latitude",
-        "last_long": "Last Longitude",
-        "channel": "Channel",
-        "mqtt_gateway": "MQTT",
-        "last_seen": "Last Seen",
-        "favorite": "Favorite",
-        "yes": "Yes",
-        "no": "No",
-
-        "time_just_now": "just now",
-        "time_min_ago": "min ago",
-        "time_hr_ago": "hr ago",
-        "time_day_ago": "day ago",
-        "time_days_ago": "days ago"
+      "search_placeholder": "Search by name or ID...",
+      "all_roles": "All Roles",
+      "all_channels": "All Channels",
+      "all_hw_models": "All HW Models",
+      "all_firmware": "All Firmware",
+      "export_csv": "Export CSV",
+      "clear_filters": "Clear Filters",
+      "showing": "Showing",
+      "nodes": "nodes",
+      "short": "Short",
+      "long_name": "Long Name",
+      "hw_model": "HW Model",
+      "firmware": "Firmware",
+      "role": "Role",
+      "last_lat": "Last Latitude",
+      "last_long": "Last Longitude",
+      "channel": "Channel",
+      "last_update": "Last Update",
+      "loading_nodes": "Loading nodes...",
+      "no_nodes": "No nodes found",
+      "error_nodes": "Error loading nodes"
     },
-
     "net": {
-      "net_title": "Weekly Net:",
-    "total_messages": "Number of messages:",
-    "view_packet_details": "More details"
+      "number_of_checkins": "Number of Check-ins:",
+      "view_packet_details": "View packet details",
+      "view_all_packets_from_node": "View all packets from this node",
+      "no_packets_found": "No packets found."
     },
-
-  "map": {
-  "show_routers_only": "Show Routers Only",
-  "show_mqtt_only": "Show MQTT Gateways Only",
-  "share_view": "Share This View",
-  "reset_filters": "Reset Filters To Defaults",
-  "unmapped_packets_title": "Unmapped Packets",
-  "unmapped_packets_empty": "No recent unmapped packets.",
-  "channel_label": "Channel:",
-      "model_label": "Model:",
-      "role_label": "Role:",
-      "mqtt_gateway": "MQTT Gateway:",
+    "map": {
+      "channel": "Channel:",
+      "model": "Model:",
+      "role": "Role:",
       "last_seen": "Last seen:",
       "firmware": "Firmware:",
-      "yes": "Yes",
-      "no": "No",
-      "link_copied": "Link Copied!",
-      "legend_traceroute": "Traceroute (with arrows)",
-      "legend_neighbor": "Neighbor"
-
+      "show_routers_only": "Show Routers Only",
+      "share_view": "Share This View"
     },
-
     "stats":
     {
       "mesh_stats_summary": "Mesh Statistics - Summary (all available in Database)",
       "total_nodes": "Total Nodes",
-      "total_gateways": "Total Gateways",
       "total_packets": "Total Packets",
       "total_packets_seen": "Total Packets Seen",
       "packets_per_day_all": "Packets per Day - All Ports (Last 14 Days)",
@@ -135,29 +77,26 @@
       "hardware_breakdown": "Hardware Breakdown",
       "role_breakdown": "Role Breakdown",
       "channel_breakdown": "Channel Breakdown",
-      "gateway_channel_breakdown": "Gateway Channel Breakdown",
-      "gateway_role_breakdown": "Gateway Role Breakdown",
-      "gateway_firmware_breakdown": "Gateway Firmware Breakdown",
-      "no_gateways": "No gateways found",
       "expand_chart": "Expand Chart",
       "export_csv": "Export CSV",
       "all_channels": "All Channels",
       "node_id": "Node ID"
     },
-      "top": {
-      "top_traffic_nodes": "Top Nodes Traffic",
-      "channel": "Channel",
-      "search": "Search",
-      "search_placeholder": "Search nodes...",
+    "top":
+    {
+      "top_traffic_nodes": "Top Traffic Nodes (last 24 hours)",
+      "chart_description_1": "This chart shows a bell curve (normal distribution) based on the total \"Times Seen\" values for all nodes. It helps visualize how frequently nodes are heard, relative to the average.",
+      "chart_description_2": "This \"Times Seen\" value is the closest that we can get to Mesh utilization by node.",
+      "mean_label": "Mean:",
+      "stddev_label": "Standard Deviation:",
       "long_name": "Long Name",
       "short_name": "Short Name",
-      "packets_sent": "Sent (24h)",
-      "times_seen": "Seen (24h)",
-      "avg_gateways": "Avg Gateways",
-      "showing_nodes": "Showing",
-      "nodes_suffix": "nodes"
+      "channel": "Channel",
+      "packets_sent": "Packets Sent",
+      "times_seen": "Times Seen",
+      "seen_percent": "Seen % of Mean",
+      "no_nodes": "No top traffic nodes available."
     },
-
     "nodegraph":
     {
       "channel_label": "Channel:",
@@ -180,6 +119,7 @@
         "to": "To",
         "port": "Port",
         "links": "Links",
+
         "unknown_app": "UNKNOWN APP",
         "text_message": "Text Message",
         "position": "Position",
@@ -191,77 +131,11 @@
         "telemetry": "Telemetry",
         "trace_route": "Trace Route",
         "neighbor_info": "Neighbor Info",
+
         "direct_to_mqtt": "direct to MQTT",
         "all": "All",
         "map": "Map",
         "graph": "Graph"
-      },
-    "node": {
-        "specifications": "Specifications",
-        "node_id": "Node ID",
-        "long_name": "Long Name",
-        "short_name": "Short Name",
-        "hw_model": "Hardware Model",
-        "firmware": "Firmware",
-        "role": "Role",
-        "mqtt_gateway": "MQTT Gateway",
-        "channel": "Channel",
-        "latitude": "Latitude",
-        "longitude": "Longitude",
-        "first_update": "First Update",
-        "last_update": "Last Update",
-        "battery_voltage": "Battery & Voltage",
-        "air_channel": "Air & Channel Utilization",
-        "environment": "Environment Metrics",
-        "neighbors_chart": "Neighbors (Signal-to-Noise)",
-        "expand": "Expand",
-        "export_csv": "Export CSV",
-        "time": "Time",
-        "packet_id": "Packet ID",
-        "from": "From",
-        "to": "To",
-        "port": "Port",
-        "direct_to_mqtt": "Direct to MQTT",
-        "all_broadcast": "All",
-        "statistics": "Statistics",
-        "last_24h": "24h",
-        "packets_sent": "Packets sent",
-        "times_seen": "Times seen",
-        "yes": "Yes",
-        "no": "No",
-        "copy_import_url": "Copy Import URL",
-        "show_qr_code": "Show QR Code",
-        "toggle_coverage": "Predicted Coverage",
-        "location_required": "Location required for coverage",
-        "coverage_help": "Coverage Help",
-        "share_contact_qr": "Share Contact QR",
-        "copy_url": "Copy URL",
-        "copied": "Copied!",
-        "potential_impersonation": "Potential Impersonation Detected",
-        "scan_qr_to_add": "Scan this QR code to add this node as a contact on another device."
-    },
-    "packet": {
-      "loading": "Loading packet information...",
-      "packet_id_label": "Packet ID",
-      "from_node": "From Node",
-      "to_node": "To Node",
-      "channel": "Channel",
-      "port": "Port",
-      "raw_payload": "Raw Payload",
-      "decoded_telemetry": "Decoded Telemetry",
-      "location": "Location",
-      "seen_by": "Seen By",
-      "gateway": "Gateway",
-      "rssi": "RSSI",
-      "snr": "SNR",
-      "hops": "Hop",
-      "time": "Time",
-      "packet_source": "Packet Source",
-      "distance": "Distance",
-      "node_id_short": "Node ID",
-      "all_broadcast": "All",
-      "direct_to_mqtt": "Direct to MQTT"
-  }
+      }
 
-
-  }
+  }

meshview/lang/es.json

@@ -1,126 +1,71 @@
 {
   "base": {
-    "chat": "Conversaciones",
+    "conversations": "Conversaciones",
     "nodes": "Nodos",
-    "everything": "Mostrar todo",
-    "graphs": "Gráficos de la Malla",
+    "everything": "Mostrar Todo",
+    "graph": "Gráficos de la Malla",
     "net": "Red Semanal",
     "map": "Mapa en Vivo",
     "stats": "Estadísticas",
     "top": "Nodos con Mayor Tráfico",
     "footer": "Visita <strong><a href=\"https://github.com/pablorevilla-meshtastic/meshview\">Meshview</a></strong> en Github.",
-    "node_id": "ID de Nodo",
-    "go_to_node": "Ir al nodo",
+    "node id": "ID de Nodo",
+    "go to node": "Ir al nodo",
     "all": "Todos",
     "portnum_options": {
-      "0": "Desconocido",
       "1": "Mensaje de Texto",
-      "2": "Hardware Remoto",
       "3": "Ubicación",
       "4": "Información del Nodo",
-      "5": "Enrutamiento",
-      "6": "Administración",
-      "7": "Texto (Comprimido)",
-      "8": "Punto de Referencia",
-      "9": "Audio",
-      "10": "Sensor de Detección",
-      "11": "Alerta",
-      "12": "Verificación de Clave",
-      "32": "Respuesta",
-      "33": "Túnel IP",
-      "34": "Paxcounter",
-      "35": "Store Forward++",
-      "36": "Estado del Nodo",
-      "64": "Serial",
-      "65": "Store & Forward",
-      "66": "Prueba de Alcance",
       "67": "Telemetría",
-      "68": "ZPS",
-      "69": "Simulador",
       "70": "Traceroute",
-      "71": "Información de Vecinos",
-      "72": "ATAK",
-      "73": "Reporte de Mapa",
-      "74": "Prueba de Energía",
-      "76": "Túnel Reticulum",
-      "77": "Cayenne",
-      "256": "App Privada",
-      "257": "ATAK Forwarder"
+      "71": "Información de Vecinos"
     }
   },
-
   "chat": {
-    "chat_title": "Conversaciones:",
-    "replying_to": "Respondiendo a:",
-    "view_packet_details": "Ver detalles del paquete"
+  "replying_to": "Respondiendo a:",
+  "view_packet_details": "Ver detalles del paquete"
   },
-
   "nodelist": {
     "search_placeholder": "Buscar por nombre o ID...",
-    "all_roles": "Todos los roles",
-    "all_channels": "Todos los canales",
-    "all_hw": "Todos los modelos",
-    "all_firmware": "Todo el firmware",
-    "show_favorites": "⭐ Mostrar favoritos",
-    "show_all": "⭐ Mostrar todos",
+    "all_roles": "Todos los Roles",
+    "all_channels": "Todos los Canales",
+    "all_hw_models": "Todos los Modelos",
+    "all_firmware": "Todo el Firmware",
     "export_csv": "Exportar CSV",
-    "clear_filters": "Limpiar filtros",
-    "showing_nodes": "Mostrando",
-    "nodes_suffix": "nodos",
-    "loading_nodes": "Cargando nodos...",
-    "error_loading_nodes": "Error al cargar nodos",
-    "no_nodes_found": "No se encontraron nodos",
-    "short_name": "Corto",
-    "long_name": "Nombre largo",
-    "hw_model": "Modelo HW",
+    "clear_filters": "Limpiar Filtros",
+    "showing": "Mostrando",
+    "nodes": "nodos",
+    "short": "Corto",
+    "long_name": "Largo",
+    "hw_model": "Modelo",
     "firmware": "Firmware",
     "role": "Rol",
-    "last_lat": "Última latitud",
-    "last_long": "Última longitud",
+    "last_lat": "Última Latitud",
+    "last_long": "Última Longitud",
     "channel": "Canal",
-    "mqtt_gateway": "MQTT",
-    "last_seen": "Última vez visto",
-    "favorite": "Favorito",
-    "yes": "Sí",
-    "no": "No",
-    "time_just_now": "justo ahora",
-    "time_min_ago": "min atrás",
-    "time_hr_ago": "h atrás",
-    "time_day_ago": "día atrás",
-    "time_days_ago": "días atrás"
+    "last_update": "Última Actualización",
+    "loading_nodes": "Cargando nodos...",
+    "no_nodes": "No se encontraron nodos",
+    "error_nodes": "Error al cargar nodos"
   },
-
   "net": {
-    "net_title": "Red Semanal:",
-    "total_messages": "Número de mensajes:",
-    "view_packet_details": "Más Detalles"
+    "number_of_checkins": "Número de registros:",
+    "view_packet_details": "Ver detalles del paquete",
+    "view_all_packets_from_node": "Ver todos los paquetes de este nodo",
+    "no_packets_found": "No se encontraron paquetes."
   },
-
   "map": {
-  "filter_routers_only": "Mostrar solo enrutadores",
-  "show_routers_only": "Mostrar solo enrutadores",
-  "show_mqtt_only": "Mostrar solo gateways MQTT",
-  "share_view": "Compartir esta vista",
-  "reset_filters": "Restablecer filtros",
-  "unmapped_packets_title": "Paquetes sin mapa",
-  "unmapped_packets_empty": "No hay paquetes sin mapa recientes.",
-  "channel_label": "Canal:",
-    "model_label": "Modelo:",
-    "role_label": "Rol:",
-    "mqtt_gateway": "Gateway MQTT:",
+    "channel": "Canal:",
+    "model": "Modelo:",
+    "role": "Rol:",
     "last_seen": "Visto por última vez:",
     "firmware": "Firmware:",
-    "yes": "Sí",
-    "no": "No",
-    "link_copied": "¡Enlace copiado!",
-    "legend_traceroute": "Ruta de traceroute (flechas de dirección)",
-    "legend_neighbor": "Vínculo de vecinos"
+    "show_routers_only": "Mostrar solo enrutadores",
+    "share_view": "Compartir esta vista"
   },
-
   "stats": {
     "mesh_stats_summary": "Estadísticas de la Malla - Resumen (completas en la base de datos)",
     "total_nodes": "Nodos Totales",
-    "total_gateways": "Gateways Totales",
     "total_packets": "Paquetes Totales",
     "total_packets_seen": "Paquetes Totales Vistos",
     "packets_per_day_all": "Paquetes por Día - Todos los Puertos (Últimos 14 Días)",
@@ -131,30 +76,26 @@
     "hardware_breakdown": "Distribución de Hardware",
     "role_breakdown": "Distribución de Roles",
     "channel_breakdown": "Distribución de Canales",
-    "gateway_channel_breakdown": "Desglose de canales de gateways",
-    "gateway_role_breakdown": "Desglose de roles de gateways",
-    "gateway_firmware_breakdown": "Desglose de firmware de gateways",
-    "no_gateways": "No se encontraron gateways",
     "expand_chart": "Ampliar Gráfico",
     "export_csv": "Exportar CSV",
     "all_channels": "Todos los Canales"
   },
-
   "top": {
-    "top_traffic_nodes": "Tráfico de Nodos (24h)",
-    "channel": "Canal",
-    "search": "Buscar",
-    "search_placeholder": "Buscar nodos...",
+    "top_traffic_nodes": "Tráfico (últimas 24 horas)",
+    "chart_description_1": "Este gráfico muestra una curva normal (distribución normal) basada en el valor total de \"Veces Visto\" para todos los nodos. Ayuda a visualizar con qué frecuencia se detectan los nodos en relación con el promedio.",
+    "chart_description_2": "Este valor de \"Veces Visto\" es lo más aproximado que tenemos al nivel de uso de la malla por nodo.",
+    "mean_label": "Media:",
+    "stddev_label": "Desviación Estándar:",
     "long_name": "Nombre Largo",
     "short_name": "Nombre Corto",
-    "packets_sent": "Enviados (24h)",
-    "times_seen": "Visto (24h)",
-    "avg_gateways": "Promedio de Gateways",
-    "showing_nodes": "Mostrando",
-    "nodes_suffix": "nodos"
+    "channel": "Canal",
+    "packets_sent": "Paquetes Enviados",
+    "times_seen": "Veces Visto",
+    "seen_percent": "% Visto respecto a la Media",
+    "no_nodes": "No hay nodos con mayor tráfico disponibles."
   },
-
-  "nodegraph": {
+  "nodegraph":
+  {
     "channel_label": "Canal:",
     "search_placeholder": "Buscar nodo...",
     "search_button": "Buscar",
@@ -168,86 +109,34 @@
     "unknown": "Desconocido",
     "node_not_found": "¡Nodo no encontrado en el canal actual!"
   },
+  "firehose":
+    {
+      "live_feed": "📡 Flujo en Vivo",
+      "pause": "Pausar",
+      "resume": "Continuar",
+      "time": "Hora",
+      "packet_id": "ID del Paquete",
+      "from": "De",
+      "to": "Para",
+      "port": "Puerto",
+      "links": "Enlaces",
 
-  "firehose": {
-    "live_feed": "📡 Flujo en vivo",
-    "pause": "Pausar",
-    "resume": "Reanudar",
-    "time": "Hora",
-    "packet_id": "ID de paquete",
-    "from": "De",
-    "to": "A",
-    "port": "Puerto",
-    "direct_to_mqtt": "Directo a MQTT",
-    "all_broadcast": "Todos"
-  },
+      "unknown_app": "APLICACIÓN DESCONOCIDA",
+      "text_message": "Mensaje de Texto",
+      "position": "Posición",
+      "node_info": "Información del Nodo",
+      "routing": "Enrutamiento",
+      "administration": "Administración",
+      "waypoint": "Punto de Ruta",
+      "store_forward": "Almacenar y Reenviar",
+      "telemetry": "Telemetría",
+      "trace_route": "Rastreo de Ruta",
+      "neighbor_info": "Información de Vecinos",
 
-  "node": {
-    "specifications": "Especificaciones",
-    "node_id": "ID de Nodo",
-    "long_name": "Nombre Largo",
-    "short_name": "Nombre Corto",
-    "hw_model": "Modelo de Hardware",
-    "firmware": "Firmware",
-    "role": "Rol",
-    "mqtt_gateway": "Gateway MQTT",
-    "channel": "Canal",
-    "latitude": "Latitud",
-    "longitude": "Longitud",
-    "first_update": "Primera Actualización",
-    "last_update": "Última Actualización",
-    "battery_voltage": "Batería y voltaje",
-    "air_channel": "Utilización del aire y del canal",
-    "environment": "Métricas Ambientales",
-    "neighbors_chart": "Vecinos (Relación Señal/Ruido)",
-    "expand": "Ampliar",
-    "export_csv": "Exportar CSV",
-    "time": "Hora",
-    "packet_id": "ID del Paquete",
-    "from": "De",
-    "to": "A",
-    "port": "Puerto",
-    "direct_to_mqtt": "Directo a MQTT",
-    "all_broadcast": "Todos",
-    "statistics": "Estadísticas",
-    "last_24h": "24h",
-    "packets_sent": "Paquetes enviados",
-    "times_seen": "Veces visto",
-    "yes": "Sí",
-    "no": "No",
-    "copy_import_url": "Copiar URL de importación",
-    "show_qr_code": "Mostrar código QR",
-    "toggle_coverage": "Cobertura predicha",
-    "location_required": "Se requiere ubicación para la cobertura",
-    "coverage_help": "Ayuda de cobertura",
-    "share_contact_qr": "Compartir contacto QR",
-    "copy_url": "Copiar URL",
-    "copied": "¡Copiado!",
-    "potential_impersonation": "Posible suplantación detectada",
-    "scan_qr_to_add": "Escanea este código QR para agregar este nodo como contacto en otro dispositivo."
-  },
+      "direct_to_mqtt": "Directo a MQTT",
+      "all": "Todos",
+      "map": "Mapa",
+      "graph": "Gráfico"
+    }
 
-  "packet": {
-    "loading": "Cargando información del paquete...",
-    "packet_id_label": "ID del Paquete",
-    "from_node": "De",
-    "to_node": "A",
-    "channel": "Canal",
-    "port": "Puerto",
-    "raw_payload": "Payload sin procesar",
-    "decoded_telemetry": "Telemetría Decodificada",
-    "location": "Ubicación",
-    "seen_by": "Visto por",
-    "gateway": "Gateway",
-    "rssi": "RSSI",
-    "snr": "SNR",
-    "hops": "Saltos",
-    "time": "Hora",
-    "packet_source": "Origen del Paquete",
-    "distance": "Distancia",
-    "node_id_short": "ID de Nodo",
-    "all_broadcast": "Todos",
-    "direct_to_mqtt": "Directo a MQTT",
-    "signal": "Señal"
-  }
 }

meshview/migrations.py

@@ -186,24 +186,19 @@ async def create_migration_status_table(engine: AsyncEngine) -> None:
             text("""
             CREATE TABLE IF NOT EXISTS migration_status (
                 id INTEGER PRIMARY KEY CHECK (id = 1),
-                in_progress BOOLEAN NOT NULL DEFAULT FALSE,
+                in_progress BOOLEAN NOT NULL DEFAULT 0,
                 updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
             )
         """)
         )
 
-        result = await conn.execute(
+        # Insert initial row if not exists
+        await conn.execute(
             text("""
-            SELECT 1 FROM migration_status WHERE id = 1
+            INSERT OR IGNORE INTO migration_status (id, in_progress)
+            VALUES (1, 0)
         """)
         )
-        if result.first() is None:
-            await conn.execute(
-                text("""
-                INSERT INTO migration_status (id, in_progress)
-                VALUES (1, FALSE)
-            """)
-            )
 
 
 async def set_migration_in_progress(engine: AsyncEngine, in_progress: bool) -> None:

meshview/models.py

@@ -1,3 +1,5 @@
+from datetime import datetime
+
 from sqlalchemy import BigInteger, ForeignKey, Index, desc
 from sqlalchemy.ext.asyncio import AsyncAttrs
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column, relationship
@@ -20,7 +22,7 @@ class Node(Base):
     last_lat: Mapped[int] = mapped_column(BigInteger, nullable=True)
     last_long: Mapped[int] = mapped_column(BigInteger, nullable=True)
     channel: Mapped[str] = mapped_column(nullable=True)
-    is_mqtt_gateway: Mapped[bool] = mapped_column(nullable=True)
+    last_update: Mapped[datetime] = mapped_column(nullable=True)
     first_seen_us: Mapped[int] = mapped_column(BigInteger, nullable=True)
     last_seen_us: Mapped[int] = mapped_column(BigInteger, nullable=True)
 
@@ -31,7 +33,11 @@ class Node(Base):
     )
 
     def to_dict(self):
-        return {column.name: getattr(self, column.name) for column in self.__table__.columns}
+        return {
+            column.name: getattr(self, column.name)
+            for column in self.__table__.columns
+            if column.name != "last_update"
+        }
 
 
 class Packet(Base):
@@ -49,13 +55,17 @@ class Packet(Base):
         overlaps="from_node",
     )
     payload: Mapped[bytes] = mapped_column(nullable=True)
+    import_time: Mapped[datetime] = mapped_column(nullable=True)
     import_time_us: Mapped[int] = mapped_column(BigInteger, nullable=True)
     channel: Mapped[str] = mapped_column(nullable=True)
 
     __table_args__ = (
         Index("idx_packet_from_node_id", "from_node_id"),
         Index("idx_packet_to_node_id", "to_node_id"),
+        Index("idx_packet_import_time", desc("import_time")),
         Index("idx_packet_import_time_us", desc("import_time_us")),
+        # Composite index for /top endpoint performance - filters by from_node_id AND import_time
+        Index("idx_packet_from_node_time", "from_node_id", desc("import_time")),
         Index("idx_packet_from_node_time_us", "from_node_id", desc("import_time_us")),
     )
 
@@ -76,6 +86,7 @@ class PacketSeen(Base):
     rx_snr: Mapped[float] = mapped_column(nullable=True)
     rx_rssi: Mapped[int] = mapped_column(nullable=True)
     topic: Mapped[str] = mapped_column(nullable=True)
+    import_time: Mapped[datetime] = mapped_column(nullable=True)
     import_time_us: Mapped[int] = mapped_column(BigInteger, nullable=True)
 
     __table_args__ = (
@@ -97,25 +108,11 @@ class Traceroute(Base):
     gateway_node_id: Mapped[int] = mapped_column(BigInteger, nullable=True)
     done: Mapped[bool] = mapped_column(nullable=True)
     route: Mapped[bytes] = mapped_column(nullable=True)
+    import_time: Mapped[datetime] = mapped_column(nullable=True)
     route_return: Mapped[bytes] = mapped_column(nullable=True)
     import_time_us: Mapped[int] = mapped_column(BigInteger, nullable=True)
 
     __table_args__ = (
-        Index("idx_traceroute_packet_id", "packet_id"),
+        Index("idx_traceroute_import_time", "import_time"),
         Index("idx_traceroute_import_time_us", "import_time_us"),
     )
-
-
-class NodePublicKey(Base):
-    __tablename__ = "node_public_key"
-
-    id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
-    node_id: Mapped[int] = mapped_column(BigInteger, nullable=False)
-    public_key: Mapped[str] = mapped_column(nullable=False)
-    first_seen_us: Mapped[int] = mapped_column(BigInteger, nullable=True)
-    last_seen_us: Mapped[int] = mapped_column(BigInteger, nullable=True)
-
-    __table_args__ = (
-        Index("idx_node_public_key_node_id", "node_id"),
-        Index("idx_node_public_key_public_key", "public_key"),
-    )

meshview/mqtt_database.py

@@ -1,5 +1,3 @@
-from sqlalchemy import event
-from sqlalchemy.engine.url import make_url
 from sqlalchemy.ext.asyncio import async_sessionmaker, create_async_engine
 
 from meshview import models
@@ -7,26 +5,9 @@ from meshview import models
 
 def init_database(database_connection_string):
     global engine, async_session
-
-    url = make_url(database_connection_string)
-    kwargs = {"echo": False}
-
-    if url.drivername.startswith("sqlite"):
-        kwargs["connect_args"] = {"timeout": 900}  # seconds
-
-    engine = create_async_engine(url, **kwargs)
-
-    # Enforce SQLite pragmas on every new DB connection
-    if url.drivername.startswith("sqlite"):
-
-        @event.listens_for(engine.sync_engine, "connect")
-        def _set_sqlite_pragmas(dbapi_conn, _):
-            cursor = dbapi_conn.cursor()
-            cursor.execute("PRAGMA journal_mode=WAL;")
-            cursor.execute("PRAGMA busy_timeout=900000;")  # ms
-            cursor.execute("PRAGMA synchronous=NORMAL;")
-            cursor.close()
-
+    engine = create_async_engine(
+        database_connection_string, echo=False, connect_args={"timeout": 900}
+    )
     async_session = async_sessionmaker(engine, expire_on_commit=False)
 
 

meshview/mqtt_reader.py

@@ -8,11 +8,9 @@ import aiomqtt
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
 from google.protobuf.message import DecodeError
 
-from meshtastic.protobuf.mesh_pb2 import Data
 from meshtastic.protobuf.mqtt_pb2 import ServiceEnvelope
-from meshview.config import CONFIG
 
-PRIMARY_KEY = base64.b64decode("1PG7OiApB1nwvP+rz05pAQ==")
+KEY = base64.b64decode("1PG7OiApB1nwvP+rz05pAQ==")
 
 logging.basicConfig(
     level=logging.INFO,
@@ -23,94 +21,24 @@ logging.basicConfig(
 logger = logging.getLogger(__name__)
 
 
-def _parse_skip_node_ids():
-    mqtt_config = CONFIG.get("mqtt", {})
-    raw_value = mqtt_config.get("skip_node_ids", "")
-    if not raw_value:
-        return set()
-
-    if isinstance(raw_value, str):
-        raw_value = raw_value.strip()
-        if not raw_value:
-            return set()
-        values = [v.strip() for v in raw_value.split(",") if v.strip()]
-    else:
-        values = [raw_value]
-
-    skip_ids = set()
-    for value in values:
-        try:
-            skip_ids.add(int(value, 0))
-        except (TypeError, ValueError):
-            logger.warning("Invalid node id in mqtt.skip_node_ids: %s", value)
-    return skip_ids
-
-
-def _strip_quotes(value):
-    if len(value) >= 2 and value[0] == value[-1] and value[0] in ("'", '"'):
-        return value[1:-1]
-    return value
-
-
-def _parse_secondary_keys():
-    mqtt_config = CONFIG.get("mqtt", {})
-    raw_value = mqtt_config.get("secondary_keys", "")
-    if not raw_value:
-        return []
-
-    if isinstance(raw_value, str):
-        raw_value = raw_value.strip()
-        if not raw_value:
-            return []
-        values = [v.strip() for v in raw_value.split(",") if v.strip()]
-    else:
-        values = [raw_value]
-
-    keys = []
-    for value in values:
-        try:
-            cleaned = _strip_quotes(str(value).strip())
-            if cleaned:
-                keys.append(base64.b64decode(cleaned))
-        except (TypeError, ValueError):
-            logger.warning("Invalid base64 key in mqtt.secondary_keys: %s", value)
-    return keys
-
-
-SKIP_NODE_IDS = _parse_skip_node_ids()
-SECONDARY_KEYS = _parse_secondary_keys()
-
-logger.info("Primary key: %s", PRIMARY_KEY)
-if SECONDARY_KEYS:
-    logger.info("Secondary keys: %s", SECONDARY_KEYS)
-else:
-    logger.info("Secondary keys: []")
-
-
-# Thank you to "Robert Grizzell" for the decryption code!
-# https://github.com/rgrizzell
-def decrypt(packet, key):
+def decrypt(packet):
     if packet.HasField("decoded"):
-        return True
+        return
     packet_id = packet.id.to_bytes(8, "little")
     from_node_id = getattr(packet, "from").to_bytes(8, "little")
     nonce = packet_id + from_node_id
 
-    cipher = Cipher(algorithms.AES(key), modes.CTR(nonce))
+    cipher = Cipher(algorithms.AES(KEY), modes.CTR(nonce))
     decryptor = cipher.decryptor()
     raw_proto = decryptor.update(packet.encrypted) + decryptor.finalize()
     try:
-        data = Data()
-        data.ParseFromString(raw_proto)
-        packet.decoded.CopyFrom(data)
+        packet.decoded.ParseFromString(raw_proto)
     except DecodeError:
-        return False
-    return True
+        pass
 
 
 async def get_topic_envelopes(mqtt_server, mqtt_port, topics, mqtt_user, mqtt_passwd):
     identifier = str(random.getrandbits(16))
-    keyring = [PRIMARY_KEY, *SECONDARY_KEYS]
     msg_count = 0
     start_time = None
     while True:
@@ -137,14 +65,14 @@ async def get_topic_envelopes(mqtt_server, mqtt_port, topics, mqtt_user, mqtt_pa
                     except DecodeError:
                         continue
 
-                    for key in keyring:
-                        if decrypt(envelope.packet, key):
-                            break
+                    decrypt(envelope.packet)
+                    # print(envelope.packet.decoded)
                     if not envelope.packet.decoded:
                         continue
 
-                    # Skip packets from configured node IDs
-                    if getattr(envelope.packet, "from", None) in SKIP_NODE_IDS:
+                    # Skip packets from specific node
+                    # FIXME: make this configurable as a list of node IDs to skip
+                    if getattr(envelope.packet, "from", None) == 2144342101:
                         continue
 
                     msg_count += 1

meshview/mqtt_store.py

@@ -1,21 +1,14 @@
-import logging
+import datetime
 import re
-import time
 
-from sqlalchemy import select, update
-from sqlalchemy.dialects.postgresql import insert as pg_insert
+from sqlalchemy import select
 from sqlalchemy.dialects.sqlite import insert as sqlite_insert
-from sqlalchemy.exc import IntegrityError
 
 from meshtastic.protobuf.config_pb2 import Config
 from meshtastic.protobuf.mesh_pb2 import HardwareModel
 from meshtastic.protobuf.portnums_pb2 import PortNum
 from meshview import decode_payload, mqtt_database
-from meshview.models import Node, NodePublicKey, Packet, PacketSeen, Traceroute
-
-logger = logging.getLogger(__name__)
-
-MQTT_GATEWAY_CACHE: set[int] = set()
+from meshview.models import Node, Packet, PacketSeen, Traceroute
 
 
 async def process_envelope(topic, env):
@@ -44,7 +37,8 @@ async def process_envelope(topic, env):
                     await session.execute(select(Node).where(Node.node_id == node_id))
                 ).scalar_one_or_none()
 
-                now_us = int(time.time() * 1_000_000)
+                now = datetime.datetime.now(datetime.UTC)
+                now_us = int(now.timestamp() * 1_000_000)
 
                 if node:
                     node.node_id = node_id
@@ -56,6 +50,7 @@ async def process_envelope(topic, env):
                     node.last_lat = map_report.latitude_i
                     node.last_long = map_report.longitude_i
                     node.firmware = map_report.firmware_version
+                    node.last_update = now
                     node.last_seen_us = now_us
                     if node.first_seen_us is None:
                         node.first_seen_us = now_us
@@ -71,6 +66,7 @@ async def process_envelope(topic, env):
                         firmware=map_report.firmware_version,
                         last_lat=map_report.latitude_i,
                         last_long=map_report.longitude_i,
+                        last_update=now,
                         first_seen_us=now_us,
                         last_seen_us=now_us,
                     )
@@ -86,43 +82,29 @@ async def process_envelope(topic, env):
     async with mqtt_database.async_session() as session:
         # --- Packet insert with ON CONFLICT DO NOTHING
         result = await session.execute(select(Packet).where(Packet.id == env.packet.id))
+        # FIXME: Not Used
+        # new_packet = False
         packet = result.scalar_one_or_none()
         if not packet:
-            now_us = int(time.time() * 1_000_000)
-            packet_values = {
-                "id": env.packet.id,
-                "portnum": env.packet.decoded.portnum,
-                "from_node_id": getattr(env.packet, "from"),
-                "to_node_id": env.packet.to,
-                "payload": env.packet.SerializeToString(),
-                "import_time_us": now_us,
-                "channel": env.channel_id,
-            }
-            dialect = session.get_bind().dialect.name
-            stmt = None
-
-            if dialect == "sqlite":
-                stmt = (
-                    sqlite_insert(Packet)
-                    .values(**packet_values)
-                    .on_conflict_do_nothing(index_elements=["id"])
+            # FIXME: Not Used
+            # new_packet = True
+            now = datetime.datetime.now(datetime.UTC)
+            now_us = int(now.timestamp() * 1_000_000)
+            stmt = (
+                sqlite_insert(Packet)
+                .values(
+                    id=env.packet.id,
+                    portnum=env.packet.decoded.portnum,
+                    from_node_id=getattr(env.packet, "from"),
+                    to_node_id=env.packet.to,
+                    payload=env.packet.SerializeToString(),
+                    import_time=now,
+                    import_time_us=now_us,
+                    channel=env.channel_id,
                 )
-            elif dialect == "postgresql":
-                stmt = (
-                    pg_insert(Packet)
-                    .values(**packet_values)
-                    .on_conflict_do_nothing(index_elements=["id"])
-                )
-
-            if stmt is not None:
-                await session.execute(stmt)
-            else:
-                try:
-                    async with session.begin_nested():
-                        session.add(Packet(**packet_values))
-                        await session.flush()
-                except IntegrityError:
-                    pass
+                .on_conflict_do_nothing(index_elements=["id"])
+            )
+            await session.execute(stmt)
 
         # --- PacketSeen (no conflict handling here, normal insert)
 
@@ -133,12 +115,6 @@ async def process_envelope(topic, env):
         else:
             node_id = int(env.gateway_id[1:], 16)
 
-        if node_id not in MQTT_GATEWAY_CACHE:
-            MQTT_GATEWAY_CACHE.add(node_id)
-            await session.execute(
-                update(Node).where(Node.node_id == node_id).values(is_mqtt_gateway=True)
-            )
-
         result = await session.execute(
             select(PacketSeen).where(
                 PacketSeen.packet_id == env.packet.id,
@@ -147,7 +123,8 @@ async def process_envelope(topic, env):
             )
         )
         if not result.scalar_one_or_none():
-            now_us = int(time.time() * 1_000_000)
+            now = datetime.datetime.now(datetime.UTC)
+            now_us = int(now.timestamp() * 1_000_000)
             seen = PacketSeen(
                 packet_id=env.packet.id,
                 node_id=int(env.gateway_id[1:], 16),
@@ -158,6 +135,7 @@ async def process_envelope(topic, env):
                 hop_limit=env.packet.hop_limit,
                 hop_start=env.packet.hop_start,
                 topic=topic,
+                import_time=now,
                 import_time_us=now_us,
             )
             session.add(seen)
@@ -189,7 +167,8 @@ async def process_envelope(topic, env):
                         await session.execute(select(Node).where(Node.id == user.id))
                     ).scalar_one_or_none()
 
-                    now_us = int(time.time() * 1_000_000)
+                    now = datetime.datetime.now(datetime.UTC)
+                    now_us = int(now.timestamp() * 1_000_000)
 
                     if node:
                         node.node_id = node_id
@@ -198,6 +177,7 @@ async def process_envelope(topic, env):
                         node.hw_model = hw_model
                         node.role = role
                         node.channel = env.channel_id
+                        node.last_update = now
                         node.last_seen_us = now_us
                         if node.first_seen_us is None:
                             node.first_seen_us = now_us
@@ -210,32 +190,11 @@ async def process_envelope(topic, env):
                             hw_model=hw_model,
                             role=role,
                             channel=env.channel_id,
+                            last_update=now,
                             first_seen_us=now_us,
                             last_seen_us=now_us,
                         )
                         session.add(node)
-
-                    if user.public_key:
-                        public_key_hex = user.public_key.hex()
-                        existing_key = (
-                            await session.execute(
-                                select(NodePublicKey).where(
-                                    NodePublicKey.node_id == node_id,
-                                    NodePublicKey.public_key == public_key_hex,
-                                )
-                            )
-                        ).scalar_one_or_none()
-
-                        if existing_key:
-                            existing_key.last_seen_us = now_us
-                        else:
-                            new_key = NodePublicKey(
-                                node_id=node_id,
-                                public_key=public_key_hex,
-                                first_seen_us=now_us,
-                                last_seen_us=now_us,
-                            )
-                            session.add(new_key)
             except Exception as e:
                 print(f"Error processing NODEINFO_APP: {e}")
 
@@ -250,9 +209,11 @@ async def process_envelope(topic, env):
                     await session.execute(select(Node).where(Node.node_id == from_node_id))
                 ).scalar_one_or_none()
                 if node:
-                    now_us = int(time.time() * 1_000_000)
+                    now = datetime.datetime.now(datetime.UTC)
+                    now_us = int(now.timestamp() * 1_000_000)
                     node.last_lat = position.latitude_i
                     node.last_long = position.longitude_i
+                    node.last_update = now
                     node.last_seen_us = now_us
                     if node.first_seen_us is None:
                         node.first_seen_us = now_us
@@ -262,23 +223,21 @@ async def process_envelope(topic, env):
         if env.packet.decoded.portnum == PortNum.TRACEROUTE_APP:
             packet_id = env.packet.id
             if packet_id is not None:
-                now_us = int(time.time() * 1_000_000)
+                now = datetime.datetime.now(datetime.UTC)
+                now_us = int(now.timestamp() * 1_000_000)
                 session.add(
                     Traceroute(
                         packet_id=packet_id,
                         route=env.packet.decoded.payload,
                         done=not env.packet.decoded.want_response,
                         gateway_node_id=int(env.gateway_id[1:], 16),
+                        import_time=now,
                         import_time_us=now_us,
                     )
                 )
 
         await session.commit()
 
-
-async def load_gateway_cache():
-    async with mqtt_database.async_session() as session:
-        result = await session.execute(
-            select(Node.node_id).where(Node.is_mqtt_gateway == True)  # noqa: E712
-        )
-        MQTT_GATEWAY_CACHE.update(result.scalars().all())
+        # if new_packet:
+        #    await packet.awaitable_attrs.to_node
+        #    await packet.awaitable_attrs.from_node

meshview/radio/coverage.py

@@ -1,146 +0,0 @@
-import math
-from functools import lru_cache
-
-try:
-    from pyitm import itm
-
-    ITM_AVAILABLE = True
-except Exception:
-    itm = None
-    ITM_AVAILABLE = False
-
-DEFAULT_CLIMATE = 5  # Continental temperate
-DEFAULT_GROUND = 0.005  # Average ground conductivity
-DEFAULT_EPS_DIELECT = 15.0
-DEFAULT_DELTA_H = 90.0
-DEFAULT_RELIABILITY = 0.5
-DEFAULT_MIN_DBM = -130.0
-DEFAULT_MAX_DBM = -80.0
-DEFAULT_THRESHOLD_DBM = -120.0
-EARTH_RADIUS_KM = 6371.0
-BEARING_STEP_DEG = 5
-
-
-def destination_point(
-    lat: float, lon: float, bearing_deg: float, distance_km: float
-) -> tuple[float, float]:
-    lat1 = math.radians(lat)
-    lon1 = math.radians(lon)
-    bearing = math.radians(bearing_deg)
-
-    d = distance_km / EARTH_RADIUS_KM
-
-    lat2 = math.asin(
-        math.sin(lat1) * math.cos(d) + math.cos(lat1) * math.sin(d) * math.cos(bearing)
-    )
-
-    lon2 = lon1 + math.atan2(
-        math.sin(bearing) * math.sin(d) * math.cos(lat1),
-        math.cos(d) - math.sin(lat1) * math.sin(lat2),
-    )
-
-    return math.degrees(lat2), math.degrees(lon2)
-
-
-@lru_cache(maxsize=512)
-def compute_coverage(
-    lat: float,
-    lon: float,
-    freq_mhz: float,
-    tx_dbm: float,
-    tx_height_m: float,
-    rx_height_m: float,
-    radius_km: float,
-    step_km: float,
-    reliability: float,
-) -> list[tuple[float, float, float]]:
-    if not ITM_AVAILABLE:
-        return []
-
-    points = []
-    distance = max(step_km, 1.0)
-    while distance <= radius_km:
-        for bearing in range(0, 360, BEARING_STEP_DEG):
-            rx_lat, rx_lon = destination_point(lat, lon, bearing, distance)
-            try:
-                loss_db, _ = itm.area(
-                    ModVar=2,
-                    deltaH=DEFAULT_DELTA_H,
-                    tht_m=tx_height_m,
-                    rht_m=rx_height_m,
-                    dist_km=distance,
-                    TSiteCriteria=0,
-                    RSiteCriteria=0,
-                    eps_dielect=DEFAULT_EPS_DIELECT,
-                    sgm_conductivity=DEFAULT_GROUND,
-                    eno_ns_surfref=301,
-                    frq_mhz=freq_mhz,
-                    radio_climate=DEFAULT_CLIMATE,
-                    pol=1,
-                    pctTime=reliability,
-                    pctLoc=0.5,
-                    pctConf=0.5,
-                )
-            except itm.InputError:
-                continue
-            rx_dbm = tx_dbm - loss_db
-            points.append((rx_lat, rx_lon, rx_dbm))
-        distance += step_km
-
-    return points
-
-
-@lru_cache(maxsize=512)
-def compute_perimeter(
-    lat: float,
-    lon: float,
-    freq_mhz: float,
-    tx_dbm: float,
-    tx_height_m: float,
-    rx_height_m: float,
-    radius_km: float,
-    step_km: float,
-    reliability: float,
-    threshold_dbm: float,
-) -> list[tuple[float, float]]:
-    if not ITM_AVAILABLE:
-        return []
-
-    perimeter = []
-    distance = max(step_km, 1.0)
-    for bearing in range(0, 360, BEARING_STEP_DEG):
-        last_point = None
-        dist = distance
-        while dist <= radius_km:
-            try:
-                loss_db, _ = itm.area(
-                    ModVar=2,
-                    deltaH=DEFAULT_DELTA_H,
-                    tht_m=tx_height_m,
-                    rht_m=rx_height_m,
-                    dist_km=dist,
-                    TSiteCriteria=0,
-                    RSiteCriteria=0,
-                    eps_dielect=DEFAULT_EPS_DIELECT,
-                    sgm_conductivity=DEFAULT_GROUND,
-                    eno_ns_surfref=301,
-                    frq_mhz=freq_mhz,
-                    radio_climate=DEFAULT_CLIMATE,
-                    pol=1,
-                    pctTime=reliability,
-                    pctLoc=0.5,
-                    pctConf=0.5,
-                )
-            except itm.InputError:
-                dist += step_km
-                continue
-
-            rx_dbm = tx_dbm - loss_db
-            if rx_dbm >= threshold_dbm:
-                last_point = destination_point(lat, lon, bearing, dist)
-            dist += step_km
-
-        if last_point:
-            perimeter.append(last_point)
-
-    return perimeter

meshview/static/api-config.html

@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8" />
+  <title>API Documentation - Config</title>
+  <link rel="stylesheet" href="https://unpkg.com/swagger-ui-dist/swagger-ui.css" />
+  <style>
+    body { margin: 0; background: #ffffff; color: #000; }
+    #swagger-ui { background: #ffffff; color: #000; }
+    .swagger-ui { background-color: #ffffff !important; color: #000 !important; }
+    .swagger-ui .topbar,
+    .swagger-ui .info,
+    .swagger-ui .opblock-summary-description,
+    .swagger-ui .parameters-col_description,
+    .swagger-ui .response-col_description { color: #000 !important; }
+    .swagger-ui .opblock { background-color: #f9f9f9 !important; border-color: #ddd !important; }
+    .swagger-ui .opblock-summary { background-color: #eaeaea !important; color: #000 !important; }
+    .swagger-ui .opblock-section-header { color: #000 !important; }
+    .swagger-ui .parameters,
+    .swagger-ui .response { background-color: #fafafa !important; color: #000 !important; }
+    .swagger-ui table { color: #000 !important; }
+    .swagger-ui a { color: #1a0dab !important; }
+    .swagger-ui input,
+    .swagger-ui select,
+    .swagger-ui textarea { background-color: #fff !important; color: #000 !important; border: 1px solid #ccc !important; }
+  </style>
+</head>
+<body>
+  <div id="swagger-ui"></div>
+
+  <script src="https://unpkg.com/swagger-ui-dist/swagger-ui-bundle.js"></script>
+  <script>
+    const spec = {
+      openapi: "3.0.0",
+      info: {
+        title: "Site Config API",
+        version: "1.0.0",
+        description: "API for retrieving the site configuration. This endpoint does not take any parameters."
+      },
+      paths: {
+        "/api/config": {
+          get: {
+            summary: "Get site configuration",
+            description: "Returns the current site configuration object.",
+            responses: {
+              "200": {
+                description: "Successful response",
+                content: {
+                  "application/json": {
+                    schema: {
+                      type: "object",
+                      properties: {
+                        site_config: {
+                          type: "object",
+                          additionalProperties: true,
+                          example: {
+                            site_name: "MeshView",
+                            firehose_interval: 1000,
+                            starting: "/nodes",
+                            theme: "dark"
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              },
+              "500": {
+                description: "Server error",
+                content: {
+                  "application/json": {
+                    schema: {
+                      type: "object",
+                      properties: {
+                        error: { type: "string", example: "Internal server error" }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    };
+
+    window.onload = () => {
+      SwaggerUIBundle({
+        spec,
+        dom_id: '#swagger-ui',
+        presets: [
+          SwaggerUIBundle.presets.apis,
+          SwaggerUIBundle.SwaggerUIStandalonePreset
+        ],
+        layout: "BaseLayout"
+      });
+    };
+  </script>
+</body>
+</html>

meshview/static/api-edges.html

@@ -0,0 +1,109 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8" />
+  <title>API Documentation - Edges</title>
+  <link rel="stylesheet" href="https://unpkg.com/swagger-ui-dist/swagger-ui.css" />
+  <style>
+    body {
+      margin: 0;
+      background: #ffffff;
+      color: #000000;
+    }
+    #swagger-ui { background: #ffffff; color: #000; }
+    .swagger-ui { background-color: #ffffff !important; color: #000 !important; }
+    .swagger-ui .topbar,
+    .swagger-ui .info,
+    .swagger-ui .opblock-summary-description,
+    .swagger-ui .parameters-col_description,
+    .swagger-ui .response-col_description { color: #000 !important; }
+    .swagger-ui .opblock { background-color: #f9f9f9 !important; border-color: #ddd !important; }
+    .swagger-ui .opblock-summary { background-color: #eaeaea !important; color: #000 !important; }
+    .swagger-ui .opblock-section-header { color: #000 !important; }
+    .swagger-ui .parameters,
+    .swagger-ui .response { background-color: #fafafa !important; color: #000 !important; }
+    .swagger-ui table { color: #000 !important; }
+    .swagger-ui a { color: #1a0dab !important; }
+    .swagger-ui input,
+    .swagger-ui select,
+    .swagger-ui textarea { background-color: #fff !important; color: #000 !important; border: 1px solid #ccc !important; }
+  </style>
+</head>
+<body>
+  <div id="swagger-ui"></div>
+
+  <script src="https://unpkg.com/swagger-ui-dist/swagger-ui-bundle.js"></script>
+  <script>
+    const spec = {
+      openapi: "3.0.0",
+      info: {
+        title: "Network Edges API",
+        version: "1.0.0",
+        description: "API for retrieving network edges derived from traceroutes and neighbor info packets, with optional type filtering."
+      },
+      paths: {
+        "/api/edges": {
+          get: {
+            summary: "Get network edges",
+            description: "Returns edges between nodes in the network. Optionally filter by type (`traceroute` or `neighbor`).",
+            parameters: [
+              {
+                name: "type",
+                in: "query",
+                required: false,
+                description: "Optional filter to only return edges of this type (`traceroute` or `neighbor`).",
+                schema: { type: "string", enum: ["traceroute", "neighbor"] }
+              }
+            ],
+            responses: {
+              "200": {
+                description: "Successful response",
+                content: {
+                  "application/json": {
+                    schema: {
+                      type: "object",
+                      properties: {
+                        edges: {
+                          type: "array",
+                          items: {
+                            type: "object",
+                            properties: {
+                              from: { type: "integer", example: 101 },
+                              to: { type: "integer", example: 102 },
+                              type: { type: "string", example: "traceroute" }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              },
+              "400": {
+                description: "Invalid request parameters",
+                content: {
+                  "application/json": {
+                    schema: { type: "object", properties: { error: { type: "string" } } }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    };
+
+    window.onload = () => {
+      SwaggerUIBundle({
+        spec,
+        dom_id: '#swagger-ui',
+        presets: [
+          SwaggerUIBundle.presets.apis,
+          SwaggerUIBundle.SwaggerUIStandalonePreset
+        ],
+        layout: "BaseLayout"
+      });
+    };
+  </script>
+</body>
+</html>

meshview/static/api-nodes.html

@@ -0,0 +1,134 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8" />
+  <title>API Documentation - Nodes</title>
+  <link rel="stylesheet" href="https://unpkg.com/swagger-ui-dist/swagger-ui.css" />
+  <style>
+    body { margin: 0; background: #ffffff; color: #000; }
+    #swagger-ui { background: #ffffff; color: #000; }
+    .swagger-ui { background-color: #ffffff !important; color: #000 !important; }
+    .swagger-ui .topbar,
+    .swagger-ui .info,
+    .swagger-ui .opblock-summary-description,
+    .swagger-ui .parameters-col_description,
+    .swagger-ui .response-col_description { color: #000 !important; }
+    .swagger-ui .opblock { background-color: #f9f9f9 !important; border-color: #ddd !important; }
+    .swagger-ui .opblock-summary { background-color: #eaeaea !important; color: #000 !important; }
+    .swagger-ui .opblock-section-header { color: #000 !important; }
+    .swagger-ui .parameters,
+    .swagger-ui .response { background-color: #fafafa !important; color: #000 !important; }
+    .swagger-ui table { color: #000 !important; }
+    .swagger-ui a { color: #1a0dab !important; }
+    .swagger-ui input,
+    .swagger-ui select,
+    .swagger-ui textarea { background-color: #fff !important; color: #000 !important; border: 1px solid #ccc !important; }
+  </style>
+</head>
+<body>
+  <div id="swagger-ui"></div>
+
+  <script src="https://unpkg.com/swagger-ui-dist/swagger-ui-bundle.js"></script>
+  <script>
+    const spec = {
+      openapi: "3.0.0",
+      info: {
+        title: "Network Nodes API",
+        version: "1.0.0",
+        description: "API for retrieving nodes in the network with optional filters by last seen time."
+      },
+      paths: {
+        "/api/nodes": {
+          get: {
+            summary: "Get network nodes",
+            description: "Returns a list of nodes with optional filtering by recent activity.",
+            parameters: [
+              {
+                name: "hours",
+                in: "query",
+                required: false,
+                description: "Return nodes seen in the last X hours.",
+                schema: { type: "integer", example: 24 }
+              },
+              {
+                name: "days",
+                in: "query",
+                required: false,
+                description: "Return nodes seen in the last X days.",
+                schema: { type: "integer", example: 7 }
+              },
+              {
+                name: "last_seen_after",
+                in: "query",
+                required: false,
+                description: "Return nodes last seen after this ISO8601 timestamp.",
+                schema: { type: "string", format: "date-time", example: "2025-08-25T14:00:00" }
+              }
+            ],
+            responses: {
+              "200": {
+                description: "Successful response",
+                content: {
+                  "application/json": {
+                    schema: {
+                      type: "object",
+                      properties: {
+                        nodes: {
+                          type: "array",
+                          items: {
+                            type: "object",
+                            properties: {
+                              node_id: { type: "integer", example: 101 },
+                              long_name: { type: "string", example: "Node Alpha" },
+                              short_name: { type: "string", example: "A" },
+                              channel: { type: "string", example: "2" },
+                              last_seen: { type: "string", format: "date-time", example: "2025-08-25T12:00:00" },
+                              last_lat: { type: "number", format: "float", example: 37.7749 },
+                              last_long: { type: "number", format: "float", example: -122.4194 },
+                              hardware: { type: "string", example: "Heltec V3" },
+                              firmware: { type: "string", example: "1.0.5" },
+                              role: { type: "string", example: "router" }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              },
+              "400": {
+                description: "Invalid request parameters",
+                content: {
+                  "application/json": {
+                    schema: { type: "object", properties: { error: { type: "string" } } }
+                  }
+                }
+              },
+              "500": {
+                description: "Server error",
+                content: {
+                  "application/json": {
+                    schema: { type: "object", properties: { error: { type: "string" } } }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    };
+
+    window.onload = () => {
+      SwaggerUIBundle({
+        spec,
+        dom_id: '#swagger-ui',
+        presets: [
+          SwaggerUIBundle.presets.apis,
+          SwaggerUIBundle.SwaggerUIStandalonePreset
+        ],
+        layout: "BaseLayout"
+      });
+    };
+  </script>
+</body>
+</html>

meshview/static/api-packets.html

@@ -0,0 +1,167 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8" />
+  <title>API Documentation - Packets</title>
+  <link rel="stylesheet" href="https://unpkg.com/swagger-ui-dist/swagger-ui.css" />
+  <style>
+    body {
+      margin: 0;
+      background: #ffffff;
+      color: #000000;
+    }
+    #swagger-ui {
+      background: #ffffff;
+      color: #000000;
+    }
+
+    /* Override Swagger UI colors for white background */
+    .swagger-ui {
+      background-color: #ffffff !important;
+      color: #000000 !important;
+    }
+
+    .swagger-ui .topbar,
+    .swagger-ui .info,
+    .swagger-ui .opblock-summary-description,
+    .swagger-ui .parameters-col_description,
+    .swagger-ui .response-col_description {
+      color: #000000 !important;
+    }
+
+    .swagger-ui .opblock {
+      background-color: #f9f9f9 !important;
+      border-color: #ddd !important;
+    }
+
+    .swagger-ui .opblock-summary {
+      background-color: #eaeaea !important;
+      color: #000 !important;
+    }
+
+    .swagger-ui .opblock-section-header {
+      color: #000 !important;
+    }
+
+    .swagger-ui .parameters,
+    .swagger-ui .response {
+      background-color: #fafafa !important;
+      color: #000 !important;
+    }
+
+    .swagger-ui table {
+      color: #000 !important;
+    }
+
+    .swagger-ui a {
+      color: #1a0dab !important; /* classic link blue */
+    }
+
+    .swagger-ui input,
+    .swagger-ui select,
+    .swagger-ui textarea {
+      background-color: #fff !important;
+      color: #000 !important;
+      border: 1px solid #ccc !important;
+    }
+  </style>
+</head>
+<body>
+  <div id="swagger-ui"></div>
+
+  <script src="https://unpkg.com/swagger-ui-dist/swagger-ui-bundle.js"></script>
+  <script>
+    const spec = {
+      openapi: "3.0.0",
+      info: {
+        title: "Packets API",
+        version: "1.0.0",
+        description: "API for retrieving packet records with optional filters."
+      },
+      paths: {
+        "/api/packets": {
+          get: {
+            summary: "Get packets",
+            description: "Returns a list of recent packets, optionally filtered by a timestamp and limited by count.",
+            parameters: [
+              {
+                name: "limit",
+                in: "query",
+                required: false,
+                description: "Maximum number of packets to return. Default is 200.",
+                schema: {
+                  type: "integer",
+                  default: 200
+                }
+              },
+              {
+                name: "since",
+                in: "query",
+                required: false,
+                description: "Only return packets imported after this ISO8601 timestamp (e.g., `2025-08-12T14:15:20`).",
+                schema: {
+                  type: "string",
+                  format: "date-time"
+                }
+              }
+            ],
+            responses: {
+              "200": {
+                description: "Successful response",
+                content: {
+                  "application/json": {
+                    schema: {
+                      type: "object",
+                      properties: {
+                        packets: {
+                          type: "array",
+                          items: {
+                            type: "object",
+                            properties: {
+                              id: { type: "integer", example: 196988973 },
+                              from_node_id: { type: "integer", example: 2381019191 },
+                              to_node_id: { type: "integer", example: 1234567890 },
+                              portnum: { type: "integer", example: 1 },
+                              import_time: { type: "string", format: "date-time", example: "2025-08-12T14:15:20.503827" },
+                              payload: { type: "string", example: "Hello Mesh" }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              },
+              "500": {
+                description: "Internal server error",
+                content: {
+                  "application/json": {
+                    schema: {
+                      type: "object",
+                      properties: {
+                        error: { type: "string", example: "Failed to fetch packets" }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    };
+
+    window.onload = () => {
+      SwaggerUIBundle({
+        spec,
+        dom_id: '#swagger-ui',
+        presets: [
+          SwaggerUIBundle.presets.apis,
+          SwaggerUIBundle.SwaggerUIStandalonePreset
+        ],
+        layout: "BaseLayout"
+      });
+    };
+  </script>
+</body>
+</html>

meshview/static/api-stats.html

@@ -0,0 +1,210 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8" />
+  <title>API Documentation - Packet Stats</title>
+  <link rel="stylesheet" href="https://unpkg.com/swagger-ui-dist/swagger-ui.css" />
+  <style>
+    body {
+      margin: 0;
+      background: #ffffff;
+      color: #000000;
+    }
+    #swagger-ui {
+      background: #ffffff;
+      color: #000000;
+    }
+
+    /* Override Swagger UI colors for white background */
+    .swagger-ui {
+      background-color: #ffffff !important;
+      color: #000000 !important;
+    }
+
+    .swagger-ui .topbar,
+    .swagger-ui .info,
+    .swagger-ui .opblock-summary-description,
+    .swagger-ui .parameters-col_description,
+    .swagger-ui .response-col_description {
+      color: #000000 !important;
+    }
+
+    .swagger-ui .opblock {
+      background-color: #f9f9f9 !important;
+      border-color: #ddd !important;
+    }
+
+    .swagger-ui .opblock-summary {
+      background-color: #eaeaea !important;
+      color: #000 !important;
+    }
+
+    .swagger-ui .opblock-section-header {
+      color: #000 !important;
+    }
+
+    .swagger-ui .parameters,
+    .swagger-ui .response {
+      background-color: #fafafa !important;
+      color: #000 !important;
+    }
+
+    .swagger-ui table {
+      color: #000 !important;
+    }
+
+    .swagger-ui a {
+      color: #1a0dab !important; /* classic link blue */
+    }
+
+    .swagger-ui input,
+    .swagger-ui select,
+    .swagger-ui textarea {
+      background-color: #fff !important;
+      color: #000 !important;
+      border: 1px solid #ccc !important;
+    }
+  </style>
+</head>
+<body>
+  <div id="swagger-ui"></div>
+
+  <script src="https://unpkg.com/swagger-ui-dist/swagger-ui-bundle.js"></script>
+  <script>
+    const spec = {
+      openapi: "3.0.0",
+      info: {
+        title: "Packet Statistics API",
+        version: "1.0.0",
+        description: "API for retrieving packet statistics over a given period with optional filters."
+      },
+      paths: {
+        "/api/stats": {
+          get: {
+            summary: "Get packet statistics",
+            description: "Returns packet statistics for a given period type and length, with optional filters.",
+            parameters: [
+              {
+                name: "period_type",
+                in: "query",
+                required: false,
+                description: "Type of period to group by (`hour` or `day`). Default is `hour`.",
+                schema: {
+                  type: "string",
+                  enum: ["hour", "day"]
+                }
+              },
+              {
+                name: "length",
+                in: "query",
+                required: false,
+                description: "Number of periods to include. Default is 24.",
+                schema: {
+                  type: "integer",
+                  default: 24
+                }
+              },
+              {
+                name: "channel",
+                in: "query",
+                required: false,
+                description: "Filter by channel name.",
+                schema: {
+                  type: "string"
+                }
+              },
+              {
+                name: "portnum",
+                in: "query",
+                required: false,
+                description: "Filter by port number.",
+                schema: {
+                  type: "integer"
+                }
+              },
+              {
+                name: "to_node",
+                in: "query",
+                required: false,
+                description: "Filter by destination node ID.",
+                schema: {
+                  type: "integer"
+                }
+              },
+              {
+                name: "from_node",
+                in: "query",
+                required: false,
+                description: "Filter by source node ID.",
+                schema: {
+                  type: "integer"
+                }
+              }
+            ],
+            responses: {
+              "200": {
+                description: "Successful response",
+                content: {
+                  "application/json": {
+                    schema: {
+                      type: "object",
+                      properties: {
+                        hourly: {
+                          type: "object",
+                          properties: {
+                            period_type: { type: "string" },
+                            length: { type: "integer" },
+                            filters: { type: "object" },
+                            data: {
+                              type: "array",
+                              items: {
+                                type: "object",
+                                properties: {
+                                  period: { type: "string", example: "2025-08-06 19:00" },
+                                  node_id: { type: "integer" },
+                                  long_name: { type: "string" },
+                                  short_name: { type: "string" },
+                                  packets: { type: "integer" }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              },
+              "400": {
+                description: "Invalid request parameters",
+                content: {
+                  "application/json": {
+                    schema: {
+                      type: "object",
+                      properties: {
+                        error: { type: "string" }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    };
+
+    window.onload = () => {
+      SwaggerUIBundle({
+        spec,
+        dom_id: '#swagger-ui',
+        presets: [
+          SwaggerUIBundle.presets.apis,
+          SwaggerUIBundle.SwaggerUIStandalonePreset
+        ],
+        layout: "BaseLayout"
+      });
+    };
+  </script>
+</body>
+</html>

meshview/static/api.html

@@ -1,273 +1,91 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
-<meta charset="utf-8">
-<title>Meshview API Documentation</title>
-<style>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>API Index</title>
+  <style>
     body {
-        background: #121212;
-        color: #eee;
-        font-family: monospace;
-        margin: 20px;
-        line-height: 1.5;
+      font-family: Arial, sans-serif;
+      background-color: #1e1e1e;
+      color: #eaeaea;
+      margin: 0;
+      padding: 0;
     }
-    h1, h2, h3 { color: #79c0ff; }
-    code {
-        background: #1e1e1e;
-        padding: 3px 6px;
-        border-radius: 4px;
-        color: #ffd479;
-        font-size: 0.95rem;
+    header {
+      background: #2a2a2a;
+      padding: 20px;
+      text-align: center;
+      font-size: 1.6em;
+      font-weight: bold;
     }
-    .endpoint {
-        border: 1px solid #333;
-        padding: 12px;
-        margin-bottom: 18px;
-        border-radius: 8px;
-        background: #1a1a1a;
+    .container {
+      max-width: 800px;
+      margin: 30px auto;
+      padding: 20px;
     }
-    .method {
-        display: inline-block;
-        padding: 2px 8px;
-        border-radius: 4px;
-        margin-right: 6px;
-        font-weight: bold;
+    ul {
+      list-style: none;
+      padding: 0;
     }
-    .get { background: #0066cc; }
-    .path { font-weight: bold; color: #fff; }
-    table {
-        width: 100%;
-        border-collapse: collapse;
-        margin-top: 8px;
+    li {
+      background: #272b2f;
+      border: 1px solid #474b4e;
+      padding: 15px 20px;
+      margin-bottom: 15px;
+      border-radius: 10px;
+      transition: background 0.2s;
     }
-    th, td {
-        border: 1px solid #444;
-        padding: 6px 10px;
+    li:hover {
+      background: #33383d;
     }
-    th {
-        background: #222;
-        color: #9ddcff;
+    a {
+      color: #4cafef;
+      text-decoration: none;
+      font-weight: bold;
+      font-size: 1.1em;
     }
-    .example {
-        margin-top: 10px;
-        padding: 10px;
-        background: #161616;
-        border-radius: 6px;
-        border: 1px solid #333;
+    p {
+      margin: 8px 0 0 0;
+      font-size: 0.9em;
+      color: #bbbbbb;
     }
-</style>
+  </style>
 </head>
-
 <body>
 
-<h1>Meshview API Documentation</h1>
-<p>This page describes all REST endpoints provided by Meshview.</p>
+<header>
+  API Index
+</header>
 
-
-<!------------------------------ NODES ------------------------------>
-<h2>/api/nodes</h2>
-
-<div class="endpoint">
-    <span class="method get">GET</span>
-    <span class="path">/api/nodes</span>
-    <p>Returns a list of mesh nodes.</p>
-
-    <h3>Query Parameters</h3>
-    <table>
-        <tr><th>Parameter</th><th>Description</th></tr>
-        <tr><td>role</td><td>Filter by node role</td></tr>
-        <tr><td>channel</td><td>Filter by channel</td></tr>
-        <tr><td>hw_model</td><td>Hardware model filter</td></tr>
-        <tr><td>days_active</td><td>Only nodes seen within X days</td></tr>
-    </table>
-
-    <div class="example">
-        <b>Example:</b><br>
-        <code>/api/nodes?days_active=3</code>
-    </div>
+<div class="container">
+  <ul>
+    <li>
+      <a href="/api-chat">Chat API</a>
+      <p> View chat messages.</p>
+    </li>
+    <li>
+      <a href="/api-nodes">Node API</a>
+      <p>Retrieve node information.</p>
+    </li>
+    <li>
+      <a href="/api-packets">Packet API</a>
+      <p>Access raw packet data.</p>
+    </li>
+    <li>
+      <a href="/api-stats">Statistics API </a>
+      <p>View system and traffic statistics.</p>
+    </li>
+    <li>
+      <a href="/api-edges">Edges API</a>
+      <p>Get edges details.</p>
+    </li>
+    <li>
+      <a href="/api-config">Configuration API</a>
+      <p>Get and update configuration details.</p>
+    </li>
+  </ul>
 </div>
 
-
-<!------------------------------ PACKETS ------------------------------>
-<h2>/api/packets</h2>
-
-<div class="endpoint">
-    <span class="method get">GET</span>
-    <span class="path">/api/packets</span>
-    <p>Fetch packets with many filters. Returns decoded packet data.</p>
-
-    <h3>Query Parameters</h3>
-    <table>
-        <tr><th>Parameter</th><th>Description</th></tr>
-        <tr><td>packet_id</td><td>Return exactly one packet</td></tr>
-        <tr><td>limit</td><td>Max number of results (1–100)</td></tr>
-        <tr><td>since</td><td>Only packets newer than import_time_us</td></tr>
-        <tr><td>from_node_id</td><td>Filter by sender node</td></tr>
-        <tr><td>to_node_id</td><td>Filter by destination node</td></tr>
-        <tr><td>node_id</td><td>Legacy: match either from or to</td></tr>
-        <tr><td>portnum</td><td>Filter by port number</td></tr>
-        <tr><td>contains</td><td>Substring filter for payload</td></tr>
-    </table>
-
-    <div class="example">
-        <b>Example:</b><br>
-        <code>/api/packets?from_node_id=123&limit=100</code>
-    </div>
-</div>
-
-
-<!------------------------------ PACKETS SEEN ------------------------------>
-<h2>/api/packets_seen/{packet_id}</h2>
-
-<div class="endpoint">
-    <span class="method get">GET</span>
-    <span class="path">/api/packets_seen/&lt;packet_id&gt;</span>
-    <p>Returns list of gateways that heard the packet (RSSI/SNR/hops).</p>
-
-    <div class="example">
-        <b>Example:</b><br>
-        <code>/api/packets_seen/3314808102</code>
-    </div>
-</div>
-
-
-<!------------------------------ STATS ------------------------------>
-<h2>/api/stats</h2>
-
-<div class="endpoint">
-    <span class="method get">GET</span>
-    <span class="path">/api/stats</span>
-    <p>Returns aggregated packet statistics for a node or globally.</p>
-
-    <h3>Query Parameters</h3>
-    <table>
-        <tr><th>Parameter</th><th>Description</th></tr>
-        <tr><td>period_type</td><td>"hour" or "day"</td></tr>
-        <tr><td>length</td><td>How many hours/days</td></tr>
-        <tr><td>node</td><td>Node ID for combined sent+seen stats</td></tr>
-        <tr><td>from_node</td><td>Filter by sender</td></tr>
-        <tr><td>to_node</td><td>Filter by receiver</td></tr>
-        <tr><td>portnum</td><td>Filter by port</td></tr>
-        <tr><td>channel</td><td>Filter by channel</td></tr>
-    </table>
-
-    <div class="example">
-        <b>Example:</b><br>
-        <code>/api/stats?node=1128180332&period_type=day&length=1</code>
-    </div>
-</div>
-
-
-<!------------------------------ STATS COUNT ------------------------------>
-<h2>/api/stats/count</h2>
-
-<div class="endpoint">
-    <span class="method get">GET</span>
-    <span class="path">/api/stats/count</span>
-    <p>
-        Returns <b>total packets</b> and <b>total packet_seen entries</b>.
-        When no filters are provided, it returns global totals.
-        When filters are specified, they narrow the time, channel,
-        direction, or specific packet.
-    </p>
-
-    <h3>Query Parameters</h3>
-    <table>
-        <tr><th>Parameter</th><th>Description</th></tr>
-        <tr><td>period_type</td><td>"hour" or "day"</td></tr>
-        <tr><td>length</td><td>Number of hours or days (depends on period_type)</td></tr>
-        <tr><td>channel</td><td>Filter by channel</td></tr>
-        <tr><td>from_node</td><td>Only packets sent by this node</td></tr>
-        <tr><td>to_node</td><td>Only packets received by this node</td></tr>
-        <tr><td>packet_id</td><td>Filter seen counts for specific packet_id</td></tr>
-    </table>
-
-    <div class="example">
-        <b>Example:</b><br>
-        <code>/api/stats/count?from_node=1128180332&period_type=day&length=1</code>
-    </div>
-</div>
-
-
-
-<!------------------------------ EDGES ------------------------------>
-<h2>/api/edges</h2>
-
-<div class="endpoint">
-    <span class="method get">GET</span>
-    <span class="path">/api/edges</span>
-    <p>Returns traceroute and/or neighbor edges for graph rendering.</p>
-
-    <h3>Query Parameters</h3>
-    <table>
-        <tr><th>Parameter</th><th>Description</th></tr>
-        <tr><td>type</td><td>"traceroute", "neighbor", or omitted for both</td></tr>
-    </table>
-
-    <div class="example">
-        <b>Example:</b><br>
-        <code>/api/edges?type=neighbor</code>
-    </div>
-</div>
-
-
-<!------------------------------ CONFIG ------------------------------>
-<h2>/api/config</h2>
-
-<div class="endpoint">
-    <span class="method get">GET</span>
-    <span class="path">/api/config</span>
-    <p>Returns Meshview configuration (site, MQTT, cleanup, etc.).</p>
-
-    <div class="example">
-        <code>/api/config</code>
-    </div>
-</div>
-
-
-<!------------------------------ LANG ------------------------------>
-<h2>/api/lang</h2>
-
-<div class="endpoint">
-    <span class="method get">GET</span>
-    <span class="path">/api/lang</span>
-    <p>Returns translated text for the UI.</p>
-
-    <h3>Parameters</h3>
-    <table>
-        <tr><th>lang</th><td>Language code (e.g. "en")</td></tr>
-        <tr><th>section</th><td>Optional UI section (firehose, map, top...)</td></tr>
-    </table>
-
-    <div class="example">
-        <code>/api/lang?lang=en&section=firehose</code>
-    </div>
-</div>
-
-
-<!------------------------------ HEALTH ------------------------------>
-<h2>/health</h2>
-
-<div class="endpoint">
-    <span class="method get">GET</span>
-    <span class="path">/health</span>
-    <p>Returns API + database status.</p>
-</div>
-
-
-<!------------------------------ VERSION ------------------------------>
-<h2>/version</h2>
-
-<div class="endpoint">
-    <span class="method get">GET</span>
-    <span class="path">/version</span>
-    <p>Returns Meshview version and Git revision.</p>
-</div>
-
-
-<br><br>
-<hr>
-<p style="text-align:center; color:#666;">Meshview API — generated documentation</p>
-
 </body>
 </html>

meshview/static/kiosk.html

@@ -44,7 +44,6 @@ body { margin: 0; font-family: monospace; background: #121212; color: #eee; }
 
 <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js" crossorigin></script>
 <script src="https://unpkg.com/leaflet-polylinedecorator@1.6.0/dist/leaflet.polylinedecorator.js" crossorigin></script>
-<script src="/static/portmaps.js"></script>
 
 <script>
 (async function(){
@@ -76,8 +75,8 @@ body { margin: 0; font-family: monospace; background: #121212; color: #eee; }
         return color;
     }
 
-    function timeAgoFromUs(us){
-        const diff = Date.now() - (us / 1000);
+    function timeAgo(dateStr){
+        const diff = Date.now() - new Date(dateStr);
         const s=Math.floor(diff/1000), m=Math.floor(s/60), h=Math.floor(m/60), d=Math.floor(h/24);
         if(d>0) return d+'d'; if(h>0) return h+'h'; if(m>0) return m+'m'; return s+'s';
     }
@@ -98,7 +97,7 @@ body { margin: 0; font-family: monospace; background: #121212; color: #eee; }
     const channels = new Set();
     const activeBlinks = new Map();
 
-    const portMap = window.PORT_LABEL_MAP;
+    const portMap = {1:"Text",67:"Telemetry",3:"Position",70:"Traceroute",4:"Node Info",71:"Neighbour Info",73:"Map Report"};
 
     nodes.forEach(node=>{
         if(isInvalidCoord(node)) return;
@@ -119,7 +118,7 @@ body { margin: 0; font-family: monospace; background: #121212; color: #eee; }
                           <b>Channel:</b> ${node.channel}<br>
                           <b>Model:</b> ${node.hw_model}<br>
                           <b>Role:</b> ${node.role}<br>`;
-        if(node.last_seen_us) popupContent+=`<b>Last seen:</b> ${timeAgoFromUs(node.last_seen_us)}<br>`;
+        if(node.last_update) popupContent+=`<b>Last seen:</b> ${timeAgo(node.last_update)}<br>`;
         if(node.firmware) popupContent+=`<b>Firmware:</b> ${node.firmware}<br>`;
 
         marker.on('click', e=>{
@@ -191,51 +190,32 @@ body { margin: 0; font-family: monospace; background: #121212; color: #eee; }
         activeBlinks.set(marker,interval);
     }
 
-    let lastImportTimeUs = null;
-
+    let lastImportTime=null;
     async function fetchLatestPacket(){
         try{
-            const res = await fetch(`/api/packets?limit=1`);
-            const data = await res.json();
-            lastImportTimeUs = data.packets?.[0]?.import_time_us || 0;
-        }catch(err){
-            console.error(err);
-        }
+            const res=await fetch(`/api/packets?limit=1`);
+            const data=await res.json();
+            lastImportTime=data.packets?.[0]?.import_time || new Date().toISOString();
+        }catch(err){ console.error(err); }
     }
 
     async function fetchNewPackets(){
-        if (!lastImportTimeUs) return;
-
+        if(!lastImportTime) return;
         try{
-            const res = await fetch(`/api/packets?since=${lastImportTimeUs}`);
-            const data = await res.json();
+            const res=await fetch(`/api/packets?since=${lastImportTime}`);
+            const data=await res.json();
             if(!data.packets || !data.packets.length) return;
-
-            let latest = lastImportTimeUs;
-
-            data.packets.forEach(packet => {
-
-                // Track newest microsecond timestamp
-                if (packet.import_time_us && packet.import_time_us > latest) {
-                    latest = packet.import_time_us;
-                }
-
-                // Look up marker and blink it
-                const marker = markerById[packet.from_node_id];
-                const nodeData = nodeMap.get(packet.from_node_id);
-                if (marker && nodeData) {
-                    blinkNode(marker, nodeData.long_name, packet.portnum);
-                }
+            let latest=lastImportTime;
+            data.packets.forEach(packet=>{
+                if(packet.import_time && packet.import_time>latest) latest=packet.import_time;
+                const marker=markerById[packet.from_node_id];
+                const nodeData=nodeMap.get(packet.from_node_id);
+                if(marker && nodeData) blinkNode(marker,nodeData.long_name,packet.portnum);
             });
-
-            lastImportTimeUs = latest;
-
-        }catch(err){
-            console.error(err);
-        }
+            lastImportTime=latest;
+        }catch(err){ console.error(err); }
     }
 
-
     if(mapInterval>0){ fetchLatestPacket(); setInterval(fetchNewPackets,mapInterval*1000); }
 
 })();

meshview/static/live-map.html

@@ -0,0 +1,209 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8" />
+<title>Mesh Nodes Live Map</title>
+<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" />
+<style>
+  body { margin: 0; }
+  #map { height: 100vh; width: 100%; }
+
+  #legend {
+    position: absolute; bottom: 10px; right: 10px;
+    background: rgba(0,0,0,0.7);
+    color: white; padding: 8px 12px;
+    font-family: monospace; font-size: 13px;
+    border-radius: 5px; z-index: 1000;
+  }
+  .legend-item { display: flex; align-items: center; margin-bottom: 4px; }
+  .legend-color { width: 16px; height: 16px; margin-right: 6px; border-radius: 4px; }
+
+  .pulse-label span {
+    background: rgba(0,0,0,0.6);
+    padding: 2px 4px;
+    border-radius: 3px;
+    pointer-events: none;
+    font-family: monospace;
+    font-size: 12px;
+  }
+</style>
+</head>
+<body>
+<div id="map"></div>
+<div id="legend"></div>
+
+<script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"></script>
+<script>
+const map = L.map("map");
+L.tileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", { maxZoom: 19, attribution: "© OpenStreetMap" }).addTo(map);
+
+const nodeMarkers = new Map();
+let lastPacketTime = null;
+
+const portColors = {
+  1:"red",
+  67:"cyan",
+  3:"orange",
+  70:"purple",
+  4:"yellow",
+  71:"brown",
+  73:"pink"
+};
+const portLabels = {
+  1:"Text",
+  67:"Telemetry",
+  3:"Position",
+  70:"Traceroute",
+  4:"Node Info",
+  71:"Neighbour Info",
+  73:"Map Report"
+};
+function getPulseColor(portnum) { return portColors[portnum] || "green"; }
+
+// Legend
+const legend = document.getElementById("legend");
+for (const [port, color] of Object.entries(portColors)) {
+  const item = document.createElement("div");
+  item.className = "legend-item";
+  const colorBox = document.createElement("div");
+  colorBox.className = "legend-color";
+  colorBox.style.background = color;
+  const label = document.createElement("span");
+  label.textContent = `${portLabels[port] || "Custom"} (${port})`;
+  item.appendChild(colorBox);
+  item.appendChild(label);
+  legend.appendChild(item);
+}
+
+// Pulse marker
+function pulseMarker(marker, highlightColor = "red") {
+  if (!marker || marker.activePulse) return;
+  marker.activePulse = true;
+
+  const originalColor = marker.options.originalColor;
+  const originalRadius = marker.options.originalRadius;
+  marker.bringToFront();
+
+  const nodeInfo = marker.options.nodeInfo || {};
+  const portLabel = marker.currentPortLabel || "";
+  const displayName = `${nodeInfo.long_name || nodeInfo.short_name || "Unknown"}${portLabel ? ` (<i>${portLabel}</i>)` : ""}`;
+
+  marker.bindTooltip(displayName, {
+    permanent: true,
+    direction: 'top',
+    className: 'pulse-label',
+    offset: [0, -10],
+    html: true
+  }).openTooltip();
+
+  const flashDuration = 2000, fadeDuration = 1000, flashInterval = 100, maxRadius = originalRadius + 5;
+  let flashTime = 0;
+
+  const flashTimer = setInterval(() => {
+    flashTime += flashInterval;
+    const isOn = (flashTime / flashInterval) % 2 === 0;
+    marker.setStyle({ fillColor: isOn ? highlightColor : originalColor, radius: isOn ? maxRadius : originalRadius });
+
+    if (flashTime >= flashDuration) {
+      clearInterval(flashTimer);
+      const fadeStart = performance.now();
+      function fade(now) {
+        const t = Math.min((now - fadeStart) / fadeDuration, 1);
+        const radius = originalRadius + (maxRadius - originalRadius) * (1 - t);
+        marker.setStyle({ fillColor: highlightColor, radius: radius, fillOpacity: 1 });
+        if (t < 1) requestAnimationFrame(fade);
+        else {
+          marker.setStyle({ fillColor: originalColor, radius: originalRadius, fillOpacity: 1 });
+          marker.unbindTooltip();
+          marker.activePulse = false;
+        }
+      }
+      requestAnimationFrame(fade);
+    }
+  }, flashInterval);
+}
+
+// --- Load nodes ---
+async function loadNodes() {
+  try {
+    const res = await fetch("/api/nodes");
+    if (!res.ok) throw new Error(`HTTP error ${res.status}`);
+    const data = await res.json();
+    const nodes = data.nodes || [];
+
+    nodes.forEach(node => {
+      const lat = node.last_lat / 1e7;
+      const lng = node.last_long / 1e7;
+      if (lat && lng && !isNaN(lat) && !isNaN(lng)) {
+        const color = "blue";
+        const marker = L.circleMarker([lat,lng], {
+          radius:7, color:"white", fillColor:color, fillOpacity:1, weight:0.7
+        }).addTo(map);
+        marker.options.originalColor = color;
+        marker.options.originalRadius = 7;
+        marker.options.nodeInfo = node;
+        marker.bindPopup(`<b>${node.long_name||node.short_name||"Unknown"}</b><br>ID: ${node.node_id}<br>Role: ${node.role}`);
+        nodeMarkers.set(node.node_id, marker);
+      } else {
+        nodeMarkers.set(node.node_id, {options:{nodeInfo:node}});
+      }
+    });
+
+    const markersWithCoords = Array.from(nodeMarkers.values()).filter(m=>m instanceof L.CircleMarker);
+    if(markersWithCoords.length>0) await setMapBoundsFromConfig();
+    else map.setView([37.77,-122.42],9);
+
+  } catch(err){
+    console.error("Failed to load nodes:", err);
+  }
+}
+
+// --- Map bounds ---
+async function setMapBoundsFromConfig() {
+  try {
+    const res = await fetch("/api/config");
+    const config = await res.json();
+    const topLat = parseFloat(config.site.map_top_left_lat);
+    const topLon = parseFloat(config.site.map_top_left_lon);
+    const bottomLat = parseFloat(config.site.map_bottom_right_lat);
+    const bottomLon = parseFloat(config.site.map_bottom_right_lon);
+
+    if ([topLat, topLon, bottomLat, bottomLon].some(v => isNaN(v))) {
+      throw new Error("Map bounds contain NaN");
+    }
+
+    map.fitBounds([[topLat, topLon], [bottomLat, bottomLon]]);
+  } catch(err) {
+    console.error("Failed to load map bounds from config:", err);
+    map.setView([37.77,-122.42],9);
+  }
+}
+
+// --- Poll packets ---
+async function pollPackets() {
+  try {
+    let url = "/api/packets?limit=10";
+    if (lastPacketTime) url += `&since=${lastPacketTime}`;
+    const res = await fetch(url);
+    if (!res.ok) throw new Error(`HTTP error ${res.status}`);
+    const data = await res.json();
+    const packets = data.packets || [];
+    if (packets.length) lastPacketTime = packets[0].import_time;
+
+    packets.forEach(pkt => {
+      const marker = nodeMarkers.get(pkt.from_node_id);
+      if (marker instanceof L.CircleMarker) { // only real markers
+        marker.currentPortLabel = portLabels[pkt.portnum] || `${pkt.portnum}`;
+        pulseMarker(marker, getPulseColor(pkt.portnum));
+      }
+    });
+  } catch(err){
+    console.error("Failed to fetch packets:", err);
+  }
+}
+
+// --- Initialize ---
+loadNodes().then(() => setInterval(pollPackets, 1000));
+</script>
+</body>
+</html>

meshview/static/portmaps.js

@@ -1,77 +0,0 @@
-// Shared port label/color definitions for UI pages.
-// Port numbers defined in: https://github.com/meshtastic/protobufs/blob/master/meshtastic/portnums.proto
-window.PORT_LABEL_MAP = {
-    0: "Unknown",
-    1: "Text",
-    2: "Remote Hardware",
-    3: "Position",
-    4: "Node Info",
-    5: "Routing",
-    6: "Admin",
-    7: "Text (Compressed)",
-    8: "Waypoint",
-    9: "Audio",
-    10: "Detection Sensor",
-    11: "Alert",
-    12: "Key Verification",
-    32: "Reply",
-    33: "IP Tunnel",
-    34: "Paxcounter",
-    35: "Store Forward++",
-    36: "Node Status",
-    64: "Serial",
-    65: "Store & Forward",
-    66: "Range Test",
-    67: "Telemetry",
-    68: "ZPS",
-    69: "Simulator",
-    70: "Traceroute",
-    71: "Neighbor",
-    72: "ATAK",
-    73: "Map Report",
-    74: "Power Stress",
-    76: "Reticulum Tunnel",
-    77: "Cayenne",
-    256: "Private App",
-    257: "ATAK Forwarder",
-};
-
-window.PORT_COLOR_MAP = {
-    0: "#6c757d",   // gray - Unknown
-    1: "#1f77b4",   // blue - Text
-    2: "#795548",   // brown - Remote Hardware
-    3: "#2ca02c",   // green - Position
-    4: "#ffbf00",   // yellow - Node Info
-    5: "#ff7f0e",   // orange - Routing
-    6: "#20c997",   // teal - Admin
-    7: "#6a51a3",   // purple - Text (Compressed)
-    8: "#fd7e14",   // orange - Waypoint
-    9: "#e91e63",   // pink - Audio
-    10: "#ff9800",  // amber - Detection Sensor
-    11: "#f44336",  // bright red - Alert
-    12: "#9c27b0",  // purple - Key Verification
-    32: "#00bcd4",  // cyan - Reply
-    33: "#607d8b",  // blue-gray - IP Tunnel
-    34: "#8d6e63",  // brown-gray - Paxcounter
-    35: "#8bc34a",  // light green - Store Forward++
-    36: "#4caf50",  // green - Node Status
-    64: "#9e9e9e",  // gray - Serial
-    65: "#6610f2",  // indigo - Store & Forward
-    66: "#cddc39",  // lime - Range Test
-    67: "#17a2b8",  // info blue - Telemetry
-    68: "#3f51b5",  // indigo - ZPS
-    69: "#673ab7",  // deep purple - Simulator
-    70: "#f44336",  // bright red - Traceroute
-    71: "#e377c2",  // pink - Neighbor
-    72: "#2196f3",  // blue - ATAK
-    73: "#9999ff",  // light purple - Map Report
-    74: "#ff5722",  // deep orange - Power Stress
-    76: "#009688",  // teal - Reticulum Tunnel
-    77: "#4db6ac",  // teal accent - Cayenne
-    256: "#757575", // dark gray - Private App
-    257: "#1976d2", // blue - ATAK Forwarder
-};
-
-// Aliases for pages that expect different names.
-window.PORT_MAP = window.PORT_LABEL_MAP;
-window.PORT_COLORS = window.PORT_COLOR_MAP;

meshview/store.py

@@ -1,14 +1,11 @@
-import logging
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timedelta
 
-from sqlalchemy import Text, and_, cast, func, or_, select
+from sqlalchemy import and_, func, or_, select, text
 from sqlalchemy.orm import lazyload
 
 from meshview import database, models
 from meshview.models import Node, Packet, PacketSeen, Traceroute
 
-logger = logging.getLogger(__name__)
-
 
 async def get_node(node_id):
     async with database.async_session() as session:
@@ -30,12 +27,18 @@ async def get_fuzzy_nodes(query):
 async def get_packets(
     from_node_id=None,
     to_node_id=None,
-    node_id=None,  # legacy
+    node_id=None,  # legacy: match either from OR to
     portnum=None,
     after=None,
-    contains=None,  # substring search
+    contains=None,  # NEW: SQL-level substring match
     limit=50,
 ):
+    """
+    SQLAlchemy 2.0 async ORM version.
+    Supports strict from/to/node filtering, substring payload search,
+    portnum, since, and limit.
+    """
+
     async with database.async_session() as session:
         stmt = select(models.Packet)
         conditions = []
@@ -48,40 +51,36 @@ async def get_packets(
         if to_node_id is not None:
             conditions.append(models.Packet.to_node_id == to_node_id)
 
-        # Legacy node_id (either direction)
+        # Legacy node ID filter: match either direction
         if node_id is not None:
             conditions.append(
-                or_(
-                    models.Packet.from_node_id == node_id,
-                    models.Packet.to_node_id == node_id,
-                )
+                or_(models.Packet.from_node_id == node_id, models.Packet.to_node_id == node_id)
             )
 
         # Port filter
         if portnum is not None:
             conditions.append(models.Packet.portnum == portnum)
 
-        # Timestamp filter using microseconds
+        # Timestamp filter
         if after is not None:
             conditions.append(models.Packet.import_time_us > after)
 
-        # Case-insensitive substring search on payload (BLOB → TEXT)
+        # Case-insensitive substring search on UTF-8 payload (stored as BLOB)
         if contains:
-            contains_lower = f"%{contains.lower()}%"
-            payload_text = cast(models.Packet.payload, Text)
-            conditions.append(func.lower(payload_text).like(contains_lower))
+            contains_lower = contains.lower()
+            conditions.append(func.lower(models.Packet.payload).like(f"%{contains_lower}%"))
 
-        # Apply WHERE conditions
+        # Apply all conditions
         if conditions:
             stmt = stmt.where(and_(*conditions))
 
-        # Order by newest first
+        # Order newest → oldest
         stmt = stmt.order_by(models.Packet.import_time_us.desc())
 
-        # Limit
+        # Apply limit
         stmt = stmt.limit(limit)
 
-        # Run query
+        # Execute query
         result = await session.execute(stmt)
         return result.scalars().all()
 
@@ -95,10 +94,8 @@ async def get_packets_from(node_id=None, portnum=None, since=None, limit=500):
         if portnum:
             q = q.where(Packet.portnum == portnum)
         if since:
-            now_us = int(datetime.now().timestamp() * 1_000_000)
-            start_us = now_us - int(since.total_seconds() * 1_000_000)
-            q = q.where(Packet.import_time_us > start_us)
-        result = await session.execute(q.limit(limit).order_by(Packet.import_time_us.desc()))
+            q = q.where(Packet.import_time > (datetime.now() - since))
+        result = await session.execute(q.limit(limit).order_by(Packet.import_time.desc()))
         return result.scalars()
 
 
@@ -114,7 +111,7 @@ async def get_packets_seen(packet_id):
         result = await session.execute(
             select(PacketSeen)
             .where(PacketSeen.packet_id == packet_id)
-            .order_by(PacketSeen.import_time_us.desc())
+            .order_by(PacketSeen.import_time.desc())
         )
         return result.scalars()
 
@@ -135,21 +132,18 @@ async def get_traceroute(packet_id):
         result = await session.execute(
             select(Traceroute)
             .where(Traceroute.packet_id == packet_id)
-            .order_by(Traceroute.import_time_us)
+            .order_by(Traceroute.import_time)
         )
         return result.scalars()
 
 
 async def get_traceroutes(since):
-    if isinstance(since, datetime):
-        since_us = int(since.timestamp() * 1_000_000)
-    else:
-        since_us = int(since)
     async with database.async_session() as session:
         stmt = (
             select(Traceroute)
-            .where(Traceroute.import_time_us > since_us)
-            .order_by(Traceroute.import_time_us)
+            .join(Packet)
+            .where(Traceroute.import_time > since)
+            .order_by(Traceroute.import_time)
         )
         stream = await session.stream_scalars(stmt)
         async for tr in stream:
@@ -157,8 +151,6 @@ async def get_traceroutes(since):
 
 
 async def get_mqtt_neighbors(since):
-    now_us = int(datetime.now().timestamp() * 1_000_000)
-    start_us = now_us - int(since.total_seconds() * 1_000_000)
     async with database.async_session() as session:
         result = await session.execute(
             select(PacketSeen, Packet)
@@ -166,7 +158,7 @@ async def get_mqtt_neighbors(since):
             .where(
                 (PacketSeen.hop_limit == PacketSeen.hop_start)
                 & (PacketSeen.hop_start != 0)
-                & (PacketSeen.import_time_us > start_us)
+                & (PacketSeen.import_time > (datetime.now() - since))
             )
             .options(
                 lazyload(Packet.from_node),
@@ -179,9 +171,9 @@ async def get_mqtt_neighbors(since):
 async def get_total_node_count(channel: str = None) -> int:
     try:
         async with database.async_session() as session:
-            now_us = int(datetime.now(timezone.utc).timestamp() * 1_000_000)  # noqa: UP017
-            cutoff_us = now_us - 86400 * 1_000_000
-            q = select(func.count(Node.id)).where(Node.last_seen_us > cutoff_us)
+            q = select(func.count(Node.id)).where(
+                Node.last_update > datetime.now() - timedelta(days=1)
+            )
 
             if channel:
                 q = q.where(Node.channel == channel)
@@ -196,32 +188,26 @@ async def get_total_node_count(channel: str = None) -> int:
 async def get_top_traffic_nodes():
     try:
         async with database.async_session() as session:
-            now_us = int(datetime.now(timezone.utc).timestamp() * 1_000_000)  # noqa: UP017
-            cutoff_us = now_us - 86400 * 1_000_000
-            total_packets_sent = func.count(func.distinct(Packet.id)).label("total_packets_sent")
-            total_times_seen = func.count(PacketSeen.packet_id).label("total_times_seen")
-
-            stmt = (
-                select(
-                    Node.node_id,
-                    Node.long_name,
-                    Node.short_name,
-                    Node.channel,
-                    total_packets_sent,
-                    total_times_seen,
-                )
-                .select_from(Node)
-                .outerjoin(
-                    Packet,
-                    (Packet.from_node_id == Node.node_id) & (Packet.import_time_us >= cutoff_us),
-                )
-                .outerjoin(PacketSeen, PacketSeen.packet_id == Packet.id)
-                .group_by(Node.node_id, Node.long_name, Node.short_name, Node.channel)
-                .having(total_packets_sent > 0)
-                .order_by(total_times_seen.desc())
+            result = await session.execute(
+                text("""
+                SELECT 
+                    n.node_id,
+                    n.long_name,
+                    n.short_name,
+                    n.channel,
+                    COUNT(DISTINCT p.id) AS total_packets_sent,
+                    COUNT(ps.packet_id) AS total_times_seen
+                FROM node n
+                LEFT JOIN packet p ON n.node_id = p.from_node_id
+                    AND p.import_time >= DATETIME('now', 'localtime', '-24 hours')
+                LEFT JOIN packet_seen ps ON p.id = ps.packet_id
+                GROUP BY n.node_id, n.long_name, n.short_name
+                HAVING total_packets_sent > 0
+                ORDER BY total_times_seen DESC;
+            """)
             )
 
-            rows = (await session.execute(stmt)).all()
+            rows = result.fetchall()
 
             nodes = [
                 {
@@ -244,42 +230,44 @@ async def get_top_traffic_nodes():
 async def get_node_traffic(node_id: int):
     try:
         async with database.async_session() as session:
-            now_us = int(datetime.now(timezone.utc).timestamp() * 1_000_000)  # noqa: UP017
-            cutoff_us = now_us - 86400 * 1_000_000
-            packet_count = func.count().label("packet_count")
-
-            stmt = (
-                select(Node.long_name, Packet.portnum, packet_count)
-                .select_from(Packet)
-                .join(Node, Packet.from_node_id == Node.node_id)
-                .where(Node.node_id == node_id)
-                .where(Packet.import_time_us >= cutoff_us)
-                .group_by(Node.long_name, Packet.portnum)
-                .order_by(packet_count.desc())
+            result = await session.execute(
+                text("""
+                    SELECT 
+                        node.long_name, packet.portnum, 
+                        COUNT(*) AS packet_count
+                    FROM packet
+                    JOIN node ON packet.from_node_id = node.node_id
+                    WHERE node.node_id = :node_id 
+                    AND packet.import_time >= DATETIME('now', 'localtime', '-24 hours') 
+                    GROUP BY packet.portnum
+                    ORDER BY packet_count DESC;
+                """),
+                {"node_id": node_id},
             )
 
-            result = await session.execute(stmt)
-            return [
+            # Map the result to include node.long_name and packet data
+            traffic_data = [
                 {
-                    "long_name": row.long_name,
-                    "portnum": row.portnum,
-                    "packet_count": row.packet_count,
+                    "long_name": row[0],  # node.long_name
+                    "portnum": row[1],  # packet.portnum
+                    "packet_count": row[2],  # COUNT(*) as packet_count
                 }
                 for row in result.all()
             ]
 
+            return traffic_data
+
     except Exception as e:
         # Log the error or handle it as needed
         print(f"Error fetching node traffic: {str(e)}")
         return []
 
 
-async def get_nodes(node_id=None, role=None, channel=None, hw_model=None, days_active=None):
+async def get_nodes(role=None, channel=None, hw_model=None, days_active=None):
     """
     Fetches nodes from the database based on optional filtering criteria.
 
     Parameters:
-        node_id
         role (str, optional): The role of the node (converted to uppercase for consistency).
         channel (str, optional): The communication channel associated with the node.
         hw_model (str, optional): The hardware model of the node.
@@ -295,12 +283,6 @@ async def get_nodes(node_id=None, role=None, channel=None, hw_model=None, days_a
             query = select(Node)
 
             # Apply filters based on provided parameters
-            if node_id is not None:
-                try:
-                    node_id_int = int(node_id)
-                except (TypeError, ValueError):
-                    node_id_int = node_id
-                query = query.where(Node.node_id == node_id_int)
             if role is not None:
                 query = query.where(Node.role == role.upper())  # Ensure role is uppercase
             if channel is not None:
@@ -309,12 +291,10 @@ async def get_nodes(node_id=None, role=None, channel=None, hw_model=None, days_a
                 query = query.where(Node.hw_model == hw_model)
 
             if days_active is not None:
-                now_us = int(datetime.now(timezone.utc).timestamp() * 1_000_000)  # noqa: UP017
-                cutoff_us = now_us - int(timedelta(days_active).total_seconds() * 1_000_000)
-                query = query.where(Node.last_seen_us > cutoff_us)
+                query = query.where(Node.last_update > datetime.now() - timedelta(days_active))
 
-            # Exclude nodes with missing last_seen_us
-            query = query.where(Node.last_seen_us.is_not(None))
+            # Exclude nodes where last_update is an empty string
+            query = query.where(Node.last_update != "")
 
             # Order results by long_name in ascending order
             query = query.order_by(Node.short_name.asc())
@@ -325,7 +305,7 @@ async def get_nodes(node_id=None, role=None, channel=None, hw_model=None, days_a
             return nodes  # Return the list of nodes
 
     except Exception:
-        logger.exception("error reading DB")
+        print("error reading DB")  # Consider using logging instead of print
         return []  # Return an empty list in case of failure
 
 
@@ -337,36 +317,22 @@ async def get_packet_stats(
     to_node: int | None = None,
     from_node: int | None = None,
 ):
-    now = datetime.now(timezone.utc)  # noqa: UP017
+    now = datetime.now()
 
     if period_type == "hour":
         start_time = now - timedelta(hours=length)
-        time_format_sqlite = "%Y-%m-%d %H:00"
-        time_format_pg = "YYYY-MM-DD HH24:00"
+        time_format = '%Y-%m-%d %H:00'
     elif period_type == "day":
         start_time = now - timedelta(days=length)
-        time_format_sqlite = "%Y-%m-%d"
-        time_format_pg = "YYYY-MM-DD"
+        time_format = '%Y-%m-%d'
     else:
         raise ValueError("period_type must be 'hour' or 'day'")
 
     async with database.async_session() as session:
-        dialect = session.get_bind().dialect.name
-        if dialect == "postgresql":
-            period_expr = func.to_char(
-                func.to_timestamp(Packet.import_time_us / 1_000_000.0),
-                time_format_pg,
-            )
-        else:
-            period_expr = func.strftime(
-                time_format_sqlite,
-                func.datetime(Packet.import_time_us / 1_000_000, "unixepoch"),
-            )
-
         q = select(
-            period_expr.label("period"),
-            func.count().label("count"),
-        ).where(Packet.import_time_us >= int(start_time.timestamp() * 1_000_000))
+            func.strftime(time_format, Packet.import_time).label('period'),
+            func.count().label('count'),
+        ).where(Packet.import_time >= start_time)
 
         # Filters
         if channel:

meshview/templates/chat.html

@@ -53,9 +53,8 @@
 
     <!-- ⭐ CHAT TITLE WITH ICON, aligned to container ⭐ -->
     <div class="container px-2">
-        <h2 style="color:white; margin:0 0 10px 0;">
-            <span class="icon">💬</span>
-            <span data-translate="chat_title"></span>
+        <h2 data-translate="chat_title" style="color:white; margin:0 0 10px 0;">
+            💬 Chat
         </h2>
     </div>
 
@@ -72,45 +71,24 @@ document.addEventListener("DOMContentLoaded", async () => {
     const packetMap = new Map();
     let chatLang = {};
 
-    /* ==========================================================
-       TRANSLATIONS FOR CHAT PAGE
-       ========================================================== */
-    function applyTranslations(dict, root=document) {
+    function applyTranslations(dict, root = document) {
         root.querySelectorAll("[data-translate]").forEach(el => {
             const key = el.dataset.translate;
             const val = dict[key];
             if (!val) return;
             if (el.placeholder) el.placeholder = val;
+            else if (el.tagName === "INPUT" && el.value) el.value = val;
+            else if (key === "footer") el.innerHTML = val;
             else el.textContent = val;
         });
     }
 
-    async function loadChatLang() {
-        try {
-            const cfg = await window._siteConfigPromise;
-            const langCode = cfg?.site?.language || "en";
-            const res = await fetch(`/api/lang?lang=${langCode}&section=chat`);
-            chatLang = await res.json();
-
-            // Apply to existing DOM
-            applyTranslations(chatLang);
-        } catch (err) {
-            console.error("Chat translation load failed:", err);
-        }
-    }
-
-    /* ==========================================================
-       SAFE HTML
-       ========================================================== */
     function escapeHtml(text) {
         const div = document.createElement("div");
         div.textContent = text ?? "";
         return div.innerHTML;
     }
 
-    /* ==========================================================
-       RENDERING PACKETS
-       ========================================================== */
     function renderPacket(packet, highlight = false) {
         if (renderedPacketIds.has(packet.id)) return;
         renderedPacketIds.add(packet.id);
@@ -161,31 +139,20 @@ document.addEventListener("DOMContentLoaded", async () => {
         const div = document.createElement("div");
         div.className = "row chat-packet" + (highlight ? " flash" : "");
         div.dataset.packetId = packet.id;
-
         div.innerHTML = `
-            <span class="col-2 timestamp" title="${packet.import_time_us}">
-                ${formattedTimestamp}
-            </span>
-
+            <span class="col-2 timestamp" title="${packet.import_time_us}">${formattedTimestamp}</span>
             <span class="col-2 channel">
                 <a href="/packet/${packet.id}" title="${chatLang.view_packet_details || 'View details'}">🔎</a>
-                ${escapeHtml(packet.channel || "")}
+                 ${escapeHtml(packet.channel || "")}
             </span>
-
             <span class="col-3 nodename">
                 <a href="/node/${packet.from_node_id}">
                     ${escapeHtml((packet.long_name || "").trim() || `Node ${packet.from_node_id}`)}
                 </a>
             </span>
-
-            <span class="col-5 message">
-                ${escapeHtml(packet.payload)}${replyHtml}
-            </span>
+            <span class="col-5 message">${escapeHtml(packet.payload)}${replyHtml}</span>
         `;
-
         chatContainer.prepend(div);
-
-        // Translate newly added DOM
         applyTranslations(chatLang, div);
 
         if (highlight) setTimeout(() => div.classList.remove("flash"), 2500);
@@ -194,27 +161,26 @@ document.addEventListener("DOMContentLoaded", async () => {
     function renderPacketsEnsureDescending(packets, highlight=false) {
         if (!Array.isArray(packets) || packets.length===0) return;
         const sortedDesc = packets.slice().sort((a,b)=>{
-            const aTime = a.import_time_us || (new Date(a.import_time).getTime() * 1000);
-            const bTime = b.import_time_us || (new Date(b.import_time).getTime() * 1000);
+            const aTime =
+                (a.import_time_us && a.import_time_us > 0)
+                    ? a.import_time_us
+                    : (a.import_time ? new Date(a.import_time).getTime() * 1000 : 0);
+            const bTime =
+                (b.import_time_us && b.import_time_us > 0)
+                    ? b.import_time_us
+                    : (b.import_time ? new Date(b.import_time).getTime() * 1000 : 0);
             return bTime - aTime;
         });
-        for (let i=sortedDesc.length-1; i>=0; i--) {
-            renderPacket(sortedDesc[i], highlight);
-        }
+        for (let i=sortedDesc.length-1; i>=0; i--) renderPacket(sortedDesc[i], highlight);
     }
 
-    /* ==========================================================
-       FETCHING PACKETS
-       ========================================================== */
     async function fetchInitial() {
         try {
             const resp = await fetch("/api/packets?portnum=1&limit=100");
             const data = await resp.json();
             if (data?.packets?.length) renderPacketsEnsureDescending(data.packets);
             lastTime = data?.latest_import_time || lastTime;
-        } catch(err){
-            console.error("Initial fetch error:", err);
-        }
+        } catch(err){ console.error("Initial fetch error:", err); }
     }
 
     async function fetchUpdates() {
@@ -226,19 +192,21 @@ document.addEventListener("DOMContentLoaded", async () => {
             const data = await resp.json();
             if (data?.packets?.length) renderPacketsEnsureDescending(data.packets, true);
             lastTime = data?.latest_import_time || lastTime;
-        } catch(err){
-            console.error("Fetch updates error:", err);
-        }
+        } catch(err){ console.error("Fetch updates error:", err); }
     }
 
-    /* ==========================================================
-       INIT
-       ========================================================== */
-    await loadChatLang();     // load translations FIRST
-    await fetchInitial();     // then fetch initial packets
+    async function loadChatLang() {
+        try {
+            const cfg = await window._siteConfigPromise;
+            const langCode = cfg?.site?.language || "en";
+            const res = await fetch(`/api/lang?lang=${langCode}&section=chat`);
+            chatLang = await res.json();
+            applyTranslations(chatLang);
+        } catch(err){ console.error("Chat translation load failed:", err); }
+    }
 
+    await Promise.all([loadChatLang(), fetchInitial()]);
     setInterval(fetchUpdates, 5000);
 });
 </script>
-
 {% endblock %}

meshview/templates/firehose.html

@@ -12,16 +12,6 @@
     border-radius: 6px;
 }
 
-.port-tag {
-    display: inline-block;
-    padding: 2px 6px;
-    border-radius: 6px;
-    font-size: 0.75rem;
-    font-weight: 500;
-    color: #fff;
-}
-
-/* Packet table */
 .packet-table {
     width: 100%;
     border-collapse: collapse;
@@ -41,7 +31,6 @@
 .packet-table tr:nth-of-type(odd) { background-color: #272b2f; }
 .packet-table tr:nth-of-type(even) { background-color: #212529; }
 
-/* Port tag */
 .port-tag {
     display: inline-block;
     padding: 1px 6px;
@@ -50,22 +39,29 @@
     font-weight: 500;
     color: #fff;
 }
+.port-0  { background-color: #6c757d; }
+.port-1  { background-color: #007bff; }
+.port-3  { background-color: #28a745; }
+.port-4  { background-color: #ffc107; }
+.port-5  { background-color: #dc3545; }
+.port-6  { background-color: #20c997; }
+.port-65 { background-color: #ff66b3; }
+.port-67 { background-color: #17a2b8; }
+.port-70 { background-color: #6f42c1; }
+.port-71 { background-color: #fd7e14; }
 
 .to-mqtt { font-style: italic; color: #aaa; }
 
-/* Payload rows */
 .payload-row { display: none; background-color: #1b1e22; }
 .payload-cell {
     padding: 8px 12px;
     font-family: monospace;
     white-space: pre-wrap;
     color: #b0bec5;
+    border-top: none;
 }
-.packet-table tr.expanded + .payload-row {
-    display: table-row;
-}
+.packet-table tr.expanded + .payload-row { display: table-row; }
 
-/* Toggle arrow */
 .toggle-btn {
     cursor: pointer;
     color: #aaa;
@@ -74,7 +70,7 @@
 }
 .toggle-btn:hover { color: #fff; }
 
-/* Inline link next to port tag */
+/* Link next to port tag */
 .inline-link {
     margin-left: 6px;
     font-weight: bold;
@@ -88,16 +84,9 @@
 
 {% block body %}
 <div class="container">
-
     <form class="d-flex align-items-center justify-content-between mb-3">
-        <h2 class="mb-0" data-translate-lang="live_feed">📡 Live Feed</h2>
-
-        <button type="button"
-                id="pause-button"
-                class="btn btn-sm btn-outline-secondary"
-                data-translate-lang="pause">
-            Pause
-        </button>
+        <h5 class="mb-0" data-translate-lang="live_feed">📡 Live Feed</h5>
+        <button type="button" id="pause-button" class="btn btn-sm btn-outline-secondary" data-translate-lang="pause">Pause</button>
     </form>
 
     <table class="packet-table">
@@ -112,82 +101,90 @@
         </thead>
         <tbody id="packet_list"></tbody>
     </table>
-
 </div>
 
-<script src="/static/portmaps.js"></script>
 <script>
-/* ======================================================
-   FIREHOSE TRANSLATION SYSTEM (isolated from base)
-   ====================================================== */
+let lastImportTimeUs = null;
+let updatesPaused = false;
+let nodeMap = {};
+let updateInterval = 3000;
 let firehoseTranslations = {};
 
-function applyTranslationsFirehose(translations, root=document) {
-    root
-      .querySelectorAll("[data-translate-lang]")
-      .forEach(el => {
-          const key = el.dataset.translateLang;
-          if (!translations[key]) return;
-
-          if (el.tagName === "INPUT" && el.placeholder !== undefined) {
-              el.placeholder = translations[key];
-          } else {
-              el.textContent = translations[key];
-          }
-      });
+function applyTranslations(translations, root=document) {
+    root.querySelectorAll("[data-translate-lang]").forEach(el => {
+        const key = el.dataset.translateLang;
+        if (translations[key]) el.textContent = translations[key];
+    });
 }
 
-async function loadTranslationsFirehose() {
+async function loadTranslations() {
     try {
         const cfg = await window._siteConfigPromise;
-        const lang = cfg?.site?.language || "en";
-
-        const res = await fetch(`/api/lang?lang=${lang}&section=firehose`);
+        const langCode = cfg?.site?.language || "en";
+        const res = await fetch(`/api/lang?lang=${langCode}&section=firehose`);
         firehoseTranslations = await res.json();
-
-        applyTranslationsFirehose(firehoseTranslations);
+        applyTranslations(firehoseTranslations, document);
     } catch (err) {
         console.error("Firehose translation load failed:", err);
     }
 }
 
-/* ======================================================
-   NODE LOOKUP
-   ====================================================== */
-let nodeMap = {};
+const PORT_MAP = {
+    0: "UNKNOWN APP",
+    1: "Text Message",
+    3: "Position",
+    4: "Node Info",
+    5: "Routing",
+    6: "Administration",
+    8: "Waypoint",
+    65: "Store Forward",
+    67: "Telemetry",
+    70: "Trace Route",
+    71: "Neighbor Info",
+};
 
+const PORT_COLORS = {
+    0: "#6c757d",
+    1: "#007bff",
+    3: "#28a745",
+    4: "#ffc107",
+    5: "#dc3545",
+    6: "#20c997",
+    65: "#6610f2",
+    67: "#17a2b8",
+    68: "#fd7e14",
+    69: "#6f42c1",
+    70: "#ff4444",
+    71: "#ff66cc",
+    72: "#00cc99",
+    73: "#9999ff",
+    74: "#cc00cc",
+    75: "#ffbb33",
+    76: "#00bcd4",
+    77: "#8bc34a",
+    78: "#795548"
+};
+
+// Load node names
 async function loadNodes() {
-    try {
-        const res = await fetch("/api/nodes");
-        const data = await res.json();
-
-        for (const n of data.nodes || []) {
-            nodeMap[n.node_id] = n.long_name || n.short_name || n.id || n.node_id;
-        }
-
-        nodeMap[4294967295] = firehoseTranslations.all_broadcast || "All";
-    } catch (err) {
-        console.error("Failed loading nodes:", err);
+    const res = await fetch("/api/nodes");
+    if (!res.ok) return;
+    const data = await res.json();
+    for (const n of data.nodes || []) {
+        nodeMap[n.node_id] = n.long_name || n.short_name || n.id || n.node_id;
     }
+    nodeMap[4294967295] = "All";
 }
 
 function nodeName(id) {
+    if (id === 4294967295) return `<span class="to-mqtt">All</span>`;
     return nodeMap[id] || id;
 }
 
-/* ======================================================
-   PORT COLORS & NAMES
-   ====================================================== */
-const PORT_MAP = window.PORT_MAP || {};
-const PORT_COLORS = window.PORT_COLORS || {};
-
 function portLabel(portnum, payload, linksHtml) {
     const name = PORT_MAP[portnum] || "Unknown";
     const color = PORT_COLORS[portnum] || "#6c757d";
-
-    const safePayload = payload
-        ? payload.replace(/"/g, "&quot;")
-        : "";
+    const safePayload = payload ? payload.replace(/"/g, "&quot;") : "";
 
     return `
         <span class="port-tag" style="background-color:${color}" title="${safePayload}">
@@ -198,70 +195,31 @@ function portLabel(portnum, payload, linksHtml) {
     `;
 }
 
-/* ======================================================
-   TIME FORMAT
-   ====================================================== */
-function formatTimes(importTimeUs) {
-    const ms = Number(importTimeUs) / 1000;
-    if (!Number.isFinite(ms)) {
-        return { local: "—", utc: "—", epoch: "—" };
-    }
+function formatLocalTime(importTimeUs) {
+    const ms = importTimeUs / 1000;
     const date = new Date(ms);
-    const local = date.toLocaleTimeString([], {
-        hour: "2-digit",
-        minute: "2-digit",
-        second: "2-digit",
-        timeZoneName: "short"
-    });
-    const utc = date.toLocaleTimeString([], {
-        hour: "2-digit",
-        minute: "2-digit",
-        second: "2-digit",
-        timeZone: "UTC",
-        timeZoneName: "short"
-    });
-    return { local, utc, epoch: String(importTimeUs) };
+    return date.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit", second: "2-digit" });
 }
 
-function logPacketTimes(packet) {
-    const times = formatTimes(packet.import_time_us);
-    console.log(
-        "[firehose] packet time",
-        "id=" + packet.id,
-        "epoch_us=" + times.epoch,
-        "local=" + times.local,
-        "utc=" + times.utc
-    );
-}
-
-/* ======================================================
-   FIREHOSE FETCHING
-   ====================================================== */
-let lastImportTimeUs = null;
-let updatesPaused = false;
-let updateInterval = 3000;
-
 async function configureFirehose() {
     try {
         const cfg = await window._siteConfigPromise;
-        const sec = cfg?.site?.firehose_interval;
-        if (sec && !isNaN(sec)) updateInterval = sec * 1000;
-    } catch {}
+        const intervalSec = cfg?.site?.firehose_interval;
+        if (intervalSec && !isNaN(intervalSec)) updateInterval = parseInt(intervalSec) * 1000;
+    } catch (err) {
+        console.warn("Failed to read firehose interval:", err);
+    }
 }
 
 async function fetchUpdates() {
     if (updatesPaused) return;
-
     const url = new URL("/api/packets", window.location.origin);
-    url.searchParams.set("limit", 100);
-
-    if (lastImportTimeUs)
-        url.searchParams.set("since", lastImportTimeUs);
+    if (lastImportTimeUs) url.searchParams.set("since", lastImportTimeUs);
+    url.searchParams.set("limit", 50);
 
     try {
         const res = await fetch(url);
         if (!res.ok) return;
-
         const data = await res.json();
         const packets = data.packets || [];
         if (!packets.length) return;
@@ -269,35 +227,19 @@ async function fetchUpdates() {
         const list = document.getElementById("packet_list");
 
         for (const pkt of packets.reverse()) {
-            logPacketTimes(pkt);
+            const from = pkt.from_node_id === 4294967295
+                ? `<span class="to-mqtt">All</span>`
+                : `<a href="/node/${pkt.from_node_id}" style="text-decoration:underline; color:inherit;">${nodeMap[pkt.from_node_id] || pkt.from_node_id}</a>`;
 
-            /* FROM — includes translation */
-            const from =
-                pkt.from_node_id === 4294967295
-                    ? `<span class="to-mqtt" data-translate-lang="all_broadcast">
-                           ${firehoseTranslations.all_broadcast || "All"}
-                       </span>`
-                    : `<a href="/node/${pkt.from_node_id}" style="text-decoration:underline; color:inherit;">
-                           ${nodeMap[pkt.from_node_id] || pkt.from_node_id}
-                       </a>`;
-
-            /* TO — includes translation */
-            const to =
-                pkt.to_node_id === 1
-                    ? `<span class="to-mqtt" data-translate-lang="direct_to_mqtt">
-                           ${firehoseTranslations.direct_to_mqtt || "direct to MQTT"}
-                       </span>`
-                    : pkt.to_node_id === 4294967295
-                    ? `<span class="to-mqtt" data-translate-lang="all_broadcast">
-                           ${firehoseTranslations.all_broadcast || "All"}
-                       </span>`
-                    : `<a href="/node/${pkt.to_node_id}" style="text-decoration:underline; color:inherit;">
-                           ${nodeMap[pkt.to_node_id] || pkt.to_node_id}
-                       </a>`;
+            const to = pkt.to_node_id === 1
+                ? `<span class="to-mqtt">direct to MQTT</span>`
+                : pkt.to_node_id === 4294967295
+                ? `<span class="to-mqtt">All</span>`
+                : `<a href="/node/${pkt.to_node_id}" style="text-decoration:underline; color:inherit;">${nodeMap[pkt.to_node_id] || pkt.to_node_id}</a>`;
 
+            // Inline link next to port tag
             let inlineLinks = "";
 
-            // Position link
             if (pkt.portnum === 3 && pkt.payload) {
                 const latMatch = pkt.payload.match(/latitude_i:\s*(-?\d+)/);
                 const lonMatch = pkt.payload.match(/longitude_i:\s*(-?\d+)/);
@@ -305,59 +247,36 @@ async function fetchUpdates() {
                 if (latMatch && lonMatch) {
                     const lat = parseInt(latMatch[1]) / 1e7;
                     const lon = parseInt(lonMatch[1]) / 1e7;
-                    inlineLinks += ` <a class="inline-link"
-                                        href="https://www.google.com/maps?q=${lat},${lon}"
-                                        target="_blank">📍</a>`;
+                    inlineLinks += ` <a class="inline-link" href="https://www.google.com/maps?q=${lat},${lon}" target="_blank">📍</a>`;
                 }
             }
 
-            // Traceroute link
             if (pkt.portnum === 70) {
                 let traceId = pkt.id;
                 const match = pkt.payload.match(/ID:\s*(\d+)/i);
                 if (match) traceId = match[1];
 
-                inlineLinks += ` <a class="inline-link"
-                                    href="/graph/traceroute/${traceId}"
-                                    target="_blank">⮕</a>`;
+                inlineLinks += ` <a class="inline-link" href="/graph/traceroute/${traceId}" target="_blank">⮕</a>`;
             }
 
-            const safePayload = (pkt.payload || "")
-                .replace(/</g, "&lt;")
-                .replace(/>/g, "&gt;");
+            const safePayload = (pkt.payload || "").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+            const localTime = formatLocalTime(pkt.import_time_us);
 
             const html = `
-<tr class="packet-row">
-
-    <td>
-        ${formatTimes(pkt.import_time_us).local}<br>
-    </td>
-
-    <td>
-        <span class="toggle-btn">▶</span>
-        <a href="/packet/${pkt.id}"
-           style="text-decoration:underline; color:inherit;">
-            ${pkt.id}
-        </a>
-    </td>
-
+<tr class="packet-row" data-id="${pkt.id}">
+    <td>${localTime}</td>
+    <td><span class="toggle-btn">▶</span> <a href="/packet/${pkt.id}" style="text-decoration:underline; color:inherit;">${pkt.id}</a></td>
     <td>${from}</td>
     <td>${to}</td>
     <td>${portLabel(pkt.portnum, pkt.payload, inlineLinks)}</td>
-
 </tr>
-
 <tr class="payload-row">
     <td colspan="5" class="payload-cell">${safePayload}</td>
-</tr>
-`;
-
+</tr>`;
             list.insertAdjacentHTML("afterbegin", html);
         }
 
-        // Limit table size
         while (list.rows.length > 400) list.deleteRow(-1);
-
         lastImportTimeUs = packets[packets.length - 1].import_time_us;
 
     } catch (err) {
@@ -365,40 +284,29 @@ async function fetchUpdates() {
     }
 }
 
-/* ======================================================
-   INITIALIZE PAGE
-   ====================================================== */
+// --- Initialize ---
 document.addEventListener("DOMContentLoaded", async () => {
-
     const pauseBtn = document.getElementById("pause-button");
-
     pauseBtn.addEventListener("click", () => {
         updatesPaused = !updatesPaused;
-
-        pauseBtn.textContent =
-            updatesPaused
-                ? (firehoseTranslations.resume || "Resume")
-                : (firehoseTranslations.pause || "Pause");
+        pauseBtn.textContent = updatesPaused
+            ? (firehoseTranslations.resume || "Resume")
+            : (firehoseTranslations.pause || "Pause");
     });
 
-    document.addEventListener("click", e => {
+    document.addEventListener("click", (e) => {
         const btn = e.target.closest(".toggle-btn");
         if (!btn) return;
-
         const row = btn.closest(".packet-row");
         row.classList.toggle("expanded");
-
-        btn.textContent =
-            row.classList.contains("expanded") ? "▼" : "▶";
+        btn.textContent = row.classList.contains("expanded") ? "▼" : "▶";
     });
 
-    await loadTranslationsFirehose();
+    await loadTranslations();
     await configureFirehose();
     await loadNodes();
-
     fetchUpdates();
     setInterval(fetchUpdates, updateInterval);
 });
 </script>
-
 {% endblock %}

meshview/templates/map.html

@@ -7,244 +7,59 @@
 <style>
     .legend { background:white;padding:8px;line-height:1.5;border-radius:5px;box-shadow:0 0 10px rgba(0,0,0,0.3);font-size:14px;color:black; }
     .legend i { width:12px;height:12px;display:inline-block;margin-right:6px;border-radius:50%; }
-
     #filter-container { text-align:center;margin-top:10px; }
     .filter-checkbox { margin:0 10px; }
-
-    #share-button,
-    #reset-filters-button {
+    #share-button, #reset-filters-button {
         padding:5px 15px;border:none;border-radius:4px;font-size:14px;cursor:pointer;color:white;
     }
     #share-button { margin-left:20px; background-color:#4CAF50; }
     #share-button:hover { background-color:#45a049; }
     #share-button:active { background-color:#3d8b40; }
-
     #reset-filters-button { margin-left:10px; background-color:#f44336; }
     #reset-filters-button:hover { background-color:#da190b; }
     #reset-filters-button:active { background-color:#c41e0d; }
-
     .blinking-tooltip { background:white;color:black;border:1px solid black;border-radius:4px;padding:2px 5px; }
-
-    #map-wrapper {
-        position: relative;
-        width: 100%;
-        height: calc(100vh - 270px);
-    }
-    #map {
-        width: 100%;
-        height: 100%;
-    }
-    #unmapped-packets {
-        position: absolute;
-        bottom: 30px;
-        right: 15px;
-        z-index: 600;
-        width: 220px;
-        padding: 6px 8px;
-        background: rgba(255, 255, 255, 0.95);
-        border: 1px solid #ddd;
-        border-radius: 6px;
-        font-size: 12px;
-        text-align: left;
-        box-shadow: 0 0 10px rgba(0,0,0,0.2);
-        pointer-events: auto;
-    }
-    #unmapped-packets h3 {
-        margin: 0 0 6px;
-        font-size: 12px;
-        font-weight: 600;
-        color: #000;
-    }
-    #unmapped-list {
-        list-style: none;
-        padding: 0;
-        margin: 0;
-        max-height: 120px;
-        overflow-y: auto;
-    }
-    #unmapped-list li {
-        display: flex;
-        gap: 6px;
-        padding: 3px 0;
-        border-bottom: 1px dotted #e0e0e0;
-    }
-    #unmapped-list li:last-child { border-bottom: none; }
-    .unmapped-node { font-weight: 400; color: #000; }
-    .unmapped-empty { color: #666; font-style: italic; }
 </style>
 {% endblock %}
 
 {% block body %}
-
-<div id="map-wrapper">
-    <div id="map"></div>
-
-    <div id="unmapped-packets">
-        <h3 data-translate-lang="unmapped_packets_title">Unmapped Packets</h3>  
-        <ul id="unmapped-list">
-            <li class="unmapped-empty" data-translate-lang="unmapped_packets_empty">
-                No recent unmapped packets.
-            </li>
-        </ul>
-    </div>
-</div>
-
-<div id="map-legend"
-     class="legend"
-     style="position:absolute;
-            bottom:30px;
-            right:15px;
-            z-index:500;
-            pointer-events:none;">
-    <div>
-        <i style="background:orange; width:15px; height:3px; border-radius:0;"></i>
-        <span data-translate-lang="legend_traceroute">Traceroute Path (arrowed)</span>
-    </div>
-
-    <div style="margin-top:6px;">
-        <i style="background:gray; width:15px; height:3px; border-radius:0;"></i>
-        <span data-translate-lang="legend_neighbor">Neighbor Link</span>
-    </div>
-</div>
-
+<div id="map" style="width:100%;height:calc(100vh - 270px)"></div>
 <div id="filter-container">
-    <input type="checkbox" class="filter-checkbox" id="filter-routers-only">
-    <span data-translate-lang="show_routers_only">Show Routers Only</span>
-    <input type="checkbox" class="filter-checkbox" id="filter-mqtt-only">
-    <span data-translate-lang="show_mqtt_only">Show MQTT Gateways Only</span>
+    <input type="checkbox" class="filter-checkbox" id="filter-routers-only"> Show Routers Only
 </div>
-
 <div style="text-align:center;margin-top:5px;">
-    <button id="share-button" onclick="shareCurrentView()" data-translate-lang="share_view">
-        🔗 Share This View
-    </button>
-    <button id="reset-filters-button" onclick="resetFiltersToDefaults()" data-translate-lang="reset_filters">
-        ↺ Reset Filters To Defaults
-    </button>
+    <button id="share-button" onclick="shareCurrentView()">🔗 Share This View</button>
+    <button id="reset-filters-button" onclick="resetFiltersToDefaults()">↺ Reset Filters To Defaults</button>
 </div>
 
 <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"
         integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo="
         crossorigin=""></script>
-
 <script src="https://unpkg.com/leaflet-polylinedecorator@1.6.0/dist/leaflet.polylinedecorator.js"
         integrity="sha384-FhPn/2P/fJGhQLeNWDn9B/2Gml2bPOrKJwFqJXgR3xOPYxWg5mYQ5XZdhUSugZT0"
         crossorigin></script>
-<script src="/static/portmaps.js"></script>
 
 <script>
-/* ======================================================
-   MAP PAGE TRANSLATION SYSTEM
-   ====================================================== */
-
-let mapTranslations = {};
-
-async function loadTranslationsMap() {
-    try {
-        const cfg = await window._siteConfigPromise;
-        const lang = cfg?.site?.language || "en";
-        const res  = await fetch(`/api/lang?lang=${lang}&section=map`);
-        mapTranslations = await res.json();
-        applyTranslationsMap();
-    } catch (err) {
-        console.error("Map translation load failed:", err);
-    }
-}
-
-function applyTranslationsMap(root = document) {
-    root.querySelectorAll("[data-translate-lang]").forEach(el => {
-        const key = el.dataset.translateLang;
-        const val = mapTranslations[key];
-        if (!val) return;
-
-        if (el.tagName === "INPUT" && el.placeholder !== undefined) {
-            el.placeholder = val;
-        } else {
-            el.textContent = val;
-        }
-    });
-}
-
-/* ======================================================
-   EXISTING MAP LOGIC
-   ====================================================== */
-
+// ---------------------- Map Initialization ----------------------
 var map = L.map('map');
-L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png',
-    { maxZoom:19, attribution:'&copy; OpenStreetMap' }).addTo(map);
+L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', { maxZoom:19, attribution:'&copy; OpenStreetMap' }).addTo(map);
 
-// Data structures
-var nodes = [], markers = {}, markerById = {}, nodeMap = new Map();
-var edgeLayer = L.layerGroup().addTo(map), selectedNodeId = null;
+// ---------------------- Globals ----------------------
+var nodes=[], markers={}, markerById={}, nodeMap = new Map();
+var edgesData=[], edgeLayer = L.layerGroup().addTo(map), selectedNodeId = null;
 var activeBlinks = new Map(), lastImportTime = null;
 var mapInterval = 0;
-var unmappedPackets = [];
-const UNMAPPED_LIMIT = 50;
-const UNMAPPED_TTL_MS = 5000;
-
-const portMap = window.PORT_LABEL_MAP;
-
-const palette = ["#e6194b","#4363d8","#f58231","#911eb4","#46f0f0","#f032e6","#bcf60c","#fabebe",
-                 "#008080","#e6beff","#9a6324","#fffac8","#800000","#aaffc3","#808000","#ffd8b1",
-                 "#000075","#808080"];
-
+const portMap = {1:"Text",67:"Telemetry",3:"Position",70:"Traceroute",4:"Node Info",71:"Neighbour Info",73:"Map Report"};
+const palette = ["#e6194b","#4363d8","#f58231","#911eb4","#46f0f0","#f032e6","#bcf60c","#fabebe","#008080","#e6beff","#9a6324","#fffac8","#800000","#aaffc3","#808000","#ffd8b1","#000075","#808080"];
 const colorMap = new Map(); let nextColorIndex = 0;
 const channelSet = new Set();
 
-map.on("popupopen", function (e) {
-    const popupEl = e.popup.getElement();
-    if (popupEl) applyTranslationsMap(popupEl);
-});
-
-function timeAgoFromUs(us){
-    const diff = Date.now() - (us / 1000);
-    const s = Math.floor(diff/1000), m = Math.floor(s/60),
-          h = Math.floor(m/60),       d = Math.floor(h/24);
-    return d>0?d+"d":h>0?h+"h":m>0?m+"m":s+"s";
-}
-
-function hashToColor(str){
-    if(colorMap.has(str)) return colorMap.get(str);
-    const c = palette[nextColorIndex++ % palette.length];
-    colorMap.set(str,c);
-    return c;
-}
-
-function hashToUnit(str){
-    let h = 2166136261;
-    for(let i=0;i<str.length;i++){
-        h ^= str.charCodeAt(i);
-        h = Math.imul(h, 16777619);
-    }
-    return (h >>> 0) / 0xffffffff;
-}
-
-function jitterLatLng(lat, lon, key){
-    const meters = 15; // small, visually separates overlaps
-    const angle = hashToUnit(String(key)) * Math.PI * 2;
-    const r = meters * (0.3 + 0.7 * hashToUnit(`r:${key}`));
-    const dLat = (r * Math.cos(angle)) / 111320;
-    const dLon = (r * Math.sin(angle)) / (111320 * Math.cos(lat * Math.PI / 180));
-    return [lat + dLat, lon + dLon];
-}
-
-function isInvalidCoord(n){
-    return !n || !n.lat || !n.long || n.lat === 0 || n.long === 0 ||
-           Number.isNaN(n.lat) || Number.isNaN(n.long);
-}
-
-function getNodeLatLng(n){
-    const marker = markerById[n.key];
-    if(marker){
-        return marker.getLatLng();
-    }
-    return { lat: n.lat, lng: n.long };
-}
-
-/* ======================================================
-   PACKET FETCHING (unchanged)
-   ====================================================== */
+// ---------------------- Helpers ----------------------
+function timeAgo(date){ const diff=Date.now()-new Date(date), s=Math.floor(diff/1000), m=Math.floor(s/60), h=Math.floor(m/60), d=Math.floor(h/24); return d>0?d+"d":h>0?h+"h":m>0?m+"m":s+"s"; }
+function hashToColor(str){ if(colorMap.has(str)) return colorMap.get(str); const c=palette[nextColorIndex++%palette.length]; colorMap.set(str,c); return c; }
+function isInvalidCoord(n){ return !n||!n.lat||!n.long||n.lat===0||n.long===0||Number.isNaN(n.lat)||Number.isNaN(n.long); }
 
+// ---------------------- Packet Fetching ----------------------
 function fetchLatestPacket(){
     fetch(`/api/packets?limit=1`)
       .then(r=>r.json())
@@ -257,7 +72,6 @@ function fetchLatestPacket(){
 function fetchNewPackets(){
     if(mapInterval <= 0) return;
     if(lastImportTime===null) return;
-
     const url = new URL(`/api/packets`, window.location.origin);
     url.searchParams.set("since", lastImportTime);
     url.searchParams.set("limit", 50);
@@ -267,26 +81,19 @@ function fetchNewPackets(){
       .then(data=>{
           if(!data.packets || data.packets.length===0) return;
           let latest = lastImportTime;
-
           data.packets.forEach(pkt=>{
               if(pkt.import_time_us > latest) latest = pkt.import_time_us;
-
               const marker = markerById[pkt.from_node_id];
               const nodeData = nodeMap.get(pkt.from_node_id);
-              if(marker && nodeData) {
-                  blinkNode(marker,nodeData.long_name,pkt.portnum);
-              } else {
-                  addUnmappedPacket(pkt, nodeData);
-              }
+              if(marker && nodeData) blinkNode(marker,nodeData.long_name,pkt.portnum);
           });
-
           lastImportTime = latest;
       })
       .catch(console.error);
 }
 
+// ---------------------- Polling ----------------------
 let packetInterval=null;
-
 function startPacketFetcher(){
     if(mapInterval<=0) return;
     if(!packetInterval){
@@ -294,58 +101,65 @@ function startPacketFetcher(){
         packetInterval=setInterval(fetchNewPackets,mapInterval*1000);
     }
 }
-
 function stopPacketFetcher(){
     if(packetInterval){
         clearInterval(packetInterval);
         packetInterval=null;
     }
 }
-
 document.addEventListener("visibilitychange",()=>{
     document.hidden?stopPacketFetcher():startPacketFetcher();
 });
 
+// ---------------------- WAIT FOR CONFIG ----------------------
 async function waitForConfig() {
     while (typeof window._siteConfigPromise === "undefined") {
+        console.log("Waiting for _siteConfigPromise...");
         await new Promise(r => setTimeout(r, 100));
     }
+
     try {
         const cfg = await window._siteConfigPromise;
-        return cfg.site || {};
+        if (!cfg || !cfg.site) throw new Error("Config missing site object");
+        return cfg.site;
     } catch (err) {
         console.error("Error loading site config:", err);
         return {};
     }
 }
 
+// ---------------------- Load Config & Start Polling ----------------------
 async function initMapPolling() {
     try {
         const site = await waitForConfig();
         mapInterval = parseInt(site.map_interval, 10) || 0;
 
+        // ---- Check URL params ----
         const params = new URLSearchParams(window.location.search);
-        const lat  = parseFloat(params.get('lat'));
-        const lng  = parseFloat(params.get('lng'));
+        const lat = parseFloat(params.get('lat'));
+        const lng = parseFloat(params.get('lng'));
         const zoom = parseInt(params.get('zoom'), 10);
-
         if (!isNaN(lat) && !isNaN(lng) && !isNaN(zoom)) {
             map.setView([lat, lng], zoom);
             window.configBoundsApplied = true;
             setTimeout(() => map.invalidateSize(), 100);
         }
         else {
-            const tl = [parseFloat(site.map_top_left_lat), parseFloat(site.map_top_left_lon)];
-            const br = [parseFloat(site.map_bottom_right_lat), parseFloat(site.map_bottom_right_lon)];
-
-            if (tl.every(isFinite) && br.every(isFinite)) {
-                map.fitBounds([tl, br]);
+            const topLeft = [parseFloat(site.map_top_left_lat), parseFloat(site.map_top_left_lon)];
+            const bottomRight = [parseFloat(site.map_bottom_right_lat), parseFloat(site.map_bottom_right_lon)];
+            if (topLeft.every(isFinite) && bottomRight.every(isFinite)) {
+                map.fitBounds([topLeft, bottomRight]);
                 window.configBoundsApplied = true;
                 setTimeout(() => map.invalidateSize(), 100);
             }
         }
 
-        if (mapInterval > 0) startPacketFetcher();
+        if (mapInterval > 0) {
+            console.log(`Starting map polling every ${mapInterval}s`);
+            startPacketFetcher();
+        } else {
+            console.log("Map polling disabled (map_interval=0)");
+        }
 
     } catch (err) {
         console.error("Failed to load /api/config:", err);
@@ -354,372 +168,169 @@ async function initMapPolling() {
 
 initMapPolling();
 
-/* ======================================================
-   LOAD NODES
-   ====================================================== */
-
-fetch('/api/nodes?days_active=3')
-    .then(r=>r.json())
-    .then(data=>{
-        if(!data.nodes) return;
-
-        nodes = data.nodes.map(n=>({
-            key: n.node_id ?? n.id,
-            id: n.id,
-            node_id: n.node_id,
-            lat: n.last_lat ? n.last_lat/1e7 : null,
-            long: n.last_long ? n.last_long/1e7 : null,
-            long_name: n.long_name || "",
-            short_name: n.short_name || "",
-            channel: n.channel || "",
-            hw_model: n.hw_model || "",
-            role: n.role || "",
-            firmware: n.firmware || "",
-            last_seen_us: n.last_seen_us || null,
-            is_mqtt_gateway: n.is_mqtt_gateway === true,
-            isRouter: (n.role||"").toLowerCase().includes("router")
-        }));
-
-        nodes.forEach(n=>{
-            nodeMap.set(n.key, n);
-            if(n.channel) channelSet.add(n.channel);
-        });
-
-        renderNodesOnMap();
-        createChannelFilters();
-    })
-    .catch(console.error);
-
-/* ======================================================
-   RENDER NODES
-   ====================================================== */
+// ---------------------- Load Nodes + Edges ----------------------
+fetch('/api/nodes?days_active=3').then(r=>r.json()).then(data=>{
+    if(!data.nodes) return;
+    nodes = data.nodes.map(n=>({
+        key: n.node_id!==null?n.node_id:n.id,
+        id: n.id,
+        node_id: n.node_id,
+        lat: n.last_lat?n.last_lat/1e7:null,
+        long: n.last_long?n.last_long/1e7:null,
+        long_name: n.long_name||"",
+        short_name: n.short_name||"",
+        channel: n.channel||"",
+        hw_model: n.hw_model||"",
+        role: n.role||"",
+        firmware: n.firmware||"",
+        last_update: n.last_update||"",
+        isRouter: n.role? n.role.toLowerCase().includes("router"):false
+    }));
+    nodes.forEach(n=>{ nodeMap.set(n.key,n); if(n.channel) channelSet.add(n.channel); });
+    renderNodesOnMap();
+    createChannelFilters();
+    return fetch('/api/edges');
+}).then(r=>r?r.json():null).then(data=>{
+    if(data && data.edges) edgesData=data.edges;
+}).catch(console.error);
 
+// ---------------------- Render Nodes ----------------------
 function renderNodesOnMap(){
+    const bounds = L.latLngBounds();
     nodes.forEach(node=>{
         if(isInvalidCoord(node)) return;
-
         const color = hashToColor(node.channel);
-
-        const [jLat, jLon] = jitterLatLng(node.lat, node.long, node.key);
-        const marker = L.circleMarker([jLat,jLon], {
-            radius: node.isRouter ? 9 : 7,
-            color: "white",
-            fillColor: color,
-            fillOpacity: 1,
-            weight: 0.7
-        }).addTo(map);
-
+        const opts = { radius: node.isRouter?9:7, color:"white", fillColor:color, fillOpacity:1, weight:0.7 };
+        const marker = L.circleMarker([node.lat,node.long],opts).addTo(map);
         marker.nodeId = node.key;
         marker.originalColor = color;
         markerById[node.key] = marker;
-
-        const popup = `
-            <b><a href="/node/${node.node_id}">${node.long_name}</a> (${node.short_name})</b><br>
-
-            <b data-translate-lang="channel_label"></b> ${node.channel}<br>
-            <b data-translate-lang="model_label"></b> ${node.hw_model}<br>
-            <b data-translate-lang="role_label"></b> ${node.role}<br>
-            <b data-translate-lang="mqtt_gateway"></b> ${
-                node.is_mqtt_gateway ? (mapTranslations.yes || "Yes") : (mapTranslations.no || "No")
-            }<br>
-
-            ${
-                node.last_seen_us
-                    ? `<b data-translate-lang="last_seen"></b> ${timeAgoFromUs(node.last_seen_us)}<br>`
-                    : ""
-            }
-
-            ${
-                node.firmware
-                    ? `<b data-translate-lang="firmware"></b> ${node.firmware}<br>`
-                    : ""
-            }
-        `;
-
-        marker.on('click', () => {
-            onNodeClick(node);
-            marker.bindPopup(popup).openPopup();
-        });
+        const popup = `<b><a href="/node/${node.node_id}">${node.long_name}</a> (${node.short_name})</b><br>
+                       <b>Channel:</b> ${node.channel}<br>
+                       <b>Model:</b> ${node.hw_model}<br>
+                       <b>Role:</b> ${node.role}<br>
+                       ${node.last_update? `<b>Last seen:</b> ${timeAgo(node.last_update)}<br>`:""}
+                       ${node.firmware? `<b>Firmware:</b> ${node.firmware}<br>`:""}`;
+        marker.on('click',()=>{ onNodeClick(node); marker.bindPopup(popup).openPopup(); setTimeout(()=>marker.closePopup(),3000); });
+        bounds.extend(marker.getLatLng());
     });
-
-    setTimeout(() => applyTranslationsMap(), 50);
-}
-
-/* ======================================================
-   UNMAPPED PACKETS LIST
-   ====================================================== */
-
-function addUnmappedPacket(pkt, nodeData){
-    if(nodeData && !isInvalidCoord(nodeData)) return;
-
-    const now = Date.now();
-    const entry = {
-        id: pkt.id,
-        key: `${pkt.id ?? "x"}-${pkt.import_time_us ?? now}-${Math.random().toString(16).slice(2)}`,
-        import_time_us: pkt.import_time_us || 0,
-        from_node_id: pkt.from_node_id,
-        long_name: pkt.long_name || (nodeData?.long_name || ""),
-        portnum: pkt.portnum,
-        payload: (pkt.payload || "").trim(),
-        expires_at: now + UNMAPPED_TTL_MS
-    };
-
-    unmappedPackets.unshift(entry);
-    pruneUnmappedPackets(now);
-    if(unmappedPackets.length > UNMAPPED_LIMIT){
-        unmappedPackets = unmappedPackets.slice(0, UNMAPPED_LIMIT);
+    if(!window.configBoundsApplied && bounds.isValid()){
+        map.fitBounds(bounds);
+        setTimeout(()=>map.invalidateSize(),100);
     }
-    renderUnmappedPackets();
-
-    setTimeout(() => {
-        pruneUnmappedPackets(Date.now());
-        renderUnmappedPackets();
-    }, UNMAPPED_TTL_MS + 50);
 }
 
-function pruneUnmappedPackets(now){
-    unmappedPackets = unmappedPackets.filter(p => p.expires_at > now);
-}
-
-function renderUnmappedPackets(){
-    pruneUnmappedPackets(Date.now());
-    const list = document.getElementById("unmapped-list");
-    list.innerHTML = "";
-
-    if(unmappedPackets.length === 0){
-        const empty = document.createElement("li");
-        empty.className = "unmapped-empty";
-        empty.dataset.translateLang = "unmapped_packets_empty";
-        empty.textContent = "No recent unmapped packets.";
-        list.appendChild(empty);
-        return;
-    }
-
-    unmappedPackets.forEach(p=>{
-        const li = document.createElement("li");
-
-        const node = document.createElement("span");
-        node.className = "unmapped-node";
-        const type = portMap[p.portnum] || `Port ${p.portnum ?? "?"}`;
-        const name = p.long_name || `Node ${p.from_node_id ?? "?"}`;
-        node.textContent = `${name} (${type})`;
-
-        li.appendChild(node);
-        list.appendChild(li);
-    });
-}
-
-/* ======================================================
-   ⭐ NEW: DYNAMIC EDGE LOADING
-   ====================================================== */
-
-async function onNodeClick(node){
+// ---------------------- Render Edges ----------------------
+function onNodeClick(node){
     selectedNodeId = node.key;
     edgeLayer.clearLayers();
-
-    try {
-        const res = await fetch(`/api/edges?node_id=${node.key}`);
-        const data = await res.json();
-        const edges = data.edges || [];
-
-        edges.forEach(edge=>{
-            const f = nodeMap.get(edge.from);
-            const t = nodeMap.get(edge.to);
-
-            if(!f || !t || isInvalidCoord(f) || isInvalidCoord(t)) return;
-
-            const color = edge.type === "neighbor" ? "gray" : "orange";
-            const fLatLng = getNodeLatLng(f);
-            const tLatLng = getNodeLatLng(t);
-            const line  = L.polyline([[fLatLng.lat, fLatLng.lng], [tLatLng.lat, tLatLng.lng]], {
-                color, weight: 3
-            }).addTo(edgeLayer);
-
-            if(edge.type === "traceroute"){
-                L.polylineDecorator(line, {
-                    patterns: [
-                        {
-                            offset: '100%',
-                            repeat: 0,
-                            symbol: L.Symbol.arrowHead({
-                                pixelSize:5,
-                                polygon:false,
-                                pathOptions:{stroke:true,color}
-                            })
-                        }
-                    ]
-                }).addTo(edgeLayer);
-            }
-        });
-
-    } catch(err){
-        console.error("Failed to load edges for node", node.key, err);
-    }
+    edgesData.forEach(edge=>{
+        if(edge.from!==node.key && edge.to!==node.key) return;
+        const f=nodeMap.get(edge.from), t=nodeMap.get(edge.to);
+        if(!f||!t||isInvalidCoord(f)||isInvalidCoord(t)) return;
+        const color=edge.type==="neighbor"?"gray":"orange";
+        const l=L.polyline([[f.lat,f.long],[t.lat,t.long]],{color,weight:3}).addTo(edgeLayer);
+        if(edge.type==="traceroute"){
+            L.polylineDecorator(l,{patterns:[{offset:'100%',repeat:0,symbol:L.Symbol.arrowHead({pixelSize:5,polygon:false,pathOptions:{stroke:true,color}})}]}).addTo(edgeLayer);
+        }
+    });
 }
+map.on('click',e=>{ if(!e.originalEvent.target.classList.contains('leaflet-interactive')){ edgeLayer.clearLayers(); selectedNodeId=null; } });
 
-map.on('click', e=>{
-    if(!e.originalEvent.target.classList.contains('leaflet-interactive')){
-        edgeLayer.clearLayers();
-        selectedNodeId=null;
-    }
-});
-
-/* ======================================================
-   BLINKING
-   ====================================================== */
-
+// ---------------------- Packet Blinking ----------------------
 function blinkNode(marker,longName,portnum){
     if(!map.hasLayer(marker)) return;
-
-    if(activeBlinks.has(marker)){
-        clearInterval(activeBlinks.get(marker));
-        marker.setStyle({ fillColor: marker.originalColor });
-        if(marker.tooltip) map.removeLayer(marker.tooltip);
-    }
-
-    let blinkCount = 0;
-    const tooltip = L.tooltip({
-        permanent:true,
-        direction:'top',
-        offset:[0,-marker.options.radius-5],
-        className:'blinking-tooltip'
-    })
-    .setContent(`${longName} (${portMap[portnum] || "Port "+portnum})`)
-    .setLatLng(marker.getLatLng())
-    .addTo(map);
-
+    if(activeBlinks.has(marker)){ clearInterval(activeBlinks.get(marker)); marker.setStyle({fillColor:marker.originalColor}); if(marker.tooltip) map.removeLayer(marker.tooltip); }
+    let blinkCount=0;
+    const portName = portMap[portnum]||`Port ${portnum}`;
+    const tooltip = L.tooltip({permanent:true,direction:'top',offset:[0,-marker.options.radius-5],className:'blinking-tooltip'})
+                     .setContent(`${longName} (${portName})`).setLatLng(marker.getLatLng()).addTo(map);
     marker.tooltip = tooltip;
-
     const interval = setInterval(()=>{
-        if(map.hasLayer(marker)){
-            marker.setStyle({
-                fillColor: blinkCount%2===0 ? 'yellow' : marker.originalColor
-            });
-            marker.bringToFront();
-        }
+        if(map.hasLayer(marker)){ marker.setStyle({fillColor: blinkCount%2===0?'yellow':marker.originalColor}); marker.bringToFront(); }
         blinkCount++;
-
-        if(blinkCount>7){
-            clearInterval(interval);
-            marker.setStyle({ fillColor: marker.originalColor });
-            map.removeLayer(tooltip);
-            activeBlinks.delete(marker);
-        }
-
+        if(blinkCount>7){ clearInterval(interval); marker.setStyle({fillColor:marker.originalColor}); map.removeLayer(tooltip); activeBlinks.delete(marker); }
     },500);
-
-    activeBlinks.set(marker, interval);
+    activeBlinks.set(marker,interval);
 }
 
-/* ======================================================
-   CHANNEL FILTERS
-   ====================================================== */
-
+// ---------------------- Channel Filters ----------------------
 function createChannelFilters(){
     const filterContainer = document.getElementById("filter-container");
-    const saved = JSON.parse(localStorage.getItem("mapFilters") || "{}");
+    const savedState = JSON.parse(localStorage.getItem("mapFilters") || "{}");
 
     channelSet.forEach(channel=>{
-        const cb=document.createElement("input");
-        cb.type="checkbox";
-        cb.className="filter-checkbox";
-        cb.id=`filter-channel-${channel}`;
-        cb.checked = saved[channel] !== false;
+        const checkbox = document.createElement("input");
+        checkbox.type = "checkbox";
+        checkbox.className = "filter-checkbox";
+        checkbox.id = `filter-channel-${channel}`;
+        checkbox.checked = savedState[channel] !== false;
+        checkbox.addEventListener("change", saveFiltersToLocalStorage);
+        checkbox.addEventListener("change", updateNodeVisibility);
+        filterContainer.appendChild(checkbox);
 
-        cb.addEventListener("change", saveFiltersToLocalStorage);
-        cb.addEventListener("change", updateNodeVisibility);
-
-        filterContainer.appendChild(cb);
-
-        const label=document.createElement("label");
-        label.htmlFor=cb.id;
-        label.innerText=channel;
+        const label = document.createElement("label");
+        label.htmlFor = checkbox.id;
+        label.innerText = channel;
         label.style.color = hashToColor(channel);
         filterContainer.appendChild(label);
     });
 
-    const routerOnly=document.getElementById("filter-routers-only");
-    const mqttOnly=document.getElementById("filter-mqtt-only");
-    routerOnly.checked = saved["routersOnly"] || false;
-    mqttOnly.checked = saved["mqttOnly"] || false;
-
+    const routerOnly = document.getElementById("filter-routers-only");
+    routerOnly.checked = savedState["routersOnly"] || false;
     routerOnly.addEventListener("change", saveFiltersToLocalStorage);
     routerOnly.addEventListener("change", updateNodeVisibility);
-    mqttOnly.addEventListener("change", saveFiltersToLocalStorage);
-    mqttOnly.addEventListener("change", updateNodeVisibility);
 
     updateNodeVisibility();
 }
 
 function saveFiltersToLocalStorage(){
     const state = {};
-    channelSet.forEach(ch=>{
-        state[ch] = document.getElementById(`filter-channel-${ch}`).checked;
+    channelSet.forEach(ch => {
+        const el = document.getElementById(`filter-channel-${ch}`);
+        state[ch] = el.checked;
     });
     state["routersOnly"] = document.getElementById("filter-routers-only").checked;
-    state["mqttOnly"] = document.getElementById("filter-mqtt-only").checked;
-
     localStorage.setItem("mapFilters", JSON.stringify(state));
 }
 
 function updateNodeVisibility(){
-    const routerOnly = document.getElementById("filter-routers-only").checked;
-    const mqttOnly = document.getElementById("filter-mqtt-only").checked;
-    const activeChannels = [...channelSet].filter(ch =>
-        document.getElementById(`filter-channel-${ch}`).checked
-    );
-
+    const showRoutersOnly = document.getElementById("filter-routers-only").checked;
+    const activeChannels = Array.from(channelSet).filter(ch=>document.getElementById(`filter-channel-${ch}`).checked);
     nodes.forEach(n=>{
         const marker = markerById[n.key];
         if(marker){
-            const visible =
-                (!routerOnly || n.isRouter) &&
-                (!mqttOnly || n.is_mqtt_gateway) &&
-                activeChannels.includes(n.channel);
-
-            visible ? map.addLayer(marker) : map.removeLayer(marker);
+            const visible = (!showRoutersOnly || n.isRouter) && activeChannels.includes(n.channel);
+            if(visible) map.addLayer(marker); else map.removeLayer(marker);
         }
     });
 }
 
-/* ======================================================
-   SHARE / RESET
-   ====================================================== */
-
+// ---------------------- Share / Reset ----------------------
 function shareCurrentView() {
-    const c = map.getCenter();
-    const url = `${window.location.origin}/map?lat=${c.lat.toFixed(6)}&lng=${c.lng.toFixed(6)}&zoom=${map.getZoom()}`;
+    const center = map.getCenter();
+    const zoom = map.getZoom();
+    const lat = center.lat.toFixed(6);
+    const lng = center.lng.toFixed(6);
 
-    navigator.clipboard.writeText(url).then(()=>{
-        const btn = document.getElementById('share-button');
-        const old = btn.textContent;
-        btn.textContent = '✓ ' + (mapTranslations.link_copied || 'Link Copied!');
-        btn.style.backgroundColor = '#2196F3';
-
-        setTimeout(()=>{
-            btn.textContent = old;
-            btn.style.backgroundColor = '#4CAF50';
+    const shareUrl = `${window.location.origin}/map?lat=${lat}&lng=${lng}&zoom=${zoom}`;
+    navigator.clipboard.writeText(shareUrl).then(() => {
+        const button = document.getElementById('share-button');
+        const originalText = button.textContent;
+        button.textContent = '✓ Link Copied!';
+        button.style.backgroundColor = '#2196F3';
+        setTimeout(() => {
+            button.textContent = originalText;
+            button.style.backgroundColor = '#4CAF50';
         }, 2000);
-    });
+    }).catch(() => alert('Share this link:\n' + shareUrl));
 }
 
 function resetFiltersToDefaults(){
     document.getElementById("filter-routers-only").checked = false;
-    document.getElementById("filter-mqtt-only").checked = false;
-    channelSet.forEach(ch => {
-        document.getElementById(`filter-channel-${ch}`).checked = true;
-    });
+    channelSet.forEach(ch=>document.getElementById(`filter-channel-${ch}`).checked = true);
     saveFiltersToLocalStorage();
     updateNodeVisibility();
 }
-
-/* ======================================================
-   TRANSLATION LOAD
-   ====================================================== */
-
-document.addEventListener("DOMContentLoaded", () => {
-    loadTranslationsMap();
-});
 </script>
-
 {% endblock %}

meshview/templates/net.html

@@ -23,29 +23,20 @@
 .channel { font-style: italic; color: #bbb; }
 .channel a { font-style: normal; color: #999; }
 
+@keyframes flash { 0% { background-color: #ffe066; } 100% { background-color: inherit; } }
+.chat-packet.flash { animation: flash 3.5s ease-out; }
+
+.replying-to { font-size: 0.8em; color: #aaa; margin-top: 2px; padding-left: 10px; }
+.replying-to .reply-preview { color: #aaa; }
+
 #weekly-message { margin: 15px 0; font-weight: bold; color: #ffeb3b; }
 #total-count { margin-bottom: 10px; font-style: italic; color: #ccc; }
 {% endblock %}
 
 {% block body %}
 <div class="container">
-    <!-- ⭐ NET TITLE WITH ICON ⭐ -->
-    <div class="container px-2">
-        <h2 style="color:white; margin:0 0 10px 0;">
-            <span class="icon">💬</span>
-            <span data-translate-lang="net_title"></span>
-        </h2>
-    </div>
-
-    <!-- Weekly network message -->
-    <div id="weekly-message"></div>
-
-
-    <!-- Total message count -->
-    <div id="total-count">
-        <span data-translate-lang="total_messages">Total messages:</span>
-        <span id="total-count-value">0</span>
-    </div>
+    <div id="weekly-message">Loading weekly message...</div>
+    <div id="total-count">Total messages: 0</div>
 
     <div id="chat-container">
         <div class="container" id="chat-log"></div>
@@ -54,180 +45,140 @@
 
 <script>
 document.addEventListener("DOMContentLoaded", async () => {
-
     const chatContainer = document.querySelector("#chat-log");
+    const totalCountEl = document.querySelector("#total-count");
     const weeklyMessageEl = document.querySelector("#weekly-message");
-    const totalCountValueEl = document.querySelector("#total-count-value");
-
-    if (!chatContainer || !weeklyMessageEl || !totalCountValueEl) {
-        console.error("Required elements missing");
+    if (!chatContainer || !totalCountEl || !weeklyMessageEl) {
+        console.error("Required elements not found");
         return;
     }
 
     const renderedPacketIds = new Set();
-    let netTranslations = {};
+    const packetMap = new Map();
+    let chatTranslations = {};
     let netTag = "";
 
-    /* -----------------------------------
-       Escape HTML safely
-    ----------------------------------- */
+    function updateTotalCount() {
+        totalCountEl.textContent = `Total messages: ${renderedPacketIds.size}`;
+    }
+
     function escapeHtml(text) {
         const div = document.createElement("div");
         div.textContent = text ?? "";
         return div.innerHTML;
     }
 
-    /* -----------------------------------
-       Apply translations
-    ----------------------------------- */
-    function applyTranslations(trans, root=document) {
+    function applyTranslations(translations, root = document) {
         root.querySelectorAll("[data-translate-lang]").forEach(el => {
             const key = el.dataset.translateLang;
-            if (trans[key]) el.textContent = trans[key];
+            if (translations[key]) el.textContent = translations[key];
         });
         root.querySelectorAll("[data-translate-lang-title]").forEach(el => {
             const key = el.dataset.translateLangTitle;
-            if (trans[key]) el.title = trans[key];
+            if (translations[key]) el.title = translations[key];
         });
     }
 
-    /* -----------------------------------
-       Update count
-    ----------------------------------- */
-    function updateTotalCount() {
-        totalCountValueEl.textContent = renderedPacketIds.size;
-    }
-
-    /* -----------------------------------
-       Render single packet
-    ----------------------------------- */
     function renderPacket(packet) {
         if (renderedPacketIds.has(packet.id)) return;
         renderedPacketIds.add(packet.id);
+        packetMap.set(packet.id, packet);
 
         const date = new Date(packet.import_time_us / 1000);
+        const formattedTime = date.toLocaleTimeString([], { hour: "numeric", minute: "2-digit", second: "2-digit", hour12: true });
+        const formattedDate = `${(date.getMonth() + 1).toString().padStart(2, "0")}/${date.getDate().toString().padStart(2, "0")}/${date.getFullYear()}`;
+        const formattedTimestamp = `${formattedTime} - ${formattedDate}`;
 
-        const timeStr = date.toLocaleTimeString([], {
-            hour: "numeric",
-            minute: "2-digit",
-            second: "2-digit",
-            hour12: true
-        });
-
-        const dateStr =
-            `${String(date.getMonth()+1).padStart(2,"0")}/`+
-            `${String(date.getDate()).padStart(2,"0")}/`+
-            date.getFullYear();
-
-        const timestamp = `${timeStr} - ${dateStr}`;
-
-        const fromName =
-            (packet.long_name || "").trim() ||
-            `${netTranslations.node_fallback} ${packet.from_node_id}`;
+        let replyHtml = "";
+        if (packet.reply_id) {
+            const parent = packetMap.get(packet.reply_id);
+            if (parent) {
+                replyHtml = `<div class="replying-to">
+                    <div class="reply-preview">
+                        <i data-translate-lang="replying_to"></i>
+                        <strong>${escapeHtml((parent.long_name || "").trim() || `Node ${parent.from_node_id}`)}</strong>:
+                        ${escapeHtml(parent.payload || "")}
+                    </div>
+                </div>`;
+            } else {
+                replyHtml = `<div class="replying-to">
+                    <i data-translate-lang="replying_to"></i>
+                    <a href="/packet/${packet.reply_id}">${packet.reply_id}</a>
+                </div>`;
+            }
+        }
 
         const div = document.createElement("div");
         div.className = "row chat-packet";
         div.dataset.packetId = packet.id;
-
         div.innerHTML = `
-            <span class="col-2 timestamp" title="${packet.import_time_us}">
-                ${timestamp}
-            </span>
-
+            <span class="col-2 timestamp" title="${packet.import_time_us}">${formattedTimestamp}</span>
             <span class="col-2 channel">
-                <a href="/packet/${packet.id}"
-                   data-translate-lang-title="view_packet_details">✉️</a>
+                <a href="/packet/${packet.id}" data-translate-lang-title="view_packet_details">✉️</a>
                 ${escapeHtml(packet.channel || "")}
             </span>
-
             <span class="col-3 nodename">
-                <a href="/node/${packet.from_node_id}">
-                    ${escapeHtml(fromName)}
+                <a href="/packet_list/${packet.from_node_id}">
+                    ${escapeHtml((packet.long_name || "").trim() || `Node ${packet.from_node_id}`)}
                 </a>
             </span>
-
-            <span class="col-5 message">
-                ${escapeHtml(packet.payload).replace(/\n/g,"<br>")}
-            </span>
+            <span class="col-5 message">${escapeHtml(packet.payload)}${replyHtml}</span>
         `;
-
         chatContainer.prepend(div);
-        applyTranslations(netTranslations, div);
+        applyTranslations(chatTranslations, div);
         updateTotalCount();
     }
 
-    /* -----------------------------------
-       Sort descending by time
-    ----------------------------------- */
     function renderPacketsEnsureDescending(packets) {
-        if (!packets || !packets.length) return;
-        const sorted = packets.slice().sort((a, b) => b.import_time_us - a.import_time_us);
-        for (let i = sorted.length - 1; i >= 0; i--) {
-            renderPacket(sorted[i]);
-        }
+        if (!Array.isArray(packets) || packets.length === 0) return;
+        const sortedDesc = packets.slice().sort((a, b) => b.import_time_us - a.import_time_us);
+        for (let i = sortedDesc.length - 1; i >= 0; i--) renderPacket(sortedDesc[i]);
     }
 
-    /* -----------------------------------
-       Fetch initial net-tagged packets
-    ----------------------------------- */
     async function fetchInitialPackets(tag) {
-        if (!tag) return;
-
+        if (!tag) {
+            console.warn("No net_tag defined, skipping packet fetch.");
+            return;
+        }
         try {
-            const sixDaysAgoMs = Date.now() - 6*24*60*60*1000;
+            console.log("Fetching packets for netTag:", tag);
+            const sixDaysAgoMs = Date.now() - (6 * 24 * 60 * 60 * 1000);
             const sinceUs = Math.floor(sixDaysAgoMs * 1000);
-
-            const url =
-                `/api/packets?portnum=1&contains=${encodeURIComponent(tag)}&since=${sinceUs}&limit=1000`;
-
-            const resp = await fetch(url);
+            const resp = await fetch(`/api/packets?portnum=1&contains=${encodeURIComponent(tag)}&since=${sinceUs}`);
             const data = await resp.json();
-
-            if (data?.packets?.length)
-                renderPacketsEnsureDescending(data.packets);
-
+            console.log("Packets received:", data?.packets?.length);
+            if (data?.packets?.length) renderPacketsEnsureDescending(data.packets);
         } catch (err) {
             console.error("Initial fetch error:", err);
         }
     }
 
-    /* -----------------------------------
-       Load translations from section=net
-    ----------------------------------- */
     async function loadTranslations(cfg) {
         try {
-            const lang = cfg?.site?.language || "en";
-            const res = await fetch(`/api/lang?lang=${lang}&section=net`);
-            netTranslations = await res.json();
-            applyTranslations(netTranslations, document);
+            const langCode = cfg?.site?.language || "en";
+            const res = await fetch(`/api/lang?lang=${langCode}&section=chat`);
+            chatTranslations = await res.json();
+            applyTranslations(chatTranslations, document);
         } catch (err) {
-            console.error("Failed loading translations", err);
+            console.error("Chat translation load failed:", err);
         }
     }
 
-    /* -----------------------------------
-       MAIN
-    ----------------------------------- */
+    // --- MAIN LOGIC ---
     try {
-        const cfg = await window._siteConfigPromise;
+        const cfg = await window._siteConfigPromise; // ✅ Already fetched by base.html
         const site = cfg?.site || {};
 
+        // Populate from config
         netTag = site.net_tag || "";
-
-        weeklyMessageEl.textContent = site.weekly_net_message || "";
-
+        weeklyMessageEl.textContent = site.weekly_net_message || "Weekly message not set.";
 
         await loadTranslations(cfg);
         await fetchInitialPackets(netTag);
-
     } catch (err) {
         console.error("Initialization failed:", err);
-
-        weeklyMessageEl.textContent =
-            netTranslations.failed_to_load_site_config ||
-            "Failed to load site config.";
+        weeklyMessageEl.textContent = "Failed to load site config.";
     }
-
 });
 </script>
 {% endblock %}

meshview/templates/nodelist.html

@@ -1,31 +1,12 @@
 {% extends "base.html" %}
 
 {% block css %}
-<style>
-    html, body {
-    overflow-x: auto !important;
-}
-
 table {
-    /* FIX: allow table to keep natural width so scrolling works */
-    width: max-content;
-    min-width: 100%;
+    width: 80%;
     border-collapse: collapse;
     margin: 1em auto;
 }
 
-/* Desktop scroll wrapper */
-#node-list {
-    width: 100%;
-    overflow-x: auto;     /* allows horizontal scroll */
-    overflow-y: hidden;
-    /* !!! removed display:flex because it prevents scrolling */
-}
-
-#node-list table {
-    width: max-content;   /* table keeps its natural width */
-    min-width: 100%;      /* won't shrink smaller than viewport */
-}
 th, td {
     padding: 10px;
     border: 1px solid #333;
@@ -103,23 +84,7 @@ select, .export-btn, .search-box, .clear-btn {
     font-weight: bold;
     color: white;
 }
-.node-status {
-    margin-left: 10px;
-    padding: 2px 8px;
-    border-radius: 12px;
-    border: 1px solid #2a6a8a;
-    background: #0d2a3a;
-    color: #9fd4ff;
-    font-size: 0.9em;
-    display: inline-block;
-    opacity: 0;
-    transition: opacity 0.15s ease-in-out;
-}
-.node-status.active {
-    opacity: 1;
-}
 
-/* Favorite stars */
 .favorite-star {
     cursor: pointer;
     font-size: 1.2em;
@@ -135,7 +100,6 @@ select, .export-btn, .search-box, .clear-btn {
     color: #ffd700;
 }
 
-/* Favorite filter button */
 .favorites-btn {
     background-color: #ffd700;
     color: #000;
@@ -150,171 +114,49 @@ select, .export-btn, .search-box, .clear-btn {
     background-color: #ff6b6b;
     color: white;
 }
-
-/* --------------------------------------------- */
-/* MOBILE CARD VIEW */
-/* --------------------------------------------- */
-@media (max-width: 768px) {
-
-    /* Hide desktop view */
-    #node-list table {
-        display: none;
-    }
-
-    /* Show mobile cards */
-    #mobile-node-list {
-        display: block !important;
-        width: 100%;
-        padding: 0 10px;
-
-        /* If you want horizontal swiping, uncomment:
-        overflow-x: auto;
-        white-space: nowrap; */
-    }
-
-    .node-card {
-        background: #1e1e1e;
-        border: 1px solid #333;
-        border-radius: 8px;
-        padding: 12px 15px;
-        margin-bottom: 12px;
-        color: white;
-    }
-
-    .node-card-header {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        font-size: 1.2em;
-        font-weight: bold;
-        margin-bottom: 8px;
-    }
-
-    .node-card-field {
-        margin: 4px 0;
-        font-size: 0.9em;
-    }
-
-    .node-card-field b {
-        color: #9fd4ff;
-    }
-
-    .favorite-star {
-        font-size: 1.4em;
-    }
-}
-</style>
 {% endblock %}
 
 {% block body %}
 <div class="filter-container">
+    <input type="text" id="search-box" class="search-box" placeholder="Search by name or ID..." />
 
-    <input
-        type="text"
-        id="search-box"
-        class="search-box"
-        data-translate-lang="search_placeholder"
-        placeholder="Search by name or ID or HEX ID..."
-    />
+    <select id="role-filter"><option value="">All Roles</option></select>
+    <select id="channel-filter"><option value="">All Channels</option></select>
+    <select id="hw-filter"><option value="">All HW Models</option></select>
+    <select id="firmware-filter"><option value="">All Firmware</option></select>
 
-    <select id="role-filter">
-        <option value="" data-translate-lang="all_roles">All Roles</option>
-    </select>
-
-    <select id="channel-filter">
-        <option value="" data-translate-lang="all_channels">All Channels</option>
-    </select>
-
-    <select id="hw-filter">
-        <option value="" data-translate-lang="all_hw">All HW Models</option>
-    </select>
-
-    <select id="firmware-filter">
-        <option value="" data-translate-lang="all_firmware">All Firmware</option>
-    </select>
-
-    <button class="favorites-btn" id="favorites-btn" data-translate-lang="show_favorites">
-        ⭐ Show Favorites
-    </button>
-
-    <button class="export-btn" id="export-btn" data-translate-lang="export_csv">
-        Export CSV
-    </button>
-
-    <button class="clear-btn" id="clear-btn" data-translate-lang="clear_filters">
-        Clear Filters
-    </button>
+    <button class="favorites-btn" id="favorites-btn">⭐ Show Favorites</button>
+    <button class="export-btn" id="export-btn">Export CSV</button>
+    <button class="clear-btn" id="clear-btn">Clear Filters</button>
 </div>
 
 <div class="count-container">
-    <span data-translate-lang="showing_nodes">Showing</span>
-    <span id="node-count">0</span>
-    <span data-translate-lang="nodes_suffix">nodes</span>
-    <span id="node-status" class="node-status" aria-live="polite"></span>
+    Showing <span id="node-count">0</span> nodes
 </div>
 
-<!-- Desktop table -->
 <div id="node-list">
     <table>
         <thead>
             <tr>
-                <th data-translate-lang="short_name">Short <span class="sort-icon">▲</span></th>
-                <th data-translate-lang="long_name">Long Name <span class="sort-icon"></span></th>
-                <th data-translate-lang="hw_model">HW Model <span class="sort-icon"></span></th>
-                <th data-translate-lang="firmware">Firmware <span class="sort-icon"></span></th>
-                <th data-translate-lang="role">Role <span class="sort-icon"></span></th>
-                <th data-translate-lang="last_lat">Last Latitude <span class="sort-icon"></span></th>
-                <th data-translate-lang="last_long">Last Longitude <span class="sort-icon"></span></th>
-                <th data-translate-lang="channel">Channel <span class="sort-icon"></span></th>
-                <th data-translate-lang="mqtt_gateway">MQTT</th>
-                <th data-translate-lang="last_seen">Last Seen <span class="sort-icon"></span></th>
-                <th data-translate-lang="favorite"></th>
+                <th>Short <span class="sort-icon">▲</span></th>
+                <th>Long Name <span class="sort-icon"></span></th>
+                <th>HW Model <span class="sort-icon"></span></th>
+                <th>Firmware <span class="sort-icon"></span></th>
+                <th>Role <span class="sort-icon"></span></th>
+                <th>Last Latitude <span class="sort-icon"></span></th>
+                <th>Last Longitude <span class="sort-icon"></span></th>
+                <th>Channel <span class="sort-icon"></span></th>
+                <th>Last Seen <span class="sort-icon"></span></th>
+                <th> </th>
             </tr>
         </thead>
         <tbody id="node-table-body">
-            <tr>
-                <td colspan="11" style="text-align:center; color:white;" data-translate-lang="loading_nodes">
-                    Loading nodes...
-                </td>
-            </tr>
+            <tr><td colspan="10" style="text-align:center; color:white;">Loading nodes...</td></tr>
         </tbody>
     </table>
 </div>
 
-<!-- Mobile Card View -->
-<div id="mobile-node-list" style="display:none;"></div>
-
 <script>
-// =====================================================
-// TRANSLATIONS
-// =====================================================
-let nodelistTranslations = {};
-
-function applyTranslationsNodelist() {
-    document.querySelectorAll("[data-translate-lang]").forEach(el => {
-        const key = el.dataset.translateLang;
-        if (nodelistTranslations[key]) {
-            if (el.tagName === "INPUT" && el.placeholder) {
-                el.placeholder = nodelistTranslations[key];
-            } else {
-                el.textContent = nodelistTranslations[key];
-            }
-        }
-    });
-}
-
-async function loadTranslationsNodelist() {
-    try {
-        const cfg = await window._siteConfigPromise;
-        const lang = cfg?.site?.language || "en";
-        const res = await fetch(`/api/lang?lang=${lang}&section=nodelist`);
-        nodelistTranslations = await res.json();
-        applyTranslationsNodelist();
-    } catch (err) {
-        console.error("Failed to load nodelist translations:", err);
-    }
-}
-
 // =====================================================
 // GLOBALS
 // =====================================================
@@ -322,11 +164,6 @@ let allNodes = [];
 let sortColumn = "short_name";
 let sortAsc = true;
 let showOnlyFavorites = false;
-let favoritesSet = new Set();
-let isBusy = false;
-let statusHideTimer = null;
-let statusShownAt = 0;
-const minStatusMs = 300;
 
 const headers = document.querySelectorAll("thead th");
 const keyMap = [
@@ -334,51 +171,37 @@ const keyMap = [
     "last_lat","last_long","channel","last_seen_us"
 ];
 
-function debounce(fn, delay = 250) {
-    let t;
-    return (...args) => {
-        clearTimeout(t);
-        t = setTimeout(() => fn(...args), delay);
-    };
-}
-
-function nextFrame() {
-    return new Promise(resolve => requestAnimationFrame(() => resolve()));
-}
-
-function loadFavorites() {
+// =====================================================
+// FAVORITES SYSTEM (localStorage)
+// =====================================================
+function getFavorites() {
     const favorites = localStorage.getItem('nodelist_favorites');
-    if (!favorites) {
-        favoritesSet = new Set();
-        return;
-    }
+    return favorites ? JSON.parse(favorites) : [];
+}
 
-    try {
-        const parsed = JSON.parse(favorites);
-        favoritesSet = new Set(Array.isArray(parsed) ? parsed : []);
-    } catch (err) {
-        console.warn("Failed to parse favorites, resetting.", err);
-        favoritesSet = new Set();
-    }
-}
-function saveFavorites() {
-    localStorage.setItem('nodelist_favorites', JSON.stringify([...favoritesSet]));
+function saveFavorites(favs) {
+    localStorage.setItem('nodelist_favorites', JSON.stringify(favs));
 }
+
 function toggleFavorite(nodeId) {
-    if (favoritesSet.has(nodeId)) {
-        favoritesSet.delete(nodeId);
-    } else {
-        favoritesSet.add(nodeId);
-    }
-    saveFavorites();
-}
-function isFavorite(nodeId) {
-    return favoritesSet.has(nodeId);
+    let favs = getFavorites();
+    const idx = favs.indexOf(nodeId);
+    if (idx >= 0) favs.splice(idx, 1);
+    else favs.push(nodeId);
+    saveFavorites(favs);
 }
 
-function timeAgoFromMs(msTimestamp) {
-    if (!msTimestamp) return "N/A";
-    const diff = Date.now() - msTimestamp;
+function isFavorite(nodeId) {
+    return getFavorites().includes(nodeId);
+}
+
+// =====================================================
+// "TIME AGO" FORMATTER
+// =====================================================
+function timeAgo(usTimestamp) {
+    if (!usTimestamp) return "N/A";
+    const ms = usTimestamp / 1000;
+    const diff = Date.now() - ms;
 
     if (diff < 60000) return "just now";
     const mins = Math.floor(diff / 60000);
@@ -386,129 +209,77 @@ function timeAgoFromMs(msTimestamp) {
     const hrs = Math.floor(mins / 60);
     if (hrs < 24) return `${hrs} hr ago`;
     const days = Math.floor(hrs / 24);
-    return `${days} days ago`;
+    return `${days} day${days > 1 ? "s" : ""} ago`;
 }
 
 // =====================================================
-// DOM LOADED
+// DOM LOADED: FETCH NODES
 // =====================================================
 document.addEventListener("DOMContentLoaded", async function() {
-
-    await loadTranslationsNodelist();
-    loadFavorites();
-
     const tbody = document.getElementById("node-table-body");
-    const mobileList = document.getElementById("mobile-node-list");
-
     const roleFilter = document.getElementById("role-filter");
     const channelFilter = document.getElementById("channel-filter");
     const hwFilter = document.getElementById("hw-filter");
     const firmwareFilter = document.getElementById("firmware-filter");
     const searchBox = document.getElementById("search-box");
     const countSpan = document.getElementById("node-count");
-    const statusSpan = document.getElementById("node-status");
     const exportBtn = document.getElementById("export-btn");
     const clearBtn = document.getElementById("clear-btn");
     const favoritesBtn = document.getElementById("favorites-btn");
 
-    let lastIsMobile = (window.innerWidth <= 768);
-
     try {
-        setStatus("Loading nodes…");
-        await nextFrame();
         const res = await fetch("/api/nodes?days_active=3");
         if (!res.ok) throw new Error("Failed to fetch nodes");
 
         const data = await res.json();
-
-        allNodes = data.nodes.map(n => {
-            const firmware = n.firmware || n.firmware_version || "";
-            const last_seen_us = n.last_seen_us || 0;
-            const last_seen_ms = last_seen_us ? (last_seen_us / 1000) : 0;
-
-            return {
-                ...n,
-                firmware,
-                last_seen_us,
-                last_seen_ms,
-                _search: [
-                    n.node_id,
-                    n.id,
-                    n.long_name,
-                    n.short_name
-                ]
-                    .filter(Boolean)
-                    .join(" ")
-                    .toLowerCase()
-            };
-        });
+        allNodes = data.nodes;
 
         populateFilters(allNodes);
-        applyFilters(); // ensures initial sort + render uses same path
+        renderTable(allNodes);
         updateSortIcons();
-        setStatus("");
     } catch (err) {
-        tbody.innerHTML = `<tr>
-            <td colspan="11" style="text-align:center; color:red;">
-                ${nodelistTranslations.error_loading_nodes || "Error loading nodes"}
-            </td></tr>`;
-        setStatus("");
-        return;
+        tbody.innerHTML = `<tr><td colspan="10" style="text-align:center; color:red;">Error loading nodes: ${err.message}</td></tr>`;
     }
 
     roleFilter.addEventListener("change", applyFilters);
     channelFilter.addEventListener("change", applyFilters);
     hwFilter.addEventListener("change", applyFilters);
     firmwareFilter.addEventListener("change", applyFilters);
-
-    // Debounced only for search typing
-    searchBox.addEventListener("input", debounce(applyFilters, 250));
-
+    searchBox.addEventListener("input", applyFilters);
     exportBtn.addEventListener("click", exportToCSV);
     clearBtn.addEventListener("click", clearFilters);
     favoritesBtn.addEventListener("click", toggleFavoritesFilter);
 
-    // Favorite star click handler (delegated)
-    document.addEventListener("click", e => {
+    // STAR CLICK HANDLER
+    tbody.addEventListener("click", e => {
         if (e.target.classList.contains('favorite-star')) {
-            const nodeId = parseInt(e.target.dataset.nodeId, 10);
-            const fav = isFavorite(nodeId);
+            const nodeId = parseInt(e.target.dataset.nodeId);
+            const isFav = isFavorite(nodeId);
 
-            if (fav) {
+            if (isFav) {
                 e.target.classList.remove("active");
                 e.target.textContent = "☆";
             } else {
                 e.target.classList.add("active");
                 e.target.textContent = "★";
             }
-
             toggleFavorite(nodeId);
-            applyFilters();
         }
     });
 
+    // SORTING
     headers.forEach((th, index) => {
         th.addEventListener("click", () => {
-            const key = keyMap[index];
-            // ignore clicks on the "favorite" (last header) which has no sort key
-            if (!key) return;
-
+            let key = keyMap[index];
             sortAsc = (sortColumn === key) ? !sortAsc : true;
             sortColumn = key;
-
             applyFilters();
         });
     });
 
-    // Re-render on breakpoint change so mobile/desktop view switches instantly
-    window.addEventListener("resize", debounce(() => {
-        const isMobile = (window.innerWidth <= 768);
-        if (isMobile !== lastIsMobile) {
-            lastIsMobile = isMobile;
-            applyFilters();
-        }
-    }, 150));
-
+    // =====================================================
+    // FILTER POPULATION
+    // =====================================================
     function populateFilters(nodes) {
         const roles = new Set(), channels = new Set(), hws = new Set(), fws = new Set();
 
@@ -534,18 +305,20 @@ document.addEventListener("DOMContentLoaded", async function() {
         });
     }
 
+    // =====================================================
+    // FAVORITES FILTER
+    // =====================================================
     function toggleFavoritesFilter() {
         showOnlyFavorites = !showOnlyFavorites;
-        favoritesBtn.textContent = showOnlyFavorites
-            ? "Show All"
-            : "⭐ Show Favorites";
+        favoritesBtn.textContent = showOnlyFavorites ? "⭐ Show All" : "⭐ Show Favorites";
         favoritesBtn.classList.toggle("active", showOnlyFavorites);
         applyFilters();
     }
 
-    async function applyFilters() {
-        setStatus("Updating…");
-        await nextFrame();
+    // =====================================================
+    // APPLY FILTERS + SORT
+    // =====================================================
+    function applyFilters() {
         const searchTerm = searchBox.value.trim().toLowerCase();
 
         let filtered = allNodes.filter(n => {
@@ -553,150 +326,90 @@ document.addEventListener("DOMContentLoaded", async function() {
             const channelMatch = !channelFilter.value || n.channel === channelFilter.value;
             const hwMatch = !hwFilter.value || n.hw_model === hwFilter.value;
             const fwMatch = !firmwareFilter.value || n.firmware === firmwareFilter.value;
+            const searchMatch =
+                !searchTerm ||
+                (n.long_name && n.long_name.toLowerCase().includes(searchTerm)) ||
+                (n.short_name && n.short_name.toLowerCase().includes(searchTerm)) ||
+                n.node_id.toString().includes(searchTerm);
 
-            const searchMatch = !searchTerm || n._search.includes(searchTerm);
             const favMatch = !showOnlyFavorites || isFavorite(n.node_id);
 
             return roleMatch && channelMatch && hwMatch && fwMatch && searchMatch && favMatch;
         });
 
-        // IMPORTANT: Always sort the filtered subset to preserve expected behavior
         filtered = sortNodes(filtered, sortColumn, sortAsc);
 
         renderTable(filtered);
         updateSortIcons();
-        setStatus("");
     }
 
+    // =====================================================
+    // RENDER TABLE
+    // =====================================================
     function renderTable(nodes) {
-        const isMobile = window.innerWidth <= 768;
-        const shouldRenderTable = !isMobile;
-
-        if (shouldRenderTable) {
-            tbody.innerHTML = "";
-        } else {
-            mobileList.innerHTML = "";
-        }
-
-        const tableFrag = shouldRenderTable ? document.createDocumentFragment() : null;
-        const mobileFrag = shouldRenderTable ? null : document.createDocumentFragment();
+        tbody.innerHTML = "";
 
         if (!nodes.length) {
-            if (shouldRenderTable) {
-                tbody.innerHTML = `<tr>
-                    <td colspan="11" style="text-align:center; color:white;">
-                        ${nodelistTranslations.no_nodes_found || "No nodes found"}
-                    </td>
-                </tr>`;
-            } else {
-                mobileList.innerHTML = `<div style="text-align:center; color:white;">
-                    ${nodelistTranslations.no_nodes_found || "No nodes found"}
-                </div>`;
-            }
-
+            tbody.innerHTML = `<tr><td colspan="10" style="text-align:center; color:white;">No nodes found</td></tr>`;
             countSpan.textContent = 0;
             return;
         }
 
         nodes.forEach(node => {
-            const fav = isFavorite(node.node_id);
-            const star = fav ? "★" : "☆";
+            const isFav = isFavorite(node.node_id);
+            const star = isFav ? "★" : "☆";
 
-            if (shouldRenderTable) {
-                // DESKTOP TABLE ROW
-                const row = document.createElement("tr");
-                row.innerHTML = `
-                    <td>${node.short_name || "N/A"}</td>
-                    <td><a href="/node/${node.node_id}">${node.long_name || "N/A"}</a></td>
-                    <td>${node.hw_model || "N/A"}</td>
-                    <td>${node.firmware || "N/A"}</td>
-                    <td>${node.role || "N/A"}</td>
-                    <td>${node.last_lat ? (node.last_lat / 1e7).toFixed(7) : "N/A"}</td>
-                    <td>${node.last_long ? (node.last_long / 1e7).toFixed(7) : "N/A"}</td>
-                    <td>${node.channel || "N/A"}</td>
-                    <td>${node.is_mqtt_gateway ? (nodelistTranslations.yes || "Yes") : (nodelistTranslations.no || "No")}</td>
-                    <td>${timeAgoFromMs(node.last_seen_ms)}</td>
-                    <td style="text-align:center;">
-                        <span class="favorite-star ${fav ? "active" : ""}" data-node-id="${node.node_id}">
-                            ${star}
-                        </span>
-                    </td>
-                `;
-                tableFrag.appendChild(row);
-            } else {
-                // MOBILE CARD VIEW
-                const card = document.createElement("div");
-                card.className = "node-card";
-                card.innerHTML = `
-                    <div class="node-card-header">
-                        <span>${node.short_name || node.long_name || node.node_id}</span>
-                        <span class="favorite-star ${fav ? "active" : ""}" data-node-id="${node.node_id}">
-                            ${star}
-                        </span>
-                    </div>
-
-                    <div class="node-card-field"><b>ID:</b> ${node.node_id}</div>
-                    <div class="node-card-field"><b>Name:</b> ${node.long_name || "N/A"}</div>
-                    <div class="node-card-field"><b>HW:</b> ${node.hw_model || "N/A"}</div>
-                    <div class="node-card-field"><b>Firmware:</b> ${node.firmware || "N/A"}</div>
-                    <div class="node-card-field"><b>Role:</b> ${node.role || "N/A"}</div>
-                    <div class="node-card-field"><b>Location:</b>
-                        ${node.last_lat ? (node.last_lat / 1e7).toFixed(5) : "N/A"},
-                        ${node.last_long ? (node.last_long / 1e7).toFixed(5) : "N/A"}
-                    </div>
-                    <div class="node-card-field"><b>Channel:</b> ${node.channel || "N/A"}</div>
-                    <div class="node-card-field"><b>Last Seen:</b> ${timeAgoFromMs(node.last_seen_ms)}</div>
-
-                    <a href="/node/${node.node_id}" style="color:#9fd4ff; text-decoration:underline; margin-top:5px; display:block;">
-                        View Node →
-                    </a>
-                `;
-                mobileFrag.appendChild(card);
-            }
+            const row = document.createElement("tr");
+            row.innerHTML = `
+                <td>${node.short_name || "N/A"}</td>
+                <td><a href="/node/${node.node_id}">${node.long_name || "N/A"}</a></td>
+                <td>${node.hw_model || "N/A"}</td>
+                <td>${node.firmware || "N/A"}</td>
+                <td>${node.role || "N/A"}</td>
+                <td>${node.last_lat ? (node.last_lat / 1e7).toFixed(7) : "N/A"}</td>
+                <td>${node.last_long ? (node.last_long / 1e7).toFixed(7) : "N/A"}</td>
+                <td>${node.channel || "N/A"}</td>
+                <td>${timeAgo(node.last_seen_us)}</td>
+                <td style="text-align:center;">
+                    <span class="favorite-star ${isFav ? "active" : ""}" data-node-id="${node.node_id}">${star}</span>
+                </td>
+            `;
+            tbody.appendChild(row);
         });
 
-        // Toggle correct view
-        mobileList.style.display = isMobile ? "block" : "none";
-
         countSpan.textContent = nodes.length;
-
-        if (shouldRenderTable) {
-            tbody.appendChild(tableFrag);
-        } else {
-            mobileList.appendChild(mobileFrag);
-        }
     }
 
+    // =====================================================
+    // CLEAR FILTERS
+    // =====================================================
     function clearFilters() {
         roleFilter.value = "";
         channelFilter.value = "";
         hwFilter.value = "";
         firmwareFilter.value = "";
         searchBox.value = "";
-
         sortColumn = "short_name";
         sortAsc = true;
         showOnlyFavorites = false;
-
         favoritesBtn.textContent = "⭐ Show Favorites";
         favoritesBtn.classList.remove("active");
 
-        applyFilters();
+        renderTable(allNodes);
         updateSortIcons();
     }
 
+    // =====================================================
+    // EXPORT CSV
+    // =====================================================
     function exportToCSV() {
         const rows = [];
-        const headerList = Array.from(headers).map(h =>
-            `"${h.innerText.replace(/▲|▼/g,'')}"`
-        );
+        const headerList = Array.from(headers).map(h => `"${h.innerText.replace(/▲|▼/g,'')}"`);
         rows.push(headerList.join(","));
 
         const trs = tbody.querySelectorAll("tr");
         trs.forEach(tr => {
-            const cells = Array.from(tr.children).map(td =>
-                `"${td.innerText.replace(/"/g,'""')}"`
-            );
+            const cells = Array.from(tr.children).map(td => `"${td.innerText.replace(/"/g,'""')}"`);
             rows.push(cells.join(","));
         });
 
@@ -707,69 +420,36 @@ document.addEventListener("DOMContentLoaded", async function() {
         a.click();
     }
 
+    // =====================================================
+    // SORT NODES
+    // =====================================================
     function sortNodes(nodes, key, asc) {
         return [...nodes].sort((a, b) => {
             let A = a[key];
             let B = b[key];
 
+            // special handling for timestamp
             if (key === "last_seen_us") {
                 A = A || 0;
                 B = B || 0;
             }
 
-            // Normalize strings for stable sorting
-            if (typeof A === "string") A = A.toLowerCase();
-            if (typeof B === "string") B = B.toLowerCase();
-
             if (A < B) return asc ? -1 : 1;
             if (A > B) return asc ? 1 : -1;
             return 0;
         });
     }
 
+    // =====================================================
+    // SORT ICONS
+    // =====================================================
     function updateSortIcons() {
         headers.forEach((th, i) => {
             const span = th.querySelector(".sort-icon");
             if (!span) return;
-            span.textContent =
-                keyMap[i] === sortColumn ? (sortAsc ? "▲" : "▼") : "";
+            span.textContent = keyMap[i] === sortColumn ? (sortAsc ? "▲" : "▼") : "";
         });
     }
-
-    function setStatus(message) {
-        if (!statusSpan) return;
-        if (statusHideTimer) {
-            clearTimeout(statusHideTimer);
-            statusHideTimer = null;
-        }
-
-        if (message) {
-            statusShownAt = Date.now();
-            console.log("[nodelist] status:", message);
-            statusSpan.textContent = message;
-            statusSpan.classList.add("active");
-            isBusy = true;
-            return;
-        }
-
-        const elapsed = Date.now() - statusShownAt;
-        const remaining = Math.max(0, minStatusMs - elapsed);
-        if (remaining > 0) {
-            statusHideTimer = setTimeout(() => {
-                statusHideTimer = null;
-                console.log("[nodelist] status: cleared");
-                statusSpan.textContent = "";
-                statusSpan.classList.remove("active");
-                isBusy = false;
-            }, remaining);
-            return;
-        }
-
-        console.log("[nodelist] status: cleared");
-        statusSpan.textContent = "";
-        statusSpan.classList.remove("active");
-        isBusy = false;
-    }
 });
 </script>
 {% endblock %}

meshview/templates/packet.html

@@ -1,10 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}Packet Details{% endblock %}
-
-{% block head %}
-<script src="/static/portmaps.js"></script>
-{% endblock %}
+{% block title %}Packet Details{%endblock%}
 
 {% block css %}
 {{ super() }}
@@ -52,7 +48,7 @@
     display: none;
 }
 
-/* --- SOURCE MARKER --- */
+/* --- SOURCE MARKER (slightly bigger) --- */
 .source-marker {
     width: 24px;
     height: 24px;
@@ -101,27 +97,26 @@
 {% block body %}
 <div class="container mt-4 mb-5 packet-container">
 
-    <div id="loading" data-translate-lang="loading">Loading packet information...</div>
+    <div id="loading">Loading packet information...</div>
     <div id="packet-card" class="packet-card d-none"></div>
 
     <div id="map"></div>
 
     <div id="seen-container" class="mt-4 d-none">
         <h5 style="color:#ccc; margin:15px 0 10px 0;">
-            📡 <span data-translate-lang="seen_by">Seen By</span>
-            <span id="seen-count" style="color:#4da6ff;"></span>
+            📡 Seen By <span id="seen-count" style="color:#4da6ff;"></span>
         </h5>
 
         <div class="table-responsive">
             <table class="table table-dark table-sm seen-table">
                 <thead>
                     <tr>
-                        <th data-translate-lang="gateway">Gateway</th>
-                        <th data-translate-lang="rssi">RSSI</th>
-                        <th data-translate-lang="snr">SNR</th>
-                        <th data-translate-lang="hops">Hops</th>
-                        <th data-translate-lang="channel">Channel</th>
-                        <th data-translate-lang="time">Time</th>
+                        <th>Gateway</th>
+                        <th>RSSI</th>
+                        <th>SNR</th>
+                        <th>Hop</th>
+                        <th>Channel</th>
+                        <th>Time</th>
                     </tr>
                 </thead>
                 <tbody id="seen-table-body"></tbody>
@@ -131,39 +126,8 @@
 </div>
 
 <script>
-
-/* ======================================================
-   PACKET PAGE TRANSLATION
-   ====================================================== */
-let packetTranslations = {};
-
-async function loadTranslationsPacket() {
-    try {
-        const cfg = await window._siteConfigPromise;
-        const lang = cfg?.site?.language || "en";
-        const res = await fetch(`/api/lang?lang=${lang}&section=packet`);
-        packetTranslations = await res.json();
-        applyTranslationsPacket(packetTranslations);
-    } catch (err) {
-        console.error("Packet translations failed:", err);
-    }
-}
-
-function applyTranslationsPacket(dict, root = document) {
-    root.querySelectorAll("[data-translate-lang]").forEach(el => {
-        const key = el.dataset.translateLang;
-        if (dict[key]) el.textContent = dict[key];
-    });
-}
-
-/* ======================================================
-   PACKET PAGE MAIN
-   ====================================================== */
-
 document.addEventListener("DOMContentLoaded", async () => {
 
-    await loadTranslationsPacket();  // <-- IMPORTANT
-
     const packetCard    = document.getElementById("packet-card");
     const loading       = document.getElementById("loading");
     const mapDiv        = document.getElementById("map");
@@ -176,13 +140,23 @@ document.addEventListener("DOMContentLoaded", async () => {
     ----------------------------------------------*/
     const match = window.location.pathname.match(/\/packet\/(\d+)/);
     if (!match) {
-        loading.textContent = packetTranslations.invalid_url || "Invalid packet URL";
+        loading.textContent = "Invalid packet URL";
         return;
     }
     const packetId = match[1];
 
-    /* PORT LABELS (NOT TRANSLATED) */
-    const PORT_NAMES = window.PORT_LABEL_MAP;
+    /* PORT NAME MAP */
+    const PORT_NAMES = {
+        0:"UNKNOWN APP",
+        1:"Text",
+        3:"Position",
+        4:"Node Info",
+        5:"Routing",
+        6:"Admin",
+        67:"Telemetry",
+        70:"Traceroute",
+        71:"Neighbor"
+    };
 
     /* ---------------------------------------------
        Fetch packet
@@ -190,31 +164,28 @@ document.addEventListener("DOMContentLoaded", async () => {
     const packetRes = await fetch(`/api/packets?packet_id=${packetId}`);
     const packetData = await packetRes.json();
     if (!packetData.packets.length) {
-        loading.textContent = packetTranslations.not_found || "Packet not found.";
+        loading.textContent = "Packet not found.";
         return;
     }
     const p = packetData.packets[0];
 
     /* ---------------------------------------------
-       Load nodes for names & positions
+       Fetch all nodes
     ----------------------------------------------*/
     const nodesRes = await fetch("/api/nodes");
     const nodesData = await nodesRes.json();
     const nodeLookup = {};
     (nodesData.nodes || []).forEach(n => nodeLookup[n.node_id] = n);
 
-    const fromNodeObj = nodeLookup[p.from_node_id];
-    const toNodeObj   = nodeLookup[p.to_node_id];
+    const fromNodeObj   = nodeLookup[p.from_node_id];
+    const toNodeObj     = nodeLookup[p.to_node_id];
 
     const fromNodeLabel = fromNodeObj?.long_name || p.from_node_id;
-
     const toNodeLabel =
-        p.to_node_id == 4294967295
-            ? (packetTranslations.all_broadcast || "All")
-            : (toNodeObj?.long_name || p.to_node_id);
+        p.to_node_id == 4294967295 ? "All" : (toNodeObj?.long_name || p.to_node_id);
 
     /* ---------------------------------------------
-       Parse payload for lat/lon
+       Parse payload for lat/lon if this *packet* is a position packet
     ----------------------------------------------*/
     let lat = null, lon = null;
     const parsed = {};
@@ -224,14 +195,14 @@ document.addEventListener("DOMContentLoaded", async () => {
             const [k, v] = line.split(":").map(x=>x.trim());
             if (k && v !== undefined) {
                 parsed[k] = v;
-                if (k === "latitude_i") lat = Number(v) / 1e7;
+                if (k === "latitude_i")  lat = Number(v) / 1e7;
                 if (k === "longitude_i") lon = Number(v) / 1e7;
             }
         });
     }
 
     /* ---------------------------------------------
-       Render card
+       Render packet header & details
     ----------------------------------------------*/
     const time = p.import_time_us
         ? new Date(p.import_time_us / 1000).toLocaleString()
@@ -245,47 +216,42 @@ document.addEventListener("DOMContentLoaded", async () => {
 
     packetCard.innerHTML = `
         <div class="card-header">
-            <span>
-                <span data-translate-lang="packet_id_label">${packetTranslations.packet_id_label || "Packet ID:"}</span>
-                <i>${p.id}</i>
-            </span>
+            <span>Packet ID: <i>${p.id}</i></span>
             <small>${time}</small>
         </div>
 
         <div class="card-body">
             <dl>
-                <dt data-translate-lang="from_node">${packetTranslations.from_node || "From Node"}:</dt>
+                <dt>From Node:</dt>
                 <dd><a href="/node/${p.from_node_id}">${fromNodeLabel}</a></dd>
-
-                <dt data-translate-lang="to_node">${packetTranslations.to_node || "To Node"}:</dt>
+                <dt>To Node:</dt>
                 <dd>${
                     p.to_node_id === 4294967295
-                        ? `<i data-translate-lang="all_broadcast">${packetTranslations.all_broadcast || "All"}</i>`
+                        ? `<i>All</i>`
                         : p.to_node_id === 1
-                            ? `<i data-translate-lang="direct_to_mqtt">${packetTranslations.direct_to_mqtt || "Direct to MQTT"}</i>`
+                            ? `<i>Direct to MQTT</i>`
                             : `<a href="/node/${p.to_node_id}">${toNodeLabel}</a>`
                 }</dd>
 
-                <dt data-translate-lang="channel">${packetTranslations.channel || "Channel"}:</dt>
-                <dd>${p.channel ?? "—"}</dd>
 
-                <dt data-translate-lang="port">${packetTranslations.port || "Port"}:</dt>
+                <dt>Channel:</dt><dd>${p.channel ?? "—"}</dd>
+
+                <dt>Port:</dt>
                 <dd><i>${PORT_NAMES[p.portnum] || "UNKNOWN APP"}</i> (${p.portnum})</dd>
 
-                <dt data-translate-lang="raw_payload">${packetTranslations.raw_payload || "From Raw Payload"}:</dt>
+                <dt>Raw Payload:</dt>
                 <dd><pre>${escapeHtml(p.payload ?? "—")}</pre></dd>
 
                 ${
                     telemetryExtras.length
-                    ? `<dt data-translate-lang="decoded_telemetry">${packetTranslations.decoded_telemetry || "Decoded Telemetry"}</dt>
+                    ? `<dt>Decoded Telemetry</dt>
                        <dd><pre>${telemetryExtras.join("\n")}</pre></dd>`
                     : ""
                 }
 
                 ${
                     lat && lon
-                    ? `<dt data-translate-lang="location">${packetTranslations.location || "Location:"}</dt>
-                       <dd>${lat.toFixed(6)}, ${lon.toFixed(6)}</dd>`
+                    ? `<dt>Location:</dt><dd>${lat.toFixed(6)}, ${lon.toFixed(6)}</dd>`
                     : ""
                 }
             </dl>
@@ -296,18 +262,22 @@ document.addEventListener("DOMContentLoaded", async () => {
     packetCard.classList.remove("d-none");
 
     /* ---------------------------------------------
-       Map setup
+       Map initialization
     ----------------------------------------------*/
     const map = L.map("map");
     mapDiv.style.display = "block";
 
-    L.tileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", { maxZoom: 19 })
-      .addTo(map);
+    L.tileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {
+        maxZoom: 19
+    }).addTo(map);
 
     const allBounds = [];
 
     /* ---------------------------------------------
-       Determine packet source location
+       ALWAYS SHOW SOURCE POSITION
+       Priority:
+         1) position from packet payload
+         2) fallback: last_lat/last_long from /api/nodes
     ----------------------------------------------*/
     let srcLat = lat;
     let srcLon = lon;
@@ -334,202 +304,167 @@ document.addEventListener("DOMContentLoaded", async () => {
 
         sourceMarker.bindPopup(`
             <div style="font-size:0.9em">
-                <b data-translate-lang="packet_source">${packetTranslations.packet_source || "Packet Source"}</b><br>
+                <b>Packet Source</b><br>
                 Lat: ${srcLat.toFixed(6)}<br>
                 Lon: ${srcLon.toFixed(6)}<br>
-                <span data-translate-lang="from_node">${packetTranslations.from_node || "From Node:"}</span> ${fromNodeLabel}<br>
-                <span data-translate-lang="channel">${packetTranslations.channel || "Channel:"}</span> ${p.channel ?? "—"}<br>
-                <span data-translate-lang="port">${packetTranslations.port || "Port:"}</span> ${PORT_NAMES[p.portnum] || "UNKNOWN"} (${p.portnum})
+                From Node: ${fromNodeLabel}<br>
+                Channel: ${p.channel ?? "—"}<br>
+                Port: ${PORT_NAMES[p.portnum] || "UNKNOWN"} (${p.portnum})
             </div>
         `);
+
     } else {
         map.setView([0,0], 2);
     }
 
     /* ---------------------------------------------
-       Colors for hops (warm → cold)
+       Color for hop indicator markers (warm → cold)
     ----------------------------------------------*/
     function hopColor(hopValue){
         const colors = [
-            "#ff3b30","#ff6b22","#ff9f0c","#ffd60a",
-            "#87d957","#57d9c4","#3db2ff","#1e63ff"
+            "#ff3b30",
+            "#ff6b22",
+            "#ff9f0c",
+            "#ffd60a",
+            "#87d957",
+            "#57d9c4",
+            "#3db2ff",
+            "#1e63ff"
         ];
         let h = Number(hopValue);
         if (isNaN(h)) return "#aaa";
-        return colors[Math.min(Math.max(h, 0), 7)];
+        if (h < 0) h = 0;
+        if (h > 7) h = 7;
+        return colors[h];
     }
 
-    /* ---------------------------------------------
-       Distance helper
-    ----------------------------------------------*/
-    function haversine(lat1, lon1, lat2, lon2){
-        const R = 6371;
-        const dLat = (lat2-lat1)*Math.PI/180;
-        const dLon = (lon2-lon1)*Math.PI/180;
-        const a = Math.sin(dLat/2)**2 +
+    /* Distance helper */
+    function haversine(lat1,lon1,lat2,lon2){
+        const R=6371;
+        const dLat=(lat2-lat1)*Math.PI/180;
+        const dLon=(lon2-lon1)*Math.PI/180;
+        const a=Math.sin(dLat/2)**2+
             Math.cos(lat1*Math.PI/180)*
             Math.cos(lat2*Math.PI/180)*
             Math.sin(dLon/2)**2;
-        return R * (2*Math.atan2(Math.sqrt(a), Math.sqrt(1-a)));
+        return R*(2*Math.atan2(Math.sqrt(a),Math.sqrt(1-a)));
     }
 
     /* ---------------------------------------------
-   Load packets_seen
-----------------------------------------------*/
-const seenRes  = await fetch(`/api/packets_seen/${packetId}`);
-const seenData = await seenRes.json();
-const seenList = seenData.seen ?? [];
+       Fetch packets_seen
+    ----------------------------------------------*/
+    const seenRes  = await fetch(`/api/packets_seen/${packetId}`);
+    const seenData = await seenRes.json();
+    const seenList = seenData.seen ?? [];
 
-/* ---------------------------------------------
-   Sort by hop count (highest first)
-----------------------------------------------*/
-const seenSorted = seenList.slice().sort((a,b)=>{
-    const ha = (a.hop_start ?? 0) - (a.hop_limit ?? 0);
-    const hb = (b.hop_start ?? 0) - (b.hop_limit ?? 0);
-    return hb - ha;
-});
+    /* sort by hop_start descending (warm → cold) */
+    const seenSorted = seenList.slice().sort((a,b)=>{
+        const A=a.hop_start??-999;
+        const B=b.hop_start??-999;
+        return B-A;
+    });
 
-if (seenSorted.length){
-    seenContainer.classList.remove("d-none");
-    seenCountSpan.textContent = `(${seenSorted.length})`;
-}
+    if (seenSorted.length){
+        seenContainer.classList.remove("d-none");
+        seenCountSpan.textContent=`(${seenSorted.length} gateways)`;
+    }
 
-/* ---------------------------------------------
-   GROUP BY HOP COUNT
-----------------------------------------------*/
-const hopGroups = {};
+    /* ---------------------------------------------
+       Gateway markers and seen table
+    ----------------------------------------------*/
+    seenTableBody.innerHTML = seenSorted.map(s=>{
+        const node=nodeLookup[s.node_id];
+        const label=node?(node.long_name||node.node_id):s.node_id;
 
-seenSorted.forEach(s => {
-    const hopValue = Math.max(
-        0,
-        (s.hop_start ?? 0) - (s.hop_limit ?? 0)
-    );
-    if (!hopGroups[hopValue]) hopGroups[hopValue] = [];
-    hopGroups[hopValue].push(s);
-});
+        const timeStr = s.import_time_us
+            ? new Date(s.import_time_us/1000).toLocaleTimeString()
+            : "—";
 
-/* ---------------------------------------------
-   Render grouped gateway table + map markers
-----------------------------------------------*/
-seenTableBody.innerHTML = Object.keys(hopGroups)
-    .sort((a,b) => Number(a) - Number(b))   // 0 hop first
-    .map(hopKey => {
+        if(node?.last_lat && node.last_long){
+            const rlat=node.last_lat/1e7;
+            const rlon=node.last_long/1e7;
+            allBounds.push([rlat,rlon]);
 
-        const hopLabel =
-            hopKey === "0"
-                ? (packetTranslations.direct || "Direct (0 hops)")
-                : `${hopKey} ${packetTranslations.hops || "hops"}`;
+            const start = Number(s.hop_start ?? 0);
+            const limit = Number(s.hop_limit ?? 0);
+            const hopValue = start - limit;
 
-        const rows = hopGroups[hopKey].map(s => {
-            const node = nodeLookup[s.node_id];
-            const label = node?.long_name || s.node_id;
+            const color = hopColor(hopValue);
 
-            const timeStr = s.import_time_us
-                ? new Date(s.import_time_us/1000).toLocaleTimeString()
-                : "—";
+            const iconHtml = `
+                <div style="
+                    background:${color};
+                    width:24px;
+                    height:24px;
+                    border-radius:50%;
+                    display:flex;
+                    align-items:center;
+                    justify-content:center;
+                    color:white;
+                    font-size:11px;
+                    font-weight:700;
+                    border:2px solid rgba(0,0,0,0.35);
+                    box-shadow:0 0 5px rgba(0,0,0,0.45);
+                ">${hopValue}</div>`;
 
-            /* ---------------- MAP MARKERS (UNCHANGED) ---------------- */
-            if (node?.last_lat && node.last_long){
-                const rlat = node.last_lat/1e7;
-                const rlon = node.last_long/1e7;
-                allBounds.push([rlat, rlon]);
-                let distanceKm = null;
-                if (srcLat && srcLon) {
-                    distanceKm = haversine(srcLat, srcLon, rlat, rlon);
-                }
-                const distanceMi = distanceKm !== null ? distanceKm * 0.621371 : null;
-                const color = hopColor(hopKey);
-
-                const marker = L.marker([rlat,rlon],{
-                    icon: L.divIcon({
-                        html: `
-                        <div style="
-                            background:${color};
-                            width:24px; height:24px;
-                            border-radius:50%;
-                            display:flex;
-                            align-items:center;
-                            justify-content:center;
-                            color:white;
-                            font-size:11px;
-                            font-weight:700;
-                            border:2px solid rgba(0,0,0,0.35);
-                            box-shadow:0 0 5px rgba(0,0,0,0.45);
-                        ">${hopKey}</div>`,
-                        className: "",
-                        iconSize:[24,24],
-                        iconAnchor:[12,12]
-                    })
-                }).addTo(map);
-
-                marker.bindPopup(`
-                <div style="font-size:0.9em">
-                    <b>${label}</b><br>
-                    <span data-translate-lang="node_id_short">Node ID</span>:
-                    <a href="/node/${s.node_id}">${s.node_id}</a><br>
-                    HW: ${node?.hw_model ?? "—"}<br>
-                    <span data-translate-lang="channel">Channel</span>: ${s.channel ?? "—"}<br>
-                    ${
-                        distanceKm !== null
-                            ? `<span data-translate-lang="distance">Distance</span>:
-                               ${distanceKm.toFixed(1)} km / ${distanceMi.toFixed(1)} mi<br>`
-                            : ""
-                    }
-
-                    <br>
-
-                    <b data-translate-lang="signal">Signal</b><br>
-                    RSSI: ${s.rx_rssi ?? "—"}<br>
-                    SNR: ${s.rx_snr ?? "—"}<br><br>
-
-                    <b data-translate-lang="hops">Hops</b>: ${hopKey}
-                </div>
-            `);
+            const marker=L.marker([rlat,rlon],{
+                icon:L.divIcon({
+                    html:iconHtml,
+                    className:"",
+                    iconSize:[24,24],
+                    iconAnchor:[12,12]
+                })
+            }).addTo(map);
 
+            let distKm=null,distMi=null;
+            if(srcLat&&srcLon){
+                distKm=haversine(srcLat,srcLon,rlat,rlon);
+                distMi=distKm*0.621371;
             }
 
-            return `
-                <tr>
-                    <td><a href="/node/${s.node_id}">${label}</a></td>
-                    <td>${s.rx_rssi ?? "—"}</td>
-                    <td>${s.rx_snr ?? "—"}</td>
-                    <td>${hopKey}</td>
-                    <td>${s.channel ?? "—"}</td>
-                    <td>${timeStr}</td>
-                </tr>
-            `;
-        }).join("");
+            marker.bindPopup(`
+                <div style="font-size:0.9em">
+                    <b>${node?.long_name || s.node_id}</b><br>
+                    Node ID: <a href="/node/${s.node_id}">${s.node_id}</a><br>
+                    HW: ${node?.hw_model ?? "—"}<br>
+                    Channel: ${s.channel ?? "—"}<br><br>
+                    <b>Signal</b><br>
+                    RSSI: ${s.rx_rssi ?? "—"}<br>
+                    SNR: ${s.rx_snr ?? "—"}<br><br>
+                    <b>Hops</b>: ${hopValue}<br>
+                    <b>Distance</b><br>
+                    ${
+                        distKm
+                        ? `${distKm.toFixed(2)} km (${distMi.toFixed(2)} mi)`
+                        : "—"
+                    }
+                </div>
+            `);
+        }
 
         return `
             <tr>
-                <td colspan="6"
-                    style="
-                        background:#1f2327;
-                        font-weight:700;
-                        color:#9ecbff;
-                        border-top:1px solid #444;
-                        padding:8px 12px;
-                    ">
-                    🔁 ${hopLabel} (${hopGroups[hopKey].length})
-                </td>
-            </tr>
-            ${rows}
-        `;
+                <td><a href="/node/${s.node_id}">${label}</a></td>
+                <td>${s.rx_rssi ?? "—"}</td>
+                <td>${s.rx_snr ?? "—"}</td>
+                <td>${s.hop_start ?? "—"} → ${s.hop_limit ?? "—"}</td>
+                <td>${s.channel ?? "—"}</td>
+                <td>${timeStr}</td>
+            </tr>`;
     }).join("");
 
-
     /* ---------------------------------------------
-       Fit map around all markers
+       Fit map to all markers
     ----------------------------------------------*/
-    if (allBounds.length > 0){
-        map.fitBounds(allBounds, { padding:[40,40] });
+    if(allBounds.length>0){
+        map.fitBounds(allBounds,{padding:[40,40]});
     }
 
     /* ---------------------------------------------
-       Escape HTML helper
+       Escape HTML
     ----------------------------------------------*/
     function escapeHtml(unsafe) {
-        return (unsafe ?? "").replace(/[&<"'>]/g, m => ({
+        return (unsafe??"").replace(/[&<"'>]/g,m=>({
             "&":"&amp;",
             "<":"&lt;",
             ">":"&gt;",
@@ -540,5 +475,4 @@ seenTableBody.innerHTML = Object.keys(hopGroups)
 
 });
 </script>
-
 {% endblock %}

meshview/templates/stats.html

@@ -89,7 +89,6 @@
 
 {% block head %}
 <script src="https://cdn.jsdelivr.net/npm/echarts@5.5.0/dist/echarts.min.js"></script>
-<script src="/static/portmaps.js"></script>
 {% endblock %}
 
 {% block body %}
@@ -112,10 +111,6 @@
             <p data-translate-lang="total_packets_seen">Total Packets Seen</p>
             <div class="summary-count" id="summary_seen">0</div>
         </div>
-        <div class="summary-card" style="flex:1;">
-            <p data-translate-lang="total_gateways">Total Gateways</p>
-            <div class="summary-count" id="summary_gateways">0</div>
-        </div>
     </div>
 
     <!-- Daily Charts -->
@@ -194,28 +189,6 @@
         <button class="export-btn" data-chart="chart_channel" data-translate-lang="export_csv">Export CSV</button>
         <div id="chart_channel" class="chart"></div>
     </div>
-
-    <!-- Gateway breakdown charts -->
-    <div class="card-section">
-        <p class="section-header" data-translate-lang="gateway_channel_breakdown">Gateway Channel Breakdown</p>
-        <button class="expand-btn" data-chart="chart_gateway_channel" data-translate-lang="expand_chart">Expand Chart</button>
-        <button class="export-btn" data-chart="chart_gateway_channel" data-translate-lang="export_csv">Export CSV</button>
-        <div id="chart_gateway_channel" class="chart"></div>
-    </div>
-
-    <div class="card-section">
-        <p class="section-header" data-translate-lang="gateway_role_breakdown">Gateway Role Breakdown</p>
-        <button class="expand-btn" data-chart="chart_gateway_role" data-translate-lang="expand_chart">Expand Chart</button>
-        <button class="export-btn" data-chart="chart_gateway_role" data-translate-lang="export_csv">Export CSV</button>
-        <div id="chart_gateway_role" class="chart"></div>
-    </div>
-
-    <div class="card-section">
-        <p class="section-header" data-translate-lang="gateway_firmware_breakdown">Gateway Firmware Breakdown</p>
-        <button class="expand-btn" data-chart="chart_gateway_firmware" data-translate-lang="expand_chart">Expand Chart</button>
-        <button class="export-btn" data-chart="chart_gateway_firmware" data-translate-lang="export_csv">Export CSV</button>
-        <div id="chart_gateway_firmware" class="chart"></div>
-    </div>
 </div>
 
 <!-- Modal for expanded charts -->
@@ -232,7 +205,14 @@
 </div>
 
 <script>
-const PORTNUM_LABELS = window.PORT_LABEL_MAP;
+const PORTNUM_LABELS = {
+    1: "Text Messages",
+    3: "Position",
+    4: "Node Info",
+    67: "Telemetry",
+    70: "Traceroute",
+    71: "Neighbor Info"
+};
 
 // --- Fetch & Processing ---
 async function fetchStats(period_type,length,portnum=null,channel=null){
@@ -365,7 +345,6 @@ function renderPieChart(elId,data,name){
     return chart;
 }
 
-
 // --- Packet Type Pie Chart ---
 async function fetchPacketTypeBreakdown(channel=null) {
     const portnums = [1,3,4,67,70,71];
@@ -389,7 +368,6 @@ async function fetchPacketTypeBreakdown(channel=null) {
 let chartHourlyAll, chartPortnum1, chartPortnum3, chartPortnum4, chartPortnum67, chartPortnum70, chartPortnum71;
 let chartDailyAll, chartDailyPortnum1;
 let chartHwModel, chartRole, chartChannel;
-let chartGatewayChannel, chartGatewayRole, chartGatewayFirmware;
 let chartPacketTypes;
 
 async function init(){
@@ -436,31 +414,10 @@ async function init(){
     chartRole=renderPieChart("chart_role",processCountField(nodes,"role"),"Role");
     chartChannel=renderPieChart("chart_channel",processCountField(nodes,"channel"),"Channel");
 
-    const gateways = nodes.filter(n => n.is_mqtt_gateway);
-    chartGatewayChannel = renderPieChart(
-        "chart_gateway_channel",
-        processCountField(gateways, "channel"),
-        "Gateway Channel"
-    );
-    chartGatewayRole = renderPieChart(
-        "chart_gateway_role",
-        processCountField(gateways, "role"),
-        "Gateway Role"
-    );
-    chartGatewayFirmware = renderPieChart(
-        "chart_gateway_firmware",
-        processCountField(gateways, "firmware"),
-        "Gateway Firmware"
-    );
-
     const summaryNodesEl = document.getElementById("summary_nodes");
     if (summaryNodesEl) {
         summaryNodesEl.textContent = nodes.length.toLocaleString();
     }
-    const summaryGatewaysEl = document.getElementById("summary_gateways");
-    if (summaryGatewaysEl) {
-        summaryGatewaysEl.textContent = gateways.length.toLocaleString();
-    }
 
     // Packet types pie
     const packetTypesData = await fetchPacketTypeBreakdown();
@@ -507,9 +464,6 @@ window.addEventListener('resize',()=>{
         chartHwModel,
         chartRole,
         chartChannel,
-        chartGatewayChannel,
-        chartGatewayRole,
-        chartGatewayFirmware,
         chartPacketTypes
     ].forEach(c=>c?.resize());
 });

meshview/templates/top.html

@@ -15,7 +15,7 @@
         display: flex;
         flex-wrap: wrap;
         align-items: center;
-        gap: 20px;
+        gap: 10px;
         margin-bottom: 15px;
     }
 
@@ -38,9 +38,16 @@
         color: #ddd;
     }
 
-    table th { background-color: #333; }
+    .filter-bar {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: 20px;
+    }
 
-    table tbody tr:nth-child(odd)  { background-color: #272b2f; }
+
+    table th { background-color: #333; }
+    table tbody tr:nth-child(odd) { background-color: #272b2f; }
     table tbody tr:nth-child(even) { background-color: #212529; }
     table tbody tr:hover { background-color: #555; cursor: pointer; }
 
@@ -51,191 +58,227 @@
     .node-link:hover { text-decoration: underline; }
 
     .good-x { color: #81ff81; font-weight: bold; }
-    .ok-x   { color: #e8e86d; font-weight: bold; }
-    .bad-x  { color: #ff6464; font-weight: bold; }
-
-    .pagination {
-        display: flex;
-        justify-content: center;
-        gap: 12px;
-        margin-top: 15px;
-    }
+    .ok-x { color: #e8e86d; font-weight: bold; }
+    .bad-x { color: #ff6464; font-weight: bold; }
 </style>
 {% endblock %}
 
 {% block body %}
 
-<h1 data-translate-lang="top_traffic_nodes">Top Nodes Traffic</h1>
+<h1>Top Nodes Traffic</h1>
 
 <div class="top-container">
 
-    <div class="filter-bar">
-        <div>
-            <label data-translate-lang="channel">Channel:</label>
-            <select id="channelFilter"></select>
-        </div>
+<div class="filter-bar">
+    <div>
+        <label for="channelFilter">Channel:</label>
+        <select id="channelFilter" class="form-select form-select-sm" style="width:auto;"></select>
     </div>
 
-    <div style="margin-bottom:10px;font-weight:bold;">
-        <span data-translate-lang="showing_nodes">Showing</span>
-        <span id="node-count">0</span>
-        <span data-translate-lang="nodes_suffix">nodes</span>
+    <div>
+        <label for="nodeSearch">Search:</label>
+        <input id="nodeSearch" type="text" class="form-control form-control-sm"
+               placeholder="Search nodes..."
+               style="width:180px; display:inline-block;">
     </div>
+</div>
 
-    <table id="nodesTable">
-        <thead>
-            <tr>
-                <th data-translate-lang="long_name">Long Name</th>
-                <th data-translate-lang="short_name">Short Name</th>
-                <th data-translate-lang="channel">Channel</th>
-                <th data-translate-lang="packets_sent">Sent (24h)</th>
-                <th data-translate-lang="times_seen">Seen (24h)</th>
-                <th data-translate-lang="avg_gateways">Avg Gateways</th>
-            </tr>
-        </thead>
-        <tbody></tbody>
-    </table>
 
-    <div class="pagination">
-        <button id="prevPage" class="btn btn-sm btn-secondary">Prev</button>
-        <span id="pageInfo"></span>
-        <button id="nextPage" class="btn btn-sm btn-secondary">Next</button>
+
+
+    <div class="table-responsive">
+        <table id="nodesTable">
+            <thead>
+                <tr>
+                    <th>Long Name</th>
+                    <th>Short Name</th>
+                    <th>Channel</th>
+                    <th>Sent (24h)</th>
+                    <th>Seen (24h)</th>
+                    <th>Avg Gateways</th>
+                </tr>
+            </thead>
+            <tbody></tbody>
+        </table>
     </div>
 
 </div>
 
 <script>
-/* ======================================================
-   TRANSLATIONS
-   ====================================================== */
-let topTranslations = {};
+    let allNodes = [];
 
-function applyTranslationsTop(dict, root=document) {
-    root.querySelectorAll("[data-translate-lang]").forEach(el => {
-        const key = el.dataset.translateLang;
-        if (!dict[key]) return;
-        el.textContent = dict[key];
-    });
-}
+    async function loadChannels() {
+        try {
+            const res = await fetch("/api/channels");
+            const data = await res.json();
+            const channels = data.channels || [];
 
-async function loadTranslationsTop() {
-    const cfg = await window._siteConfigPromise;
-    const lang = cfg?.site?.language || "en";
-    const res = await fetch(`/api/lang?lang=${lang}&section=top`);
-    topTranslations = await res.json();
-    applyTranslationsTop(topTranslations);
-}
+            const select = document.getElementById("channelFilter");
 
-/* ======================================================
-   CONFIG
-   ====================================================== */
-const PAGE_SIZE = 20;
-let currentPage = 0;
-let totalRows = 0;
+            // Default LongFast first
+            if (channels.includes("LongFast")) {
+                const opt = document.createElement("option");
+                opt.value = "LongFast";
+                opt.textContent = "LongFast";
+                select.appendChild(opt);
+            }
 
-/* ======================================================
-   HELPERS
-   ====================================================== */
-function avgClass(v) {
-    if (v >= 10) return "good-x";
-    if (v >= 2)  return "ok-x";
-    return "bad-x";
-}
+            for (const ch of channels) {
+                if (ch === "LongFast") continue;
+                const opt = document.createElement("option");
+                opt.value = ch;
+                opt.textContent = ch;
+                select.appendChild(opt);
+            }
 
-/* ======================================================
-   LOAD CHANNELS
-   ====================================================== */
-async function loadChannels() {
-    const res = await fetch("/api/channels");
-    const data = await res.json();
-    const sel = document.getElementById("channelFilter");
-
-    sel.innerHTML = "";
-    for (const ch of data.channels || []) {
-        const opt = document.createElement("option");
-        opt.value = ch;
-        opt.textContent = ch;
-        sel.appendChild(opt);
+            select.addEventListener("change", renderTable);
+        } catch (err) {
+            console.error("Error loading channels:", err);
+        }
     }
 
-    sel.value = "MediumFast";
-}
+    async function loadNodes() {
+        try {
+            const res = await fetch("/api/nodes");
+            const data = await res.json();
+            allNodes = data.nodes || [];
+        } catch (err) {
+            console.error("Error loading nodes:", err);
+        }
+    }
+
+    async function fetchNodeStats(nodeId) {
+        try {
+            const url = `/api/stats/count?from_node=${nodeId}&period_type=day&length=1`;
+            const res = await fetch(url);
+            const data = await res.json();
+
+            const sent = data.total_packets || 0;
+            const seen = data.total_seen || 0;
+            const avg = seen / Math.max(sent, 1);
+
+            return {
+                sent,
+                seen,
+                avg: avg
+            };
+        } catch (err) {
+            console.error("Stat error", err);
+            return { sent: 0, seen: 0, avg: 0 };
+        }
+    }
+
+    function avgClass(v) {
+        if (v >= 10) return "good-x";   // Very strong node
+        if (v >= 2)  return "ok-x";     // Normal node
+        return "bad-x";                 // Weak node
+    }
 
-/* ======================================================
-   FETCH + RENDER
-   ====================================================== */
 async function renderTable() {
     const tbody = document.querySelector("#nodesTable tbody");
     tbody.innerHTML = "";
 
     const channel = document.getElementById("channelFilter").value;
-    const offset  = currentPage * PAGE_SIZE;
+    const searchText = document.getElementById("nodeSearch").value.trim().toLowerCase();
 
-    const url = new URL("/api/stats/top", window.location.origin);
-    url.searchParams.set("limit", PAGE_SIZE);
-    url.searchParams.set("offset", offset);
-    if (channel) url.searchParams.set("channel", channel);
+    // Filter nodes by channel FIRST
+    let filtered = allNodes.filter(n => n.channel === channel);
 
-    const res = await fetch(url);
-    const data = await res.json();
-
-    totalRows = data.total || 0;
-
-    for (const n of data.nodes || []) {
-        const tr = document.createElement("tr");
-        tr.onclick = () => location.href = `/node/${n.node_id}`;
-
-        tr.innerHTML = `
-            <td>
-                <a class="node-link" href="/node/${n.node_id}"
-                   onclick="event.stopPropagation()">
-                    ${n.long_name || n.node_id}
-                </a>
-            </td>
-            <td>${n.short_name || ""}</td>
-            <td>${n.channel || ""}</td>
-            <td>${n.sent}</td>
-            <td>${n.seen}</td>
-            <td><span class="${avgClass(n.avg)}">${n.avg.toFixed(1)}</span></td>
-        `;
-        tbody.appendChild(tr);
+    // Then apply search
+    if (searchText !== "") {
+        filtered = filtered.filter(n =>
+            (n.long_name && n.long_name.toLowerCase().includes(searchText)) ||
+            (n.short_name && n.short_name.toLowerCase().includes(searchText)) ||
+            String(n.node_id).includes(searchText)
+        );
     }
 
-    const totalPages = Math.max(1, Math.ceil(totalRows / PAGE_SIZE));
+    // --- Create placeholder rows ---
+    const rowRefs = filtered.map(n => {
+        const tr = document.createElement("tr");
+        tr.addEventListener("click", () => {
+            window.location.href = `/node/${n.node_id}`;
+        });
 
-    document.getElementById("node-count").textContent = totalRows;
-    document.getElementById("pageInfo").textContent =
-        `Page ${currentPage + 1} / ${totalPages}`;
+        const tdLong = document.createElement("td");
+        const a = document.createElement("a");
+        a.href = `/node/${n.node_id}`;
+        a.textContent = n.long_name || n.node_id;
+        a.className = "node-link";
+        a.addEventListener("click", e => e.stopPropagation());
+        tdLong.appendChild(a);
 
-    document.getElementById("prevPage").disabled = currentPage === 0;
-    document.getElementById("nextPage").disabled = currentPage >= totalPages - 1;
+        const tdShort = document.createElement("td");
+        tdShort.textContent = n.short_name || "";
+
+        const tdChannel = document.createElement("td");
+        tdChannel.textContent = n.channel || "";
+
+        const tdSent = document.createElement("td");
+        tdSent.textContent = "Loading...";
+
+        const tdSeen = document.createElement("td");
+        tdSeen.textContent = "Loading...";
+
+        const tdAvg = document.createElement("td");
+        tdAvg.textContent = "Loading...";
+
+        tr.appendChild(tdLong);
+        tr.appendChild(tdShort);
+        tr.appendChild(tdChannel);
+        tr.appendChild(tdSent);
+        tr.appendChild(tdSeen);
+        tr.appendChild(tdAvg);
+
+        tbody.appendChild(tr);
+
+        return { node: n, tr, tdSent, tdSeen, tdAvg };
+    });
+
+    // --- Stats fetch ---
+    const statsList = await Promise.all(
+        rowRefs.map(ref => fetchNodeStats(ref.node.node_id))
+    );
+
+    // --- Update + cleanup empty nodes ---
+    let combined = rowRefs.map((ref, i) => {
+        const stats = statsList[i];
+
+        ref.tdSent.textContent = stats.sent;
+        ref.tdSeen.textContent = stats.seen;
+        ref.tdAvg.innerHTML = `<span class="${avgClass(stats.avg)}">${stats.avg.toFixed(1)}</span>`;
+
+        return {
+            tr: ref.tr,
+            sent: stats.sent,
+            seen: stats.seen
+        };
+    });
+
+    // Remove nodes with no traffic
+    combined = combined.filter(r => !(r.sent === 0 && r.seen === 0));
+
+    // Sort by traffic (seen)
+    combined.sort((a, b) => b.seen - a.seen);
+
+    // Rebuild table
+    tbody.innerHTML = "";
+    for (const r of combined) {
+        tbody.appendChild(r.tr);
+    }
 }
 
-/* ======================================================
-   INIT
-   ====================================================== */
-document.addEventListener("DOMContentLoaded", async () => {
-    await loadTranslationsTop();
+
+
+(async () => {
+    await loadNodes();
     await loadChannels();
-    await renderTable();
+    document.getElementById("channelFilter").value = "LongFast";
 
-    channelFilter.onchange = () => {
-        currentPage = 0;
-        renderTable();
-    };
+    document.getElementById("nodeSearch").addEventListener("input", renderTable);
 
-    prevPage.onclick = () => {
-        if (currentPage > 0) {
-            currentPage--;
-            renderTable();
-        }
-    };
-
-    nextPage.onclick = () => {
-        currentPage++;
-        renderTable();
-    };
-});
+    renderTable();
+})();
 </script>
 
 {% endblock %}

meshview/templates/traceroute.html

@@ -1,138 +0,0 @@
-{% extends "base.html" %}
-
-{% block head %}
-<script src="https://cdn.jsdelivr.net/npm/echarts/dist/echarts.min.js"></script>
-{% endblock %}
-
-{% block css %}
-#traceroute-graph {
-    width: 100%;
-    height: 85vh;
-    border: 1px solid #2a2f36;
-    background: linear-gradient(135deg, #0f1216 0%, #171b22 100%);
-    border-radius: 10px;
-}
-
-#traceroute-meta {
-    padding: 12px 16px;
-    color: #c8d0da;
-}
-
-#traceroute-error {
-    color: #ff6b6b;
-}
-{% endblock %}
-
-{% block body %}
-<div id="traceroute-meta">
-    <div><b>Traceroute</b> <span id="traceroute-title"></span></div>
-    <div id="traceroute-error"></div>
-</div>
-<div id="traceroute-graph"></div>
-
-<script>
-const el = document.getElementById("traceroute-graph");
-const chart = echarts.init(el);
-
-function packetIdFromPath() {
-    const parts = window.location.pathname.split("/").filter(Boolean);
-    return parts[parts.length - 1];
-}
-
-function addPathEdges(path, edges, style) {
-    for (let i = 0; i < path.length - 1; i++) {
-        edges.push({
-            source: String(path[i]),
-            target: String(path[i + 1]),
-            lineStyle: style
-        });
-    }
-}
-
-async function loadTraceroute() {
-    const packetId = packetIdFromPath();
-    document.getElementById("traceroute-title").textContent = `#${packetId}`;
-
-    const [res, nodesRes] = await Promise.all([
-        fetch(`/api/traceroute/${packetId}`),
-        fetch("/api/nodes"),
-    ]);
-    if (!res.ok) {
-        document.getElementById("traceroute-error").textContent = "Traceroute not found.";
-        return;
-    }
-
-    const data = await res.json();
-    const nodesData = nodesRes.ok ? await nodesRes.json() : { nodes: [] };
-    const nodeShortNameById = new Map(
-        (nodesData.nodes || []).map(n => [String(n.node_id), n.short_name || n.long_name || String(n.node_id)])
-    );
-    const nodeLongNameById = new Map(
-        (nodesData.nodes || []).map(n => [String(n.node_id), n.long_name || n.short_name || String(n.node_id)])
-    );
-    const nodes = new Map();
-    const edges = [];
-
-    const forwardPaths = data?.winning_paths?.forward || [];
-    const reversePaths = data?.winning_paths?.reverse || [];
-    const originId = data?.packet?.from != null ? String(data.packet.from) : null;
-    const targetId = data?.packet?.to != null ? String(data.packet.to) : null;
-
-    forwardPaths.forEach(path => {
-        path.forEach(id => nodes.set(String(id), { name: String(id) }));
-        addPathEdges(path, edges, { color: "#ff5733", width: 3 });
-    });
-
-    reversePaths.forEach(path => {
-        path.forEach(id => nodes.set(String(id), { name: String(id) }));
-        addPathEdges(path, edges, { color: "#00c3ff", width: 2, type: "dashed" });
-    });
-
-    const graphNodes = Array.from(nodes.values()).map(n => {
-        const isOrigin = originId && n.name === originId;
-        const isTarget = targetId && n.name === targetId;
-        const color = isOrigin ? "#ff3b30" : isTarget ? "#34c759" : "#8aa4c8";
-        const size = isOrigin || isTarget ? 44 : 36;
-        return {
-            id: n.name,
-            name: nodeShortNameById.get(n.name) || n.name,
-            symbolSize: size,
-            itemStyle: { color },
-            label: {
-                show: true,
-                color: "#e7eef7",
-                fontWeight: "bold"
-            },
-            tooltip: {
-                formatter: () => nodeLongNameById.get(n.name) || n.name
-            }
-        };
-    });
-
-    const option = {
-        backgroundColor: "transparent",
-        tooltip: { trigger: "item" },
-        series: [
-            {
-                type: "graph",
-                layout: "force",
-                roam: true,
-                zoom: 1.2,
-                draggable: true,
-                force: { repulsion: 200, edgeLength: 80 },
-                data: graphNodes,
-                edges: edges,
-                lineStyle: { opacity: 0.8, curveness: 0.1 },
-                edgeSymbol: ["none", "arrow"],
-                edgeSymbolSize: 10
-            }
-        ]
-    };
-
-    chart.setOption(option);
-}
-
-loadTraceroute();
-window.addEventListener("resize", () => chart.resize());
-</script>
-{% endblock %}

meshview/web.py

@@ -1,10 +1,7 @@
-"""Main web server routes and page rendering for Meshview."""
-
 import asyncio
 import datetime
 import logging
 import os
-import pathlib
 import re
 import ssl
 from dataclasses import dataclass
@@ -21,7 +18,6 @@ from meshview import config, database, decode_payload, migrations, models, store
 from meshview.__version__ import (
     __version_string__,
 )
-from meshview.deps import check_optional_deps
 from meshview.web_api import api
 
 logging.basicConfig(
@@ -39,7 +35,6 @@ env = Environment(loader=PackageLoader("meshview"), autoescape=select_autoescape
 
 # Start Database
 database.init_database(CONFIG["database"]["connection_string"])
-check_optional_deps()
 
 BASE_DIR = os.path.dirname(__file__)
 LANG_DIR = os.path.join(BASE_DIR, "lang")
@@ -50,25 +45,22 @@ with open(os.path.join(os.path.dirname(__file__), '1x1.png'), 'rb') as png:
 
 @dataclass
 class Packet:
-    """UI-friendly packet wrapper for templates and API payloads."""
-
     id: int
     from_node_id: int
     from_node: models.Node
     to_node_id: int
     to_node: models.Node
-    channel: str
     portnum: int
     data: str
     raw_mesh_packet: object
     raw_payload: object
     payload: str
     pretty_payload: Markup
+    import_time: datetime.datetime
     import_time_us: int
 
     @classmethod
     def from_model(cls, packet):
-        """Convert a Packet ORM model into a presentation-friendly Packet."""
         mesh_packet, payload = decode_payload.decode(packet)
         pretty_payload = None
 
@@ -105,11 +97,11 @@ class Packet:
             from_node_id=packet.from_node_id,
             to_node=packet.to_node,
             to_node_id=packet.to_node_id,
-            channel=packet.channel,
             portnum=packet.portnum,
             data=text_mesh_packet,
             payload=text_payload,  # now always a string
             pretty_payload=pretty_payload,
+            import_time=packet.import_time,
             import_time_us=packet.import_time_us,  # <-- include microseconds
             raw_mesh_packet=mesh_packet,
             raw_payload=payload,
@@ -117,7 +109,6 @@ class Packet:
 
 
 async def build_trace(node_id):
-    """Build a recent GPS trace list for a node using position packets."""
     trace = []
     for raw_p in await store.get_packets_from(
         node_id, PortNum.POSITION_APP, since=datetime.timedelta(hours=24)
@@ -139,7 +130,6 @@ async def build_trace(node_id):
 
 
 async def build_neighbors(node_id):
-    """Return neighbor node metadata for the given node ID."""
     packets = await store.get_packets_from(node_id, PortNum.NEIGHBORINFO_APP, limit=1)
     packet = packets.first()
 
@@ -169,7 +159,6 @@ async def build_neighbors(node_id):
 
 
 def node_id_to_hex(node_id):
-    """Format a node_id in Meshtastic hex notation."""
     if node_id is None or isinstance(node_id, Undefined):
         return "Invalid node_id"  # i... have no clue
     if node_id == 4294967295:
@@ -179,7 +168,6 @@ def node_id_to_hex(node_id):
 
 
 def format_timestamp(timestamp):
-    """Normalize timestamps to ISO 8601 strings."""
     if isinstance(timestamp, int):
         timestamp = datetime.datetime.fromtimestamp(timestamp, datetime.UTC)
     return timestamp.isoformat(timespec="milliseconds")
@@ -213,38 +201,6 @@ async def redirect_packet_list(request):
     raise web.HTTPFound(location=f"/node/{packet_id}")
 
 
-# Generic static HTML route
-@routes.get("/{page}")
-async def serve_page(request):
-    """Serve static HTML pages from meshview/static."""
-    page = request.match_info["page"]
-
-    # default to index.html if no extension
-    if not page.endswith(".html"):
-        page = f"{page}.html"
-
-    html_file = pathlib.Path(__file__).parent / "static" / page
-    if not html_file.exists():
-        raise web.HTTPNotFound(text=f"Page '{page}' not found")
-
-    content = html_file.read_text(encoding="utf-8")
-    return web.Response(text=content, content_type="text/html")
-
-
-@routes.get("/docs/{doc}")
-async def serve_doc(request):
-    """Serve documentation files from docs/ (markdown)."""
-    doc = request.match_info["doc"]
-    docs_root = pathlib.Path(__file__).parent.parent / "docs"
-    doc_path = (docs_root / doc).resolve()
-
-    if not doc_path.is_file() or docs_root not in doc_path.parents:
-        raise web.HTTPNotFound(text="Document not found")
-
-    content = doc_path.read_text(encoding="utf-8")
-    return web.Response(text=content, content_type="text/markdown")
-
-
 @routes.get("/net")
 async def net(request):
     return web.Response(
@@ -330,15 +286,6 @@ async def stats(request):
     )
 
 
-@routes.get("/traceroute/{packet_id}")
-async def traceroute_page(request):
-    template = env.get_template("traceroute.html")
-    return web.Response(
-        text=template.render(),
-        content_type="text/html",
-    )
-
-
 # Keep !!
 @routes.get("/graph/traceroute/{packet_id}")
 async def graph_traceroute(request):
@@ -388,8 +335,8 @@ async def graph_traceroute(request):
             # It seems some nodes add them self to the list before uplinking
             path.append(tr.gateway_node_id)
 
-        if not tr.done and tr.gateway_node_id not in node_seen_time and tr.import_time_us:
-            node_seen_time[path[-1]] = tr.import_time_us
+        if not tr.done and tr.gateway_node_id not in node_seen_time and tr.import_time:
+            node_seen_time[path[-1]] = tr.import_time
 
         mqtt_nodes.add(tr.gateway_node_id)
         node_color[path[-1]] = '#' + hex(hash(tuple(path)))[3:9]
@@ -399,7 +346,7 @@ async def graph_traceroute(request):
     for path in paths:
         used_nodes.update(path)
 
-    import_times = [tr.import_time_us for tr in traceroutes if tr.import_time_us]
+    import_times = [tr.import_time for tr in traceroutes if tr.import_time]
     if import_times:
         first_time = min(import_times)
     else:
@@ -414,7 +361,7 @@ async def graph_traceroute(request):
                 f'[{node.short_name}] {node.long_name}\n{node_id_to_hex(node_id)}\n{node.role}'
             )
         if node_id in node_seen_time:
-            ms = (node_seen_time[node_id] - first_time) / 1000
+            ms = (node_seen_time[node_id] - first_time).total_seconds() * 1000
             node_name += f'\n {ms:.2f}ms'
         style = 'dashed'
         if node_id == dest:
@@ -432,7 +379,7 @@ async def graph_traceroute(request):
                 shape='box',
                 color=node_color.get(node_id, 'black'),
                 style=style,
-                href=f"/node/{node_id}",
+                href=f"/packet_list/{node_id}",
             )
         )
 
@@ -447,8 +394,32 @@ async def graph_traceroute(request):
     )
 
 
+'''
+@routes.get("/stats")
+async def stats(request):
+    try:
+        total_packets = await store.get_total_packet_count()
+        total_nodes = await store.get_total_node_count()
+        total_packets_seen = await store.get_total_packet_seen_count()
+        template = env.get_template("stats.html")
+        return web.Response(
+            text=template.render(
+                total_packets=total_packets,
+                total_nodes=total_nodes,
+                total_packets_seen=total_packets_seen,
+            ),
+            content_type="text/html",
+        )
+    except Exception as e:
+        return web.Response(
+            text=f"An error occurred: {str(e)}",
+            status=500,
+            content_type="text/plain",
+        )
+'''
+
+
 async def run_server():
-    """Start the aiohttp web server after migrations are complete."""
     # Wait for database migrations to complete before starting web server
     logger.info("Checking database schema status...")
     database_url = CONFIG["database"]["connection_string"]
@@ -465,7 +436,6 @@ async def run_server():
     logger.info("Database schema verified - starting web server")
 
     app = web.Application()
-    app.router.add_static("/static/", pathlib.Path(__file__).parent / "static")
     app.add_routes(api.routes)  # Add API routes
     app.add_routes(routes)  # Add main web routes
 

meshview/web_api/api.py

@@ -3,28 +3,15 @@
 import datetime
 import json
 import logging
-import math
 import os
 
 from aiohttp import web
-from sqlalchemy import func, select
+from sqlalchemy import text
 
 from meshtastic.protobuf.portnums_pb2 import PortNum
 from meshview import database, decode_payload, store
 from meshview.__version__ import __version__, _git_revision_short, get_version_info
 from meshview.config import CONFIG
-from meshview.models import Node, NodePublicKey
-from meshview.models import Packet as PacketModel
-from meshview.models import PacketSeen as PacketSeenModel
-from meshview.radio.coverage import (
-    DEFAULT_MAX_DBM,
-    DEFAULT_MIN_DBM,
-    DEFAULT_RELIABILITY,
-    DEFAULT_THRESHOLD_DBM,
-    ITM_AVAILABLE,
-    compute_coverage,
-    compute_perimeter,
-)
 
 logger = logging.getLogger(__name__)
 
@@ -32,35 +19,11 @@ logger = logging.getLogger(__name__)
 Packet = None
 SEQ_REGEX = None
 LANG_DIR = None
-_LANG_CACHE = {}
 
 # Create dedicated route table for API endpoints
 routes = web.RouteTableDef()
 
 
-def _haversine_km(lat1, lon1, lat2, lon2):
-    r = 6371.0
-    phi1 = math.radians(lat1)
-    phi2 = math.radians(lat2)
-    dphi = math.radians(lat2 - lat1)
-    dlambda = math.radians(lon2 - lon1)
-    a = math.sin(dphi / 2.0) ** 2 + math.cos(phi1) * math.cos(phi2) * math.sin(dlambda / 2.0) ** 2
-    return 2 * r * math.asin(math.sqrt(a))
-
-
-def _bearing_deg(lat1, lon1, lat2, lon2):
-    phi1 = math.radians(lat1)
-    phi2 = math.radians(lat2)
-    dlambda = math.radians(lon2 - lon1)
-    y = math.sin(dlambda) * math.cos(phi2)
-    x = math.cos(phi1) * math.sin(phi2) - math.sin(phi1) * math.cos(phi2) * math.cos(dlambda)
-    bearing = math.degrees(math.atan2(y, x))
-    return (bearing + 360.0) % 360.0
-
-
-OBSERVED_MAX_DISTANCE_KM = 50.0
-
-
 def init_api_module(packet_class, seq_regex, lang_dir):
     """Initialize API module with dependencies from main web module."""
     global Packet, SEQ_REGEX, LANG_DIR
@@ -85,7 +48,6 @@ async def api_channels(request: web.Request):
 async def api_nodes(request):
     try:
         # Optional query parameters
-        node_id = request.query.get("node_id")
         role = request.query.get("role")
         channel = request.query.get("channel")
         hw_model = request.query.get("hw_model")
@@ -99,7 +61,7 @@ async def api_nodes(request):
 
         # Fetch nodes from database
         nodes = await store.get_nodes(
-            node_id=node_id, role=role, channel=channel, hw_model=hw_model, days_active=days_active
+            role=role, channel=channel, hw_model=hw_model, days_active=days_active
         )
 
         # Prepare the JSON response
@@ -117,9 +79,7 @@ async def api_nodes(request):
                     "last_lat": getattr(n, "last_lat", None),
                     "last_long": getattr(n, "last_long", None),
                     "channel": n.channel,
-                    "is_mqtt_gateway": getattr(n, "is_mqtt_gateway", None),
                     # "last_update": n.last_update.isoformat(),
-                    "first_seen_us": n.first_seen_us,
                     "last_seen_us": n.last_seen_us,
                 }
             )
@@ -165,14 +125,15 @@ async def api_packets(request):
                 "portnum": int(p.portnum) if p.portnum is not None else None,
                 "payload": (p.payload or "").strip(),
                 "import_time_us": p.import_time_us,
-                "channel": p.channel,
+                "import_time": p.import_time.isoformat() if p.import_time else None,
+                "channel": getattr(p.from_node, "channel", ""),
                 "long_name": getattr(p.from_node, "long_name", ""),
             }
             return web.json_response({"packets": [data]})
 
         # --- Parse limit ---
         try:
-            limit = min(max(int(limit_str), 1), 1000)
+            limit = min(max(int(limit_str), 1), 100)
         except ValueError:
             limit = 50
 
@@ -216,17 +177,13 @@ async def api_packets(request):
                 logger.warning(f"Invalid node_id: {node_id_str}")
 
         # --- Fetch packets using explicit filters ---
-        contains_for_query = contains
-        if portnum == PortNum.TEXT_MESSAGE_APP and contains:
-            contains_for_query = None
-
         packets = await store.get_packets(
             from_node_id=from_node_id,
             to_node_id=to_node_id,
             node_id=node_id,
             portnum=portnum,
             after=since,
-            contains=contains_for_query,
+            contains=contains,
             limit=limit,
         )
 
@@ -250,13 +207,13 @@ async def api_packets(request):
             packet_dict = {
                 "id": p.id,
                 "import_time_us": p.import_time_us,
-                "channel": p.channel,
+                "import_time": p.import_time.isoformat() if p.import_time else None,
+                "channel": getattr(p.from_node, "channel", ""),
                 "from_node_id": p.from_node_id,
                 "to_node_id": p.to_node_id,
                 "portnum": int(p.portnum),
                 "long_name": getattr(p.from_node, "long_name", ""),
                 "payload": (p.payload or "").strip(),
-                "to_long_name": getattr(p.to_node, "long_name", ""),
             }
 
             reply_id = getattr(
@@ -269,12 +226,20 @@ async def api_packets(request):
 
             packets_data.append(packet_dict)
 
-        # --- Latest import_time_us for incremental fetch ---
+        # --- Latest import_time for incremental fetch ---
         latest_import_time = None
         if packets_data:
             for p in packets_data:
                 if p.get("import_time_us") and p["import_time_us"] > 0:
                     latest_import_time = max(latest_import_time or 0, p["import_time_us"])
+                elif p.get("import_time") and latest_import_time is None:
+                    try:
+                        dt = datetime.datetime.fromisoformat(
+                            p["import_time"].replace("Z", "+00:00")
+                        )
+                        latest_import_time = int(dt.timestamp() * 1_000_000)
+                    except Exception:
+                        pass
 
         response = {"packets": packets_data}
         if latest_import_time is not None:
@@ -454,65 +419,44 @@ async def api_stats_count(request):
 
 @routes.get("/api/edges")
 async def api_edges(request):
-    since = datetime.datetime.now() - datetime.timedelta(hours=12)
+    since = datetime.datetime.now() - datetime.timedelta(hours=48)
     filter_type = request.query.get("type")
 
-    # NEW → optional single-node filter
-    node_filter_str = request.query.get("node_id")
-    node_filter = None
-    if node_filter_str:
-        try:
-            node_filter = int(node_filter_str)
-        except ValueError:
-            return web.json_response({"error": "node_id must be integer"}, status=400)
-
     edges = {}
-    traceroute_count = 0
-    edges_added_tr = 0
-    edges_added_neighbor = 0
 
-    # --- Traceroute edges ---
+    # Only build traceroute edges if requested
     if filter_type in (None, "traceroute"):
         async for tr in store.get_traceroutes(since):
-            traceroute_count += 1
-
             try:
                 route = decode_payload.decode_payload(PortNum.TRACEROUTE_APP, tr.route)
-            except Exception:
+            except Exception as e:
+                logger.error(f"Error decoding Traceroute {tr.id}: {e}")
                 continue
 
             path = [tr.packet.from_node_id] + list(route.route)
             path.append(tr.packet.to_node_id if tr.done else tr.gateway_node_id)
 
             for a, b in zip(path, path[1:], strict=False):
-                if (a, b) not in edges:
-                    edges[(a, b)] = "traceroute"
-                    edges_added_tr += 1
+                edges[(a, b)] = "traceroute"
 
-    # --- Neighbor edges ---
+    # Only build neighbor edges if requested
     if filter_type in (None, "neighbor"):
-        packets = await store.get_packets(portnum=71)
+        packets = await store.get_packets(portnum=PortNum.NEIGHBORINFO_APP, after=since)
         for packet in packets:
             try:
                 _, neighbor_info = decode_payload.decode(packet)
-            except Exception:
-                continue
+                for node in neighbor_info.neighbors:
+                    edges.setdefault((node.node_id, packet.from_node_id), "neighbor")
+            except Exception as e:
+                logger.error(
+                    f"Error decoding NeighborInfo packet {getattr(packet, 'id', '?')}: {e}"
+                )
 
-            for node in neighbor_info.neighbors:
-                edge = (node.node_id, packet.from_node_id)
-                if edge not in edges:
-                    edges[edge] = "neighbor"
-                    edges_added_neighbor += 1
-
-    # Convert to list
+    # Convert edges dict to list format for JSON response
     edges_list = [
         {"from": frm, "to": to, "type": edge_type} for (frm, to), edge_type in edges.items()
     ]
 
-    # NEW → apply node_id filtering
-    if node_filter is not None:
-        edges_list = [e for e in edges_list if e["from"] == node_filter or e["to"] == node_filter]
-
     return web.json_response({"edges": edges_list})
 
 
@@ -629,20 +573,9 @@ async def api_lang(request):
     if not os.path.exists(lang_file):
         lang_file = os.path.join(LANG_DIR, "en.json")
 
-    # Cache by file + mtime to avoid re-reading on every request
-    try:
-        mtime = os.path.getmtime(lang_file)
-    except OSError:
-        mtime = None
-
-    cache_key = lang_file
-    cached = _LANG_CACHE.get(cache_key)
-    if cached and cached.get("mtime") == mtime:
-        translations = cached["translations"]
-    else:
-        with open(lang_file, encoding="utf-8") as f:
-            translations = json.load(f)
-        _LANG_CACHE[cache_key] = {"mtime": mtime, "translations": translations}
+    # Load JSON translations
+    with open(lang_file, encoding="utf-8") as f:
+        translations = json.load(f)
 
     if section:
         section = section.lower()
@@ -670,14 +603,8 @@ async def health_check(request):
     # Check database connectivity
     try:
         async with database.async_session() as session:
-            result = await session.execute(select(func.max(PacketModel.import_time_us)))
-            last_import_time_us = result.scalar()
+            await session.execute(text("SELECT 1"))
         health_status["database"] = "connected"
-        if last_import_time_us is not None:
-            now_us = int(datetime.datetime.now(datetime.UTC).timestamp() * 1_000_000)
-            health_status["seconds_since_last_message"] = round(
-                (now_us - last_import_time_us) / 1_000_000, 1
-            )
     except Exception as e:
         logger.error(f"Database health check failed: {e}")
         health_status["database"] = "disconnected"
@@ -750,6 +677,7 @@ async def api_packets_seen(request):
                     "rx_snr": row.rx_snr,
                     "rx_rssi": row.rx_rssi,
                     "topic": row.topic,
+                    "import_time": (row.import_time.isoformat() if row.import_time else None),
                     "import_time_us": row.import_time_us,
                 }
             )
@@ -762,394 +690,3 @@ async def api_packets_seen(request):
             {"error": "Internal server error"},
             status=500,
         )
-
-
-@routes.get("/api/traceroute/{packet_id}")
-async def api_traceroute(request):
-    packet_id = int(request.match_info['packet_id'])
-
-    traceroutes = list(await store.get_traceroute(packet_id))
-    packet = await store.get_packet(packet_id)
-
-    if not packet:
-        return web.json_response({"error": "Packet not found"}, status=404)
-
-    tr_groups = []
-
-    # --------------------------------------------
-    # Decode each traceroute entry
-    # --------------------------------------------
-    for idx, tr in enumerate(traceroutes):
-        route = decode_payload.decode_payload(PortNum.TRACEROUTE_APP, tr.route)
-
-        forward_list = list(route.route)
-        reverse_list = list(route.route_back)
-
-        tr_groups.append(
-            {
-                "index": idx,
-                "gateway_node_id": tr.gateway_node_id,
-                "done": tr.done,
-                "forward_hops": forward_list,
-                "reverse_hops": reverse_list,
-            }
-        )
-
-    # --------------------------------------------
-    # Compute UNIQUE paths + counts + winning path
-    # --------------------------------------------
-    from collections import Counter
-
-    forward_paths = []
-    reverse_paths = []
-    winning_forward_paths = []
-    winning_reverse_paths = []
-
-    for tr in tr_groups:
-        f = tuple(tr["forward_hops"])
-        r = tuple(tr["reverse_hops"])
-
-        if tr["forward_hops"]:
-            forward_paths.append(f)
-
-        if tr["reverse_hops"]:
-            reverse_paths.append(r)
-
-        if tr["done"]:
-            if tr["forward_hops"]:
-                winning_forward_paths.append(f)
-            if tr["reverse_hops"]:
-                winning_reverse_paths.append(r)
-
-    # Deduplicate
-    unique_forward_paths = sorted(set(forward_paths))
-    unique_reverse_paths = sorted(set(reverse_paths))
-
-    # Count occurrences
-    forward_counts = Counter(forward_paths)
-
-    # Convert for JSON output
-    unique_forward_paths_json = [
-        {"path": list(p), "count": forward_counts[p]} for p in unique_forward_paths
-    ]
-
-    unique_reverse_paths_json = [list(p) for p in unique_reverse_paths]
-
-    from_node_id = packet.from_node_id
-    to_node_id = packet.to_node_id
-    winning_forward_with_endpoints = []
-    for path in set(winning_forward_paths):
-        full_path = list(path)
-        if from_node_id is not None and (not full_path or full_path[0] != from_node_id):
-            full_path = [from_node_id, *full_path]
-        if to_node_id is not None and (not full_path or full_path[-1] != to_node_id):
-            full_path = [*full_path, to_node_id]
-        winning_forward_with_endpoints.append(full_path)
-
-    winning_reverse_with_endpoints = []
-    for path in set(winning_reverse_paths):
-        full_path = list(path)
-        if to_node_id is not None and (not full_path or full_path[0] != to_node_id):
-            full_path = [to_node_id, *full_path]
-        if from_node_id is not None and (not full_path or full_path[-1] != from_node_id):
-            full_path = [*full_path, from_node_id]
-        winning_reverse_with_endpoints.append(full_path)
-
-    winning_paths_json = {
-        "forward": winning_forward_with_endpoints,
-        "reverse": winning_reverse_with_endpoints,
-    }
-
-    # --------------------------------------------
-    # Final API output
-    # --------------------------------------------
-    return web.json_response(
-        {
-            "packet": {
-                "id": packet.id,
-                "from": packet.from_node_id,
-                "to": packet.to_node_id,
-                "channel": packet.channel,
-            },
-            "traceroute_packets": tr_groups,
-            "unique_forward_paths": unique_forward_paths_json,
-            "unique_reverse_paths": unique_reverse_paths_json,
-            "winning_paths": winning_paths_json,
-        }
-    )
-
-
-@routes.get("/api/stats/top")
-async def api_stats_top(request):
-    """
-    Returns nodes sorted by SEEN (high → low) with pagination.
-    """
-
-    period_type = request.query.get("period_type", "day")
-    length = int(request.query.get("length", 1))
-    channel = request.query.get("channel")
-
-    limit = min(int(request.query.get("limit", 20)), 100)
-    offset = int(request.query.get("offset", 0))
-
-    multiplier = 3600 if period_type == "hour" else 86400
-    window_us = length * multiplier * 1_000_000
-
-    max_packet_import = select(func.max(PacketModel.import_time_us)).scalar_subquery()
-    max_seen_import = select(func.max(PacketSeenModel.import_time_us)).scalar_subquery()
-
-    sent_cte = (
-        select(PacketModel.from_node_id.label("node_id"), func.count().label("sent"))
-        .where(PacketModel.import_time_us >= max_packet_import - window_us)
-        .group_by(PacketModel.from_node_id)
-        .cte("sent")
-    )
-
-    seen_cte = (
-        select(PacketModel.from_node_id.label("node_id"), func.count().label("seen"))
-        .select_from(PacketSeenModel)
-        .join(PacketModel, PacketModel.id == PacketSeenModel.packet_id)
-        .where(PacketSeenModel.import_time_us >= max_seen_import - window_us)
-        .group_by(PacketModel.from_node_id)
-        .cte("seen")
-    )
-
-    query = (
-        select(
-            Node.node_id,
-            Node.long_name,
-            Node.short_name,
-            Node.channel,
-            func.coalesce(sent_cte.c.sent, 0).label("sent"),
-            func.coalesce(seen_cte.c.seen, 0).label("seen"),
-        )
-        .select_from(Node)
-        .outerjoin(sent_cte, sent_cte.c.node_id == Node.node_id)
-        .outerjoin(seen_cte, seen_cte.c.node_id == Node.node_id)
-        .order_by(func.coalesce(seen_cte.c.seen, 0).desc())
-        .limit(limit)
-        .offset(offset)
-    )
-
-    count_query = select(func.count()).select_from(Node)
-
-    if channel:
-        query = query.where(Node.channel == channel)
-        count_query = count_query.where(Node.channel == channel)
-
-    async with database.async_session() as session:
-        rows = (await session.execute(query)).all()
-        total = (await session.execute(count_query)).scalar() or 0
-
-    nodes = []
-    for r in rows:
-        avg = r.seen / max(r.sent, 1)
-        nodes.append(
-            {
-                "node_id": r.node_id,
-                "long_name": r.long_name,
-                "short_name": r.short_name,
-                "channel": r.channel,
-                "sent": r.sent,
-                "seen": r.seen,
-                "avg": round(avg, 2),
-            }
-        )
-
-    return web.json_response(
-        {
-            "total": total,
-            "limit": limit,
-            "offset": offset,
-            "nodes": nodes,
-        }
-    )
-
-
-@routes.get("/api/node/{node_id}/qr")
-async def api_node_qr(request):
-    """
-    Generate a Meshtastic URL for importing the node as a contact.
-    Returns the URL that can be used to generate a QR code.
-    """
-    try:
-        node_id_str = request.match_info["node_id"]
-        node_id = int(node_id_str, 0)
-    except (KeyError, ValueError):
-        return web.json_response({"error": "Invalid node_id"}, status=400)
-
-    node = await store.get_node(node_id)
-    if not node:
-        return web.json_response({"error": "Node not found"}, status=404)
-
-    try:
-        from meshtastic.protobuf.admin_pb2 import SharedContact
-        from meshtastic.protobuf.mesh_pb2 import User
-
-        user = User()
-        user.id = f"!{node_id:08x}"
-        if node.long_name:
-            user.long_name = node.long_name
-        if node.short_name:
-            user.short_name = node.short_name
-        if node.hw_model:
-            try:
-                from meshtastic.protobuf.mesh_pb2 import HardwareModel
-
-                hw_model_value = getattr(HardwareModel, node.hw_model.upper(), None)
-                if hw_model_value is not None:
-                    user.hw_model = hw_model_value
-            except (AttributeError, TypeError):
-                pass
-
-        contact = SharedContact()
-        contact.node_num = node_id
-        contact.user.CopyFrom(user)
-        contact.manually_verified = False
-
-        contact_bytes = contact.SerializeToString()
-        import base64
-
-        contact_b64 = base64.b64encode(contact_bytes).decode("ascii")
-        contact_b64url = contact_b64.replace("+", "-").replace("/", "_").rstrip("=")
-
-        meshtastic_url = f"https://meshtastic.org/v/#{contact_b64url}"
-
-        return web.json_response(
-            {
-                "node_id": node_id,
-                "long_name": node.long_name,
-                "short_name": node.short_name,
-                "meshtastic_url": meshtastic_url,
-            }
-        )
-    except Exception as e:
-        import traceback
-
-        logger.error(f"Error generating QR URL for node {node_id}: {e}")
-        logger.error(traceback.format_exc())
-        return web.json_response({"error": f"Failed to generate URL: {str(e)}"}, status=500)
-
-
-@routes.get("/api/node/{node_id}/impersonation-check")
-async def api_node_impersonation_check(request):
-    """
-    Check if a node has multiple different public keys, which could indicate impersonation.
-    """
-    try:
-        node_id_str = request.match_info["node_id"]
-        node_id = int(node_id_str, 0)
-    except (KeyError, ValueError):
-        return web.json_response({"error": "Invalid node_id"}, status=400)
-
-    try:
-        async with database.async_session() as session:
-            result = await session.execute(
-                select(NodePublicKey.public_key).where(NodePublicKey.node_id == node_id).distinct()
-            )
-            public_keys = result.scalars().all()
-
-            unique_key_count = len(public_keys)
-
-            return web.json_response(
-                {
-                    "node_id": node_id,
-                    "unique_public_key_count": unique_key_count,
-                    "potential_impersonation": unique_key_count > 1,
-                    "public_keys": public_keys
-                    if unique_key_count <= 3
-                    else public_keys[:3] + ["..."],
-                    "warning": "Multiple different public keys detected. This node may be getting impersonated."
-                    if unique_key_count > 1
-                    else None,
-                }
-            )
-    except Exception as e:
-        logger.error(f"Error checking impersonation for node {node_id}: {e}")
-        return web.json_response({"error": "Failed to check impersonation"}, status=500)
-
-
-@routes.get("/api/coverage/{node_id}")
-async def api_coverage(request):
-    try:
-        node_id = int(request.match_info["node_id"], 0)
-    except (KeyError, ValueError):
-        return web.json_response({"error": "Invalid node_id"}, status=400)
-
-    if not ITM_AVAILABLE:
-        return web.json_response(
-            {"error": "Coverage requires pyitm. Run: pip install -r requirements.txt"},
-            status=503,
-        )
-
-    def parse_float(name, default):
-        value = request.query.get(name)
-        if value is None:
-            return default
-        try:
-            return float(value)
-        except ValueError as exc:
-            raise web.HTTPBadRequest(
-                text=json.dumps({"error": f"{name} must be a number"}),
-                content_type="application/json",
-            ) from exc
-
-    try:
-        freq_mhz = parse_float("freq_mhz", 907.0)
-        tx_dbm = parse_float("tx_dbm", 20.0)
-        tx_height_m = parse_float("tx_height_m", 5.0)
-        rx_height_m = parse_float("rx_height_m", 1.5)
-        radius_km = parse_float("radius_km", 40.0)
-        step_km = parse_float("step_km", 0.25)
-        reliability = parse_float("reliability", DEFAULT_RELIABILITY)
-        threshold_dbm = parse_float("threshold_dbm", DEFAULT_THRESHOLD_DBM)
-    except web.HTTPBadRequest as exc:
-        raise exc
-
-    node = await store.get_node(node_id)
-    if not node or not node.last_lat or not node.last_long:
-        return web.json_response({"error": "Node not found or missing location"}, status=404)
-
-    lat = node.last_lat * 1e-7
-    lon = node.last_long * 1e-7
-
-    mode = request.query.get("mode", "perimeter")
-    if mode == "perimeter":
-        perimeter = compute_perimeter(
-            lat=round(lat, 7),
-            lon=round(lon, 7),
-            freq_mhz=round(freq_mhz, 3),
-            tx_dbm=round(tx_dbm, 2),
-            tx_height_m=round(tx_height_m, 2),
-            rx_height_m=round(rx_height_m, 2),
-            radius_km=round(radius_km, 2),
-            step_km=round(step_km, 3),
-            reliability=round(reliability, 3),
-            threshold_dbm=round(threshold_dbm, 1),
-        )
-        return web.json_response(
-            {"mode": "perimeter", "threshold_dbm": threshold_dbm, "perimeter": perimeter}
-        )
-
-    points = compute_coverage(
-        lat=round(lat, 7),
-        lon=round(lon, 7),
-        freq_mhz=round(freq_mhz, 3),
-        tx_dbm=round(tx_dbm, 2),
-        tx_height_m=round(tx_height_m, 2),
-        rx_height_m=round(rx_height_m, 2),
-        radius_km=round(radius_km, 2),
-        step_km=round(step_km, 3),
-        reliability=round(reliability, 3),
-    )
-
-    min_dbm = DEFAULT_MIN_DBM
-    max_dbm = DEFAULT_MAX_DBM
-    if points:
-        vals = [p[2] for p in points]
-        min_dbm = min(min_dbm, min(vals))
-        max_dbm = max(max_dbm, max(vals))
-
-    return web.json_response(
-        {"mode": "heatmap", "min_dbm": min_dbm, "max_dbm": max_dbm, "points": points}
-    )

pyproject.toml

@@ -48,7 +48,7 @@ dev = [
 # Linting
 target-version = "py313"
 line-length = 100
-extend-exclude = ["build", "dist", ".venv", "meshtastic/protobuf", "nanopb_pb2.py"]
+extend-exclude = ["build", "dist", ".venv"]
 
 [tool.ruff.lint]
 select = ["E", "F", "I", "UP", "B"]     # pick your rulesets
@@ -56,4 +56,4 @@ ignore = ["E501"]                       # example; let formatter handle line len
 
 [tool.ruff.format]
 quote-style = "preserve"
-indent-style = "space"
+indent-style = "space"

requirements.txt

@@ -24,7 +24,6 @@ MarkupSafe~=3.0.2
 
 # Graphs / diagrams
 pydot~=3.0.4
-pyitm~=0.3
 
 
 #############################
@@ -48,4 +47,4 @@ objgraph~=3.6.2
 # Testing
 pytest~=8.3.4
 pytest-aiohttp~=1.0.5
-pytest-asyncio~=0.24.0
+pytest-asyncio~=0.24.0

sample.config.ini

@@ -76,22 +76,12 @@ port = 1883
 username = meshdev
 password = large4cats
 
-# Optional list of node IDs to ignore. Comma-separated.
-skip_node_ids =
-
-# Optional list of secondary AES keys (base64), comma-separated.
-secondary_keys =
-
-
 
 # -------------------------
 # Database Configuration
 # -------------------------
 [database]
-# SQLAlchemy async connection string.
-# Examples:
-#   sqlite+aiosqlite:///packets.db
-#   postgresql+asyncpg://user:pass@host:5432/meshview
+# SQLAlchemy connection string. This one uses SQLite with asyncio support.
 connection_string = sqlite+aiosqlite:///packets.db
 
 

scripts/update_meshtastic_protobufs.py

@@ -1,126 +0,0 @@
-#!/usr/bin/env python3
-import argparse
-import shutil
-import subprocess
-import sys
-import tempfile
-from pathlib import Path
-
-
-def run(cmd, cwd=None):
-    subprocess.run(cmd, cwd=cwd, check=True)
-
-
-def main():
-    parser = argparse.ArgumentParser(description="Update Meshtastic protobufs")
-    parser.add_argument(
-        "--repo",
-        default="https://github.com/meshtastic/protobufs.git",
-        help="Meshtastic protobufs repo URL",
-    )
-    parser.add_argument(
-        "--ref",
-        default="master",
-        help="Git ref to fetch (branch, tag, or commit)",
-    )
-    parser.add_argument(
-        "--check",
-        action="store_true",
-        help="Only check if protobufs are up to date for the given ref",
-    )
-    args = parser.parse_args()
-
-    repo_root = Path(__file__).resolve().parents[1]
-    out_root = repo_root
-
-    with tempfile.TemporaryDirectory(prefix="meshtastic-protobufs-") as tmp:
-        tmp_path = Path(tmp)
-        print(f"Cloning {args.repo} ({args.ref}) into {tmp_path}...")
-        run(["git", "clone", "--depth", "1", "--branch", args.ref, args.repo, str(tmp_path)])
-        upstream_rev = (
-            subprocess.check_output(["git", "rev-parse", "HEAD"], cwd=tmp_path).decode().strip()
-        )
-
-        rev_file = out_root / "meshtastic" / "protobuf" / "UPSTREAM_REV.txt"
-        current_rev = None
-        if rev_file.exists():
-            current_rev = rev_file.read_text(encoding="utf-8").strip()
-
-        if args.check:
-            if current_rev == upstream_rev:
-                print(f"Up to date: {current_rev}")
-                return 0
-            print(f"Out of date. Local: {current_rev or 'unknown'} / Upstream: {upstream_rev}")
-            return 1
-
-        proto_root = None
-        # Common locations in the meshtastic/protobufs repo
-        candidates = [
-            tmp_path / "meshtastic" / "protobuf",
-            tmp_path / "protobufs",
-            tmp_path / "protobuf",
-            tmp_path / "proto",
-        ]
-        for candidate in candidates:
-            if candidate.exists() and list(candidate.glob("*.proto")):
-                proto_root = candidate
-                break
-
-        if proto_root is None:
-            # Fallback: search for any directory containing .proto files
-            for candidate in tmp_path.rglob("*.proto"):
-                proto_root = candidate.parent
-                break
-
-        if proto_root is None:
-            print("Proto root not found in cloned repo.", file=sys.stderr)
-            return 1
-
-        protos = sorted(proto_root.glob("*.proto"))
-        if not protos:
-            print(f"No .proto files found in {proto_root}", file=sys.stderr)
-            return 1
-
-        rel_protos = [str(p.relative_to(tmp_path)) for p in protos]
-
-        protoc = shutil.which("protoc")
-        if protoc:
-            cmd = [
-                protoc,
-                f"-I{tmp_path}",
-                f"--python_out={out_root}",
-                *rel_protos,
-            ]
-            print("Running protoc...")
-            run(cmd, cwd=tmp_path)
-        else:
-            try:
-                import grpc_tools.protoc  # noqa: F401
-            except Exception:
-                print(
-                    "protoc not found. Install it with your package manager, "
-                    "or install grpcio-tools and re-run.",
-                    file=sys.stderr,
-                )
-                return 1
-            cmd = [
-                sys.executable,
-                "-m",
-                "grpc_tools.protoc",
-                f"-I{tmp_path}",
-                f"--python_out={out_root}",
-                *rel_protos,
-            ]
-            print("Running grpc_tools.protoc...")
-            run(cmd, cwd=tmp_path)
-
-        rev_file.parent.mkdir(parents=True, exist_ok=True)
-        rev_file.write_text(upstream_rev + "\n", encoding="utf-8")
-
-    print("Protobufs updated in meshtastic/protobuf/.")
-    print("Review changes and commit them if desired.")
-    return 0
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())

startdb.py

@@ -7,11 +7,9 @@ import shutil
 from pathlib import Path
 
 from sqlalchemy import delete
-from sqlalchemy.engine.url import make_url
 
 from meshview import migrations, models, mqtt_database, mqtt_reader, mqtt_store
 from meshview.config import CONFIG
-from meshview.deps import check_optional_deps
 
 # -------------------------
 # Basic logging configuration
@@ -67,16 +65,18 @@ async def backup_database(database_url: str, backup_dir: str = ".") -> None:
         backup_dir: Directory to store backups (default: current directory)
     """
     try:
-        url = make_url(database_url)
-        if not url.drivername.startswith("sqlite"):
+        # Extract database file path from connection string
+        # Format: sqlite+aiosqlite:///path/to/db.db
+        if not database_url.startswith("sqlite"):
             cleanup_logger.warning("Backup only supported for SQLite databases")
             return
 
-        if not url.database or url.database == ":memory:":
+        db_path = database_url.split("///", 1)[1] if "///" in database_url else None
+        if not db_path:
             cleanup_logger.error("Could not extract database path from connection string")
             return
 
-        db_file = Path(url.database)
+        db_file = Path(db_path)
         if not db_file.exists():
             cleanup_logger.error(f"Database file not found: {db_file}")
             return
@@ -153,11 +153,11 @@ async def daily_cleanup_at(
             cleanup_logger.info("Waiting 60 seconds for backup to complete...")
             await asyncio.sleep(60)
 
-        cutoff_dt = (
-            datetime.datetime.now(datetime.UTC) - datetime.timedelta(days=days_to_keep)
-        ).replace(tzinfo=None)
-        cutoff_us = int(cutoff_dt.timestamp() * 1_000_000)
-        cleanup_logger.info(f"Running cleanup for records older than {cutoff_dt.isoformat()}...")
+        # Local-time cutoff as string for SQLite DATETIME comparison
+        cutoff = (datetime.datetime.now() - datetime.timedelta(days=days_to_keep)).strftime(
+            "%Y-%m-%d %H:%M:%S"
+        )
+        cleanup_logger.info(f"Running cleanup for records older than {cutoff}...")
 
         try:
             async with db_lock:  # Pause ingestion
@@ -168,7 +168,7 @@ async def daily_cleanup_at(
                     # Packet
                     # -------------------------
                     result = await session.execute(
-                        delete(models.Packet).where(models.Packet.import_time_us < cutoff_us)
+                        delete(models.Packet).where(models.Packet.import_time < cutoff)
                     )
                     cleanup_logger.info(f"Deleted {result.rowcount} rows from Packet")
 
@@ -176,9 +176,7 @@ async def daily_cleanup_at(
                     # PacketSeen
                     # -------------------------
                     result = await session.execute(
-                        delete(models.PacketSeen).where(
-                            models.PacketSeen.import_time_us < cutoff_us
-                        )
+                        delete(models.PacketSeen).where(models.PacketSeen.import_time < cutoff)
                     )
                     cleanup_logger.info(f"Deleted {result.rowcount} rows from PacketSeen")
 
@@ -186,9 +184,7 @@ async def daily_cleanup_at(
                     # Traceroute
                     # -------------------------
                     result = await session.execute(
-                        delete(models.Traceroute).where(
-                            models.Traceroute.import_time_us < cutoff_us
-                        )
+                        delete(models.Traceroute).where(models.Traceroute.import_time < cutoff)
                     )
                     cleanup_logger.info(f"Deleted {result.rowcount} rows from Traceroute")
 
@@ -196,19 +192,17 @@ async def daily_cleanup_at(
                     # Node
                     # -------------------------
                     result = await session.execute(
-                        delete(models.Node).where(models.Node.last_seen_us < cutoff_us)
+                        delete(models.Node).where(models.Node.last_update < cutoff)
                     )
                     cleanup_logger.info(f"Deleted {result.rowcount} rows from Node")
 
                     await session.commit()
 
-                if vacuum_db and mqtt_database.engine.dialect.name == "sqlite":
+                if vacuum_db:
                     cleanup_logger.info("Running VACUUM...")
                     async with mqtt_database.engine.begin() as conn:
                         await conn.exec_driver_sql("VACUUM;")
                     cleanup_logger.info("VACUUM completed.")
-                elif vacuum_db:
-                    cleanup_logger.info("VACUUM skipped (not supported for this database).")
 
                 cleanup_logger.info("Cleanup completed successfully.")
                 cleanup_logger.info("Ingestion resumed after cleanup.")
@@ -238,7 +232,6 @@ async def load_database_from_mqtt(
 # Main function
 # -------------------------
 async def main():
-    check_optional_deps()
     logger = logging.getLogger(__name__)
 
     # Initialize database
@@ -267,9 +260,6 @@ async def main():
         await mqtt_database.create_tables()
         logger.info("Database tables created")
 
-        # Load MQTT gateway cache after DB init/migrations
-        await mqtt_store.load_gateway_cache()
-
     finally:
         # Clear migration in progress flag
         logger.info("Clearing migration status...")