ghost 6.61.0 → 6.62.0

package/core/server/services/jobs/worker-model-event-bridge.js

@@ -1,149 +0,0 @@
-const { z } = require('zod');
-const moment = require('moment');
-
-const MODEL_EVENT_TYPE = 'model-event';
-const SUPPORTED_MODEL_EVENTS = {
-  'member.edited': {
-    model: 'Member',
-  },
-};
-
-const attributesSchema = z.record(z.string(), z.unknown());
-
-const messageSchema = z
-  .object({
-    type: z.literal(MODEL_EVENT_TYPE),
-    eventName: z.enum(Object.keys(SUPPORTED_MODEL_EVENTS)),
-    model: z.string(),
-    id: z.string().min(1),
-    previous: attributesSchema,
-    changed: attributesSchema.refine((value) => Object.keys(value).length > 0, {
-      message: 'must include at least one changed attribute',
-    }),
-    options: attributesSchema.optional(),
-  })
-  .refine((message) => SUPPORTED_MODEL_EVENTS[message.eventName]?.model === message.model, {
-    message: 'does not match the event',
-    path: ['model'],
-  });
-
-class WorkerModelEventBridge {
-  constructor({ models, events, logging, sentry }) {
-    this.models = models;
-    this.events = events;
-    this.logging = logging;
-    this.sentry = sentry;
-  }
-
-  isModelEventMessage(message) {
-    return isObject(message) && message.type === MODEL_EVENT_TYPE;
-  }
-
-  async handle(message, meta = {}) {
-    const validationError = this.validate(message);
-
-    if (validationError) {
-      this.logging.warn(
-        `Ignoring invalid worker model event from job ${meta.jobName || 'unknown'}: ${validationError}`,
-      );
-      return false;
-    }
-
-    try {
-      return await this.emitModelEvent(message);
-    } catch (err) {
-      this.logging.error(err);
-      this.sentry.captureException(err);
-      return false;
-    }
-  }
-
-  validate(message) {
-    const result = messageSchema.safeParse(message);
-
-    if (result.success) {
-      return null;
-    }
-
-    return result.error.issues
-      .map((issue) =>
-        issue.path.length ? `${issue.path.join('.')}: ${issue.message}` : issue.message,
-      )
-      .join('; ');
-  }
-
-  async emitModelEvent(message) {
-    const Model = this.models[message.model];
-    let model;
-
-    try {
-      model = await Model.findOne(
-        {
-          id: message.id,
-        },
-        {
-          require: true,
-          context: { internal: true },
-        },
-      );
-    } catch (err) {
-      if (isNotFoundError(err)) {
-        this.logging.warn(
-          `Could not emit worker model event ${message.eventName}: ${message.model} ${message.id} was not found`,
-        );
-        return false;
-      }
-
-      throw err;
-    }
-
-    model._previousAttributes = normalizeDates({
-      ...model.attributes,
-      ...message.previous,
-    });
-    model._changed = normalizeDates(message.changed);
-
-    const options = normalizeOptions(message.options);
-    this.events.emit(message.eventName, model, options);
-    return true;
-  }
-}
-
-function normalizeOptions(options = {}) {
-  return {
-    ...options,
-    context: {
-      ...options.context,
-      internal: true,
-    },
-  };
-}
-
-function normalizeDates(attributes) {
-  const normalized = { ...attributes };
-
-  for (const [key, value] of Object.entries(normalized)) {
-    if (key.endsWith('_at') && value && !(value instanceof Date)) {
-      normalized[key] = moment.utc(value).toDate();
-    }
-  }
-
-  return normalized;
-}
-
-function isObject(value) {
-  return !!value && typeof value === 'object' && !Array.isArray(value);
-}
-
-function isNotFoundError(err) {
-  return (
-    err &&
-    (err.errorType === 'NotFoundError' ||
-      err.name === 'NotFoundError' ||
-      err.message === 'NotFound' ||
-      err.message === 'EmptyResponse')
-  );
-}
-
-module.exports = WorkerModelEventBridge;
-module.exports.MODEL_EVENT_TYPE = MODEL_EVENT_TYPE;

package/core/server/services/members/jobs/clean-expired-comped.js

