ghost 6.9.1 → 6.9.3

package/core/server/services/email-service/DomainWarmingService.js

@@ -1,32 +1,62 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DomainWarmingService = void 0;
+/**
+ * Configuration for domain warming email volume scaling.
+ *
+ * | Volume Range | Multiplier                                       |
+ * |--------------|--------------------------------------------------|
+ * | ≤100 (base)  | 200 messages                                     |
+ * | 101 – 1k     | 1.25× (conservative early ramp)                  |
+ * | 1k – 5k      | 1.5× (moderate increase)                         |
+ * | 5k – 100k    | 1.75× (faster ramp after proving deliverability) |
+ * | 100k – 400k  | 2×                                               |
+ * | 400k+        | min(1.2×, +75k) cap                              |
+ */
 const WARMUP_SCALING_TABLE = {
     base: {
         limit: 100,
         value: 200
     },
     thresholds: [{
+            limit: 1_000,
+            scale: 1.25
+        }, {
+            limit: 5_000,
+            scale: 1.5
+        }, {
             limit: 100_000,
-            scale: 2
+            scale: 1.75
         }, {
             limit: 400_000,
-            scale: 1.5
+            scale: 2
         }],
-    defaultScale: 1.25
+    highVolume: {
+        threshold: 400_000,
+        maxScale: 1.2,
+        maxAbsoluteIncrease: 75_000
+    }
 };
 class DomainWarmingService {
     #emailModel;
     #labs;
+    #config;
     constructor(dependencies) {
         this.#emailModel = dependencies.models.Email;
         this.#labs = dependencies.labs;
+        this.#config = dependencies.config;
     }
     /**
      * @returns Whether the domain warming feature is enabled
      */
     isEnabled() {
-        return this.#labs.isSet('domainWarmup');
+        const hasLabsFlag = this.#labs.isSet('domainWarmup');
+        if (!hasLabsFlag) {
+            return false;
+        }
+        const fallbackDomain = this.#config.get('hostSettings:managedEmail:fallbackDomain');
+        const fallbackAddress = this.#config.get('hostSettings:managedEmail:fallbackAddress');
+        return Boolean(fallbackDomain && fallbackAddress);
     }
     /**
      * Get the maximum amount of emails that should be sent from the warming sending domain in today's newsletter
@@ -41,14 +71,15 @@ class DomainWarmingService {
      * @returns The highest number of messages sent from the CSD in a single email (excluding today)
      */
     async #getHighestCount() {
-        const email = await this.#emailModel.findOne({
+        const result = await this.#emailModel.findPage({
             filter: `created_at:<${new Date().toISOString().split('T')[0]}`,
-            order: 'csd_email_count DESC'
+            order: 'csd_email_count DESC',
+            limit: 1
         });
