emdash 0.36.0 → 0.37.0

package/dist/astro/routes/api/media/_id_/confirm.mjs

@@ -1,18 +1,18 @@
 import "../../../../../config-C3EBstHi.mjs";
 import "../../../../../base64-CvLhUKQv.mjs";
 import "../../../../../types-CQPWhPxE.mjs";
-import { t as MediaRepository } from "../../../../../media-D6SeAfBl.mjs";
+import { t as MediaRepository } from "../../../../../media-BBm8Wg3f.mjs";
 import "../../../../../dist-89xCrGqi.mjs";
 import { t as enrichImageMetadata } from "../../../../../enrich-BX0IDp4z.mjs";
-import { n as computeContentHash, t as MAX_CONTENT_HASH_BYTES } from "../../../../../hash-CTcngWvj.mjs";
-import { n as apiSuccess, r as handleError, t as apiError } from "../../../../../error-D9w94fjV.mjs";
-import { r as parseOptionalBody, t as isParseError } from "../../../../../parse-BRJg1kz8.mjs";
-import { i as mediaConfirmBody } from "../../../../../media-BjwNuLEu.mjs";
-import "../../../../../redirects-CRIM55KH.mjs";
-import "../../../../../relations-BTPM2saV.mjs";
-import "../../../../../status-DDu8HIQl.mjs";
+import { n as computeContentHash, t as MAX_CONTENT_HASH_BYTES } from "../../../../../hash-3JJPlHF2.mjs";
+import { n as apiSuccess, r as handleError, t as apiError } from "../../../../../error-DFrQjppn.mjs";
+import { r as parseOptionalBody, t as isParseError } from "../../../../../parse-Ckpg-Qfp.mjs";
+import { i as mediaConfirmBody } from "../../../../../media-BHjus86Y.mjs";
+import "../../../../../redirects-BLNOWQTn.mjs";
+import "../../../../../relations-C4htk5sb.mjs";
+import "../../../../../status-B777-dXz.mjs";
 import "../../../../../api/schemas/index.mjs";
-import { n as requireOwnerPerm, r as requirePerm } from "../../../../../authorize-ByYs-Uxs.mjs";
+import { n as requireOwnerPerm, r as requirePerm } from "../../../../../authorize-Bkf_UHhD.mjs";
 
 //#region src/astro/routes/api/media/[id]/confirm.ts
 const prerender = false;

package/dist/astro/routes/api/media/_id_/replace.d.mts

@@ -0,0 +1,8 @@
+import { APIRoute } from "astro";
+
+//#region src/astro/routes/api/media/[id]/replace.d.ts
+declare const prerender = false;
+declare const PUT: APIRoute;
+//#endregion
+export { PUT, prerender };
+//# sourceMappingURL=replace.d.mts.map

package/dist/astro/routes/api/media/_id_/replace.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"replace.d.mts","names":[],"sources":["../../../../../../src/astro/routes/api/media/[id]/replace.ts"],"mappings":";;;cASa,SAAA;AAAA,cAIA,GAAA,EAAK,QAAA"}

package/dist/astro/routes/api/media/_id_/replace.mjs

@@ -0,0 +1,91 @@
+import "../../../../../config-C3EBstHi.mjs";
+import "../../../../../base64-CvLhUKQv.mjs";
+import "../../../../../types-CQPWhPxE.mjs";
+import { n as normalizeMime } from "../../../../../mime-CUIG6x84.mjs";
+import { n as computeContentHash } from "../../../../../hash-3JJPlHF2.mjs";
+import { a as unwrapResult, n as apiSuccess, r as handleError, t as apiError } from "../../../../../error-DFrQjppn.mjs";
+import { n as DEFAULT_MAX_UPLOAD_SIZE, w as mediaReplaceMetadataForm } from "../../../../../media-BHjus86Y.mjs";
+import "../../../../../redirects-BLNOWQTn.mjs";
+import "../../../../../relations-C4htk5sb.mjs";
+import "../../../../../status-B777-dXz.mjs";
+import "../../../../../api/schemas/index.mjs";
+import { MUTABLE_MEDIA_CACHE_CONTROL } from "../../../../../media/image-endpoint.mjs";
+import { n as requireOwnerPerm, r as requirePerm } from "../../../../../authorize-Bkf_UHhD.mjs";
+
+//#region src/astro/routes/api/media/[id]/replace.ts
+const prerender = false;
+const REPLACEABLE_IMAGE_TYPES = new Set([
+	"image/jpeg",
+	"image/png",
+	"image/webp"
+]);
+const PUT = async ({ params, request, locals }) => {
+	const { emdash, user } = locals;
+	const { id } = params;
+	const editDenied = requirePerm(user, "media:edit_own");
+	if (editDenied) return editDenied;
+	if (!id) return apiError("INVALID_REQUEST", "Media ID required", 400);
+	if (!emdash?.handleMediaGet || !emdash?.handleMediaReplaceMetadata) return apiError("NOT_CONFIGURED", "EmDash is not initialized", 500);
+	if (!emdash.storage) return apiError("NO_STORAGE", "Storage not configured", 500);
+	const getResult = await emdash.handleMediaGet(id);
+	if (!getResult.success) return unwrapResult(getResult);
+	const media = getResult.data.item;
+	const ownerDenied = requireOwnerPerm(user, media.authorId ?? "", "media:edit_own", "media:edit_any");
+	if (ownerDenied) return ownerDenied;
+	if (media.status !== "ready") return apiError("INVALID_STATE", "Only ready media can be replaced", 400);
+	const sourceMime = normalizeMime(media.mimeType);
+	if (!REPLACEABLE_IMAGE_TYPES.has(sourceMime)) return apiError("INVALID_TYPE", "Media type cannot be replaced", 400);
+	const rawMax = emdash.config.maxUploadSize ?? DEFAULT_MAX_UPLOAD_SIZE;
+	if (!Number.isFinite(rawMax) || rawMax <= 0) return apiError("CONFIGURATION_ERROR", "Invalid maxUploadSize configuration", 500);
+	const maxUploadSize = rawMax;
+	const contentLength = request.headers.get("Content-Length");
+	if (contentLength && parseInt(contentLength, 10) > maxUploadSize) return apiError("PAYLOAD_TOO_LARGE", "Upload too large", 413);
+	try {
+		const formData = await request.formData();
+		const fileEntry = formData.get("file");
+		const file = fileEntry instanceof File ? fileEntry : null;
+		if (!file) return apiError("NO_FILE", "No file provided", 400);
+		if (file.size === 0) return apiError("VALIDATION_ERROR", "Replacement file is empty", 400);
+		if (file.size > maxUploadSize) return apiError("PAYLOAD_TOO_LARGE", "Upload too large", 413);
+		const replacementMime = normalizeMime(file.type);
+		if (!REPLACEABLE_IMAGE_TYPES.has(replacementMime) || replacementMime !== sourceMime) return apiError("INVALID_TYPE", "Replacement file type must match the media item", 400);
+		const metadataResult = mediaReplaceMetadataForm.safeParse({
+			width: formData.get("width"),
+			height: formData.get("height")
+		});
+		if (!metadataResult.success) return apiError("VALIDATION_ERROR", "Invalid request data", 400, { issues: metadataResult.error.issues.map((issue) => ({
+			path: issue.path.join("."),
+			message: issue.message
+		})) });
+		const { width, height } = metadataResult.data;
+		const bytes = new Uint8Array(await file.arrayBuffer());
+		const contentHash = await computeContentHash(bytes);
+		try {
+			await emdash.storage.upload({
+				key: media.storageKey,
+				body: bytes,
+				contentType: sourceMime,
+				cacheControl: MUTABLE_MEDIA_CACHE_CONTROL
+			});
+		} catch (error) {
+			return handleError(error, "Failed to replace media", "MEDIA_REPLACE_ERROR");
+		}
+		const result = await emdash.handleMediaReplaceMetadata(id, media.storageKey, {
+			size: file.size,
+			width,
+			height,
+			contentHash
+		});
+		if (!result.success) return unwrapResult(result);
+		return apiSuccess({ item: {
+			...result.data.item,
+			url: `/_emdash/api/media/file/${result.data.item.storageKey}`
+		} });
+	} catch (error) {
+		return handleError(error, "Failed to replace media", "MEDIA_REPLACE_ERROR");
+	}
+};
+
+//#endregion
+export { PUT, prerender };
+//# sourceMappingURL=replace.mjs.map

