@fedify/fedify 2.4.0-dev.1599 → 2.4.0-dev.1618

package/dist/{http-yainOC9t.mjs → http-CT7tcVBN.mjs}

@@ -1,10 +1,10 @@
 import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-BCt09TJn.mjs";
-import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-C-pKLuAU.mjs";
+import { n as version, t as name } from "./deno-DepnPEgI.mjs";
+import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-D1NrDWq-.mjs";
 import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature } from "./accept-8PiolDP7.mjs";
-import { o as validateCryptoKey, r as fetchKeyDetailed } from "./key-DcLwG7x4.mjs";
+import { o as validateCryptoKey, r as fetchKeyDetailed } from "./key-C3t-PS3M.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";

package/dist/{http-zJsVCnKu.cjs → http-D5ylizT7.cjs}

@@ -11,7 +11,7 @@ let _opentelemetry_semantic_conventions = require("@opentelemetry/semantic-conve
 let byte_encodings_base64 = require("byte-encodings/base64");
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.4.0-dev.1599+7b19967f";
+var version = "2.4.0-dev.1618+58858243";
 //#endregion
 //#region src/sig/accept.ts
 /**

package/dist/{http--wLYmH1x.js → http-DD07Erm7.js}

@@ -10,7 +10,7 @@ import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } fro
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.4.0-dev.1599+7b19967f";
+var version = "2.4.0-dev.1618+58858243";
 //#endregion
 //#region src/sig/accept.ts
 /**

package/dist/{key-DcLwG7x4.mjs → key-C3t-PS3M.mjs}

@@ -1,8 +1,8 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-BCt09TJn.mjs";
-import { _ as recordKeyLookup, n as getDurationMs, t as classifyFetchError } from "./metrics-C-pKLuAU.mjs";
+import { n as version, t as name } from "./deno-DepnPEgI.mjs";
+import { _ as recordKeyLookup, n as getDurationMs, t as classifyFetchError } from "./metrics-D1NrDWq-.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey, Multikey, Object as Object$1, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";

package/dist/{kv-cache-0TGAGm8S.js → kv-cache-Bvv7Wp8h.js}

@@ -1,6 +1,6 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { C as recordDocumentCache, d as validateCryptoKey, t as doubleKnock } from "./http--wLYmH1x.js";
+import { C as recordDocumentCache, d as validateCryptoKey, t as doubleKnock } from "./http-DD07Erm7.js";
 import { getLogger } from "@logtape/logtape";
 import { curry } from "es-toolkit";
 import { UrlError, createActivityPubRequest, getRemoteDocument, logRequest, preloadedContexts, validatePublicUrl } from "@fedify/vocab-runtime";

package/dist/{kv-cache-SZL9uu3V.mjs → kv-cache-CK273Baz.mjs}

@@ -1,7 +1,7 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { p as recordDocumentCache } from "./metrics-C-pKLuAU.mjs";
+import { p as recordDocumentCache } from "./metrics-D1NrDWq-.mjs";
 import { getLogger } from "@logtape/logtape";
 import { preloadedContexts } from "@fedify/vocab-runtime";
 //#region src/utils/kv-cache.ts

package/dist/{kv-cache-BPu_M3-N.cjs → kv-cache-DbFdquuM.cjs}

@@ -1,6 +1,6 @@
 const { URLPattern } = require("urlpattern-polyfill");
 require("./chunk-Czpeue4M.cjs");
-const require_http = require("./http-zJsVCnKu.cjs");
+const require_http = require("./http-D5ylizT7.cjs");
 const require_temporal_polyfill = require("./temporal-polyfill-BCdTHexd.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let es_toolkit = require("es-toolkit");

package/dist/{ld-B-jskR-q.mjs → ld-D8wAPjxC.mjs}

@@ -1,9 +1,9 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-BCt09TJn.mjs";
-import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-C-pKLuAU.mjs";
-import { n as fetchKey, o as validateCryptoKey } from "./key-DcLwG7x4.mjs";
+import { n as version, t as name } from "./deno-DepnPEgI.mjs";
+import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-D1NrDWq-.mjs";
+import { n as fetchKey, o as validateCryptoKey } from "./key-C3t-PS3M.mjs";
 import { getLogger } from "@logtape/logtape";
 import { Activity, CryptographicKey, Object as Object$1, getTypeId } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";

package/dist/{metrics-C-pKLuAU.mjs → metrics-D1NrDWq-.mjs}

@@ -1,7 +1,7 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-BCt09TJn.mjs";
+import { n as version, t as name } from "./deno-DepnPEgI.mjs";
 import { metrics } from "@opentelemetry/api";
 import { FetchError } from "@fedify/vocab-runtime";
 //#region src/federation/metrics.ts

package/dist/{middleware-DGEQ07xT.mjs → middleware-BRunoF2v.mjs}

@@ -1,26 +1,26 @@
 import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-BCt09TJn.mjs";
-import { a as instrumentDocumentLoader, b as recordWebFingerHandle, c as recordCircuitBreakerStateChange, d as recordCollectionRequest, f as recordCollectionTotalItems, g as recordInboxActivity, h as recordFanoutRecipients, i as getRemoteHost, l as recordCollectionDispatchDuration, n as getDurationMs, o as isAbortError, r as getFederationMetrics, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "./metrics-C-pKLuAU.mjs";
+import { n as version, t as name } from "./deno-DepnPEgI.mjs";
+import { a as instrumentDocumentLoader, b as recordWebFingerHandle, c as recordCircuitBreakerStateChange, d as recordCollectionRequest, f as recordCollectionTotalItems, g as recordInboxActivity, h as recordFanoutRecipients, i as getRemoteHost, l as recordCollectionDispatchDuration, n as getDurationMs, o as isAbortError, r as getFederationMetrics, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "./metrics-D1NrDWq-.mjs";
 import { t as formatAcceptSignature } from "./accept-8PiolDP7.mjs";
-import { a as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-DcLwG7x4.mjs";
-import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-yainOC9t.mjs";
-import { t as getAuthenticatedDocumentLoader } from "./docloader-BrRjFwOp.mjs";
-import { n as kvCache } from "./kv-cache-SZL9uu3V.mjs";
-import { _ as wrapContextLoaderForJsonLd, a as compactJsonLd, c as getNormalizationContextLoader, d as isClearlyMalformedContextReference, f as isInvalidUrlTypeError, l as hasSignature, m as verifyCompactJsonLd, p as signJsonLd, r as assertSafeJsonLd, s as detachSignature, t as InvalidContextReferenceError, u as hasSignatureLike } from "./ld-B-jskR-q.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-CeJuB8wq.mjs";
+import { a as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-C3t-PS3M.mjs";
+import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-CT7tcVBN.mjs";
+import { t as getAuthenticatedDocumentLoader } from "./docloader-C_IefWRb.mjs";
+import { n as kvCache } from "./kv-cache-CK273Baz.mjs";
+import { _ as wrapContextLoaderForJsonLd, a as compactJsonLd, c as getNormalizationContextLoader, d as isClearlyMalformedContextReference, f as isInvalidUrlTypeError, l as hasSignature, m as verifyCompactJsonLd, p as signJsonLd, r as assertSafeJsonLd, s as detachSignature, t as InvalidContextReferenceError, u as hasSignatureLike } from "./ld-D8wAPjxC.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-BjdNNmKF.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-URuqsICz.mjs";
-import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-917XYw_e.mjs";
+import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-1Xy5Ur-T.mjs";
 import { t as getNodeInfo } from "./client-CjF5IYQS.mjs";
 import { t as nodeInfoToJson } from "./types-CrtdVuDP.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-CDi3XQ0V.mjs";
-import { n as FederationBuilderImpl, t as ACTOR_ALIAS_PREFIX } from "./builder-BvCI7Xch.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-ClJ4UcZL.mjs";
+import { n as FederationBuilderImpl, t as ACTOR_ALIAS_PREFIX } from "./builder-C4a7TAvq.mjs";
 import { t as CircuitBreaker } from "./circuit-breaker-CBGyz5F7.mjs";
 import { t as buildCollectionSynchronizationHeader } from "./collection-BIhlldqK.mjs";
 import { t as KvKeyCache } from "./keycache-_DHqz5z_.mjs";
 import { t as acceptsJsonLd } from "./negotiation-RuwrPFqi.mjs";
-import { t as hasMalformedKnownTemporalLiteral } from "./temporal-jusSJxbN.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "./temporal-wA-b1IAz.mjs";
 import { t as createExponentialBackoffPolicy } from "./retry-DgFqeS5k.mjs";
 import { t as TaskCodec } from "./codec-BBga-FWI.mjs";
 import { n as ParallelMessageQueue } from "./mq-llHKivST.mjs";
@@ -1025,6 +1025,193 @@ async function handleOutbox(request, { identifier, context: ctx, outboxContextFa
 		headers: { "Content-Type": "text/plain; charset=utf-8" }
 	});
 }
+const plainTextHeaders = { "Content-Type": "text/plain; charset=utf-8" };
+/**
+* Handles a media upload request (the [ActivityPub Media Upload
+* extension](https://www.w3.org/wiki/SocialCG/ActivityPub/MediaUpload)).
+* @template TContextData The context data to pass to the context.
+* @param request The HTTP request.
+* @param parameters The parameters for handling the request.
+* @returns A promise that resolves to an HTTP response.
+* @since 2.4.0
+*/
+async function handleMediaUpload(request, { identifier, context: ctx, mediaUploaderCallback, actorDispatcher, authorizePredicate, isRegisteredObjectUri, onUnauthorized, onNotFound }) {
+	const logger = getLogger([
+		"fedify",
+		"federation",
+		"mediaUploader"
+	]);
+	if (request.bodyUsed) {
+		logger.error("Request body has already been read.", { identifier });
+		return new Response("Internal server error.", {
+			status: 500,
+			headers: plainTextHeaders
+		});
+	} else if (request.body?.locked) {
+		logger.error("Request body is locked.", { identifier });
+		return new Response("Internal server error.", {
+			status: 500,
+			headers: plainTextHeaders
+		});
+	}
+	const contentType = request.headers.get("content-type");
+	if (contentType == null || !contentType.toLowerCase().startsWith("multipart/form-data")) {
+		logger.error("The media upload request is not multipart/form-data (got {contentType}).", {
+			identifier,
+			contentType
+		});
+		return new Response("Unsupported media type.", {
+			status: 415,
+			headers: plainTextHeaders
+		});
+	}
+	if (actorDispatcher == null) {
+		logger.error("Actor dispatcher is not set.", { identifier });
+		return await onNotFound(request);
+	}
+	const actor = await actorDispatcher(ctx, identifier);
+	if (actor == null || actor instanceof Tombstone) {
+		logger.error("Actor {identifier} not found.", { identifier });
+		return await onNotFound(request);
+	}
+	if (authorizePredicate != null) {
+		let body;
+		try {
+			body = await request.arrayBuffer();
+		} catch (error) {
+			logger.error("Failed to read the multipart/form-data body:\n{error}", {
+				identifier,
+				error
+			});
+			return new Response("Invalid multipart/form-data body.", {
+				status: 400,
+				headers: plainTextHeaders
+			});
+		}
+		const rebuild = () => new Request(request.url, {
+			method: request.method,
+			headers: request.headers,
+			body: body.byteLength > 0 ? body : void 0
+		});
+		const authorizeContext = ctx.clone(ctx.data);
+		authorizeContext.request = rebuild();
+		if (!await authorizePredicate(authorizeContext, identifier)) return await onUnauthorized(rebuild());
+		request = rebuild();
+	}
+	let form;
+	try {
+		form = await request.formData();
+	} catch (error) {
+		logger.error("Failed to parse the multipart/form-data body:\n{error}", {
+			identifier,
+			error
+		});
+		return new Response("Invalid multipart/form-data body.", {
+			status: 400,
+			headers: plainTextHeaders
+		});
+	}
+	const file = form.get("file");
+	if (!(file instanceof File)) {
+		logger.error("The media upload request has no file field.", { identifier });
+		return new Response("Missing file field.", {
+			status: 400,
+			headers: plainTextHeaders
+		});
+	}
+	const objectField = form.get("object");
+	if (objectField == null) {
+		logger.error("The media upload request has no object field.", { identifier });
+		return new Response("Missing object field.", {
+			status: 400,
+			headers: plainTextHeaders
+		});
+	}
+	let object;
+	try {
+		const objectText = typeof objectField === "string" ? objectField : await objectField.text();
+		object = await Object$1.fromJsonLd(JSON.parse(objectText), ctx);
+	} catch (error) {
+		logger.error("Failed to parse the object field:\n{error}", {
+			identifier,
+			error
+		});
+		return new Response("Invalid object field.", {
+			status: 400,
+			headers: plainTextHeaders
+		});
+	}
+	let result;
+	try {
+		result = await mediaUploaderCallback(ctx, identifier, file, object);
+	} catch (error) {
+		logger.error("Failed to process the media upload:\n{error}", {
+			identifier,
+			error
+		});
+		return new Response("Internal server error.", {
+			status: 500,
+			headers: plainTextHeaders
+		});
+	}
+	if (result == null) {
+		logger.error("The media uploader callback for {identifier} returned null or undefined; it must return an object (201 Created) or a URL (202 Accepted).", { identifier });
+		return new Response("Internal server error.", {
+			status: 500,
+			headers: plainTextHeaders
+		});
+	}
+	const warnUnlessRegistered = (target) => {
+		if (isRegisteredObjectUri(target)) return;
+		logger.warn("The media uploader callback for {identifier} returned {target}, which does not point at a registered object dispatcher route; derive the returned id/URL from Context.getObjectUri().  The upload still succeeded.", {
+			identifier,
+			target: target.href
+		});
+	};
+	if (result instanceof URL) {
+		warnUnlessRegistered(result);
+		logger.info("The media upload for {identifier} is still being processed; responding 202 Accepted.", {
+			identifier,
+			location: result.href
+		});
+		return new Response(null, {
+			status: 202,
+			headers: { Location: result.href }
+		});
+	}
+	if (result.id == null) {
+		logger.error("The media uploader callback for {identifier} returned an object without an id, so a 201 Created response cannot include the required Location header.  Set the object's id with Context.getObjectUri(), or return the eventual URL to respond 202 Accepted instead.", { identifier });
+		return new Response("Internal server error.", {
+			status: 500,
+			headers: plainTextHeaders
+		});
+	}
+	warnUnlessRegistered(result.id);
+	let jsonLd;
+	try {
+		jsonLd = await result.toJsonLd(ctx);
+	} catch (error) {
+		logger.error("Failed to serialize the uploaded object to JSON-LD:\n{error}", {
+			identifier,
+			error
+		});
+		return new Response("Internal server error.", {
+			status: 500,
+			headers: plainTextHeaders
+		});
+	}
+	logger.info("The media upload for {identifier} is ready; responding 201 Created.", {
+		identifier,
+		location: result.id.href
+	});
+	return new Response(JSON.stringify(jsonLd), {
+		status: 201,
+		headers: {
+			"Content-Type": "application/activity+json",
+			Location: result.id.href
+		}
+	});
+}
 /**
 * Handles an inbox request for ActivityPub activities.
 * @template TContextData The context data to pass to the context.
@@ -2641,6 +2828,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 	benchmarkMode;
 	benchmarkMetricReader;
 	benchmarkTriggerOptions;
+	#mediaUploaderNoAuthWarned = false;
 	#queueDepthGaugeSourceId = `fedify-${(++nextQueueDepthGaugeSourceId).toString(36)}`;
 	#queueDepthGaugeEntries = [];
 	#queueDepthGaugeMeterProvider;
@@ -3956,6 +4144,32 @@ var FederationImpl = class extends FederationBuilderImpl {
 			});
 			case "benchmarkStats": return await handleBenchmarkStats(request, this.benchmarkMetricReader);
 			case "benchmarkTrigger": return await handleBenchmarkTrigger(request, context, this.benchmarkTriggerOptions);
+			case "mediaUploader":
+				if (request.method !== "POST" || this.mediaUploaderCallback == null) return new Response("Method not allowed.", {
+					status: 405,
+					headers: {
+						Allow: "POST",
+						"Content-Type": "text/plain; charset=utf-8"
+					}
+				});
+				if (this.mediaUploaderAuthorizePredicate == null && !this.#mediaUploaderNoAuthWarned) {
+					this.#mediaUploaderNoAuthWarned = true;
+					getLogger([
+						"fedify",
+						"federation",
+						"mediaUploader"
+					]).warn("The media uploader is registered without an authorize() hook, so it accepts uploads from anyone who can reach the endpoint.  Protect it with .authorize() unless a public upload endpoint is intended.");
+				}
+				return await handleMediaUpload(request, {
+					identifier: route.values.identifier,
+					context,
+					mediaUploaderCallback: this.mediaUploaderCallback,
+					actorDispatcher: this.actorCallbacks?.dispatcher,
+					authorizePredicate: this.mediaUploaderAuthorizePredicate,
+					isRegisteredObjectUri: (uri) => context.parseUri(uri)?.type === "object",
+					onUnauthorized,
+					onNotFound
+				});
 		}
 		if (request.method !== "POST" && !acceptsJsonLd(request)) {
 			metricState.endpoint = "not_acceptable";
@@ -4190,6 +4404,7 @@ function getEndpointCategory(routeName) {
 		case "inbox": return "inbox";
 		case "sharedInbox": return "shared_inbox";
 		case "outbox": return "outbox";
+		case "mediaUploader": return "media_upload";
 		case "following": return "following";
 		case "followers": return "followers";
 		case "liked": return "liked";
@@ -4323,6 +4538,11 @@ var ContextImpl = class ContextImpl {
 		if (path == null) throw new RouterError("No outbox dispatcher registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
+	getMediaUploaderUri(identifier) {
+		const path = this.federation.router.build("mediaUploader", { identifier });
+		if (path == null) throw new RouterError("No media uploader registered.");
+		return new URL(path, this.canonicalOrigin);
+	}
 	getInboxUri(identifier) {
 		if (identifier == null) {
 			const path = this.federation.router.build("sharedInbox", {});

package/dist/{middleware-HFQkD-r8.mjs → middleware-CaP0k3AD.mjs}

@@ -1,5 +1,5 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as FederationImpl } from "./middleware-DGEQ07xT.mjs";
+import { n as FederationImpl } from "./middleware-BRunoF2v.mjs";
 export { FederationImpl };