iarv/Remote-Terminal-for-MeshCore
1
0
Fork 1
mirror of https://github.com/jkingsman/Remote-Terminal-for-MeshCore.git synced 2026-05-05 04:52:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #224 from jkingsman/repeater-error-count

Browse Source 
Repeater error count
This commit is contained in:
Jack Kingsman
2026-04-25 13:54:42 -07:00
committed by GitHub
parent f0b7842c60 89cee49725
commit d436de67a2
15 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/fanout/mqtt_ha.py
View File

@@ -81,6 +81,15 @@ _REPEATER_SENSORS: list[dict[str, Any]] = [
"unit": None,
"precision": 0,
},
{
"field": "recv_errors",
"name": "RX Errors",
"object_id": "recv_errors",
"device_class": None,
"state_class": "total_increasing",
"unit": None,
"precision": 0,
},
{
"field": "uptime_seconds",
"name": "Uptime",

1
app/models.py
View File

@@ -540,6 +540,7 @@ class RepeaterStatusResponse(BaseModel):
flood_dups: int = Field(description="Duplicate flood packets")
direct_dups: int = Field(description="Duplicate direct packets")
full_events: int = Field(description="Full event queue count")
recv_errors: int | None = Field(default=None, description="Radio-level RX packet errors")
telemetry_history: list["TelemetryHistoryEntry"] = Field(
default_factory=list, description="Recent telemetry history snapshots"
)

1
app/radio_sync.py
View File

@@ -1821,6 +1821,7 @@ async def _collect_repeater_telemetry(mc: MeshCore, contact: Contact) -> bool:
"flood_dups": status.get("flood_dups", 0),
"direct_dups": status.get("direct_dups", 0),
"full_events": status.get("full_evts", 0),
"recv_errors": status.get("recv_errors"),
}
# Best-effort LPP sensor fetch — failure here does not fail the overall

1
app/routers/repeaters.py
View File

@@ -133,6 +133,7 @@ async def repeater_status(public_key: str) -> RepeaterStatusResponse:
flood_dups=status.get("flood_dups", 0),
direct_dups=status.get("direct_dups", 0),
full_events=status.get("full_evts", 0),
recv_errors=status.get("recv_errors"),
)
# Record to telemetry history as a JSON blob (best-effort)

1
app/routers/rooms.py
View File

@@ -78,6 +78,7 @@ async def room_status(public_key: str) -> RepeaterStatusResponse:
flood_dups=status.get("flood_dups", 0),
direct_dups=status.get("direct_dups", 0),
full_events=status.get("full_evts", 0),
recv_errors=status.get("recv_errors"),
)

9
frontend/src/components/repeater/RepeaterTelemetryHistoryPane.tsx
View File

