@fedify/fedify 2.2.0-dev.671 → 2.2.0-dev.677

package/dist/{builder-DbwMErXg.mjs → builder-DVJNyKAX.mjs}

@@ -2,8 +2,8 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { n as RouterError, t as Router } from "./router-CrMLXoOr.mjs";
-import { n as version, t as name } from "./deno-hMabhCww.mjs";
-import { t as InboxListenerSet } from "./inbox-wbJQKd-b.mjs";
+import { n as version, t as name } from "./deno-DhywNCFr.mjs";
+import { t as InboxListenerSet } from "./inbox-BaETdNND.mjs";
 import { getTypeId } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { getLogger } from "@logtape/logtape";
@@ -43,7 +43,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl } = await import("./middleware-CCeWFq7G.mjs");
+		const { FederationImpl } = await import("./middleware-vdOFJOOX.mjs");
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();

package/dist/compat/mod.d.cts

@@ -1,4 +1,4 @@
-import { Ct as ActivityTransformer, n as Context } from "../context-BhZVy7RB.cjs";
+import { Ct as ActivityTransformer, n as Context } from "../context-LmrZPwti.cjs";
 import { Activity } from "@fedify/vocab";
 
 //#region src/compat/transformers.d.ts

package/dist/compat/mod.d.ts

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { Ct as ActivityTransformer, n as Context } from "../context-BOiMZBu5.js";
+import { Ct as ActivityTransformer, n as Context } from "../context-C0fssarc.js";
 import { Activity } from "@fedify/vocab";
 
 //#region src/compat/transformers.d.ts

package/dist/compat/transformers.test.mjs

@@ -5,7 +5,7 @@ import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assert } from "../assert-ddO5KLpe.mjs";
 import { t as MemoryKvStore } from "../kv-tL2TOE9X.mjs";
-import { _ as autoIdAssigner, g as actorDehydrator, n as FederationImpl } from "../middleware-DcwyRzc9.mjs";
+import { _ as autoIdAssigner, g as actorDehydrator, n as FederationImpl } from "../middleware-ItHrRua7.mjs";
 import { test } from "@fedify/fixture";
 import { Follow, Person } from "@fedify/vocab";
 //#region src/compat/transformers.test.ts

package/dist/{context-BOiMZBu5.d.ts → context-C0fssarc.d.ts}