package/dist/astro/routes/api/media/_id_/replace.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"replace.mjs","names":[],"sources":["../../../../../../src/astro/routes/api/media/[id]/replace.ts"],"sourcesContent":["import type { APIRoute } from \"astro\";\n\nimport { requireOwnerPerm, requirePerm } from \"#api/authorize.js\";\nimport { apiError, apiSuccess, handleError, unwrapResult } from \"#api/error.js\";\nimport { DEFAULT_MAX_UPLOAD_SIZE, mediaReplaceMetadataForm } from \"#api/schemas.js\";\nimport { MUTABLE_MEDIA_CACHE_CONTROL } from \"#media/image-endpoint.js\";\nimport { normalizeMime } from \"#media/mime.js\";\nimport { computeContentHash } from \"#utils/hash.js\";\n\nexport const prerender = false;\n\nconst REPLACEABLE_IMAGE_TYPES = new Set([\"image/jpeg\", \"image/png\", \"image/webp\"]);\n\nexport const PUT: APIRoute = async ({ params, request, locals }) => {\n\tconst { emdash, user } = locals;\n\tconst { id } = params;\n\n\tconst editDenied = requirePerm(user, \"media:edit_own\");\n\tif (editDenied) return editDenied;\n\tif (!id) return apiError(\"INVALID_REQUEST\", \"Media ID required\", 400);\n\tif (!emdash?.handleMediaGet || !emdash?.handleMediaReplaceMetadata) {\n\t\treturn apiError(\"NOT_CONFIGURED\", \"EmDash is not initialized\", 500);\n\t}\n\tif (!emdash.storage) return apiError(\"NO_STORAGE\", \"Storage not configured\", 500);\n\n\tconst getResult = await emdash.handleMediaGet(id);\n\tif (!getResult.success) return unwrapResult(getResult);\n\tconst media = getResult.data.item;\n\tconst ownerDenied = requireOwnerPerm(\n\t\tuser,\n\t\tmedia.authorId ?? \"\",\n\t\t\"media:edit_own\",\n\t\t\"media:edit_any\",\n\t);\n\tif (ownerDenied) return ownerDenied;\n\tif (media.status !== \"ready\") {\n\t\treturn apiError(\"INVALID_STATE\", \"Only ready media can be replaced\", 400);\n\t}\n\n\tconst sourceMime = normalizeMime(media.mimeType);\n\tif (!REPLACEABLE_IMAGE_TYPES.has(sourceMime)) {\n\t\treturn apiError(\"INVALID_TYPE\", \"Media type cannot be replaced\", 400);\n\t}\n\n\tconst rawMax = emdash.config.maxUploadSize ?? DEFAULT_MAX_UPLOAD_SIZE;\n\tif (!Number.isFinite(rawMax) || rawMax <= 0) {\n\t\treturn apiError(\"CONFIGURATION_ERROR\", \"Invalid maxUploadSize configuration\", 500);\n\t}\n\tconst maxUploadSize = rawMax;\n\tconst contentLength = request.headers.get(\"Content-Length\");\n\tif (contentLength && parseInt(contentLength, 10) > maxUploadSize) {\n\t\treturn apiError(\"PAYLOAD_TOO_LARGE\", \"Upload too large\", 413);\n\t}\n\n\ttry {\n\t\tconst formData = await request.formData();\n\t\tconst fileEntry = formData.get(\"file\");\n\t\tconst file = fileEntry instanceof File ? fileEntry : null;\n\t\tif (!file) return apiError(\"NO_FILE\", \"No file provided\", 400);\n\t\tif (file.size === 0) return apiError(\"VALIDATION_ERROR\", \"Replacement file is empty\", 400);\n\t\tif (file.size > maxUploadSize) {\n\t\t\treturn apiError(\"PAYLOAD_TOO_LARGE\", \"Upload too large\", 413);\n\t\t}\n\n\t\tconst replacementMime = normalizeMime(file.type);\n\t\tif (!REPLACEABLE_IMAGE_TYPES.has(replacementMime) || replacementMime !== sourceMime) {\n\t\t\treturn apiError(\"INVALID_TYPE\", \"Replacement file type must match the media item\", 400);\n\t\t}\n\n\t\tconst metadataResult = mediaReplaceMetadataForm.safeParse({\n\t\t\twidth: formData.get(\"width\"),\n\t\t\theight: formData.get(\"height\"),\n\t\t});\n\t\tif (!metadataResult.success) {\n\t\t\treturn apiError(\"VALIDATION_ERROR\", \"Invalid request data\", 400, {\n\t\t\t\tissues: metadataResult.error.issues.map((issue) => ({\n\t\t\t\t\tpath: issue.path.join(\".\"),\n\t\t\t\t\tmessage: issue.message,\n\t\t\t\t})),\n\t\t\t});\n\t\t}\n\t\tconst { width, height } = metadataResult.data;\n\n\t\tconst bytes = new Uint8Array(await file.arrayBuffer());\n\t\tconst contentHash = await computeContentHash(bytes);\n\t\ttry {\n\t\t\tawait emdash.storage.upload({\n\t\t\t\tkey: media.storageKey,\n\t\t\t\tbody: bytes,\n\t\t\t\tcontentType: sourceMime,\n\t\t\t\tcacheControl: MUTABLE_MEDIA_CACHE_CONTROL,\n\t\t\t});\n\t\t} catch (error) {\n\t\t\treturn handleError(error, \"Failed to replace media\", \"MEDIA_REPLACE_ERROR\");\n\t\t}\n\n\t\tconst result = await emdash.handleMediaReplaceMetadata(id, media.storageKey, {\n\t\t\tsize: file.size,\n\t\t\twidth,\n\t\t\theight,\n\t\t\tcontentHash,\n\t\t});\n\t\tif (!result.success) return unwrapResult(result);\n\n\t\treturn apiSuccess({\n\t\t\titem: {\n\t\t\t\t...result.data.item,\n\t\t\t\turl: `/_emdash/api/media/file/${result.data.item.storageKey}`,\n\t\t\t},\n\t\t});\n\t} catch (error) {\n\t\treturn handleError(error, \"Failed to replace media\", \"MEDIA_REPLACE_ERROR\");\n\t}\n};\n"],"mappings":"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"}

package/dist/astro/routes/api/media/_id_/upload.mjs

@@ -1,11 +1,11 @@
 import "../../../../../base64-CvLhUKQv.mjs";
 import "../../../../../types-CQPWhPxE.mjs";
-import { t as MediaRepository } from "../../../../../media-D6SeAfBl.mjs";
+import { t as MediaRepository } from "../../../../../media-BBm8Wg3f.mjs";
 import { n as normalizeMime } from "../../../../../mime-CUIG6x84.mjs";
-import { n as computeContentHash, t as MAX_CONTENT_HASH_BYTES } from "../../../../../hash-CTcngWvj.mjs";
-import { n as apiSuccess, r as handleError, t as apiError } from "../../../../../error-D9w94fjV.mjs";
-import { t as removeUploadAttempt } from "../../../../../upload-attempts-CNyGSepg.mjs";
-import { n as requireOwnerPerm, r as requirePerm } from "../../../../../authorize-ByYs-Uxs.mjs";
+import { n as computeContentHash, t as MAX_CONTENT_HASH_BYTES } from "../../../../../hash-3JJPlHF2.mjs";
+import { n as apiSuccess, r as handleError, t as apiError } from "../../../../../error-DFrQjppn.mjs";
+import { t as removeUploadAttempt } from "../../../../../upload-attempts-BsqoQ1fn.mjs";
+import { n as requireOwnerPerm, r as requirePerm } from "../../../../../authorize-Bkf_UHhD.mjs";
 import { ulid } from "ulidx";
 
 //#region src/astro/routes/api/media/[id]/upload.ts

package/dist/astro/routes/api/media/_id_/usage.mjs

@@ -2,25 +2,25 @@ import "../../../../../dialect-helpers-BSbfaO3F.mjs";
 import "../../../../../config-C3EBstHi.mjs";
 import "../../../../../base64-CvLhUKQv.mjs";
 import "../../../../../types-CQPWhPxE.mjs";
-import "../../../../../media-D6SeAfBl.mjs";
-import "../../../../../fts-manager-BhOdW0bi.mjs";
+import "../../../../../media-BBm8Wg3f.mjs";
+import "../../../../../fts-manager-Do1BlW2r.mjs";
 import "../../../../../capture-triggers-CNW1q3HK.mjs";
 import "../../../../../activation-K0kGBWuJ.mjs";
