Merge branch 'master' into next

ar2rsawseen · ar2rsawseen · commit 775be2ab6d1a · 2026-01-14T19:12:20.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## Version 25.03.32
+Fixes:
+- [core] Filtering out internal events while calculating top events
+- [fix] Data Regeneration Error
+- [onboarding] Fix redirection to newsletter page
+- [push] Message cancellation doesn't work on cohort exit
+
 ## Version 25.03.31
 Fixes:
 - [core] Add null checking for user permission when opening the dashboard
diff --git a/README.md b/README.md
@@ -15,19 +15,42 @@
 
 ## 🌟 What is Countly?
 
-Countly is a product analytics platform that helps teams track, analyze and act on their user actions and behaviour on mobile, web and desktop applications. 
+Countly is a **privacy-first, AI-ready analytics and customer engagement platform** built for organizations that require **full data ownership and deployment flexibility**.
 
-Countly is used to track 1.5B unique identities on more than 16,000 applications via 2,000+ servers worldwide. It securely processes billions of data points every day in the cloud and on-premises, enabling teams of all sizes to build better applications and engaging experiences while maintaining full control over their product analytics data flow.
+Unlike traditional SaaS-only analytics tools, Countly can be deployed **on-premises or in a private cloud**, giving you complete control over your data, infrastructure, compliance, and security.
 
-## 🚀 What are the Countly editions?                   
+Teams use Countly to:
+* Understand user behavior across **mobile, web, desktop, and connected devices**
+* Optimize product and customer experiences in **real time**
+* Automate and personalize customer engagement across channels
 
-* **Countly Lite** — Essential plugins/features and a free-to-use, open source, non-commercial license. Available as self-hosted. Suitable for individuals and small organizations.
-* **Countly Enterprise** — Offers a wider range of plugins/features, granular data, an SLA, and direct support. Available as self-hosted or Countly hosted/managed. Suitable for medium and large organizations.
-* **Countly Flex** — Our SaaS platform that offers some Enterprise features as core features, and some others as add-ons. Everyone gets their dedicated and fully-managed Countly server(s) in the region they choose. Suitable for individuals, small and medium-sized organizations.  
+With **flexible data tracking**, **customizable dashboards**, and a **modular plugin-based architecture**, Countly scales with your product while ensuring long-term autonomy and zero vendor lock-in.
 
