domma-cms 0.25.13 → 0.25.14

package/admin/css/dashboard.css

@@ -1 +1 @@
-.dashboard-grid{display:flex;flex-direction:column;gap:var(--dm-spacing-4, 16px)}.dash-row{display:grid;gap:var(--dm-spacing-4, 16px)}.dash-row-kpi{grid-template-columns:repeat(4,1fr)}.dash-row-traffic{grid-template-columns:2fr 1fr}.dash-row-content,.dash-row-health{grid-template-columns:1fr 1fr}@media(max-width:960px){.dash-row-kpi{grid-template-columns:repeat(2,1fr)}.dash-row-traffic,.dash-row-content,.dash-row-health{grid-template-columns:1fr}}.dash-card{background:var(--dm-surface, #fff);border:1px solid var(--dm-border, #e5e7eb);border-radius:var(--dm-radius, 8px);padding:var(--dm-spacing-4, 16px)}.dash-kpi{display:flex;align-items:center;gap:var(--dm-spacing-3, 12px)}.dash-kpi-icon{font-size:24px;opacity:.8}.dash-kpi-value{font-size:28px;font-weight:600;line-height:1}.dash-kpi-label{font-size:12px;color:var(--dm-muted, #6b7280);text-transform:uppercase;letter-spacing:.05em}.dash-kpi-delta{font-size:12px;margin-top:4px}.dash-kpi-delta.up{color:var(--dm-success, #16a34a)}.dash-kpi-delta.down{color:var(--dm-danger, #dc2626)}.dash-health-pill{display:inline-flex;align-items:center;gap:6px}.dash-health-pill[data-level=ok]{color:var(--dm-success, #16a34a)}.dash-health-pill[data-level=warn]{color:var(--dm-warning, #d97706)}.dash-health-pill[data-level=fail]{color:var(--dm-danger, #dc2626)}.dash-spike-row{display:flex;justify-content:space-between;padding:6px 0;border-bottom:1px dashed var(--dm-border, #e5e7eb)}.dash-spike-row:last-child{border-bottom:0}.dash-spark{display:inline-block;width:80px;height:24px;vertical-align:middle;margin-left:8px}.dash-warnings{background:var(--dm-warning-bg, #fef3c7);border:1px solid var(--dm-warning, #d97706);color:var(--dm-warning-fg, #78350f);padding:8px 12px;border-radius:var(--dm-radius, 8px);margin-bottom:12px}.dash-updated{font-size:12px;color:var(--dm-muted, #6b7280);margin-right:8px}.dash-journey-grid{display:grid;grid-template-columns:repeat(3,1fr);gap:12px}@media(max-width:720px){.dash-journey-grid{grid-template-columns:1fr}}.dash-journey-grid h4{font-size:12px;text-transform:uppercase;color:var(--dm-muted, #6b7280);margin:0 0 6px}.dash-bounce{margin-top:12px;font-size:14px;color:var(--dm-muted, #6b7280)}.dash-empty{font-size:13px;color:var(--dm-muted, #6b7280);margin:8px 0 0}.dash-card-header{display:flex;justify-content:space-between;align-items:center;margin-bottom:12px}.dash-card-header h3{margin:0}.dash-cache-toggle{display:inline-flex;align-items:center;gap:8px;font-size:13px;color:var(--dm-muted, #6b7280);cursor:pointer}.dash-cache-toggle input[type=checkbox]{transform:scale(1.2);cursor:pointer}.dash-cache-grid{display:grid;grid-template-columns:repeat(4,1fr);gap:16px;margin-bottom:12px}@media(max-width:720px){.dash-cache-grid{grid-template-columns:repeat(2,1fr)}}.dash-cache-stat-label{font-size:11px;text-transform:uppercase;letter-spacing:.04em;color:var(--dm-muted, #6b7280);margin-bottom:4px}.dash-cache-stat-value{font-size:22px;font-weight:600;line-height:1.1}.dash-cache-stat-sub{font-size:12px;color:var(--dm-muted, #6b7280);margin-top:4px;min-height:14px}[data-field=size-bar]{height:4px;background:var(--dm-border, #e5e7eb);border-radius:2px;overflow:hidden;margin-top:6px}[data-field=size-fill]{display:block;height:100%;background:var(--dm-primary, #2563eb);width:0;transition:width .3s ease}.dash-cache-actions{display:flex;gap:8px;justify-content:flex-end}
+.dashboard-grid{display:flex;flex-direction:column;gap:var(--dm-spacing-4, 16px)}.dash-row{display:grid;gap:var(--dm-spacing-4, 16px)}.dash-row-kpi{grid-template-columns:repeat(4,1fr)}.dash-row-traffic{grid-template-columns:2fr 1fr}.dash-row-content,.dash-row-health{grid-template-columns:1fr 1fr}@media(max-width:960px){.dash-row-kpi{grid-template-columns:repeat(2,1fr)}.dash-row-traffic,.dash-row-content,.dash-row-health{grid-template-columns:1fr}}.dash-card{background:var(--dm-surface, #fff);border:1px solid var(--dm-border, #e5e7eb);border-radius:var(--dm-radius, 8px);padding:var(--dm-spacing-4, 16px)}.dash-kpi{display:flex;align-items:center;gap:var(--dm-spacing-3, 12px)}.dash-kpi-icon{font-size:24px;opacity:.8}.dash-kpi-value{font-size:28px;font-weight:600;line-height:1}.dash-kpi-label{font-size:12px;color:var(--dm-muted, #6b7280);text-transform:uppercase;letter-spacing:.05em}.dash-kpi-delta{font-size:12px;margin-top:4px}.dash-kpi-delta.up{color:var(--dm-success, #16a34a)}.dash-kpi-delta.down{color:var(--dm-danger, #dc2626)}.dash-health-pill{display:inline-flex;align-items:center;gap:6px}.dash-health-pill[data-level=ok]{color:var(--dm-success, #16a34a)}.dash-health-pill[data-level=warn]{color:var(--dm-warning, #d97706)}.dash-health-pill[data-level=fail]{color:var(--dm-danger, #dc2626)}.dash-spike-row{display:flex;justify-content:space-between;padding:6px 0;border-bottom:1px dashed var(--dm-border, #e5e7eb)}.dash-spike-row:last-child{border-bottom:0}.dash-spark{display:inline-block;width:80px;height:24px;vertical-align:middle;margin-left:8px}.dash-warnings{background:var(--dm-warning-bg, #fef3c7);border:1px solid var(--dm-warning, #d97706);color:var(--dm-warning-fg, #78350f);padding:8px 12px;border-radius:var(--dm-radius, 8px);margin-bottom:12px}.dash-updated{font-size:12px;color:var(--dm-muted, #6b7280);margin-right:8px}.dash-journey-grid{display:grid;grid-template-columns:repeat(3,1fr);gap:12px}@media(max-width:720px){.dash-journey-grid{grid-template-columns:1fr}}.dash-journey-grid h4{font-size:12px;text-transform:uppercase;color:var(--dm-muted, #6b7280);margin:0 0 6px}.dash-bounce{margin-top:12px;font-size:14px;color:var(--dm-muted, #6b7280)}.dash-empty{font-size:13px;color:var(--dm-muted, #6b7280);margin:8px 0 0}.dash-card-header{display:flex;justify-content:space-between;align-items:center;margin-bottom:12px}.dash-card-header h3{margin:0}.dash-cache-toggle{display:inline-flex;align-items:center;gap:8px;font-size:13px;color:var(--dm-muted, #6b7280);cursor:pointer}.dash-cache-toggle input[type=checkbox]{transform:scale(1.2);cursor:pointer}.dash-cache-grid{display:grid;grid-template-columns:repeat(4,1fr);gap:16px;margin-bottom:12px}@media(max-width:720px){.dash-cache-grid{grid-template-columns:repeat(2,1fr)}}.dash-cache-stat-label{font-size:11px;text-transform:uppercase;letter-spacing:.04em;color:var(--dm-muted, #6b7280);margin-bottom:4px}.dash-cache-stat-value{font-size:22px;font-weight:600;line-height:1.1}.dash-cache-stat-sub{font-size:12px;color:var(--dm-muted, #6b7280);margin-top:4px;min-height:14px}[data-field=size-bar]{height:4px;background:var(--dm-border, #e5e7eb);border-radius:2px;overflow:hidden;margin-top:6px}[data-field=size-fill]{display:block;height:100%;background:var(--dm-primary, #2563eb);width:0;transition:width .3s ease}.dash-cache-actions{display:flex;gap:8px;justify-content:flex-end}.dash-chart-wrap{position:relative;height:240px}.dash-chart-wrap>canvas{position:absolute;inset:0}

package/admin/js/templates/dashboard/traffic-chart.html

@@ -1,3 +1,3 @@
 <h3>Traffic — last 30 days</h3>
-<canvas id="dash-traffic-canvas" height="120"></canvas>
+<div class="dash-chart-wrap"><canvas id="dash-traffic-canvas"></canvas></div>
 <p class="dash-empty" hidden>No traffic recorded yet.</p>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "domma-cms",
-  "version": "0.25.13",
+  "version": "0.25.14",
   "description": "File-based CMS powered by Domma and Fastify. Run npx domma-cms my-site to create a new project.",
   "type": "module",
   "main": "server/server.js",

package/server/routes/api/dashboard.js

@@ -98,6 +98,88 @@ function buildTopPages(daily, days = 7) {
         .slice(0, 5);
 }
 
+// ── Journeys / spikes — ported verbatim from plugins/analytics so the core
+//    dashboard can compute them off disk without the plugin's encapsulated
+//    `fastify.analytics` decorator (which it cannot see). Keep in sync with
+//    plugins/analytics/plugin.js.
+const REALTIME_WINDOW_MS = 5 * 60 * 1000;
+
+function eventsInRange(journeys, start, end) {
+    const startMs = start.getTime(), endMs = end.getTime();
+    const out = [];
+    for (const [day, events] of Object.entries(journeys)) {
+        const dayMs = new Date(day + 'T00:00:00Z').getTime();
+        if (dayMs < startMs || dayMs > endMs) continue;
+        if (Array.isArray(events)) for (const ev of events) out.push(ev);
+    }
+    return out;
+}
+
+function groupBySession(events) {
+    const sessions = new Map();
+    for (const ev of events) {
+        if (!sessions.has(ev.sid)) sessions.set(ev.sid, []);
+        sessions.get(ev.sid).push(ev);
+    }
+    for (const arr of sessions.values()) arr.sort((a, b) => a.t - b.t);
+    return sessions;
+}
+
+function aggregateJourneys(events) {
+    const sessions = groupBySession(events);
+    const entry = new Map(), exit = new Map(), paths = new Map();
+    let bouncedSessions = 0;
+    for (const arr of sessions.values()) {
+        if (arr.length === 0) continue;
+        entry.set(arr[0].url, (entry.get(arr[0].url) || 0) + 1);
+        exit.set(arr[arr.length - 1].url, (exit.get(arr[arr.length - 1].url) || 0) + 1);
+        if (arr.length === 1) bouncedSessions += 1;
+        for (let i = 0; i < arr.length - 1; i += 1) {
+            const from = arr[i].url, to = arr[i + 1].url;
+            const key = from + '\x00' + to;
+            const existing = paths.get(key);
+            if (existing) existing.count += 1;
+            else paths.set(key, { from, to, count: 1 });
+        }
+    }
+    const toSorted = (m) => Array.from(m.entries())
+        .map(([url, count]) => ({ url, count }))
+        .sort((a, b) => b.count - a.count).slice(0, 10);
+    const totalSessions = sessions.size;
+    return {
+        entry: toSorted(entry),
+        exit: toSorted(exit),
+        paths: Array.from(paths.values()).sort((a, b) => b.count - a.count).slice(0, 10),
+        bounceRate: totalSessions === 0 ? 0 : +(bouncedSessions / totalSessions).toFixed(3),
+        totalSessions
+    };
+}
+
+function detectSpikes(daily, now = new Date()) {
+    const todayStr = todayKey(now);
+    const currentHour = now.getUTCHours();
+    const todayUrls = daily[todayStr] || {};
+    const elapsedHours = Math.max(1, currentHour + 1);
+    const flagged = [];
+    for (const [url, totalToday] of Object.entries(todayUrls)) {
+        const currentHits = totalToday / elapsedHours;
+        const samples = [];
+        for (let i = 1; i <= 7; i += 1) {
+            const prev = new Date(now);
+            prev.setUTCDate(prev.getUTCDate() - i);
+            const key = todayKey(prev);
+            samples.push((daily[key] && daily[key][url]) ? daily[key][url] / 24 : 0);
+        }
+        const mean = samples.reduce((a, b) => a + b, 0) / samples.length;
+        const variance = samples.reduce((acc, x) => acc + (x - mean) * (x - mean), 0) / samples.length;
+        const stddev = Math.sqrt(variance);
+        if (currentHits >= 5 && currentHits > mean + 2 * stddev && mean > 0) {
+            flagged.push({ url, hits: Math.round(currentHits), baseline: Math.round(mean), ratio: +(currentHits / Math.max(mean, 0.5)).toFixed(2) });
+        }
+    }
+    return flagged.sort((a, b) => b.ratio - a.ratio).slice(0, 5);
+}
+
 /**
  * Recent activity feed — combines page version events with recent collection
  * entries (form submissions). Returns at most 10 items, newest first.
@@ -193,7 +275,18 @@ export async function dashboardRoutes(fastify, opts = {}) {
         };
 
         const analytics = fastify.analytics;
-        const daily = analytics ? (await safe('analytics.daily', () => analytics.getDaily())) || {} : {};
+        // The analytics plugin decorates `analytics` inside its own prefixed,
+        // encapsulated scope, so `fastify.analytics` is undefined here in the
+        // core dashboard route — traffic/topPages always read 0 even though hits
+        // are recorded. Read the plugin's daily counters straight off disk (same
+        // pattern as buildActivity reading versions/collections below).
+        const daily = (await safe('analytics.daily', async () => {
+            for (const rel of ['plugins/analytics/data/daily.json', 'plugins/analytics/daily.json']) {
+                try { return JSON.parse(await fs.readFile(path.join(ROOT, rel), 'utf8')); }
+                catch { /* try next location */ }
+            }
+            return {};
+        })) || {};
 
         const today = todayKey();
         const yesterday = isoDaysAgo(1);
