@orion-studios/cms 0.5.7 → 0.5.9

package/dist/server/index.js

@@ -12,23 +12,158 @@ import {
 // src/server/routes.ts
 import { createHash as createHash3, createHmac as createHmac3, randomUUID, timingSafeEqual as timingSafeEqual2 } from "crypto";
 
+// src/analytics/time.ts
+var datePartsFormatter = (timeZone) => new Intl.DateTimeFormat("en-US", {
+  timeZone,
+  year: "numeric",
+  month: "2-digit",
+  day: "2-digit",
+  hour: "2-digit",
+  minute: "2-digit",
+  second: "2-digit",
+  hourCycle: "h23"
+});
+function isValidTimeZone(timeZone) {
+  try {
+    datePartsFormatter(timeZone).format(/* @__PURE__ */ new Date(0));
+    return true;
+  } catch {
+    return false;
+  }
+}
+function normalizeTimeZone(timeZone) {
+  const value = timeZone?.trim() || "UTC";
+  if (!isValidTimeZone(value)) {
+    throw new Error(`Invalid analytics time zone: ${value}. Use an IANA name such as America/Chicago.`);
+  }
+  return value;
+}
+function localParts(date, timeZone) {
+  const values = new Map(
+    datePartsFormatter(timeZone).formatToParts(date).filter((part) => part.type !== "literal").map((part) => [part.type, Number(part.value)])
+  );
+  return {
+    year: values.get("year") || 0,
+    month: values.get("month") || 0,
+    day: values.get("day") || 0,
+    hour: values.get("hour") || 0,
+    minute: values.get("minute") || 0,
+    second: values.get("second") || 0,
+    millisecond: date.getUTCMilliseconds()
+  };
+}
+function dateKey(parts) {
+  return `${String(parts.year).padStart(4, "0")}-${String(parts.month).padStart(2, "0")}-${String(parts.day).padStart(2, "0")}`;
+}
+function dateKeyInTimeZone(value, timeZone) {
+  const date = value instanceof Date ? value : new Date(value);
+  return dateKey(localParts(date, timeZone));
+}
+function hourInTimeZone(value, timeZone) {
+  const date = value instanceof Date ? value : new Date(value);
+  return localParts(date, timeZone).hour;
+}
+function addDays(key, days) {
+  const [year, month, day] = key.split("-").map(Number);
+  const date = new Date(Date.UTC(year, month - 1, day + days));
+  return date.toISOString().slice(0, 10);
+}
+function localDateTimeUtc(parts, timeZone) {
+  const desired = Date.UTC(
+    parts.year,
+    parts.month - 1,
+    parts.day,
+    parts.hour,
+    parts.minute,
+    parts.second,
+    parts.millisecond
+  );
+  let instant = desired;
+  for (let attempt = 0; attempt < 3; attempt += 1) {
+    const observed = localParts(new Date(instant), timeZone);
+    const observedAsUtc = Date.UTC(
+      observed.year,
+      observed.month - 1,
+      observed.day,
+      observed.hour,
+      observed.minute,
+      observed.second,
+      observed.millisecond
+    );
+    instant += desired - observedAsUtc;
+  }
+  return new Date(instant);
+}
+function localMidnightUtc(key, timeZone) {
+  const [year, month, day] = key.split("-").map(Number);
+  return localDateTimeUtc({ year, month, day, hour: 0, minute: 0, second: 0, millisecond: 0 }, timeZone);
+}
+function shiftLocalDays(date, days, timeZone) {
+  const current = localParts(date, timeZone);
+  const shifted = new Date(Date.UTC(
+    current.year,
+    current.month - 1,
+    current.day + days,
+    current.hour,
+    current.minute,
+    current.second,
+    current.millisecond
+  ));
+  return localDateTimeUtc({
+    year: shifted.getUTCFullYear(),
+    month: shifted.getUTCMonth() + 1,
+    day: shifted.getUTCDate(),
+    hour: shifted.getUTCHours(),
+    minute: shifted.getUTCMinutes(),
+    second: shifted.getUTCSeconds(),
+    millisecond: shifted.getUTCMilliseconds()
+  }, timeZone);
+}
+function calendarRange(days, timeZone, now = /* @__PURE__ */ new Date()) {
+  if (!Number.isInteger(days) || days < 1 || days > 370) {
+    throw new Error("Analytics days must be an integer from 1 through 370.");
+  }
+  const today = dateKeyInTimeZone(now, timeZone);
+  const fromKey = addDays(today, -(days - 1));
+  const previousFromKey = addDays(fromKey, -days);
+  const fromDate = localMidnightUtc(fromKey, timeZone);
+  return {
+    from: fromDate.toISOString(),
+    to: now.toISOString(),
+    previousFrom: localMidnightUtc(previousFromKey, timeZone).toISOString(),
+    previousTo: shiftLocalDays(now, -days, timeZone).toISOString()
+  };
+}
+function dateKeysInRange(from, to, timeZone) {
+  const first = dateKeyInTimeZone(from, timeZone);
+  const last = dateKeyInTimeZone(to, timeZone);
+  const keys = [];
+  for (let key = first; key <= last && keys.length <= 370; key = addDays(key, 1)) keys.push(key);
+  return keys;
+}
+
 // src/analytics/aggregate.ts
 var CONVERSION_NAMES = /* @__PURE__ */ new Set(["call", "email"]);
-function normalizeSource(utmSource, referrer) {
+function normalizeSource(utmSource, referrer, utmMedium = "") {
   const tag = utmSource.trim().toLowerCase();
+  const medium = utmMedium.trim().toLowerCase();
   if (tag) {
     if (["gbp", "gmb", "google-business", "google_business", "business.google.com"].includes(tag)) {
       return "Google Business Profile";
     }
-    if (tag === "google") return "Google";
+    if (tag === "google") {
+      if (["cpc", "ppc", "paid", "paidsearch", "paid-search"].includes(medium)) return "Google Ads";
+      if (medium === "organic") return "Google search";
+      return "Google (unclassified)";
+    }
     if (tag === "facebook" || tag === "fb") return "Facebook";
     if (tag === "instagram" || tag === "ig") return "Instagram";
     return utmSource.trim();
   }
   const host = referrer.trim().toLowerCase();
-  if (!host) return "direct";
+  if (!host) return "No referrer / direct";
   if (host === "business.google.com") return "Google Business Profile";
-  if (host.includes("google.")) return "Google search";
+  if (host.includes("google.")) return "Google (unclassified)";
   if (host.includes("bing.")) return "Bing";
   if (host.includes("duckduckgo.")) return "DuckDuckGo";
   if (host.includes("yahoo.")) return "Yahoo";
@@ -40,12 +175,11 @@ function normalizeSource(utmSource, referrer) {
   if (host.includes("twitter.") || host === "t.co" || host.includes("x.com")) return "X (Twitter)";
   return host;
 }
-var isConversion = (event) => event.server_verified === true && (event.type === "click" && CONVERSION_NAMES.has(event.name) || event.type === "form" && event.name.endsWith(":submit"));
+var isFormSubmitEvent = (event) => event.type === "form" && event.name.endsWith(":submit");
+var isConversion = (event) => event.server_verified === true && (event.type === "click" && CONVERSION_NAMES.has(event.name) || isFormSubmitEvent(event));
 var top = (map, limit, by) => [...map.entries()].sort((a, b) => by(b[1]) - by(a[1])).slice(0, limit);
-function computeKpis(events) {
+function computeKpis(events, submissions) {
   const sessions = /* @__PURE__ */ new Set();
-  const visitors = /* @__PURE__ */ new Set();
-  const visitorSessions = /* @__PURE__ */ new Map();
   const converting = /* @__PURE__ */ new Set();
   let pageviews = 0;
   let calls = 0;
@@ -54,61 +188,122 @@ function computeKpis(events) {
   let portalClicks = 0;
   for (const event of events) {
     if (event.session_key) sessions.add(event.session_key);
-    const identity = event.visitor_key || event.session_key;
-    if (identity) visitors.add(identity);
-    if (event.visitor_key && event.session_key) {
-      const keys = visitorSessions.get(event.visitor_key) || /* @__PURE__ */ new Set();
-      keys.add(event.session_key);
-      visitorSessions.set(event.visitor_key, keys);
-    }
     if (event.type === "pageview") pageviews += 1;
     if (event.type === "click" && event.name === "call") calls += 1;
     if (event.type === "click" && event.name === "email") emails += 1;
     if (event.type === "click" && event.name === "portal") portalClicks += 1;
-    if (event.server_verified === true && event.type === "form" && event.name.endsWith(":submit")) {
-      formSubmits += 1;
-    }
+    if (event.server_verified === true && isFormSubmitEvent(event)) formSubmits += 1;
     if (isConversion(event) && event.session_key) converting.add(event.session_key);
   }
-  const conversions = events.filter(isConversion).length;
-  const returningVisitors = [...visitorSessions.values()].filter((keys) => keys.size > 1).length;
+  for (const submission of submissions || []) {
+    if (submission.session_key && sessions.has(submission.session_key)) {
+      converting.add(submission.session_key);
+    }
+  }
+  const attributedSubmits = (submissions || []).filter(
+    (submission) => Boolean(submission.session_key && sessions.has(submission.session_key))
+  ).length;
+  const conversions = events.filter(isConversion).length + (submissions?.length ?? 0);
+  const visitorMetrics = computeVisitorMetrics(events);
   return {
-    visitors: visitors.size,
-    identifiedVisitors: visitorSessions.size,
-    returningVisitors,
+    visitors: visitorMetrics.visitors,
+    identifiedVisitors: visitorMetrics.identifiedVisitors,
+    returningVisitors: visitorMetrics.returningVisitors,
     sessions: sessions.size,
     pageviews,
-    pagesPerVisitor: visitors.size > 0 ? pageviews / visitors.size : 0,
+    pagesPerVisitor: visitorMetrics.visitors > 0 ? pageviews / visitorMetrics.visitors : 0,
     calls,
-    formSubmits,
+    formSubmits: submissions?.length ?? formSubmits,
     emails,
     portalClicks,
     conversions,
-    conversionRate: sessions.size > 0 ? converting.size / sessions.size : 0
+    conversionRate: sessions.size > 0 ? converting.size / sessions.size : 0,
+    attributedSubmits,
+    unattributedSubmits: (submissions?.length ?? 0) - attributedSubmits
   };
 }
-function aggregateAnalytics(events, previousEvents, range) {
-  const kpis = computeKpis(events);
-  const previous = computeKpis(previousEvents);
-  const byDay = /* @__PURE__ */ new Map();
-  const dayOf = (iso) => iso.slice(0, 10);
+function computeVisitorMetrics(events) {
+  const parents = /* @__PURE__ */ new Map();
+  const ensure = (node) => {
+    if (!parents.has(node)) parents.set(node, node);
+  };
+  const find = (node) => {
+    const parent = parents.get(node) || node;
+    if (parent === node) return node;
+    const root = find(parent);
+    parents.set(node, root);
+    return root;
+  };
+  const union = (left, right) => {
+    ensure(left);
+    ensure(right);
+    const leftRoot = find(left);
+    const rightRoot = find(right);
+    if (leftRoot !== rightRoot) parents.set(rightRoot, leftRoot);
+  };
+  const sessionNodes = /* @__PURE__ */ new Set();
+  const visitorNodes = /* @__PURE__ */ new Set();
   for (const event of events) {
+    const sessionNode = event.session_key ? `session:${event.session_key}` : "";
+    const visitorNode = event.visitor_key ? `visitor:${event.visitor_key}` : "";
+    if (sessionNode) {
+      ensure(sessionNode);
+      sessionNodes.add(sessionNode);
+    }
+    if (visitorNode) {
+      ensure(visitorNode);
+      visitorNodes.add(visitorNode);
+    }
+    if (sessionNode && visitorNode) union(sessionNode, visitorNode);
+  }
+  const roots = new Set([...parents.keys()].map(find));
+  const identifiedRoots = new Set([...visitorNodes].map(find));
+  const sessionsPerRoot = /* @__PURE__ */ new Map();
+  for (const sessionNode of sessionNodes) {
+    const root = find(sessionNode);
+    sessionsPerRoot.set(root, (sessionsPerRoot.get(root) || 0) + 1);
+  }
+  const returningVisitors = [...identifiedRoots].filter(
+    (root) => (sessionsPerRoot.get(root) || 0) > 1
+  ).length;
+  return {
+    visitors: roots.size,
+    identifiedVisitors: identifiedRoots.size,
+    returningVisitors
+  };
+}
+function aggregateAnalytics(events, previousEvents, range, submissions, previousSubmissions, timeZone = "UTC") {
+  const trafficEvents = submissions === void 0 ? events : events.filter((event) => !isFormSubmitEvent(event));
+  const previousTrafficEvents = previousSubmissions === void 0 ? previousEvents : previousEvents.filter((event) => !isFormSubmitEvent(event));
+  const kpis = computeKpis(trafficEvents, submissions);
+  const previous = computeKpis(previousTrafficEvents, previousSubmissions);
+  const byDay = /* @__PURE__ */ new Map();
+  const summaryTimeZone = normalizeTimeZone(timeZone);
+  const dayOf = (iso) => dateKeyInTimeZone(iso, summaryTimeZone);
+  for (const event of trafficEvents) {
     const day = dayOf(event.created_at);
-    const entry = byDay.get(day) || { visitors: /* @__PURE__ */ new Set(), conversions: 0 };
-    const identity = event.visitor_key || event.session_key;
-    if (identity) entry.visitors.add(identity);
+    const entry = byDay.get(day) || { events: [], conversions: 0 };
+    entry.events.push(event);
     if (isConversion(event)) entry.conversions += 1;
     byDay.set(day, entry);
   }
+  for (const submission of submissions || []) {
+    const day = dayOf(submission.created_at);
+    const entry = byDay.get(day) || { events: [], conversions: 0 };
+    entry.conversions += 1;
+    byDay.set(day, entry);
+  }
   const trend = [];
-  for (let cursor = /* @__PURE__ */ new Date(`${dayOf(range.from)}T00:00:00Z`); cursor.toISOString().slice(0, 10) <= dayOf(range.to); cursor.setUTCDate(cursor.getUTCDate() + 1)) {
-    const day = cursor.toISOString().slice(0, 10);
+  for (const day of dateKeysInRange(range.from, range.to, summaryTimeZone)) {
     const entry = byDay.get(day);
-    trend.push({ day, visitors: entry?.visitors.size ?? 0, conversions: entry?.conversions ?? 0 });
-    if (trend.length > 370) break;
+    trend.push({
+      day,
+      visitors: entry ? computeVisitorMetrics(entry.events).visitors : 0,
+      conversions: entry?.conversions ?? 0
+    });
   }
   const bySession = /* @__PURE__ */ new Map();
-  for (const event of events) {
+  for (const event of trafficEvents) {
     if (!event.session_key) continue;
     const list = bySession.get(event.session_key) || [];
     list.push(event);
@@ -117,27 +312,39 @@ function aggregateAnalytics(events, previousEvents, range) {
   for (const list of bySession.values()) {
     list.sort((a, b) => a.created_at.localeCompare(b.created_at));
   }
+  const convertedSessionKeys = /* @__PURE__ */ new Set();
+  for (const event of trafficEvents) {
+    if (isConversion(event) && event.session_key) convertedSessionKeys.add(event.session_key);
+  }
+  for (const submission of submissions || []) {
+    if (submission.session_key) convertedSessionKeys.add(submission.session_key);
+  }
   const pages = /* @__PURE__ */ new Map();
   const pageEntry = (path) => {
     const entry = pages.get(path) || { views: 0, entries: 0, conversions: 0 };
     pages.set(path, entry);
     return entry;
   };
-  for (const event of events) {
+  for (const event of trafficEvents) {
     if (event.type === "pageview") pageEntry(event.path).views += 1;
     if (isConversion(event)) pageEntry(event.path).conversions += 1;
   }
+  for (const submission of submissions || []) {
+    const list = bySession.get(submission.session_key);
+    const lastPageview = list?.filter((event) => event.type === "pageview" && event.created_at <= submission.created_at).at(-1);
+    if (lastPageview) pageEntry(lastPageview.path).conversions += 1;
+  }
   for (const list of bySession.values()) {
     const first = list.find((event) => event.type === "pageview");
     if (first) pageEntry(first.path).entries += 1;
   }
   const sources = /* @__PURE__ */ new Map();
-  for (const list of bySession.values()) {
+  for (const [sessionKey, list] of bySession.entries()) {
     const first = list.find((event) => event.type === "pageview");
-    const label = normalizeSource(first?.utm?.source || "", first?.referrer || "");
+    const label = normalizeSource(first?.utm?.source || "", first?.referrer || "", first?.utm?.medium || "");
     const entry = sources.get(label) || { sessions: 0, conversions: 0 };
     entry.sessions += 1;
-    if (list.some(isConversion)) entry.conversions += 1;
+    if (convertedSessionKeys.has(sessionKey)) entry.conversions += 1;
     sources.set(label, entry);
   }
   const locations = /* @__PURE__ */ new Map();
@@ -149,13 +356,13 @@ function aggregateAnalytics(events, previousEvents, range) {
     if (sample.device) devices.set(sample.device, (devices.get(sample.device) || 0) + 1);
   }
   const hours = new Array(24).fill(0);
-  for (const event of events) {
+  for (const event of trafficEvents) {
     if (event.type !== "pageview") continue;
-    const hour = new Date(event.created_at).getUTCHours();
+    const hour = hourInTimeZone(event.created_at, summaryTimeZone);
     if (Number.isFinite(hour)) hours[hour] += 1;
   }
   const pathCounts = /* @__PURE__ */ new Map();
-  for (const list of bySession.values()) {
+  for (const [sessionKey, list] of bySession.entries()) {
     const steps = [];
     for (const event of list) {
       if (event.type !== "pageview") continue;
@@ -166,25 +373,50 @@ function aggregateAnalytics(events, previousEvents, range) {
     const key = steps.join(" \u2192 ");
     const entry = pathCounts.get(key) || { count: 0, converted: 0 };
     entry.count += 1;
-    if (list.some(isConversion)) entry.converted += 1;
+    if (convertedSessionKeys.has(sessionKey)) entry.converted += 1;
     pathCounts.set(key, entry);
   }
   const forms = /* @__PURE__ */ new Map();
-  for (const event of events) {
+  const formEvidence = (form, sessionKey) => {
+    const sessions = forms.get(form) || /* @__PURE__ */ new Map();
+    forms.set(form, sessions);
+    const evidence = sessions.get(sessionKey) || { viewed: false, start: false, submit: false };
+    sessions.set(sessionKey, evidence);
+    return evidence;
+  };
+  for (const event of trafficEvents) {
     if (event.type !== "form") continue;
     const [slug, stage] = event.name.split(":");
     if (!slug || !stage) continue;
-    const entry = forms.get(slug) || { views: 0, starts: 0, submits: 0 };
-    if (stage === "view") entry.views += 1;
-    if (stage === "start") entry.starts += 1;
-    if (stage === "submit" && event.server_verified === true) entry.submits += 1;
-    forms.set(slug, entry);
+    if (stage !== "viewed" && stage !== "start" && stage !== "submit") continue;
+    const sessionKey = event.session_key || `event:${String(event.id ?? event.created_at)}`;
+    const evidence = formEvidence(slug, sessionKey);
+    if (stage === "viewed") evidence.viewed = true;
+    if (stage === "start") evidence.start = true;
+    if (stage === "submit" && event.server_verified === true) evidence.submit = true;
+  }
+  for (const [index, submission] of (submissions || []).entries()) {
+    const sessionKey = submission.session_key || `submission:${String(submission.id ?? index)}`;
+    formEvidence(submission.form, sessionKey).submit = true;
+  }
+  const formSummary = [];
+  for (const [form, sessions] of forms.entries()) {
+    let views = 0;
+    let starts = 0;
+    let submits = 0;
+    for (const evidence of sessions.values()) {
+      if (evidence.viewed || evidence.start || evidence.submit) views += 1;
+      if (evidence.start || evidence.submit) starts += 1;
+      if (evidence.submit) submits += 1;
+    }
+    formSummary.push({ form, views, starts, submits });
   }
   const notFound = /* @__PURE__ */ new Map();
-  for (const event of events) {
+  for (const event of trafficEvents) {
     if (event.type === "not_found") notFound.set(event.path, (notFound.get(event.path) || 0) + 1);
   }
   return {
+    timeZone: summaryTimeZone,
     range,
     kpis,
     previous,
@@ -198,7 +430,7 @@ function aggregateAnalytics(events, previousEvents, range) {
       path: key.split(" \u2192 "),
       ...data
     })),
-    forms: [...forms.entries()].map(([form, data]) => ({ form, ...data })),
+    forms: formSummary,
     notFound: top(notFound, 20, (count) => count).map(([path, count]) => ({ path, count }))
   };
 }
@@ -209,8 +441,8 @@ var EVENT_TYPES = ["pageview", "click", "form", "not_found"];
 var MAX_EVENTS_PER_BATCH = 20;
 var MAX_TEXT = 300;
 var MAX_META_JSON = 1e3;
-function sessionKeyFor(ip, userAgent, secret, now = /* @__PURE__ */ new Date()) {
-  const day = now.toISOString().slice(0, 10);
+function sessionKeyFor(ip, userAgent, secret, now = /* @__PURE__ */ new Date(), timeZone = "UTC") {
+  const day = dateKeyInTimeZone(now, normalizeTimeZone(timeZone));
   return createHash("sha256").update(`${secret}|${day}|${ip}|${userAgent}`).digest("hex").slice(0, 24);
 }
 function visitorKeyFor(visitorId, secret) {
@@ -1170,6 +1402,7 @@ function createCmsRoutes(options) {
   };
   const previewProjectRef = options.projectRef || (options.memoryMode ? "memory" : "");
   const analyticsSecret = options.analyticsSecret || (options.memoryMode ? "orion-memory-analytics-secret" : "");
+  const analyticsTimeZone = normalizeTimeZone(options.analyticsTimeZone);
   const autoReplyHashSecret = options.autoReplyHashSecret || (options.memoryMode ? "orion-memory-auto-reply-secret" : "");
   const analyticsLimit = (max, windowMs, bucket) => options.memoryMode ? createMemoryRateLimitStore({ max, windowMs }) : createDurableRateLimitStore(db, { max, windowMs, bucket, failClosed: true });
   const autoReplyLimit = (max, windowMs, bucket) => options.memoryMode ? createMemoryRateLimitStore({ max, windowMs }) : createDurableRateLimitStore(db, { max, windowMs, bucket, failClosed: true });
@@ -1252,7 +1485,13 @@ function createCmsRoutes(options) {
   const analyticsRetentionDays = options.analyticsRetentionDays ?? 90;
   const requestSessionKey = (request) => {
     if (!analyticsSecret) return "";
-    return sessionKeyFor(clientKey(request), request.headers.get("user-agent") || "", analyticsSecret);
+    return sessionKeyFor(
+      clientKey(request),
+      request.headers.get("user-agent") || "",
+      analyticsSecret,
+      /* @__PURE__ */ new Date(),
+      analyticsTimeZone
+    );
   };
   const guard = async (request, action) => {
     if (hostedMemoryMode) return errors.unauthorized();
@@ -2231,10 +2470,12 @@ function createCmsRoutes(options) {
         }
       }
       try {
-        await db().from("cms_events").insert(
+        const { error } = await db().from("cms_events").insert(
           rows.map((row) => ({ ...row, server_verified: false }))
         );
+        if (error) console.error("CMS analytics ingest failed.");
       } catch {
+        console.error("CMS analytics ingest failed.");
       }
     }
     return json({ success: true });
@@ -2243,30 +2484,99 @@ function createCmsRoutes(options) {
     const all = [];
     let cursor = 0;
     for (let page = 0; page < 60; page += 1) {
-      const { data, error } = await db().from("cms_events").select("id, session_key, type, name, path, referrer, utm, device, region, city, meta, server_verified, created_at").gte("created_at", fromIso).lte("created_at", toIso).gt("id", cursor).order("id", { ascending: true }).limit(1e3);
-      if (error || !data || data.length === 0) break;
+      const { data, error } = await db().from("cms_events").select("id, session_key, visitor_key, type, name, path, referrer, utm, device, region, city, meta, server_verified, created_at").gte("created_at", fromIso).lte("created_at", toIso).gt("id", cursor).order("id", { ascending: true }).limit(1e3);
+      if (error) throw new Error("Analytics event read failed.");
+      if (!data || data.length === 0) return all;
       all.push(...data);
       cursor = Number(data[data.length - 1].id);
-      if (data.length < 1e3) break;
+      if (data.length < 1e3) return all;
     }
-    return all;
+    throw new Error("Analytics event read exceeded the supported row limit.");
+  };
+  const fetchFormSubmissions = async (fromIso, toIso) => {
+    const all = [];
+    let cursor = 0;
+    for (let page = 0; page < 60; page += 1) {
+      const { data, error } = await db().from("cms_form_submissions").select("id, form_id, session_key, created_at").gte("created_at", fromIso).lte("created_at", toIso).gt("id", cursor).order("id", { ascending: true }).limit(1e3);
+      if (error) throw new Error("Analytics submission read failed.");
+      if (!data || data.length === 0) return all;
+      all.push(...data);
+      cursor = Number(data[data.length - 1].id);
+      if (data.length < 1e3) return all;
+    }
+    throw new Error("Analytics submission read exceeded the supported row limit.");
+  };
+  const fetchFormSlugs = async () => {
+    const { data, error } = await db().from("cms_forms").select("id, slug").limit(1e3);
+    const slugs = /* @__PURE__ */ new Map();
+    if (error) throw new Error("Analytics form label read failed.");
+    if (!data) return slugs;
+    for (const form of data) {
+      const id = String(form.id || "");
+      const slug = String(form.slug || "");
+      if (id && slug) slugs.set(id, slug);
+    }
+    return slugs;
   };
   const getAnalytics = async (request) => {
     const auth = await guard(request, "analytics.read");
     if (auth instanceof Response) return auth;
     const url = new URL(request.url);
-    const toMs = Date.parse(url.searchParams.get("to") || "") || Date.now();
-    const defaultFrom = toMs - 30 * 864e5;
-    const fromMs = Math.min(Date.parse(url.searchParams.get("from") || "") || defaultFrom, toMs);
-    const windowMs = Math.max(toMs - fromMs, 864e5);
-    const from = new Date(fromMs).toISOString();
-    const to = new Date(toMs).toISOString();
-    const previousFrom = new Date(fromMs - windowMs).toISOString();
-    const [events, previousEvents] = await Promise.all([
-      fetchEvents(from, to),
-      fetchEvents(previousFrom, from)
-    ]);
-    return json(aggregateAnalytics(events, previousEvents, { from, to }));
+    const requestedDays = Number(url.searchParams.get("days") || "");
+    let from;
+    let to;
+    let previousFrom;
+    let previousTo;
+    if (Number.isInteger(requestedDays) && requestedDays >= 1 && requestedDays <= 370) {
+      ({ from, to, previousFrom, previousTo } = calendarRange(requestedDays, analyticsTimeZone));
+    } else {
+      const toMs = Date.parse(url.searchParams.get("to") || "") || Date.now();
+      const defaultFrom = toMs - 30 * 864e5;
+      const fromMs2 = Math.min(Date.parse(url.searchParams.get("from") || "") || defaultFrom, toMs);
+      const windowMs = Math.max(toMs - fromMs2, 864e5);
+      from = new Date(fromMs2).toISOString();
+      to = new Date(toMs).toISOString();
+      previousFrom = new Date(fromMs2 - windowMs).toISOString();
+      previousTo = new Date(fromMs2 - 1).toISOString();
+    }
+    let events;
+    let previousEvents;
+    let submissionRows;
+    let formSlugs;
+    try {
+      [events, previousEvents, submissionRows, formSlugs] = await Promise.all([
+        fetchEvents(from, to),
+        fetchEvents(previousFrom, previousTo),
+        fetchFormSubmissions(previousFrom, to),
+        fetchFormSlugs()
+      ]);
+    } catch {
+      console.error("CMS analytics summary read failed.");
+      return json({ error: "Analytics data is temporarily unavailable. No partial totals were shown." }, 503);
+    }
+    const fromMs = Date.parse(from);
+    const submissions = submissionRows.map((submission) => ({
+      id: submission.id,
+      form: formSlugs.get(String(submission.form_id)) || String(submission.form_id),
+      session_key: String(submission.session_key || ""),
+      created_at: String(submission.created_at)
+    }));
+    const currentSubmissions = submissions.filter(
+      (submission) => Date.parse(submission.created_at) >= fromMs
+    );
+    const previousSubmissions = submissions.filter(
+      (submission) => Date.parse(submission.created_at) <= Date.parse(previousTo)
+    );
+    return json(
+      aggregateAnalytics(
+        events,
+        previousEvents,
+        { from, to },
+        currentSubmissions,
+        previousSubmissions,
+        analyticsTimeZone
+      )
+    );
   };
   const pruneEvents = async () => {
     const cutoff = new Date(Date.now() - analyticsRetentionDays * 864e5).toISOString();

package/dist/studio/index.d.ts

@@ -164,8 +164,11 @@ type AnalyticsKpis = {
     portalClicks: number;
     conversions: number;
     conversionRate: number;
+    attributedSubmits: number;
+    unattributedSubmits: number;
 };
 type AnalyticsSummary = {
+    timeZone: string;
     range: {
         from: string;
         to: string;
@@ -514,6 +517,7 @@ declare function createStudioApi(options: {
     analytics: (params?: {
         from?: string;
         to?: string;
+        days?: number;
     }) => Promise<AnalyticsSummary>;
     listUsers: () => Promise<{
         users: StudioUser[];