@reachy/audience-module 1.0.18 → 1.0.20

package/dist/engine/V2AudienceEngine.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.V2AudienceEngine = void 0;
 const CriteriaParser_1 = require("../builders/CriteriaParser");
+const ClickHouseEventQueryExecutor_1 = require("../executors/ClickHouseEventQueryExecutor");
 const getByPath = (obj, dottedPath) => {
     if (!obj || !dottedPath)
         return undefined;
@@ -315,13 +316,22 @@ const applyEventRuleFilters = (rows, filters, opts) => {
 };
 class V2AudienceEngine {
     constructor(params) {
+        this.chExecutor = null;
         this.supabase = params.supabaseClient;
         this.debug = !!params.debug;
         this.logger = params.logger || console;
+        if (params.clickhouseClient) {
+            this.chExecutor = new ClickHouseEventQueryExecutor_1.ClickHouseEventQueryExecutor(params.clickhouseClient, params.logger || console);
+            if (this.debug)
+                this.logger.log('[V2AudienceEngine] ClickHouse executor initialized');
+        }
     }
-    async getContactIdsByAudienceCriteriaV2(organizationId, projectId, criteriaRaw) {
-        let criteria = CriteriaParser_1.CriteriaParser.parse(criteriaRaw);
-        let projectTimezone = 'UTC';
+    async getProjectTimezone(organizationId, projectId) {
+        const cacheKey = `${organizationId}:${projectId}`;
+        const cached = V2AudienceEngine._tzCache.get(cacheKey);
+        if (cached && Date.now() - cached.fetchedAt < V2AudienceEngine.TZ_CACHE_TTL) {
+            return cached.tz;
+        }
         try {
             const { data } = await this.supabase
                 .from('projects')
@@ -330,12 +340,20 @@ class V2AudienceEngine {
                 .eq('id', projectId)
                 .single();
             const tzCandidate = data?.settings?.timezone;
-            if (typeof tzCandidate === 'string' && isValidIanaTimezone(tzCandidate)) {
-                projectTimezone = tzCandidate.trim();
-            }
+            const tz = (typeof tzCandidate === 'string' && isValidIanaTimezone(tzCandidate))
+                ? tzCandidate.trim()
+                : 'UTC';
+            V2AudienceEngine._tzCache.set(cacheKey, { tz, fetchedAt: Date.now() });
+            return tz;
         }
         catch {
+            V2AudienceEngine._tzCache.set(cacheKey, { tz: 'UTC', fetchedAt: Date.now() });
+            return 'UTC';
         }
+    }
+    async getContactIdsByAudienceCriteriaV2(organizationId, projectId, criteriaRaw) {
+        let criteria = CriteriaParser_1.CriteriaParser.parse(criteriaRaw);
+        const projectTimezone = await this.getProjectTimezone(organizationId, projectId);
         if ((!Array.isArray(criteria.groups) || criteria.groups.length === 0) &&
             (Array.isArray(criteria.filters) || Array.isArray(criteria.conditions))) {
             criteria = coerceCriteriaToGroups(criteria);
@@ -351,7 +369,8 @@ class V2AudienceEngine {
             return new Set();
         }
         const typeId = String(criteria?.type || '');
-        const fetchAll = async (baseQuery, pageSize) => {
+        const MAX_FETCH_ROWS = 500000;
+        const fetchAll = async (baseQuery, pageSize, maxRows = MAX_FETCH_ROWS) => {
             let offset = 0;
             let out = [];
             while (true) {
@@ -361,35 +380,72 @@ class V2AudienceEngine {
                 if (!data || data.length === 0)
                     break;
                 out = out.concat(data);
+                if (out.length >= maxRows) {
+                    this.dlog('fetchAll: max rows reached', { maxRows, fetched: out.length });
+                    break;
+                }
                 if (data.length < pageSize)
                     break;
                 offset += pageSize;
             }
             return out;
         };
-        const allContacts = await fetchAll(this.supabase
-            .from('contacts')
-            .select('id, reachy_id, email')
-            .eq('organization_id', organizationId)
-            .eq('project_id', projectId), 1000);
-        const allContactIds = new Set((allContacts || []).map((c) => c.id));
-        const reachyIdToContactId = new Map();
-        const contactIdToReachyId = new Map();
-        const emailToContactId = new Map();
-        for (const c of allContacts || []) {
-            const rid = c?.reachy_id ? String(c.reachy_id).trim() : '';
-            const cid = c?.id ? String(c.id).trim() : '';
-            if (rid && cid) {
-                reachyIdToContactId.set(rid, cid);
-                contactIdToReachyId.set(cid, rid);
+        const groups = criteria.groups;
+        const hasNegate = groups.some((g) => (g.rules || []).some((r) => r.negate));
+        const hasEventRules = groups.some((g) => (g.rules || []).some((r) => r.kind === 'event'));
+        let allContactIds = new Set();
+        let reachyIdToContactId = new Map();
+        let contactIdToReachyId = new Map();
+        let emailToContactId = new Map();
+        let _contactsLoaded = false;
+        const ensureContactsLoaded = async () => {
+            if (_contactsLoaded)
+                return;
+            _contactsLoaded = true;
+            const allContacts = await fetchAll(this.supabase
+                .from('contacts')
+                .select('id, reachy_id, email')
+                .eq('organization_id', organizationId)
+                .eq('project_id', projectId), 1000);
+            allContactIds = new Set((allContacts || []).map((c) => c.id));
+            for (const c of allContacts || []) {
+                const rid = c?.reachy_id ? String(c.reachy_id).trim() : '';
+                const cid = c?.id ? String(c.id).trim() : '';
+                if (rid && cid) {
+                    reachyIdToContactId.set(rid, cid);
+                    contactIdToReachyId.set(cid, rid);
+                }
+                const email = c?.email ? String(c.email).trim().toLowerCase() : '';
+                if (email && cid)
+                    emailToContactId.set(email, cid);
             }
-            const email = c?.email ? String(c.email).trim().toLowerCase() : '';
-            if (email && cid)
-                emailToContactId.set(email, cid);
+        };
+        if (hasNegate || hasEventRules) {
+            await ensureContactsLoaded();
         }
-        const union = (a, b) => new Set([...a, ...b]);
-        const intersect = (a, b) => new Set([...a].filter(x => b.has(x)));
-        const diff = (a, b) => new Set([...a].filter(x => !b.has(x)));
+        const union = (a, b) => {
+            const result = new Set(a);
+            for (const x of b)
+                result.add(x);
+            return result;
+        };
+        const intersect = (a, b) => {
+            const [smaller, larger] = a.size <= b.size ? [a, b] : [b, a];
+            const result = new Set();
+            for (const x of smaller) {
+                if (larger.has(x))
+                    result.add(x);
+            }
+            return result;
+        };
+        const diff = (a, b) => {
+            const result = new Set();
+            for (const x of a) {
+                if (!b.has(x))
+                    result.add(x);
+            }
+            return result;
+        };
         const resolveEventContactId = (row) => {
             const rawReachyId = row?.reachy_id ? String(row.reachy_id).trim() : '';
             if (rawReachyId) {
@@ -416,12 +472,33 @@ class V2AudienceEngine {
         };
         const evalEventRule = async (rule) => {
             const cfg = criteria?.config || {};
+            if (this.chExecutor) {
+                try {
+                    return await this.chExecutor.execute(rule, criteria, organizationId, projectId, projectTimezone, reachyIdToContactId, contactIdToReachyId, allContactIds);
+                }
+                catch (chErr) {
+                    this.logger.warn('[V2AudienceEngine] ClickHouse evalEventRule failed, falling back to Supabase:', chErr);
+                }
+            }
             const effectiveEventName = cfg.eventType && String(cfg.eventType).trim() !== ''
                 ? String(cfg.eventType)
                 : String(rule.eventName);
+            const ruleFiltersPrecheck = Array.isArray(rule.filters) ? rule.filters : [];
+            const needsEventData = !!((rule.interest && rule.interest.key) ||
+                ruleFiltersPrecheck.some((f) => ['event_property', 'time_of_day', 'day_of_week', 'day_of_month'].includes(String(f?.type || '').trim())) ||
+                (rule.frequency && rule.frequency.type && rule.frequency.type !== 'count') ||
+                typeId === 'live-page-count');
+            const needsTimestamp = !!(ruleFiltersPrecheck.some((f) => ['first_time', 'last_time', 'time_of_day', 'day_of_week', 'day_of_month'].includes(String(f?.type || '').trim())));
+            let selectFields = 'contact_id, reachy_id';
+            if (needsEventData)
+                selectFields += ', event_data';
+            if (needsTimestamp)
+                selectFields += ', event_timestamp';
+            if (needsEventData || needsTimestamp)
+                selectFields += ', event_name';
             let query = this.supabase
                 .from('contact_events')
-                .select('contact_id, reachy_id, event_data, event_timestamp, event_name')
+                .select(selectFields)
                 .eq('organization_id', organizationId)
                 .eq('project_id', projectId)
                 .eq('event_name', effectiveEventName);
@@ -622,7 +699,8 @@ class V2AudienceEngine {
                 if (this.debug)
                     this.logger.warn('[AUDIENCE_MODULE_ENGINE] event attributes filter error');
             }
-            const data = await fetchAll(query, 500);
+            const MAX_EVENT_ROWS = 200000;
+            const data = await fetchAll(query, 1000, MAX_EVENT_ROWS);
             if (!data || data.length === 0)
                 return new Set();
             let rows = data;
@@ -1208,41 +1286,78 @@ class V2AudienceEngine {
                 return new Set();
             return new Set(data.map((r) => r.id));
         };
+        const evalRule = (rule) => rule.kind === 'event' ? evalEventRule(rule) : evalPropertyRule(rule);
         const evalGroup = async (group) => {
+            const rules = group.rules || [];
+            if (rules.length === 0)
+                return new Set();
+            const op = group.operator;
+            if (op === 'OR') {
+                const results = await Promise.all(rules.map(async (rule) => {
+                    const set = await evalRule(rule);
+                    return rule.negate ? diff(allContactIds, set) : set;
+                }));
+                let acc = results[0];
+                for (let i = 1; i < results.length; i++) {
+                    acc = union(acc, results[i]);
+                }
+                return acc;
+            }
             let acc = null;
-            for (const rule of group.rules || []) {
-                const set = rule.kind === 'event' ? await evalEventRule(rule) : await evalPropertyRule(rule);
-                const shouldNegate = rule.negate;
-                const s = shouldNegate ? diff(allContactIds, set) : set;
+            for (const rule of rules) {
+                const set = await evalRule(rule);
+                const s = rule.negate ? diff(allContactIds, set) : set;
                 if (acc == null) {
                     acc = s;
                 }
                 else {
-                    if (group.operator === 'AND')
+                    if (op === 'AND')
                         acc = intersect(acc, s);
-                    else if (group.operator === 'OR')
-                        acc = union(acc, s);
-                    else if (group.operator === 'NOT')
+                    else if (op === 'NOT')
                         acc = diff(acc, s);
                 }
+                if (acc.size === 0)
+                    return acc;
             }
             return acc || new Set();
         };
+        const allGroups = criteria.groups;
         let result = null;
-        for (let i = 0; i < criteria.groups.length; i++) {
-            const group = criteria.groups[i];
-            const gset = await evalGroup(group);
-            if (result == null) {
-                result = gset;
+        const allCombineWithOr = allGroups.length > 1 && allGroups.every((g, i) => {
+            if (i === 0)
+                return true;
+            return String(g.combineOperator || g.operator || 'AND').toUpperCase() === 'OR';
+        });
+        if (allCombineWithOr) {
+            const groupResults = await Promise.all(allGroups.map((g) => evalGroup(g)));
+            result = groupResults[0];
+            for (let i = 1; i < groupResults.length; i++) {
+                result = union(result, groupResults[i]);
             }
-            else {
-                const betweenOp = String(group.combineOperator || group.operator || 'AND').toUpperCase();
-                if (betweenOp === 'AND')
-                    result = intersect(result, gset);
-                else if (betweenOp === 'OR')
-                    result = union(result, gset);
-                else if (betweenOp === 'NOT')
-                    result = diff(result, gset);
+        }
+        else {
+            for (let i = 0; i < allGroups.length; i++) {
+                const group = allGroups[i];
+                const gset = await evalGroup(group);
+                if (result == null) {
+                    result = gset;
+                }
+                else {
+                    const betweenOp = String(group.combineOperator || group.operator || 'AND').toUpperCase();
+                    if (betweenOp === 'AND')
+                        result = intersect(result, gset);
+                    else if (betweenOp === 'OR')
+                        result = union(result, gset);
+                    else if (betweenOp === 'NOT')
+                        result = diff(result, gset);
+                }
+                if (result.size === 0) {
+                    const nextOp = i + 1 < allGroups.length
+                        ? String((allGroups[i + 1].combineOperator || allGroups[i + 1].operator || 'AND')).toUpperCase()
+                        : '';
+                    if (nextOp === 'AND' || nextOp === 'NOT')
+                        break;
+                }
             }
         }
         const finalSet = result || new Set();
@@ -1259,21 +1374,7 @@ class V2AudienceEngine {
             return false;
         }
         const typeId = String(criteria?.type || '');
-        let projectTimezone = 'UTC';
-        try {
-            const { data } = await this.supabase
-                .from('projects')
-                .select('settings')
-                .eq('organization_id', organizationId)
-                .eq('id', projectId)
-                .single();
-            const tzCandidate = data?.settings?.timezone;
-            if (typeof tzCandidate === 'string' && isValidIanaTimezone(tzCandidate)) {
-                projectTimezone = tzCandidate.trim();
-            }
-        }
-        catch {
-        }
+        const projectTimezone = await this.getProjectTimezone(organizationId, projectId);
         const { data: contactRow } = await this.supabase
             .from('contacts')
             .select('id, reachy_id, email')
@@ -1284,6 +1385,22 @@ class V2AudienceEngine {
         const reachyId = contactRow?.reachy_id ? String(contactRow.reachy_id).trim() : '';
         const evalEventRuleForContact = async (rule) => {
             const cfg = criteria?.config || {};
+            if (this.chExecutor) {
+                try {
+                    const singleContactIdToReachyId = new Map();
+                    const singleReachyIdToContactId = new Map();
+                    const singleAllContactIds = new Set([contactId]);
+                    if (reachyId) {
+                        singleReachyIdToContactId.set(reachyId, contactId);
+                        singleContactIdToReachyId.set(contactId, reachyId);
+                    }
+                    const matchSet = await this.chExecutor.execute(rule, criteria, organizationId, projectId, projectTimezone, singleReachyIdToContactId, singleContactIdToReachyId, singleAllContactIds);
+                    return matchSet.has(contactId);
+                }
+                catch (chErr) {
+                    this.logger.warn('[V2AudienceEngine] ClickHouse evalEventRuleForContact failed, falling back to Supabase:', chErr);
+                }
+            }
             const effectiveEventName = cfg.eventType && String(cfg.eventType).trim() !== ''
                 ? String(cfg.eventType)
                 : String(rule.eventName);
@@ -1948,27 +2065,37 @@ class V2AudienceEngine {
             return res;
         };
         const evalGroupForContact = async (group) => {
+            const rules = group.rules || [];
+            if (rules.length === 0)
+                return false;
+            const op = group.operator;
             let acc = null;
-            for (const rule of group.rules || []) {
+            for (const rule of rules) {
                 const r = await evalRuleForContact(rule);
-                if (acc == null)
+                if (acc == null) {
                     acc = r;
+                }
                 else {
-                    if (group.operator === 'AND')
+                    if (op === 'AND')
                         acc = acc && r;
-                    else if (group.operator === 'OR')
+                    else if (op === 'OR')
                         acc = acc || r;
-                    else if (group.operator === 'NOT')
+                    else if (op === 'NOT')
                         acc = acc && !r;
                 }
+                if (op === 'AND' && acc === false)
+                    return false;
+                if (op === 'OR' && acc === true)
+                    return true;
             }
             return !!acc;
         };
         let result = null;
         for (const group of criteria.groups) {
             const g = await evalGroupForContact(group);
-            if (result == null)
+            if (result == null) {
                 result = g;
+            }
             else {
                 const betweenOp = String(group.combineOperator || group.operator || 'AND').toUpperCase();
                 if (betweenOp === 'AND')
@@ -1978,6 +2105,15 @@ class V2AudienceEngine {
                 else if (betweenOp === 'NOT')
                     result = result && !g;
             }
+            if (result === false) {
+                const remaining = criteria.groups.slice(criteria.groups.indexOf(group) + 1);
+                const allAnd = remaining.every((g2) => {
+                    const op2 = String(g2.combineOperator || g2.operator || 'AND').toUpperCase();
+                    return op2 === 'AND' || op2 === 'NOT';
+                });
+                if (allAnd)
+                    return false;
+            }
         }
         return !!result;
     }
@@ -1988,6 +2124,8 @@ class V2AudienceEngine {
     }
 }
 exports.V2AudienceEngine = V2AudienceEngine;
+V2AudienceEngine._tzCache = new Map();
+V2AudienceEngine.TZ_CACHE_TTL = 5 * 60 * 1000;
 function jsonTextAccessor(base, key) {
     const safeKey = String(key || '').trim();
     return `${base}->>${safeKey}`;