@fedify/fedify 2.3.0-dev.1361 → 2.3.0-dev.1367

package/dist/{middleware-6R3zHHW0.mjs → middleware-CR1Ux5W8.mjs}

@@ -1,28 +1,27 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-C1j4CMgo.mjs";
-import { a as instrumentDocumentLoader, b as recordWebFingerHandle, c as recordCircuitBreakerStateChange, d as recordCollectionRequest, f as recordCollectionTotalItems, g as recordInboxActivity, h as recordFanoutRecipients, i as getRemoteHost, l as recordCollectionDispatchDuration, n as getDurationMs, o as isAbortError, r as getFederationMetrics, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "./metrics-BC8TM85p.mjs";
-import { t as formatAcceptSignature } from "./accept-CceiKpCy.mjs";
-import { a as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-E-05ikaC.mjs";
-import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-pFZqYnR0.mjs";
-import { t as getAuthenticatedDocumentLoader } from "./docloader-DLb-Mj7i.mjs";
-import { n as kvCache } from "./kv-cache-D-OZCnQz.mjs";
-import { _ as wrapContextLoaderForJsonLd, a as compactJsonLd, c as getNormalizationContextLoader, d as isClearlyMalformedContextReference, f as isInvalidUrlTypeError, l as hasSignature, m as verifyCompactJsonLd, p as signJsonLd, r as assertSafeJsonLd, s as detachSignature, t as InvalidContextReferenceError, u as hasSignatureLike } from "./ld-Bi8DPgxi.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-9bbtWYCS.mjs";
-import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-BgFLCJQ_.mjs";
-import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-DS0QOtP2.mjs";
-import { t as getNodeInfo } from "./client-B_A6mfn3.mjs";
-import { t as nodeInfoToJson } from "./types-BFowWFTT.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-CyGRAWkX.mjs";
-import { n as FederationBuilderImpl, t as ACTOR_ALIAS_PREFIX } from "./builder-Ec1dUgEm.mjs";
-import { t as CircuitBreaker } from "./circuit-breaker-hJBB6jwA.mjs";
-import { t as buildCollectionSynchronizationHeader } from "./collection-Dp5ky45w.mjs";
-import { t as KvKeyCache } from "./keycache-CaOR6NYg.mjs";
-import { t as acceptsJsonLd } from "./negotiation-m_L2nyS3.mjs";
-import { t as hasMalformedKnownTemporalLiteral } from "./temporal-B82PdoA8.mjs";
-import { t as createExponentialBackoffPolicy } from "./retry-DI4O-zYl.mjs";
-import { t as TaskCodec } from "./codec-Bf-rTqks.mjs";
+import { n as version, t as name } from "./deno-BiUfdE9z.mjs";
+import { a as instrumentDocumentLoader, b as recordWebFingerHandle, c as recordCircuitBreakerStateChange, d as recordCollectionRequest, f as recordCollectionTotalItems, g as recordInboxActivity, h as recordFanoutRecipients, i as getRemoteHost, l as recordCollectionDispatchDuration, n as getDurationMs, o as isAbortError, r as getFederationMetrics, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "./metrics-BNeDNuTR.mjs";
+import { t as formatAcceptSignature } from "./accept-CPkZzmGN.mjs";
+import { a as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-DjYpTdy6.mjs";
+import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-B57xhg1w.mjs";
+import { t as getAuthenticatedDocumentLoader } from "./docloader-BBJhBveN.mjs";
+import { n as kvCache } from "./kv-cache-KKf6uhtv.mjs";
+import { _ as wrapContextLoaderForJsonLd, a as compactJsonLd, c as getNormalizationContextLoader, d as isClearlyMalformedContextReference, f as isInvalidUrlTypeError, l as hasSignature, m as verifyCompactJsonLd, p as signJsonLd, r as assertSafeJsonLd, s as detachSignature, t as InvalidContextReferenceError, u as hasSignatureLike } from "./ld-OdHhWHdK.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-UhADnZlT.mjs";
+import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-L_DbOaFe.mjs";
+import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-B5uQgIa7.mjs";
+import { t as getNodeInfo } from "./client-ByXmQhYD.mjs";
+import { t as nodeInfoToJson } from "./types-J53Kw7so.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-Bd2V-sji.mjs";
+import { n as FederationBuilderImpl, t as ACTOR_ALIAS_PREFIX } from "./builder-CsrxMBlC.mjs";
+import { t as CircuitBreaker } from "./circuit-breaker-CSWsyoef.mjs";
+import { t as buildCollectionSynchronizationHeader } from "./collection-Cc3DVAhE.mjs";
+import { t as KvKeyCache } from "./keycache-BeU0LCII.mjs";
+import { t as acceptsJsonLd } from "./negotiation-DDstyBvc.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "./temporal-BXLwWpMY.mjs";
+import { t as createExponentialBackoffPolicy } from "./retry-CXg_MBI-.mjs";
 import { getLogger, withContext } from "@logtape/logtape";
 import { RouterError } from "@fedify/uri-template";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, Tombstone, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
@@ -2410,12 +2409,9 @@ var FederationImpl = class extends FederationBuilderImpl {
 	inboxQueue;
 	outboxQueue;
 	fanoutQueue;
-	taskQueue;
 	inboxQueueStarted;
 	outboxQueueStarted;
 	fanoutQueueStarted;
-	taskQueueStarted;
-	startedTaskQueues;
 	manuallyStartQueue;
 	origin;
 	documentLoaderFactory;
@@ -2429,8 +2425,6 @@ var FederationImpl = class extends FederationBuilderImpl {
 	skipSignatureVerification;
 	outboxRetryPolicy;
 	inboxRetryPolicy;
-	taskRetryPolicy;
-	taskQueueResolution;
 	circuitBreaker;
 	activityTransformers;
 	_tracerProvider;
@@ -2476,17 +2470,14 @@ var FederationImpl = class extends FederationBuilderImpl {
 			this.inboxQueue = void 0;
 			this.outboxQueue = void 0;
 			this.fanoutQueue = void 0;
-			this.taskQueue = void 0;
 		} else if ("enqueue" in options.queue && "listen" in options.queue) {
 			this.inboxQueue = options.queue;
 			this.outboxQueue = options.queue;
 			this.fanoutQueue = options.queue;
-			this.taskQueue = void 0;
 		} else {
 			this.inboxQueue = options.queue.inbox;
 			this.outboxQueue = options.queue.outbox;
 			this.fanoutQueue = options.queue.fanout;
-			this.taskQueue = options.queue.task;
 		}
 		if (options.circuitBreaker !== false && this.outboxQueue != null) {
 			this.circuitBreaker = new CircuitBreaker({
@@ -2510,8 +2501,6 @@ var FederationImpl = class extends FederationBuilderImpl {
 		this.inboxQueueStarted = false;
 		this.outboxQueueStarted = false;
 		this.fanoutQueueStarted = false;
-		this.taskQueueStarted = false;
-		this.startedTaskQueues = /* @__PURE__ */ new Set();
 		this.manuallyStartQueue = options.manuallyStartQueue ?? false;
 		if (options.origin != null) if (typeof options.origin === "string") {
 			if (!URL.canParse(options.origin) || !options.origin.match(/^https?:\/\//)) throw new TypeError(`Invalid origin: ${JSON.stringify(options.origin)}`);
@@ -2593,8 +2582,6 @@ var FederationImpl = class extends FederationBuilderImpl {
 		this.inboxChallengePolicy = options.inboxChallengePolicy;
 		this.outboxRetryPolicy = options.outboxRetryPolicy ?? createExponentialBackoffPolicy();
 		this.inboxRetryPolicy = options.inboxRetryPolicy ?? createExponentialBackoffPolicy();
-		this.taskRetryPolicy = options.taskRetryPolicy ?? createExponentialBackoffPolicy();
-		this.taskQueueResolution = options.taskQueueResolution ?? "fallback";
 		this.activityTransformers = options.activityTransformers ?? getDefaultActivityTransformers();
 		this._tracerProvider = options.tracerProvider;
 		if (benchmarkMode) {
@@ -2643,14 +2630,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 	_getTracer() {
 		return this.tracerProvider.getTracer(name, version);
 	}
-	resolveTaskQueue(taskName) {
-		const resolved = this.taskDefinitions.get(taskName)?.queue ?? this.taskQueue;
-		if (resolved != null) return resolved;
-		return this.taskQueueResolution === "strict" ? void 0 : this.outboxQueue;
-	}
 	async _startQueueInternal(ctxData, signal, queue) {
-		const hasDedicatedTaskQueue = [...this.taskDefinitions.values()].some((def) => def.queue != null);
-		if (this.inboxQueue == null && this.outboxQueue == null && this.fanoutQueue == null && this.taskQueue == null && !hasDedicatedTaskQueue) return;
+		if (this.inboxQueue == null && this.outboxQueue == null) return;
 		const logger = getLogger([
 			"fedify",
 			"federation",
@@ -2672,26 +2653,6 @@ var FederationImpl = class extends FederationBuilderImpl {
 			this.fanoutQueueStarted = true;
 			promises.push(this.fanoutQueue.listen((msg) => this.processQueuedTask(ctxData, msg), { signal }));
 		}
-		if (this.taskQueue != null && this.taskQueue !== this.inboxQueue && this.taskQueue !== this.outboxQueue && this.taskQueue !== this.fanoutQueue && (queue == null || queue === "task") && !this.taskQueueStarted) {
-			logger.debug("Starting a task worker.");
-			this.taskQueueStarted = true;
-			promises.push(this.taskQueue.listen((msg) => this.processQueuedTask(ctxData, msg), { signal }));
-		}
-		if (queue == null || queue === "task") {
-			const standardQueues = new Set([
-				this.inboxQueue,
-				this.outboxQueue,
-				this.fanoutQueue,
-				this.taskQueue
-			].filter((q) => q != null));
-			for (const def of this.taskDefinitions.values()) {
-				const taskQueue = def.queue;
-				if (taskQueue == null || standardQueues.has(taskQueue) || this.startedTaskQueues.has(taskQueue)) continue;
-				logger.debug("Starting a worker for a dedicated per-task queue.");
-				this.startedTaskQueues.add(taskQueue);
-				promises.push(taskQueue.listen((msg) => this.processQueuedTask(ctxData, msg), { signal }));
-			}
-		}
 		await Promise.all(promises);
 	}
 	processQueuedTask(contextData, message) {
@@ -2813,7 +2774,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 						}
 					});
 				});
-			} else if (message.type === "task") await this.#listenTaskMessage(contextData, message);
+			}
 		});
 	}
 	async #listenFanoutMessage(data, message) {
@@ -3377,77 +3338,6 @@ var FederationImpl = class extends FederationBuilderImpl {
 			listenerSpan.end();
 		});
 	}
-	async #listenTaskMessage(contextData, message) {
-		const logger = getLogger([
-			"fedify",
-			"federation",
-			"task"
-		]);
-		const def = this.taskDefinitions.get(message.taskName);
-		if (def == null) {
-			logger.warn("Received a custom task {taskName} with no registered handler; dropping.", { taskName: message.taskName });
-			return;
-		}
-		const context = this.#createContext(new URL(message.baseUrl), contextData);
-		let data;
-		try {
-			data = await context.codec.decode(def.schema, message.data);
-		} catch (error) {
-			logger.error("Custom task {taskName} payload could not be decoded or validated; dropping:\n{error}", {
-				taskName: message.taskName,
-				error
-			});
-			return;
-		}
-		try {
-			await def.handler(context, data);
-		} catch (error) {
-			if (def.onError != null) try {
-				await def.onError(context, error, data);
-			} catch (onErrorError) {
-				logger.error("onError for custom task {taskName} threw:\n{error}", {
-					taskName: message.taskName,
-					error: onErrorError
-				});
-			}
-			const queue = this.resolveTaskQueue(def.name);
-			if (queue?.nativeRetrial) throw error;
-			const retryPolicy = def.retryPolicy ?? this.taskRetryPolicy;
-			let elapsedTime = Temporal.Duration.from({ seconds: 0 });
-			try {
-				elapsedTime = Temporal.Instant.from(message.started).until(Temporal.Now.instant());
-			} catch (parseError) {
-				logger.error("Custom task {taskName} has an unparsable started time {started}; treating elapsedTime as zero:\n{error}", {
-					taskName: message.taskName,
-					started: message.started,
-					error: parseError
-				});
-			}
-			const delay = retryPolicy({
-				elapsedTime,
-				attempts: message.attempt
-			});
-			if (delay != null && queue != null) {
-				logger.error("Custom task {taskName} failed (attempt #{attempt}); retry...:\n{error}", {
-					taskName: message.taskName,
-					attempt: message.attempt,
-					error
-				});
-				const retryMessage = {
-					...message,
-					attempt: message.attempt + 1
-				};
-				await queue.enqueue(retryMessage, {
-					delay: clampNegativeDelay(delay),
-					orderingKey: message.orderingKey
-				});
-			} else logger.error("Custom task {taskName} failed after {attempt} attempts; giving up:\n{error}", {
-				taskName: message.taskName,
-				attempt: message.attempt,
-				error
-			});
-		}
-	}
 	startQueue(contextData, options = {}) {
 		return this._startQueueInternal(contextData, options.signal, options.queue);
 	}
@@ -4024,7 +3914,6 @@ var ContextImpl = class ContextImpl {
 	documentLoader;
 	contextLoader;
 	invokedFromActorKeyPairsDispatcher;
-	#codec;
 	constructor({ url, federation, data, documentLoader, contextLoader, invokedFromActorKeyPairsDispatcher }) {
 		this.url = url;
 		this.federation = federation;
@@ -4033,15 +3922,6 @@ var ContextImpl = class ContextImpl {
 		this.contextLoader = contextLoader;
 		this.invokedFromActorKeyPairsDispatcher = invokedFromActorKeyPairsDispatcher;
 	}
-	/**
-	* A {@link TaskCodec} bound to this context's loaders, used to encode
-	* and decode custom task payloads.  Lazily created and cached so a context
-	* that never enqueues or dispatches a task pays nothing.
-	* @internal
-	*/
-	get codec() {
-		return this.#codec ??= new TaskCodec(this);
-	}
 	clone(data) {
 		return new ContextImpl({
 			url: this.url,
@@ -4360,45 +4240,6 @@ var ContextImpl = class ContextImpl {
 			allowPrivateAddress: this.federation.allowPrivateAddress
 		});
 	}
-	async enqueueTask(task, data, options = {}) {
-		await this.#enqueueTasks(task, [data], options);
-	}
-	async enqueueTaskMany(task, payloads, options = {}) {
-		await this.#enqueueTasks(task, payloads, options);
-	}
-	async #enqueueTasks(task, items, options) {
-		const def = this.federation.taskDefinitions.get(task.name);
-		if (def == null || def.handle !== task) throw new TypeError(`Task ${JSON.stringify(task.name)} is not defined on this federation; pass a handle returned by its defineTask().`);
-		const queue = this.federation.resolveTaskQueue(task.name);
-		if (queue == null) throw new TypeError("No message queue is configured for tasks; pass `queue` to createFederation() or to defineTask().");
-		if (items.length < 1) return;
-		const delay = options.delay == null ? void 0 : Temporal.Duration.from(options.delay);
-		const messages = await Promise.all(items.map(this.#encodeTaskMessage(task, options)));
-		if (!this.federation.manuallyStartQueue) this.federation._startQueueInternal(this.data);
-		const enqueueOptions = {
-			delay,
-			orderingKey: options.orderingKey
-		};
-		if (messages.length === 1) await queue.enqueue(messages[0], enqueueOptions);
-		else if (queue.enqueueMany != null) await queue.enqueueMany(messages, enqueueOptions);
-		else await Promise.all(messages.map((m) => queue.enqueue(m, enqueueOptions)));
-	}
-	#encodeTaskMessage = (task, options) => async (data) => {
-		const encoded = await this.codec.encode(task.schema, data);
-		const carrier = {};
-		propagation.inject(context.active(), carrier);
-		return {
-			type: "task",
-			id: crypto.randomUUID(),
-			baseUrl: this.origin,
-			taskName: task.name,
-			data: encoded,
-			started: Temporal.Now.instant().toString(),
-			attempt: 0,
-			orderingKey: options.orderingKey,
-			traceContext: carrier
-		};
-	};
 	sendActivity(sender, recipients, activity, options = {}) {
 		return this.tracerProvider.getTracer(name, version).startActiveSpan(this.federation.outboxQueue == null || options.immediate ? "activitypub.outbox" : "activitypub.fanout", {
 			kind: this.federation.outboxQueue == null || options.immediate ? SpanKind.CLIENT : SpanKind.PRODUCER,