ghost 6.56.0 → 6.57.1

package/core/server/services/automations/database-automations-repository.js

@@ -465,13 +465,13 @@ async function findNextPendingReadyAt(trx, staleLockCutoff) {
     })
         .orderBy('ready_at')
         .first();
-    return row?.next_ready_at ? new Date(row.next_ready_at) : null;
+    return row?.next_ready_at ? (0, database_date_1.fromDatabaseDate)(row.next_ready_at) : null;
 }
 function buildStepToRun(row) {
     const base = {
         id: row.id,
         step_attempts: row.step_attempts,
-        ready_at: new Date(row.ready_at),
+        ready_at: (0, database_date_1.fromDatabaseDate)(row.ready_at),
         locked_by: row.locked_by,
         automation_run_id: row.automation_run_id,
         automation_id: row.automation_id,
@@ -897,8 +897,8 @@ function getNextRevisionCreatedAt(latestCreatedAt, requestedCreatedAt) {
     if (!latestCreatedAt) {
         return (0, database_date_1.toDatabaseDate)(requestedCreatedAt);
     }
-    const requestedTime = new Date(requestedCreatedAt).getTime();
-    const latestTime = new Date(latestCreatedAt).getTime();
+    const requestedTime = (0, database_date_1.fromDatabaseDate)(requestedCreatedAt).getTime();
+    const latestTime = (0, database_date_1.fromDatabaseDate)(latestCreatedAt).getTime();
     if (requestedTime > latestTime) {
         return (0, database_date_1.toDatabaseDate)(requestedCreatedAt);
     }
@@ -979,7 +979,7 @@ function buildAutomationSummary(automation) {
     };
 }
 function serializeDate(date) {
-    const normalizedDate = new Date(date);
+    const normalizedDate = (0, database_date_1.fromDatabaseDate)(date);
     normalizedDate.setMilliseconds(0);
     return normalizedDate.toISOString();
 }

package/core/server/services/automations/database-automations-repository.ts

@@ -21,7 +21,7 @@ import type {
     EditAutomationData,
     Page
 } from './automations-repository';
-import {toDatabaseDate} from './database-date';
+import {fromDatabaseDate, toDatabaseDate, type DatabaseDate} from './database-date';
 import {getStaleLockCutoff} from './stale-lock-cutoff';
 import type {ExclusifyUnion, ReadonlyDeep} from 'type-fest';
 
@@ -48,8 +48,8 @@ interface AutomationRow {
     slug: string;
     name: string;
     status: string;
-    created_at: string;
-    updated_at: string;
+    created_at: DatabaseDate;
+    updated_at: DatabaseDate;
 }
 
 
@@ -76,7 +76,7 @@ type ActionLinkRow = {
 
 type ActionRevisionRow = {
     action_id: string;
-    created_at: string;
+    created_at: DatabaseDate;
     wait_hours: number | null;
     email_subject: string | null;
     email_lexical: string | null;
@@ -108,7 +108,7 @@ type StepToRunRow = {
     action_id: string;
     automation_action_revision_id: string;
     type: string;
-    ready_at: string;
+    ready_at: DatabaseDate;
     step_attempts: number;
     wait_hours: number | null;
     email_subject: string | null;
@@ -709,14 +709,14 @@ async function findNextPendingReadyAt(trx: Knex.Transaction, staleLockCutoff: Re
         })
         .orderBy('ready_at')
         .first();
-    return row?.next_ready_at ? new Date(row.next_ready_at) : null;
+    return row?.next_ready_at ? fromDatabaseDate(row.next_ready_at) : null;
 }
 
 function buildStepToRun(row: ReadonlyDeep<StepToRunRow>): AutomationStepToRun {
     const base = {
         id: row.id,
         step_attempts: row.step_attempts,
-        ready_at: new Date(row.ready_at),
+        ready_at: fromDatabaseDate(row.ready_at),
         locked_by: row.locked_by,
         automation_run_id: row.automation_run_id,
         automation_id: row.automation_id,
@@ -1259,13 +1259,13 @@ async function insertActionRevisions(
     );
 }
 
-function getNextRevisionCreatedAt(latestCreatedAt: string | null, requestedCreatedAt: string) {
+function getNextRevisionCreatedAt(latestCreatedAt: DatabaseDate | null, requestedCreatedAt: string) {
     if (!latestCreatedAt) {
         return toDatabaseDate(requestedCreatedAt);
     }
 
-    const requestedTime = new Date(requestedCreatedAt).getTime();
-    const latestTime = new Date(latestCreatedAt).getTime();
+    const requestedTime = fromDatabaseDate(requestedCreatedAt).getTime();
+    const latestTime = fromDatabaseDate(latestCreatedAt).getTime();
 
     if (requestedTime > latestTime) {
         return toDatabaseDate(requestedCreatedAt);
@@ -1355,8 +1355,8 @@ function buildAutomationSummary(automation: AutomationRow): AutomationSummary {
     };
 }
 
-function serializeDate(date: string) {
-    const normalizedDate = new Date(date);
+function serializeDate(date: DatabaseDate) {
+    const normalizedDate = fromDatabaseDate(date);
     normalizedDate.setMilliseconds(0);
     return normalizedDate.toISOString();
 }

package/core/server/services/automations/database-date.js

@@ -1,10 +1,59 @@
 "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.toDatabaseDate = void 0;
+exports.fromDatabaseDate = exports.toDatabaseDate = exports.DATABASE_DATE_FORMAT = void 0;
 const moment_1 = __importDefault(require("moment"));
-const DATABASE_DATE_FORMAT = 'YYYY-MM-DD HH:mm:ss';
-const toDatabaseDate = (date) => (0, moment_1.default)(date).format(DATABASE_DATE_FORMAT);
+const errors = __importStar(require("@tryghost/errors"));
+exports.DATABASE_DATE_FORMAT = 'YYYY-MM-DD HH:mm:ss';
+const toDatabaseDate = (date) => moment_1.default.utc(date).format(exports.DATABASE_DATE_FORMAT);
 exports.toDatabaseDate = toDatabaseDate;
+const fromDatabaseDate = (date) => {
+    if (date instanceof Date) {
+        return new Date(date);
+    }
+    if (typeof date === 'string') {
+        return moment_1.default.utc(date, exports.DATABASE_DATE_FORMAT).toDate();
+    }
+    // Defense-in-depth for legacy SQLite rows stored as epoch milliseconds.
+    if (typeof date === 'number') {
+        return moment_1.default.utc(date).toDate();
+    }
+    const exhaustive = date;
+    throw new errors.InternalServerError({ message: `Unexpected type for database date: ${exhaustive}` });
+};
+exports.fromDatabaseDate = fromDatabaseDate;

package/core/server/services/automations/database-date.ts

@@ -1,5 +1,26 @@
 import moment from 'moment';
+import * as errors from '@tryghost/errors';
 
-const DATABASE_DATE_FORMAT = 'YYYY-MM-DD HH:mm:ss';
+export const DATABASE_DATE_FORMAT = 'YYYY-MM-DD HH:mm:ss';
 
-export const toDatabaseDate = (date: Date | string): string => moment(date).format(DATABASE_DATE_FORMAT);
+export type DatabaseDate = Date | string | number;
+
+export const toDatabaseDate = (date: Date | string): string => moment.utc(date).format(DATABASE_DATE_FORMAT);
+
+export const fromDatabaseDate = (date: DatabaseDate): Date => {
+    if (date instanceof Date) {
+        return new Date(date);
+    }
+
+    if (typeof date === 'string') {
+        return moment.utc(date, DATABASE_DATE_FORMAT).toDate();
+    }
+
+    // Defense-in-depth for legacy SQLite rows stored as epoch milliseconds.
+    if (typeof date === 'number') {
+        return moment.utc(date).toDate();
+    }
+
+    const exhaustive: never = date;
+    throw new errors.InternalServerError({message: `Unexpected type for database date: ${exhaustive}`});
+};

package/core/server/services/automations/service.js

@@ -112,13 +112,13 @@ class AutomationsService {
                 logging.error({ event: { name: 'automations.enqueue-poll.error' }, err, at: date.toISOString() }, 'Failed to enqueue automations poll');
             }
         };
-        domainEvents.subscribe(StartAutomationsPollEvent, (0, one_at_a_time_1.oneAtATime)(async () => (0, poll_1.poll)({
+        domainEvents.subscribe(StartAutomationsPollEvent, (0, one_at_a_time_1.oneAtATime)(() => (0, poll_1.poll)({
             automationsApi,
             memberWelcomeEmailService,
             scheduleAutomationEmailAnalyticsJob,
             enqueueAnotherPollAt: enqueuePollAt
         })));
-        domainEvents.subscribe(StartAutomationsPollEvent, (0, one_at_a_time_1.oneAtATime)(async () => welcomeEmailAutomationPoll({
+        domainEvents.subscribe(StartAutomationsPollEvent, (0, one_at_a_time_1.oneAtATime)(() => welcomeEmailAutomationPoll({
             memberWelcomeEmailService,
             enqueueAnotherPollAt: enqueuePollAt
         })));

package/core/server/services/automations/service.ts

@@ -96,14 +96,14 @@ export class AutomationsService {
             }
         };
 
-        domainEvents.subscribe(StartAutomationsPollEvent, oneAtATime(async () => poll({
+        domainEvents.subscribe(StartAutomationsPollEvent, oneAtATime(() => poll({
             automationsApi,
             memberWelcomeEmailService,
             scheduleAutomationEmailAnalyticsJob,
             enqueueAnotherPollAt: enqueuePollAt
         })));
 
-        domainEvents.subscribe(StartAutomationsPollEvent, oneAtATime(async () => welcomeEmailAutomationPoll({
+        domainEvents.subscribe(StartAutomationsPollEvent, oneAtATime(() => welcomeEmailAutomationPoll({
             memberWelcomeEmailService,
             enqueueAnotherPollAt: enqueuePollAt
         })));

package/core/server/services/comments/comments-service-emails.js

@@ -29,7 +29,7 @@ class CommentsServiceEmails {
         // Comments live on pages as well as posts; the URL service routes by
         // the passed type, so a page typed 'posts' resolves to /404/.
         const routerType = postData.type === 'page' ? 'pages' : 'posts';
-        const baseUrl = this.urlService.facade.getUrlForResource({...postData, type: routerType}, {absolute: true});
+        const baseUrl = this.urlService.getUrlForResource({...postData, type: routerType}, {absolute: true});
         return `${baseUrl}#ghost-comments-${commentId}`;
     }
 

package/core/server/services/comments/comments-service.js

@@ -473,7 +473,7 @@ class CommentsService {
      * @param {AdminBrowseAllOptions} options
      */
     async getAdminAllComments({includeNested, filter, mongoTransformer, reportCount, order, page, limit}) {
-        const postUrlRelations = this.urlService.facade.getRequiredRelations().map(relation => `post.${relation}`);
+        const postUrlRelations = this.urlService.getRequiredRelations().map(relation => `post.${relation}`);
         const withRelated = ['member', 'post', ...postUrlRelations, 'count.replies', 'count.direct_replies', 'count.likes', 'count.dislikes', 'count.net_score', 'count.reports', 'in_reply_to', 'parent'];
 
         return await this.models.Comment.findPage({

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

@@ -4,7 +4,7 @@ const config = require('../../../shared/config');
 const domainEvents = require('@tryghost/domain-events');
 /** @import {PrometheusClient} from '@tryghost/prometheus-metrics' */
 /** @import {BatchEventProcessor} from './batch-event-processor' */
-/** @import {JobNames, CursorSeed} from './email-analytics-service' */
+/** @import {JobNames, CursorSeed, EmailAnalyticsFetchResult} from './email-analytics-service' */
 
 class EmailAnalyticsServiceWrapper {
     /** @type {string} */ #logName;
@@ -49,7 +49,7 @@ class EmailAnalyticsServiceWrapper {
         const EmailAnalyticsService = require('./email-analytics-service');
         const MailgunProvider = require('./email-analytics-provider-mailgun');
         const settings = require('../../../shared/settings-cache');
-        const queries = require('./lib/queries');
+        const {queries} = require('./lib/queries');
 
         this.service = new EmailAnalyticsService({
             provider: new MailgunProvider({config, settings, tags: mailgunTags}),
@@ -74,7 +74,7 @@ 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 {EmailAnalyticsFetchResult} fetchResult - The fetch result from EmailAnalyticsService
      * @param {number} totalDurationMs - Total duration in milliseconds
      */
     _logJobCompletion(jobType, fetchResult, totalDurationMs) {
@@ -158,6 +158,11 @@ class EmailAnalyticsServiceWrapper {
         return fetchResult.eventCount;
     }
 
+    /**
+     * @param {object} options
+     * @param {number} options.maxEvents
+     * @returns {Promise<number>} The number of scheduled events fetched
+     */
     async fetchScheduled({maxEvents}) {
         if (maxEvents < 300) {
             return 0;
@@ -227,6 +232,10 @@ class EmailAnalyticsServiceWrapper {
         this.#fetching = false;
     }
 
+    /**
+     * @param {string} reason
+     * @returns {void}
+     */
     _restartFetch(reason) {
         this.#fetching = false;
         logging.info(`${this.#logPrefix} Restarting fetch due to ${reason}`);

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

@@ -3,6 +3,7 @@ const logging = require('@tryghost/logging');
 const errors = require('@tryghost/errors');
 /** @import {PrometheusClient} from '@tryghost/prometheus-metrics' */
 /** @import {BatchEventProcessor} from './batch-event-processor' */
+/** @import {Queries} from './lib/queries' */
 
 /**
  * @typedef {object} FetchData
@@ -74,7 +75,7 @@ function createEmptyResult() {
 }
 
 module.exports = class EmailAnalyticsService {
-    queries;
+    /** @type {Queries} */ queries;
     provider;
     #createEventProcessor;
 
@@ -103,7 +104,7 @@ module.exports = class EmailAnalyticsService {
 
     /**
      * @param {object} dependencies
-     * @param {object} dependencies.queries
+     * @param {Queries} dependencies.queries
      * @param {object} dependencies.provider
      * @param {PrometheusClient} [dependencies.prometheusClient]
      * @param {() => BatchEventProcessor} dependencies.createEventProcessor
@@ -372,7 +373,7 @@ module.exports = class EmailAnalyticsService {
      * @param {EmailAnalyticsEvent[]} [options.eventTypes] - Array of event types to fetch. If not provided, Mailgun will return all event types.
      * @returns {Promise<EmailAnalyticsFetchResult>} Fetch results with timing metrics
      */
-    async #fetchEvents(fetchData, {begin, end, maxEvents = Infinity, eventTypes = null}) {
+    async #fetchEvents(fetchData, {begin, end, maxEvents = Infinity, eventTypes}) {
         // Start where we left of, or the last stored event in the database, or start 30 minutes ago if we have nothing available
         // Store that we started fetching
         fetchData.running = true;

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

@@ -57,8 +57,7 @@ const models_1 = require("../../models");
 const domain_events_1 = __importDefault(require("@tryghost/domain-events"));
 // @ts-expect-error This module lacks type definitions.
 const prometheus_client_1 = __importDefault(require("../../../shared/prometheus-client"));
-// @ts-expect-error This module lacks type definitions.
-const queries_1 = __importDefault(require("./lib/queries"));
+const queries_1 = require("./lib/queries");
 const start_email_analytics_job_event_1 = require("./events/start-email-analytics-job-event");
 const start_automation_email_analytics_job_event_1 = require("./events/start-automation-email-analytics-job-event");
 const constants_1 = require("../member-welcome-emails/constants");
@@ -113,7 +112,7 @@ const init = () => {
             config: config_1.default,
             emailEventProcessor: newsletterEmailEventProcessor,
             prometheusClient: prometheus_client_1.default,
-            queries: queries_1.default
+            queries: queries_1.queries
         }))
     });
     exports.automations.init({

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

@@ -18,8 +18,7 @@ import {EmailRecipientFailure, EmailSpamComplaintEvent, Email} from '../../model
 import domainEvents from '@tryghost/domain-events';
 // @ts-expect-error This module lacks type definitions.
 import prometheusClient from '../../../shared/prometheus-client';
-// @ts-expect-error This module lacks type definitions.
-import queries from './lib/queries';
+import {queries} from './lib/queries';
 import {StartEmailAnalyticsJobEvent} from './events/start-email-analytics-job-event';
 import {StartAutomationEmailAnalyticsJobEvent} from './events/start-automation-email-analytics-job-event';
 import {AUTOMATION_EMAIL_TAG} from '../member-welcome-emails/constants';