ghost 6.8.1 → 6.9.1

package/core/server/data/tinybird/tests/api_top_utm_contents.yaml

@@ -12,28 +12,6 @@
     {"utm_content":"search_ad","visits":1}
     {"utm_content":"header_link","visits":1}
 
-- name: Filtered by browser - Chrome
-  description: Filtered by browser - Chrome
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&browser=chrome
-  expected_result: |
-    {"utm_content":"post_123","visits":1}
-    {"utm_content":"video_ad","visits":1}
-    {"utm_content":"story_789","visits":1}
-    {"utm_content":"banner_ad","visits":1}
-
-- name: Filtered by device - desktop
-  description: Filtered by device - desktop
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop
-  expected_result: |
-    {"utm_content":"post_123","visits":1}
-    {"utm_content":"video_ad","visits":1}
-    {"utm_content":"story_789","visits":1}
-    {"utm_content":"sponsored_post","visits":1}
-    {"utm_content":"tweet_456","visits":1}
-    {"utm_content":"banner_ad","visits":1}
-    {"utm_content":"search_ad","visits":1}
-    {"utm_content":"header_link","visits":1}
-
 - name: Filtered by location - UK
   description: Filtered by location - UK
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&location=GB
@@ -43,19 +21,6 @@
     {"utm_content":"banner_ad","visits":1}
     {"utm_content":"header_link","visits":1}
 
-- name: Filtered by OS - Windows
-  description: Filtered by OS - Windows
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&os=windows
-  expected_result: |
-    {"utm_content":"post_123","visits":1}
-    {"utm_content":"video_ad","visits":1}
-    {"utm_content":"story_789","visits":1}
-    {"utm_content":"sponsored_post","visits":1}
-    {"utm_content":"tweet_456","visits":1}
-    {"utm_content":"banner_ad","visits":1}
-    {"utm_content":"search_ad","visits":1}
-    {"utm_content":"header_link","visits":1}
-
 - name: Filtered by pathname - /about/
   description: Filtered by pathname - /about/
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&pathname=%2Fabout%2F
@@ -110,8 +75,7 @@
 
 - name: Test with multiple filters combined
   description: Test with multiple filters combined
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop&browser=firefox
+  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&source=bing.com&pathname=%2Fabout%2F
   expected_result: |
-    {"utm_content":"sponsored_post","visits":1}
-    {"utm_content":"tweet_456","visits":1}
-    {"utm_content":"search_ad","visits":1}
+    {"utm_content":"story_789","visits":1}
+    {"utm_content":"header_link","visits":1}

package/core/server/data/tinybird/tests/api_top_utm_mediums.yaml

@@ -10,26 +10,6 @@
     {"utm_medium":"display","visits":1}
     {"utm_medium":"email","visits":1}
 
-- name: Filtered by browser - Chrome
-  description: Filtered by browser - Chrome
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&browser=chrome
-  expected_result: |
-    {"utm_medium":"social","visits":2}
-    {"utm_medium":"organic","visits":1}
-    {"utm_medium":"referral","visits":1}
-    {"utm_medium":"display","visits":1}
-
-- name: Filtered by device - desktop
-  description: Filtered by device - desktop
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop
-  expected_result: |
-    {"utm_medium":"social","visits":5}
-    {"utm_medium":"cpc","visits":1}
-    {"utm_medium":"organic","visits":1}
-    {"utm_medium":"referral","visits":1}
-    {"utm_medium":"display","visits":1}
-    {"utm_medium":"email","visits":1}
-
 - name: Filtered by location - UK
   description: Filtered by location - UK
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&location=GB
@@ -41,17 +21,6 @@
     {"utm_medium":"display","visits":1}
     {"utm_medium":"email","visits":1}
 
