ghost 6.37.1 → 6.38.0

package/core/server/web/gift-preview/image.js

@@ -1,6 +1,14 @@
+const fs = require('fs');
+const path = require('path');
+
 const CACHE_MAX_SIZE = 100;
+const GIFT_CARD_NOISE_PATH = path.join(__dirname, 'gift-card-noise.png');
+const GIFT_CARD_ORB_PATH = path.join(__dirname, 'gift-card-orb.png');
+const INTER_FONT_PATH = path.join(__dirname, 'Inter.ttf');
 
 const cache = new Map();
+let giftCardNoiseTile;
+let giftCardOrbImageHref;
 
 function cacheResult(key, value) {
     if (cache.size >= CACHE_MAX_SIZE) {
@@ -21,75 +29,194 @@ function escapeXml(str) {
         .replaceAll('\'', ''');
 }
 
-function hexToRgb(hex) {
-    const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+function getGiftCardOrbImageHref() {
+    if (giftCardOrbImageHref !== undefined) {
+        return giftCardOrbImageHref;
+    }
+
+    const orbPng = fs.readFileSync(GIFT_CARD_ORB_PATH);
+    giftCardOrbImageHref = `data:image/png;base64,${orbPng.toString('base64')}`;
+
+    return giftCardOrbImageHref;
+}
+
+async function getGiftCardNoiseTile() {
+    if (giftCardNoiseTile !== undefined) {
+        return giftCardNoiseTile;
+    }
+
+    const sharp = require('sharp');
+
+    giftCardNoiseTile = await sharp(GIFT_CARD_NOISE_PATH)
+        .resize(192, 192, {kernel: 'nearest'})
+        .png()
+        .toBuffer();
+
+    return giftCardNoiseTile;
+}
+
+function parseHexColor(color) {
+    const match = /^#?([0-9a-f]{3}|[0-9a-f]{6})$/i.exec(`${color || ''}`.trim());
 
-    if (!result) {
-        return {r: 0, g: 0, b: 0};
+    if (!match) {
+        return null;
     }
 
+    const hex = match[1].length === 3
+        ? match[1].split('').map(char => char + char).join('')
+        : match[1];
+
     return {
-        r: Number.parseInt(result[1], 16),
-        g: Number.parseInt(result[2], 16),
-        b: Number.parseInt(result[3], 16)
+        r: parseInt(hex.slice(0, 2), 16),
+        g: parseInt(hex.slice(2, 4), 16),
+        b: parseInt(hex.slice(4, 6), 16)
     };
 }
 
-function getBackgroundColor(accentColor) {
-    // Blend accent color at 6% opacity over white, matching Portal's redemption modal
-    const {r, g, b} = hexToRgb(accentColor);
-    const opacity = 0.06;
-    const blend = c => Math.round(255 + (c - 255) * opacity);
+function formatHexChannel(value) {
+    return Math.round(value).toString(16).padStart(2, '0');
+}
+
+function mixWithBlack(color, colorWeight = 0.65) {
+    const rgb = parseHexColor(color);
+
+    if (!rgb) {
+        return '#000000';
+    }
+
+    return `#${formatHexChannel(rgb.r * colorWeight)}${formatHexChannel(rgb.g * colorWeight)}${formatHexChannel(rgb.b * colorWeight)}`;
+}
+
+function truncateText(str, maxLength) {
+    const text = `${str || ''}`.trim();
 
-    return `rgb(${blend(r)}, ${blend(g)}, ${blend(b)})`;
+    if (text.length <= maxLength) {
+        return text;
+    }
+
+    return `${text.slice(0, maxLength - 3).trim()}...`;
+}
+
+function createTextInput({text, size, weight, width}) {
+    const escapedText = escapeXml(text);
+
+    return {
+        text: {
+            text: `<span foreground="#FFFFFF" font_desc="Inter ${weight} ${size}">${escapedText}</span>`,
+            font: 'Inter',
+            fontfile: INTER_FONT_PATH,
+            width,
+            rgba: true,
+            dpi: 72
+        }
+    };
+}
+
+function buildTextOverlays({siteTitle = 'Ghost', tierLabel = '', cadenceLabel = '1 year'}) {
+    const safeCadenceLabel = truncateText(cadenceLabel, 18);
+    const safeTierLabel = truncateText(tierLabel || 'Gift membership', 38);
+    const safeSiteTitle = truncateText(siteTitle, 40);
+
+    return [
+        {
+            input: createTextInput({
+                text: safeCadenceLabel,
+                size: 84,
+                weight: 'Bold',
+                width: 1060
+            }),
+            left: 64,
+            top: 82
+        },
+        {
+            input: createTextInput({
+                text: safeTierLabel,
+                size: 44,
+                weight: 'Medium',
+                width: 1060
+            }),
+            left: 66,
+            top: 177
+        },
+        {
+            input: createTextInput({
+                text: safeSiteTitle,
+                size: 52,
+                weight: 'Bold',
+                width: 1060
+            }),
+            left: 66,
+            top: 500
+        }
+    ];
 }
 
 function buildSvg({accentColor}) {
-    const bgColor = getBackgroundColor(accentColor);
     const escapedAccentColor = escapeXml(accentColor);
-
-    // Gift box icon from Portal (apps/portal/src/images/icons/gift.svg)
-    // Original viewBox 0 0 24 24, scaled and centered in the seal.
-    const giftIcon = `
-        <g transform="translate(564, 279) scale(3)" fill="none" stroke="#FFFFFF"
-            stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">
-            <rect x="3" y="8" width="18" height="4" rx="1"/>
-            <path d="M12 8v13"/>
-            <path d="M19 12v7a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2v-7"/>
-            <path d="M7.5 8a2.5 2.5 0 0 1 0-5C9 3 12 8 12 8"/>
-            <path d="M16.5 8a2.5 2.5 0 0 0 0-5C15 3 12 8 12 8"/>
-        </g>
-    `;
+    const orbImageHref = escapeXml(getGiftCardOrbImageHref());
 
     return `<?xml version="1.0" encoding="UTF-8"?>
 <svg width="1200" height="630" viewBox="0 0 1200 630" xmlns="http://www.w3.org/2000/svg">
-    <rect width="1200" height="630" fill="${bgColor}"/>
-
-    <rect x="0" y="303" width="1200" height="24" fill="${escapedAccentColor}"/>
-    <rect x="588" y="0" width="24" height="630" fill="${escapedAccentColor}"/>
+    <defs>
+        <linearGradient id="cardShine" x1="120" y1="580" x2="980" y2="60" gradientUnits="userSpaceOnUse">
+            <stop stop-color="#FFFFFF" stop-opacity="0"/>
+            <stop offset="0.5" stop-color="#FFFFFF" stop-opacity="0.31"/>
+            <stop offset="1" stop-color="#FFFFFF" stop-opacity="0"/>
+        </linearGradient>
+    </defs>
+
+    <rect width="1200" height="630" fill="${escapedAccentColor}"/>
+    <rect width="1200" height="630" fill="#FFFFFF" opacity="0.07"/>
+    <rect width="1200" height="630" fill="url(#cardShine)"/>
+    <image href="${orbImageHref}" x="0" y="0" width="1200" height="630" opacity="0.2" preserveAspectRatio="none"/>
+</svg>`;
+}
 
-    <circle cx="600" cy="315" r="70" fill="${bgColor}"/>
-    <circle cx="600" cy="315" r="58" fill="${escapedAccentColor}"/>
+function buildNotchOverlay({accentColor}) {
+    const notchFill = escapeXml(mixWithBlack(accentColor));
 
-    ${giftIcon}
+    const svg = `<?xml version="1.0" encoding="UTF-8"?>
+<svg width="1200" height="630" viewBox="0 0 1200 630" xmlns="http://www.w3.org/2000/svg">
+    <rect x="505" y="42" width="190" height="36" rx="18" fill="${notchFill}"/>
+    <rect x="510" y="44" width="180" height="3" rx="1.5" fill="#FFFFFF" opacity="0.18"/>
 </svg>`;
+
+    return {
+        input: Buffer.from(svg)
+    };
 }
 
-async function generateGiftPreviewImage({accentColor}) {
-    const cacheKey = accentColor;
+async function generateGiftPreviewImage({accentColor = '#15171A', siteTitle, tierLabel, cadenceLabel}) {
+    const cacheKey = JSON.stringify({
+        accentColor,
+        siteTitle,
+        tierLabel,
+        cadenceLabel
+    });
 
     if (cache.has(cacheKey)) {
         return cache.get(cacheKey);
     }
 
-    const imageTransform = require('@tryghost/image-transform');
+    const sharp = require('sharp');
+
     const svg = buildSvg({accentColor});
-    const image = await imageTransform.resizeFromBuffer(Buffer.from(svg), {
-        width: 1200,
-        format: 'png',
-        withoutEnlargement: false,
-        timeout: 10
-    });
+    const noiseTile = await getGiftCardNoiseTile();
+    const image = await sharp(Buffer.from(svg), {animated: false})
+        .resize(1200, null, {
+            withoutEnlargement: false
+        })
+        .composite([
+            {
+                input: noiseTile,
+                tile: true
+            },
+            buildNotchOverlay({accentColor}),
+            ...buildTextOverlays({siteTitle, tierLabel, cadenceLabel})
+        ])
+        .png()
+        .timeout({seconds: 10})
+        .toBuffer();
 
     cacheResult(cacheKey, image);
 

package/core/shared/config/defaults.json

@@ -1,5 +1,6 @@
 {
     "url": "http://localhost:2368",
+    "lazyRouting": false,
     "server": {
         "host": "127.0.0.1",
         "port": 2368,

package/core/shared/one-at-a-time.js

@@ -1,6 +1,7 @@
-// @ts-check
-const {InternalServerError} = require('@tryghost/errors');
-
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.oneAtATime = void 0;
+const errors_1 = require("@tryghost/errors");
 /**
  * Wraps an async function so it runs at most one invocation at a time, with at
  * most one additional invocation queued.
@@ -13,50 +14,44 @@ const {InternalServerError} = require('@tryghost/errors');
  *
  * Errors are silently swallowed.
  *
- * @param {() => PromiseLike<unknown>} fn
- * @returns {() => void}
  */
 const oneAtATime = (fn) => {
-    /** @type {'idle' | 'running' | 'running+queued'} */
     let state = 'idle';
-
     const run = async () => {
         try {
             await fn();
-        } catch {
+        }
+        catch {
             // noop
         }
-
         switch (state) {
-        case 'running+queued':
-            state = 'running';
-            run();
-            break;
-        case 'running':
-            state = 'idle';
-            break;
-        default:
-            throw new InternalServerError({message: `Unexpected state: ${state}`});
+            case 'running+queued':
+                state = 'running';
+                run();
+                break;
+            case 'running':
+                state = 'idle';
+                break;
+            default:
+                throw new errors_1.InternalServerError({ message: `Unexpected state: ${state}` });
         }
     };
-
     return () => {
         switch (state) {
-        case 'idle':
-            state = 'running';
-            run();
-            break;
-        case 'running':
-            state = 'running+queued';
-            break;
-        case 'running+queued':
-            break;
-        default: {
-            /** @type {never} */ const _exhaustive = state;
-            throw new InternalServerError({message: `Unexpected state: ${_exhaustive}`});
-        }
+            case 'idle':
+                state = 'running';
+                run();
+                break;
+            case 'running':
+                state = 'running+queued';
+                break;
+            case 'running+queued':
+                break;
+            default: {
+                const _exhaustive = state;
+                throw new errors_1.InternalServerError({ message: `Unexpected state: ${_exhaustive}` });
+            }
         }
     };
 };
-
 exports.oneAtATime = oneAtATime;

package/core/shared/one-at-a-time.ts

@@ -0,0 +1,58 @@
+import {InternalServerError} from '@tryghost/errors';
+
+type State = 'idle' | 'running' | 'running+queued';
+
+/**
+ * Wraps an async function so it runs at most one invocation at a time, with at
+ * most one additional invocation queued.
+ *
+ * Possible states:
+ *
+ * - idle: nothing is running
+ * - running: function is active, nothing is queued
+ * - running + queued: function is active, another invocation enqueued
+ *
+ * Errors are silently swallowed.
+ *
+ */
+export const oneAtATime = (fn: () => PromiseLike<unknown>): () => void => {
+    let state: State = 'idle';
+
+    const run = async () => {
+        try {
+            await fn();
+        } catch {
+            // noop
+        }
+
+        switch (state) {
+        case 'running+queued':
+            state = 'running';
+            run();
+            break;
+        case 'running':
+            state = 'idle';
+            break;
+        default:
+            throw new InternalServerError({message: `Unexpected state: ${state}`});
+        }
+    };
+
+    return () => {
+        switch (state) {
+        case 'idle':
+            state = 'running';
+            run();
+            break;
+        case 'running':
+            state = 'running+queued';
+            break;
+        case 'running+queued':
+            break;
+        default: {
+            const _exhaustive: never = state;
+            throw new InternalServerError({message: `Unexpected state: ${_exhaustive}`});
+        }
+        }
+    };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "6.37.1",
+  "version": "6.38.0",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -88,15 +88,15 @@
     "@faker-js/faker": "7.6.0",
     "@isaacs/ttlcache": "1.4.1",
     "@sentry/node": "7.120.4",
-    "@tryghost/adapter-base-cache": "0.1.23",
-    "@tryghost/admin-api-schema": "4.7.2",
+    "@tryghost/adapter-base-cache": "0.1.25",
+    "@tryghost/admin-api-schema": "4.7.4",
     "@tryghost/api-framework": "1.0.7",
-    "@tryghost/bookshelf-plugins": "2.0.3",
+    "@tryghost/bookshelf-plugins": "2.2.0",
     "@tryghost/color-utils": "0.2.16",
     "@tryghost/config-url-helpers": "1.0.23",
     "@tryghost/custom-fonts": "1.0.8",
     "@tryghost/database-info": "0.3.35",
-    "@tryghost/debug": "2.1.0",
+    "@tryghost/debug": "2.2.0",
     "@tryghost/domain-events": "1.0.8",
     "@tryghost/email-mock-receiver": "2.1.0",
     "@tryghost/errors": "1.3.13",
@@ -116,7 +116,7 @@
     "@tryghost/kg-markdown-html-renderer": "7.2.1",
     "@tryghost/kg-mobiledoc-html-renderer": "7.2.1",
     "@tryghost/limit-service": "1.5.2",
-    "@tryghost/logging": "4.1.0",
+    "@tryghost/logging": "4.2.0",
     "@tryghost/members-csv": "2.0.7",
     "@tryghost/metrics": "1.0.43",
     "@tryghost/mongo-utils": "0.6.3",
@@ -126,20 +126,20 @@
     "@tryghost/nql": "0.12.10",
     "@tryghost/nql-lang": "0.6.4",
     "@tryghost/parse-email-address": "file:components/tryghost-parse-email-address-0.0.0.tgz",
-    "@tryghost/pretty-cli": "3.1.0",
+    "@tryghost/pretty-cli": "3.2.0",
     "@tryghost/prometheus-metrics": "1.0.8",
-    "@tryghost/promise": "2.1.0",
-    "@tryghost/referrer-parser": "0.1.15",
+    "@tryghost/promise": "2.2.0",
+    "@tryghost/referrer-parser": "0.1.17",
     "@tryghost/request": "1.0.12",
-    "@tryghost/root-utils": "2.1.0",
+    "@tryghost/root-utils": "2.2.0",
     "@tryghost/security": "1.0.6",
-    "@tryghost/social-urls": "0.1.60",
+    "@tryghost/social-urls": "0.1.62",
     "@tryghost/string": "0.3.2",
-    "@tryghost/tpl": "2.1.0",
+    "@tryghost/tpl": "2.2.0",
     "@tryghost/url-utils": "5.1.2",
     "@tryghost/validator": "0.2.22",
-    "@tryghost/version": "2.1.0",
-    "@tryghost/zip": "3.1.0",
+    "@tryghost/version": "2.2.0",
+    "@tryghost/zip": "3.2.0",
     "body-parser": "1.20.4",
     "bookshelf": "1.2.0",
     "bookshelf-relations": "2.8.0",
@@ -178,7 +178,7 @@
     "ghost-storage-base": "1.1.2",
     "glob": "8.1.0",
     "got": "13.0.0",
-    "gscan": "5.4.3",
+    "gscan": "6.0.2",
     "handlebars": "4.7.9",
     "heic-convert": "2.1.0",
     "html-to-text": "5.1.1",
@@ -228,6 +228,7 @@
     "rss": "1.2.2",
     "sanitize-html": "2.17.0",
     "semver": "7.7.4",
+    "sharp": "0.34.5",
     "simple-dom": "1.4.0",
     "stoppable": "1.1.0",
     "stripe": "8.222.0",
@@ -264,6 +265,7 @@
     "@types/node-jose": "1.1.13",
     "@types/nodemailer": "6.4.23",
     "@types/on-headers": "1.0.4",
+    "@types/papaparse": "5.5.2",
     "@types/sinon": "17.0.4",
     "@types/supertest": "6.0.3",
     "@typescript-eslint/parser": "8.49.0",
@@ -375,7 +377,7 @@
     ],
     "overrides": {
       "@tryghost/errors": "^1.3.7",
-      "@tryghost/logging": "4.1.0",
+      "@tryghost/logging": "4.2.0",
       "jackspeak": "2.3.6",
       "moment": "2.30.1",
       "moment-timezone": "0.5.45",