-import "../../../../../content-refresh-DLOfIhYc.mjs";
-import "../../../../../media-usage-work-C-fhM30c.mjs";
-import "../../../../../content-repair-BCxzy0r4.mjs";
-import "../../../../../collection-deletion-m_oi2c0N.mjs";
-import { t as handleMediaUsageDetails } from "../../../../../media-usage-BTRJvS6V.mjs";
-import { a as unwrapResult, t as apiError } from "../../../../../error-D9w94fjV.mjs";
-import { i as parseQuery, t as isParseError } from "../../../../../parse-BRJg1kz8.mjs";
-import { V as mediaUsageDetailsQuery } from "../../../../../media-BjwNuLEu.mjs";
-import "../../../../../redirects-CRIM55KH.mjs";
-import "../../../../../relations-BTPM2saV.mjs";
-import "../../../../../status-DDu8HIQl.mjs";
+import "../../../../../collection-deletion-Bj07NHbj.mjs";
+import "../../../../../content-refresh-Bwp-8yGy.mjs";
+import "../../../../../media-usage-work-D6D9sMCA.mjs";
+import "../../../../../content-repair-Czdp7jz5.mjs";
+import { t as handleMediaUsageDetails } from "../../../../../media-usage-CdY5jhSR.mjs";
+import { a as unwrapResult, t as apiError } from "../../../../../error-DFrQjppn.mjs";
+import { i as parseQuery, t as isParseError } from "../../../../../parse-Ckpg-Qfp.mjs";
+import { J as mediaUsageDetailsQuery } from "../../../../../media-BHjus86Y.mjs";
+import "../../../../../redirects-BLNOWQTn.mjs";
+import "../../../../../relations-C4htk5sb.mjs";
+import "../../../../../status-B777-dXz.mjs";
 import "../../../../../api/schemas/index.mjs";
-import "../../../../../api-tokens-B5NHLNUN.mjs";
-import { r as requirePerm } from "../../../../../authorize-ByYs-Uxs.mjs";
-import { t as requireScope } from "../../../../../scopes-vMR1uIbt.mjs";
+import "../../../../../api-tokens-BfYts-sq.mjs";
+import { r as requirePerm } from "../../../../../authorize-Bkf_UHhD.mjs";
+import { t as requireScope } from "../../../../../scopes-BhWvBavj.mjs";
 
 //#region src/astro/routes/api/media/[id]/usage.ts
 const prerender = false;

package/dist/astro/routes/api/media/_id_.mjs

@@ -2,24 +2,24 @@ import "../../../../dialect-helpers-BSbfaO3F.mjs";
 import "../../../../config-C3EBstHi.mjs";
 import "../../../../base64-CvLhUKQv.mjs";
 import "../../../../types-CQPWhPxE.mjs";
-import { t as MediaRepository } from "../../../../media-D6SeAfBl.mjs";
-import "../../../../fts-manager-BhOdW0bi.mjs";
+import { t as MediaRepository } from "../../../../media-BBm8Wg3f.mjs";
+import "../../../../fts-manager-Do1BlW2r.mjs";
 import "../../../../capture-triggers-CNW1q3HK.mjs";
 import "../../../../activation-K0kGBWuJ.mjs";
-import "../../../../content-refresh-DLOfIhYc.mjs";
-import "../../../../media-usage-work-C-fhM30c.mjs";
-import "../../../../content-repair-BCxzy0r4.mjs";
-import "../../../../collection-deletion-m_oi2c0N.mjs";
-import { a as handleMediaUsageSummaries } from "../../../../media-usage-BTRJvS6V.mjs";
-import { a as unwrapResult, n as apiSuccess, r as handleError, t as apiError } from "../../../../error-D9w94fjV.mjs";
-import { i as parseQuery, n as parseBody, t as isParseError } from "../../../../parse-BRJg1kz8.mjs";
-import { p as mediaGetQuery, w as mediaUpdateBody } from "../../../../media-BjwNuLEu.mjs";
-import "../../../../redirects-CRIM55KH.mjs";
-import "../../../../relations-BTPM2saV.mjs";
-import "../../../../status-DDu8HIQl.mjs";
+import "../../../../collection-deletion-Bj07NHbj.mjs";
+import "../../../../content-refresh-Bwp-8yGy.mjs";
+import "../../../../media-usage-work-D6D9sMCA.mjs";
+import "../../../../content-repair-Czdp7jz5.mjs";
+import { a as handleMediaUsageSummaries } from "../../../../media-usage-CdY5jhSR.mjs";
+import { a as unwrapResult, n as apiSuccess, r as handleError, t as apiError } from "../../../../error-DFrQjppn.mjs";
+import { i as parseQuery, n as parseBody, t as isParseError } from "../../../../parse-Ckpg-Qfp.mjs";
+import { O as mediaUpdateBody, m as mediaGetQuery } from "../../../../media-BHjus86Y.mjs";
+import "../../../../redirects-BLNOWQTn.mjs";
+import "../../../../relations-C4htk5sb.mjs";
+import "../../../../status-B777-dXz.mjs";
 import "../../../../api/schemas/index.mjs";
-import { t as removeUploadAttempt } from "../../../../upload-attempts-CNyGSepg.mjs";
-import { n as requireOwnerPerm, r as requirePerm, t as canReadMediaUsageCount } from "../../../../authorize-ByYs-Uxs.mjs";
+import { t as removeUploadAttempt } from "../../../../upload-attempts-BsqoQ1fn.mjs";
+import { n as requireOwnerPerm, r as requirePerm, t as canReadMediaUsageCount } from "../../../../authorize-Bkf_UHhD.mjs";
 
 //#region src/astro/routes/api/media/[id].ts
 const prerender = false;

package/dist/astro/routes/api/media/file/_...key_.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"_...key_.d.mts","names":[],"sources":["../../../../../../src/astro/routes/api/media/file/[...key].ts"],"mappings":";;;cAUa,SAAA;AAAA,cAoBA,GAAA,EAAK,QAAA"}
+{"version":3,"file":"_...key_.d.mts","names":[],"sources":["../../../../../../src/astro/routes/api/media/file/[...key].ts"],"mappings":";;;cAWa,SAAA;AAAA,cAoBA,GAAA,EAAK,QAAA"}

package/dist/astro/routes/api/media/file/_...key_.mjs

@@ -1,6 +1,7 @@
 import "../../../../../base64-CvLhUKQv.mjs";
 import "../../../../../types-CQPWhPxE.mjs";
-import { r as handleError, t as apiError } from "../../../../../error-D9w94fjV.mjs";
+import { r as handleError, t as apiError } from "../../../../../error-DFrQjppn.mjs";
+import { IMMUTABLE_IMAGE_CACHE, MUTABLE_MEDIA_CACHE_CONTROL } from "../../../../../media/image-endpoint.mjs";
 
 //#region src/astro/routes/api/media/file/[...key].ts
 const prerender = false;
