@fedify/fedify 2.0.0-pr.559.6 → 2.0.0

package/dist/{middleware-Ddt9Yu31.cjs → middleware-aQr0yVne.cjs}

@@ -4,10 +4,10 @@
         
 const require_chunk = require('./chunk-CGaQZ11T.cjs');
 const require_transformers = require('./transformers-3g8GZwkZ.cjs');
-const require_http = require('./http-BP6_JjsL.cjs');
-const require_proof = require('./proof-BrTneuEN.cjs');
+const require_http = require('./http-CowIBMKY.cjs');
+const require_proof = require('./proof-DQFAjOse.cjs');
 const require_types = require('./types-Cd_hszr_.cjs');
-const require_kv_cache = require('./kv-cache-yGgfNuY5.cjs');
+const require_kv_cache = require('./kv-cache-174yQHE6.cjs');
 const __logtape_logtape = require_chunk.__toESM(require("@logtape/logtape"));
 const __fedify_vocab = require_chunk.__toESM(require("@fedify/vocab"));
 const __opentelemetry_api = require_chunk.__toESM(require("@opentelemetry/api"));
@@ -339,7 +339,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl: FederationImpl$1 } = await Promise.resolve().then(() => require("./middleware-ACS5M4fZ.cjs"));
+		const { FederationImpl: FederationImpl$1 } = await Promise.resolve().then(() => require("./middleware-BYNnNj-3.cjs"));
 		const f = new FederationImpl$1(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -371,12 +371,7 @@ var FederationBuilderImpl = class {
 	setActorDispatcher(path, dispatcher) {
 		if (this.router.has("actor")) throw new RouterError("Actor dispatcher already set.");
 		const variables = this.router.add(path, "actor");
-		if (variables.size !== 1 || !(variables.has("identifier") || variables.has("handle"))) throw new RouterError("Path for actor dispatcher must have one variable: {identifier}");
-		if (variables.has("handle")) (0, __logtape_logtape.getLogger)([
-			"fedify",
-			"federation",
-			"actor"
-		]).warn("The {{handle}} variable in the actor dispatcher path is deprecated. Use {{identifier}} instead.");
+		if (variables.size !== 1 || !variables.has("identifier")) throw new RouterError("Path for actor dispatcher must have one variable: {identifier}");
 		const callbacks = { dispatcher: async (context$2, identifier) => {
 			const actor = await this._getTracer().startActiveSpan("activitypub.dispatch_actor", {
 				kind: __opentelemetry_api.SpanKind.SERVER,
@@ -538,12 +533,7 @@ var FederationBuilderImpl = class {
 			if (this.inboxPath !== path) throw new RouterError("Inbox dispatcher path must match inbox listener path.");
 		} else {
 			const variables = this.router.add(path, "inbox");
-			if (variables.size !== 1 || !(variables.has("identifier") || variables.has("handle"))) throw new RouterError("Path for inbox dispatcher must have one variable: {identifier}");
-			if (variables.has("handle")) (0, __logtape_logtape.getLogger)([
-				"fedify",
-				"federation",
-				"inbox"
-			]).warn("The {{handle}} variable in the inbox dispatcher path is deprecated. Use {{identifier}} instead.");
+			if (variables.size !== 1 || !variables.has("identifier")) throw new RouterError("Path for inbox dispatcher must have one variable: {identifier}");
 			this.inboxPath = path;
 		}
 		const callbacks = { dispatcher };
@@ -571,12 +561,7 @@ var FederationBuilderImpl = class {
 	setOutboxDispatcher(path, dispatcher) {
 		if (this.router.has("outbox")) throw new RouterError("Outbox dispatcher already set.");
 		const variables = this.router.add(path, "outbox");
-		if (variables.size !== 1 || !(variables.has("identifier") || variables.has("handle"))) throw new RouterError("Path for outbox dispatcher must have one variable: {identifier}");
-		if (variables.has("handle")) (0, __logtape_logtape.getLogger)([
-			"fedify",
-			"federation",
-			"outbox"
-		]).warn("The {{handle}} variable in the outbox dispatcher path is deprecated. Use {{identifier}} instead.");
+		if (variables.size !== 1 || !variables.has("identifier")) throw new RouterError("Path for outbox dispatcher must have one variable: {identifier}");
 		const callbacks = { dispatcher };
 		this.outboxCallbacks = callbacks;
 		const setters = {
@@ -602,12 +587,7 @@ var FederationBuilderImpl = class {
 	setFollowingDispatcher(path, dispatcher) {
 		if (this.router.has("following")) throw new RouterError("Following collection dispatcher already set.");
 		const variables = this.router.add(path, "following");
-		if (variables.size !== 1 || !(variables.has("identifier") || variables.has("handle"))) throw new RouterError("Path for following collection dispatcher must have one variable: {identifier}");
-		if (variables.has("handle")) (0, __logtape_logtape.getLogger)([
-			"fedify",
-			"federation",
-			"collection"
-		]).warn("The {{handle}} variable in the following collection dispatcher path is deprecated. Use {{identifier}} instead.");
+		if (variables.size !== 1 || !variables.has("identifier")) throw new RouterError("Path for following collection dispatcher must have one variable: {identifier}");
 		const callbacks = { dispatcher };
 		this.followingCallbacks = callbacks;
 		const setters = {
@@ -633,12 +613,7 @@ var FederationBuilderImpl = class {
 	setFollowersDispatcher(path, dispatcher) {
 		if (this.router.has("followers")) throw new RouterError("Followers collection dispatcher already set.");
 		const variables = this.router.add(path, "followers");
-		if (variables.size !== 1 || !(variables.has("identifier") || variables.has("handle"))) throw new RouterError("Path for followers collection dispatcher must have one variable: {identifier}");
-		if (variables.has("handle")) (0, __logtape_logtape.getLogger)([
-			"fedify",
-			"federation",
-			"collection"
-		]).warn("The {{handle}} variable in the followers collection dispatcher path is deprecated. Use {{identifier}} instead.");
+		if (variables.size !== 1 || !variables.has("identifier")) throw new RouterError("Path for followers collection dispatcher must have one variable: {identifier}");
 		const callbacks = { dispatcher };
 		this.followersCallbacks = callbacks;
 		const setters = {
@@ -664,12 +639,7 @@ var FederationBuilderImpl = class {
 	setLikedDispatcher(path, dispatcher) {
 		if (this.router.has("liked")) throw new RouterError("Liked collection dispatcher already set.");
 		const variables = this.router.add(path, "liked");
-		if (variables.size !== 1 || !(variables.has("identifier") || variables.has("handle"))) throw new RouterError("Path for liked collection dispatcher must have one variable: {identifier}");
-		if (variables.has("handle")) (0, __logtape_logtape.getLogger)([
-			"fedify",
-			"federation",
-			"collection"
-		]).warn("The {{handle}} variable in the liked collection dispatcher path is deprecated. Use {{identifier}} instead.");
+		if (variables.size !== 1 || !variables.has("identifier")) throw new RouterError("Path for liked collection dispatcher must have one variable: {identifier}");
 		const callbacks = { dispatcher };
 		this.likedCallbacks = callbacks;
 		const setters = {
@@ -695,12 +665,7 @@ var FederationBuilderImpl = class {
 	setFeaturedDispatcher(path, dispatcher) {
 		if (this.router.has("featured")) throw new RouterError("Featured collection dispatcher already set.");
 		const variables = this.router.add(path, "featured");
-		if (variables.size !== 1 || !(variables.has("identifier") || variables.has("handle"))) throw new RouterError("Path for featured collection dispatcher must have one variable: {identifier}");
-		if (variables.has("handle")) (0, __logtape_logtape.getLogger)([
-			"fedify",
-			"federation",
-			"collection"
-		]).warn("The {{handle}} variable in the featured collection dispatcher path is deprecated. Use {{identifier}} instead.");
+		if (variables.size !== 1 || !variables.has("identifier")) throw new RouterError("Path for featured collection dispatcher must have one variable: {identifier}");
 		const callbacks = { dispatcher };
 		this.featuredCallbacks = callbacks;
 		const setters = {
@@ -726,12 +691,7 @@ var FederationBuilderImpl = class {
 	setFeaturedTagsDispatcher(path, dispatcher) {
 		if (this.router.has("featuredTags")) throw new RouterError("Featured tags collection dispatcher already set.");
 		const variables = this.router.add(path, "featuredTags");
-		if (variables.size !== 1 || !(variables.has("identifier") || variables.has("handle"))) throw new RouterError("Path for featured tags collection dispatcher must have one variable: {identifier}");
-		if (variables.has("handle")) (0, __logtape_logtape.getLogger)([
-			"fedify",
-			"federation",
-			"collection"
-		]).warn("The {{handle}} variable in the featured tags collection dispatcher path is deprecated. Use {{identifier}} instead.");
+		if (variables.size !== 1 || !variables.has("identifier")) throw new RouterError("Path for featured tags collection dispatcher must have one variable: {identifier}");
 		const callbacks = { dispatcher };
 		this.featuredTagsCallbacks = callbacks;
 		const setters = {
@@ -760,13 +720,8 @@ var FederationBuilderImpl = class {
 			if (this.inboxPath !== inboxPath) throw new RouterError("Inbox listener path must match inbox dispatcher path.");
 		} else {
 			const variables = this.router.add(inboxPath, "inbox");
-			if (variables.size !== 1 || !(variables.has("identifier") || variables.has("handle"))) throw new RouterError("Path for inbox must have one variable: {identifier}");
+			if (variables.size !== 1 || !variables.has("identifier")) throw new RouterError("Path for inbox must have one variable: {identifier}");
 			this.inboxPath = inboxPath;
-			if (variables.has("handle")) (0, __logtape_logtape.getLogger)([
-				"fedify",
-				"federation",
-				"inbox"
-			]).warn("The {{handle}} variable in the inbox path is deprecated. Use {{identifier}} instead.");
 		}
 		if (sharedInboxPath != null) {
 			const siVars = this.router.add(sharedInboxPath, "sharedInbox");
@@ -2133,6 +2088,34 @@ function sendActivity(options) {
 		}
 	});
 }
+const MAX_ERROR_RESPONSE_BODY_BYTES = 1024;
+async function readLimitedResponseBody(response, maxBytes) {
+	if (response.body == null) return "";
+	const reader = response.body.getReader();
+	const decoder = new TextDecoder();
+	const chunks = [];
+	let totalBytes = 0;
+	let truncated = false;
+	try {
+		while (true) {
+			const { done, value } = await reader.read();
+			if (done) break;
+			if (totalBytes + value.length > maxBytes) {
+				const remaining = maxBytes - totalBytes;
+				if (remaining > 0) chunks.push(decoder.decode(value.slice(0, remaining), { stream: true }));
+				truncated = true;
+				break;
+			}
+			chunks.push(decoder.decode(value, { stream: true }));
+			totalBytes += value.length;
+		}
+	} finally {
+		reader.releaseLock();
+	}
+	let result = chunks.join("");
+	if (truncated) result += "… (truncated)";
+	return result;
+}
 async function sendActivityInternal({ activity, activityId, keys, inbox, headers, specDeterminer, tracerProvider }, span) {
 	const logger$1 = (0, __logtape_logtape.getLogger)([
 		"fedify",
@@ -2175,7 +2158,7 @@ async function sendActivityInternal({ activity, activityId, keys, inbox, headers
 	if (!response.ok) {
 		let error;
 		try {
-			error = await response.text();
+			error = await readLimitedResponseBody(response, MAX_ERROR_RESPONSE_BODY_BYTES);
 		} catch (_) {
 			error = "";
 		}
@@ -2210,7 +2193,10 @@ var SendActivityError = class extends Error {
 	*/
 	statusCode;
 	/**
-	* The response body from the inbox, if any.
+	* The response body from the inbox, if any.  Note that this may be
+	* truncated to a maximum of 1 KiB to prevent excessive memory consumption
+	* when remote servers return large error pages (e.g., Cloudflare error pages).
+	* If truncated, the string will end with `"… (truncated)"`.
 	*/
 	responseBody;
 	/**
@@ -2395,7 +2381,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 	outboxRetryPolicy;
 	inboxRetryPolicy;
 	activityTransformers;
-	tracerProvider;
+	_tracerProvider;
 	firstKnock;
 	constructor(options) {
 		super();
@@ -2477,9 +2463,12 @@ var FederationImpl = class extends FederationBuilderImpl {
 		this.outboxRetryPolicy = options.outboxRetryPolicy ?? createExponentialBackoffPolicy();
 		this.inboxRetryPolicy = options.inboxRetryPolicy ?? createExponentialBackoffPolicy();
 		this.activityTransformers = options.activityTransformers ?? require_transformers.getDefaultActivityTransformers();
-		this.tracerProvider = options.tracerProvider ?? __opentelemetry_api.trace.getTracerProvider();
+		this._tracerProvider = options.tracerProvider;
 		this.firstKnock = options.firstKnock;
 	}
+	get tracerProvider() {
+		return this._tracerProvider ?? __opentelemetry_api.trace.getTracerProvider();
+	}
 	_initializeRouter() {
 		this.router.add("/.well-known/webfinger", "webfinger");
 		this.router.add("/.well-known/nodeinfo", "nodeInfoJrd");
@@ -2520,18 +2509,24 @@ var FederationImpl = class extends FederationBuilderImpl {
 				kind: __opentelemetry_api.SpanKind.CONSUMER,
 				attributes: { "activitypub.activity.type": message.activityType }
 			}, extractedContext, async (span) => {
-				if (message.activityId != null) span.setAttribute("activitypub.activity.id", message.activityId);
-				try {
-					await this.#listenFanoutMessage(contextData, message);
-				} catch (e) {
-					span.setStatus({
-						code: __opentelemetry_api.SpanStatusCode.ERROR,
-						message: String(e)
-					});
-					throw e;
-				} finally {
-					span.end();
-				}
+				const spanCtx = span.spanContext();
+				return await (0, __logtape_logtape.withContext)({
+					traceId: spanCtx.traceId,
+					spanId: spanCtx.spanId
+				}, async () => {
+					if (message.activityId != null) span.setAttribute("activitypub.activity.id", message.activityId);
+					try {
+						await this.#listenFanoutMessage(contextData, message);
+					} catch (e) {
+						span.setStatus({
+							code: __opentelemetry_api.SpanStatusCode.ERROR,
+							message: String(e)
+						});
+						throw e;
+					} finally {
+						span.end();
+					}
+				});
 			});
 			else if (message.type === "outbox") await tracer.startActiveSpan("activitypub.outbox", {
 				kind: __opentelemetry_api.SpanKind.CONSUMER,
@@ -2540,34 +2535,46 @@ var FederationImpl = class extends FederationBuilderImpl {
 					"activitypub.activity.retries": message.attempt
 				}
 			}, extractedContext, async (span) => {
-				if (message.activityId != null) span.setAttribute("activitypub.activity.id", message.activityId);
-				try {
-					await this.#listenOutboxMessage(contextData, message, span);
-				} catch (e) {
-					span.setStatus({
-						code: __opentelemetry_api.SpanStatusCode.ERROR,
-						message: String(e)
-					});
-					throw e;
-				} finally {
-					span.end();
-				}
+				const spanCtx = span.spanContext();
+				return await (0, __logtape_logtape.withContext)({
+					traceId: spanCtx.traceId,
+					spanId: spanCtx.spanId
+				}, async () => {
+					if (message.activityId != null) span.setAttribute("activitypub.activity.id", message.activityId);
+					try {
+						await this.#listenOutboxMessage(contextData, message, span);
+					} catch (e) {
+						span.setStatus({
+							code: __opentelemetry_api.SpanStatusCode.ERROR,
+							message: String(e)
+						});
+						throw e;
+					} finally {
+						span.end();
+					}
+				});
 			});
 			else if (message.type === "inbox") await tracer.startActiveSpan("activitypub.inbox", {
 				kind: __opentelemetry_api.SpanKind.CONSUMER,
 				attributes: { "activitypub.shared_inbox": message.identifier == null }
 			}, extractedContext, async (span) => {
-				try {
-					await this.#listenInboxMessage(contextData, message, span);
-				} catch (e) {
-					span.setStatus({
-						code: __opentelemetry_api.SpanStatusCode.ERROR,
-						message: String(e)
-					});
-					throw e;
-				} finally {
-					span.end();
-				}
+				const spanCtx = span.spanContext();
+				return await (0, __logtape_logtape.withContext)({
+					traceId: spanCtx.traceId,
+					spanId: spanCtx.spanId
+				}, async () => {
+					try {
+						await this.#listenInboxMessage(contextData, message, span);
+					} catch (e) {
+						span.setStatus({
+							code: __opentelemetry_api.SpanStatusCode.ERROR,
+							message: String(e)
+						});
+						throw e;
+					} finally {
+						span.end();
+					}
+				});
 			});
 		});
 	}
@@ -2731,7 +2738,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		if (message.identifier != null) context$2 = this.#createContext(baseUrl, ctxData, { documentLoader: await context$2.getDocumentLoader({ identifier: message.identifier }) });
 		else if (this.sharedInboxKeyDispatcher != null) {
 			const identity = await this.sharedInboxKeyDispatcher(context$2);
-			if (identity != null) context$2 = this.#createContext(baseUrl, ctxData, { documentLoader: "identifier" in identity || "username" in identity || "handle" in identity ? await context$2.getDocumentLoader(identity) : context$2.getDocumentLoader(identity) });
+			if (identity != null) context$2 = this.#createContext(baseUrl, ctxData, { documentLoader: "identifier" in identity || "username" in identity ? await context$2.getDocumentLoader(identity) : context$2.getDocumentLoader(identity) });
 		}
 		const activity = await __fedify_vocab.Activity.fromJsonLd(message.activity, context$2);
 		span.setAttribute("activitypub.activity.type", (0, __fedify_vocab.getTypeId)(activity).href);
@@ -3040,54 +3047,60 @@ var FederationImpl = class extends FederationBuilderImpl {
 					[__opentelemetry_semantic_conventions.ATTR_URL_FULL]: request.url
 				}
 			}, async (span) => {
-				const logger$1 = (0, __logtape_logtape.getLogger)([
-					"fedify",
-					"federation",
-					"http"
-				]);
-				if (span.isRecording()) for (const [k, v] of request.headers) span.setAttribute((0, __opentelemetry_semantic_conventions.ATTR_HTTP_REQUEST_HEADER)(k), [v]);
-				let response;
-				try {
-					response = await this.#fetch(request, {
-						...options,
-						span,
-						tracer
-					});
-					if (acceptsJsonLd(request)) response.headers.set("Vary", "Accept");
-				} catch (error) {
-					span.setStatus({
-						code: __opentelemetry_api.SpanStatusCode.ERROR,
-						message: `${error}`
-					});
+				const spanCtx = span.spanContext();
+				return await (0, __logtape_logtape.withContext)({
+					traceId: spanCtx.traceId,
+					spanId: spanCtx.spanId
+				}, async () => {
+					const logger$1 = (0, __logtape_logtape.getLogger)([
+						"fedify",
+						"federation",
+						"http"
+					]);
+					if (span.isRecording()) for (const [k, v] of request.headers) span.setAttribute((0, __opentelemetry_semantic_conventions.ATTR_HTTP_REQUEST_HEADER)(k), [v]);
+					let response;
+					try {
+						response = await this.#fetch(request, {
+							...options,
+							span,
+							tracer
+						});
+						if (acceptsJsonLd(request)) response.headers.set("Vary", "Accept");
+					} catch (error) {
+						span.setStatus({
+							code: __opentelemetry_api.SpanStatusCode.ERROR,
+							message: `${error}`
+						});
+						span.end();
+						logger$1.error("An error occurred while serving request {method} {url}: {error}", {
+							method: request.method,
+							url: request.url,
+							error
+						});
+						throw error;
+					}
+					if (span.isRecording()) {
+						span.setAttribute(__opentelemetry_semantic_conventions.ATTR_HTTP_RESPONSE_STATUS_CODE, response.status);
+						for (const [k, v] of response.headers) span.setAttribute((0, __opentelemetry_semantic_conventions.ATTR_HTTP_RESPONSE_HEADER)(k), [v]);
+						span.setStatus({
+							code: response.status >= 500 ? __opentelemetry_api.SpanStatusCode.ERROR : __opentelemetry_api.SpanStatusCode.UNSET,
+							message: response.statusText
+						});
+					}
 					span.end();
-					logger$1.error("An error occurred while serving request {method} {url}: {error}", {
+					const url = new URL(request.url);
+					const logTpl = "{method} {path}: {status}";
+					const values = {
 						method: request.method,
+						path: `${url.pathname}${url.search}`,
 						url: request.url,
-						error
-					});
-					throw error;
-				}
-				if (span.isRecording()) {
-					span.setAttribute(__opentelemetry_semantic_conventions.ATTR_HTTP_RESPONSE_STATUS_CODE, response.status);
-					for (const [k, v] of response.headers) span.setAttribute((0, __opentelemetry_semantic_conventions.ATTR_HTTP_RESPONSE_HEADER)(k), [v]);
-					span.setStatus({
-						code: response.status >= 500 ? __opentelemetry_api.SpanStatusCode.ERROR : __opentelemetry_api.SpanStatusCode.UNSET,
-						message: response.statusText
-					});
-				}
-				span.end();
-				const url = new URL(request.url);
-				const logTpl = "{method} {path}: {status}";
-				const values = {
-					method: request.method,
-					path: `${url.pathname}${url.search}`,
-					url: request.url,
-					status: response.status
-				};
-				if (response.status >= 500) logger$1.error(logTpl, values);
-				else if (response.status >= 400) logger$1.warn(logTpl, values);
-				else logger$1.info(logTpl, values);
-				return response;
+						status: response.status
+					};
+					if (response.status >= 500) logger$1.error(logTpl, values);
+					else if (response.status >= 400) logger$1.warn(logTpl, values);
+					else logger$1.info(logTpl, values);
+					return response;
+				});
 			});
 		});
 	}
@@ -3121,9 +3134,9 @@ var FederationImpl = class extends FederationBuilderImpl {
 		if (request.method !== "POST" && !acceptsJsonLd(request)) return await onNotAcceptable(request);
 		switch (routeName) {
 			case "actor":
-				context$2 = this.#createContext(request, contextData, { invokedFromActorDispatcher: { identifier: route.values.identifier ?? route.values.handle } });
+				context$2 = this.#createContext(request, contextData, { invokedFromActorDispatcher: { identifier: route.values.identifier } });
 				return await handleActor(request, {
-					identifier: route.values.identifier ?? route.values.handle,
+					identifier: route.values.identifier,
 					context: context$2,
 					actorDispatcher: this.actorCallbacks?.dispatcher,
 					authorizePredicate: this.actorCallbacks?.authorizePredicate,
@@ -3149,7 +3162,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			}
 			case "outbox": return await handleCollection(request, {
 				name: "outbox",
-				identifier: route.values.identifier ?? route.values.handle,
+				identifier: route.values.identifier,
 				uriGetter: context$2.getOutboxUri.bind(context$2),
 				context: context$2,
 				collectionCallbacks: this.outboxCallbacks,
@@ -3160,7 +3173,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			case "inbox":
 				if (request.method !== "POST") return await handleCollection(request, {
 					name: "inbox",
-					identifier: route.values.identifier ?? route.values.handle,
+					identifier: route.values.identifier,
 					uriGetter: context$2.getInboxUri.bind(context$2),
 					context: context$2,
 					collectionCallbacks: this.inboxCallbacks,
@@ -3168,15 +3181,15 @@ var FederationImpl = class extends FederationBuilderImpl {
 					onUnauthorized,
 					onNotFound
 				});
-				context$2 = this.#createContext(request, contextData, { documentLoader: await context$2.getDocumentLoader({ identifier: route.values.identifier ?? route.values.handle }) });
+				context$2 = this.#createContext(request, contextData, { documentLoader: await context$2.getDocumentLoader({ identifier: route.values.identifier }) });
 			case "sharedInbox":
 				if (routeName !== "inbox" && this.sharedInboxKeyDispatcher != null) {
 					const identity = await this.sharedInboxKeyDispatcher(context$2);
-					if (identity != null) context$2 = this.#createContext(request, contextData, { documentLoader: "identifier" in identity || "username" in identity || "handle" in identity ? await context$2.getDocumentLoader(identity) : context$2.getDocumentLoader(identity) });
+					if (identity != null) context$2 = this.#createContext(request, contextData, { documentLoader: "identifier" in identity || "username" in identity ? await context$2.getDocumentLoader(identity) : context$2.getDocumentLoader(identity) });
 				}
 				if (!this.manuallyStartQueue) this._startQueueInternal(contextData);
 				return await handleInbox(request, {
-					recipient: route.values.identifier ?? route.values.handle ?? null,
+					recipient: route.values.identifier ?? null,
 					context: context$2,
 					inboxContextFactory: context$2.toInboxContext.bind(context$2),
 					kv: this.kv,
@@ -3193,7 +3206,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				});
 			case "following": return await handleCollection(request, {
 				name: "following",
-				identifier: route.values.identifier ?? route.values.handle,
+				identifier: route.values.identifier,
 				uriGetter: context$2.getFollowingUri.bind(context$2),
 				context: context$2,
 				collectionCallbacks: this.followingCallbacks,
@@ -3210,7 +3223,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				}
 				return await handleCollection(request, {
 					name: "followers",
-					identifier: route.values.identifier ?? route.values.handle,
+					identifier: route.values.identifier,
 					uriGetter: baseUrl == null ? context$2.getFollowersUri.bind(context$2) : (identifier) => {
 						const uri = context$2.getFollowersUri(identifier);
 						uri.searchParams.set("base-url", baseUrl);
@@ -3227,7 +3240,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			}
 			case "liked": return await handleCollection(request, {
 				name: "liked",
-				identifier: route.values.identifier ?? route.values.handle,
+				identifier: route.values.identifier,
 				uriGetter: context$2.getLikedUri.bind(context$2),
 				context: context$2,
 				collectionCallbacks: this.likedCallbacks,
@@ -3237,7 +3250,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			});
 			case "featured": return await handleCollection(request, {
 				name: "featured",
-				identifier: route.values.identifier ?? route.values.handle,
+				identifier: route.values.identifier,
 				uriGetter: context$2.getFeaturedUri.bind(context$2),
 				context: context$2,
 				collectionCallbacks: this.featuredCallbacks,
@@ -3247,7 +3260,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			});
 			case "featuredTags": return await handleCollection(request, {
 				name: "featured tags",
-				identifier: route.values.identifier ?? route.values.handle,
+				identifier: route.values.identifier,
 				uriGetter: context$2.getFeaturedTagsUri.bind(context$2),
 				context: context$2,
 				collectionCallbacks: this.featuredTagsCallbacks,
@@ -3345,10 +3358,7 @@ var ContextImpl = class ContextImpl {
 		return new URL(path, this.canonicalOrigin);
 	}
 	getActorUri(identifier) {
-		const path = this.federation.router.build("actor", {
-			identifier,
-			handle: identifier
-		});
+		const path = this.federation.router.build("actor", { identifier });
 		if (path == null) throw new RouterError("No actor dispatcher registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
@@ -3361,10 +3371,7 @@ var ContextImpl = class ContextImpl {
 		return new URL(path, this.canonicalOrigin);
 	}
 	getOutboxUri(identifier) {
-		const path = this.federation.router.build("outbox", {
-			identifier,
-			handle: identifier
-		});
+		const path = this.federation.router.build("outbox", { identifier });
 		if (path == null) throw new RouterError("No outbox dispatcher registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
@@ -3374,50 +3381,32 @@ var ContextImpl = class ContextImpl {
 			if (path$1 == null) throw new RouterError("No shared inbox path registered.");
 			return new URL(path$1, this.canonicalOrigin);
 		}
-		const path = this.federation.router.build("inbox", {
-			identifier,
-			handle: identifier
-		});
+		const path = this.federation.router.build("inbox", { identifier });
 		if (path == null) throw new RouterError("No inbox path registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
 	getFollowingUri(identifier) {
-		const path = this.federation.router.build("following", {
-			identifier,
-			handle: identifier
-		});
+		const path = this.federation.router.build("following", { identifier });
 		if (path == null) throw new RouterError("No following collection path registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
 	getFollowersUri(identifier) {
-		const path = this.federation.router.build("followers", {
-			identifier,
-			handle: identifier
-		});
+		const path = this.federation.router.build("followers", { identifier });
 		if (path == null) throw new RouterError("No followers collection path registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
 	getLikedUri(identifier) {
-		const path = this.federation.router.build("liked", {
-			identifier,
-			handle: identifier
-		});
+		const path = this.federation.router.build("liked", { identifier });
 		if (path == null) throw new RouterError("No liked collection path registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
 	getFeaturedUri(identifier) {
-		const path = this.federation.router.build("featured", {
-			identifier,
-			handle: identifier
-		});
+		const path = this.federation.router.build("featured", { identifier });
 		if (path == null) throw new RouterError("No featured collection path registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
 	getFeaturedTagsUri(identifier) {
-		const path = this.federation.router.build("featuredTags", {
-			identifier,
-			handle: identifier
-		});
+		const path = this.federation.router.build("featuredTags", { identifier });
 		if (path == null) throw new RouterError("No featured tags collection path registered.");
 		return new URL(path, this.canonicalOrigin);
 	}
@@ -3430,24 +3419,15 @@ var ContextImpl = class ContextImpl {
 		if (uri == null) return null;
 		if (uri.origin !== this.origin && uri.origin !== this.canonicalOrigin) return null;
 		const route = this.federation.router.route(uri.pathname);
-		const logger$1 = (0, __logtape_logtape.getLogger)(["fedify", "federation"]);
 		if (route == null) return null;
 		else if (route.name === "sharedInbox") return {
 			type: "inbox",
-			identifier: void 0,
-			get handle() {
-				logger$1.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
-				return void 0;
-			}
+			identifier: void 0
 		};
-		const identifier = "identifier" in route.values ? route.values.identifier : route.values.handle;
+		const identifier = route.values.identifier;
 		if (route.name === "actor") return {
 			type: "actor",
-			identifier,
-			get handle() {
-				logger$1.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
-				return identifier;
-			}
+			identifier
 		};
 		else if (route.name.startsWith("object:")) {
 			const typeId = route.name.replace(/^object:/, "");
@@ -3459,59 +3439,31 @@ var ContextImpl = class ContextImpl {
 			};
 		} else if (route.name === "inbox") return {
 			type: "inbox",
-			identifier,
-			get handle() {
-				logger$1.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
-				return identifier;
-			}
+			identifier
 		};
 		else if (route.name === "outbox") return {
 			type: "outbox",
-			identifier,
-			get handle() {
-				logger$1.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
-				return identifier;
-			}
+			identifier
 		};
 		else if (route.name === "following") return {
 			type: "following",
-			identifier,
-			get handle() {
-				logger$1.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
-				return identifier;
-			}
+			identifier
 		};
 		else if (route.name === "followers") return {
 			type: "followers",
-			identifier,
-			get handle() {
-				logger$1.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
-				return identifier;
-			}
+			identifier
 		};
 		else if (route.name === "liked") return {
 			type: "liked",
-			identifier,
-			get handle() {
-				logger$1.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
-				return identifier;
-			}
+			identifier
 		};
 		else if (route.name === "featured") return {
 			type: "featured",
-			identifier,
-			get handle() {
-				logger$1.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
-				return identifier;
-			}
+			identifier
 		};
 		else if (route.name === "featuredTags") return {
 			type: "featuredTags",
-			identifier,
-			get handle() {
-				logger$1.warn("The ParseUriResult.handle property is deprecated; use ParseUriResult.identifier instead.");
-				return identifier;
-			}
+			identifier
 		};
 		const collectionTypes = ["collection", "orderedCollection"];
 		const collectionRegex = /* @__PURE__ */ new RegExp(`^(${collectionTypes.join("|")}):(.*)$`);
@@ -3613,19 +3565,10 @@ var ContextImpl = class ContextImpl {
 		return null;
 	}
 	getDocumentLoader(identity) {
-		if ("identifier" in identity || "username" in identity || "handle" in identity) {
+		if ("identifier" in identity || "username" in identity) {
 			let identifierPromise;
-			if ("username" in identity || "handle" in identity) {
-				let username;
-				if ("username" in identity) username = identity.username;
-				else {
-					username = identity.handle;
-					(0, __logtape_logtape.getLogger)([
-						"fedify",
-						"runtime",
-						"docloader"
-					]).warn("The \"handle\" property is deprecated; use \"identifier\" or \"username\" instead.", { identity });
-				}
+			if ("username" in identity) {
+				const username = identity.username;
 				const mapper = this.federation.actorCallbacks?.handleMapper;
 				if (mapper == null) identifierPromise = Promise.resolve(username);
 				else {
@@ -3711,15 +3654,10 @@ var ContextImpl = class ContextImpl {
 		]);
 		let keys;
 		let identifier = null;
-		if ("identifier" in sender || "username" in sender || "handle" in sender) {
+		if ("identifier" in sender || "username" in sender) {
 			if ("identifier" in sender) identifier = sender.identifier;
 			else {
-				let username;
-				if ("username" in sender) username = sender.username;
-				else {
-					username = sender.handle;
-					logger$1.warn("The \"handle\" property for the sender parameter is deprecated; use \"identifier\" or \"username\" instead.", { sender });
-				}
+				const username = sender.username;
 				if (this.federation.actorCallbacks?.handleMapper == null) identifier = username;
 				else {
 					const mapped = await this.federation.actorCallbacks.handleMapper(this, username);
@@ -4075,15 +4013,10 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 		]);
 		let keys;
 		let identifier = null;
-		if ("identifier" in forwarder || "username" in forwarder || "handle" in forwarder) {
+		if ("identifier" in forwarder || "username" in forwarder) {
 			if ("identifier" in forwarder) identifier = forwarder.identifier;
 			else {
-				let username;
-				if ("username" in forwarder) username = forwarder.username;
-				else {
-					username = forwarder.handle;
-					logger$1.warn("The \"handle\" property for the forwarder parameter is deprecated; use \"identifier\" or \"username\" instead.", { forwarder });
-				}
+				const username = forwarder.username;
 				if (this.federation.actorCallbacks?.handleMapper == null) identifier = username;
 				else {
 					const mapped = await this.federation.actorCallbacks.handleMapper(this, username);