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

package/dist/middleware-DTjhpVrj.js

@@ -0,0 +1,26 @@
+
+      import { Temporal } from "@js-temporal/polyfill";
+      import { URLPattern } from "urlpattern-polyfill";
+      globalThis.addEventListener = () => {};
+    
+import "./type-BSR-vRXo.js";
+import { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, createFederation } from "./middleware-DxS7Csvz.js";
+import "./client-KUXReLjS.js";
+import "./lookup-q8DeFAjR.js";
+import "./types-BSuWJsOm.js";
+import "./actor-By5NMImS.js";
+import "./key-B057bXm0.js";
+import "./http-CCydyMoV.js";
+import "./authdocloader-lhbaj4KA.js";
+import "./ld-CxJe2x7_.js";
+import "./owner-jwXilm3L.js";
+import "./proof-CHi36V0T.js";
+import "./inbox-DH8TXk1f.js";
+import "./builder-B6AupxqD.js";
+import "./collection-CcnIw1qY.js";
+import "./keycache-CB_VjDe0.js";
+import "./negotiation-5NPJL6zp.js";
+import "./retry-D4GJ670a.js";
+import "./send-CwVrwo7j.js";
+
+export { FederationImpl };

package/dist/{middleware-CU2GpLYi.js → middleware-DxS7Csvz.js}

@@ -3,22 +3,23 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, deno_default, getDocumentLoader, getTypeId, kvCache, lookupWebFinger } from "./type-CGIBxLsG.js";
-import { getNodeInfo } from "./client-DXKgLzk4.js";
-import { RouterError, lookupObject, traverseCollection } from "./lookup-1CBMmJ3_.js";
+import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, deno_default, getDocumentLoader, getTypeId, kvCache, lookupWebFinger } from "./type-BSR-vRXo.js";
+import { getNodeInfo } from "./client-KUXReLjS.js";
+import { RouterError, lookupObject, traverseCollection } from "./lookup-q8DeFAjR.js";
 import { nodeInfoToJson } from "./types-BSuWJsOm.js";
-import { exportJwk, importJwk, validateCryptoKey } from "./key-C6ojpFqZ.js";
-import { verifyRequest } from "./http-mimmGwH8.js";
-import { getAuthenticatedDocumentLoader } from "./authdocloader-CQBXQkJb.js";
-import { detachSignature, hasSignature, signJsonLd, verifyJsonLd } from "./ld-tLocOQ6q.js";
-import { doesActorOwnKey, getKeyOwner } from "./owner-qDh_g_5C.js";
-import { signObject, verifyObject } from "./proof-DimUFDOB.js";
-import { routeActivity } from "./inbox--bLOiwUO.js";
-import { FederationBuilderImpl } from "./builder-Cmx9eExq.js";
+import { exportJwk, importJwk, validateCryptoKey } from "./key-B057bXm0.js";
+import { verifyRequest } from "./http-CCydyMoV.js";
+import { getAuthenticatedDocumentLoader } from "./authdocloader-lhbaj4KA.js";
+import { detachSignature, hasSignature, signJsonLd, verifyJsonLd } from "./ld-CxJe2x7_.js";
+import { doesActorOwnKey, getKeyOwner } from "./owner-jwXilm3L.js";
+import { signObject, verifyObject } from "./proof-CHi36V0T.js";
+import { routeActivity } from "./inbox-DH8TXk1f.js";
+import { FederationBuilderImpl } from "./builder-B6AupxqD.js";
 import { buildCollectionSynchronizationHeader } from "./collection-CcnIw1qY.js";
-import { KvKeyCache } from "./keycache-DZnNO-JV.js";
-import { createExponentialBackoffPolicy } from "./retry-CfF8Gn4d.js";
-import { extractInboxes, sendActivity } from "./send-BDoLPO28.js";
+import { KvKeyCache } from "./keycache-CB_VjDe0.js";
+import { acceptsJsonLd } from "./negotiation-5NPJL6zp.js";
+import { createExponentialBackoffPolicy } from "./retry-D4GJ670a.js";
+import { extractInboxes, sendActivity } from "./send-CwVrwo7j.js";
 import { getLogger, withContext } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
 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";
@@ -297,73 +298,8 @@ async function handleWebFingerInternal(request, { context: context$1, host, acto
 	} });
 }
 