@@ -31,7 +32,7 @@ const GET = async ({ params, locals }) => {
 		const result = await emdash.storage.download(key);
 		const headers = {
 			"Content-Type": result.contentType,
-			"Cache-Control": "public, max-age=31536000, immutable",
+			"Cache-Control": result.contentType.startsWith("image/") ? MUTABLE_MEDIA_CACHE_CONTROL : IMMUTABLE_IMAGE_CACHE,
 			"X-Content-Type-Options": "nosniff",
 			"Content-Security-Policy": "sandbox; default-src 'none'; img-src 'self'; style-src 'unsafe-inline'"
 		};

package/dist/astro/routes/api/media/file/_...key_.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"_...key_.mjs","names":[],"sources":["../../../../../../src/astro/routes/api/media/file/[...key].ts"],"sourcesContent":["/**\n * Serve uploaded media files\n *\n * GET /_emdash/api/media/file/:key - Serve file from storage\n */\n\nimport type { APIRoute } from \"astro\";\n\nimport { apiError, handleError } from \"#api/error.js\";\n\nexport const prerender = false;\n\n/**\n * Content types that are safe to display inline (simple raster/vector images, video, audio).\n * Everything else gets Content-Disposition: attachment to prevent script execution.\n */\nconst SAFE_INLINE_TYPES = new Set([\n\t\"image/jpeg\",\n\t\"image/png\",\n\t\"image/gif\",\n\t\"image/webp\",\n\t\"image/avif\",\n\t\"image/x-icon\",\n\t\"video/mp4\",\n\t\"video/webm\",\n\t\"audio/mpeg\",\n\t\"audio/wav\",\n\t\"audio/ogg\",\n]);\n\nexport const GET: APIRoute = async ({ params, locals }) => {\n\tconst { key } = params;\n\tconst { emdash } = locals;\n\n\tif (!key) {\n\t\treturn apiError(\"NOT_FOUND\", \"File not found\", 404);\n\t}\n\n\t// Backup archives share the storage bucket but hold the site's full\n\t// content export — they must never be reachable through the public,\n\t// unauthenticated media route. Admins download them via the\n\t// authenticated backups API.\n\tif (key.startsWith(\"backups/\")) {\n\t\treturn apiError(\"NOT_FOUND\", \"File not found\", 404);\n\t}\n\n\tif (!emdash?.storage) {\n\t\treturn apiError(\"NOT_CONFIGURED\", \"Storage not configured\", 500);\n\t}\n\n\ttry {\n\t\tconst result = await emdash.storage.download(key);\n\n\t\tconst headers: Record<string, string> = {\n\t\t\t\"Content-Type\": result.contentType,\n\t\t\t\"Cache-Control\": \"public, max-age=31536000, immutable\",\n\t\t\t\"X-Content-Type-Options\": \"nosniff\",\n\t\t\t// Sandbox CSP on all user-uploaded content — prevents script execution\n\t\t\t// even for SVGs navigated to directly or content types that support scripting.\n\t\t\t\"Content-Security-Policy\":\n\t\t\t\t\"sandbox; default-src 'none'; img-src 'self'; style-src 'unsafe-inline'\",\n\t\t};\n\n\t\tif (result.size) {\n\t\t\theaders[\"Content-Length\"] = String(result.size);\n\t\t}\n\n\t\t// Safe image/media types can render inline; everything else (SVG, PDF,\n\t\t// HTML, JS, etc.) must be downloaded to prevent stored XSS.\n\t\tif (SAFE_INLINE_TYPES.has(result.contentType)) {\n\t\t\theaders[\"Content-Disposition\"] = \"inline\";\n\t\t} else {\n\t\t\theaders[\"Content-Disposition\"] = \"attachment\";\n\t\t}\n\n\t\treturn new Response(result.body, { status: 200, headers });\n\t} catch (error) {\n\t\t// Check if it's a \"not found\" error\n\t\tif (\n\t\t\terror instanceof Error &&\n\t\t\t(error.message.includes(\"not found\") || error.message.includes(\"NOT_FOUND\"))\n\t\t) {\n\t\t\treturn apiError(\"NOT_FOUND\", \"File not found\", 404);\n\t\t}\n\t\treturn handleError(error, \"Failed to serve file\", \"FILE_SERVE_ERROR\");\n\t}\n};\n"],"mappings":";;;;;AAUA,MAAa,YAAY;;;;;AAMzB,MAAM,oBAAoB,IAAI,IAAI;CACjC;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA,CAAC;AAEF,MAAa,MAAgB,OAAO,EAAE,QAAQ,aAAa;CAC1D,MAAM,EAAE,QAAQ;CAChB,MAAM,EAAE,WAAW;AAEnB,KAAI,CAAC,IACJ,QAAO,SAAS,aAAa,kBAAkB,IAAI;AAOpD,KAAI,IAAI,WAAW,WAAW,CAC7B,QAAO,SAAS,aAAa,kBAAkB,IAAI;AAGpD,KAAI,CAAC,QAAQ,QACZ,QAAO,SAAS,kBAAkB,0BAA0B,IAAI;AAGjE,KAAI;EACH,MAAM,SAAS,MAAM,OAAO,QAAQ,SAAS,IAAI;EAEjD,MAAM,UAAkC;GACvC,gBAAgB,OAAO;GACvB,iBAAiB;GACjB,0BAA0B;GAG1B,2BACC;GACD;AAED,MAAI,OAAO,KACV,SAAQ,oBAAoB,OAAO,OAAO,KAAK;AAKhD,MAAI,kBAAkB,IAAI,OAAO,YAAY,CAC5C,SAAQ,yBAAyB;MAEjC,SAAQ,yBAAyB;AAGlC,SAAO,IAAI,SAAS,OAAO,MAAM;GAAE,QAAQ;GAAK;GAAS,CAAC;UAClD,OAAO;AAEf,MACC,iBAAiB,UAChB,MAAM,QAAQ,SAAS,YAAY,IAAI,MAAM,QAAQ,SAAS,YAAY,EAE3E,QAAO,SAAS,aAAa,kBAAkB,IAAI;AAEpD,SAAO,YAAY,OAAO,wBAAwB,mBAAmB"}
+{"version":3,"file":"_...key_.mjs","names":[],"sources":["../../../../../../src/astro/routes/api/media/file/[...key].ts"],"sourcesContent":["/**\n * Serve uploaded media files\n *\n * GET /_emdash/api/media/file/:key - Serve file from storage\n */\n\nimport type { APIRoute } from \"astro\";\n\nimport { apiError, handleError } from \"#api/error.js\";\nimport { IMMUTABLE_IMAGE_CACHE, MUTABLE_MEDIA_CACHE_CONTROL } from \"#media/image-endpoint.js\";\n\nexport const prerender = false;\n\n/**\n * Content types that are safe to display inline (simple raster/vector images, video, audio).\n * Everything else gets Content-Disposition: attachment to prevent script execution.\n */\nconst SAFE_INLINE_TYPES = new Set([\n\t\"image/jpeg\",\n\t\"image/png\",\n\t\"image/gif\",\n\t\"image/webp\",\n\t\"image/avif\",\n\t\"image/x-icon\",\n\t\"video/mp4\",\n\t\"video/webm\",\n\t\"audio/mpeg\",\n\t\"audio/wav\",\n\t\"audio/ogg\",\n]);\n\nexport const GET: APIRoute = async ({ params, locals }) => {\n\tconst { key } = params;\n\tconst { emdash } = locals;\n\n\tif (!key) {\n\t\treturn apiError(\"NOT_FOUND\", \"File not found\", 404);\n\t}\n\n\t// Backup archives share the storage bucket but hold the site's full\n\t// content export — they must never be reachable through the public,\n\t// unauthenticated media route. Admins download them via the\n\t// authenticated backups API.\n\tif (key.startsWith(\"backups/\")) {\n\t\treturn apiError(\"NOT_FOUND\", \"File not found\", 404);\n\t}\n\n\tif (!emdash?.storage) {\n\t\treturn apiError(\"NOT_CONFIGURED\", \"Storage not configured\", 500);\n\t}\n\n\ttry {\n\t\tconst result = await emdash.storage.download(key);\n\n\t\tconst headers: Record<string, string> = {\n\t\t\t\"Content-Type\": result.contentType,\n\t\t\t\"Cache-Control\": result.contentType.startsWith(\"image/\")\n\t\t\t\t? MUTABLE_MEDIA_CACHE_CONTROL\n\t\t\t\t: IMMUTABLE_IMAGE_CACHE,\n\t\t\t\"X-Content-Type-Options\": \"nosniff\",\n\t\t\t// Sandbox CSP on all user-uploaded content — prevents script execution\n\t\t\t// even for SVGs navigated to directly or content types that support scripting.\n\t\t\t\"Content-Security-Policy\":\n\t\t\t\t\"sandbox; default-src 'none'; img-src 'self'; style-src 'unsafe-inline'\",\n\t\t};\n\n\t\tif (result.size) {\n\t\t\theaders[\"Content-Length\"] = String(result.size);\n\t\t}\n\n\t\t// Safe image/media types can render inline; everything else (SVG, PDF,\n\t\t// HTML, JS, etc.) must be downloaded to prevent stored XSS.\n\t\tif (SAFE_INLINE_TYPES.has(result.contentType)) {\n\t\t\theaders[\"Content-Disposition\"] = \"inline\";\n\t\t} else {\n\t\t\theaders[\"Content-Disposition\"] = \"attachment\";\n\t\t}\n\n\t\treturn new Response(result.body, { status: 200, headers });\n\t} catch (error) {\n\t\t// Check if it's a \"not found\" error\n\t\tif (\n\t\t\terror instanceof Error &&\n\t\t\t(error.message.includes(\"not found\") || error.message.includes(\"NOT_FOUND\"))\n\t\t) {\n\t\t\treturn apiError(\"NOT_FOUND\", \"File not found\", 404);\n\t\t}\n\t\treturn handleError(error, \"Failed to serve file\", \"FILE_SERVE_ERROR\");\n\t}\n};\n"],"mappings":";;;;;;AAWA,MAAa,YAAY;;;;;AAMzB,MAAM,oBAAoB,IAAI,IAAI;CACjC;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA;CACA,CAAC;AAEF,MAAa,MAAgB,OAAO,EAAE,QAAQ,aAAa;CAC1D,MAAM,EAAE,QAAQ;CAChB,MAAM,EAAE,WAAW;AAEnB,KAAI,CAAC,IACJ,QAAO,SAAS,aAAa,kBAAkB,IAAI;AAOpD,KAAI,IAAI,WAAW,WAAW,CAC7B,QAAO,SAAS,aAAa,kBAAkB,IAAI;AAGpD,KAAI,CAAC,QAAQ,QACZ,QAAO,SAAS,kBAAkB,0BAA0B,IAAI;AAGjE,KAAI;EACH,MAAM,SAAS,MAAM,OAAO,QAAQ,SAAS,IAAI;EAEjD,MAAM,UAAkC;GACvC,gBAAgB,OAAO;GACvB,iBAAiB,OAAO,YAAY,WAAW,SAAS,GACrD,8BACA;GACH,0BAA0B;GAG1B,2BACC;GACD;AAED,MAAI,OAAO,KACV,SAAQ,oBAAoB,OAAO,OAAO,KAAK;AAKhD,MAAI,kBAAkB,IAAI,OAAO,YAAY,CAC5C,SAAQ,yBAAyB;MAEjC,SAAQ,yBAAyB;AAGlC,SAAO,IAAI,SAAS,OAAO,MAAM;GAAE,QAAQ;GAAK;GAAS,CAAC;UAClD,OAAO;AAEf,MACC,iBAAiB,UAChB,MAAM,QAAQ,SAAS,YAAY,IAAI,MAAM,QAAQ,SAAS,YAAY,EAE3E,QAAO,SAAS,aAAa,kBAAkB,IAAI;AAEpD,SAAO,YAAY,OAAO,wBAAwB,mBAAmB"}

