@fedify/fedify 2.0.0-pr.490.2 → 2.0.0-pr.559.4

package/dist/{middleware-Ck7O6mb0.cjs → middleware-hWyKOO_6.cjs}

@@ -3,22 +3,21 @@
           const { URLPattern } = require("urlpattern-polyfill");
         
 const require_chunk = require('./chunk-DqRYRqnO.cjs');
-const require_transformers = require('./transformers-CoBS-oFG.cjs');
-const require_lookup = require('./lookup-BTqtVATt.cjs');
-const require_actor = require('./actor-CBfPjuWj.cjs');
-const require_http = require('./http-Dxpqz4hE.cjs');
-const require_proof = require('./proof-fEwcA7LA.cjs');
-const require_types = require('./types-CWgzGaqk.cjs');
-const require_kv_cache = require('./kv-cache-BMpfJFTx.cjs');
-const require_vocab = require('./vocab-X_X5T8D3.cjs');
+const require_transformers = require('./transformers-BjBg6Lag.cjs');
+const require_http = require('./http-DKBUv5zZ.cjs');
+const require_proof = require('./proof-Bmi8ZIcW.cjs');
+const require_types = require('./types-B6z6CqIz.cjs');
+const require_kv_cache = require('./kv-cache-DCJojeTn.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"));
-const __fedify_vocab_runtime = require_chunk.__toESM(require("@fedify/vocab-runtime"));
 const es_toolkit = require_chunk.__toESM(require("es-toolkit"));
 const uri_template_router = require_chunk.__toESM(require("uri-template-router"));
 const url_template = require_chunk.__toESM(require("url-template"));
 const byte_encodings_hex = require_chunk.__toESM(require("byte-encodings/hex"));
 const __opentelemetry_semantic_conventions = require_chunk.__toESM(require("@opentelemetry/semantic-conventions"));
+const __fedify_vocab_runtime = require_chunk.__toESM(require("@fedify/vocab-runtime"));
+const __fedify_webfinger = require_chunk.__toESM(require("@fedify/webfinger"));
 const node_url = require_chunk.__toESM(require("node:url"));
 
 //#region src/federation/inbox.ts
@@ -42,7 +41,7 @@ var InboxListenerSet = class InboxListenerSet {
 		if (inboxListeners == null) return null;
 		while (true) {
 			if (inboxListeners.has(cls)) break;
-			if (cls === require_actor.Activity) return null;
+			if (cls === __fedify_vocab.Activity) return null;
 			cls = globalThis.Object.getPrototypeOf(cls);
 		}
 		const listener = inboxListeners.get(cls);
@@ -63,7 +62,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 	]);
 	let cacheKey = null;
 	if (activity.id != null) {
-		const inboxContext = inboxContextFactory(recipient, json, activity.id?.href, require_actor.getTypeId(activity).href);
+		const inboxContext = inboxContextFactory(recipient, json, activity.id?.href, (0, __fedify_vocab.getTypeId)(activity).href);
 		const strategy = idempotencyStrategy ?? "per-inbox";
 		let keyString;
 		if (typeof strategy === "function") {
@@ -142,7 +141,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 		return "enqueued";
 	}
 	tracerProvider = tracerProvider ?? __opentelemetry_api.trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(require_lookup.deno_default.name, require_lookup.deno_default.version);
+	const tracer = tracerProvider.getTracer(require_http.deno_default.name, require_http.deno_default.version);
 	return await tracer.startActiveSpan("activitypub.dispatch_inbox_listener", { kind: __opentelemetry_api.SpanKind.INTERNAL }, async (span$1) => {
 		const dispatched = inboxListeners?.dispatchWithClass(activity);
 		if (dispatched == null) {
@@ -152,7 +151,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 			});
 			span$1.setStatus({
 				code: __opentelemetry_api.SpanStatusCode.UNSET,
-				message: `Unsupported activity type: ${require_actor.getTypeId(activity).href}`
+				message: `Unsupported activity type: ${(0, __fedify_vocab.getTypeId)(activity).href}`
 			});
 			span$1.end();
 			return "unsupportedActivity";
@@ -160,7 +159,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 		const { class: cls, listener } = dispatched;
 		span$1.updateName(`activitypub.dispatch_inbox_listener ${cls.name}`);
 		try {
-			await listener(inboxContextFactory(recipient, json, activity?.id?.href, require_actor.getTypeId(activity).href), activity);
+			await listener(inboxContextFactory(recipient, json, activity?.id?.href, (0, __fedify_vocab.getTypeId)(activity).href), activity);
 		} catch (error) {
 			try {
 				await inboxErrorHandler?.(ctx, error);
@@ -324,6 +323,7 @@ var FederationBuilderImpl = class {
 	inboxListeners;
 	inboxErrorHandler;
 	sharedInboxKeyDispatcher;
+	outboxPermanentFailureHandler;
 	idempotencyStrategy;
 	collectionTypeIds;
 	collectionCallbacks;
@@ -339,7 +339,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl: FederationImpl$1 } = await Promise.resolve().then(() => require("./middleware-Z8lc_drL.cjs"));
+		const { FederationImpl: FederationImpl$1 } = await Promise.resolve().then(() => require("./middleware-BFiwWMA2.cjs"));
 		const f = new FederationImpl$1(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -361,11 +361,12 @@ var FederationBuilderImpl = class {
 		f.inboxListeners = this.inboxListeners?.clone();
 		f.inboxErrorHandler = this.inboxErrorHandler;
 		f.sharedInboxKeyDispatcher = this.sharedInboxKeyDispatcher;
+		f.outboxPermanentFailureHandler = this.outboxPermanentFailureHandler;
 		f.idempotencyStrategy = this.idempotencyStrategy;
 		return f;
 	}
 	_getTracer() {
-		return __opentelemetry_api.trace.getTracer(require_lookup.deno_default.name, require_lookup.deno_default.version);
+		return __opentelemetry_api.trace.getTracer(require_http.deno_default.name, require_http.deno_default.version);
 	}
 	setActorDispatcher(path, dispatcher) {
 		if (this.router.has("actor")) throw new RouterError("Actor dispatcher already set.");
@@ -385,7 +386,7 @@ var FederationBuilderImpl = class {
 					const actor$1 = await dispatcher(context$2, identifier);
 					span.setAttribute("activitypub.actor.id", (actor$1?.id ?? context$2.getActorUri(identifier)).href);
 					if (actor$1 == null) span.setStatus({ code: __opentelemetry_api.SpanStatusCode.ERROR });
-					else span.setAttribute("activitypub.actor.type", require_actor.getTypeId(actor$1).href);
+					else span.setAttribute("activitypub.actor.type", (0, __fedify_vocab.getTypeId)(actor$1).href);
 					return actor$1;
 				} catch (error) {
 					span.setStatus({
@@ -508,7 +509,7 @@ var FederationBuilderImpl = class {
 						const object = await dispatcher(ctx, values);
 						span.setAttribute("activitypub.object.id", (object?.id ?? ctx.getObjectUri(cls, values)).href);
 						if (object == null) span.setStatus({ code: __opentelemetry_api.SpanStatusCode.ERROR });
-						else span.setAttribute("activitypub.object.type", require_actor.getTypeId(object).href);
+						else span.setAttribute("activitypub.object.type", (0, __fedify_vocab.getTypeId)(object).href);
 						return object;
 					} catch (e) {
 						span.setStatus({
@@ -842,6 +843,9 @@ var FederationBuilderImpl = class {
 		const path = this.router.build(`collection:${routeName}`, values) ?? this.router.build(`orderedCollection:${routeName}`, values);
 		return path;
 	}
+	setOutboxPermanentFailureHandler(handler) {
+		this.outboxPermanentFailureHandler = handler;
+	}
 	/**
 	* Converts a name (string or symbol) to a unique string identifier.
 	* For symbols, generates and caches a UUID if not already present.
@@ -923,10 +927,10 @@ var KvKeyCache = class {
 		const serialized = await this.kv.get([...this.prefix, keyId.href]);
 		if (serialized == null) return void 0;
 		try {
-			return await require_actor.CryptographicKey.fromJsonLd(serialized, this.options);
+			return await __fedify_vocab.CryptographicKey.fromJsonLd(serialized, this.options);
 		} catch {
 			try {
-				return await require_actor.Multikey.fromJsonLd(serialized, this.options);
+				return await __fedify_vocab.Multikey.fromJsonLd(serialized, this.options);
 			} catch {
 				await this.kv.delete([...this.prefix, keyId.href]);
 				return void 0;
@@ -1112,7 +1116,7 @@ async function handleObject(request, { values, context: context$2, objectDispatc
 async function handleCollection(request, { name, identifier, uriGetter, filter, filterPredicate, context: context$2, collectionCallbacks, tracerProvider, onUnauthorized, onNotFound }) {
 	const spanName = name.trim().replace(/\s+/g, "_");
 	tracerProvider = tracerProvider ?? __opentelemetry_api.trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(require_lookup.deno_default.name, require_lookup.deno_default.version);
+	const tracer = tracerProvider.getTracer(require_http.deno_default.name, require_http.deno_default.version);
 	const url = new URL(request.url);
 	const cursor = url.searchParams.get("cursor");
 	if (collectionCallbacks == null) return await onNotFound(request);
@@ -1126,7 +1130,7 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 				kind: __opentelemetry_api.SpanKind.SERVER,
 				attributes: {
 					"activitypub.collection.id": baseUri.href,
-					"activitypub.collection.type": require_actor.OrderedCollection.typeId.href
+					"activitypub.collection.type": __fedify_vocab.OrderedCollection.typeId.href
 				}
 			}, async (span) => {
 				if (totalItems != null) span.setAttribute("activitypub.collection.total_items", Number(totalItems));
@@ -1150,7 +1154,7 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 				}
 			});
 			if (itemsOrResponse instanceof Response) return itemsOrResponse;
-			collection = new require_actor.OrderedCollection({
+			collection = new __fedify_vocab.OrderedCollection({
 				id: baseUri,
 				totalItems: totalItems == null ? null : Number(totalItems),
 				items: filterCollectionItems(itemsOrResponse, name, filterPredicate)
@@ -1164,7 +1168,7 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 				last = new URL(context$2.url);
 				last.searchParams.set("cursor", lastCursor);
 			}
-			collection = new require_actor.OrderedCollection({
+			collection = new __fedify_vocab.OrderedCollection({
 				id: baseUri,
 				totalItems: totalItems == null ? null : Number(totalItems),
 				first,
@@ -1178,7 +1182,7 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 			kind: __opentelemetry_api.SpanKind.SERVER,
 			attributes: {
 				"activitypub.collection.id": uri.href,
-				"activitypub.collection.type": require_actor.OrderedCollectionPage.typeId.href,
+				"activitypub.collection.type": __fedify_vocab.OrderedCollectionPage.typeId.href,
 				"fedify.collection.cursor": cursor
 			}
 		}, async (span) => {
@@ -1214,7 +1218,7 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 		}
 		const partOf = new URL(context$2.url);
 		partOf.searchParams.delete("cursor");
-		collection = new require_actor.OrderedCollectionPage({
+		collection = new __fedify_vocab.OrderedCollectionPage({
 			id: uri,
 			prev,
 			next,
@@ -1262,7 +1266,7 @@ function filterCollectionItems(items, collectionName, filterPredicate) {
 	let logged = false;
 	for (const item of items) {
 		let mappedItem;
-		if (item instanceof require_actor.Object || item instanceof require_actor.Link || item instanceof URL) mappedItem = item;
+		if (item instanceof __fedify_vocab.Object || item instanceof __fedify_vocab.Link || item instanceof URL) mappedItem = item;
 		else if (item.id == null) continue;
 		else mappedItem = item.id;
 		if (filterPredicate != null && !filterPredicate(item)) {
@@ -1289,7 +1293,7 @@ function filterCollectionItems(items, collectionName, filterPredicate) {
 */
 async function handleInbox(request, options) {
 	const tracerProvider = options.tracerProvider ?? __opentelemetry_api.trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(require_lookup.deno_default.name, require_lookup.deno_default.version);
+	const tracer = tracerProvider.getTracer(require_http.deno_default.name, require_http.deno_default.version);
 	return await tracer.startActiveSpan("activitypub.inbox", {
 		kind: options.queue == null ? __opentelemetry_api.SpanKind.SERVER : __opentelemetry_api.SpanKind.PRODUCER,
 		attributes: { "activitypub.shared_inbox": options.recipient == null }
@@ -1417,14 +1421,14 @@ async function handleInboxInternal(request, parameters, span) {
 			recipient,
 			json
 		});
-		activity = await require_actor.Activity.fromJsonLd(jsonWithoutSig, ctx);
+		activity = await __fedify_vocab.Activity.fromJsonLd(jsonWithoutSig, ctx);
 	} else {
 		logger$1.debug("Linked Data Signatures are not verified.", {
 			recipient,
 			json
 		});
 		try {
-			activity = await require_proof.verifyObject(require_actor.Activity, jsonWithoutSig, {
+			activity = await require_proof.verifyObject(__fedify_vocab.Activity, jsonWithoutSig, {
 				contextLoader: ctx.contextLoader,
 				documentLoader: ctx.documentLoader,
 				keyCache,
@@ -1487,10 +1491,10 @@ async function handleInboxInternal(request, parameters, span) {
 			} else logger$1.debug("HTTP Signatures are verified.", { recipient });
 			httpSigKey = key;
 		}
-		activity = await require_actor.Activity.fromJsonLd(jsonWithoutSig, ctx);
+		activity = await __fedify_vocab.Activity.fromJsonLd(jsonWithoutSig, ctx);
 	}
 	if (activity.id != null) span.setAttribute("activitypub.activity.id", activity.id.href);
-	span.setAttribute("activitypub.activity.type", require_actor.getTypeId(activity).href);
+	span.setAttribute("activitypub.activity.type", (0, __fedify_vocab.getTypeId)(activity).href);
 	span.addEvent("activitypub.activity.received", {
 		"activitypub.activity.json": JSON.stringify(json),
 		"activitypub.activity.verified": activity != null,
@@ -1570,7 +1574,7 @@ async function _handleCustomCollection(request, { name, values, context: context
 	verifyDefined(callbacks);
 	await authIfNeeded(context$2, values, callbacks);
 	const cursor = new URL(request.url).searchParams.get("cursor");
-	return await new CustomCollectionHandler(name, values, context$2, callbacks, tracerProvider, require_actor.Collection, require_actor.CollectionPage, filterPredicate).fetchCollection(cursor).toJsonLd().then(respondAsActivity);
+	return await new CustomCollectionHandler(name, values, context$2, callbacks, tracerProvider, __fedify_vocab.Collection, __fedify_vocab.CollectionPage, filterPredicate).fetchCollection(cursor).toJsonLd().then(respondAsActivity);
 }
 /**
 * Handles an ordered collection request.
@@ -1588,7 +1592,7 @@ async function _handleOrderedCollection(request, { name, values, context: contex
 	verifyDefined(callbacks);
 	await authIfNeeded(context$2, values, callbacks);
 	const cursor = new URL(request.url).searchParams.get("cursor");
-	return await new CustomCollectionHandler(name, values, context$2, callbacks, tracerProvider, require_actor.OrderedCollection, require_actor.OrderedCollectionPage, filterPredicate).fetchCollection(cursor).toJsonLd().then(respondAsActivity);
+	return await new CustomCollectionHandler(name, values, context$2, callbacks, tracerProvider, __fedify_vocab.OrderedCollection, __fedify_vocab.OrderedCollectionPage, filterPredicate).fetchCollection(cursor).toJsonLd().then(respondAsActivity);
 }
 /**
 * Handling custom collections with support for pagination and filtering.
@@ -1648,7 +1652,7 @@ var CustomCollectionHandler = class {
 		this.CollectionPage = CollectionPage$1;
 		this.filterPredicate = filterPredicate;
 		this.name = this.name.trim().replace(/\s+/g, "_");
-		this.#tracer = this.tracerProvider.getTracer(require_lookup.deno_default.name, require_lookup.deno_default.version);
+		this.#tracer = this.tracerProvider.getTracer(require_http.deno_default.name, require_http.deno_default.version);
 		this.#id = new URL(this.context.url);
 		this.#dispatcher = callbacks.dispatcher.bind(callbacks);
 	}
@@ -2038,139 +2042,6 @@ function handleNodeInfoJrd(_request, context$2) {
 	return Promise.resolve(response);
 }
 
-//#endregion
-//#region src/webfinger/handler.ts
-const logger = (0, __logtape_logtape.getLogger)([
-	"fedify",
-	"webfinger",
-	"server"
-]);
-/**
-* Handles a WebFinger request.  You would not typically call this function
-* directly, but instead use {@link Federation.fetch} method.
-* @param request The WebFinger request to handle.
-* @param parameters The parameters for handling the request.
-* @returns The response to the request.
-*/
-async function handleWebFinger(request, options) {
-	if (options.tracer == null) return await handleWebFingerInternal(request, options);
-	return await options.tracer.startActiveSpan("webfinger.handle", { kind: __opentelemetry_api.SpanKind.SERVER }, async (span) => {
-		try {
-			const response = await handleWebFingerInternal(request, options);
-			span.setStatus({ code: response.ok ? __opentelemetry_api.SpanStatusCode.UNSET : __opentelemetry_api.SpanStatusCode.ERROR });
-			return response;
-		} catch (error) {
-			span.setStatus({
-				code: __opentelemetry_api.SpanStatusCode.ERROR,
-				message: String(error)
-			});
-			throw error;
-		} finally {
-			span.end();
-		}
-	});
-}
-async function handleWebFingerInternal(request, { context: context$2, host, actorDispatcher, actorHandleMapper, actorAliasMapper, onNotFound, span, webFingerLinksDispatcher }) {
-	if (actorDispatcher == null) {
-		logger.error("Actor dispatcher is not set.");
-		return await onNotFound(request);
-	}
-	const resource = context$2.url.searchParams.get("resource");
-	if (resource == null) return new Response("Missing resource parameter.", { status: 400 });
-	span?.setAttribute("webfinger.resource", resource);
-	let resourceUrl;
-	try {
-		resourceUrl = new URL(resource);
-	} catch (e) {
-		if (e instanceof TypeError) return new Response("Invalid resource URL.", { status: 400 });
-		throw e;
-	}
-	span?.setAttribute("webfinger.resource.scheme", resourceUrl.protocol.replace(/:$/, ""));
-	async function mapUsernameToIdentifier(username) {
-		if (actorHandleMapper == null) {
-			logger.error("No actor handle mapper is set; use the WebFinger username {username} as the actor's internal identifier.", { username });
-			return username;
-		}
-		const identifier$1 = await actorHandleMapper(context$2, username);
-		if (identifier$1 == null) {
-			logger.error("Actor {username} not found.", { username });
-			return null;
-		}
-		return identifier$1;
-	}
-	let identifier = null;
-	const uriParsed = context$2.parseUri(resourceUrl);
-	if (uriParsed?.type != "actor") {
-		const match = /^acct:([^@]+)@([^@]+)$/.exec(resource);
-		if (match == null) {
-			const result = await actorAliasMapper?.(context$2, resourceUrl);
-			if (result == null) return await onNotFound(request);
-			if ("identifier" in result) identifier = result.identifier;
-			else identifier = await mapUsernameToIdentifier(result.username);
-		} else {
-			const portMatch = /:\d+$/.exec(match[2]);
-			const normalizedHost = portMatch == null ? (0, node_url.domainToASCII)(match[2].toLowerCase()) : (0, node_url.domainToASCII)(match[2].substring(0, portMatch.index).toLowerCase()) + portMatch[0];
-			if (normalizedHost != context$2.url.host && normalizedHost != host) return await onNotFound(request);
-			else {
-				identifier = await mapUsernameToIdentifier(match[1]);
-				resourceUrl = new URL(`acct:${match[1]}@${normalizedHost}`);
-			}
-		}
-	} else identifier = uriParsed.identifier;
-	if (identifier == null) return await onNotFound(request);
-	const actor = await actorDispatcher(context$2, identifier);
-	if (actor == null) {
-		logger.error("Actor {identifier} not found.", { identifier });
-		return await onNotFound(request);
-	}
-	const links = [{
-		rel: "self",
-		href: context$2.getActorUri(identifier).href,
-		type: "application/activity+json"
-	}];
-	for (const url of actor.urls) if (url instanceof require_actor.Link && url.href != null) links.push({
-		rel: url.rel ?? "http://webfinger.net/rel/profile-page",
-		href: url.href.href,
-		type: url.mediaType == null ? void 0 : url.mediaType
-	});
-	else if (url instanceof URL) links.push({
-		rel: "http://webfinger.net/rel/profile-page",
-		href: url.href
-	});
-	for await (const image of actor.getIcons()) {
-		if (image.url?.href == null) continue;
-		const link = {
-			rel: "http://webfinger.net/rel/avatar",
-			href: image.url.href.toString()
-		};
-		if (image.mediaType != null) link.type = image.mediaType;
-		links.push(link);
-	}
-	if (webFingerLinksDispatcher != null) {
-		const customLinks = await webFingerLinksDispatcher(context$2, resourceUrl);
-		if (customLinks != null) for (const link of customLinks) links.push(link);
-	}
-	const aliases = [];
-	if (resourceUrl.protocol != "acct:" && actor.preferredUsername != null) {
-		aliases.push(`acct:${actor.preferredUsername}@${host ?? context$2.url.host}`);
-		if (host != null && host !== context$2.url.host) aliases.push(`acct:${actor.preferredUsername}@${context$2.url.host}`);
-	}
-	if (resourceUrl.href !== context$2.getActorUri(identifier).href) aliases.push(context$2.getActorUri(identifier).href);
-	if (resourceUrl.protocol === "acct:" && host != null && host !== context$2.url.host && !resourceUrl.href.endsWith(`@${host}`)) {
-		const username = resourceUrl.href.replace(/^acct:/, "").replace(/@.*$/, "");
-		aliases.push(`acct:${username}@${host}`);
-	}
-	const jrd = {
-		subject: resourceUrl.href,
-		aliases,
-		links
-	};
-	return new Response(JSON.stringify(jrd), { headers: {
-		"Content-Type": "application/jrd+json",
-		"Access-Control-Allow-Origin": "*"
-	} });
-}
-
 //#endregion
 //#region src/federation/retry.ts
 /**
@@ -2239,7 +2110,7 @@ function extractInboxes({ recipients, preferSharedInbox, excludeBaseUris }) {
 */
 function sendActivity(options) {
 	const tracerProvider = options.tracerProvider ?? __opentelemetry_api.trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(require_lookup.deno_default.name, require_lookup.deno_default.version);
+	const tracer = tracerProvider.getTracer(require_http.deno_default.name, require_http.deno_default.version);
 	return tracer.startActiveSpan("activitypub.send_activity", {
 		kind: __opentelemetry_api.SpanKind.CLIENT,
 		attributes: { "activitypub.shared_inbox": options.sharedInbox ?? false }
@@ -2315,7 +2186,7 @@ async function sendActivityInternal({ activity, activityId, keys, inbox, headers
 			statusText: response.statusText,
 			error
 		});
-		throw new Error(`Failed to send activity ${activityId} to ${inbox.href} (${response.status} ${response.statusText}):\n${error}`);
+		throw new SendActivityError(inbox, response.status, `Failed to send activity ${activityId} to ${inbox.href} (${response.status} ${response.statusText}):\n${error}`, error);
 	}
 	span.addEvent("activitypub.activity.sent", {
 		"activitypub.activity.json": JSON.stringify(activity),
@@ -2323,6 +2194,172 @@ async function sendActivityInternal({ activity, activityId, keys, inbox, headers
 		"activitypub.activity.id": activityId ?? ""
 	});
 }
+/**
+* An error that is thrown when an activity fails to send to a remote inbox.
+* It contains structured information about the failure, including the HTTP
+* status code, the inbox URL, and the response body.
+* @since 2.0.0
+*/
+var SendActivityError = class extends Error {
+	/**
+	* The inbox URL that the activity was being sent to.
+	*/
+	inbox;
+	/**
+	* The HTTP status code returned by the inbox.
+	*/
+	statusCode;
+	/**
+	* The response body from the inbox, if any.
+	*/
+	responseBody;
+	/**
+	* Creates a new {@link SendActivityError}.
+	* @param inbox The inbox URL.
+	* @param statusCode The HTTP status code.
+	* @param message The error message.
+	* @param responseBody The response body.
+	*/
+	constructor(inbox, statusCode, message, responseBody) {
+		super(message);
+		this.name = "SendActivityError";
+		this.inbox = inbox;
+		this.statusCode = statusCode;
+		this.responseBody = responseBody;
+	}
+};
+
+//#endregion
+//#region src/federation/webfinger.ts
+const logger = (0, __logtape_logtape.getLogger)([
+	"fedify",
+	"webfinger",
+	"server"
+]);
+/**
+* Handles a WebFinger request.  You would not typically call this function
+* directly, but instead use {@link Federation.fetch} method.
+* @param request The WebFinger request to handle.
+* @param parameters The parameters for handling the request.
+* @returns The response to the request.
+*/
+async function handleWebFinger(request, options) {
+	if (options.tracer == null) return await handleWebFingerInternal(request, options);
+	return await options.tracer.startActiveSpan("webfinger.handle", { kind: __opentelemetry_api.SpanKind.SERVER }, async (span) => {
+		try {
+			const response = await handleWebFingerInternal(request, options);
+			span.setStatus({ code: response.ok ? __opentelemetry_api.SpanStatusCode.UNSET : __opentelemetry_api.SpanStatusCode.ERROR });
+			return response;
+		} catch (error) {
+			span.setStatus({
+				code: __opentelemetry_api.SpanStatusCode.ERROR,
+				message: String(error)
+			});
+			throw error;
+		} finally {
+			span.end();
+		}
+	});
+}
+async function handleWebFingerInternal(request, { context: context$2, host, actorDispatcher, actorHandleMapper, actorAliasMapper, onNotFound, span, webFingerLinksDispatcher }) {
+	if (actorDispatcher == null) {
+		logger.error("Actor dispatcher is not set.");
+		return await onNotFound(request);
+	}
+	const resource = context$2.url.searchParams.get("resource");
+	if (resource == null) return new Response("Missing resource parameter.", { status: 400 });
+	span?.setAttribute("webfinger.resource", resource);
+	let resourceUrl;
+	try {
+		resourceUrl = new URL(resource);
+	} catch (e) {
+		if (e instanceof TypeError) return new Response("Invalid resource URL.", { status: 400 });
+		throw e;
+	}
+	span?.setAttribute("webfinger.resource.scheme", resourceUrl.protocol.replace(/:$/, ""));
+	async function mapUsernameToIdentifier(username) {
+		if (actorHandleMapper == null) {
+			logger.error("No actor handle mapper is set; use the WebFinger username {username} as the actor's internal identifier.", { username });
+			return username;
+		}
+		const identifier$1 = await actorHandleMapper(context$2, username);
+		if (identifier$1 == null) {
+			logger.error("Actor {username} not found.", { username });
+			return null;
+		}
+		return identifier$1;
+	}
+	let identifier = null;
+	const uriParsed = context$2.parseUri(resourceUrl);
+	if (uriParsed?.type != "actor") {
+		const match = /^acct:([^@]+)@([^@]+)$/.exec(resource);
+		if (match == null) {
+			const result = await actorAliasMapper?.(context$2, resourceUrl);
+			if (result == null) return await onNotFound(request);
+			if ("identifier" in result) identifier = result.identifier;
+			else identifier = await mapUsernameToIdentifier(result.username);
+		} else {
+			const portMatch = /:\d+$/.exec(match[2]);
+			const normalizedHost = portMatch == null ? (0, node_url.domainToASCII)(match[2].toLowerCase()) : (0, node_url.domainToASCII)(match[2].substring(0, portMatch.index).toLowerCase()) + portMatch[0];
+			if (normalizedHost != context$2.url.host && normalizedHost != host) return await onNotFound(request);
+			else {
+				identifier = await mapUsernameToIdentifier(match[1]);
+				resourceUrl = new URL(`acct:${match[1]}@${normalizedHost}`);
+			}
+		}
+	} else identifier = uriParsed.identifier;
+	if (identifier == null) return await onNotFound(request);
+	const actor = await actorDispatcher(context$2, identifier);
+	if (actor == null) {
+		logger.error("Actor {identifier} not found.", { identifier });
+		return await onNotFound(request);
+	}
+	const links = [{
+		rel: "self",
+		href: context$2.getActorUri(identifier).href,
+		type: "application/activity+json"
+	}];
+	for (const url of actor.urls) if (url instanceof __fedify_vocab.Link && url.href != null) links.push({
+		rel: url.rel ?? "http://webfinger.net/rel/profile-page",
+		href: url.href.href,
+		type: url.mediaType == null ? void 0 : url.mediaType
+	});
+	else if (url instanceof URL) links.push({
+		rel: "http://webfinger.net/rel/profile-page",
+		href: url.href
+	});
+	for await (const image of actor.getIcons()) {
+		if (image.url?.href == null) continue;
+		links.push({
+			rel: "http://webfinger.net/rel/avatar",
+			href: image.url.href.toString(),
+			...image.mediaType != null && { type: image.mediaType }
+		});
+	}
+	if (webFingerLinksDispatcher != null) {
+		const customLinks = await webFingerLinksDispatcher(context$2, resourceUrl);
+		if (customLinks != null) for (const link of customLinks) links.push(link);
+	}
+	const aliases = [];
+	if (resourceUrl.protocol != "acct:" && actor.preferredUsername != null) {
+		aliases.push(`acct:${actor.preferredUsername}@${host ?? context$2.url.host}`);
+		if (host != null && host !== context$2.url.host) aliases.push(`acct:${actor.preferredUsername}@${context$2.url.host}`);
+	}
+	if (resourceUrl.href !== context$2.getActorUri(identifier).href) aliases.push(context$2.getActorUri(identifier).href);
+	if (resourceUrl.protocol === "acct:" && host != null && host !== context$2.url.host && !resourceUrl.href.endsWith(`@${host}`)) {
+		const username = resourceUrl.href.replace(/^acct:/, "").replace(/@.*$/, "");
+		aliases.push(`acct:${username}@${host}`);
+	}
+	const jrd = {
+		subject: resourceUrl.href,
+		aliases,
+		links
+	};
+	return new Response(JSON.stringify(jrd), { headers: {
+		"Content-Type": "application/jrd+json",
+		"Access-Control-Allow-Origin": "*"
+	} });
+}
 
 //#endregion
 //#region src/federation/middleware.ts
@@ -2352,6 +2389,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 	allowPrivateAddress;
 	userAgent;
 	onOutboxError;
+	permanentFailureStatusCodes;
 	signatureTimeWindow;
 	skipSignatureVerification;
 	outboxRetryPolicy;
@@ -2433,6 +2471,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		}));
 		this.userAgent = userAgent;
 		this.onOutboxError = options.onOutboxError;
+		this.permanentFailureStatusCodes = options.permanentFailureStatusCodes ?? [404, 410];
 		this.signatureTimeWindow = options.signatureTimeWindow ?? { hours: 1 };
 		this.skipSignatureVerification = options.skipSignatureVerification ?? false;
 		this.outboxRetryPolicy = options.outboxRetryPolicy ?? createExponentialBackoffPolicy();
@@ -2446,7 +2485,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		this.router.add("/.well-known/nodeinfo", "nodeInfoJrd");
 	}
 	_getTracer() {
-		return this.tracerProvider.getTracer(require_lookup.deno_default.name, require_lookup.deno_default.version);
+		return this.tracerProvider.getTracer(require_http.deno_default.name, require_http.deno_default.version);
 	}
 	async _startQueueInternal(ctxData, signal, queue) {
 		if (this.inboxQueue == null && this.outboxQueue == null) return;
@@ -2546,7 +2585,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			keyId: new URL(keyId),
 			privateKey: await require_http.importJwk(privateKey, "private")
 		})));
-		const activity = await require_actor.Activity.fromJsonLd(message.activity, {
+		const activity = await __fedify_vocab.Activity.fromJsonLd(message.activity, {
 			contextLoader: this.contextLoaderFactory({
 				allowPrivateAddress: this.allowPrivateAddress,
 				userAgent: this.userAgent
@@ -2563,6 +2602,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		}) });
 		await this.sendActivity(keys, message.inboxes, activity, {
 			collectionSync: message.collectionSync,
+			orderingKey: message.orderingKey,
 			context: context$2
 		});
 	}
@@ -2608,19 +2648,50 @@ var FederationImpl = class extends FederationBuilderImpl {
 				message: String(error)
 			});
 			const loaderOptions = this.#getLoaderOptions(message.baseUrl);
-			const activity = await require_actor.Activity.fromJsonLd(message.activity, {
+			const activity = await __fedify_vocab.Activity.fromJsonLd(message.activity, {
 				contextLoader: this.contextLoaderFactory(loaderOptions),
 				documentLoader: rsaKeyPair == null ? this.documentLoaderFactory(loaderOptions) : this.authenticatedDocumentLoaderFactory(rsaKeyPair, loaderOptions),
 				tracerProvider: this.tracerProvider
 			});
 			try {
-				this.onOutboxError?.(error, activity);
+				await this.onOutboxError?.(error, activity);
 			} catch (error$1) {
 				logger$1.error("An unexpected error occurred in onError handler:\n{error}", {
 					...logData,
 					error: error$1
 				});
 			}
+			if (error instanceof SendActivityError && this.permanentFailureStatusCodes.includes(error.statusCode)) {
+				logger$1.warn("Permanent delivery failure for activity {activityId} to {inbox} ({status}); not retrying.", {
+					...logData,
+					status: error.statusCode
+				});
+				if (this.outboxPermanentFailureHandler != null) {
+					const ctx = this.#createContext(new URL(message.baseUrl), _, { documentLoader: this.documentLoaderFactory(loaderOptions) });
+					try {
+						await this.outboxPermanentFailureHandler(ctx, {
+							inbox: new URL(message.inbox),
+							activity,
+							error,
+							statusCode: error.statusCode,
+							actorIds: (message.actorIds ?? []).flatMap((id) => {
+								try {
+									return [new URL(id)];
+								} catch {
+									logger$1.warn("Invalid actorId URL in OutboxMessage: {id}", { id });
+									return [];
+								}
+							})
+						});
+					} catch (handlerError) {
+						logger$1.error("An unexpected error occurred in outboxPermanentFailureHandler:\n{error}", {
+							...logData,
+							error: handlerError
+						});
+					}
+				}
+				return;
+			}
 			if (this.outboxQueue?.nativeRetrial) {
 				logger$1.error("Failed to send activity {activityId} to {inbox}; backend will handle retry:\n{error}", {
 					...logData,
@@ -2662,8 +2733,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 			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) });
 		}
-		const activity = await require_actor.Activity.fromJsonLd(message.activity, context$2);
-		span.setAttribute("activitypub.activity.type", require_actor.getTypeId(activity).href);
+		const activity = await __fedify_vocab.Activity.fromJsonLd(message.activity, context$2);
+		span.setAttribute("activitypub.activity.type", (0, __fedify_vocab.getTypeId)(activity).href);
 		if (activity.id != null) span.setAttribute("activitypub.activity.id", activity.id.href);
 		const cacheKey = activity.id == null ? null : [
 			...this.kvPrefixes.activityIdempotence,
@@ -2692,7 +2763,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				});
 				span$1.setStatus({
 					code: __opentelemetry_api.SpanStatusCode.ERROR,
-					message: `Unsupported activity type: ${require_actor.getTypeId(activity).href}`
+					message: `Unsupported activity type: ${(0, __fedify_vocab.getTypeId)(activity).href}`
 				});
 				span$1.end();
 				return;
@@ -2700,7 +2771,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			const { class: cls, listener } = dispatched;
 			span$1.updateName(`activitypub.dispatch_inbox_listener ${cls.name}`);
 			try {
-				await listener(context$2.toInboxContext(message.identifier, message.activity, activity.id?.href, require_actor.getTypeId(activity).href), activity);
+				await listener(context$2.toInboxContext(message.identifier, message.activity, activity.id?.href, (0, __fedify_vocab.getTypeId)(activity).href), activity);
 			} catch (error) {
 				try {
 					await this.inboxErrorHandler?.(context$2, error);
@@ -2811,7 +2882,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			"federation",
 			"outbox"
 		]);
-		const { immediate, collectionSync, context: ctx } = options;
+		const { immediate, collectionSync, orderingKey, context: ctx } = options;
 		if (activity.id == null) throw new TypeError("The activity to send must have an id.");
 		if (activity.actorId == null) throw new TypeError("The activity to send must have at least one actor property.");
 		else if (keys.length < 1) throw new TypeError("The keys must not be empty.");
@@ -2872,7 +2943,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				keys,
 				activity: jsonLd,
 				activityId: activity.id?.href,
-				activityType: require_actor.getTypeId(activity).href,
+				activityType: (0, __fedify_vocab.getTypeId)(activity).href,
 				inbox: new URL(inbox),
 				sharedInbox: inboxes[inbox].sharedInbox,
 				headers: collectionSync == null ? void 0 : new Headers({ "Collection-Synchronization": await buildCollectionSynchronizationHeader(collectionSync, inboxes[inbox].actorIds) }),
@@ -2899,6 +2970,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 		__opentelemetry_api.propagation.inject(__opentelemetry_api.context.active(), carrier);
 		const messages = [];
 		for (const inbox in inboxes) {
+			const inboxOrigin = new URL(inbox).origin;
+			const messageOrderingKey = orderingKey == null ? void 0 : `${orderingKey}\n${inboxOrigin}`;
 			const message = {
 				type: "outbox",
 				id: crypto.randomUUID(),
@@ -2906,19 +2979,36 @@ var FederationImpl = class extends FederationBuilderImpl {
 				keys: keyJwkPairs,
 				activity: jsonLd,
 				activityId: activity.id?.href,
-				activityType: require_actor.getTypeId(activity).href,
+				activityType: (0, __fedify_vocab.getTypeId)(activity).href,
 				inbox,
 				sharedInbox: inboxes[inbox].sharedInbox,
+				actorIds: [...inboxes[inbox].actorIds],
 				started: (/* @__PURE__ */ new Date()).toISOString(),
 				attempt: 0,
 				headers: collectionSync == null ? {} : { "Collection-Synchronization": await buildCollectionSynchronizationHeader(collectionSync, inboxes[inbox].actorIds) },
+				orderingKey: messageOrderingKey,
 				traceContext: carrier
 			};
-			messages.push(message);
+			messages.push({
+				message,
+				orderingKey: messageOrderingKey
+			});
 		}
 		const { outboxQueue } = this;
 		if (outboxQueue.enqueueMany == null) {
-			const promises = messages.map((m) => outboxQueue.enqueue(m));
+			const promises = messages.map((m) => outboxQueue.enqueue(m.message, { orderingKey: m.orderingKey }));
+			const results = await Promise.allSettled(promises);
+			const errors = results.filter((r) => r.status === "rejected").map((r) => r.reason);
+			if (errors.length > 0) {
+				logger$1.error("Failed to enqueue activity {activityId} to send later: {errors}", {
+					activityId: activity.id.href,
+					errors
+				});
+				if (errors.length > 1) throw new AggregateError(errors, `Failed to enqueue activity ${activityId} to send later.`);
+				throw errors[0];
+			}
+		} else if (orderingKey != null) {
+			const promises = messages.map((m) => outboxQueue.enqueue(m.message, { orderingKey: m.orderingKey }));
 			const results = await Promise.allSettled(promises);
 			const errors = results.filter((r) => r.status === "rejected").map((r) => r.reason);
 			if (errors.length > 0) {
@@ -2930,7 +3020,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				throw errors[0];
 			}
 		} else try {
-			await outboxQueue.enqueueMany(messages);
+			await outboxQueue.enqueueMany(messages.map((m) => m.message));
 		} catch (error) {
 			logger$1.error("Failed to enqueue activity {activityId} to send later: {error}", {
 				activityId: activity.id.href,
@@ -3461,12 +3551,12 @@ var ContextImpl = class ContextImpl {
 		for (const keyPair of keyPairs) {
 			const newPair = {
 				...keyPair,
-				cryptographicKey: new require_actor.CryptographicKey({
+				cryptographicKey: new __fedify_vocab.CryptographicKey({
 					id: keyPair.keyId,
 					owner,
 					publicKey: keyPair.publicKey
 				}),
-				multikey: new require_actor.Multikey({
+				multikey: new __fedify_vocab.Multikey({
 					id: keyPair.keyId,
 					controller: owner,
 					publicKey: keyPair.publicKey
@@ -3552,7 +3642,7 @@ var ContextImpl = class ContextImpl {
 		return this.federation.authenticatedDocumentLoaderFactory(identity);
 	}
 	lookupObject(identifier, options = {}) {
-		return require_vocab.lookupObject(identifier, {
+		return (0, __fedify_vocab.lookupObject)(identifier, {
 			...options,
 			documentLoader: options.documentLoader ?? this.documentLoader,
 			contextLoader: options.contextLoader ?? this.contextLoader,
@@ -3562,7 +3652,7 @@ var ContextImpl = class ContextImpl {
 		});
 	}
 	traverseCollection(collection, options = {}) {
-		return require_vocab.traverseCollection(collection, {
+		return (0, __fedify_vocab.traverseCollection)(collection, {
 			...options,
 			documentLoader: options.documentLoader ?? this.documentLoader,
 			contextLoader: options.contextLoader ?? this.contextLoader
@@ -3580,7 +3670,7 @@ var ContextImpl = class ContextImpl {
 		});
 	}
 	lookupWebFinger(resource, options = {}) {
-		return require_lookup.lookupWebFinger(resource, {
+		return (0, __fedify_webfinger.lookupWebFinger)(resource, {
 			...options,
 			userAgent: options.userAgent ?? this.federation.userAgent,
 			tracerProvider: options.tracerProvider ?? this.tracerProvider,
@@ -3588,11 +3678,11 @@ var ContextImpl = class ContextImpl {
 		});
 	}
 	sendActivity(sender, recipients, activity, options = {}) {
-		const tracer = this.tracerProvider.getTracer(require_lookup.deno_default.name, require_lookup.deno_default.version);
+		const tracer = this.tracerProvider.getTracer(require_http.deno_default.name, require_http.deno_default.version);
 		return tracer.startActiveSpan(this.federation.outboxQueue == null || options.immediate ? "activitypub.outbox" : "activitypub.fanout", {
 			kind: this.federation.outboxQueue == null || options.immediate ? __opentelemetry_api.SpanKind.CLIENT : __opentelemetry_api.SpanKind.PRODUCER,
 			attributes: {
-				"activitypub.activity.type": require_actor.getTypeId(activity).href,
+				"activitypub.activity.type": (0, __fedify_vocab.getTypeId)(activity).href,
 				"activitypub.activity.to": activity.toIds.map((to) => to.href),
 				"activitypub.activity.cc": activity.toIds.map((cc) => cc.href),
 				"activitypub.activity.bto": activity.btoIds.map((bto) => bto.href),
@@ -3646,20 +3736,25 @@ var ContextImpl = class ContextImpl {
 		} else keys = [sender];
 		if (keys.length < 1) throw new TypeError("The sender's keys must not be empty.");
 		for (const { privateKey } of keys) require_http.validateCryptoKey(privateKey, "private");
-		const opts = { context: this };
 		let expandedRecipients;
+		let collectionSync;
 		if (Array.isArray(recipients)) expandedRecipients = recipients;
 		else if (recipients === "followers") {
 			if (identifier == null) throw new Error("If recipients is \"followers\", sender must be an actor identifier or username.");
 			expandedRecipients = [];
 			for await (const recipient of this.getFollowers(identifier)) expandedRecipients.push(recipient);
 			if (options.syncCollection) try {
-				opts.collectionSync = this.getFollowersUri(identifier).href;
+				collectionSync = this.getFollowersUri(identifier).href;
 			} catch (error) {
-				if (error instanceof RouterError) opts.collectionSync = void 0;
-				else throw error;
+				if (!(error instanceof RouterError)) throw error;
 			}
 		} else expandedRecipients = [recipients];
+		const opts = {
+			context: this,
+			orderingKey: options.orderingKey,
+			collectionSync,
+			immediate: options.immediate
+		};
 		span.setAttribute("activitypub.inboxes", expandedRecipients.length);
 		for (const activityTransformer of this.federation.activityTransformers) activity = activityTransformer(activity, this);
 		span?.setAttribute("activitypub.activity.id", activity?.id?.href ?? "");
@@ -3704,12 +3799,13 @@ var ContextImpl = class ContextImpl {
 				contextLoader: this.contextLoader
 			}),
 			activityId: activity.id?.href,
-			activityType: require_actor.getTypeId(activity).href,
+			activityType: (0, __fedify_vocab.getTypeId)(activity).href,
 			collectionSync: opts.collectionSync,
+			orderingKey: options.orderingKey,
 			traceContext: carrier
 		};
 		if (!this.federation.manuallyStartQueue) this.federation._startQueueInternal(this.data);
-		this.federation.fanoutQueue.enqueue(message);
+		this.federation.fanoutQueue.enqueue(message, { orderingKey: options.orderingKey });
 	}
 	async *getFollowers(identifier) {
 		if (this.federation.followersCallbacks == null) throw new Error("No followers collection dispatcher registered.");
@@ -3734,10 +3830,10 @@ var ContextImpl = class ContextImpl {
 	}
 	routeActivity(recipient, activity, options = {}) {
 		const tracerProvider = this.tracerProvider ?? this.tracerProvider;
-		const tracer = tracerProvider.getTracer(require_lookup.deno_default.name, require_lookup.deno_default.version);
+		const tracer = tracerProvider.getTracer(require_http.deno_default.name, require_http.deno_default.version);
 		return tracer.startActiveSpan("activitypub.inbox", {
 			kind: this.federation.inboxQueue == null || options.immediate ? __opentelemetry_api.SpanKind.INTERNAL : __opentelemetry_api.SpanKind.PRODUCER,
-			attributes: { "activitypub.activity.type": require_actor.getTypeId(activity).href }
+			attributes: { "activitypub.activity.type": (0, __fedify_vocab.getTypeId)(activity).href }
 		}, async (span) => {
 			if (activity.id != null) span.setAttribute("activitypub.activity.id", activity.id.href);
 			if (activity.toIds.length > 0) span.setAttribute("activitypub.activity.to", activity.toIds.map((to) => to.href));
@@ -3771,7 +3867,7 @@ var ContextImpl = class ContextImpl {
 		const contextLoader = options.contextLoader ?? this.contextLoader;
 		const json = await activity.toJsonLd({ contextLoader });
 		const keyCache = new KvKeyCache(this.federation.kv, this.federation.kvPrefixes.publicKey, this);
-		const verified = await require_proof.verifyObject(require_actor.Activity, json, {
+		const verified = await require_proof.verifyObject(__fedify_vocab.Activity, json, {
 			contextLoader,
 			documentLoader: options.documentLoader ?? this.documentLoader,
 			tracerProvider: options.tracerProvider ?? this.tracerProvider,
@@ -3797,7 +3893,7 @@ var ContextImpl = class ContextImpl {
 					activityId: activity.id.href
 				});
 				return false;
-			} else if (!(fetched instanceof require_actor.Activity)) {
+			} else if (!(fetched instanceof __fedify_vocab.Activity)) {
 				logger$1.debug("Fetched object is not an Activity.", {
 					recipient,
 					activity: await fetched.toJsonLd({ contextLoader })
@@ -3952,7 +4048,7 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 		});
 	}
 	forwardActivity(forwarder, recipients, options) {
-		const tracer = this.tracerProvider.getTracer(require_lookup.deno_default.name, require_lookup.deno_default.version);
+		const tracer = this.tracerProvider.getTracer(require_http.deno_default.name, require_http.deno_default.version);
 		return tracer.startActiveSpan("activitypub.outbox", {
 			kind: this.federation.outboxQueue == null || options?.immediate ? __opentelemetry_api.SpanKind.CLIENT : __opentelemetry_api.SpanKind.PRODUCER,
 			attributes: { "activitypub.activity.type": this.activityType }
@@ -4004,7 +4100,7 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 		if (!require_proof.hasSignature(this.activity)) {
 			let hasProof;
 			try {
-				const activity = await require_actor.Activity.fromJsonLd(this.activity, this);
+				const activity = await __fedify_vocab.Activity.fromJsonLd(this.activity, this);
 				hasProof = await activity.getProof() != null;
 			} catch {
 				hasProof = false;
@@ -4061,8 +4157,10 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 		}
 		const carrier = {};
 		__opentelemetry_api.propagation.inject(__opentelemetry_api.context.active(), carrier);
+		const orderingKey = options?.orderingKey;
 		const messages = [];
 		for (const inbox in inboxes) {
+			const inboxUrl = new URL(inbox);
 			const message = {
 				type: "outbox",
 				id: crypto.randomUUID(),
@@ -4076,13 +4174,29 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 				started: (/* @__PURE__ */ new Date()).toISOString(),
 				attempt: 0,
 				headers: {},
+				orderingKey: orderingKey == null ? void 0 : `${orderingKey}\n${inboxUrl.origin}`,
 				traceContext: carrier
 			};
-			messages.push(message);
+			messages.push({
+				message,
+				orderingKey: message.orderingKey
+			});
 		}
 		const { outboxQueue } = this.federation;
 		if (outboxQueue.enqueueMany == null) {
-			const promises = messages.map((m) => outboxQueue.enqueue(m));
+			const promises = messages.map((m) => outboxQueue.enqueue(m.message, { orderingKey: m.orderingKey }));
+			const results = await Promise.allSettled(promises);
+			const errors = results.filter((r) => r.status === "rejected").map((r) => r.reason);
+			if (errors.length > 0) {
+				logger$1.error("Failed to enqueue activity {activityId} to forward later:\n{errors}", {
+					activityId: this.activityId,
+					errors
+				});
+				if (errors.length > 1) throw new AggregateError(errors, `Failed to enqueue activity ${this.activityId} to forward later.`);
+				throw errors[0];
+			}
+		} else if (orderingKey != null) {
+			const promises = messages.map((m) => outboxQueue.enqueue(m.message, { orderingKey: m.orderingKey }));
 			const results = await Promise.allSettled(promises);
 			const errors = results.filter((r) => r.status === "rejected").map((r) => r.reason);
 			if (errors.length > 0) {
@@ -4094,7 +4208,7 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 				throw errors[0];
 			}
 		} else try {
-			await outboxQueue.enqueueMany(messages);
+			await outboxQueue.enqueueMany(messages.map((m) => m.message));
 		} catch (error) {
 			logger$1.error("Failed to enqueue activity {activityId} to forward later:\n{error}", {
 				activityId: this.activityId,
@@ -4193,6 +4307,12 @@ Object.defineProperty(exports, 'RouterError', {
     return RouterError;
   }
 });
+Object.defineProperty(exports, 'SendActivityError', {
+  enumerable: true,
+  get: function () {
+    return SendActivityError;
+  }
+});
 Object.defineProperty(exports, 'buildCollectionSynchronizationHeader', {
   enumerable: true,
   get: function () {
@@ -4223,6 +4343,12 @@ Object.defineProperty(exports, 'digest', {
     return digest;
   }
 });
+Object.defineProperty(exports, 'handleWebFinger', {
+  enumerable: true,
+  get: function () {
+    return handleWebFinger;
+  }
+});
 Object.defineProperty(exports, 'respondWithObject', {
   enumerable: true,
   get: function () {