';
From f187a6fcd3e59e93e645767457e309586615b7c3 Mon Sep 17 00:00:00 2001
From: GeiserX <9169332+GeiserX@users.noreply.github.com>
Date: Sat, 4 Apr 2026 22:13:58 +0200
Subject: [PATCH 3/6] fix: address review findings on Android worker support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- Resilient JSON parsing: _safe_json() helper so one malformed DB row
degrades that worker instead of 500-ing the whole fleet/services UI
- Fleet summary now filters offline workers (was counting stale data)
- Fleet UI: "Containers" label → "Services", onboarding text mentions
Android app, app pills show 24h net traffic on hover tooltip
- Dashboard sub-rows show net_tx/rx for Android instances instead of
CPU/memory placeholders
---
app/main.py | 31 ++++++++++++++++++++-----------
app/static/js/app.js | 13 +++++++++++--
app/templates/fleet.html | 18 +++++++++++++++---
3 files changed, 46 insertions(+), 16 deletions(-)
diff --git a/app/main.py b/app/main.py
index cc94c30..fe7777c 100644
--- a/app/main.py
+++ b/app/main.py
@@ -35,6 +35,14 @@
_collector_alerts: list[dict[str, str]] = []
+def _safe_json(raw: str, fallback: Any = None) -> Any:
+ """Parse JSON with a fallback so one malformed DB row doesn't 500 the fleet."""
+ try:
+ return json.loads(raw)
+ except (json.JSONDecodeError, TypeError):
+ return fallback if fallback is not None else []
+
+
async def _get_all_worker_containers() -> list[dict[str, Any]]:
"""Collect container/app data from all online workers' heartbeat data in DB."""
workers = await database.list_workers()
@@ -42,13 +50,13 @@ async def _get_all_worker_containers() -> list[dict[str, Any]]:
for w in workers:
if w.get("status") != "online":
continue
- sys_info = json.loads(w.get("system_info", "{}"))
+ sys_info = _safe_json(w.get("system_info", "{}"), {})
worker_has_docker = sys_info.get("docker_available", False)
is_android = sys_info.get("device_type") == "android"
worker_name = w.get("name", "worker")
# Docker containers (from Docker-based workers)
- containers = json.loads(w.get("containers", "[]"))
+ containers = _safe_json(w.get("containers", "[]"))
for c in containers:
slug = c.get("slug", "")
if slug:
@@ -71,7 +79,7 @@ async def _get_all_worker_containers() -> list[dict[str, Any]]:
# Android apps (from Android workers)
if is_android:
- apps = json.loads(w.get("apps", "[]"))
+ apps = _safe_json(w.get("apps", "[]"))
for a in apps:
slug = a.get("slug", "")
if slug:
@@ -1462,9 +1470,9 @@ async def api_list_workers(request: Request) -> list[dict[str, Any]]:
def _parse_worker_json(w: dict[str, Any]) -> None:
"""Parse stored JSON columns and compute counts for a worker dict."""
- w["containers"] = json.loads(w.get("containers", "[]"))
- w["apps"] = json.loads(w.get("apps", "[]"))
- w["system_info"] = json.loads(w.get("system_info", "{}"))
+ w["containers"] = _safe_json(w.get("containers", "[]"))
+ w["apps"] = _safe_json(w.get("apps", "[]"))
+ w["system_info"] = _safe_json(w.get("system_info", "{}"), {})
is_android = w["system_info"].get("device_type") == "android"
if is_android:
w["container_count"] = len(w["apps"])
@@ -1559,18 +1567,19 @@ async def api_fleet_summary(request: Request) -> dict[str, Any]:
online_workers = 0
for w in workers:
- sys_info = json.loads(w.get("system_info", "{}"))
+ if w["status"] != "online":
+ continue
+ online_workers += 1
+ sys_info = _safe_json(w.get("system_info", "{}"), {})
is_android = sys_info.get("device_type") == "android"
if is_android:
- apps = json.loads(w.get("apps", "[]"))
+ apps = _safe_json(w.get("apps", "[]"))
total_containers += len(apps)
total_running += sum(1 for a in apps if a.get("running"))
else:
- containers = json.loads(w.get("containers", "[]"))
+ containers = _safe_json(w.get("containers", "[]"))
total_containers += len(containers)
total_running += sum(1 for c in containers if c.get("status") == "running")
- if w["status"] == "online":
- online_workers += 1
return {
"total_workers": len(workers),
diff --git a/app/static/js/app.js b/app/static/js/app.js
index 3081a6a..a06f16e 100644
--- a/app/static/js/app.js
+++ b/app/static/js/app.js
@@ -73,6 +73,13 @@ const CP = (() => {
function capFirst(s) { return s ? s.charAt(0).toUpperCase() + s.slice(1) : ''; }
+ function fmtNetBytes(b) {
+ if (!b || b < 1024) return (b || 0) + ' B';
+ if (b < 1048576) return (b / 1024).toFixed(1) + ' KB';
+ if (b < 1073741824) return (b / 1048576).toFixed(1) + ' MB';
+ return (b / 1073741824).toFixed(2) + ' GB';
+ }
+
// -----------------------------------------------------------
// Modal
// -----------------------------------------------------------
@@ -516,6 +523,8 @@ const CP = (() => {
const iNoDocker = !inst.has_docker || inst.is_android;
const disabledAttr = iNoDocker ? ' disabled title="No Docker access"' : '';
const subLabel = inst.is_android ? '' : escapeHtml(inst.container_name);
+ const cpuCell = inst.is_android ? fmtNetBytes(inst.net_tx_24h) : `${inst.cpu || '0'}%`;
+ const memCell = inst.is_android ? fmtNetBytes(inst.net_rx_24h) : (inst.memory || '0 MB');
html += `
|
@@ -526,8 +535,8 @@ const CP = (() => {
| |
|
|
- ${inst.cpu || '0'}% |
- ${inst.memory || '0 MB'} |
+ ${cpuCell} |
+ ${memCell} |
|
diff --git a/app/templates/fleet.html b/app/templates/fleet.html
index 3153e34..de3da65 100644
--- a/app/templates/fleet.html
+++ b/app/templates/fleet.html
@@ -16,7 +16,7 @@
-
- Containers
+ Services
-
@@ -32,7 +32,9 @@
- Deploy drumsergio/cashpilot-worker on each server with these environment variables:
+ Deploy drumsergio/cashpilot-worker on each server, or install the
+ Android app on your phone.
+ For Docker workers, set these environment variables:
CASHPILOT_UI_URL=
@@ -137,6 +139,13 @@ Workers
container.innerHTML = html;
}
+ function fmtBytes(b) {
+ if (!b || b < 1024) return b + ' B';
+ if (b < 1048576) return (b / 1024).toFixed(1) + ' KB';
+ if (b < 1073741824) return (b / 1048576).toFixed(1) + ' MB';
+ return (b / 1073741824).toFixed(2) + ' GB';
+ }
+
function renderApps(apps) {
let html = '';
html += ' ';
@@ -144,7 +153,10 @@ Workers
const isRunning = a.running;
const color = isRunning ? 'var(--success)' : 'var(--text-muted)';
const bg = isRunning ? 'var(--success-soft)' : 'var(--bg-hover)';
- html += `${esc(a.slug)}`;
+ const tx = a.net_tx_24h || 0;
+ const rx = a.net_rx_24h || 0;
+ const netTip = (tx || rx) ? ` title="24h: ↑${fmtBytes(tx)} ↓${fmtBytes(rx)}"` : '';
+ html += `${esc(a.slug)}`;
}
html += 'Workers
}
function fmtBytes(b) {
- if (!b || b < 1024) return b + ' B';
+ if (!b || b < 1024) return (b || 0) + ' B';
if (b < 1048576) return (b / 1024).toFixed(1) + ' KB';
if (b < 1073741824) return (b / 1048576).toFixed(1) + ' MB';
return (b / 1073741824).toFixed(2) + ' GB';
From 866a8a302f030eb6f42b7a2126970ffa72b7187c Mon Sep 17 00:00:00 2001
From: GeiserX <9169332+GeiserX@users.noreply.github.com>
Date: Sat, 4 Apr 2026 22:33:30 +0200
Subject: [PATCH 6/6] fix: label Android TX/RX in dashboard sub-rows
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Show ↑/↓ prefixes so it's clear the CPU/Memory columns display
network traffic for Android instances.
---
app/static/js/app.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/static/js/app.js b/app/static/js/app.js
index a06f16e..cd4e9c1 100644
--- a/app/static/js/app.js
+++ b/app/static/js/app.js
@@ -523,8 +523,8 @@ const CP = (() => {
const iNoDocker = !inst.has_docker || inst.is_android;
const disabledAttr = iNoDocker ? ' disabled title="No Docker access"' : '';
const subLabel = inst.is_android ? '' : escapeHtml(inst.container_name);
- const cpuCell = inst.is_android ? fmtNetBytes(inst.net_tx_24h) : `${inst.cpu || '0'}%`;
- const memCell = inst.is_android ? fmtNetBytes(inst.net_rx_24h) : (inst.memory || '0 MB');
+ const cpuCell = inst.is_android ? `↑ ${fmtNetBytes(inst.net_tx_24h)}` : `${inst.cpu || '0'}%`;
+ const memCell = inst.is_android ? `↓ ${fmtNetBytes(inst.net_rx_24h)}` : (inst.memory || '0 MB');
html += `
|
| |