package/dist/astro/routes/api/media/folders/_id_.mjs

@@ -1,15 +1,15 @@
 import "../../../../../config-C3EBstHi.mjs";
 import "../../../../../base64-CvLhUKQv.mjs";
 import "../../../../../types-CQPWhPxE.mjs";
-import { a as handleMediaFolderUpdate, n as handleMediaFolderDelete, r as handleMediaFolderGet } from "../../../../../media-folders-D-0CmRZj.mjs";
-import { a as unwrapResult, t as apiError } from "../../../../../error-D9w94fjV.mjs";
-import { n as parseBody, t as isParseError } from "../../../../../parse-BRJg1kz8.mjs";
-import { c as mediaFolderIdSchema, s as mediaFolderBody } from "../../../../../media-BjwNuLEu.mjs";
-import "../../../../../redirects-CRIM55KH.mjs";
-import "../../../../../relations-BTPM2saV.mjs";
-import "../../../../../status-DDu8HIQl.mjs";
+import { a as handleMediaFolderUpdate, n as handleMediaFolderDelete, r as handleMediaFolderGet } from "../../../../../media-folders-BGkATs8n.mjs";
+import { a as unwrapResult, t as apiError } from "../../../../../error-DFrQjppn.mjs";
+import { n as parseBody, t as isParseError } from "../../../../../parse-Ckpg-Qfp.mjs";
+import { c as mediaFolderBody, l as mediaFolderIdSchema } from "../../../../../media-BHjus86Y.mjs";
+import "../../../../../redirects-BLNOWQTn.mjs";
+import "../../../../../relations-C4htk5sb.mjs";
+import "../../../../../status-B777-dXz.mjs";
 import "../../../../../api/schemas/index.mjs";
-import { r as requirePerm } from "../../../../../authorize-ByYs-Uxs.mjs";
+import { r as requirePerm } from "../../../../../authorize-Bkf_UHhD.mjs";
 
 //#region src/astro/routes/api/media/folders/[id].ts
 const prerender = false;

package/dist/astro/routes/api/media/folders/index.mjs

@@ -1,15 +1,15 @@
 import "../../../../../config-C3EBstHi.mjs";
 import "../../../../../base64-CvLhUKQv.mjs";
 import "../../../../../types-CQPWhPxE.mjs";
-import { i as handleMediaFolderList, t as handleMediaFolderCreate } from "../../../../../media-folders-D-0CmRZj.mjs";
-import { a as unwrapResult, t as apiError } from "../../../../../error-D9w94fjV.mjs";
-import { i as parseQuery, n as parseBody, t as isParseError } from "../../../../../parse-BRJg1kz8.mjs";
-import { l as mediaFolderListQuery, s as mediaFolderBody } from "../../../../../media-BjwNuLEu.mjs";
-import "../../../../../redirects-CRIM55KH.mjs";
-import "../../../../../relations-BTPM2saV.mjs";
-import "../../../../../status-DDu8HIQl.mjs";
+import { i as handleMediaFolderList, t as handleMediaFolderCreate } from "../../../../../media-folders-BGkATs8n.mjs";
+import { a as unwrapResult, t as apiError } from "../../../../../error-DFrQjppn.mjs";
+import { i as parseQuery, n as parseBody, t as isParseError } from "../../../../../parse-Ckpg-Qfp.mjs";
+import { c as mediaFolderBody, u as mediaFolderListQuery } from "../../../../../media-BHjus86Y.mjs";
+import "../../../../../redirects-BLNOWQTn.mjs";
+import "../../../../../relations-C4htk5sb.mjs";
+import "../../../../../status-B777-dXz.mjs";
 import "../../../../../api/schemas/index.mjs";
-import { r as requirePerm } from "../../../../../authorize-ByYs-Uxs.mjs";
+import { r as requirePerm } from "../../../../../authorize-Bkf_UHhD.mjs";
 
 //#region src/astro/routes/api/media/folders/index.ts
 const prerender = false;

package/dist/astro/routes/api/media/providers/_providerId_/_itemId_.mjs

@@ -1,7 +1,7 @@
 import "../../../../../../base64-CvLhUKQv.mjs";
 import "../../../../../../types-CQPWhPxE.mjs";
-import { n as apiSuccess, r as handleError, t as apiError } from "../../../../../../error-D9w94fjV.mjs";
-import { r as requirePerm } from "../../../../../../authorize-ByYs-Uxs.mjs";
+import { n as apiSuccess, r as handleError, t as apiError } from "../../../../../../error-DFrQjppn.mjs";
+import { r as requirePerm } from "../../../../../../authorize-Bkf_UHhD.mjs";
 
 //#region src/astro/routes/api/media/providers/[providerId]/[itemId].ts
 const prerender = false;

package/dist/astro/routes/api/media/providers/_providerId_/index.mjs

@@ -1,7 +1,7 @@
 import "../../../../../../base64-CvLhUKQv.mjs";
 import "../../../../../../types-CQPWhPxE.mjs";
-import { n as apiSuccess, r as handleError, t as apiError } from "../../../../../../error-D9w94fjV.mjs";
-import { r as requirePerm } from "../../../../../../authorize-ByYs-Uxs.mjs";
+import { n as apiSuccess, r as handleError, t as apiError } from "../../../../../../error-DFrQjppn.mjs";
+import { r as requirePerm } from "../../../../../../authorize-Bkf_UHhD.mjs";
 
 //#region src/astro/routes/api/media/providers/[providerId]/index.ts
 const prerender = false;

package/dist/astro/routes/api/media/providers/index.mjs

@@ -1,7 +1,7 @@
 import "../../../../../base64-CvLhUKQv.mjs";
 import "../../../../../types-CQPWhPxE.mjs";
-import { n as apiSuccess, t as apiError } from "../../../../../error-D9w94fjV.mjs";
-import { r as requirePerm } from "../../../../../authorize-ByYs-Uxs.mjs";
+import { n as apiSuccess, t as apiError } from "../../../../../error-DFrQjppn.mjs";
+import { r as requirePerm } from "../../../../../authorize-Bkf_UHhD.mjs";
 
 //#region src/astro/routes/api/media/providers/index.ts
 const prerender = false;

package/dist/astro/routes/api/media/upload-url.mjs

@@ -1,19 +1,19 @@
 import "../../../../config-C3EBstHi.mjs";
 import "../../../../base64-CvLhUKQv.mjs";
 import "../../../../types-CQPWhPxE.mjs";
+import { t as MediaRepository } from "../../../../media-BBm8Wg3f.mjs";
 import { n as normalizeMime, t as matchesMimeAllowlist } from "../../../../mime-CUIG6x84.mjs";