@@ -210,12 +303,22 @@ export async function dashboardRoutes(fastify, opts = {}) {
             previousWeek: sumRange(daily, isoDaysAgo(13), isoDaysAgo(7))
         };
 
-        const realtime = analytics
-            ? (await safe('analytics.realtime', () => analytics.getRealtime())) || { activeSessions: 0 }
-            : { activeSessions: 0 };
-        const spikes = analytics
-            ? ((await safe('analytics.spikes', () => analytics.getSpikes())) || { items: [] }).items
-            : [];
+        // Session events read straight off disk too (same reason as daily above).
+        const journeysData = (await safe('analytics.journeysData', async () => {
+            for (const rel of ['plugins/analytics/data/journeys.json', 'plugins/analytics/journeys.json']) {
+                try { return JSON.parse(await fs.readFile(path.join(ROOT, rel), 'utf8')); }
+                catch { /* try next location */ }
+            }
+            return {};
+        })) || {};
+        const realtime = (await safe('analytics.realtime', async () => {
+            const evs = journeysData[today] || [];
+            const cutoff = Date.now() - REALTIME_WINDOW_MS;
+            const sids = new Set();
+            for (const ev of evs) if (ev.t >= cutoff) sids.add(ev.sid);
+            return { activeSessions: sids.size, windowMinutes: REALTIME_WINDOW_MS / 60000 };
+        })) || { activeSessions: 0 };
+        const spikes = (await safe('analytics.spikes', () => detectSpikes(daily))) || [];
         const health = await safe('health', () => getHealth()) || { status: 'ok', checks: [] };
 
         if (lite) {
@@ -229,9 +332,11 @@ export async function dashboardRoutes(fastify, opts = {}) {
         }
 
         const topPages = buildTopPages(daily);
-        const journeys = analytics
-            ? (await safe('analytics.journeys', () => analytics.getJourneys({ range: '7d' }))) || null
-            : null;
+        const journeys = (await safe('analytics.journeys', () => {
+            const end = new Date(); end.setUTCHours(0, 0, 0, 0);
+            const start = new Date(end); start.setUTCDate(start.getUTCDate() - 6);
+            return aggregateJourneys(eventsInRange(journeysData, start, end));
+        })) || null;
         const activity = (await safe('activity', () => buildActivity())) || [];
 
         return { traffic, topPages, journeys, spikes, realtime, health, activity, warnings };