webspresso 0.0.64 → 0.0.65

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webspresso",
-  "version": "0.0.64",
+  "version": "0.0.65",
   "description": "Minimal, production-ready SSR framework for Node.js with file-based routing, Nunjucks templating, built-in i18n, and CLI tooling",
   "main": "index.js",
   "types": "index.d.ts",

package/plugins/site-analytics/admin-component.js

@@ -187,6 +187,7 @@ var AnalyticsPage = {
     vnode.state.viewsOverTime = [];
     vnode.state.topPages = [];
     vnode.state.botActivity = [];
+    vnode.state.referrerSources = [];
     vnode.state.countries = [];
     vnode.state.recent = [];
     vnode.state.chartLoaded = false;
@@ -217,6 +218,7 @@ var AnalyticsPage = {
       analyticsApi('views-over-time', days),
       analyticsApi('top-pages', days),
       analyticsApi('bot-activity', days),
+      analyticsApi('referrer-sources', days),
       analyticsApi('countries', days),
       analyticsApi('client-errors', days),
       analyticsApi('recent', days),
@@ -225,9 +227,10 @@ var AnalyticsPage = {
       vnode.state.viewsOverTime = results[1];
       vnode.state.topPages = results[2];
       vnode.state.botActivity = results[3];
-      vnode.state.countries = results[4];
-      vnode.state.clientErrors = results[5];
-      vnode.state.recent = results[6];
+      vnode.state.referrerSources = results[4];
+      vnode.state.countries = results[5];
+      vnode.state.clientErrors = results[6];
+      vnode.state.recent = results[7];
       vnode.state.loading = false;
 
       if (chartInstance) {
@@ -279,11 +282,13 @@ var AnalyticsPage = {
         ? m('div.flex.justify-center.py-24', m(Spinner))
         : [
           // Stat cards
-          m('div.grid.grid-cols-1.sm:grid-cols-2.lg:grid-cols-4.gap-4.mb-6', [
+          m('div.grid.grid-cols-2.sm:grid-cols-3.lg:grid-cols-3.xl:grid-cols-6.gap-4.mb-6', [
             m(StatCard, { icon: '👁', label: 'Views', value: s.stats?.views, bgClass: 'bg-blue-100' }),
             m(StatCard, { icon: '👤', label: 'Visitors', value: s.stats?.visitors, bgClass: 'bg-green-100' }),
             m(StatCard, { icon: '📄', label: 'Unique Pages', value: s.stats?.uniquePages, bgClass: 'bg-yellow-100' }),
             m(StatCard, { icon: '🔗', label: 'Sessions', value: s.stats?.sessions, bgClass: 'bg-purple-100' }),
+            m(StatCard, { icon: '🏠', label: 'Direct traffic', value: s.stats?.directViews, bgClass: 'bg-slate-100' }),
+            m(StatCard, { icon: '🌐', label: 'With referrer', value: s.stats?.referredViews, bgClass: 'bg-cyan-100' }),
           ]),
 
           // Chart + Bot Activity row
@@ -413,6 +418,31 @@ var AnalyticsPage = {
             ]),
           ]),
 
+          // Referrer sources (hostname-level)
+          m('div.bg-white.rounded-lg.shadow.mb-6', [
+            m('div.px-5.py-4.border-b.border-gray-100.flex.items-center.justify-between', [
+              m('h3.text-sm.font-semibold.text-gray-900', 'Referrer sources'),
+              m('span.text-xs.text-gray-400', 'By hostname · last ' + s.days + ' days'),
+            ]),
+            m('div.p-4', [
+              !s.referrerSources || s.referrerSources.length === 0
+                ? m('p.text-gray-400.text-sm.text-center.py-4', 'No external referrer data (direct visits or missing Referer header)')
+                : (function() {
+                  var maxV = s.referrerSources[0]?.views || 1;
+                  return m('div.grid.grid-cols-1.sm:grid-cols-2.gap-x-8.gap-y-2', s.referrerSources.map(function(r) {
+                    return m('div.flex.items-center.gap-3.py-1', [
+                      m('span.text-sm.text-gray-700.flex-1.min-w-0.truncate', { title: r.source }, r.source),
+                      m('div.w-32.shrink-0', m(HBar, {
+                        pct: (r.views / maxV) * 100,
+                        color: 'bg-sky-500',
+                      })),
+                      m('span.text-xs.text-gray-500.w-12.text-right.tabular-nums', formatNumber(r.views)),
+                    ]);
+                  }));
+                })(),
+            ]),
+          ]),
+
           // Country Stats
           m('div.bg-white.rounded-lg.shadow.mb-6', [
             m('div.px-5.py-4.border-b.border-gray-100.flex.items-center.justify-between', [

package/plugins/site-analytics/api-handlers.js

@@ -29,6 +29,24 @@ function createAnalyticsApiHandlers(options) {
     return d.toISOString();
   }
 
+  /**
+   * Extract registrable hostname from Referer URL (strip www.)
+   * @param {string|null|undefined} referrer
+   * @returns {string|null}
+   */
+  function hostnameFromReferrer(referrer) {
+    if (!referrer || typeof referrer !== 'string' || !referrer.trim()) return null;
+    try {
+      const u = new URL(referrer);
+      const h = u.hostname;
+      if (!h) return null;
+      const norm = h.replace(/^www\./i, '').toLowerCase();
+      return norm || null;
+    } catch {
+      return null;
+    }
+  }
+
   /**
    * GET /stats - Summary statistics
    */
@@ -42,6 +60,18 @@ function createAnalyticsApiHandlers(options) {
         .where('is_bot', false)
         .count('id as count');
 
+      const totalViews = parseInt(views.count) || 0;
+
+      const [directRow] = await knex(tableName)
+        .where('created_at', '>=', since)
+        .where('is_bot', false)
+        .where((qb) => {
+          qb.whereNull('referrer').orWhere('referrer', '');
+        })
+        .count('id as count');
+
+      const directViews = parseInt(directRow.count) || 0;
+
       const [visitors] = await knex(tableName)
         .where('created_at', '>=', since)
         .where('is_bot', false)
@@ -58,7 +88,9 @@ function createAnalyticsApiHandlers(options) {
         .countDistinct('session_id as count');
 
       res.json({
-        views: parseInt(views.count) || 0,
+        views: totalViews,
+        directViews,
+        referredViews: Math.max(0, totalViews - directViews),
         visitors: parseInt(visitors.count) || 0,
         uniquePages: parseInt(uniquePages.count) || 0,
         sessions: parseInt(sessions.count) || 0,
@@ -183,6 +215,46 @@ function createAnalyticsApiHandlers(options) {
     }
   }
 
+  /**
+   * GET /referrer-sources - Top referrer hostnames (aggregated from full Referer URLs)
+   */
+  async function getReferrerSources(req, res) {
+    try {
+      const days = parseDays(req);
+      const since = sinceDate(days);
+      const limit = Math.min(parseInt(req.query.limit) || 20, 50);
+      /** Max distinct full Referer URLs read before hostname merge (long tail capped). */
+      const referrerGroupLimit = 400;
+
+      const rows = await knex(tableName)
+        .select('referrer')
+        .where('created_at', '>=', since)
+        .where('is_bot', false)
+        .whereNotNull('referrer')
+        .where('referrer', '!=', '')
+        .count('id as views')
+        .groupBy('referrer')
+        .orderBy('views', 'desc')
+        .limit(referrerGroupLimit);
+
+      const byHost = new Map();
+      for (const r of rows) {
+        const host = hostnameFromReferrer(r.referrer) || 'Other';
+        const n = parseInt(r.views) || 0;
+        byHost.set(host, (byHost.get(host) || 0) + n);
+      }
+
+      const list = [...byHost.entries()]
+        .map(([source, views]) => ({ source, views }))
+        .sort((a, b) => b.views - a.views)
+        .slice(0, limit);
+
+      res.json(list);
+    } catch (e) {
+      res.status(500).json({ error: e.message });
+    }
+  }
+
   /**
    * GET /countries - Country breakdown
    */
@@ -262,6 +334,7 @@ function createAnalyticsApiHandlers(options) {
     getViewsOverTime,
     getTopPages,
     getBotActivity,
+    getReferrerSources,
     getCountries,
     getClientErrors,
     getRecent,

package/plugins/site-analytics/index.js

@@ -115,6 +115,7 @@ function siteAnalyticsPlugin(options = {}) {
             { method: 'get', path: '/views-over-time', handler: handlers.getViewsOverTime },
             { method: 'get', path: '/top-pages', handler: handlers.getTopPages },
             { method: 'get', path: '/bot-activity', handler: handlers.getBotActivity },
+            { method: 'get', path: '/referrer-sources', handler: handlers.getReferrerSources },
             { method: 'get', path: '/countries', handler: handlers.getCountries },
             { method: 'get', path: '/client-errors', handler: handlers.getClientErrors },
             { method: 'get', path: '/recent', handler: handlers.getRecent },