-        if (!email) {
+        if (!result.data.length) {
             return 0;
         }
-        const count = email.get('csd_email_count');
+        const count = result.data[0].get('csd_email_count');
         return count || 0;
     }
     /**
@@ -59,12 +90,19 @@ class DomainWarmingService {
         if (lastCount <= WARMUP_SCALING_TABLE.base.limit) {
             return WARMUP_SCALING_TABLE.base.value;
         }
+        // For high volume senders (400k+), cap the increase at 20% or 75k absolute
+        if (lastCount > WARMUP_SCALING_TABLE.highVolume.threshold) {
+            const scaledIncrease = Math.ceil(lastCount * WARMUP_SCALING_TABLE.highVolume.maxScale);
+            const absoluteIncrease = lastCount + WARMUP_SCALING_TABLE.highVolume.maxAbsoluteIncrease;
+            return Math.min(scaledIncrease, absoluteIncrease);
+        }
         for (const threshold of WARMUP_SCALING_TABLE.thresholds.sort((a, b) => a.limit - b.limit)) {
             if (lastCount <= threshold.limit) {
                 return Math.ceil(lastCount * threshold.scale);
             }
         }
-        return Math.ceil(lastCount * WARMUP_SCALING_TABLE.defaultScale);
+        // This should not be reached given the thresholds cover all cases up to highVolume.threshold
+        return Math.ceil(lastCount * WARMUP_SCALING_TABLE.highVolume.maxScale);
     }
 }
 exports.DomainWarmingService = DomainWarmingService;

package/core/server/services/email-service/DomainWarmingService.ts

@@ -2,8 +2,12 @@ type LabsService = {
     isSet: (flag: string) => boolean;
 };
 
+type ConfigService = {
+    get: (key: string) => string | undefined;
+}
+
 type EmailModel = {
-    findOne: (options: {filter: string; order: string}) => Promise<EmailRecord | null>;
+    findPage: (options: {filter: string; order: string; limit: number}) => Promise<{data: EmailRecord[]}>;
 };
 
 type EmailRecord = {
@@ -20,41 +24,79 @@ type WarmupScalingTable = {
         limit: number;
         scale: number;
     }[];
-    defaultScale: number;
+    highVolume: {
+        threshold: number;
+        maxScale: number;
+        maxAbsoluteIncrease: number;
+    };
 }
 
+/**
+ * Configuration for domain warming email volume scaling.
+ *
+ * | Volume Range | Multiplier                                       |
+ * |--------------|--------------------------------------------------|
+ * | ≤100 (base)  | 200 messages                                     |
+ * | 101 – 1k     | 1.25× (conservative early ramp)                  |
+ * | 1k – 5k      | 1.5× (moderate increase)                         |
+ * | 5k – 100k    | 1.75× (faster ramp after proving deliverability) |
+ * | 100k – 400k  | 2×                                               |
+ * | 400k+        | min(1.2×, +75k) cap                              |
+ */
 const WARMUP_SCALING_TABLE: WarmupScalingTable = {
     base: {
         limit: 100,
         value: 200
     },
     thresholds: [{
+        limit: 1_000,
+        scale: 1.25
+    }, {
+        limit: 5_000,
+        scale: 1.5
+    }, {
         limit: 100_000,
-        scale: 2
+        scale: 1.75
     }, {
         limit: 400_000,
-        scale: 1.5
+        scale: 2
     }],
-    defaultScale: 1.25
+    highVolume: {
+        threshold: 400_000,
+        maxScale: 1.2,
+        maxAbsoluteIncrease: 75_000
+    }
 };
 
 export class DomainWarmingService {
     #emailModel: EmailModel;
     #labs: LabsService;
+    #config: ConfigService;
 
     constructor(dependencies: {
         models: {Email: EmailModel};
         labs: LabsService;
+        config: ConfigService;
     }) {
         this.#emailModel = dependencies.models.Email;
         this.#labs = dependencies.labs;
+        this.#config = dependencies.config;
     }
 
     /**
      * @returns Whether the domain warming feature is enabled
      */
     isEnabled(): boolean {
-        return this.#labs.isSet('domainWarmup');
+        const hasLabsFlag = this.#labs.isSet('domainWarmup');
+
+        if (!hasLabsFlag) {
+            return false;
+        }
+
+        const fallbackDomain = this.#config.get('hostSettings:managedEmail:fallbackDomain');
+        const fallbackAddress = this.#config.get('hostSettings:managedEmail:fallbackAddress');
+
+        return Boolean(fallbackDomain && fallbackAddress);
     }
 
     /**
@@ -72,16 +114,17 @@ export class DomainWarmingService {
      * @returns The highest number of messages sent from the CSD in a single email (excluding today)
      */
     async #getHighestCount(): Promise<number> {
-        const email = await this.#emailModel.findOne({
+        const result = await this.#emailModel.findPage({
             filter: `created_at:<${new Date().toISOString().split('T')[0]}`,
-            order: 'csd_email_count DESC'
+            order: 'csd_email_count DESC',
+            limit: 1
         });
 
