ghost 6.5.3 → 6.6.1

package/core/built/admin/index.html

@@ -6,7 +6,7 @@
     <title>Ghost</title>
 
     
-<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22cdnUrl%22%3A%22%22%2C%22editorUrl%22%3A%22%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%226.5%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%2237bd1e3e4d%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%2270b59aade7%22%2C%22activitypubFilename%22%3A%22activitypub.js%22%2C%22activitypubHash%22%3A%223a9db432aa%22%2C%22postsFilename%22%3A%22posts.js%22%2C%22postsHash%22%3A%2252d8643b3a%22%2C%22statsFilename%22%3A%22stats.js%22%2C%22statsHash%22%3A%227449bfe668%22%2C%22activitypubRemoteConfigUrl%22%3A%22%2F.ghost%2Factivitypub%2Fstable%2Fclient-config%22%7D" />
+<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22cdnUrl%22%3A%22%22%2C%22editorUrl%22%3A%22%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%226.6%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%2237bd1e3e4d%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%225b5d9a0d3d%22%2C%22activitypubFilename%22%3A%22activitypub.js%22%2C%22activitypubHash%22%3A%2240c618ae11%22%2C%22postsFilename%22%3A%22posts.js%22%2C%22postsHash%22%3A%229a34075d6a%22%2C%22statsFilename%22%3A%22stats.js%22%2C%22statsHash%22%3A%224b9d666e6c%22%2C%22activitypubRemoteConfigUrl%22%3A%22%2F.ghost%2Factivitypub%2Fstable%2Fclient-config%22%7D" />
 
     <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1, minimal-ui, viewport-fit=cover" />
     <meta name="pinterest" content="nopin" />
@@ -49,7 +49,7 @@
 
     <script src="assets/vendor-aed0068cf9b67d042dd23a6343545b7b.js"></script>
 <script src="assets/chunk.397.a720333cfffc99c47e71.js"></script>
-<script src="assets/chunk.524.4d89fd583d7826ebd59b.js"></script>
-    <script src="assets/ghost-6caf3f9221e33783e229a3e10b593fae.js"></script>
+<script src="assets/chunk.524.04ed4161680a5dfe50c0.js"></script>
+    <script src="assets/ghost-dd34586f2d693640a66edb96be8ea6c2.js"></script>
 </body>
 </html>

package/core/server/services/VerificationTrigger.js