@@ -1,132 +0,0 @@
-const { parentPort } = require('worker_threads');
-const ObjectId = require('bson-objectid').default;
-const { chunk: chunkArray } = require('lodash');
-const debug = require('@tryghost/debug')('jobs:clean-expired-comped');
-const moment = require('moment');
-
-// recurring job to clean expired complimentary subscriptions
-
-// Exit early when cancelled to prevent stalling shutdown. No cleanup needed when cancelling as everything is idempotent and will pick up
-// where it left off on next run
-function cancel() {
-  if (parentPort) {
-    parentPort.postMessage('cancelled before completion');
-    parentPort.postMessage('cancelled');
-  } else {
-    setTimeout(() => {
-      process.exit(0);
-    }, 1000);
-  }
-}
-
-if (parentPort) {
-  parentPort.once('message', (message) => {
-    if (message === 'cancel') {
-      return cancel();
-    }
-  });
-}
-
-(async () => {
-  const cleanupStartDate = new Date();
-  const db = require('../../../data/db');
-  if (parentPort) {
-    parentPort.postMessage('execution started');
-  }
-  debug(`Starting cleanup of expired comp subscriptions`);
-  const expiredCompedRows = await db
-    .knex('members_products')
-    .where('expiry_at', '<', moment.utc().startOf('day').toISOString())
-    .select('*');
-
-  let deletedExpiredSubs = 0;
-  let updatedMembers = 0;
-
-  // Run cleanup for expired comp subscriptions
-  // Removes expired comped entries from members_products table
-  // Updates affected members status to free from comped
-  // Adds member status event for going from comped to free
-  if (expiredCompedRows?.length) {
-    const rowIds = expiredCompedRows.map((d) => d.id);
-    const memberIds = expiredCompedRows.map((d) => d.member_id);
-
-    // Delete all expired comped rows
-    deletedExpiredSubs = await db.knex('members_products').whereIn('id', rowIds).del();
-
-    // fetch all comped members to update
-    const membersToUpdate = await db
-      .knex('members')
-      .whereIn('id', memberIds)
-      .andWhere('status', 'comped');
-
-    const updateMemberIds = membersToUpdate.map((d) => d.id);
-    const now = new Date();
-
-    // Update all comped members to free
-    updatedMembers = await db.knex('members').whereIn('id', updateMemberIds).update({
-      status: 'free',
-      updated_at: now,
-    });
-
-    const statusEvents = membersToUpdate.map((member) => {
-      return {
-        id: ObjectId().toHexString(),
-        member_id: member.id,
-        from_status: member.status,
-        to_status: 'free',
-        created_at: now,
-      };
-    });
-
-    // SQLite >= 3.32.0 can support 32766 host parameters
-    // each row uses 5 variables so ⌊32766/5⌋ = 6553
-    const chunkSize = 6553;
-
-    const chunks = chunkArray(statusEvents, chunkSize);
-
-    // Adds status event for members going comped->free
-    for (const chunk of chunks) {
-      await db.knex('members_status_events').insert(chunk);
-    }
-
-    if (parentPort) {
-      for (const member of membersToUpdate) {
-        parentPort.postMessage({
-          type: 'model-event',
-          eventName: 'member.edited',
-          model: 'Member',
-          id: member.id,
-          previous: {
-            status: member.status,
-            updated_at: member.updated_at,
-          },
-          changed: {
-            status: 'free',
-            updated_at: now,
-          },
-          options: {
-            context: { internal: true },
-          },
-        });
-      }
-    }
-  }
-
-  let cleanupEndDate = new Date();
-
-  debug(
-    `Removed ${deletedExpiredSubs} expired subscriptions, updated ${updatedMembers} members in ${cleanupEndDate.valueOf() - cleanupStartDate.valueOf()}ms`,
-  );
-
-  if (parentPort) {
-    parentPort.postMessage(
-      `completed in ${cleanupEndDate.valueOf() - cleanupStartDate.valueOf()}ms: removed ${deletedExpiredSubs} expired subscriptions and updated ${updatedMembers} members`,
-    );
-    parentPort.postMessage('done');
-  } else {
-    // give the logging pipes time finish writing before exit
-    setTimeout(() => {
-      process.exit(0);
-    }, 1000);
-  }
-})();

package/core/server/services/stripe/services/checkout/allowed-countries.js