-For a detailed comparison of different editions [please check here](https://countly.com/pricing). To try the Countly Flex [please visit this page]([https://countly.com/flex](https://countly.com/flex)).
+**Built for privacy. Designed for flexibility. Ready for AI-driven innovation.**
+
+## 🚀 Countly Plans                  
+
+**Countly Lite**
+* Core analytics and essential features
+* Free to use under an open-source, non-commercial license
+* Self-hosted deployment
+* Ideal for individuals and small teams
+
+**Countly Enterprise**
+* Full analytics and engagement suite
+* Advanced features, granular data access, SLA, and direct support
+* Available as self-hosted or managed/private cloud
+* Ideal for medium and large organizations with advanced compliance needs
 
-Also, please note that SDKs of Countly are the same for all editions.
+**Countly Flex**
+* Fully managed SaaS experience with dedicated Countly servers
+* Region-based hosting selection
+* Enterprise-grade features included, with optional add-ons
+* Ideal for individuals and small-to-medium organizations wanting flexibility without infrastructure management
+
+:pushpin: **Note**: Countly SDKs are identical across all editions.
+
+For a detailed comparison of different editions [please check here](https://countly.com/pricing). To try the Countly Flex [please visit this page]([https://countly.com/flex](https://countly.com/flex)).
 
 ## 📦 What is included in this repository?
 
diff --git a/api/jobs/topEvents.js b/api/jobs/topEvents.js
@@ -35,16 +35,7 @@ class TopEventsJob extends job.Job {
     }
 
     /**
-     * If the event's name include [CLY], removed them.
-     * @param {array} eventsData - events list.
-     * @return {array} filtered data.
-     */
-    eventsFilter(eventsData) {
-        return eventsData.filter(l => !l.includes('[CLY]'));
-    }
-
-    /**
-     * 
+     *
      * @param {object} params  - params object
      * @param {object} data  - object where to collect data
      * @param {boolean} previous  - if fetching for previous period
@@ -205,51 +196,55 @@ class TopEventsJob extends job.Job {
     async getAppEvents(app) {
         log.d(app._id + ": Fetching app events");
         const getEvents = await new Promise((res, rej) => common.db.collection("events").findOne({ _id: app._id }, (errorEvents, result) => errorEvents ? rej(errorEvents) : res(result)));
-        if (getEvents && 'list' in getEvents) {
-            const eventMap = this.eventsFilter(getEvents.list);
-            if (eventMap && eventMap instanceof Array) {
-                for (const period of TopEventsJob.PERIODS) {
-                    const data = {};
-                    const sessionData = {};
-                    const usersData = {};
-                    const usersCollectionName = "users";
-                    const ob = { app_id: app._id, appTimezone: app.timezone, qstring: { period: period } };
-                    // if (period === "hour") {
-                    //     ob.time = common.initTimeObj(app.timezone, new Date().getTime());
-                    //     ob.qstring.action = "refresh";
-                    // }
-                    let totalCount = 0;
-                    let prevTotalCount = 0;
-                    let totalSum = 0;
-                    let prevTotalSum = 0;
-                    let totalDuration = 0;
-                    let prevTotalDuration = 0;
-
-                    //Fetching totals for this period
-                    await this.fetchEventTotalCounts({ app_id: app._id, appTimezone: app.timezone, qstring: { period: period } }, data, false);
-                    var period2 = countlyCommon.getPeriodObj({appTimezone: app.timezone, qstring: {}}, period);
-                    var newPeriod = [period2.start - (period2.end - period2.start), period2.start];
-                    //Fetching totals for previous period
-                    await this.fetchEventTotalCounts({ app_id: app._id, appTimezone: app.timezone, qstring: { period: newPeriod } }, data, true);
+        if (Array.isArray(getEvents?.list)) {
+            for (const period of TopEventsJob.PERIODS) {
+                const data = {};
+                const sessionData = {};
+                const usersData = {};
+                const usersCollectionName = "users";
+                const ob = { app_id: app._id, appTimezone: app.timezone, qstring: { period: period } };
+                // if (period === "hour") {
+                //     ob.time = common.initTimeObj(app.timezone, new Date().getTime());
+                //     ob.qstring.action = "refresh";
+                // }
+                let totalCount = 0;
+                let prevTotalCount = 0;
+                let totalSum = 0;
+                let prevTotalSum = 0;
+                let totalDuration = 0;
+                let prevTotalDuration = 0;
 
+                //Fetching totals for this period
+                await this.fetchEventTotalCounts({ app_id: app._id, appTimezone: app.timezone, qstring: { period: period } }, data, false);
+                var period2 = countlyCommon.getPeriodObj({appTimezone: app.timezone, qstring: {}}, period);
+                var newPeriod = [period2.start - (period2.end - period2.start), period2.start];
+                //Fetching totals for previous period
+                await this.fetchEventTotalCounts({ app_id: app._id, appTimezone: app.timezone, qstring: { period: newPeriod } }, data, true);
+                // filter out the internal events
+                if (typeof data === "object") {
+                    Object.keys(data).forEach((key) => {
+                        if (key.startsWith('[CLY]_')) {
+                            delete data[key];
+                        }
+                    });
+                }
 
-                    for (var event in data) {
-                        //Calculating trend
-                        var trend = countlyCommon.getPercentChange(data[event].data.count["prev-total"], data[event].data.count.total);
-                        data[event].data.count.change = trend.percent;
-                        data[event].data.count.trend = trend.trend;
-                        totalCount += data[event].data.count.total;
-                        prevTotalCount += data[event].data.count["prev-total"];
-                        totalSum += data[event].data.sum.total;
-                        prevTotalSum += data[event].data.sum["prev-total"];
-                        totalDuration += data[event].data.duration.total;
-                        prevTotalDuration += data[event].data.duration["prev-total"];
-                    }
-                    log.d("    getting session count (" + period + ")");
-                    await this.getSessionCount({ ob, sessionData, usersData, usersCollectionName });
-                    log.d("    saving data (" + period + ")");
-                    await this.saveAppEvents({ app, data, sessionData, usersData, period, totalCount, prevTotalCount, totalSum, prevTotalSum, totalDuration, prevTotalDuration });
+                for (var event in data) {
+                    //Calculating trend
+                    var trend = countlyCommon.getPercentChange(data[event].data.count["prev-total"], data[event].data.count.total);
+                    data[event].data.count.change = trend.percent;
+                    data[event].data.count.trend = trend.trend;
+                    totalCount += data[event].data.count.total;
+                    prevTotalCount += data[event].data.count["prev-total"];
+                    totalSum += data[event].data.sum.total;
+                    prevTotalSum += data[event].data.sum["prev-total"];
+                    totalDuration += data[event].data.duration.total;
+                    prevTotalDuration += data[event].data.duration["prev-total"];
                 }
+                log.d("    getting session count (" + period + ")");
+                await this.getSessionCount({ ob, sessionData, usersData, usersCollectionName });
+                log.d("    saving data (" + period + ")");
+                await this.saveAppEvents({ app, data, sessionData, usersData, period, totalCount, prevTotalCount, totalSum, prevTotalSum, totalDuration, prevTotalDuration });
             }
         }
         else {
diff --git a/frontend/express/public/core/onboarding/javascripts/countly.views.js b/frontend/express/public/core/onboarding/javascripts/countly.views.js
@@ -267,11 +267,6 @@
                 var countly_newsletter = doc.countly_newsletter;
                 delete doc.countly_newsletter;
 
-                this.$store.dispatch('countlyOnboarding/updateUserNewsletter', {
-                    user_id: countlyGlobal.member._id,
-                    subscribe_newsletter: countly_newsletter,
-                });
-
                 if (countly_newsletter) {
                     this.$store.dispatch('countlyOnboarding/sendNewsletterSubscription', {
                         name: countlyGlobal.member.full_name.split(' ')[0],
@@ -280,9 +275,15 @@
                     });
                 }
 
-                // go home
-                window.location.href = '#/home';
-                window.location.reload();
+                this.$store.dispatch('countlyOnboarding/updateUserNewsletter', {
+                    user_id: countlyGlobal.member._id,
+                    subscribe_newsletter: countly_newsletter,
+                }).finally(function() {
+                    countlyGlobal.member.subscribe_newsletter = countly_newsletter;
+                    // go home
+                    window.location.href = '#/home';
+                    window.location.reload();
+                });
             },
         }
     });
@@ -345,12 +346,19 @@
         }
     });
 
-    if (hasNewsLetter && (typeof countlyGlobal.member.subscribe_newsletter !== 'boolean' && !store.get('disable_newsletter_prompt') && (countlyGlobal.member.login_count === 3 || moment().dayOfYear() % 90 === 0))) {
+    if (
+        hasNewsLetter &&
+        (
+            typeof countlyGlobal.member.subscribe_newsletter !== 'boolean' &&
+            store.get('disable_newsletter_prompt') === false &&
+            (countlyGlobal.member.login_count === 3 || moment().dayOfYear() % 90 === 0)
+        )
+    ) {
         if (Backbone.history.fragment !== '/not-subscribed-newsletter' && !/initial-setup|initial-consent/.test(window.location.hash)) {
             app.navigate("/not-subscribed-newsletter", true);
         }
     }
     else if (!countlyGlobal.member.subscribe_newsletter && (countlyGlobal.member.login_count !== 3 && moment().dayOfYear() % 90 !== 0)) {
         store.set('disable_newsletter_prompt', false);
     }
-})();
+})();
diff --git a/plugins/push/api/api-auto.js b/plugins/push/api/api-auto.js
@@ -48,15 +48,8 @@ module.exports.autoOnCohort = function(entry, cohort, uids) {
             // adding messages to queue
             if (trigger) {
                 logCohorts.d('processing %s %s', typ, msg._id);
-                audience.getApp().then(() => {
-                    audience.push(trigger).setUIDs(uids).setStart(new Date()).run().then(result => {
-                        logCohorts.d('processing %s %s, result: %j', typ, msg._id, result);
-                        if (result.total) {
-                            return msg.update({$inc: {'result.total': result.total}}, () => {
-                                msg.result.total += result.total;
-                            });
-                        }
-                    }).then(() => {
+                audience.getApp().then(async() => {
+                    audience.push(trigger).setUIDs(uids).setStart(new Date()).run().then(() => {
                         logCohorts.d('done processing %s %s', typ, msg._id);
                     }).catch(error => {
                         logCohorts.e('Error while pushing users to cohorted message queue %s %s', typ, msg._id, error);
diff --git a/plugins/push/api/send/audience.js b/plugins/push/api/send/audience.js
@@ -756,16 +756,22 @@ class Popper extends PusherPopper {
      */
     async run() {
         this.audience.log.i('popping %d uids from %s', this.uids.length, this.audience.message._id);
+        return this.clear(this.uids);
     }
 
     /**
-     * Remove all message pushes
-     * 
+     * Remove all message pushes or those for specified uids
+     *
+     * @param {string[]} uids optional array of uids to remove pushes for
      * @returns {number} number of records removed
      */
-    async clear() {
+    async clear(uids) {
         let deleted = await Promise.all(this.audience.platformsWithVirtuals().map(async p => {
-            let res = await common.db.collection('push').deleteMany({m: this.audience.message._id, p});
+            const query = {m: this.audience.message._id, p};
+            if (uids) {
+                query.u = { $in: uids };
+            }
+            let res = await common.db.collection('push').deleteMany(query);
             return {p, deleted: res.deletedCount};
         }));
         let update;
@@ -775,7 +781,9 @@ class Popper extends PusherPopper {
             }
             update.$inc['result.processed'] = (update.$inc['result.processed'] || 0) + obj.deleted;
             update.$inc['result.errored'] = (update.$inc['result.errored'] || 0) + obj.deleted;
-            update.$inc[`result.errors.${obj.p}.cancelled`] = (update.$inc[`result.errors.${obj.p}.cancelled`] || 0) + obj.deleted;
+            update.$inc[`result.errors.cancelled`] = (update.$inc[`result.errors.cancelled`] || 0) + obj.deleted;
+            update.$inc[`result.subs.${obj.p}.errors.cancelled`] = (update.$inc[`result.subs.${obj.p}.errors.cancelled`] || 0) + obj.deleted;
+            update.$inc[`result.subs.${obj.p}.errored`] = (update.$inc[`result.subs.${obj.p}.errored`] || 0) + obj.deleted;
         }
         if (update) {
             await this.audience.message.update(update, () => {
