ghost 6.63.0 → 6.64.0

package/core/server/lib/public-jwk.js

@@ -0,0 +1,77 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPublicKeyInfo = getPublicKeyInfo;
+const node_crypto_1 = __importDefault(require("node:crypto"));
+const errors = __importStar(require("@tryghost/errors"));
+// Parsing a PEM and thumbprinting it costs real CPU, so results are shared
+// across every consumer of the same key. Keyed by digest so the cache never
+// holds another reference to private key material.
+const cache = new Map();
+async function parse(privateKeyPem) {
+    // jose 6 is ESM-only. tsc emits this as `require('jose')` under module: commonjs,
+    // which resolves via Node's require(esm) - available on every Node in `engines`.
+    const { calculateJwkThumbprint } = await Promise.resolve().then(() => __importStar(require('jose')));
+    // Node handles both PKCS#1 and PKCS#8 PEMs, and exports public fields only.
+    const publicKey = node_crypto_1.default.createPublicKey(node_crypto_1.default.createPrivateKey(privateKeyPem));
+    const { kty, n, e } = publicKey.export({ format: 'jwk' });
+    if (kty !== 'RSA' || !n || !e) {
+        throw new errors.IncorrectUsageError({
+            message: 'Expected an RSA private key',
+        });
+    }
+    const jwk = { kty, n, e };
+    return { kid: await calculateJwkThumbprint(jwk, 'sha256'), jwk };
+}
+/**
+ * Public JWK and `kid` for a PEM-encoded RSA private key. Never returns private
+ * parameters.
+ */
+function getPublicKeyInfo(privateKeyPem) {
+    const digest = node_crypto_1.default.createHash('sha256').update(privateKeyPem).digest('hex');
+    let info = cache.get(digest);
+    if (!info) {
+        info = parse(privateKeyPem).catch((err) => {
+            // Don't pin a failure forever - a later caller should retry.
+            cache.delete(digest);
+            throw err;
+        });
+        cache.set(digest, info);
+    }
+    return info;
+}

package/core/server/models/user.js

@@ -7,6 +7,7 @@ const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const security = require('@tryghost/security');
 const { validatePassword } = require('../lib/validate-password');
+const { generatePassword } = require('../lib/generate-password');
 const permissions = require('../services/permissions');
 const urlUtils = require('../../shared/url-utils').default;
 const { setIsRoles } = require('./role-utils');
