@fedify/fedify 2.0.0-dev.1908 → 2.0.0-dev.196

package/dist/{middleware-Dv90Gwc-.js → middleware-BqPcChYv.js}

@@ -2,22 +2,21 @@
           import { Temporal } from "@js-temporal/polyfill";
           import { URLPattern } from "urlpattern-polyfill";
         
-import { getDefaultActivityTransformers } from "./transformers-BFT6d7J5.js";
-import { deno_default, lookupWebFinger } from "./lookup-DrCNfWHm.js";
-import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, getTypeId } from "./actor-C76CDThG.js";
-import { doubleKnock, exportJwk, importJwk, validateCryptoKey, verifyRequest } from "./http-ByZmUHwe.js";
-import { detachSignature, doesActorOwnKey, getKeyOwner, hasSignature, signJsonLd, signObject, verifyJsonLd, verifyObject } from "./proof-CDW6KgLA.js";
-import { getNodeInfo, nodeInfoToJson } from "./types-BtUjyi5y.js";
-import { getAuthenticatedDocumentLoader, kvCache } from "./kv-cache-CykGg2IP.js";
-import { lookupObject, traverseCollection } from "./vocab-B4wXNBv8.js";
+import { getDefaultActivityTransformers } from "./transformers-N_ip_y4P.js";
+import { deno_default, doubleKnock, exportJwk, importJwk, validateCryptoKey, verifyRequest } from "./http-B5BgMxiO.js";
+import { detachSignature, doesActorOwnKey, getKeyOwner, hasSignature, signJsonLd, signObject, verifyJsonLd, verifyObject } from "./proof-DzFse-Bn.js";
+import { getNodeInfo, nodeInfoToJson } from "./types-8l28uC8o.js";
+import { getAuthenticatedDocumentLoader, kvCache } from "./kv-cache-BqWqxam4.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 { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
-import { getDocumentLoader } from "@fedify/vocab-runtime";
 import { cloneDeep } from "es-toolkit";
 import { Router } from "uri-template-router";
 import { parseTemplate } from "url-template";
 import { encodeHex } from "byte-encodings/hex";
 import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_HTTP_RESPONSE_HEADER, ATTR_HTTP_RESPONSE_STATUS_CODE, ATTR_URL_FULL } from "@opentelemetry/semantic-conventions";
+import { getDocumentLoader } from "@fedify/vocab-runtime";
+import { lookupWebFinger } from "@fedify/webfinger";
 import { domainToASCII } from "node:url";
 
 //#region src/federation/inbox.ts
