@jant/core 0.7.1 → 0.8.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/assets/prepare.js +3 -3
- package/bin/commands/db/export.js +115 -2
- package/bin/commands/deploy.js +11 -3
- package/bin/commands/{search-reindex.js → search/reindex.js} +5 -5
- package/bin/commands/site/export.js +48 -36
- package/bin/commands/site/import.js +3074 -2
- package/bin/commands/site/snapshot/import.js +2 -0
- package/bin/commands/telegram/register-webhooks.js +48 -23
- package/bin/jant.js +16 -11
- package/bin/lib/command-registry.js +120 -0
- package/bin/lib/migration-artifacts.js +19 -0
- package/bin/lib/renamed-arguments.js +56 -0
- package/bin/lib/site-snapshot.js +83 -1
- package/dist/{app-ZcaI1kPN.js → app-CFsmRVJN.js} +7916 -499
- package/dist/client/.vite/manifest.json +3 -3
- package/dist/client/_assets/{client-DAhoqPdr.css → client-BCumu1-D.css} +1 -1
- package/dist/client/_assets/{client-knSEyUJO.js → client-DTLBOHqD.js} +1 -1
- package/dist/client/_assets/{client-auth-CAMfTrKW.js → client-auth-D6Ix6SmE.js} +1 -1
- package/dist/index.js +2 -3
- package/dist/node.js +2 -3
- package/dist/url-CKlGzvdN.js +428 -0
- package/package.json +1 -5
- package/src/__tests__/cli-commands.test.ts +144 -0
- package/src/__tests__/config-docs.test.ts +148 -0
- package/src/__tests__/export-import-roundtrip.test.ts +1 -1
- package/src/__tests__/feed-docs.test.ts +36 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/README.md +89 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/41q27/0x4nv/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/41q27/_index.md +41 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/41q27/faqyt/index.md +28 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/41q27/the-potting-mix-guide-i-keep-rereading/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/_index.md +4 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/a-night-heron-field-guide-for-my-walk-folder/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/a-quiet-saturday-after-a-busy-week/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/archive/_index.md +7 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/are-na-is-the-only-bookmark-pile-i-still-revisit/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/bought-too-many-lemons-again/_index.md +34 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/city-walks/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/collections/_index.md +4 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/current-tea-rotation/_index.md +31 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/derek-sivers-still-writes-the-kind-of-internet-i-want-more-of/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/desk-but-better/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/e0kcg/_index.md +19 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/featured/_index.md +7 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/from-basho/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/from-epictetus/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/from-marcus-aurelius/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/from-seneca/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/from-thoreau/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/gkbvv/2cl6d/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/gkbvv/3zqv7/index.md +28 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/gkbvv/5oxsv/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/gkbvv/_index.md +36 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/home-cooking/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/k5vh8/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/k5vh8/a-reading-log-idea-i-might-steal/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/k5vh8/a83qu/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/k5vh8/from-seneca-5hibo/index.md +19 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/mynoise-for-rainy-afternoons/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/nts-archives-are-good-cleaning-music/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/qgfcu/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/qgfcu/c91j0/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/qgfcu/qyucy/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/qgfcu/wsgck/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/rain-makes-my-neighborhood-look-better/_index.md +43 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/reading-notes/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/serious-eats-on-tomato-and-egg-soup/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/te812/_index.md +41 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/te812/cxiu6/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/te812/t77ms/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/te812/the-soup-trick-i-always-forget/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/telk3/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/telk3/from-thoreau-pawt2/index.md +17 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/the-five-minute-reset-is-still-the-best-habit-i-have/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/the-hallway-light-took-12-minutes-and-3-months/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/the-recurse-center-manual-is-weirdly-calming/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/tiny-projects/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/useful-links/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/weekend-notes/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/what-i-actually-use-my-notebook-for/_index.md +49 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/data/jant.toml +119 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/hugo.toml +43 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/static/media/021801c20ab3-med_01kn8jw26cenf98vc7k0ppz5k8.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/static/media/0f868ce9ac84-med_01kn8jtx8qenf98tm9ahxr48sw.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/static/media/50c2ad911bad-med_01kn8jvb16enf98txp7p0pf5ge.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/static/media/7a91f0960491-med_01kn8jvq58enf98v538w5vsqp4.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/static/media/8714116d3c8e-med_01kn8jve5nenf98tzap11gpxzr.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/static/media/8a0b4277443f-med_01kn8jv0jdenf98tp6qr9zgjjc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/static/media/a7d1c8a1afd9-med_01kn8jv452enf98trbkwrvhvgd.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/static/media/e25570b405f5-med_01kn8jvsaeenf98v6ct4gjzppc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/static/media/e89ea4eabf01-med_01kn8jtq3penf98tfq4gzmh9g9.png +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/themes/jant/static/apple-touch-icon.png +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/themes/jant/static/custom.css +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/themes/jant/static/favicon.ico +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/snapshot/db.sql +218 -0
- package/src/__tests__/fixtures/releases/0.7.0/snapshot/meta.json +9 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/README.md +89 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/41q27/0x4nv/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/41q27/_index.md +41 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/41q27/faqyt/index.md +28 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/41q27/the-potting-mix-guide-i-keep-rereading/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/_index.md +4 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/a-night-heron-field-guide-for-my-walk-folder/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/a-quiet-saturday-after-a-busy-week/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/archive/_index.md +7 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/are-na-is-the-only-bookmark-pile-i-still-revisit/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/bought-too-many-lemons-again/_index.md +34 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/city-walks/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/collections/_index.md +4 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/current-tea-rotation/_index.md +31 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/derek-sivers-still-writes-the-kind-of-internet-i-want-more-of/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/desk-but-better/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/e0kcg/_index.md +19 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/featured/_index.md +7 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/from-basho/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/from-epictetus/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/from-marcus-aurelius/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/from-seneca/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/from-thoreau/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/gkbvv/2cl6d/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/gkbvv/3zqv7/index.md +28 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/gkbvv/5oxsv/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/gkbvv/_index.md +36 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/home-cooking/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/k5vh8/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/k5vh8/a-reading-log-idea-i-might-steal/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/k5vh8/a83qu/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/k5vh8/from-seneca-5hibo/index.md +19 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/mynoise-for-rainy-afternoons/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/nts-archives-are-good-cleaning-music/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/qgfcu/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/qgfcu/c91j0/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/qgfcu/qyucy/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/qgfcu/wsgck/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/rain-makes-my-neighborhood-look-better/_index.md +43 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/reading-notes/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/serious-eats-on-tomato-and-egg-soup/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/te812/_index.md +41 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/te812/cxiu6/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/te812/t77ms/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/te812/the-soup-trick-i-always-forget/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/telk3/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/telk3/from-thoreau-pawt2/index.md +17 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/the-five-minute-reset-is-still-the-best-habit-i-have/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/the-hallway-light-took-12-minutes-and-3-months/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/the-recurse-center-manual-is-weirdly-calming/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/tiny-projects/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/useful-links/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/weekend-notes/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/what-i-actually-use-my-notebook-for/_index.md +49 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/data/jant.toml +119 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/hugo.toml +43 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/static/media/021801c20ab3-med_01kn8jw26cenf98vc7k0ppz5k8.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/static/media/0f868ce9ac84-med_01kn8jtx8qenf98tm9ahxr48sw.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/static/media/50c2ad911bad-med_01kn8jvb16enf98txp7p0pf5ge.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/static/media/7a91f0960491-med_01kn8jvq58enf98v538w5vsqp4.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/static/media/8714116d3c8e-med_01kn8jve5nenf98tzap11gpxzr.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/static/media/8a0b4277443f-med_01kn8jv0jdenf98tp6qr9zgjjc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/static/media/a7d1c8a1afd9-med_01kn8jv452enf98trbkwrvhvgd.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/static/media/e25570b405f5-med_01kn8jvsaeenf98v6ct4gjzppc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/static/media/e89ea4eabf01-med_01kn8jtq3penf98tfq4gzmh9g9.png +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/themes/jant/static/apple-touch-icon.png +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/themes/jant/static/custom.css +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/themes/jant/static/favicon.ico +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/snapshot/db.sql +322 -0
- package/src/__tests__/fixtures/releases/0.7.1/snapshot/meta.json +9 -0
- package/src/__tests__/helpers/site-export-import.ts +97 -0
- package/src/__tests__/import-site-command.test.ts +27 -1
- package/src/__tests__/release-fixtures.test.ts +132 -0
- package/src/__tests__/site-export-canonical-import.test.ts +11 -47
- package/src/__tests__/theme-docs.test.ts +109 -0
- package/src/app.tsx +1 -5
- package/src/db/rehearsal-fixtures/pg-demo-current.json +55 -0
- package/src/db/rehearsal-fixtures/pg-demo-current.sql +431 -0
- package/src/i18n/locales/public/en.po +0 -2
- package/src/i18n/locales/public/zh-Hans.po +0 -2
- package/src/i18n/locales/public/zh-Hant.po +0 -2
- package/src/index.ts +6 -77
- package/src/lib/__tests__/view.test.ts +0 -46
- package/src/lib/feed.ts +0 -6
- package/src/lib/view.ts +0 -27
- package/src/node/__tests__/cli-export.test.ts +2 -2
- package/src/node/__tests__/cli-site-snapshot.test.ts +6 -0
- package/src/node/__tests__/cli-site-token-env.test.ts +4 -1
- package/src/node/__tests__/cli-snapshot-meta.test.ts +64 -0
- package/src/routes/api/internal/search-reindex.ts +1 -1
- package/src/services/__tests__/media.test.ts +0 -271
- package/src/services/export.ts +13 -5
- package/src/services/media.ts +1 -219
- package/src/styles/ui.css +0 -118
- package/bin/commands/export.js +0 -120
- package/bin/commands/import-site.js +0 -3034
- package/bin/commands/migrate-text-attachments.js +0 -181
- package/dist/github-sync-Gw4orAHk.js +0 -8398
- package/src/client/multipart-upload.ts +0 -206
- package/src/routes/api/__tests__/upload-multipart.test.ts +0 -739
- package/src/routes/api/internal/text-attachments.ts +0 -60
- package/src/routes/api/upload-multipart.ts +0 -366
|
@@ -1,60 +0,0 @@
|
|
|
1
|
-
import { Hono } from "hono";
|
|
2
|
-
import { z } from "zod";
|
|
3
|
-
import { requireInternalAdminApi } from "../../../middleware/auth.js";
|
|
4
|
-
import { getConfiguredStorageDriver } from "../../../lib/env.js";
|
|
5
|
-
import { parseValidated } from "../../../lib/schemas.js";
|
|
6
|
-
import type { Bindings } from "../../../types.js";
|
|
7
|
-
import type { AppVariables } from "../../../types/app-context.js";
|
|
8
|
-
|
|
9
|
-
type Env = { Bindings: Bindings; Variables: AppVariables };
|
|
10
|
-
|
|
11
|
-
const MigrateLegacySchema = z.object({
|
|
12
|
-
limit: z.number().int().positive().max(500).optional(),
|
|
13
|
-
});
|
|
14
|
-
|
|
15
|
-
export const internalTextAttachmentsRoutes = new Hono<Env>();
|
|
16
|
-
|
|
17
|
-
/**
|
|
18
|
-
* One-off migration endpoint: converts legacy text-attachment rows to the
|
|
19
|
-
* current markdown-only format. Handles both historical layouts (envelope
|
|
20
|
-
* and HTML/JSON sibling pairs) in a single pass — the service method
|
|
21
|
-
* dispatches on the row's stored mimeType.
|
|
22
|
-
*
|
|
23
|
-
* Idempotent: rows already in markdown form are detected by mimeType and
|
|
24
|
-
* ignored. Callers loop until `remaining === 0`.
|
|
25
|
-
*
|
|
26
|
-
* Path kept as `migrate-envelopes` for backwards compatibility with the
|
|
27
|
-
* existing `jant migrate-text-attachments` CLI; the endpoint now covers a
|
|
28
|
-
* broader migration but the external contract is unchanged.
|
|
29
|
-
*/
|
|
30
|
-
internalTextAttachmentsRoutes.post(
|
|
31
|
-
"/migrate-envelopes",
|
|
32
|
-
requireInternalAdminApi(),
|
|
33
|
-
async (c) => {
|
|
34
|
-
const storage = c.var.storage;
|
|
35
|
-
if (!storage) {
|
|
36
|
-
return c.json(
|
|
37
|
-
{ error: "File storage isn't set up. Check your server config." },
|
|
38
|
-
500,
|
|
39
|
-
);
|
|
40
|
-
}
|
|
41
|
-
|
|
42
|
-
const contentType = c.req.header("Content-Type") || "";
|
|
43
|
-
const rawBody = contentType.includes("application/json")
|
|
44
|
-
? await c.req.json().catch(() => ({}))
|
|
45
|
-
: {};
|
|
46
|
-
const body = parseValidated(MigrateLegacySchema, rawBody);
|
|
47
|
-
|
|
48
|
-
// Internal admin routes are mounted before the `withConfig` middleware,
|
|
49
|
-
// so `c.var.appConfig` is undefined here. Read the driver straight from
|
|
50
|
-
// env — same source `createStorageDriver` uses to build `c.var.storage`,
|
|
51
|
-
// so the string we pass matches the bucket the driver writes to.
|
|
52
|
-
const result = await c.var.services.media.migrateLegacyTextAttachments({
|
|
53
|
-
storage,
|
|
54
|
-
storageDriver: getConfiguredStorageDriver(c.env),
|
|
55
|
-
limit: body.limit,
|
|
56
|
-
});
|
|
57
|
-
|
|
58
|
-
return c.json(result);
|
|
59
|
-
},
|
|
60
|
-
);
|
|
@@ -1,366 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Multipart Upload API Routes
|
|
3
|
-
*
|
|
4
|
-
* Handles chunked file uploads for files that exceed the Cloudflare Workers
|
|
5
|
-
* 100MB request body limit. Uses the storage driver's multipart API.
|
|
6
|
-
*
|
|
7
|
-
* Protocol:
|
|
8
|
-
* 1. POST / — Initiate: validate metadata, start multipart upload
|
|
9
|
-
* 2. PUT /:id/part — Upload a single chunk (raw body, not FormData)
|
|
10
|
-
* 3. POST /:id/complete — Finalize: combine parts, create DB record
|
|
11
|
-
* 4. POST /:id/abort — Cancel: discard uploaded parts
|
|
12
|
-
* 5. PUT /:id/poster — Upload poster frame (video thumbnails, small FormData)
|
|
13
|
-
*/
|
|
14
|
-
|
|
15
|
-
import { Hono, type Context } from "hono";
|
|
16
|
-
import { z } from "zod";
|
|
17
|
-
import { msg } from "@lingui/core/macro";
|
|
18
|
-
import type { Bindings } from "../../types.js";
|
|
19
|
-
import type { AppVariables } from "../../types/app-context.js";
|
|
20
|
-
import { requireAuthApi } from "../../middleware/auth.js";
|
|
21
|
-
import { getMediaUrl, getPublicUrlForProvider } from "../../lib/image.js";
|
|
22
|
-
import {
|
|
23
|
-
detectPosterMimeType,
|
|
24
|
-
generateStorageKey,
|
|
25
|
-
getPosterExtension,
|
|
26
|
-
getStoredUploadPolicy,
|
|
27
|
-
getStoredUploadSignaturePeekLength,
|
|
28
|
-
getPosterStorageKey,
|
|
29
|
-
validateStoredUploadMetadata,
|
|
30
|
-
validateStoredUploadSignature,
|
|
31
|
-
} from "../../lib/upload.js";
|
|
32
|
-
import {
|
|
33
|
-
IMAGE_DIMENSION_PEEK_BYTES,
|
|
34
|
-
parseImageDimensions,
|
|
35
|
-
} from "../../lib/image-dimensions.js";
|
|
36
|
-
import { supportsMultipart } from "../../lib/storage.js";
|
|
37
|
-
import {
|
|
38
|
-
MediaQuotaExceededError,
|
|
39
|
-
ValidationError,
|
|
40
|
-
parseIdParam,
|
|
41
|
-
} from "../../lib/errors.js";
|
|
42
|
-
import { getI18n } from "../../i18n/index.js";
|
|
43
|
-
import { ID_PREFIX } from "../../lib/ids.js";
|
|
44
|
-
import { parseValidated } from "../../lib/schemas.js";
|
|
45
|
-
|
|
46
|
-
type Env = { Bindings: Bindings; Variables: AppVariables };
|
|
47
|
-
|
|
48
|
-
// ── Schemas ──────────────────────────────────────────────────────────
|
|
49
|
-
|
|
50
|
-
const InitiateSchema = z.object({
|
|
51
|
-
filename: z.string().min(1),
|
|
52
|
-
contentType: z.string().min(1),
|
|
53
|
-
size: z.number().int().positive(),
|
|
54
|
-
});
|
|
55
|
-
|
|
56
|
-
const UploadPartSchema = z.object({
|
|
57
|
-
storageKey: z.string().min(1),
|
|
58
|
-
uploadId: z.string().min(1),
|
|
59
|
-
});
|
|
60
|
-
|
|
61
|
-
const CompleteSchema = z.object({
|
|
62
|
-
storageKey: z.string().min(1),
|
|
63
|
-
uploadId: z.string().min(1),
|
|
64
|
-
parts: z.array(
|
|
65
|
-
z.object({
|
|
66
|
-
partNumber: z.number().int().positive(),
|
|
67
|
-
etag: z.string().min(1),
|
|
68
|
-
}),
|
|
69
|
-
),
|
|
70
|
-
filename: z.string().min(1),
|
|
71
|
-
originalName: z.string().min(1),
|
|
72
|
-
contentType: z.string().min(1),
|
|
73
|
-
size: z.number().int().positive(),
|
|
74
|
-
width: z.number().int().positive().optional(),
|
|
75
|
-
height: z.number().int().positive().optional(),
|
|
76
|
-
durationSeconds: z.number().int().positive().optional(),
|
|
77
|
-
blurhash: z.string().max(200).optional(),
|
|
78
|
-
waveform: z.string().max(2000).optional(),
|
|
79
|
-
posterKey: z.string().optional(),
|
|
80
|
-
});
|
|
81
|
-
|
|
82
|
-
const AbortSchema = z.object({
|
|
83
|
-
storageKey: z.string().min(1),
|
|
84
|
-
uploadId: z.string().min(1),
|
|
85
|
-
});
|
|
86
|
-
|
|
87
|
-
// ── Routes ───────────────────────────────────────────────────────────
|
|
88
|
-
|
|
89
|
-
export const multipartUploadApiRoutes = new Hono<Env>();
|
|
90
|
-
|
|
91
|
-
// Require auth for all multipart routes
|
|
92
|
-
multipartUploadApiRoutes.use("*", requireAuthApi());
|
|
93
|
-
|
|
94
|
-
function getHostedMediaQuotaExceededText(c: Context<Env>): string {
|
|
95
|
-
return getI18n(c)._(
|
|
96
|
-
msg({
|
|
97
|
-
message:
|
|
98
|
-
"This upload would exceed your shared hosted media limit. Remove files or upgrade storage to continue.",
|
|
99
|
-
comment:
|
|
100
|
-
"@context: Error shown when a hosted upload would exceed the shared account media limit",
|
|
101
|
-
}),
|
|
102
|
-
);
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
// POST / — Initiate a multipart upload
|
|
106
|
-
multipartUploadApiRoutes.post("/", async (c) => {
|
|
107
|
-
const storage = c.var.storage;
|
|
108
|
-
if (!storage || !supportsMultipart(storage)) {
|
|
109
|
-
return c.json({ error: "Storage doesn't support multipart uploads." }, 500);
|
|
110
|
-
}
|
|
111
|
-
|
|
112
|
-
const body = await c.req.json();
|
|
113
|
-
const data = parseValidated(InitiateSchema, body);
|
|
114
|
-
|
|
115
|
-
// Validate file type and size
|
|
116
|
-
const error = validateStoredUploadMetadata(data.contentType, data.size, {
|
|
117
|
-
maxFileSizeMB: c.var.appConfig.uploadMaxFileSize,
|
|
118
|
-
});
|
|
119
|
-
if (error) {
|
|
120
|
-
throw new ValidationError(error);
|
|
121
|
-
}
|
|
122
|
-
const uploadPolicy = getStoredUploadPolicy(data.contentType);
|
|
123
|
-
if (!uploadPolicy) {
|
|
124
|
-
throw new ValidationError(
|
|
125
|
-
`File type "${data.contentType}" is not supported.`,
|
|
126
|
-
);
|
|
127
|
-
}
|
|
128
|
-
|
|
129
|
-
const { id, filename, storageKey } = generateStorageKey(
|
|
130
|
-
c.var.currentSite.id,
|
|
131
|
-
data.filename,
|
|
132
|
-
);
|
|
133
|
-
|
|
134
|
-
try {
|
|
135
|
-
await c.var.services.media.assertCanWriteBytes(data.size);
|
|
136
|
-
} catch (error) {
|
|
137
|
-
if (error instanceof MediaQuotaExceededError) {
|
|
138
|
-
return c.json({ error: getHostedMediaQuotaExceededText(c) }, 409);
|
|
139
|
-
}
|
|
140
|
-
|
|
141
|
-
throw error;
|
|
142
|
-
}
|
|
143
|
-
|
|
144
|
-
const upload = await storage.createMultipartUpload(storageKey, {
|
|
145
|
-
contentType: data.contentType,
|
|
146
|
-
contentDisposition: uploadPolicy.contentDisposition,
|
|
147
|
-
cacheControl: "public, max-age=31536000, immutable",
|
|
148
|
-
});
|
|
149
|
-
|
|
150
|
-
return c.json({
|
|
151
|
-
id,
|
|
152
|
-
uploadId: upload.uploadId,
|
|
153
|
-
storageKey,
|
|
154
|
-
filename,
|
|
155
|
-
originalName: data.filename,
|
|
156
|
-
});
|
|
157
|
-
});
|
|
158
|
-
|
|
159
|
-
// PUT /:id/part?partNumber=N&storageKey=...&uploadId=... — Upload a single part
|
|
160
|
-
multipartUploadApiRoutes.put("/:id/part", async (c) => {
|
|
161
|
-
const storage = c.var.storage;
|
|
162
|
-
if (!storage || !supportsMultipart(storage)) {
|
|
163
|
-
return c.json({ error: "Storage doesn't support multipart uploads." }, 500);
|
|
164
|
-
}
|
|
165
|
-
|
|
166
|
-
parseIdParam(c.req.param("id"), ID_PREFIX.media);
|
|
167
|
-
|
|
168
|
-
const storageKey = c.req.query("storageKey");
|
|
169
|
-
const uploadId = c.req.query("uploadId");
|
|
170
|
-
if (!storageKey || !uploadId) {
|
|
171
|
-
throw new ValidationError(
|
|
172
|
-
"storageKey and uploadId query parameters are required",
|
|
173
|
-
);
|
|
174
|
-
}
|
|
175
|
-
parseValidated(UploadPartSchema, { storageKey, uploadId });
|
|
176
|
-
|
|
177
|
-
const partNumberRaw = c.req.query("partNumber");
|
|
178
|
-
if (!partNumberRaw) {
|
|
179
|
-
throw new ValidationError("partNumber query parameter is required");
|
|
180
|
-
}
|
|
181
|
-
const partNumber = parseInt(partNumberRaw, 10);
|
|
182
|
-
if (isNaN(partNumber) || partNumber < 1) {
|
|
183
|
-
throw new ValidationError("partNumber must be a positive integer");
|
|
184
|
-
}
|
|
185
|
-
|
|
186
|
-
const body = await c.req.arrayBuffer();
|
|
187
|
-
const part = await storage.uploadPart(storageKey, uploadId, partNumber, body);
|
|
188
|
-
|
|
189
|
-
return c.json({ partNumber: part.partNumber, etag: part.etag });
|
|
190
|
-
});
|
|
191
|
-
|
|
192
|
-
// POST /:id/complete — Finalize the upload
|
|
193
|
-
multipartUploadApiRoutes.post("/:id/complete", async (c) => {
|
|
194
|
-
const storage = c.var.storage;
|
|
195
|
-
if (!storage || !supportsMultipart(storage)) {
|
|
196
|
-
return c.json({ error: "Storage doesn't support multipart uploads." }, 500);
|
|
197
|
-
}
|
|
198
|
-
|
|
199
|
-
const id = parseIdParam(c.req.param("id"), ID_PREFIX.media);
|
|
200
|
-
const body = await c.req.json();
|
|
201
|
-
const data = parseValidated(CompleteSchema, body);
|
|
202
|
-
|
|
203
|
-
// Validate file type and size
|
|
204
|
-
const validationError = validateStoredUploadMetadata(
|
|
205
|
-
data.contentType,
|
|
206
|
-
data.size,
|
|
207
|
-
{ maxFileSizeMB: c.var.appConfig.uploadMaxFileSize },
|
|
208
|
-
);
|
|
209
|
-
if (validationError) {
|
|
210
|
-
throw new ValidationError(validationError);
|
|
211
|
-
}
|
|
212
|
-
const uploadPolicy = getStoredUploadPolicy(data.contentType);
|
|
213
|
-
if (!uploadPolicy) {
|
|
214
|
-
throw new ValidationError(
|
|
215
|
-
`File type "${data.contentType}" is not supported.`,
|
|
216
|
-
);
|
|
217
|
-
}
|
|
218
|
-
|
|
219
|
-
try {
|
|
220
|
-
await c.var.services.media.assertCanWriteBytes(data.size);
|
|
221
|
-
} catch (error) {
|
|
222
|
-
if (error instanceof MediaQuotaExceededError) {
|
|
223
|
-
await storage.abortMultipartUpload(data.storageKey, data.uploadId);
|
|
224
|
-
return c.json({ error: getHostedMediaQuotaExceededText(c) }, 409);
|
|
225
|
-
}
|
|
226
|
-
|
|
227
|
-
throw error;
|
|
228
|
-
}
|
|
229
|
-
|
|
230
|
-
// Complete the R2 multipart upload
|
|
231
|
-
await storage.completeMultipartUpload(
|
|
232
|
-
data.storageKey,
|
|
233
|
-
data.uploadId,
|
|
234
|
-
data.parts,
|
|
235
|
-
);
|
|
236
|
-
|
|
237
|
-
const signaturePeekLength = getStoredUploadSignaturePeekLength(
|
|
238
|
-
data.contentType,
|
|
239
|
-
);
|
|
240
|
-
let width = data.width && data.width > 0 ? data.width : undefined;
|
|
241
|
-
let height = data.height && data.height > 0 ? data.height : undefined;
|
|
242
|
-
const needsDimensionSniff =
|
|
243
|
-
(!width || !height) && data.contentType.startsWith("image/");
|
|
244
|
-
const peekLength = needsDimensionSniff
|
|
245
|
-
? Math.max(signaturePeekLength, IMAGE_DIMENSION_PEEK_BYTES)
|
|
246
|
-
: signaturePeekLength;
|
|
247
|
-
if (peekLength > 0) {
|
|
248
|
-
const object = await storage.get(data.storageKey, {
|
|
249
|
-
range: { offset: 0, length: peekLength },
|
|
250
|
-
});
|
|
251
|
-
if (!object) {
|
|
252
|
-
throw new ValidationError("The uploaded file could not be found.");
|
|
253
|
-
}
|
|
254
|
-
const bytes = new Uint8Array(await new Response(object.body).arrayBuffer());
|
|
255
|
-
if (signaturePeekLength > 0) {
|
|
256
|
-
const signatureError = validateStoredUploadSignature(
|
|
257
|
-
data.contentType,
|
|
258
|
-
bytes.subarray(0, signaturePeekLength),
|
|
259
|
-
);
|
|
260
|
-
if (signatureError) {
|
|
261
|
-
await storage.delete(data.storageKey).catch(() => {});
|
|
262
|
-
if (data.posterKey) {
|
|
263
|
-
await storage.delete(data.posterKey).catch(() => {});
|
|
264
|
-
}
|
|
265
|
-
throw new ValidationError(signatureError);
|
|
266
|
-
}
|
|
267
|
-
}
|
|
268
|
-
if (needsDimensionSniff) {
|
|
269
|
-
const dimensions = parseImageDimensions(data.contentType, bytes);
|
|
270
|
-
if (dimensions) {
|
|
271
|
-
width ??= dimensions.width;
|
|
272
|
-
height ??= dimensions.height;
|
|
273
|
-
}
|
|
274
|
-
}
|
|
275
|
-
}
|
|
276
|
-
|
|
277
|
-
// Create the DB record
|
|
278
|
-
const media = await c.var.services.media.create({
|
|
279
|
-
id,
|
|
280
|
-
filename: data.filename,
|
|
281
|
-
originalName: data.originalName,
|
|
282
|
-
mimeType: data.contentType,
|
|
283
|
-
size: data.size,
|
|
284
|
-
storageKey: data.storageKey,
|
|
285
|
-
provider: c.var.appConfig.storageDriver,
|
|
286
|
-
width,
|
|
287
|
-
height,
|
|
288
|
-
durationSeconds:
|
|
289
|
-
data.durationSeconds && data.durationSeconds > 0
|
|
290
|
-
? data.durationSeconds
|
|
291
|
-
: undefined,
|
|
292
|
-
blurhash: data.blurhash,
|
|
293
|
-
waveform: data.waveform,
|
|
294
|
-
posterKey: data.posterKey,
|
|
295
|
-
mediaKind: uploadPolicy.mediaKind,
|
|
296
|
-
});
|
|
297
|
-
|
|
298
|
-
const mediaPublicUrl = getPublicUrlForProvider(
|
|
299
|
-
c.var.appConfig.storageDriver,
|
|
300
|
-
c.var.appConfig.r2PublicUrl,
|
|
301
|
-
c.var.appConfig.s3PublicUrl,
|
|
302
|
-
c.var.appConfig.localPublicUrl,
|
|
303
|
-
);
|
|
304
|
-
const publicUrl = getMediaUrl(
|
|
305
|
-
data.storageKey,
|
|
306
|
-
mediaPublicUrl,
|
|
307
|
-
c.var.appConfig.sitePathPrefix,
|
|
308
|
-
);
|
|
309
|
-
|
|
310
|
-
return c.json({
|
|
311
|
-
id: media.id,
|
|
312
|
-
filename: media.filename,
|
|
313
|
-
url: publicUrl,
|
|
314
|
-
mimeType: media.mimeType,
|
|
315
|
-
size: media.size,
|
|
316
|
-
});
|
|
317
|
-
});
|
|
318
|
-
|
|
319
|
-
// POST /:id/abort — Cancel the upload
|
|
320
|
-
multipartUploadApiRoutes.post("/:id/abort", async (c) => {
|
|
321
|
-
const storage = c.var.storage;
|
|
322
|
-
if (!storage || !supportsMultipart(storage)) {
|
|
323
|
-
return c.json({ error: "Storage doesn't support multipart uploads." }, 500);
|
|
324
|
-
}
|
|
325
|
-
|
|
326
|
-
parseIdParam(c.req.param("id"), ID_PREFIX.media);
|
|
327
|
-
|
|
328
|
-
const body = await c.req.json();
|
|
329
|
-
const data = parseValidated(AbortSchema, body);
|
|
330
|
-
|
|
331
|
-
await storage.abortMultipartUpload(data.storageKey, data.uploadId);
|
|
332
|
-
|
|
333
|
-
return c.json({ success: true });
|
|
334
|
-
});
|
|
335
|
-
|
|
336
|
-
// PUT /:id/poster — Upload poster frame (video thumbnails)
|
|
337
|
-
multipartUploadApiRoutes.put("/:id/poster", async (c) => {
|
|
338
|
-
const storage = c.var.storage;
|
|
339
|
-
if (!storage) {
|
|
340
|
-
return c.json({ error: "Storage not configured." }, 500);
|
|
341
|
-
}
|
|
342
|
-
|
|
343
|
-
const id = parseIdParam(c.req.param("id"), ID_PREFIX.media);
|
|
344
|
-
const formData = await c.req.formData();
|
|
345
|
-
const posterFile = formData.get("poster") as File | null;
|
|
346
|
-
if (!posterFile) {
|
|
347
|
-
throw new ValidationError("No poster file provided");
|
|
348
|
-
}
|
|
349
|
-
|
|
350
|
-
const posterBytes = new Uint8Array(await posterFile.arrayBuffer());
|
|
351
|
-
const posterMime = detectPosterMimeType(posterBytes);
|
|
352
|
-
if (!posterMime) {
|
|
353
|
-
throw new ValidationError(
|
|
354
|
-
"Unsupported poster format. Only WebP and PNG are accepted.",
|
|
355
|
-
);
|
|
356
|
-
}
|
|
357
|
-
|
|
358
|
-
const posterExt = getPosterExtension(posterMime);
|
|
359
|
-
const posterKey = getPosterStorageKey(c.var.currentSite.id, id, posterExt);
|
|
360
|
-
|
|
361
|
-
await storage.put(posterKey, posterBytes, {
|
|
362
|
-
contentType: posterMime,
|
|
363
|
-
});
|
|
364
|
-
|
|
365
|
-
return c.json({ posterKey });
|
|
366
|
-
});
|