@litemetrics/node 0.1.3 → 0.3.0

package/dist/index.cjs

@@ -42,6 +42,36 @@ var import_client = require("@clickhouse/client");
 
 // src/adapters/utils.ts
 var import_crypto = require("crypto");
+function getTimezoneOffsetMs(date, timezone) {
+  const formatter = new Intl.DateTimeFormat("en-US", {
+    timeZone: timezone,
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit",
+    second: "2-digit",
+    hour12: false
+  });
+  const parts = formatter.formatToParts(date);
+  const get = (type) => parts.find((p) => p.type === type).value;
+  const y = parseInt(get("year"));
+  const m = parseInt(get("month")) - 1;
+  const d = parseInt(get("day"));
+  const h = parseInt(get("hour") === "24" ? "0" : get("hour"));
+  const mi = parseInt(get("minute"));
+  const s = parseInt(get("second"));
+  return Date.UTC(y, m, d, h, mi, s) - date.getTime();
+}
+function toUTCDate(value) {
+  if (value instanceof Date) return value;
+  if (typeof value === "number") return new Date(value);
+  const s = String(value).trim();
+  if (s.length >= 10 && !s.endsWith("Z") && !/[+-]\d{2}:?\d{2}$/.test(s)) {
+    return /* @__PURE__ */ new Date(s.replace(" ", "T") + "Z");
+  }
+  return new Date(s);
+}
 function resolvePeriod(q) {
   const now = /* @__PURE__ */ new Date();
   const period = q.period ?? "7d";
@@ -108,60 +138,66 @@ function granularityToDateFormat(g) {
       return "%Y-%m";
   }
 }