@@ -338,7 +337,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl: FederationImpl$1 } = await import("./middleware-pl3iXZpj.js");
+		const { FederationImpl: FederationImpl$1 } = await import("./middleware-ZN9cd_L8.js");
 		const f = new FederationImpl$1(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -1490,6 +1489,13 @@ async function handleInboxInternal(request, parameters, span) {
 	}
 	if (activity.id != null) span.setAttribute("activitypub.activity.id", activity.id.href);
 	span.setAttribute("activitypub.activity.type", getTypeId(activity).href);
+	span.addEvent("activitypub.activity.received", {
+		"activitypub.activity.json": JSON.stringify(json),
+		"activitypub.activity.verified": activity != null,
+		"ld_signatures.verified": ldSigVerified,
+		"http_signatures.verified": httpSigKey != null,
+		"http_signatures.key_id": httpSigKey?.id?.href ?? ""
+	});
 	if (httpSigKey != null && !await doesActorOwnKey(activity, httpSigKey, ctx)) {
 		logger$1.error("The signer ({keyId}) and the actor ({actorId}) do not match.", {
 			activity: json,
@@ -2030,139 +2036,6 @@ function handleNodeInfoJrd(_request, context$1) {
 	return Promise.resolve(response);
 }
 
-//#endregion
-//#region src/webfinger/handler.ts
-const logger = 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: SpanKind.SERVER }, async (span) => {
-		try {
-			const response = await handleWebFingerInternal(request, options);
-			span.setStatus({ code: response.ok ? SpanStatusCode.UNSET : SpanStatusCode.ERROR });
-			return response;
-		} catch (error) {
-			span.setStatus({
-				code: SpanStatusCode.ERROR,
-				message: String(error)
-			});
-			throw error;
-		} finally {
-			span.end();
-		}
-	});
-}
-async function handleWebFingerInternal(request, { context: context$1, host, actorDispatcher, actorHandleMapper, actorAliasMapper, onNotFound, span, webFingerLinksDispatcher }) {
-	if (actorDispatcher == null) {
-		logger.error("Actor dispatcher is not set.");
-		return await onNotFound(request);
-	}
-	const resource = context$1.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$1, username);
-		if (identifier$1 == null) {
-			logger.error("Actor {username} not found.", { username });
-			return null;
-		}
-		return identifier$1;
-	}
-	let identifier = null;
-	const uriParsed = context$1.parseUri(resourceUrl);
-	if (uriParsed?.type != "actor") {
-		const match = /^acct:([^@]+)@([^@]+)$/.exec(resource);
-		if (match == null) {
-			const result = await actorAliasMapper?.(context$1, 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 ? domainToASCII(match[2].toLowerCase()) : domainToASCII(match[2].substring(0, portMatch.index).toLowerCase()) + portMatch[0];
-			if (normalizedHost != context$1.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$1, identifier);
-	if (actor == null) {
-		logger.error("Actor {identifier} not found.", { identifier });
-		return await onNotFound(request);
-	}
-	const links = [{
-		rel: "self",
-		href: context$1.getActorUri(identifier).href,
-		type: "application/activity+json"
-	}];
-	for (const url of actor.urls) if (url instanceof 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$1, 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$1.url.host}`);
-		if (host != null && host !== context$1.url.host) aliases.push(`acct:${actor.preferredUsername}@${context$1.url.host}`);
-	}
-	if (resourceUrl.href !== context$1.getActorUri(identifier).href) aliases.push(context$1.getActorUri(identifier).href);
-	if (resourceUrl.protocol === "acct:" && host != null && host !== context$1.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
 /**
@@ -2189,8 +2062,8 @@ function createExponentialBackoffPolicy(options = {}) {
 			milliseconds *= 1 + Math.random();
 			milliseconds = Math.round(milliseconds);
 		}
-		const delay$1 = Temporal.Duration.from({ milliseconds });
-		return Temporal.Duration.compare(delay$1, maxDelay) > 0 ? maxDelay : delay$1;
+		const delay = Temporal.Duration.from({ milliseconds });
+		return Temporal.Duration.compare(delay, maxDelay) > 0 ? maxDelay : delay;
 	};
 }
 
@@ -2242,7 +2115,7 @@ function sendActivity(options) {
 			await sendActivityInternal({
 				...options,
 				tracerProvider
-			});
+			}, span);
 		} catch (e) {
 			span.setStatus({
 				code: SpanStatusCode.ERROR,
@@ -2254,7 +2127,7 @@ function sendActivity(options) {
 		}
 	});
 }
-async function sendActivityInternal({ activity, activityId, keys, inbox, headers, specDeterminer, tracerProvider }) {
+async function sendActivityInternal({ activity, activityId, keys, inbox, headers, specDeterminer, tracerProvider }, span) {
 	const logger$1 = getLogger([
 		"fedify",
 		"federation",
@@ -2309,6 +2182,143 @@ async function sendActivityInternal({ activity, activityId, keys, inbox, headers
 		});
 		throw new Error(`Failed to send activity ${activityId} to ${inbox.href} (${response.status} ${response.statusText}):\n${error}`);
 	}
+	span.addEvent("activitypub.activity.sent", {
+		"activitypub.activity.json": JSON.stringify(activity),
+		"activitypub.inbox.url": inbox.href,
+		"activitypub.activity.id": activityId ?? ""
+	});
+}
+
+//#endregion
+//#region src/federation/webfinger.ts
+const logger = 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: SpanKind.SERVER }, async (span) => {
+		try {
+			const response = await handleWebFingerInternal(request, options);
+			span.setStatus({ code: response.ok ? SpanStatusCode.UNSET : SpanStatusCode.ERROR });
+			return response;
+		} catch (error) {
+			span.setStatus({
+				code: SpanStatusCode.ERROR,
+				message: String(error)
+			});
+			throw error;
+		} finally {
+			span.end();
+		}
+	});
+}
+async function handleWebFingerInternal(request, { context: context$1, host, actorDispatcher, actorHandleMapper, actorAliasMapper, onNotFound, span, webFingerLinksDispatcher }) {
+	if (actorDispatcher == null) {
+		logger.error("Actor dispatcher is not set.");
+		return await onNotFound(request);
+	}
+	const resource = context$1.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$1, username);
+		if (identifier$1 == null) {
+			logger.error("Actor {username} not found.", { username });
+			return null;
+		}
+		return identifier$1;
+	}
+	let identifier = null;
+	const uriParsed = context$1.parseUri(resourceUrl);
+	if (uriParsed?.type != "actor") {
+		const match = /^acct:([^@]+)@([^@]+)$/.exec(resource);
+		if (match == null) {
+			const result = await actorAliasMapper?.(context$1, 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 ? domainToASCII(match[2].toLowerCase()) : domainToASCII(match[2].substring(0, portMatch.index).toLowerCase()) + portMatch[0];
+			if (normalizedHost != context$1.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$1, identifier);
+	if (actor == null) {
+		logger.error("Actor {identifier} not found.", { identifier });
+		return await onNotFound(request);
+	}
+	const links = [{
+		rel: "self",
+		href: context$1.getActorUri(identifier).href,
+		type: "application/activity+json"
+	}];
+	for (const url of actor.urls) if (url instanceof 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$1, 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$1.url.host}`);
+		if (host != null && host !== context$1.url.host) aliases.push(`acct:${actor.preferredUsername}@${context$1.url.host}`);
+	}
+	if (resourceUrl.href !== context$1.getActorUri(identifier).href) aliases.push(context$1.getActorUri(identifier).href);
+	if (resourceUrl.protocol === "acct:" && host != null && host !== context$1.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
@@ -2615,11 +2625,11 @@ var FederationImpl = class extends FederationBuilderImpl {
 				});
 				throw error;
 			}
