@fedify/fedify 2.0.0-dev.323 → 2.0.0-dev.372

package/dist/{middleware-DaOdxVOc.js → middleware-C5W9b9D9.js}

@@ -3,24 +3,24 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { deno_default } from "./deno-BTAi5-ur.js";
+import { deno_default } from "./deno-CDo9j5Hk.js";
 import { getNodeInfo } from "./client-Dg7OfUDA.js";
 import { RouterError } from "./router-D9eI0s4b.js";
 import { nodeInfoToJson } from "./types-CPz01LGH.js";
-import { exportJwk, importJwk, validateCryptoKey } from "./key-BI6sqU5u.js";
-import { verifyRequest } from "./http-C4WANccp.js";
-import { detachSignature, hasSignature, signJsonLd, verifyJsonLd } from "./ld-qTcTL2A4.js";
-import { doesActorOwnKey, getKeyOwner } from "./owner-Cfmtlwoe.js";
-import { signObject, verifyObject } from "./proof-Bc8ULrzP.js";
-import { getAuthenticatedDocumentLoader } from "./docloader-D8dzb6AT.js";
+import { exportJwk, importJwk, validateCryptoKey } from "./key-DtVs0UwP.js";
+import { verifyRequest } from "./http-BQhAaO-e.js";
+import { detachSignature, hasSignature, signJsonLd, verifyJsonLd } from "./ld-BLHZlaWL.js";
+import { doesActorOwnKey, getKeyOwner } from "./owner-BwS4q7BU.js";
+import { signObject, verifyObject } from "./proof-N5F9c402.js";
+import { getAuthenticatedDocumentLoader } from "./docloader-Cl-iMQFP.js";
 import { kvCache } from "./kv-cache-B__dHl7g.js";
-import { routeActivity } from "./inbox-CdBcxHA7.js";
-import { FederationBuilderImpl } from "./builder-CvKuNW7P.js";
+import { routeActivity } from "./inbox-B4kgSsVH.js";
+import { FederationBuilderImpl } from "./builder-BxlBAtuD.js";
 import { buildCollectionSynchronizationHeader } from "./collection-CcnIw1qY.js";
 import { KvKeyCache } from "./keycache-DRxpZ5r9.js";
 import { acceptsJsonLd } from "./negotiation-5NPJL6zp.js";
 import { createExponentialBackoffPolicy } from "./retry-D4GJ670a.js";
-import { extractInboxes, sendActivity } from "./send-BKW3wSXo.js";
+import { SendActivityError, extractInboxes, sendActivity } from "./send-DpOe6hgL.js";
 import { getLogger, withContext } from "@logtape/logtape";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
 import { getDocumentLoader } from "@fedify/vocab-runtime";
@@ -1307,12 +1307,13 @@ var FederationImpl = class extends FederationBuilderImpl {
 	allowPrivateAddress;
 	userAgent;
 	onOutboxError;
+	permanentFailureStatusCodes;
 	signatureTimeWindow;
 	skipSignatureVerification;
 	outboxRetryPolicy;
 	inboxRetryPolicy;
 	activityTransformers;
-	tracerProvider;
+	_tracerProvider;
 	firstKnock;
 	constructor(options) {
 		super();
@@ -1388,14 +1389,18 @@ 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();
 		this.inboxRetryPolicy = options.inboxRetryPolicy ?? createExponentialBackoffPolicy();
 		this.activityTransformers = options.activityTransformers ?? getDefaultActivityTransformers();
-		this.tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
+		this._tracerProvider = options.tracerProvider;
 		this.firstKnock = options.firstKnock;
 	}
+	get tracerProvider() {
+		return this._tracerProvider ?? trace.getTracerProvider();
+	}
 	_initializeRouter() {
 		this.router.add("/.well-known/webfinger", "webfinger");
 		this.router.add("/.well-known/nodeinfo", "nodeInfoJrd");
@@ -1436,18 +1441,24 @@ var FederationImpl = class extends FederationBuilderImpl {
 				kind: 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: SpanStatusCode.ERROR,
-						message: String(e)
-					});
-					throw e;
-				} finally {
-					span.end();
-				}
+				const spanCtx = span.spanContext();
+				return await 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: SpanStatusCode.ERROR,
+							message: String(e)
+						});
+						throw e;
+					} finally {
+						span.end();
+					}
+				});
 			});
 			else if (message.type === "outbox") await tracer.startActiveSpan("activitypub.outbox", {
 				kind: SpanKind.CONSUMER,
@@ -1456,34 +1467,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: SpanStatusCode.ERROR,
-						message: String(e)
-					});
-					throw e;
-				} finally {
-					span.end();
-				}
+				const spanCtx = span.spanContext();
+				return await 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: SpanStatusCode.ERROR,
+							message: String(e)
+						});
+						throw e;
+					} finally {
+						span.end();
+					}
+				});
 			});
 			else if (message.type === "inbox") await tracer.startActiveSpan("activitypub.inbox", {
 				kind: SpanKind.CONSUMER,
 				attributes: { "activitypub.shared_inbox": message.identifier == null }
 			}, extractedContext, async (span) => {
-				try {
-					await this.#listenInboxMessage(contextData, message, span);
-				} catch (e) {
-					span.setStatus({
-						code: SpanStatusCode.ERROR,
-						message: String(e)
-					});
-					throw e;
-				} finally {
-					span.end();
-				}
+				const spanCtx = span.spanContext();
+				return await withContext({
+					traceId: spanCtx.traceId,
+					spanId: spanCtx.spanId
+				}, async () => {
+					try {
+						await this.#listenInboxMessage(contextData, message, span);
+					} catch (e) {
+						span.setStatus({
+							code: SpanStatusCode.ERROR,
+							message: String(e)
+						});
+						throw e;
+					} finally {
+						span.end();
+					}
+				});
 			});
 		});
 	}
