@fedify/fedify 0.12.0 → 0.13.0-dev.311

package/esm/federation/middleware.js

@@ -13,7 +13,6 @@ import { InboxListenerSet } from "./inbox.js";
 import { createExponentialBackoffPolicy } from "./retry.js";
 import { Router, RouterError } from "./router.js";
 import { extractInboxes, sendActivity } from "./send.js";
-const invokedByCreateFederation = Symbol("invokedByCreateFederation");
 /**
  * Create a new {@link Federation} instance.
  * @param parameters Parameters for initializing the instance.
@@ -21,65 +20,41 @@ const invokedByCreateFederation = Symbol("invokedByCreateFederation");
  * @since 0.10.0
  */
 export function createFederation(options) {
-    return new Federation({
-        ...options,
-        // @ts-ignore: This is a private symbol.
-        [invokedByCreateFederation]: true,
-    });
+    return new FederationImpl(options);
 }
 const invokedByContext = Symbol("invokedByContext");
-/**
- * An object that registers federation-related business logic and dispatches
- * requests to the appropriate handlers.
- *
- * It also provides a middleware interface for handling requests before your
- * web framework's router; see {@link Federation.handle}.
- */
-export class Federation {
-    #kv;
-    #kvPrefixes;
-    #queue;
-    #queueStarted;
-    #manuallyStartQueue;
-    #router;
-    #nodeInfoDispatcher;
-    #actorCallbacks;
-    #objectCallbacks;
-    #objectTypeIds;
-    #inboxPath;
-    #inboxCallbacks;
-    #outboxCallbacks;
-    #followingCallbacks;
-    #followersCallbacks;
-    #likedCallbacks;
-    #featuredCallbacks;
-    #featuredTagsCallbacks;
-    #inboxListeners;
-    #inboxErrorHandler;
-    #sharedInboxKeyDispatcher;
-    #documentLoader;
-    #contextLoader;
-    #authenticatedDocumentLoaderFactory;
-    #treatHttps;
-    #onOutboxError;
-    #signatureTimeWindow;
-    #outboxRetryPolicy;
-    #inboxRetryPolicy;
-    /**
-     * Create a new {@link Federation} instance.
-     * @param parameters Parameters for initializing the instance.
-     * @deprecated Use {@link createFederation} method instead.
-     */
-    constructor(parameters) {
-        const options = parameters;
-        const logger = getLogger(["fedify", "federation"]);
-        // @ts-ignore: This is a private symbol.
-        if (!options[invokedByCreateFederation]) {
-            logger.warn("The Federation constructor is deprecated.  Use the createFederation()" +
-                "function instead.");
-        }
-        this.#kv = options.kv;
-        this.#kvPrefixes = {
+class FederationImpl {
+    kv;
+    kvPrefixes;
+    queue;
+    queueStarted;
+    manuallyStartQueue;
+    router;
+    nodeInfoDispatcher;
+    actorCallbacks;
+    objectCallbacks;
+    objectTypeIds;
+    inboxPath;
+    inboxCallbacks;
+    outboxCallbacks;
+    followingCallbacks;
+    followersCallbacks;
+    likedCallbacks;
+    featuredCallbacks;
+    featuredTagsCallbacks;
+    inboxListeners;
+    inboxErrorHandler;
+    sharedInboxKeyDispatcher;
+    documentLoader;
+    contextLoader;
+    authenticatedDocumentLoaderFactory;
+    onOutboxError;
+    signatureTimeWindow;
+    outboxRetryPolicy;
+    inboxRetryPolicy;
+    constructor(options) {
+        this.kv = options.kv;
+        this.kvPrefixes = {
             ...({
                 activityIdempotence: ["_fedify", "activityIdempotence"],
                 remoteDocument: ["_fedify", "remoteDocument"],
@@ -87,45 +62,38 @@ export class Federation {
             }),
             ...(options.kvPrefixes ?? {}),
         };
-        this.#queue = options.queue;
-        this.#queueStarted = false;
-        this.#manuallyStartQueue = options.manuallyStartQueue ?? false;
-        this.#router = new Router({
+        this.queue = options.queue;
+        this.queueStarted = false;
+        this.manuallyStartQueue = options.manuallyStartQueue ?? false;
+        this.router = new Router({
             trailingSlashInsensitive: options.trailingSlashInsensitive,
         });
-        this.#router.add("/.well-known/webfinger", "webfinger");
-        this.#router.add("/.well-known/nodeinfo", "nodeInfoJrd");
-        this.#objectCallbacks = {};
-        this.#objectTypeIds = {};
-        this.#documentLoader = options.documentLoader ?? kvCache({
+        this.router.add("/.well-known/webfinger", "webfinger");
+        this.router.add("/.well-known/nodeinfo", "nodeInfoJrd");
+        this.objectCallbacks = {};
+        this.objectTypeIds = {};
+        this.documentLoader = options.documentLoader ?? kvCache({
             loader: fetchDocumentLoader,
             kv: options.kv,
-            prefix: this.#kvPrefixes.remoteDocument,
+            prefix: this.kvPrefixes.remoteDocument,
         });
-        this.#contextLoader = options.contextLoader ?? this.#documentLoader;
-        this.#authenticatedDocumentLoaderFactory =
+        this.contextLoader = options.contextLoader ?? this.documentLoader;
+        this.authenticatedDocumentLoaderFactory =
             options.authenticatedDocumentLoaderFactory ??
                 getAuthenticatedDocumentLoader;
-        this.#onOutboxError = options.onOutboxError;
-        this.#treatHttps = parameters.treatHttps ?? false;
-        if (parameters.treatHttps) {
-            logger.warn("The treatHttps option is deprecated and will be removed in " +
-                "a future release.  Instead, use the x-forwarded-fetch library" +
-                " to recognize the X-Forwarded-Host and X-Forwarded-Proto " +
-                "headers.  See also: <https://github.com/dahlia/x-forwarded-fetch>.");
-        }
-        this.#signatureTimeWindow = options.signatureTimeWindow ?? { minutes: 1 };
-        this.#outboxRetryPolicy = options.outboxRetryPolicy ??
+        this.onOutboxError = options.onOutboxError;
+        this.signatureTimeWindow = options.signatureTimeWindow ?? { minutes: 1 };
+        this.outboxRetryPolicy = options.outboxRetryPolicy ??
             createExponentialBackoffPolicy();
-        this.#inboxRetryPolicy = options.inboxRetryPolicy ??
+        this.inboxRetryPolicy = options.inboxRetryPolicy ??
             createExponentialBackoffPolicy();
     }
     #startQueue(ctxData) {
-        if (this.#queue != null && !this.#queueStarted) {
+        if (this.queue != null && !this.queueStarted) {
             const logger = getLogger(["fedify", "federation", "queue"]);
             logger.debug("Starting a task queue.");
-            this.#queue?.listen((msg) => this.#listenQueue(ctxData, msg));
-            this.#queueStarted = true;
+            this.queue?.listen((msg) => this.#listenQueue(ctxData, msg));
+            this.queueStarted = true;
         }
     }
     async #listenQueue(ctxData, message) {
@@ -161,35 +129,35 @@ export class Federation {
                 keys.push(pair);
             }
             const documentLoader = rsaKeyPair == null
-                ? this.#documentLoader
-                : this.#authenticatedDocumentLoaderFactory(rsaKeyPair);
+                ? this.documentLoader
+                : this.authenticatedDocumentLoaderFactory(rsaKeyPair);
             activity = await Activity.fromJsonLd(message.activity, {
                 documentLoader,
-                contextLoader: this.#contextLoader,
+                contextLoader: this.contextLoader,
             });
             await sendActivity({
                 keys,
                 activity,
                 inbox: new URL(message.inbox),
-                contextLoader: this.#contextLoader,
+                contextLoader: this.contextLoader,
                 headers: new Headers(message.headers),
             });
         }
         catch (error) {
             try {
-                this.#onOutboxError?.(error, activity);
+                this.onOutboxError?.(error, activity);
             }
             catch (error) {
                 logger.error("An unexpected error occurred in onError handler:\n{error}", { ...logData, error, activityId: activity?.id?.href });
             }
-            const delay = this.#outboxRetryPolicy({
+            const delay = this.outboxRetryPolicy({
                 elapsedTime: dntShim.Temporal.Instant.from(message.started).until(dntShim.Temporal.Now.instant()),
                 attempts: message.attempt,
             });
             if (delay != null) {
                 logger.error("Failed to send activity {activityId} to {inbox} (attempt " +
                     "#{attempt}); retry...:\n{error}", { ...logData, error, activityId: activity?.id?.href });
-                this.#queue?.enqueue({
+                this.queue?.enqueue({
                     ...message,
                     attempt: message.attempt + 1,
                 }, {
@@ -217,8 +185,8 @@ export class Federation {
                 }),
             });
         }
-        else if (this.#sharedInboxKeyDispatcher != null) {
-            const identity = await this.#sharedInboxKeyDispatcher(context);
+        else if (this.sharedInboxKeyDispatcher != null) {
+            const identity = await this.sharedInboxKeyDispatcher(context);
             if (identity != null) {
                 context = this.#createContext(baseUrl, ctxData, {
                     documentLoader: "handle" in identity
@@ -229,11 +197,11 @@ export class Federation {
         }
         const activity = await Activity.fromJsonLd(message.activity, context);
         const cacheKey = activity.id == null ? null : [
-            ...this.#kvPrefixes.activityIdempotence,
+            ...this.kvPrefixes.activityIdempotence,
             activity.id.href,
         ];
         if (cacheKey != null) {
-            const cached = await this.#kv.get(cacheKey);
+            const cached = await this.kv.get(cacheKey);
             if (cached === true) {
                 logger.debug("Activity {activityId} has already been processed.", {
                     activityId: activity.id?.href,
@@ -242,7 +210,7 @@ export class Federation {
                 return;
             }
         }
-        const listener = this.#inboxListeners?.dispatch(activity);
+        const listener = this.inboxListeners?.dispatch(activity);
         if (listener == null) {
             logger.error("Unsupported activity type:\n{activity}", { activity: message.activity, trial: message.attempt });
             return;
@@ -252,7 +220,7 @@ export class Federation {
         }
         catch (error) {
             try {
-                await this.#inboxErrorHandler?.(context, error);
+                await this.inboxErrorHandler?.(context, error);
             }
             catch (error) {
                 logger.error("An unexpected error occurred in inbox error handler:\n{error}", {
@@ -262,7 +230,7 @@ export class Federation {
                     activity: message.activity,
                 });
             }
-            const delay = this.#inboxRetryPolicy({
+            const delay = this.inboxRetryPolicy({
                 elapsedTime: dntShim.Temporal.Instant.from(message.started).until(dntShim.Temporal.Now.instant()),
                 attempts: message.attempt,
             });
@@ -274,7 +242,7 @@ export class Federation {
                     activityId: activity.id?.href,
                     activity: message.activity,
                 });
-                this.#queue?.enqueue({
+                this.queue?.enqueue({
                     ...message,
                     attempt: message.attempt + 1,
                 }, {
@@ -290,20 +258,12 @@ export class Federation {
             return;
         }
         if (cacheKey != null) {
-            await this.#kv.set(cacheKey, true, {
+            await this.kv.set(cacheKey, true, {
                 ttl: dntShim.Temporal.Duration.from({ days: 1 }),
             });
         }
         logger.info("Activity {activityId} has been processed.", { activityId: activity.id?.href, activity: message.activity });
     }
-    /**
-     * Manually start the task queue.
-     *
-     * This method is useful when you set the `manuallyStartQueue` option to
-     * `true` in the {@link createFederation} function.
-     * @param contextData The context data to pass to the context.
-     * @since 0.12.0
-     */
     startQueue(contextData) {
         this.#startQueue(contextData);
         return Promise.resolve();
@@ -323,92 +283,47 @@ export class Federation {
             url.hash = "";
             url.search = "";
         }
-        if (this.#treatHttps)
-            url.protocol = "https:";
         const ctxOptions = {
             url,
             federation: this,
-            router: this.#router,
-            objectTypeIds: this.#objectTypeIds,
-            objectCallbacks: this.#objectCallbacks,
-            actorCallbacks: this.#actorCallbacks,
             data: contextData,
-            documentLoader: opts.documentLoader ?? this.#documentLoader,
-            contextLoader: this.#contextLoader,
-            authenticatedDocumentLoaderFactory: this.#authenticatedDocumentLoaderFactory,
+            documentLoader: opts.documentLoader ?? this.documentLoader,
         };
         if (request == null)
             return new ContextImpl(ctxOptions);
         return new RequestContextImpl({
             ...ctxOptions,
             request,
-            signatureTimeWindow: this.#signatureTimeWindow,
-            followersCallbacks: this.#followersCallbacks,
             invokedFromActorDispatcher: opts.invokedFromActorDispatcher,
             invokedFromObjectDispatcher: opts.invokedFromObjectDispatcher,
         });
     }
-    /**
-     * Registers a NodeInfo dispatcher.
-     * @param path The URI path pattern for the NodeInfo dispatcher.  The syntax
-     *             is based on URI Template
-     *             ([RFC 6570](https://tools.ietf.org/html/rfc6570)).  The path
-     *             must have no variables.
-     * @param dispatcher A NodeInfo dispatcher callback to register.
-     * @throws {RouterError} Thrown if the path pattern is invalid.
-     * @since 0.2.0
-     */
     setNodeInfoDispatcher(path, dispatcher) {
-        if (this.#router.has("nodeInfo")) {
+        if (this.router.has("nodeInfo")) {
             throw new RouterError("NodeInfo dispatcher already set.");
         }
-        const variables = this.#router.add(path, "nodeInfo");
+        const variables = this.router.add(path, "nodeInfo");
         if (variables.size !== 0) {
             throw new RouterError("Path for NodeInfo dispatcher must have no variables.");
         }
-        this.#nodeInfoDispatcher = dispatcher;
+        this.nodeInfoDispatcher = dispatcher;
     }
-    /**
-     * Registers an actor dispatcher.
-     *
-     * @example
-     * ``` typescript
-     * federation.setActorDispatcher(
-     *   "/users/{handle}",
-     *   async (ctx, handle) => {
-     *     return new Person({
-     *       id: ctx.getActorUri(handle),
-     *       preferredUsername: handle,
-     *       // ...
-     *     });
-     *   }
-     * );
-     * ```
-     *
-     * @param path The URI path pattern for the actor dispatcher.  The syntax is
-     *             based on URI Template
-     *             ([RFC 6570](https://tools.ietf.org/html/rfc6570)).  The path
-     *             must have one variable: `{handle}`.
-     * @param dispatcher An actor dispatcher callback to register.
-     * @returns An object with methods to set other actor dispatcher callbacks.
-     * @throws {RouterError} Thrown if the path pattern is invalid.
-     */
     setActorDispatcher(path, dispatcher) {
-        if (this.#router.has("actor")) {
+        if (this.router.has("actor")) {
             throw new RouterError("Actor dispatcher already set.");
         }
-        const variables = this.#router.add(path, "actor");
+        const variables = this.router.add(path, "actor");
         if (variables.size !== 1 || !variables.has("handle")) {
             throw new RouterError("Path for actor dispatcher must have one variable: {handle}");
         }
         const callbacks = {
-            dispatcher: async (context, handle, key) => {
-                const actor = await dispatcher(context, handle, key);
+            dispatcher: async (context, handle) => {
+                const actor = await dispatcher(context, handle);
                 if (actor == null)
                     return null;
                 const logger = getLogger(["fedify", "federation", "actor"]);
-                if (this.#followingCallbacks != null &&
-                    this.#followingCallbacks.dispatcher != null) {
+                if (this.followingCallbacks != null &&
+                    this.followingCallbacks.dispatcher != null) {
                     if (actor.followingId == null) {
                         logger.warn("You configured a following collection dispatcher, but the " +
                             "actor does not have a following property.  Set the property " +
@@ -421,8 +336,8 @@ export class Federation {
                             "Context.getFollowingUri(handle).");
                     }
                 }
-                if (this.#followersCallbacks != null &&
-                    this.#followersCallbacks.dispatcher != null) {
+                if (this.followersCallbacks != null &&
+                    this.followersCallbacks.dispatcher != null) {
                     if (actor.followersId == null) {
                         logger.warn("You configured a followers collection dispatcher, but the " +
                             "actor does not have a followers property.  Set the property " +
@@ -435,8 +350,8 @@ export class Federation {
                             "Context.getFollowersUri(handle).");
                     }
                 }
-                if (this.#outboxCallbacks != null &&
-                    this.#outboxCallbacks.dispatcher != null) {
+                if (this.outboxCallbacks != null &&
+                    this.outboxCallbacks.dispatcher != null) {
                     if (actor?.outboxId == null) {
                         logger.warn("You configured an outbox collection dispatcher, but the " +
                             "actor does not have an outbox property.  Set the property " +
@@ -448,8 +363,8 @@ export class Federation {
                             "URI.  Set the property with Context.getOutboxUri(handle).");
                     }
                 }
-                if (this.#likedCallbacks != null &&
-                    this.#likedCallbacks.dispatcher != null) {
+                if (this.likedCallbacks != null &&
+                    this.likedCallbacks.dispatcher != null) {
                     if (actor?.likedId == null) {
                         logger.warn("You configured a liked collection dispatcher, but the " +
                             "actor does not have a liked property.  Set the property " +
@@ -461,8 +376,8 @@ export class Federation {
                             "URI.  Set the property with Context.getLikedUri(handle).");
                     }
                 }
-                if (this.#featuredCallbacks != null &&
-                    this.#featuredCallbacks.dispatcher != null) {
+                if (this.featuredCallbacks != null &&
+                    this.featuredCallbacks.dispatcher != null) {
                     if (actor?.featuredId == null) {
                         logger.warn("You configured a featured collection dispatcher, but the " +
                             "actor does not have a featured property.  Set the property " +
@@ -474,8 +389,8 @@ export class Federation {
                             "URI.  Set the property with Context.getFeaturedUri(handle).");
                     }
                 }
-                if (this.#featuredTagsCallbacks != null &&
-                    this.#featuredTagsCallbacks.dispatcher != null) {
+                if (this.featuredTagsCallbacks != null &&
+                    this.featuredTagsCallbacks.dispatcher != null) {
                     if (actor?.featuredTagsId == null) {
                         logger.warn("You configured a featured tags collection dispatcher, but the " +
                             "actor does not have a featuredTags property.  Set the property " +
@@ -488,7 +403,7 @@ export class Federation {
                             "Context.getFeaturedTagsUri(handle).");
                     }
                 }
-                if (this.#router.has("inbox")) {
+                if (this.router.has("inbox")) {
                     if (actor.inboxId == null) {
                         logger.warn("You configured inbox listeners, but the actor does not " +
                             "have an inbox property.  Set the property with " +
@@ -525,24 +440,12 @@ export class Federation {
                 return actor;
             },
         };
-        this.#actorCallbacks = callbacks;
+        this.actorCallbacks = callbacks;
         const setters = {
             setKeyPairsDispatcher(dispatcher) {
                 callbacks.keyPairsDispatcher = dispatcher;
                 return setters;
             },
-            setKeyPairDispatcher(dispatcher) {
-                getLogger(["fedify", "federation", "actor"]).warn("The ActorCallbackSetters.setKeyPairDispatcher() method is " +
-                    "deprecated.  Use the ActorCallbackSetters.setKeyPairsDispatcher() " +
-                    "instead.");
-                callbacks.keyPairsDispatcher = async (ctx, handle) => {
-                    const key = await dispatcher(ctx.data, handle);
-                    if (key == null)
-                        return [];
-                    return [key];
-                };
-                return setters;
-            },
             authorize(predicate) {
                 callbacks.authorizePredicate = predicate;
                 return setters;
@@ -554,10 +457,10 @@ export class Federation {
     // deno-lint-ignore no-explicit-any
     cls, path, dispatcher) {
         const routeName = `object:${cls.typeId.href}`;
-        if (this.#router.has(routeName)) {
+        if (this.router.has(routeName)) {
             throw new RouterError(`Object dispatcher for ${cls.name} already set.`);
         }
-        const variables = this.#router.add(path, routeName);
+        const variables = this.router.add(path, routeName);
         if (variables.size < 1) {
             throw new RouterError("Path for object dispatcher must have at least one variable.");
         }
@@ -565,8 +468,8 @@ export class Federation {
             dispatcher,
             parameters: variables,
         };
-        this.#objectCallbacks[cls.typeId.href] = callbacks;
-        this.#objectTypeIds[cls.typeId.href] = cls;
+        this.objectCallbacks[cls.typeId.href] = callbacks;
+        this.objectTypeIds[cls.typeId.href] = cls;
         const setters = {
             authorize(predicate) {
                 callbacks.authorizePredicate = predicate;
@@ -575,38 +478,26 @@ export class Federation {
         };
         return setters;
     }
-    /**
-     * Registers an inbox dispatcher.
-     *
-     * @param path The URI path pattern for the outbox dispatcher.  The syntax is
-     *             based on URI Template
-     *             ([RFC 6570](https://tools.ietf.org/html/rfc6570)).  The path
-     *             must have one variable: `{handle}`, and must match the inbox
-     *             listener path.
-     * @param dispatcher An inbox dispatcher callback to register.
-     * @throws {@link RouterError} Thrown if the path pattern is invalid.
-     * @since 0.11.0
-     */
     setInboxDispatcher(path, dispatcher) {
-        if (this.#inboxCallbacks != null) {
+        if (this.inboxCallbacks != null) {
             throw new RouterError("Inbox dispatcher already set.");
         }
-        if (this.#router.has("inbox")) {
-            if (this.#inboxPath !== path) {
+        if (this.router.has("inbox")) {
+            if (this.inboxPath !== path) {
                 throw new RouterError("Inbox dispatcher path must match inbox listener path.");
             }
         }
         else {
-            const variables = this.#router.add(path, "inbox");
+            const variables = this.router.add(path, "inbox");
             if (variables.size !== 1 || !variables.has("handle")) {
                 throw new RouterError("Path for inbox dispatcher must have one variable: {handle}");
             }
-            this.#inboxPath = path;
+            this.inboxPath = path;
         }
         const callbacks = {
             dispatcher,
         };
-        this.#inboxCallbacks = callbacks;
+        this.inboxCallbacks = callbacks;
         const setters = {
             setCounter(counter) {
                 callbacks.counter = counter;
@@ -627,41 +518,18 @@ export class Federation {
         };
         return setters;
     }
-    /**
-     * Registers an outbox dispatcher.
-     *
-     * @example
-     * ``` typescript
-     * federation.setOutboxDispatcher(
-     *   "/users/{handle}/outbox",
-     *   async (ctx, handle, options) => {
-     *     let items: Activity[];
-     *     let nextCursor: string;
-     *     // ...
-     *     return { items, nextCursor };
-     *   }
-     * );
-     * ```
-     *
-     * @param path The URI path pattern for the outbox dispatcher.  The syntax is
-     *             based on URI Template
-     *             ([RFC 6570](https://tools.ietf.org/html/rfc6570)).  The path
-     *             must have one variable: `{handle}`.
-     * @param dispatcher An outbox dispatcher callback to register.
-     * @throws {@link RouterError} Thrown if the path pattern is invalid.
-     */
     setOutboxDispatcher(path, dispatcher) {
-        if (this.#router.has("outbox")) {
+        if (this.router.has("outbox")) {
             throw new RouterError("Outbox dispatcher already set.");
         }
-        const variables = this.#router.add(path, "outbox");
+        const variables = this.router.add(path, "outbox");
         if (variables.size !== 1 || !variables.has("handle")) {
             throw new RouterError("Path for outbox dispatcher must have one variable: {handle}");
         }
         const callbacks = {
             dispatcher,
         };
-        this.#outboxCallbacks = callbacks;
+        this.outboxCallbacks = callbacks;
         const setters = {
             setCounter(counter) {
                 callbacks.counter = counter;
@@ -682,29 +550,18 @@ export class Federation {
         };
         return setters;
     }
-    /**
-     * Registers a following collection dispatcher.
-     * @param path The URI path pattern for the following collection.  The syntax
-     *             is based on URI Template
-     *             ([RFC 6570](https://tools.ietf.org/html/rfc6570)).  The path
-     *             must have one variable: `{handle}`.
-     * @param dispatcher A following collection callback to register.
-     * @returns An object with methods to set other following collection
-     *          callbacks.
-     * @throws {RouterError} Thrown if the path pattern is invalid.
-     */
     setFollowingDispatcher(path, dispatcher) {
-        if (this.#router.has("following")) {
+        if (this.router.has("following")) {
             throw new RouterError("Following collection dispatcher already set.");
         }
-        const variables = this.#router.add(path, "following");
+        const variables = this.router.add(path, "following");
         if (variables.size !== 1 || !variables.has("handle")) {
             throw new RouterError("Path for following collection dispatcher must have one variable: {handle}");
         }
         const callbacks = {
             dispatcher,
         };
-        this.#followingCallbacks = callbacks;
+        this.followingCallbacks = callbacks;
         const setters = {
             setCounter(counter) {
                 callbacks.counter = counter;
@@ -725,29 +582,18 @@ export class Federation {
         };
         return setters;
     }
-    /**
-     * Registers a followers collection dispatcher.
-     * @param path The URI path pattern for the followers collection.  The syntax
-     *             is based on URI Template
-     *             ([RFC 6570](https://tools.ietf.org/html/rfc6570)).  The path
-     *             must have one variable: `{handle}`.
-     * @param dispatcher A followers collection callback to register.
-     * @returns An object with methods to set other followers collection
-     *          callbacks.
-     * @throws {@link RouterError} Thrown if the path pattern is invalid.
-     */
     setFollowersDispatcher(path, dispatcher) {
-        if (this.#router.has("followers")) {
+        if (this.router.has("followers")) {
             throw new RouterError("Followers collection dispatcher already set.");
         }
-        const variables = this.#router.add(path, "followers");
+        const variables = this.router.add(path, "followers");
         if (variables.size !== 1 || !variables.has("handle")) {
             throw new RouterError("Path for followers collection dispatcher must have one variable: {handle}");
         }
         const callbacks = {
             dispatcher,
         };
-        this.#followersCallbacks = callbacks;
+        this.followersCallbacks = callbacks;
         const setters = {
             setCounter(counter) {
                 callbacks.counter = counter;
@@ -768,30 +614,18 @@ export class Federation {
         };
         return setters;
     }
-    /**
-     * Registers a liked collection dispatcher.
-     * @param path The URI path pattern for the liked collection.  The syntax
-     *             is based on URI Template
-     *             ([RFC 6570](https://tools.ietf.org/html/rfc6570)).  The path
-     *             must have one variable: `{handle}`.
-     * @param dispatcher A liked collection callback to register.
-     * @returns An object with methods to set other liked collection
-     *          callbacks.
-     * @throws {@link RouterError} Thrown if the path pattern is invalid.
-     * @since 0.11.0
-     */
     setLikedDispatcher(path, dispatcher) {
-        if (this.#router.has("liked")) {
+        if (this.router.has("liked")) {
             throw new RouterError("Liked collection dispatcher already set.");
         }
-        const variables = this.#router.add(path, "liked");
+        const variables = this.router.add(path, "liked");
         if (variables.size !== 1 || !variables.has("handle")) {
             throw new RouterError("Path for liked collection dispatcher must have one variable: {handle}");
         }
         const callbacks = {
             dispatcher,
         };
-        this.#likedCallbacks = callbacks;
+        this.likedCallbacks = callbacks;
         const setters = {
             setCounter(counter) {
                 callbacks.counter = counter;
@@ -812,30 +646,18 @@ export class Federation {
         };
         return setters;
     }
-    /**
-     * Registers a featured collection dispatcher.
-     * @param path The URI path pattern for the featured collection.  The syntax
-     *             is based on URI Template
-     *             ([RFC 6570](https://tools.ietf.org/html/rfc6570)).  The path
-     *             must have one variable: `{handle}`.
-     * @param dispatcher A featured collection callback to register.
-     * @returns An object with methods to set other featured collection
-     *          callbacks.
-     * @throws {@link RouterError} Thrown if the path pattern is invalid.
-     * @since 0.11.0
-     */
     setFeaturedDispatcher(path, dispatcher) {
-        if (this.#router.has("featured")) {
+        if (this.router.has("featured")) {
             throw new RouterError("Featured collection dispatcher already set.");
         }
-        const variables = this.#router.add(path, "featured");
+        const variables = this.router.add(path, "featured");
         if (variables.size !== 1 || !variables.has("handle")) {
             throw new RouterError("Path for featured collection dispatcher must have one variable: {handle}");
         }
         const callbacks = {
             dispatcher,
         };
-        this.#featuredCallbacks = callbacks;
+        this.featuredCallbacks = callbacks;
         const setters = {
             setCounter(counter) {
                 callbacks.counter = counter;
@@ -856,23 +678,11 @@ export class Federation {
         };
         return setters;
     }
-    /**
-     * Registers a featured tags collection dispatcher.
-     * @param path The URI path pattern for the featured tags collection.
-     *             The syntax is based on URI Template
-     *             ([RFC 6570](https://tools.ietf.org/html/rfc6570)).  The path
-     *             must have one variable: `{handle}`.
-     * @param dispatcher A featured tags collection callback to register.
-     * @returns An object with methods to set other featured tags collection
-     *          callbacks.
-     * @throws {@link RouterError} Thrown if the path pattern is invalid.
-     * @since 0.11.0
-     */
     setFeaturedTagsDispatcher(path, dispatcher) {
-        if (this.#router.has("featuredTags")) {
+        if (this.router.has("featuredTags")) {
             throw new RouterError("Featured tags collection dispatcher already set.");
         }
-        const variables = this.#router.add(path, "featuredTags");
+        const variables = this.router.add(path, "featuredTags");
         if (variables.size !== 1 || !variables.has("handle")) {
             throw new RouterError("Path for featured tags collection dispatcher must have one " +
                 "variable: {handle}");
@@ -880,7 +690,7 @@ export class Federation {
         const callbacks = {
             dispatcher,
         };
-        this.#featuredTagsCallbacks = callbacks;
+        this.featuredTagsCallbacks = callbacks;
         const setters = {
             setCounter(counter) {
                 callbacks.counter = counter;
@@ -901,59 +711,29 @@ export class Federation {
         };
         return setters;
     }
-    /**
-     * Assigns the URL path for the inbox and starts setting inbox listeners.
-     *
-     * @example
-     * ``` typescript
-     * federation
-     *   .setInboxListeners("/users/{handle/inbox", "/inbox")
-     *   .on(Follow, async (ctx, follow) => {
-     *     const from = await follow.getActor(ctx);
-     *     if (!isActor(from)) return;
-     *     // ...
-     *     await ctx.sendActivity({ })
-     *   })
-     *   .on(Undo, async (ctx, undo) => {
-     *     // ...
-     *   });
-     * ```
-     *
-     * @param inboxPath The URI path pattern for the inbox.  The syntax is based
-     *                  on URI Template
-     *                  ([RFC 6570](https://tools.ietf.org/html/rfc6570)).
-     *                  The path must have one variable: `{handle}`, and must
-     *                  match the inbox dispatcher path.
-     * @param sharedInboxPath An optional URI path pattern for the shared inbox.
-     *                        The syntax is based on URI Template
-     *                        ([RFC 6570](https://tools.ietf.org/html/rfc6570)).
-     *                        The path must have no variables.
-     * @returns An object to register inbox listeners.
-     * @throws {RouteError} Thrown if the path pattern is invalid.
-     */
     setInboxListeners(inboxPath, sharedInboxPath) {
-        if (this.#inboxListeners != null) {
+        if (this.inboxListeners != null) {
             throw new RouterError("Inbox listeners already set.");
         }
-        if (this.#router.has("inbox")) {
-            if (this.#inboxPath !== inboxPath) {
+        if (this.router.has("inbox")) {
+            if (this.inboxPath !== inboxPath) {
                 throw new RouterError("Inbox listener path must match inbox dispatcher path.");
             }
         }
         else {
-            const variables = this.#router.add(inboxPath, "inbox");
+            const variables = this.router.add(inboxPath, "inbox");
             if (variables.size !== 1 || !variables.has("handle")) {
                 throw new RouterError("Path for inbox must have one variable: {handle}");
             }
-            this.#inboxPath = inboxPath;
+            this.inboxPath = inboxPath;
         }
         if (sharedInboxPath != null) {
-            const siVars = this.#router.add(sharedInboxPath, "sharedInbox");
+            const siVars = this.router.add(sharedInboxPath, "sharedInbox");
             if (siVars.size !== 0) {
                 throw new RouterError("Path for shared inbox must have no variables.");
             }
         }
-        const listeners = this.#inboxListeners = new InboxListenerSet();
+        const listeners = this.inboxListeners = new InboxListenerSet();
         const setters = {
             on(
             // deno-lint-ignore no-explicit-any
@@ -962,27 +742,16 @@ export class Federation {
                 return setters;
             },
             onError: (handler) => {
-                this.#inboxErrorHandler = handler;
+                this.inboxErrorHandler = handler;
                 return setters;
             },
             setSharedKeyDispatcher: (dispatcher) => {
-                this.#sharedInboxKeyDispatcher = dispatcher;
+                this.sharedInboxKeyDispatcher = dispatcher;
                 return setters;
             },
         };
         return setters;
     }
-    /**
-     * Sends an activity to recipients' inboxes.  You would typically use
-     * {@link Context.sendActivity} instead of this method.
-     *
-     * @param keys The sender's key pairs.
-     * @param recipients The recipients of the activity.
-     * @param activity The activity to send.
-     * @param options Options for sending the activity.
-     * @throws {TypeError} If the activity to send does not have an actor.
-     * @deprecated Use {@link Context.sendActivity} instead.
-     */
     async sendActivity(keys, recipients, activity, options) {
         const logger = getLogger(["fedify", "federation", "outbox"]);
         if (!(invokedByContext in options) || !options[invokedByContext]) {
@@ -1000,7 +769,7 @@ export class Federation {
             logger.error("Activity {activityId} to send does not have an actor.", { activity, activityId: activity?.id?.href });
             throw new TypeError("The activity to send must have at least one actor property.");
         }
-        if (!this.#manuallyStartQueue)
+        if (!this.manuallyStartQueue)
             this.#startQueue(contextData);
         if (activity.id == null) {
             activity = activity.clone({
@@ -1017,7 +786,7 @@ export class Federation {
             activityId: activity.id?.href,
             activity,
         });
-        if (immediate || this.#queue == null) {
+        if (immediate || this.queue == null) {
             if (immediate) {
                 logger.debug("Sending activity immediately without queue since immediate option " +
                     "is set.", { activityId: activity.id?.href, activity });
@@ -1031,7 +800,7 @@ export class Federation {
                     keys,
                     activity,
                     inbox: new URL(inbox),
-                    contextLoader: this.#contextLoader,
+                    contextLoader: this.contextLoader,
                     headers: collectionSync == null ? undefined : new Headers({
                         "Collection-Synchronization": await buildCollectionSynchronizationHeader(collectionSync, inboxes[inbox]),
                     }),
@@ -1047,7 +816,7 @@ export class Federation {
             keyJwkPairs.push({ keyId: keyId.href, privateKey: privateKeyJwk });
         }
         const activityJson = await activity.toJsonLd({
-            contextLoader: this.#contextLoader,
+            contextLoader: this.contextLoader,
         });
         for (const inbox in inboxes) {
             const message = {
@@ -1061,21 +830,9 @@ export class Federation {
                     "Collection-Synchronization": await buildCollectionSynchronizationHeader(collectionSync, inboxes[inbox]),
                 },
             };
-            this.#queue.enqueue(message);
+            this.queue.enqueue(message);
         }
     }
-    /**
-     * Handles a request related to federation.  If a request is not related to
-     * federation, the `onNotFound` or `onNotAcceptable` callback is called.
-     *
-     * Usually, this method is called from a server's request handler or
-     * a web framework's middleware.
-     *
-     * @param request The request object.
-     * @param parameters The parameters for handling the request.
-     * @returns The response to the request.
-     * @since 0.6.0
-     */
     async fetch(request, options) {
         const response = await this.#fetch(request, options);
         const logger = getLogger(["fedify", "federation", "http"]);
@@ -1100,7 +857,7 @@ export class Federation {
         onNotAcceptable ??= notAcceptable;
         onUnauthorized ??= unauthorized;
         const url = new URL(request.url);
-        const route = this.#router.route(url.pathname);
+        const route = this.router.route(url.pathname);
         if (route == null) {
             const response = onNotFound(request);
             return response instanceof Promise ? await response : response;
@@ -1111,7 +868,7 @@ export class Federation {
             case "webfinger":
                 return await handleWebFinger(request, {
                     context,
-                    actorDispatcher: this.#actorCallbacks?.dispatcher,
+                    actorDispatcher: this.actorCallbacks?.dispatcher,
                     onNotFound,
                 });
             case "nodeInfoJrd":
@@ -1119,27 +876,25 @@ export class Federation {
             case "nodeInfo":
                 return await handleNodeInfo(request, {
                     context,
-                    nodeInfoDispatcher: this.#nodeInfoDispatcher,
+                    nodeInfoDispatcher: this.nodeInfoDispatcher,
                 });
             case "actor":
-                // FIXME: When the deprecated last parameter (key) of ActorDispatcher
-                //        is removed, uncomment the following line.
-                // context = this.#createContext(request, contextData, {
-                //   invokedFromActorDispatcher: { handle: route.values.handle },
-                // });
+                context = this.#createContext(request, contextData, {
+                    invokedFromActorDispatcher: { handle: route.values.handle },
+                });
                 return await handleActor(request, {
                     handle: route.values.handle,
                     context,
-                    actorDispatcher: this.#actorCallbacks?.dispatcher,
-                    authorizePredicate: this.#actorCallbacks?.authorizePredicate,
+                    actorDispatcher: this.actorCallbacks?.dispatcher,
+                    authorizePredicate: this.actorCallbacks?.authorizePredicate,
                     onUnauthorized,
                     onNotFound,
                     onNotAcceptable,
                 });
             case "object": {
                 const typeId = route.name.replace(/^object:/, "");
-                const callbacks = this.#objectCallbacks[typeId];
-                const cls = this.#objectTypeIds[typeId];
+                const callbacks = this.objectCallbacks[typeId];
+                const cls = this.objectTypeIds[typeId];
                 context = this.#createContext(request, contextData, {
                     invokedFromObjectDispatcher: { cls, values: route.values },
                 });
@@ -1158,7 +913,7 @@ export class Federation {
                     name: "outbox",
                     handle: route.values.handle,
                     context,
-                    collectionCallbacks: this.#outboxCallbacks,
+                    collectionCallbacks: this.outboxCallbacks,
                     onUnauthorized,
                     onNotFound,
                     onNotAcceptable,
@@ -1169,7 +924,7 @@ export class Federation {
                         name: "inbox",
                         handle: route.values.handle,
                         context,
-                        collectionCallbacks: this.#inboxCallbacks,
+                        collectionCallbacks: this.inboxCallbacks,
                         onUnauthorized,
                         onNotFound,
                         onNotAcceptable,
@@ -1182,8 +937,8 @@ export class Federation {
                 });
             // falls through
             case "sharedInbox":
-                if (routeName !== "inbox" && this.#sharedInboxKeyDispatcher != null) {
-                    const identity = await this.#sharedInboxKeyDispatcher(context);
+                if (routeName !== "inbox" && this.sharedInboxKeyDispatcher != null) {
+                    const identity = await this.sharedInboxKeyDispatcher(context);
                     if (identity != null) {
                         context = this.#createContext(request, contextData, {
                             documentLoader: "handle" in identity
@@ -1192,25 +947,25 @@ export class Federation {
                         });
                     }
                 }
-                if (!this.#manuallyStartQueue)
+                if (!this.manuallyStartQueue)
                     this.#startQueue(contextData);
                 return await handleInbox(request, {
                     handle: route.values.handle ?? null,
                     context,
-                    kv: this.#kv,
-                    kvPrefixes: this.#kvPrefixes,
-                    actorDispatcher: this.#actorCallbacks?.dispatcher,
-                    inboxListeners: this.#inboxListeners,
-                    inboxErrorHandler: this.#inboxErrorHandler,
+                    kv: this.kv,
+                    kvPrefixes: this.kvPrefixes,
+                    actorDispatcher: this.actorCallbacks?.dispatcher,
+                    inboxListeners: this.inboxListeners,
+                    inboxErrorHandler: this.inboxErrorHandler,
                     onNotFound,
-                    signatureTimeWindow: this.#signatureTimeWindow,
+                    signatureTimeWindow: this.signatureTimeWindow,
                 });
             case "following":
                 return await handleCollection(request, {
                     name: "following",
                     handle: route.values.handle,
                     context,
-                    collectionCallbacks: this.#followingCallbacks,
+                    collectionCallbacks: this.followingCallbacks,
                     onUnauthorized,
                     onNotFound,
                     onNotAcceptable,
@@ -1229,7 +984,7 @@ export class Federation {
                     filterPredicate: baseUrl != null
                         ? ((i) => (i instanceof URL ? i.href : i.id?.href ?? "").startsWith(baseUrl))
                         : undefined,
-                    collectionCallbacks: this.#followersCallbacks,
+                    collectionCallbacks: this.followersCallbacks,
                     onUnauthorized,
                     onNotFound,
                     onNotAcceptable,
@@ -1240,7 +995,7 @@ export class Federation {
                     name: "liked",
                     handle: route.values.handle,
                     context,
-                    collectionCallbacks: this.#likedCallbacks,
+                    collectionCallbacks: this.likedCallbacks,
                     onUnauthorized,
                     onNotFound,
                     onNotAcceptable,
@@ -1250,7 +1005,7 @@ export class Federation {
                     name: "featured",
                     handle: route.values.handle,
                     context,
-                    collectionCallbacks: this.#featuredCallbacks,
+                    collectionCallbacks: this.featuredCallbacks,
                     onUnauthorized,
                     onNotFound,
                     onNotAcceptable,
@@ -1260,7 +1015,7 @@ export class Federation {
                     name: "featured tags",
                     handle: route.values.handle,
                     context,
-                    collectionCallbacks: this.#featuredTagsCallbacks,
+                    collectionCallbacks: this.featuredTagsCallbacks,
                     onUnauthorized,
                     onNotFound,
                     onNotAcceptable,
@@ -1273,59 +1028,49 @@ export class Federation {
     }
 }
 class ContextImpl {
-    #url;
-    #federation;
-    #router;
-    #objectTypeIds;
-    objectCallbacks;
-    actorCallbacks;
+    url;
+    federation;
     data;
     documentLoader;
-    contextLoader;
-    #authenticatedDocumentLoaderFactory;
-    #invokedFromActorKeyPairsDispatcher;
-    constructor({ url, federation, router, objectTypeIds, objectCallbacks, actorCallbacks, data, documentLoader, contextLoader, authenticatedDocumentLoaderFactory, invokedFromActorKeyPairsDispatcher, }) {
-        this.#url = url;
-        this.#federation = federation;
-        this.#router = router;
-        this.#objectTypeIds = objectTypeIds;
-        this.objectCallbacks = objectCallbacks;
-        this.actorCallbacks = actorCallbacks;
+    invokedFromActorKeyPairsDispatcher;
+    constructor({ url, federation, data, documentLoader, invokedFromActorKeyPairsDispatcher, }) {
+        this.url = url;
+        this.federation = federation;
         this.data = data;
         this.documentLoader = documentLoader;
-        this.contextLoader = contextLoader;
-        this.#authenticatedDocumentLoaderFactory =
-            authenticatedDocumentLoaderFactory;
-        this.#invokedFromActorKeyPairsDispatcher =
+        this.invokedFromActorKeyPairsDispatcher =
             invokedFromActorKeyPairsDispatcher;
     }
     get hostname() {
-        return this.#url.hostname;
+        return this.url.hostname;
     }
     get host() {
-        return this.#url.host;
+        return this.url.host;
     }
     get origin() {
-        return this.#url.origin;
+        return this.url.origin;
+    }
+    get contextLoader() {
+        return this.federation.contextLoader;
     }
     getNodeInfoUri() {
-        const path = this.#router.build("nodeInfo", {});
+        const path = this.federation.router.build("nodeInfo", {});
         if (path == null) {
             throw new RouterError("No NodeInfo dispatcher registered.");
         }
-        return new URL(path, this.#url);
+        return new URL(path, this.url);
     }
     getActorUri(handle) {
-        const path = this.#router.build("actor", { handle });
+        const path = this.federation.router.build("actor", { handle });
         if (path == null) {
             throw new RouterError("No actor dispatcher registered.");
         }
-        return new URL(path, this.#url);
+        return new URL(path, this.url);
     }
     getObjectUri(
     // deno-lint-ignore no-explicit-any
     cls, values) {
-        const callbacks = this.objectCallbacks[cls.typeId.href];
+        const callbacks = this.federation.objectCallbacks[cls.typeId.href];
         if (callbacks == null) {
             throw new RouterError("No object dispatcher registered.");
         }
@@ -1334,72 +1079,72 @@ class ContextImpl {
                 throw new TypeError(`Missing parameter: ${param}`);
             }
         }
-        const path = this.#router.build(`object:${cls.typeId.href}`, values);
+        const path = this.federation.router.build(`object:${cls.typeId.href}`, values);
         if (path == null) {
             throw new RouterError("No object dispatcher registered.");
         }
-        return new URL(path, this.#url);
+        return new URL(path, this.url);
     }
     getOutboxUri(handle) {
-        const path = this.#router.build("outbox", { handle });
+        const path = this.federation.router.build("outbox", { handle });
         if (path == null) {
             throw new RouterError("No outbox dispatcher registered.");
         }
-        return new URL(path, this.#url);
+        return new URL(path, this.url);
     }
     getInboxUri(handle) {
         if (handle == null) {
-            const path = this.#router.build("sharedInbox", {});
+            const path = this.federation.router.build("sharedInbox", {});
             if (path == null) {
                 throw new RouterError("No shared inbox path registered.");
             }
-            return new URL(path, this.#url);
+            return new URL(path, this.url);
         }
-        const path = this.#router.build("inbox", { handle });
+        const path = this.federation.router.build("inbox", { handle });
         if (path == null) {
             throw new RouterError("No inbox path registered.");
         }
-        return new URL(path, this.#url);
+        return new URL(path, this.url);
     }
     getFollowingUri(handle) {
-        const path = this.#router.build("following", { handle });
+        const path = this.federation.router.build("following", { handle });
         if (path == null) {
             throw new RouterError("No following collection path registered.");
         }
-        return new URL(path, this.#url);
+        return new URL(path, this.url);
     }
     getFollowersUri(handle) {
-        const path = this.#router.build("followers", { handle });
+        const path = this.federation.router.build("followers", { handle });
         if (path == null) {
             throw new RouterError("No followers collection path registered.");
         }
-        return new URL(path, this.#url);
+        return new URL(path, this.url);
     }
     getLikedUri(handle) {
-        const path = this.#router.build("liked", { handle });
+        const path = this.federation.router.build("liked", { handle });
         if (path == null) {
             throw new RouterError("No liked collection path registered.");
         }
-        return new URL(path, this.#url);
+        return new URL(path, this.url);
     }
     getFeaturedUri(handle) {
-        const path = this.#router.build("featured", { handle });
+        const path = this.federation.router.build("featured", { handle });
         if (path == null) {
             throw new RouterError("No featured collection path registered.");
         }
-        return new URL(path, this.#url);
+        return new URL(path, this.url);
     }
     getFeaturedTagsUri(handle) {
-        const path = this.#router.build("featuredTags", { handle });
+        const path = this.federation.router.build("featuredTags", { handle });
         if (path == null) {
             throw new RouterError("No featured tags collection path registered.");
         }
-        return new URL(path, this.#url);
+        return new URL(path, this.url);
     }
     parseUri(uri) {
-        if (uri.origin !== this.#url.origin)
+        if (uri.origin !== this.url.origin)
             return null;
-        const route = this.#router.route(uri.pathname);
+        const route = this.federation.router.route(uri.pathname);
         if (route == null)
             return null;
         else if (route.name === "actor") {
@@ -1409,7 +1154,7 @@ class ContextImpl {
             const typeId = route.name.replace(/^object:/, "");
             return {
                 type: "object",
-                class: this.#objectTypeIds[typeId],
+                class: this.federation.objectTypeIds[typeId],
                 typeId: new URL(typeId),
                 values: route.values,
             };
@@ -1442,12 +1187,12 @@ class ContextImpl {
     }
     async getActorKeyPairs(handle) {
         const logger = getLogger(["fedify", "federation", "actor"]);
-        if (this.#invokedFromActorKeyPairsDispatcher != null) {
+        if (this.invokedFromActorKeyPairsDispatcher != null) {
             logger.warn("Context.getActorKeyPairs({getActorKeyPairsHandle}) method is " +
                 "invoked from the actor key pairs dispatcher " +
                 "({actorKeyPairsDispatcherHandle}); this may cause an infinite loop.", {
                 getActorKeyPairsHandle: handle,
-                actorKeyPairsDispatcherHandle: this.#invokedFromActorKeyPairsDispatcher.handle,
+                actorKeyPairsDispatcherHandle: this.invokedFromActorKeyPairsDispatcher.handle,
             });
         }
         let keyPairs;
@@ -1480,26 +1225,17 @@ class ContextImpl {
     }
     async getKeyPairsFromHandle(handle) {
         const logger = getLogger(["fedify", "federation", "actor"]);
-        if (this.actorCallbacks?.keyPairsDispatcher == null) {
+        if (this.federation.actorCallbacks?.keyPairsDispatcher == null) {
             throw new Error("No actor key pairs dispatcher registered.");
         }
-        const path = this.#router.build("actor", { handle });
+        const path = this.federation.router.build("actor", { handle });
         if (path == null) {
             logger.warn("No actor dispatcher registered.");
             return [];
         }
-        const actorUri = new URL(path, this.#url);
-        const keyPairs = await this.actorCallbacks?.keyPairsDispatcher(new ContextImpl({
-            url: this.#url,
-            federation: this.#federation,
-            router: this.#router,
-            objectTypeIds: this.#objectTypeIds,
-            objectCallbacks: this.objectCallbacks,
-            actorCallbacks: this.actorCallbacks,
-            data: this.data,
-            documentLoader: this.documentLoader,
-            contextLoader: this.contextLoader,
-            authenticatedDocumentLoaderFactory: this.#authenticatedDocumentLoaderFactory,
+        const actorUri = new URL(path, this.url);
+        const keyPairs = await this.federation.actorCallbacks?.keyPairsDispatcher(new ContextImpl({
+            ...this,
             invokedFromActorKeyPairsDispatcher: { handle },
         }), handle);
         if (keyPairs.length < 1) {
@@ -1518,24 +1254,6 @@ class ContextImpl {
         }
         return result;
     }
-    async getActorKey(handle) {
-        getLogger(["fedify", "federation", "actor"]).warn("Context.getActorKey() method is deprecated; " +
-            "use Context.getActorKeyPairs() method instead.");
-        let keyPair;
-        try {
-            keyPair = await this.getRsaKeyPairFromHandle(handle);
-        }
-        catch (_) {
-            return null;
-        }
-        if (keyPair == null)
-            return null;
-        return new CryptographicKey({
-            id: keyPair.keyId,
-            owner: this.getActorUri(handle),
-            publicKey: keyPair.publicKey,
-        });
-    }
     async getRsaKeyPairFromHandle(handle) {
         const keyPairs = await this.getKeyPairsFromHandle(handle);
         for (const keyPair of keyPairs) {
@@ -1555,9 +1273,9 @@ class ContextImpl {
             const keyPair = this.getRsaKeyPairFromHandle(identity.handle);
             return keyPair.then((pair) => pair == null
                 ? this.documentLoader
-                : this.#authenticatedDocumentLoaderFactory(pair));
+                : this.federation.authenticatedDocumentLoaderFactory(pair));
         }
-        return this.#authenticatedDocumentLoaderFactory(identity);
+        return this.federation.authenticatedDocumentLoaderFactory(identity);
     }
     async sendActivity(sender, recipients, activity, options = {}) {
         let keys;
@@ -1594,15 +1312,15 @@ class ContextImpl {
             for await (const recipient of this.getFollowers(sender.handle)) {
                 expandedRecipients.push(recipient);
             }
-            const collectionId = this.#router.build("followers", sender);
+            const collectionId = this.federation.router.build("followers", sender);
             opts.collectionSync = collectionId == null
                 ? undefined
-                : new URL(collectionId, this.#url).href;
+                : new URL(collectionId, this.url).href;
         }
         else {
             expandedRecipients = [recipients];
         }
-        return await this.#federation.sendActivity(keys, expandedRecipients, activity, opts);
+        return await this.federation.sendActivity(keys, expandedRecipients, activity, opts);
     }
     getFollowers(_handle) {
         throw new Error('"followers" recipients are not supported in Context.  ' +
@@ -1610,39 +1328,33 @@ class ContextImpl {
     }
 }
 class RequestContextImpl extends ContextImpl {
-    #options;
-    #followersCallbacks;
-    #signatureTimeWindow;
     #invokedFromActorDispatcher;
     #invokedFromObjectDispatcher;
     request;
     url;
     constructor(options) {
         super(options);
-        this.#options = options;
-        this.#followersCallbacks = options.followersCallbacks;
-        this.#signatureTimeWindow = options.signatureTimeWindow;
         this.#invokedFromActorDispatcher = options.invokedFromActorDispatcher;
         this.#invokedFromObjectDispatcher = options.invokedFromObjectDispatcher;
         this.request = options.request;
         this.url = options.url;
     }
     async *getFollowers(handle) {
-        if (this.#followersCallbacks == null) {
+        if (this.federation.followersCallbacks == null) {
             throw new Error("No followers collection dispatcher registered.");
         }
-        const result = await this.#followersCallbacks.dispatcher(this, handle, null);
+        const result = await this.federation.followersCallbacks.dispatcher(this, handle, null);
         if (result != null) {
             for (const recipient of result.items)
                 yield recipient;
             return;
         }
-        if (this.#followersCallbacks.firstCursor == null) {
+        if (this.federation.followersCallbacks.firstCursor == null) {
             throw new Error("No first cursor dispatcher registered for followers collection.");
         }
-        let cursor = await this.#followersCallbacks.firstCursor(this, handle);
+        let cursor = await this.federation.followersCallbacks.firstCursor(this, handle);
         while (cursor != null) {
-            const result = await this.#followersCallbacks.dispatcher(this, handle, cursor);
+            const result = await this.federation.followersCallbacks.dispatcher(this, handle, cursor);
             if (result == null)
                 break;
             for (const recipient of result.items)
@@ -1651,8 +1363,8 @@ class RequestContextImpl extends ContextImpl {
         }
     }
     async getActor(handle) {
-        if (this.actorCallbacks == null ||
-            this.actorCallbacks.dispatcher == null) {
+        if (this.federation.actorCallbacks == null ||
+            this.federation.actorCallbacks.dispatcher == null) {
             throw new Error("No actor dispatcher registered.");
         }
         if (this.#invokedFromActorDispatcher != null) {
@@ -1663,26 +1375,15 @@ class RequestContextImpl extends ContextImpl {
                 actorDispatcherHandle: this.#invokedFromActorDispatcher.handle,
             });
         }
-        let rsaKey;
-        try {
-            rsaKey = await this.getRsaKeyPairFromHandle(handle);
-        }
-        catch (_) {
-            rsaKey = null;
-        }
-        return await this.actorCallbacks.dispatcher(new RequestContextImpl({
-            ...this.#options,
+        return await this.federation.actorCallbacks.dispatcher(new RequestContextImpl({
+            ...this,
             invokedFromActorDispatcher: { handle },
-        }), handle, rsaKey == null ? null : new CryptographicKey({
-            id: rsaKey.keyId,
-            owner: this.getActorUri(handle),
-            publicKey: rsaKey.publicKey,
-        }));
+        }), handle);
     }
     async getObject(
     // deno-lint-ignore no-explicit-any
     cls, values) {
-        const callbacks = this.objectCallbacks[cls.typeId.href];
+        const callbacks = this.federation.objectCallbacks[cls.typeId.href];
         if (callbacks == null) {
             throw new Error("No object dispatcher registered.");
         }
@@ -1703,7 +1404,7 @@ class RequestContextImpl extends ContextImpl {
             });
         }
         return await callbacks.dispatcher(new RequestContextImpl({
-            ...this.#options,
+            ...this,
             invokedFromObjectDispatcher: { cls, values },
         }), values);
     }
@@ -1713,7 +1414,7 @@ class RequestContextImpl extends ContextImpl {
             return this.#signedKey;
         return this.#signedKey = await verifyRequest(this.request, {
             ...this,
-            timeWindow: this.#signatureTimeWindow,
+            timeWindow: this.federation.signatureTimeWindow,
         });
     }
     #signedKeyOwner = undefined;