@jant/core 0.10.0 → 0.11.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/bin/commands/db/execute-file.js +1 -1
- package/bin/commands/db/export.js +1 -1
- package/bin/commands/migrate.js +4 -4
- package/bin/commands/posts/rebuild-html.js +1 -1
- package/bin/commands/reset-password.js +1 -1
- package/bin/commands/search/reindex.js +1 -1
- package/bin/commands/setup.js +4 -2
- package/bin/commands/site/export.js +3 -0
- package/bin/commands/site/import.js +178 -91
- package/bin/commands/site/pull-media.js +3 -2
- package/bin/commands/site/snapshot/export.js +3 -1
- package/bin/commands/site/snapshot/import.js +3 -2
- package/bin/commands/start.js +44 -0
- package/bin/commands/telegram/register-webhooks.js +1 -1
- package/bin/commands/uploads/cleanup.js +48 -9
- package/bin/jant.js +39 -4
- package/bin/lib/import-sources.js +151 -0
- package/bin/lib/node-env.js +14 -9
- package/bin/lib/runtime-target.js +1 -1
- package/bin/lib/site-pull-media.js +56 -4
- package/bin/lib/site-snapshot.js +39 -2
- package/bin/lib/sql-export.js +66 -10
- package/dist/{app-DIVtyB4m.js → app-jQI4OPRe.js} +5055 -4448
- package/dist/client/.vite/manifest.json +38 -38
- package/dist/client/_assets/chunks/{create-editor-B-m7X7S5.js → create-editor-5Y49x7h5.js} +2 -2
- package/dist/client/_assets/chunks/{footnote-rail-CmeoVtnU.js → footnote-rail-BJwswtVQ.js} +1 -1
- package/dist/client/_assets/chunks/{settings-paths-C-ZZBTau.js → settings-paths-h6RjIe3C.js} +2 -2
- package/dist/client/_assets/chunks/{slug-format-BcIsNKz-.js → slug-format-Dsi0e9Xn.js} +1 -1
- package/dist/client/_assets/chunks/{slugify-373citbs.js → slugify-DlHLyUHS.js} +1 -1
- package/dist/client/_assets/chunks/sortable-list-DYMcJrlS.js +2 -0
- package/dist/client/_assets/chunks/unsafe-svg-DxrzM_Gb.js +2 -0
- package/dist/client/_assets/client-52vQhZAv.js +296 -0
- package/dist/client/_assets/client-BaqmpPQ-.css +2 -0
- package/dist/client/_assets/{client-auth-BpkkKTsV.js → client-auth-BDcCR6u1.js} +2 -2
- package/dist/client/_assets/client-author-CGVvrNZ8.css +2 -0
- package/dist/client/_assets/{client-compose-C-DXzcFR.js → client-compose-CzEwT5qX.js} +4 -4
- package/dist/client/_assets/{client-manage-BfT7ht4M.js → client-manage-CF7x21L4.js} +37 -37
- package/dist/client/_assets/{client-settings-CGR_nZ78.js → client-settings-DIM44Zqh.js} +2 -2
- package/dist/{url-CKlGzvdN.js → constants-DEgyqWDl.js} +340 -1
- package/dist/index.d.ts +44 -0
- package/dist/index.js +33 -1
- package/dist/node.js +57 -13
- package/package.json +13 -18
- package/src/__tests__/api-docs.test.ts +168 -1
- package/src/__tests__/bin/import-sources.test.ts +85 -0
- package/src/__tests__/bin/uploads-cleanup.test.ts +66 -26
- package/src/__tests__/cli-commands.test.ts +40 -0
- package/src/__tests__/config-docs.test.ts +119 -16
- package/src/__tests__/custom-url-redirects.test.ts +108 -0
- package/src/__tests__/export-collection-custom-urls.test.ts +69 -0
- package/src/__tests__/export-docs.test.ts +113 -41
- package/src/__tests__/export-feed-ids.test.ts +1 -0
- package/src/__tests__/export-format-version.test.ts +88 -0
- package/src/__tests__/export-hugo-build.test.ts +139 -4
- package/src/__tests__/export-import-roundtrip.test.ts +2 -1
- package/src/__tests__/export-service.test.ts +42 -13
- package/src/__tests__/export-smart-collection.test.ts +1 -1
- package/src/__tests__/feed-docs.test.ts +287 -21
- package/src/__tests__/feed-reply-addresses.test.ts +100 -0
- package/src/__tests__/feeds-disabled.test.ts +98 -0
- package/src/__tests__/fixtures/export-format/1.json +76 -0
- package/src/__tests__/fixtures/export-format/2.json +80 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/README.md +130 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/2thjq/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/2u5e5/_index.md +35 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/0x4nv/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/_index.md +44 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/faqyt/index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/the-potting-mix-guide-i-keep-rereading/index.md +20 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/5kayp/_index.md +23 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/5ynfs/_index.md +31 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/5ynfs/hu597/index.md +21 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/_index.md +5 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/a-night-heron-field-guide-for-my-walk-folder/_index.md +31 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/a-quiet-saturday-after-a-busy-week/_index.md +36 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/archive/_index.md +8 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/are-na-is-the-only-bookmark-pile-i-still-revisit/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/bought-too-many-lemons-again/_index.md +37 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/city-walks/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/cleanshot-for-screenshots-ocr-and-screen-recording-on-the-mac/_index.md +33 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/cleanshotmac-shang-de-jie-tu-ocr-lu-ping-gong-ju/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/co344/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/collections/_index.md +5 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/current-tea-rotation/_index.md +34 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/derek-sivers-still-writes-the-kind-of-internet-i-want-more-of/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/desk-but-better/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/e0kcg/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/egi3c/_index.md +24 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/evf9j/_index.md +152 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/featured/_index.md +8 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-basho/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-epictetus/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-marcus-aurelius/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-seneca/_index.md +26 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-thoreau/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/2cl6d/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/3zqv7/index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/5oxsv/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/_index.md +39 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gwob9/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/home-cooking/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/hz729/_index.md +24 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/inaturalist-ai-zi-ran-she-qu/_index.md +44 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/j4v0q/_index.md +35 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k278t/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k4eee/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/a-reading-log-idea-i-might-steal/index.md +20 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/a83qu/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/from-seneca-5hibo/index.md +21 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/kan-qi-lai-bi-jiao-ku-de-gong-si-men/_index.md +41 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/l2m7y/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/lan-ya-yao-kong-qi-chuang-shang-yue-du-de-fan-ye-shen-qi/_index.md +57 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/mynoise-for-rainy-afternoons/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/n09le/_index.md +23 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/ni-fu-jin-de-wei-ji-bai-ke-tiao-mu/_index.md +42 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/nts-archives-are-good-cleaning-music/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/c91j0/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/qyucy/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/wsgck/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/rain-makes-my-neighborhood-look-better/_index.md +46 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/reading-notes/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/s4r3e/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/serious-eats-on-tomato-and-egg-soup/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/_index.md +44 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/cxiu6/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/t77ms/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/the-soup-trick-i-always-forget/index.md +20 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/telk3/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/telk3/from-thoreau-pawt2/index.md +21 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/the-five-minute-reset-is-still-the-best-habit-i-have/_index.md +36 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/the-hallway-light-took-12-minutes-and-3-months/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/the-recurse-center-manual-is-weirdly-calming/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/tiny-projects/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/tong-wang-xing-fu-zhi-lu/_index.md +68 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/tou-ma-yan-jiang-ju-le-bu-chu-ti-yan/_index.md +62 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/useful-links/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/weekend-notes/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/what-i-actually-use-my-notebook-for/_index.md +52 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/data/jant.toml +124 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/hugo.toml +45 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/_redirects +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/40bc6cd1f12e-med_01kn8jtq3penf98tfq4gzmh9g9.png +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jtx8qenf98tm9ahxr48sw.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jv0jdenf98tp6qr9zgjjc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jv452enf98trbkwrvhvgd.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jvb16enf98txp7p0pf5ge.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jve5nenf98tzap11gpxzr.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jvq58enf98v538w5vsqp4.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jvsaeenf98v6ct4gjzppc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jw26cenf98vc7k0ppz5k8.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q1hme4e8cmby77dn66yy.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q2w7e4e8cmc20036yh66.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q7d2e4e8cmdeqjmyafby.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q887e4e8cmdjssych7yh.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167jx2f6ct88pkz45j3ycp-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167jx2f6ct88pkz45j3ycp.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167mbdf6ct88pr4ga1b9kf-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167mbdf6ct88pr4ga1b9kf.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167nsvf6ct88q1anhz4svb-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167nsvf6ct88q1anhz4svb.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167qaxf6ct88qfndwzxx83-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167qaxf6ct88qfndwzxx83.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167sm0f6ct88qw5brtsgcw.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167tf8f6ct88r169s51j49.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167vaaf6ct88rbx5ztenwb.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167w51f6ct88rp19pybkw1.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167x0nf6ct88rzajb84tw3.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167xxbf6ct88s5t2300bjk.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167yq5f6ct88s9pjwt5fxg.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167zg4f6ct88sge8jp28ja.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/themes/jant/static/apple-touch-icon.png +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/themes/jant/static/custom.css +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/themes/jant/static/favicon.ico +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/wrangler.jsonc +24 -0
- package/src/__tests__/fixtures/releases/0.10.0/snapshot/db.sql +322 -0
- package/src/__tests__/fixtures/releases/0.10.0/snapshot/meta.json +11 -0
- package/src/__tests__/helpers/app.ts +6 -1
- package/src/__tests__/helpers/export-fixtures.ts +1 -0
- package/src/__tests__/import-refused-aliases.test.ts +98 -0
- package/src/__tests__/import-site-command.test.ts +73 -8
- package/src/__tests__/public-types.test.ts +64 -0
- package/src/__tests__/release-fixtures.test.ts +79 -24
- package/src/__tests__/release-version.test.ts +84 -0
- package/src/__tests__/site-pull-media.test.ts +48 -0
- package/src/__tests__/snapshot-tables.test.ts +37 -0
- package/src/__tests__/sql-export.test.ts +21 -1
- package/src/__tests__/stored-file-headers.test.ts +94 -0
- package/src/__tests__/template-deploy-workflow.test.ts +101 -0
- package/src/__tests__/theme-docs.test.ts +113 -24
- package/src/__tests__/toolchain-versions.test.ts +54 -0
- package/src/__tests__/trailing-slash-redirect.test.ts +61 -0
- package/src/__tests__/vite-config-graph.test.ts +98 -0
- package/src/app.tsx +89 -66
- package/src/client/__tests__/compose-bridge-image-upload.test.ts +1 -0
- package/src/client/__tests__/compose-bridge.test.ts +87 -0
- package/src/client/__tests__/compose-shortcuts.test.ts +4 -4
- package/src/client/__tests__/footnote-rail.test.ts +1 -1
- package/src/client/__tests__/lazy-entries.test.ts +1 -1
- package/src/client/__tests__/media-scroll-hint.test.ts +2 -2
- package/src/client/avatar-upload.ts +10 -10
- package/src/client/components/__tests__/jant-compose-dialog.test.ts +295 -4
- package/src/client/components/__tests__/jant-compose-editor.test.ts +34 -0
- package/src/client/components/__tests__/jant-settings-general.test.ts +0 -32
- package/src/client/components/compose-types.ts +14 -0
- package/src/client/components/jant-compose-dialog.ts +96 -41
- package/src/client/components/jant-compose-editor.ts +21 -4
- package/src/client/components/jant-config-editor.ts +4 -6
- package/src/client/components/jant-media-lightbox.ts +4 -4
- package/src/client/components/jant-settings-general.ts +0 -4
- package/src/client/components/nav-manager-types.ts +6 -5
- package/src/client/compose-bridge.ts +15 -4
- package/src/client/compose-launch.ts +4 -6
- package/src/client/compose-shortcuts.ts +1 -1
- package/src/client/footnote-rail.ts +1 -1
- package/src/client/lazy-entries.ts +1 -1
- package/src/client/media-scroll-hint.ts +2 -2
- package/src/client/tiptap/__tests__/markdown-clipboard.test.ts +55 -0
- package/src/client/tiptap/markdown-clipboard.ts +50 -2
- package/src/client/upload-session.ts +7 -6
- package/src/db/__tests__/backfill-external-redirects.test.ts +59 -0
- package/src/db/__tests__/backfill-featured-discover.test.ts +56 -0
- package/src/db/backfills/0007_restore_external_redirect_scheme.sql +20 -0
- package/src/db/backfills/0008_turn_off_featured_only_discover.sql +11 -0
- package/src/i18n/locales/public/en.po +46 -48
- package/src/i18n/locales/public/en.ts +1 -1
- package/src/i18n/locales/public/zh-Hans.po +45 -46
- package/src/i18n/locales/public/zh-Hans.ts +1 -1
- package/src/i18n/locales/public/zh-Hant.po +45 -46
- package/src/i18n/locales/public/zh-Hant.ts +1 -1
- package/src/i18n/locales/settings/en.po +15 -29
- package/src/i18n/locales/settings/en.ts +1 -1
- package/src/i18n/locales/settings/zh-Hans.po +15 -29
- package/src/i18n/locales/settings/zh-Hans.ts +1 -1
- package/src/i18n/locales/settings/zh-Hant.po +15 -29
- package/src/i18n/locales/settings/zh-Hant.ts +1 -1
- package/src/index.ts +43 -2
- package/src/lib/__tests__/api-settings.test.ts +3 -3
- package/src/lib/__tests__/constants.test.ts +10 -0
- package/src/lib/__tests__/discover.test.ts +8 -9
- package/src/lib/__tests__/env-values.test.ts +125 -0
- package/src/lib/__tests__/feed-path.test.ts +29 -0
- package/src/lib/__tests__/feed.test.ts +50 -22
- package/src/lib/__tests__/filter-dimensions.test.ts +22 -8
- package/src/lib/__tests__/post-list-cursor.test.ts +0 -10
- package/src/lib/__tests__/rate-limit.test.ts +22 -7
- package/src/lib/__tests__/resolve-config.test.ts +5 -3
- package/src/lib/__tests__/schemas.test.ts +72 -23
- package/src/lib/__tests__/slugify.test.ts +9 -0
- package/src/lib/__tests__/startup-config.test.ts +12 -0
- package/src/lib/__tests__/storage-s3.test.ts +214 -0
- package/src/lib/__tests__/theme.test.ts +20 -1
- package/src/lib/__tests__/time.test.ts +56 -0
- package/src/lib/__tests__/timeline.test.ts +46 -0
- package/src/lib/__tests__/url-fetch.test.ts +65 -1
- package/src/lib/__tests__/url.test.ts +60 -1
- package/src/lib/api-nav-items.ts +16 -20
- package/src/lib/api-post-input.ts +34 -1
- package/src/lib/api-posts.ts +125 -23
- package/src/lib/api-public-posts.ts +28 -37
- package/src/lib/api-search.ts +49 -2
- package/src/lib/api-settings.ts +159 -54
- package/src/lib/api-threads.ts +34 -11
- package/src/lib/constants.ts +6 -0
- package/src/lib/discover.ts +7 -23
- package/src/lib/env-values.ts +140 -0
- package/src/lib/env.ts +203 -12
- package/src/lib/feed-path.ts +8 -2
- package/src/lib/feed-policy.ts +110 -7
- package/src/lib/feed.ts +69 -25
- package/src/lib/filter-dimensions.ts +17 -10
- package/src/lib/github-sync-site-config.ts +1 -0
- package/src/lib/hugo-markdown.ts +5 -6
- package/src/lib/navigation.ts +4 -1
- package/src/lib/post-list-cursor.ts +33 -29
- package/src/lib/public-storage.ts +43 -0
- package/src/lib/rate-limit.ts +31 -16
- package/src/lib/render.tsx +5 -0
- package/src/lib/resolve-config.ts +16 -19
- package/src/lib/schemas.ts +248 -180
- package/src/lib/slugify.ts +6 -1
- package/src/lib/sse.ts +1 -1
- package/src/lib/startup-config.ts +20 -1
- package/src/lib/theme.ts +8 -5
- package/src/lib/thread-fold.ts +6 -0
- package/src/lib/thread-query.ts +19 -24
- package/src/lib/time.ts +137 -17
- package/src/lib/timeline.ts +56 -13
- package/src/lib/url-fetch.ts +141 -40
- package/src/lib/url.ts +86 -1
- package/src/middleware/__tests__/auth.test.ts +27 -0
- package/src/middleware/__tests__/cors.test.ts +54 -0
- package/src/middleware/__tests__/cross-origin.test.ts +149 -0
- package/src/middleware/__tests__/public-content-access.test.ts +2 -42
- package/src/middleware/auth.ts +34 -3
- package/src/middleware/cors.ts +4 -4
- package/src/middleware/cross-origin.ts +124 -0
- package/src/middleware/error-handler.ts +7 -0
- package/src/middleware/public-content-access.ts +3 -26
- package/src/middleware/secure-headers.ts +8 -2
- package/src/node/__tests__/cli-migrate.test.ts +2 -2
- package/src/node/__tests__/cli-runtime-target.test.ts +13 -2
- package/src/node/__tests__/cli-site-snapshot.test.ts +57 -0
- package/src/node/__tests__/cli-snapshot-meta.test.ts +11 -1
- package/src/node/__tests__/cli-sql-export.test.ts +25 -1
- package/src/node/__tests__/cli-start.test.ts +66 -0
- package/src/node/__tests__/request-handler.test.ts +37 -0
- package/src/node/__tests__/runtime.test.ts +56 -1
- package/src/node/request-handler.ts +58 -5
- package/src/node/runtime.ts +37 -11
- package/src/preset.css +3 -3
- package/src/routes/__tests__/compose.test.ts +84 -0
- package/src/routes/api/__tests__/collections.test.ts +68 -0
- package/src/routes/api/__tests__/mcp.test.ts +164 -9
- package/src/routes/api/__tests__/media.test.ts +9 -1
- package/src/routes/api/__tests__/nav-items.test.ts +27 -1
- package/src/routes/api/__tests__/posts.test.ts +269 -78
- package/src/routes/api/__tests__/search.test.ts +17 -4
- package/src/routes/api/__tests__/settings.test.ts +119 -85
- package/src/routes/api/__tests__/telegram.test.ts +11 -6
- package/src/routes/api/__tests__/threads.test.ts +11 -0
- package/src/routes/api/__tests__/upload-response.test.ts +48 -0
- package/src/routes/api/__tests__/uploads.test.ts +35 -2
- package/src/routes/api/collections.ts +3 -3
- package/src/routes/api/custom-urls.ts +2 -1
- package/src/routes/api/export.ts +1 -0
- package/src/routes/api/internal/__tests__/post-body-html.test.ts +19 -0
- package/src/routes/api/internal/__tests__/uploads.test.ts +2 -0
- package/src/routes/api/internal/sites.ts +16 -4
- package/src/routes/api/mcp.ts +1 -0
- package/src/routes/api/media.ts +7 -8
- package/src/routes/api/nav-items.ts +2 -1
- package/src/routes/api/posts.ts +18 -24
- package/src/routes/api/public/__tests__/posts.test.ts +15 -0
- package/src/routes/api/public/__tests__/threads-collections.test.ts +12 -45
- package/src/routes/api/public/__tests__/threads.test.ts +41 -9
- package/src/routes/api/public/posts.ts +2 -2
- package/src/routes/api/public/threads.ts +16 -26
- package/src/routes/api/search.ts +7 -41
- package/src/routes/api/settings.ts +32 -28
- package/src/routes/api/smart-collections.ts +6 -1
- package/src/routes/api/threads.ts +25 -26
- package/src/routes/api/upload.ts +6 -21
- package/src/routes/api/uploads.ts +14 -20
- package/src/routes/auth/__tests__/dev.test.ts +16 -13
- package/src/routes/auth/__tests__/hosted-sso.test.ts +51 -0
- package/src/routes/auth/__tests__/setup-auth.test.ts +2 -0
- package/src/routes/auth/__tests__/setup-discover.test.ts +2 -0
- package/src/routes/auth/__tests__/setup-flow.test.ts +32 -0
- package/src/routes/auth/__tests__/setup-rate-limit.test.ts +72 -0
- package/src/routes/auth/__tests__/setup-steps.test.ts +2 -0
- package/src/routes/auth/__tests__/signin.test.ts +167 -2
- package/src/routes/auth/dev.ts +4 -6
- package/src/routes/auth/hosted-sso.ts +9 -6
- package/src/routes/auth/setup.tsx +35 -5
- package/src/routes/auth/signin.tsx +96 -1
- package/src/routes/compose.tsx +47 -47
- package/src/routes/dash/__tests__/settings-avatar.test.ts +59 -4
- package/src/routes/dash/__tests__/settings-demo-locks.test.ts +147 -0
- package/src/routes/dash/custom-urls.tsx +2 -0
- package/src/routes/dash/settings.tsx +79 -32
- package/src/routes/feed/__tests__/feed.test.ts +93 -3
- package/src/routes/feed/__tests__/sitemap.test.ts +42 -0
- package/src/routes/feed/feed.ts +128 -175
- package/src/routes/feed/sitemap.ts +9 -7
- package/src/routes/pages/__tests__/archive-years.test.ts +45 -0
- package/src/routes/pages/__tests__/collection-routing.test.ts +40 -0
- package/src/routes/pages/__tests__/collections.test.ts +3 -0
- package/src/routes/pages/__tests__/language-routing.test.ts +31 -0
- package/src/routes/pages/__tests__/post-page-round-trips.test.ts +34 -2
- package/src/routes/pages/__tests__/search.test.ts +5 -2
- package/src/routes/pages/__tests__/thread-gap.test.ts +207 -0
- package/src/routes/pages/archive.tsx +33 -94
- package/src/routes/pages/brand.tsx +1 -0
- package/src/routes/pages/collection.tsx +13 -84
- package/src/routes/pages/collections.tsx +2 -0
- package/src/routes/pages/featured.tsx +7 -2
- package/src/routes/pages/home.tsx +1 -0
- package/src/routes/pages/latest.tsx +6 -2
- package/src/routes/pages/new.tsx +1 -0
- package/src/routes/pages/page.tsx +73 -47
- package/src/routes/pages/search.tsx +5 -3
- package/src/routes/pages/smart-collection.tsx +11 -70
- package/src/routes/pages/subscribe.tsx +1 -0
- package/src/routes/pages/theme-sample.tsx +1 -0
- package/src/runtime/__tests__/readiness.test.ts +16 -0
- package/src/runtime/cloudflare.ts +2 -3
- package/src/runtime/index.ts +3 -1
- package/src/runtime/node.ts +3 -5
- package/src/runtime/readiness.ts +5 -0
- package/src/services/__tests__/auth.test.ts +115 -0
- package/src/services/__tests__/collection.test.ts +9 -0
- package/src/services/__tests__/github-sync-webhook.test.ts +78 -0
- package/src/services/__tests__/hosted-handoff.test.ts +208 -1
- package/src/services/__tests__/media.test.ts +47 -27
- package/src/services/__tests__/navigation.test.ts +67 -15
- package/src/services/__tests__/post.test.ts +103 -56
- package/src/services/__tests__/search.test.ts +38 -0
- package/src/services/__tests__/settings.test.ts +2 -14
- package/src/services/__tests__/smart-collection.test.ts +2 -2
- package/src/services/__tests__/telegram-ingest.test.ts +113 -0
- package/src/services/__tests__/thread.test.ts +26 -11
- package/src/services/auth.ts +36 -4
- package/src/services/collection.ts +46 -5
- package/src/services/custom-url.ts +11 -4
- package/src/services/export-theme/assets/client-site.css +1 -1
- package/src/services/export-theme/assets/client-site.js +2 -2
- package/src/services/export-theme/layouts/_default/baseof.html +1 -1
- package/src/services/export-theme/layouts/collection/single.html +1 -1
- package/src/services/export-theme/layouts/partials/featured-thread.html +8 -1
- package/src/services/export-theme/layouts/partials/head.html +1 -1
- package/src/services/export-theme/layouts/partials/media-gallery.html +6 -3
- package/src/services/export-theme/layouts/smart_collection/list.html +1 -1
- package/src/services/export-theme/styles/main.css +3 -3
- package/src/services/export.ts +68 -19
- package/src/services/github-sync.ts +10 -10
- package/src/services/hosted-handoff.ts +106 -6
- package/src/services/index.ts +3 -1
- package/src/services/language.ts +33 -0
- package/src/services/mcp.ts +176 -438
- package/src/services/media.ts +69 -21
- package/src/services/navigation.ts +19 -4
- package/src/services/path.ts +45 -3
- package/src/services/post.ts +329 -214
- package/src/services/search.ts +22 -3
- package/src/services/settings.ts +36 -3
- package/src/services/site-admin.ts +1 -0
- package/src/services/smart-collection.ts +10 -3
- package/src/services/telegram.ts +23 -6
- package/src/services/thread.ts +11 -3
- package/src/services/upload-session.ts +14 -15
- package/src/styles/components.css +2 -2
- package/src/styles/site-media.css +2 -2
- package/src/styles/tokens.css +19 -22
- package/src/styles/ui-author.css +73 -94
- package/src/styles/ui.css +62 -62
- package/src/types/app-context.ts +5 -1
- package/src/types/bindings.ts +11 -0
- package/src/types/config.ts +4 -4
- package/src/types/constants.ts +20 -0
- package/src/types/props.ts +34 -8
- package/src/types/views.ts +28 -13
- package/src/ui/color-themes.ts +6 -5
- package/src/ui/dash/settings/GeneralContent.tsx +0 -22
- package/src/ui/dash/settings/__tests__/GeneralContent.test.tsx +0 -21
- package/src/ui/feed/CuratedThreadPreview.tsx +7 -2
- package/src/ui/feed/LinkCard.tsx +1 -2
- package/src/ui/feed/NoteCard.tsx +1 -2
- package/src/ui/feed/QuoteCard.tsx +2 -2
- package/src/ui/feed/ThreadPreview.tsx +6 -6
- package/src/ui/feed/TimelineFeed.tsx +1 -7
- package/src/ui/feed/__tests__/thread-preview.test.ts +123 -10
- package/src/ui/feed/__tests__/timeline-cards.test.ts +18 -1
- package/src/ui/layouts/BaseLayout.tsx +5 -0
- package/src/ui/pages/ArchivePage.tsx +1 -1
- package/src/ui/pages/BrandPage.tsx +1 -1
- package/src/ui/pages/CollectionPage.tsx +0 -1
- package/src/ui/pages/CollectionsPage.tsx +2 -2
- package/src/ui/pages/ComposePage.tsx +1 -1
- package/src/ui/pages/FeaturedPage.tsx +1 -1
- package/src/ui/pages/HomePage.tsx +1 -1
- package/src/ui/pages/PostPage.tsx +1 -1
- package/src/ui/pages/SearchPage.tsx +1 -1
- package/src/ui/pages/SmartCollectionPage.tsx +2 -3
- package/src/ui/pages/SubscribePage.tsx +1 -1
- package/src/ui/pages/ThemeSamplePage.tsx +1 -1
- package/src/ui/shared/MediaGallery.tsx +1 -1
- package/src/vendor/datastar.js +9 -1956
- package/src/vendor/datastar.js.map +4 -4
- package/dist/client/_assets/chunks/sortable-list-BJyd-LXE.js +0 -2
- package/dist/client/_assets/chunks/unsafe-svg-DU_DNMy5.js +0 -2
- package/dist/client/_assets/client-D4AT9Iqr.js +0 -295
- package/dist/client/_assets/client-DRuw7XCt.css +0 -2
- package/dist/client/_assets/client-author-DQ8R-8KR.css +0 -2
|
@@ -41,6 +41,7 @@ import {
|
|
|
41
41
|
PUBLIC_ARCHIVE_VISIBILITIES,
|
|
42
42
|
} from "../types/constants.js";
|
|
43
43
|
import { ID_PREFIX, isTypeId } from "./ids.js";
|
|
44
|
+
import { startOfMonthIn } from "./time.js";
|
|
44
45
|
import type { PostFilters } from "../services/post.js";
|
|
45
46
|
|
|
46
47
|
type Translator = Pick<I18n, "_">;
|
|
@@ -179,6 +180,12 @@ export interface DimensionContext {
|
|
|
179
180
|
yearAxis?: YearAxis;
|
|
180
181
|
}
|
|
181
182
|
|
|
183
|
+
/** What turning a selection into `PostFilters` needs beyond the dimensions. */
|
|
184
|
+
export interface PostFilterContext extends DimensionContext {
|
|
185
|
+
/** The site's time zone: a `year` is a calendar year on its wall clock. */
|
|
186
|
+
timeZone: string;
|
|
187
|
+
}
|
|
188
|
+
|
|
182
189
|
// =============================================================================
|
|
183
190
|
// URL parsing
|
|
184
191
|
// =============================================================================
|
|
@@ -323,7 +330,7 @@ interface Dimension<K extends FilterDimensionKey> {
|
|
|
323
330
|
/** This value's slice of a `PostFilters`. */
|
|
324
331
|
toPostFilter(
|
|
325
332
|
value: FilterDimensionValues[K],
|
|
326
|
-
ctx:
|
|
333
|
+
ctx: PostFilterContext,
|
|
327
334
|
): Partial<PostFilters>;
|
|
328
335
|
/**
|
|
329
336
|
* How this value reads to a reader, on its own.
|
|
@@ -643,8 +650,8 @@ const YEAR_DIMENSION: Dimension<"year"> = {
|
|
|
643
650
|
if (!raw) return { state: "absent" };
|
|
644
651
|
const year = Number.parseInt(raw, 10);
|
|
645
652
|
// Bounded at both ends, and the ceiling is the load-bearing one:
|
|
646
|
-
// `toPostFilter` turns a year into `Date.UTC
|
|
647
|
-
// year 275760. A NaN bound is a comparison every row fails, so the page
|
|
653
|
+
// `toPostFilter` turns a year into `Date.UTC`-based bounds, which go `NaN`
|
|
654
|
+
// past year 275760. A NaN bound is a comparison every row fails, so the page
|
|
648
655
|
// would render empty with nothing to say why.
|
|
649
656
|
if (
|
|
650
657
|
!Number.isFinite(year) ||
|
|
@@ -681,8 +688,8 @@ const YEAR_DIMENSION: Dimension<"year"> = {
|
|
|
681
688
|
},
|
|
682
689
|
control: { kind: "year" },
|
|
683
690
|
toPostFilter(value, ctx) {
|
|
684
|
-
const after =
|
|
685
|
-
const before =
|
|
691
|
+
const after = startOfMonthIn(value, 1, ctx.timeZone);
|
|
692
|
+
const before = startOfMonthIn(value + 1, 1, ctx.timeZone);
|
|
686
693
|
// `PostFilters` has no year field: a year is a pair of timestamp bounds on
|
|
687
694
|
// whichever column the caller is treating as the timeline.
|
|
688
695
|
return ctx.yearAxis === "sort"
|
|
@@ -1267,15 +1274,15 @@ function spellDimension<K extends FilterDimensionKey>(
|
|
|
1267
1274
|
* and inside an aggregate count.
|
|
1268
1275
|
*
|
|
1269
1276
|
* @param selection - Dimensions the reader chose
|
|
1270
|
-
* @param ctx - Collection vocabulary and
|
|
1277
|
+
* @param ctx - Collection vocabulary, year axis, and the site's time zone
|
|
1271
1278
|
* @returns The matching `PostFilters` slice
|
|
1272
1279
|
* @example
|
|
1273
|
-
* toPostFilters({ format: "quote", media: "any" }, {});
|
|
1280
|
+
* toPostFilters({ format: "quote", media: "any" }, { timeZone: "UTC" });
|
|
1274
1281
|
* // { format: "quote", hasMedia: true }
|
|
1275
1282
|
*/
|
|
1276
1283
|
export function toPostFilters(
|
|
1277
1284
|
selection: PostFilterSelection,
|
|
1278
|
-
ctx:
|
|
1285
|
+
ctx: PostFilterContext,
|
|
1279
1286
|
): Partial<PostFilters> {
|
|
1280
1287
|
let filters: Partial<PostFilters> = {};
|
|
1281
1288
|
for (const key of FILTER_DIMENSION_KEYS) {
|
|
@@ -1289,11 +1296,11 @@ export function toPostFilters(
|
|
|
1289
1296
|
function filterFor<K extends FilterDimensionKey>(
|
|
1290
1297
|
key: K,
|
|
1291
1298
|
value: FilterDimensionValues[K],
|
|
1292
|
-
ctx:
|
|
1299
|
+
ctx: PostFilterContext,
|
|
1293
1300
|
): Partial<PostFilters> {
|
|
1294
1301
|
const toFilter = FILTER_DIMENSIONS[key].toPostFilter as unknown as (
|
|
1295
1302
|
value: FilterDimensionValues[K],
|
|
1296
|
-
ctx:
|
|
1303
|
+
ctx: PostFilterContext,
|
|
1297
1304
|
) => Partial<PostFilters>;
|
|
1298
1305
|
return toFilter(value, ctx);
|
|
1299
1306
|
}
|
|
@@ -36,6 +36,7 @@ export async function buildSyncSiteConfig(c: {
|
|
|
36
36
|
rssFeedsEnabled: appConfig.rssFeedsEnabled,
|
|
37
37
|
mainRssFeed: appConfig.mainRssFeed,
|
|
38
38
|
archiveDefaultLayout: appConfig.archiveDefaultLayout,
|
|
39
|
+
timeZone: appConfig.timeZone,
|
|
39
40
|
siteFooter: appConfig.siteFooter,
|
|
40
41
|
showHeaderAvatar: appConfig.showHeaderAvatar,
|
|
41
42
|
siteAvatarUrl: appConfig.siteAvatarUrl,
|
package/src/lib/hugo-markdown.ts
CHANGED
|
@@ -61,9 +61,9 @@ export interface HugoSmartCollectionSelection {
|
|
|
61
61
|
* provider has a reachable public URL and we link rather than re-
|
|
62
62
|
* bundle the bytes.
|
|
63
63
|
*
|
|
64
|
-
* `poster` follows the same rule for video poster frames.
|
|
65
|
-
*
|
|
66
|
-
*
|
|
64
|
+
* `poster` follows the same rule for video poster frames. Where the bytes
|
|
65
|
+
* are stored is the source site's business, so no storage key travels; an
|
|
66
|
+
* import uploads each file afresh.
|
|
67
67
|
*/
|
|
68
68
|
export interface JantMedia {
|
|
69
69
|
id: string;
|
|
@@ -82,9 +82,6 @@ export interface JantMedia {
|
|
|
82
82
|
waveform?: string;
|
|
83
83
|
summary?: string;
|
|
84
84
|
chars?: number;
|
|
85
|
-
provider?: string;
|
|
86
|
-
storage_key?: string;
|
|
87
|
-
poster_key?: string;
|
|
88
85
|
[key: string]: unknown;
|
|
89
86
|
}
|
|
90
87
|
|
|
@@ -121,6 +118,8 @@ export interface HugoFrontMatter {
|
|
|
121
118
|
|
|
122
119
|
// Hugo routing
|
|
123
120
|
aliases?: string[];
|
|
121
|
+
/** A Collection's or Smart Collection's description, as its author wrote it. */
|
|
122
|
+
description?: string;
|
|
124
123
|
/**
|
|
125
124
|
* Published root bundles only: the `<id>` Jant's feeds gave the Thread's
|
|
126
125
|
* entry — its permalink, absolute, with no trailing slash. The theme's feed
|
package/src/lib/navigation.ts
CHANGED
|
@@ -167,7 +167,10 @@ export async function getNavigationData(
|
|
|
167
167
|
}
|
|
168
168
|
const collectionFreshness =
|
|
169
169
|
collectionNavIds.length > 0
|
|
170
|
-
? await c.var.services.navItems.getCollectionFreshness(collectionNavIds
|
|
170
|
+
? await c.var.services.navItems.getCollectionFreshness(collectionNavIds, {
|
|
171
|
+
status: "published",
|
|
172
|
+
excludePrivate: !isAuthenticated,
|
|
173
|
+
})
|
|
171
174
|
: undefined;
|
|
172
175
|
|
|
173
176
|
const basePath = `${appConfig.sitePathPrefix}${langBase}`;
|
|
@@ -14,9 +14,7 @@
|
|
|
14
14
|
* position on an axis they may already read; the values are never looked up.
|
|
15
15
|
* Filters stay out: a position on the sort axis is valid under any filter.
|
|
16
16
|
*
|
|
17
|
-
* Callers treat the string as opaque.
|
|
18
|
-
* the bare post TypeID earlier releases returned; see
|
|
19
|
-
* {@link isLegacyPostListCursor}.
|
|
17
|
+
* Callers treat the string as opaque.
|
|
20
18
|
*/
|
|
21
19
|
|
|
22
20
|
import { ValidationError } from "./errors.js";
|
|
@@ -41,13 +39,6 @@ const VERSION_MESSAGE =
|
|
|
41
39
|
const MODE_MESSAGE =
|
|
42
40
|
"This cursor is from a list in a different order. Leave cursor out to start from the first page.";
|
|
43
41
|
|
|
44
|
-
/**
|
|
45
|
-
* A legacy cursor naming a Post that is gone, or that the caller can't see.
|
|
46
|
-
* One message for both, so a cursor can't be used to probe for private Posts.
|
|
47
|
-
*/
|
|
48
|
-
export const MISSING_LEGACY_CURSOR_MESSAGE =
|
|
49
|
-
"This cursor names a post that can't be found. Leave cursor out to start from the first page.";
|
|
50
|
-
|
|
51
42
|
/** What one position of the key tuple holds. */
|
|
52
43
|
export type PostListCursorKeyKind = "number" | "id";
|
|
53
44
|
|
|
@@ -127,6 +118,38 @@ export function encodePostListCursor(
|
|
|
127
118
|
return encodeBase64Url(JSON.stringify(payload));
|
|
128
119
|
}
|
|
129
120
|
|
|
121
|
+
/**
|
|
122
|
+
* The sort mode a cursor into one Thread's Posts records. Distinct from every
|
|
123
|
+
* list and collection mode, so a position in one never resumes another.
|
|
124
|
+
*/
|
|
125
|
+
export const THREAD_POSTS_SORT_MODE = "thread";
|
|
126
|
+
|
|
127
|
+
/**
|
|
128
|
+
* A cursor into a Thread's Posts that starts right after `post`.
|
|
129
|
+
*
|
|
130
|
+
* Thread order is the root first, then replies by creation time, then ID —
|
|
131
|
+
* the tuple `PostService.listThreadPostsPage` sorts by, so this is the
|
|
132
|
+
* `nextCursor` a page ending at `post` would carry.
|
|
133
|
+
*
|
|
134
|
+
* @param post - A Post in the Thread
|
|
135
|
+
* @returns The opaque cursor
|
|
136
|
+
* @example
|
|
137
|
+
* ```ts
|
|
138
|
+
* encodeThreadPostsCursorAfter(lastLeadingReply);
|
|
139
|
+
* ```
|
|
140
|
+
*/
|
|
141
|
+
export function encodeThreadPostsCursorAfter(post: {
|
|
142
|
+
id: string;
|
|
143
|
+
replyToId: string | null;
|
|
144
|
+
createdAt: number;
|
|
145
|
+
}): string {
|
|
146
|
+
return encodePostListCursor(THREAD_POSTS_SORT_MODE, [
|
|
147
|
+
post.replyToId === null ? 0 : 1,
|
|
148
|
+
post.createdAt,
|
|
149
|
+
post.id,
|
|
150
|
+
]);
|
|
151
|
+
}
|
|
152
|
+
|
|
130
153
|
/**
|
|
131
154
|
* Decode a cursor for the current request, strictly.
|
|
132
155
|
*
|
|
@@ -196,22 +219,3 @@ export function decodePostListCursor(
|
|
|
196
219
|
}
|
|
197
220
|
return tuple;
|
|
198
221
|
}
|
|
199
|
-
|
|
200
|
-
/**
|
|
201
|
-
* Whether a cursor is the bare post TypeID that releases before the opaque
|
|
202
|
-
* format returned as `nextCursor`.
|
|
203
|
-
*
|
|
204
|
-
* Accepted indefinitely — a stored cursor, or one a client built from a post
|
|
205
|
-
* ID, must keep resuming. An encoded cursor can never look like one: it opens
|
|
206
|
-
* with the base64url of `{"`, never with `pst_`.
|
|
207
|
-
*
|
|
208
|
-
* @param raw - The `cursor` the caller sent
|
|
209
|
-
* @returns Whether to resolve it as a post ID
|
|
210
|
-
* @example
|
|
211
|
-
* ```ts
|
|
212
|
-
* isLegacyPostListCursor("pst_01jpyx3m7gw4w3h7m4bknq0v1d"); // => true
|
|
213
|
-
* ```
|
|
214
|
-
*/
|
|
215
|
-
export function isLegacyPostListCursor(raw: string): boolean {
|
|
216
|
-
return isTypeId(raw, ID_PREFIX.post);
|
|
217
|
-
}
|
|
@@ -60,3 +60,46 @@ export function isPublicStorageKeyAllowed(
|
|
|
60
60
|
storageKey.startsWith(`sites/${siteId}/${segment}/`),
|
|
61
61
|
);
|
|
62
62
|
}
|
|
63
|
+
|
|
64
|
+
/**
|
|
65
|
+
* Whether a request path is one the public storage proxy answers.
|
|
66
|
+
*
|
|
67
|
+
* @param path - Request path, without the site path prefix
|
|
68
|
+
* @returns `true` for `/media/*` and the older `/sites/*` layout
|
|
69
|
+
*
|
|
70
|
+
* @example
|
|
71
|
+
* ```ts
|
|
72
|
+
* isPublicStoragePath("/media/sit_1/files/med_1.webp"); // true
|
|
73
|
+
* isPublicStoragePath("/about"); // false
|
|
74
|
+
* ```
|
|
75
|
+
*/
|
|
76
|
+
export function isPublicStoragePath(path: string): boolean {
|
|
77
|
+
return path.startsWith("/media/") || path.startsWith("/sites/");
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
/**
|
|
81
|
+
* The Content-Security-Policy a stored file is served with when opened.
|
|
82
|
+
*
|
|
83
|
+
* Every stored file runs sandboxed with nothing allowed but inline styles,
|
|
84
|
+
* which image and video viewers use for their own layout. PDFs are the
|
|
85
|
+
* exception: a sandboxed PDF won't open in Chrome's viewer, and that viewer
|
|
86
|
+
* runs isolated from the page already.
|
|
87
|
+
*
|
|
88
|
+
* @param contentType - The stored file's MIME type
|
|
89
|
+
* @returns The policy, or `null` when the file is served without one
|
|
90
|
+
*
|
|
91
|
+
* @example
|
|
92
|
+
* ```ts
|
|
93
|
+
* getStoredFileContentSecurityPolicy("text/html");
|
|
94
|
+
* // "default-src 'none'; style-src 'unsafe-inline'; sandbox"
|
|
95
|
+
* getStoredFileContentSecurityPolicy("application/pdf"); // null
|
|
96
|
+
* ```
|
|
97
|
+
*/
|
|
98
|
+
export function getStoredFileContentSecurityPolicy(
|
|
99
|
+
contentType: string,
|
|
100
|
+
): string | null {
|
|
101
|
+
if (contentType.split(";")[0]?.trim().toLowerCase() === "application/pdf") {
|
|
102
|
+
return null;
|
|
103
|
+
}
|
|
104
|
+
return "default-src 'none'; style-src 'unsafe-inline'; sandbox";
|
|
105
|
+
}
|
package/src/lib/rate-limit.ts
CHANGED
|
@@ -47,24 +47,33 @@ export interface RateLimiter {
|
|
|
47
47
|
/**
|
|
48
48
|
* Extracts the client IP from a Hono request context.
|
|
49
49
|
*
|
|
50
|
-
* On Cloudflare Workers, `cf-connecting-ip` is set by the edge and
|
|
51
|
-
*
|
|
52
|
-
* `
|
|
53
|
-
*
|
|
54
|
-
*
|
|
55
|
-
*
|
|
50
|
+
* On Cloudflare Workers, `cf-connecting-ip` is set by the edge and a client
|
|
51
|
+
* can't forge it. On Node, the request handler has already pinned both
|
|
52
|
+
* headers (see `withClientAddress` in `node/request-handler.ts`): without
|
|
53
|
+
* `TRUST_PROXY` they hold the socket's address, and behind a trusted proxy
|
|
54
|
+
* they hold what the proxy set. The last `x-forwarded-for` entry is the one
|
|
55
|
+
* the nearest proxy added; earlier entries are whatever the client sent. When
|
|
56
|
+
* neither header is available we return `"unknown"` so all such requests
|
|
57
|
+
* share a bucket, which beats skipping the rate limit entirely.
|
|
56
58
|
*
|
|
57
|
-
*
|
|
58
|
-
*
|
|
59
|
-
*
|
|
59
|
+
* @param c - Hono context
|
|
60
|
+
* @returns The client's IP address, or `"unknown"`
|
|
61
|
+
*
|
|
62
|
+
* @example
|
|
63
|
+
* ```ts
|
|
64
|
+
* // X-Forwarded-For: 198.51.100.1, 203.0.113.7
|
|
65
|
+
* getClientIp(c); // "203.0.113.7"
|
|
66
|
+
* ```
|
|
60
67
|
*/
|
|
61
|
-
export function getClientIp(c:
|
|
68
|
+
export function getClientIp(c: {
|
|
69
|
+
req: { header(name: string): string | undefined };
|
|
70
|
+
}): string {
|
|
62
71
|
const cf = c.req.header("cf-connecting-ip");
|
|
63
72
|
if (cf) return cf;
|
|
64
73
|
const fwd = c.req.header("x-forwarded-for");
|
|
65
74
|
if (fwd) {
|
|
66
|
-
const
|
|
67
|
-
if (
|
|
75
|
+
const last = fwd.split(",").at(-1)?.trim();
|
|
76
|
+
if (last) return last;
|
|
68
77
|
}
|
|
69
78
|
return "unknown";
|
|
70
79
|
}
|
|
@@ -76,6 +85,11 @@ export interface RequestRateLimitOptions extends RateLimitCheckOptions {
|
|
|
76
85
|
* different surfaces independent when they share a storage backend.
|
|
77
86
|
*/
|
|
78
87
|
name: string;
|
|
88
|
+
/**
|
|
89
|
+
* What the bucket belongs to, such as the email address a sign-in names.
|
|
90
|
+
* Defaults to the client IP (see {@link getClientIp}).
|
|
91
|
+
*/
|
|
92
|
+
key?: string;
|
|
79
93
|
}
|
|
80
94
|
|
|
81
95
|
/** Whether a request is under its limit, and how long to wait when it isn't. */
|
|
@@ -86,8 +100,9 @@ export type RequestRateLimitResult =
|
|
|
86
100
|
* Counts this request against its client's bucket and reports whether it is
|
|
87
101
|
* under the limit.
|
|
88
102
|
*
|
|
89
|
-
* Buckets are per client IP (see {@link getClientIp})
|
|
90
|
-
*
|
|
103
|
+
* Buckets are per client IP (see {@link getClientIp}), or per `key` when one
|
|
104
|
+
* is given, and scoped by `name`.
|
|
105
|
+
* When `appConfig.rateLimit.enabled` is off, nothing is counted and every
|
|
91
106
|
* request passes, so test and dev environments don't have to reason about
|
|
92
107
|
* bucket state. The caller decides what an over-limit response looks like:
|
|
93
108
|
* a page and an API answer differently.
|
|
@@ -110,10 +125,10 @@ export async function checkRequestRateLimit(
|
|
|
110
125
|
c: RateLimitContext,
|
|
111
126
|
opts: RequestRateLimitOptions,
|
|
112
127
|
): Promise<RequestRateLimitResult> {
|
|
113
|
-
if (c.var.appConfig.rateLimit.
|
|
128
|
+
if (!c.var.appConfig.rateLimit.enabled) return { ok: true };
|
|
114
129
|
|
|
115
130
|
const result = await c.var.rateLimiter.check(
|
|
116
|
-
`${opts.name}:${getClientIp(c)}`,
|
|
131
|
+
`${opts.name}:${opts.key ?? getClientIp(c)}`,
|
|
117
132
|
{ limit: opts.limit, windowSec: opts.windowSec },
|
|
118
133
|
);
|
|
119
134
|
if (result.ok) return { ok: true };
|
package/src/lib/render.tsx
CHANGED
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
import type { Context } from "hono";
|
|
9
9
|
import type { Child } from "hono/jsx";
|
|
10
10
|
import type { SiteLayoutProps } from "../types.js";
|
|
11
|
+
import type { PageName } from "../types/constants.js";
|
|
11
12
|
import { SETTINGS_KEYS } from "./constants.js";
|
|
12
13
|
import {
|
|
13
14
|
BaseLayout,
|
|
@@ -27,6 +28,8 @@ import {
|
|
|
27
28
|
export interface RenderPublicPageOptions {
|
|
28
29
|
/** Page title for <title> tag */
|
|
29
30
|
title: string;
|
|
31
|
+
/** Which page this is, written to `<body data-page>` for themes. */
|
|
32
|
+
page: PageName;
|
|
30
33
|
/** Page description for meta tag */
|
|
31
34
|
description?: string;
|
|
32
35
|
/** Optional explicit favicon asset href */
|
|
@@ -125,6 +128,7 @@ export interface RenderPublicPageOptions {
|
|
|
125
128
|
export function renderPublicPage(c: Context, options: RenderPublicPageOptions) {
|
|
126
129
|
const {
|
|
127
130
|
title,
|
|
131
|
+
page,
|
|
128
132
|
description,
|
|
129
133
|
faviconHref,
|
|
130
134
|
appleTouchHref,
|
|
@@ -195,6 +199,7 @@ export function renderPublicPage(c: Context, options: RenderPublicPageOptions) {
|
|
|
195
199
|
return c.html(
|
|
196
200
|
<BaseLayout
|
|
197
201
|
title={title}
|
|
202
|
+
page={page}
|
|
198
203
|
description={metaDescription}
|
|
199
204
|
c={c}
|
|
200
205
|
faviconHref={faviconHref}
|
|
@@ -21,7 +21,10 @@ import {
|
|
|
21
21
|
getConfiguredStorageDriver,
|
|
22
22
|
getDiscoverDefault,
|
|
23
23
|
getEnvString,
|
|
24
|
+
readEnvBoolean,
|
|
25
|
+
readEnvInteger,
|
|
24
26
|
} from "./env.js";
|
|
27
|
+
import { readConfigEnvValue } from "./env-values.js";
|
|
25
28
|
import { parseLanguageList } from "../i18n/locales.js";
|
|
26
29
|
import { getPublicUrlForProvider, getMediaUrl, getImageUrl } from "./image.js";
|
|
27
30
|
import { normalizeTimeZone } from "./timezones.js";
|
|
@@ -96,7 +99,6 @@ function resolve(
|
|
|
96
99
|
): string {
|
|
97
100
|
const field = CONFIG_FIELDS[key as keyof typeof CONFIG_FIELDS];
|
|
98
101
|
if (!field) return "";
|
|
99
|
-
const envKeys = "envKeys" in field ? field.envKeys : undefined;
|
|
100
102
|
|
|
101
103
|
// User-configurable: DB > ENV > Default
|
|
102
104
|
if (!field.envOnly && Object.hasOwn(allSettings, key)) {
|
|
@@ -107,7 +109,7 @@ function resolve(
|
|
|
107
109
|
}
|
|
108
110
|
|
|
109
111
|
// ENV > Default
|
|
110
|
-
const envValue =
|
|
112
|
+
const envValue = readConfigEnvValue(env, key as keyof typeof CONFIG_FIELDS);
|
|
111
113
|
if (envValue) return envValue;
|
|
112
114
|
|
|
113
115
|
if (field.defaultValue) return field.defaultValue;
|
|
@@ -129,9 +131,8 @@ function resolve(
|
|
|
129
131
|
function resolveFallback(key: string, env: Bindings): string {
|
|
130
132
|
const field = CONFIG_FIELDS[key as keyof typeof CONFIG_FIELDS];
|
|
131
133
|
if (!field) return "";
|
|
132
|
-
const envKeys = "envKeys" in field ? field.envKeys : undefined;
|
|
133
134
|
|
|
134
|
-
const envValue =
|
|
135
|
+
const envValue = readConfigEnvValue(env, key as keyof typeof CONFIG_FIELDS);
|
|
135
136
|
if (envValue) return envValue;
|
|
136
137
|
|
|
137
138
|
if (field.defaultValue) return field.defaultValue;
|
|
@@ -151,10 +152,15 @@ type RuntimeNumberConfigKey =
|
|
|
151
152
|
| "RSS_FEED_LIMIT"
|
|
152
153
|
| "RSS_PUBLISH_DELAY_SECONDS";
|
|
153
154
|
|
|
155
|
+
/**
|
|
156
|
+
* A numeric setting's value, or `fallback` when it isn't a whole number in
|
|
157
|
+
* the setting's range. `fallback` defaults to the registry's default, so a
|
|
158
|
+
* value the site can't use runs as the value `GET /api/settings` reports.
|
|
159
|
+
*/
|
|
154
160
|
function parseConfigInt(
|
|
155
161
|
key: RuntimeNumberConfigKey,
|
|
156
162
|
value: string,
|
|
157
|
-
fallback
|
|
163
|
+
fallback = Number(CONFIG_FIELDS[key].defaultValue),
|
|
158
164
|
): number {
|
|
159
165
|
const normalized = value.trim();
|
|
160
166
|
const parsed = Number(normalized);
|
|
@@ -193,12 +199,10 @@ export function resolveSummaryConfig(
|
|
|
193
199
|
maxParagraphs: parseConfigInt(
|
|
194
200
|
"SUMMARY_MAX_PARAGRAPHS",
|
|
195
201
|
resolve("SUMMARY_MAX_PARAGRAPHS", allSettings, env),
|
|
196
|
-
5,
|
|
197
202
|
),
|
|
198
203
|
maxChars: parseConfigInt(
|
|
199
204
|
"SUMMARY_MAX_CHARS",
|
|
200
205
|
resolve("SUMMARY_MAX_CHARS", allSettings, env),
|
|
201
|
-
500,
|
|
202
206
|
),
|
|
203
207
|
};
|
|
204
208
|
}
|
|
@@ -238,7 +242,6 @@ export function resolveConfig(
|
|
|
238
242
|
const pageSize = parseConfigInt(
|
|
239
243
|
"PAGE_SIZE",
|
|
240
244
|
resolve("PAGE_SIZE", allSettings, env),
|
|
241
|
-
50,
|
|
242
245
|
);
|
|
243
246
|
const searchPageSize = parseConfigInt(
|
|
244
247
|
"SEARCH_PAGE_SIZE",
|
|
@@ -260,7 +263,7 @@ export function resolveConfig(
|
|
|
260
263
|
const s3PublicUrl = getEnvString(env, "S3_PUBLIC_URL") || "";
|
|
261
264
|
const localPublicUrl = getEnvString(env, "LOCAL_PUBLIC_URL") || "";
|
|
262
265
|
const imageTransformUrl = getEnvString(env, "IMAGE_TRANSFORM_URL") || "";
|
|
263
|
-
const demoMode =
|
|
266
|
+
const demoMode = readEnvBoolean(env, "DEMO_MODE") ?? false;
|
|
264
267
|
|
|
265
268
|
// Resolve avatar URL from storage key
|
|
266
269
|
const siteAvatar = allSettings["SITE_AVATAR"] ?? "";
|
|
@@ -363,16 +366,14 @@ export function resolveConfig(
|
|
|
363
366
|
imageTransformUrl,
|
|
364
367
|
|
|
365
368
|
// Upload (ENV only)
|
|
366
|
-
uploadMaxFileSize:
|
|
367
|
-
parseInt(getEnvString(env, "UPLOAD_MAX_FILE_SIZE_MB") ?? "1024", 10) ||
|
|
368
|
-
1024,
|
|
369
|
+
uploadMaxFileSize: readEnvInteger(env, "UPLOAD_MAX_FILE_SIZE_MB") ?? 1024,
|
|
369
370
|
|
|
370
371
|
// Summary extraction (DB > ENV > Default)
|
|
371
372
|
summaryMaxParagraphs: summaryConfig.maxParagraphs,
|
|
372
373
|
summaryMaxChars: summaryConfig.maxChars,
|
|
373
374
|
|
|
374
375
|
// Slug (ENV only)
|
|
375
|
-
slugIdLength:
|
|
376
|
+
slugIdLength: readEnvInteger(env, "SLUG_ID_LENGTH") ?? 5,
|
|
376
377
|
|
|
377
378
|
// Pagination/feed (DB > ENV > Default)
|
|
378
379
|
pageSize,
|
|
@@ -381,12 +382,10 @@ export function resolveConfig(
|
|
|
381
382
|
rssFeedLimit: parseConfigInt(
|
|
382
383
|
"RSS_FEED_LIMIT",
|
|
383
384
|
resolve("RSS_FEED_LIMIT", allSettings, env),
|
|
384
|
-
50,
|
|
385
385
|
),
|
|
386
386
|
rssPublishDelaySeconds: parseConfigInt(
|
|
387
387
|
"RSS_PUBLISH_DELAY_SECONDS",
|
|
388
388
|
resolve("RSS_PUBLISH_DELAY_SECONDS", allSettings, env),
|
|
389
|
-
300,
|
|
390
389
|
),
|
|
391
390
|
|
|
392
391
|
// Demo (ENV only)
|
|
@@ -428,10 +427,8 @@ export function resolveConfig(
|
|
|
428
427
|
// Rate limiting (ENV only). Defaults are conservative enough for a
|
|
429
428
|
// human typing in the search UI but reject bot floods.
|
|
430
429
|
rateLimit: {
|
|
431
|
-
|
|
432
|
-
searchPerMinute:
|
|
433
|
-
parseInt(getEnvString(env, "RATE_LIMIT_SEARCH_PER_MIN") ?? "30", 10) ||
|
|
434
|
-
30,
|
|
430
|
+
enabled: readEnvBoolean(env, "RATE_LIMIT_ENABLED") ?? true,
|
|
431
|
+
searchPerMinute: readEnvInteger(env, "RATE_LIMIT_SEARCH_PER_MIN") ?? 30,
|
|
435
432
|
},
|
|
436
433
|
|
|
437
434
|
// Settings form placeholders (ENV > Default, without DB)
|