@litemetrics/node 0.1.2 → 0.2.0

package/dist/index.cjs

@@ -179,6 +179,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(),
@@ -217,6 +229,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)
@@ -228,6 +247,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),
@@ -243,6 +263,65 @@ function toCHDateTime(d) {
   const iso = typeof d === "string" ? d : d.toISOString();
   return iso.replace("T", " ").replace("Z", "");
 }
+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: {} };
   const map = {
@@ -253,6 +332,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",
@@ -269,7 +352,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;
@@ -289,6 +379,7 @@ 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)` });
@@ -299,6 +390,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();
@@ -341,7 +440,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,
@@ -546,8 +652,8 @@ var ClickHouseAdapter = class {
       }
       case "top_exit_pages": {
         const rows = await this.queryRows(
-          `SELECT url AS key, count() AS value FROM (
-             SELECT session_id, argMax(url, timestamp) AS url
+          `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}
@@ -556,7 +662,7 @@ var ClickHouseAdapter = class {
                AND url IS NOT NULL${filterSql}
              GROUP BY session_id
            )
-           GROUP BY url
+           GROUP BY exit_url
            ORDER BY value DESC
            LIMIT {limit:UInt32}`,
           { ...params, ...filter.params }
@@ -567,9 +673,9 @@ var ClickHouseAdapter = class {
       }
       case "top_transitions": {
         const rows = await this.queryRows(
-          `SELECT concat(prev_url, ' \u2192 ', url) AS key, count() AS value FROM (
-             SELECT session_id, url,
-                    lag(url) OVER (PARTITION BY session_id ORDER BY timestamp) AS prev_url
+          `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}
@@ -577,7 +683,7 @@ var ClickHouseAdapter = class {
                AND type = 'pageview'
                AND url IS NOT NULL${filterSql}
            )
-           WHERE prev_url IS NOT NULL
+           WHERE prev_url IS NOT NULL AND prev_url != ''
            GROUP BY key
            ORDER BY value DESC
            LIMIT {limit:UInt32}`,
@@ -692,6 +798,159 @@ 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 ${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 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_utm_mediums": {
+        const rows = await this.queryRows(
+          `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 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_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);
+        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)) {
@@ -945,45 +1204,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(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 ${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
       )
@@ -1019,13 +1292,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 last_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.last_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) {
@@ -1036,6 +1474,7 @@ var ClickHouseAdapter = class {
       siteId: generateSiteId(),
       secretKey: generateSecretKey(),
       name: data.name,
+      type: data.type ?? "web",
       domain: data.domain,
       allowedOrigins: data.allowedOrigins,
       conversionEvents: data.conversionEvents,
@@ -1048,6 +1487,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,
@@ -1062,7 +1502,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 }
@@ -1071,7 +1511,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 }
@@ -1080,7 +1520,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`,
@@ -1090,7 +1530,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 }
@@ -1102,6 +1542,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;
@@ -1111,6 +1552,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,
@@ -1125,6 +1567,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,
@@ -1134,7 +1577,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 }
@@ -1148,6 +1591,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,
@@ -1162,7 +1606,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 }
@@ -1179,6 +1623,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,
@@ -1193,6 +1638,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,
@@ -1214,6 +1660,7 @@ 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,
@@ -1276,6 +1723,131 @@ var ClickHouseAdapter = class {
 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 = {
@@ -1286,6 +1858,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",
@@ -1301,7 +1877,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;
@@ -1311,6 +1889,7 @@ var MongoDBAdapter = class {
   db;
   collection;
   sites;
+  identityMap;
   constructor(url) {
     this.client = new import_mongodb.MongoClient(url);
   }
@@ -1319,13 +1898,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) {
@@ -1366,6 +1948,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);
@@ -1379,12 +1968,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;
@@ -1393,7 +1992,7 @@ var MongoDBAdapter = class {
       }
       case "visitors": {
         const [result2] = await this.collection.aggregate([
-          { $match: { ...baseMatch, ...filterMatch } },
+          ...matchStages(),
           { $group: { _id: "$visitor_id" } },
           { $count: "count" }
         ]).toArray();
@@ -1403,7 +2002,7 @@ var MongoDBAdapter = class {
       }
       case "sessions": {
         const [result2] = await this.collection.aggregate([
-          { $match: { ...baseMatch, ...filterMatch } },
+          ...matchStages(),
           { $group: { _id: "$session_id" } },
           { $count: "count" }
         ]).toArray();
@@ -1413,7 +2012,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;
@@ -1428,7 +2027,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;
@@ -1437,7 +2036,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 }
@@ -1448,7 +2047,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 }
@@ -1459,7 +2058,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 } },
@@ -1471,7 +2070,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 } },
@@ -1483,7 +2082,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 }
@@ -1500,7 +2099,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 }
@@ -1511,7 +2110,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 } } },
@@ -1524,7 +2123,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",
@@ -1545,7 +2144,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 }
@@ -1556,15 +2155,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 }
@@ -1575,15 +2170,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 }
@@ -1594,7 +2185,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 } },
@@ -1606,7 +2197,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 } },
@@ -1618,7 +2209,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 } },
@@ -1628,6 +2219,117 @@ 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([
+          ...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 }
+        ]).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([
+          ...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 }
+        ]).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([
+          ...matchStages({ 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;
+      }
+      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)) {
@@ -1816,24 +2518,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" },
@@ -1866,10 +2616,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(),
@@ -1899,13 +2650,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 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 getUserEvents(siteId, visitorId, params) {
-    return this.listEvents({ ...params, siteId, visitorId });
+  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 {
@@ -1929,7 +2792,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,
@@ -1947,6 +2821,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,
@@ -1971,6 +2846,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;
@@ -2002,6 +2878,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,
@@ -2270,12 +3147,74 @@ 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 };
     });
   }
+  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"];
@@ -2287,6 +3226,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", "*");
@@ -2312,6 +3267,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 });
@@ -2319,29 +3280,20 @@ 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 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;
           }
         }
+        await processIdentity(enriched);
         await db.insertEvents(enriched);
         sendJson(res, 200, { ok: true });
       } catch (err) {
@@ -2602,11 +3554,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 = {