@fedify/fedify 1.0.0-dev.396 → 1.0.0-dev.398

package/CHANGES.md

@@ -28,6 +28,22 @@ To be released.
      -  Added `attachSignature()` function.
      -  Added `detachSignature()` function.
 
+ -  In inbox listeners, a received activity now can be forwarded to another
+    server.  [[#137]]
+
+     -  Added `InboxContext` interface.
+     -  Added `ForwardActivityOptions` interface.
+     -  The first parameter of the `InboxListener` callback type became
+        `InboxContext` (was `Context`).
+
+ -  `Context.sendActivity()` method now adds Object Integrity Proofs to
+    the activity to be sent only once.  It had added Object Integrity Proofs
+    to the activity for every recipient before.
+
+ -  WebFinger responses now include <http://webfinger.net/rel/avatar> links
+    if the `Actor` object returned by the actor dispatcher has `icon`/`icons`
+    property.
+
  -  The `fedify inbox` command now sends `Delete(Application)` activities when
     it's terminated so that the peers can clean up data related to the temporary
     actor.  [[#135]]
@@ -39,6 +55,7 @@ To be released.
 
 [Linked Data Signatures]: https://web.archive.org/web/20170923124140/https://w3c-dvcg.github.io/ld-signatures/
 [#135]: https://github.com/dahlia/fedify/issues/135
+[#137]: https://github.com/dahlia/fedify/issues/137
 
 
 Version 0.15.1

package/esm/federation/federation.js

@@ -0,0 +1 @@
+export {};

package/esm/federation/handler.js

@@ -175,7 +175,7 @@ function filterCollectionItems(items, collectionName, filterPredicate) {
     }
     return result;
 }
-export async function handleInbox(request, { handle, context, kv, kvPrefixes, queue, actorDispatcher, inboxListeners, inboxErrorHandler, onNotFound, signatureTimeWindow, skipSignatureVerification, }) {
+export async function handleInbox(request, { handle, context, inboxContextFactory, kv, kvPrefixes, queue, actorDispatcher, inboxListeners, inboxErrorHandler, onNotFound, signatureTimeWindow, skipSignatureVerification, }) {
     const logger = getLogger(["fedify", "federation", "inbox"]);
     if (actorDispatcher == null) {
         logger.error("Actor dispatcher is not set.", { handle });
@@ -343,7 +343,7 @@ export async function handleInbox(request, { handle, context, kv, kvPrefixes, qu
             attempt: 0,
             started: new Date().toISOString(),
         });
-        logger.info("Activity {activityId} is eunqueued.", { activityId: activity.id?.href, activity: json });
+        logger.info("Activity {activityId} is enqueued.", { activityId: activity.id?.href, activity: json });
         return new Response("Activity is enqueued.", {
             status: 202,
             headers: { "Content-Type": "text/plain; charset=utf-8" },
@@ -358,7 +358,7 @@ export async function handleInbox(request, { handle, context, kv, kvPrefixes, qu
         });
     }
     try {
-        await listener(context, activity);
+        await listener(inboxContextFactory(json), activity);
     }
     catch (error) {
         try {

package/esm/federation/middleware.js

@@ -4,7 +4,9 @@ import { handleNodeInfo, handleNodeInfoJrd } from "../nodeinfo/handler.js";
 import { fetchDocumentLoader, getAuthenticatedDocumentLoader, kvCache, } from "../runtime/docloader.js";
 import { verifyRequest } from "../sig/http.js";
 import { exportJwk, importJwk, validateCryptoKey } from "../sig/key.js";
+import { hasSignature, signJsonLd } from "../sig/ld.js";
 import { getKeyOwner } from "../sig/owner.js";
+import { signObject } from "../sig/proof.js";
 import { lookupObject } from "../vocab/lookup.js";
 import { Activity, CryptographicKey, Multikey, } from "../vocab/vocab.js";
 import { handleWebFinger } from "../webfinger/handler.js";
@@ -23,7 +25,7 @@ import { extractInboxes, sendActivity } from "./send.js";
 export function createFederation(options) {
     return new FederationImpl(options);
 }
-class FederationImpl {
+export class FederationImpl {
     kv;
     kvPrefixes;
     queue;
@@ -128,45 +130,44 @@ class FederationImpl {
             keyIds: message.keys.map((pair) => pair.keyId),
             inbox: message.inbox,
             activity: message.activity,
+            activityId: message.activityId,
             attempt: message.attempt,
             headers: message.headers,
         };
-        let activity = null;
-        try {
-            const keys = [];
-            let rsaKeyPair = null;
-            for (const { keyId, privateKey } of message.keys) {
-                const pair = {
-                    keyId: new URL(keyId),
-                    privateKey: await importJwk(privateKey, "private"),
-                };
-                if (rsaKeyPair == null &&
-                    pair.privateKey.algorithm.name === "RSASSA-PKCS1-v1_5") {
-                    rsaKeyPair = pair;
-                }
-                keys.push(pair);
+        const keys = [];
+        let rsaKeyPair = null;
+        for (const { keyId, privateKey } of message.keys) {
+            const pair = {
+                keyId: new URL(keyId),
+                privateKey: await importJwk(privateKey, "private"),
+            };
+            if (rsaKeyPair == null &&
+                pair.privateKey.algorithm.name === "RSASSA-PKCS1-v1_5") {
+                rsaKeyPair = pair;
             }
-            const documentLoader = rsaKeyPair == null
-                ? this.documentLoader
-                : this.authenticatedDocumentLoaderFactory(rsaKeyPair);
-            activity = await Activity.fromJsonLd(message.activity, {
-                documentLoader,
-                contextLoader: this.contextLoader,
-            });
+            keys.push(pair);
+        }
+        try {
             await sendActivity({
                 keys,
-                activity,
+                activity: message.activity,
+                activityId: message.activityId,
                 inbox: new URL(message.inbox),
-                contextLoader: this.contextLoader,
                 headers: new Headers(message.headers),
             });
         }
         catch (error) {
+            const activity = await Activity.fromJsonLd(message.activity, {
+                contextLoader: this.contextLoader,
+                documentLoader: rsaKeyPair == null
+                    ? this.documentLoader
+                    : this.authenticatedDocumentLoaderFactory(rsaKeyPair),
+            });
             try {
                 this.onOutboxError?.(error, activity);
             }
             catch (error) {
-                logger.error("An unexpected error occurred in onError handler:\n{error}", { ...logData, error, activityId: activity?.id?.href });
+                logger.error("An unexpected error occurred in onError handler:\n{error}", { ...logData, error });
             }
             const delay = this.outboxRetryPolicy({
                 elapsedTime: dntShim.Temporal.Instant.from(message.started).until(dntShim.Temporal.Now.instant()),
@@ -174,7 +175,7 @@ class FederationImpl {
             });
             if (delay != null) {
                 logger.error("Failed to send activity {activityId} to {inbox} (attempt " +
-                    "#{attempt}); retry...:\n{error}", { ...logData, error, activityId: activity?.id?.href });
+                    "#{attempt}); retry...:\n{error}", { ...logData, error });
                 this.queue?.enqueue({
                     ...message,
                     attempt: message.attempt + 1,
@@ -186,11 +187,11 @@ class FederationImpl {
             }
             else {
                 logger.error("Failed to send activity {activityId} to {inbox} after {attempt} " +
-                    "attempts; giving up:\n{error}", { ...logData, error, activityId: activity?.id?.href });
+                    "attempts; giving up:\n{error}", { ...logData, error });
             }
             return;
         }
-        logger.info("Successfully sent activity {activityId} to {inbox}.", { ...logData, activityId: activity?.id?.href });
+        logger.info("Successfully sent activity {activityId} to {inbox}.", { ...logData });
     }
     async #listenInboxMessage(ctxData, message) {
         const logger = getLogger(["fedify", "federation", "inbox"]);
@@ -234,7 +235,7 @@ class FederationImpl {
             return;
         }
         try {
-            await listener(context, activity);
+            await listener(context.toInboxContext(message.activity), activity);
         }
         catch (error) {
             try {
@@ -782,8 +783,6 @@ class FederationImpl {
             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)
-            this.#startQueue(contextData);
         if (activity.id == null) {
             activity = activity.clone({
                 id: new URL(`urn:uuid:${dntShim.crypto.randomUUID()}`),
@@ -799,21 +798,78 @@ class FederationImpl {
             activityId: activity.id?.href,
             activity,
         });
+        if (activity.id == null) {
+            throw new TypeError("The activity to send must have an id.");
+        }
+        if (activity.actorId == null) {
+            throw new TypeError("The activity to send must have at least one actor property.");
+        }
+        else if (keys.length < 1) {
+            throw new TypeError("The keys must not be empty.");
+        }
+        const activityId = activity.id.href;
+        let proofCreated = false;
+        let rsaKey = null;
+        for (const { keyId, privateKey } of keys) {
+            validateCryptoKey(privateKey, "private");
+            if (rsaKey == null && privateKey.algorithm.name === "RSASSA-PKCS1-v1_5") {
+                rsaKey = { keyId, privateKey };
+                continue;
+            }
+            if (privateKey.algorithm.name === "Ed25519") {
+                activity = await signObject(activity, privateKey, keyId, {
+                    contextLoader: this.contextLoader,
+                });
+                proofCreated = true;
+            }
+        }
+        let jsonLd = await activity.toJsonLd({
+            format: "compact",
+            contextLoader: this.contextLoader,
+        });
+        if (rsaKey == null) {
+            logger.warn("No supported key found to create a Linked Data signature for " +
+                "the activity {activityId}.  The activity will be sent without " +
+                "a Linked Data signature.  In order to create a Linked Data " +
+                "signature, at least one RSASSA-PKCS1-v1_5 key must be provided.", {
+                activityId,
+                keys: keys.map((pair) => ({
+                    keyId: pair.keyId.href,
+                    privateKey: pair.privateKey,
+                })),
+            });
+        }
+        else {
+            jsonLd = await signJsonLd(jsonLd, rsaKey.privateKey, rsaKey.keyId, {
+                contextLoader: this.contextLoader,
+            });
+        }
+        if (!proofCreated) {
+            logger.warn("No supported key found to create a proof for the activity {activityId}.  " +
+                "The activity will be sent without a proof.  " +
+                "In order to create a proof, at least one Ed25519 key must be provided.", {
+                activityId,
+                keys: keys.map((pair) => ({
+                    keyId: pair.keyId.href,
+                    privateKey: pair.privateKey,
+                })),
+            });
+        }
         if (immediate || this.queue == null) {
             if (immediate) {
                 logger.debug("Sending activity immediately without queue since immediate option " +
-                    "is set.", { activityId: activity.id?.href, activity });
+                    "is set.", { activityId: activity.id.href, activity: jsonLd });
             }
             else {
-                logger.debug("Sending activity immediately without queue since queue is not set.", { activityId: activity.id?.href, activity });
+                logger.debug("Sending activity immediately without queue since queue is not set.", { activityId: activity.id.href, activity: jsonLd });
             }
             const promises = [];
             for (const inbox in inboxes) {
                 promises.push(sendActivity({
                     keys,
-                    activity,
+                    activity: jsonLd,
+                    activityId: activity.id?.href,
                     inbox: new URL(inbox),
-                    contextLoader: this.contextLoader,
                     headers: collectionSync == null ? undefined : new Headers({
                         "Collection-Synchronization": await buildCollectionSynchronizationHeader(collectionSync, inboxes[inbox]),
                     }),
@@ -822,20 +878,20 @@ class FederationImpl {
             await Promise.all(promises);
             return;
         }
-        logger.debug("Enqueuing activity {activityId} to send later.", { activityId: activity.id?.href, activity });
+        logger.debug("Enqueuing activity {activityId} to send later.", { activityId: activity.id.href, activity: jsonLd });
         const keyJwkPairs = [];
         for (const { keyId, privateKey } of keys) {
             const privateKeyJwk = await exportJwk(privateKey);
             keyJwkPairs.push({ keyId: keyId.href, privateKey: privateKeyJwk });
         }
-        const activityJson = await activity.toJsonLd({
-            contextLoader: this.contextLoader,
-        });
+        if (!this.manuallyStartQueue)
+            this.#startQueue(contextData);
         for (const inbox in inboxes) {
             const message = {
                 type: "outbox",
                 keys: keyJwkPairs,
-                activity: activityJson,
+                activity: jsonLd,
+                activityId: activity.id?.href,
                 inbox,
                 started: new Date().toISOString(),
                 attempt: 0,
@@ -968,6 +1024,7 @@ class FederationImpl {
                 return await handleInbox(request, {
                     handle: route.values.handle ?? null,
                     context,
+                    inboxContextFactory: context.toInboxContext.bind(context),
                     kv: this.kv,
                     kvPrefixes: this.kvPrefixes,
                     queue: this.queue,
@@ -1064,6 +1121,15 @@ class ContextImpl {
         this.invokedFromActorKeyPairsDispatcher =
             invokedFromActorKeyPairsDispatcher;
     }
+    toInboxContext(activity) {
+        return new InboxContextImpl(activity, {
+            url: this.url,
+            federation: this.federation,
+            data: this.data,
+            documentLoader: this.documentLoader,
+            invokedFromActorKeyPairsDispatcher: this.invokedFromActorKeyPairsDispatcher,
+        });
+    }
     get hostname() {
         return this.url.hostname;
     }
@@ -1336,7 +1402,7 @@ class ContextImpl {
                 throw new Error("If recipients is 'followers', sender must be an actor handle.");
             }
             expandedRecipients = [];
-            for await (const recipient of this.#getFollowers(sender.handle)) {
+            for await (const recipient of this.getFollowers(sender.handle)) {
                 expandedRecipients.push(recipient);
             }
             const collectionId = this.federation.router.build("followers", sender);
@@ -1349,7 +1415,7 @@ class ContextImpl {
         }
         return await this.federation.sendActivity(keys, expandedRecipients, activity, opts);
     }
-    async *#getFollowers(handle) {
+    async *getFollowers(handle) {
         if (this.federation.followersCallbacks == null) {
             throw new Error("No followers collection dispatcher registered.");
         }
@@ -1450,6 +1516,120 @@ class RequestContextImpl extends ContextImpl {
         return this.#signedKeyOwner = await getKeyOwner(key, this);
     }
 }
+export class InboxContextImpl extends ContextImpl {
+    activity;
+    constructor(activity, options) {
+        super(options);
+        this.activity = activity;
+    }
+    async forwardActivity(forwarder, recipients, options) {
+        const logger = getLogger(["fedify", "federation", "inbox"]);
+        let keys;
+        if ("handle" in forwarder) {
+            keys = await this.getKeyPairsFromHandle(forwarder.handle);
+            if (keys.length < 1) {
+                throw new Error(`No key pair found for actor ${JSON.stringify(forwarder.handle)}.`);
+            }
+        }
+        else if (Array.isArray(forwarder)) {
+            if (forwarder.length < 1) {
+                throw new Error("The forwarder's key pairs are empty.");
+            }
+            keys = forwarder;
+        }
+        else {
+            keys = [forwarder];
+        }
+        let activityId = undefined;
+        if (!hasSignature(this.activity)) {
+            let hasProof;
+            try {
+                const activity = await Activity.fromJsonLd(this.activity, this);
+                activityId = activity.id?.href;
+                hasProof = await activity.getProof() != null;
+            }
+            catch {
+                hasProof = false;
+            }
+            if (!hasProof) {
+                if (options?.skipIfUnsigned)
+                    return;
+                logger.warn("The received activity {activityId} is not signed; even if it is " +
+                    "forwarded to other servers as is, it may not be accepted by " +
+                    "them due to the lack of a signature/proof.");
+            }
+        }
+        if (activityId == null && typeof this.activity === "object" &&
+            this.activity != null) {
+            activityId =
+                "@id" in this.activity && typeof this.activity["@id"] === "string"
+                    ? this.activity["@id"]
+                    : "id" in this.activity && typeof this.activity.id === "string"
+                        ? this.activity.id
+                        : undefined;
+        }
+        if (recipients === "followers") {
+            if (!("handle" in forwarder)) {
+                throw new Error("If recipients is 'followers', forwarder must be an actor handle.");
+            }
+            const followers = [];
+            for await (const recipient of this.getFollowers(forwarder.handle)) {
+                followers.push(recipient);
+            }
+            recipients = followers;
+        }
+        const inboxes = extractInboxes({
+            recipients: Array.isArray(recipients) ? recipients : [recipients],
+            preferSharedInbox: options?.preferSharedInbox,
+            excludeBaseUris: options?.excludeBaseUris,
+        });
+        logger.debug("Forwarding activity {activityId} to inboxes:\n{inboxes}", {
+            inboxes: globalThis.Object.keys(inboxes),
+            activityId,
+            activity: this.activity,
+        });
+        if (options?.immediate || this.federation.queue == null) {
+            if (options?.immediate) {
+                logger.debug("Forwarding activity immediately without queue since immediate " +
+                    "option is set.");
+            }
+            else {
+                logger.debug("Forwarding activity immediately without queue since queue is not " +
+                    "set.");
+            }
+            const promises = [];
+            for (const inbox in inboxes) {
+                promises.push(sendActivity({
+                    keys,
+                    activity: this.activity,
+                    activityId: activityId,
+                    inbox: new URL(inbox),
+                }));
+            }
+            await Promise.all(promises);
+            return;
+        }
+        logger.debug("Enqueuing activity {activityId} to forward later.", { activityId, activity: this.activity });
+        const keyJwkPairs = [];
+        for (const { keyId, privateKey } of keys) {
+            const privateKeyJwk = await exportJwk(privateKey);
+            keyJwkPairs.push({ keyId: keyId.href, privateKey: privateKeyJwk });
+        }
+        for (const inbox in inboxes) {
+            const message = {
+                type: "outbox",
+                keys: keyJwkPairs,
+                activity: this.activity,
+                activityId,
+                inbox,
+                started: new Date().toISOString(),
+                attempt: 0,
+                headers: {},
+            };
+            this.federation.queue.enqueue(message);
+        }
+    }
+}
 function notFound(_request) {
     return new Response("Not Found", { status: 404 });
 }

package/esm/federation/mod.js

@@ -6,9 +6,10 @@
 export * from "./callback.js";
 export * from "./collection.js";
 export * from "./context.js";
+export * from "./federation.js";
 export { respondWithObject, respondWithObjectIfAcceptable, } from "./handler.js";
 export * from "./kv.js";
-export * from "./middleware.js";
+export { createFederation, } from "./middleware.js";
 export * from "./mq.js";
 export * from "./retry.js";
 export * from "./router.js";

package/esm/federation/send.js

@@ -1,8 +1,5 @@
 import { getLogger } from "@logtape/logtape";
 import { signRequest } from "../sig/http.js";
-import { validateCryptoKey } from "../sig/key.js";
-import { signJsonLd } from "../sig/ld.js";
-import { signObject } from "../sig/proof.js";
 /**
  * Extracts the inbox URLs from recipients.
  * @param parameters The parameters to extract the inboxes.
@@ -33,73 +30,22 @@ export function extractInboxes({ recipients, preferSharedInbox, excludeBaseUris
  *                   See also {@link SendActivityParameters}.
  * @throws {Error} If the activity fails to send.
  */
-export async function sendActivity({ activity, keys, inbox, contextLoader, documentLoader, headers, }) {
+export async function sendActivity({ activity, activityId, keys, inbox, headers, }) {
     const logger = getLogger(["fedify", "federation", "outbox"]);
-    if (activity.id == null) {
-        throw new TypeError("The activity to send must have an id.");
-    }
-    if (activity.actorId == null) {
-        throw new TypeError("The activity to send must have at least one actor property.");
-    }
-    else if (keys.length < 1) {
-        throw new TypeError("The keys must not be empty.");
-    }
-    const activityId = activity.id.href;
-    let proofCreated = false;
-    let rsaKey = null;
-    for (const { keyId, privateKey } of keys) {
-        validateCryptoKey(privateKey, "private");
-        if (rsaKey == null && privateKey.algorithm.name === "RSASSA-PKCS1-v1_5") {
-            rsaKey = { keyId, privateKey };
-            continue;
-        }
-        if (privateKey.algorithm.name === "Ed25519") {
-            activity = await signObject(activity, privateKey, keyId, {
-                documentLoader,
-                contextLoader,
-            });
-            proofCreated = true;
-        }
-    }
-    let jsonLd = await activity.toJsonLd({
-        format: "compact",
-        contextLoader,
-    });
-    if (rsaKey == null) {
-        logger.warn("No supported key found to create a Linked Data signature for " +
-            "the activity {activityId}.  The activity will be sent without " +
-            "a Linked Data signature.  In order to create a Linked Data " +
-            "signature, at least one RSASSA-PKCS1-v1_5 key must be provided.", {
-            activityId,
-            keys: keys.map((pair) => ({
-                keyId: pair.keyId.href,
-                privateKey: pair.privateKey,
-            })),
-        });
-    }
-    else {
-        jsonLd = await signJsonLd(jsonLd, rsaKey.privateKey, rsaKey.keyId, {
-            contextLoader,
-        });
-    }
-    if (!proofCreated) {
-        logger.warn("No supported key found to create a proof for the activity {activityId}.  " +
-            "The activity will be sent without a proof.  " +
-            "In order to create a proof, at least one Ed25519 key must be provided.", {
-            activityId,
-            keys: keys.map((pair) => ({
-                keyId: pair.keyId.href,
-                privateKey: pair.privateKey,
-            })),
-        });
-    }
     headers = new Headers(headers);
     headers.set("Content-Type", "application/activity+json");
     let request = new Request(inbox, {
         method: "POST",
         headers,
-        body: JSON.stringify(jsonLd),
+        body: JSON.stringify(activity),
     });
+    let rsaKey = null;
+    for (const key of keys) {
+        if (key.privateKey.algorithm.name === "RSASSA-PKCS1-v1_5") {
+            rsaKey = key;
+            break;
+        }
+    }
     if (rsaKey == null) {
         logger.warn("No supported key found to sign the request to {inbox}.  " +
             "The request will be sent without a signature.  " +

package/esm/sig/ld.js

@@ -73,7 +73,13 @@ export async function signJsonLd(jsonLd, privateKey, keyId, options) {
     const signature = await createSignature(jsonLd, privateKey, keyId, options);
     return attachSignature(jsonLd, signature);
 }
-function hasSignature(jsonLd) {
+/**
+ * Checks if the given JSON-LD document has a Linked Data Signature.
+ * @param jsonLd The JSON-LD document to check.
+ * @returns `true` if the document has a signature; `false` otherwise.
+ * @since 1.0.0
+ */
+export function hasSignature(jsonLd) {
     if (typeof jsonLd !== "object" || jsonLd == null)
         return false;
     if ("signature" in jsonLd) {

package/esm/sig/mod.js

@@ -5,6 +5,6 @@
  */
 export { signRequest, verifyRequest, } from "./http.js";
 export { exportJwk, generateCryptoKeyPair, importJwk, } from "./key.js";
-export * from "./ld.js";
+export { attachSignature, createSignature, detachSignature, signJsonLd, verifyJsonLd, verifySignature, } from "./ld.js";
 export { doesActorOwnKey, getKeyOwner, } from "./owner.js";
 export * from "./proof.js";

package/esm/webfinger/handler.js

@@ -82,6 +82,17 @@ export async function handleWebFinger(request, { context, actorDispatcher, actor
             });
         }
     }
+    for await (const image of actor.getIcons()) {
+        if (image.url?.href == null)
+            continue;
+        const link = {
+            rel: "http://webfinger.net/rel/avatar",
+            href: image.url.href.toString(),
+        };
+        if (image.mediaType != null)
+            link.type = image.mediaType;
+        links.push(link);
+    }
     const jrd = {
         subject: resourceUrl.href,
         aliases: resourceUrl.href === context.getActorUri(handle).href

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/fedify",
-  "version": "1.0.0-dev.396+e3232eb6",
+  "version": "1.0.0-dev.398+5c6e1394",
   "description": "An ActivityPub server framework",
   "keywords": [
     "ActivityPub",

package/types/federation/callback.d.ts

@@ -4,7 +4,7 @@ import type { Actor } from "../vocab/actor.js";
 import type { Activity, CryptographicKey } from "../vocab/mod.js";
 import type { Object } from "../vocab/vocab.js";
 import type { PageItems } from "./collection.js";
-import type { Context, RequestContext } from "./context.js";
+import type { Context, InboxContext, RequestContext } from "./context.js";
 import type { SenderKeyPair } from "./send.js";
 /**
  * A callback that dispatches a {@link NodeInfo} object.
@@ -86,12 +86,15 @@ export type CollectionCursor<TContext extends Context<TContextData>, TContextDat
  *
  * @typeParam TContextData The context data to pass to the {@link Context}.
  * @typeParam TActivity The type of activity to listen for.
+ * @param context The inbox context.
+ * @param activity The activity that was received.
  */
-export type InboxListener<TContextData, TActivity extends Activity> = (context: Context<TContextData>, activity: TActivity) => void | Promise<void>;
+export type InboxListener<TContextData, TActivity extends Activity> = (context: InboxContext<TContextData>, activity: TActivity) => void | Promise<void>;
 /**
  * A callback that handles errors in an inbox.
  *
  * @typeParam TContextData The context data to pass to the {@link Context}.
+ * @param context The inbox context.
  */
 export type InboxErrorHandler<TContextData> = (context: Context<TContextData>, error: Error) => void | Promise<void>;
 /**

package/types/federation/callback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"callback.d.ts","sourceRoot":"","sources":["../../src/federation/callback.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"callback.d.ts","sourceRoot":"","sources":["../../src/federation/callback.ts"],"names":[],"mappings":"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"}