-			const delay$1 = this.outboxRetryPolicy({
+			const delay = this.outboxRetryPolicy({
 				elapsedTime: Temporal.Instant.from(message.started).until(Temporal.Now.instant()),
 				attempts: message.attempt
 			});
-			if (delay$1 != null) {
+			if (delay != null) {
 				logger$1.error("Failed to send activity {activityId} to {inbox} (attempt #{attempt}); retry...:\n{error}", {
 					...logData,
 					error
@@ -2627,7 +2637,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				await this.outboxQueue?.enqueue({
 					...message,
 					attempt: message.attempt + 1
-				}, { delay: Temporal.Duration.compare(delay$1, { seconds: 0 }) < 0 ? Temporal.Duration.from({ seconds: 0 }) : delay$1 });
+				}, { delay: Temporal.Duration.compare(delay, { seconds: 0 }) < 0 ? Temporal.Duration.from({ seconds: 0 }) : delay });
 			} else logger$1.error("Failed to send activity {activityId} to {inbox} after {attempt} attempts; giving up:\n{error}", {
 				...logData,
 				error
@@ -2714,11 +2724,11 @@ var FederationImpl = class extends FederationBuilderImpl {
 					span$1.end();
 					throw error;
 				}
-				const delay$1 = this.inboxRetryPolicy({
+				const delay = this.inboxRetryPolicy({
 					elapsedTime: Temporal.Instant.from(message.started).until(Temporal.Now.instant()),
 					attempts: message.attempt
 				});
-				if (delay$1 != null) {
+				if (delay != null) {
 					logger$1.error("Failed to process the incoming activity {activityId} (attempt #{attempt}); retry...:\n{error}", {
 						error,
 						attempt: message.attempt,
@@ -2729,7 +2739,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					await this.inboxQueue?.enqueue({
 						...message,
 						attempt: message.attempt + 1
-					}, { delay: Temporal.Duration.compare(delay$1, { seconds: 0 }) < 0 ? Temporal.Duration.from({ seconds: 0 }) : delay$1 });
+					}, { delay: Temporal.Duration.compare(delay, { seconds: 0 }) < 0 ? Temporal.Duration.from({ seconds: 0 }) : delay });
 				} else logger$1.error("Failed to process the incoming activity {activityId} after {trial} attempts; giving up:\n{error}", {
 					error,
 					activityId: activity.id?.href,
@@ -4144,4 +4154,4 @@ function getRequestId(request) {
 }
 
 //#endregion
-export { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, Router$1 as Router, RouterError, buildCollectionSynchronizationHeader, createExponentialBackoffPolicy, createFederation, createFederationBuilder, digest, respondWithObject, respondWithObjectIfAcceptable };
+export { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, Router$1 as Router, RouterError, buildCollectionSynchronizationHeader, createExponentialBackoffPolicy, createFederation, createFederationBuilder, digest, handleWebFinger, respondWithObject, respondWithObjectIfAcceptable };

package/dist/middleware-CnrWiFJI.cjs

@@ -0,0 +1,12 @@
+
+          const { Temporal } = require("@js-temporal/polyfill");
+          const { URLPattern } = require("urlpattern-polyfill");
+        
+require('./transformers-BjBg6Lag.cjs');
+require('./http-B_jtB30-.cjs');
+const require_middleware = require('./middleware-BaoVtoMl.cjs');
+require('./proof-vmNsq1AQ.cjs');
+require('./types-B6z6CqIz.cjs');
+require('./kv-cache-DY6hQ8Rf.cjs');
+
+exports.FederationImpl = require_middleware.FederationImpl;