@@ -1,267 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.STRIPE_ALLOWED_COUNTRIES = void 0;
-exports.isStripeAllowedCountry = isStripeAllowedCountry;
-/**
- * The countries Stripe Checkout will accept in `shipping_address_collection`.
- *
- * Not a general list of countries. This is not a question about which places exist, it is
- * a question about where this payment processor will ship, and only the processor's answer
- * decides whether a session can be created at all. A general ISO list gets it wrong in both
- * directions: it omits places Stripe accepts, and it includes the sanctioned countries
- * Stripe refuses.
- *
- * Measured against the live API at the pinned version by `e2e/scripts/probe-stripe-constraints.ts`,
- * not read from the SDK's `AllowedCountry` union, because that union is wrong: it omits
- * `SD`, which the live API accepts. Every other code the union carries was confirmed
- * accepted, so the union is a subset of this list rather than a different one — which is
- * what the accompanying test holds it to, so a country Stripe adds cannot pass unnoticed.
- *
- * A code Stripe rejects fails the whole session create, which is a publisher who cannot
- * sell. So this is checked when a publisher chooses a country rather than when a member
- * tries to buy.
- */
-exports.STRIPE_ALLOWED_COUNTRIES = [
-    'AC',
-    'AD',
-    'AE',
-    'AF',
-    'AG',
-    'AI',
-    'AL',
-    'AM',
-    'AO',
-    'AQ',
-    'AR',
-    'AT',
-    'AU',
-    'AW',
-    'AX',
-    'AZ',
-    'BA',
-    'BB',
-    'BD',
-    'BE',
-    'BF',
-    'BG',
-    'BH',
-    'BI',
-    'BJ',
-    'BL',
-    'BM',
-    'BN',
-    'BO',
-    'BQ',
-    'BR',
-    'BS',
-    'BT',
-    'BV',
-    'BW',
-    'BY',
-    'BZ',
-    'CA',
-    'CD',
-    'CF',
-    'CG',
-    'CH',
-    'CI',
-    'CK',
-    'CL',
-    'CM',
-    'CN',
-    'CO',
-    'CR',
-    'CV',
-    'CW',
-    'CY',
-    'CZ',
-    'DE',
-    'DJ',
-    'DK',
-    'DM',
-    'DO',
-    'DZ',
-    'EC',
-    'EE',
-    'EG',
-    'EH',
-    'ER',
-    'ES',
-    'ET',
-    'FI',
-    'FJ',
-    'FK',
-    'FO',
-    'FR',
-    'GA',
-    'GB',
-    'GD',
-    'GE',
-    'GF',
-    'GG',
-    'GH',
-    'GI',
-    'GL',
-    'GM',
-    'GN',
-    'GP',
-    'GQ',
-    'GR',
-    'GS',
-    'GT',
-    'GU',
-    'GW',
-    'GY',
-    'HK',
-    'HN',
-    'HR',
-    'HT',
-    'HU',
-    'ID',
-    'IE',
-    'IL',
-    'IM',
-    'IN',
-    'IO',
-    'IQ',
-    'IS',
-    'IT',
-    'JE',
-    'JM',
-    'JO',
-    'JP',
-    'KE',
-    'KG',
-    'KH',
-    'KI',
-    'KM',
-    'KN',
-    'KR',
-    'KW',
-    'KY',
-    'KZ',
-    'LA',
-    'LB',
-    'LC',
-    'LI',
-    'LK',
-    'LR',
-    'LS',
-    'LT',
-    'LU',
-    'LV',
-    'LY',
-    'MA',
-    'MC',
-    'MD',
-    'ME',
-    'MF',
-    'MG',
-    'MK',
-    'ML',
-    'MM',
-    'MN',
-    'MO',
-    'MQ',
-    'MR',
-    'MS',
-    'MT',
-    'MU',
-    'MV',
-    'MW',
-    'MX',
-    'MY',
-    'MZ',
-    'NA',
-    'NC',
-    'NE',
-    'NG',
-    'NI',
-    'NL',
-    'NO',
-    'NP',
-    'NR',
-    'NU',
-    'NZ',
-    'OM',
-    'PA',
-    'PE',
-    'PF',
-    'PG',
-    'PH',
-    'PK',
-    'PL',
-    'PM',
-    'PN',
-    'PR',
-    'PS',
-    'PT',
-    'PY',
-    'QA',
-    'RE',
-    'RO',
-    'RS',
-    'RU',
-    'RW',
-    'SA',
-    'SB',
-    'SC',
-    'SD',
-    'SE',
-    'SG',
-    'SH',
-    'SI',
-    'SJ',
-    'SK',
-    'SL',
-    'SM',
-    'SN',
-    'SO',
-    'SR',
-    'SS',
-    'ST',
-    'SV',
-    'SX',
-    'SZ',
-    'TA',
-    'TC',
-    'TD',
-    'TF',
-    'TG',
-    'TH',
-    'TJ',
-    'TK',
-    'TL',
-    'TM',
-    'TN',
-    'TO',
-    'TR',
-    'TT',
-    'TV',
-    'TW',
-    'TZ',
-    'UA',
-    'UG',
-    'US',
-    'UY',
-    'UZ',
-    'VA',
-    'VC',
-    'VE',
-    'VG',
-    'VN',
-    'VU',
-    'WF',
-    'WS',
-    'XK',
-    'YE',
-    'YT',
-    'ZA',
-    'ZM',
-    'ZW',
-    'ZZ',
-];
-const ALLOWED = new Set(exports.STRIPE_ALLOWED_COUNTRIES);
-function isStripeAllowedCountry(code) {
-    return ALLOWED.has(code);
-}

