@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
package/src/services/export.ts
CHANGED
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
* filled in by Commit 5.
|
|
20
20
|
*/
|
|
21
21
|
|
|
22
|
-
import type { PostService } from "./post.js";
|
|
22
|
+
import type { PostFilters, PostService } from "./post.js";
|
|
23
23
|
import type { PathService } from "./path.js";
|
|
24
24
|
import type { CollectionService } from "./collection.js";
|
|
25
25
|
import type { MediaService } from "./media.js";
|
|
@@ -90,7 +90,11 @@ import LAYOUT_RSS from "./export-theme/layouts/_default/rss.xml?raw";
|
|
|
90
90
|
import PARTIAL_FEED_POST_CONTENT from "./export-theme/layouts/partials/feed-post-content.xml?raw";
|
|
91
91
|
|
|
92
92
|
import { suggestSyncRepoName } from "../lib/github-sync-repo-name.js";
|
|
93
|
-
import {
|
|
93
|
+
import {
|
|
94
|
+
getPostPath,
|
|
95
|
+
redirectTargetHref,
|
|
96
|
+
toAbsoluteSiteUrl,
|
|
97
|
+
} from "../lib/url.js";
|
|
94
98
|
import type { StorageDriver } from "../lib/storage.js";
|
|
95
99
|
import { base64ToUint8Array } from "../lib/favicon.js";
|
|
96
100
|
import { makeZip } from "client-zip";
|
|
@@ -107,12 +111,14 @@ import {
|
|
|
107
111
|
} from "../types.js";
|
|
108
112
|
|
|
109
113
|
/**
|
|
110
|
-
* Format version written to `data/jant.toml` as `version`. Raise it
|
|
111
|
-
*
|
|
112
|
-
* importer refuses a version newer than its
|
|
113
|
-
*
|
|
114
|
+
* Format version written to `data/jant.toml` as `version`. Raise it whenever
|
|
115
|
+
* `jant site import` starts reading a field, or a value of one, that it didn't
|
|
116
|
+
* before: an older importer refuses a version newer than its
|
|
117
|
+
* `SUPPORTED_SITE_EXPORT_VERSION` (kept equal to this by a test) instead of
|
|
118
|
+
* importing the export and silently dropping what it doesn't know.
|
|
119
|
+
* `export-format-version.test.ts` freezes the fields each version reads.
|
|
114
120
|
*/
|
|
115
|
-
export const SITE_EXPORT_FORMAT_VERSION =
|
|
121
|
+
export const SITE_EXPORT_FORMAT_VERSION = 2;
|
|
116
122
|
|
|
117
123
|
/** A file of the exported Hugo site whose text or bytes the export holds. */
|
|
118
124
|
export interface ExportContentFile {
|
|
@@ -201,6 +207,8 @@ export interface SiteConfig {
|
|
|
201
207
|
mainRssFeed: string;
|
|
202
208
|
/** "list" or "grid" — the layout the exported archive page opens with. */
|
|
203
209
|
archiveDefaultLayout: string;
|
|
210
|
+
/** IANA time zone the site dates posts in. */
|
|
211
|
+
timeZone: string;
|
|
204
212
|
siteFooter: string;
|
|
205
213
|
showHeaderAvatar: boolean;
|
|
206
214
|
siteAvatarUrl: string;
|
|
@@ -343,6 +351,35 @@ function buildDefaultAppleTouchAsset(): Pick<
|
|
|
343
351
|
};
|
|
344
352
|
}
|
|
345
353
|
|
|
354
|
+
/** Posts read per query while an export walks the site. */
|
|
355
|
+
const EXPORT_POST_PAGE_SIZE = 500;
|
|
356
|
+
|
|
357
|
+
/**
|
|
358
|
+
* Every post the filters match, however many there are. An export used to
|
|
359
|
+
* ask for the first 10,000 and stop there without a word, dropping the rest
|
|
360
|
+
* of a large site, replies included.
|
|
361
|
+
*
|
|
362
|
+
* @param posts - The post service
|
|
363
|
+
* @param filters - What to list
|
|
364
|
+
* @returns All matching posts, in the list order
|
|
365
|
+
*/
|
|
366
|
+
async function listEveryPost(
|
|
367
|
+
posts: PostService,
|
|
368
|
+
filters: Omit<PostFilters, "limit" | "offset">,
|
|
369
|
+
): Promise<Post[]> {
|
|
370
|
+
const all: Post[] = [];
|
|
371
|
+
let cursor: string | undefined;
|
|
372
|
+
do {
|
|
373
|
+
const page = await posts.listPage(filters, {
|
|
374
|
+
cursor,
|
|
375
|
+
limit: EXPORT_POST_PAGE_SIZE,
|
|
376
|
+
});
|
|
377
|
+
all.push(...page.posts);
|
|
378
|
+
cursor = page.nextCursor ?? undefined;
|
|
379
|
+
} while (cursor);
|
|
380
|
+
return all;
|
|
381
|
+
}
|
|
382
|
+
|
|
346
383
|
export function createExportService(
|
|
347
384
|
services: {
|
|
348
385
|
posts: PostService;
|
|
@@ -378,15 +415,17 @@ export function createExportService(
|
|
|
378
415
|
? // The export builds a public static site, so it sees what a
|
|
379
416
|
// signed-out reader sees. Language narrowing is not applied: the
|
|
380
417
|
// export walks every language itself.
|
|
381
|
-
services.collections.listDirectoryData({
|
|
418
|
+
services.collections.listDirectoryData({
|
|
419
|
+
isAuthenticated: false,
|
|
420
|
+
timeZone: siteConfig.timeZone,
|
|
421
|
+
})
|
|
382
422
|
: Promise.resolve(null);
|
|
383
423
|
|
|
384
424
|
// 1. Query all data
|
|
385
425
|
const [allPosts, allCollections, collectionDirectoryData] =
|
|
386
426
|
await Promise.all([
|
|
387
|
-
services.posts
|
|
427
|
+
listEveryPost(services.posts, {
|
|
388
428
|
excludeReplies: false,
|
|
389
|
-
limit: 10000,
|
|
390
429
|
}),
|
|
391
430
|
services.collections.list(),
|
|
392
431
|
collectionDirectoryDataPromise,
|
|
@@ -532,7 +571,11 @@ export function createExportService(
|
|
|
532
571
|
exportFiles.push(...bundleFiles);
|
|
533
572
|
}
|
|
534
573
|
|
|
535
|
-
// Collection landing pages (`content/{slug}/_index.md`)
|
|
574
|
+
// Collection landing pages (`content/{slug}/_index.md`), with the
|
|
575
|
+
// custom URLs that name them.
|
|
576
|
+
const collectionAliases = await services.paths.getCollectionAliases(
|
|
577
|
+
allCollections.map((c) => c.id),
|
|
578
|
+
);
|
|
536
579
|
for (const collection of allCollections) {
|
|
537
580
|
const slug = collectionSlugMap.get(collection.id) ?? collection.slug;
|
|
538
581
|
const entryCount =
|
|
@@ -544,6 +587,7 @@ export function createExportService(
|
|
|
544
587
|
slug,
|
|
545
588
|
entryCount,
|
|
546
589
|
siteConfig.rssFeedsEnabled,
|
|
590
|
+
collectionAliases.get(collection.id) ?? [],
|
|
547
591
|
),
|
|
548
592
|
});
|
|
549
593
|
}
|
|
@@ -1047,8 +1091,6 @@ function buildMediaEmission(
|
|
|
1047
1091
|
if (media.durationSeconds !== null && media.durationSeconds !== undefined) {
|
|
1048
1092
|
entry.duration_seconds = media.durationSeconds;
|
|
1049
1093
|
}
|
|
1050
|
-
entry.provider = media.provider;
|
|
1051
|
-
entry.storage_key = media.storageKey;
|
|
1052
1094
|
|
|
1053
1095
|
let inlinePosterPath: string | null = null;
|
|
1054
1096
|
if (media.posterKey) {
|
|
@@ -1057,7 +1099,6 @@ function buildMediaEmission(
|
|
|
1057
1099
|
entry.poster = hasRemoteUrl
|
|
1058
1100
|
? getMediaUrl(media.posterKey, mediaBaseUrl)
|
|
1059
1101
|
: `/media/${posterLocalName}`;
|
|
1060
|
-
entry.poster_key = media.posterKey;
|
|
1061
1102
|
if (!hasRemoteUrl) {
|
|
1062
1103
|
inlinePosterPath = `static/media/${posterLocalName}`;
|
|
1063
1104
|
}
|
|
@@ -1395,12 +1436,16 @@ async function buildCollectionSection(
|
|
|
1395
1436
|
slug: string,
|
|
1396
1437
|
entryCount: number,
|
|
1397
1438
|
rssFeedsEnabled: boolean,
|
|
1439
|
+
aliases: string[],
|
|
1398
1440
|
): Promise<string> {
|
|
1399
1441
|
const frontMatter: HugoFrontMatter = {
|
|
1400
1442
|
title: collection.title,
|
|
1401
1443
|
slug,
|
|
1402
1444
|
type: "collection",
|
|
1403
|
-
|
|
1445
|
+
// Custom URLs for this Collection. Hugo writes a redirect page for each;
|
|
1446
|
+
// an import registers them again.
|
|
1447
|
+
aliases: aliases.length > 0 ? aliases : undefined,
|
|
1448
|
+
description: collection.description ?? undefined,
|
|
1404
1449
|
sort_order: collection.sortOrder,
|
|
1405
1450
|
entry_count: entryCount,
|
|
1406
1451
|
// Opt into Atom output at /{slug}/index.xml.
|
|
@@ -1441,7 +1486,7 @@ async function buildSmartCollectionSection(
|
|
|
1441
1486
|
title: smartCollection.title,
|
|
1442
1487
|
slug: smartCollection.slug,
|
|
1443
1488
|
type: "smart_collection",
|
|
1444
|
-
|
|
1489
|
+
description: smartCollection.description ?? undefined,
|
|
1445
1490
|
sort_order: smartCollection.sort,
|
|
1446
1491
|
display_layout: smartCollection.layout ?? undefined,
|
|
1447
1492
|
selection,
|
|
@@ -1943,6 +1988,7 @@ function buildJantDataToml(
|
|
|
1943
1988
|
`multilingual_enabled = ${config.multilingualEnabled}`,
|
|
1944
1989
|
`additional_languages = "${escapeTomlString(config.additionalLanguages.join(","))}"`,
|
|
1945
1990
|
`main_rss_feed = "${escapeTomlString(config.mainRssFeed)}"`,
|
|
1991
|
+
`time_zone = "${escapeTomlString(config.timeZone)}"`,
|
|
1946
1992
|
`archive_default_layout = "${escapeTomlString(config.archiveDefaultLayout)}"`,
|
|
1947
1993
|
`public_api_enabled = ${config.publicApiEnabled}`,
|
|
1948
1994
|
`rss_feeds_enabled = ${config.rssFeedsEnabled}`,
|
|
@@ -2061,10 +2107,13 @@ function buildJantDataToml(
|
|
|
2061
2107
|
for (const record of targets.standalonePaths) {
|
|
2062
2108
|
parts.push("");
|
|
2063
2109
|
parts.push("[[custom_url]]");
|
|
2064
|
-
|
|
2110
|
+
// Every path in an export starts with a slash, as the API gives them.
|
|
2111
|
+
parts.push(`path = "/${escapeTomlString(record.path)}"`);
|
|
2065
2112
|
parts.push(`kind = "${escapeTomlString(record.kind)}"`);
|
|
2066
2113
|
if (record.kind === "redirect" && record.redirectToPath) {
|
|
2067
|
-
parts.push(
|
|
2114
|
+
parts.push(
|
|
2115
|
+
`to = "${escapeTomlString(redirectTargetHref(record.redirectToPath))}"`,
|
|
2116
|
+
);
|
|
2068
2117
|
parts.push(`status = ${record.redirectType ?? 301}`);
|
|
2069
2118
|
}
|
|
2070
2119
|
if (record.kind === "archive" && record.archiveQuery) {
|
|
@@ -2092,7 +2141,7 @@ function buildCustomUrlRedirects(
|
|
|
2092
2141
|
(record) =>
|
|
2093
2142
|
[
|
|
2094
2143
|
`/${record.path}`,
|
|
2095
|
-
|
|
2144
|
+
redirectTargetHref(record.redirectToPath as string),
|
|
2096
2145
|
record.redirectType ?? 301,
|
|
2097
2146
|
] as const,
|
|
2098
2147
|
);
|
|
@@ -40,6 +40,7 @@ import {
|
|
|
40
40
|
type SiteConfig,
|
|
41
41
|
} from "./export.js";
|
|
42
42
|
import type { PostService } from "./post.js";
|
|
43
|
+
import type { UpdatePost } from "../types.js";
|
|
43
44
|
import type { PathService } from "./path.js";
|
|
44
45
|
import type { CollectionService } from "./collection.js";
|
|
45
46
|
import type { MediaService } from "./media.js";
|
|
@@ -704,17 +705,16 @@ export function createGitHubSyncService(
|
|
|
704
705
|
? markdownToTiptapJson(trimmedBody)
|
|
705
706
|
: null;
|
|
706
707
|
|
|
707
|
-
|
|
708
|
+
// A quote keeps its source's name and URL in `title` and `url`,
|
|
709
|
+
// which is where the API's `sourceName` and `sourceUrl` go too.
|
|
710
|
+
const isQuote = existingPost.format === "quote";
|
|
711
|
+
const title = isQuote ? frontMatter.source_name : frontMatter.title;
|
|
712
|
+
const url = isQuote ? frontMatter.source_url : frontMatter.link_url;
|
|
713
|
+
|
|
714
|
+
const updateData: UpdatePost = {};
|
|
708
715
|
if (tiptapBody !== null) updateData.body = tiptapBody;
|
|
709
|
-
if (
|
|
710
|
-
|
|
711
|
-
if (frontMatter.link_url !== undefined) {
|
|
712
|
-
updateData.url = frontMatter.link_url;
|
|
713
|
-
}
|
|
714
|
-
if (frontMatter.source_name !== undefined)
|
|
715
|
-
updateData.sourceName = frontMatter.source_name;
|
|
716
|
-
if (frontMatter.source_url !== undefined)
|
|
717
|
-
updateData.sourceUrl = frontMatter.source_url;
|
|
716
|
+
if (title !== undefined) updateData.title = title;
|
|
717
|
+
if (url !== undefined) updateData.url = url;
|
|
718
718
|
if (frontMatter.quote_text !== undefined) {
|
|
719
719
|
updateData.quoteText = frontMatter.quote_text;
|
|
720
720
|
}
|
|
@@ -9,6 +9,7 @@ import {
|
|
|
9
9
|
ConflictError,
|
|
10
10
|
DomainError,
|
|
11
11
|
ExternalServiceError,
|
|
12
|
+
ForbiddenError,
|
|
12
13
|
NotFoundError,
|
|
13
14
|
UnauthorizedError,
|
|
14
15
|
} from "../lib/errors.js";
|
|
@@ -21,15 +22,45 @@ import { createSiteMemberService } from "./site-member.js";
|
|
|
21
22
|
export interface HostedHandoffSession {
|
|
22
23
|
sessionToken: string;
|
|
23
24
|
userId: string;
|
|
25
|
+
/** Whether the browser's existing session was kept instead of a new one. */
|
|
26
|
+
reused: boolean;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
/**
|
|
30
|
+
* The browser a sign-in link was opened in.
|
|
31
|
+
*
|
|
32
|
+
* better-auth records the device on a session from the request of the auth
|
|
33
|
+
* endpoint that creates it. The handoff creates its session outside any such
|
|
34
|
+
* endpoint, so it has nothing to read them from, and every session it made
|
|
35
|
+
* showed as "Unknown device". The route passes them in instead.
|
|
36
|
+
*/
|
|
37
|
+
export interface HostedHandoffClient {
|
|
38
|
+
/** The `User-Agent` header, which the Sessions page turns into a device name. */
|
|
39
|
+
userAgent: string;
|
|
40
|
+
/** The client address, or `""` when none was reported. */
|
|
41
|
+
ipAddress: string;
|
|
42
|
+
/** The session token the browser already carries for this site, if any. */
|
|
43
|
+
sessionToken?: string | null;
|
|
24
44
|
}
|
|
25
45
|
|
|
26
46
|
export interface HostedHandoffService {
|
|
27
47
|
completeFromSignedToken(input: {
|
|
28
48
|
currentSiteId: string;
|
|
29
49
|
token: string;
|
|
50
|
+
client: HostedHandoffClient;
|
|
30
51
|
}): Promise<HostedHandoffSession>;
|
|
31
52
|
}
|
|
32
53
|
|
|
54
|
+
async function sha256Hex(value: string): Promise<string> {
|
|
55
|
+
const digest = await crypto.subtle.digest(
|
|
56
|
+
"SHA-256",
|
|
57
|
+
new TextEncoder().encode(value),
|
|
58
|
+
);
|
|
59
|
+
return Array.from(new Uint8Array(digest), (byte) =>
|
|
60
|
+
byte.toString(16).padStart(2, "0"),
|
|
61
|
+
).join("");
|
|
62
|
+
}
|
|
63
|
+
|
|
33
64
|
function getDisplayName(claims: HostedSsoClaims): string {
|
|
34
65
|
const name = claims.name?.trim();
|
|
35
66
|
return name && name.length > 0 ? name : claims.email;
|
|
@@ -82,7 +113,34 @@ export function createHostedHandoffService(
|
|
|
82
113
|
);
|
|
83
114
|
}
|
|
84
115
|
|
|
116
|
+
// Core has one level of access: every member can do everything the
|
|
117
|
+
// owner can. Until roles mean something here, an admin or editor
|
|
118
|
+
// signing in would get the owner's powers, so only the owner may.
|
|
119
|
+
if (claims.role !== "owner") {
|
|
120
|
+
throw new ForbiddenError(
|
|
121
|
+
`Only the site's owner can sign in to it for now. Ask the owner in ${providerLabel}.`,
|
|
122
|
+
);
|
|
123
|
+
}
|
|
124
|
+
|
|
85
125
|
const authContext = await auth.$context;
|
|
126
|
+
|
|
127
|
+
// A sign-in link travels in a URL, so it can land in a log or a
|
|
128
|
+
// history entry. It signs in once, then counts as expired: the reader
|
|
129
|
+
// gets the same page, with the way back to the provider. The record
|
|
130
|
+
// expires with the link.
|
|
131
|
+
const usedIdentifier = `hosted-sso:${await sha256Hex(input.token)}`;
|
|
132
|
+
if (
|
|
133
|
+
await authContext.internalAdapter.findVerificationValue(usedIdentifier)
|
|
134
|
+
) {
|
|
135
|
+
throw new UnauthorizedError(
|
|
136
|
+
`This sign-in link has expired. Return to ${providerLabel} and try again.`,
|
|
137
|
+
);
|
|
138
|
+
}
|
|
139
|
+
await authContext.internalAdapter.createVerificationValue({
|
|
140
|
+
identifier: usedIdentifier,
|
|
141
|
+
value: claims.sub,
|
|
142
|
+
expiresAt: new Date(claims.exp * 1000),
|
|
143
|
+
});
|
|
86
144
|
const linkedAccount = await db
|
|
87
145
|
.select({ userId: account.userId })
|
|
88
146
|
.from(account)
|
|
@@ -144,12 +202,17 @@ export function createHostedHandoffService(
|
|
|
144
202
|
});
|
|
145
203
|
}
|
|
146
204
|
} else {
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
205
|
+
// The control plane vouched for this identity, the same way an
|
|
206
|
+
// OAuth provider would, and the account below carries its ID.
|
|
207
|
+
user = await authContext.internalAdapter.createUser(
|
|
208
|
+
{
|
|
209
|
+
email: claims.email,
|
|
210
|
+
emailVerified: true,
|
|
211
|
+
name: getDisplayName(claims),
|
|
212
|
+
role: "member",
|
|
213
|
+
},
|
|
214
|
+
{ method: "oauth", oauth: { providerId: "jant-cloud" } },
|
|
215
|
+
);
|
|
153
216
|
|
|
154
217
|
await authContext.internalAdapter.createAccount({
|
|
155
218
|
accountId: claims.sub,
|
|
@@ -167,9 +230,45 @@ export function createHostedHandoffService(
|
|
|
167
230
|
|
|
168
231
|
await siteMembers.ensure(input.currentSiteId, user.id, claims.role);
|
|
169
232
|
|
|
233
|
+
const { client } = input;
|
|
234
|
+
const device = {
|
|
235
|
+
userAgent: client.userAgent,
|
|
236
|
+
ipAddress: client.ipAddress,
|
|
237
|
+
};
|
|
238
|
+
|
|
239
|
+
// Opening the site from the provider again, in a browser already signed
|
|
240
|
+
// in as the same person, keeps that browser's session. Every open used to
|
|
241
|
+
// mint another one, and the Sessions page filled up with the same
|
|
242
|
+
// browser. The row is read from the database rather than taken from the
|
|
243
|
+
// request's session, which better-auth may answer from a cookie cache for
|
|
244
|
+
// minutes after the session was revoked.
|
|
245
|
+
const existing = client.sessionToken
|
|
246
|
+
? await authContext.internalAdapter.findSession(client.sessionToken)
|
|
247
|
+
: null;
|
|
248
|
+
if (
|
|
249
|
+
existing &&
|
|
250
|
+
existing.session.userId === user.id &&
|
|
251
|
+
new Date(existing.session.expiresAt).getTime() > Date.now()
|
|
252
|
+
) {
|
|
253
|
+
// A session made before the handoff recorded devices has none; this
|
|
254
|
+
// browser is the one holding it, so it can say what it is.
|
|
255
|
+
if (!existing.session.userAgent && device.userAgent) {
|
|
256
|
+
await authContext.internalAdapter.updateSession(
|
|
257
|
+
existing.session.token,
|
|
258
|
+
device,
|
|
259
|
+
);
|
|
260
|
+
}
|
|
261
|
+
return {
|
|
262
|
+
sessionToken: existing.session.token,
|
|
263
|
+
userId: user.id,
|
|
264
|
+
reused: true,
|
|
265
|
+
};
|
|
266
|
+
}
|
|
267
|
+
|
|
170
268
|
const session = await authContext.internalAdapter.createSession(
|
|
171
269
|
user.id,
|
|
172
270
|
false,
|
|
271
|
+
device,
|
|
173
272
|
);
|
|
174
273
|
if (!session) {
|
|
175
274
|
throw new ExternalServiceError("Failed to create a site session.");
|
|
@@ -178,6 +277,7 @@ export function createHostedHandoffService(
|
|
|
178
277
|
return {
|
|
179
278
|
sessionToken: session.token,
|
|
180
279
|
userId: user.id,
|
|
280
|
+
reused: false,
|
|
181
281
|
};
|
|
182
282
|
},
|
|
183
283
|
};
|
package/src/services/index.ts
CHANGED
|
@@ -157,6 +157,8 @@ export function createServices(
|
|
|
157
157
|
{
|
|
158
158
|
databaseDialect: dialect,
|
|
159
159
|
authSecret: config?.authSecret,
|
|
160
|
+
siteId,
|
|
161
|
+
siteResolutionMode: config?.siteResolutionMode,
|
|
160
162
|
},
|
|
161
163
|
databaseSchema,
|
|
162
164
|
),
|
|
@@ -208,7 +210,7 @@ export type {
|
|
|
208
210
|
SmartCollectionService,
|
|
209
211
|
SmartCollectionViewer,
|
|
210
212
|
} from "./smart-collection.js";
|
|
211
|
-
export type { MediaService,
|
|
213
|
+
export type { MediaService, MediaListPage } from "./media.js";
|
|
212
214
|
export type { UploadSessionService } from "./upload-session.js";
|
|
213
215
|
export type { CollectionService } from "./collection.js";
|
|
214
216
|
export type { SearchService, SearchResult, SearchOptions } from "./search.js";
|
package/src/services/language.ts
CHANGED
|
@@ -113,6 +113,23 @@ export interface LanguageService {
|
|
|
113
113
|
* @throws {ConflictError} When posts still use the language
|
|
114
114
|
*/
|
|
115
115
|
removeLanguage(language: string): Promise<{ multilingualDisabled: boolean }>;
|
|
116
|
+
/**
|
|
117
|
+
* Bring back the languages a site export recorded, into a site whose
|
|
118
|
+
* primary language is already set.
|
|
119
|
+
*
|
|
120
|
+
* Each language passes the checks adding it would, and multilingual
|
|
121
|
+
* content is turned on only when the export had it on and names a second
|
|
122
|
+
* language, as {@link enable} requires.
|
|
123
|
+
*
|
|
124
|
+
* @param input - The additional languages, and whether multilingual
|
|
125
|
+
* content was on
|
|
126
|
+
* @throws {ValidationError} When a language tag is malformed
|
|
127
|
+
* @throws {ConflictError} When a language prefix collides with a stored path
|
|
128
|
+
*/
|
|
129
|
+
restore(input: {
|
|
130
|
+
additional: readonly string[];
|
|
131
|
+
enabled: boolean;
|
|
132
|
+
}): Promise<void>;
|
|
116
133
|
}
|
|
117
134
|
|
|
118
135
|
export interface LanguageServiceDeps {
|
|
@@ -335,6 +352,22 @@ export function createLanguageService(
|
|
|
335
352
|
await settings.remove("MULTILINGUAL_ENABLED");
|
|
336
353
|
},
|
|
337
354
|
|
|
355
|
+
async restore(input) {
|
|
356
|
+
const { primary } = await readState();
|
|
357
|
+
const additional = normalizeAdditional(input.additional, primary);
|
|
358
|
+
for (const language of additional) {
|
|
359
|
+
await assertPrefixAvailable(language);
|
|
360
|
+
}
|
|
361
|
+
|
|
362
|
+
await writeLanguages(primary, additional);
|
|
363
|
+
if (input.enabled && additional.length > 0) {
|
|
364
|
+
await settings.set("MULTILINGUAL_ENABLED", "true");
|
|
365
|
+
await posts.materializeMissingLanguage(primary);
|
|
366
|
+
} else {
|
|
367
|
+
await settings.remove("MULTILINGUAL_ENABLED");
|
|
368
|
+
}
|
|
369
|
+
},
|
|
370
|
+
|
|
338
371
|
async setPrimary(language) {
|
|
339
372
|
const next = requireValidLanguage(language);
|
|
340
373
|
const state = await readState();
|