@fedify/fedify 1.10.7 → 1.10.8

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

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

package/dist/{key-DEYIxAFs.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-Q3DfzuUi.cjs");
-const require_actor = require("./actor-BGIAXtRd.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-DdL5Oc59.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-rT_94Pke.mjs";
-import { i as isActor } from "./actor-C-_2S5Mn.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-Cmbps6xt.cjs → key-DGuUMBsU.cjs}

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

package/dist/{keycache-BVR9f06Y.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-rT_94Pke.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-Co-0pK8a.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-rT_94Pke.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-BFaDk5gX.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-rT_94Pke.mjs";
-import { a as validateCryptoKey, n as fetchKey } from "./key-DdL5Oc59.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-CZGJqSjm.cjs → lookup-CA5RreoS.cjs}

@@ -1,6 +1,6 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
-const require_docloader = require("./docloader-Q3DfzuUi.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-CMYXdjVH.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-rT_94Pke.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-jlmCTRsO.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-Dtaju6oI.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-CmA2E9Bu.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-Dtaju6oI.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-Cujbx4Zv.js";
-import { t as lookupWebFinger } from "./lookup-jlmCTRsO.js";
-import { i as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-vIzWPiil.js";
-import { r as verifyRequest, t as doubleKnock } from "./http-DRnRwr3i.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-DHPbi_Mx.js";
-import { n as getNodeInfo, t as nodeInfoToJson } from "./types-CXZk86AG.js";
-import { t as getAuthenticatedDocumentLoader } from "./authdocloader-D4Y6iyTF.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,
@@ -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-BWlZ-wms.cjs → middleware-BPTDstS-.cjs}

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

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

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

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

@@ -1,14 +1,14 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
-const require_docloader = require("./docloader-Q3DfzuUi.cjs");
-const require_transformers = require("./transformers-CLtJ5H8o.cjs");
-const require_actor = require("./actor-BGIAXtRd.cjs");
-const require_lookup = require("./lookup-CZGJqSjm.cjs");
-const require_key = require("./key-DEYIxAFs.cjs");
-const require_http = require("./http-DCrun8ql.cjs");
-const require_proof = require("./proof-DcPdtve2.cjs");
-const require_types = require("./types-B34v-m2N.cjs");
-const require_authdocloader = require("./authdocloader-DQfruCir.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-BWlZ-wms.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,
@@ -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-BXD5WJbj.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-rT_94Pke.mjs";
-import { i as RouterError, n as traverseCollection, t as lookupObject } from "./lookup-CMYXdjVH.mjs";
-import { t as getNodeInfo } from "./client-Dyb8MI3u.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-C-_2S5Mn.mjs";
-import { a as validateCryptoKey, i as importJwk, t as exportJwk } from "./key-DdL5Oc59.mjs";
-import { l as verifyRequest } from "./http-BRwSVBn1.mjs";
-import { t as getAuthenticatedDocumentLoader } from "./authdocloader-1Sk2bqFx.mjs";
-import { a as signJsonLd, i as hasSignature, o as verifyJsonLd, r as detachSignature } from "./ld-BFaDk5gX.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-CNdS8zxf.mjs";
-import { n as signObject, r as verifyObject } from "./proof-Co7YmDpv.mjs";
-import { n as routeActivity } from "./inbox-pD1nbb_5.mjs";
-import { t as FederationBuilderImpl } from "./builder-CZbrDRl7.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-BVR9f06Y.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-BRCWNcMa.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,
@@ -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-Q3DfzuUi.cjs");
-const require_transformers = require("./transformers-CLtJ5H8o.cjs");
+const require_docloader = require("./docloader--HMTXXhM.cjs");
+const require_transformers = require("./transformers-Cd6Tdn3M.cjs");
 require("./compat/mod.cjs");
-const require_actor = require("./actor-BGIAXtRd.cjs");
-const require_middleware = require("./middleware-BhMQrJXH.cjs");
-const require_lookup = require("./lookup-CZGJqSjm.cjs");
-const require_key = require("./key-DEYIxAFs.cjs");
-const require_http = require("./http-DCrun8ql.cjs");
-const require_proof = require("./proof-DcPdtve2.cjs");
-const require_types = require("./types-B34v-m2N.cjs");
-const require_authdocloader = require("./authdocloader-DQfruCir.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");

package/dist/mod.d.cts

@@ -7,7 +7,7 @@ import { a as signRequest, c as FetchKeyResult, d as fetchKey, f as generateCryp
 import { i as getKeyOwner, n as GetKeyOwnerOptions, r as doesActorOwnKey, t as DoesActorOwnKeyOptions } from "./owner-0yNTyGMb.cjs";
 import { a as toAcctUrl, c as TraverseCollectionOptions, i as parseFediverseHandle, l as lookupObject, n as FediverseHandle, o as PUBLIC_COLLECTION, r as isFediverseHandle, s as LookupObjectOptions, t as getTypeId, u as traverseCollection } from "./mod-BQ3lrlXU.cjs";
 import { i as ResourceDescriptor, n as lookupWebFinger } from "./mod-CDbqB60V.cjs";
-import { $ as CustomCollectionCursor, A as createFederation, B as RouterRouteResult, C as InboxListenerSetters, D as FederationKvPrefixes, E as CreateFederationOptions, F as Message, G as ActorDispatcher, H as respondWithObject, I as createFederationBuilder, J as AuthorizePredicate, K as ActorHandleMapper, L as Router, M as RetryContext, N as RetryPolicy, O as FederationOrigin, P as createExponentialBackoffPolicy, Q as CustomCollectionCounter, R as RouterError, S as IdempotencyStrategy, T as Rfc6570Expression, U as respondWithObjectIfAcceptable, V as RespondWithObjectOptions, W as ActorAliasMapper, X as CollectionCursor, Y as CollectionCounter, Z as CollectionDispatcher, _ as FederationBuilder, a as InboxContext, at as ObjectDispatcher, b as FederationStartQueueOptions, c as RouteActivityOptions, ct as WebFingerLinksDispatcher, d as ActorCallbackSetters, dt as buildCollectionSynchronizationHeader, et as CustomCollectionDispatcher, f as CollectionCallbackSetters, ft as digest, g as Federation, h as Federatable, i as GetSignedKeyOptions, it as ObjectAuthorizePredicate, j as CreateExponentialBackoffPolicyOptions, k as FederationQueueOptions, l as SendActivityOptions, lt as SenderKeyPair, m as CustomCollectionCallbackSetters, n as Context, nt as InboxListener, o as ParseUriResult, ot as OutboxErrorHandler, p as ConstructorWithTypeId, pt as ActivityTransformer, q as ActorKeyPairsDispatcher, r as ForwardActivityOptions, rt as NodeInfoDispatcher, s as RequestContext, st as SharedInboxKeyDispatcher, t as ActorKeyPair, tt as InboxErrorHandler, u as SendActivityOptionsForCollection, ut as PageItems, v as FederationFetchOptions, w as ObjectCallbackSetters, x as IdempotencyKeyCallback, y as FederationOptions, z as RouterOptions } from "./context-PfghnHYj.cjs";
+import { $ as CustomCollectionCursor, A as createFederation, B as RouterRouteResult, C as InboxListenerSetters, D as FederationKvPrefixes, E as CreateFederationOptions, F as Message, G as ActorDispatcher, H as respondWithObject, I as createFederationBuilder, J as AuthorizePredicate, K as ActorHandleMapper, L as Router, M as RetryContext, N as RetryPolicy, O as FederationOrigin, P as createExponentialBackoffPolicy, Q as CustomCollectionCounter, R as RouterError, S as IdempotencyStrategy, T as Rfc6570Expression, U as respondWithObjectIfAcceptable, V as RespondWithObjectOptions, W as ActorAliasMapper, X as CollectionCursor, Y as CollectionCounter, Z as CollectionDispatcher, _ as FederationBuilder, a as InboxContext, at as ObjectDispatcher, b as FederationStartQueueOptions, c as RouteActivityOptions, ct as WebFingerLinksDispatcher, d as ActorCallbackSetters, dt as buildCollectionSynchronizationHeader, et as CustomCollectionDispatcher, f as CollectionCallbackSetters, ft as digest, g as Federation, h as Federatable, i as GetSignedKeyOptions, it as ObjectAuthorizePredicate, j as CreateExponentialBackoffPolicyOptions, k as FederationQueueOptions, l as SendActivityOptions, lt as SenderKeyPair, m as CustomCollectionCallbackSetters, n as Context, nt as InboxListener, o as ParseUriResult, ot as OutboxErrorHandler, p as ConstructorWithTypeId, pt as ActivityTransformer, q as ActorKeyPairsDispatcher, r as ForwardActivityOptions, rt as NodeInfoDispatcher, s as RequestContext, st as SharedInboxKeyDispatcher, t as ActorKeyPair, tt as InboxErrorHandler, u as SendActivityOptionsForCollection, ut as PageItems, v as FederationFetchOptions, w as ObjectCallbackSetters, x as IdempotencyKeyCallback, y as FederationOptions, z as RouterOptions } from "./context-BzSr5FCW.cjs";
 import { a as MessageQueueListenOptions, i as MessageQueueEnqueueOptions, n as InProcessMessageQueueOptions, o as ParallelMessageQueue, r as MessageQueue, t as InProcessMessageQueue } from "./mq-CrItclRD.cjs";
 import { actorDehydrator, autoIdAssigner, getDefaultActivityTransformers } from "./compat/mod.cjs";
 import { GetAuthenticatedDocumentLoaderOptions, exportMultibaseKey, exportSpki, getAuthenticatedDocumentLoader, importMultibaseKey, importPem, importPkcs1, importSpki } from "./runtime/mod.cjs";

package/dist/mod.d.ts

@@ -9,7 +9,7 @@ import { a as signRequest, c as FetchKeyResult, d as fetchKey, f as generateCryp
 import { i as getKeyOwner, n as GetKeyOwnerOptions, r as doesActorOwnKey, t as DoesActorOwnKeyOptions } from "./owner-CPEbNpnZ.js";
 import { a as toAcctUrl, c as TraverseCollectionOptions, i as parseFediverseHandle, l as lookupObject, n as FediverseHandle, o as PUBLIC_COLLECTION, r as isFediverseHandle, s as LookupObjectOptions, t as getTypeId, u as traverseCollection } from "./mod-Lj0W1nnG.js";
 import { i as ResourceDescriptor, n as lookupWebFinger } from "./mod-lHd-Zdd_.js";
-import { $ as CustomCollectionCursor, A as createFederation, B as RouterRouteResult, C as InboxListenerSetters, D as FederationKvPrefixes, E as CreateFederationOptions, F as Message, G as ActorDispatcher, H as respondWithObject, I as createFederationBuilder, J as AuthorizePredicate, K as ActorHandleMapper, L as Router, M as RetryContext, N as RetryPolicy, O as FederationOrigin, P as createExponentialBackoffPolicy, Q as CustomCollectionCounter, R as RouterError, S as IdempotencyStrategy, T as Rfc6570Expression, U as respondWithObjectIfAcceptable, V as RespondWithObjectOptions, W as ActorAliasMapper, X as CollectionCursor, Y as CollectionCounter, Z as CollectionDispatcher, _ as FederationBuilder, a as InboxContext, at as ObjectDispatcher, b as FederationStartQueueOptions, c as RouteActivityOptions, ct as WebFingerLinksDispatcher, d as ActorCallbackSetters, dt as buildCollectionSynchronizationHeader, et as CustomCollectionDispatcher, f as CollectionCallbackSetters, ft as digest, g as Federation, h as Federatable, i as GetSignedKeyOptions, it as ObjectAuthorizePredicate, j as CreateExponentialBackoffPolicyOptions, k as FederationQueueOptions, l as SendActivityOptions, lt as SenderKeyPair, m as CustomCollectionCallbackSetters, n as Context, nt as InboxListener, o as ParseUriResult, ot as OutboxErrorHandler, p as ConstructorWithTypeId, pt as ActivityTransformer, q as ActorKeyPairsDispatcher, r as ForwardActivityOptions, rt as NodeInfoDispatcher, s as RequestContext, st as SharedInboxKeyDispatcher, t as ActorKeyPair, tt as InboxErrorHandler, u as SendActivityOptionsForCollection, ut as PageItems, v as FederationFetchOptions, w as ObjectCallbackSetters, x as IdempotencyKeyCallback, y as FederationOptions, z as RouterOptions } from "./context-C6n2yrj0.js";
+import { $ as CustomCollectionCursor, A as createFederation, B as RouterRouteResult, C as InboxListenerSetters, D as FederationKvPrefixes, E as CreateFederationOptions, F as Message, G as ActorDispatcher, H as respondWithObject, I as createFederationBuilder, J as AuthorizePredicate, K as ActorHandleMapper, L as Router, M as RetryContext, N as RetryPolicy, O as FederationOrigin, P as createExponentialBackoffPolicy, Q as CustomCollectionCounter, R as RouterError, S as IdempotencyStrategy, T as Rfc6570Expression, U as respondWithObjectIfAcceptable, V as RespondWithObjectOptions, W as ActorAliasMapper, X as CollectionCursor, Y as CollectionCounter, Z as CollectionDispatcher, _ as FederationBuilder, a as InboxContext, at as ObjectDispatcher, b as FederationStartQueueOptions, c as RouteActivityOptions, ct as WebFingerLinksDispatcher, d as ActorCallbackSetters, dt as buildCollectionSynchronizationHeader, et as CustomCollectionDispatcher, f as CollectionCallbackSetters, ft as digest, g as Federation, h as Federatable, i as GetSignedKeyOptions, it as ObjectAuthorizePredicate, j as CreateExponentialBackoffPolicyOptions, k as FederationQueueOptions, l as SendActivityOptions, lt as SenderKeyPair, m as CustomCollectionCallbackSetters, n as Context, nt as InboxListener, o as ParseUriResult, ot as OutboxErrorHandler, p as ConstructorWithTypeId, pt as ActivityTransformer, q as ActorKeyPairsDispatcher, r as ForwardActivityOptions, rt as NodeInfoDispatcher, s as RequestContext, st as SharedInboxKeyDispatcher, t as ActorKeyPair, tt as InboxErrorHandler, u as SendActivityOptionsForCollection, ut as PageItems, v as FederationFetchOptions, w as ObjectCallbackSetters, x as IdempotencyKeyCallback, y as FederationOptions, z as RouterOptions } from "./context-CyacVopT.js";
 import { a as MessageQueueListenOptions, i as MessageQueueEnqueueOptions, n as InProcessMessageQueueOptions, o as ParallelMessageQueue, r as MessageQueue, t as InProcessMessageQueue } from "./mq-D_ZZRdby.js";
 import { actorDehydrator, autoIdAssigner, getDefaultActivityTransformers } from "./compat/mod.js";
 import { GetAuthenticatedDocumentLoaderOptions, exportMultibaseKey, exportSpki, getAuthenticatedDocumentLoader, importMultibaseKey, importPem, importPkcs1, importSpki } from "./runtime/mod.js";

package/dist/mod.js

@@ -2,15 +2,15 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 import { n as autoIdAssigner, r as getDefaultActivityTransformers, t as actorDehydrator } from "./transformers-BV4OeK9o.js";
 import "./compat/mod.js";
-import { i as getDocumentLoader, o as getUserAgent, r as fetchDocumentLoader, s as kvCache, t as FetchError } from "./docloader-Dtaju6oI.js";
-import { $ as Person, A as Flag, B as Like, C as Dislike, Ct as importPkcs1, D as Endpoints, E as EmojiReact, F as Image, G as Multikey, H as Listen, I as IntransitiveActivity, J as Offer, K as Note, L as Invite, M as Group, N as Hashtag, O as Event, P as Ignore, Q as Page, R as Join, S as DidService, St as importPem, T as Emoji, Tt as getTypeId, U as Mention, V as Link, W as Move, X as OrderedCollectionPage, Y as OrderedCollection, Z as Organization, _ as CollectionPage, _t as View, a as normalizeActorHandle, at as Reject, b as DataIntegrityProof, bt as exportSpki, c as Add, ct as Service, d as Arrive, dt as TentativeReject, et as Place, f as Article, ft as Tombstone, g as Collection, gt as Video, h as ChatMessage, ht as Update, i as isActor, it as Read, j as Follow, k as Export, l as Announce, lt as Source, m as Block, mt as Undo, n as getActorHandle, nt as PropertyValue, o as Accept, ot as Relationship, p as Audio, pt as Travel, q as Object$1, r as getActorTypeName, rt as Question, s as Activity, st as Remove, t as getActorClassByTypeName, tt as Profile, u as Application, ut as TentativeAccept, v as Create, vt as LanguageString, w as Document, wt as importSpki, x as Delete, xt as importMultibaseKey, y as CryptographicKey, yt as exportMultibaseKey, z as Leave } from "./actor-Cujbx4Zv.js";
-import { a as respondWithObjectIfAcceptable, c as createFederationBuilder, i as respondWithObject, l as Router, o as buildCollectionSynchronizationHeader, r as createExponentialBackoffPolicy, s as digest, t as createFederation, u as RouterError } from "./middleware-CmA2E9Bu.js";
-import { t as lookupWebFinger } from "./lookup-jlmCTRsO.js";
-import { i as importJwk, n as fetchKey, r as generateCryptoKeyPair, t as exportJwk } from "./key-vIzWPiil.js";
-import { n as signRequest, r as verifyRequest } from "./http-DRnRwr3i.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-DHPbi_Mx.js";
-import { a as parseSemVer, i as formatSemVer, n as getNodeInfo, r as parseNodeInfo, t as nodeInfoToJson } from "./types-CXZk86AG.js";
-import { t as getAuthenticatedDocumentLoader } from "./authdocloader-D4Y6iyTF.js";
+import { i as getDocumentLoader, o as getUserAgent, r as fetchDocumentLoader, s as kvCache, t as FetchError } from "./docloader-Cms83CjK.js";
+import { $ as Person, A as Flag, B as Like, C as Dislike, Ct as importPkcs1, D as Endpoints, E as EmojiReact, F as Image, G as Multikey, H as Listen, I as IntransitiveActivity, J as Offer, K as Note, L as Invite, M as Group, N as Hashtag, O as Event, P as Ignore, Q as Page, R as Join, S as DidService, St as importPem, T as Emoji, Tt as getTypeId, U as Mention, V as Link, W as Move, X as OrderedCollectionPage, Y as OrderedCollection, Z as Organization, _ as CollectionPage, _t as View, a as normalizeActorHandle, at as Reject, b as DataIntegrityProof, bt as exportSpki, c as Add, ct as Service, d as Arrive, dt as TentativeReject, et as Place, f as Article, ft as Tombstone, g as Collection, gt as Video, h as ChatMessage, ht as Update, i as isActor, it as Read, j as Follow, k as Export, l as Announce, lt as Source, m as Block, mt as Undo, n as getActorHandle, nt as PropertyValue, o as Accept, ot as Relationship, p as Audio, pt as Travel, q as Object$1, r as getActorTypeName, rt as Question, s as Activity, st as Remove, t as getActorClassByTypeName, tt as Profile, u as Application, ut as TentativeAccept, v as Create, vt as LanguageString, w as Document, wt as importSpki, x as Delete, xt as importMultibaseKey, y as CryptographicKey, yt as exportMultibaseKey, z as Leave } from "./actor-BtdqoffI.js";
+import { a as respondWithObjectIfAcceptable, c as createFederationBuilder, i as respondWithObject, l as Router, o as buildCollectionSynchronizationHeader, r as createExponentialBackoffPolicy, s as digest, t as createFederation, u as RouterError } from "./middleware-BDTuu7QY.js";
+import { t as lookupWebFinger } from "./lookup-CpMB-hV5.js";
+import { i as importJwk, n as fetchKey, r as generateCryptoKeyPair, t as exportJwk } from "./key-ASS7oK8n.js";
+import { n as signRequest, r as verifyRequest } from "./http-CDZB3DBW.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-JCn_Nftz.js";
+import { a as parseSemVer, i as formatSemVer, n as getNodeInfo, r as parseNodeInfo, t as nodeInfoToJson } from "./types-Dy8sMtkH.js";
+import { t as getAuthenticatedDocumentLoader } from "./authdocloader-BjFtWv8Q.js";
 import { PUBLIC_COLLECTION, isFediverseHandle, lookupObject, parseFediverseHandle, toAcctUrl, traverseCollection } from "./vocab/mod.js";
 import { InProcessMessageQueue, MemoryKvStore, ParallelMessageQueue } from "./federation/mod.js";
 import "./nodeinfo/mod.js";