@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
|
@@ -294,6 +294,7 @@ describe("CollectionService", () => {
|
|
|
294
294
|
// A stranger who could subtract the directory's number from the
|
|
295
295
|
// collection page's would learn how much unpublished work is in here.
|
|
296
296
|
const anonymous = await collectionService.listDirectoryData({
|
|
297
|
+
timeZone: "UTC",
|
|
297
298
|
isAuthenticated: false,
|
|
298
299
|
});
|
|
299
300
|
expect(anonymous.collections[0]?.threadCount).toBe(1);
|
|
@@ -302,6 +303,7 @@ describe("CollectionService", () => {
|
|
|
302
303
|
);
|
|
303
304
|
|
|
304
305
|
const author = await collectionService.listDirectoryData({
|
|
306
|
+
timeZone: "UTC",
|
|
305
307
|
isAuthenticated: true,
|
|
306
308
|
});
|
|
307
309
|
expect(author.collections[0]?.threadCount).toBe(2);
|
|
@@ -324,6 +326,7 @@ describe("CollectionService", () => {
|
|
|
324
326
|
await collectionService.addThread(reading.id, root.id);
|
|
325
327
|
|
|
326
328
|
const directory = await collectionService.listDirectoryData({
|
|
329
|
+
timeZone: "UTC",
|
|
327
330
|
isAuthenticated: false,
|
|
328
331
|
});
|
|
329
332
|
expect(directory.collections[0]?.threadCount).toBe(1);
|
|
@@ -349,6 +352,7 @@ describe("CollectionService", () => {
|
|
|
349
352
|
}
|
|
350
353
|
|
|
351
354
|
const englishView = await collectionService.listDirectoryData({
|
|
355
|
+
timeZone: "UTC",
|
|
352
356
|
isAuthenticated: false,
|
|
353
357
|
lang: "en",
|
|
354
358
|
});
|
|
@@ -356,6 +360,7 @@ describe("CollectionService", () => {
|
|
|
356
360
|
|
|
357
361
|
// The row itself stays listed in every view — only its number narrows.
|
|
358
362
|
const japaneseView = await collectionService.listDirectoryData({
|
|
363
|
+
timeZone: "UTC",
|
|
359
364
|
isAuthenticated: false,
|
|
360
365
|
lang: "ja",
|
|
361
366
|
});
|
|
@@ -380,6 +385,7 @@ describe("CollectionService", () => {
|
|
|
380
385
|
await collectionService.addThread(reading.id, post.id);
|
|
381
386
|
|
|
382
387
|
const directory = await collectionService.listDirectoryData({
|
|
388
|
+
timeZone: "UTC",
|
|
383
389
|
isAuthenticated: false,
|
|
384
390
|
});
|
|
385
391
|
|
|
@@ -428,6 +434,7 @@ describe("CollectionService", () => {
|
|
|
428
434
|
await postService.update(root.id, { bodyMarkdown: "after" });
|
|
429
435
|
|
|
430
436
|
const directory = await collectionService.listDirectoryData({
|
|
437
|
+
timeZone: "UTC",
|
|
431
438
|
isAuthenticated: false,
|
|
432
439
|
});
|
|
433
440
|
expect(directory.collections[0]?.recentActivityAt).toBe(1704067200);
|
|
@@ -458,6 +465,7 @@ describe("CollectionService", () => {
|
|
|
458
465
|
});
|
|
459
466
|
|
|
460
467
|
const directory = await collectionService.listDirectoryData({
|
|
468
|
+
timeZone: "UTC",
|
|
461
469
|
isAuthenticated: false,
|
|
462
470
|
});
|
|
463
471
|
expect(directory.collections[0]?.recentActivityAt).toBe(1704067260);
|
|
@@ -474,6 +482,7 @@ describe("CollectionService", () => {
|
|
|
474
482
|
});
|
|
475
483
|
|
|
476
484
|
const directory = await collectionService.listDirectoryData({
|
|
485
|
+
timeZone: "UTC",
|
|
477
486
|
isAuthenticated: false,
|
|
478
487
|
});
|
|
479
488
|
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A push to the synced repository edits the matching post. A quote keeps its
|
|
3
|
+
* source's name and URL in `title` and `url`, so the webhook has to put
|
|
4
|
+
* `source_name` and `source_url` there; it used to pass them under names the
|
|
5
|
+
* post service ignores, and edits to a quote's source never reached Jant.
|
|
6
|
+
*/
|
|
7
|
+
|
|
8
|
+
import { afterEach, describe, expect, it, vi } from "vitest";
|
|
9
|
+
import { createTestApp } from "../../__tests__/helpers/app.js";
|
|
10
|
+
import { makeSiteConfig } from "../../__tests__/helpers/export-fixtures.js";
|
|
11
|
+
import { DEFAULT_TEST_SITE_ID } from "../../__tests__/helpers/db.js";
|
|
12
|
+
import { createGitHubSyncService } from "../github-sync.js";
|
|
13
|
+
|
|
14
|
+
function toBase64(text: string): string {
|
|
15
|
+
return btoa(unescape(encodeURIComponent(text)));
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
afterEach(() => {
|
|
19
|
+
vi.unstubAllGlobals();
|
|
20
|
+
});
|
|
21
|
+
|
|
22
|
+
describe("GitHub Sync webhook", () => {
|
|
23
|
+
it("puts a quote's edited source name and URL where a quote keeps them", async () => {
|
|
24
|
+
const { services } = createTestApp();
|
|
25
|
+
const quote = await services.posts.create({
|
|
26
|
+
format: "quote",
|
|
27
|
+
quoteText: "Less is more.",
|
|
28
|
+
title: "Old Source",
|
|
29
|
+
url: "https://old.example/",
|
|
30
|
+
status: "published",
|
|
31
|
+
});
|
|
32
|
+
await services.settings.set("GITHUB_SYNC_ENABLED", "true");
|
|
33
|
+
await services.settings.set("GITHUB_SYNC_REPO", "owner/site");
|
|
34
|
+
await services.settings.set("GITHUB_SYNC_TOKEN", "token");
|
|
35
|
+
|
|
36
|
+
const file = [
|
|
37
|
+
"---",
|
|
38
|
+
`slug: ${quote.slug}`,
|
|
39
|
+
"format: quote",
|
|
40
|
+
"source_name: New Source",
|
|
41
|
+
"source_url: https://new.example/",
|
|
42
|
+
"quote_text: Less is more.",
|
|
43
|
+
"---",
|
|
44
|
+
"",
|
|
45
|
+
].join("\n");
|
|
46
|
+
vi.stubGlobal(
|
|
47
|
+
"fetch",
|
|
48
|
+
vi.fn(async () =>
|
|
49
|
+
Response.json({
|
|
50
|
+
sha: "abc",
|
|
51
|
+
content: toBase64(file),
|
|
52
|
+
encoding: "base64",
|
|
53
|
+
}),
|
|
54
|
+
),
|
|
55
|
+
);
|
|
56
|
+
|
|
57
|
+
const sync = createGitHubSyncService(
|
|
58
|
+
services,
|
|
59
|
+
DEFAULT_TEST_SITE_ID,
|
|
60
|
+
makeSiteConfig(),
|
|
61
|
+
);
|
|
62
|
+
await sync.handleWebhookPush({
|
|
63
|
+
after: "head",
|
|
64
|
+
commits: [
|
|
65
|
+
{
|
|
66
|
+
message: "Edit the quote's source",
|
|
67
|
+
added: [],
|
|
68
|
+
modified: [`content/${quote.slug}/_index.md`],
|
|
69
|
+
removed: [],
|
|
70
|
+
},
|
|
71
|
+
],
|
|
72
|
+
} as Parameters<typeof sync.handleWebhookPush>[0]);
|
|
73
|
+
|
|
74
|
+
const updated = await services.posts.getById(quote.id);
|
|
75
|
+
expect(updated?.title).toBe("New Source");
|
|
76
|
+
expect(updated?.url).toBe("https://new.example/");
|
|
77
|
+
});
|
|
78
|
+
});
|
|
@@ -5,7 +5,8 @@ import {
|
|
|
5
5
|
} from "../../__tests__/helpers/db.js";
|
|
6
6
|
import { createAuth } from "../../auth.js";
|
|
7
7
|
import type { Database } from "../../db/index.js";
|
|
8
|
-
import {
|
|
8
|
+
import { eq } from "drizzle-orm";
|
|
9
|
+
import { account, session, siteMembers, user } from "../../db/schema.js";
|
|
9
10
|
import {
|
|
10
11
|
signHostedSsoToken,
|
|
11
12
|
type HostedSsoClaims,
|
|
@@ -14,6 +15,12 @@ import { createHostedHandoffService } from "../hosted-handoff.js";
|
|
|
14
15
|
|
|
15
16
|
const HOSTED_SSO_SECRET = "cloud-sso-secret-cloud-sso-secret";
|
|
16
17
|
|
|
18
|
+
const BROWSER = {
|
|
19
|
+
userAgent:
|
|
20
|
+
"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.0.0 Safari/537.36",
|
|
21
|
+
ipAddress: "203.0.113.7",
|
|
22
|
+
};
|
|
23
|
+
|
|
17
24
|
async function seedExistingAdmin(db: Database) {
|
|
18
25
|
const createdAt = new Date();
|
|
19
26
|
const timestamp = Math.floor(Date.now() / 1000);
|
|
@@ -90,6 +97,7 @@ describe("HostedHandoffService", () => {
|
|
|
90
97
|
const result = await hostedHandoff.completeFromSignedToken({
|
|
91
98
|
currentSiteId: DEFAULT_TEST_SITE_ID,
|
|
92
99
|
token,
|
|
100
|
+
client: BROWSER,
|
|
93
101
|
});
|
|
94
102
|
|
|
95
103
|
const linkedUser = await db.query.user.findFirst({
|
|
@@ -120,4 +128,203 @@ describe("HostedHandoffService", () => {
|
|
|
120
128
|
expect(membership?.role).toBe("owner");
|
|
121
129
|
expect(createdSession?.userId).toBe(result.userId);
|
|
122
130
|
});
|
|
131
|
+
|
|
132
|
+
it("signs in once per link and refuses the same link again", async () => {
|
|
133
|
+
const testDb = createTestDatabase();
|
|
134
|
+
const db = testDb.db as unknown as Database;
|
|
135
|
+
const auth = createAuth(db, {
|
|
136
|
+
allowSystemUserProvisioning: true,
|
|
137
|
+
secret: "test-auth-secret",
|
|
138
|
+
baseURL: "http://127.0.0.1:3000",
|
|
139
|
+
useSecureCookies: false,
|
|
140
|
+
});
|
|
141
|
+
const hostedHandoff = createHostedHandoffService(db, auth, {
|
|
142
|
+
secret: HOSTED_SSO_SECRET,
|
|
143
|
+
});
|
|
144
|
+
const token = await signHostedSsoToken(
|
|
145
|
+
HOSTED_SSO_SECRET,
|
|
146
|
+
createHostedClaims(),
|
|
147
|
+
);
|
|
148
|
+
|
|
149
|
+
await hostedHandoff.completeFromSignedToken({
|
|
150
|
+
currentSiteId: DEFAULT_TEST_SITE_ID,
|
|
151
|
+
token,
|
|
152
|
+
client: BROWSER,
|
|
153
|
+
});
|
|
154
|
+
|
|
155
|
+
await expect(
|
|
156
|
+
hostedHandoff.completeFromSignedToken({
|
|
157
|
+
currentSiteId: DEFAULT_TEST_SITE_ID,
|
|
158
|
+
token,
|
|
159
|
+
client: BROWSER,
|
|
160
|
+
}),
|
|
161
|
+
).rejects.toThrow("This sign-in link has expired.");
|
|
162
|
+
});
|
|
163
|
+
|
|
164
|
+
it("lets only the owner sign in while core has no roles", async () => {
|
|
165
|
+
const testDb = createTestDatabase();
|
|
166
|
+
const db = testDb.db as unknown as Database;
|
|
167
|
+
const auth = createAuth(db, {
|
|
168
|
+
allowSystemUserProvisioning: true,
|
|
169
|
+
secret: "test-auth-secret",
|
|
170
|
+
baseURL: "http://127.0.0.1:3000",
|
|
171
|
+
useSecureCookies: false,
|
|
172
|
+
});
|
|
173
|
+
const hostedHandoff = createHostedHandoffService(db, auth, {
|
|
174
|
+
secret: HOSTED_SSO_SECRET,
|
|
175
|
+
});
|
|
176
|
+
const token = await signHostedSsoToken(
|
|
177
|
+
HOSTED_SSO_SECRET,
|
|
178
|
+
createHostedClaims({ role: "editor" }),
|
|
179
|
+
);
|
|
180
|
+
|
|
181
|
+
await expect(
|
|
182
|
+
hostedHandoff.completeFromSignedToken({
|
|
183
|
+
currentSiteId: DEFAULT_TEST_SITE_ID,
|
|
184
|
+
token,
|
|
185
|
+
client: BROWSER,
|
|
186
|
+
}),
|
|
187
|
+
).rejects.toThrow("Only the site's owner");
|
|
188
|
+
});
|
|
189
|
+
|
|
190
|
+
describe("sessions", () => {
|
|
191
|
+
/** A handoff whose every call signs a fresh one-use link for the owner. */
|
|
192
|
+
function setUp() {
|
|
193
|
+
const testDb = createTestDatabase();
|
|
194
|
+
const db = testDb.db as unknown as Database;
|
|
195
|
+
const auth = createAuth(db, {
|
|
196
|
+
allowSystemUserProvisioning: true,
|
|
197
|
+
secret: "test-auth-secret",
|
|
198
|
+
baseURL: "http://127.0.0.1:3000",
|
|
199
|
+
useSecureCookies: false,
|
|
200
|
+
});
|
|
201
|
+
const hostedHandoff = createHostedHandoffService(db, auth, {
|
|
202
|
+
secret: HOSTED_SSO_SECRET,
|
|
203
|
+
});
|
|
204
|
+
let issued = 0;
|
|
205
|
+
const signIn = async (
|
|
206
|
+
client: Parameters<
|
|
207
|
+
typeof hostedHandoff.completeFromSignedToken
|
|
208
|
+
>[0]["client"],
|
|
209
|
+
claims?: Partial<HostedSsoClaims>,
|
|
210
|
+
) => {
|
|
211
|
+
issued += 1;
|
|
212
|
+
const token = await signHostedSsoToken(
|
|
213
|
+
HOSTED_SSO_SECRET,
|
|
214
|
+
createHostedClaims({
|
|
215
|
+
iat: Math.floor(Date.now() / 1000) - issued,
|
|
216
|
+
...claims,
|
|
217
|
+
}),
|
|
218
|
+
);
|
|
219
|
+
return hostedHandoff.completeFromSignedToken({
|
|
220
|
+
currentSiteId: DEFAULT_TEST_SITE_ID,
|
|
221
|
+
token,
|
|
222
|
+
client,
|
|
223
|
+
});
|
|
224
|
+
};
|
|
225
|
+
const findSession = (token: string) =>
|
|
226
|
+
db.query.session.findFirst({
|
|
227
|
+
where: (fields, { eq }) => eq(fields.token, token),
|
|
228
|
+
});
|
|
229
|
+
const countSessions = async () =>
|
|
230
|
+
(await db.query.session.findMany()).length;
|
|
231
|
+
return { db, signIn, findSession, countSessions };
|
|
232
|
+
}
|
|
233
|
+
|
|
234
|
+
// The Sessions page names a device from its user agent. The handoff made
|
|
235
|
+
// its sessions outside any better-auth endpoint, where better-auth has no
|
|
236
|
+
// request to read one from, so every hosted sign-in showed "Unknown device".
|
|
237
|
+
it("records the browser on a new session", async () => {
|
|
238
|
+
const { signIn, findSession } = setUp();
|
|
239
|
+
|
|
240
|
+
const result = await signIn(BROWSER);
|
|
241
|
+
|
|
242
|
+
expect(result.reused).toBe(false);
|
|
243
|
+
const session = await findSession(result.sessionToken);
|
|
244
|
+
expect(session?.userAgent).toBe(BROWSER.userAgent);
|
|
245
|
+
expect(session?.ipAddress).toBe(BROWSER.ipAddress);
|
|
246
|
+
});
|
|
247
|
+
|
|
248
|
+
it("keeps the session a browser already holds for the same person", async () => {
|
|
249
|
+
const { signIn, countSessions } = setUp();
|
|
250
|
+
const first = await signIn(BROWSER);
|
|
251
|
+
|
|
252
|
+
const second = await signIn({
|
|
253
|
+
...BROWSER,
|
|
254
|
+
sessionToken: first.sessionToken,
|
|
255
|
+
});
|
|
256
|
+
|
|
257
|
+
expect(second.reused).toBe(true);
|
|
258
|
+
expect(second.sessionToken).toBe(first.sessionToken);
|
|
259
|
+
expect(await countSessions()).toBe(1);
|
|
260
|
+
});
|
|
261
|
+
|
|
262
|
+
it("names the device on a kept session that recorded none", async () => {
|
|
263
|
+
const { signIn, findSession } = setUp();
|
|
264
|
+
const first = await signIn({ userAgent: "", ipAddress: "" });
|
|
265
|
+
expect((await findSession(first.sessionToken))?.userAgent).toBe("");
|
|
266
|
+
|
|
267
|
+
await signIn({ ...BROWSER, sessionToken: first.sessionToken });
|
|
268
|
+
|
|
269
|
+
const session = await findSession(first.sessionToken);
|
|
270
|
+
expect(session?.userAgent).toBe(BROWSER.userAgent);
|
|
271
|
+
expect(session?.ipAddress).toBe(BROWSER.ipAddress);
|
|
272
|
+
});
|
|
273
|
+
|
|
274
|
+
it("starts a new session when the one the browser holds was revoked", async () => {
|
|
275
|
+
const { db, signIn, countSessions } = setUp();
|
|
276
|
+
const first = await signIn(BROWSER);
|
|
277
|
+
await db.delete(session).where(eq(session.token, first.sessionToken));
|
|
278
|
+
|
|
279
|
+
const second = await signIn({
|
|
280
|
+
...BROWSER,
|
|
281
|
+
sessionToken: first.sessionToken,
|
|
282
|
+
});
|
|
283
|
+
|
|
284
|
+
expect(second.reused).toBe(false);
|
|
285
|
+
expect(second.sessionToken).not.toBe(first.sessionToken);
|
|
286
|
+
expect(await countSessions()).toBe(1);
|
|
287
|
+
});
|
|
288
|
+
|
|
289
|
+
it("starts a new session when the one the browser holds has expired", async () => {
|
|
290
|
+
const { db, signIn } = setUp();
|
|
291
|
+
const first = await signIn(BROWSER);
|
|
292
|
+
await db
|
|
293
|
+
.update(session)
|
|
294
|
+
.set({ expiresAt: new Date(Date.now() - 1000) })
|
|
295
|
+
.where(eq(session.token, first.sessionToken));
|
|
296
|
+
|
|
297
|
+
const second = await signIn({
|
|
298
|
+
...BROWSER,
|
|
299
|
+
sessionToken: first.sessionToken,
|
|
300
|
+
});
|
|
301
|
+
|
|
302
|
+
expect(second.reused).toBe(false);
|
|
303
|
+
expect(second.sessionToken).not.toBe(first.sessionToken);
|
|
304
|
+
});
|
|
305
|
+
|
|
306
|
+
it("never hands over a session that belongs to someone else", async () => {
|
|
307
|
+
const { db, signIn } = setUp();
|
|
308
|
+
await seedExistingAdmin(db);
|
|
309
|
+
const createdAt = new Date();
|
|
310
|
+
await db.insert(session).values({
|
|
311
|
+
id: "ses_01kmbaseadmin000000000000",
|
|
312
|
+
userId: "usr_01kmbaseadmin000000000000",
|
|
313
|
+
token: "someone-elses-session",
|
|
314
|
+
expiresAt: new Date(Date.now() + 3600_000),
|
|
315
|
+
ipAddress: "",
|
|
316
|
+
userAgent: "",
|
|
317
|
+
createdAt,
|
|
318
|
+
updatedAt: createdAt,
|
|
319
|
+
});
|
|
320
|
+
|
|
321
|
+
const result = await signIn({
|
|
322
|
+
...BROWSER,
|
|
323
|
+
sessionToken: "someone-elses-session",
|
|
324
|
+
});
|
|
325
|
+
|
|
326
|
+
expect(result.reused).toBe(false);
|
|
327
|
+
expect(result.sessionToken).not.toBe("someone-elses-session");
|
|
328
|
+
});
|
|
329
|
+
});
|
|
123
330
|
});
|
|
@@ -12,6 +12,12 @@ import { storagePurge } from "../../db/schema.js";
|
|
|
12
12
|
import { MediaQuotaExceededError } from "../../lib/errors.js";
|
|
13
13
|
import { now } from "../../lib/time.js";
|
|
14
14
|
|
|
15
|
+
// Sideloading resolves hosts before fetching; keep these tests off real DNS.
|
|
16
|
+
vi.mock("node:dns/promises", () => {
|
|
17
|
+
const lookup = async () => [{ address: "93.184.215.14", family: 4 }];
|
|
18
|
+
return { lookup, default: { lookup } };
|
|
19
|
+
});
|
|
20
|
+
|
|
15
21
|
interface MockStorageFile {
|
|
16
22
|
body: Uint8Array;
|
|
17
23
|
contentType?: string;
|
|
@@ -869,21 +875,15 @@ describe("MediaService", () => {
|
|
|
869
875
|
});
|
|
870
876
|
});
|
|
871
877
|
|
|
872
|
-
describe("
|
|
873
|
-
it("returns empty
|
|
874
|
-
|
|
875
|
-
|
|
876
|
-
|
|
877
|
-
|
|
878
|
-
it("returns media ordered by createdAt desc", async () => {
|
|
879
|
-
await mediaService.create({ ...sampleMedia, storageKey: "a.jpg" });
|
|
880
|
-
await mediaService.create({ ...sampleMedia, storageKey: "b.jpg" });
|
|
881
|
-
|
|
882
|
-
const list = await mediaService.list();
|
|
883
|
-
expect(list).toHaveLength(2);
|
|
878
|
+
describe("listPage", () => {
|
|
879
|
+
it("returns an empty page when no media exists", async () => {
|
|
880
|
+
await expect(mediaService.listPage({ limit: 10 })).resolves.toEqual({
|
|
881
|
+
media: [],
|
|
882
|
+
nextCursor: null,
|
|
883
|
+
});
|
|
884
884
|
});
|
|
885
885
|
|
|
886
|
-
it("respects limit
|
|
886
|
+
it("respects the limit", async () => {
|
|
887
887
|
for (let i = 0; i < 5; i++) {
|
|
888
888
|
await mediaService.create({
|
|
889
889
|
...sampleMedia,
|
|
@@ -891,12 +891,12 @@ describe("MediaService", () => {
|
|
|
891
891
|
});
|
|
892
892
|
}
|
|
893
893
|
|
|
894
|
-
const
|
|
895
|
-
expect(
|
|
894
|
+
const page = await mediaService.listPage({ limit: 2 });
|
|
895
|
+
expect(page.media).toHaveLength(2);
|
|
896
|
+
expect(page.nextCursor).toEqual(expect.any(String));
|
|
896
897
|
});
|
|
897
898
|
|
|
898
|
-
|
|
899
|
-
it("pages through every item with an ID cursor", async () => {
|
|
899
|
+
it("pages through every item, newest first", async () => {
|
|
900
900
|
const created = [];
|
|
901
901
|
for (let i = 0; i < 5; i++) {
|
|
902
902
|
created.push(
|
|
@@ -911,19 +911,39 @@ describe("MediaService", () => {
|
|
|
911
911
|
.sort()
|
|
912
912
|
.reverse();
|
|
913
913
|
|
|
914
|
-
const
|
|
915
|
-
|
|
916
|
-
|
|
917
|
-
|
|
918
|
-
|
|
919
|
-
|
|
914
|
+
const seen: string[] = [];
|
|
915
|
+
let cursor: string | undefined;
|
|
916
|
+
do {
|
|
917
|
+
const page = await mediaService.listPage({ limit: 2, cursor });
|
|
918
|
+
seen.push(...page.media.map((media) => media.id));
|
|
919
|
+
cursor = page.nextCursor ?? undefined;
|
|
920
|
+
} while (cursor);
|
|
921
|
+
|
|
922
|
+
expect(seen).toEqual(newestFirst);
|
|
923
|
+
});
|
|
924
|
+
|
|
925
|
+
// A full last page used to hand back a cursor that led to an empty page.
|
|
926
|
+
it("ends with a null cursor when the last page is full", async () => {
|
|
927
|
+
for (let i = 0; i < 4; i++) {
|
|
928
|
+
await mediaService.create({
|
|
929
|
+
...sampleMedia,
|
|
930
|
+
storageKey: `full${i}.jpg`,
|
|
931
|
+
});
|
|
932
|
+
}
|
|
933
|
+
|
|
934
|
+
const first = await mediaService.listPage({ limit: 2 });
|
|
935
|
+
const second = await mediaService.listPage({
|
|
920
936
|
limit: 2,
|
|
921
|
-
cursor:
|
|
937
|
+
cursor: first.nextCursor ?? undefined,
|
|
922
938
|
});
|
|
939
|
+
expect(second.media).toHaveLength(2);
|
|
940
|
+
expect(second.nextCursor).toBeNull();
|
|
941
|
+
});
|
|
923
942
|
|
|
924
|
-
|
|
925
|
-
|
|
926
|
-
|
|
943
|
+
it("refuses a cursor it didn't issue", async () => {
|
|
944
|
+
await expect(
|
|
945
|
+
mediaService.listPage({ limit: 2, cursor: "not-a-cursor" }),
|
|
946
|
+
).rejects.toThrow();
|
|
927
947
|
});
|
|
928
948
|
});
|
|
929
949
|
|
|
@@ -1169,14 +1169,62 @@ describe("NavItemService", () => {
|
|
|
1169
1169
|
});
|
|
1170
1170
|
|
|
1171
1171
|
describe("getCollectionFreshness", () => {
|
|
1172
|
+
const READER = { status: "published" as const, excludePrivate: true };
|
|
1173
|
+
|
|
1172
1174
|
beforeEach(() => {
|
|
1173
1175
|
insertTestCollection(sqlite, TEST_COLLECTION_ID, "design", "Design");
|
|
1174
1176
|
});
|
|
1175
1177
|
|
|
1178
|
+
function insertCollectedRoot(
|
|
1179
|
+
id: string,
|
|
1180
|
+
status: "published" | "draft",
|
|
1181
|
+
visibility: "public" | "private",
|
|
1182
|
+
) {
|
|
1183
|
+
const ts = now();
|
|
1184
|
+
sqlite
|
|
1185
|
+
.prepare(
|
|
1186
|
+
`INSERT INTO post (id, site_id, thread_id, format, status, visibility, created_at, updated_at, last_activity_at)
|
|
1187
|
+
VALUES (?, ?, ?, 'note', ?, ?, ?, ?, ?)`,
|
|
1188
|
+
)
|
|
1189
|
+
.run(id, DEFAULT_TEST_SITE_ID, id, status, visibility, ts, ts, ts);
|
|
1190
|
+
sqlite
|
|
1191
|
+
.prepare(
|
|
1192
|
+
`INSERT INTO thread_collection (site_id, thread_id, collection_id, created_at, position)
|
|
1193
|
+
VALUES (?, ?, ?, ?, 0)`,
|
|
1194
|
+
)
|
|
1195
|
+
.run(DEFAULT_TEST_SITE_ID, id, TEST_COLLECTION_ID, ts);
|
|
1196
|
+
}
|
|
1197
|
+
|
|
1198
|
+
it("ignores a draft a signed-out reader can't see", async () => {
|
|
1199
|
+
insertCollectedRoot("pst_fresh_draft", "draft", "public");
|
|
1200
|
+
|
|
1201
|
+
const result = await navItemService.getCollectionFreshness(
|
|
1202
|
+
[TEST_COLLECTION_ID],
|
|
1203
|
+
READER,
|
|
1204
|
+
);
|
|
1205
|
+
expect(result.size).toBe(0);
|
|
1206
|
+
});
|
|
1207
|
+
|
|
1208
|
+
it("counts a private Thread only for the signed-in author", async () => {
|
|
1209
|
+
insertCollectedRoot("pst_fresh_private", "published", "private");
|
|
1210
|
+
|
|
1211
|
+
const signedOut = await navItemService.getCollectionFreshness(
|
|
1212
|
+
[TEST_COLLECTION_ID],
|
|
1213
|
+
READER,
|
|
1214
|
+
);
|
|
1215
|
+
const author = await navItemService.getCollectionFreshness(
|
|
1216
|
+
[TEST_COLLECTION_ID],
|
|
1217
|
+
{ status: "published", excludePrivate: false },
|
|
1218
|
+
);
|
|
1219
|
+
expect(signedOut.size).toBe(0);
|
|
1220
|
+
expect(author.has(TEST_COLLECTION_ID)).toBe(true);
|
|
1221
|
+
});
|
|
1222
|
+
|
|
1176
1223
|
it("returns empty set when no collections have recent activity", async () => {
|
|
1177
|
-
const result = await navItemService.getCollectionFreshness(
|
|
1178
|
-
TEST_COLLECTION_ID,
|
|
1179
|
-
|
|
1224
|
+
const result = await navItemService.getCollectionFreshness(
|
|
1225
|
+
[TEST_COLLECTION_ID],
|
|
1226
|
+
READER,
|
|
1227
|
+
);
|
|
1180
1228
|
expect(result.size).toBe(0);
|
|
1181
1229
|
});
|
|
1182
1230
|
|
|
@@ -1197,9 +1245,10 @@ describe("NavItemService", () => {
|
|
|
1197
1245
|
)
|
|
1198
1246
|
.run(DEFAULT_TEST_SITE_ID, "pst_test001", TEST_COLLECTION_ID, ts);
|
|
1199
1247
|
|
|
1200
|
-
const result = await navItemService.getCollectionFreshness(
|
|
1201
|
-
TEST_COLLECTION_ID,
|
|
1202
|
-
|
|
1248
|
+
const result = await navItemService.getCollectionFreshness(
|
|
1249
|
+
[TEST_COLLECTION_ID],
|
|
1250
|
+
READER,
|
|
1251
|
+
);
|
|
1203
1252
|
expect(result.has(TEST_COLLECTION_ID)).toBe(true);
|
|
1204
1253
|
});
|
|
1205
1254
|
|
|
@@ -1225,9 +1274,10 @@ describe("NavItemService", () => {
|
|
|
1225
1274
|
)
|
|
1226
1275
|
.run(DEFAULT_TEST_SITE_ID, "pst_test002", TEST_COLLECTION_ID, oldTs);
|
|
1227
1276
|
|
|
1228
|
-
const result = await navItemService.getCollectionFreshness(
|
|
1229
|
-
TEST_COLLECTION_ID,
|
|
1230
|
-
|
|
1277
|
+
const result = await navItemService.getCollectionFreshness(
|
|
1278
|
+
[TEST_COLLECTION_ID],
|
|
1279
|
+
READER,
|
|
1280
|
+
);
|
|
1231
1281
|
expect(result.has(TEST_COLLECTION_ID)).toBe(false);
|
|
1232
1282
|
});
|
|
1233
1283
|
|
|
@@ -1254,9 +1304,10 @@ describe("NavItemService", () => {
|
|
|
1254
1304
|
)
|
|
1255
1305
|
.run(DEFAULT_TEST_SITE_ID, "pst_edited", TEST_COLLECTION_ID, oldTs);
|
|
1256
1306
|
|
|
1257
|
-
const result = await navItemService.getCollectionFreshness(
|
|
1258
|
-
TEST_COLLECTION_ID,
|
|
1259
|
-
|
|
1307
|
+
const result = await navItemService.getCollectionFreshness(
|
|
1308
|
+
[TEST_COLLECTION_ID],
|
|
1309
|
+
READER,
|
|
1310
|
+
);
|
|
1260
1311
|
expect(result.get(TEST_COLLECTION_ID)).toBe(recentTs);
|
|
1261
1312
|
});
|
|
1262
1313
|
|
|
@@ -1303,9 +1354,10 @@ describe("NavItemService", () => {
|
|
|
1303
1354
|
recentTs,
|
|
1304
1355
|
);
|
|
1305
1356
|
|
|
1306
|
-
const result = await navItemService.getCollectionFreshness(
|
|
1307
|
-
TEST_COLLECTION_ID,
|
|
1308
|
-
|
|
1357
|
+
const result = await navItemService.getCollectionFreshness(
|
|
1358
|
+
[TEST_COLLECTION_ID],
|
|
1359
|
+
READER,
|
|
1360
|
+
);
|
|
1309
1361
|
expect(result.has(TEST_COLLECTION_ID)).toBe(true);
|
|
1310
1362
|
});
|
|
1311
1363
|
});
|