-import { n as apiSuccess, r as handleError, t as apiError } from "../../../../error-D9w94fjV.mjs";
-import { n as parseBody, t as isParseError } from "../../../../parse-BRJg1kz8.mjs";
-import { T as mediaUploadUrlBody, n as DEFAULT_MAX_UPLOAD_SIZE } from "../../../../media-BjwNuLEu.mjs";
-import "../../../../redirects-CRIM55KH.mjs";
-import "../../../../relations-BTPM2saV.mjs";
-import "../../../../status-DDu8HIQl.mjs";
+import { n as apiSuccess, r as handleError, t as apiError } from "../../../../error-DFrQjppn.mjs";
+import { n as parseBody, t as isParseError } from "../../../../parse-Ckpg-Qfp.mjs";
+import { M as mediaUploadUrlBody, n as DEFAULT_MAX_UPLOAD_SIZE } from "../../../../media-BHjus86Y.mjs";
+import "../../../../redirects-BLNOWQTn.mjs";
+import "../../../../relations-C4htk5sb.mjs";
+import "../../../../status-B777-dXz.mjs";
 import "../../../../api/schemas/index.mjs";
-import { r as requirePerm } from "../../../../authorize-ByYs-Uxs.mjs";
-import { n as resolveFieldAllowlist, t as GLOBAL_UPLOAD_ALLOWLIST } from "../../../../media-allowlist-D35v7bmL.mjs";
+import { r as requirePerm } from "../../../../authorize-Bkf_UHhD.mjs";
+import { n as resolveFieldAllowlist, t as GLOBAL_UPLOAD_ALLOWLIST } from "../../../../media-allowlist-CoTBWoDp.mjs";
 import { ulid } from "ulidx";
 import * as path from "node:path";