-- name: Filtered by OS - Windows
-  description: Filtered by OS - Windows
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&os=windows
-  expected_result: |
-    {"utm_medium":"social","visits":5}
-    {"utm_medium":"cpc","visits":1}
-    {"utm_medium":"organic","visits":1}
-    {"utm_medium":"referral","visits":1}
-    {"utm_medium":"display","visits":1}
-    {"utm_medium":"email","visits":1}
-
 - name: Filtered by pathname - /about/
   description: Filtered by pathname - /about/
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&pathname=%2Fabout%2F
@@ -104,7 +73,7 @@
 
 - name: Test with multiple filters combined
   description: Test with multiple filters combined
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop&browser=firefox
+  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&source=bing.com&pathname=%2Fabout%2F
   expected_result: |
-    {"utm_medium":"social","visits":3}
-    {"utm_medium":"cpc","visits":1}
+    {"utm_medium":"social","visits":1}
+    {"utm_medium":"email","visits":1}

package/core/server/data/tinybird/tests/api_top_utm_sources.yaml

@@ -13,30 +13,6 @@
     {"utm_source":"partner_site","visits":1}
     {"utm_source":"newsletter","visits":1}
 
-- name: Filtered by browser - Chrome
-  description: Filtered by browser - Chrome
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&browser=chrome
-  expected_result: |
-    {"utm_source":"google","visits":1}
-    {"utm_source":"facebook","visits":1}
-    {"utm_source":"bing","visits":1}
-    {"utm_source":"instagram","visits":1}
-    {"utm_source":"partner_site","visits":1}
-
-- name: Filtered by device - desktop
-  description: Filtered by device - desktop
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop
-  expected_result: |
-    {"utm_source":"google","visits":2}
-    {"utm_source":"linkedin","visits":1}
-    {"utm_source":"twitter","visits":1}
-    {"utm_source":"facebook","visits":1}
-    {"utm_source":"bing","visits":1}
-    {"utm_source":"reddit","visits":1}
-    {"utm_source":"instagram","visits":1}
-    {"utm_source":"partner_site","visits":1}
-    {"utm_source":"newsletter","visits":1}
-
 - name: Filtered by location - UK
   description: Filtered by location - UK
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&location=GB
@@ -47,20 +23,6 @@
     {"utm_source":"partner_site","visits":1}
     {"utm_source":"newsletter","visits":1}
 
-- name: Filtered by OS - Windows
-  description: Filtered by OS - Windows
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&os=windows
-  expected_result: |
-    {"utm_source":"google","visits":2}
-    {"utm_source":"linkedin","visits":1}
-    {"utm_source":"twitter","visits":1}
-    {"utm_source":"facebook","visits":1}
-    {"utm_source":"bing","visits":1}
-    {"utm_source":"reddit","visits":1}
-    {"utm_source":"instagram","visits":1}
-    {"utm_source":"partner_site","visits":1}
-    {"utm_source":"newsletter","visits":1}
-
 - name: Filtered by pathname - /about/
   description: Filtered by pathname - /about/
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&pathname=%2Fabout%2F
@@ -120,9 +82,7 @@
 
 - name: Test with multiple filters combined
   description: Test with multiple filters combined
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop&browser=firefox
+  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&source=bing.com&pathname=%2Fabout%2F
   expected_result: |
-    {"utm_source":"linkedin","visits":1}
-    {"utm_source":"twitter","visits":1}
-    {"utm_source":"google","visits":1}
-    {"utm_source":"reddit","visits":1}
+    {"utm_source":"instagram","visits":1}
+    {"utm_source":"newsletter","visits":1}

package/core/server/data/tinybird/tests/api_top_utm_terms.yaml

@@ -11,26 +11,6 @@
     {"utm_term":"new_feature","visits":1}
     {"utm_term":"announcement","visits":1}
 