@@ -1570,13 +1593,44 @@ var FederationImpl = class extends FederationBuilderImpl {
 				tracerProvider: this.tracerProvider
 			});
 			try {
-				this.onOutboxError?.(error, activity);
+				await this.onOutboxError?.(error, activity);
 			} catch (error$1) {
 				logger$2.error("An unexpected error occurred in onError handler:\n{error}", {
 					...logData,
 					error: error$1
 				});
 			}
+			if (error instanceof SendActivityError && this.permanentFailureStatusCodes.includes(error.statusCode)) {
+				logger$2.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$2.warn("Invalid actorId URL in OutboxMessage: {id}", { id });
+									return [];
+								}
+							})
+						});
+					} catch (handlerError) {
+						logger$2.error("An unexpected error occurred in outboxPermanentFailureHandler:\n{error}", {
+							...logData,
+							error: handlerError
+						});
+					}
+				}
+				return;
+			}
 			if (this.outboxQueue?.nativeRetrial) {
 				logger$2.error("Failed to send activity {activityId} to {inbox}; backend will handle retry:\n{error}", {
 					...logData,
@@ -1867,6 +1921,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				activityType: 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) },
@@ -1924,54 +1979,60 @@ var FederationImpl = class extends FederationBuilderImpl {
 					[ATTR_URL_FULL]: request.url
 				}
 			}, async (span) => {
-				const logger$2 = getLogger([
-					"fedify",
-					"federation",
-					"http"
-				]);
-				if (span.isRecording()) for (const [k, v] of request.headers) span.setAttribute(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: SpanStatusCode.ERROR,
-						message: `${error}`
-					});
+				const spanCtx = span.spanContext();
+				return await withContext({
+					traceId: spanCtx.traceId,
+					spanId: spanCtx.spanId
+				}, async () => {
+					const logger$2 = getLogger([
+						"fedify",
+						"federation",
+						"http"
+					]);
+					if (span.isRecording()) for (const [k, v] of request.headers) span.setAttribute(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: SpanStatusCode.ERROR,
+							message: `${error}`
+						});
+						span.end();
+						logger$2.error("An error occurred while serving request {method} {url}: {error}", {
+							method: request.method,
+							url: request.url,
+							error
+						});
+						throw error;
+					}
+					if (span.isRecording()) {
+						span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, response.status);
+						for (const [k, v] of response.headers) span.setAttribute(ATTR_HTTP_RESPONSE_HEADER(k), [v]);
+						span.setStatus({
+							code: response.status >= 500 ? SpanStatusCode.ERROR : SpanStatusCode.UNSET,
+							message: response.statusText
+						});
+					}
 					span.end();
-					logger$2.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(ATTR_HTTP_RESPONSE_STATUS_CODE, response.status);
-					for (const [k, v] of response.headers) span.setAttribute(ATTR_HTTP_RESPONSE_HEADER(k), [v]);
-					span.setStatus({
-						code: response.status >= 500 ? SpanStatusCode.ERROR : 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$2.error(logTpl, values);
-				else if (response.status >= 400) logger$2.warn(logTpl, values);
-				else logger$2.info(logTpl, values);
-				return response;
+						status: response.status
+					};
+					if (response.status >= 500) logger$2.error(logTpl, values);
+					else if (response.status >= 400) logger$2.warn(logTpl, values);
+					else logger$2.info(logTpl, values);
+					return response;
+				});
 			});
 		});
 	}