@litemetrics/node 0.1.1 → 0.1.3

package/dist/index.js

@@ -140,6 +140,18 @@ function generateSecretKey() {
 // src/adapters/clickhouse.ts
 var EVENTS_TABLE = "litemetrics_events";
 var SITES_TABLE = "litemetrics_sites";
+var IDENTITY_MAP_TABLE = "litemetrics_identity_map";
+var CREATE_IDENTITY_MAP_TABLE = `
+CREATE TABLE IF NOT EXISTS ${IDENTITY_MAP_TABLE} (
+    site_id        LowCardinality(String),
+    visitor_id     String,
+    user_id        String,
+    identified_at  DateTime64(3),
+    created_at     DateTime64(3) DEFAULT now64(3)
+) ENGINE = ReplacingMergeTree(created_at)
+  ORDER BY (site_id, visitor_id)
+  SETTINGS index_granularity = 8192
+`;
 var CREATE_EVENTS_TABLE = `
 CREATE TABLE IF NOT EXISTS ${EVENTS_TABLE} (
     event_id       UUID DEFAULT generateUUIDv4(),
@@ -153,6 +165,13 @@ CREATE TABLE IF NOT EXISTS ${EVENTS_TABLE} (
     title          Nullable(String),
     event_name     Nullable(String),
     properties     Nullable(String),
+    event_source   LowCardinality(Nullable(String)),
+    event_subtype  LowCardinality(Nullable(String)),
+    page_path      Nullable(String),
+    target_url_path Nullable(String),
+    element_selector Nullable(String),
+    element_text   Nullable(String),
+    scroll_depth_pct Nullable(UInt8),
     user_id        Nullable(String),
     traits         Nullable(String),
     country        LowCardinality(Nullable(String)),
@@ -184,6 +203,7 @@ CREATE TABLE IF NOT EXISTS ${SITES_TABLE} (
     name             String,
     domain           Nullable(String),
     allowed_origins  Nullable(String),
+    conversion_events Nullable(String),
     created_at       DateTime64(3),
     updated_at       DateTime64(3),
     version          UInt64,
@@ -196,6 +216,39 @@ function toCHDateTime(d) {
   const iso = typeof d === "string" ? d : d.toISOString();
   return iso.replace("T", " ").replace("Z", "");
 }
+function buildFilterConditions(filters) {
+  if (!filters) return { conditions: [], params: {} };
+  const map = {
+    "geo.country": "country",
+    "geo.city": "city",
+    "geo.region": "region",
+    "language": "language",
+    "device.type": "device_type",
+    "device.browser": "browser",
+    "device.os": "os",
+    "utm.source": "utm_source",
+    "utm.medium": "utm_medium",
+    "utm.campaign": "utm_campaign",
+    "utm.term": "utm_term",
+    "utm.content": "utm_content",
+    "referrer": "referrer",
+    "event_source": "event_source",
+    "event_subtype": "event_subtype",
+    "page_path": "page_path",
+    "target_url_path": "target_url_path",
+    "event_name": "event_name",
+    "type": "type"
+  };
+  const conditions = [];
+  const params = {};
+  for (const [key, value] of Object.entries(filters)) {
+    if (!value || !map[key]) continue;
+    const paramKey = `f_${key.replace(/[^a-zA-Z0-9]/g, "_")}`;
+    conditions.push(`${map[key]} = {${paramKey}:String}`);
+    params[paramKey] = value;
+  }
+  return { conditions, params };
+}
 var ClickHouseAdapter = class {
   client;
   constructor(url) {
@@ -209,6 +262,17 @@ var ClickHouseAdapter = class {
   async init() {
     await this.client.command({ query: CREATE_EVENTS_TABLE });
     await this.client.command({ query: CREATE_SITES_TABLE });
+    await this.client.command({ query: CREATE_IDENTITY_MAP_TABLE });
+    await this.client.command({ query: `ALTER TABLE ${EVENTS_TABLE} ADD COLUMN IF NOT EXISTS event_source LowCardinality(Nullable(String))` });
+    await this.client.command({ query: `ALTER TABLE ${EVENTS_TABLE} ADD COLUMN IF NOT EXISTS event_subtype LowCardinality(Nullable(String))` });
+    await this.client.command({ query: `ALTER TABLE ${EVENTS_TABLE} ADD COLUMN IF NOT EXISTS page_path Nullable(String)` });
+    await this.client.command({ query: `ALTER TABLE ${EVENTS_TABLE} ADD COLUMN IF NOT EXISTS target_url_path Nullable(String)` });
+    await this.client.command({ query: `ALTER TABLE ${EVENTS_TABLE} ADD COLUMN IF NOT EXISTS element_selector Nullable(String)` });
+    await this.client.command({ query: `ALTER TABLE ${EVENTS_TABLE} ADD COLUMN IF NOT EXISTS element_text Nullable(String)` });
+    await this.client.command({ query: `ALTER TABLE ${EVENTS_TABLE} ADD COLUMN IF NOT EXISTS scroll_depth_pct Nullable(UInt8)` });
+    await this.client.command({
+      query: `ALTER TABLE ${SITES_TABLE} ADD COLUMN IF NOT EXISTS conversion_events Nullable(String)`
+    });
   }
   async close() {
     await this.client.close();
@@ -227,6 +291,13 @@ var ClickHouseAdapter = class {
       title: e.title ?? null,
       event_name: e.name ?? null,
       properties: e.properties ? JSON.stringify(e.properties) : null,
+      event_source: e.eventSource ?? null,
+      event_subtype: e.eventSubtype ?? null,
+      page_path: e.pagePath ?? null,
+      target_url_path: e.targetUrlPath ?? null,
+      element_selector: e.elementSelector ?? null,
+      element_text: e.elementText ?? null,
+      scroll_depth_pct: e.scrollDepthPct ?? null,
       user_id: e.userId ?? null,
       traits: e.traits ? JSON.stringify(e.traits) : null,
       country: e.geo?.country ?? null,
@@ -263,6 +334,8 @@ var ClickHouseAdapter = class {
       to: toCHDateTime(dateRange.to),
       limit
     };
+    const filter = buildFilterConditions(q.filters);
+    const filterSql = filter.conditions.length > 0 ? ` AND ${filter.conditions.join(" AND ")}` : "";
     let data = [];
     let total = 0;
     switch (q.metric) {
@@ -272,8 +345,8 @@ var ClickHouseAdapter = class {
            WHERE site_id = {siteId:String}
              AND timestamp >= {from:String}
              AND timestamp <= {to:String}
-             AND type = 'pageview'`,
-          params
+             AND type = 'pageview'${filterSql}`,
+          { ...params, ...filter.params }
         );
         total = Number(rows[0]?.value ?? 0);
         data = [{ key: "pageviews", value: total }];
@@ -284,8 +357,8 @@ var ClickHouseAdapter = class {
           `SELECT uniq(visitor_id) AS value FROM ${EVENTS_TABLE}
            WHERE site_id = {siteId:String}
              AND timestamp >= {from:String}
-             AND timestamp <= {to:String}`,
-          params
+             AND timestamp <= {to:String}${filterSql}`,
+          { ...params, ...filter.params }
         );
         total = Number(rows[0]?.value ?? 0);
         data = [{ key: "visitors", value: total }];
