Merge pull request #17 from nickprice101/codex/fix-device-list-caching

Prevent stale device list caching

Author: nickprice101

server.js

@@ -26,6 +26,7 @@ const execFileAsync = promisify(execFile);
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const app = express();
 const PORT = Number(process.env.PORT) || 3001;
+app.disable("etag");
 
 // ── Rate limiting ─────────────────────────────────────────────────────────────
 // Limits each IP to 120 requests per minute to prevent abuse.
@@ -39,7 +40,33 @@ app.use(limiter);
 
 // ── Static files (production build) ─────────────────────────────────────────
 const distPath = path.join(__dirname, "dist");
-app.use(express.static(distPath));
+app.use("/api", (_req, res, next) => {
+  res.set({
+    "Cache-Control": "no-store, no-cache, must-revalidate, proxy-revalidate",
+    Pragma: "no-cache",
+    Expires: "0",
+    "Surrogate-Control": "no-store",
+  });
+  next();
+});
+
+app.use(
+  express.static(distPath, {
+    etag: false,
+    setHeaders: (res, filePath) => {
+      if (filePath.endsWith(".html")) {
+        res.setHeader("Cache-Control", "no-store, no-cache, must-revalidate, proxy-revalidate");
+        res.setHeader("Pragma", "no-cache");
+        res.setHeader("Expires", "0");
+        return;
+      }
+
+      if (/\.[A-Za-z0-9_-]+\.(js|css)$/.test(path.basename(filePath))) {
+        res.setHeader("Cache-Control", "public, max-age=31536000, immutable");
+      }
+    },
+  })
+);
 
 // ── Helpers ──────────────────────────────────────────────────────────────────
 
@@ -671,6 +698,11 @@ app.get("/api/router/devices", async (req, res) => {
 
 // ── SPA fallback ─────────────────────────────────────────────────────────────
 app.get("/{*path}", (_req, res) => {
+  res.set({
+    "Cache-Control": "no-store, no-cache, must-revalidate, proxy-revalidate",
+    Pragma: "no-cache",
+    Expires: "0",
+  });
   res.sendFile(path.join(distPath, "index.html"));
 });
 

src/App.jsx

@@ -31,7 +31,8 @@ import { Database, Globe, History, Plus, Router, Wallet, AlertTriangle, Calendar
  * The UI falls back gracefully when the endpoints are not reachable.
  */
 
-const STORAGE_KEY = "mobile-data-dashboard-v1";
+const STORAGE_KEY = "mobile-data-dashboard-v2";
+const FETCH_CACHE_BUSTER = "slate7-device-list-v2";
 const DEFAULT_POLLING_MINUTES = 15;
 const COUNTRY_OPTIONS = [
   "Netherlands",
@@ -89,6 +90,11 @@ function fmtGB(v) {
   return `${(n * 1024).toFixed(0)} MB`;
 }
 
+function withCacheBust(url) {
+  const value = `${FETCH_CACHE_BUSTER}-${Date.now()}`;
+  return url.includes("?") ? `${url}&_=${encodeURIComponent(value)}` : `${url}?_=${encodeURIComponent(value)}`;
+}
+
 
 function addDays(isoDate, days) {
   const d = new Date(isoDate);
@@ -424,7 +430,7 @@ export default function MobileDataDashboard() {
     setSyncError("");
     try {
       const response = await fetch(
-        `/api/router/usage?iface=${encodeURIComponent(state.settings.interfaceName || "wwan0")}`,
+        withCacheBust(`/api/router/usage?iface=${encodeURIComponent(state.settings.interfaceName || "wwan0")}`),
         { cache: "no-store" }
       );
       if (!response.ok) throw new Error(`HTTP ${response.status}`);
@@ -467,7 +473,7 @@ export default function MobileDataDashboard() {
     setDeviceDetectMessage("");
 
     try {
-      const response = await fetch("/api/router/devices", { cache: "no-store" });
+      const response = await fetch(withCacheBust("/api/router/devices"), { cache: "no-store" });
       if (!response.ok) throw new Error("Router device endpoint not available");
 
       const payload = await response.json();