@fedify/fedify 1.9.7 → 1.9.9

package/dist/{http-hFXuPP4j.mjs → http-CsSHezSz.mjs}

@@ -1,8 +1,8 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { G as FetchError, ot as name, s as CryptographicKey, st as version } from "./vocab-DuJO9k13.mjs";
-import { a as validateCryptoKey, n as fetchKey } from "./key-ByblW_7f.mjs";
+import { G as FetchError, ot as name, s as CryptographicKey, st as version } from "./vocab-CG-IqKPs.mjs";
+import { a as validateCryptoKey, n as fetchKey } from "./key-Bbuzt358.mjs";
 import { getLogger } from "@logtape/logtape";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";

package/dist/{http-z-J6i29D.js → http-Dbj7ZT3b.js}

@@ -1,8 +1,8 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
-import { d as name, f as version, t as FetchError } from "./docloader-Dlo9EMTn.js";
-import { y as CryptographicKey } from "./actor-B3mkavdq.js";
-import { n as fetchKey, o as validateCryptoKey } from "./key-DPg0mibt.js";
+import { d as name, f as version, t as FetchError } from "./docloader-ivt5xNwJ.js";
+import { y as CryptographicKey } from "./actor-MDInzRdc.js";
+import { n as fetchKey, o as validateCryptoKey } from "./key-C2e_Yz1s.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";

package/dist/{inbox-B0NdZv6Q.mjs → inbox-D7U8Ysvc.mjs}

@@ -1,7 +1,7 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { U as getTypeId, ot as name, st as version, t as Activity } from "./vocab-DuJO9k13.mjs";
+import { U as getTypeId, ot as name, st as version, t as Activity } from "./vocab-CG-IqKPs.mjs";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
 //#region src/federation/inbox.ts

