@momentumcms/plugins-analytics 0.4.0 → 0.4.1

package/index.js

@@ -831,8 +831,210 @@ function createApiCollectorMiddleware(emitter) {
   };
 }
 
-// libs/plugins/analytics/src/lib/ingest-handler.ts
+// libs/plugins/analytics/src/lib/collectors/page-view-collector.ts
 import { randomUUID as randomUUID3 } from "node:crypto";
+
+// libs/plugins/analytics/src/lib/utils/content-route-matcher.ts
+function escapeRegex(str) {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function compileContentRoute(collection, pattern) {
+  const segments = pattern.split("/").filter(Boolean);
+  const paramNames = [];
+  let staticCount = 0;
+  const regexParts = segments.map((seg) => {
+    if (seg.startsWith(":")) {
+      paramNames.push(seg.slice(1));
+      return "([^/]+)";
+    }
+    staticCount++;
+    return escapeRegex(seg);
+  });
+  const regexStr = "^/" + regexParts.join("/") + "/?$";
+  return {
+    collection,
+    pattern,
+    regex: new RegExp(regexStr),
+    paramNames,
+    staticSegments: staticCount
+  };
+}
+function compileContentRoutes(routes) {
+  const compiled = Object.entries(routes).map(
+    ([collection, pattern]) => compileContentRoute(collection, pattern)
+  );
+  compiled.sort((a, b) => b.staticSegments - a.staticSegments);
+  return compiled;
+}
+function matchContentRoute(path, routes) {
+  for (const route of routes) {
+    const match = route.regex.exec(path);
+    if (match) {
+      const params = {};
+      for (let i = 0; i < route.paramNames.length; i++) {
+        params[route.paramNames[i]] = match[i + 1];
+      }
+      return { collection: route.collection, params };
+    }
+  }
+  return void 0;
+}
+
+// libs/plugins/analytics/src/lib/collectors/page-view-collector.ts
+var DEFAULT_EXCLUDE_EXTENSIONS = /* @__PURE__ */ new Set([
+  ".js",
+  ".css",
+  ".ico",
+  ".png",
+  ".jpg",
+  ".jpeg",
+  ".gif",
+  ".svg",
+  ".webp",
+  ".avif",
+  ".woff",
+  ".woff2",
+  ".ttf",
+  ".eot",
+  ".map",
+  ".json",
+  ".xml",
+  ".txt",
+  ".mp4",
+  ".webm",
+  ".ogg",
+  ".mp3"
+]);
+var ALWAYS_EXCLUDED_PREFIXES = [
+  "/api/",
+  "/admin",
+  "/__vite",
+  "/@fs/",
+  "/@id/",
+  "/.analog/",
+  "/node_modules/"
+];
+var ALWAYS_EXCLUDED_EXACT = /* @__PURE__ */ new Set([
+  "/api",
+  "/favicon.ico",
+  "/robots.txt",
+  "/sitemap.xml",
+  "/sitemap-index.xml",
+  "/health",
+  "/healthz",
+  "/ready",
+  "/.well-known/security.txt"
+]);
+var BOT_PATTERN = /bot|crawl|spider|slurp|bingpreview|mediapartners|facebookexternalhit|linkedinbot|twitterbot|whatsapp|telegrambot|discordbot|applebot|duckduckbot|yandex|baidu|sogou|ia_archiver|semrush|ahref|mj12bot|dotbot|petalbot|bytespider/i;
+function isBot(ua) {
+  if (!ua)
+    return false;
+  return BOT_PATTERN.test(ua);
+}
+function shouldExcludePath(path, excludeExtensions, excludePaths) {
+  if (ALWAYS_EXCLUDED_EXACT.has(path))
+    return true;
+  for (const prefix of ALWAYS_EXCLUDED_PREFIXES) {
+    if (path.startsWith(prefix))
+      return true;
+  }
+  for (const pattern of excludePaths) {
+    if (path.startsWith(pattern))
+      return true;
+  }
+  const dotIndex = path.lastIndexOf(".");
+  if (dotIndex !== -1) {
+    const ext = path.slice(dotIndex).toLowerCase();
+    if (excludeExtensions.has(ext))
+      return true;
+  }
+  return false;
+}
+function extractUserId(req) {
+  if (!("user" in req))
+    return void 0;
+  const user = req["user"];
+  if (user == null || typeof user !== "object")
+    return void 0;
+  if (!("id" in user))
+    return void 0;
+  const id = user.id;
+  return typeof id === "string" ? id : void 0;
+}
+function createPageViewCollectorMiddleware(emitter, options = {}) {
+  const excludeExtensions = options.excludeExtensions ? new Set(options.excludeExtensions) : DEFAULT_EXCLUDE_EXTENSIONS;
+  const excludePaths = options.excludePaths ?? [];
+  const onlySuccessful = options.onlySuccessful !== false;
+  const trackBots = options.trackBots === true;
+  const compiledRoutes = options.contentRoutes ? compileContentRoutes(options.contentRoutes) : void 0;
+  return (req, res, next) => {
+    if (req.method !== "GET") {
+      next();
+      return;
+    }
+    const path = req.path;
+    if (shouldExcludePath(path, excludeExtensions, excludePaths)) {
+      next();
+      return;
+    }
+    const ua = req.headers["user-agent"];
+    if (!trackBots && isBot(ua)) {
+      next();
+      return;
+    }
+    const start = Date.now();
+    res.once("finish", () => {
+      if (onlySuccessful && (res.statusCode < 200 || res.statusCode >= 300)) {
+        return;
+      }
+      const duration = Date.now() - start;
+      const parsed = parseUserAgent(ua);
+      const refHeader = req.headers["referer"] ?? req.headers["referrer"];
+      const referrer = Array.isArray(refHeader) ? refHeader[0] : refHeader;
+      let contentCollection;
+      let contentSlug;
+      if (compiledRoutes) {
+        const routeMatch = matchContentRoute(path, compiledRoutes);
+        if (routeMatch) {
+          contentCollection = routeMatch.collection;
+          contentSlug = routeMatch.params["slug"];
+        }
+      }
+      const event = {
+        id: randomUUID3(),
+        category: "page",
+        name: "page_view",
+        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+        userId: extractUserId(req),
+        properties: {
+          method: req.method,
+          path,
+          statusCode: res.statusCode,
+          ...contentCollection != null ? { collection: contentCollection } : {},
+          ...contentSlug != null ? { slug: contentSlug } : {}
+        },
+        context: {
+          source: "server",
+          url: req.originalUrl,
+          referrer,
+          userAgent: ua,
+          ip: req.ip ?? req.socket.remoteAddress,
+          device: parsed.device,
+          browser: parsed.browser,
+          os: parsed.os,
+          duration,
+          statusCode: res.statusCode,
+          ...contentCollection != null ? { collection: contentCollection } : {}
+        }
+      };
+      emitter(event);
+    });
+    next();
+  };
+}
+
+// libs/plugins/analytics/src/lib/ingest-handler.ts
+import { randomUUID as randomUUID4 } from "node:crypto";
 import { Router as createRouter } from "express";
 
 // libs/core/src/lib/collections/define-collection.ts
@@ -1126,7 +1328,7 @@ function createIngestRouter(options) {
       }
       const partial = raw;
       const event = {
-        id: randomUUID3(),
+        id: randomUUID4(),
         category: partial.category ?? "custom",
         name: partial.name ?? "unknown",
         // Server-side timestamp (prevents client clock skew)
@@ -1732,6 +1934,42 @@ function matchesDocumentUrl(eventUrl, documentPath) {
   }
   return pathname === documentPath || pathname === `${documentPath}/`;
 }
+async function queryEventsByDocument(queryFn, eventName, collection, documentId, documentPath, options) {
+  const queryBase = {
+    ...options.category ? { category: options.category } : {},
+    name: eventName,
+    from: options.from,
+    to: options.to,
+    limit: 1e3
+  };
+  const [serverResult, allResult] = await Promise.all([
+    queryFn({ ...queryBase, collection }),
+    queryFn(queryBase)
+  ]);
+  const seen = /* @__PURE__ */ new Set();
+  const results = [];
+  for (const e of [...serverResult.events, ...allResult.events]) {
+    if (seen.has(e.id))
+      continue;
+    seen.add(e.id);
+    const matchesCollection = e.context.collection === collection || e.properties["collection"] === collection;
+    const matchesSlug = typeof e.properties["slug"] === "string" && e.properties["slug"] === documentId;
+    if (matchesCollection && matchesSlug)
+      results.push(e);
+  }
+  if (results.length > 0)
+    return results;
+  const urlResult = await queryFn({ ...queryBase, search: documentPath });
+  return urlResult.events.filter((e) => matchesDocumentUrl(e.context.url, documentPath));
+}
+function countByBlockType(events) {
+  const map = /* @__PURE__ */ new Map();
+  for (const event of events) {
+    const bt = String(event.properties["blockType"] ?? "unknown");
+    map.set(bt, (map.get(bt) ?? 0) + 1);
+  }
+  return map;
+}
 function createContentPerformanceRouter(adapter) {
   const router = Router2();
   router.get("/content-performance", requireAdmin, async (req, res) => {
@@ -1750,16 +1988,15 @@ function createContentPerformanceRouter(adapter) {
         return;
       }
       const documentPath = `/${collection}/${documentId}`;
-      const pageViewResult = await adapter.query({
-        category: "page",
-        name: "page_view",
-        search: documentPath,
-        from,
-        to,
-        limit: 1e3
-      });
-      const pageViewEvents = pageViewResult.events.filter(
-        (e) => matchesDocumentUrl(e.context.url, documentPath)
+      const queryFn = adapter.query.bind(adapter);
+      const dateRange = { from, to };
+      const pageViewEvents = await queryEventsByDocument(
+        queryFn,
+        "page_view",
+        collection,
+        documentId,
+        documentPath,
+        { category: "page", ...dateRange }
       );
       const visitorSet = /* @__PURE__ */ new Set();
       const referrerMap = /* @__PURE__ */ new Map();
@@ -1774,38 +2011,26 @@ function createContentPerformanceRouter(adapter) {
       }
       let blockEngagement;
       try {
-        const [impressionResult, hoverResult] = await Promise.all([
-          adapter.query({
-            name: "block_impression",
-            search: documentPath,
-            from,
-            to,
-            limit: 1e3
-          }),
-          adapter.query({
-            name: "block_hover",
-            search: documentPath,
-            from,
-            to,
-            limit: 1e3
-          })
+        const [impressionEvents, hoverEvents] = await Promise.all([
+          queryEventsByDocument(
+            queryFn,
+            "block_impression",
+            collection,
+            documentId,
+            documentPath,
+            dateRange
+          ),
+          queryEventsByDocument(
+            queryFn,
+            "block_hover",
+            collection,
+            documentId,
+            documentPath,
+            dateRange
+          )
         ]);
-        const impressionEvents = impressionResult.events.filter(
-          (e) => matchesDocumentUrl(e.context.url, documentPath)
-        );
-        const hoverEvents = hoverResult.events.filter(
-          (e) => matchesDocumentUrl(e.context.url, documentPath)
-        );
-        const impressionMap = /* @__PURE__ */ new Map();
-        for (const event of impressionEvents) {
-          const bt = String(event.properties["blockType"] ?? "unknown");
-          impressionMap.set(bt, (impressionMap.get(bt) ?? 0) + 1);
-        }
-        const hoverMap = /* @__PURE__ */ new Map();
-        for (const event of hoverEvents) {
-          const bt = String(event.properties["blockType"] ?? "unknown");
-          hoverMap.set(bt, (hoverMap.get(bt) ?? 0) + 1);
-        }
+        const impressionMap = countByBlockType(impressionEvents);
+        const hoverMap = countByBlockType(hoverEvents);
         const allTypes = /* @__PURE__ */ new Set([...impressionMap.keys(), ...hoverMap.keys()]);
         if (allTypes.size > 0) {
           blockEngagement = [];
@@ -2113,6 +2338,19 @@ function analyticsPlugin(config) {
           position: "before-api"
         });
       }
+      if (config.trackPageViews !== false) {
+        const pageViewOptions = typeof config.trackPageViews === "object" ? config.trackPageViews : {};
+        const pageViewCollector = createPageViewCollectorMiddleware(
+          (event) => eventStore.add(event),
+          pageViewOptions
+        );
+        registerMiddleware({
+          path: "/",
+          handler: pageViewCollector,
+          position: "root"
+        });
+        logger.info("Page view tracking enabled");
+      }
       if (config.contentPerformance !== false) {
         const contentPerfRouter = createContentPerformanceRouter(config.adapter);
         registerMiddleware({
@@ -2197,16 +2435,20 @@ export {
   TrackingRules,
   analyticsPlugin,
   attachBlockTracking,
+  compileContentRoutes,
   createAnalyticsMiddleware,
   createAnalyticsQueryRouter,
   createApiCollectorMiddleware,
   createContentPerformanceRouter,
   createIngestRouter,
+  createPageViewCollectorMiddleware,
   createRuleEngine,
   createTracker,
   createTrackingRulesRouter,
   injectBlockAnalyticsFields,
   injectCollectionCollector,
+  isBot,
+  matchContentRoute,
   parseUserAgent,
   postgresAnalyticsAdapter
 };

package/lib/analytics-admin-routes.cjs

@@ -291,12 +291,13 @@ var analytics_dashboard_page_exports = {};
 __export(analytics_dashboard_page_exports, {
   AnalyticsDashboardPage: () => AnalyticsDashboardPage
 });
-var import_core4, import_common2, import_ui2, import_core5, import_outline2, AnalyticsDashboardPage;
+var import_core4, import_common2, import_router, import_ui2, import_core5, import_outline2, AnalyticsDashboardPage;
 var init_analytics_dashboard_page = __esm({
   "libs/plugins/analytics/src/lib/dashboard/analytics-dashboard.page.ts"() {
     "use strict";
     import_core4 = require("@angular/core");
     import_common2 = require("@angular/common");
+    import_router = require("@angular/router");
     import_ui2 = require("@momentumcms/ui");
     import_core5 = require("@ng-icons/core");
     import_outline2 = require("@ng-icons/heroicons/outline");
@@ -306,6 +307,8 @@ var init_analytics_dashboard_page = __esm({
       constructor() {
         this.analytics = (0, import_core4.inject)(AnalyticsService);
         this.platformId = (0, import_core4.inject)(import_core4.PLATFORM_ID);
+        this.router = (0, import_core4.inject)(import_router.Router);
+        this.route = (0, import_core4.inject)(import_router.ActivatedRoute);
         /** Date range options */
         this.dateRanges = [
           {
@@ -343,15 +346,12 @@ var init_analytics_dashboard_page = __esm({
         this.currentPage = (0, import_core4.signal)(1);
         /** Events per page */
         this.pageSize = 20;
-        /** Filtered events based on selected category (client-side filter on top of server query) */
+        /** Events from server query (filtered server-side by category when selected) */
         this.filteredEvents = (0, import_core4.computed)(() => {
           const result = this.analytics.events();
           if (!result)
             return [];
-          const cat = this.selectedCategory();
-          if (cat === "all")
-            return result.events;
-          return result.events.filter((e) => e.category === cat);
+          return result.events;
         });
         /** Total pages for pagination */
         this.totalPages = (0, import_core4.computed)(() => {
@@ -371,6 +371,22 @@ var init_analytics_dashboard_page = __esm({
       ngOnInit() {
         if (!(0, import_common2.isPlatformBrowser)(this.platformId))
           return;
+        const params = this.route.snapshot.queryParams;
+        if (params["range"] && this.dateRanges.some((r) => r.value === params["range"])) {
+          this.selectedRange.set(params["range"]);
+        }
+        if (params["category"] && this.categoryFilters.some((c) => c.value === params["category"])) {
+          this.selectedCategory.set(params["category"]);
+        }
+        if (params["search"]) {
+          this.searchTerm.set(params["search"]);
+        }
+        if (params["page"]) {
+          const page = parseInt(params["page"], 10);
+          if (!isNaN(page) && page > 0) {
+            this.currentPage.set(page);
+          }
+        }
         void this.refresh();
       }
       /**
@@ -381,13 +397,15 @@ var init_analytics_dashboard_page = __esm({
         const from = dateRange?.getFrom();
         const search = this.searchTerm() || void 0;
         const page = this.currentPage();
+        const category = this.selectedCategory();
         await Promise.all([
           this.analytics.fetchSummary({ from }),
           this.analytics.queryEvents({
             limit: this.pageSize,
             page,
             from,
-            search
+            search,
+            category: category !== "all" ? category : void 0
           })
         ]);
       }
@@ -397,13 +415,17 @@ var init_analytics_dashboard_page = __esm({
       setDateRange(range) {
         this.selectedRange.set(range.value);
         this.currentPage.set(1);
+        this.syncUrlParams();
         void this.refresh();
       }
       /**
-       * Set category filter.
+       * Set category filter and re-query server.
        */
       setCategory(category) {
         this.selectedCategory.set(category);
+        this.currentPage.set(1);
+        this.syncUrlParams();
+        void this.refresh();
       }
       /**
        * Handle search input.
@@ -413,6 +435,7 @@ var init_analytics_dashboard_page = __esm({
         if (target instanceof HTMLInputElement) {
           this.searchTerm.set(target.value);
           this.currentPage.set(1);
+          this.syncUrlParams();
           void this.refresh();
         }
       }
@@ -421,8 +444,26 @@ var init_analytics_dashboard_page = __esm({
        */
       goToPage(page) {
         this.currentPage.set(page);
+        this.syncUrlParams();
         void this.refresh();
       }
+      /**
+       * Sync current filter state to URL query params.
+       */
+      syncUrlParams() {
+        const queryParams = {
+          range: this.selectedRange() !== "all" ? this.selectedRange() : null,
+          category: this.selectedCategory() !== "all" ? this.selectedCategory() : null,
+          search: this.searchTerm() || null,
+          page: this.currentPage() > 1 ? String(this.currentPage()) : null
+        };
+        void this.router.navigate([], {
+          relativeTo: this.route,
+          queryParams,
+          queryParamsHandling: "merge",
+          replaceUrl: true
+        });
+      }
       /**
        * Get total content operations count.
        */
@@ -1120,12 +1161,13 @@ var content_performance_page_exports = {};
 __export(content_performance_page_exports, {
   ContentPerformancePage: () => ContentPerformancePage
 });
-var import_core7, import_common3, import_ui3, import_core8, import_outline3, ContentPerformancePage;
+var import_core7, import_common3, import_router2, import_ui3, import_core8, import_outline3, ContentPerformancePage;
 var init_content_performance_page = __esm({
   "libs/plugins/analytics/src/lib/dashboard/content-performance.page.ts"() {
     "use strict";
     import_core7 = require("@angular/core");
     import_common3 = require("@angular/common");
+    import_router2 = require("@angular/router");
     import_ui3 = require("@momentumcms/ui");
     import_core8 = require("@ng-icons/core");
     import_outline3 = require("@ng-icons/heroicons/outline");
@@ -1134,6 +1176,8 @@ var init_content_performance_page = __esm({
       constructor() {
         this.service = (0, import_core7.inject)(ContentPerformanceService);
         this.platformId = (0, import_core7.inject)(import_core7.PLATFORM_ID);
+        this.router = (0, import_core7.inject)(import_router2.Router);
+        this.route = (0, import_core7.inject)(import_router2.ActivatedRoute);
         this.dateRanges = [
           {
             label: "24h",
@@ -1183,16 +1227,25 @@ var init_content_performance_page = __esm({
       ngOnInit() {
         if (!(0, import_common3.isPlatformBrowser)(this.platformId))
           return;
+        const params = this.route.snapshot.queryParams;
+        if (params["range"] && this.dateRanges.some((r) => r.value === params["range"])) {
+          this.selectedRange.set(params["range"]);
+        }
+        if (params["search"]) {
+          this.searchTerm.set(params["search"]);
+        }
         void this.fetchData();
       }
       setDateRange(range) {
         this.selectedRange.set(range.value);
         this.expandedRow.set(null);
+        this.syncUrlParams();
         void this.fetchData();
       }
       onSearch(event) {
         if (event.target instanceof HTMLInputElement) {
           this.searchTerm.set(event.target.value);
+          this.syncUrlParams();
         }
       }
       toggleRow(url) {
@@ -1203,6 +1256,18 @@ var init_content_performance_page = __esm({
         const from = range?.getFrom();
         await this.service.fetchTopPages({ from });
       }
+      syncUrlParams() {
+        const queryParams = {
+          range: this.selectedRange() !== "all" ? this.selectedRange() : null,
+          search: this.searchTerm() || null
+        };
+        void this.router.navigate([], {
+          relativeTo: this.route,
+          queryParams,
+          queryParamsHandling: "merge",
+          replaceUrl: true
+        });
+      }
     };
     ContentPerformancePage = __decorateClass([
       (0, import_core7.Component)({