-//#endregion
-//#region src/federation/negotiation.ts
-function compareSpecs(a, b) {
-	return b.q - a.q || (b.s ?? 0) - (a.s ?? 0) || (a.o ?? 0) - (b.o ?? 0) || a.i - b.i || 0;
-}
-function isQuality(spec) {
-	return spec.q > 0;
-}
-const simpleMediaTypeRegExp = /^\s*([^\s\/;]+)\/([^;\s]+)\s*(?:;(.*))?$/;
-function splitKeyValuePair(str) {
-	const [key, value] = str.split("=");
-	return [key.toLowerCase(), value];
-}
-function parseMediaType(str, i) {
-	const match = simpleMediaTypeRegExp.exec(str);
-	if (!match) return;
-	const [, type, subtype, parameters] = match;
-	if (!type || !subtype) return;
-	const params = Object.create(null);
-	let q = 1;
-	if (parameters) {
-		const kvps = parameters.split(";").map((p) => p.trim()).map(splitKeyValuePair);
-		for (const [key, val] of kvps) {
-			const value = val && val[0] === `"` && val[val.length - 1] === `"` ? val.slice(1, val.length - 1) : val;
-			if (key === "q" && value) {
-				q = parseFloat(value);
-				break;
-			}
-			params[key] = value;
-		}
-	}
-	return {
-		type,
-		subtype,
-		params,
-		i,
-		o: void 0,
-		q,
-		s: void 0
-	};
-}
-function parseAccept(accept) {
-	const accepts = accept.split(",").map((p) => p.trim());
-	const mediaTypes = [];
-	for (const [index, accept$1] of accepts.entries()) {
-		const mediaType = parseMediaType(accept$1.trim(), index);
-		if (mediaType) mediaTypes.push(mediaType);
-	}
-	return mediaTypes;
-}
-function getFullType(spec) {
-	return `${spec.type}/${spec.subtype}`;
-}
-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) : ["*/*"];
-	if (types == null) return true;
-	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");
-}
 /**
 * Handles an actor request.
 * @template TContextData The context data to pass to the context.
@@ -371,7 +307,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$2 = getLogger([
 		"fedify",
 		"federation",
@@ -386,7 +322,6 @@ async function handleActor(request, { identifier, context: context$1, actorDispa
 		logger$2.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: {
@@ -421,11 +356,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: {
@@ -463,7 +397,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);
@@ -576,7 +510,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: {
@@ -914,7 +847,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);
@@ -933,7 +865,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);
@@ -1211,10 +1142,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;
 			}
@@ -1232,15 +1162,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.
@@ -1324,15 +1245,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
 */
@@ -2011,6 +1923,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 						span,
 						tracer
 					});
+					if (acceptsJsonLd(request)) response.headers.set("Vary", "Accept");
 				} catch (error) {
 					span.setStatus({
 						code: SpanStatusCode.ERROR,
@@ -2074,6 +1987,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, {
@@ -2082,8 +1998,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:/, "");
@@ -2099,8 +2014,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					objectDispatcher: callbacks?.dispatcher,
 					authorizePredicate: callbacks?.authorizePredicate,
 					onUnauthorized,
-					onNotFound,
-					onNotAcceptable
+					onNotFound
 				});
 			}
 			case "outbox": return await handleCollection(request, {
@@ -2111,8 +2025,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, {
@@ -2123,8 +2036,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":
@@ -2156,8 +2068,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");
@@ -2180,8 +2091,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					collectionCallbacks: this.followersCallbacks,
 					tracerProvider: this.tracerProvider,
 					onUnauthorized,
-					onNotFound,
-					onNotAcceptable
+					onNotFound
 				});
 			}
 			case "liked": return await handleCollection(request, {
@@ -2192,8 +2102,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				collectionCallbacks: this.likedCallbacks,
 				tracerProvider: this.tracerProvider,
 				onUnauthorized,
-				onNotFound,
-				onNotAcceptable
+				onNotFound
 			});
 			case "featured": return await handleCollection(request, {
 				name: "featured",
@@ -2203,8 +2112,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",
@@ -2214,8 +2122,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				collectionCallbacks: this.featuredTagsCallbacks,
 				tracerProvider: this.tracerProvider,
 				onUnauthorized,
-				onNotFound,
-				onNotAcceptable
+				onNotFound
 			});
 			case "collection": {
 				const name = route.name.replace(/^collection:/, "");
@@ -2227,8 +2134,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					collectionCallbacks: callbacks,
 					tracerProvider: this.tracerProvider,
 					onUnauthorized,
-					onNotFound,
-					onNotAcceptable
+					onNotFound
 				});
 			}
 			case "orderedCollection": {
@@ -2241,8 +2147,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 					collectionCallbacks: callbacks,
 					tracerProvider: this.tracerProvider,
 					onUnauthorized,
-					onNotFound,
-					onNotAcceptable
+					onNotFound
 				});
 			}
 			default: {
@@ -2537,15 +2442,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$2.warn("No actor dispatcher registered.");
-			return [];
+		let actorUri;
+		try {
+			actorUri = this.getActorUri(identifier);
+		} catch (error) {
+			if (error instanceof RouterError) {
+				logger$2.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 }
@@ -2706,12 +2612,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);
@@ -3210,4 +3115,4 @@ function getRequestId(request) {
 }
 
 //#endregion
-export { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, acceptsJsonLd, actorDehydrator, autoIdAssigner, createFederation, handleActor, handleCollection, handleCustomCollection, handleInbox, handleNodeInfo, handleNodeInfoJrd, handleObject, handleWebFinger, respondWithObject, respondWithObjectIfAcceptable };
+export { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, actorDehydrator, autoIdAssigner, createFederation, handleActor, handleCollection, handleCustomCollection, handleInbox, handleNodeInfo, handleNodeInfoJrd, handleObject, handleWebFinger, respondWithObject, respondWithObjectIfAcceptable };

package/dist/{mod-RI3-KvUI.d.ts → mod-B26zRlH1.d.ts}

@@ -1,7 +1,7 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 import { Activity } from "./vocab-SOE1ifCr.js";
-import { ActivityTransformer, Context } from "./context-CDSZdQHD.js";
+import { ActivityTransformer, Context } from "./context-CQsAT7xk.js";
 
 //#region src/compat/transformers.d.ts