@fedify/fedify 1.10.6 → 1.10.8

package/dist/{http-kyXntNm5.cjs → http-Bg-OkZtX.cjs}

@@ -1,8 +1,8 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
-const require_docloader = require("./docloader-DWWy7Mlm.cjs");
-const require_actor = require("./actor-Bhyv1XG8.cjs");
-const require_key = require("./key-DgYChyco.cjs");
+const require_docloader = require("./docloader--HMTXXhM.cjs");
+const require_actor = require("./actor-CHbT9hXW.cjs");
+const require_key = require("./key-Bbf-ITpM.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _opentelemetry_api = require("@opentelemetry/api");
 let byte_encodings_base64 = require("byte-encodings/base64");

package/dist/{http-CbNRWhO2.js → http-CDZB3DBW.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-LthfAmat.js";
-import { y as CryptographicKey } from "./actor-D7XOmVKd.js";
-import { n as fetchKey, o as validateCryptoKey } from "./key-BR2q2bCE.js";
+import { d as name, f as version, t as FetchError } from "./docloader-Cms83CjK.js";
+import { y as CryptographicKey } from "./actor-BtdqoffI.js";
+import { n as fetchKey, o as validateCryptoKey } from "./key-ASS7oK8n.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";

package/dist/{inbox-gr3hW-GD.mjs → inbox-Cnih7u27.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-CeumAiRh.mjs";
+import { U as getTypeId, ot as name, st as version, t as Activity } from "./vocab-DcYXFzyR.mjs";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
 //#region src/federation/inbox.ts

package/dist/{key-BR2q2bCE.js → key-ASS7oK8n.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-LthfAmat.js";
-import { i as isActor, q as Object$1, y as CryptographicKey } from "./actor-D7XOmVKd.js";
+import { d as name, f as version, i as getDocumentLoader } from "./docloader-Cms83CjK.js";
+import { i as isActor, q as Object$1, y as CryptographicKey } from "./actor-BtdqoffI.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 //#region src/sig/key.ts

package/dist/{key-CTKl4AWD.mjs → key-B0qYOng3.mjs}

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

package/dist/{key-DgYChyco.cjs → key-Bbf-ITpM.cjs}

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

package/dist/{key-Db4XYUx7.mjs → key-C16D-kud.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-CeumAiRh.mjs";
-import { i as isActor } from "./actor-Cl985C7Q.mjs";
+import { J as getDocumentLoader, ot as name, s as CryptographicKey, st as version, v as Object$1 } from "./vocab-DcYXFzyR.mjs";
+import { i as isActor } from "./actor-stZ3L5bm.mjs";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 //#region src/sig/key.ts

package/dist/{key-Bzt8qD6I.cjs → key-DGuUMBsU.cjs}

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

package/dist/{keycache-YHrypd98.mjs → keycache-CBPbgb7d.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-CeumAiRh.mjs";
+import { g as Multikey, s as CryptographicKey } from "./vocab-DcYXFzyR.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-r0MYdjdV.mjs → keys-Br4iedk3.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-CeumAiRh.mjs";
+import { I as importSpki, g as Multikey, s as CryptographicKey } from "./vocab-DcYXFzyR.mjs";
 //#region src/testing/keys.ts
 const rsaPublicKey1 = new CryptographicKey({
 	id: new URL("https://example.com/key"),

package/dist/{ld-iTK8z54J.mjs → ld-7nQ68-rS.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-CeumAiRh.mjs";
-import { a as validateCryptoKey, n as fetchKey } from "./key-Db4XYUx7.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-DcYXFzyR.mjs";
+import { a as validateCryptoKey, n as fetchKey } from "./key-C16D-kud.mjs";
 import { getLogger } from "@logtape/logtape";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import jsonld from "jsonld";

package/dist/{lookup-BdSpYC1N.cjs → lookup-CA5RreoS.cjs}

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

package/dist/{lookup-BzhBNUNH.mjs → lookup-CCcDhxO2.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-CeumAiRh.mjs";
+import { J as getDocumentLoader, U as getTypeId, W as lookupWebFinger, ot as name, st as version, v as Object$1 } from "./vocab-DcYXFzyR.mjs";
 import { getLogger } from "@logtape/logtape";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { cloneDeep, delay } from "es-toolkit";

package/dist/{lookup-DZ9GTTzJ.js → lookup-CpMB-hV5.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-LthfAmat.js";
+import { d as name, f as version, l as UrlError, o as getUserAgent, u as validatePublicUrl } from "./docloader-Cms83CjK.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 //#region src/webfinger/lookup.ts

package/dist/{middleware-Df-QFT32.js → middleware-BDTuu7QY.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-LthfAmat.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-D7XOmVKd.js";
-import { t as lookupWebFinger } from "./lookup-DZ9GTTzJ.js";
-import { i as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-BR2q2bCE.js";
-import { r as verifyRequest, t as doubleKnock } from "./http-CbNRWhO2.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-CmhkztK1.js";
-import { n as getNodeInfo, t as nodeInfoToJson } from "./types-9gce5lHU.js";
-import { t as getAuthenticatedDocumentLoader } from "./authdocloader-D_IgE19r.js";
+import { d as name, f as version, i as getDocumentLoader, s as kvCache } from "./docloader-Cms83CjK.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-BtdqoffI.js";
+import { t as lookupWebFinger } from "./lookup-CpMB-hV5.js";
+import { i as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-ASS7oK8n.js";
+import { r as verifyRequest, t as doubleKnock } from "./http-CDZB3DBW.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-JCn_Nftz.js";
+import { n as getNodeInfo, t as nodeInfoToJson } from "./types-Dy8sMtkH.js";
+import { t as getAuthenticatedDocumentLoader } from "./authdocloader-BjFtWv8Q.js";
 import { lookupObject, traverseCollection } from "./vocab/mod.js";
 import { getLogger, withContext } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
@@ -2839,14 +2839,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
@@ -3479,6 +3482,7 @@ var ContextImpl = class ContextImpl {
 		}
 		const owner = this.getActorUri(identifier);
 		const result = [];
+		let i = 1;
 		for (const keyPair of keyPairs) {
 			const newPair = {
 				...keyPair,
@@ -3488,12 +3492,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;
 	}
@@ -3640,6 +3645,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 {
@@ -3657,8 +3663,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;
@@ -3689,6 +3700,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,
@@ -3728,7 +3749,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.");
@@ -4010,8 +4031,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-DRNvNZa1.cjs → middleware-BPTDstS-.cjs}

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

package/dist/{middleware-XbutA7xe.mjs → middleware-Bi5LcEMF.mjs}

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

package/dist/{middleware-CZOiI7j6.cjs → middleware-C90kKt44.cjs}

@@ -1,14 +1,14 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
-const require_docloader = require("./docloader-DWWy7Mlm.cjs");
-const require_transformers = require("./transformers-DQcMoinm.cjs");
-const require_actor = require("./actor-Bhyv1XG8.cjs");
-const require_lookup = require("./lookup-BdSpYC1N.cjs");
-const require_key = require("./key-DgYChyco.cjs");
-const require_http = require("./http-kyXntNm5.cjs");
-const require_proof = require("./proof-D9Y-Sfn8.cjs");
-const require_types = require("./types-BNAdhXAI.cjs");
-const require_authdocloader = require("./authdocloader-BLlsL860.cjs");
+const require_docloader = require("./docloader--HMTXXhM.cjs");
+const require_transformers = require("./transformers-Cd6Tdn3M.cjs");
+const require_actor = require("./actor-CHbT9hXW.cjs");
+const require_lookup = require("./lookup-CA5RreoS.cjs");
+const require_key = require("./key-Bbf-ITpM.cjs");
+const require_http = require("./http-Bg-OkZtX.cjs");
+const require_proof = require("./proof-BYdxNk_7.cjs");
+const require_types = require("./types-BVCtDIwE.cjs");
+const require_authdocloader = require("./authdocloader-qSZCRtME.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-DRNvNZa1.cjs"));
+		const { FederationImpl } = await Promise.resolve().then(() => require("./middleware-BPTDstS-.cjs"));
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -2831,14 +2831,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
@@ -3471,6 +3474,7 @@ var ContextImpl = class ContextImpl {
 		}
 		const owner = this.getActorUri(identifier);
 		const result = [];
+		let i = 1;
 		for (const keyPair of keyPairs) {
 			const newPair = {
 				...keyPair,
@@ -3480,12 +3484,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;
 	}
@@ -3632,6 +3637,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 {
@@ -3649,8 +3655,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;
@@ -3681,6 +3692,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,
@@ -3720,7 +3741,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.");
@@ -4002,8 +4023,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-Bk0hNv-N.mjs → middleware-Crs1EVL7.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-CeumAiRh.mjs";
-import { i as RouterError, n as traverseCollection, t as lookupObject } from "./lookup-BzhBNUNH.mjs";
-import { t as getNodeInfo } from "./client-Ds4v9YJZ.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-DcYXFzyR.mjs";
+import { i as RouterError, n as traverseCollection, t as lookupObject } from "./lookup-CCcDhxO2.mjs";
+import { t as getNodeInfo } from "./client-aAP3RFq_.mjs";
 import { t as nodeInfoToJson } from "./types-CAnkAQGM.mjs";
-import "./actor-Cl985C7Q.mjs";
-import { a as validateCryptoKey, i as importJwk, t as exportJwk } from "./key-Db4XYUx7.mjs";
-import { l as verifyRequest } from "./http-pZJd5Nkb.mjs";
-import { t as getAuthenticatedDocumentLoader } from "./authdocloader-A-uvTiEn.mjs";
-import { a as signJsonLd, i as hasSignature, o as verifyJsonLd, r as detachSignature } from "./ld-iTK8z54J.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-CoLrSrJE.mjs";
-import { n as signObject, r as verifyObject } from "./proof-CzEaLrMm.mjs";
-import { n as routeActivity } from "./inbox-gr3hW-GD.mjs";
-import { t as FederationBuilderImpl } from "./builder-BqZNPx3S.mjs";
+import "./actor-stZ3L5bm.mjs";
+import { a as validateCryptoKey, i as importJwk, t as exportJwk } from "./key-C16D-kud.mjs";
+import { l as verifyRequest } from "./http-BPQ_zPRB.mjs";
+import { t as getAuthenticatedDocumentLoader } from "./authdocloader-DiNlCuEL.mjs";
+import { a as signJsonLd, i as hasSignature, o as verifyJsonLd, r as detachSignature } from "./ld-7nQ68-rS.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-ncOJW9jU.mjs";
+import { n as signObject, r as verifyObject } from "./proof-Bd732W1s.mjs";
+import { n as routeActivity } from "./inbox-Cnih7u27.mjs";
+import { t as FederationBuilderImpl } from "./builder-C06p3NRV.mjs";
 import { t as buildCollectionSynchronizationHeader } from "./collection-BD6-SZ6O.mjs";
-import { t as KvKeyCache } from "./keycache-YHrypd98.mjs";
+import { t as KvKeyCache } from "./keycache-CBPbgb7d.mjs";
 import { t as createExponentialBackoffPolicy } from "./retry-Ddbq3AcK.mjs";
-import { n as sendActivity, t as extractInboxes } from "./send-vtEBiKbR.mjs";
+import { n as sendActivity, t as extractInboxes } from "./send-BUUNtAjI.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";
@@ -1852,14 +1852,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
@@ -2492,6 +2495,7 @@ var ContextImpl = class ContextImpl {
 		}
 		const owner = this.getActorUri(identifier);
 		const result = [];
+		let i = 1;
 		for (const keyPair of keyPairs) {
 			const newPair = {
 				...keyPair,
@@ -2501,12 +2505,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;
 	}
@@ -2653,6 +2658,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 {
@@ -2670,8 +2676,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;
@@ -2702,6 +2713,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,
@@ -2741,7 +2762,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.");
@@ -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/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-DWWy7Mlm.cjs");
-const require_transformers = require("./transformers-DQcMoinm.cjs");
+const require_docloader = require("./docloader--HMTXXhM.cjs");
+const require_transformers = require("./transformers-Cd6Tdn3M.cjs");
 require("./compat/mod.cjs");
-const require_actor = require("./actor-Bhyv1XG8.cjs");
-const require_middleware = require("./middleware-CZOiI7j6.cjs");
-const require_lookup = require("./lookup-BdSpYC1N.cjs");
-const require_key = require("./key-DgYChyco.cjs");
-const require_http = require("./http-kyXntNm5.cjs");
-const require_proof = require("./proof-D9Y-Sfn8.cjs");
-const require_types = require("./types-BNAdhXAI.cjs");
-const require_authdocloader = require("./authdocloader-BLlsL860.cjs");
+const require_actor = require("./actor-CHbT9hXW.cjs");
+const require_middleware = require("./middleware-C90kKt44.cjs");
+const require_lookup = require("./lookup-CA5RreoS.cjs");
+const require_key = require("./key-Bbf-ITpM.cjs");
+const require_http = require("./http-Bg-OkZtX.cjs");
+const require_proof = require("./proof-BYdxNk_7.cjs");
+const require_types = require("./types-BVCtDIwE.cjs");
+const require_authdocloader = require("./authdocloader-qSZCRtME.cjs");
 const require_vocab_mod = require("./vocab/mod.cjs");
 const require_federation_mod = require("./federation/mod.cjs");
 require("./nodeinfo/mod.cjs");