@@ -296,8 +369,8 @@ var ClickHouseAdapter = class {
           `SELECT uniq(session_id) AS value FROM ${EVENTS_TABLE}
            WHERE site_id = {siteId:String}
              AND timestamp >= {from:String}
-             AND timestamp <= {to:String}`,
-          params
+             AND timestamp <= {to:String}${filterSql}`,
+          { ...params, ...filter.params }
         );
         total = Number(rows[0]?.value ?? 0);
         data = [{ key: "sessions", value: total }];
@@ -309,13 +382,33 @@ var ClickHouseAdapter = class {
            WHERE site_id = {siteId:String}
              AND timestamp >= {from:String}
              AND timestamp <= {to:String}
-             AND type = 'event'`,
-          params
+             AND type = 'event'${filterSql}`,
+          { ...params, ...filter.params }
         );
         total = Number(rows[0]?.value ?? 0);
         data = [{ key: "events", value: total }];
         break;
       }
+      case "conversions": {
+        const conversionEvents = q.conversionEvents ?? [];
+        if (conversionEvents.length === 0) {
+          total = 0;
+          data = [{ key: "conversions", value: 0 }];
+          break;
+        }
+        const rows = await this.queryRows(
+          `SELECT count() AS value FROM ${EVENTS_TABLE}
+           WHERE site_id = {siteId:String}
+             AND timestamp >= {from:String}
+             AND timestamp <= {to:String}
+             AND type = 'event'
+             AND event_name IN {eventNames:Array(String)}${filterSql}`,
+          { ...params, eventNames: conversionEvents, ...filter.params }
+        );
+        total = Number(rows[0]?.value ?? 0);
+        data = [{ key: "conversions", value: total }];
+        break;
+      }
       case "top_pages": {
         const rows = await this.queryRows(
           `SELECT url AS key, count() AS value FROM ${EVENTS_TABLE}
@@ -323,11 +416,11 @@ var ClickHouseAdapter = class {
              AND timestamp >= {from:String}
              AND timestamp <= {to:String}
              AND type = 'pageview'
-             AND url IS NOT NULL
+             AND url IS NOT NULL${filterSql}
            GROUP BY url
            ORDER BY value DESC
            LIMIT {limit:UInt32}`,
-          params
+          { ...params, ...filter.params }
         );
         data = rows.map((r) => ({ key: r.key, value: Number(r.value) }));
         total = data.reduce((sum, d) => sum + d.value, 0);
@@ -341,11 +434,11 @@ var ClickHouseAdapter = class {
              AND timestamp <= {to:String}
              AND type = 'pageview'
              AND referrer IS NOT NULL
-             AND referrer != ''
+             AND referrer != ''${filterSql}
            GROUP BY referrer
            ORDER BY value DESC
            LIMIT {limit:UInt32}`,
-          params
+          { ...params, ...filter.params }
         );
         data = rows.map((r) => ({ key: r.key, value: Number(r.value) }));
         total = data.reduce((sum, d) => sum + d.value, 0);
@@ -357,11 +450,11 @@ var ClickHouseAdapter = class {
            WHERE site_id = {siteId:String}
              AND timestamp >= {from:String}
              AND timestamp <= {to:String}
-             AND country IS NOT NULL
+             AND country IS NOT NULL${filterSql}
            GROUP BY country
            ORDER BY value DESC
            LIMIT {limit:UInt32}`,
-          params
+          { ...params, ...filter.params }
         );
         data = rows.map((r) => ({ key: r.key, value: Number(r.value) }));
         total = data.reduce((sum, d) => sum + d.value, 0);
@@ -373,11 +466,11 @@ var ClickHouseAdapter = class {
            WHERE site_id = {siteId:String}
              AND timestamp >= {from:String}
              AND timestamp <= {to:String}
-             AND city IS NOT NULL
+             AND city IS NOT NULL${filterSql}
            GROUP BY city
            ORDER BY value DESC
            LIMIT {limit:UInt32}`,
-          params
+          { ...params, ...filter.params }
         );
         data = rows.map((r) => ({ key: r.key, value: Number(r.value) }));
         total = data.reduce((sum, d) => sum + d.value, 0);
@@ -391,10 +484,132 @@ var ClickHouseAdapter = class {
              AND timestamp <= {to:String}
              AND type = 'event'
              AND event_name IS NOT NULL
+             ${filterSql}
+           GROUP BY event_name
+           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_conversions": {
+        const conversionEvents = q.conversionEvents ?? [];
+        if (conversionEvents.length === 0) {
+          total = 0;
+          data = [];
+          break;
+        }
+        const rows = await this.queryRows(
+          `SELECT event_name AS key, count() AS value FROM ${EVENTS_TABLE}
+           WHERE site_id = {siteId:String}
+             AND timestamp >= {from:String}
+             AND timestamp <= {to:String}
+             AND type = 'event'
+             AND event_name IN {eventNames:Array(String)}
+             ${filterSql}
            GROUP BY event_name
            ORDER BY value DESC
            LIMIT {limit:UInt32}`,
-          params
+          { ...params, eventNames: conversionEvents, ...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_exit_pages": {
+        const rows = await this.queryRows(
+          `SELECT exit_url AS key, count() AS value FROM (
+             SELECT session_id, argMax(url, timestamp) AS exit_url
+             FROM ${EVENTS_TABLE}
+             WHERE site_id = {siteId:String}
+               AND timestamp >= {from:String}
+               AND timestamp <= {to:String}
+               AND type = 'pageview'
+               AND url IS NOT NULL${filterSql}
+             GROUP BY session_id
+           )
+           GROUP BY exit_url
+           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_transitions": {
+        const rows = await this.queryRows(
+          `SELECT concat(prev_url, ' \u2192 ', curr_url) AS key, count() AS value FROM (
+             SELECT session_id, url AS curr_url,
+                    lagInFrame(url, 1) OVER (PARTITION BY session_id ORDER BY timestamp ASC) AS prev_url
+             FROM ${EVENTS_TABLE}
+             WHERE site_id = {siteId:String}
+               AND timestamp >= {from:String}
+               AND timestamp <= {to:String}
+               AND type = 'pageview'
+               AND url IS NOT NULL${filterSql}
+           )
+           WHERE prev_url IS NOT NULL AND prev_url != ''
+           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_scroll_pages": {
+        const rows = await this.queryRows(
+          `SELECT page_path AS key, count() AS value FROM ${EVENTS_TABLE}
+           WHERE site_id = {siteId:String}
+             AND timestamp >= {from:String}
+             AND timestamp <= {to:String}
+             AND type = 'event'
+             AND event_subtype = 'scroll_depth'
+             AND page_path IS NOT NULL${filterSql}
+           GROUP BY page_path
+           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_button_clicks": {
+        const rows = await this.queryRows(
+          `SELECT ifNull(element_text, element_selector) AS key, count() AS value FROM ${EVENTS_TABLE}
+           WHERE site_id = {siteId:String}
+             AND timestamp >= {from:String}
+             AND timestamp <= {to:String}
+             AND type = 'event'
+             AND event_subtype = 'button_click'
+             AND (element_text IS NOT NULL OR element_selector 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_link_targets": {
+        const rows = await this.queryRows(
+          `SELECT target_url_path AS key, count() AS value FROM ${EVENTS_TABLE}
+           WHERE site_id = {siteId:String}
+             AND timestamp >= {from:String}
+             AND timestamp <= {to:String}
+             AND type = 'event'
+             AND event_subtype IN ('link_click','outbound_click')
+             AND target_url_path IS NOT NULL${filterSql}
+           GROUP BY target_url_path
+           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);
@@ -407,10 +622,11 @@ var ClickHouseAdapter = class {
              AND timestamp >= {from:String}
              AND timestamp <= {to:String}
              AND device_type IS NOT NULL
+             ${filterSql}
            GROUP BY device_type
            ORDER BY value DESC
            LIMIT {limit:UInt32}`,
-          params
+          { ...params, ...filter.params }
         );
         data = rows.map((r) => ({ key: r.key, value: Number(r.value) }));
         total = data.reduce((sum, d) => sum + d.value, 0);
@@ -423,10 +639,11 @@ var ClickHouseAdapter = class {
              AND timestamp >= {from:String}
              AND timestamp <= {to:String}
              AND browser IS NOT NULL
+             ${filterSql}
            GROUP BY browser
            ORDER BY value DESC
            LIMIT {limit:UInt32}`,
-          params
+          { ...params, ...filter.params }
         );
         data = rows.map((r) => ({ key: r.key, value: Number(r.value) }));
         total = data.reduce((sum, d) => sum + d.value, 0);
@@ -439,10 +656,62 @@ var ClickHouseAdapter = class {
              AND timestamp >= {from:String}
              AND timestamp <= {to:String}
              AND os IS NOT NULL
+             ${filterSql}
            GROUP BY os
            ORDER BY value DESC
            LIMIT {limit:UInt32}`,
-          params
+          { ...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}
+           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
+           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_mediums": {
+        const rows = await this.queryRows(
+          `SELECT utm_medium 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
+           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_campaigns": {
+        const rows = await this.queryRows(
+          `SELECT utm_campaign 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_campaign IS NOT NULL AND utm_campaign != ''
+             ${filterSql}
+           GROUP BY utm_campaign
+           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);
@@ -450,7 +719,7 @@ var ClickHouseAdapter = class {
       }
     }
     const result = { metric: q.metric, period, data, total };
-    if (q.compare && ["pageviews", "visitors", "sessions", "events"].includes(q.metric)) {
+    if (q.compare && ["pageviews", "visitors", "sessions", "events", "conversions"].includes(q.metric)) {
       const prevRange = previousPeriodRange(dateRange);
       const prevResult = await this.query({
         ...q,
@@ -480,7 +749,12 @@ var ClickHouseAdapter = class {
     const granularity = params.granularity ?? autoGranularity(period);
     const bucketFn = this.granularityToClickHouseFunc(granularity);
     const dateFormat = granularityToDateFormat(granularity);
+    const filter = buildFilterConditions(params.filters);
+    const filterSql = filter.conditions.length > 0 ? ` AND ${filter.conditions.join(" AND ")}` : "";
     const typeFilter = params.metric === "pageviews" ? `AND type = 'pageview'` : "";
+    const eventsFilter = params.metric === "events" ? `AND type = 'event'` : "";
+    const conversionsFilter = params.metric === "conversions" ? `AND type = 'event' AND event_name IN {eventNames:Array(String)}` : "";
+    const extraFilters = [typeFilter, eventsFilter, conversionsFilter, filterSql].filter(Boolean).join(" ");
     let sql;
     if (params.metric === "visitors" || params.metric === "sessions") {
       const field = params.metric === "visitors" ? "visitor_id" : "session_id";
@@ -490,7 +764,7 @@ var ClickHouseAdapter = class {
         WHERE site_id = {siteId:String}
           AND timestamp >= {from:String}
           AND timestamp <= {to:String}
-          ${typeFilter}
+          ${extraFilters}
         GROUP BY bucket
         ORDER BY bucket ASC
       `;
@@ -501,7 +775,7 @@ var ClickHouseAdapter = class {
         WHERE site_id = {siteId:String}
           AND timestamp >= {from:String}
           AND timestamp <= {to:String}
-          ${typeFilter}
+          ${extraFilters}
         GROUP BY bucket
         ORDER BY bucket ASC
       `;
@@ -509,7 +783,9 @@ var ClickHouseAdapter = class {
     const rows = await this.queryRows(sql, {
       siteId: params.siteId,
       from: toCHDateTime(dateRange.from),
-      to: toCHDateTime(dateRange.to)
+      to: toCHDateTime(dateRange.to),
+      eventNames: params.conversionEvents ?? [],
+      ...filter.params
     });
     const mappedRows = rows.map((r) => ({
       _id: this.convertClickHouseBucket(r.bucket, granularity),
@@ -627,6 +903,14 @@ var ClickHouseAdapter = class {
       conditions.push(`event_name = {eventName:String}`);
       queryParams.eventName = params.eventName;
     }
+    if (params.eventSource) {
+      conditions.push(`event_source = {eventSource:String}`);
+      queryParams.eventSource = params.eventSource;
+    }
+    if (params.eventNames && params.eventNames.length > 0) {
+      conditions.push(`event_name IN {eventNames:Array(String)}`);
+      queryParams.eventNames = params.eventNames;
+    }
     if (params.visitorId) {
       conditions.push(`visitor_id = {visitorId:String}`);
       queryParams.visitorId = params.visitorId;
@@ -649,7 +933,9 @@ var ClickHouseAdapter = class {
     const [events, countRows] = await Promise.all([
       this.queryRows(
         `SELECT event_id, type, timestamp, session_id, visitor_id, url, referrer, title,
-                event_name, properties, user_id, traits, country, city, region,
+                event_name, properties, event_source, event_subtype, page_path, target_url_path,
+                element_selector, element_text, scroll_depth_pct,
+                user_id, traits, country, city, region,
                 device_type, browser, os, language,
                 utm_source, utm_medium, utm_campaign, utm_term, utm_content
          FROM ${EVENTS_TABLE}
@@ -684,36 +970,59 @@ var ClickHouseAdapter = class {
     const where = conditions.join(" AND ");
     const [userRows, countRows] = await Promise.all([
       this.queryRows(
-        `SELECT
-          visitor_id,
-          anyLast(user_id) AS userId,
-          anyLast(traits) AS traits,
-          min(timestamp) AS firstSeen,
-          max(timestamp) AS lastSeen,
+        `WITH identity AS (
+          SELECT visitor_id, user_id
+          FROM ${IDENTITY_MAP_TABLE} FINAL
+          WHERE site_id = {siteId:String}
+        )
+        SELECT
+          if(i.user_id IS NOT NULL AND i.user_id != '', i.user_id, e.visitor_id) AS group_key,
+          anyLast(e.visitor_id) AS visitor_id,
+          anyLast(i.user_id) AS userId,
+          anyLast(e.traits) AS traits,
+          min(e.timestamp) AS firstSeen,
+          max(e.timestamp) AS lastSeen,
           count() AS totalEvents,
-          countIf(type = 'pageview') AS totalPageviews,
-          uniq(session_id) AS totalSessions,
-          anyLast(url) AS lastUrl,
-          anyLast(device_type) AS device_type,
-          anyLast(browser) AS browser,
-          anyLast(os) AS os,
-          anyLast(country) AS country,
-          anyLast(city) AS city,
-          anyLast(region) AS region,
-          anyLast(language) AS language
-        FROM ${EVENTS_TABLE}
-        WHERE ${where}
-        GROUP BY visitor_id
+          countIf(e.type = 'pageview') AS totalPageviews,
+          uniq(e.session_id) AS totalSessions,
+          anyLast(e.url) AS lastUrl,
+          anyLast(e.referrer) AS referrer,
+          anyLast(e.device_type) AS device_type,
+          anyLast(e.browser) AS browser,
+          anyLast(e.os) AS os,
+          anyLast(e.country) AS country,
+          anyLast(e.city) AS city,
+          anyLast(e.region) AS region,
+          anyLast(e.language) AS language,
+          anyLast(e.timezone) AS timezone,
+          anyLast(e.screen_width) AS screen_width,
+          anyLast(e.screen_height) AS screen_height,
+          anyLast(e.utm_source) AS utm_source,
+          anyLast(e.utm_medium) AS utm_medium,
+          anyLast(e.utm_campaign) AS utm_campaign,
+          anyLast(e.utm_term) AS utm_term,
+          anyLast(e.utm_content) AS utm_content
+        FROM ${EVENTS_TABLE} e
+        LEFT JOIN identity i ON e.visitor_id = i.visitor_id
+        WHERE e.site_id = {siteId:String}${where.includes("ILIKE") ? ` AND (e.visitor_id ILIKE {search:String} OR i.user_id ILIKE {search:String})` : ""}
+        GROUP BY group_key
         ORDER BY lastSeen DESC
         LIMIT {limit:UInt32}
         OFFSET {offset:UInt32}`,
         queryParams
       ),
       this.queryRows(
-        `SELECT count() AS total FROM (
-          SELECT visitor_id FROM ${EVENTS_TABLE}
-          WHERE ${where}
-          GROUP BY visitor_id
+        `WITH identity AS (
+          SELECT visitor_id, user_id
+          FROM ${IDENTITY_MAP_TABLE} FINAL
+          WHERE site_id = {siteId:String}
+        )
+        SELECT count() AS total FROM (
+          SELECT if(i.user_id IS NOT NULL AND i.user_id != '', i.user_id, e.visitor_id) AS group_key
+          FROM ${EVENTS_TABLE} e
+          LEFT JOIN identity i ON e.visitor_id = i.visitor_id
+          WHERE e.site_id = {siteId:String}${where.includes("ILIKE") ? ` AND (e.visitor_id ILIKE {search:String} OR i.user_id ILIKE {search:String})` : ""}
+          GROUP BY group_key
         )`,
         queryParams
       )
@@ -728,9 +1037,19 @@ var ClickHouseAdapter = class {
       totalPageviews: Number(u.totalPageviews),
       totalSessions: Number(u.totalSessions),
       lastUrl: u.lastUrl ? String(u.lastUrl) : void 0,
+      referrer: u.referrer ? String(u.referrer) : void 0,
       device: u.device_type ? { type: String(u.device_type), browser: String(u.browser ?? ""), os: String(u.os ?? "") } : void 0,
       geo: u.country ? { country: String(u.country), city: u.city ? String(u.city) : void 0, region: u.region ? String(u.region) : void 0 } : void 0,
-      language: u.language ? String(u.language) : void 0
+      language: u.language ? String(u.language) : void 0,
+      timezone: u.timezone ? String(u.timezone) : void 0,
+      screen: u.screen_width || u.screen_height ? { width: Number(u.screen_width ?? 0), height: Number(u.screen_height ?? 0) } : void 0,
+      utm: u.utm_source ? {
+        source: String(u.utm_source),
+        medium: u.utm_medium ? String(u.utm_medium) : void 0,
+        campaign: u.utm_campaign ? String(u.utm_campaign) : void 0,
+        term: u.utm_term ? String(u.utm_term) : void 0,
+        content: u.utm_content ? String(u.utm_content) : void 0
+      } : void 0
     }));
     return {
       users,
@@ -739,13 +1058,178 @@ var ClickHouseAdapter = class {
       offset
     };
   }
-  async getUserDetail(siteId, visitorId) {
-    const result = await this.listUsers({ siteId, search: visitorId, limit: 1 });
-    const user = result.users.find((u) => u.visitorId === visitorId);
+  async getUserDetail(siteId, identifier) {
+    const visitorIds = await this.getVisitorIdsForUser(siteId, identifier);
+    if (visitorIds.length > 0) {
+      return this.getMergedUserDetail(siteId, identifier, visitorIds);
+    }
+    const userId = await this.getUserIdForVisitor(siteId, identifier);
+    if (userId) {
+      const allVisitorIds = await this.getVisitorIdsForUser(siteId, userId);
+      return this.getMergedUserDetail(siteId, userId, allVisitorIds.length > 0 ? allVisitorIds : [identifier]);
+    }
+    const result = await this.listUsers({ siteId, search: identifier, limit: 1 });
+    const user = result.users.find((u) => u.visitorId === identifier);
     return user ?? null;
   }
-  async getUserEvents(siteId, visitorId, params) {
-    return this.listEvents({ ...params, siteId, visitorId });
+  async getUserEvents(siteId, identifier, params) {
+    const visitorIds = await this.getVisitorIdsForUser(siteId, identifier);
+    if (visitorIds.length > 0) {
+      return this.listEventsForVisitorIds(siteId, visitorIds, params);
+    }
+    const userId = await this.getUserIdForVisitor(siteId, identifier);
+    if (userId) {
+      const allVisitorIds = await this.getVisitorIdsForUser(siteId, userId);
+      if (allVisitorIds.length > 0) {
+        return this.listEventsForVisitorIds(siteId, allVisitorIds, params);
+      }
+    }
+    return this.listEvents({ ...params, siteId, visitorId: identifier });
+  }
+  // ─── Identity Mapping ──────────────────────────────────────
+  async upsertIdentity(siteId, visitorId, userId) {
+    await this.client.insert({
+      table: IDENTITY_MAP_TABLE,
+      values: [{
+        site_id: siteId,
+        visitor_id: visitorId,
+        user_id: userId,
+        identified_at: toCHDateTime(/* @__PURE__ */ new Date())
+      }],
+      format: "JSONEachRow"
+    });
+  }
+  async getVisitorIdsForUser(siteId, userId) {
+    const rows = await this.queryRows(
+      `SELECT visitor_id FROM ${IDENTITY_MAP_TABLE} FINAL
+       WHERE site_id = {siteId:String} AND user_id = {userId:String}`,
+      { siteId, userId }
+    );
+    return rows.map((r) => r.visitor_id);
+  }
+  async getUserIdForVisitor(siteId, visitorId) {
+    const rows = await this.queryRows(
+      `SELECT user_id FROM ${IDENTITY_MAP_TABLE} FINAL
+       WHERE site_id = {siteId:String} AND visitor_id = {visitorId:String}
+       LIMIT 1`,
+      { siteId, visitorId }
+    );
+    return rows.length > 0 ? rows[0].user_id : null;
+  }
+  async getMergedUserDetail(siteId, userId, visitorIds) {
+    const rows = await this.queryRows(
+      `SELECT
+        anyLast(visitor_id) AS visitor_id,
+        anyLast(traits) AS traits,
+        min(timestamp) AS firstSeen,
+        max(timestamp) AS lastSeen,
+        count() AS totalEvents,
+        countIf(type = 'pageview') AS totalPageviews,
+        uniq(session_id) AS totalSessions,
+        anyLast(url) AS lastUrl,
+        anyLast(referrer) AS referrer,
+        anyLast(device_type) AS device_type,
+        anyLast(browser) AS browser,
+        anyLast(os) AS os,
+        anyLast(country) AS country,
+        anyLast(city) AS city,
+        anyLast(region) AS region,
+        anyLast(language) AS language,
+        anyLast(timezone) AS timezone,
+        anyLast(screen_width) AS screen_width,
+        anyLast(screen_height) AS screen_height,
+        anyLast(utm_source) AS utm_source,
+        anyLast(utm_medium) AS utm_medium,
+        anyLast(utm_campaign) AS utm_campaign,
+        anyLast(utm_term) AS utm_term,
+        anyLast(utm_content) AS utm_content
+      FROM ${EVENTS_TABLE}
+      WHERE site_id = {siteId:String}
+        AND visitor_id IN {visitorIds:Array(String)}`,
+      { siteId, visitorIds }
+    );
+    if (rows.length === 0) return null;
+    const u = rows[0];
+    return {
+      visitorId: String(u.visitor_id),
+      visitorIds,
+      userId,
+      traits: this.parseJSON(u.traits),
+      firstSeen: new Date(String(u.firstSeen)).toISOString(),
+      lastSeen: new Date(String(u.lastSeen)).toISOString(),
+      totalEvents: Number(u.totalEvents),
+      totalPageviews: Number(u.totalPageviews),
+      totalSessions: Number(u.totalSessions),
+      lastUrl: u.lastUrl ? String(u.lastUrl) : void 0,
+      referrer: u.referrer ? String(u.referrer) : void 0,
+      device: u.device_type ? { type: String(u.device_type), browser: String(u.browser ?? ""), os: String(u.os ?? "") } : void 0,
+      geo: u.country ? { country: String(u.country), city: u.city ? String(u.city) : void 0, region: u.region ? String(u.region) : void 0 } : void 0,
+      language: u.language ? String(u.language) : void 0,
+      timezone: u.timezone ? String(u.timezone) : void 0,
+      screen: u.screen_width || u.screen_height ? { width: Number(u.screen_width ?? 0), height: Number(u.screen_height ?? 0) } : void 0,
+      utm: u.utm_source ? {
+        source: String(u.utm_source),
+        medium: u.utm_medium ? String(u.utm_medium) : void 0,
+        campaign: u.utm_campaign ? String(u.utm_campaign) : void 0,
+        term: u.utm_term ? String(u.utm_term) : void 0,
+        content: u.utm_content ? String(u.utm_content) : void 0
+      } : void 0
+    };
+  }
+  async listEventsForVisitorIds(siteId, visitorIds, params) {
+    const limit = Math.min(params.limit ?? 50, 200);
+    const offset = params.offset ?? 0;
+    const conditions = [`site_id = {siteId:String}`, `visitor_id IN {visitorIds:Array(String)}`];
+    const queryParams = { siteId, visitorIds, limit, offset };
+    if (params.type) {
+      conditions.push(`type = {type:String}`);
+      queryParams.type = params.type;
+    }
+    if (params.eventName) {
+      conditions.push(`event_name = {eventName:String}`);
+      queryParams.eventName = params.eventName;
+    }
+    if (params.eventNames && params.eventNames.length > 0) {
+      conditions.push(`event_name IN {eventNames:Array(String)}`);
+      queryParams.eventNames = params.eventNames;
+    }
+    if (params.period || params.dateFrom) {
+      const { dateRange } = resolvePeriod({
+        period: params.period,
+        dateFrom: params.dateFrom,
+        dateTo: params.dateTo
+      });
+      conditions.push(`timestamp >= {from:String} AND timestamp <= {to:String}`);
+      queryParams.from = toCHDateTime(dateRange.from);
+      queryParams.to = toCHDateTime(dateRange.to);
+    }
+    const where = conditions.join(" AND ");
+    const [events, countRows] = await Promise.all([
+      this.queryRows(
+        `SELECT event_id, type, timestamp, session_id, visitor_id, url, referrer, title,
+                event_name, properties, event_source, event_subtype, page_path, target_url_path,
+                element_selector, element_text, scroll_depth_pct,
+                user_id, traits, country, city, region,
+                device_type, browser, os, language,
+                utm_source, utm_medium, utm_campaign, utm_term, utm_content
+         FROM ${EVENTS_TABLE}
+         WHERE ${where}
+         ORDER BY timestamp DESC
+         LIMIT {limit:UInt32}
+         OFFSET {offset:UInt32}`,
+        queryParams
+      ),
+      this.queryRows(
+        `SELECT count() AS total FROM ${EVENTS_TABLE} WHERE ${where}`,
+        queryParams
+      )
+    ]);
+    return {
+      events: events.map((e) => this.toEventListItem(e)),
+      total: Number(countRows[0]?.total ?? 0),
+      limit,
+      offset
+    };
   }
   // ─── Site Management ──────────────────────────────────────
   async createSite(data) {
@@ -758,6 +1242,7 @@ var ClickHouseAdapter = class {
       name: data.name,
       domain: data.domain,
       allowedOrigins: data.allowedOrigins,
+      conversionEvents: data.conversionEvents,
       createdAt: nowISO,
       updatedAt: nowISO
     };
@@ -769,6 +1254,7 @@ var ClickHouseAdapter = class {
         name: site.name,
         domain: site.domain ?? null,
         allowed_origins: site.allowedOrigins ? JSON.stringify(site.allowedOrigins) : null,
+        conversion_events: site.conversionEvents ? JSON.stringify(site.conversionEvents) : null,
         created_at: nowCH,
         updated_at: nowCH,
         version: 1,
@@ -780,7 +1266,7 @@ var ClickHouseAdapter = class {
   }
   async getSite(siteId) {
     const rows = await this.queryRows(
-      `SELECT site_id, secret_key, name, domain, allowed_origins, created_at, updated_at
+      `SELECT site_id, secret_key, name, domain, allowed_origins, conversion_events, created_at, updated_at
        FROM ${SITES_TABLE} FINAL
        WHERE site_id = {siteId:String} AND is_deleted = 0`,
       { siteId }
@@ -789,7 +1275,7 @@ var ClickHouseAdapter = class {
   }
   async getSiteBySecret(secretKey) {
     const rows = await this.queryRows(
-      `SELECT site_id, secret_key, name, domain, allowed_origins, created_at, updated_at
+      `SELECT site_id, secret_key, name, domain, allowed_origins, conversion_events, created_at, updated_at
        FROM ${SITES_TABLE} FINAL
        WHERE secret_key = {secretKey:String} AND is_deleted = 0`,
       { secretKey }
@@ -798,7 +1284,7 @@ var ClickHouseAdapter = class {
   }
   async listSites() {
     const rows = await this.queryRows(
-      `SELECT site_id, secret_key, name, domain, allowed_origins, created_at, updated_at
+      `SELECT site_id, secret_key, name, domain, allowed_origins, conversion_events, created_at, updated_at
        FROM ${SITES_TABLE} FINAL
        WHERE is_deleted = 0
        ORDER BY created_at DESC`,
@@ -808,7 +1294,7 @@ var ClickHouseAdapter = class {
   }
   async updateSite(siteId, data) {
     const currentRows = await this.queryRows(
-      `SELECT site_id, secret_key, name, domain, allowed_origins, created_at, updated_at, version
+      `SELECT site_id, secret_key, name, domain, allowed_origins, conversion_events, created_at, updated_at, version
        FROM ${SITES_TABLE} FINAL
        WHERE site_id = {siteId:String} AND is_deleted = 0`,
       { siteId }
@@ -822,6 +1308,7 @@ var ClickHouseAdapter = class {
     const newName = data.name !== void 0 ? data.name : String(current.name);
     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;
     await this.client.insert({
       table: SITES_TABLE,
       values: [{
@@ -830,6 +1317,7 @@ var ClickHouseAdapter = class {
         name: newName,
         domain: newDomain,
         allowed_origins: newOrigins,
+        conversion_events: newConversions,
         created_at: toCHDateTime(String(current.created_at)),
         updated_at: nowCH,
         version: newVersion,
@@ -843,13 +1331,14 @@ var ClickHouseAdapter = class {
       name: newName,
       domain: newDomain ?? void 0,
       allowedOrigins: newOrigins ? JSON.parse(newOrigins) : void 0,
+      conversionEvents: newConversions ? JSON.parse(newConversions) : void 0,
       createdAt: String(current.created_at),
       updatedAt: nowISO
     };
   }
   async deleteSite(siteId) {
     const currentRows = await this.queryRows(
-      `SELECT site_id, secret_key, name, domain, allowed_origins, created_at, version
+      `SELECT site_id, secret_key, name, domain, allowed_origins, conversion_events, created_at, version
        FROM ${SITES_TABLE} FINAL
        WHERE site_id = {siteId:String} AND is_deleted = 0`,
       { siteId }
@@ -865,6 +1354,7 @@ var ClickHouseAdapter = class {
         name: String(current.name),
         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,
         created_at: toCHDateTime(String(current.created_at)),
         updated_at: nowCH,
         version: Number(current.version) + 1,
@@ -876,7 +1366,7 @@ var ClickHouseAdapter = class {
   }
   async regenerateSecret(siteId) {
     const currentRows = await this.queryRows(
-      `SELECT site_id, secret_key, name, domain, allowed_origins, created_at, version
+      `SELECT site_id, secret_key, name, domain, allowed_origins, conversion_events, created_at, version
        FROM ${SITES_TABLE} FINAL
        WHERE site_id = {siteId:String} AND is_deleted = 0`,
       { siteId }
@@ -895,6 +1385,7 @@ var ClickHouseAdapter = class {
         name: String(current.name),
         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,
         created_at: toCHDateTime(String(current.created_at)),
         updated_at: nowCH,
         version: Number(current.version) + 1,
@@ -908,6 +1399,7 @@ var ClickHouseAdapter = class {
       name: String(current.name),
       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,
       createdAt: String(current.created_at),
       updatedAt: nowISO
     };
@@ -928,6 +1420,7 @@ var ClickHouseAdapter = class {
       name: String(row.name),
       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()
     };
@@ -944,6 +1437,13 @@ var ClickHouseAdapter = class {
       title: row.title ? String(row.title) : void 0,
       name: row.event_name ? String(row.event_name) : void 0,
       properties: this.parseJSON(row.properties),
+      eventSource: row.event_source ? String(row.event_source) : void 0,
+      eventSubtype: row.event_subtype ? String(row.event_subtype) : void 0,
+      pagePath: row.page_path ? String(row.page_path) : void 0,
+      targetUrlPath: row.target_url_path ? String(row.target_url_path) : void 0,
+      elementSelector: row.element_selector ? String(row.element_selector) : void 0,
+      elementText: row.element_text ? String(row.element_text) : void 0,
+      scrollDepthPct: row.scroll_depth_pct !== null && row.scroll_depth_pct !== void 0 ? Number(row.scroll_depth_pct) : void 0,
       userId: row.user_id ? String(row.user_id) : void 0,
       traits: this.parseJSON(row.traits),
       geo: row.country ? {
@@ -980,11 +1480,43 @@ var ClickHouseAdapter = class {
 import { MongoClient } from "mongodb";
 var EVENTS_COLLECTION = "litemetrics_events";
 var SITES_COLLECTION = "litemetrics_sites";
+var IDENTITY_MAP_COLLECTION = "litemetrics_identity_map";
+function buildFilterMatch(filters) {
+  if (!filters) return {};
+  const map = {
+    "geo.country": "country",
+    "geo.city": "city",
+    "geo.region": "region",
+    "language": "language",
+    "device.type": "device_type",
+    "device.browser": "browser",
+    "device.os": "os",
+    "utm.source": "utm_source",
+    "utm.medium": "utm_medium",
+    "utm.campaign": "utm_campaign",
+    "utm.term": "utm_term",
+    "utm.content": "utm_content",
+    "referrer": "referrer",
+    "event_source": "event_source",
+    "event_subtype": "event_subtype",
+    "page_path": "page_path",
+    "target_url_path": "target_url_path",
+    "event_name": "event_name",
+    "type": "type"
+  };
+  const match = {};
+  for (const [key, value] of Object.entries(filters)) {
+    if (!value || !map[key]) continue;
+    match[map[key]] = value;
+  }
+  return match;
+}
 var MongoDBAdapter = class {
   client;
   db;
   collection;
   sites;
+  identityMap;
   constructor(url) {
     this.client = new MongoClient(url);
   }
@@ -993,13 +1525,16 @@ var MongoDBAdapter = class {
     this.db = this.client.db();
     this.collection = this.db.collection(EVENTS_COLLECTION);
     this.sites = this.db.collection(SITES_COLLECTION);
+    this.identityMap = this.db.collection(IDENTITY_MAP_COLLECTION);
     await Promise.all([
       this.collection.createIndex({ site_id: 1, timestamp: -1 }),
       this.collection.createIndex({ site_id: 1, type: 1 }),
       this.collection.createIndex({ site_id: 1, visitor_id: 1 }),
       this.collection.createIndex({ site_id: 1, session_id: 1 }),
       this.sites.createIndex({ site_id: 1 }, { unique: true }),
-      this.sites.createIndex({ secret_key: 1 })
+      this.sites.createIndex({ secret_key: 1 }),
+      this.identityMap.createIndex({ site_id: 1, visitor_id: 1 }, { unique: true }),
+      this.identityMap.createIndex({ site_id: 1, user_id: 1 })
     ]);
   }
   async insertEvents(events) {
@@ -1015,6 +1550,13 @@ var MongoDBAdapter = class {
       title: e.title ?? null,
       event_name: e.name ?? null,
       properties: e.properties ?? null,
+      event_source: e.eventSource ?? null,
+      event_subtype: e.eventSubtype ?? null,
+      page_path: e.pagePath ?? null,
+      target_url_path: e.targetUrlPath ?? null,
+      element_selector: e.elementSelector ?? null,
+      element_text: e.elementText ?? null,
+      scroll_depth_pct: e.scrollDepthPct ?? null,
       user_id: e.userId ?? null,
       traits: e.traits ?? null,
       country: e.geo?.country ?? null,
@@ -1045,12 +1587,13 @@ var MongoDBAdapter = class {
       site_id: siteId,
       timestamp: { $gte: new Date(dateRange.from), $lte: new Date(dateRange.to) }
     };
+    const filterMatch = buildFilterMatch(q.filters);
     let data = [];
     let total = 0;
     switch (q.metric) {
       case "pageviews": {
         const [result2] = await this.collection.aggregate([
-          { $match: { ...baseMatch, type: "pageview" } },
+          { $match: { ...baseMatch, ...filterMatch, type: "pageview" } },
           { $count: "count" }
         ]).toArray();
         total = result2?.count ?? 0;
@@ -1059,7 +1602,7 @@ var MongoDBAdapter = class {
       }
       case "visitors": {
         const [result2] = await this.collection.aggregate([
-          { $match: baseMatch },
+          { $match: { ...baseMatch, ...filterMatch } },
           { $group: { _id: "$visitor_id" } },
           { $count: "count" }
         ]).toArray();
@@ -1069,7 +1612,7 @@ var MongoDBAdapter = class {
       }
       case "sessions": {
         const [result2] = await this.collection.aggregate([
-          { $match: baseMatch },
+          { $match: { ...baseMatch, ...filterMatch } },
           { $group: { _id: "$session_id" } },
           { $count: "count" }
         ]).toArray();
@@ -1079,16 +1622,31 @@ var MongoDBAdapter = class {
       }
       case "events": {
         const [result2] = await this.collection.aggregate([
-          { $match: { ...baseMatch, type: "event" } },
+          { $match: { ...baseMatch, ...filterMatch, type: "event" } },
           { $count: "count" }
         ]).toArray();
         total = result2?.count ?? 0;
         data = [{ key: "events", value: total }];
         break;
       }
+      case "conversions": {
+        const conversionEvents = q.conversionEvents ?? [];
+        if (conversionEvents.length === 0) {
+          total = 0;
+          data = [{ key: "conversions", value: 0 }];
+          break;
+        }
+        const [result2] = await this.collection.aggregate([
+          { $match: { ...baseMatch, ...filterMatch, type: "event", event_name: { $in: conversionEvents } } },
+          { $count: "count" }
+        ]).toArray();
+        total = result2?.count ?? 0;
+        data = [{ key: "conversions", value: total }];
+        break;
+      }
       case "top_pages": {
         const rows = await this.collection.aggregate([
-          { $match: { ...baseMatch, type: "pageview", url: { $ne: null } } },
+          { $match: { ...baseMatch, ...filterMatch, type: "pageview", url: { $ne: null } } },
           { $group: { _id: "$url", value: { $sum: 1 } } },
           { $sort: { value: -1 } },
           { $limit: limit }
@@ -1099,7 +1657,7 @@ var MongoDBAdapter = class {
       }
       case "top_referrers": {
         const rows = await this.collection.aggregate([
-          { $match: { ...baseMatch, type: "pageview", referrer: { $nin: [null, ""] } } },
+          { $match: { ...baseMatch, ...filterMatch, type: "pageview", referrer: { $nin: [null, ""] } } },
           { $group: { _id: "$referrer", value: { $sum: 1 } } },
           { $sort: { value: -1 } },
           { $limit: limit }
@@ -1110,7 +1668,7 @@ var MongoDBAdapter = class {
       }
       case "top_countries": {
         const rows = await this.collection.aggregate([
-          { $match: { ...baseMatch, country: { $ne: null } } },
+          { $match: { ...baseMatch, ...filterMatch, country: { $ne: null } } },
           { $group: { _id: "$country", value: { $addToSet: "$visitor_id" } } },
           { $project: { _id: 1, value: { $size: "$value" } } },
           { $sort: { value: -1 } },
@@ -1122,7 +1680,7 @@ var MongoDBAdapter = class {
       }
       case "top_cities": {
         const rows = await this.collection.aggregate([
-          { $match: { ...baseMatch, city: { $ne: null } } },
+          { $match: { ...baseMatch, ...filterMatch, city: { $ne: null } } },
           { $group: { _id: "$city", value: { $addToSet: "$visitor_id" } } },
           { $project: { _id: 1, value: { $size: "$value" } } },
           { $sort: { value: -1 } },
@@ -1134,7 +1692,24 @@ var MongoDBAdapter = class {
       }
       case "top_events": {
         const rows = await this.collection.aggregate([
-          { $match: { ...baseMatch, type: "event", event_name: { $ne: null } } },
+          { $match: { ...baseMatch, ...filterMatch, type: "event", event_name: { $ne: null } } },
+          { $group: { _id: "$event_name", value: { $sum: 1 } } },
+          { $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_conversions": {
+        const conversionEvents = q.conversionEvents ?? [];
+        if (conversionEvents.length === 0) {
+          total = 0;
+          data = [];
+          break;
+        }
+        const rows = await this.collection.aggregate([
+          { $match: { ...baseMatch, ...filterMatch, type: "event", event_name: { $in: conversionEvents } } },
           { $group: { _id: "$event_name", value: { $sum: 1 } } },
           { $sort: { value: -1 } },
           { $limit: limit }
@@ -1143,9 +1718,92 @@ var MongoDBAdapter = class {
         total = data.reduce((sum, d) => sum + d.value, 0);
         break;
       }
+      case "top_exit_pages": {
+        const rows = await this.collection.aggregate([
+          { $match: { ...baseMatch, ...filterMatch, type: "pageview", url: { $ne: null } } },
+          { $sort: { timestamp: 1 } },
+          { $group: { _id: "$session_id", url: { $last: "$url" } } },
+          { $group: { _id: "$url", value: { $sum: 1 } } },
+          { $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_transitions": {
+        const rows = await this.collection.aggregate([
+          { $match: { ...baseMatch, ...filterMatch, type: "pageview", url: { $ne: null } } },
+          {
+            $setWindowFields: {
+              partitionBy: "$session_id",
+              sortBy: { timestamp: 1 },
+              output: {
+                prev_url: { $shift: { output: "$url", by: -1 } }
+              }
+            }
+          },
+          { $match: { prev_url: { $ne: null } } },
+          { $group: { _id: { $concat: ["$prev_url", " \u2192 ", "$url"] }, value: { $sum: 1 } } },
+          { $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_scroll_pages": {
+        const rows = await this.collection.aggregate([
+          { $match: { ...baseMatch, ...filterMatch, type: "event", event_subtype: "scroll_depth", page_path: { $ne: null } } },
+          { $group: { _id: "$page_path", value: { $sum: 1 } } },
+          { $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_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 } }]
+            }
+          },
+          { $group: { _id: { $ifNull: ["$element_text", "$element_selector"] }, value: { $sum: 1 } } },
+          { $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_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 }
+            }
+          },
+          { $group: { _id: "$target_url_path", value: { $sum: 1 } } },
+          { $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_devices": {
         const rows = await this.collection.aggregate([
-          { $match: { ...baseMatch, device_type: { $ne: null } } },
+          { $match: { ...baseMatch, ...filterMatch, device_type: { $ne: null } } },
           { $group: { _id: "$device_type", value: { $addToSet: "$visitor_id" } } },
           { $project: { _id: 1, value: { $size: "$value" } } },
           { $sort: { value: -1 } },
@@ -1157,7 +1815,7 @@ var MongoDBAdapter = class {
       }
       case "top_browsers": {
         const rows = await this.collection.aggregate([
-          { $match: { ...baseMatch, browser: { $ne: null } } },
+          { $match: { ...baseMatch, ...filterMatch, browser: { $ne: null } } },
           { $group: { _id: "$browser", value: { $addToSet: "$visitor_id" } } },
           { $project: { _id: 1, value: { $size: "$value" } } },
           { $sort: { value: -1 } },
@@ -1169,7 +1827,7 @@ var MongoDBAdapter = class {
       }
       case "top_os": {
         const rows = await this.collection.aggregate([
-          { $match: { ...baseMatch, os: { $ne: null } } },
+          { $match: { ...baseMatch, ...filterMatch, os: { $ne: null } } },
           { $group: { _id: "$os", value: { $addToSet: "$visitor_id" } } },
           { $project: { _id: 1, value: { $size: "$value" } } },
           { $sort: { value: -1 } },
@@ -1179,9 +1837,45 @@ var MongoDBAdapter = class {
         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" } } },
+          { $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_mediums": {
+        const rows = await this.collection.aggregate([
+          { $match: { ...baseMatch, ...filterMatch, utm_medium: { $nin: [null, ""] } } },
+          { $group: { _id: "$utm_medium", 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_campaigns": {
+        const rows = await this.collection.aggregate([
+          { $match: { ...baseMatch, ...filterMatch, utm_campaign: { $nin: [null, ""] } } },
+          { $group: { _id: "$utm_campaign", 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"].includes(q.metric)) {
+    if (q.compare && ["pageviews", "visitors", "sessions", "events", "conversions"].includes(q.metric)) {
       const prevRange = previousPeriodRange(dateRange);
       const prevResult = await this.query({
         ...q,
@@ -1213,15 +1907,34 @@ var MongoDBAdapter = class {
       site_id: params.siteId,
       timestamp: { $gte: new Date(dateRange.from), $lte: new Date(dateRange.to) }
     };
+    const filterMatch = buildFilterMatch(params.filters);
     if (params.metric === "pageviews") {
       baseMatch.type = "pageview";
     }
+    if (params.metric === "events") {
+      baseMatch.type = "event";
+    }
+    if (params.metric === "conversions") {
+      baseMatch.type = "event";
+      const conversionEvents = params.conversionEvents ?? [];
+      if (conversionEvents.length === 0) {
+        const data2 = fillBuckets(
+          new Date(dateRange.from),
+          new Date(dateRange.to),
+          granularity,
+          granularityToDateFormat(granularity),
+          []
+        );
+        return { metric: params.metric, granularity, data: data2 };
+      }
+      baseMatch.event_name = { $in: conversionEvents };
+    }
     const dateFormat = granularityToDateFormat(granularity);
     let pipeline;
     if (params.metric === "visitors" || params.metric === "sessions") {
       const groupField = params.metric === "visitors" ? "$visitor_id" : "$session_id";
       pipeline = [
-        { $match: baseMatch },
+        { $match: { ...baseMatch, ...filterMatch } },
         {
           $group: {
             _id: {
@@ -1240,7 +1953,7 @@ var MongoDBAdapter = class {
       ];
     } else {
       pipeline = [
-        { $match: baseMatch },
+        { $match: { ...baseMatch, ...filterMatch } },
         {
           $group: {
             _id: { $dateToString: { format: dateFormat, date: "$timestamp" } },
@@ -1321,7 +2034,12 @@ var MongoDBAdapter = class {
     const offset = params.offset ?? 0;
     const match = { site_id: params.siteId };
     if (params.type) match.type = params.type;
-    if (params.eventName) match.event_name = params.eventName;
+    if (params.eventName) {
+      match.event_name = params.eventName;
+    } else if (params.eventNames && params.eventNames.length > 0) {
+      match.event_name = { $in: params.eventNames };
+    }
+    if (params.eventSource) match.event_source = params.eventSource;
     if (params.visitorId) match.visitor_id = params.visitorId;
     if (params.userId) match.user_id = params.userId;
     if (params.period || params.dateFrom) {
@@ -1343,23 +2061,72 @@ var MongoDBAdapter = class {
       offset
     };
   }
+  // ─── Identity Mapping ──────────────────────────────────────
+  async upsertIdentity(siteId, visitorId, userId) {
+    await this.identityMap.updateOne(
+      { site_id: siteId, visitor_id: visitorId },
+      {
+        $set: { user_id: userId, identified_at: /* @__PURE__ */ new Date() },
+        $setOnInsert: { site_id: siteId, visitor_id: visitorId, created_at: /* @__PURE__ */ new Date() }
+      },
+      { upsert: true }
+    );
+  }
+  async getVisitorIdsForUser(siteId, userId) {
+    const docs = await this.identityMap.find({ site_id: siteId, user_id: userId }).toArray();
+    return docs.map((d) => d.visitor_id);
+  }
+  async getUserIdForVisitor(siteId, visitorId) {
+    const doc = await this.identityMap.findOne({ site_id: siteId, visitor_id: visitorId });
+    return doc?.user_id ?? null;
+  }
   // ─── User Listing ──────────────────────────────────────
   async listUsers(params) {
     const limit = Math.min(params.limit ?? 50, 200);
     const offset = params.offset ?? 0;
     const match = { site_id: params.siteId };
-    if (params.search) {
-      match.$or = [
-        { visitor_id: { $regex: params.search, $options: "i" } },
-        { user_id: { $regex: params.search, $options: "i" } }
-      ];
-    }
     const pipeline = [
       { $match: match },
+      // Join with identity map to resolve visitor → user
+      {
+        $lookup: {
+          from: IDENTITY_MAP_COLLECTION,
+          let: { vid: "$visitor_id", sid: "$site_id" },
+          pipeline: [
+            { $match: { $expr: { $and: [{ $eq: ["$visitor_id", "$$vid"] }, { $eq: ["$site_id", "$$sid"] }] } } }
+          ],
+          as: "_identity"
+        }
+      },
+      {
+        $addFields: {
+          _resolved_id: {
+            $ifNull: [{ $arrayElemAt: ["$_identity.user_id", 0] }, "$visitor_id"]
+          },
+          _resolved_user_id: {
+            $arrayElemAt: ["$_identity.user_id", 0]
+          }
+        }
+      }
+    ];
+    if (params.search) {
+      pipeline.push({
+        $match: {
+          $or: [
+            { visitor_id: { $regex: params.search, $options: "i" } },
+            { user_id: { $regex: params.search, $options: "i" } },
+            { _resolved_user_id: { $regex: params.search, $options: "i" } }
+          ]
+        }
+      });
+    }
+    pipeline.push(
+      { $sort: { timestamp: 1 } },
       {
         $group: {
-          _id: "$visitor_id",
-          userId: { $last: "$user_id" },
+          _id: "$_resolved_id",
+          visitorIds: { $addToSet: "$visitor_id" },
+          userId: { $last: { $ifNull: ["$_resolved_user_id", "$user_id"] } },
           traits: { $last: "$traits" },
           firstSeen: { $min: "$timestamp" },
           lastSeen: { $max: "$timestamp" },
@@ -1367,13 +2134,22 @@ var MongoDBAdapter = class {
           totalPageviews: { $sum: { $cond: [{ $eq: ["$type", "pageview"] }, 1, 0] } },
           sessions: { $addToSet: "$session_id" },
           lastUrl: { $last: "$url" },
+          referrer: { $last: "$referrer" },
           device_type: { $last: "$device_type" },
           browser: { $last: "$browser" },
           os: { $last: "$os" },
           country: { $last: "$country" },
           city: { $last: "$city" },
           region: { $last: "$region" },
-          language: { $last: "$language" }
+          language: { $last: "$language" },
+          timezone: { $last: "$timezone" },
+          screen_width: { $last: "$screen_width" },
+          screen_height: { $last: "$screen_height" },
+          utm_source: { $last: "$utm_source" },
+          utm_medium: { $last: "$utm_medium" },
+          utm_campaign: { $last: "$utm_campaign" },
+          utm_term: { $last: "$utm_term" },
+          utm_content: { $last: "$utm_content" }
         }
       },
       { $sort: { lastSeen: -1 } },
@@ -1383,10 +2159,11 @@ var MongoDBAdapter = class {
           count: [{ $count: "total" }]
         }
       }
-    ];
+    );
     const [result] = await this.collection.aggregate(pipeline).toArray();
     const users = (result?.data ?? []).map((u) => ({
-      visitorId: u._id,
+      visitorId: u.visitorIds[0] ?? u._id,
+      visitorIds: u.visitorIds.length > 1 ? u.visitorIds : void 0,
       userId: u.userId ?? void 0,
       traits: u.traits ?? void 0,
       firstSeen: u.firstSeen.toISOString(),
@@ -1395,9 +2172,19 @@ var MongoDBAdapter = class {
       totalPageviews: u.totalPageviews,
       totalSessions: u.sessions.length,
       lastUrl: u.lastUrl ?? void 0,
+      referrer: u.referrer ?? void 0,
       device: u.device_type ? { type: u.device_type, browser: u.browser ?? "", os: u.os ?? "" } : void 0,
       geo: u.country ? { country: u.country, city: u.city ?? void 0, region: u.region ?? void 0 } : void 0,
-      language: u.language ?? void 0
+      language: u.language ?? void 0,
+      timezone: u.timezone ?? void 0,
+      screen: u.screen_width || u.screen_height ? { width: u.screen_width ?? 0, height: u.screen_height ?? 0 } : void 0,
+      utm: u.utm_source ? {
+        source: u.utm_source ?? void 0,
+        medium: u.utm_medium ?? void 0,
+        campaign: u.utm_campaign ?? void 0,
+        term: u.utm_term ?? void 0,
+        content: u.utm_content ?? void 0
+      } : void 0
     }));
     return {
       users,
@@ -1406,13 +2193,125 @@ var MongoDBAdapter = class {
       offset
     };
   }
-  async getUserDetail(siteId, visitorId) {
-    const result = await this.listUsers({ siteId, search: visitorId, limit: 1 });
-    const user = result.users.find((u) => u.visitorId === visitorId);
-    return user ?? null;
+  async getUserDetail(siteId, identifier) {
+    const visitorIds = await this.getVisitorIdsForUser(siteId, identifier);
+    if (visitorIds.length > 0) {
+      return this.getMergedUserDetail(siteId, identifier, visitorIds);
+    }
+    const userId = await this.getUserIdForVisitor(siteId, identifier);
+    if (userId) {
+      const allVisitorIds = await this.getVisitorIdsForUser(siteId, userId);
+      return this.getMergedUserDetail(siteId, userId, allVisitorIds);
+    }
+    return this.getMergedUserDetail(siteId, void 0, [identifier]);
+  }
+  async getUserEvents(siteId, identifier, params) {
+    let visitorIds = await this.getVisitorIdsForUser(siteId, identifier);
+    if (visitorIds.length === 0) {
+      const userId = await this.getUserIdForVisitor(siteId, identifier);
+      if (userId) {
+        visitorIds = await this.getVisitorIdsForUser(siteId, userId);
+      }
+    }
+    if (visitorIds.length === 0) {
+      visitorIds = [identifier];
+    }
+    return this.listEventsForVisitorIds(siteId, visitorIds, params);
   }
-  async getUserEvents(siteId, visitorId, params) {
-    return this.listEvents({ ...params, siteId, visitorId });
+  async getMergedUserDetail(siteId, userId, visitorIds) {
+    const pipeline = [
+      { $match: { site_id: siteId, visitor_id: { $in: visitorIds } } },
+      { $sort: { timestamp: 1 } },
+      {
+        $group: {
+          _id: null,
+          visitorIds: { $addToSet: "$visitor_id" },
+          traits: { $last: "$traits" },
+          firstSeen: { $min: "$timestamp" },
+          lastSeen: { $max: "$timestamp" },
+          totalEvents: { $sum: 1 },
+          totalPageviews: { $sum: { $cond: [{ $eq: ["$type", "pageview"] }, 1, 0] } },
+          sessions: { $addToSet: "$session_id" },
+          lastUrl: { $last: "$url" },
+          referrer: { $last: "$referrer" },
+          device_type: { $last: "$device_type" },
+          browser: { $last: "$browser" },
+          os: { $last: "$os" },
+          country: { $last: "$country" },
+          city: { $last: "$city" },
+          region: { $last: "$region" },
+          language: { $last: "$language" },
+          timezone: { $last: "$timezone" },
+          screen_width: { $last: "$screen_width" },
+          screen_height: { $last: "$screen_height" },
+          utm_source: { $last: "$utm_source" },
+          utm_medium: { $last: "$utm_medium" },
+          utm_campaign: { $last: "$utm_campaign" },
+          utm_term: { $last: "$utm_term" },
+          utm_content: { $last: "$utm_content" }
+        }
+      }
+    ];
+    const [row] = await this.collection.aggregate(pipeline).toArray();
+    if (!row) return null;
+    return {
+      visitorId: visitorIds[0],
+      visitorIds: row.visitorIds.length > 1 ? row.visitorIds : void 0,
+      userId: userId ?? void 0,
+      traits: row.traits ?? void 0,
+      firstSeen: row.firstSeen.toISOString(),
+      lastSeen: row.lastSeen.toISOString(),
+      totalEvents: row.totalEvents,
+      totalPageviews: row.totalPageviews,
+      totalSessions: row.sessions.length,
+      lastUrl: row.lastUrl ?? void 0,
+      referrer: row.referrer ?? void 0,
+      device: row.device_type ? { type: row.device_type, browser: row.browser ?? "", os: row.os ?? "" } : void 0,
+      geo: row.country ? { country: row.country, city: row.city ?? void 0, region: row.region ?? void 0 } : void 0,
+      language: row.language ?? void 0,
+      timezone: row.timezone ?? void 0,
+      screen: row.screen_width || row.screen_height ? { width: row.screen_width ?? 0, height: row.screen_height ?? 0 } : void 0,
+      utm: row.utm_source ? {
+        source: row.utm_source ?? void 0,
+        medium: row.utm_medium ?? void 0,
+        campaign: row.utm_campaign ?? void 0,
+        term: row.utm_term ?? void 0,
+        content: row.utm_content ?? void 0
+      } : void 0
+    };
+  }
+  async listEventsForVisitorIds(siteId, visitorIds, params) {
+    const limit = Math.min(params.limit ?? 50, 200);
+    const offset = params.offset ?? 0;
+    const match = {
+      site_id: siteId,
+      visitor_id: { $in: visitorIds }
+    };
+    if (params.type) match.type = params.type;
+    if (params.eventName) {
+      match.event_name = params.eventName;
+    } else if (params.eventNames && params.eventNames.length > 0) {
+      match.event_name = { $in: params.eventNames };
+    }
+    if (params.eventSource) match.event_source = params.eventSource;
+    if (params.period || params.dateFrom) {
+      const { dateRange } = resolvePeriod({
+        period: params.period,
+        dateFrom: params.dateFrom,
+        dateTo: params.dateTo
+      });
+      match.timestamp = { $gte: new Date(dateRange.from), $lte: new Date(dateRange.to) };
+    }
+    const [events, countResult] = await Promise.all([
+      this.collection.find(match).sort({ timestamp: -1 }).skip(offset).limit(limit).toArray(),
+      this.collection.countDocuments(match)
+    ]);
+    return {
+      events: events.map((e) => this.toEventListItem(e)),
+      total: countResult,
+      limit,
+      offset
+    };
   }
   toEventListItem(doc) {
     return {
@@ -1426,6 +2325,13 @@ var MongoDBAdapter = class {
       title: doc.title ?? void 0,
       name: doc.event_name ?? void 0,
       properties: doc.properties ?? void 0,
+      eventSource: doc.event_source ? doc.event_source : void 0,
+      eventSubtype: doc.event_subtype ? doc.event_subtype : void 0,
+      pagePath: doc.page_path ?? void 0,
+      targetUrlPath: doc.target_url_path ?? void 0,
+      elementSelector: doc.element_selector ?? void 0,
+      elementText: doc.element_text ?? void 0,
+      scrollDepthPct: doc.scroll_depth_pct ?? void 0,
       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,
@@ -1449,6 +2355,7 @@ var MongoDBAdapter = class {
       name: data.name,
       domain: data.domain ?? null,
       allowed_origins: data.allowedOrigins ?? null,
+      conversion_events: data.conversionEvents ?? null,
       created_at: now,
       updated_at: now
     };
@@ -1472,6 +2379,7 @@ var MongoDBAdapter = class {
     if (data.name !== void 0) updates.name = data.name;
     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;
     const result = await this.sites.findOneAndUpdate(
       { site_id: siteId },
       { $set: updates },
@@ -1502,6 +2410,7 @@ var MongoDBAdapter = class {
       name: doc.name,
       domain: doc.domain ?? void 0,
       allowedOrigins: doc.allowed_origins ?? void 0,
+      conversionEvents: doc.conversion_events ?? void 0,
       createdAt: doc.created_at.toISOString(),
       updatedAt: doc.updated_at.toISOString()
     };
@@ -1755,6 +2664,7 @@ async function createCollector(config) {
     if (allowed) {
       res.setHeader?.("Access-Control-Allow-Origin", origin || "*");
       res.setHeader?.("Access-Control-Allow-Methods", methods);
+      res.setHeader?.("Access-Control-Allow-Credentials", "true");
       const headers = ["Content-Type", extraHeaders].filter(Boolean).join(", ");
       res.setHeader?.("Access-Control-Allow-Headers", headers);
     }
@@ -1772,6 +2682,51 @@ async function createCollector(config) {
       return { ...event, ip, geo, device };
     });
   }
+  const identityCache = /* @__PURE__ */ new Map();
+  const IDENTITY_CACHE_TTL = 5 * 60 * 1e3;
+  function getCachedUserId(siteId, visitorId) {
+    const key = `${siteId}:${visitorId}`;
+    const entry = identityCache.get(key);
+    if (!entry) return void 0;
+    if (Date.now() > entry.expires) {
+      identityCache.delete(key);
+      return void 0;
+    }
+    return entry.userId;
+  }
+  function setCachedUserId(siteId, visitorId, userId) {
+    const key = `${siteId}:${visitorId}`;
+    identityCache.set(key, { userId, expires: Date.now() + IDENTITY_CACHE_TTL });
+    if (identityCache.size > 1e4) {
+      const now = Date.now();
+      for (const [k, v] of identityCache) {
+        if (now > v.expires) identityCache.delete(k);
+      }
+    }
+  }
+  async function processIdentity(events) {
+    for (const event of events) {
+      if (!event.visitorId || event.visitorId === "server") continue;
+      if (event.type === "identify" && event.userId) {
+        await db.upsertIdentity(event.siteId, event.visitorId, event.userId);
+        setCachedUserId(event.siteId, event.visitorId, event.userId);
+      } else if (!event.userId) {
+        const cached = getCachedUserId(event.siteId, event.visitorId);
+        if (cached) {
+          event.userId = cached;
+        } else {
+          const resolved = await db.getUserIdForVisitor(event.siteId, event.visitorId);
+          if (resolved) {
+            event.userId = resolved;
+            setCachedUserId(event.siteId, event.visitorId, resolved);
+          }
+        }
+      } else if (event.userId) {
+        setCachedUserId(event.siteId, event.visitorId, event.userId);
+        await db.upsertIdentity(event.siteId, event.visitorId, event.userId);
+      }
+    }
+  }
   function extractIp(req) {
     if (config.trustProxy ?? true) {
       const forwarded = req.headers?.["x-forwarded-for"];
@@ -1785,7 +2740,14 @@ async function createCollector(config) {
   }
   function handler() {
     return async (req, res) => {
-      if (setCors(req, res, "POST, OPTIONS")) return;
+      res.setHeader?.("Access-Control-Allow-Origin", "*");
+      res.setHeader?.("Access-Control-Allow-Methods", "POST, OPTIONS");
+      res.setHeader?.("Access-Control-Allow-Headers", "Content-Type");
+      if (req.method === "OPTIONS") {
+        res.writeHead?.(204);
+        res.end?.();
+        return;
+      }
       if (req.method !== "POST") {
         sendJson(res, 405, { ok: false, error: "Method not allowed" });
         return;
@@ -1826,11 +2788,13 @@ async function createCollector(config) {
               sendJson(res, 200, { ok: true });
               return;
             }
+            await processIdentity(filtered);
             await db.insertEvents(filtered);
             sendJson(res, 200, { ok: true });
             return;
           }
         }
+        await processIdentity(enriched);
         await db.insertEvents(enriched);
         sendJson(res, 200, { ok: true });
       } catch (err) {
@@ -1864,8 +2828,13 @@ async function createCollector(config) {
             period: params.period,
             dateFrom: params.dateFrom,
             dateTo: params.dateTo,
-            granularity: q.granularity
+            granularity: q.granularity,
+            filters: q.filters ? JSON.parse(q.filters) : void 0
           };
+          if (tsParams.metric === "conversions") {
+            const site = await db.getSite(params.siteId);
+            tsParams.conversionEvents = site?.conversionEvents ?? [];
+          }
           const result2 = await db.queryTimeSeries(tsParams);
           sendJson(res, 200, result2);
           return;
@@ -1881,7 +2850,15 @@ async function createCollector(config) {
           sendJson(res, 200, result2);
           return;
         }
-        const result = await db.query(params);
+        const isConversionMetric = params.metric === "conversions" || params.metric === "top_conversions";
+        let result;
+        if (isConversionMetric) {
+          const site = await db.getSite(params.siteId);
+          const conversionEvents = site?.conversionEvents ?? [];
+          result = await db.query({ ...params, conversionEvents });
+        } else {
+          result = await db.query(params);
+        }
         sendJson(res, 200, result);
       } catch (err) {
         sendJson(res, 500, { ok: false, error: err instanceof Error ? err.message : "Internal error" });
@@ -1978,10 +2955,13 @@ async function createCollector(config) {
           sendJson(res, 401, { ok: false, error: "Invalid or missing secret key" });
           return;
         }
+        const eventNames = typeof q.eventNames === "string" ? q.eventNames.split(",").map((s) => s.trim()).filter(Boolean) : void 0;
         const params = {
           siteId: q.siteId,
           type: q.type,
           eventName: q.eventName,
+          eventNames,
+          eventSource: q.eventSource,
           visitorId: q.visitorId,
           userId: q.userId,
           period: q.period,
@@ -2021,9 +3001,13 @@ async function createCollector(config) {
         const visitorId = usersIdx >= 0 ? pathSegments[usersIdx + 1] : void 0;
         const action = usersIdx >= 0 ? pathSegments[usersIdx + 2] : void 0;
         if (visitorId && action === "events") {
+          const eventNames = typeof q.eventNames === "string" ? q.eventNames.split(",").map((s) => s.trim()).filter(Boolean) : void 0;
           const params2 = {
             siteId: q.siteId,
             type: q.type,
+            eventName: q.eventName,
+            eventNames,
+            eventSource: q.eventSource,
             period: q.period,
             dateFrom: q.dateFrom,
             dateTo: q.dateTo,
@@ -2071,11 +3055,11 @@ async function createCollector(config) {
     async listUsers(params) {
       return db.listUsers(params);
     },
-    async getUserDetail(siteId, visitorId) {
-      return db.getUserDetail(siteId, visitorId);
+    async getUserDetail(siteId, identifier) {
+      return db.getUserDetail(siteId, identifier);
     },
-    async getUserEvents(siteId, visitorId, params) {
-      return db.getUserEvents(siteId, visitorId, params);
+    async getUserEvents(siteId, identifier, params) {
+      return db.getUserEvents(siteId, identifier, params);
     },
     async track(siteId, name, properties, options) {
       const event = {
@@ -2130,7 +3114,8 @@ function createAdapter(config) {
   }
 }
 async function parseBody(req) {
-  if (req.body) return req.body;
+  if (req.body && typeof req.body === "object") return req.body;
+  if (typeof req.body === "string") return JSON.parse(req.body);
   return new Promise((resolve, reject) => {
     let data = "";
     req.on("data", (chunk) => {