domma-cms 0.25.10 → 0.25.12

package/bin/cli.js

@@ -321,6 +321,9 @@ content/users/
 content/media/
 *.log
 .domma-backups/
+
+# Analytics plugin runtime counters (written on every page hit). Never track.
+plugins/analytics/data/
 `;
 
 step('Writing .gitignore');

package/bin/update.js

@@ -467,18 +467,21 @@ export default async function update(_positional, flags) {
     done();
 
     // -------------------------------------------------------------------------
-    // 11. Ensure .domma-backups/ is in .gitignore
+    // 11. Ensure runtime state is in .gitignore (self-heal existing installs)
+    //     .domma-backups/ + analytics counters — tracking the latter resets
+    //     live analytics on every checkout/pull/update (recurring bug).
     // -------------------------------------------------------------------------
 
     const gitignorePath = path.join(cwd, '.gitignore');
-    const backupEntry = '.domma-backups/';
-    if (existsSync(gitignorePath)) {
-        const current = readFileSync(gitignorePath, 'utf8');
-        if (!current.includes(backupEntry)) {
-            writeFileSync(gitignorePath, current.trimEnd() + '\n' + backupEntry + '\n', 'utf8');
-        }
-    } else {
-        writeFileSync(gitignorePath, backupEntry + '\n', 'utf8');
+    const requiredIgnores = [
+        '.domma-backups/',
+        'plugins/analytics/data/',
+    ];
+    const current = existsSync(gitignorePath) ? readFileSync(gitignorePath, 'utf8') : '';
+    const missing = requiredIgnores.filter(entry => !current.split(/\r?\n/).includes(entry));
+    if (missing.length) {
+        const prefix = current ? current.trimEnd() + '\n' : '';
+        writeFileSync(gitignorePath, prefix + missing.join('\n') + '\n', 'utf8');
     }
 
     // -------------------------------------------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "domma-cms",
-  "version": "0.25.10",
+  "version": "0.25.12",
   "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",
@@ -20,6 +20,11 @@
     "config/",
     "!config/connections.json",
     "plugins/",
+    "!plugins/analytics/data",
+    "!plugins/analytics/stats.json",
+    "!plugins/analytics/daily.json",
+    "!plugins/analytics/lifetime.json",
+    "!plugins/analytics/journeys.json",
     "scripts/",
     "docs/",
     "CHANGELOG.md",

package/plugins/analytics/plugin.js

@@ -19,10 +19,17 @@ import path from 'path';
 import {fileURLToPath} from 'url';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const LIFETIME_FILE = path.join(__dirname, 'lifetime.json');
-const DAILY_FILE = path.join(__dirname, 'daily.json');
-const LEGACY_FILE = path.join(__dirname, 'stats.json');
-const JOURNEYS_FILE = path.join(__dirname, 'journeys.json');
+
+// Runtime counters live under data/ — the carve-out that BOTH update paths
+// preserve (siteCmsUpdater's copyPlugin backs up data/; `domma-cms update`
+// keeps 'data' in its preserve set). Pre-2.1 they sat in the plugin root and
+// were overwritten by the manager's copy on every plugin push. On first boot
+// migrateToDataDir() moves any pre-2.1 root files across.
+const DATA_DIR = path.join(__dirname, 'data');
+const LIFETIME_FILE = path.join(DATA_DIR, 'lifetime.json');
+const DAILY_FILE = path.join(DATA_DIR, 'daily.json');
+const LEGACY_FILE = path.join(DATA_DIR, 'stats.json');
+const JOURNEYS_FILE = path.join(DATA_DIR, 'journeys.json');
 const JOURNEY_DAILY_CAP = 5000;
 const REALTIME_WINDOW_MS = 5 * 60 * 1000;
 
@@ -35,11 +42,29 @@ async function readJson(file, fallback) {
 }
 
 async function writeJson(file, data) {
+    await fs.mkdir(path.dirname(file), { recursive: true });
     const tmp = file + '.tmp';
     await fs.writeFile(tmp, JSON.stringify(data, null, 2) + '\n', 'utf8');
     await fs.rename(tmp, file);
 }
 
+/**
+ * One-shot relocation of pre-2.1 counters from the plugin root into data/.
+ * Runs before migrateLegacy() so the rest of the plugin only ever sees data/.
+ */
+async function migrateToDataDir() {
+    await fs.mkdir(DATA_DIR, { recursive: true });
+    for (const name of ['lifetime.json', 'daily.json', 'journeys.json', 'stats.json']) {
+        const dest = path.join(DATA_DIR, name);
+        try { await fs.access(dest); continue; } catch { /* dest absent — maybe move */ }
+        const oldPath = path.join(__dirname, name);
+        try {
+            await fs.access(oldPath);
+            await fs.rename(oldPath, dest);
+        } catch { /* no pre-2.1 file to move */ }
+    }
+}
+
 /**
  * One-shot migration from the legacy flat stats.json.
  * Preserves existing totals as lifetime numbers; daily history starts empty.
@@ -253,6 +278,7 @@ export default async function analyticsPlugin(fastify, options) {
     const { authenticate, requireAdmin } = options.auth;
     const settings = options.settings || {};
 
+    await migrateToDataDir();
     await migrateLegacy();
 
     fastify.decorate('analytics', {

package/plugins/analytics/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "analytics",
   "displayName": "Analytics",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "Page view analytics with daily trends, time-range filtering, top-pages table and CSV export. Honours Do-Not-Track and dedups per session.",
   "author": "Darryl Waterhouse",
   "date": "2026-05-04",
@@ -37,11 +37,19 @@
   "scaffold": {
     "reset": [
       {
-        "path": "lifetime.json",
+        "path": "data/lifetime.json",
         "content": "{}"
       },
       {
-        "path": "daily.json",
+        "path": "data/daily.json",
+        "content": "{}"
+      },
+      {
+        "path": "data/journeys.json",
+        "content": "{}"
+      },
+      {
+        "path": "data/stats.json",
         "content": "{}"
       }
     ]

package/plugins/analytics/daily.json

@@ -1,8 +0,0 @@
-{
-  "2026-05-06": {
-    "/test-from-controller": 1
-  },
-  "2026-05-22": {
-    "/about": 1
-  }
-}

package/plugins/analytics/journeys.json

@@ -1,18 +0,0 @@
-{
-  "2026-05-06": [
-    {
-      "sid": "test-controller",
-      "t": 1778084386121,
-      "url": "/test-from-controller",
-      "ref": "/"
-    }
-  ],
-  "2026-05-22": [
-    {
-      "sid": "test-sid-123",
-      "t": 1779450391054,
-      "url": "/about",
-      "ref": ""
-    }
-  ]
-}

package/plugins/analytics/lifetime.json

@@ -1,25 +0,0 @@
-{
-  "/": 162,
-  "/about": 89,
-  "/blog": 42,
-  "/contact": 31,
-  "/resources/typography": 4,
-  "/resources": 13,
-  "/resources/shortcodes": 14,
-  "/resources/cards": 19,
-  "/resources/interactive": 13,
-  "/resources/grid": 6,
-  "/forms": 14,
-  "/resources/effects": 6,
-  "/blog/hello-world": 28,
-  "/feedback": 42,
-  "/resources/dependencies": 2,
-  "/resources/components": 6,
-  "/gdpr": 3,
-  "/scratch": 84,
-  "/getting-started": 3,
-  "/resources/pro": 1,
-  "/todo": 23,
-  "/thank-you": 1,
-  "/test-from-controller": 1
-}

package/plugins/analytics/stats.json

@@ -1,24 +0,0 @@
-{
-  "/": 162,
-  "/about": 88,
-  "/blog": 42,
-  "/contact": 31,
-  "/resources/typography": 4,
-  "/resources": 13,
-  "/resources/shortcodes": 14,
-  "/resources/cards": 19,
-  "/resources/interactive": 13,
-  "/resources/grid": 6,
-  "/forms": 14,
-  "/resources/effects": 6,
-  "/blog/hello-world": 28,
-  "/feedback": 42,
-  "/resources/dependencies": 2,
-  "/resources/components": 6,
-  "/gdpr": 3,
-  "/scratch": 84,
-  "/getting-started": 3,
-  "/resources/pro": 1,
-  "/todo": 23,
-  "/thank-you": 1
-}