ghost 6.53.0 → 6.54.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/components/ghost-storage-base-3.0.0.tgz +0 -0
- package/components/tryghost-adapter-base-cache-0.2.0.tgz +0 -0
- package/components/tryghost-adapter-base-scheduling-0.1.1.tgz +0 -0
- package/components/tryghost-adapter-base-sso-0.1.1.tgz +0 -0
- package/components/tryghost-admin-api-schema-0.0.0.tgz +0 -0
- package/components/tryghost-custom-field-types-0.0.0.tgz +0 -0
- package/components/tryghost-i18n-0.0.0.tgz +0 -0
- package/components/tryghost-kg-converters-1.2.3.tgz +0 -0
- package/components/tryghost-kg-default-nodes-2.1.3.tgz +0 -0
- package/components/tryghost-kg-lexical-html-renderer-1.4.3.tgz +0 -0
- package/core/boot.js +9 -6
- package/core/built/admin/assets/Combination-CJG7Flp-.js +41 -0
- package/core/built/admin/assets/Growth-CSaHoSVD.js +3 -0
- package/core/built/admin/assets/Newsletters-C5cs6FGo.js +1 -0
- package/core/built/admin/assets/Overview-j4NaeUNm.js +1 -0
- package/core/built/admin/assets/{PolarAngleAxis-pciQ0MOy.js → PolarAngleAxis-BGjf7sBu.js} +1 -1
- package/core/built/admin/assets/{RadialBarChart-DWmw2PcX.js → RadialBarChart-zeFf9mBz.js} +1 -1
- package/core/built/admin/assets/Web-_fD935OX.js +2 -0
- package/core/built/admin/assets/account-migration-DLvVA5yq.js +1 -0
- package/core/built/admin/assets/activitypub/{account-migration-BPZG37DJ.js → account-migration-DHbZcxGM.js} +13 -13
- package/core/built/admin/assets/activitypub/activitypub.js +7 -7
- package/core/built/admin/assets/activitypub/{avatar-ZYco0ITb.js → avatar-B3DEDB1l.js} +10 -10
- package/core/built/admin/assets/activitypub/{avatar-flipboard-D541lc4F.js → avatar-flipboard-Cqrg0XMx.js} +3 -3
- package/core/built/admin/assets/activitypub/{bluesky-sharing-NOHUtHjl.js → bluesky-sharing-zfxUey_L.js} +38 -37
- package/core/built/admin/assets/activitypub/{chunk-KS7C4IRE-B-GOFDPZ.js → chunk-KS7C4IRE-D4HEcEwi.js} +716 -710
- package/core/built/admin/assets/activitypub/{content-formatters-bwrp4iEO.js → content-formatters-BpQARh28.js} +229 -181
- package/core/built/admin/assets/activitypub/{copy-C7m7ovHw.js → copy-D9UWIAan.js} +2 -2
- package/core/built/admin/assets/activitypub/{dist-B5ira32t.js → dist-Ba_QxHHl.js} +5 -5
- package/core/built/admin/assets/activitypub/{domain-iqE4YXwD.js → domain-CmwSZLHK.js} +33 -33
- package/core/built/admin/assets/activitypub/{edit-profile-B8MFYh28.js → edit-profile-CXdwNmVG.js} +46 -45
- package/core/built/admin/assets/activitypub/{explore-BbdKodp3.js → explore-DfbjzGM1.js} +20 -20
- package/core/built/admin/assets/activitypub/{feed-Cl3A5owG.js → feed-DSEBJOqf.js} +15 -15
- package/core/built/admin/assets/activitypub/{field-DL6WyR-c.js → field-CY7XVcx6.js} +13 -13
- package/core/built/admin/assets/activitypub/{hash-6G3DzwL9.js → hash-BC9Q0N4c.js} +2 -2
- package/core/built/admin/assets/activitypub/{inbox-YmhuBice.js → inbox-DQ4ZnC1m.js} +2 -2
- package/core/built/admin/assets/activitypub/inbox-DtQ0kytT.js +1221 -0
- package/core/built/admin/assets/activitypub/{label-DGbLjDvE.js → label-Dw96GQ7u.js} +6 -6
- package/core/built/admin/assets/activitypub/layout-IdVq3lRy.js +1 -0
- package/core/built/admin/assets/activitypub/{moderation-qnBtk1zS.js → moderation-Dg_-I-8C.js} +32 -31
- package/core/built/admin/assets/activitypub/{note-C7ZRoSJv.js → note-Cy1-uKMY.js} +21 -21
- package/core/built/admin/assets/activitypub/{notifications-DiEA4b1o.js → notifications-B_fvoLIM.js} +17 -17
- package/core/built/admin/assets/activitypub/{onboarding-_JVgEwgV.js → onboarding-BFDkzeR2.js} +2 -2
- package/core/built/admin/assets/activitypub/{onboarding-DG4zu3qM.js → onboarding-D6rcBdPe.js} +5 -5
- package/core/built/admin/assets/activitypub/{preferences-B3FtocnP.js → preferences-ByJseZp6.js} +1607 -1606
- package/core/built/admin/assets/activitypub/{profile-D8ZJfYXB.js → profile-BFtbnIjz.js} +264 -263
- package/core/built/admin/assets/activitypub/{reply-C1vggenw.js → reply-CpdMeAO5.js} +2 -2
- package/core/built/admin/assets/activitypub/{routes-BOii-V9n.js → routes-Dh3xXfce.js} +1311 -1295
- package/core/built/admin/assets/activitypub/{separator-1gNokN5S.js → separator-BI1FLsYM.js} +4 -4
- package/core/built/admin/assets/activitypub/{settings--9Sb0nbl.js → settings-DTgqJPxM.js} +14 -14
- package/core/built/admin/assets/activitypub/{site-fkMmqv0V.js → site-CdL9ZLqm.js} +10 -10
- package/core/built/admin/assets/activitypub/{step-1-QhivSMw2.js → step-1-DIDg4aHb.js} +15 -15
- package/core/built/admin/assets/activitypub/{step-2-pMk9YwqD.js → step-2-BfGe8BYt.js} +7 -7
- package/core/built/admin/assets/activitypub/{step-3-DvmVC1fo.js → step-3-mE9spAqw.js} +12 -12
- package/core/built/admin/assets/activitypub/{tabs-Dc0FEEYD.js → tabs-ogqwoBlb.js} +241 -237
- package/core/built/admin/assets/activitypub/{topic-filter-CuDyM5bD.js → topic-filter-DLHBZT93.js} +4 -4
- package/core/built/admin/assets/activitypub/use-activity-pub-queries-VzbN99u_.js +1957 -0
- package/core/built/admin/assets/activitypub/{use-navigate-with-base-path-Drx1kdAK.js → use-navigate-with-base-path-CAwXTmqH.js} +165 -175
- package/core/built/admin/assets/activitypub/{use-reply-chain-data-BHkCHcW5.js → use-reply-chain-data-CxonteFD.js} +8 -8
- package/core/built/admin/assets/activitypub/users-BLeiOTHc.js +1464 -0
- package/core/built/admin/assets/activitypub/{x-BHCEe-c2.js → x-C8tAnXly.js} +2 -2
- package/core/built/admin/assets/{audience-adiFehTD.js → audience-BKRdsFmy.js} +1 -1
- package/core/built/admin/assets/{automated-emails-UWM02CMr.js → automated-emails-Cn87L5Md.js} +1 -1
- package/core/built/admin/assets/automations-B7-y3dXt.js +1 -0
- package/core/built/admin/assets/automations-BP_aHamJ.js +1 -0
- package/core/built/admin/assets/{avatar-flipboard-Lz3F9fNT.js → avatar-flipboard-C6Kj3Awu.js} +1 -1
- package/core/built/admin/assets/bluesky-sharing-Bh36XPh4.js +1 -0
- package/core/built/admin/assets/box-BWbhXh21.js +1 -0
- package/core/built/admin/assets/breadcrumb-D34YWnaw.js +1 -0
- package/core/built/admin/assets/card-DGoDJzrn.js +1 -0
- package/core/built/admin/assets/{chart-ChpW-NzQ.js → chart-BuRT2Y6p.js} +14 -14
- package/core/built/admin/assets/chart-helpers-DbklaJw9.js +1 -0
- package/core/built/admin/assets/checkbox-DA4-1UiI.js +1 -0
- package/core/built/admin/assets/chunk.524.45e0875f41b71e46e849.js +25 -0
- package/core/built/admin/assets/chunk.582.51defd4b009f0de8d4d5.js +27 -0
- package/core/built/admin/assets/{chunk.831.0703a12e49f51cec3f3a.js → chunk.589.096f4d0bb775e5229aa9.js} +78 -85
- package/core/built/admin/assets/{chunk.432.c2caa0b20f03e71d1a35.js → chunk.962.b73442b07be930bb5d85.js} +2216 -3188
- package/core/built/admin/assets/{chunk.432.c2caa0b20f03e71d1a35.js.LICENSE.txt → chunk.962.b73442b07be930bb5d85.js.LICENSE.txt} +0 -63
- package/core/built/admin/assets/code-editor-view-BKBrkffZ.js +1 -0
- package/core/built/admin/assets/comments-CzVNIT8b.js +1 -0
- package/core/built/admin/assets/container-BYz2Ed39.js +1 -0
- package/core/built/admin/assets/data-list-16rkJYYi.js +1 -0
- package/core/built/admin/assets/date-range-select-B5vSsrpx.js +1 -0
- package/core/built/admin/assets/disabled-sources-indicator-NkOIoMue.js +1 -0
- package/core/built/admin/assets/{dist-CsekE4FL.js → dist-CQJY6SVY.js} +1 -1
- package/core/built/admin/assets/dist-DGzPJ_bO.js +4 -0
- package/core/built/admin/assets/{dist-BbGrW05X.js → dist-DyViJwIy.js} +1 -1
- package/core/built/admin/assets/dist-Ndy-PuGN.js +1 -0
- package/core/built/admin/assets/dist-P_ohUlTi.js +1 -0
- package/core/built/admin/assets/domain-B7_n5nfx.js +1 -0
- package/core/built/admin/assets/dropzone-DcuJEEUf.js +5 -0
- package/core/built/admin/assets/edit-profile-rvDGrS8J.js +1 -0
- package/core/built/admin/assets/editor-BCiIyFjm.js +8 -0
- package/core/built/admin/assets/empty-indicator-oX1u1Pkn.js +1 -0
- package/core/built/admin/assets/esm-CFX93H5M.js +2 -0
- package/core/built/admin/assets/explore-BZAZOg5X.js +1 -0
- package/core/built/admin/assets/feed-CFV8xDw9.js +1 -0
- package/core/built/admin/assets/field-BW-M2Zwp.js +1 -0
- package/core/built/admin/assets/{filter-sources-v39ihhhV.js → filter-sources-Fx8wiYYw.js} +1 -1
- package/core/built/admin/assets/filters-CGX_pf2N.js +1 -0
- package/core/built/admin/assets/filters-DtcXMZDU.js +1 -0
- package/core/built/admin/assets/framework-provider-CmtnPXIT.js +4 -0
- package/core/built/admin/assets/{ghost-b57f077997b739a8ae9a70772dc016cb.js → ghost-b1dce91ad3232cc259ee5fbbf9526243.js} +294 -290
- package/core/built/admin/assets/ghost-dark-c8d0ab7f515b2010c173e23e9b32ea8a.css +1 -0
- package/core/built/admin/assets/gift-link-modal-Bk8qpnMw.js +1 -0
- package/core/built/admin/assets/{gift-links-CY3GwiVi.js → gift-links-nBxJjZiQ.js} +1 -1
- package/core/built/admin/assets/growth-Ck2s3JjR.js +1 -0
- package/core/built/admin/assets/hooks-BApwwBE0.js +2 -0
- package/core/built/admin/assets/{inbox-TEISAmth.js → inbox-BRp1_aaC.js} +35 -35
- package/core/built/admin/assets/index-BBf502Wg.js +69 -0
- package/core/built/admin/assets/index-BCCZKxP2.css +1 -0
- package/core/built/admin/assets/inline-EMAm3okk.js +1 -0
- package/core/built/admin/assets/input-group-DjuYnNCd.js +1 -0
- package/core/built/admin/assets/{react-dom-C6aoWSfl.js → jsx-runtime-DX3WBWVO.js} +1 -1
- package/core/built/admin/assets/koenig-lexical/koenig-lexical.js +5 -2
- package/core/built/admin/assets/koenig-lexical/koenig-lexical.umd.js +2 -2
- package/core/built/admin/assets/{koenig-lexical-Di7b48ED.js → koenig-lexical-CM7UFNdL.js} +2 -2
- package/core/built/admin/assets/kpi-card-BrGH6FsT.js +1 -0
- package/core/built/admin/assets/kpi-card-CIGyijjx.js +1 -0
- package/core/built/admin/assets/kpi-helpers-_HRRsklE.js +1 -0
- package/core/built/admin/assets/kpi-tabs-BSvh9eoq.js +1 -0
- package/core/built/admin/assets/label-BOR9XdKl.js +1 -0
- package/core/built/admin/assets/label-picker-BdNAWuUX.js +1 -0
- package/core/built/admin/assets/{labels-GbxlXWtf.js → labels-Cyayfd-e.js} +1 -1
- package/core/built/admin/assets/layout-Bw4GnxXp.js +1 -0
- package/core/built/admin/assets/limit-service-9fwD33lU.js +20 -0
- package/core/built/admin/assets/link-helpers-tOlxmuH5.js +1 -0
- package/core/built/admin/assets/list-page-B6ANtzkd.js +1 -0
- package/core/built/admin/assets/mailchimp-Ds_NQ04w.svg +9 -0
- package/core/built/admin/assets/member-custom-fields-DvFyamLu.js +1 -0
- package/core/built/admin/assets/member-detail-Cg2vTqvJ.js +1 -0
- package/core/built/admin/assets/members-DsPxYAVm.js +10 -0
- package/core/built/admin/assets/modals-Bf_fyvHZ.js +31 -0
- package/core/built/admin/assets/moderation-Dlp7M5sa.js +1 -0
- package/core/built/admin/assets/multi-select-combobox-CH1o8XXQ.js +1 -0
- package/core/built/admin/assets/newsletter-CQ5CAYUI.js +1 -0
- package/core/built/admin/assets/{newsletters-DZm3yLj8.js → newsletters-D1jbtV-h.js} +1 -1
- package/core/built/admin/assets/note-BrAZ7Z0o.js +1 -0
- package/core/built/admin/assets/notifications-BnbHLOPC.js +1 -0
- package/core/built/admin/assets/nql-lang-B7faUf8D.js +19 -0
- package/core/built/admin/assets/{offers-D11QtPXX.js → offers-CrY6nSRR.js} +1 -1
- package/core/built/admin/assets/onboarding-route-eU146kuA.js +1 -0
- package/core/built/admin/assets/overview-BpbaK-xu.js +1 -0
- package/core/built/admin/assets/page-header-C0jVxtS8.js +1 -0
- package/core/built/admin/assets/{pages-BnObVRrf.js → pages-BbNWFcGj.js} +1 -1
- package/core/built/admin/assets/pintura-CXOmq-5H.svg +15 -0
- package/core/built/admin/assets/post-analytics-Iw7dk1mT.js +1 -0
- package/core/built/admin/assets/post-analytics-header-D9pJ4iNm.js +1 -0
- package/core/built/admin/assets/{post-analytics-provider-DSfBCtnj.js → post-analytics-provider-BDqcfBor.js} +1 -1
- package/core/built/admin/assets/post-share-modal-DBfKl2GZ.js +1 -0
- package/core/built/admin/assets/{posts-CwH8VJvB.js → posts-EWpZIjkr.js} +1 -1
- package/core/built/admin/assets/preferences-D4EANGoc.js +5 -0
- package/core/built/admin/assets/profile-dJ44Bn_W.js +1 -0
- package/core/built/admin/assets/{referrers-nxR52jPI.js → referrers-BCfFYSHc.js} +1 -1
- package/core/built/admin/assets/router-provider-C1R4AZ2o.js +1 -0
- package/core/built/admin/assets/select--2uVN9_-.js +1 -0
- package/core/built/admin/assets/settings-Bz3RZRmE.js +1 -0
- package/core/built/admin/assets/settings-SD9bxIpt.js +4 -0
- package/core/built/admin/assets/share-modal-CkdTTMJd.js +1 -0
- package/core/built/admin/assets/social-urls-BvFZwYcE.js +8 -0
- package/core/built/admin/assets/sort-button-DZp9Y2r1.js +1 -0
- package/core/built/admin/assets/source-icon-CHr9qJ2Y.js +1 -0
- package/core/built/admin/assets/stack-xiN0eQ6Z.js +1 -0
- package/core/built/admin/assets/stats-DGoXZxWE.js +1 -0
- package/core/built/admin/assets/stats-view-D2-1L0ms.js +1 -0
- package/core/built/admin/assets/step-1-RdahbwyG.js +1 -0
- package/core/built/admin/assets/step-2-D83PeRwd.js +1 -0
- package/core/built/admin/assets/step-3-p_Op4wv4.js +2 -0
- package/core/built/admin/assets/switch-qp518gFQ.js +1 -0
- package/core/built/admin/assets/table-B8LgTQJZ.js +1 -0
- package/core/built/admin/assets/tabs-D3ZOYkM7.js +1 -0
- package/core/built/admin/assets/tags-B4l891z2.js +1 -0
- package/core/built/admin/assets/text-DwtjwGkh.js +1 -0
- package/core/built/admin/assets/textarea-CTlb3Uu6.js +1 -0
- package/core/built/admin/assets/{tiers-EghDzCKc.js → tiers-BgYLWRJv.js} +1 -1
- package/core/built/admin/assets/toggle-group-DNXDkAwf.js +1 -0
- package/core/built/admin/assets/topic-filter-DZGjEcz3.js +1 -0
- package/core/built/admin/assets/{use-analytics-data-0l_OHtnR.js → use-analytics-data-CaT8RirX.js} +1 -1
- package/core/built/admin/assets/use-filter-params-DeQ8sX4N.js +1 -0
- package/core/built/admin/assets/use-growth-stats-9Db2CuJe.js +1 -0
- package/core/built/admin/assets/{use-post-referrers-DwI31Ril.js → use-post-referrers-BV54YcQS.js} +1 -1
- package/core/built/admin/assets/use-reply-chain-data-DuYZGDan.js +1 -0
- package/core/built/admin/assets/use-simple-pagination-8fTua9Nt.js +1 -0
- package/core/built/admin/assets/{use-tinybird-query-DvZBBMG7.js → use-tinybird-query-Dz156HvZ.js} +1 -1
- package/core/built/admin/assets/{use-tinybird-token-CQtebkvU.js → use-tinybird-token-C9RUdL_n.js} +1 -1
- package/core/built/admin/assets/{users-Pc8IRjk9.js → users-CcSCQFcQ.js} +1 -1
- package/core/built/admin/assets/virtual-list-BCvP0YF-.js +1 -0
- package/core/built/admin/assets/web-DTZnnUGr.js +1 -0
- package/core/built/admin/index.html +18 -22
- package/core/frontend/apps/private-blogging/index.js +1 -1
- package/core/frontend/apps/private-blogging/lib/middleware.js +1 -1
- package/core/frontend/helpers/split.js +2 -1
- package/core/frontend/meta/asset-url.js +1 -1
- package/core/frontend/meta/author-image.js +1 -1
- package/core/frontend/meta/blog-logo.js +1 -1
- package/core/frontend/meta/canonical-url.js +1 -1
- package/core/frontend/meta/cover-image.js +1 -1
- package/core/frontend/meta/get-meta.js +1 -1
- package/core/frontend/meta/og-image.js +1 -1
- package/core/frontend/meta/paginated-url.js +1 -1
- package/core/frontend/meta/twitter-image.js +1 -1
- package/core/frontend/meta/url.js +1 -1
- package/core/frontend/services/assets-minification/admin-auth-assets.js +1 -1
- package/core/frontend/services/llms/handler.js +1 -1
- package/core/frontend/services/proxy.js +31 -2
- package/core/frontend/services/routing/collection-router.js +1 -1
- package/core/frontend/services/routing/controllers/email-post.js +1 -1
- package/core/frontend/services/routing/controllers/entry/markdown.js +1 -1
- package/core/frontend/services/routing/controllers/entry/markdown.ts +1 -1
- package/core/frontend/services/routing/controllers/entry.js +1 -1
- package/core/frontend/services/routing/controllers/entry.ts +1 -1
- package/core/frontend/services/routing/controllers/previews.js +6 -7
- package/core/frontend/services/routing/controllers/unsubscribe.js +7 -3
- package/core/frontend/services/routing/email-router.js +1 -1
- package/core/frontend/services/routing/events.js +12 -0
- package/core/frontend/services/routing/middleware/page-param.js +1 -1
- package/core/frontend/services/routing/parent-router.js +1 -1
- package/core/frontend/services/routing/preview-router.js +1 -1
- package/core/frontend/services/routing/router-manager.js +4 -8
- package/core/frontend/services/routing/rss-router.js +1 -1
- package/core/frontend/services/routing/static-pages-router.js +1 -1
- package/core/frontend/services/routing/static-routes-router.js +1 -1
- package/core/frontend/services/routing/taxonomy-router.js +1 -1
- package/core/frontend/services/rss/generate-feed.js +1 -1
- package/core/frontend/services/sitemap/base-site-map-generator.js +23 -4
- package/core/frontend/services/sitemap/site-map-index-generator.js +1 -1
- package/core/frontend/services/sitemap/site-map-manager.js +14 -8
- package/core/frontend/services/sitemap/utils.js +1 -1
- package/core/frontend/services/theme-engine/middleware/update-global-template-options.js +1 -1
- package/core/frontend/services/theme-engine/middleware/update-local-template-options.js +1 -1
- package/core/frontend/utils/images.js +1 -1
- package/core/frontend/web/middleware/admin-toolbar.js +1 -1
- package/core/frontend/web/middleware/handle-image-sizes.js +2 -2
- package/core/frontend/web/middleware/redirect-ghost-to-admin.js +1 -1
- package/core/frontend/web/routers/serve-favicon.js +1 -1
- package/core/frontend/web/routers/serve-public-file.js +1 -1
- package/core/frontend/web/site.js +5 -5
- package/core/server/adapters/cache/AdapterCacheMemoryTTL.js +2 -2
- package/core/server/adapters/cache/MemoryCache.js +2 -2
- package/core/server/adapters/cache/Redis.js +1 -1
- package/core/server/adapters/cache/index.js +1 -1
- package/core/server/adapters/lib/redis/AdapterCacheRedis.js +2 -2
- package/core/server/adapters/route-settings/FileStore.js +2 -8
- package/core/server/adapters/route-settings/FileStore.ts +1 -6
- package/core/server/adapters/route-settings/S3RouteSettingsStore.js +206 -0
- package/core/server/adapters/route-settings/S3RouteSettingsStore.ts +199 -0
- package/core/server/adapters/route-settings/utils.js +13 -0
- package/core/server/adapters/route-settings/utils.ts +7 -0
- package/core/server/adapters/scheduling/deps.d.ts +0 -2
- package/core/server/adapters/scheduling/error-capture.js +76 -0
- package/core/server/adapters/scheduling/error-capture.ts +91 -0
- package/core/server/adapters/scheduling/utils.js +18 -34
- package/core/server/adapters/scheduling/utils.ts +36 -0
- package/core/server/adapters/storage/LocalFilesStorage.js +1 -1
- package/core/server/adapters/storage/LocalImagesStorage.js +1 -1
- package/core/server/adapters/storage/LocalMediaStorage.js +1 -1
- package/core/server/adapters/storage/LocalStorageBase.js +3 -3
- package/core/server/adapters/storage/S3Storage.js +2 -2
- package/core/server/adapters/storage/S3Storage.ts +1 -1
- package/core/server/adapters/storage/utils.js +1 -1
- package/core/server/api/endpoints/authentication.js +1 -1
- package/core/server/api/endpoints/featurebase.js +1 -1
- package/core/server/api/endpoints/files.js +2 -2
- package/core/server/api/endpoints/images.js +2 -2
- package/core/server/api/endpoints/libraries.d.ts +0 -1
- package/core/server/api/endpoints/media.js +8 -5
- package/core/server/api/endpoints/member-custom-fields.js +4 -1
- package/core/server/api/endpoints/member-custom-fields.ts +4 -1
- package/core/server/api/endpoints/posts.js +17 -1
- package/core/server/api/endpoints/search-index-public.js +4 -3
- package/core/server/api/endpoints/search-index.js +5 -4
- package/core/server/api/endpoints/settings-public.js +1 -1
- package/core/server/api/endpoints/settings.js +3 -1
- package/core/server/api/endpoints/utils/serializers/input/utils/url.js +9 -1
- package/core/server/api/endpoints/utils/serializers/output/default.js +7 -0
- package/core/server/api/endpoints/utils/serializers/output/files.js +1 -1
- package/core/server/api/endpoints/utils/serializers/output/media.js +1 -1
- package/core/server/api/endpoints/utils/serializers/output/member-custom-fields.js +7 -4
- package/core/server/api/endpoints/utils/serializers/output/member-custom-fields.ts +8 -4
- package/core/server/api/endpoints/utils/serializers/output/members.js +16 -26
- package/core/server/api/endpoints/utils/serializers/output/pages.js +7 -0
- package/core/server/api/endpoints/utils/serializers/output/posts.js +13 -0
- package/core/server/api/endpoints/utils/serializers/output/utils/url.js +1 -1
- package/core/server/api/endpoints/utils/validators/input/members.js +2 -52
- package/core/server/data/db/backup.js +1 -1
- package/core/server/data/importer/handlers/image.js +3 -3
- package/core/server/data/importer/import-manager.js +6 -4
- package/core/server/data/importer/importers/content-file-importer.js +2 -2
- package/core/server/data/migrations/utils/schema.js +4 -2
- package/core/server/data/migrations/versions/6.54/2026-07-19-16-59-00-add-content-import-permission.js +10 -0
- package/core/server/data/migrations/versions/6.54/2026-07-20-13-59-21-drop-email-tracked-sent-count-from-automation-action-revisions.js +7 -0
- package/core/server/data/migrations/versions/6.54/2026-07-21-01-58-20-add-automation-run-steps-poller-index.js +3 -0
- package/core/server/data/migrations/versions/6.54/2026-07-21-21-08-15-add-automated-email-recipients-mailgun-message-id-index.js +3 -0
- package/core/server/data/migrations/versions/6.54/2026-07-22-10-41-08-add-click-tracking-to-automated-email-recipients.js +13 -0
- package/core/server/data/migrations/versions/6.54/2026-07-22-15-10-30-add-email-clicked-count-to-automation-action-revisions.js +7 -0
- package/core/server/data/migrations/versions/6.54/2026-07-23-10-24-18-add-automation-action-revision-to-redirects.js +9 -0
- package/core/server/data/schema/commands.js +37 -3
- package/core/server/data/schema/fixtures/fixtures.json +7 -0
- package/core/server/data/schema/lib/default-index-name.js +20 -0
- package/core/server/data/schema/schema.js +40 -17
- package/core/server/data/seeders/data-generator.js +4 -2
- package/core/server/lib/image/image-size.js +5 -7
- package/core/server/lib/image/image-utils.js +2 -2
- package/core/server/lib/image/index.js +4 -4
- package/core/server/lib/lexical.js +3 -3
- package/core/server/lib/mobiledoc.js +2 -2
- package/core/server/lib/validate-password.js +1 -1
- package/core/server/models/action.js +9 -0
- package/core/server/models/base/plugins/generate-slug.js +1 -1
- package/core/server/models/collection.js +1 -1
- package/core/server/models/custom-theme-setting.js +1 -1
- package/core/server/models/member.js +73 -0
- package/core/server/models/newsletter.js +1 -1
- package/core/server/models/post.js +19 -5
- package/core/server/models/posts-meta.js +1 -1
- package/core/server/models/redirect.js +1 -1
- package/core/server/models/settings.js +1 -1
- package/core/server/models/snippet.js +1 -1
- package/core/server/models/tag.js +1 -1
- package/core/server/models/user.js +1 -1
- package/core/server/models/welcome-email-automated-email.js +1 -1
- package/core/server/services/activitypub/activity-pub-service-wrapper.js +1 -1
- package/core/server/services/adapter-manager/adapter-manager.js +5 -1
- package/core/server/services/adapter-manager/adapter-manager.ts +7 -2
- package/core/server/services/adapter-manager/index.js +18 -15
- package/core/server/services/adapter-manager/index.ts +23 -17
- package/core/server/services/adapter-manager/utils.js +124 -14
- package/core/server/services/adapter-manager/utils.ts +130 -14
- package/core/server/services/api-version-compatibility/mw-version-rewrites.js +1 -1
- package/core/server/services/audience-feedback/index.js +1 -1
- package/core/server/services/auth/passwordreset.js +1 -1
- package/core/server/services/auth/session/express-session.js +1 -1
- package/core/server/services/auth/session/index.js +2 -2
- package/core/server/services/auth/session/session-service.js +1 -1
- package/core/server/services/automations/automations-api.js +2 -19
- package/core/server/services/automations/automations-api.ts +2 -31
- package/core/server/services/automations/automations-repository.ts +15 -0
- package/core/server/services/automations/database-automations-repository.js +30 -2
- package/core/server/services/automations/database-automations-repository.ts +33 -2
- package/core/server/services/automations/poll.js +16 -12
- package/core/server/services/automations/poll.ts +17 -15
- package/core/server/services/automations/service.js +1 -1
- package/core/server/services/automations/service.ts +3 -13
- package/core/server/services/automations/welcome-email-automation-poll.js +2 -1
- package/core/server/services/comments/index.js +1 -1
- package/core/server/services/custom-redirects/index.js +2 -2
- package/core/server/services/email-analytics/email-analytics-service-wrapper.js +14 -13
- package/core/server/services/email-analytics/email-analytics-service.js +1 -1
- package/core/server/services/email-analytics/events/start-email-analytics-job-event.js +11 -15
- package/core/server/services/email-analytics/events/start-email-analytics-job-event.ts +15 -0
- package/core/server/services/email-analytics/index.js +2 -3
- package/core/server/services/email-analytics/index.ts +1 -2
- package/core/server/services/email-analytics/jobs/email-analytics-job-scheduler.js +1 -6
- package/core/server/services/email-analytics/jobs/email-analytics-job-scheduler.ts +0 -9
- package/core/server/services/email-analytics/jobs/fetch-latest/index.js +1 -1
- package/core/server/services/email-analytics/jobs/index.js +0 -2
- package/core/server/services/email-service/email-service-wrapper.js +1 -1
- package/core/server/services/email-service/email-service.js +20 -4
- package/core/server/services/explore-ping/explore-ping-service.js +24 -39
- package/core/server/services/explore-ping/explore-ping-service.ts +198 -0
- package/core/server/services/explore-ping/index.js +11 -11
- package/core/server/services/explore-ping/index.ts +42 -0
- package/core/server/services/gifts/gift-reminder-scheduler.js +1 -1
- package/core/server/services/gifts/gift-reminder-scheduler.ts +1 -1
- package/core/server/services/gifts/gift-service-wrapper.js +1 -1
- package/core/server/services/identity-tokens/identity-token-service-wrapper.js +1 -1
- package/core/server/services/indexnow-ping/constants.js +30 -0
- package/core/server/services/indexnow-ping/constants.ts +32 -0
- package/core/server/services/indexnow-ping/index.js +29 -253
- package/core/server/services/indexnow-ping/index.ts +37 -0
- package/core/server/services/indexnow-ping/indexnow-ping-service.js +229 -0
- package/core/server/services/indexnow-ping/indexnow-ping-service.ts +319 -0
- package/core/server/services/invites/index.js +1 -1
- package/core/server/services/lib/mailgun-client.js +3 -3
- package/core/server/services/link-redirection/index.js +2 -2
- package/core/server/services/link-redirection/link-redirect-repository.js +1 -1
- package/core/server/services/link-redirection/link-redirect.js +12 -13
- package/core/server/services/link-redirection/link-redirect.ts +22 -0
- package/core/server/services/link-redirection/link-redirects-service.js +1 -1
- package/core/server/services/link-tracking/full-post-link.js +2 -2
- package/core/server/services/link-tracking/index.js +1 -1
- package/core/server/services/mail/ghost-mailer.js +1 -1
- package/core/server/services/mail/index.js +1 -1
- package/core/server/services/media-inliner/external-media-inliner.js +2 -2
- package/core/server/services/media-inliner/service.js +4 -3
- package/core/server/services/member-attribution/index.js +1 -1
- package/core/server/services/member-welcome-emails/service.js +1 -1
- package/core/server/services/members/api.js +8 -2
- package/core/server/services/members/csv/index.js +10 -0
- package/core/server/services/members/csv/index.ts +3 -0
- package/core/server/services/members/csv/parse.js +94 -0
- package/core/server/services/members/csv/parse.ts +111 -0
- package/core/server/services/members/csv/types.js +2 -0
- package/core/server/services/members/csv/types.ts +39 -0
- package/core/server/services/members/csv/unparse.js +69 -0
- package/core/server/services/members/csv/unparse.ts +79 -0
- package/core/server/services/members/exporter/query.js +35 -8
- package/core/server/services/members/importer/config.js +35 -0
- package/core/server/services/members/importer/config.ts +39 -0
- package/core/server/services/members/importer/members-csv-importer.js +31 -13
- package/core/server/services/members/members-api/members-api.js +4 -2
- package/core/server/services/members/members-api/repositories/event-repository.js +13 -2
- package/core/server/services/members/members-api/services/member-bread-service.js +42 -19
- package/core/server/services/members/middleware.js +1 -1
- package/core/server/services/members/service.js +15 -2
- package/core/server/services/members/stripe-connect.js +1 -1
- package/core/server/services/members-custom-fields/actions.js +3 -0
- package/core/server/services/members-custom-fields/actions.ts +6 -2
- package/core/server/services/members-custom-fields/config.js +34 -0
- package/core/server/services/members-custom-fields/config.ts +38 -0
- package/core/server/services/members-custom-fields/definitions-service.js +156 -21
- package/core/server/services/members-custom-fields/definitions-service.ts +170 -25
- package/core/server/services/members-custom-fields/index.js +16 -3
- package/core/server/services/members-custom-fields/index.ts +17 -3
- package/core/server/services/members-custom-fields/values-service.js +56 -10
- package/core/server/services/members-custom-fields/values-service.ts +62 -10
- package/core/server/services/mentions/mention-sending-service.js +22 -2
- package/core/server/services/mentions/service.js +21 -5
- package/core/server/services/newsletters/index.js +1 -1
- package/core/server/services/oembed/oembed-service.js +122 -33
- package/core/server/services/oembed/service.js +4 -2
- package/core/server/services/offers/service.js +1 -1
- package/core/server/services/post-scheduling/index.js +4 -3
- package/core/server/services/post-scheduling/index.ts +4 -3
- package/core/server/services/post-scheduling/post-scheduling.js +1 -1
- package/core/server/services/post-scheduling/post-scheduling.ts +1 -1
- package/core/server/services/posts/post-email-handler.js +13 -6
- package/core/server/services/posts/post-scheduling.js +1 -1
- package/core/server/services/posts/posts-service-instance.js +1 -1
- package/core/server/services/posts/posts-service.js +2 -2
- package/core/server/services/posts-public/service.js +1 -1
- package/core/server/services/public-config/site.js +1 -1
- package/core/server/services/recommendations/recommendation-service-wrapper.js +1 -1
- package/core/server/services/recommendations/service/libraries.d.ts +0 -2
- package/core/server/services/route-settings/dynamic-routing-service.js +2 -3
- package/core/server/services/route-settings/index.js +1 -1
- package/core/server/services/route-settings/route-settings-parser.js +134 -124
- package/core/server/services/route-settings/route-settings-parser.ts +160 -125
- package/core/server/services/route-settings/validation-errors.js +178 -0
- package/core/server/services/route-settings/validation-errors.ts +196 -0
- package/core/server/services/settings/settings-service.js +2 -2
- package/core/server/services/settings-helpers/index.js +1 -1
- package/core/server/services/slack-notifications/service.js +1 -1
- package/core/server/services/slack-ping/constants.js +16 -0
- package/core/server/services/slack-ping/constants.ts +15 -0
- package/core/server/services/slack-ping/index.js +26 -204
- package/core/server/services/slack-ping/index.ts +35 -0
- package/core/server/services/slack-ping/slack-ping-service.js +214 -0
- package/core/server/services/slack-ping/slack-ping-service.ts +296 -0
- package/core/server/services/staff/index.js +1 -1
- package/core/server/services/stats/posts-stats-service.js +1 -1
- package/core/server/services/stats/service.js +1 -1
- package/core/server/services/stripe/service.js +1 -1
- package/core/server/services/tags-public/service.js +1 -1
- package/core/server/services/themes/validate.js +1 -1
- package/core/server/services/update-check/index.js +1 -1
- package/core/server/services/url/lazy-url-service.js +66 -6
- package/core/server/services/url/lazy-url-service.ts +73 -6
- package/core/server/services/url/url-generator.js +1 -1
- package/core/server/services/url/url-service-facade.js +68 -3
- package/core/server/services/url/url-service-facade.ts +79 -4
- package/core/server/services/url/url-service.js +1 -1
- package/core/server/services/url/urls.js +1 -1
- package/core/server/services/webhooks/index.js +19 -2
- package/core/server/services/webhooks/listen.js +6 -11
- package/core/server/services/webhooks/payload.js +1 -3
- package/core/server/services/webhooks/serialize.js +16 -1
- package/core/server/web/admin/app.js +1 -1
- package/core/server/web/admin/middleware/redirect-admin-urls.js +1 -1
- package/core/server/web/api/endpoints/admin/routes.js +1 -0
- package/core/server/web/api/middleware/cors.js +1 -1
- package/core/server/web/api/middleware/upload.js +4 -0
- package/core/server/web/gift-preview/controller.js +1 -1
- package/core/server/web/shared/middleware/redirect-amp-urls.js +1 -1
- package/core/server/web/shared/middleware/uncapitalise.js +2 -2
- package/core/server/web/shared/middleware/url-redirects.js +1 -1
- package/core/shared/config/defaults.json +8 -1
- package/core/shared/config/overrides.json +4 -0
- package/core/shared/url-utils.js +19 -15
- package/core/shared/url-utils.ts +20 -0
- package/ghost.js +0 -1
- package/package.json +26 -31
- package/pnpm-lock.yaml +681 -2789
- package/pnpm-workspace.yaml +31 -17
- package/components/tryghost-adapter-base-scheduling-0.0.0.tgz +0 -0
- package/components/tryghost-adapter-base-sso-0.0.0.tgz +0 -0
- package/core/built/admin/assets/Combination--5EZGaDs.js +0 -43
- package/core/built/admin/assets/Growth-C0NoKcHQ.js +0 -3
- package/core/built/admin/assets/Newsletters-Ed8kDjdy.js +0 -1
- package/core/built/admin/assets/Overview-CArPgRZt.js +0 -1
- package/core/built/admin/assets/Web-CjjYoVM3.js +0 -2
- package/core/built/admin/assets/account-migration-mfa5mNI9.js +0 -1
- package/core/built/admin/assets/activitypub/inbox-B3rjKMTv.js +0 -1221
- package/core/built/admin/assets/activitypub/layout-jcurg3rU.js +0 -1
- package/core/built/admin/assets/activitypub/use-activity-pub-queries-yqGRcnLn.js +0 -2569
- package/core/built/admin/assets/activitypub/users-CfyHIsTG.js +0 -1316
- package/core/built/admin/assets/automations-DkUnxNdv.js +0 -1
- package/core/built/admin/assets/automations-vjXofmV_.js +0 -1
- package/core/built/admin/assets/bluesky-sharing-T-pO3RcP.js +0 -1
- package/core/built/admin/assets/breadcrumb-CekPYTCn.js +0 -1
- package/core/built/admin/assets/button--i2uMDDn.js +0 -4
- package/core/built/admin/assets/card-CSWz_BXq.js +0 -1
- package/core/built/admin/assets/chart-helpers-C_4Ka_vT.js +0 -1
- package/core/built/admin/assets/chunk.524.8ce2c741473e2f0929dc.js +0 -25
- package/core/built/admin/assets/chunk.582.453459d6228d2955408b.js +0 -27
- package/core/built/admin/assets/code-editor-view-BfkwQto2.js +0 -1
- package/core/built/admin/assets/command-K75Jzs0G.js +0 -1
- package/core/built/admin/assets/comments-BEIi1DH-.js +0 -1
- package/core/built/admin/assets/container-BNXvlcjA.js +0 -1
- package/core/built/admin/assets/data-list-BmK5QMab.js +0 -1
- package/core/built/admin/assets/date-range-select-5sKzwbt7.js +0 -1
- package/core/built/admin/assets/disabled-sources-indicator-L_ssJTNr.js +0 -1
- package/core/built/admin/assets/dist-BBIJuyPg.js +0 -1
- package/core/built/admin/assets/dist-BHE0dp6o.js +0 -1
- package/core/built/admin/assets/dist-DJ6c4_De.js +0 -1
- package/core/built/admin/assets/dist-DW0QXQO3.js +0 -1
- package/core/built/admin/assets/dist-DxFLceO5.js +0 -1
- package/core/built/admin/assets/dist-QcACAOAD.js +0 -1
- package/core/built/admin/assets/dist-duxRDcQu.js +0 -177
- package/core/built/admin/assets/domain-CLaPZ9Rc.js +0 -1
- package/core/built/admin/assets/dropzone-E0bSX4_a.js +0 -5
- package/core/built/admin/assets/edit-profile-DqNPKaA4.js +0 -1
- package/core/built/admin/assets/editor-CkLXQDRp.js +0 -8
- package/core/built/admin/assets/empty-indicator-BTtOlgIo.js +0 -1
- package/core/built/admin/assets/esm-TSfGW7nz.js +0 -2
- package/core/built/admin/assets/explore-BEstLxKr.js +0 -1
- package/core/built/admin/assets/feed-C58p2voG.js +0 -1
- package/core/built/admin/assets/field-BSbDUHPv.js +0 -1
- package/core/built/admin/assets/filters-BgYv8Gt7.js +0 -1
- package/core/built/admin/assets/filters-DvenFkmK.js +0 -1
- package/core/built/admin/assets/framework-provider-jQktxm9P.js +0 -4
- package/core/built/admin/assets/ghost-dark-8590dea6cd695ff90f27d262c4464538.css +0 -1
- package/core/built/admin/assets/gift-link-modal-BPjXkEFt.js +0 -1
- package/core/built/admin/assets/growth-D4JNiVTe.js +0 -1
- package/core/built/admin/assets/hooks-Cjxexi_I.js +0 -2
- package/core/built/admin/assets/index-BacwlcOy.js +0 -67
- package/core/built/admin/assets/index-DxRNHH0o.css +0 -1
- package/core/built/admin/assets/inline-C22rnPro.js +0 -1
- package/core/built/admin/assets/input-group-CKfrILLP.js +0 -1
- package/core/built/admin/assets/jsx-runtime-CtMZ-PAS.js +0 -1
- package/core/built/admin/assets/kpi-card-DZxQKAIb.js +0 -1
- package/core/built/admin/assets/kpi-card-FidQ5zg3.js +0 -1
- package/core/built/admin/assets/kpi-helpers-C5T8Vaf1.js +0 -1
- package/core/built/admin/assets/kpi-tabs-_VRK6hGV.js +0 -1
- package/core/built/admin/assets/label-Cza7hPgn.js +0 -1
- package/core/built/admin/assets/label-picker-DgC_zLaw.js +0 -1
- package/core/built/admin/assets/layout-BxsXnKFX.js +0 -1
- package/core/built/admin/assets/limit-service-CTurluJQ.js +0 -20
- package/core/built/admin/assets/link-helpers-C3Gqy2cz.js +0 -1
- package/core/built/admin/assets/list-page-BtqCnow_.js +0 -1
- package/core/built/admin/assets/member-custom-fields-9uXFBqSt.js +0 -1
- package/core/built/admin/assets/member-detail-Dq6ZDIxo.js +0 -1
- package/core/built/admin/assets/members-CUWD9jal.js +0 -10
- package/core/built/admin/assets/modals-CIdwHVga.js +0 -31
- package/core/built/admin/assets/moderation-DTt04UDA.js +0 -1
- package/core/built/admin/assets/newsletter-cC8vcc9h.js +0 -1
- package/core/built/admin/assets/note-DZU0IY9e.js +0 -1
- package/core/built/admin/assets/notifications-NoHpBHJ4.js +0 -1
- package/core/built/admin/assets/nql-lang-CvCSOQG3.js +0 -19
- package/core/built/admin/assets/onboarding-route-Deg2hNm8.js +0 -1
- package/core/built/admin/assets/overview-BQPt_9w3.js +0 -1
- package/core/built/admin/assets/page-header-D6bEqPo2.js +0 -1
- package/core/built/admin/assets/post-analytics-header-BPw_B2_D.js +0 -1
- package/core/built/admin/assets/post-analytics-kp2_--XO.js +0 -1
- package/core/built/admin/assets/post-share-modal-Cave3Z4W.js +0 -1
- package/core/built/admin/assets/preferences-C7h3j_uy.js +0 -5
- package/core/built/admin/assets/profile-B2x4q2oB.js +0 -1
- package/core/built/admin/assets/router-provider-5fsX1CYn.js +0 -1
- package/core/built/admin/assets/select-PhPjIBBT.js +0 -1
- package/core/built/admin/assets/settings-D5P9Gwgo.js +0 -6
- package/core/built/admin/assets/settings-zUOzQV5I.js +0 -1
- package/core/built/admin/assets/share-modal-EfpfbuWF.js +0 -1
- package/core/built/admin/assets/social-urls-DgAF08Xc.js +0 -18
- package/core/built/admin/assets/sort-button-WOQYJm2H.js +0 -1
- package/core/built/admin/assets/source-icon-hm8Cj-Gx.js +0 -1
- package/core/built/admin/assets/stats-CnQDb62m.js +0 -1
- package/core/built/admin/assets/stats-view-CCfTJgSe.js +0 -1
- package/core/built/admin/assets/step-1-BGlhY4DS.js +0 -1
- package/core/built/admin/assets/step-2-D3sDEyFH.js +0 -1
- package/core/built/admin/assets/step-3-CvZoUdsc.js +0 -2
- package/core/built/admin/assets/switch-CNjkOmwz.js +0 -1
- package/core/built/admin/assets/table-C5nZYPnW.js +0 -1
- package/core/built/admin/assets/tabs-dtOcExye.js +0 -1
- package/core/built/admin/assets/tags-Dhm0FB_g.js +0 -1
- package/core/built/admin/assets/textarea-CeKw3wmV.js +0 -1
- package/core/built/admin/assets/toggle-group-DfhZIMTW.js +0 -1
- package/core/built/admin/assets/topic-filter-Cxe1Il41.js +0 -1
- package/core/built/admin/assets/typeof-Ca-duI-z.js +0 -1
- package/core/built/admin/assets/use-filter-params-Bub6BqNy.js +0 -1
- package/core/built/admin/assets/use-growth-stats-BJORomv0.js +0 -1
- package/core/built/admin/assets/use-reply-chain-data-B89YjVoo.js +0 -1
- package/core/built/admin/assets/use-simple-pagination-BL2SYXKi.js +0 -1
- package/core/built/admin/assets/virtual-list-DNJOSK9I.js +0 -1
- package/core/built/admin/assets/web-BHUE3YQc.js +0 -1
- package/core/server/adapters/scheduling/scheduling-base.js +0 -5
- package/core/server/adapters/sso/SSOBase.js +0 -5
- package/core/server/adapters/storage/index.js +0 -17
|
@@ -2,7 +2,7 @@ const _ = require('lodash');
|
|
|
2
2
|
const xml = require('xml');
|
|
3
3
|
const moment = require('moment');
|
|
4
4
|
const path = require('path');
|
|
5
|
-
const urlUtils = require('../../../shared/url-utils');
|
|
5
|
+
const urlUtils = require('../../../shared/url-utils').default;
|
|
6
6
|
const localUtils = require('./utils');
|
|
7
7
|
|
|
8
8
|
// Sitemap specific xml namespace declarations that should not change
|
|
@@ -22,8 +22,27 @@ class BaseSiteMapGenerator {
|
|
|
22
22
|
this.maxPerPage = 50000;
|
|
23
23
|
}
|
|
24
24
|
|
|
25
|
-
hasCanonicalUrl(datum) {
|
|
26
|
-
|
|
25
|
+
hasCanonicalUrl(datum, url) {
|
|
26
|
+
if (!datum?.canonical_url) {
|
|
27
|
+
return false;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
// Sitemap data comes from raw knex queries which bypass model-layer
|
|
31
|
+
// attribute transforms, so canonical_url may still be transform-ready
|
|
32
|
+
// (__GHOST_URL__/...) and must be made absolute before comparing
|
|
33
|
+
const canonicalUrl = urlUtils.transformReadyToAbsolute(datum.canonical_url);
|
|
34
|
+
|
|
35
|
+
const normalizeUrl = (value) => {
|
|
36
|
+
const normalizedUrl = new URL(value);
|
|
37
|
+
normalizedUrl.pathname = normalizedUrl.pathname.replace(/\/+$/, '');
|
|
38
|
+
return normalizedUrl.href;
|
|
39
|
+
};
|
|
40
|
+
|
|
41
|
+
try {
|
|
42
|
+
return normalizeUrl(canonicalUrl) !== normalizeUrl(url);
|
|
43
|
+
} catch {
|
|
44
|
+
return canonicalUrl !== url;
|
|
45
|
+
}
|
|
27
46
|
}
|
|
28
47
|
|
|
29
48
|
generateXmlFromNodes(page) {
|
|
@@ -83,7 +102,7 @@ class BaseSiteMapGenerator {
|
|
|
83
102
|
const lastModified = this.getLastModifiedForDatum(datum);
|
|
84
103
|
const node = this.createUrlNodeFromDatum(url, datum, lastModified);
|
|
85
104
|
|
|
86
|
-
if (node && !this.hasCanonicalUrl(datum)) {
|
|
105
|
+
if (node && !this.hasCanonicalUrl(datum, url)) {
|
|
87
106
|
this.updateLastModified(datum, lastModified);
|
|
88
107
|
this.updateLookups(datum, node, lastModified);
|
|
89
108
|
// force regeneration of xml
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
const _ = require('lodash');
|
|
2
2
|
const xml = require('xml');
|
|
3
3
|
const moment = require('moment');
|
|
4
|
-
const urlUtils = require('../../../shared/url-utils');
|
|
4
|
+
const urlUtils = require('../../../shared/url-utils').default;
|
|
5
5
|
const localUtils = require('./utils');
|
|
6
6
|
|
|
7
7
|
const XMLNS_DECLS = {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
const DomainEvents = require('@tryghost/domain-events');
|
|
2
2
|
const errors = require('@tryghost/errors');
|
|
3
|
-
const urlUtils = require('../../../shared/url-utils');
|
|
3
|
+
const urlUtils = require('../../../shared/url-utils').default;
|
|
4
4
|
const {URLResourceUpdatedEvent} = require('../../../shared/events');
|
|
5
5
|
const IndexMapGenerator = require('./site-map-index-generator');
|
|
6
6
|
const PagesMapGenerator = require('./page-map-generator');
|
|
@@ -8,8 +8,8 @@ const PostsMapGenerator = require('./post-map-generator');
|
|
|
8
8
|
const UsersMapGenerator = require('./user-map-generator');
|
|
9
9
|
const TagsMapGenerator = require('./tags-map-generator');
|
|
10
10
|
|
|
11
|
-
//
|
|
12
|
-
const
|
|
11
|
+
// Frontend-internal routing events (router.created / routers.reset)
|
|
12
|
+
const routingEvents = require('../routing/events');
|
|
13
13
|
|
|
14
14
|
// What the sitemap XML reads off each resource, beyond the columns URL
|
|
15
15
|
// computation needs: lastmod dates, image nodes, and the canonical_url skip
|
|
@@ -42,6 +42,12 @@ class SiteMapManager {
|
|
|
42
42
|
// loads would change boot order.
|
|
43
43
|
this._urlService = options.urlService || null;
|
|
44
44
|
|
|
45
|
+
// Server events arrive through the proxy's narrow subscription
|
|
46
|
+
// surface (site.changed, url.added, url.removed). Injectable for
|
|
47
|
+
// tests; resolved at construction (not module load) for the same
|
|
48
|
+
// boot-order reason as the url service above.
|
|
49
|
+
this._serverEvents = options.serverEvents || require('../proxy').serverEvents;
|
|
50
|
+
|
|
45
51
|
// Index state for the build path. _indexEpoch increments on every
|
|
46
52
|
// invalidation signal; a build compares the epoch it started with so
|
|
47
53
|
// an invalidated-while-running build never marks the index ready.
|
|
@@ -53,7 +59,7 @@ class SiteMapManager {
|
|
|
53
59
|
// every rebuild can replay them after resetting the generators.
|
|
54
60
|
this._routerEntries = [];
|
|
55
61
|
|
|
56
|
-
|
|
62
|
+
routingEvents.on('router.created', (router) => {
|
|
57
63
|
if (router.name !== 'StaticRoutesRouter' && router.name !== 'CollectionRouter') {
|
|
58
64
|
return;
|
|
59
65
|
}
|
|
@@ -76,7 +82,7 @@ class SiteMapManager {
|
|
|
76
82
|
// current after the initial build, exactly as before this change —
|
|
77
83
|
// deploying is a no-op until the lazy flip. Pure lazy fires no
|
|
78
84
|
// events, so there the index empties and the next read rebuilds.
|
|
79
|
-
|
|
85
|
+
this._serverEvents.on('site.changed', () => {
|
|
80
86
|
if (this._getUrlService().isLazy()) {
|
|
81
87
|
this._invalidateIndex();
|
|
82
88
|
}
|
|
@@ -88,15 +94,15 @@ class SiteMapManager {
|
|
|
88
94
|
this[event.data.resourceType].updateURL(event.data);
|
|
89
95
|
});
|
|
90
96
|
|
|
91
|
-
|
|
97
|
+
this._serverEvents.on('url.added', (obj) => {
|
|
92
98
|
this[obj.resource.config.type].addUrl(obj.url.absolute, obj.resource.data);
|
|
93
99
|
});
|
|
94
100
|
|
|
95
|
-
|
|
101
|
+
this._serverEvents.on('url.removed', (obj) => {
|
|
96
102
|
this[obj.resource.config.type].removeUrl(obj.url.absolute, obj.resource.data);
|
|
97
103
|
});
|
|
98
104
|
|
|
99
|
-
|
|
105
|
+
routingEvents.on('routers.reset', () => {
|
|
100
106
|
this.pages && this.pages.reset();
|
|
101
107
|
this.posts && this.posts.reset();
|
|
102
108
|
this.users && this.users.reset();
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
const hbs = require('../engine');
|
|
2
|
-
const urlUtils = require('../../../../shared/url-utils');
|
|
2
|
+
const urlUtils = require('../../../../shared/url-utils').default;
|
|
3
3
|
const settingsCache = require('../../../../shared/settings-cache');
|
|
4
4
|
const customThemeSettingsCache = require('../../../../shared/custom-theme-settings-cache');
|
|
5
5
|
const labs = require('../../../../shared/labs');
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
const _ = require('lodash');
|
|
2
2
|
const hbs = require('../engine');
|
|
3
|
-
const urlUtils = require('../../../../shared/url-utils');
|
|
3
|
+
const urlUtils = require('../../../../shared/url-utils').default;
|
|
4
4
|
const customThemeSettingsCache = require('../../../../shared/custom-theme-settings-cache');
|
|
5
5
|
const preview = require('../preview');
|
|
6
6
|
const labs = require('../../../../shared/labs');
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
const imageTransform = require('@tryghost/image-transform');
|
|
2
|
-
const urlUtils = require('../../shared/url-utils');
|
|
2
|
+
const urlUtils = require('../../shared/url-utils').default;
|
|
3
3
|
const {isInternalImage} = require('../services/proxy');
|
|
4
4
|
|
|
5
5
|
module.exports.detectInternalImage = function detectInternalImage(requestedImageUrl) {
|
|
@@ -2,7 +2,7 @@ const _ = require('lodash');
|
|
|
2
2
|
const path = require('path');
|
|
3
3
|
const {NoContentError} = require('@tryghost/errors');
|
|
4
4
|
const imageTransform = require('@tryghost/image-transform');
|
|
5
|
-
const
|
|
5
|
+
const adapterManager = require('../../../server/services/adapter-manager').default;
|
|
6
6
|
const activeTheme = require('../../services/theme-engine/active');
|
|
7
7
|
const config = require('../../../shared/config');
|
|
8
8
|
const {imageSize} = require('../../../server/lib/image');
|
|
@@ -104,7 +104,7 @@ module.exports = function handleImageSizes(req, res, next) {
|
|
|
104
104
|
return redirectToOriginal();
|
|
105
105
|
}
|
|
106
106
|
|
|
107
|
-
const storageInstance =
|
|
107
|
+
const storageInstance = adapterManager.getAdapter('storage:images');
|
|
108
108
|
// CASE: unsupported storage adapter
|
|
109
109
|
if (typeof storageInstance.saveRaw !== 'function') {
|
|
110
110
|
return redirectToOriginal();
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
const express = require('../../../shared/express');
|
|
2
2
|
const config = require('../../../shared/config');
|
|
3
|
-
const urlUtils = require('../../../shared/url-utils');
|
|
3
|
+
const urlUtils = require('../../../shared/url-utils').default;
|
|
4
4
|
|
|
5
5
|
// Extract the core redirect logic for easier testing
|
|
6
6
|
const handleAdminRedirect = function (req, res) {
|
|
@@ -3,7 +3,7 @@ const path = require('path');
|
|
|
3
3
|
const crypto = require('crypto');
|
|
4
4
|
const config = require('../../../shared/config');
|
|
5
5
|
const {blogIcon} = require('../../services/proxy');
|
|
6
|
-
const urlUtils = require('../../../shared/url-utils');
|
|
6
|
+
const urlUtils = require('../../../shared/url-utils').default;
|
|
7
7
|
const settingsCache = require('../../../shared/settings-cache');
|
|
8
8
|
|
|
9
9
|
const buildContentResponse = (ext, buf) => {
|
|
@@ -3,7 +3,7 @@ const fs = require('fs-extra');
|
|
|
3
3
|
const path = require('path');
|
|
4
4
|
const errors = require('@tryghost/errors');
|
|
5
5
|
const config = require('../../../shared/config');
|
|
6
|
-
const urlUtils = require('../../../shared/url-utils');
|
|
6
|
+
const urlUtils = require('../../../shared/url-utils').default;
|
|
7
7
|
const tpl = require('@tryghost/tpl');
|
|
8
8
|
const {cardAssets} = require('../../services/assets-minification');
|
|
9
9
|
const themeEngine = require('../../services/theme-engine');
|
|
@@ -6,8 +6,8 @@ const {MemberPageViewEvent} = require('../../shared/events');
|
|
|
6
6
|
|
|
7
7
|
// App requires
|
|
8
8
|
const config = require('../../shared/config');
|
|
9
|
-
const
|
|
10
|
-
const urlUtils = require('../../shared/url-utils');
|
|
9
|
+
const adapterManager = require('../../server/services/adapter-manager').default;
|
|
10
|
+
const urlUtils = require('../../shared/url-utils').default;
|
|
11
11
|
const sitemapHandler = require('../services/sitemap/handler');
|
|
12
12
|
const serveFavicon = require('./routers/serve-favicon');
|
|
13
13
|
const servePublicFiles = require('./routers/serve-public-file');
|
|
@@ -96,11 +96,11 @@ module.exports = function setupSiteApp(routerConfig) {
|
|
|
96
96
|
siteApp.use(createLlmsDiscovery({settingsCache, labs}));
|
|
97
97
|
|
|
98
98
|
// Serve site images using the storage adapter
|
|
99
|
-
siteApp.use(STATIC_IMAGE_URL_PREFIX, mw.handleImageSizes,
|
|
99
|
+
siteApp.use(STATIC_IMAGE_URL_PREFIX, mw.handleImageSizes, adapterManager.getAdapter('storage:images').serve());
|
|
100
100
|
// Serve site media using the storage adapter
|
|
101
|
-
siteApp.use(STATIC_MEDIA_URL_PREFIX,
|
|
101
|
+
siteApp.use(STATIC_MEDIA_URL_PREFIX, adapterManager.getAdapter('storage:media').serve());
|
|
102
102
|
// Serve site files using the storage adapter
|
|
103
|
-
siteApp.use(STATIC_FILES_URL_PREFIX,
|
|
103
|
+
siteApp.use(STATIC_FILES_URL_PREFIX, adapterManager.getAdapter('storage:files').serve());
|
|
104
104
|
|
|
105
105
|
// /member/.well-known/* serves files (e.g. jwks.json) so it needs to be mounted before the prettyUrl mw to avoid trailing slashes
|
|
106
106
|
siteApp.use(
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
const TTLCache = require('@isaacs/ttlcache');
|
|
2
|
-
const
|
|
2
|
+
const {CacheBase} = require('@tryghost/adapter-base-cache');
|
|
3
3
|
|
|
4
4
|
/**
|
|
5
5
|
* Cache adapter compatible wrapper around TTLCache
|
|
@@ -8,7 +8,7 @@ const Base = require('@tryghost/adapter-base-cache');
|
|
|
8
8
|
* - it supports time-to-live (TTL)
|
|
9
9
|
* - it supports a max number of items
|
|
10
10
|
*/
|
|
11
|
-
class AdapterCacheMemoryTTL extends
|
|
11
|
+
class AdapterCacheMemoryTTL extends CacheBase {
|
|
12
12
|
#cache;
|
|
13
13
|
|
|
14
14
|
/**
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* The adapter-manager loads adapters by constructing a path from the config value.
|
|
4
4
|
*
|
|
5
5
|
* @see core/shared/config/defaults.json
|
|
6
|
-
* @see core/server/services/adapter-manager/adapter-manager.
|
|
6
|
+
* @see core/server/services/adapter-manager/adapter-manager.ts
|
|
7
7
|
*/
|
|
8
8
|
const RedisCache = require('../lib/redis/AdapterCacheRedis');
|
|
9
9
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
const crypto = require('crypto');
|
|
2
|
-
const
|
|
2
|
+
const {CacheBase} = require('@tryghost/adapter-base-cache');
|
|
3
3
|
const errors = require('@tryghost/errors');
|
|
4
4
|
const logging = require('@tryghost/logging');
|
|
5
5
|
const metrics = require('@tryghost/metrics');
|
|
@@ -9,7 +9,7 @@ const redisStoreFactory = require('./redis-store-factory');
|
|
|
9
9
|
|
|
10
10
|
const PREFIX_HASH_KEY = 'prefix_hash';
|
|
11
11
|
|
|
12
|
-
class AdapterCacheRedis extends
|
|
12
|
+
class AdapterCacheRedis extends CacheBase {
|
|
13
13
|
/**
|
|
14
14
|
*
|
|
15
15
|
* @param {Object} config
|
|
@@ -36,27 +36,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
36
36
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
-
exports.getBackupRouteSettingsFilePath = void 0;
|
|
40
39
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
41
40
|
const path_1 = __importDefault(require("path"));
|
|
42
41
|
const zod_1 = require("zod");
|
|
43
|
-
const date_fns_1 = require("date-fns");
|
|
44
42
|
const errors = __importStar(require("@tryghost/errors"));
|
|
45
43
|
const tpl_1 = __importDefault(require("@tryghost/tpl"));
|
|
46
44
|
const adapter_base_route_settings_1 = require("@tryghost/adapter-base-route-settings");
|
|
47
45
|
const yaml_parser_1 = __importDefault(require("../../services/route-settings/yaml-parser"));
|
|
48
46
|
const route_settings_parser_1 = require("../../services/route-settings/route-settings-parser");
|
|
47
|
+
const utils_1 = require("./utils");
|
|
49
48
|
const YAML_FILENAME = 'routes.yaml';
|
|
50
49
|
const DEFAULT_SETTINGS_FILENAME = 'default-routes.yaml';
|
|
51
50
|
const messages = {
|
|
52
51
|
missingPaths: 'FileStore requires basePath and defaultSettingsBasePath.',
|
|
53
52
|
ensureSettings: 'Error trying to access settings files in {path}.'
|
|
54
53
|
};
|
|
55
|
-
const getBackupRouteSettingsFilePath = (filePath) => {
|
|
56
|
-
const { dir, name, ext } = path_1.default.parse(filePath);
|
|
57
|
-
return path_1.default.join(dir, `${name}-${(0, date_fns_1.format)(new Date(), 'yyyy-MM-dd-HH-mm-ss')}${ext}`);
|
|
58
|
-
};
|
|
59
|
-
exports.getBackupRouteSettingsFilePath = getBackupRouteSettingsFilePath;
|
|
60
54
|
// Validates the required paths sourced from config. Used by `FileStore.validate`.
|
|
61
55
|
const configSchema = zod_1.z.object({
|
|
62
56
|
basePath: zod_1.z.string({ error: (0, tpl_1.default)(messages.missingPaths) }).min(1, { error: (0, tpl_1.default)(messages.missingPaths) }),
|
|
@@ -98,7 +92,7 @@ class FileStore extends adapter_base_route_settings_1.RouteSettingsStoreBase {
|
|
|
98
92
|
// config (nconf holds static values), so it's read from the raw input
|
|
99
93
|
// rather than the validated schema output.
|
|
100
94
|
this.getBackupFilePath = config.getBackupFilePath
|
|
101
|
-
??
|
|
95
|
+
?? utils_1.getBackupRouteSettingsFilePath;
|
|
102
96
|
}
|
|
103
97
|
async get() {
|
|
104
98
|
const yamlPath = path_1.default.join(this.basePath, YAML_FILENAME);
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import fs from 'fs-extra';
|
|
2
2
|
import path from 'path';
|
|
3
3
|
import {z} from 'zod';
|
|
4
|
-
import {format} from 'date-fns';
|
|
5
4
|
import * as errors from '@tryghost/errors';
|
|
6
5
|
import tpl from '@tryghost/tpl';
|
|
7
6
|
|
|
@@ -9,6 +8,7 @@ import {RouteSettingsStoreBase, type RouteSettings} from '@tryghost/adapter-base
|
|
|
9
8
|
|
|
10
9
|
import parseYaml from '../../services/route-settings/yaml-parser';
|
|
11
10
|
import {parseRouteSettings} from '../../services/route-settings/route-settings-parser';
|
|
11
|
+
import {getBackupRouteSettingsFilePath} from './utils';
|
|
12
12
|
|
|
13
13
|
const YAML_FILENAME = 'routes.yaml';
|
|
14
14
|
const DEFAULT_SETTINGS_FILENAME = 'default-routes.yaml';
|
|
@@ -18,11 +18,6 @@ const messages = {
|
|
|
18
18
|
ensureSettings: 'Error trying to access settings files in {path}.'
|
|
19
19
|
};
|
|
20
20
|
|
|
21
|
-
export const getBackupRouteSettingsFilePath = (filePath: string): string => {
|
|
22
|
-
const {dir, name, ext} = path.parse(filePath);
|
|
23
|
-
return path.join(dir, `${name}-${format(new Date(), 'yyyy-MM-dd-HH-mm-ss')}${ext}`);
|
|
24
|
-
};
|
|
25
|
-
|
|
26
21
|
// Validates the required paths sourced from config. Used by `FileStore.validate`.
|
|
27
22
|
const configSchema = z.object({
|
|
28
23
|
basePath: z.string({error: tpl(messages.missingPaths)}).min(1, {error: tpl(messages.missingPaths)}),
|
|
@@ -0,0 +1,206 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
36
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
|
+
};
|
|
38
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
40
|
+
const path_1 = __importDefault(require("path"));
|
|
41
|
+
const client_s3_1 = require("@aws-sdk/client-s3");
|
|
42
|
+
const zod_1 = require("zod");
|
|
43
|
+
const tpl_1 = __importDefault(require("@tryghost/tpl"));
|
|
44
|
+
const errors = __importStar(require("@tryghost/errors"));
|
|
45
|
+
const adapter_base_route_settings_1 = require("@tryghost/adapter-base-route-settings");
|
|
46
|
+
const yaml_parser_1 = __importDefault(require("../../services/route-settings/yaml-parser"));
|
|
47
|
+
const route_settings_parser_1 = require("../../services/route-settings/route-settings-parser");
|
|
48
|
+
const utils_1 = require("./utils");
|
|
49
|
+
const YAML_FILENAME = 'routes.yaml';
|
|
50
|
+
const DEFAULT_SETTINGS_FILENAME = 'default-routes.yaml';
|
|
51
|
+
const CONTENT_TYPE = 'application/yaml; charset=utf-8';
|
|
52
|
+
const messages = {
|
|
53
|
+
missingBucket: 'S3RouteSettingsStore requires a bucket name',
|
|
54
|
+
missingStaticFileURLPrefix: 'S3RouteSettingsStore requires a staticFileURLPrefix',
|
|
55
|
+
missingDefaultSettingsBasePath: 'S3RouteSettingsStore requires a defaultSettingsBasePath',
|
|
56
|
+
partialCredentials: 'S3RouteSettingsStore requires both accessKeyId and secretAccessKey when either is provided',
|
|
57
|
+
missingResponseBody: 'S3 GetObject returned no body',
|
|
58
|
+
ensureDefaults: 'Error trying to access the default settings file in {path}.'
|
|
59
|
+
};
|
|
60
|
+
const stripLeadingAndTrailingSlashes = (value = '') => value.replace(/^\/+|\/+$/g, '');
|
|
61
|
+
const configSchema = zod_1.z.object({
|
|
62
|
+
bucket: zod_1.z.string({ error: (0, tpl_1.default)(messages.missingBucket) }).min(1, { error: (0, tpl_1.default)(messages.missingBucket) }),
|
|
63
|
+
staticFileURLPrefix: zod_1.z.string({ error: (0, tpl_1.default)(messages.missingStaticFileURLPrefix) })
|
|
64
|
+
.transform(stripLeadingAndTrailingSlashes)
|
|
65
|
+
.refine(value => value.length > 0, { error: (0, tpl_1.default)(messages.missingStaticFileURLPrefix) }),
|
|
66
|
+
defaultSettingsBasePath: zod_1.z.string({ error: (0, tpl_1.default)(messages.missingDefaultSettingsBasePath) })
|
|
67
|
+
.min(1, { error: (0, tpl_1.default)(messages.missingDefaultSettingsBasePath) }),
|
|
68
|
+
tenantPrefix: zod_1.z.string().transform(stripLeadingAndTrailingSlashes).optional(),
|
|
69
|
+
region: zod_1.z.string().optional(),
|
|
70
|
+
endpoint: zod_1.z.string().optional(),
|
|
71
|
+
forcePathStyle: zod_1.z.boolean().optional(),
|
|
72
|
+
accessKeyId: zod_1.z.string().optional(),
|
|
73
|
+
secretAccessKey: zod_1.z.string().optional(),
|
|
74
|
+
sessionToken: zod_1.z.string().optional()
|
|
75
|
+
}).refine((config) => {
|
|
76
|
+
const hasAccessKey = Boolean(config.accessKeyId);
|
|
77
|
+
const hasSecretKey = Boolean(config.secretAccessKey);
|
|
78
|
+
const hasSessionToken = Boolean(config.sessionToken);
|
|
79
|
+
const hasCredentialPair = hasAccessKey && hasSecretKey;
|
|
80
|
+
return !((hasAccessKey || hasSecretKey || hasSessionToken) && !hasCredentialPair);
|
|
81
|
+
}, { error: (0, tpl_1.default)(messages.partialCredentials) });
|
|
82
|
+
/**
|
|
83
|
+
* Remote store for route settings backed by an S3-compatible bucket (MinIO in
|
|
84
|
+
* tests, GCS in production). Reads and writes the operator's original
|
|
85
|
+
* `routes.yaml` verbatim.
|
|
86
|
+
*/
|
|
87
|
+
class S3RouteSettingsStore extends adapter_base_route_settings_1.RouteSettingsStoreBase {
|
|
88
|
+
client;
|
|
89
|
+
bucket;
|
|
90
|
+
staticFileURLPrefix;
|
|
91
|
+
tenantPrefix;
|
|
92
|
+
defaultSettingsBasePath;
|
|
93
|
+
static parseConfig(config) {
|
|
94
|
+
const result = configSchema.safeParse(config);
|
|
95
|
+
if (!result.success) {
|
|
96
|
+
throw new errors.IncorrectUsageError({
|
|
97
|
+
message: [...new Set(result.error.issues.map(issue => issue.message))].join('; ')
|
|
98
|
+
});
|
|
99
|
+
}
|
|
100
|
+
return result.data;
|
|
101
|
+
}
|
|
102
|
+
static validate(config) {
|
|
103
|
+
S3RouteSettingsStore.parseConfig(config);
|
|
104
|
+
}
|
|
105
|
+
constructor(config) {
|
|
106
|
+
super();
|
|
107
|
+
const options = S3RouteSettingsStore.parseConfig(config);
|
|
108
|
+
const hasCredentialPair = Boolean(options.accessKeyId) && Boolean(options.secretAccessKey);
|
|
109
|
+
this.bucket = options.bucket;
|
|
110
|
+
this.staticFileURLPrefix = options.staticFileURLPrefix;
|
|
111
|
+
this.tenantPrefix = options.tenantPrefix ?? '';
|
|
112
|
+
this.defaultSettingsBasePath = options.defaultSettingsBasePath;
|
|
113
|
+
const clientConfig = {
|
|
114
|
+
region: options.region,
|
|
115
|
+
endpoint: options.endpoint,
|
|
116
|
+
forcePathStyle: options.forcePathStyle
|
|
117
|
+
};
|
|
118
|
+
if (hasCredentialPair) {
|
|
119
|
+
clientConfig.credentials = {
|
|
120
|
+
accessKeyId: options.accessKeyId,
|
|
121
|
+
secretAccessKey: options.secretAccessKey,
|
|
122
|
+
sessionToken: options.sessionToken
|
|
123
|
+
};
|
|
124
|
+
}
|
|
125
|
+
// `s3Client` is a test-only injection seam — it never comes from config
|
|
126
|
+
// (nconf holds static values), so it's read from the raw input rather
|
|
127
|
+
// than the validated schema output.
|
|
128
|
+
const injectedClient = config?.s3Client;
|
|
129
|
+
this.client = injectedClient || new client_s3_1.S3Client(clientConfig);
|
|
130
|
+
}
|
|
131
|
+
async get() {
|
|
132
|
+
let body;
|
|
133
|
+
try {
|
|
134
|
+
const response = await this.client.send(new client_s3_1.GetObjectCommand({
|
|
135
|
+
Bucket: this.bucket,
|
|
136
|
+
Key: this.buildKey()
|
|
137
|
+
}));
|
|
138
|
+
if (!response.Body) {
|
|
139
|
+
throw new errors.InternalServerError({
|
|
140
|
+
message: (0, tpl_1.default)(messages.missingResponseBody)
|
|
141
|
+
});
|
|
142
|
+
}
|
|
143
|
+
body = await response.Body.transformToString('utf-8');
|
|
144
|
+
}
|
|
145
|
+
catch (err) {
|
|
146
|
+
if (this._isNotFound(err)) {
|
|
147
|
+
const defaultContent = await this.readDefaultSettings();
|
|
148
|
+
return (0, route_settings_parser_1.parseRouteSettings)((0, yaml_parser_1.default)(defaultContent), defaultContent);
|
|
149
|
+
}
|
|
150
|
+
throw err;
|
|
151
|
+
}
|
|
152
|
+
return (0, route_settings_parser_1.parseRouteSettings)((0, yaml_parser_1.default)(body), body);
|
|
153
|
+
}
|
|
154
|
+
async replace(settings) {
|
|
155
|
+
const key = this.buildKey();
|
|
156
|
+
if (await this._canonicalExists()) {
|
|
157
|
+
await this.client.send(new client_s3_1.CopyObjectCommand({
|
|
158
|
+
Bucket: this.bucket,
|
|
159
|
+
Key: (0, utils_1.getBackupRouteSettingsFilePath)(key),
|
|
160
|
+
CopySource: `${this.bucket}/${key}`
|
|
161
|
+
}));
|
|
162
|
+
}
|
|
163
|
+
await this.client.send(new client_s3_1.PutObjectCommand({
|
|
164
|
+
Bucket: this.bucket,
|
|
165
|
+
Key: key,
|
|
166
|
+
Body: settings.yamlSource,
|
|
167
|
+
ContentType: CONTENT_TYPE
|
|
168
|
+
}));
|
|
169
|
+
}
|
|
170
|
+
buildKey() {
|
|
171
|
+
const parts = [this.tenantPrefix, this.staticFileURLPrefix, YAML_FILENAME].filter(Boolean);
|
|
172
|
+
return parts.join('/');
|
|
173
|
+
}
|
|
174
|
+
async _canonicalExists() {
|
|
175
|
+
try {
|
|
176
|
+
await this.client.send(new client_s3_1.HeadObjectCommand({
|
|
177
|
+
Bucket: this.bucket,
|
|
178
|
+
Key: this.buildKey()
|
|
179
|
+
}));
|
|
180
|
+
return true;
|
|
181
|
+
}
|
|
182
|
+
catch (err) {
|
|
183
|
+
if (this._isNotFound(err)) {
|
|
184
|
+
return false;
|
|
185
|
+
}
|
|
186
|
+
throw err;
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
async readDefaultSettings() {
|
|
190
|
+
const defaultFilePath = path_1.default.join(this.defaultSettingsBasePath, DEFAULT_SETTINGS_FILENAME);
|
|
191
|
+
try {
|
|
192
|
+
return await fs_extra_1.default.readFile(defaultFilePath, 'utf8');
|
|
193
|
+
}
|
|
194
|
+
catch (err) {
|
|
195
|
+
throw new errors.InternalServerError({
|
|
196
|
+
message: (0, tpl_1.default)(messages.ensureDefaults, { path: this.defaultSettingsBasePath }),
|
|
197
|
+
err: err,
|
|
198
|
+
context: err.path
|
|
199
|
+
});
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
_isNotFound(err) {
|
|
203
|
+
return err instanceof client_s3_1.NotFound || err instanceof client_s3_1.NoSuchKey;
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
exports.default = S3RouteSettingsStore;
|