@fedify/fedify 2.0.0-pr.433.1603 → 2.0.0-pr.434.1662

package/dist/{middleware-BJn2g4ay.js → middleware-BvEwDOJ5.js}

@@ -1,17 +1,17 @@
 
-      import { Temporal } from "@js-temporal/polyfill";
-      import { URLPattern } from "urlpattern-polyfill";
-    
-import { getDefaultActivityTransformers } from "./transformers-Dna8Fg7k.js";
-import { deno_default, getDocumentLoader, kvCache } from "./docloader-D4sbvvPM.js";
-import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, getTypeId } from "./actor-CY-MF2fp.js";
-import { lookupWebFinger } from "./lookup-DG0T7i6q.js";
-import { exportJwk, importJwk, validateCryptoKey } from "./key-DaaSDiCV.js";
-import { doubleKnock, verifyRequest } from "./http-az-I4DFF.js";
-import { detachSignature, doesActorOwnKey, getKeyOwner, hasSignature, signJsonLd, signObject, verifyJsonLd, verifyObject } from "./proof-aGjI96QA.js";
-import { getNodeInfo, nodeInfoToJson } from "./types-DiMJWG0f.js";
-import { getAuthenticatedDocumentLoader } from "./authdocloader-Dh8orZQs.js";
-import { lookupObject, traverseCollection } from "./vocab-Br3OfNTW.js";
+          import { Temporal } from "@js-temporal/polyfill";
+          import { URLPattern } from "urlpattern-polyfill";
+        
+import { getDefaultActivityTransformers } from "./transformers-BFT6d7J5.js";
+import { deno_default, getDocumentLoader, kvCache } from "./docloader-ZGKS1Zy-.js";
+import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, getTypeId } from "./actor-Dsla85Uq.js";
+import { lookupWebFinger } from "./lookup-Cc-KXO2K.js";
+import { exportJwk, importJwk, validateCryptoKey } from "./key-cn3BcQaB.js";
+import { doubleKnock, verifyRequest } from "./http-BqSkbrGv.js";
+import { detachSignature, doesActorOwnKey, getKeyOwner, hasSignature, signJsonLd, signObject, verifyJsonLd, verifyObject } from "./proof-BE1A6Ct1.js";
+import { getNodeInfo, nodeInfoToJson } from "./types-XMA_ABYQ.js";
+import { getAuthenticatedDocumentLoader } from "./authdocloader-CpmdBiRe.js";
+import { lookupObject, traverseCollection } from "./vocab-BlOQWNvd.js";
 import { getLogger, withContext } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
 import { encodeHex } from "byte-encodings/hex";