-- name: Filtered by browser - Chrome
-  description: Filtered by browser - Chrome
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&browser=chrome
-  expected_result: |
-    {"utm_term":"discount","visits":1}
-    {"utm_term":"ghost_blog","visits":1}
-    {"utm_term":"loyal_customers","visits":1}
-
-- name: Filtered by device - desktop
-  description: Filtered by device - desktop
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop
-  expected_result: |
-    {"utm_term":"discount","visits":1}
-    {"utm_term":"ghost_blog","visits":1}
-    {"utm_term":"subscribers","visits":1}
-    {"utm_term":"loyal_customers","visits":1}
-    {"utm_term":"black_friday","visits":1}
-    {"utm_term":"new_feature","visits":1}
-    {"utm_term":"announcement","visits":1}
-
 - name: Filtered by location - UK
   description: Filtered by location - UK
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&location=GB
@@ -40,18 +20,6 @@
     {"utm_term":"subscribers","visits":1}
     {"utm_term":"new_feature","visits":1}
 
-- name: Filtered by OS - Windows
-  description: Filtered by OS - Windows
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&os=windows
-  expected_result: |
-    {"utm_term":"discount","visits":1}
-    {"utm_term":"ghost_blog","visits":1}
-    {"utm_term":"subscribers","visits":1}
-    {"utm_term":"loyal_customers","visits":1}
-    {"utm_term":"black_friday","visits":1}
-    {"utm_term":"new_feature","visits":1}
-    {"utm_term":"announcement","visits":1}
-
 - name: Filtered by pathname - /about/
   description: Filtered by pathname - /about/
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&pathname=%2Fabout%2F
@@ -108,8 +76,7 @@
 
 - name: Test with multiple filters combined
   description: Test with multiple filters combined
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop&browser=firefox
+  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&source=bing.com&pathname=%2Fabout%2F
   expected_result: |
-    {"utm_term":"black_friday","visits":1}
-    {"utm_term":"new_feature","visits":1}
-    {"utm_term":"announcement","visits":1}
+    {"utm_term":"subscribers","visits":1}
+    {"utm_term":"loyal_customers","visits":1}

package/core/server/services/email-address/EmailAddressService.js