-        if (!email) {
+        if (!result.data.length) {
             return 0;
         }
 
-        const count = email.get('csd_email_count');
+        const count = result.data[0].get('csd_email_count');
         return count || 0;
     }
 
@@ -94,12 +137,20 @@ export class DomainWarmingService {
             return WARMUP_SCALING_TABLE.base.value;
         }
 
+        // For high volume senders (400k+), cap the increase at 20% or 75k absolute
+        if (lastCount > WARMUP_SCALING_TABLE.highVolume.threshold) {
+            const scaledIncrease = Math.ceil(lastCount * WARMUP_SCALING_TABLE.highVolume.maxScale);
+            const absoluteIncrease = lastCount + WARMUP_SCALING_TABLE.highVolume.maxAbsoluteIncrease;
+            return Math.min(scaledIncrease, absoluteIncrease);
+        }
+
         for (const threshold of WARMUP_SCALING_TABLE.thresholds.sort((a, b) => a.limit - b.limit)) {
             if (lastCount <= threshold.limit) {
                 return Math.ceil(lastCount * threshold.scale);
             }
         }
 
-        return Math.ceil(lastCount * WARMUP_SCALING_TABLE.defaultScale);
+        // This should not be reached given the thresholds cover all cases up to highVolume.threshold
+        return Math.ceil(lastCount * WARMUP_SCALING_TABLE.highVolume.maxScale);
     }
 }

package/core/server/services/email-service/EmailServiceWrapper.js

@@ -118,7 +118,8 @@ class EmailServiceWrapper {
 
         const domainWarmingService = new DomainWarmingService({
             models: {Email},
-            labs
+            labs,
+            config: configService
         });
 
         const batchSendingService = new BatchSendingService({

package/core/server/services/member-welcome-emails/jobs/index.js

@@ -8,20 +8,24 @@ let hasScheduled = {
 
 module.exports = {
     async scheduleMemberWelcomeEmailJob() {
-        if (!config.get('memberWelcomeEmailTestInbox')) {
+        const testInboxDisabled = !config.get('memberWelcomeEmailTestInbox');
+        const alreadyScheduledProcessing = hasScheduled.processOutbox;
+
+        if (testInboxDisabled || alreadyScheduledProcessing) {
             return false;
         }
 
-        if (!hasScheduled.processOutbox && !process.env.NODE_ENV.startsWith('test')) {
-            jobsService.addJob({
-                at: '0 */5 * * * *',
-                job: path.resolve(__dirname, 'process-outbox.js'),
-                name: 'process-member-welcome-emails'
-            });
+        const configValue = config.get('memberWelcomeEmailSendInstantly');
+        const testEmailSendInstantly = configValue === true || configValue === 'true';
+        const cronSchedule = testEmailSendInstantly ? '*/3 * * * * *' : '0 */5 * * * *';
 
-            hasScheduled.processOutbox = true;
-        }
+        jobsService.addJob({
+            at: cronSchedule,
+            job: path.resolve(__dirname, 'process-outbox.js'),
+            name: 'process-member-welcome-emails'
+        });
 
+        hasScheduled.processOutbox = true;
         return hasScheduled.processOutbox;
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "6.9.1",
+  "version": "6.9.3",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -87,7 +87,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.9.1.tgz",
+    "@tryghost/i18n": "file:components/tryghost-i18n-6.9.3.tgz",
     "@tryghost/image-transform": "1.4.6",
     "@tryghost/job-manager": "1.0.3",
     "@tryghost/kg-card-factory": "5.1.2",
@@ -274,7 +274,7 @@
     "jackspeak": "2.3.6",
     "moment": "2.24.0",
     "moment-timezone": "0.5.45",
-    "@tryghost/i18n": "file:components/tryghost-i18n-6.9.1.tgz"
+    "@tryghost/i18n": "file:components/tryghost-i18n-6.9.3.tgz"
   },
   "nx": {
     "targets": {