-import { MediaRepository } from "emdash";
 
 //#region src/astro/routes/api/media/upload-url.ts
 /**
@@ -46,7 +46,7 @@ const POST = async ({ request, locals }) => {
 		const allowlist = (body.fieldId ? await resolveFieldAllowlist(emdash.db, body.fieldId) : null) ?? [...GLOBAL_UPLOAD_ALLOWLIST];
 		if (!matchesMimeAllowlist(body.contentType, allowlist)) return apiError("INVALID_TYPE", "File type not allowed", 400);
 		const repo = new MediaRepository(emdash.db);
-		if (body.contentHash && body.size > 0) {
+		if (body.deduplicate !== false && body.contentHash && body.size > 0) {
 			const existing = await repo.findByContentHash(body.contentHash);
 			if (existing && existing.mimeType === normalizedContentType && existing.size === body.size) return apiSuccess({
 				existing: true,
@@ -55,7 +55,8 @@ const POST = async ({ request, locals }) => {
 				url: `/_emdash/api/media/file/${existing.storageKey}`
 			});
 		}
-		const storageKey = `${ulid()}${path.extname(body.filename) || ""}`;
+		const filename = body.ensureUniqueFilename ? await repo.findAvailableFilename(body.filename) : body.filename;
+		const storageKey = `${ulid()}${path.extname(filename) || ""}`;
 		let signedUrl;
 		try {
 			signedUrl = await emdash.storage.getSignedUploadUrl({
@@ -69,11 +70,12 @@ const POST = async ({ request, locals }) => {
 			signedUrl = null;
 		}
 		const mediaItem = await repo.createPending({
-			filename: body.filename,
+			filename,
 			mimeType: normalizedContentType,
 			size: body.size,
 			storageKey,
-			authorId: user?.id
+			authorId: user?.id,
+			folderId: body.folderId
 		});
 		return apiSuccess({
 			uploadUrl: signedUrl?.url ?? `/_emdash/api/media/${mediaItem.id}/upload`,

package/dist/astro/routes/api/media/upload-url.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"upload-url.mjs","names":[],"sources":["../../../../../src/astro/routes/api/media/upload-url.ts"],"sourcesContent":["/**\n * Media upload URL endpoint\n *\n * POST /_emdash/api/media/upload-url\n *\n * Returns a signed URL for direct upload to storage.\n * Creates a pending media record that must be confirmed after upload.\n */\n\nimport * as path from \"node:path\";\n\nimport type { APIRoute } from \"astro\";\nimport { MediaRepository } from \"emdash\";\nimport { ulid } from \"ulidx\";\n\nimport { requirePerm } from \"#api/authorize.js\";\nimport { apiError, apiSuccess, handleError } from \"#api/error.js\";\nimport { GLOBAL_UPLOAD_ALLOWLIST, resolveFieldAllowlist } from \"#api/handlers/media-allowlist.js\";\nimport { isParseError, parseBody } from \"#api/parse.js\";\nimport { DEFAULT_MAX_UPLOAD_SIZE, mediaUploadUrlBody } from \"#api/schemas.js\";\nimport { matchesMimeAllowlist, normalizeMime } from \"#media/mime.js\";\n\nexport const prerender = false;\n\ninterface UploadUrlResponse {\n\tuploadUrl: string;\n\tmethod: \"PUT\";\n\theaders: Record<string, string>;\n\tmediaId: string;\n\tstorageKey: string;\n\texpiresAt: string;\n}\n\n/** Response when content already exists (deduplication) */\ninterface ExistingMediaResponse {\n\texisting: true;\n\tmediaId: string;\n\tstorageKey: string;\n\turl: string;\n}\n\nfunction isUnsupportedSignedUpload(error: unknown): boolean {\n\treturn error instanceof Error && \"code\" in error && error.code === \"NOT_SUPPORTED\";\n}\n\n/**\n * Get a signed upload URL for direct-to-storage upload\n */\nexport const POST: APIRoute = async ({ request, locals }) => {\n\tconst { emdash, user } = locals;\n\n\tconst denied = requirePerm(user, \"media:upload\");\n\tif (denied) return denied;\n\n\tif (!emdash?.storage) {\n\t\treturn apiError(\n\t\t\t\"NO_STORAGE\",\n\t\t\t\"Storage not configured. Signed URL uploads require S3-compatible storage.\",\n\t\t\t501,\n\t\t);\n\t}\n\n\tif (!emdash?.db) {\n\t\treturn apiError(\"NOT_CONFIGURED\", \"EmDash is not initialized\", 500);\n\t}\n\n\ttry {\n\t\tconst maxSize = emdash.config.maxUploadSize ?? DEFAULT_MAX_UPLOAD_SIZE;\n\t\tif (!Number.isFinite(maxSize) || maxSize <= 0) {\n\t\t\treturn apiError(\n\t\t\t\t\"CONFIGURATION_ERROR\",\n\t\t\t\t\"Invalid maxUploadSize configuration. Expected a positive finite number.\",\n\t\t\t\t500,\n\t\t\t);\n\t\t}\n\t\tconst body = await parseBody(request, mediaUploadUrlBody(maxSize));\n\t\tif (isParseError(body)) return body;\n\t\tconst normalizedContentType = normalizeMime(body.contentType);\n\n\t\t// Validate content type (field-aware widening)\n\t\tconst fieldAllowlist = body.fieldId\n\t\t\t? await resolveFieldAllowlist(emdash.db, body.fieldId)\n\t\t\t: null;\n\t\tconst allowlist = fieldAllowlist ?? [...GLOBAL_UPLOAD_ALLOWLIST];\n\n\t\tif (!matchesMimeAllowlist(body.contentType, allowlist)) {\n\t\t\treturn apiError(\"INVALID_TYPE\", \"File type not allowed\", 400);\n\t\t}\n\n\t\tconst repo = new MediaRepository(emdash.db);\n\n\t\t// Check for existing content with same hash (deduplication)\n\t\tif (body.contentHash && body.size > 0) {\n\t\t\tconst existing = await repo.findByContentHash(body.contentHash);\n\t\t\tif (existing && existing.mimeType === normalizedContentType && existing.size === body.size) {\n\t\t\t\tconst response: ExistingMediaResponse = {\n\t\t\t\t\texisting: true,\n\t\t\t\t\tmediaId: existing.id,\n\t\t\t\t\tstorageKey: existing.storageKey,\n\t\t\t\t\turl: `/_emdash/api/media/file/${existing.storageKey}`,\n\t\t\t\t};\n\t\t\t\treturn apiSuccess(response);\n\t\t\t}\n\t\t}\n\n\t\t// Generate unique storage key\n\t\tconst id = ulid();\n\t\tconst ext = path.extname(body.filename) || \"\";\n\t\tconst storageKey = `${id}${ext}`;\n\n\t\tlet signedUrl: Awaited<ReturnType<typeof emdash.storage.getSignedUploadUrl>> | null;\n\t\ttry {\n\t\t\tsignedUrl = await emdash.storage.getSignedUploadUrl({\n\t\t\t\tkey: storageKey,\n\t\t\t\tcontentType: body.contentType,\n\t\t\t\tsize: body.size,\n\t\t\t\texpiresIn: 3600,\n\t\t\t});\n\t\t} catch (error) {\n\t\t\tif (!isUnsupportedSignedUpload(error)) throw error;\n\t\t\tsignedUrl = null;\n\t\t}\n\n\t\tconst mediaItem = await repo.createPending({\n\t\t\tfilename: body.filename,\n\t\t\tmimeType: normalizedContentType,\n\t\t\tsize: body.size,\n\t\t\tstorageKey,\n\t\t\tauthorId: user?.id,\n\t\t});\n\n\t\tconst response: UploadUrlResponse = {\n\t\t\tuploadUrl: signedUrl?.url ?? `/_emdash/api/media/${mediaItem.id}/upload`,\n\t\t\tmethod: signedUrl?.method ?? \"PUT\",\n\t\t\theaders: signedUrl?.headers ?? {\n\t\t\t\t\"Content-Type\": normalizedContentType,\n\t\t\t\t\"X-EmDash-Request\": \"1\",\n\t\t\t},\n\t\t\tmediaId: mediaItem.id,\n\t\t\tstorageKey,\n\t\t\texpiresAt: signedUrl?.expiresAt ?? new Date(Date.now() + 3600 * 1000).toISOString(),\n\t\t};\n\n\t\treturn apiSuccess(response);\n\t} catch (error) {\n\t\treturn handleError(error, \"Failed to generate upload URL\", \"UPLOAD_URL_ERROR\");\n\t}\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAsBA,MAAa,YAAY;AAmBzB,SAAS,0BAA0B,OAAyB;AAC3D,QAAO,iBAAiB,SAAS,UAAU,SAAS,MAAM,SAAS;;;;;AAMpE,MAAa,OAAiB,OAAO,EAAE,SAAS,aAAa;CAC5D,MAAM,EAAE,QAAQ,SAAS;CAEzB,MAAM,SAAS,YAAY,MAAM,eAAe;AAChD,KAAI,OAAQ,QAAO;AAEnB,KAAI,CAAC,QAAQ,QACZ,QAAO,SACN,cACA,6EACA,IACA;AAGF,KAAI,CAAC,QAAQ,GACZ,QAAO,SAAS,kBAAkB,6BAA6B,IAAI;AAGpE,KAAI;EACH,MAAM,UAAU,OAAO,OAAO,iBAAiB;AAC/C,MAAI,CAAC,OAAO,SAAS,QAAQ,IAAI,WAAW,EAC3C,QAAO,SACN,uBACA,2EACA,IACA;EAEF,MAAM,OAAO,MAAM,UAAU,SAAS,mBAAmB,QAAQ,CAAC;AAClE,MAAI,aAAa,KAAK,CAAE,QAAO;EAC/B,MAAM,wBAAwB,cAAc,KAAK,YAAY;EAM7D,MAAM,aAHiB,KAAK,UACzB,MAAM,sBAAsB,OAAO,IAAI,KAAK,QAAQ,GACpD,SACiC,CAAC,GAAG,wBAAwB;AAEhE,MAAI,CAAC,qBAAqB,KAAK,aAAa,UAAU,CACrD,QAAO,SAAS,gBAAgB,yBAAyB,IAAI;EAG9D,MAAM,OAAO,IAAI,gBAAgB,OAAO,GAAG;AAG3C,MAAI,KAAK,eAAe,KAAK,OAAO,GAAG;GACtC,MAAM,WAAW,MAAM,KAAK,kBAAkB,KAAK,YAAY;AAC/D,OAAI,YAAY,SAAS,aAAa,yBAAyB,SAAS,SAAS,KAAK,KAOrF,QAAO,WANiC;IACvC,UAAU;IACV,SAAS,SAAS;IAClB,YAAY,SAAS;IACrB,KAAK,2BAA2B,SAAS;IACzC,CAC0B;;EAO7B,MAAM,aAAa,GAFR,MAAM,GACL,KAAK,QAAQ,KAAK,SAAS,IAAI;EAG3C,IAAI;AACJ,MAAI;AACH,eAAY,MAAM,OAAO,QAAQ,mBAAmB;IACnD,KAAK;IACL,aAAa,KAAK;IAClB,MAAM,KAAK;IACX,WAAW;IACX,CAAC;WACM,OAAO;AACf,OAAI,CAAC,0BAA0B,MAAM,CAAE,OAAM;AAC7C,eAAY;;EAGb,MAAM,YAAY,MAAM,KAAK,cAAc;GAC1C,UAAU,KAAK;GACf,UAAU;GACV,MAAM,KAAK;GACX;GACA,UAAU,MAAM;GAChB,CAAC;AAcF,SAAO,WAZ6B;GACnC,WAAW,WAAW,OAAO,sBAAsB,UAAU,GAAG;GAChE,QAAQ,WAAW,UAAU;GAC7B,SAAS,WAAW,WAAW;IAC9B,gBAAgB;IAChB,oBAAoB;IACpB;GACD,SAAS,UAAU;GACnB;GACA,WAAW,WAAW,aAAa,IAAI,KAAK,KAAK,KAAK,GAAG,OAAO,IAAK,CAAC,aAAa;GACnF,CAE0B;UACnB,OAAO;AACf,SAAO,YAAY,OAAO,iCAAiC,mBAAmB"}
+{"version":3,"file":"upload-url.mjs","names":[],"sources":["../../../../../src/astro/routes/api/media/upload-url.ts"],"sourcesContent":["/**\n * Media upload URL endpoint\n *\n * POST /_emdash/api/media/upload-url\n *\n * Returns a signed URL for direct upload to storage.\n * Creates a pending media record that must be confirmed after upload.\n */\n\nimport * as path from \"node:path\";\n\nimport type { APIRoute } from \"astro\";\nimport { ulid } from \"ulidx\";\n\nimport { requirePerm } from \"#api/authorize.js\";\nimport { apiError, apiSuccess, handleError } from \"#api/error.js\";\nimport { GLOBAL_UPLOAD_ALLOWLIST, resolveFieldAllowlist } from \"#api/handlers/media-allowlist.js\";\nimport { isParseError, parseBody } from \"#api/parse.js\";\nimport { DEFAULT_MAX_UPLOAD_SIZE, mediaUploadUrlBody } from \"#api/schemas.js\";\nimport { MediaRepository } from \"#db/repositories/media.js\";\nimport { matchesMimeAllowlist, normalizeMime } from \"#media/mime.js\";\n\nexport const prerender = false;\n\ninterface UploadUrlResponse {\n\tuploadUrl: string;\n\tmethod: \"PUT\";\n\theaders: Record<string, string>;\n\tmediaId: string;\n\tstorageKey: string;\n\texpiresAt: string;\n}\n\n/** Response when content already exists (deduplication) */\ninterface ExistingMediaResponse {\n\texisting: true;\n\tmediaId: string;\n\tstorageKey: string;\n\turl: string;\n}\n\nfunction isUnsupportedSignedUpload(error: unknown): boolean {\n\treturn error instanceof Error && \"code\" in error && error.code === \"NOT_SUPPORTED\";\n}\n\n/**\n * Get a signed upload URL for direct-to-storage upload\n */\nexport const POST: APIRoute = async ({ request, locals }) => {\n\tconst { emdash, user } = locals;\n\n\tconst denied = requirePerm(user, \"media:upload\");\n\tif (denied) return denied;\n\n\tif (!emdash?.storage) {\n\t\treturn apiError(\n\t\t\t\"NO_STORAGE\",\n\t\t\t\"Storage not configured. Signed URL uploads require S3-compatible storage.\",\n\t\t\t501,\n\t\t);\n\t}\n\n\tif (!emdash?.db) {\n\t\treturn apiError(\"NOT_CONFIGURED\", \"EmDash is not initialized\", 500);\n\t}\n\n\ttry {\n\t\tconst maxSize = emdash.config.maxUploadSize ?? DEFAULT_MAX_UPLOAD_SIZE;\n\t\tif (!Number.isFinite(maxSize) || maxSize <= 0) {\n\t\t\treturn apiError(\n\t\t\t\t\"CONFIGURATION_ERROR\",\n\t\t\t\t\"Invalid maxUploadSize configuration. Expected a positive finite number.\",\n\t\t\t\t500,\n\t\t\t);\n\t\t}\n\t\tconst body = await parseBody(request, mediaUploadUrlBody(maxSize));\n\t\tif (isParseError(body)) return body;\n\t\tconst normalizedContentType = normalizeMime(body.contentType);\n\n\t\t// Validate content type (field-aware widening)\n\t\tconst fieldAllowlist = body.fieldId\n\t\t\t? await resolveFieldAllowlist(emdash.db, body.fieldId)\n\t\t\t: null;\n\t\tconst allowlist = fieldAllowlist ?? [...GLOBAL_UPLOAD_ALLOWLIST];\n\n\t\tif (!matchesMimeAllowlist(body.contentType, allowlist)) {\n\t\t\treturn apiError(\"INVALID_TYPE\", \"File type not allowed\", 400);\n\t\t}\n\n\t\tconst repo = new MediaRepository(emdash.db);\n\n\t\t// Check for existing content with same hash (deduplication)\n\t\tif (body.deduplicate !== false && body.contentHash && body.size > 0) {\n\t\t\tconst existing = await repo.findByContentHash(body.contentHash);\n\t\t\tif (existing && existing.mimeType === normalizedContentType && existing.size === body.size) {\n\t\t\t\tconst response: ExistingMediaResponse = {\n\t\t\t\t\texisting: true,\n\t\t\t\t\tmediaId: existing.id,\n\t\t\t\t\tstorageKey: existing.storageKey,\n\t\t\t\t\turl: `/_emdash/api/media/file/${existing.storageKey}`,\n\t\t\t\t};\n\t\t\t\treturn apiSuccess(response);\n\t\t\t}\n\t\t}\n\t\tconst filename = body.ensureUniqueFilename\n\t\t\t? await repo.findAvailableFilename(body.filename)\n\t\t\t: body.filename;\n\n\t\t// Generate unique storage key\n\t\tconst id = ulid();\n\t\tconst ext = path.extname(filename) || \"\";\n\t\tconst storageKey = `${id}${ext}`;\n\n\t\tlet signedUrl: Awaited<ReturnType<typeof emdash.storage.getSignedUploadUrl>> | null;\n\t\ttry {\n\t\t\tsignedUrl = await emdash.storage.getSignedUploadUrl({\n\t\t\t\tkey: storageKey,\n\t\t\t\tcontentType: body.contentType,\n\t\t\t\tsize: body.size,\n\t\t\t\texpiresIn: 3600,\n\t\t\t});\n\t\t} catch (error) {\n\t\t\tif (!isUnsupportedSignedUpload(error)) throw error;\n\t\t\tsignedUrl = null;\n\t\t}\n\n\t\tconst mediaItem = await repo.createPending({\n\t\t\tfilename,\n\t\t\tmimeType: normalizedContentType,\n\t\t\tsize: body.size,\n\t\t\tstorageKey,\n\t\t\tauthorId: user?.id,\n\t\t\tfolderId: body.folderId,\n\t\t});\n\n\t\tconst response: UploadUrlResponse = {\n\t\t\tuploadUrl: signedUrl?.url ?? `/_emdash/api/media/${mediaItem.id}/upload`,\n\t\t\tmethod: signedUrl?.method ?? \"PUT\",\n\t\t\theaders: signedUrl?.headers ?? {\n\t\t\t\t\"Content-Type\": normalizedContentType,\n\t\t\t\t\"X-EmDash-Request\": \"1\",\n\t\t\t},\n\t\t\tmediaId: mediaItem.id,\n\t\t\tstorageKey,\n\t\t\texpiresAt: signedUrl?.expiresAt ?? new Date(Date.now() + 3600 * 1000).toISOString(),\n\t\t};\n\n\t\treturn apiSuccess(response);\n\t} catch (error) {\n\t\treturn handleError(error, \"Failed to generate upload URL\", \"UPLOAD_URL_ERROR\");\n\t}\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAsBA,MAAa,YAAY;AAmBzB,SAAS,0BAA0B,OAAyB;AAC3D,QAAO,iBAAiB,SAAS,UAAU,SAAS,MAAM,SAAS;;;;;AAMpE,MAAa,OAAiB,OAAO,EAAE,SAAS,aAAa;CAC5D,MAAM,EAAE,QAAQ,SAAS;CAEzB,MAAM,SAAS,YAAY,MAAM,eAAe;AAChD,KAAI,OAAQ,QAAO;AAEnB,KAAI,CAAC,QAAQ,QACZ,QAAO,SACN,cACA,6EACA,IACA;AAGF,KAAI,CAAC,QAAQ,GACZ,QAAO,SAAS,kBAAkB,6BAA6B,IAAI;AAGpE,KAAI;EACH,MAAM,UAAU,OAAO,OAAO,iBAAiB;AAC/C,MAAI,CAAC,OAAO,SAAS,QAAQ,IAAI,WAAW,EAC3C,QAAO,SACN,uBACA,2EACA,IACA;EAEF,MAAM,OAAO,MAAM,UAAU,SAAS,mBAAmB,QAAQ,CAAC;AAClE,MAAI,aAAa,KAAK,CAAE,QAAO;EAC/B,MAAM,wBAAwB,cAAc,KAAK,YAAY;EAM7D,MAAM,aAHiB,KAAK,UACzB,MAAM,sBAAsB,OAAO,IAAI,KAAK,QAAQ,GACpD,SACiC,CAAC,GAAG,wBAAwB;AAEhE,MAAI,CAAC,qBAAqB,KAAK,aAAa,UAAU,CACrD,QAAO,SAAS,gBAAgB,yBAAyB,IAAI;EAG9D,MAAM,OAAO,IAAI,gBAAgB,OAAO,GAAG;AAG3C,MAAI,KAAK,gBAAgB,SAAS,KAAK,eAAe,KAAK,OAAO,GAAG;GACpE,MAAM,WAAW,MAAM,KAAK,kBAAkB,KAAK,YAAY;AAC/D,OAAI,YAAY,SAAS,aAAa,yBAAyB,SAAS,SAAS,KAAK,KAOrF,QAAO,WANiC;IACvC,UAAU;IACV,SAAS,SAAS;IAClB,YAAY,SAAS;IACrB,KAAK,2BAA2B,SAAS;IACzC,CAC0B;;EAG7B,MAAM,WAAW,KAAK,uBACnB,MAAM,KAAK,sBAAsB,KAAK,SAAS,GAC/C,KAAK;EAKR,MAAM,aAAa,GAFR,MAAM,GACL,KAAK,QAAQ,SAAS,IAAI;EAGtC,IAAI;AACJ,MAAI;AACH,eAAY,MAAM,OAAO,QAAQ,mBAAmB;IACnD,KAAK;IACL,aAAa,KAAK;IAClB,MAAM,KAAK;IACX,WAAW;IACX,CAAC;WACM,OAAO;AACf,OAAI,CAAC,0BAA0B,MAAM,CAAE,OAAM;AAC7C,eAAY;;EAGb,MAAM,YAAY,MAAM,KAAK,cAAc;GAC1C;GACA,UAAU;GACV,MAAM,KAAK;GACX;GACA,UAAU,MAAM;GAChB,UAAU,KAAK;GACf,CAAC;AAcF,SAAO,WAZ6B;GACnC,WAAW,WAAW,OAAO,sBAAsB,UAAU,GAAG;GAChE,QAAQ,WAAW,UAAU;GAC7B,SAAS,WAAW,WAAW;IAC9B,gBAAgB;IAChB,oBAAoB;IACpB;GACD,SAAS,UAAU;GACnB;GACA,WAAW,WAAW,aAAa,IAAI,KAAK,KAAK,KAAK,GAAG,OAAO,IAAK,CAAC,aAAa;GACnF,CAE0B;UACnB,OAAO;AACf,SAAO,YAAY,OAAO,iCAAiC,mBAAmB"}

package/dist/astro/routes/api/media.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"media.d.mts","names":[],"sources":["../../../../src/astro/routes/api/media.ts"],"mappings":";;;cAyBa,SAAA;AAgBb;;;AAAA,cAAa,GAAA,EAAK,QAAA;;AAgElB;;;;cAAa,IAAA,EAAM,QAAA"}
+{"version":3,"file":"media.d.mts","names":[],"sources":["../../../../src/astro/routes/api/media.ts"],"mappings":";;;cAgCa,SAAA;AAgBb;;;AAAA,cAAa,GAAA,EAAK,QAAA;;AAgElB;;;;cAAa,IAAA,EAAM,QAAA"}