@fedify/fedify 2.0.0-pr.412.1692 → 2.0.0-pr.412.1794

package/dist/middleware-Bot7EEwV.js

@@ -0,0 +1,26 @@
+
+      import { Temporal } from "@js-temporal/polyfill";
+      import { URLPattern } from "urlpattern-polyfill";
+      globalThis.addEventListener = () => {};
+    
+import "./lookup-DQRtjvb1.js";
+import { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, createFederation } from "./middleware-CJlj5Olw.js";
+import "./client-pY7-3icS.js";
+import "./types-C2XVl6gj.js";
+import "./actor-BXHc5r-q.js";
+import "./key-CxdLUFS6.js";
+import "./http-D2kIm9la.js";
+import "./ld-CIhvSCCr.js";
+import "./owner-Dvh7mBvr.js";
+import "./proof-Dgy35fzc.js";
+import "./docloader-CrbAy9Oc.js";
+import "./kv-cache-DN9pfMBe.js";
+import "./inbox-HjG5peXY.js";
+import "./builder-u7usRsT3.js";
+import "./collection-BzWsN9pB.js";
+import "./keycache-bU7COwsh.js";
+import "./negotiation-C4nFufNk.js";
+import "./retry-CfF8Gn4d.js";
+import "./send-Drp20VO9.js";
+
+export { FederationImpl };

package/dist/middleware-CFJgmUMW.cjs

@@ -0,0 +1,15 @@
+
+          const { Temporal } = require("@js-temporal/polyfill");
+          const { URLPattern } = require("urlpattern-polyfill");
+        
+require('./transformers-CoBS-oFG.cjs');
+require('./lookup-CfFkONZD.cjs');
+require('./actor-Ba9Z1eNJ.cjs');
+const require_middleware = require('./middleware-D74TgW2E.cjs');
+require('./http-Dofes42e.cjs');
+require('./proof-D0uThUvD.cjs');
+require('./types-CWgzGaqk.cjs');
+require('./kv-cache-Dkvbn6rg.cjs');
+require('./vocab-DFaWWYDn.cjs');
+
+exports.FederationImpl = require_middleware.FederationImpl;

package/dist/{middleware-Cgr3PtaJ.js → middleware-CJlj5Olw.js}

@@ -3,23 +3,24 @@
       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-NEA09tSC.js";
-import { getNodeInfo } from "./client-Bmd-i8x8.js";
-import { RouterError, lookupObject, traverseCollection } from "./lookup-DhQCVVja.js";
-import { nodeInfoToJson } from "./types-BSuWJsOm.js";
-import { exportJwk, importJwk, validateCryptoKey } from "./key-IxRhZpOF.js";
-import { verifyRequest } from "./http-DGjdMiLc.js";
-import { getAuthenticatedDocumentLoader } from "./authdocloader-SjwloJUA.js";
-import { detachSignature, hasSignature, signJsonLd, verifyJsonLd } from "./ld-DW7A0uIc.js";
-import { doesActorOwnKey, getKeyOwner } from "./owner-6Vc3UXXE.js";
-import { signObject, verifyObject } from "./proof-C1jhbeNv.js";
-import { routeActivity } from "./inbox-BoDY3z8G.js";
-import { FederationBuilderImpl } from "./builder-OA47XRft.js";
-import { buildCollectionSynchronizationHeader } from "./collection-CcnIw1qY.js";
-import { KvKeyCache } from "./keycache-TEniXNel.js";
-import { acceptsJsonLd } from "./negotiation-5NPJL6zp.js";
-import { createExponentialBackoffPolicy } from "./retry-D4GJ670a.js";
-import { extractInboxes, sendActivity } from "./send-DjATl6i3.js";
+import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, RouterError, deno_default, getTypeId, lookupObject, lookupWebFinger, traverseCollection } from "./lookup-DQRtjvb1.js";
+import { getNodeInfo } from "./client-pY7-3icS.js";
+import { nodeInfoToJson } from "./types-C2XVl6gj.js";
+import { exportJwk, importJwk, validateCryptoKey } from "./key-CxdLUFS6.js";
+import { verifyRequest } from "./http-D2kIm9la.js";
+import { detachSignature, hasSignature, signJsonLd, verifyJsonLd } from "./ld-CIhvSCCr.js";
+import { doesActorOwnKey, getKeyOwner } from "./owner-Dvh7mBvr.js";
+import { signObject, verifyObject } from "./proof-Dgy35fzc.js";
+import { getAuthenticatedDocumentLoader } from "./docloader-CrbAy9Oc.js";
+import { kvCache } from "./kv-cache-DN9pfMBe.js";
+import { routeActivity } from "./inbox-HjG5peXY.js";
+import { FederationBuilderImpl } from "./builder-u7usRsT3.js";
+import { buildCollectionSynchronizationHeader } from "./collection-BzWsN9pB.js";
+import { KvKeyCache } from "./keycache-bU7COwsh.js";
+import { acceptsJsonLd } from "./negotiation-C4nFufNk.js";
+import { createExponentialBackoffPolicy } from "./retry-CfF8Gn4d.js";
+import { extractInboxes, sendActivity } from "./send-Drp20VO9.js";
+import { getDocumentLoader } from "@fedify/vocab-runtime";
 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";