@@ -83,9 +83,12 @@ class EmailAddressService {
         if (this.#labs.isSet('domainWarmup') && options.useFallbackAddress) {
             const fallbackEmail = this.fallbackEmail;
             if (fallbackEmail) {
+                if (!fallbackEmail.name) {
+                    fallbackEmail.name = preferred.from.name || this.defaultFromEmail.name;
+                }
                 return {
                     from: fallbackEmail,
-                    replyTo: preferred.replyTo || preferred.from
+                    replyTo: preferred.replyTo || preferred.from || this.defaultFromEmail
                 };
             }
             else {

package/core/server/services/email-address/EmailAddressService.ts

@@ -120,9 +120,13 @@ export class EmailAddressService {
         if (this.#labs.isSet('domainWarmup') && options.useFallbackAddress) {
             const fallbackEmail = this.fallbackEmail;
             if (fallbackEmail) {
+                if (!fallbackEmail.name) {
+                    fallbackEmail.name = preferred.from.name || this.defaultFromEmail.name;
+                }
+
                 return {
                     from: fallbackEmail,
-                    replyTo: preferred.replyTo || preferred.from
+                    replyTo: preferred.replyTo || preferred.from || this.defaultFromEmail
                 };
             } else {
                 logging.error('[EmailAddresses] Fallback email address is not configured, cannot use fallback address for sending email.');

package/core/server/services/email-analytics/EmailAnalyticsService.js

@@ -330,22 +330,56 @@ module.exports = class EmailAnalyticsService {
 
         // We keep the processing result here, so we also have a result in case of failures
         let processingResult = new EventProcessingResult();
+        // Track cumulative event counts separately since processingResult gets reset during intermediate aggregations
+        const cumulativeResult = new EventProcessingResult();
+        // Track all unique emailIds and memberIds that need aggregation
+        const allEmailIds = new Set();
+        const allMemberIds = new Set();
         let error = null;
 
         /**
          * Process a batch of events
          * @param {Array<Object>} events - Array of event objects to process
-         * @param {EventProcessingResult} processingResult - Object to store the processing results
-         * @param {FetchData} fetchData - Object containing fetch operation data
          * @returns {Promise<void>}
          */
         const processBatch = async (events) => {
             // Even if the fetching is interrupted because of an error, we still store the last event timestamp
             const processingStart = Date.now();
+            // Capture the state before processing to calculate delta
+            const beforeCounts = {
+                opened: processingResult.opened,
+                delivered: processingResult.delivered,
+                temporaryFailed: processingResult.temporaryFailed,
+                permanentFailed: processingResult.permanentFailed,
+                unsubscribed: processingResult.unsubscribed,
+                complained: processingResult.complained,
+                unhandled: processingResult.unhandled,
+                unprocessable: processingResult.unprocessable
+            };
+            const beforeEmailIds = new Set(processingResult.emailIds);
+            const beforeMemberIds = new Set(processingResult.memberIds);
+
             await this.processEventBatch(events, processingResult, fetchData);
             processingTimeMs += (Date.now() - processingStart);
             eventCount += events.length;
 
+            // Calculate delta (only new counts from this batch) and accumulate for final reporting
+            const batchDelta = new EventProcessingResult({
+                opened: processingResult.opened - beforeCounts.opened,
+                delivered: processingResult.delivered - beforeCounts.delivered,
+                temporaryFailed: processingResult.temporaryFailed - beforeCounts.temporaryFailed,
+                permanentFailed: processingResult.permanentFailed - beforeCounts.permanentFailed,
+                unsubscribed: processingResult.unsubscribed - beforeCounts.unsubscribed,
+                complained: processingResult.complained - beforeCounts.complained,
+                unhandled: processingResult.unhandled - beforeCounts.unhandled,
+                unprocessable: processingResult.unprocessable - beforeCounts.unprocessable,
+                emailIds: processingResult.emailIds.filter(id => !beforeEmailIds.has(id)),
+                memberIds: processingResult.memberIds.filter(id => !beforeMemberIds.has(id))
+            });
+            cumulativeResult.merge(batchDelta);
+            batchDelta.emailIds.forEach(id => allEmailIds.add(id));
+            batchDelta.memberIds.forEach(id => allMemberIds.add(id));
+
             // Every 5 minutes or 5000 members we do an aggregation and clear the processingResult
             // Otherwise we need to loop a lot of members afterwards, and this takes too long without updating the stat counts in between
             if ((Date.now() - lastAggregation > 5 * 60 * 1000 || processingResult.memberIds.length > 5000) && eventCount > 0) {
@@ -356,6 +390,9 @@ module.exports = class EmailAnalyticsService {
                     await this.aggregateStats(processingResult, includeOpenedEvents);
                     aggregationTimeMs += (Date.now() - aggregationStart);
                     lastAggregation = Date.now();
+                    // Remove aggregated emailIds and memberIds from tracking sets to avoid re-aggregating at the end
+                    processingResult.emailIds.forEach(id => allEmailIds.delete(id));
+                    processingResult.memberIds.forEach(id => allMemberIds.delete(id));
                     processingResult = new EventProcessingResult();
                 } catch (err) {
                     logging.error('[EmailAnalytics] Error while aggregating stats');
@@ -386,10 +423,20 @@ module.exports = class EmailAnalyticsService {
             }
         }
 
-        if (processingResult.memberIds.length > 0 || processingResult.emailIds.length > 0) {
+        // Final aggregation: aggregate any remaining events and ensure all emailIds are aggregated
+        // We need to aggregate all unique emailIds to ensure the emails table is updated
+        const finalEmailIds = Array.from(new Set([...processingResult.emailIds, ...allEmailIds]));
+        const finalMemberIds = Array.from(new Set([...processingResult.memberIds, ...allMemberIds]));
+
+        if (finalMemberIds.length > 0 || finalEmailIds.length > 0) {
             try {
                 const aggregationStart = Date.now();
-                await this.aggregateStats(processingResult, includeOpenedEvents);
+                // Create a result object with all emailIds and memberIds for final aggregation
+                const finalAggregationResult = {
+                    emailIds: finalEmailIds,
+                    memberIds: finalMemberIds
+                };
+                await this.aggregateStats(finalAggregationResult, includeOpenedEvents);
                 aggregationTimeMs += (Date.now() - aggregationStart);
             } catch (err) {
                 logging.error('[EmailAnalytics] Error while aggregating stats');
@@ -404,7 +451,7 @@ module.exports = class EmailAnalyticsService {
         // Small trick: if reached the end of new events, we are going to keep
         // fetching the same events because 'begin' won't change
         // So if we didn't have errors while fetching, and total events < maxEvents, increase lastEventTimestamp with one second
-        if (!error && eventCount > 0 && eventCount < maxEvents && fetchData.lastEventTimestamp && fetchData.lastEventTimestamp.getTime() < Date.now() - 2000) {
+        if (!error && eventCount > 0 && fetchData.lastEventTimestamp && fetchData.lastEventTimestamp.getTime() < Date.now() - 2000) {
             // set the data on the db so we can store it for fetching after reboot
             await this.queries.setJobTimestamp(fetchData.jobName, 'finished', new Date(fetchData.lastEventTimestamp.getTime()));
             // increment and store in local memory
@@ -425,7 +472,7 @@ module.exports = class EmailAnalyticsService {
             apiPollingTimeMs,
             processingTimeMs,
             aggregationTimeMs,
-            result: processingResult
+            result: cumulativeResult
         };
     }
 
@@ -437,26 +484,55 @@ module.exports = class EmailAnalyticsService {
      * @returns {Promise<void>}
      */
     async processEventBatch(events, result, fetchData) {
-        for (const event of events) {
-            const batchResult = await this.processEvent(event);
+        const useBatchProcessing = this.config.get('emailAnalytics:batchProcessing');
+
+        if (useBatchProcessing) {
+            // Batched mode: pre-fetch all recipients, then process events using cache
+            const emailIdentifications = events.map(event => ({
+                emailId: event.emailId,
+                providerId: event.providerId,
+                email: event.recipientEmail
+            }));
 
-            // Save last event timestamp
-            if (!fetchData.lastEventTimestamp || (event.timestamp && event.timestamp > fetchData.lastEventTimestamp)) {
-                fetchData.lastEventTimestamp = event.timestamp; // don't need to keep db in sync; it'll fall back to last completed timestamp anyways
+            const recipientCache = await this.eventProcessor.batchGetRecipients(emailIdentifications);
+
+            for (const event of events) {
+                const batchResult = await this.processEvent(event, recipientCache);
+
+                // Save last event timestamp
+                if (!fetchData.lastEventTimestamp || (event.timestamp && event.timestamp > fetchData.lastEventTimestamp)) {
+                    fetchData.lastEventTimestamp = event.timestamp;
+                }
+
+                result.merge(batchResult);
             }
 
-            result.merge(batchResult);
+            // Flush all batched updates to the database
+            await this.eventProcessor.flushBatchedUpdates();
+        } else {
+            // Sequential mode: process events one by one (original behavior)
+            for (const event of events) {
+                const batchResult = await this.processEvent(event);
+
+                // Save last event timestamp
+                if (!fetchData.lastEventTimestamp || (event.timestamp && event.timestamp > fetchData.lastEventTimestamp)) {
+                    fetchData.lastEventTimestamp = event.timestamp;
+                }
+
+                result.merge(batchResult);
+            }
         }
     }
 
     /**
      *
      * @param {{id: string, type: any; severity: any; recipientEmail: any; emailId?: string; providerId: string; timestamp: Date; error: {code: number; message: string; enhandedCode: string|number} | null}} event
+     * @param {Map<string, any>} [recipientCache] Optional cache for batched processing
      * @returns {Promise<EventProcessingResult>}
      */
-    async processEvent(event) {
+    async processEvent(event, recipientCache) {
         if (event.type === 'delivered') {
-            const recipient = await this.eventProcessor.handleDelivered({emailId: event.emailId, providerId: event.providerId, email: event.recipientEmail}, event.timestamp);
+            const recipient = await this.eventProcessor.handleDelivered({emailId: event.emailId, providerId: event.providerId, email: event.recipientEmail}, event.timestamp, recipientCache);
 
             if (recipient) {
                 return new EventProcessingResult({
@@ -470,7 +546,7 @@ module.exports = class EmailAnalyticsService {
         }
 
         if (event.type === 'opened') {
-            const recipient = await this.eventProcessor.handleOpened({emailId: event.emailId, providerId: event.providerId, email: event.recipientEmail}, event.timestamp);
+            const recipient = await this.eventProcessor.handleOpened({emailId: event.emailId, providerId: event.providerId, email: event.recipientEmail}, event.timestamp, recipientCache);
 
             if (recipient) {
                 return new EventProcessingResult({
@@ -485,7 +561,7 @@ module.exports = class EmailAnalyticsService {
 
         if (event.type === 'failed') {
             if (event.severity === 'permanent') {
-                const recipient = await this.eventProcessor.handlePermanentFailed({emailId: event.emailId, providerId: event.providerId, email: event.recipientEmail}, {id: event.id, timestamp: event.timestamp, error: event.error});
+                const recipient = await this.eventProcessor.handlePermanentFailed({emailId: event.emailId, providerId: event.providerId, email: event.recipientEmail}, {id: event.id, timestamp: event.timestamp, error: event.error}, recipientCache);
 
                 if (recipient) {
                     return new EventProcessingResult({
@@ -497,7 +573,7 @@ module.exports = class EmailAnalyticsService {
 
                 return new EventProcessingResult({unprocessable: 1});
             } else {
-                const recipient = await this.eventProcessor.handleTemporaryFailed({emailId: event.emailId, providerId: event.providerId, email: event.recipientEmail}, {id: event.id, timestamp: event.timestamp, error: event.error});
+                const recipient = await this.eventProcessor.handleTemporaryFailed({emailId: event.emailId, providerId: event.providerId, email: event.recipientEmail}, {id: event.id, timestamp: event.timestamp, error: event.error}, recipientCache);
 
                 if (recipient) {
                     return new EventProcessingResult({
@@ -512,7 +588,7 @@ module.exports = class EmailAnalyticsService {
         }
 
         if (event.type === 'unsubscribed') {
-            const recipient = await this.eventProcessor.handleUnsubscribed({emailId: event.emailId, providerId: event.providerId, email: event.recipientEmail}, event.timestamp);
+            const recipient = await this.eventProcessor.handleUnsubscribed({emailId: event.emailId, providerId: event.providerId, email: event.recipientEmail}, event.timestamp, recipientCache);
 
             if (recipient) {
                 return new EventProcessingResult({
@@ -526,7 +602,7 @@ module.exports = class EmailAnalyticsService {
         }
 
         if (event.type === 'complained') {
-            const recipient = await this.eventProcessor.handleComplained({emailId: event.emailId, providerId: event.providerId, email: event.recipientEmail}, event.timestamp);
+            const recipient = await this.eventProcessor.handleComplained({emailId: event.emailId, providerId: event.providerId, email: event.recipientEmail}, event.timestamp, recipientCache);
 
             if (recipient) {
                 return new EventProcessingResult({
@@ -547,15 +623,31 @@ module.exports = class EmailAnalyticsService {
      * @param {boolean} includeOpenedEvents
      */
     async aggregateStats({emailIds = [], memberIds = []}, includeOpenedEvents = true) {
+        const useBatchProcessing = this.config.get('emailAnalytics:batchProcessing');
+
         for (const emailId of emailIds) {
             await this.aggregateEmailStats(emailId, includeOpenedEvents);
         }
 
         // @ts-expect-error
         const memberMetric = this.prometheusClient?.getMetric('email_analytics_aggregate_member_stats_count');
-        for (const memberId of memberIds) {
-            await this.aggregateMemberStats(memberId);
-            memberMetric?.inc();
+
+        if (useBatchProcessing) {
+            // Batched mode: process 100 members at a time
+            logging.info(`[EmailAnalytics] Aggregating stats for ${memberIds.length} members using BATCHED mode (batch size: 100)`);
+            const BATCH_SIZE = 100;
+            for (let i = 0; i < memberIds.length; i += BATCH_SIZE) {
+                const batch = memberIds.slice(i, i + BATCH_SIZE);
+                await this.aggregateMemberStatsBatch(batch);
+                memberMetric?.inc(batch.length);
+            }
+        } else {
+            // Sequential mode: process one member at a time
+            logging.info(`[EmailAnalytics] Aggregating stats for ${memberIds.length} members using SEQUENTIAL mode`);
+            for (const memberId of memberIds) {
+                await this.aggregateMemberStats(memberId);
+                memberMetric?.inc();
+            }
         }
     }
 
@@ -577,4 +669,13 @@ module.exports = class EmailAnalyticsService {
     async aggregateMemberStats(memberId) {
         return this.queries.aggregateMemberStats(memberId);
     }
+
+    /**
+     * Aggregate member stats for multiple members in a batch.
+     * @param {string[]} memberIds - Array of member IDs to aggregate stats for.
+     * @returns {Promise<void>}
+     */
+    async aggregateMemberStatsBatch(memberIds) {
+        return this.queries.aggregateMemberStatsBatch(memberIds);
+    }
 };

package/core/server/services/email-analytics/EmailAnalyticsServiceWrapper.js

@@ -57,6 +57,10 @@ class EmailAnalyticsServiceWrapper {
             prometheusClient
         });
 
+        // Log the processing mode on initialization
+        const batchProcessingEnabled = config.get('emailAnalytics:batchProcessing');
+        logging.info(`[EmailAnalytics] Initialized with ${batchProcessingEnabled ? 'BATCHED' : 'SEQUENTIAL'} processing mode`);
+
         // We currently cannot trigger a non-offloaded job from the job manager
         // So the email analytics jobs simply emits an event.
         domainEvents.subscribe(StartEmailAnalyticsJobEvent, async () => {
@@ -81,10 +85,12 @@ class EmailAnalyticsServiceWrapper {
         const apiPercent = totalDurationMs > 0 ? Math.round((apiPollingTimeMs / totalDurationMs) * 100) : 0;
         const processingPercent = totalDurationMs > 0 ? Math.round((processingTimeMs / totalDurationMs) * 100) : 0;
         const aggregationPercent = totalDurationMs > 0 ? Math.round((aggregationTimeMs / totalDurationMs) * 100) : 0;
+        const batchMode = config.get('emailAnalytics:batchProcessing') ? 'BATCHED' : 'SEQUENTIAL';
 
         const logMessage = [
             `[EmailAnalytics] Job complete: ${jobType}`,
             `${eventCount} events in ${(totalDurationMs / 1000).toFixed(1)}s (${throughput.toFixed(2)} events/s)`,
+            `Mode: ${batchMode}`,
             `Timings: API ${(apiPollingTimeMs / 1000).toFixed(1)}s (${apiPercent}%) / Processing ${(processingTimeMs / 1000).toFixed(1)}s (${processingPercent}%) / Aggregation ${(aggregationTimeMs / 1000).toFixed(1)}s (${aggregationPercent}%)`,
             `Events: opened=${result.opened} delivered=${result.delivered} failed=${result.permanentFailed + result.temporaryFailed} unprocessable=${result.unprocessable}`
         ].join(' | ');

package/core/server/services/email-analytics/jobs/update-member-email-analytics/index.js

@@ -1,13 +1,14 @@
 const queries = require('../../lib/queries');
- 
+
 /**
  * Updates email analytics for a specific member
- * 
+ *
  * @param {Object} options - The options object
  * @param {string} options.memberId - The ID of the member to update analytics for
  * @returns {Promise<Object>} The result of the aggregation query (1/0)
  */
 module.exports = async function updateMemberEmailAnalytics({memberId}) {
-    const result = await queries.aggregateMemberStats(memberId);
+    // Use the batch method with a single member for consistency
+    const result = await queries.aggregateMemberStatsBatch([memberId]);
     return result;
 };