package/dist/{key-ByblW_7f.mjs → key-Bbuzt358.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { J as getDocumentLoader, ot as name, s as CryptographicKey, st as version, v as Object$1 } from "./vocab-DuJO9k13.mjs";
-import { i as isActor } from "./actor-DeUOMMMQ.mjs";
+import { J as getDocumentLoader, ot as name, s as CryptographicKey, st as version, v as Object$1 } from "./vocab-CG-IqKPs.mjs";
+import { i as isActor } from "./actor-DVET8NhO.mjs";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 //#region src/sig/key.ts

package/dist/{key-USCeSjWo.mjs → key-Bg3Rr_bi.mjs}

@@ -1,5 +1,5 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { a as validateCryptoKey } from "./key-ByblW_7f.mjs";
+import { a as validateCryptoKey } from "./key-Bbuzt358.mjs";
 export { validateCryptoKey };

package/dist/{key-BfH9JUMQ.cjs → key-Bl8yte5W.cjs}

@@ -1,4 +1,4 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
-const require_key = require("./key-B2ZqbGDP.cjs");
+const require_key = require("./key-CUorXS6k.cjs");
 exports.validateCryptoKey = require_key.validateCryptoKey;

package/dist/{key-DPg0mibt.js → key-C2e_Yz1s.js}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 import { t as __exportAll } from "./rolldown-runtime-C7fyD9f2.js";
-import { d as name, f as version, i as getDocumentLoader } from "./docloader-Dlo9EMTn.js";
-import { i as isActor, q as Object$1, y as CryptographicKey } from "./actor-B3mkavdq.js";
+import { d as name, f as version, i as getDocumentLoader } from "./docloader-ivt5xNwJ.js";
+import { i as isActor, q as Object$1, y as CryptographicKey } from "./actor-MDInzRdc.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 //#region src/sig/key.ts

package/dist/{key-B2ZqbGDP.cjs → key-CUorXS6k.cjs}

@@ -1,7 +1,7 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
-const require_docloader = require("./docloader-Co-tW1B6.cjs");
-const require_actor = require("./actor-CsvteFj1.cjs");
+const require_docloader = require("./docloader-BZfjD0Xt.cjs");
+const require_actor = require("./actor-DILKT_HU.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _opentelemetry_api = require("@opentelemetry/api");
 //#region src/sig/key.ts

package/dist/{keycache-qGjtNwWK.mjs → keycache-Dpm1JlAw.mjs}

@@ -1,7 +1,7 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { g as Multikey, s as CryptographicKey } from "./vocab-DuJO9k13.mjs";
+import { g as Multikey, s as CryptographicKey } from "./vocab-CG-IqKPs.mjs";
 //#region src/federation/keycache.ts
 const NULL_KEY_CACHE_VALUE = { _fedify: "key-unavailable" };
 const NULL_KEY_CACHE_TTL = Temporal.Duration.from({ minutes: 5 });

package/dist/{keys-D48z4zQE.mjs → keys-CZlvPl27.mjs}

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { I as importSpki, g as Multikey, s as CryptographicKey } from "./vocab-DuJO9k13.mjs";
+import { I as importSpki, g as Multikey, s as CryptographicKey } from "./vocab-CG-IqKPs.mjs";
 //#region src/testing/keys.ts
 const rsaPublicKey1 = new CryptographicKey({
 	id: new URL("https://example.com/key"),

package/dist/{ld-Bk-CiTUe.mjs → ld-iU-MUtGB.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { J as getDocumentLoader, U as getTypeId, ot as name, s as CryptographicKey, st as version, t as Activity, v as Object$1 } from "./vocab-DuJO9k13.mjs";
-import { a as validateCryptoKey, n as fetchKey } from "./key-ByblW_7f.mjs";
+import { J as getDocumentLoader, U as getTypeId, ot as name, s as CryptographicKey, st as version, t as Activity, v as Object$1 } from "./vocab-CG-IqKPs.mjs";
+import { a as validateCryptoKey, n as fetchKey } from "./key-Bbuzt358.mjs";
 import { getLogger } from "@logtape/logtape";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import jsonld from "jsonld";

package/dist/{lookup-CuDOZqcB.js → lookup-BOFQeNi_.js}

@@ -1,6 +1,6 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
-import { d as name, f as version, l as UrlError, o as getUserAgent, u as validatePublicUrl } from "./docloader-Dlo9EMTn.js";
+import { d as name, f as version, l as UrlError, o as getUserAgent, u as validatePublicUrl } from "./docloader-ivt5xNwJ.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 //#region src/webfinger/lookup.ts

package/dist/{lookup-C6EHvNN7.cjs → lookup-BnvWOvmD.cjs}

@@ -1,6 +1,6 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
-const require_docloader = require("./docloader-Co-tW1B6.cjs");
+const require_docloader = require("./docloader-BZfjD0Xt.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _opentelemetry_api = require("@opentelemetry/api");
 //#region src/webfinger/lookup.ts

package/dist/{lookup-B-LJhUtc.mjs → lookup-DhIULso8.mjs}

@@ -1,7 +1,7 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { J as getDocumentLoader, U as getTypeId, W as lookupWebFinger, ot as name, st as version, v as Object$1 } from "./vocab-DuJO9k13.mjs";
+import { J as getDocumentLoader, U as getTypeId, W as lookupWebFinger, ot as name, st as version, v as Object$1 } from "./vocab-CG-IqKPs.mjs";
 import { getLogger } from "@logtape/logtape";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { cloneDeep, delay } from "es-toolkit";

package/dist/{middleware-xIvAtsQ9.mjs → middleware-BBjNkISH.mjs}

@@ -1,23 +1,23 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { J as getDocumentLoader, U as getTypeId, W as lookupWebFinger, Z as kvCache, a as CollectionPage, b as OrderedCollection, g as Multikey, h as Link, i as Collection, ot as name, s as CryptographicKey, st as version, t as Activity, v as Object$1, x as OrderedCollectionPage } from "./vocab-DuJO9k13.mjs";
-import { i as RouterError, n as traverseCollection, t as lookupObject } from "./lookup-B-LJhUtc.mjs";
-import { t as getNodeInfo } from "./client-Bza9SeZS.mjs";
+import { J as getDocumentLoader, U as getTypeId, W as lookupWebFinger, Z as kvCache, a as CollectionPage, b as OrderedCollection, g as Multikey, h as Link, i as Collection, ot as name, s as CryptographicKey, st as version, t as Activity, v as Object$1, x as OrderedCollectionPage } from "./vocab-CG-IqKPs.mjs";
+import { i as RouterError, n as traverseCollection, t as lookupObject } from "./lookup-DhIULso8.mjs";
+import { t as getNodeInfo } from "./client-DuRbuCIQ.mjs";
 import { t as nodeInfoToJson } from "./types-CAnkAQGM.mjs";
-import "./actor-DeUOMMMQ.mjs";
-import { a as validateCryptoKey, i as importJwk, t as exportJwk } from "./key-ByblW_7f.mjs";
-import { l as verifyRequest } from "./http-hFXuPP4j.mjs";
-import { t as getAuthenticatedDocumentLoader } from "./authdocloader-BKq994CV.mjs";
-import { a as signJsonLd, i as hasSignature, o as verifyJsonLd, r as detachSignature } from "./ld-Bk-CiTUe.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-CkmuWs8s.mjs";
-import { n as signObject, r as verifyObject } from "./proof-DVFzuYOq.mjs";
-import { n as routeActivity } from "./inbox-B0NdZv6Q.mjs";
-import { t as FederationBuilderImpl } from "./builder-CnVAhip1.mjs";
+import "./actor-DVET8NhO.mjs";
+import { a as validateCryptoKey, i as importJwk, t as exportJwk } from "./key-Bbuzt358.mjs";
+import { l as verifyRequest } from "./http-CsSHezSz.mjs";
+import { t as getAuthenticatedDocumentLoader } from "./authdocloader-DLvikTbR.mjs";
+import { a as signJsonLd, i as hasSignature, o as verifyJsonLd, r as detachSignature } from "./ld-iU-MUtGB.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-CAvCysNj.mjs";
+import { n as signObject, r as verifyObject } from "./proof-DkUAJViu.mjs";
+import { n as routeActivity } from "./inbox-D7U8Ysvc.mjs";
+import { t as FederationBuilderImpl } from "./builder-DfInnU0K.mjs";
 import { t as buildCollectionSynchronizationHeader } from "./collection-BD6-SZ6O.mjs";
-import { t as KvKeyCache } from "./keycache-qGjtNwWK.mjs";
+import { t as KvKeyCache } from "./keycache-Dpm1JlAw.mjs";
 import { t as createExponentialBackoffPolicy } from "./retry-Ddbq3AcK.mjs";
-import { n as sendActivity, t as extractInboxes } from "./send-BsKuGBh0.mjs";
+import { n as sendActivity, t as extractInboxes } from "./send-BxjL4pnG.mjs";
 import { getLogger, withContext } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
 import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_HTTP_RESPONSE_HEADER, ATTR_HTTP_RESPONSE_STATUS_CODE, ATTR_URL_FULL } from "@opentelemetry/semantic-conventions";
@@ -1845,14 +1845,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
@@ -2485,6 +2488,7 @@ var ContextImpl = class ContextImpl {
 		}
 		const owner = this.getActorUri(identifier);
 		const result = [];
+		let i = 1;
 		for (const keyPair of keyPairs) {
 			const newPair = {
 				...keyPair,
@@ -2494,12 +2498,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;
 	}
@@ -2646,6 +2651,7 @@ var ContextImpl = class ContextImpl {
 		]);
 		let keys;
 		let identifier = null;
+		let actorKeyPairs = null;
 		if ("identifier" in sender || "username" in sender || "handle" in sender) {
 			if ("identifier" in sender) identifier = sender.identifier;
 			else {
@@ -2663,8 +2669,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;
@@ -2695,6 +2706,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,
@@ -2734,7 +2755,7 @@ var ContextImpl = class ContextImpl {
 			traceContext: carrier
 		};
 		if (!this.federation.manuallyStartQueue) this.federation._startQueueInternal(this.data);
-		this.federation.fanoutQueue.enqueue(message);
+		await this.federation.fanoutQueue.enqueue(message);
 	}
 	async *getFollowers(identifier) {
 		if (this.federation.followersCallbacks == null) throw new Error("No followers collection dispatcher registered.");
@@ -3016,8 +3037,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-UNqaTRBe.cjs → middleware-BD8iV5GL.cjs}

@@ -1,14 +1,14 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
-const require_docloader = require("./docloader-Co-tW1B6.cjs");
-const require_transformers = require("./transformers-C2P5eKUT.cjs");
-const require_actor = require("./actor-CsvteFj1.cjs");
-const require_lookup = require("./lookup-C6EHvNN7.cjs");
-const require_key = require("./key-B2ZqbGDP.cjs");
-const require_http = require("./http-cvQMgiFd.cjs");
-const require_proof = require("./proof-DiFRNymC.cjs");
-const require_types = require("./types-D4VM3B7I.cjs");
-const require_authdocloader = require("./authdocloader-tagnJZ6u.cjs");
+const require_docloader = require("./docloader-BZfjD0Xt.cjs");
+const require_transformers = require("./transformers-DW7EyHh4.cjs");
+const require_actor = require("./actor-DILKT_HU.cjs");
+const require_lookup = require("./lookup-BnvWOvmD.cjs");
+const require_key = require("./key-CUorXS6k.cjs");
+const require_http = require("./http-8jvVkJos.cjs");
+const require_proof = require("./proof-2V3jxAdE.cjs");
+const require_types = require("./types-B0U2QC2Q.cjs");
+const require_authdocloader = require("./authdocloader-hwjRHw8X.cjs");
 const require_vocab_mod = require("./vocab/mod.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _opentelemetry_api = require("@opentelemetry/api");
@@ -335,7 +335,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl } = await Promise.resolve().then(() => require("./middleware-SP7rhp6I.cjs"));
+		const { FederationImpl } = await Promise.resolve().then(() => require("./middleware-TO6qMFz0.cjs"));
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -2819,14 +2819,17 @@ var FederationImpl = class extends FederationBuilderImpl {
 		let rsaKey = null;
 		for (const { keyId, privateKey } of keys) {
 			require_key.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
@@ -3459,6 +3462,7 @@ var ContextImpl = class ContextImpl {
 		}
 		const owner = this.getActorUri(identifier);
 		const result = [];
+		let i = 1;
 		for (const keyPair of keyPairs) {
 			const newPair = {
 				...keyPair,
@@ -3468,12 +3472,13 @@ var ContextImpl = class ContextImpl {
 					publicKey: keyPair.publicKey
 				}),
 				multikey: new require_actor.Multikey({
-					id: keyPair.keyId,
+					id: new URL(`#multikey-${i}`, owner),
 					controller: owner,
 					publicKey: keyPair.publicKey
 				})
 			};
 			result.push(newPair);
+			i++;
 		}
 		return result;
 	}
@@ -3620,6 +3625,7 @@ var ContextImpl = class ContextImpl {
 		]);
 		let keys;
 		let identifier = null;
+		let actorKeyPairs = null;
 		if ("identifier" in sender || "username" in sender || "handle" in sender) {
 			if ("identifier" in sender) identifier = sender.identifier;
 			else {
@@ -3637,8 +3643,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;
@@ -3669,6 +3680,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,
@@ -3708,7 +3729,7 @@ var ContextImpl = class ContextImpl {
 			traceContext: carrier
 		};
 		if (!this.federation.manuallyStartQueue) this.federation._startQueueInternal(this.data);
-		this.federation.fanoutQueue.enqueue(message);
+		await this.federation.fanoutQueue.enqueue(message);
 	}
 	async *getFollowers(identifier) {
 		if (this.federation.followersCallbacks == null) throw new Error("No followers collection dispatcher registered.");
@@ -3990,8 +4011,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-Cns1QUI8.js → middleware-D0zludVl.js}

@@ -2,14 +2,14 @@ import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 import { t as __exportAll } from "./rolldown-runtime-C7fyD9f2.js";
 import { r as getDefaultActivityTransformers } from "./transformers-BV4OeK9o.js";
-import { d as name, f as version, i as getDocumentLoader, s as kvCache } from "./docloader-Dlo9EMTn.js";
-import { G as Multikey, Tt as getTypeId, V as Link, X as OrderedCollectionPage, Y as OrderedCollection, _ as CollectionPage, g as Collection, q as Object$1, s as Activity, y as CryptographicKey } from "./actor-B3mkavdq.js";
-import { t as lookupWebFinger } from "./lookup-CuDOZqcB.js";
-import { i as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-DPg0mibt.js";
-import { r as verifyRequest, t as doubleKnock } from "./http-z-J6i29D.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-BBEQdN7B.js";
-import { n as getNodeInfo, t as nodeInfoToJson } from "./types-BK9bojU0.js";
-import { t as getAuthenticatedDocumentLoader } from "./authdocloader-C3_-i4Zk.js";
+import { d as name, f as version, i as getDocumentLoader, s as kvCache } from "./docloader-ivt5xNwJ.js";
+import { G as Multikey, Tt as getTypeId, V as Link, X as OrderedCollectionPage, Y as OrderedCollection, _ as CollectionPage, g as Collection, q as Object$1, s as Activity, y as CryptographicKey } from "./actor-MDInzRdc.js";
+import { t as lookupWebFinger } from "./lookup-BOFQeNi_.js";
+import { i as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-C2e_Yz1s.js";
+import { r as verifyRequest, t as doubleKnock } from "./http-Dbj7ZT3b.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-C99DO0SE.js";
+import { n as getNodeInfo, t as nodeInfoToJson } from "./types-dHLDn_7H.js";
+import { t as getAuthenticatedDocumentLoader } from "./authdocloader-DRG9qnz7.js";
 import { lookupObject, traverseCollection } from "./vocab/mod.js";
 import { getLogger, withContext } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
@@ -2827,14 +2827,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
@@ -3467,6 +3470,7 @@ var ContextImpl = class ContextImpl {
 		}
 		const owner = this.getActorUri(identifier);
 		const result = [];
+		let i = 1;
 		for (const keyPair of keyPairs) {
 			const newPair = {
 				...keyPair,
@@ -3476,12 +3480,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;
 	}
@@ -3628,6 +3633,7 @@ var ContextImpl = class ContextImpl {
 		]);
 		let keys;
 		let identifier = null;
+		let actorKeyPairs = null;
 		if ("identifier" in sender || "username" in sender || "handle" in sender) {
 			if ("identifier" in sender) identifier = sender.identifier;
 			else {
@@ -3645,8 +3651,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;
@@ -3677,6 +3688,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,
@@ -3716,7 +3737,7 @@ var ContextImpl = class ContextImpl {
 			traceContext: carrier
 		};
 		if (!this.federation.manuallyStartQueue) this.federation._startQueueInternal(this.data);
-		this.federation.fanoutQueue.enqueue(message);
+		await this.federation.fanoutQueue.enqueue(message);
 	}
 	async *getFollowers(identifier) {
 		if (this.federation.followersCallbacks == null) throw new Error("No followers collection dispatcher registered.");
@@ -3998,8 +4019,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-DYNDkDz7.mjs → middleware-DauQ1R8p.mjs}

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

package/dist/{middleware-SP7rhp6I.cjs → middleware-TO6qMFz0.cjs}

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

package/dist/mod.cjs

@@ -1,17 +1,17 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_docloader = require("./docloader-Co-tW1B6.cjs");
-const require_transformers = require("./transformers-C2P5eKUT.cjs");
+const require_docloader = require("./docloader-BZfjD0Xt.cjs");
+const require_transformers = require("./transformers-DW7EyHh4.cjs");
 require("./compat/mod.cjs");
-const require_actor = require("./actor-CsvteFj1.cjs");
-const require_middleware = require("./middleware-UNqaTRBe.cjs");
-const require_lookup = require("./lookup-C6EHvNN7.cjs");
-const require_key = require("./key-B2ZqbGDP.cjs");
-const require_http = require("./http-cvQMgiFd.cjs");
-const require_proof = require("./proof-DiFRNymC.cjs");
-const require_types = require("./types-D4VM3B7I.cjs");
-const require_authdocloader = require("./authdocloader-tagnJZ6u.cjs");
+const require_actor = require("./actor-DILKT_HU.cjs");
+const require_middleware = require("./middleware-BD8iV5GL.cjs");
+const require_lookup = require("./lookup-BnvWOvmD.cjs");
+const require_key = require("./key-CUorXS6k.cjs");
+const require_http = require("./http-8jvVkJos.cjs");
+const require_proof = require("./proof-2V3jxAdE.cjs");
+const require_types = require("./types-B0U2QC2Q.cjs");
+const require_authdocloader = require("./authdocloader-hwjRHw8X.cjs");
 const require_vocab_mod = require("./vocab/mod.cjs");
 const require_federation_mod = require("./federation/mod.cjs");
 require("./nodeinfo/mod.cjs");