-function fillBuckets(from, to, granularity, dateFormat, rows) {
+function fillBuckets(from, to, granularity, dateFormat, rows, timezone) {
   const map = new Map(rows.map((r) => [r._id, r.value]));
   const points = [];
-  const current = new Date(from);
+  const fromOffset = timezone ? getTimezoneOffsetMs(from, timezone) : 0;
+  const toOffset = timezone ? getTimezoneOffsetMs(to, timezone) : 0;
+  const current = new Date(from.getTime() + fromOffset);
+  const toWall = new Date(to.getTime() + toOffset);
   if (granularity === "hour") {
-    current.setMinutes(0, 0, 0);
+    current.setUTCMinutes(0, 0, 0);
   } else if (granularity === "day") {
-    current.setHours(0, 0, 0, 0);
+    current.setUTCHours(0, 0, 0, 0);
   } else if (granularity === "week") {
-    const day = current.getDay();
+    const day = current.getUTCDay();
     const diff = day === 0 ? -6 : 1 - day;
-    current.setDate(current.getDate() + diff);
-    current.setHours(0, 0, 0, 0);
+    current.setUTCDate(current.getUTCDate() + diff);
+    current.setUTCHours(0, 0, 0, 0);
   } else if (granularity === "month") {
-    current.setDate(1);
-    current.setHours(0, 0, 0, 0);
+    current.setUTCDate(1);
+    current.setUTCHours(0, 0, 0, 0);
   }
-  while (current <= to) {
+  while (current <= toWall) {
     const key = formatDateBucket(current, dateFormat);
-    points.push({ date: current.toISOString(), value: map.get(key) ?? 0 });
+    const approxUtc = new Date(current.getTime() - fromOffset);
+    const exactOffset = timezone ? getTimezoneOffsetMs(approxUtc, timezone) : 0;
+    const realUtc = new Date(current.getTime() - exactOffset);
+    points.push({ date: realUtc.toISOString(), value: map.get(key) ?? 0 });
     if (granularity === "hour") {
-      current.setHours(current.getHours() + 1);
+      current.setUTCHours(current.getUTCHours() + 1);
     } else if (granularity === "day") {
-      current.setDate(current.getDate() + 1);
+      current.setUTCDate(current.getUTCDate() + 1);
     } else if (granularity === "week") {
-      current.setDate(current.getDate() + 7);
+      current.setUTCDate(current.getUTCDate() + 7);
     } else if (granularity === "month") {
-      current.setMonth(current.getMonth() + 1);
+      current.setUTCMonth(current.getUTCMonth() + 1);
     }
   }
   return points;
 }
 function formatDateBucket(date, format) {
-  const y = date.getFullYear();
-  const m = String(date.getMonth() + 1).padStart(2, "0");
-  const d = String(date.getDate()).padStart(2, "0");
-  const h = String(date.getHours()).padStart(2, "0");
+  const y = date.getUTCFullYear();
+  const m = String(date.getUTCMonth() + 1).padStart(2, "0");
+  const d = String(date.getUTCDate()).padStart(2, "0");
+  const h = String(date.getUTCHours()).padStart(2, "0");
   if (format === "%Y-%m-%dT%H:00") return `${y}-${m}-${d}T${h}:00`;
   if (format === "%Y-%m-%d") return `${y}-${m}-${d}`;
   if (format === "%Y-%m") return `${y}-${m}`;
   if (format === "%G-W%V") {
-    const jan4 = new Date(y, 0, 4);
-    const dayOfYear = Math.ceil((date.getTime() - new Date(y, 0, 1).getTime()) / 864e5) + 1;
-    const jan4Day = jan4.getDay() || 7;
+    const jan4 = new Date(Date.UTC(y, 0, 4));
+    const dayOfYear = Math.ceil((date.getTime() - Date.UTC(y, 0, 1)) / 864e5) + 1;
+    const jan4Day = jan4.getUTCDay() || 7;
     const weekNum = Math.ceil((dayOfYear + jan4Day - 1) / 7);
     return `${y}-W${String(weekNum).padStart(2, "0")}`;
   }
   return date.toISOString();
 }
 function getISOWeek(date) {
-  const y = date.getFullYear();
-  const jan4 = new Date(y, 0, 4);
-  const dayOfYear = Math.ceil((date.getTime() - new Date(y, 0, 1).getTime()) / 864e5) + 1;
-  const jan4Day = jan4.getDay() || 7;
+  const y = date.getUTCFullYear();
+  const jan4 = new Date(Date.UTC(y, 0, 4));
+  const dayOfYear = Math.ceil((date.getTime() - Date.UTC(y, 0, 1)) / 864e5) + 1;
+  const jan4Day = jan4.getUTCDay() || 7;
   const weekNum = Math.ceil((dayOfYear + jan4Day - 1) / 7);
   return `${y}-W${String(weekNum).padStart(2, "0")}`;
 }
@@ -176,6 +212,38 @@ function generateSecretKey() {
   return `sk_${(0, import_crypto.randomBytes)(32).toString("hex")}`;
 }
 
+// src/query-helpers.ts
+function isValidTimezone(tz) {
+  try {
+    Intl.DateTimeFormat(void 0, { timeZone: tz });
+    return true;
+  } catch {
+    return false;
+  }
+}
+function extractQueryParams(req) {
+  const q = req.query ?? Object.fromEntries(new URL(req.url, "http://localhost").searchParams);
+  let timezone;
+  if (typeof q.timezone === "string" && q.timezone) {
+    if (isValidTimezone(q.timezone)) {
+      timezone = q.timezone;
+    } else {
+      console.warn(`[litemetrics] Invalid timezone "${q.timezone}", falling back to UTC`);
+    }
+  }
+  return {
+    siteId: q.siteId,
+    metric: q.metric,
+    period: q.period,
+    dateFrom: q.dateFrom,
+    dateTo: q.dateTo,
+    limit: q.limit ? parseInt(q.limit, 10) : void 0,
+    filters: q.filters ? JSON.parse(q.filters) : void 0,
+    compare: q.compare === "true" || q.compare === "1",
+    timezone
+  };
+}
+
 // src/adapters/clickhouse.ts
 var EVENTS_TABLE = "litemetrics_events";
 var SITES_TABLE = "litemetrics_sites";
@@ -229,6 +297,13 @@ CREATE TABLE IF NOT EXISTS ${EVENTS_TABLE} (
     utm_term       Nullable(String),
     utm_content    Nullable(String),
     ip             Nullable(String),
+    os_version     LowCardinality(Nullable(String)),
+    device_model   LowCardinality(Nullable(String)),
+    device_brand   LowCardinality(Nullable(String)),
+    app_version    LowCardinality(Nullable(String)),
+    app_build      Nullable(String),
+    sdk_name       LowCardinality(Nullable(String)),
+    sdk_version    LowCardinality(Nullable(String)),
     created_at     DateTime64(3) DEFAULT now64(3)
 ) ENGINE = MergeTree()
   PARTITION BY toYYYYMM(timestamp)
@@ -240,6 +315,7 @@ CREATE TABLE IF NOT EXISTS ${SITES_TABLE} (
     site_id          String,
     secret_key       String,
     name             String,
+    type             LowCardinality(Nullable(String)) DEFAULT 'web',
     domain           Nullable(String),
     allowed_origins  Nullable(String),
     conversion_events Nullable(String),
@@ -252,8 +328,74 @@ CREATE TABLE IF NOT EXISTS ${SITES_TABLE} (
   SETTINGS index_granularity = 8192
 `;
 function toCHDateTime(d) {
-  const iso = typeof d === "string" ? d : d.toISOString();
-  return iso.replace("T", " ").replace("Z", "");
+  const date = d instanceof Date ? d : toUTCDate(d);
+  const y = date.getUTCFullYear();
+  const mo = String(date.getUTCMonth() + 1).padStart(2, "0");
+  const da = String(date.getUTCDate()).padStart(2, "0");
+  const h = String(date.getUTCHours()).padStart(2, "0");
+  const mi = String(date.getUTCMinutes()).padStart(2, "0");
+  const s = String(date.getUTCSeconds()).padStart(2, "0");
+  const ms = String(date.getUTCMilliseconds()).padStart(3, "0");
+  return `${y}-${mo}-${da} ${h}:${mi}:${s}.${ms}`;
+}
+function normalizedUtmSourceExpr() {
+  return `multiIf(
+    lower(utm_source) IN ('ig','instagram','instagram.com'), 'Instagram',
+    lower(utm_source) IN ('fb','facebook','facebook.com','fb.com'), 'Facebook',
+    lower(utm_source) IN ('tw','twitter','twitter.com','x','x.com','t.co'), 'X (Twitter)',
+    lower(utm_source) IN ('li','linkedin','linkedin.com'), 'LinkedIn',
+    lower(utm_source) IN ('yt','youtube','youtube.com'), 'YouTube',
+    lower(utm_source) IN ('goog','google','google.com'), 'Google',
+    lower(utm_source) IN ('gh','github','github.com'), 'GitHub',
+    lower(utm_source) IN ('reddit','reddit.com'), 'Reddit',
+    lower(utm_source) IN ('pinterest','pinterest.com'), 'Pinterest',
+    lower(utm_source) IN ('tiktok','tiktok.com'), 'TikTok',
+    lower(utm_source) IN ('openai','chatgpt','chat.openai.com'), 'OpenAI',
+    lower(utm_source) IN ('perplexity','perplexity.ai'), 'Perplexity',
+    utm_source
+  )`;
+}
+function normalizedUtmMediumExpr() {
+  return `multiIf(
+    lower(utm_medium) IN ('cpc','ppc','paidsearch','paid-search','paid_search','paid'), 'Paid',
+    lower(utm_medium) IN ('organic'), 'Organic',
+    lower(utm_medium) IN ('social','social-media','social_media'), 'Social',
+    lower(utm_medium) IN ('email','e-mail','e_mail'), 'Email',
+    lower(utm_medium) IN ('display','banner','cpm'), 'Display',
+    lower(utm_medium) IN ('affiliate'), 'Affiliate',
+    lower(utm_medium) IN ('referral'), 'Referral',
+    utm_medium
+  )`;
+}
+function channelClassificationExpr() {
+  return `multiIf(
+    lower(ifNull(utm_medium,'')) IN ('cpc','ppc','paidsearch','paid-search','paid_search','paid')
+      AND (lower(ifNull(utm_source,'')) IN ('google','goog','bing','yahoo','duckduckgo','ecosia','baidu','yandex')
+           OR multiSearchAnyCaseInsensitive(ifNull(referrer,''), ['google','bing','yahoo','duckduckgo','ecosia','baidu','yandex','search.brave']) > 0),
+    'Paid Search',
+    lower(ifNull(utm_medium,'')) IN ('cpc','ppc','paidsearch','paid-search','paid_search','paid')
+      AND (lower(ifNull(utm_source,'')) IN ('instagram','ig','facebook','fb','twitter','tw','x','linkedin','li','youtube','yt','tiktok','pinterest','reddit','snapchat')
+           OR multiSearchAnyCaseInsensitive(ifNull(referrer,''), ['instagram','facebook','twitter','x.com','t.co','linkedin','youtube','tiktok','pinterest','reddit','snapchat']) > 0),
+    'Paid Social',
+    lower(ifNull(utm_medium,'')) IN ('email','e-mail','e_mail'),
+    'Email',
+    lower(ifNull(utm_medium,'')) IN ('display','banner','cpm'),
+    'Display',
+    lower(ifNull(utm_medium,'')) IN ('affiliate'),
+    'Affiliate',
+    multiSearchAnyCaseInsensitive(ifNull(referrer,''), ['google','bing','yahoo','duckduckgo','ecosia','baidu','yandex','search.brave']) > 0
+      AND (ifNull(utm_medium,'') = '' OR lower(utm_medium) NOT IN ('cpc','ppc','paidsearch','paid-search','paid_search','paid')),
+    'Organic Search',
+    (multiSearchAnyCaseInsensitive(ifNull(referrer,''), ['instagram','facebook','twitter','x.com','t.co','linkedin','youtube','tiktok','pinterest','reddit','snapchat','mastodon','tumblr']) > 0
+     OR lower(ifNull(utm_source,'')) IN ('instagram','ig','facebook','fb','twitter','tw','x','linkedin','li','youtube','yt','tiktok','pinterest','reddit','snapchat'))
+      AND (ifNull(utm_medium,'') = '' OR lower(utm_medium) NOT IN ('cpc','ppc','paidsearch','paid-search','paid_search','paid')),
+    'Organic Social',
+    ifNull(referrer,'') != '' AND length(ifNull(referrer,'')) > 0,
+    'Referral',
+    (ifNull(utm_source,'') != '' OR ifNull(utm_medium,'') != '' OR ifNull(utm_campaign,'') != ''),
+    'Other',
+    'Direct'
+  )`;
 }
 function buildFilterConditions(filters) {
   if (!filters) return { conditions: [], params: {} };
@@ -265,6 +407,10 @@ function buildFilterConditions(filters) {
     "device.type": "device_type",
     "device.browser": "browser",
     "device.os": "os",
+    "device.osVersion": "os_version",
+    "device.deviceModel": "device_model",
+    "device.deviceBrand": "device_brand",
+    "device.appVersion": "app_version",
     "utm.source": "utm_source",
     "utm.medium": "utm_medium",
     "utm.campaign": "utm_campaign",
@@ -281,7 +427,14 @@ function buildFilterConditions(filters) {
   const conditions = [];
   const params = {};
   for (const [key, value] of Object.entries(filters)) {
-    if (!value || !map[key]) continue;
+    if (!value) continue;
+    if (key === "channel") {
+      const paramKey2 = "f_channel";
+      conditions.push(`${channelClassificationExpr()} = {${paramKey2}:String}`);
+      params[paramKey2] = value;
+      continue;
+    }
+    if (!map[key]) continue;
     const paramKey = `f_${key.replace(/[^a-zA-Z0-9]/g, "_")}`;
     conditions.push(`${map[key]} = {${paramKey}:String}`);
     params[paramKey] = value;
@@ -312,6 +465,14 @@ var ClickHouseAdapter = class {
     await this.client.command({
       query: `ALTER TABLE ${SITES_TABLE} ADD COLUMN IF NOT EXISTS conversion_events Nullable(String)`
     });
+    await this.client.command({ query: `ALTER TABLE ${EVENTS_TABLE} ADD COLUMN IF NOT EXISTS os_version LowCardinality(Nullable(String))` });
+    await this.client.command({ query: `ALTER TABLE ${EVENTS_TABLE} ADD COLUMN IF NOT EXISTS device_model LowCardinality(Nullable(String))` });
+    await this.client.command({ query: `ALTER TABLE ${EVENTS_TABLE} ADD COLUMN IF NOT EXISTS device_brand LowCardinality(Nullable(String))` });
+    await this.client.command({ query: `ALTER TABLE ${EVENTS_TABLE} ADD COLUMN IF NOT EXISTS app_version LowCardinality(Nullable(String))` });
+    await this.client.command({ query: `ALTER TABLE ${EVENTS_TABLE} ADD COLUMN IF NOT EXISTS app_build Nullable(String)` });
+    await this.client.command({ query: `ALTER TABLE ${EVENTS_TABLE} ADD COLUMN IF NOT EXISTS sdk_name LowCardinality(Nullable(String))` });
+    await this.client.command({ query: `ALTER TABLE ${EVENTS_TABLE} ADD COLUMN IF NOT EXISTS sdk_version LowCardinality(Nullable(String))` });
+    await this.client.command({ query: `ALTER TABLE ${SITES_TABLE} ADD COLUMN IF NOT EXISTS type LowCardinality(Nullable(String)) DEFAULT 'web'` });
   }
   async close() {
     await this.client.close();
@@ -354,7 +515,14 @@ var ClickHouseAdapter = class {
       utm_campaign: e.utm?.campaign ?? null,
       utm_term: e.utm?.term ?? null,
       utm_content: e.utm?.content ?? null,
-      ip: e.ip ?? null
+      ip: e.ip ?? null,
+      os_version: e.device?.osVersion ?? null,
+      device_model: e.device?.deviceModel ?? null,
+      device_brand: e.device?.deviceBrand ?? null,
+      app_version: e.device?.appVersion ?? null,
+      app_build: e.device?.appBuild ?? null,
+      sdk_name: e.device?.sdkName ?? null,
+      sdk_version: e.device?.sdkVersion ?? null
     }));
     await this.client.insert({
       table: EVENTS_TABLE,
@@ -705,15 +873,67 @@ var ClickHouseAdapter = class {
         total = data.reduce((sum, d) => sum + d.value, 0);
         break;
       }
+      case "top_os_versions": {
+        const rows = await this.queryRows(
+          `SELECT concat(os, ' ', ifNull(os_version, '')) AS key, uniq(visitor_id) AS value FROM ${EVENTS_TABLE}
+           WHERE site_id = {siteId:String}
+             AND timestamp >= {from:String}
+             AND timestamp <= {to:String}
+             AND os IS NOT NULL
+             AND os_version IS NOT NULL
+             ${filterSql}
+           GROUP BY key
+           ORDER BY value DESC
+           LIMIT {limit:UInt32}`,
+          { ...params, ...filter.params }
+        );
+        data = rows.map((r) => ({ key: r.key, value: Number(r.value) }));
+        total = data.reduce((sum, d) => sum + d.value, 0);
+        break;
+      }
+      case "top_device_models": {
+        const rows = await this.queryRows(
+          `SELECT trim(concat(ifNull(device_brand, ''), ' ', device_model)) AS key, uniq(visitor_id) AS value FROM ${EVENTS_TABLE}
+           WHERE site_id = {siteId:String}
+             AND timestamp >= {from:String}
+             AND timestamp <= {to:String}
+             AND device_model IS NOT NULL
+             ${filterSql}
+           GROUP BY key
+           ORDER BY value DESC
+           LIMIT {limit:UInt32}`,
+          { ...params, ...filter.params }
+        );
+        data = rows.map((r) => ({ key: r.key, value: Number(r.value) }));
+        total = data.reduce((sum, d) => sum + d.value, 0);
+        break;
+      }
+      case "top_app_versions": {
+        const rows = await this.queryRows(
+          `SELECT app_version AS key, uniq(visitor_id) AS value FROM ${EVENTS_TABLE}
+           WHERE site_id = {siteId:String}
+             AND timestamp >= {from:String}
+             AND timestamp <= {to:String}
+             AND app_version IS NOT NULL
+             ${filterSql}
+           GROUP BY app_version
+           ORDER BY value DESC
+           LIMIT {limit:UInt32}`,
+          { ...params, ...filter.params }
+        );
+        data = rows.map((r) => ({ key: r.key, value: Number(r.value) }));
+        total = data.reduce((sum, d) => sum + d.value, 0);
+        break;
+      }
       case "top_utm_sources": {
         const rows = await this.queryRows(
-          `SELECT utm_source AS key, uniq(visitor_id) AS value FROM ${EVENTS_TABLE}
+          `SELECT ${normalizedUtmSourceExpr()} AS key, uniq(visitor_id) AS value FROM ${EVENTS_TABLE}
            WHERE site_id = {siteId:String}
              AND timestamp >= {from:String}
              AND timestamp <= {to:String}
              AND utm_source IS NOT NULL AND utm_source != ''
              ${filterSql}
-           GROUP BY utm_source
+           GROUP BY key
            ORDER BY value DESC
            LIMIT {limit:UInt32}`,
           { ...params, ...filter.params }
@@ -724,13 +944,13 @@ var ClickHouseAdapter = class {
       }
       case "top_utm_mediums": {
         const rows = await this.queryRows(
-          `SELECT utm_medium AS key, uniq(visitor_id) AS value FROM ${EVENTS_TABLE}
+          `SELECT ${normalizedUtmMediumExpr()} AS key, uniq(visitor_id) AS value FROM ${EVENTS_TABLE}
            WHERE site_id = {siteId:String}
              AND timestamp >= {from:String}
              AND timestamp <= {to:String}
              AND utm_medium IS NOT NULL AND utm_medium != ''
              ${filterSql}
-           GROUP BY utm_medium
+           GROUP BY key
            ORDER BY value DESC
            LIMIT {limit:UInt32}`,
           { ...params, ...filter.params }
@@ -756,6 +976,56 @@ var ClickHouseAdapter = class {
         total = data.reduce((sum, d) => sum + d.value, 0);
         break;
       }
+      case "top_utm_terms": {
+        const rows = await this.queryRows(
+          `SELECT utm_term AS key, uniq(visitor_id) AS value FROM ${EVENTS_TABLE}
+           WHERE site_id = {siteId:String}
+             AND timestamp >= {from:String}
+             AND timestamp <= {to:String}
+             AND utm_term IS NOT NULL AND utm_term != ''
+             ${filterSql}
+           GROUP BY utm_term
+           ORDER BY value DESC
+           LIMIT {limit:UInt32}`,
+          { ...params, ...filter.params }
+        );
+        data = rows.map((r) => ({ key: r.key, value: Number(r.value) }));
+        total = data.reduce((sum, d) => sum + d.value, 0);
+        break;
+      }
+      case "top_utm_contents": {
+        const rows = await this.queryRows(
+          `SELECT utm_content AS key, uniq(visitor_id) AS value FROM ${EVENTS_TABLE}
+           WHERE site_id = {siteId:String}
+             AND timestamp >= {from:String}
+             AND timestamp <= {to:String}
+             AND utm_content IS NOT NULL AND utm_content != ''
+             ${filterSql}
+           GROUP BY utm_content
+           ORDER BY value DESC
+           LIMIT {limit:UInt32}`,
+          { ...params, ...filter.params }
+        );
+        data = rows.map((r) => ({ key: r.key, value: Number(r.value) }));
+        total = data.reduce((sum, d) => sum + d.value, 0);
+        break;
+      }
+      case "top_channels": {
+        const rows = await this.queryRows(
+          `SELECT ${channelClassificationExpr()} AS key, uniq(visitor_id) AS value FROM ${EVENTS_TABLE}
+           WHERE site_id = {siteId:String}
+             AND timestamp >= {from:String}
+             AND timestamp <= {to:String}
+             ${filterSql}
+           GROUP BY key
+           ORDER BY value DESC
+           LIMIT {limit:UInt32}`,
+          { ...params, ...filter.params }
+        );
+        data = rows.map((r) => ({ key: r.key, value: Number(r.value) }));
+        total = data.reduce((sum, d) => sum + d.value, 0);
+        break;
+      }
     }
     const result = { metric: q.metric, period, data, total };
     if (q.compare && ["pageviews", "visitors", "sessions", "events", "conversions"].includes(q.metric)) {
@@ -786,7 +1056,7 @@ var ClickHouseAdapter = class {
       dateTo: params.dateTo
     });
     const granularity = params.granularity ?? autoGranularity(period);
-    const bucketFn = this.granularityToClickHouseFunc(granularity);
+    const bucketFn = this.granularityToClickHouseFunc(granularity, params.timezone);
     const dateFormat = granularityToDateFormat(granularity);
     const filter = buildFilterConditions(params.filters);
     const filterSql = filter.conditions.length > 0 ? ` AND ${filter.conditions.join(" AND ")}` : "";
@@ -835,38 +1105,41 @@ var ClickHouseAdapter = class {
       new Date(dateRange.to),
       granularity,
       dateFormat,
-      mappedRows
+      mappedRows,
+      params.timezone
     );
     return { metric: params.metric, granularity, data };
   }
-  granularityToClickHouseFunc(g) {
+  granularityToClickHouseFunc(g, timezone) {
+    const safeTz = timezone && isValidTimezone(timezone) ? timezone : void 0;
+    const tz = safeTz ? `, '${safeTz}'` : "";
     switch (g) {
       case "hour":
-        return "toStartOfHour(timestamp)";
+        return `toStartOfHour(timestamp${tz})`;
       case "day":
-        return "toStartOfDay(timestamp)";
+        return `toStartOfDay(timestamp${tz})`;
       case "week":
-        return "toStartOfWeek(timestamp, 1)";
+        return `toStartOfWeek(timestamp, 1${tz})`;
       // 1 = Monday
       case "month":
-        return "toStartOfMonth(timestamp)";
+        return `toStartOfMonth(timestamp${tz})`;
     }
   }
   convertClickHouseBucket(bucket, granularity) {
-    const date = new Date(bucket);
-    const y = date.getFullYear();
-    const m = String(date.getMonth() + 1).padStart(2, "0");
-    const d = String(date.getDate()).padStart(2, "0");
-    const h = String(date.getHours()).padStart(2, "0");
+    const date = toUTCDate(bucket);
+    const y = date.getUTCFullYear();
+    const m = String(date.getUTCMonth() + 1).padStart(2, "0");
+    const d = String(date.getUTCDate()).padStart(2, "0");
+    const h = String(date.getUTCHours()).padStart(2, "0");
     switch (granularity) {
       case "hour":
         return `${y}-${m}-${d}T${h}:00`;
       case "day":
         return `${y}-${m}-${d}`;
       case "week": {
-        const jan4 = new Date(y, 0, 4);
-        const dayOfYear = Math.ceil((date.getTime() - new Date(y, 0, 1).getTime()) / 864e5) + 1;
-        const jan4Day = jan4.getDay() || 7;
+        const jan4 = new Date(Date.UTC(y, 0, 4));
+        const dayOfYear = Math.ceil((date.getTime() - Date.UTC(y, 0, 1)) / 864e5) + 1;
+        const jan4Day = jan4.getUTCDay() || 7;
         const weekNum = Math.ceil((dayOfYear + jan4Day - 1) / 7);
         return `${y}-W${String(weekNum).padStart(2, "0")}`;
       }
@@ -895,7 +1168,7 @@ var ClickHouseAdapter = class {
     );
     const cohortMap = /* @__PURE__ */ new Map();
     for (const v of rows) {
-      const firstDate = new Date(v.first_event);
+      const firstDate = toUTCDate(v.first_event);
       const cohortWeek = getISOWeek(firstDate);
       if (!cohortMap.has(cohortWeek)) {
         cohortMap.set(cohortWeek, { visitors: /* @__PURE__ */ new Set(), weekSets: /* @__PURE__ */ new Map() });
@@ -903,7 +1176,7 @@ var ClickHouseAdapter = class {
       const cohort = cohortMap.get(cohortWeek);
       cohort.visitors.add(v.visitor_id);
       const eventWeeks = (Array.isArray(v.active_weeks) ? v.active_weeks : []).map((w) => {
-        const d = new Date(w);
+        const d = toUTCDate(w);
         return getISOWeek(d);
       });
       for (const w of eventWeeks) {
@@ -1070,8 +1343,8 @@ var ClickHouseAdapter = class {
       visitorId: String(u.visitor_id),
       userId: u.userId ? String(u.userId) : void 0,
       traits: this.parseJSON(u.traits),
-      firstSeen: new Date(String(u.firstSeen)).toISOString(),
-      lastSeen: new Date(String(u.lastSeen)).toISOString(),
+      firstSeen: toUTCDate(String(u.firstSeen)).toISOString(),
+      lastSeen: toUTCDate(String(u.lastSeen)).toISOString(),
       totalEvents: Number(u.totalEvents),
       totalPageviews: Number(u.totalPageviews),
       totalSessions: Number(u.totalSessions),
@@ -1158,7 +1431,7 @@ var ClickHouseAdapter = class {
   async getMergedUserDetail(siteId, userId, visitorIds) {
     const rows = await this.queryRows(
       `SELECT
-        anyLast(visitor_id) AS visitor_id,
+        anyLast(visitor_id) AS last_visitor_id,
         anyLast(traits) AS traits,
         min(timestamp) AS firstSeen,
         max(timestamp) AS lastSeen,
@@ -1190,12 +1463,12 @@ var ClickHouseAdapter = class {
     if (rows.length === 0) return null;
     const u = rows[0];
     return {
-      visitorId: String(u.visitor_id),
+      visitorId: String(u.last_visitor_id),
       visitorIds,
       userId,
       traits: this.parseJSON(u.traits),
-      firstSeen: new Date(String(u.firstSeen)).toISOString(),
-      lastSeen: new Date(String(u.lastSeen)).toISOString(),
+      firstSeen: toUTCDate(String(u.firstSeen)).toISOString(),
+      lastSeen: toUTCDate(String(u.lastSeen)).toISOString(),
       totalEvents: Number(u.totalEvents),
       totalPageviews: Number(u.totalPageviews),
       totalSessions: Number(u.totalSessions),
@@ -1279,6 +1552,7 @@ var ClickHouseAdapter = class {
       siteId: generateSiteId(),
       secretKey: generateSecretKey(),
       name: data.name,
+      type: data.type ?? "web",
       domain: data.domain,
       allowedOrigins: data.allowedOrigins,
       conversionEvents: data.conversionEvents,
@@ -1291,6 +1565,7 @@ var ClickHouseAdapter = class {
         site_id: site.siteId,
         secret_key: site.secretKey,
         name: site.name,
+        type: site.type ?? "web",
         domain: site.domain ?? null,
         allowed_origins: site.allowedOrigins ? JSON.stringify(site.allowedOrigins) : null,
         conversion_events: site.conversionEvents ? JSON.stringify(site.conversionEvents) : null,
@@ -1305,7 +1580,7 @@ var ClickHouseAdapter = class {
   }
   async getSite(siteId) {
     const rows = await this.queryRows(
-      `SELECT site_id, secret_key, name, domain, allowed_origins, conversion_events, created_at, updated_at
+      `SELECT site_id, secret_key, name, type, domain, allowed_origins, conversion_events, created_at, updated_at
        FROM ${SITES_TABLE} FINAL
        WHERE site_id = {siteId:String} AND is_deleted = 0`,
       { siteId }
@@ -1314,7 +1589,7 @@ var ClickHouseAdapter = class {
   }
   async getSiteBySecret(secretKey) {
     const rows = await this.queryRows(
-      `SELECT site_id, secret_key, name, domain, allowed_origins, conversion_events, created_at, updated_at
+      `SELECT site_id, secret_key, name, type, domain, allowed_origins, conversion_events, created_at, updated_at
        FROM ${SITES_TABLE} FINAL
        WHERE secret_key = {secretKey:String} AND is_deleted = 0`,
       { secretKey }
@@ -1323,7 +1598,7 @@ var ClickHouseAdapter = class {
   }
   async listSites() {
     const rows = await this.queryRows(
-      `SELECT site_id, secret_key, name, domain, allowed_origins, conversion_events, created_at, updated_at
+      `SELECT site_id, secret_key, name, type, domain, allowed_origins, conversion_events, created_at, updated_at
        FROM ${SITES_TABLE} FINAL
        WHERE is_deleted = 0
        ORDER BY created_at DESC`,
@@ -1333,7 +1608,7 @@ var ClickHouseAdapter = class {
   }
   async updateSite(siteId, data) {
     const currentRows = await this.queryRows(
-      `SELECT site_id, secret_key, name, domain, allowed_origins, conversion_events, created_at, updated_at, version
+      `SELECT site_id, secret_key, name, type, domain, allowed_origins, conversion_events, created_at, updated_at, version
        FROM ${SITES_TABLE} FINAL
        WHERE site_id = {siteId:String} AND is_deleted = 0`,
       { siteId }
@@ -1345,6 +1620,7 @@ var ClickHouseAdapter = class {
     const nowCH = toCHDateTime(now);
     const newVersion = Number(current.version) + 1;
     const newName = data.name !== void 0 ? data.name : String(current.name);
+    const newType = data.type !== void 0 ? data.type : current.type ? String(current.type) : "web";
     const newDomain = data.domain !== void 0 ? data.domain || null : current.domain ? String(current.domain) : null;
     const newOrigins = data.allowedOrigins !== void 0 ? data.allowedOrigins.length > 0 ? JSON.stringify(data.allowedOrigins) : null : current.allowed_origins ? String(current.allowed_origins) : null;
     const newConversions = data.conversionEvents !== void 0 ? data.conversionEvents.length > 0 ? JSON.stringify(data.conversionEvents) : null : current.conversion_events ? String(current.conversion_events) : null;
@@ -1354,6 +1630,7 @@ var ClickHouseAdapter = class {
         site_id: String(current.site_id),
         secret_key: String(current.secret_key),
         name: newName,
+        type: newType,
         domain: newDomain,
         allowed_origins: newOrigins,
         conversion_events: newConversions,
@@ -1368,6 +1645,7 @@ var ClickHouseAdapter = class {
       siteId: String(current.site_id),
       secretKey: String(current.secret_key),
       name: newName,
+      type: newType,
       domain: newDomain ?? void 0,
       allowedOrigins: newOrigins ? JSON.parse(newOrigins) : void 0,
       conversionEvents: newConversions ? JSON.parse(newConversions) : void 0,
@@ -1377,7 +1655,7 @@ var ClickHouseAdapter = class {
   }
   async deleteSite(siteId) {
     const currentRows = await this.queryRows(
-      `SELECT site_id, secret_key, name, domain, allowed_origins, conversion_events, created_at, version
+      `SELECT site_id, secret_key, name, type, domain, allowed_origins, conversion_events, created_at, version
        FROM ${SITES_TABLE} FINAL
        WHERE site_id = {siteId:String} AND is_deleted = 0`,
       { siteId }
@@ -1391,6 +1669,7 @@ var ClickHouseAdapter = class {
         site_id: String(current.site_id),
         secret_key: String(current.secret_key),
         name: String(current.name),
+        type: current.type ? String(current.type) : "web",
         domain: current.domain ? String(current.domain) : null,
         allowed_origins: current.allowed_origins ? String(current.allowed_origins) : null,
         conversion_events: current.conversion_events ? String(current.conversion_events) : null,
@@ -1405,7 +1684,7 @@ var ClickHouseAdapter = class {
   }
   async regenerateSecret(siteId) {
     const currentRows = await this.queryRows(
-      `SELECT site_id, secret_key, name, domain, allowed_origins, conversion_events, created_at, version
+      `SELECT site_id, secret_key, name, type, domain, allowed_origins, conversion_events, created_at, version
        FROM ${SITES_TABLE} FINAL
        WHERE site_id = {siteId:String} AND is_deleted = 0`,
       { siteId }
@@ -1422,6 +1701,7 @@ var ClickHouseAdapter = class {
         site_id: String(current.site_id),
         secret_key: newSecret,
         name: String(current.name),
+        type: current.type ? String(current.type) : "web",
         domain: current.domain ? String(current.domain) : null,
         allowed_origins: current.allowed_origins ? String(current.allowed_origins) : null,
         conversion_events: current.conversion_events ? String(current.conversion_events) : null,
@@ -1436,6 +1716,7 @@ var ClickHouseAdapter = class {
       siteId: String(current.site_id),
       secretKey: newSecret,
       name: String(current.name),
+      type: current.type ? String(current.type) : "web",
       domain: current.domain ? String(current.domain) : void 0,
       allowedOrigins: current.allowed_origins ? JSON.parse(String(current.allowed_origins)) : void 0,
       conversionEvents: current.conversion_events ? JSON.parse(String(current.conversion_events)) : void 0,
@@ -1457,18 +1738,19 @@ var ClickHouseAdapter = class {
       siteId: String(row.site_id),
       secretKey: String(row.secret_key),
       name: String(row.name),
+      type: row.type ? String(row.type) : "web",
       domain: row.domain ? String(row.domain) : void 0,
       allowedOrigins: row.allowed_origins ? JSON.parse(String(row.allowed_origins)) : void 0,
       conversionEvents: row.conversion_events ? JSON.parse(String(row.conversion_events)) : void 0,
-      createdAt: new Date(String(row.created_at)).toISOString(),
-      updatedAt: new Date(String(row.updated_at)).toISOString()
+      createdAt: toUTCDate(String(row.created_at)).toISOString(),
+      updatedAt: toUTCDate(String(row.updated_at)).toISOString()
     };
   }
   toEventListItem(row) {
     return {
       id: String(row.event_id ?? ""),
       type: String(row.type),
-      timestamp: new Date(String(row.timestamp)).toISOString(),
+      timestamp: toUTCDate(String(row.timestamp)).toISOString(),
       visitorId: String(row.visitor_id),
       sessionId: String(row.session_id),
       url: row.url ? String(row.url) : void 0,
@@ -1520,6 +1802,130 @@ var import_mongodb = require("mongodb");
 var EVENTS_COLLECTION = "litemetrics_events";
 var SITES_COLLECTION = "litemetrics_sites";
 var IDENTITY_MAP_COLLECTION = "litemetrics_identity_map";
+function normalizedUtmSourceSwitch() {
+  return {
+    $switch: {
+      branches: [
+        { case: { $in: [{ $toLower: { $ifNull: ["$utm_source", ""] } }, ["ig", "instagram", "instagram.com"]] }, then: "Instagram" },
+        { case: { $in: [{ $toLower: { $ifNull: ["$utm_source", ""] } }, ["fb", "facebook", "facebook.com", "fb.com"]] }, then: "Facebook" },
+        { case: { $in: [{ $toLower: { $ifNull: ["$utm_source", ""] } }, ["tw", "twitter", "twitter.com", "x", "x.com", "t.co"]] }, then: "X (Twitter)" },
+        { case: { $in: [{ $toLower: { $ifNull: ["$utm_source", ""] } }, ["li", "linkedin", "linkedin.com"]] }, then: "LinkedIn" },
+        { case: { $in: [{ $toLower: { $ifNull: ["$utm_source", ""] } }, ["yt", "youtube", "youtube.com"]] }, then: "YouTube" },
+        { case: { $in: [{ $toLower: { $ifNull: ["$utm_source", ""] } }, ["goog", "google", "google.com"]] }, then: "Google" },
+        { case: { $in: [{ $toLower: { $ifNull: ["$utm_source", ""] } }, ["gh", "github", "github.com"]] }, then: "GitHub" },
+        { case: { $in: [{ $toLower: { $ifNull: ["$utm_source", ""] } }, ["reddit", "reddit.com"]] }, then: "Reddit" },
+        { case: { $in: [{ $toLower: { $ifNull: ["$utm_source", ""] } }, ["pinterest", "pinterest.com"]] }, then: "Pinterest" },
+        { case: { $in: [{ $toLower: { $ifNull: ["$utm_source", ""] } }, ["tiktok", "tiktok.com"]] }, then: "TikTok" },
+        { case: { $in: [{ $toLower: { $ifNull: ["$utm_source", ""] } }, ["openai", "chatgpt", "chat.openai.com"]] }, then: "OpenAI" },
+        { case: { $in: [{ $toLower: { $ifNull: ["$utm_source", ""] } }, ["perplexity", "perplexity.ai"]] }, then: "Perplexity" }
+      ],
+      default: "$utm_source"
+    }
+  };
+}
+function normalizedUtmMediumSwitch() {
+  return {
+    $switch: {
+      branches: [
+        { case: { $in: [{ $toLower: { $ifNull: ["$utm_medium", ""] } }, ["cpc", "ppc", "paidsearch", "paid-search", "paid_search", "paid"]] }, then: "Paid" },
+        { case: { $in: [{ $toLower: { $ifNull: ["$utm_medium", ""] } }, ["organic"]] }, then: "Organic" },
+        { case: { $in: [{ $toLower: { $ifNull: ["$utm_medium", ""] } }, ["social", "social-media", "social_media"]] }, then: "Social" },
+        { case: { $in: [{ $toLower: { $ifNull: ["$utm_medium", ""] } }, ["email", "e-mail", "e_mail"]] }, then: "Email" },
+        { case: { $in: [{ $toLower: { $ifNull: ["$utm_medium", ""] } }, ["display", "banner", "cpm"]] }, then: "Display" },
+        { case: { $in: [{ $toLower: { $ifNull: ["$utm_medium", ""] } }, ["affiliate"]] }, then: "Affiliate" },
+        { case: { $in: [{ $toLower: { $ifNull: ["$utm_medium", ""] } }, ["referral"]] }, then: "Referral" }
+      ],
+      default: "$utm_medium"
+    }
+  };
+}
+var SEARCH_ENGINES = /google|bing|yahoo|duckduckgo|ecosia|baidu|yandex|search\.brave/i;
+var SOCIAL_NETWORKS = /instagram|facebook|twitter|x\.com|t\.co|linkedin|youtube|tiktok|pinterest|reddit|snapchat|mastodon|tumblr/i;
+var PAID_MEDIUMS = ["cpc", "ppc", "paidsearch", "paid-search", "paid_search", "paid"];
+var SOCIAL_SOURCES = ["instagram", "ig", "facebook", "fb", "twitter", "tw", "x", "linkedin", "li", "youtube", "yt", "tiktok", "pinterest", "reddit", "snapchat"];
+function channelClassificationSwitch() {
+  const lMedium = { $toLower: { $ifNull: ["$utm_medium", ""] } };
+  const lSource = { $toLower: { $ifNull: ["$utm_source", ""] } };
+  const refStr = { $ifNull: ["$referrer", ""] };
+  return {
+    $switch: {
+      branches: [
+        // Paid Search
+        {
+          case: {
+            $and: [
+              { $in: [lMedium, PAID_MEDIUMS] },
+              { $or: [
+                { $in: [lSource, ["google", "goog", "bing", "yahoo", "duckduckgo", "ecosia", "baidu", "yandex"]] },
+                { $regexMatch: { input: refStr, regex: SEARCH_ENGINES } }
+              ] }
+            ]
+          },
+          then: "Paid Search"
+        },
+        // Paid Social
+        {
+          case: {
+            $and: [
+              { $in: [lMedium, PAID_MEDIUMS] },
+              { $or: [
+                { $in: [lSource, SOCIAL_SOURCES] },
+                { $regexMatch: { input: refStr, regex: SOCIAL_NETWORKS } }
+              ] }
+            ]
+          },
+          then: "Paid Social"
+        },
+        // Email
+        { case: { $in: [lMedium, ["email", "e-mail", "e_mail"]] }, then: "Email" },
+        // Display
+        { case: { $in: [lMedium, ["display", "banner", "cpm"]] }, then: "Display" },
+        // Affiliate
+        { case: { $in: [lMedium, ["affiliate"]] }, then: "Affiliate" },
+        // Organic Search
+        {
+          case: {
+            $and: [
+              { $regexMatch: { input: refStr, regex: SEARCH_ENGINES } },
+              { $not: [{ $in: [lMedium, PAID_MEDIUMS] }] }
+            ]
+          },
+          then: "Organic Search"
+        },
+        // Organic Social
+        {
+          case: {
+            $and: [
+              { $or: [
+                { $regexMatch: { input: refStr, regex: SOCIAL_NETWORKS } },
+                { $in: [lSource, SOCIAL_SOURCES] }
+              ] },
+              { $not: [{ $in: [lMedium, PAID_MEDIUMS] }] }
+            ]
+          },
+          then: "Organic Social"
+        },
+        // Referral
+        {
+          case: { $and: [{ $ne: [refStr, ""] }, { $gt: [{ $strLenCP: refStr }, 0] }] },
+          then: "Referral"
+        },
+        // Other (has UTM but no referrer)
+        {
+          case: {
+            $or: [
+              { $and: [{ $ne: [{ $ifNull: ["$utm_source", ""] }, ""] }] },
+              { $and: [{ $ne: [{ $ifNull: ["$utm_medium", ""] }, ""] }] },
+              { $and: [{ $ne: [{ $ifNull: ["$utm_campaign", ""] }, ""] }] }
+            ]
+          },
+          then: "Other"
+        }
+      ],
+      default: "Direct"
+    }
+  };
+}
 function buildFilterMatch(filters) {
   if (!filters) return {};
   const map = {
@@ -1530,6 +1936,10 @@ function buildFilterMatch(filters) {
     "device.type": "device_type",
     "device.browser": "browser",
     "device.os": "os",
+    "device.osVersion": "os_version",
+    "device.deviceModel": "device_model",
+    "device.deviceBrand": "device_brand",
+    "device.appVersion": "app_version",
     "utm.source": "utm_source",
     "utm.medium": "utm_medium",
     "utm.campaign": "utm_campaign",
@@ -1545,7 +1955,9 @@ function buildFilterMatch(filters) {
   };
   const match = {};
   for (const [key, value] of Object.entries(filters)) {
-    if (!value || !map[key]) continue;
+    if (!value) continue;
+    if (key === "channel") continue;
+    if (!map[key]) continue;
     match[map[key]] = value;
   }
   return match;
@@ -1614,6 +2026,13 @@ var MongoDBAdapter = class {
       utm_term: e.utm?.term ?? null,
       utm_content: e.utm?.content ?? null,
       ip: e.ip ?? null,
+      os_version: e.device?.osVersion ?? null,
+      device_model: e.device?.deviceModel ?? null,
+      device_brand: e.device?.deviceBrand ?? null,
+      app_version: e.device?.appVersion ?? null,
+      app_build: e.device?.appBuild ?? null,
+      sdk_name: e.device?.sdkName ?? null,
+      sdk_version: e.device?.sdkVersion ?? null,
       created_at: /* @__PURE__ */ new Date()
     }));
     await this.collection.insertMany(docs);
@@ -1627,12 +2046,22 @@ var MongoDBAdapter = class {
       timestamp: { $gte: new Date(dateRange.from), $lte: new Date(dateRange.to) }
     };
     const filterMatch = buildFilterMatch(q.filters);
+    const matchStages = (extra) => {
+      const stages = [
+        { $match: { ...baseMatch, ...filterMatch, ...extra } }
+      ];
+      if (q.filters?.channel) {
+        stages.push({ $addFields: { _channel: channelClassificationSwitch() } });
+        stages.push({ $match: { _channel: q.filters.channel } });
+      }
+      return stages;
+    };
     let data = [];
     let total = 0;
     switch (q.metric) {
       case "pageviews": {
         const [result2] = await this.collection.aggregate([
-          { $match: { ...baseMatch, ...filterMatch, type: "pageview" } },
+          ...matchStages({ type: "pageview" }),
           { $count: "count" }
         ]).toArray();
         total = result2?.count ?? 0;
@@ -1641,7 +2070,7 @@ var MongoDBAdapter = class {
       }
       case "visitors": {
         const [result2] = await this.collection.aggregate([
-          { $match: { ...baseMatch, ...filterMatch } },
+          ...matchStages(),
           { $group: { _id: "$visitor_id" } },
           { $count: "count" }
         ]).toArray();
@@ -1651,7 +2080,7 @@ var MongoDBAdapter = class {
       }
       case "sessions": {
         const [result2] = await this.collection.aggregate([
-          { $match: { ...baseMatch, ...filterMatch } },
+          ...matchStages(),
           { $group: { _id: "$session_id" } },
           { $count: "count" }
         ]).toArray();
@@ -1661,7 +2090,7 @@ var MongoDBAdapter = class {
       }
       case "events": {
         const [result2] = await this.collection.aggregate([
-          { $match: { ...baseMatch, ...filterMatch, type: "event" } },
+          ...matchStages({ type: "event" }),
           { $count: "count" }
         ]).toArray();
         total = result2?.count ?? 0;
@@ -1676,7 +2105,7 @@ var MongoDBAdapter = class {
           break;
         }
         const [result2] = await this.collection.aggregate([
-          { $match: { ...baseMatch, ...filterMatch, type: "event", event_name: { $in: conversionEvents } } },
+          ...matchStages({ type: "event", event_name: { $in: conversionEvents } }),
           { $count: "count" }
         ]).toArray();
         total = result2?.count ?? 0;
@@ -1685,7 +2114,7 @@ var MongoDBAdapter = class {
       }
       case "top_pages": {
         const rows = await this.collection.aggregate([
-          { $match: { ...baseMatch, ...filterMatch, type: "pageview", url: { $ne: null } } },
+          ...matchStages({ type: "pageview", url: { $ne: null } }),
           { $group: { _id: "$url", value: { $sum: 1 } } },
           { $sort: { value: -1 } },
           { $limit: limit }
@@ -1696,7 +2125,7 @@ var MongoDBAdapter = class {
       }
       case "top_referrers": {
         const rows = await this.collection.aggregate([
-          { $match: { ...baseMatch, ...filterMatch, type: "pageview", referrer: { $nin: [null, ""] } } },
+          ...matchStages({ type: "pageview", referrer: { $nin: [null, ""] } }),
           { $group: { _id: "$referrer", value: { $sum: 1 } } },
           { $sort: { value: -1 } },
           { $limit: limit }
@@ -1707,7 +2136,7 @@ var MongoDBAdapter = class {
       }
       case "top_countries": {
         const rows = await this.collection.aggregate([
-          { $match: { ...baseMatch, ...filterMatch, country: { $ne: null } } },
+          ...matchStages({ country: { $ne: null } }),
           { $group: { _id: "$country", value: { $addToSet: "$visitor_id" } } },
           { $project: { _id: 1, value: { $size: "$value" } } },
           { $sort: { value: -1 } },
@@ -1719,7 +2148,7 @@ var MongoDBAdapter = class {
       }
       case "top_cities": {
         const rows = await this.collection.aggregate([
-          { $match: { ...baseMatch, ...filterMatch, city: { $ne: null } } },
+          ...matchStages({ city: { $ne: null } }),
           { $group: { _id: "$city", value: { $addToSet: "$visitor_id" } } },
           { $project: { _id: 1, value: { $size: "$value" } } },
           { $sort: { value: -1 } },
@@ -1731,7 +2160,7 @@ var MongoDBAdapter = class {
       }
       case "top_events": {
         const rows = await this.collection.aggregate([
-          { $match: { ...baseMatch, ...filterMatch, type: "event", event_name: { $ne: null } } },
+          ...matchStages({ type: "event", event_name: { $ne: null } }),
           { $group: { _id: "$event_name", value: { $sum: 1 } } },
           { $sort: { value: -1 } },
           { $limit: limit }
@@ -1748,7 +2177,7 @@ var MongoDBAdapter = class {
           break;
         }
         const rows = await this.collection.aggregate([
-          { $match: { ...baseMatch, ...filterMatch, type: "event", event_name: { $in: conversionEvents } } },
+          ...matchStages({ type: "event", event_name: { $in: conversionEvents } }),
           { $group: { _id: "$event_name", value: { $sum: 1 } } },
           { $sort: { value: -1 } },
           { $limit: limit }
@@ -1759,7 +2188,7 @@ var MongoDBAdapter = class {
       }
       case "top_exit_pages": {
         const rows = await this.collection.aggregate([
-          { $match: { ...baseMatch, ...filterMatch, type: "pageview", url: { $ne: null } } },
+          ...matchStages({ type: "pageview", url: { $ne: null } }),
           { $sort: { timestamp: 1 } },
           { $group: { _id: "$session_id", url: { $last: "$url" } } },
           { $group: { _id: "$url", value: { $sum: 1 } } },
@@ -1772,7 +2201,7 @@ var MongoDBAdapter = class {
       }
       case "top_transitions": {
         const rows = await this.collection.aggregate([
-          { $match: { ...baseMatch, ...filterMatch, type: "pageview", url: { $ne: null } } },
+          ...matchStages({ type: "pageview", url: { $ne: null } }),
           {
             $setWindowFields: {
               partitionBy: "$session_id",
@@ -1793,7 +2222,7 @@ var MongoDBAdapter = class {
       }
       case "top_scroll_pages": {
         const rows = await this.collection.aggregate([
-          { $match: { ...baseMatch, ...filterMatch, type: "event", event_subtype: "scroll_depth", page_path: { $ne: null } } },
+          ...matchStages({ type: "event", event_subtype: "scroll_depth", page_path: { $ne: null } }),
           { $group: { _id: "$page_path", value: { $sum: 1 } } },
           { $sort: { value: -1 } },
           { $limit: limit }
@@ -1804,15 +2233,11 @@ var MongoDBAdapter = class {
       }
       case "top_button_clicks": {
         const rows = await this.collection.aggregate([
-          {
-            $match: {
-              ...baseMatch,
-              ...filterMatch,
-              type: "event",
-              event_subtype: "button_click",
-              $or: [{ element_text: { $ne: null } }, { element_selector: { $ne: null } }]
-            }
-          },
+          ...matchStages({
+            type: "event",
+            event_subtype: "button_click",
+            $or: [{ element_text: { $ne: null } }, { element_selector: { $ne: null } }]
+          }),
           { $group: { _id: { $ifNull: ["$element_text", "$element_selector"] }, value: { $sum: 1 } } },
           { $sort: { value: -1 } },
           { $limit: limit }
@@ -1823,15 +2248,11 @@ var MongoDBAdapter = class {
       }
       case "top_link_targets": {
         const rows = await this.collection.aggregate([
-          {
-            $match: {
-              ...baseMatch,
-              ...filterMatch,
-              type: "event",
-              event_subtype: { $in: ["link_click", "outbound_click"] },
-              target_url_path: { $ne: null }
-            }
-          },
+          ...matchStages({
+            type: "event",
+            event_subtype: { $in: ["link_click", "outbound_click"] },
+            target_url_path: { $ne: null }
+          }),
           { $group: { _id: "$target_url_path", value: { $sum: 1 } } },
           { $sort: { value: -1 } },
           { $limit: limit }
@@ -1842,7 +2263,7 @@ var MongoDBAdapter = class {
       }
       case "top_devices": {
         const rows = await this.collection.aggregate([
-          { $match: { ...baseMatch, ...filterMatch, device_type: { $ne: null } } },
+          ...matchStages({ device_type: { $ne: null } }),
           { $group: { _id: "$device_type", value: { $addToSet: "$visitor_id" } } },
           { $project: { _id: 1, value: { $size: "$value" } } },
           { $sort: { value: -1 } },
@@ -1854,7 +2275,7 @@ var MongoDBAdapter = class {
       }
       case "top_browsers": {
         const rows = await this.collection.aggregate([
-          { $match: { ...baseMatch, ...filterMatch, browser: { $ne: null } } },
+          ...matchStages({ browser: { $ne: null } }),
           { $group: { _id: "$browser", value: { $addToSet: "$visitor_id" } } },
           { $project: { _id: 1, value: { $size: "$value" } } },
           { $sort: { value: -1 } },
@@ -1866,7 +2287,7 @@ var MongoDBAdapter = class {
       }
       case "top_os": {
         const rows = await this.collection.aggregate([
-          { $match: { ...baseMatch, ...filterMatch, os: { $ne: null } } },
+          ...matchStages({ os: { $ne: null } }),
           { $group: { _id: "$os", value: { $addToSet: "$visitor_id" } } },
           { $project: { _id: 1, value: { $size: "$value" } } },
           { $sort: { value: -1 } },
@@ -1876,10 +2297,47 @@ var MongoDBAdapter = class {
         total = data.reduce((sum, d) => sum + d.value, 0);
         break;
       }
+      case "top_os_versions": {
+        const rows = await this.collection.aggregate([
+          ...matchStages({ os: { $ne: null }, os_version: { $ne: null } }),
+          { $group: { _id: { $concat: ["$os", " ", "$os_version"] }, value: { $addToSet: "$visitor_id" } } },
+          { $project: { _id: 1, value: { $size: "$value" } } },
+          { $sort: { value: -1 } },
+          { $limit: limit }
+        ]).toArray();
+        data = rows.map((r) => ({ key: r._id, value: r.value }));
+        total = data.reduce((sum, d) => sum + d.value, 0);
+        break;
+      }
+      case "top_device_models": {
+        const rows = await this.collection.aggregate([
+          ...matchStages({ device_model: { $ne: null } }),
+          { $group: { _id: { $trim: { input: { $concat: [{ $ifNull: ["$device_brand", ""] }, " ", "$device_model"] } } }, value: { $addToSet: "$visitor_id" } } },
+          { $project: { _id: 1, value: { $size: "$value" } } },
+          { $sort: { value: -1 } },
+          { $limit: limit }
+        ]).toArray();
+        data = rows.map((r) => ({ key: r._id, value: r.value }));
+        total = data.reduce((sum, d) => sum + d.value, 0);
+        break;
+      }
+      case "top_app_versions": {
+        const rows = await this.collection.aggregate([
+          ...matchStages({ app_version: { $ne: null } }),
+          { $group: { _id: "$app_version", value: { $addToSet: "$visitor_id" } } },
+          { $project: { _id: 1, value: { $size: "$value" } } },
+          { $sort: { value: -1 } },
+          { $limit: limit }
+        ]).toArray();
+        data = rows.map((r) => ({ key: r._id, value: r.value }));
+        total = data.reduce((sum, d) => sum + d.value, 0);
+        break;
+      }
       case "top_utm_sources": {
         const rows = await this.collection.aggregate([
-          { $match: { ...baseMatch, ...filterMatch, utm_source: { $nin: [null, ""] } } },
-          { $group: { _id: "$utm_source", value: { $addToSet: "$visitor_id" } } },
+          ...matchStages({ utm_source: { $nin: [null, ""] } }),
+          { $addFields: { _normalized_source: normalizedUtmSourceSwitch() } },
+          { $group: { _id: "$_normalized_source", value: { $addToSet: "$visitor_id" } } },
           { $project: { _id: 1, value: { $size: "$value" } } },
           { $sort: { value: -1 } },
           { $limit: limit }
@@ -1890,8 +2348,9 @@ var MongoDBAdapter = class {
       }
       case "top_utm_mediums": {
         const rows = await this.collection.aggregate([
-          { $match: { ...baseMatch, ...filterMatch, utm_medium: { $nin: [null, ""] } } },
-          { $group: { _id: "$utm_medium", value: { $addToSet: "$visitor_id" } } },
+          ...matchStages({ utm_medium: { $nin: [null, ""] } }),
+          { $addFields: { _normalized_medium: normalizedUtmMediumSwitch() } },
+          { $group: { _id: "$_normalized_medium", value: { $addToSet: "$visitor_id" } } },
           { $project: { _id: 1, value: { $size: "$value" } } },
           { $sort: { value: -1 } },
           { $limit: limit }
@@ -1902,7 +2361,7 @@ var MongoDBAdapter = class {
       }
       case "top_utm_campaigns": {
         const rows = await this.collection.aggregate([
-          { $match: { ...baseMatch, ...filterMatch, utm_campaign: { $nin: [null, ""] } } },
+          ...matchStages({ utm_campaign: { $nin: [null, ""] } }),
           { $group: { _id: "$utm_campaign", value: { $addToSet: "$visitor_id" } } },
           { $project: { _id: 1, value: { $size: "$value" } } },
           { $sort: { value: -1 } },
@@ -1912,6 +2371,43 @@ var MongoDBAdapter = class {
         total = data.reduce((sum, d) => sum + d.value, 0);
         break;
       }
+      case "top_utm_terms": {
+        const rows = await this.collection.aggregate([
+          ...matchStages({ utm_term: { $nin: [null, ""] } }),
+          { $group: { _id: "$utm_term", value: { $addToSet: "$visitor_id" } } },
+          { $project: { _id: 1, value: { $size: "$value" } } },
+          { $sort: { value: -1 } },
+          { $limit: limit }
+        ]).toArray();
+        data = rows.map((r) => ({ key: r._id, value: r.value }));
+        total = data.reduce((sum, d) => sum + d.value, 0);
+        break;
+      }
+      case "top_utm_contents": {
+        const rows = await this.collection.aggregate([
+          ...matchStages({ utm_content: { $nin: [null, ""] } }),
+          { $group: { _id: "$utm_content", value: { $addToSet: "$visitor_id" } } },
+          { $project: { _id: 1, value: { $size: "$value" } } },
+          { $sort: { value: -1 } },
+          { $limit: limit }
+        ]).toArray();
+        data = rows.map((r) => ({ key: r._id, value: r.value }));
+        total = data.reduce((sum, d) => sum + d.value, 0);
+        break;
+      }
+      case "top_channels": {
+        const rows = await this.collection.aggregate([
+          ...matchStages(),
+          { $addFields: { _channel: channelClassificationSwitch() } },
+          { $group: { _id: "$_channel", value: { $addToSet: "$visitor_id" } } },
+          { $project: { _id: 1, value: { $size: "$value" } } },
+          { $sort: { value: -1 } },
+          { $limit: limit }
+        ]).toArray();
+        data = rows.map((r) => ({ key: r._id, value: r.value }));
+        total = data.reduce((sum, d) => sum + d.value, 0);
+        break;
+      }
     }
     const result = { metric: q.metric, period, data, total };
     if (q.compare && ["pageviews", "visitors", "sessions", "events", "conversions"].includes(q.metric)) {
@@ -2374,7 +2870,18 @@ var MongoDBAdapter = class {
       userId: doc.user_id ?? void 0,
       traits: doc.traits ?? void 0,
       geo: doc.country ? { country: doc.country, city: doc.city ?? void 0, region: doc.region ?? void 0 } : void 0,
-      device: doc.device_type ? { type: doc.device_type, browser: doc.browser ?? "", os: doc.os ?? "" } : void 0,
+      device: doc.device_type ? {
+        type: doc.device_type,
+        browser: doc.browser ?? "",
+        os: doc.os ?? "",
+        osVersion: doc.os_version ?? void 0,
+        deviceModel: doc.device_model ?? void 0,
+        deviceBrand: doc.device_brand ?? void 0,
+        appVersion: doc.app_version ?? void 0,
+        appBuild: doc.app_build ?? void 0,
+        sdkName: doc.sdk_name ?? void 0,
+        sdkVersion: doc.sdk_version ?? void 0
+      } : void 0,
       language: doc.language ?? void 0,
       utm: doc.utm_source ? {
         source: doc.utm_source ?? void 0,
@@ -2392,6 +2899,7 @@ var MongoDBAdapter = class {
       site_id: generateSiteId(),
       secret_key: generateSecretKey(),
       name: data.name,
+      type: data.type ?? "web",
       domain: data.domain ?? null,
       allowed_origins: data.allowedOrigins ?? null,
       conversion_events: data.conversionEvents ?? null,
@@ -2416,6 +2924,7 @@ var MongoDBAdapter = class {
   async updateSite(siteId, data) {
     const updates = { updated_at: /* @__PURE__ */ new Date() };
     if (data.name !== void 0) updates.name = data.name;
+    if (data.type !== void 0) updates.type = data.type;
     if (data.domain !== void 0) updates.domain = data.domain || null;
     if (data.allowedOrigins !== void 0) updates.allowed_origins = data.allowedOrigins.length > 0 ? data.allowedOrigins : null;
     if (data.conversionEvents !== void 0) updates.conversion_events = data.conversionEvents.length > 0 ? data.conversionEvents : null;
@@ -2447,6 +2956,7 @@ var MongoDBAdapter = class {
       siteId: doc.site_id,
       secretKey: doc.secret_key,
       name: doc.name,
+      type: doc.type ?? "web",
       domain: doc.domain ?? void 0,
       allowedOrigins: doc.allowed_origins ?? void 0,
       conversionEvents: doc.conversion_events ?? void 0,
@@ -2715,9 +3225,26 @@ async function createCollector(config) {
     return false;
   }
   function enrichEvents(events, ip, userAgent) {
-    const device = parseUserAgent(userAgent);
+    const uaDevice = parseUserAgent(userAgent);
     return events.map((event) => {
       const geo = resolveGeo(ip, event.timezone);
+      let device;
+      if (event.mobile?.platform) {
+        device = {
+          type: "mobile",
+          browser: "App",
+          os: event.mobile.platform === "ios" ? "iOS" : "Android",
+          osVersion: event.mobile.osVersion,
+          deviceModel: event.mobile.deviceModel,
+          deviceBrand: event.mobile.deviceBrand,
+          appVersion: event.mobile.appVersion,
+          appBuild: event.mobile.appBuild,
+          sdkName: event.mobile.sdkName,
+          sdkVersion: event.mobile.sdkVersion
+        };
+      } else {
+        device = uaDevice;
+      }
       return { ...event, ip, geo, device };
     });
   }
@@ -2777,6 +3304,22 @@ async function createCollector(config) {
     }
     return req.ip || req.socket?.remoteAddress || req.connection?.remoteAddress || "";
   }
+  function extractRequestHostname(req) {
+    const headerValue = (value) => {
+      if (Array.isArray(value)) return value[0];
+      if (typeof value === "string") return value;
+      return void 0;
+    };
+    const origin = headerValue(req.headers?.origin);
+    const referer = headerValue(req.headers?.referer) || headerValue(req.headers?.referrer);
+    const raw = origin ?? referer;
+    if (!raw || raw === "null") return void 0;
+    try {
+      return new URL(raw).hostname.toLowerCase();
+    } catch {
+      return void 0;
+    }
+  }
   function handler() {
     return async (req, res) => {
       res.setHeader?.("Access-Control-Allow-Origin", "*");
@@ -2802,6 +3345,12 @@ async function createCollector(config) {
           sendJson(res, 400, { ok: false, error: "Too many events (max 100)" });
           return;
         }
+        const siteIds = new Set(payload.events.map((event) => event.siteId).filter(Boolean));
+        if (siteIds.size !== 1) {
+          sendJson(res, 200, { ok: true });
+          return;
+        }
+        const siteId = Array.from(siteIds)[0];
         const userAgent = req.headers?.["user-agent"] || "";
         if (isBot(userAgent)) {
           sendJson(res, 200, { ok: true });
@@ -2809,26 +3358,15 @@ async function createCollector(config) {
         }
         const ip = extractIp(req);
         const enriched = enrichEvents(payload.events, ip, userAgent);
-        const siteId = enriched[0]?.siteId;
-        if (siteId) {
-          const site = await db.getSite(siteId);
-          if (site?.allowedOrigins && site.allowedOrigins.length > 0) {
-            const allowed = new Set(site.allowedOrigins.map((h) => h.toLowerCase()));
-            const filtered = enriched.filter((event) => {
-              if (!event.url) return true;
-              try {
-                const hostname = new URL(event.url).hostname.toLowerCase();
-                return allowed.has(hostname);
-              } catch {
-                return true;
-              }
-            });
-            if (filtered.length === 0) {
-              sendJson(res, 200, { ok: true });
-              return;
-            }
-            await processIdentity(filtered);
-            await db.insertEvents(filtered);
+        const site = await db.getSite(siteId);
+        if (site?.allowedOrigins && site.allowedOrigins.length > 0) {
+          const requestHostname = extractRequestHostname(req);
+          if (!requestHostname) {
+            sendJson(res, 200, { ok: true });
+            return;
+          }
+          const allowed = new Set(site.allowedOrigins.map((h) => h.toLowerCase()));
+          if (!allowed.has(requestHostname)) {
             sendJson(res, 200, { ok: true });
             return;
           }
@@ -2868,7 +3406,8 @@ async function createCollector(config) {
             dateFrom: params.dateFrom,
             dateTo: params.dateTo,
             granularity: q.granularity,
-            filters: q.filters ? JSON.parse(q.filters) : void 0
+            filters: q.filters ? JSON.parse(q.filters) : void 0,
+            timezone: params.timezone
           };
           if (tsParams.metric === "conversions") {
             const site = await db.getSite(params.siteId);
@@ -3170,19 +3709,6 @@ async function parseBody(req) {
     req.on("error", reject);
   });
 }
-function extractQueryParams(req) {
-  const q = req.query ?? Object.fromEntries(new URL(req.url, "http://localhost").searchParams);
-  return {
-    siteId: q.siteId,
-    metric: q.metric,
-    period: q.period,
-    dateFrom: q.dateFrom,
-    dateTo: q.dateTo,
-    limit: q.limit ? parseInt(q.limit, 10) : void 0,
-    filters: q.filters ? JSON.parse(q.filters) : void 0,
-    compare: q.compare === "true" || q.compare === "1"
-  };
-}
 function sendJson(res, status, body) {
   if (typeof res.status === "function" && typeof res.json === "function") {
     res.status(status).json(body);