package/core/server/services/stripe/services/checkout/field-ports.js

@@ -1,34 +0,0 @@
-"use strict";
-/**
- * What Stripe Checkout will render, measured against the live API at Ghost's pinned
- * version rather than read from the reference — which disagreed with the API in three of
- * five probes, missing the field cap and the key format entirely. A wrong bound here fails
- * the session create, which fails the checkout.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CHECKOUT_ELIGIBLE_FIELD_TYPES = exports.MAX_CHECKOUT_LABEL_LENGTH = exports.MAX_CHECKOUT_CUSTOM_FIELDS = exports.STRIPE_PORT = exports.STRIPE_PORTS = void 0;
-exports.isStripePort = isStripePort;
-exports.isCheckoutEligible = isCheckoutEligible;
-/** The names Stripe returns values under, and the only ports a binding for it may use. */
-exports.STRIPE_PORTS = ['shipping_name', 'shipping_address', 'phone'];
-function isStripePort(key) {
-    return exports.STRIPE_PORTS.includes(key);
-}
-exports.STRIPE_PORT = {
-    shippingName: 'shipping_name',
-    shippingAddress: 'shipping_address',
-    phone: 'phone',
-};
-/** Stripe rejects a fourth. */
-exports.MAX_CHECKOUT_CUSTOM_FIELDS = 3;
-/** Stripe caps a custom label at 50, where a field name may be 191 — hence a question label. */
-exports.MAX_CHECKOUT_LABEL_LENGTH = 50;
-/**
- * What Stripe Checkout can ask for. No `long_text`: its text input caps shorter than that
- * type allows. No `address`: Stripe has no custom-field equivalent, so an address is
- * collected through its own parameter instead.
- */
-exports.CHECKOUT_ELIGIBLE_FIELD_TYPES = ['short_text'];
-function isCheckoutEligible(type) {
-    return exports.CHECKOUT_ELIGIBLE_FIELD_TYPES.includes(type);
-}

package/core/server/services/tier-checkout-config/destinations.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PORT_FIELD = void 0;
-/**
- * What a port supplies, and what to call a field made to hold it. The type is a rule about
- * any destination: a port that returns an address can only be collected into a field that
- * keeps one. The name is used only when the request names a key the site does not keep
- * yet, which is the one moment a publisher has not chosen a label themselves.
- *
- * A key is not a port. `phone` is what Stripe calls what it returns; where it lands is
- * whatever the request said, and `Shipping Phone` is only how that field is listed.
- */
-exports.PORT_FIELD = {
-    shipping_name: { name: 'Shipping Name', type: 'short_text' },
-    shipping_address: { name: 'Shipping Address', type: 'address' },
-    phone: { name: 'Shipping Phone', type: 'short_text' },
-};

package/core/server/services/update-check/run-update-check.js

@@ -1,63 +0,0 @@
-const { parentPort, workerData } = require('worker_threads');
-
-const postParentPortMessage = (message) => {
-  if (parentPort) {
-    parentPort.postMessage(message);
-  }
-};
-
-// Exit early when cancelled to prevent stalling shutdown. No cleanup needed when cancelling as everything is idempotent and will pick up
-// where it left off on next run
-function cancel() {
-  postParentPortMessage('cancelled before completion');
-
-  if (parentPort) {
-    postParentPortMessage('cancelled');
-  } else {
-    setTimeout(() => {
-      process.exit(0);
-    }, 1000);
-  }
-}
-
-if (parentPort) {
-  parentPort.once('message', (message) => {
-    if (message === 'cancel') {
-      return cancel();
-    }
-  });
-}
-
-(async () => {
-  const startedAt = Date.now();
-  postParentPortMessage('execution started');
-  const updateCheck = require('./');
-
-  // INIT required services
-  const permissions = require('../permissions');
-  await permissions.init();
-
-  const settings = require('../settings/settings-service');
-  await settings.init();
-
-  const emailAddress = require('../email-address');
-  emailAddress.init();
-  // Finished INIT
-
-  await updateCheck({
-    rethrowErrors: true,
-    forceUpdate: workerData.forceUpdate,
-    updateCheckUrl: workerData.updateCheckUrl,
-  });
-
-  postParentPortMessage(`completed in ${Date.now() - startedAt}ms`);
-
-  if (parentPort) {
-    postParentPortMessage('done');
-  } else {
-    // give the logging pipes time finish writing before exit
-    setTimeout(() => {
-      process.exit(0);
-    }, 1000);
-  }
-})();