@@ -838,7 +839,7 @@ async function handleInboxInternal(request, parameters, span) {
 /**
 * Handles a custom collection request.
 * @template TItem The type of items in the collection.
-* @template TParams The parameter names of the requested URL.
+* @template TParam The parameter names of the requested URL.
 * @template TContext The type of the context, extending {@link RequestContext}.
 * @template TContextData The context data to pass to the `TContext`.
 * @param request The HTTP request.
@@ -856,7 +857,7 @@ async function _handleCustomCollection(request, { name, values, context: context
 /**
 * Handles an ordered collection request.
 * @template TItem The type of items in the collection.
-* @template TParams The parameter names of the requested URL.
+* @template TParam The parameter names of the requested URL.
 * @template TContext The type of the context, extending {@link RequestContext}.
 * @template TContextData The context data to pass to the `TContext`.
 * @param request The HTTP request.
@@ -876,7 +877,7 @@ async function _handleOrderedCollection(request, { name, values, context: contex
 * The main flow is on `getCollection`, `dispatch`.
 *
 * @template TItem The type of items in the collection.
-* @template TParams The parameter names of the requested URL.
+* @template TParam The parameter names of the requested URL.
 * @template TContext The type of the context. {@link Context} or {@link RequestContext}.
 * @template TContextData The context data to pass to the `TContext`.
 * @template TCollection The type of the collection, extending {@link Collection}.
@@ -910,14 +911,14 @@ var CustomCollectionHandler = class {
 	#collection = null;
 	/**
 	* Creates a new CustomCollection instance.
-	* @param {string} name The name of the collection.
-	* @param {TParams} values The parameter values for the collection.
-	* @param {TContext} context The request context.
-	* @param {CustomCollectionCallbacks} callbacks The collection callbacks.
-	* @param {TracerProvider} tracerProvider The tracer provider for telemetry.
-	* @param {ConstructorWithTypeId<TCollection>} Collection The Collection constructor.
-	* @param {ConstructorWithTypeId<TCollectionPage>} CollectionPage The CollectionPage constructor.
-	* @param {(item: TItem) => boolean} filterPredicate Optional filter predicate for items.
+	* @param name The name of the collection.
+	* @param values The parameter values for the collection.
+	* @param context The request context.
+	* @param callbacks The collection callbacks.
+	* @param tracerProvider The tracer provider for telemetry.
+	* @param Collection The Collection constructor.
+	* @param CollectionPage The CollectionPage constructor.
+	* @param filterPredicate Optional filter predicate for items.
 	*/
 	constructor(name, values, context$1, callbacks, tracerProvider = trace.getTracerProvider(), Collection$1, CollectionPage$1, filterPredicate) {
 		this.name = name;
@@ -1042,7 +1043,7 @@ var CustomCollectionHandler = class {
 	/**
 	* Creates a function to wrap the dispatcher so tracing can be applied.
 	* @param params Parameters including cursor and total items.
-	* @returns {(span: Span) => Promise<PageItems<TItem>>} A function that handles the span operation.
+	* @returns A function that handles the span operation.
 	*/
 	spanPages = ({ totalItems = null, cursor = null }) => async (span) => {
 		try {
@@ -1063,23 +1064,23 @@ var CustomCollectionHandler = class {
 	};
 	/**
 	* Dispatches the collection request to get items.
-	* @param {string | null} cursor The cursor for pagination, or null for the first page.
-	* @returns {Promise<PageItems<TItem>>} A promise that resolves to the page items.
+	* @param cursor The cursor for pagination, or null for the first page.
+	* @returns A promise that resolves to the page items.
 	*/
 	async dispatch(cursor = null) {
 		return await this.#dispatcher(this.context, this.values, cursor) ?? new ItemsNotFoundError().throw();
 	}
 	/**
 	* Filters the items in the collection.
-	* @param {TItem[]} items The items to filter.
-	* @returns {(Object | Link | URL)[]} The filtered items.
+	* @param items The items to filter.
+	* @returns The filtered items.
 	*/
 	filterItems(items) {
 		return filterCollectionItems(items, this.name, this.filterPredicate);
 	}
 	/**
 	* Appends a cursor to the URL if it exists.
-	* @param {string | null | undefined} cursor The cursor to append, or null/undefined.
+	* @param cursor The cursor to append, or null/undefined.
 	* @returns The URL with cursor appended, or null if cursor is null/undefined.
 	*/
 	appendToUrl(cursor) {
@@ -1087,8 +1088,7 @@ var CustomCollectionHandler = class {
 	}
 	/**
 	* Gets the stored collection or collection page.
-	* @returns {Promise<TCollection | TCollectionPage>} A promise that resolves to
-	the collection or collection page.
+	* @returns A promise that resolves to the collection or collection page.
 	*/
 	get collection() {
 		if (this.#collection === null) this.#collection = this.getCollection();
@@ -1096,8 +1096,8 @@ var CustomCollectionHandler = class {
 	}
 	/**
 	* Gets the total number of items in the collection.
-	* @returns {Promise<number | null>} A promise that
-	resolves to the total items count, or null if not available.
+	* @returns A promise that resolves to the total items count,
+	*          or null if not available.
 	*/
 	get totalItems() {
 		if (this.#totalItems === void 0) this.totalItems = this.callbacks.counter?.(this.context, this.values);
@@ -1113,8 +1113,8 @@ var CustomCollectionHandler = class {
 	}
 	/**
 	* Gets the first cursor for pagination.
-	* @returns {Promise<string | null>} A promise that resolves to the first cursor,
-	or null if not available.
+	* @returns A promise that resolves to the first cursor,
+	*          or null if not available.
 	*/
 	get firstCursor() {
 		const cursor = this.callbacks.firstCursor?.(this.context, this.values);
@@ -1319,7 +1319,6 @@ var FederationImpl = class extends FederationBuilderImpl {
 	firstKnock;
 	constructor(options) {
 		super();
-		const logger$2 = getLogger(["fedify", "federation"]);
 		this.kv = options.kv;
 		this.kvPrefixes = {
 			activityIdempotence: ["_fedify", "activityIdempotence"],
@@ -1367,8 +1366,9 @@ var FederationImpl = class extends FederationBuilderImpl {
 		this.router.trailingSlashInsensitive = options.trailingSlashInsensitive ?? false;
 		this._initializeRouter();
 		if (options.allowPrivateAddress || options.userAgent != null) {
-			if (options.contextLoader != null) throw new TypeError("Cannot set contextLoader with allowPrivateAddress or userAgent options.");
-			else if (options.authenticatedDocumentLoaderFactory != null) throw new TypeError("Cannot set authenticatedDocumentLoaderFactory with allowPrivateAddress or userAgent options.");
+			if (options.documentLoaderFactory != null) throw new TypeError("Cannot set documentLoaderFactory with allowPrivateAddress or userAgent options.");
+			if (options.contextLoaderFactory != null) throw new TypeError("Cannot set contextLoaderFactory with allowPrivateAddress or userAgent options.");
+			if (options.authenticatedDocumentLoaderFactory != null) throw new TypeError("Cannot set authenticatedDocumentLoaderFactory with allowPrivateAddress or userAgent options.");
 		}
 		const { allowPrivateAddress, userAgent } = options;
 		this.allowPrivateAddress = allowPrivateAddress ?? false;
@@ -1382,11 +1382,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 				prefix: this.kvPrefixes.remoteDocument
 			});
 		});
-		if (options.contextLoader != null) {
-			if (options.contextLoaderFactory != null) throw new TypeError("Cannot set both contextLoader and contextLoaderFactory options at a time; use contextLoaderFactory only.");
-			this.contextLoaderFactory = () => options.contextLoader;
-			logger$2.warn("The contextLoader option is deprecated; use contextLoaderFactory option instead.");
-		} else this.contextLoaderFactory = options.contextLoaderFactory ?? this.documentLoaderFactory;
+		this.contextLoaderFactory = options.contextLoaderFactory ?? this.documentLoaderFactory;
 		this.authenticatedDocumentLoaderFactory = options.authenticatedDocumentLoaderFactory ?? ((identity) => getAuthenticatedDocumentLoader(identity, {
 			allowPrivateAddress,
 			userAgent,

package/dist/middleware-CjHl2NHA.js

@@ -0,0 +1,15 @@
+
+          import { Temporal } from "@js-temporal/polyfill";
+          import { URLPattern } from "urlpattern-polyfill";
+        
+import "./transformers-BFT6d7J5.js";
+import "./lookup-CHkCVZTU.js";
+import "./actor-DzhunPC_.js";
+import { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, createFederation } from "./middleware-DMk2Mdn9.js";
+import "./http-CUVx-vzb.js";
+import "./proof-fqzaMJ4g.js";
+import "./types-BtUjyi5y.js";
+import "./kv-cache-CGXcDejL.js";
+import "./vocab-BnR3nIU9.js";
+
+export { FederationImpl };

package/dist/{middleware-TfuVoceY.cjs → middleware-D74TgW2E.cjs}

@@ -4,21 +4,20 @@
         
 const require_chunk = require('./chunk-DqRYRqnO.cjs');
 const require_transformers = require('./transformers-CoBS-oFG.cjs');
-const require_docloader = require('./docloader-7Ey7wNHx.cjs');
-const require_actor = require('./actor-CrTGiTZd.cjs');
-const require_lookup = require('./lookup-DiV4LFBg.cjs');
-const require_key = require('./key-CZR7QraT.cjs');
-const require_http = require('./http-BiBofurJ.cjs');
-const require_proof = require('./proof-CRJWXFfT.cjs');
-const require_types = require('./types-CmmUQisS.cjs');
-const require_authdocloader = require('./authdocloader-CQMPmpaO.cjs');
-const require_vocab = require('./vocab-C5Y-0fGj.cjs');
+const require_lookup = require('./lookup-CfFkONZD.cjs');
+const require_actor = require('./actor-Ba9Z1eNJ.cjs');
+const require_http = require('./http-Dofes42e.cjs');
+const require_proof = require('./proof-D0uThUvD.cjs');
+const require_types = require('./types-CWgzGaqk.cjs');
+const require_kv_cache = require('./kv-cache-Dkvbn6rg.cjs');
+const require_vocab = require('./vocab-DFaWWYDn.cjs');
 const __logtape_logtape = require_chunk.__toESM(require("@logtape/logtape"));
 const __opentelemetry_api = require_chunk.__toESM(require("@opentelemetry/api"));
-const byte_encodings_hex = require_chunk.__toESM(require("byte-encodings/hex"));
+const __fedify_vocab_runtime = require_chunk.__toESM(require("@fedify/vocab-runtime"));
 const es_toolkit = require_chunk.__toESM(require("es-toolkit"));
 const uri_template_router = require_chunk.__toESM(require("uri-template-router"));
 const url_template = require_chunk.__toESM(require("url-template"));
+const byte_encodings_hex = require_chunk.__toESM(require("byte-encodings/hex"));
 const __opentelemetry_semantic_conventions = require_chunk.__toESM(require("@opentelemetry/semantic-conventions"));
 const node_url = require_chunk.__toESM(require("node:url"));
 
@@ -143,7 +142,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 		return "enqueued";
 	}
 	tracerProvider = tracerProvider ?? __opentelemetry_api.trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(require_docloader.deno_default.name, require_docloader.deno_default.version);
+	const tracer = tracerProvider.getTracer(require_lookup.deno_default.name, require_lookup.deno_default.version);
 	return await tracer.startActiveSpan("activitypub.dispatch_inbox_listener", { kind: __opentelemetry_api.SpanKind.INTERNAL }, async (span$1) => {
 		const dispatched = inboxListeners?.dispatchWithClass(activity);
 		if (dispatched == null) {
@@ -340,7 +339,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl: FederationImpl$1 } = await Promise.resolve().then(() => require("./middleware-EjIW2mZB.cjs"));
+		const { FederationImpl: FederationImpl$1 } = await Promise.resolve().then(() => require("./middleware-CFJgmUMW.cjs"));
 		const f = new FederationImpl$1(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -366,7 +365,7 @@ var FederationBuilderImpl = class {
 		return f;
 	}
 	_getTracer() {
-		return __opentelemetry_api.trace.getTracer(require_docloader.deno_default.name, require_docloader.deno_default.version);
+		return __opentelemetry_api.trace.getTracer(require_lookup.deno_default.name, require_lookup.deno_default.version);
 	}
 	setActorDispatcher(path, dispatcher) {
 		if (this.router.has("actor")) throw new RouterError("Actor dispatcher already set.");
@@ -793,11 +792,11 @@ var FederationBuilderImpl = class {
 		};
 		return setters;
 	}
-	setCollectionDispatcher(name, ...args) {
-		return this.#setCustomCollectionDispatcher(name, "collection", ...args);
+	setCollectionDispatcher(name, itemType, path, dispatcher) {
+		return this.#setCustomCollectionDispatcher(name, "collection", itemType, path, dispatcher);
 	}
-	setOrderedCollectionDispatcher(name, ...args) {
-		return this.#setCustomCollectionDispatcher(name, "orderedCollection", ...args);
+	setOrderedCollectionDispatcher(name, itemType, path, dispatcher) {
+		return this.#setCustomCollectionDispatcher(name, "orderedCollection", itemType, path, dispatcher);
 	}
 	#setCustomCollectionDispatcher(name, collectionType, itemType, path, dispatcher) {
 		const strName = String(name);
@@ -1113,7 +1112,7 @@ async function handleObject(request, { values, context: context$2, objectDispatc
 async function handleCollection(request, { name, identifier, uriGetter, filter, filterPredicate, context: context$2, collectionCallbacks, tracerProvider, onUnauthorized, onNotFound }) {
 	const spanName = name.trim().replace(/\s+/g, "_");
 	tracerProvider = tracerProvider ?? __opentelemetry_api.trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(require_docloader.deno_default.name, require_docloader.deno_default.version);
+	const tracer = tracerProvider.getTracer(require_lookup.deno_default.name, require_lookup.deno_default.version);
 	const url = new URL(request.url);
 	const cursor = url.searchParams.get("cursor");
 	if (collectionCallbacks == null) return await onNotFound(request);
@@ -1290,7 +1289,7 @@ function filterCollectionItems(items, collectionName, filterPredicate) {
 */
 async function handleInbox(request, options) {
 	const tracerProvider = options.tracerProvider ?? __opentelemetry_api.trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(require_docloader.deno_default.name, require_docloader.deno_default.version);
+	const tracer = tracerProvider.getTracer(require_lookup.deno_default.name, require_lookup.deno_default.version);
 	return await tracer.startActiveSpan("activitypub.inbox", {
 		kind: options.queue == null ? __opentelemetry_api.SpanKind.SERVER : __opentelemetry_api.SpanKind.PRODUCER,
 		attributes: { "activitypub.shared_inbox": options.recipient == null }
@@ -1551,7 +1550,7 @@ async function handleInboxInternal(request, parameters, span) {
 /**
 * Handles a custom collection request.
 * @template TItem The type of items in the collection.
-* @template TParams The parameter names of the requested URL.
+* @template TParam The parameter names of the requested URL.
 * @template TContext The type of the context, extending {@link RequestContext}.
 * @template TContextData The context data to pass to the `TContext`.
 * @param request The HTTP request.
@@ -1569,7 +1568,7 @@ async function _handleCustomCollection(request, { name, values, context: context
 /**
 * Handles an ordered collection request.
 * @template TItem The type of items in the collection.
-* @template TParams The parameter names of the requested URL.
+* @template TParam The parameter names of the requested URL.
 * @template TContext The type of the context, extending {@link RequestContext}.
 * @template TContextData The context data to pass to the `TContext`.
 * @param request The HTTP request.
@@ -1589,7 +1588,7 @@ async function _handleOrderedCollection(request, { name, values, context: contex
 * The main flow is on `getCollection`, `dispatch`.
 *
 * @template TItem The type of items in the collection.
-* @template TParams The parameter names of the requested URL.
+* @template TParam The parameter names of the requested URL.
 * @template TContext The type of the context. {@link Context} or {@link RequestContext}.
 * @template TContextData The context data to pass to the `TContext`.
 * @template TCollection The type of the collection, extending {@link Collection}.
@@ -1623,14 +1622,14 @@ var CustomCollectionHandler = class {
 	#collection = null;
 	/**
 	* Creates a new CustomCollection instance.
-	* @param {string} name The name of the collection.
-	* @param {TParams} values The parameter values for the collection.
-	* @param {TContext} context The request context.
-	* @param {CustomCollectionCallbacks} callbacks The collection callbacks.
-	* @param {TracerProvider} tracerProvider The tracer provider for telemetry.
-	* @param {ConstructorWithTypeId<TCollection>} Collection The Collection constructor.
-	* @param {ConstructorWithTypeId<TCollectionPage>} CollectionPage The CollectionPage constructor.
-	* @param {(item: TItem) => boolean} filterPredicate Optional filter predicate for items.
+	* @param name The name of the collection.
+	* @param values The parameter values for the collection.
+	* @param context The request context.
+	* @param callbacks The collection callbacks.
+	* @param tracerProvider The tracer provider for telemetry.
+	* @param Collection The Collection constructor.
+	* @param CollectionPage The CollectionPage constructor.
+	* @param filterPredicate Optional filter predicate for items.
 	*/
 	constructor(name, values, context$2, callbacks, tracerProvider = __opentelemetry_api.trace.getTracerProvider(), Collection$1, CollectionPage$1, filterPredicate) {
 		this.name = name;
@@ -1642,7 +1641,7 @@ var CustomCollectionHandler = class {
 		this.CollectionPage = CollectionPage$1;
 		this.filterPredicate = filterPredicate;
 		this.name = this.name.trim().replace(/\s+/g, "_");
-		this.#tracer = this.tracerProvider.getTracer(require_docloader.deno_default.name, require_docloader.deno_default.version);
+		this.#tracer = this.tracerProvider.getTracer(require_lookup.deno_default.name, require_lookup.deno_default.version);
 		this.#id = new URL(this.context.url);
 		this.#dispatcher = callbacks.dispatcher.bind(callbacks);
 	}
@@ -1755,7 +1754,7 @@ var CustomCollectionHandler = class {
 	/**
 	* Creates a function to wrap the dispatcher so tracing can be applied.
 	* @param params Parameters including cursor and total items.
-	* @returns {(span: Span) => Promise<PageItems<TItem>>} A function that handles the span operation.
+	* @returns A function that handles the span operation.
 	*/
 	spanPages = ({ totalItems = null, cursor = null }) => async (span) => {
 		try {
@@ -1776,23 +1775,23 @@ var CustomCollectionHandler = class {
 	};
 	/**
 	* Dispatches the collection request to get items.
-	* @param {string | null} cursor The cursor for pagination, or null for the first page.
-	* @returns {Promise<PageItems<TItem>>} A promise that resolves to the page items.
+	* @param cursor The cursor for pagination, or null for the first page.
+	* @returns A promise that resolves to the page items.
 	*/
 	async dispatch(cursor = null) {
 		return await this.#dispatcher(this.context, this.values, cursor) ?? new ItemsNotFoundError().throw();
 	}
 	/**
 	* Filters the items in the collection.
-	* @param {TItem[]} items The items to filter.
-	* @returns {(Object | Link | URL)[]} The filtered items.
+	* @param items The items to filter.
+	* @returns The filtered items.
 	*/
 	filterItems(items) {
 		return filterCollectionItems(items, this.name, this.filterPredicate);
 	}
 	/**
 	* Appends a cursor to the URL if it exists.
-	* @param {string | null | undefined} cursor The cursor to append, or null/undefined.
+	* @param cursor The cursor to append, or null/undefined.
 	* @returns The URL with cursor appended, or null if cursor is null/undefined.
 	*/
 	appendToUrl(cursor) {
@@ -1800,8 +1799,7 @@ var CustomCollectionHandler = class {
 	}
 	/**
 	* Gets the stored collection or collection page.
-	* @returns {Promise<TCollection | TCollectionPage>} A promise that resolves to
-	the collection or collection page.
+	* @returns A promise that resolves to the collection or collection page.
 	*/
 	get collection() {
 		if (this.#collection === null) this.#collection = this.getCollection();
@@ -1809,8 +1807,8 @@ var CustomCollectionHandler = class {
 	}
 	/**
 	* Gets the total number of items in the collection.
-	* @returns {Promise<number | null>} A promise that
-	resolves to the total items count, or null if not available.
+	* @returns A promise that resolves to the total items count,
+	*          or null if not available.
 	*/
 	get totalItems() {
 		if (this.#totalItems === void 0) this.totalItems = this.callbacks.counter?.(this.context, this.values);
@@ -1826,8 +1824,8 @@ var CustomCollectionHandler = class {
 	}
 	/**
 	* Gets the first cursor for pagination.
-	* @returns {Promise<string | null>} A promise that resolves to the first cursor,
-	or null if not available.
+	* @returns A promise that resolves to the first cursor,
+	*          or null if not available.
 	*/
 	get firstCursor() {
 		const cursor = this.callbacks.firstCursor?.(this.context, this.values);
@@ -2234,7 +2232,7 @@ function extractInboxes({ recipients, preferSharedInbox, excludeBaseUris }) {
 */
 function sendActivity(options) {
 	const tracerProvider = options.tracerProvider ?? __opentelemetry_api.trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(require_docloader.deno_default.name, require_docloader.deno_default.version);
+	const tracer = tracerProvider.getTracer(require_lookup.deno_default.name, require_lookup.deno_default.version);
 	return tracer.startActiveSpan("activitypub.send_activity", {
 		kind: __opentelemetry_api.SpanKind.CLIENT,
 		attributes: { "activitypub.shared_inbox": options.sharedInbox ?? false }
@@ -2351,7 +2349,6 @@ var FederationImpl = class extends FederationBuilderImpl {
 	firstKnock;
 	constructor(options) {
 		super();
-		const logger$1 = (0, __logtape_logtape.getLogger)(["fedify", "federation"]);
 		this.kv = options.kv;
 		this.kvPrefixes = {
 			activityIdempotence: ["_fedify", "activityIdempotence"],
@@ -2399,14 +2396,15 @@ var FederationImpl = class extends FederationBuilderImpl {
 		this.router.trailingSlashInsensitive = options.trailingSlashInsensitive ?? false;
 		this._initializeRouter();
 		if (options.allowPrivateAddress || options.userAgent != null) {
-			if (options.contextLoader != null) throw new TypeError("Cannot set contextLoader with allowPrivateAddress or userAgent options.");
-			else if (options.authenticatedDocumentLoaderFactory != null) throw new TypeError("Cannot set authenticatedDocumentLoaderFactory with allowPrivateAddress or userAgent options.");
+			if (options.documentLoaderFactory != null) throw new TypeError("Cannot set documentLoaderFactory with allowPrivateAddress or userAgent options.");
+			if (options.contextLoaderFactory != null) throw new TypeError("Cannot set contextLoaderFactory with allowPrivateAddress or userAgent options.");
+			if (options.authenticatedDocumentLoaderFactory != null) throw new TypeError("Cannot set authenticatedDocumentLoaderFactory with allowPrivateAddress or userAgent options.");
 		}
 		const { allowPrivateAddress, userAgent } = options;
 		this.allowPrivateAddress = allowPrivateAddress ?? false;
 		this.documentLoaderFactory = options.documentLoaderFactory ?? ((opts) => {
-			return require_docloader.kvCache({
-				loader: require_docloader.getDocumentLoader({
+			return require_kv_cache.kvCache({
+				loader: (0, __fedify_vocab_runtime.getDocumentLoader)({
 					allowPrivateAddress: opts?.allowPrivateAddress ?? allowPrivateAddress,
 					userAgent: opts?.userAgent ?? userAgent
 				}),
@@ -2414,12 +2412,8 @@ var FederationImpl = class extends FederationBuilderImpl {
 				prefix: this.kvPrefixes.remoteDocument
 			});
 		});
-		if (options.contextLoader != null) {
-			if (options.contextLoaderFactory != null) throw new TypeError("Cannot set both contextLoader and contextLoaderFactory options at a time; use contextLoaderFactory only.");
-			this.contextLoaderFactory = () => options.contextLoader;
-			logger$1.warn("The contextLoader option is deprecated; use contextLoaderFactory option instead.");
-		} else this.contextLoaderFactory = options.contextLoaderFactory ?? this.documentLoaderFactory;
-		this.authenticatedDocumentLoaderFactory = options.authenticatedDocumentLoaderFactory ?? ((identity) => require_authdocloader.getAuthenticatedDocumentLoader(identity, {
+		this.contextLoaderFactory = options.contextLoaderFactory ?? this.documentLoaderFactory;
+		this.authenticatedDocumentLoaderFactory = options.authenticatedDocumentLoaderFactory ?? ((identity) => require_kv_cache.getAuthenticatedDocumentLoader(identity, {
 			allowPrivateAddress,
 			userAgent,
 			specDeterminer: new KvSpecDeterminer(this.kv, this.kvPrefixes.httpMessageSignaturesSpec, options.firstKnock),
@@ -2440,7 +2434,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		this.router.add("/.well-known/nodeinfo", "nodeInfoJrd");
 	}
 	_getTracer() {
-		return this.tracerProvider.getTracer(require_docloader.deno_default.name, require_docloader.deno_default.version);
+		return this.tracerProvider.getTracer(require_lookup.deno_default.name, require_lookup.deno_default.version);
 	}
 	async _startQueueInternal(ctxData, signal, queue) {
 		if (this.inboxQueue == null && this.outboxQueue == null) return;
@@ -2538,7 +2532,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		});
 		const keys = await Promise.all(message.keys.map(async ({ keyId, privateKey }) => ({
 			keyId: new URL(keyId),
-			privateKey: await require_key.importJwk(privateKey, "private")
+			privateKey: await require_http.importJwk(privateKey, "private")
 		})));
 		const activity = await require_actor.Activity.fromJsonLd(message.activity, {
 			contextLoader: this.contextLoaderFactory({
@@ -2579,7 +2573,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		for (const { keyId, privateKey } of message.keys) {
 			const pair = {
 				keyId: new URL(keyId),
-				privateKey: await require_key.importJwk(privateKey, "private")
+				privateKey: await require_http.importJwk(privateKey, "private")
 			};
 			if (rsaKeyPair == null && pair.privateKey.algorithm.name === "RSASSA-PKCS1-v1_5") rsaKeyPair = pair;
 			keys.push(pair);
@@ -2814,7 +2808,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		let proofCreated = false;
 		let rsaKey = null;
 		for (const { keyId, privateKey } of keys) {
-			require_key.validateCryptoKey(privateKey, "private");
+			require_http.validateCryptoKey(privateKey, "private");
 			if (rsaKey == null && privateKey.algorithm.name === "RSASSA-PKCS1-v1_5") {
 				rsaKey = {
 					keyId,
@@ -2882,7 +2876,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		});
 		const keyJwkPairs = [];
 		for (const { keyId, privateKey } of keys) {
-			const privateKeyJwk = await require_key.exportJwk(privateKey);
+			const privateKeyJwk = await require_http.exportJwk(privateKey);
 			keyJwkPairs.push({
 				keyId: keyId.href,
 				privateKey: privateKeyJwk
@@ -3582,7 +3576,7 @@ var ContextImpl = class ContextImpl {
 		});
 	}
 	sendActivity(sender, recipients, activity, options = {}) {
-		const tracer = this.tracerProvider.getTracer(require_docloader.deno_default.name, require_docloader.deno_default.version);
+		const tracer = this.tracerProvider.getTracer(require_lookup.deno_default.name, require_lookup.deno_default.version);
 		return tracer.startActiveSpan(this.federation.outboxQueue == null || options.immediate ? "activitypub.outbox" : "activitypub.fanout", {
 			kind: this.federation.outboxQueue == null || options.immediate ? __opentelemetry_api.SpanKind.CLIENT : __opentelemetry_api.SpanKind.PRODUCER,
 			attributes: {
@@ -3639,7 +3633,7 @@ var ContextImpl = class ContextImpl {
 			keys = sender;
 		} else keys = [sender];
 		if (keys.length < 1) throw new TypeError("The sender's keys must not be empty.");
-		for (const { privateKey } of keys) require_key.validateCryptoKey(privateKey, "private");
+		for (const { privateKey } of keys) require_http.validateCryptoKey(privateKey, "private");
 		const opts = { context: this };
 		let expandedRecipients;
 		if (Array.isArray(recipients)) expandedRecipients = recipients;
@@ -3680,7 +3674,7 @@ var ContextImpl = class ContextImpl {
 		}
 		const keyJwkPairs = await Promise.all(keys.map(async ({ keyId, privateKey }) => ({
 			keyId: keyId.href,
-			privateKey: await require_key.exportJwk(privateKey)
+			privateKey: await require_http.exportJwk(privateKey)
 		})));
 		const carrier = {};
 		__opentelemetry_api.propagation.inject(__opentelemetry_api.context.active(), carrier);
@@ -3728,7 +3722,7 @@ var ContextImpl = class ContextImpl {
 	}
 	routeActivity(recipient, activity, options = {}) {
 		const tracerProvider = this.tracerProvider ?? this.tracerProvider;
-		const tracer = tracerProvider.getTracer(require_docloader.deno_default.name, require_docloader.deno_default.version);
+		const tracer = tracerProvider.getTracer(require_lookup.deno_default.name, require_lookup.deno_default.version);
 		return tracer.startActiveSpan("activitypub.inbox", {
 			kind: this.federation.inboxQueue == null || options.immediate ? __opentelemetry_api.SpanKind.INTERNAL : __opentelemetry_api.SpanKind.PRODUCER,
 			attributes: { "activitypub.activity.type": require_actor.getTypeId(activity).href }
@@ -3946,7 +3940,7 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 		});
 	}
 	forwardActivity(forwarder, recipients, options) {
-		const tracer = this.tracerProvider.getTracer(require_docloader.deno_default.name, require_docloader.deno_default.version);
+		const tracer = this.tracerProvider.getTracer(require_lookup.deno_default.name, require_lookup.deno_default.version);
 		return tracer.startActiveSpan("activitypub.outbox", {
 			kind: this.federation.outboxQueue == null || options?.immediate ? __opentelemetry_api.SpanKind.CLIENT : __opentelemetry_api.SpanKind.PRODUCER,
 			attributes: { "activitypub.activity.type": this.activityType }
@@ -4047,7 +4041,7 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 		});
 		const keyJwkPairs = [];
 		for (const { keyId, privateKey } of keys) {
-			const privateKeyJwk = await require_key.exportJwk(privateKey);
+			const privateKeyJwk = await require_http.exportJwk(privateKey);
 			keyJwkPairs.push({
 				keyId: keyId.href,
 				privateKey: privateKeyJwk