@@ -2573,7 +2573,10 @@ interface GetSignedKeyOptions {
 */
 interface ActorKeyPair extends CryptoKeyPair {
   /**
-  * The URI of the public key, which is used for verifying HTTP Signatures.
+  * The URI of the public key for {@link CryptographicKey}, which is used for
+  * verifying HTTP Signatures and Linked Data Signatures.  Note that this is
+  * the ID of the {@link cryptographicKey}, not of the {@link multikey};
+  * the {@link Multikey} instance has a distinct ID of its own.
   */
   readonly keyId: URL;
   /**

package/dist/{context-BhZVy7RB.d.cts → context-LmrZPwti.d.cts}

@@ -2571,7 +2571,10 @@ interface GetSignedKeyOptions {
 */
 interface ActorKeyPair extends CryptoKeyPair {
   /**
-  * The URI of the public key, which is used for verifying HTTP Signatures.
+  * The URI of the public key for {@link CryptographicKey}, which is used for
+  * verifying HTTP Signatures and Linked Data Signatures.  Note that this is
+  * the ID of the {@link cryptographicKey}, not of the {@link multikey};
+  * the {@link Multikey} instance has a distinct ID of its own.
   */
   readonly keyId: URL;
   /**

package/dist/{deno-hMabhCww.mjs → deno-DhywNCFr.mjs}

@@ -3,6 +3,6 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.2.0-dev.671+61141c60";
+var version = "2.2.0-dev.677+41046619";
 //#endregion
 export { version as n, name as t };

package/dist/{docloader-DfimMtL4.mjs → docloader-C08QBNrF.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { o as validateCryptoKey } from "./key-Buz4jrLL.mjs";
-import { n as doubleKnock } from "./http-0f792a_Z.mjs";
+import { o as validateCryptoKey } from "./key-D0Yn0mtH.mjs";
+import { n as doubleKnock } from "./http-CPJdCaSL.mjs";
 import { curry } from "es-toolkit";
 import { UrlError, createActivityPubRequest, getRemoteDocument, logRequest, validatePublicUrl } from "@fedify/vocab-runtime";
 import { getLogger } from "@logtape/logtape";

package/dist/federation/builder.test.mjs

@@ -5,7 +5,7 @@ import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { a as assertExists } from "../std__assert-Duiq_YC9.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
 import { t as MemoryKvStore } from "../kv-tL2TOE9X.mjs";
-import { n as createFederationBuilder } from "../builder-DbwMErXg.mjs";
+import { n as createFederationBuilder } from "../builder-DVJNyKAX.mjs";
 import { test } from "@fedify/fixture";
 import { Activity, Note, Person } from "@fedify/vocab";
 //#region src/federation/builder.test.ts

package/dist/federation/handler.test.mjs

@@ -6,11 +6,11 @@ import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-Duiq_YC9.mjs";
 import { t as assert } from "../assert-ddO5KLpe.mjs";
 import { r as parseAcceptSignature } from "../accept-Dd__NiUL.mjs";
-import { s as signRequest } from "../http-0f792a_Z.mjs";
+import { s as signRequest } from "../http-CPJdCaSL.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, s as rsaPublicKey2 } from "../keys-BAK-tUlf.mjs";
 import { t as MemoryKvStore } from "../kv-tL2TOE9X.mjs";
-import { a as createFederation, c as handleCollection, d as handleObject, f as respondWithObject, l as handleCustomCollection, p as respondWithObjectIfAcceptable, s as handleActor, u as handleInbox } from "../middleware-DcwyRzc9.mjs";
-import { t as InboxListenerSet } from "../inbox-wbJQKd-b.mjs";
+import { a as createFederation, c as handleCollection, d as handleObject, f as respondWithObject, l as handleCustomCollection, p as respondWithObjectIfAcceptable, s as handleActor, u as handleInbox } from "../middleware-ItHrRua7.mjs";
+import { t as InboxListenerSet } from "../inbox-BaETdNND.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, Note, Person } from "@fedify/vocab";
 import { FetchError } from "@fedify/vocab-runtime";

package/dist/federation/idempotency.test.mjs

@@ -4,9 +4,9 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-Duiq_YC9.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
-import { n as signObject } from "../proof-CZf0bupI.mjs";
+import { n as signObject } from "../proof-BrTLb1tP.mjs";
 import { t as MemoryKvStore } from "../kv-tL2TOE9X.mjs";
-import { a as createFederation } from "../middleware-DcwyRzc9.mjs";
+import { a as createFederation } from "../middleware-ItHrRua7.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, Follow, Person } from "@fedify/vocab";
 //#region src/federation/idempotency.test.ts

package/dist/federation/inbox.test.mjs

@@ -3,7 +3,7 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
-import { t as InboxListenerSet } from "../inbox-wbJQKd-b.mjs";
+import { t as InboxListenerSet } from "../inbox-BaETdNND.mjs";
 import { test } from "@fedify/fixture";
 import { Activity, Create, Invite, Offer, Update } from "@fedify/vocab";
 //#region src/federation/inbox.test.ts

package/dist/federation/middleware.test.mjs

@@ -10,14 +10,14 @@ import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
 import { t as assertNotEquals } from "../assert_not_equals--wG9hV7u.mjs";
 import { t as assert } from "../assert-ddO5KLpe.mjs";
-import { l as verifyRequest, s as signRequest } from "../http-0f792a_Z.mjs";
+import { l as verifyRequest, s as signRequest } from "../http-CPJdCaSL.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-DfimMtL4.mjs";
-import { a as signJsonLd, o as verifyJsonLd, r as detachSignature } from "../ld-Drc5O1ub.mjs";
-import { t as doesActorOwnKey } from "../owner-CLKB6EdW.mjs";
-import { n as signObject, r as verifyObject } from "../proof-CZf0bupI.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-C08QBNrF.mjs";
+import { a as signJsonLd, o as verifyJsonLd, r as detachSignature } from "../ld-DbgG8OrC.mjs";
+import { t as doesActorOwnKey } from "../owner-rvdHpSM9.mjs";
+import { n as signObject, r as verifyObject } from "../proof-BrTLb1tP.mjs";
 import { t as MemoryKvStore } from "../kv-tL2TOE9X.mjs";
-import { a as createFederation, i as KvSpecDeterminer, n as FederationImpl, r as InboxContextImpl, t as ContextImpl } from "../middleware-DcwyRzc9.mjs";
+import { a as createFederation, i as KvSpecDeterminer, n as FederationImpl, r as InboxContextImpl, t as ContextImpl } from "../middleware-ItHrRua7.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import * as vocab from "@fedify/vocab";
 import { getTypeId, lookupObject } from "@fedify/vocab";
@@ -285,7 +285,7 @@ test({
 					owner: new URL("https://example.com/users/handle")
 				}),
 				multikey: new vocab.Multikey({
-					id: new URL("https://example.com/users/handle#main-key"),
+					id: new URL("https://example.com/users/handle#multikey-1"),
 					controller: new URL("https://example.com/users/handle"),
 					publicKey: rsaPublicKey2.publicKey
 				})
@@ -298,7 +298,7 @@ test({
 					owner: new URL("https://example.com/users/handle")
 				}),
 				multikey: new vocab.Multikey({
-					id: new URL("https://example.com/users/handle#key-2"),
+					id: new URL("https://example.com/users/handle#multikey-2"),
 					controller: new URL("https://example.com/users/handle"),
 					publicKey: ed25519PublicKey.publicKey
 				})
@@ -1729,8 +1729,10 @@ test("ContextImpl.sendActivity()", async (t) => {
 			keyCache: {
 				async get(keyId) {
 					const keys = await federation.createContext(new URL("https://example.com/"), void 0).getActorKeyPairs("1");
-					for (const key of keys) if (key.keyId.href === keyId.href) if (key.publicKey.algorithm.name === "Ed25519") return key.multikey;
-					else return key.cryptographicKey;
+					for (const key of keys) {
+						if (key.keyId.href === keyId.href) return key.cryptographicKey;
+						if (key.multikey.id?.href === keyId.href) return key.multikey;
+					}
 				},
 				async set(_keyId, _key) {}
 			}
@@ -1896,25 +1898,29 @@ test("ContextImpl.sendActivity()", async (t) => {
 			id: new URL("https://example.com/recipient"),
 			inboxId: new URL("https://example.com/inbox")
 		}, activity, { fanout: "force" });
-		assertEquals(queue.messages, [{
-			id: queue.messages[0].id,
-			type: "fanout",
-			activity: await activity.toJsonLd({
-				format: "compact",
-				contextLoader: documentLoader
-			}),
-			activityId: "https://example.com/activity/1",
-			activityType: "https://www.w3.org/ns/activitystreams#Create",
-			baseUrl: "https://example.com",
-			collectionSync: void 0,
-			inboxes: { "https://example.com/inbox": {
-				actorIds: ["https://example.com/recipient"],
-				sharedInbox: false
-			} },
-			keys: queue.messages[0].type === "fanout" ? queue.messages[0].keys : [],
-			orderingKey: void 0,
-			traceContext: {}
-		}]);
+		assertEquals(queue.messages.length, 1);
+		assert(queue.messages[0].type === "fanout");
+		const fanoutMsg = queue.messages[0];
+		assertEquals(fanoutMsg.activityId, "https://example.com/activity/1");
+		assertEquals(fanoutMsg.activityType, "https://www.w3.org/ns/activitystreams#Create");
+		assertEquals(fanoutMsg.baseUrl, "https://example.com");
+		assertEquals(fanoutMsg.collectionSync, void 0);
+		assertEquals(fanoutMsg.orderingKey, void 0);
+		assertEquals(fanoutMsg.inboxes, { "https://example.com/inbox": {
+			actorIds: ["https://example.com/recipient"],
+			sharedInbox: false
+		} });
+		const signedActivity = await vocab.Create.fromJsonLd(fanoutMsg.activity, {
+			contextLoader: documentLoader,
+			documentLoader
+		});
+		assertEquals(signedActivity.id?.href, "https://example.com/activity/1");
+		let proofCount = 0;
+		for await (const proof of signedActivity.getProofs({ contextLoader: documentLoader })) {
+			assertEquals(proof.verificationMethodId?.href, "https://example.com/john#multikey-2");
+			proofCount++;
+		}
+		assertEquals(proofCount, 1);
 	});
 	queue.clear();
 	await t.step("fanout: \"skip\"", async () => {

package/dist/federation/mod.cjs

@@ -2,7 +2,7 @@ const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("../chunk-DDcVe30Y.cjs");
-const require_middleware = require("../middleware-5TGjniPd.cjs");
+const require_middleware = require("../middleware-eyhwv4v9.cjs");
 let es_toolkit = require("es-toolkit");
 //#region src/federation/kv.ts
 /**

package/dist/federation/mod.d.cts

@@ -1,4 +1,4 @@
-import { $ as ActorKeyPairsDispatcher, A as createFederation, B as RouterRouteResult, C as InboxChallengePolicy, D as FederationKvPrefixes, E as Rfc6570Expression, F as Message, G as InProcessMessageQueueOptions, H as respondWithObject, I as createFederationBuilder, J as MessageQueueListenOptions, K as MessageQueue, L as Router, M as RetryContext, N as RetryPolicy, O as FederationOrigin, P as createExponentialBackoffPolicy, Q as ActorHandleMapper, R as RouterError, S as IdempotencyStrategy, St as digest, T as ObjectCallbackSetters, U as respondWithObjectIfAcceptable, V as RespondWithObjectOptions, W as InProcessMessageQueue, X as ActorAliasMapper, Y as ParallelMessageQueue, Z as ActorDispatcher, _ as FederationBuilder, _t as WebFingerLinksDispatcher, a as InboxContext, at as CustomCollectionCursor, b as FederationStartQueueOptions, bt as PageItems, c as RouteActivityOptions, ct as InboxListener, d as ActorCallbackSetters, dt as ObjectDispatcher, et as AuthorizePredicate, f as CollectionCallbackSetters, ft as OutboxErrorHandler, g as Federation, gt as UnverifiedActivityReason, h as Federatable, ht as UnverifiedActivityHandler, i as GetSignedKeyOptions, it as CustomCollectionCounter, j as CreateExponentialBackoffPolicyOptions, k as FederationQueueOptions, l as SendActivityOptions, lt as NodeInfoDispatcher, m as CustomCollectionCallbackSetters, mt as SharedInboxKeyDispatcher, n as Context, nt as CollectionCursor, o as ParseUriResult, ot as CustomCollectionDispatcher, p as ConstructorWithTypeId, pt as OutboxPermanentFailureHandler, q as MessageQueueEnqueueOptions, r as ForwardActivityOptions, rt as CollectionDispatcher, s as RequestContext, st as InboxErrorHandler, t as ActorKeyPair, tt as CollectionCounter, u as SendActivityOptionsForCollection, ut as ObjectAuthorizePredicate, v as FederationFetchOptions, vt as SendActivityError, w as InboxListenerSetters, x as IdempotencyKeyCallback, xt as buildCollectionSynchronizationHeader, y as FederationOptions, yt as SenderKeyPair, z as RouterOptions } from "../context-BhZVy7RB.cjs";
+import { $ as ActorKeyPairsDispatcher, A as createFederation, B as RouterRouteResult, C as InboxChallengePolicy, D as FederationKvPrefixes, E as Rfc6570Expression, F as Message, G as InProcessMessageQueueOptions, H as respondWithObject, I as createFederationBuilder, J as MessageQueueListenOptions, K as MessageQueue, L as Router, M as RetryContext, N as RetryPolicy, O as FederationOrigin, P as createExponentialBackoffPolicy, Q as ActorHandleMapper, R as RouterError, S as IdempotencyStrategy, St as digest, T as ObjectCallbackSetters, U as respondWithObjectIfAcceptable, V as RespondWithObjectOptions, W as InProcessMessageQueue, X as ActorAliasMapper, Y as ParallelMessageQueue, Z as ActorDispatcher, _ as FederationBuilder, _t as WebFingerLinksDispatcher, a as InboxContext, at as CustomCollectionCursor, b as FederationStartQueueOptions, bt as PageItems, c as RouteActivityOptions, ct as InboxListener, d as ActorCallbackSetters, dt as ObjectDispatcher, et as AuthorizePredicate, f as CollectionCallbackSetters, ft as OutboxErrorHandler, g as Federation, gt as UnverifiedActivityReason, h as Federatable, ht as UnverifiedActivityHandler, i as GetSignedKeyOptions, it as CustomCollectionCounter, j as CreateExponentialBackoffPolicyOptions, k as FederationQueueOptions, l as SendActivityOptions, lt as NodeInfoDispatcher, m as CustomCollectionCallbackSetters, mt as SharedInboxKeyDispatcher, n as Context, nt as CollectionCursor, o as ParseUriResult, ot as CustomCollectionDispatcher, p as ConstructorWithTypeId, pt as OutboxPermanentFailureHandler, q as MessageQueueEnqueueOptions, r as ForwardActivityOptions, rt as CollectionDispatcher, s as RequestContext, st as InboxErrorHandler, t as ActorKeyPair, tt as CollectionCounter, u as SendActivityOptionsForCollection, ut as ObjectAuthorizePredicate, v as FederationFetchOptions, vt as SendActivityError, w as InboxListenerSetters, x as IdempotencyKeyCallback, xt as buildCollectionSynchronizationHeader, y as FederationOptions, yt as SenderKeyPair, z as RouterOptions } from "../context-LmrZPwti.cjs";
 import { a as MemoryKvStore, i as KvStoreSetOptions, n as KvStore, r as KvStoreListEntry, t as KvKey } from "../kv-CbLNp3zQ.cjs";
-import { n as handleWebFinger, t as WebFingerHandlerParameters } from "../mod-Bp_CzKd4.cjs";
+import { n as handleWebFinger, t as WebFingerHandlerParameters } from "../mod-Cgpc49fA.cjs";
 export { ActorAliasMapper, ActorCallbackSetters, ActorDispatcher, ActorHandleMapper, ActorKeyPair, ActorKeyPairsDispatcher, AuthorizePredicate, CollectionCallbackSetters, CollectionCounter, CollectionCursor, CollectionDispatcher, ConstructorWithTypeId, Context, CreateExponentialBackoffPolicyOptions, CustomCollectionCallbackSetters, CustomCollectionCounter, CustomCollectionCursor, CustomCollectionDispatcher, Federatable, Federation, FederationBuilder, FederationFetchOptions, FederationKvPrefixes, FederationOptions, FederationOrigin, FederationQueueOptions, FederationStartQueueOptions, ForwardActivityOptions, GetSignedKeyOptions, IdempotencyKeyCallback, IdempotencyStrategy, InProcessMessageQueue, InProcessMessageQueueOptions, InboxChallengePolicy, InboxContext, InboxErrorHandler, InboxListener, InboxListenerSetters, KvKey, KvStore, KvStoreListEntry, KvStoreSetOptions, MemoryKvStore, Message, MessageQueue, MessageQueueEnqueueOptions, MessageQueueListenOptions, NodeInfoDispatcher, ObjectAuthorizePredicate, ObjectCallbackSetters, ObjectDispatcher, OutboxErrorHandler, OutboxPermanentFailureHandler, PageItems, ParallelMessageQueue, ParseUriResult, RequestContext, RespondWithObjectOptions, RetryContext, RetryPolicy, Rfc6570Expression, RouteActivityOptions, Router, RouterError, RouterOptions, RouterRouteResult, SendActivityError, SendActivityOptions, SendActivityOptionsForCollection, SenderKeyPair, SharedInboxKeyDispatcher, UnverifiedActivityHandler, UnverifiedActivityReason, WebFingerHandlerParameters, WebFingerLinksDispatcher, buildCollectionSynchronizationHeader, createExponentialBackoffPolicy, createFederation, createFederationBuilder, digest, handleWebFinger, respondWithObject, respondWithObjectIfAcceptable };

package/dist/federation/mod.d.ts

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { $ as ActorKeyPairsDispatcher, A as createFederation, B as RouterRouteResult, C as InboxChallengePolicy, D as FederationKvPrefixes, E as Rfc6570Expression, F as Message, G as InProcessMessageQueueOptions, H as respondWithObject, I as createFederationBuilder, J as MessageQueueListenOptions, K as MessageQueue, L as Router, M as RetryContext, N as RetryPolicy, O as FederationOrigin, P as createExponentialBackoffPolicy, Q as ActorHandleMapper, R as RouterError, S as IdempotencyStrategy, St as digest, T as ObjectCallbackSetters, U as respondWithObjectIfAcceptable, V as RespondWithObjectOptions, W as InProcessMessageQueue, X as ActorAliasMapper, Y as ParallelMessageQueue, Z as ActorDispatcher, _ as FederationBuilder, _t as WebFingerLinksDispatcher, a as InboxContext, at as CustomCollectionCursor, b as FederationStartQueueOptions, bt as PageItems, c as RouteActivityOptions, ct as InboxListener, d as ActorCallbackSetters, dt as ObjectDispatcher, et as AuthorizePredicate, f as CollectionCallbackSetters, ft as OutboxErrorHandler, g as Federation, gt as UnverifiedActivityReason, h as Federatable, ht as UnverifiedActivityHandler, i as GetSignedKeyOptions, it as CustomCollectionCounter, j as CreateExponentialBackoffPolicyOptions, k as FederationQueueOptions, l as SendActivityOptions, lt as NodeInfoDispatcher, m as CustomCollectionCallbackSetters, mt as SharedInboxKeyDispatcher, n as Context, nt as CollectionCursor, o as ParseUriResult, ot as CustomCollectionDispatcher, p as ConstructorWithTypeId, pt as OutboxPermanentFailureHandler, q as MessageQueueEnqueueOptions, r as ForwardActivityOptions, rt as CollectionDispatcher, s as RequestContext, st as InboxErrorHandler, t as ActorKeyPair, tt as CollectionCounter, u as SendActivityOptionsForCollection, ut as ObjectAuthorizePredicate, v as FederationFetchOptions, vt as SendActivityError, w as InboxListenerSetters, x as IdempotencyKeyCallback, xt as buildCollectionSynchronizationHeader, y as FederationOptions, yt as SenderKeyPair, z as RouterOptions } from "../context-BOiMZBu5.js";
+import { $ as ActorKeyPairsDispatcher, A as createFederation, B as RouterRouteResult, C as InboxChallengePolicy, D as FederationKvPrefixes, E as Rfc6570Expression, F as Message, G as InProcessMessageQueueOptions, H as respondWithObject, I as createFederationBuilder, J as MessageQueueListenOptions, K as MessageQueue, L as Router, M as RetryContext, N as RetryPolicy, O as FederationOrigin, P as createExponentialBackoffPolicy, Q as ActorHandleMapper, R as RouterError, S as IdempotencyStrategy, St as digest, T as ObjectCallbackSetters, U as respondWithObjectIfAcceptable, V as RespondWithObjectOptions, W as InProcessMessageQueue, X as ActorAliasMapper, Y as ParallelMessageQueue, Z as ActorDispatcher, _ as FederationBuilder, _t as WebFingerLinksDispatcher, a as InboxContext, at as CustomCollectionCursor, b as FederationStartQueueOptions, bt as PageItems, c as RouteActivityOptions, ct as InboxListener, d as ActorCallbackSetters, dt as ObjectDispatcher, et as AuthorizePredicate, f as CollectionCallbackSetters, ft as OutboxErrorHandler, g as Federation, gt as UnverifiedActivityReason, h as Federatable, ht as UnverifiedActivityHandler, i as GetSignedKeyOptions, it as CustomCollectionCounter, j as CreateExponentialBackoffPolicyOptions, k as FederationQueueOptions, l as SendActivityOptions, lt as NodeInfoDispatcher, m as CustomCollectionCallbackSetters, mt as SharedInboxKeyDispatcher, n as Context, nt as CollectionCursor, o as ParseUriResult, ot as CustomCollectionDispatcher, p as ConstructorWithTypeId, pt as OutboxPermanentFailureHandler, q as MessageQueueEnqueueOptions, r as ForwardActivityOptions, rt as CollectionDispatcher, s as RequestContext, st as InboxErrorHandler, t as ActorKeyPair, tt as CollectionCounter, u as SendActivityOptionsForCollection, ut as ObjectAuthorizePredicate, v as FederationFetchOptions, vt as SendActivityError, w as InboxListenerSetters, x as IdempotencyKeyCallback, xt as buildCollectionSynchronizationHeader, y as FederationOptions, yt as SenderKeyPair, z as RouterOptions } from "../context-C0fssarc.js";
 import { a as MemoryKvStore, i as KvStoreSetOptions, n as KvStore, r as KvStoreListEntry, t as KvKey } from "../kv-GFYnFoOl.js";
-import { n as handleWebFinger, t as WebFingerHandlerParameters } from "../mod-DKOAow7a.js";
+import { n as handleWebFinger, t as WebFingerHandlerParameters } from "../mod-CnwZoDzx.js";
 export { ActorAliasMapper, ActorCallbackSetters, ActorDispatcher, ActorHandleMapper, ActorKeyPair, ActorKeyPairsDispatcher, AuthorizePredicate, CollectionCallbackSetters, CollectionCounter, CollectionCursor, CollectionDispatcher, ConstructorWithTypeId, Context, CreateExponentialBackoffPolicyOptions, CustomCollectionCallbackSetters, CustomCollectionCounter, CustomCollectionCursor, CustomCollectionDispatcher, Federatable, Federation, FederationBuilder, FederationFetchOptions, FederationKvPrefixes, FederationOptions, FederationOrigin, FederationQueueOptions, FederationStartQueueOptions, ForwardActivityOptions, GetSignedKeyOptions, IdempotencyKeyCallback, IdempotencyStrategy, InProcessMessageQueue, InProcessMessageQueueOptions, InboxChallengePolicy, InboxContext, InboxErrorHandler, InboxListener, InboxListenerSetters, KvKey, KvStore, KvStoreListEntry, KvStoreSetOptions, MemoryKvStore, Message, MessageQueue, MessageQueueEnqueueOptions, MessageQueueListenOptions, NodeInfoDispatcher, ObjectAuthorizePredicate, ObjectCallbackSetters, ObjectDispatcher, OutboxErrorHandler, OutboxPermanentFailureHandler, PageItems, ParallelMessageQueue, ParseUriResult, RequestContext, RespondWithObjectOptions, RetryContext, RetryPolicy, Rfc6570Expression, RouteActivityOptions, Router, RouterError, RouterOptions, RouterRouteResult, SendActivityError, SendActivityOptions, SendActivityOptionsForCollection, SenderKeyPair, SharedInboxKeyDispatcher, UnverifiedActivityHandler, UnverifiedActivityReason, WebFingerHandlerParameters, WebFingerLinksDispatcher, buildCollectionSynchronizationHeader, createExponentialBackoffPolicy, createFederation, createFederationBuilder, digest, handleWebFinger, respondWithObject, respondWithObjectIfAcceptable };

package/dist/federation/mod.js

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
-import { a as createExponentialBackoffPolicy, c as buildCollectionSynchronizationHeader, d as Router, f as RouterError, i as SendActivityError, l as digest, o as respondWithObject, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as createFederationBuilder } from "../middleware-CqaVY7Db.js";
+import { a as createExponentialBackoffPolicy, c as buildCollectionSynchronizationHeader, d as Router, f as RouterError, i as SendActivityError, l as digest, o as respondWithObject, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as createFederationBuilder } from "../middleware-D5u0ehbB.js";
 import { isEqual } from "es-toolkit";
 //#region src/federation/kv.ts
 /**

package/dist/federation/send.test.mjs

@@ -8,10 +8,10 @@ import { n as assertFalse, t as assertRejects } from "../assert_rejects-B-qJtC9Z
 import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assertNotEquals } from "../assert_not_equals--wG9hV7u.mjs";
 import { t as assert } from "../assert-ddO5KLpe.mjs";
-import { l as verifyRequest } from "../http-0f792a_Z.mjs";
+import { l as verifyRequest } from "../http-CPJdCaSL.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
-import { t as doesActorOwnKey } from "../owner-CLKB6EdW.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-Bsp6qk0O.mjs";
+import { t as doesActorOwnKey } from "../owner-rvdHpSM9.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-CqkObdC8.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { Activity, Application, Endpoints, Group, Person, Service } from "@fedify/vocab";
 //#region src/federation/send.test.ts

package/dist/federation/webfinger.test.mjs

@@ -5,7 +5,7 @@ import { n as createRequestContext } from "../context-Juj6bdHC.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-Duiq_YC9.mjs";
 import { t as MemoryKvStore } from "../kv-tL2TOE9X.mjs";
-import { a as createFederation, o as handleWebFinger } from "../middleware-DcwyRzc9.mjs";
+import { a as createFederation, o as handleWebFinger } from "../middleware-ItHrRua7.mjs";
 import { test } from "@fedify/fixture";
 import { Image, Link, Person } from "@fedify/vocab";
 //#region src/federation/webfinger.test.ts

package/dist/{http-0f792a_Z.mjs → http-CPJdCaSL.mjs}

@@ -1,9 +1,9 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-hMabhCww.mjs";
+import { n as version, t as name } from "./deno-DhywNCFr.mjs";
 import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature } from "./accept-Dd__NiUL.mjs";
-import { o as validateCryptoKey, r as fetchKeyDetailed } from "./key-Buz4jrLL.mjs";
+import { o as validateCryptoKey, r as fetchKeyDetailed } from "./key-D0Yn0mtH.mjs";
 import { CryptographicKey } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { FetchError } from "@fedify/vocab-runtime";

package/dist/{http-oG4y8q4n.js → http-D3tag6Yq.js}

@@ -10,7 +10,7 @@ import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } fro
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.2.0-dev.671+61141c60";
+var version = "2.2.0-dev.677+41046619";
 //#endregion
 //#region src/sig/accept.ts
 /**

package/dist/{http-BewLiYTT.cjs → http-YvNVio1S.cjs}

@@ -11,7 +11,7 @@ let _opentelemetry_semantic_conventions = require("@opentelemetry/semantic-conve
 let byte_encodings_base64 = require("byte-encodings/base64");
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.2.0-dev.671+61141c60";
+var version = "2.2.0-dev.677+41046619";
 //#endregion
 //#region src/sig/accept.ts
 /**

package/dist/{inbox-wbJQKd-b.mjs → inbox-BaETdNND.mjs}

@@ -1,7 +1,7 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-hMabhCww.mjs";
+import { n as version, t as name } from "./deno-DhywNCFr.mjs";
 import { Activity, getTypeId } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
 import { getLogger } from "@logtape/logtape";

package/dist/{key-Buz4jrLL.mjs → key-D0Yn0mtH.mjs}

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-hMabhCww.mjs";
+import { n as version, t as name } from "./deno-DhywNCFr.mjs";
 import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { FetchError, getDocumentLoader } from "@fedify/vocab-runtime";

package/dist/{kv-cache-BnfUjj42.js → kv-cache-CmiF_bSD.js}

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { d as validateCryptoKey, t as doubleKnock } from "./http-oG4y8q4n.js";
+import { d as validateCryptoKey, t as doubleKnock } from "./http-D3tag6Yq.js";
 import { getLogger } from "@logtape/logtape";
 import { curry } from "es-toolkit";
 import { UrlError, createActivityPubRequest, getRemoteDocument, logRequest, preloadedContexts, validatePublicUrl } from "@fedify/vocab-runtime";

package/dist/{kv-cache-E_ri3gGZ.cjs → kv-cache-Pk6XERKs.cjs}

@@ -1,7 +1,7 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 require("./chunk-DDcVe30Y.cjs");
-const require_http = require("./http-BewLiYTT.cjs");
+const require_http = require("./http-YvNVio1S.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let es_toolkit = require("es-toolkit");
 let _fedify_vocab_runtime = require("@fedify/vocab-runtime");

package/dist/{ld-Drc5O1ub.mjs → ld-DbgG8OrC.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-hMabhCww.mjs";
-import { n as fetchKey, o as validateCryptoKey } from "./key-Buz4jrLL.mjs";
+import { n as version, t as name } from "./deno-DhywNCFr.mjs";
+import { n as fetchKey, o as validateCryptoKey } from "./key-D0Yn0mtH.mjs";
 import { Activity, CryptographicKey, Object as Object$1, getTypeId } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { getDocumentLoader } from "@fedify/vocab-runtime";

package/dist/{middleware-BhdA_6gU.cjs → middleware-CRwpNEwP.cjs}

@@ -1,4 +1,4 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
-const require_middleware = require("./middleware-5TGjniPd.cjs");
+const require_middleware = require("./middleware-eyhwv4v9.cjs");
 exports.FederationImpl = require_middleware.FederationImpl;

package/dist/{middleware-CqaVY7Db.js → middleware-D5u0ehbB.js}

@@ -2,10 +2,10 @@ import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 import { t as __exportAll } from "./chunk-nlSIicah.js";
 import { r as getDefaultActivityTransformers } from "./transformers-ve6e2xcg.js";
-import { _ as version, a as verifyRequestDetailed, d as validateCryptoKey, f as formatAcceptSignature, g as name, i as verifyRequest, n as parseRfc9421SignatureInput, o as exportJwk, t as doubleKnock, u as importJwk } from "./http-oG4y8q4n.js";
-import { a as doesActorOwnKey, d as signJsonLd, f as verifyJsonLd, l as detachSignature, n as signObject, o as getKeyOwner, r as verifyObject, u as hasSignature } from "./proof-Cr-0THxd.js";
+import { _ as version, a as verifyRequestDetailed, d as validateCryptoKey, f as formatAcceptSignature, g as name, i as verifyRequest, n as parseRfc9421SignatureInput, o as exportJwk, t as doubleKnock, u as importJwk } from "./http-D3tag6Yq.js";
+import { a as doesActorOwnKey, d as signJsonLd, f as verifyJsonLd, l as detachSignature, n as signObject, o as getKeyOwner, r as verifyObject, u as hasSignature } from "./proof-zRahbXVh.js";
 import { n as getNodeInfo, t as nodeInfoToJson } from "./types-hvL8ElAs.js";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-BnfUjj42.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-CmiF_bSD.js";
 import { getLogger, withContext } from "@logtape/logtape";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
@@ -3003,14 +3003,17 @@ var FederationImpl = class extends FederationBuilderImpl {
 		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") {
+			if (rsaKey == null && privateKey.algorithm.name === "RSASSA-PKCS1-v1_5") rsaKey = {
+				keyId,
+				privateKey
+			};
+		}
+		for await (const _ of activity.getProofs({ contextLoader })) {
+			proofCreated = true;
+			break;
+		}
+		if (!proofCreated) {
+			for (const { keyId, privateKey } of keys) if (privateKey.algorithm.name === "Ed25519") {
 				activity = await signObject(activity, privateKey, keyId, {
 					contextLoader,
 					tracerProvider: this.tracerProvider
@@ -3602,6 +3605,7 @@ var ContextImpl = class ContextImpl {
 		}
 		const owner = this.getActorUri(identifier);
 		const result = [];
+		let i = 1;
 		for (const keyPair of keyPairs) {
 			const newPair = {
 				...keyPair,
@@ -3611,12 +3615,13 @@ var ContextImpl = class ContextImpl {
 					publicKey: keyPair.publicKey
 				}),
 				multikey: new Multikey({
-					id: keyPair.keyId,
+					id: new URL(`#multikey-${i}`, owner),
 					controller: owner,
 					publicKey: keyPair.publicKey
 				})
 			};
 			result.push(newPair);
+			i++;
 		}
 		return result;
 	}
@@ -3754,6 +3759,7 @@ var ContextImpl = class ContextImpl {
 		]);
 		let keys;
 		let identifier = null;
+		let actorKeyPairs = null;
 		if ("identifier" in sender || "username" in sender) {
 			if ("identifier" in sender) identifier = sender.identifier;
 			else {
@@ -3766,8 +3772,13 @@ var ContextImpl = class ContextImpl {
 				}
 			}
 			span.setAttribute("fedify.actor.identifier", identifier);
-			keys = await this.getKeyPairsFromIdentifier(identifier);
-			if (keys.length < 1) throw new Error(`No key pair found for actor ${JSON.stringify(identifier)}.`);
+			if (this.federation.actorCallbacks?.keyPairsDispatcher == null) throw new Error("No actor key pairs dispatcher registered.");
+			actorKeyPairs = await this.getActorKeyPairs(identifier);
+			if (actorKeyPairs.length < 1) throw new Error(`No key pair found for actor ${JSON.stringify(identifier)}.`);
+			keys = actorKeyPairs.map((kp) => ({
+				keyId: kp.keyId,
+				privateKey: kp.privateKey
+			}));
 		} else if (Array.isArray(sender)) {
 			if (sender.length < 1) throw new Error("The sender's key pairs are empty.");
 			keys = sender;
@@ -3803,6 +3814,16 @@ var ContextImpl = class ContextImpl {
 			});
 			throw new TypeError("The activity to send must have at least one actor property.");
 		}
+		if (actorKeyPairs != null) {
+			const contextLoader = this.contextLoader;
+			for (const kp of actorKeyPairs) {
+				if (kp.privateKey.algorithm.name !== "Ed25519" || kp.multikey.id == null) continue;
+				activity = await signObject(activity, kp.privateKey, kp.multikey.id, {
+					contextLoader,
+					tracerProvider: this.tracerProvider
+				});
+			}
+		}
 		const inboxes = extractInboxes({
 			recipients: expandedRecipients,
 			preferSharedInbox: options.preferSharedInbox,
@@ -4136,8 +4157,12 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 					identifier = mapped;
 				}
 			}
-			keys = await this.getKeyPairsFromIdentifier(identifier);
-			if (keys.length < 1) throw new Error(`No key pair found for actor ${JSON.stringify(identifier)}.`);
+			const actorKeyPairs = await this.getActorKeyPairs(identifier);
+			if (actorKeyPairs.length < 1) throw new Error(`No key pair found for actor ${JSON.stringify(identifier)}.`);
+			keys = actorKeyPairs.map((kp) => ({
+				keyId: kp.keyId,
+				privateKey: kp.privateKey
+			}));
 		} else if (Array.isArray(forwarder)) {
 			if (forwarder.length < 1) throw new Error("The forwarder's key pairs are empty.");
 			keys = forwarder;

package/dist/{middleware-DcwyRzc9.mjs → middleware-ItHrRua7.mjs}

@@ -2,24 +2,24 @@ import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { n as RouterError } from "./router-CrMLXoOr.mjs";
-import { n as version, t as name } from "./deno-hMabhCww.mjs";
+import { n as version, t as name } from "./deno-DhywNCFr.mjs";
 import { t as formatAcceptSignature } from "./accept-Dd__NiUL.mjs";
-import { a as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-Buz4jrLL.mjs";
-import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-0f792a_Z.mjs";
-import { t as getAuthenticatedDocumentLoader } from "./docloader-DfimMtL4.mjs";
+import { a as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-D0Yn0mtH.mjs";
+import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-CPJdCaSL.mjs";
+import { t as getAuthenticatedDocumentLoader } from "./docloader-C08QBNrF.mjs";
 import { n as kvCache } from "./kv-cache-B01V7s3h.mjs";
-import { a as signJsonLd, i as hasSignature, o as verifyJsonLd, r as detachSignature } from "./ld-Drc5O1ub.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-CLKB6EdW.mjs";
-import { n as signObject, r as verifyObject } from "./proof-CZf0bupI.mjs";
+import { a as signJsonLd, i as hasSignature, o as verifyJsonLd, r as detachSignature } from "./ld-DbgG8OrC.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-rvdHpSM9.mjs";
+import { n as signObject, r as verifyObject } from "./proof-BrTLb1tP.mjs";
 import { t as getNodeInfo } from "./client-DEpOVgY1.mjs";
 import { t as nodeInfoToJson } from "./types-DCP0WLdt.mjs";
-import { n as routeActivity } from "./inbox-wbJQKd-b.mjs";
-import { t as FederationBuilderImpl } from "./builder-DbwMErXg.mjs";
+import { n as routeActivity } from "./inbox-BaETdNND.mjs";
+import { t as FederationBuilderImpl } from "./builder-DVJNyKAX.mjs";
 import { t as buildCollectionSynchronizationHeader } from "./collection-BD6-SZ6O.mjs";
 import { t as KvKeyCache } from "./keycache-CCSwkQcY.mjs";
 import { t as acceptsJsonLd } from "./negotiation-DnsfFF8I.mjs";
 import { t as createExponentialBackoffPolicy } from "./retry-B_E3V_Dx.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-Bsp6qk0O.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-CqkObdC8.mjs";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
 import { lookupWebFinger } from "@fedify/webfinger";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
@@ -1890,14 +1890,17 @@ var FederationImpl = class extends FederationBuilderImpl {
 		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") {
+			if (rsaKey == null && privateKey.algorithm.name === "RSASSA-PKCS1-v1_5") rsaKey = {
+				keyId,
+				privateKey
+			};
+		}
+		for await (const _ of activity.getProofs({ contextLoader })) {
+			proofCreated = true;
+			break;
+		}
+		if (!proofCreated) {
+			for (const { keyId, privateKey } of keys) if (privateKey.algorithm.name === "Ed25519") {
 				activity = await signObject(activity, privateKey, keyId, {
 					contextLoader,
 					tracerProvider: this.tracerProvider
@@ -2489,6 +2492,7 @@ var ContextImpl = class ContextImpl {
 		}
 		const owner = this.getActorUri(identifier);
 		const result = [];
+		let i = 1;
 		for (const keyPair of keyPairs) {
 			const newPair = {
 				...keyPair,
@@ -2498,12 +2502,13 @@ var ContextImpl = class ContextImpl {
 					publicKey: keyPair.publicKey
 				}),
 				multikey: new Multikey({
-					id: keyPair.keyId,
+					id: new URL(`#multikey-${i}`, owner),
 					controller: owner,
 					publicKey: keyPair.publicKey
 				})
 			};
 			result.push(newPair);
+			i++;
 		}
 		return result;
 	}
@@ -2641,6 +2646,7 @@ var ContextImpl = class ContextImpl {
 		]);
 		let keys;
 		let identifier = null;
+		let actorKeyPairs = null;
 		if ("identifier" in sender || "username" in sender) {
 			if ("identifier" in sender) identifier = sender.identifier;
 			else {
@@ -2653,8 +2659,13 @@ var ContextImpl = class ContextImpl {
 				}
 			}
 			span.setAttribute("fedify.actor.identifier", identifier);
-			keys = await this.getKeyPairsFromIdentifier(identifier);
-			if (keys.length < 1) throw new Error(`No key pair found for actor ${JSON.stringify(identifier)}.`);
+			if (this.federation.actorCallbacks?.keyPairsDispatcher == null) throw new Error("No actor key pairs dispatcher registered.");
+			actorKeyPairs = await this.getActorKeyPairs(identifier);
+			if (actorKeyPairs.length < 1) throw new Error(`No key pair found for actor ${JSON.stringify(identifier)}.`);
+			keys = actorKeyPairs.map((kp) => ({
+				keyId: kp.keyId,
+				privateKey: kp.privateKey
+			}));
 		} else if (Array.isArray(sender)) {
 			if (sender.length < 1) throw new Error("The sender's key pairs are empty.");
 			keys = sender;
@@ -2690,6 +2701,16 @@ var ContextImpl = class ContextImpl {
 			});
 			throw new TypeError("The activity to send must have at least one actor property.");
 		}
+		if (actorKeyPairs != null) {
+			const contextLoader = this.contextLoader;
+			for (const kp of actorKeyPairs) {
+				if (kp.privateKey.algorithm.name !== "Ed25519" || kp.multikey.id == null) continue;
+				activity = await signObject(activity, kp.privateKey, kp.multikey.id, {
+					contextLoader,
+					tracerProvider: this.tracerProvider
+				});
+			}
+		}
 		const inboxes = extractInboxes({
 			recipients: expandedRecipients,
 			preferSharedInbox: options.preferSharedInbox,
@@ -3023,8 +3044,12 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 					identifier = mapped;
 				}
 			}
-			keys = await this.getKeyPairsFromIdentifier(identifier);
-			if (keys.length < 1) throw new Error(`No key pair found for actor ${JSON.stringify(identifier)}.`);
+			const actorKeyPairs = await this.getActorKeyPairs(identifier);
+			if (actorKeyPairs.length < 1) throw new Error(`No key pair found for actor ${JSON.stringify(identifier)}.`);
+			keys = actorKeyPairs.map((kp) => ({
+				keyId: kp.keyId,
+				privateKey: kp.privateKey
+			}));
 		} else if (Array.isArray(forwarder)) {
 			if (forwarder.length < 1) throw new Error("The forwarder's key pairs are empty.");
 			keys = forwarder;

package/dist/{middleware-5TGjniPd.cjs → middleware-eyhwv4v9.cjs}

@@ -2,10 +2,10 @@ const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 require("./chunk-DDcVe30Y.cjs");
 const require_transformers = require("./transformers-NeAONrAq.cjs");
-const require_http = require("./http-BewLiYTT.cjs");
-const require_proof = require("./proof-CNU71NVu.cjs");
+const require_http = require("./http-YvNVio1S.cjs");
+const require_proof = require("./proof-4G31YUYH.cjs");
 const require_types = require("./types-KC4QAoxe.cjs");
-const require_kv_cache = require("./kv-cache-E_ri3gGZ.cjs");
+const require_kv_cache = require("./kv-cache-Pk6XERKs.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_vocab = require("@fedify/vocab");
 let _opentelemetry_api = require("@opentelemetry/api");
@@ -331,7 +331,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl } = await Promise.resolve().then(() => require("./middleware-BhdA_6gU.cjs"));
+		const { FederationImpl } = await Promise.resolve().then(() => require("./middleware-CRwpNEwP.cjs"));
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -2996,14 +2996,17 @@ var FederationImpl = class extends FederationBuilderImpl {
 		let rsaKey = null;
 		for (const { keyId, privateKey } of keys) {
 			require_http.validateCryptoKey(privateKey, "private");
-			if (rsaKey == null && privateKey.algorithm.name === "RSASSA-PKCS1-v1_5") {
-				rsaKey = {
-					keyId,
-					privateKey
-				};
-				continue;
-			}
-			if (privateKey.algorithm.name === "Ed25519") {
+			if (rsaKey == null && privateKey.algorithm.name === "RSASSA-PKCS1-v1_5") rsaKey = {
+				keyId,
+				privateKey
+			};
+		}
+		for await (const _ of activity.getProofs({ contextLoader })) {
+			proofCreated = true;
+			break;
+		}
+		if (!proofCreated) {
+			for (const { keyId, privateKey } of keys) if (privateKey.algorithm.name === "Ed25519") {
 				activity = await require_proof.signObject(activity, privateKey, keyId, {
 					contextLoader,
 					tracerProvider: this.tracerProvider
@@ -3595,6 +3598,7 @@ var ContextImpl = class ContextImpl {
 		}
 		const owner = this.getActorUri(identifier);
 		const result = [];
+		let i = 1;
 		for (const keyPair of keyPairs) {
 			const newPair = {
 				...keyPair,
@@ -3604,12 +3608,13 @@ var ContextImpl = class ContextImpl {
 					publicKey: keyPair.publicKey
 				}),
 				multikey: new _fedify_vocab.Multikey({
-					id: keyPair.keyId,
+					id: new URL(`#multikey-${i}`, owner),
 					controller: owner,
 					publicKey: keyPair.publicKey
 				})
 			};
 			result.push(newPair);
+			i++;
 		}
 		return result;
 	}
@@ -3747,6 +3752,7 @@ var ContextImpl = class ContextImpl {
 		]);
 		let keys;
 		let identifier = null;
+		let actorKeyPairs = null;
 		if ("identifier" in sender || "username" in sender) {
 			if ("identifier" in sender) identifier = sender.identifier;
 			else {
@@ -3759,8 +3765,13 @@ var ContextImpl = class ContextImpl {
 				}
 			}
 			span.setAttribute("fedify.actor.identifier", identifier);
-			keys = await this.getKeyPairsFromIdentifier(identifier);
-			if (keys.length < 1) throw new Error(`No key pair found for actor ${JSON.stringify(identifier)}.`);
+			if (this.federation.actorCallbacks?.keyPairsDispatcher == null) throw new Error("No actor key pairs dispatcher registered.");
+			actorKeyPairs = await this.getActorKeyPairs(identifier);
+			if (actorKeyPairs.length < 1) throw new Error(`No key pair found for actor ${JSON.stringify(identifier)}.`);
+			keys = actorKeyPairs.map((kp) => ({
+				keyId: kp.keyId,
+				privateKey: kp.privateKey
+			}));
 		} else if (Array.isArray(sender)) {
 			if (sender.length < 1) throw new Error("The sender's key pairs are empty.");
 			keys = sender;
@@ -3796,6 +3807,16 @@ var ContextImpl = class ContextImpl {
 			});
 			throw new TypeError("The activity to send must have at least one actor property.");
 		}
+		if (actorKeyPairs != null) {
+			const contextLoader = this.contextLoader;
+			for (const kp of actorKeyPairs) {
+				if (kp.privateKey.algorithm.name !== "Ed25519" || kp.multikey.id == null) continue;
+				activity = await require_proof.signObject(activity, kp.privateKey, kp.multikey.id, {
+					contextLoader,
+					tracerProvider: this.tracerProvider
+				});
+			}
+		}
 		const inboxes = extractInboxes({
 			recipients: expandedRecipients,
 			preferSharedInbox: options.preferSharedInbox,
@@ -4129,8 +4150,12 @@ var InboxContextImpl = class InboxContextImpl extends ContextImpl {
 					identifier = mapped;
 				}
 			}
-			keys = await this.getKeyPairsFromIdentifier(identifier);
-			if (keys.length < 1) throw new Error(`No key pair found for actor ${JSON.stringify(identifier)}.`);
+			const actorKeyPairs = await this.getActorKeyPairs(identifier);
+			if (actorKeyPairs.length < 1) throw new Error(`No key pair found for actor ${JSON.stringify(identifier)}.`);
+			keys = actorKeyPairs.map((kp) => ({
+				keyId: kp.keyId,
+				privateKey: kp.privateKey
+			}));
 		} else if (Array.isArray(forwarder)) {
 			if (forwarder.length < 1) throw new Error("The forwarder's key pairs are empty.");
 			keys = forwarder;

package/dist/{middleware-CCeWFq7G.mjs → middleware-vdOFJOOX.mjs}

@@ -1,5 +1,5 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as FederationImpl } from "./middleware-DcwyRzc9.mjs";
+import { n as FederationImpl } from "./middleware-ItHrRua7.mjs";
 export { FederationImpl };

package/dist/{mod-Bp_CzKd4.d.cts → mod-Cgpc49fA.d.cts}

@@ -1,4 +1,4 @@
-import { Q as ActorHandleMapper, X as ActorAliasMapper, Z as ActorDispatcher, _t as WebFingerLinksDispatcher, s as RequestContext } from "./context-BhZVy7RB.cjs";
+import { Q as ActorHandleMapper, X as ActorAliasMapper, Z as ActorDispatcher, _t as WebFingerLinksDispatcher, s as RequestContext } from "./context-LmrZPwti.cjs";
 import { Span, Tracer } from "@opentelemetry/api";
 
 //#region src/federation/webfinger.d.ts

package/dist/{mod-DKOAow7a.d.ts → mod-CnwZoDzx.d.ts}

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { Q as ActorHandleMapper, X as ActorAliasMapper, Z as ActorDispatcher, _t as WebFingerLinksDispatcher, s as RequestContext } from "./context-BOiMZBu5.js";
+import { Q as ActorHandleMapper, X as ActorAliasMapper, Z as ActorDispatcher, _t as WebFingerLinksDispatcher, s as RequestContext } from "./context-C0fssarc.js";
 import { Span, Tracer } from "@opentelemetry/api";
 
 //#region src/federation/webfinger.d.ts

package/dist/mod.cjs

@@ -4,11 +4,11 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("./chunk-DDcVe30Y.cjs");
 const require_transformers = require("./transformers-NeAONrAq.cjs");
 require("./compat/mod.cjs");
-const require_http = require("./http-BewLiYTT.cjs");
-const require_middleware = require("./middleware-5TGjniPd.cjs");
-const require_proof = require("./proof-CNU71NVu.cjs");
+const require_http = require("./http-YvNVio1S.cjs");
+const require_middleware = require("./middleware-eyhwv4v9.cjs");
+const require_proof = require("./proof-4G31YUYH.cjs");
 const require_types = require("./types-KC4QAoxe.cjs");
-const require_kv_cache = require("./kv-cache-E_ri3gGZ.cjs");
+const require_kv_cache = require("./kv-cache-Pk6XERKs.cjs");
 const require_federation_mod = require("./federation/mod.cjs");
 require("./nodeinfo/mod.cjs");
 require("./runtime/mod.cjs");

package/dist/mod.d.cts

@@ -1,10 +1,10 @@
 import { a as InboundService, c as OutboundService, d as Software, f as Usage, i as parseNodeInfo, l as Protocol, n as ParseNodeInfoOptions, o as JsonValue, p as nodeInfoToJson, r as getNodeInfo, s as NodeInfo, t as GetNodeInfoOptions, u as Services } from "./client-z-8dc-e1.cjs";
 import { C as exportJwk, D as importJwk, E as generateCryptoKeyPair, S as KeyCache, T as fetchKeyDetailed, _ as validateAcceptSignature, a as VerifyRequestDetailedResult, b as FetchKeyOptions, c as signRequest, d as AcceptSignatureMember, f as AcceptSignatureParameters, g as parseAcceptSignature, h as fulfillAcceptSignature, i as SignRequestOptions, l as verifyRequest, m as formatAcceptSignature, n as HttpMessageSignaturesSpecDeterminer, o as VerifyRequestFailureReason, p as FulfillAcceptSignatureResult, r as Rfc9421SignRequestOptions, s as VerifyRequestOptions, t as HttpMessageSignaturesSpec, u as verifyRequestDetailed, v as FetchKeyDetailedResult, w as fetchKey, x as FetchKeyResult, y as FetchKeyErrorResult } from "./http-CrGuipxe.cjs";
 import { i as getKeyOwner, n as GetKeyOwnerOptions, r as doesActorOwnKey, t as DoesActorOwnKeyOptions } from "./owner-CptqhsOy.cjs";
-import { $ as ActorKeyPairsDispatcher, A as createFederation, B as RouterRouteResult, C as InboxChallengePolicy, Ct as ActivityTransformer, D as FederationKvPrefixes, E as Rfc6570Expression, F as Message, G as InProcessMessageQueueOptions, H as respondWithObject, I as createFederationBuilder, J as MessageQueueListenOptions, K as MessageQueue, L as Router, M as RetryContext, N as RetryPolicy, O as FederationOrigin, P as createExponentialBackoffPolicy, Q as ActorHandleMapper, R as RouterError, S as IdempotencyStrategy, St as digest, T as ObjectCallbackSetters, U as respondWithObjectIfAcceptable, V as RespondWithObjectOptions, W as InProcessMessageQueue, X as ActorAliasMapper, Y as ParallelMessageQueue, Z as ActorDispatcher, _ as FederationBuilder, _t as WebFingerLinksDispatcher, a as InboxContext, at as CustomCollectionCursor, b as FederationStartQueueOptions, bt as PageItems, c as RouteActivityOptions, ct as InboxListener, d as ActorCallbackSetters, dt as ObjectDispatcher, et as AuthorizePredicate, f as CollectionCallbackSetters, ft as OutboxErrorHandler, g as Federation, gt as UnverifiedActivityReason, h as Federatable, ht as UnverifiedActivityHandler, i as GetSignedKeyOptions, it as CustomCollectionCounter, j as CreateExponentialBackoffPolicyOptions, k as FederationQueueOptions, l as SendActivityOptions, lt as NodeInfoDispatcher, m as CustomCollectionCallbackSetters, mt as SharedInboxKeyDispatcher, n as Context, nt as CollectionCursor, o as ParseUriResult, ot as CustomCollectionDispatcher, p as ConstructorWithTypeId, pt as OutboxPermanentFailureHandler, q as MessageQueueEnqueueOptions, r as ForwardActivityOptions, rt as CollectionDispatcher, s as RequestContext, st as InboxErrorHandler, t as ActorKeyPair, tt as CollectionCounter, u as SendActivityOptionsForCollection, ut as ObjectAuthorizePredicate, v as FederationFetchOptions, vt as SendActivityError, w as InboxListenerSetters, x as IdempotencyKeyCallback, xt as buildCollectionSynchronizationHeader, y as FederationOptions, yt as SenderKeyPair, z as RouterOptions } from "./context-BhZVy7RB.cjs";
+import { $ as ActorKeyPairsDispatcher, A as createFederation, B as RouterRouteResult, C as InboxChallengePolicy, Ct as ActivityTransformer, D as FederationKvPrefixes, E as Rfc6570Expression, F as Message, G as InProcessMessageQueueOptions, H as respondWithObject, I as createFederationBuilder, J as MessageQueueListenOptions, K as MessageQueue, L as Router, M as RetryContext, N as RetryPolicy, O as FederationOrigin, P as createExponentialBackoffPolicy, Q as ActorHandleMapper, R as RouterError, S as IdempotencyStrategy, St as digest, T as ObjectCallbackSetters, U as respondWithObjectIfAcceptable, V as RespondWithObjectOptions, W as InProcessMessageQueue, X as ActorAliasMapper, Y as ParallelMessageQueue, Z as ActorDispatcher, _ as FederationBuilder, _t as WebFingerLinksDispatcher, a as InboxContext, at as CustomCollectionCursor, b as FederationStartQueueOptions, bt as PageItems, c as RouteActivityOptions, ct as InboxListener, d as ActorCallbackSetters, dt as ObjectDispatcher, et as AuthorizePredicate, f as CollectionCallbackSetters, ft as OutboxErrorHandler, g as Federation, gt as UnverifiedActivityReason, h as Federatable, ht as UnverifiedActivityHandler, i as GetSignedKeyOptions, it as CustomCollectionCounter, j as CreateExponentialBackoffPolicyOptions, k as FederationQueueOptions, l as SendActivityOptions, lt as NodeInfoDispatcher, m as CustomCollectionCallbackSetters, mt as SharedInboxKeyDispatcher, n as Context, nt as CollectionCursor, o as ParseUriResult, ot as CustomCollectionDispatcher, p as ConstructorWithTypeId, pt as OutboxPermanentFailureHandler, q as MessageQueueEnqueueOptions, r as ForwardActivityOptions, rt as CollectionDispatcher, s as RequestContext, st as InboxErrorHandler, t as ActorKeyPair, tt as CollectionCounter, u as SendActivityOptionsForCollection, ut as ObjectAuthorizePredicate, v as FederationFetchOptions, vt as SendActivityError, w as InboxListenerSetters, x as IdempotencyKeyCallback, xt as buildCollectionSynchronizationHeader, y as FederationOptions, yt as SenderKeyPair, z as RouterOptions } from "./context-LmrZPwti.cjs";
 import { a as MemoryKvStore, i as KvStoreSetOptions, n as KvStore, r as KvStoreListEntry, t as KvKey } from "./kv-CbLNp3zQ.cjs";
 import { actorDehydrator, autoIdAssigner, getDefaultActivityTransformers } from "./compat/mod.cjs";
-import { n as handleWebFinger, t as WebFingerHandlerParameters } from "./mod-Bp_CzKd4.cjs";
+import { n as handleWebFinger, t as WebFingerHandlerParameters } from "./mod-Cgpc49fA.cjs";
 import { _ as verifyJsonLd, a as createProof, c as verifyProof, d as VerifyJsonLdOptions, f as VerifySignatureOptions, g as signJsonLd, h as detachSignature, i as VerifyProofOptions, l as CreateSignatureOptions, m as createSignature, n as SignObjectOptions, o as signObject, p as attachSignature, r as VerifyObjectOptions, s as verifyObject, t as CreateProofOptions, u as SignJsonLdOptions, v as verifySignature } from "./mod-DoJBjjnO.cjs";
 import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./mod-CMEbIaNh.cjs";
 export * from "@fedify/vocab-runtime";

package/dist/mod.d.ts

@@ -3,10 +3,10 @@ import { URLPattern } from "urlpattern-polyfill";
 import { a as InboundService, c as OutboundService, d as Software, f as Usage, i as parseNodeInfo, l as Protocol, n as ParseNodeInfoOptions, o as JsonValue, p as nodeInfoToJson, r as getNodeInfo, s as NodeInfo, t as GetNodeInfoOptions, u as Services } from "./client-AtlibPOU.js";
 import { C as exportJwk, D as importJwk, E as generateCryptoKeyPair, S as KeyCache, T as fetchKeyDetailed, _ as validateAcceptSignature, a as VerifyRequestDetailedResult, b as FetchKeyOptions, c as signRequest, d as AcceptSignatureMember, f as AcceptSignatureParameters, g as parseAcceptSignature, h as fulfillAcceptSignature, i as SignRequestOptions, l as verifyRequest, m as formatAcceptSignature, n as HttpMessageSignaturesSpecDeterminer, o as VerifyRequestFailureReason, p as FulfillAcceptSignatureResult, r as Rfc9421SignRequestOptions, s as VerifyRequestOptions, t as HttpMessageSignaturesSpec, u as verifyRequestDetailed, v as FetchKeyDetailedResult, w as fetchKey, x as FetchKeyResult, y as FetchKeyErrorResult } from "./http-aQzN9Ayi.js";
 import { i as getKeyOwner, n as GetKeyOwnerOptions, r as doesActorOwnKey, t as DoesActorOwnKeyOptions } from "./owner-74ARJ5TL.js";
-import { $ as ActorKeyPairsDispatcher, A as createFederation, B as RouterRouteResult, C as InboxChallengePolicy, Ct as ActivityTransformer, D as FederationKvPrefixes, E as Rfc6570Expression, F as Message, G as InProcessMessageQueueOptions, H as respondWithObject, I as createFederationBuilder, J as MessageQueueListenOptions, K as MessageQueue, L as Router, M as RetryContext, N as RetryPolicy, O as FederationOrigin, P as createExponentialBackoffPolicy, Q as ActorHandleMapper, R as RouterError, S as IdempotencyStrategy, St as digest, T as ObjectCallbackSetters, U as respondWithObjectIfAcceptable, V as RespondWithObjectOptions, W as InProcessMessageQueue, X as ActorAliasMapper, Y as ParallelMessageQueue, Z as ActorDispatcher, _ as FederationBuilder, _t as WebFingerLinksDispatcher, a as InboxContext, at as CustomCollectionCursor, b as FederationStartQueueOptions, bt as PageItems, c as RouteActivityOptions, ct as InboxListener, d as ActorCallbackSetters, dt as ObjectDispatcher, et as AuthorizePredicate, f as CollectionCallbackSetters, ft as OutboxErrorHandler, g as Federation, gt as UnverifiedActivityReason, h as Federatable, ht as UnverifiedActivityHandler, i as GetSignedKeyOptions, it as CustomCollectionCounter, j as CreateExponentialBackoffPolicyOptions, k as FederationQueueOptions, l as SendActivityOptions, lt as NodeInfoDispatcher, m as CustomCollectionCallbackSetters, mt as SharedInboxKeyDispatcher, n as Context, nt as CollectionCursor, o as ParseUriResult, ot as CustomCollectionDispatcher, p as ConstructorWithTypeId, pt as OutboxPermanentFailureHandler, q as MessageQueueEnqueueOptions, r as ForwardActivityOptions, rt as CollectionDispatcher, s as RequestContext, st as InboxErrorHandler, t as ActorKeyPair, tt as CollectionCounter, u as SendActivityOptionsForCollection, ut as ObjectAuthorizePredicate, v as FederationFetchOptions, vt as SendActivityError, w as InboxListenerSetters, x as IdempotencyKeyCallback, xt as buildCollectionSynchronizationHeader, y as FederationOptions, yt as SenderKeyPair, z as RouterOptions } from "./context-BOiMZBu5.js";
+import { $ as ActorKeyPairsDispatcher, A as createFederation, B as RouterRouteResult, C as InboxChallengePolicy, Ct as ActivityTransformer, D as FederationKvPrefixes, E as Rfc6570Expression, F as Message, G as InProcessMessageQueueOptions, H as respondWithObject, I as createFederationBuilder, J as MessageQueueListenOptions, K as MessageQueue, L as Router, M as RetryContext, N as RetryPolicy, O as FederationOrigin, P as createExponentialBackoffPolicy, Q as ActorHandleMapper, R as RouterError, S as IdempotencyStrategy, St as digest, T as ObjectCallbackSetters, U as respondWithObjectIfAcceptable, V as RespondWithObjectOptions, W as InProcessMessageQueue, X as ActorAliasMapper, Y as ParallelMessageQueue, Z as ActorDispatcher, _ as FederationBuilder, _t as WebFingerLinksDispatcher, a as InboxContext, at as CustomCollectionCursor, b as FederationStartQueueOptions, bt as PageItems, c as RouteActivityOptions, ct as InboxListener, d as ActorCallbackSetters, dt as ObjectDispatcher, et as AuthorizePredicate, f as CollectionCallbackSetters, ft as OutboxErrorHandler, g as Federation, gt as UnverifiedActivityReason, h as Federatable, ht as UnverifiedActivityHandler, i as GetSignedKeyOptions, it as CustomCollectionCounter, j as CreateExponentialBackoffPolicyOptions, k as FederationQueueOptions, l as SendActivityOptions, lt as NodeInfoDispatcher, m as CustomCollectionCallbackSetters, mt as SharedInboxKeyDispatcher, n as Context, nt as CollectionCursor, o as ParseUriResult, ot as CustomCollectionDispatcher, p as ConstructorWithTypeId, pt as OutboxPermanentFailureHandler, q as MessageQueueEnqueueOptions, r as ForwardActivityOptions, rt as CollectionDispatcher, s as RequestContext, st as InboxErrorHandler, t as ActorKeyPair, tt as CollectionCounter, u as SendActivityOptionsForCollection, ut as ObjectAuthorizePredicate, v as FederationFetchOptions, vt as SendActivityError, w as InboxListenerSetters, x as IdempotencyKeyCallback, xt as buildCollectionSynchronizationHeader, y as FederationOptions, yt as SenderKeyPair, z as RouterOptions } from "./context-C0fssarc.js";
 import { a as MemoryKvStore, i as KvStoreSetOptions, n as KvStore, r as KvStoreListEntry, t as KvKey } from "./kv-GFYnFoOl.js";
 import { actorDehydrator, autoIdAssigner, getDefaultActivityTransformers } from "./compat/mod.js";
-import { n as handleWebFinger, t as WebFingerHandlerParameters } from "./mod-DKOAow7a.js";
+import { n as handleWebFinger, t as WebFingerHandlerParameters } from "./mod-CnwZoDzx.js";
 import { _ as verifyJsonLd, a as createProof, c as verifyProof, d as VerifyJsonLdOptions, f as VerifySignatureOptions, g as signJsonLd, h as detachSignature, i as VerifyProofOptions, l as CreateSignatureOptions, m as createSignature, n as SignObjectOptions, o as signObject, p as attachSignature, r as VerifyObjectOptions, s as verifyObject, t as CreateProofOptions, u as SignJsonLdOptions, v as verifySignature } from "./mod-DvxszxXC.js";
 import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./mod-CLgIXe9w.js";
 export * from "@fedify/vocab-runtime";

package/dist/mod.js

@@ -3,11 +3,11 @@ import "urlpattern-polyfill";
 import "./chunk-nlSIicah.js";
 import { n as autoIdAssigner, r as getDefaultActivityTransformers, t as actorDehydrator } from "./transformers-ve6e2xcg.js";
 import "./compat/mod.js";
-import { a as verifyRequestDetailed, c as fetchKeyDetailed, f as formatAcceptSignature, h as validateAcceptSignature, i as verifyRequest, l as generateCryptoKeyPair, m as parseAcceptSignature, o as exportJwk, p as fulfillAcceptSignature, r as signRequest, s as fetchKey, u as importJwk } from "./http-oG4y8q4n.js";
-import { a as createExponentialBackoffPolicy, c as buildCollectionSynchronizationHeader, d as Router, f as RouterError, i as SendActivityError, l as digest, o as respondWithObject, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as createFederationBuilder } from "./middleware-CqaVY7Db.js";
-import { a as doesActorOwnKey, c as createSignature, d as signJsonLd, f as verifyJsonLd, i as verifyProof, l as detachSignature, n as signObject, o as getKeyOwner, p as verifySignature, r as verifyObject, s as attachSignature, t as createProof } from "./proof-Cr-0THxd.js";
+import { a as verifyRequestDetailed, c as fetchKeyDetailed, f as formatAcceptSignature, h as validateAcceptSignature, i as verifyRequest, l as generateCryptoKeyPair, m as parseAcceptSignature, o as exportJwk, p as fulfillAcceptSignature, r as signRequest, s as fetchKey, u as importJwk } from "./http-D3tag6Yq.js";
+import { a as createExponentialBackoffPolicy, c as buildCollectionSynchronizationHeader, d as Router, f as RouterError, i as SendActivityError, l as digest, o as respondWithObject, r as handleWebFinger, s as respondWithObjectIfAcceptable, t as createFederation, u as createFederationBuilder } from "./middleware-D5u0ehbB.js";
+import { a as doesActorOwnKey, c as createSignature, d as signJsonLd, f as verifyJsonLd, i as verifyProof, l as detachSignature, n as signObject, o as getKeyOwner, p as verifySignature, r as verifyObject, s as attachSignature, t as createProof } from "./proof-zRahbXVh.js";
 import { n as getNodeInfo, r as parseNodeInfo, t as nodeInfoToJson } from "./types-hvL8ElAs.js";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-BnfUjj42.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-CmiF_bSD.js";
 import { InProcessMessageQueue, MemoryKvStore, ParallelMessageQueue } from "./federation/mod.js";
 import "./nodeinfo/mod.js";
 import "./runtime/mod.js";

package/dist/nodeinfo/handler.test.mjs

@@ -5,7 +5,7 @@ import { n as createRequestContext } from "../context-Juj6bdHC.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-Duiq_YC9.mjs";
 import { t as MemoryKvStore } from "../kv-tL2TOE9X.mjs";
-import { a as createFederation, h as handleNodeInfoJrd, m as handleNodeInfo } from "../middleware-DcwyRzc9.mjs";
+import { a as createFederation, h as handleNodeInfoJrd, m as handleNodeInfo } from "../middleware-ItHrRua7.mjs";
 import { test } from "@fedify/fixture";
 //#region src/nodeinfo/handler.test.ts
 test("handleNodeInfo()", async () => {

package/dist/{owner-CLKB6EdW.mjs → owner-rvdHpSM9.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-hMabhCww.mjs";
-import "./key-Buz4jrLL.mjs";
+import { n as version, t as name } from "./deno-DhywNCFr.mjs";
+import "./key-D0Yn0mtH.mjs";
 import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { getDocumentLoader } from "@fedify/vocab-runtime";

package/dist/{proof-CNU71NVu.cjs → proof-4G31YUYH.cjs}

@@ -1,7 +1,7 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 const require_chunk = require("./chunk-DDcVe30Y.cjs");
-const require_http = require("./http-BewLiYTT.cjs");
+const require_http = require("./http-YvNVio1S.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_vocab = require("@fedify/vocab");
 let _opentelemetry_api = require("@opentelemetry/api");

package/dist/{proof-CZf0bupI.mjs → proof-BrTLb1tP.mjs}

@@ -1,8 +1,8 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-hMabhCww.mjs";
-import { n as fetchKey, o as validateCryptoKey } from "./key-Buz4jrLL.mjs";
+import { n as version, t as name } from "./deno-DhywNCFr.mjs";
+import { n as fetchKey, o as validateCryptoKey } from "./key-D0Yn0mtH.mjs";
 import { Activity, DataIntegrityProof, Multikey, getTypeId } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { getLogger } from "@logtape/logtape";

package/dist/{proof-Cr-0THxd.js → proof-zRahbXVh.js}

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
-import { _ as version, d as validateCryptoKey, g as name, s as fetchKey } from "./http-oG4y8q4n.js";
+import { _ as version, d as validateCryptoKey, g as name, s as fetchKey } from "./http-D3tag6Yq.js";
 import { getLogger } from "@logtape/logtape";
 import { Activity, CryptographicKey, DataIntegrityProof, Multikey, Object as Object$1, getTypeId, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";

package/dist/{send-Bsp6qk0O.mjs → send-CqkObdC8.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-hMabhCww.mjs";
-import { n as doubleKnock } from "./http-0f792a_Z.mjs";
+import { n as version, t as name } from "./deno-DhywNCFr.mjs";
+import { n as doubleKnock } from "./http-CPJdCaSL.mjs";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { getLogger } from "@logtape/logtape";
 //#region src/federation/send.ts

package/dist/sig/http.test.mjs

@@ -7,8 +7,8 @@ import { a as assertExists, t as assertStringIncludes } from "../std__assert-Dui
 import { n as assertFalse, t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
 import { t as assert } from "../assert-ddO5KLpe.mjs";
-import { t as exportJwk } from "../key-Buz4jrLL.mjs";
-import { a as parseRfc9421Signature, c as timingSafeEqual, i as formatRfc9421SignatureParameters, l as verifyRequest, n as doubleKnock, o as parseRfc9421SignatureInput, r as formatRfc9421Signature, s as signRequest, t as createRfc9421SignatureBase, u as verifyRequestDetailed } from "../http-0f792a_Z.mjs";
+import { t as exportJwk } from "../key-D0Yn0mtH.mjs";
+import { a as parseRfc9421Signature, c as timingSafeEqual, i as formatRfc9421SignatureParameters, l as verifyRequest, n as doubleKnock, o as parseRfc9421SignatureInput, r as formatRfc9421Signature, s as signRequest, t as createRfc9421SignatureBase, u as verifyRequestDetailed } from "../http-CPJdCaSL.mjs";
 import { i as rsaPrivateKey2, l as rsaPublicKey5, o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-BAK-tUlf.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError, exportSpki } from "@fedify/vocab-runtime";

package/dist/sig/key.test.mjs

@@ -5,7 +5,7 @@ import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-Duiq_YC9.mjs";
 import { t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
-import { a as importJwk, i as generateCryptoKeyPair, n as fetchKey, o as validateCryptoKey, r as fetchKeyDetailed, t as exportJwk } from "../key-Buz4jrLL.mjs";
+import { a as importJwk, i as generateCryptoKeyPair, n as fetchKey, o as validateCryptoKey, r as fetchKeyDetailed, t as exportJwk } from "../key-D0Yn0mtH.mjs";
 import { c as rsaPublicKey3, i as rsaPrivateKey2, o as rsaPublicKey1, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { CryptographicKey, Multikey } from "@fedify/vocab";

package/dist/sig/ld.test.mjs

@@ -5,9 +5,9 @@ import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { n as assertFalse, t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
 import { t as assert } from "../assert-ddO5KLpe.mjs";
-import { i as generateCryptoKeyPair } from "../key-Buz4jrLL.mjs";
+import { i as generateCryptoKeyPair } from "../key-D0Yn0mtH.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
-import { a as signJsonLd, n as createSignature, o as verifyJsonLd, r as detachSignature, s as verifySignature, t as attachSignature } from "../ld-Drc5O1ub.mjs";
+import { a as signJsonLd, n as createSignature, o as verifyJsonLd, r as detachSignature, s as verifySignature, t as attachSignature } from "../ld-DbgG8OrC.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { CryptographicKey } from "@fedify/vocab";
 import { encodeBase64 } from "byte-encodings/base64";

package/dist/sig/mod.cjs

@@ -1,8 +1,8 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_http = require("../http-BewLiYTT.cjs");
-const require_proof = require("../proof-CNU71NVu.cjs");
+const require_http = require("../http-YvNVio1S.cjs");
+const require_proof = require("../proof-4G31YUYH.cjs");
 exports.attachSignature = require_proof.attachSignature;
 exports.createProof = require_proof.createProof;
 exports.createSignature = require_proof.createSignature;

package/dist/sig/mod.js

@@ -1,5 +1,5 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
-import { a as verifyRequestDetailed, c as fetchKeyDetailed, f as formatAcceptSignature, h as validateAcceptSignature, i as verifyRequest, l as generateCryptoKeyPair, m as parseAcceptSignature, o as exportJwk, p as fulfillAcceptSignature, r as signRequest, s as fetchKey, u as importJwk } from "../http-oG4y8q4n.js";
-import { a as doesActorOwnKey, c as createSignature, d as signJsonLd, f as verifyJsonLd, i as verifyProof, l as detachSignature, n as signObject, o as getKeyOwner, p as verifySignature, r as verifyObject, s as attachSignature, t as createProof } from "../proof-Cr-0THxd.js";
+import { a as verifyRequestDetailed, c as fetchKeyDetailed, f as formatAcceptSignature, h as validateAcceptSignature, i as verifyRequest, l as generateCryptoKeyPair, m as parseAcceptSignature, o as exportJwk, p as fulfillAcceptSignature, r as signRequest, s as fetchKey, u as importJwk } from "../http-D3tag6Yq.js";
+import { a as doesActorOwnKey, c as createSignature, d as signJsonLd, f as verifyJsonLd, i as verifyProof, l as detachSignature, n as signObject, o as getKeyOwner, p as verifySignature, r as verifyObject, s as attachSignature, t as createProof } from "../proof-zRahbXVh.js";
 export { attachSignature, createProof, createSignature, detachSignature, doesActorOwnKey, exportJwk, fetchKey, fetchKeyDetailed, formatAcceptSignature, fulfillAcceptSignature, generateCryptoKeyPair, getKeyOwner, importJwk, parseAcceptSignature, signJsonLd, signObject, signRequest, validateAcceptSignature, verifyJsonLd, verifyObject, verifyProof, verifyRequest, verifyRequestDetailed, verifySignature };

package/dist/sig/owner.test.mjs

@@ -6,7 +6,7 @@ import "../std__assert-Duiq_YC9.mjs";
 import { n as assertFalse } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assert } from "../assert-ddO5KLpe.mjs";
 import { o as rsaPublicKey1, s as rsaPublicKey2 } from "../keys-BAK-tUlf.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-CLKB6EdW.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-rvdHpSM9.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, CryptographicKey, lookupObject } from "@fedify/vocab";
 //#region src/sig/owner.test.ts

package/dist/sig/proof.test.mjs

@@ -6,7 +6,7 @@ import "../std__assert-Duiq_YC9.mjs";
 import { t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
-import { i as verifyProof, n as signObject, r as verifyObject, t as createProof } from "../proof-CZf0bupI.mjs";
+import { i as verifyProof, n as signObject, r as verifyObject, t as createProof } from "../proof-BrTLb1tP.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, DataIntegrityProof, Multikey, Note, Place } from "@fedify/vocab";
 import { decodeMultibase, importMultibaseKey } from "@fedify/vocab-runtime";

package/dist/testing/mod.d.mts

@@ -2121,7 +2121,10 @@ interface GetSignedKeyOptions {
  */
 interface ActorKeyPair extends CryptoKeyPair {
   /**
-   * The URI of the public key, which is used for verifying HTTP Signatures.
+   * The URI of the public key for {@link CryptographicKey}, which is used for
+   * verifying HTTP Signatures and Linked Data Signatures.  Note that this is
+   * the ID of the {@link cryptographicKey}, not of the {@link multikey};
+   * the {@link Multikey} instance has a distinct ID of its own.
    */
   readonly keyId: URL;
   /**

package/dist/utils/docloader.test.mjs

@@ -5,9 +5,9 @@ import { t as esm_default } from "../esm-DVILvP5e.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-Duiq_YC9.mjs";
 import { t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
-import { l as verifyRequest } from "../http-0f792a_Z.mjs";
+import { l as verifyRequest } from "../http-CPJdCaSL.mjs";
 import { i as rsaPrivateKey2 } from "../keys-BAK-tUlf.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-DfimMtL4.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-C08QBNrF.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { UrlError } from "@fedify/vocab-runtime";
 //#region src/utils/docloader.test.ts

package/dist/utils/mod.cjs

@@ -1,6 +1,6 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_kv_cache = require("../kv-cache-E_ri3gGZ.cjs");
+const require_kv_cache = require("../kv-cache-Pk6XERKs.cjs");
 exports.getAuthenticatedDocumentLoader = require_kv_cache.getAuthenticatedDocumentLoader;
 exports.kvCache = require_kv_cache.kvCache;

package/dist/utils/mod.js

@@ -1,4 +1,4 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-BnfUjj42.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "../kv-cache-CmiF_bSD.js";
 export { getAuthenticatedDocumentLoader, kvCache };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/fedify",
-  "version": "2.2.0-dev.671+61141c60",
+  "version": "2.2.0-dev.677+41046619",
   "description": "An ActivityPub server framework",
   "keywords": [
     "ActivityPub",
@@ -144,9 +144,9 @@
     "uri-template-router": "^1.0.0",
     "url-template": "^3.1.1",
     "urlpattern-polyfill": "^10.1.0",
-    "@fedify/vocab": "2.2.0-dev.671+61141c60",
-    "@fedify/webfinger": "2.2.0-dev.671+61141c60",
-    "@fedify/vocab-runtime": "2.2.0-dev.671+61141c60"
+    "@fedify/webfinger": "2.2.0-dev.677+41046619",
+    "@fedify/vocab": "2.2.0-dev.677+41046619",
+    "@fedify/vocab-runtime": "2.2.0-dev.677+41046619"
   },
   "devDependencies": {
     "@std/assert": "npm:@jsr/std__assert@^0.226.0",
@@ -159,7 +159,7 @@
     "typescript": "^5.9.2",
     "wrangler": "^4.17.0",
     "@fedify/fixture": "2.0.0",
-    "@fedify/vocab-tools": "^2.2.0-dev.671+61141c60"
+    "@fedify/vocab-tools": "^2.2.0-dev.677+41046619"
   },
   "scripts": {
     "build:self": "tsdown",