@@ -66,8 +67,7 @@ User = ghostBookshelf.Model.extend(
 
     defaults: function defaults() {
       return {
-        // secretlint-disable-next-line @secretlint/secretlint-rule-pattern
-        password: security.identifier.uid(50),
+        password: generatePassword(''),
         visibility: 'public',
         status: 'active',
         comment_notifications: true,
@@ -208,8 +208,7 @@ User = ghostBookshelf.Model.extend(
      */
     lock: function lock(options) {
       const update = {
-        // secretlint-disable-next-line @secretlint/secretlint-rule-pattern
-        password: security.identifier.uid(50),
+        password: generatePassword(this.get('email') || ''),
       };
       if (this.get('status') !== 'inactive') {
         update.status = 'locked';
@@ -306,8 +305,8 @@ User = ghostBookshelf.Model.extend(
         }
 
         if (options.importing) {
-          // always set password to a random uid when importing
-          this.set('password', security.identifier.uid(50));
+          // generate a random password when importing
+          this.set('password', generatePassword(this.get('email') || ''));
 
           // lock users so they have to follow the password reset flow
           if (this.get('status') !== 'inactive') {
@@ -1037,10 +1036,13 @@ User = ghostBookshelf.Model.extend(
                 }),
               );
             }
-          } else if (roleId !== contextRoleId) {
+          } else if (roleId !== contextRoleId || editedUserId !== context.user) {
             // CASE: you are trying to change a role, but you are not owner
-            // @NOTE: your role is not the same than the role you try to change (!)
-            // e.g. admin can assign admin role to a user, but not owner
+            // @NOTE: assigning any role to *another* user must always go through
+            // the assign check, including your own role. Otherwise an Editor could
+            // promote an Author to Editor, which the role hierarchy disallows.
+            // The only case that skips the check is a self-edit that leaves your
+            // own role untouched, e.g. a profile update that echoes back `roles`.
 
             return permissions
               .canThis(context)

package/core/server/services/adapter-manager/base-classes.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.baseClasses = void 0;
+exports.baseClassPackages = exports.baseClasses = void 0;
 const ghost_storage_base_1 = require("ghost-storage-base");
 const adapter_base_scheduling_1 = require("@tryghost/adapter-base-scheduling");
 const adapter_base_sso_1 = require("@tryghost/adapter-base-sso");
@@ -10,8 +10,7 @@ const adapter_base_route_settings_1 = require("@tryghost/adapter-base-route-sett
 const adapter_base_jobs_1 = require("@tryghost/adapter-base-jobs");
 /**
  * The base class every adapter of a given type must extend. Also read by
- * bin/validate-adapters.js, which checks adapter implementations at build time -
- * keep this the only place the mapping is declared.
+ * bin/validate-adapters.js, so keep this the only place the mapping is declared.
  */
 exports.baseClasses = {
     storage: ghost_storage_base_1.StorageBase,
@@ -22,3 +21,22 @@ exports.baseClasses = {
     'route-settings': adapter_base_route_settings_1.RouteSettingsStoreBase,
     jobs: adapter_base_jobs_1.JobsBackendBase,
 };
+/**
+ * The package each base class above is imported from. An adapter that installs
+ * one of these itself gets a second copy of the base class - a different function
+ * object, so `instanceof` fails and Ghost falls back to comparing class names.
+ * bin/validate-adapters.js fails a build on such a duplicate, where a duplicate
+ * of any other package is only reported.
+ *
+ * Keyed by adapter type so `satisfies` demands an entry per type in
+ * `baseClasses`; a unit test keeps the names matching the imports above.
+ */
+exports.baseClassPackages = {
+    storage: 'ghost-storage-base',
+    scheduling: '@tryghost/adapter-base-scheduling',
+    sso: '@tryghost/adapter-base-sso',
+    cache: '@tryghost/adapter-base-cache',
+    redirects: '@tryghost/adapter-base-redirects',
+    'route-settings': '@tryghost/adapter-base-route-settings',
+    jobs: '@tryghost/adapter-base-jobs',
+};

package/core/server/services/automations/automations-api.js

@@ -18,16 +18,22 @@ exports.getAutomatedEmailRecipientsByMailgunIds = getAutomatedEmailRecipientsByM
 exports.trackEmailDeliveredAndOpened = trackEmailDeliveredAndOpened;
 exports.trackEmailClicked = trackEmailClicked;
 const errors_1 = __importDefault(require("@tryghost/errors"));
+const logging_1 = __importDefault(require("@tryghost/logging"));
 const tpl_1 = __importDefault(require("@tryghost/tpl"));
 const bson_objectid_1 = __importDefault(require("bson-objectid"));
 const zod_1 = require("zod");
 const database_automations_repository_1 = require("./database-automations-repository");
 const fake_wait_hours_multiplier_1 = require("./fake-wait-hours-multiplier");
+const tinybird_automation_stats_1 = require("./tinybird-automation-stats");
 const start_automations_poll_event_1 = require("./events/start-automations-poll-event");
 const { knex } = require('../../data/db');
 const domainEvents = require('@tryghost/domain-events');
 const labs = require('../../../shared/labs');
 const config = require('../../../shared/config');
+const settingsCache = require('../../../shared/settings-cache');
+const requestExternal = require('../../lib/request-external');
+const TinybirdServiceWrapper = require('../tinybird');
+const { create: createTinybirdClient } = require('../stats/utils/tinybird');
 const lexicalLib = require('../../lib/lexical');
 const MAX_AUTOMATION_ACTIONS = 20;
 const messages = {
@@ -77,8 +83,47 @@ const repository = (0, database_automations_repository_1.createDatabaseAutomatio
     knex,
     fakeWaitHoursMultiplier: (0, fake_wait_hours_multiplier_1.parseFakeWaitHoursMultiplier)(config.get('automations:fakeWaitHoursMultiplier')),
 });
+function getTinybirdClient() {
+    if (!labs.isSet('automationsTinybirdSync') || !config.get('tinybird:stats')) {
+        return null;
+    }
+    try {
+        const tinybirdService = TinybirdServiceWrapper.instance;
+        if (!tinybirdService?.getToken()?.token) {
+            return null;
+        }
+        return createTinybirdClient({
+            config,
+            // Fall back to MySQL after the first failed attempt.
+            request: requestExternal.extend({ retry: { limit: 0 } }),
+            settingsCache,
+            tinybirdService,
+        });
+    }
+    catch (error) {
+        logging_1.default.error('Error preparing Tinybird automation stats client:', error);
+        return null;
+    }
+}
 async function browse() {
-    return await repository.browse({ includeStats: true });
+    const tinybirdClient = getTinybirdClient();
+    if (!tinybirdClient) {
+        return await repository.browse({ includeStats: true });
+    }
+    const [browseResult, stats] = await Promise.all([
+        repository.browse({ includeStats: false }),
+        (0, tinybird_automation_stats_1.fetchAutomationStats)(tinybirdClient),
+    ]);
+    if (stats === null) {
+        return await repository.browse({ includeStats: true });
+    }
+    return {
+        ...browseResult,
+        data: browseResult.data.map((automation) => ({
+            ...automation,
+            stats: stats.get(automation.id) ?? { ...tinybird_automation_stats_1.EMPTY_AUTOMATION_STATS },
+        })),
+    };
 }
 async function read(automationId) {
     const automation = await repository.getById(automationId);

package/core/server/services/automations/tinybird-automation-stats.js

@@ -0,0 +1,56 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EMPTY_AUTOMATION_STATS = void 0;
+exports.fetchAutomationStats = fetchAutomationStats;
+const logging_1 = __importDefault(require("@tryghost/logging"));
+const zod_1 = require("zod");
+exports.EMPTY_AUTOMATION_STATS = {
+    last_run_created_at: null,
+    total_run_count: 0,
+    in_progress_run_count: 0,
+};
+const runCountSchema = zod_1.z
+    .union([zod_1.z.number(), zod_1.z.string().regex(/^\d+$/)])
+    .pipe(zod_1.z.coerce.number().int().nonnegative());
+const statsRowSchema = zod_1.z.object({
+    automation_id: zod_1.z.string(),
+    last_run_created_at: zod_1.z.iso
+        .datetime()
+        .transform((value) => new Date(value))
+        .nullable(),
+    total_run_count: runCountSchema,
+    in_progress_run_count: runCountSchema,
+});
+async function fetchAutomationStats(client) {
+    let rows;
+    try {
+        // Override the traffic analytics version: this pipe has no version suffix.
+        rows = await client.fetch('api_automation_browse_stats', { version: '' });
+    }
+    catch (error) {
+        logging_1.default.error('Error fetching Tinybird automation stats:', error);
+        return null;
+    }
+    if (rows === null) {
+        return null;
+    }
+    const parsed = zod_1.z.array(statsRowSchema).safeParse(rows);
+    if (!parsed.success) {
+        logging_1.default.error({
+            system: { event: 'automations.stats.invalid_tinybird_response' },
+            issues: parsed.error.issues,
+        }, 'Unexpected response from the Tinybird automation stats pipe');
+        return null;
+    }
+    return new Map(parsed.data.map((row) => [
+        row.automation_id,
+        {
+            last_run_created_at: row.last_run_created_at,
+            total_run_count: row.total_run_count,
+            in_progress_run_count: row.in_progress_run_count,
+        },
+    ]));
+}

package/core/server/services/content-import/import/media.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PostMediaInliner = exports.MediaInliningFailure = void 0;
 exports.isBlockedMediaUrl = isBlockedMediaUrl;
-const cheerio = require('cheerio');
+const cheerio = require('cheerio/slim');
 class MediaInliningFailure extends Error {
     failures;
     constructor(failures) {

package/core/server/services/email-analytics/email-analytics-service-wrapper.js

@@ -75,7 +75,7 @@ class EmailAnalyticsServiceWrapper {
         }
         return result;
     }
-    _logJobCompletion(jobType, fetchResult, totalDurationMs) {
+    _logJobCompletion(jobType, fetchResult, totalDurationMs, lagSeconds = null) {
         const config = this.#getConfig();
         const { eventCount, apiPollingTimeMs, processingTimeMs, aggregationTimeMs, emailAggregationTimeMs, memberAggregationTimeMs, result, } = fetchResult;
         if (eventCount === 0) {
@@ -89,6 +89,7 @@ class EmailAnalyticsServiceWrapper {
         const logMessage = [
             `[Background Job] ${this.#backgroundJobName} processed ${jobType} | ${this.#logPrefix}`,
             `${eventCount} events in ${(totalDurationMs / 1000).toFixed(1)}s (${throughput.toFixed(2)} events/s)`,
+            ...(lagSeconds === null ? [] : [`Lag: ${(lagSeconds / 60).toFixed(1)}m`]),
             `Mode: ${batchMode}`,
             `Timings: API ${(apiPollingTimeMs / 1000).toFixed(1)}s (${apiPercent}%) / Processing ${(processingTimeMs / 1000).toFixed(1)}s (${processingPercent}%) / Aggregation ${(aggregationTimeMs / 1000).toFixed(1)}s (${aggregationPercent}%) [Email ${(emailAggregationTimeMs / 1000).toFixed(1)}s / Member ${(memberAggregationTimeMs / 1000).toFixed(1)}s]`,
             `Events: opened=${result.opened} delivered=${result.delivered} failed=${result.permanentFailed + result.temporaryFailed} unprocessable=${result.unprocessable}`,
@@ -100,6 +101,7 @@ class EmailAnalyticsServiceWrapper {
                 task: jobType,
                 event_count: eventCount,
                 duration_ms: totalDurationMs,
+                ...(lagSeconds === null ? {} : { lag_seconds: lagSeconds }),
             },
         }, logMessage);
         // We're only concerned with open throughput as this is displayed to users and is most sensitive to being up to date
@@ -124,46 +126,30 @@ class EmailAnalyticsServiceWrapper {
             }
         }
     }
-    async fetchLatestOpenedEvents({ maxEvents = Infinity, } = {}) {
-        const config = this.#getConfig();
-        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_1.default.warn(`${this.#logPrefix} Opened events processing is ${lagMinutes.toFixed(1)} minutes behind (threshold: ${lagThreshold})`);
-        }
+    async #fetchAndLog(jobType, fetch, lagPipeline) {
         const fetchStartedAt = Date.now();
-        const fetchResult = await this.service.fetchLatestOpenedEvents({ maxEvents });
+        const fetchResult = await fetch();
         const totalDuration = Date.now() - fetchStartedAt;
-        this._logJobCompletion('latest-opened', fetchResult, totalDuration);
+        // Lag is read after the fetch so a clean run counts as caught up
+        const lagSeconds = lagPipeline ? this.service.getStatus()[lagPipeline].lagSeconds : null;
+        this._logJobCompletion(jobType, fetchResult, totalDuration, lagSeconds);
         return fetchResult.eventCount;
     }
+    async fetchLatestOpenedEvents({ maxEvents = Infinity, } = {}) {
+        return this.#fetchAndLog('latest-opened', () => this.service.fetchLatestOpenedEvents({ maxEvents }), 'latestOpened');
+    }
     async fetchLatestNonOpenedEvents({ maxEvents = Infinity, } = {}) {
-        const fetchStartedAt = Date.now();
-        const fetchResult = await this.service.fetchLatestNonOpenedEvents({ maxEvents });
-        const totalDuration = Date.now() - fetchStartedAt;
-        this._logJobCompletion('latest', fetchResult, totalDuration);
-        return fetchResult.eventCount;
+        return this.#fetchAndLog('latest', () => this.service.fetchLatestNonOpenedEvents({ maxEvents }), 'latest');
     }
     async fetchMissing({ maxEvents = Infinity } = {}) {
-        const fetchStartedAt = Date.now();
-        const fetchResult = await this.service.fetchMissing({ maxEvents });
-        const totalDuration = Date.now() - fetchStartedAt;
-        this._logJobCompletion('missing', fetchResult, totalDuration);
-        return fetchResult.eventCount;
+        // The missing-events sweep trails the delivery pipeline by design, so it has no lag of its own
+        return this.#fetchAndLog('missing', () => this.service.fetchMissing({ maxEvents }));
     }
     async fetchScheduled({ maxEvents }) {
         if (maxEvents < 300) {
             return 0;
         }
-        const fetchStartedAt = Date.now();
-        const fetchResult = await this.service.fetchScheduled({ maxEvents });
-        const totalDuration = Date.now() - fetchStartedAt;
-        this._logJobCompletion('scheduled', fetchResult, totalDuration);
-        return fetchResult.eventCount;
+        return this.#fetchAndLog('scheduled', () => this.service.fetchScheduled({ maxEvents }));
     }
     async startFetch() {
         const startedAt = Date.now();

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

@@ -65,11 +65,18 @@ class EmailAnalyticsService {
         this.queries.setJobMetadata(this.#jobNames.scheduled, null);
     }
     getStatus() {
+        const now = Date.now();
+        const withLag = (data) => Object.assign(data, {
+            fetchedThrough: data.fetchedThrough ?? null,
+            lagSeconds: data.fetchedThrough
+                ? Math.max(0, Math.floor((now - data.fetchedThrough.getTime()) / 1000))
+                : null,
+        });
         return {
-            latest: this.#fetchLatestNonOpenedData,
-            missing: this.#fetchMissingData,
+            latest: withLag(this.#fetchLatestNonOpenedData),
+            missing: withLag(this.#fetchMissingData),
             scheduled: this.#fetchScheduledData,
-            latestOpened: this.#fetchLatestOpenedData,
+            latestOpened: withLag(this.#fetchLatestOpenedData),
         };
     }
     /**
@@ -363,6 +370,7 @@ class EmailAnalyticsService {
                 });
             }
         };
+        let fetchedThrough;
         try {
             const fetchResult = await this.#fetchEvents({
                 batchHandler: processBatch,
@@ -371,6 +379,11 @@ class EmailAnalyticsService {
                 maxEvents,
                 events: eventTypes,
             });
+            // A void result means fetching was skipped (for example, Mailgun is not configured).
+            // Empty successful windows still establish progress through their requested end.
+            if (fetchResult) {
+                fetchedThrough = fetchResult.safeCursor ?? end;
+            }
             if (fetchResult?.safeCursor &&
                 (!fetchData.lastEventTimestamp || fetchResult.safeCursor < fetchData.lastEventTimestamp)) {
                 fetchData.lastEventTimestamp = fetchResult.safeCursor;
@@ -425,6 +438,9 @@ class EmailAnalyticsService {
         if (error) {
             throw error;
         }
+        if (fetchedThrough) {
+            fetchData.fetchedThrough = fetchedThrough;
+        }
         return {
             eventCount,
             apiPollingTimeMs,

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

@@ -50,8 +50,13 @@ const init = ({ automationsApi, config, db, domainEvents, emailSuppressionList,
         prometheusClient,
     });
     const newsletterMailgunTags = ['bulk-email'];
-    if (config.get('bulkEmail:mailgun:tag')) {
-        newsletterMailgunTags.push(config.get('bulkEmail:mailgun:tag'));
+    const automationMailgunTags = [constants_1.AUTOMATION_EMAIL_TAG];
+    const giftMailgunTags = [constants_2.GIFT_DELIVERY_EMAIL_TAG];
+    const mailgunTagFromConfig = config.get('bulkEmail:mailgun:tag');
+    if (mailgunTagFromConfig) {
+        newsletterMailgunTags.push(mailgunTagFromConfig);
+        automationMailgunTags.push(mailgunTagFromConfig);
+        giftMailgunTags.push(mailgunTagFromConfig);
     }
     prometheusClient?.registerCounter({
         name: newsletter_email_analytics_batch_processor_1.AGGREGATE_MEMBER_STATS_METRIC_NAME,
@@ -91,7 +96,7 @@ const init = ({ automationsApi, config, db, domainEvents, emailSuppressionList,
         domainEvents,
         event: start_automation_email_analytics_job_event_1.StartAutomationEmailAnalyticsJobEvent,
         queries,
-        mailgunTags: [constants_1.AUTOMATION_EMAIL_TAG],
+        mailgunTags: automationMailgunTags,
         jobNames: {
             latestNonOpened: 'email-analytics-automation-latest-others',
             missing: 'email-analytics-automation-missing',
@@ -116,7 +121,7 @@ const init = ({ automationsApi, config, db, domainEvents, emailSuppressionList,
         domainEvents,
         event: start_gift_email_analytics_job_event_1.StartGiftEmailAnalyticsJobEvent,
         queries,
-        mailgunTags: [constants_2.GIFT_DELIVERY_EMAIL_TAG],
+        mailgunTags: giftMailgunTags,
         jobNames: {
             latestNonOpened: 'email-analytics-gifts-latest-others',
             missing: 'email-analytics-gifts-missing',

package/core/server/services/email-rendering/finalize.js

@@ -1,4 +1,4 @@
-const cheerio = require('cheerio');
+const cheerio = require('cheerio/slim');
 const juice = require('juice');
 const htmlToPlaintext = require('@tryghost/html-to-plaintext');
 
@@ -12,7 +12,12 @@ const finalizeHtml = (html) => {
   $('figcaption').addClass('kg-card-figcaption');
   html = $.html();
 
-  const juicedHtml = juice(html, { inlinePseudoElements: true, removeStyleTags: true });
+  // resolveCSSVariables crashes on nameless declarations in user-authored style attributes
+  const juicedHtml = juice(html, {
+    inlinePseudoElements: true,
+    removeStyleTags: true,
+    resolveCSSVariables: false,
+  });
 
   // Many email clients, like Outlook and Yahoo, [lack support for <figure>
   // and <figcaption>][0]. To work around this, change the tags to <div>s.

package/core/server/services/email-service/README.md

@@ -25,6 +25,9 @@ failed email.
 The rough ETA measures recent recipient throughput, including work completed by
 concurrent workers. It stays `null` until enough timing samples are available in
 the current phase and attempt, so short sends may finish without showing an ETA.
+The rate uses the last minute of completions, including the interval crossing
+the window boundary. Early estimates use the available history. Sparse sends
+retain at least two measured intervals.
 Progress counts update independently of the estimate.
 
 The ETA is always `null` for failed emails and `0` once no work remains in the

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

@@ -192,7 +192,7 @@ function escapeRegExp(string) {
  * @return {ReturnType<typeof cheerio.load>}
  */
 function cheerioLoad(html) {
-  const cheerio = require('cheerio');
+  const cheerio = require('cheerio/slim');
   return cheerio.load(html);
 }
 
@@ -709,7 +709,12 @@ class EmailRenderer {
 
     // Juice HTML (inline CSS)
     const juice = require('juice');
-    html = juice(html, { inlinePseudoElements: true, removeStyleTags: true });
+    // resolveCSSVariables crashes on nameless declarations in user-authored style attributes
+    html = juice(html, {
+      inlinePseudoElements: true,
+      removeStyleTags: true,
+      resolveCSSVariables: false,
+    });
 
     // happens after inlining of CSS so we can change element types without worrying about styling
     $ = cheerioLoad(html);

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

@@ -44,7 +44,7 @@ class EmailServiceWrapper {
     const limitService = require('../limits');
     const labs = require('../../../shared/labs');
     const emailAddressService = require('../email-address');
-    const i18nLib = require('@tryghost/i18n');
+    const i18nLib = require('@tryghost/i18n').default;
     const lexicalLib = require('../../lib/lexical');
     const urlUtils = require('../../../shared/url-utils').default;
     const memberAttribution = require('../member-attribution');