@@ -17,7 +17,12 @@ import type { TelemetryHistoryEntry, TelemetryLppSensor, Contact } from '../../t
const MAX_TRACKED = 8;
type BuiltinMetric = 'battery_volts' | 'noise_floor_dbm' | 'packets' | 'uptime_seconds';
type BuiltinMetric =
| 'battery_volts'
| 'noise_floor_dbm'
| 'packets'
| 'recv_errors'
| 'uptime_seconds';
interface MetricConfig {
label: string;
@@ -29,6 +34,7 @@ const BUILTIN_METRIC_CONFIG: Record<BuiltinMetric, MetricConfig> = {
battery_volts: { label: 'Voltage', unit: 'V', color: '#22c55e' },
noise_floor_dbm: { label: 'Noise Floor', unit: 'dBm', color: '#8b5cf6' },
packets: { label: 'Packets', unit: '', color: '#0ea5e9' },
recv_errors: { label: 'RX Errors', unit: '', color: '#ef4444' },
uptime_seconds: { label: 'Uptime', unit: 's', color: '#f59e0b' },
};
@@ -154,6 +160,7 @@ export function TelemetryHistoryPane({
noise_floor_dbm: d.noise_floor_dbm,
packets_received: d.packets_received,
packets_sent: d.packets_sent,
recv_errors: d.recv_errors ?? undefined,
uptime_seconds: d.uptime_seconds,
};
// Flatten LPP sensors into the point, converting units as needed

3
frontend/src/components/repeater/RepeaterTelemetryPane.tsx
View File

@@ -91,6 +91,9 @@ export function TelemetryPane({
label="Duplicates"
value={`${data.flood_dups.toLocaleString()} flood / ${data.direct_dups.toLocaleString()} direct`}
/>
{data.recv_errors != null && (
<KvRow label="RX Errors" value={data.recv_errors.toLocaleString()} />
)}
<Separator className="my-1" />
<KvRow label="TX Queue" value={data.tx_queue_len} />
<KvRow label="Debug Flags" value={data.full_events} />

3
frontend/src/test/repeaterDashboard.test.tsx
View File

@@ -438,6 +438,7 @@ describe('RepeaterDashboard', () => {
flood_dups: 1,
direct_dups: 0,
full_events: 0,
recv_errors: 5,
telemetry_history: [],
};
@@ -707,6 +708,7 @@ describe('RepeaterDashboard', () => {
flood_dups: 1,
direct_dups: 0,
full_events: 0,
recv_errors: null,
telemetry_history: [liveEntry],
};
@@ -742,6 +744,7 @@ describe('RepeaterDashboard', () => {
flood_dups: 1,
direct_dups: 0,
full_events: 0,
recv_errors: null,
telemetry_history: [{ timestamp: 1700000000, data: { battery_volts: 4.2 } }],
};

1
frontend/src/types.ts
View File

@@ -438,6 +438,7 @@ export interface RepeaterStatusResponse {
flood_dups: number;
direct_dups: number;
full_events: number;
recv_errors: number | null;
telemetry_history: TelemetryHistoryEntry[];
}

2
pyproject.toml
View File

@@ -12,7 +12,7 @@ dependencies = [
"httpx>=0.28.1",
"pycryptodome>=3.20.0",
"pynacl>=1.5.0",
"meshcore==2.3.2",
"meshcore==2.3.7",
"aiomqtt>=2.0",
"apprise>=1.9.8",
"boto3>=1.38.0",

2
tests/test_mqtt_ha.py
View File

@@ -125,7 +125,7 @@ class TestRadioDiscovery:
class TestRepeaterDiscovery:
def test_produces_sensor_per_field(self):
configs = _repeater_discovery_configs("mc", "ccdd11223344", "Rep1", "aabb")
assert len(configs) == 7 # matches _REPEATER_SENSORS length
assert len(configs) == 8 # matches _REPEATER_SENSORS length
topics = [t for t, _ in configs]
assert "homeassistant/sensor/meshcore_ccdd11223344/battery_voltage/config" in topics

2
tests/test_repeater_routes.py
View File

@@ -722,6 +722,7 @@ class TestRepeaterStatus:
"flood_dups": 10,
"direct_dups": 5,
"full_evts": 0,
"recv_errors": 42,
}
)
@@ -741,6 +742,7 @@ class TestRepeaterStatus:
assert response.uptime_seconds == 86400
assert response.sent_flood == 100
assert response.recv_direct == 700
assert response.recv_errors == 42
@pytest.mark.asyncio
async def test_504_on_timeout(self, test_db):

1
tests/test_repeater_telemetry.py
View File

@@ -31,6 +31,7 @@ SAMPLE_STATUS = {
"flood_dups": 5,
"direct_dups": 2,
"full_events": 0,
"recv_errors": None,
}

2
tests/test_room_routes.py
View File

@@ -135,6 +135,7 @@ class TestRoomStatus:
"flood_dups": 2,
"direct_dups": 1,
"full_evts": 0,
"recv_errors": 7,
}
)
@@ -147,6 +148,7 @@ class TestRoomStatus:
assert response.battery_volts == 4.025
assert response.packets_received == 80
assert response.recv_direct == 73
assert response.recv_errors == 7
@pytest.mark.asyncio
async def test_room_acl_maps_entries(self, test_db):

8
uv.lock generated
View File

@@ -768,7 +768,7 @@ wheels = [
[[package]]
name = "meshcore"
version = "2.3.2"
version = "2.3.7"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "bleak" },
@@ -776,9 +776,9 @@ dependencies = [
{ name = "pycryptodome" },
{ name = "pyserial-asyncio-fast" },
]
sdist = { url = "https://files.pythonhosted.org/packages/4c/32/6e7a3e7dcc379888bc2bfcbbdf518af89e47b3697977cbfefd0b87fdf333/meshcore-2.3.2.tar.gz", hash = "sha256:98ceb8c28a8abe5b5b77f0941b30f99ba3d4fc2350f76de99b6c8a4e778dad6f", size = 69871 }
sdist = { url = "https://files.pythonhosted.org/packages/50/d1/e45d8fa3cac24d58c3bc2523fe67b8cd00c05ea68e1704fbbaf56cb19753/meshcore-2.3.7.tar.gz", hash = "sha256:267107e09a96f7d0d63f4bdb1402d033a724baadd9c9becf9b71a458170f60bb", size = 90787 }
wheels = [
{ url = "https://files.pythonhosted.org/packages/db/e4/9aafcd70315e48ca1bbae2f4ad1e00a13d5ef00019c486f964b31c34c488/meshcore-2.3.2-py3-none-any.whl", hash = "sha256:7b98e6d71f2c1e1ee146dd2fe96da40eb5bf33077e34ca840557ee53b192e322", size = 53325 },
{ url = "https://files.pythonhosted.org/packages/80/3d/ff4b5971a3210da07dc793b54af9b1231fea42dfb87e2818fdcc83e10d72/meshcore-2.3.7-py3-none-any.whl", hash = "sha256:952f028b25527155e78103d01598fa3897cccfa793ba2028a32bc36c86759f14", size = 60352 },
]
[[package]]
@@ -1569,7 +1569,7 @@ requires-dist = [
{ name = "boto3", specifier = ">=1.38.0" },
{ name = "fastapi", specifier = ">=0.115.0" },
{ name = "httpx", specifier = ">=0.28.1" },
{ name = "meshcore", specifier = "==2.3.2" },
{ name = "meshcore", specifier = "==2.3.7" },
{ name = "pycryptodome", specifier = ">=3.20.0" },
{ name = "pydantic-settings", specifier = ">=2.0.0" },
{ name = "pynacl", specifier = ">=1.5.0" },