@@ -43,7 +43,10 @@ class VerificationTrigger {
         this._eventRepository = eventRepository;
 
         this._handleMemberCreatedEvent = this._handleMemberCreatedEvent.bind(this);
-        DomainEvents.subscribe(MemberCreatedEvent, this._handleMemberCreatedEvent);
+
+        if (!this._isVerified()) {
+            DomainEvents.subscribe(MemberCreatedEvent, this._handleMemberCreatedEvent);
+        }
     }
 
     get _apiTriggerThreshold() {

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

@@ -24,9 +24,32 @@ const errors = require('@tryghost/errors');
  * @typedef {'delivered' | 'opened' | 'failed' | 'unsubscribed' | 'complained'} EmailAnalyticsEvent
  */
 
+/**
+ * @typedef {object} EmailAnalyticsFetchResult
+ * @property {number} eventCount - The number of events fetched
+ * @property {number} apiPollingTimeMs - Time spent polling the API in milliseconds
+ * @property {number} processingTimeMs - Time spent processing events in milliseconds
+ * @property {number} aggregationTimeMs - Time spent aggregating stats in milliseconds
+ * @property {EventProcessingResult} result - The processing result with event breakdown
+ */
+
 const TRUST_THRESHOLD_MS = 30 * 60 * 1000; // 30 minutes
 const FETCH_LATEST_END_MARGIN_MS = 1 * 60 * 1000; // Do not fetch events newer than 1 minute (yet). Reduces the chance of having missed events in fetchLatest.
 
+/**
+ * Helper function to create an empty fetch result
+ * @returns {EmailAnalyticsFetchResult}
+ */
+function createEmptyResult() {
+    return {
+        eventCount: 0,
+        apiPollingTimeMs: 0,
+        processingTimeMs: 0,
+        aggregationTimeMs: 0,
+        result: new EventProcessingResult()
+    };
+}
+
 module.exports = class EmailAnalyticsService {
     config;
     settings;
@@ -125,7 +148,7 @@ module.exports = class EmailAnalyticsService {
      * Fetches the latest opened events.
      * @param {Object} options - The options for fetching events.
      * @param {number} [options.maxEvents=Infinity] - The maximum number of events to fetch.
-     * @returns {Promise<number>} The total number of events fetched.
+     * @returns {Promise<EmailAnalyticsFetchResult>} Fetch results with timing metrics
      */
     async fetchLatestOpenedEvents({maxEvents = Infinity} = {}) {
         const begin = await this.getLastOpenedEventTimestamp();
@@ -134,7 +157,7 @@ module.exports = class EmailAnalyticsService {
         if (end <= begin) {
             // Skip for now
             logging.info('[EmailAnalytics] Skipping fetchLatestOpenedEvents because end (' + end + ') is before begin (' + begin + ')');
-            return 0;
+            return createEmptyResult();
         }
 
         return await this.#fetchEvents(this.#fetchLatestOpenedData, {begin, end, maxEvents, eventTypes: ['opened']});
@@ -144,7 +167,7 @@ module.exports = class EmailAnalyticsService {
      * Fetches the latest non-opened events.
      * @param {Object} options - The options for fetching events.
      * @param {number} [options.maxEvents=Infinity] - The maximum number of events to fetch.
-     * @returns {Promise<number>} The total number of events fetched.
+     * @returns {Promise<EmailAnalyticsFetchResult>} Fetch results with timing metrics
      */
     async fetchLatestNonOpenedEvents({maxEvents = Infinity} = {}) {
         const begin = await this.getLastNonOpenedEventTimestamp();
@@ -153,7 +176,7 @@ module.exports = class EmailAnalyticsService {
         if (end <= begin) {
             // Skip for now
             logging.info('[EmailAnalytics] Skipping fetchLatestNonOpenedEvents because end (' + end + ') is before begin (' + begin + ')');
-            return 0;
+            return createEmptyResult();
         }
 
         return await this.#fetchEvents(this.#fetchLatestNonOpenedData, {begin, end, maxEvents, eventTypes: ['delivered', 'failed', 'unsubscribed', 'complained']});
@@ -163,6 +186,7 @@ module.exports = class EmailAnalyticsService {
      * Fetches events that are older than 30 minutes, because then the 'storage' of the Mailgun API is stable. And we are sure we don't miss any events.
      * @param {object} options
      * @param {number} [options.maxEvents] Not a strict maximum. We stop fetching after we reached the maximum AND received at least one event after begin (not equal) to prevent deadlocks.
+     * @returns {Promise<EmailAnalyticsFetchResult>} Fetch results with timing metrics
      */
     async fetchMissing({maxEvents = Infinity} = {}) {
         const begin = await this.getLastMissingEventTimestamp();
@@ -178,7 +202,7 @@ module.exports = class EmailAnalyticsService {
         if (end <= begin) {
             // Skip for now
             logging.info('[EmailAnalytics] Skipping fetchMissing because end (' + end + ') is before begin (' + begin + ')');
-            return 0;
+            return createEmptyResult();
         }
 
         return await this.#fetchEvents(this.#fetchMissingData, {begin, end, maxEvents});
@@ -233,18 +257,18 @@ module.exports = class EmailAnalyticsService {
      * @method fetchScheduled
      * @param {Object} [options] - The options for fetching scheduled events.
      * @param {number} [options.maxEvents=Infinity] - The maximum number of events to fetch.
-     * @returns {Promise<number>} The number of events fetched.
+     * @returns {Promise<EmailAnalyticsFetchResult>} Fetch results with timing metrics
      */
     async fetchScheduled({maxEvents = Infinity} = {}) {
         if (!this.#fetchScheduledData || !this.#fetchScheduledData.schedule) {
             // Nothing scheduled
-            return 0;
+            return createEmptyResult();
         }
 
         if (this.#fetchScheduledData.canceled) {
             // Skip for now
             this.#fetchScheduledData = null;
-            return 0;
+            return createEmptyResult();
         }
 
         let begin = this.#fetchScheduledData.schedule.begin;
@@ -262,11 +286,11 @@ module.exports = class EmailAnalyticsService {
                 running: false,
                 jobName: 'email-analytics-scheduled'
             };
-            return 0;
+            return createEmptyResult();
         }
 
-        const count = await this.#fetchEvents(this.#fetchScheduledData, {begin, end, maxEvents});
-        if (count === 0 || this.#fetchScheduledData.canceled) {
+        const fetchResult = await this.#fetchEvents(this.#fetchScheduledData, {begin, end, maxEvents});
+        if (fetchResult.eventCount === 0 || this.#fetchScheduledData.canceled) {
             // Reset the scheduled fetch
             this.#fetchScheduledData = {
                 running: false,
@@ -275,7 +299,7 @@ module.exports = class EmailAnalyticsService {
         }
 
         this.queries.setJobTimestamp(this.#fetchScheduledData.jobName, 'finished', this.#fetchScheduledData.lastEventTimestamp);
-        return count;
+        return fetchResult;
     }
     /**
      * Start fetching analytics and store the data of the progress inside fetchData
@@ -285,18 +309,21 @@ module.exports = class EmailAnalyticsService {
      * @param {Date} options.end - End date for fetching events
      * @param {number} [options.maxEvents=Infinity] - Maximum number of events to fetch. Not a strict maximum. We stop fetching after we reached the maximum AND received at least one event after begin (not equal) to prevent deadlocks.
      * @param {EmailAnalyticsEvent[]} [options.eventTypes] - Array of event types to fetch. If not provided, Mailgun will return all event types.
-     * @returns {Promise<number>} The number of events fetched
+     * @returns {Promise<EmailAnalyticsFetchResult>} Fetch results with timing metrics
      */
     async #fetchEvents(fetchData, {begin, end, maxEvents = Infinity, eventTypes = null}) {
         // Start where we left of, or the last stored event in the database, or start 30 minutes ago if we have nothing available
-        logging.info('[EmailAnalytics] Fetching from ' + begin.toISOString() + ' until ' + end.toISOString() + ' (maxEvents: ' + maxEvents + ')');
-
         // Store that we started fetching
         fetchData.running = true;
         fetchData.lastStarted = new Date();
         fetchData.lastBegin = begin;
         this.queries.setJobTimestamp(fetchData.jobName, 'started', begin);
 
+        // Timing metrics
+        let apiPollingTimeMs = 0;
+        let processingTimeMs = 0;
+        let aggregationTimeMs = 0;
+
         let lastAggregation = Date.now();
         let eventCount = 0;
         const includeOpenedEvents = eventTypes?.includes('opened') ?? false;
@@ -314,7 +341,9 @@ module.exports = class EmailAnalyticsService {
          */
         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();
             await this.processEventBatch(events, processingResult, fetchData);
+            processingTimeMs += (Date.now() - processingStart);
             eventCount += events.length;
 
             // Every 5 minutes or 5000 members we do an aggregation and clear the processingResult
@@ -323,7 +352,9 @@ module.exports = class EmailAnalyticsService {
                 // Aggregate and clear the processingResult
                 // We do this here because otherwise it could take a long time before the new events are visible in the stats
                 try {
+                    const aggregationStart = Date.now();
                     await this.aggregateStats(processingResult, includeOpenedEvents);
+                    aggregationTimeMs += (Date.now() - aggregationStart);
                     lastAggregation = Date.now();
                     processingResult = new EventProcessingResult();
                 } catch (err) {
@@ -341,10 +372,10 @@ module.exports = class EmailAnalyticsService {
 
         try {
             for (const provider of this.providers) {
+                const apiStart = Date.now();
                 await provider.fetchLatest(processBatch, {begin, end, maxEvents, events: eventTypes});
+                apiPollingTimeMs += (Date.now() - apiStart);
             }
-
-            logging.info('[EmailAnalytics] Fetching finished');
         } catch (err) {
             if (err.message !== 'Fetching canceled') {
                 logging.error('[EmailAnalytics] Error while fetching');
@@ -357,7 +388,9 @@ module.exports = class EmailAnalyticsService {
 
         if (processingResult.memberIds.length > 0 || processingResult.emailIds.length > 0) {
             try {
+                const aggregationStart = Date.now();
                 await this.aggregateStats(processingResult, includeOpenedEvents);
+                aggregationTimeMs += (Date.now() - aggregationStart);
             } catch (err) {
                 logging.error('[EmailAnalytics] Error while aggregating stats');
                 logging.error(err);
@@ -372,13 +405,11 @@ module.exports = class EmailAnalyticsService {
         // 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) {
-            logging.info('[EmailAnalytics] Reached end of new events, increasing lastEventTimestamp with one second');
             // 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
             fetchData.lastEventTimestamp = new Date(fetchData.lastEventTimestamp.getTime() + 1000);
         } else {
-            logging.info('[EmailAnalytics] No new events found');
             // set job status to finished
             await this.queries.setJobStatus(fetchData.jobName, 'finished');
         }
@@ -388,7 +419,14 @@ module.exports = class EmailAnalyticsService {
         if (error) {
             throw error;
         }
-        return eventCount;
+
+        return {
+            eventCount,
+            apiPollingTimeMs,
+            processingTimeMs,
+            aggregationTimeMs,
+            result: processingResult
+        };
     }
 
     /**
@@ -509,17 +547,9 @@ module.exports = class EmailAnalyticsService {
      * @param {boolean} includeOpenedEvents
      */
     async aggregateStats({emailIds = [], memberIds = []}, includeOpenedEvents = true) {
-        let startTime = Date.now();
-        logging.info(`[EmailAnalytics] Aggregating for ${emailIds.length} emails`);
-
         for (const emailId of emailIds) {
             await this.aggregateEmailStats(emailId, includeOpenedEvents);
         }
-        let endTime = Date.now() - startTime;
-        logging.info(`[EmailAnalytics] Aggregating for ${emailIds.length} emails took ${endTime}ms`);
-
-        startTime = Date.now();
-        logging.info(`[EmailAnalytics] Aggregating for ${memberIds.length} members`);
 
         // @ts-expect-error
         const memberMetric = this.prometheusClient?.getMetric('email_analytics_aggregate_member_stats_count');
@@ -527,8 +557,6 @@ module.exports = class EmailAnalyticsService {
             await this.aggregateMemberStats(memberId);
             memberMetric?.inc();
         }
-        endTime = Date.now() - startTime;
-        logging.info(`[EmailAnalytics] Aggregating for ${memberIds.length} members took ${endTime}ms`);
     }
 
     /**

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

@@ -1,4 +1,6 @@
 const logging = require('@tryghost/logging');
+const metrics = require('@tryghost/metrics');
+const config = require('../../../shared/config');
 
 class EmailAnalyticsServiceWrapper {
     init() {
@@ -13,7 +15,6 @@ class EmailAnalyticsServiceWrapper {
         const {EmailRecipientFailure, EmailSpamComplaintEvent, Email} = require('../../models');
         const StartEmailAnalyticsJobEvent = require('./events/StartEmailAnalyticsJobEvent');
         const domainEvents = require('@tryghost/domain-events');
-        const config = require('../../../shared/config');
         const settings = require('../../../shared/settings-cache');
         const db = require('../../data/db');
         const queries = require('./lib/queries');
@@ -62,51 +63,100 @@ class EmailAnalyticsServiceWrapper {
         });
     }
 
+    /**
+     * Log comprehensive job completion with timing metrics
+     * @param {string} jobType - Type of job (e.g., 'latest-opened', 'latest', 'missing', 'scheduled')
+     * @param {object} fetchResult - The fetch result from EmailAnalyticsService
+     * @param {number} totalDurationMs - Total duration in milliseconds
+     */
+    _logJobCompletion(jobType, fetchResult, totalDurationMs) {
+        const {eventCount, apiPollingTimeMs, processingTimeMs, aggregationTimeMs, result} = fetchResult;
+
+        if (eventCount === 0) {
+            return;
+        }
+
+        const throughput = totalDurationMs > 0 ? eventCount / (totalDurationMs / 1000) : 0;
+        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 logMessage = [
+            `[EmailAnalytics] Job complete: ${jobType}`,
+            `${eventCount} events in ${(totalDurationMs / 1000).toFixed(1)}s (${throughput.toFixed(2)} events/s)`,
+            `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(' | ');
+
+        logging.info(logMessage);
+
+        // We're only concerned with open throughput as this is displayed to users and is most sensitive to being up to date
+        if (jobType === 'latest-opened') {
+            const openThroughputEnabled = config.get('emailAnalytics:metrics:openThroughput:enabled');
+            const openThroughputThreshold = config.get('emailAnalytics:metrics:openThroughput:threshold') || 0;
+            if (openThroughputEnabled && eventCount >= openThroughputThreshold) {
+                metrics.metric('email-analytics-open-throughput', {
+                    value: throughput,
+                    events: eventCount,
+                    duration: totalDurationMs
+                });
+            }
+        }
+    }
+
     async fetchLatestOpenedEvents({maxEvents} = {maxEvents: Infinity}) {
-        logging.info('[EmailAnalytics] Fetch latest opened events started');
+        const beginTimestamp = await this.service.getLastOpenedEventTimestamp();
+        const lagMinutes = (Date.now() - beginTimestamp.getTime()) / 60000;
+        const lagThreshold = config.get('emailAnalytics:openedJobLagWarningMinutes');
+
+        // NOTE: We only update the begin timestamp when we process events, so there's cases where we can have a false positive
+        //  - Ghost or Mailgun outages
+        //  - Lack of actual email activity
+        if (lagThreshold && lagMinutes > lagThreshold) {
+            logging.warn(`[EmailAnalytics] Opened events processing is ${lagMinutes.toFixed(1)} minutes behind (threshold: ${lagThreshold})`);
+        }
 
         const fetchStartDate = new Date();
-        const totalEvents = await this.service.fetchLatestOpenedEvents({maxEvents});
-        const fetchEndDate = new Date();
+        const fetchResult = await this.service.fetchLatestOpenedEvents({maxEvents});
+        const totalDuration = Date.now() - fetchStartDate.getTime();
 
-        logging.info(`[EmailAnalytics] Fetched ${totalEvents} events and aggregated stats in ${fetchEndDate.getTime() - fetchStartDate.getTime()}ms (latest opens)`);
-        return totalEvents;
+        this._logJobCompletion('latest-opened', fetchResult, totalDuration);
+
+        return fetchResult.eventCount;
     }
 
     async fetchLatestNonOpenedEvents({maxEvents} = {maxEvents: Infinity}) {
-        logging.info('[EmailAnalytics] Fetch latest non-opened events started');
-
         const fetchStartDate = new Date();
-        const totalEvents = await this.service.fetchLatestNonOpenedEvents({maxEvents});
-        const fetchEndDate = new Date();
+        const fetchResult = await this.service.fetchLatestNonOpenedEvents({maxEvents});
+        const totalDuration = Date.now() - fetchStartDate.getTime();
 
-        logging.info(`[EmailAnalytics] Fetched ${totalEvents} events and aggregated stats in ${fetchEndDate.getTime() - fetchStartDate.getTime()}ms (latest)`);
-        return totalEvents;
+        this._logJobCompletion('latest', fetchResult, totalDuration);
+
+        return fetchResult.eventCount;
     }
 
     async fetchMissing({maxEvents} = {maxEvents: Infinity}) {
-        logging.info('[EmailAnalytics] Fetch missing events started');
-
         const fetchStartDate = new Date();
-        const totalEvents = await this.service.fetchMissing({maxEvents});
-        const fetchEndDate = new Date();
+        const fetchResult = await this.service.fetchMissing({maxEvents});
+        const totalDuration = Date.now() - fetchStartDate.getTime();
 
-        logging.info(`[EmailAnalytics] Fetched ${totalEvents} events and aggregated stats in ${fetchEndDate.getTime() - fetchStartDate.getTime()}ms (missing)`);
-        return totalEvents;
+        this._logJobCompletion('missing', fetchResult, totalDuration);
+
+        return fetchResult.eventCount;
     }
 
     async fetchScheduled({maxEvents}) {
         if (maxEvents < 300) {
             return 0;
         }
-        logging.info('[EmailAnalytics] Fetch scheduled events started');
 
         const fetchStartDate = new Date();
-        const totalEvents = await this.service.fetchScheduled({maxEvents});
-        const fetchEndDate = new Date();
+        const fetchResult = await this.service.fetchScheduled({maxEvents});
+        const totalDuration = Date.now() - fetchStartDate.getTime();
+
+        this._logJobCompletion('scheduled', fetchResult, totalDuration);
 
-        logging.info(`[EmailAnalytics] Fetched ${totalEvents} events and aggregated stats in ${fetchEndDate.getTime() - fetchStartDate.getTime()}ms (scheduled)`);
-        return totalEvents;
+        return fetchResult.eventCount;
     }
 
     async startFetch() {
@@ -144,6 +194,11 @@ class EmailAnalyticsServiceWrapper {
                 return;
             }
 
+            // Log summary if no events were found across all jobs
+            if (c1 + c2 + c3 + c4 === 0) {
+                logging.info('[EmailAnalytics] Job complete - No events');
+            }
+
             this.fetching = false;
         } catch (e) {
             logging.error(e, 'Error while fetching email analytics');

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

@@ -10,7 +10,7 @@ module.exports = {
     async scheduleRecurringJobs(skipEmailCheck = false) {
         if (
             !hasScheduled &&
-            config.get('emailAnalytics') &&
+            config.get('emailAnalytics:enabled') &&
             config.get('backgroundJobs:emailAnalytics') &&
             !process.env.NODE_ENV.startsWith('test')
         ) {

package/core/server/services/email-service/email-templates/template.hbs

@@ -7,7 +7,7 @@
         <title>{{post.title}}</title>
         {{>styles}}
     </head>
-    <body>
+    <body data-testid="email-preview-body">
         <span class="preheader">{{preheader}}</span>
         <!-- SPACING TO AVOID BODY TEXT BEING DUPLICATED IN PREVIEW TEXT -->
         <div style="display:none; max-height:0; overflow:hidden; mso-hide: all;" aria-hidden="true" role="presentation">
@@ -178,7 +178,7 @@
                         <table role="presentation" border="0" cellpadding="0" cellspacing="0" class="main" width="100%">
                             <tr>
                                 <td class="wrapper">
-                                    <table role="presentation" border="0" cellpadding="0" cellspacing="0" width="100%">
+                                    <table role="presentation" border="0" cellpadding="0" cellspacing="0" width="100%" data-testid="email-preview-content">
                                         <tr class="post-content-row">
                                             <td class="{{classes.body}}">
                                                 <!-- POST CONTENT START -->

package/core/server/services/lib/MailgunClient.js

@@ -213,7 +213,10 @@ module.exports = class MailgunClient {
             const totalDuration = overallEndTime - overallStartTime;
             const averageBatchTime = batchCount > 0 ? totalBatchTime / batchCount : 0;
 
-            logging.info(`[MailgunClient fetchEvents]: Processed ${batchCount} batches in ${(totalDuration / 1000).toFixed(2)}s. Average batch time: ${(averageBatchTime / 1000).toFixed(2)}s`);
+            // Only log if we actually processed batches
+            if (batchCount > 0) {
+                logging.info(`[MailgunClient fetchEvents]: Processed ${batchCount} batches in ${(totalDuration / 1000).toFixed(2)}s. Average batch time: ${(averageBatchTime / 1000).toFixed(2)}s`);
+            }
         } catch (error) {
             logging.error(error);
             throw error;

package/core/server/services/mail/GhostMailer.js

@@ -135,7 +135,7 @@ module.exports = class GhostMailer {
             if (tags.length > 0) {
                 messageToSend['o:tag'] = tags;
             }
-            if (settingsCache.get('emailTrackOpens')) {
+            if (settingsCache.get('email_track_opens')) {
                 messageToSend['o:tracking-opens'] = true;
             }
         }

package/core/server/services/members/SingleUseTokenProvider.js

@@ -397,6 +397,10 @@ class SingleUseTokenProvider {
      * @returns {void}
      */
     _validateTimeSinceFirstUsage(model) {
+        if (model.get('used_count') === 0 && !model.get('first_used_at')) {
+            return;
+        }
+
         const createdAtEpoch = model.get('created_at').getTime();
         const firstUsedAtEpoch = model.get('first_used_at')?.getTime() ?? createdAtEpoch;
         const timeSinceFirstUsage = Date.now() - firstUsedAtEpoch;

package/core/server/services/members/members-api/controllers/RouterController.js

@@ -705,19 +705,19 @@ module.exports = class RouterController {
             });
         }
 
-        const isValidOTC = await tokenProvider.verifyOTC(otcRef, otc);
-        if (!isValidOTC) {
+        const tokenValue = await tokenProvider.getTokenByRef(otcRef);
+        if (!tokenValue) {
             throw new errors.BadRequestError({
                 message: tpl(messages.invalidCode),
-                code: 'INVALID_OTC'
+                code: 'INVALID_OTC_REF'
             });
         }
 
-        const tokenValue = await tokenProvider.getTokenByRef(otcRef);
-        if (!tokenValue) {
+        const isValidOTC = await tokenProvider.verifyOTC(otcRef, otc);
+        if (!isValidOTC) {
             throw new errors.BadRequestError({
                 message: tpl(messages.invalidCode),
-                code: 'INVALID_OTC_REF'
+                code: 'INVALID_OTC'
             });
         }
 

package/core/server/services/public-config/config.js

@@ -17,7 +17,7 @@ module.exports = function getConfigProperties() {
         enableDeveloperExperiments: config.get('enableDeveloperExperiments') || false,
         stripeDirect: config.get('stripeDirect'),
         mailgunIsConfigured: !!(config.get('bulkEmail') && config.get('bulkEmail').mailgun),
-        emailAnalytics: config.get('emailAnalytics'),
+        emailAnalytics: config.get('emailAnalytics:enabled'),
         hostSettings: config.get('hostSettings'),
         tenor: config.get('tenor'),
         pintura: config.get('pintura'),

package/core/shared/config/defaults.json

@@ -216,7 +216,16 @@
     "stripeDirect": false,
     "enableStripePromoCodes": false,
     "enableTipsAndDonations": true,
-    "emailAnalytics": true,
+    "emailAnalytics": {
+        "enabled": true,
+        "metrics": {
+            "openThroughput": {
+                "enabled": false,
+                "threshold": 500
+            }
+        },
+        "openedJobLagWarningMinutes": 30
+    },
     "linkClickTrackingCacheMemberUuid": false,
     "backgroundJobs": {
         "emailAnalytics": true,

package/core/shared/labs.js

@@ -49,7 +49,8 @@ const PRIVATE_FEATURES = [
     'emailCustomization',
     'tagsX',
     'utmTracking',
-    'emailUniqueid'
+    'emailUniqueid',
+    'welcomeEmails'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "6.5.3",
+  "version": "6.6.1",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -86,7 +86,7 @@
     "@tryghost/helpers": "1.1.97",
     "@tryghost/html-to-plaintext": "1.0.4",
     "@tryghost/http-cache-utils": "0.1.20",
-    "@tryghost/i18n": "file:components/tryghost-i18n-6.5.3.tgz",
+    "@tryghost/i18n": "file:components/tryghost-i18n-6.6.1.tgz",
     "@tryghost/image-transform": "1.4.6",
     "@tryghost/job-manager": "1.0.3",
     "@tryghost/kg-card-factory": "5.1.2",
@@ -273,7 +273,7 @@
     "jackspeak": "2.3.6",
     "moment": "2.24.0",
     "moment-timezone": "0.5.45",
-    "@tryghost/i18n": "file:components/tryghost-i18n-6.5.3.tgz"
+    "@tryghost/i18n": "file:components/tryghost-i18n-6.6.1.tgz"
   },
   "nx": {
     "targets": {

package/yarn.lock

@@ -5238,6 +5238,19 @@
     "@radix-ui/react-use-previous" "1.1.1"
     "@radix-ui/react-use-size" "1.1.1"
 
+"@radix-ui/react-switch@^1.2.6":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-switch/-/react-switch-1.2.6.tgz#ff79acb831f0d5ea9216cfcc5b939912571358e3"
+  integrity sha512-bByzr1+ep1zk4VubeEVViV592vu2lHE2BZY5OnzehZqOOgogN80+mNtCqPkhn2gklJqOpxWgPoYTSnhBCqpOXQ==
+  dependencies:
+    "@radix-ui/primitive" "1.1.3"
+    "@radix-ui/react-compose-refs" "1.1.2"
+    "@radix-ui/react-context" "1.1.2"
+    "@radix-ui/react-primitive" "2.1.3"
+    "@radix-ui/react-use-controllable-state" "1.2.2"
+    "@radix-ui/react-use-previous" "1.1.1"
+    "@radix-ui/react-use-size" "1.1.1"
+
 "@radix-ui/react-tabs@1.1.12":
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-tabs/-/react-tabs-1.1.12.tgz#99b3522c73db9263f429a6d0f5a9acb88df3b129"