@@ -321,7 +321,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl: FederationImpl$1 } = await import("./middleware-aYHOiG0n.js");
+		const { FederationImpl: FederationImpl$1 } = await import("./middleware-DCdrZPxz.js");
 		const f = new FederationImpl$1(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -979,9 +979,6 @@ function preferredMediaTypes(accept) {
 	const accepts = parseAccept(accept === void 0 ? "*/*" : accept ?? "");
 	return accepts.filter(isQuality).sort(compareSpecs).map(getFullType);
 }
-
-//#endregion
-//#region src/federation/handler.ts
 function acceptsJsonLd(request) {
 	const accept = request.headers.get("Accept");
 	const types = accept ? preferredMediaTypes(accept) : ["*/*"];
@@ -989,6 +986,9 @@ function acceptsJsonLd(request) {
 	if (types[0] === "text/html" || types[0] === "application/xhtml+xml") return false;
 	return types.includes("application/activity+json") || types.includes("application/ld+json") || types.includes("application/json");
 }
+
+//#endregion
+//#region src/federation/handler.ts
 /**
 * Handles an actor request.
 * @template TContextData The context data to pass to the context.
@@ -996,7 +996,7 @@ function acceptsJsonLd(request) {
 * @param parameters The parameters for handling the actor.
 * @returns A promise that resolves to an HTTP response.
 */
-async function handleActor(request, { identifier, context: context$1, actorDispatcher, authorizePredicate, onNotFound, onNotAcceptable, onUnauthorized }) {
+async function handleActor(request, { identifier, context: context$1, actorDispatcher, authorizePredicate, onNotFound, onUnauthorized }) {
 	const logger$1 = getLogger([
 		"fedify",
 		"federation",
@@ -1011,7 +1011,6 @@ async function handleActor(request, { identifier, context: context$1, actorDispa
 		logger$1.debug("Actor {identifier} not found.", { identifier });
 		return await onNotFound(request);
 	}
-	if (!acceptsJsonLd(request)) return await onNotAcceptable(request);
 	if (authorizePredicate != null) {
 		let key = await context$1.getSignedKey();
 		key = key?.clone({}, { $warning: {
@@ -1046,11 +1045,10 @@ async function handleActor(request, { identifier, context: context$1, actorDispa
 * @param parameters The parameters for handling the object.
 * @returns A promise that resolves to an HTTP response.
 */
-async function handleObject(request, { values, context: context$1, objectDispatcher, authorizePredicate, onNotFound, onNotAcceptable, onUnauthorized }) {
+async function handleObject(request, { values, context: context$1, objectDispatcher, authorizePredicate, onNotFound, onUnauthorized }) {
 	if (objectDispatcher == null) return await onNotFound(request);
 	const object = await objectDispatcher(context$1, values);
 	if (object == null) return await onNotFound(request);
-	if (!acceptsJsonLd(request)) return await onNotAcceptable(request);
 	if (authorizePredicate != null) {
 		let key = await context$1.getSignedKey();
 		key = key?.clone({}, { $warning: {
@@ -1088,7 +1086,7 @@ async function handleObject(request, { values, context: context$1, objectDispatc
 * @param parameters The parameters for handling the collection.
 * @returns A promise that resolves to an HTTP response.
 */
-async function handleCollection(request, { name, identifier, uriGetter, filter, filterPredicate, context: context$1, collectionCallbacks, tracerProvider, onUnauthorized, onNotFound, onNotAcceptable }) {
+async function handleCollection(request, { name, identifier, uriGetter, filter, filterPredicate, context: context$1, collectionCallbacks, tracerProvider, onUnauthorized, onNotFound }) {
 	const spanName = name.trim().replace(/\s+/g, "_");
 	tracerProvider = tracerProvider ?? trace.getTracerProvider();
 	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
@@ -1201,7 +1199,6 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 			partOf
 		});
 	}
-	if (!acceptsJsonLd(request)) return await onNotAcceptable(request);
 	if (collectionCallbacks.authorizePredicate != null) {
 		let key = await context$1.getSignedKey();
 		key = key?.clone({}, { $warning: {
@@ -1539,7 +1536,6 @@ async function handleInboxInternal(request, { recipient, context: ctx, inboxCont
 const handleCustomCollection = exceptWrapper(_handleCustomCollection);
 async function _handleCustomCollection(request, { name, values, context: context$1, tracerProvider, collectionCallbacks: callbacks, filterPredicate }) {
 	verifyDefined(callbacks);
-	verifyJsonLdRequest(request);
 	await authIfNeeded(context$1, values, callbacks);
 	const cursor = new URL(request.url).searchParams.get("cursor");
 	return await new CustomCollectionHandler(name, values, context$1, callbacks, tracerProvider, Collection, CollectionPage, filterPredicate).fetchCollection(cursor).toJsonLd().then(respondAsActivity);
@@ -1558,7 +1554,6 @@ async function _handleCustomCollection(request, { name, values, context: context
 const handleOrderedCollection = exceptWrapper(_handleOrderedCollection);
 async function _handleOrderedCollection(request, { name, values, context: context$1, tracerProvider, collectionCallbacks: callbacks, filterPredicate }) {
 	verifyDefined(callbacks);
-	verifyJsonLdRequest(request);
 	await authIfNeeded(context$1, values, callbacks);
 	const cursor = new URL(request.url).searchParams.get("cursor");
 	return await new CustomCollectionHandler(name, values, context$1, callbacks, tracerProvider, OrderedCollection, OrderedCollectionPage, filterPredicate).fetchCollection(cursor).toJsonLd().then(respondAsActivity);
@@ -1836,10 +1831,9 @@ function exceptWrapper(handler) {
 		try {
 			return await handler(request, handlerParams);
 		} catch (error) {
-			const { onNotFound, onNotAcceptable, onUnauthorized } = handlerParams;
+			const { onNotFound, onUnauthorized } = handlerParams;
 			switch (error?.constructor) {
 				case ItemsNotFoundError: return await onNotFound(request);
-				case NotAcceptableError: return await onNotAcceptable(request);
 				case UnauthorizedError: return await onUnauthorized(request);
 				default: throw error;
 			}
@@ -1857,15 +1851,6 @@ const verifyDefined = (callbacks) => {
 	if (callbacks === void 0) throw new ItemsNotFoundError();
 };
 /**
-* Verifies that a request accepts JSON-LD content type.
-* @param request The HTTP request to verify.
-* @throws {NotAcceptableError} If the request doesn't accept JSON-LD.
-* @since 1.8.0
-*/
-const verifyJsonLdRequest = (request) => {
-	if (!acceptsJsonLd(request)) throw new NotAcceptableError();
-};
-/**
 * Performs authorization if needed based on the authorization predicate.
 * @template TContextData The context data type.
 * @param {RequestContext<TContextData>} context The request context.
@@ -1949,15 +1934,6 @@ var ItemsNotFoundError = class extends HandlerError {
 	}
 };
 /**
-* Error thrown when the request is not acceptable (e.g., wrong content type).
-* @since 1.8.0
-*/
-var NotAcceptableError = class extends HandlerError {
-	constructor() {
-		super("The request is not acceptable.");
-	}
-};
-/**
 * Error thrown when access to a collection is unauthorized.
 * @since 1.8.0
 */
@@ -2955,6 +2931,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 						span,
 						tracer
 					});
+					if (acceptsJsonLd(request)) response.headers.set("Vary", "Accept");
 				} catch (error) {
 					span.setStatus({
 						code: SpanStatusCode.ERROR,
@@ -3018,6 +2995,9 @@ var FederationImpl = class extends FederationBuilderImpl {
 				context: context$1,
 				nodeInfoDispatcher: this.nodeInfoDispatcher
 			});
+		}
+		if (!acceptsJsonLd(request)) return await onNotAcceptable(request);
+		switch (routeName) {
 			case "actor":
 				context$1 = this.#createContext(request, contextData, { invokedFromActorDispatcher: { identifier: route.values.identifier ?? route.values.handle } });
 				return await handleActor(request, {
@@ -3026,8 +3006,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					actorDispatcher: this.actorCallbacks?.dispatcher,
 					authorizePredicate: this.actorCallbacks?.authorizePredicate,
 					onUnauthorized,
-					onNotFound,
-					onNotAcceptable
+					onNotFound
 				});
 			case "object": {
 				const typeId = route.name.replace(/^object:/, "");
@@ -3043,8 +3022,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					objectDispatcher: callbacks?.dispatcher,
 					authorizePredicate: callbacks?.authorizePredicate,
 					onUnauthorized,
-					onNotFound,
-					onNotAcceptable
+					onNotFound
 				});
 			}
 			case "outbox": return await handleCollection(request, {
@@ -3055,8 +3033,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				collectionCallbacks: this.outboxCallbacks,
 				tracerProvider: this.tracerProvider,
 				onUnauthorized,
-				onNotFound,
-				onNotAcceptable
+				onNotFound
 			});
 			case "inbox":
 				if (request.method !== "POST") return await handleCollection(request, {
@@ -3067,8 +3044,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					collectionCallbacks: this.inboxCallbacks,
 					tracerProvider: this.tracerProvider,
 					onUnauthorized,
-					onNotFound,
-					onNotAcceptable
+					onNotFound
 				});
 				context$1 = this.#createContext(request, contextData, { documentLoader: await context$1.getDocumentLoader({ identifier: route.values.identifier ?? route.values.handle }) });
 			case "sharedInbox":
@@ -3100,8 +3076,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				collectionCallbacks: this.followingCallbacks,
 				tracerProvider: this.tracerProvider,
 				onUnauthorized,
-				onNotFound,
-				onNotAcceptable
+				onNotFound
 			});
 			case "followers": {
 				let baseUrl = url.searchParams.get("base-url");
@@ -3124,8 +3099,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					collectionCallbacks: this.followersCallbacks,
 					tracerProvider: this.tracerProvider,
 					onUnauthorized,
-					onNotFound,
-					onNotAcceptable
+					onNotFound
 				});
 			}
 			case "liked": return await handleCollection(request, {
@@ -3136,8 +3110,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				collectionCallbacks: this.likedCallbacks,
 				tracerProvider: this.tracerProvider,
 				onUnauthorized,
-				onNotFound,
-				onNotAcceptable
+				onNotFound
 			});
 			case "featured": return await handleCollection(request, {
 				name: "featured",
@@ -3147,8 +3120,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				collectionCallbacks: this.featuredCallbacks,
 				tracerProvider: this.tracerProvider,
 				onUnauthorized,
-				onNotFound,
-				onNotAcceptable
+				onNotFound
 			});
 			case "featuredTags": return await handleCollection(request, {
 				name: "featured tags",
@@ -3158,8 +3130,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				collectionCallbacks: this.featuredTagsCallbacks,
 				tracerProvider: this.tracerProvider,
 				onUnauthorized,
-				onNotFound,
-				onNotAcceptable
+				onNotFound
 			});
 			case "collection": {
 				const name = route.name.replace(/^collection:/, "");
@@ -3171,8 +3142,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					collectionCallbacks: callbacks,
 					tracerProvider: this.tracerProvider,
 					onUnauthorized,
-					onNotFound,
-					onNotAcceptable
+					onNotFound
 				});
 			}
 			case "orderedCollection": {
@@ -3185,8 +3155,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					collectionCallbacks: callbacks,
 					tracerProvider: this.tracerProvider,
 					onUnauthorized,
-					onNotFound,
-					onNotAcceptable
+					onNotFound
 				});
 			}
 			default: {
@@ -3481,15 +3450,16 @@ var ContextImpl = class ContextImpl {
 			"actor"
 		]);
 		if (this.federation.actorCallbacks?.keyPairsDispatcher == null) throw new Error("No actor key pairs dispatcher registered.");
-		const path = this.federation.router.build("actor", {
-			identifier,
-			handle: identifier
-		});
-		if (path == null) {
-			logger$1.warn("No actor dispatcher registered.");
-			return [];
+		let actorUri;
+		try {
+			actorUri = this.getActorUri(identifier);
+		} catch (error) {
+			if (error instanceof RouterError) {
+				logger$1.warn(error.message);
+				return [];
+			}
+			throw error;
 		}
-		const actorUri = new URL(path, this.canonicalOrigin);
 		const keyPairs = await this.federation.actorCallbacks?.keyPairsDispatcher(new ContextImpl({
 			...this,
 			invokedFromActorKeyPairsDispatcher: { identifier }
@@ -3650,12 +3620,11 @@ var ContextImpl = class ContextImpl {
 			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) {
-				const collectionId = this.federation.router.build("followers", {
-					identifier,
-					handle: identifier
-				});
-				opts.collectionSync = collectionId == null ? void 0 : new URL(collectionId, this.canonicalOrigin).href;
+			if (options.syncCollection) try {
+				opts.collectionSync = this.getFollowersUri(identifier).href;
+			} catch (error) {
+				if (error instanceof RouterError) opts.collectionSync = void 0;
+				else throw error;
 			}
 		} else expandedRecipients = [recipients];
 		span.setAttribute("activitypub.inboxes", expandedRecipients.length);

package/dist/middleware-DCdrZPxz.js

@@ -0,0 +1,17 @@
+
+          import { Temporal } from "@js-temporal/polyfill";
+          import { URLPattern } from "urlpattern-polyfill";
+        
+import "./transformers-BFT6d7J5.js";
+import "./docloader-ZGKS1Zy-.js";
+import "./actor-Dsla85Uq.js";
+import { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, createFederation } from "./middleware-BvEwDOJ5.js";
+import "./lookup-Cc-KXO2K.js";
+import "./key-cn3BcQaB.js";
+import "./http-BqSkbrGv.js";
+import "./proof-BE1A6Ct1.js";
+import "./types-XMA_ABYQ.js";
+import "./authdocloader-CpmdBiRe.js";
+import "./vocab-BlOQWNvd.js";
+
+export { FederationImpl };