@fedify/fedify 2.2.0-dev.933 → 2.2.0-dev.938

package/dist/federation/middleware.test.mjs

@@ -4,25 +4,27 @@ globalThis.addEventListener = () => {};
 import { t as esm_default } from "../esm-DVILvP5e.mjs";
 import { n as RouterError } from "../router-CrMLXoOr.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import { n as assertStrictEquals } from "../std__assert-Duiq_YC9.mjs";
+import "../std__assert-CRDpx_HF.mjs";
 import { n as assertFalse, t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
 import { t as assertNotEquals } from "../assert_not_equals--wG9hV7u.mjs";
-import { t as assert } from "../assert-ddO5KLpe.mjs";
-import { l as verifyRequest, s as signRequest } from "../http-DAbItDan.mjs";
-import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-DKJ5e8gU.mjs";
-import { a as signJsonLd, o as verifyJsonLd, r as detachSignature } from "../ld-DYd5xgGv.mjs";
-import { t as doesActorOwnKey } from "../owner-BQOHi8l9.mjs";
-import { i as verifyObject, r as signObject } from "../proof-Bv96WRg6.mjs";
-import { t as MemoryKvStore } from "../kv-C-TG81Sv.mjs";
-import { i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-D3XX3847.mjs";
+import { t as assertStrictEquals } from "../assert_strict_equals-Dmjbg-bA.mjs";
+import { t as assert } from "../assert-DikXweDx.mjs";
+import { l as verifyRequest, s as signRequest } from "../http-pO-cqL07.mjs";
+import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DGu1NFwu.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-C5hOIM67.mjs";
+import { a as signJsonLd, o as verifyJsonLd, r as detachSignature } from "../ld-DkpX94b7.mjs";
+import { t as doesActorOwnKey } from "../owner-uOWCZ4oR.mjs";
+import { i as verifyObject, r as signObject } from "../proof-B9ynOKyy.mjs";
+import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
+import { i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-BOshhaxP.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import * as vocab from "@fedify/vocab";
 import { getTypeId, lookupObject } from "@fedify/vocab";
 import { FetchError, getDocumentLoader } from "@fedify/vocab-runtime";
 import { configure, reset } from "@logtape/logtape";
+import serialize from "json-canon";
 //#region ../fixture/src/fixtures/example.com/create.json
 var id$2 = "https://example.com/create";
 var create_default = {
@@ -1815,6 +1817,24 @@ test("FederationImpl.sendActivity()", async (t) => {
 		assertEquals(verified, ["ld", "http"]);
 		assertEquals((await request?.json())?.to, vocab.PUBLIC_COLLECTION.href);
 		verified = null;
+		await federation.sendActivity([{
+			privateKey: rsaPrivateKey3,
+			keyId: rsaPublicKey3.id
+		}], inboxes, new vocab.Create({
+			id: new URL("https://example.com/activity/attachment"),
+			actor: new URL("https://example.com/person2"),
+			object: new vocab.Note({
+				id: new URL("https://example.com/note/attachment"),
+				attachments: [new vocab.Document({
+					mediaType: "image/png",
+					url: new URL("https://example.com/image.png")
+				})]
+			})
+		}), { context });
+		assertEquals(verified, ["ld", "http"]);
+		const postedObject = (await request?.json()).object;
+		assertEquals(Array.isArray(postedObject.attachment), true);
+		verified = null;
 		await federation.sendActivity([{
 			privateKey: rsaPrivateKey3,
 			keyId: rsaPublicKey3.id
@@ -1834,6 +1854,53 @@ test("FederationImpl.sendActivity()", async (t) => {
 		assertEquals(request?.method, "POST");
 		assertEquals(request?.url, "https://example.com/inbox");
 		assertEquals(request?.headers.get("Content-Type"), "application/activity+json");
+		const preSignedActivity = new vocab.Create({
+			id: new URL("https://example.com/activity/pre-signed-attachment"),
+			actor: new URL("https://example.com/person2"),
+			object: new vocab.Note({
+				id: new URL("https://example.com/note/pre-signed-attachment"),
+				attachments: [new vocab.Document({
+					mediaType: "image/png",
+					url: new URL("https://example.com/pre-signed-image.png")
+				})]
+			})
+		});
+		const preSignedJson = await preSignedActivity.toJsonLd({
+			format: "compact",
+			contextLoader: mockDocumentLoader
+		});
+		const preSignedObject = preSignedJson.object;
+		assertEquals(Array.isArray(preSignedObject.attachment), false);
+		const created = Temporal.Now.instant();
+		const proofConfig = {
+			"@context": preSignedJson["@context"],
+			type: "DataIntegrityProof",
+			cryptosuite: "eddsa-jcs-2022",
+			verificationMethod: ed25519Multikey.id.href,
+			proofPurpose: "assertionMethod",
+			created: created.toString()
+		};
+		const encoder = new TextEncoder();
+		const proofDigest = await crypto.subtle.digest("SHA-256", encoder.encode(serialize(proofConfig)));
+		const msgDigest = await crypto.subtle.digest("SHA-256", encoder.encode(serialize(preSignedJson)));
+		const digest = new Uint8Array(proofDigest.byteLength + msgDigest.byteLength);
+		digest.set(new Uint8Array(proofDigest), 0);
+		digest.set(new Uint8Array(msgDigest), proofDigest.byteLength);
+		const proofValue = new Uint8Array(await crypto.subtle.sign("Ed25519", ed25519PrivateKey, digest));
+		verified = null;
+		await federation.sendActivity([{
+			privateKey: ed25519PrivateKey,
+			keyId: ed25519Multikey.id
+		}], inboxes, preSignedActivity.clone({ proofs: [new vocab.DataIntegrityProof({
+			cryptosuite: "eddsa-jcs-2022",
+			verificationMethod: ed25519Multikey.id,
+			proofPurpose: "assertionMethod",
+			proofValue,
+			created
+		})] }), { context });
+		assertEquals(verified, ["proof"]);
+		const postedPreSignedObject = (await request?.json()).object;
+		assertEquals(Array.isArray(postedPreSignedObject.attachment), false);
 		verified = null;
 		await federation.sendActivity([{
 			privateKey: rsaPrivateKey3,
@@ -2318,6 +2385,31 @@ test("ContextImpl.sendActivity()", async (t) => {
 		assertEquals(request?.method, "POST");
 		assertEquals(request?.url, "https://example.com/inbox");
 		assertEquals(request?.headers.get("Content-Type"), "application/activity+json");
+		const actorEdKey = (await ctx.getActorKeyPairs("1")).find((key) => key.privateKey.algorithm.name === "Ed25519");
+		assert(actorEdKey != null);
+		assert(actorEdKey.multikey.id != null);
+		const signedWithNormalizedProof = await signObject(new vocab.Create({
+			id: new URL("https://example.com/activity/signed-attachment"),
+			actor: ctx.getActorUri("1"),
+			object: new vocab.Note({
+				id: new URL("https://example.com/note/signed-attachment"),
+				attachments: [new vocab.Document({
+					mediaType: "image/png",
+					url: new URL("https://example.com/signed-image.png")
+				})]
+			})
+		}), actorEdKey.privateKey, actorEdKey.multikey.id, { contextLoader: documentLoader });
+		verified = null;
+		await ctx.sendActivity([{
+			privateKey: actorEdKey.privateKey,
+			keyId: actorEdKey.multikey.id
+		}], {
+			id: new URL("https://example.com/recipient"),
+			inboxId: new URL("https://example.com/inbox")
+		}, signedWithNormalizedProof, { normalizeExistingProofs: true });
+		assertEquals(verified, ["proof"]);
+		const postedSignedObject = (await request?.json()).object;
+		assertEquals(Array.isArray(postedSignedObject.attachment), true);
 		await assertRejects(() => ctx.sendActivity({ identifier: "not-found" }, {
 			id: new URL("https://example.com/recipient"),
 			inboxId: new URL("https://example.com/inbox")
@@ -2430,6 +2522,54 @@ test("ContextImpl.sendActivity()", async (t) => {
 		assertEquals(proofCount, 1);
 	});
 	queue.clear();
+	await t.step("fanout: \"force\" preserves pre-signed proof normalization", async () => {
+		const ctxForProof = new ContextImpl({
+			data: void 0,
+			federation,
+			url: new URL("https://example.com/"),
+			documentLoader,
+			contextLoader: documentLoader
+		});
+		const actorEdKey = (await ctxForProof.getActorKeyPairs("1")).find((key) => key.privateKey.algorithm.name === "Ed25519");
+		assert(actorEdKey != null);
+		assert(actorEdKey.multikey.id != null);
+		const signedWithNormalizedProof = await signObject(new vocab.Create({
+			id: new URL("https://example.com/activity/signed-attachment-fanout"),
+			actor: ctxForProof.getActorUri("1"),
+			object: new vocab.Note({
+				id: new URL("https://example.com/note/signed-attachment-fanout"),
+				attachments: [new vocab.Document({
+					mediaType: "image/png",
+					url: new URL("https://example.com/signed-fanout-image.png")
+				})]
+			})
+		}), actorEdKey.privateKey, actorEdKey.multikey.id, { contextLoader: documentLoader });
+		await ctx2.sendActivity([{
+			privateKey: actorEdKey.privateKey,
+			keyId: actorEdKey.multikey.id
+		}], {
+			id: new URL("https://example.com/recipient"),
+			inboxId: new URL("https://example.com/inbox")
+		}, signedWithNormalizedProof, {
+			fanout: "force",
+			normalizeExistingProofs: true
+		});
+		assertEquals(queue.messages.length, 1);
+		assert(queue.messages[0].type === "fanout");
+		const fanoutMsg = queue.messages[0];
+		assertEquals(fanoutMsg.normalizeExistingProofs, true);
+		queue.clear();
+		await federation2.processQueuedTask(void 0, fanoutMsg);
+		assertEquals(queue.messages.length, 1);
+		const outboxMsg = queue.messages[0];
+		assert(outboxMsg.type === "outbox");
+		verified = null;
+		await federation2.processQueuedTask(void 0, outboxMsg);
+		assertEquals(verified, ["proof"]);
+		const postedSignedObject = (await request?.json()).object;
+		assertEquals(Array.isArray(postedSignedObject.attachment), true);
+	});
+	queue.clear();
 	await t.step("fanout: \"skip\"", async () => {
 		const activity = new vocab.Create({
 			id: new URL("https://example.com/activity/1"),

package/dist/federation/mod.cjs

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

package/dist/federation/mod.d.cts

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

package/dist/federation/mod.d.ts

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

package/dist/federation/mod.js

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

package/dist/federation/mq.test.mjs

@@ -2,9 +2,9 @@ import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import { i as assertGreaterOrEqual, r as assertGreater } from "../std__assert-Duiq_YC9.mjs";
+import { n as assertGreater, r as assertGreaterOrEqual } from "../std__assert-CRDpx_HF.mjs";
 import { n as assertFalse } from "../assert_rejects-B-qJtC9Z.mjs";
-import { t as assert } from "../assert-ddO5KLpe.mjs";
+import { t as assert } from "../assert-DikXweDx.mjs";
 import { test } from "@fedify/fixture";
 import { delay } from "es-toolkit";
 //#region src/federation/mq.ts

package/dist/federation/negotiation.test.mjs

@@ -1,10 +1,10 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import "../std__assert-Duiq_YC9.mjs";
+import "../std__assert-CRDpx_HF.mjs";
 import { n as assertFalse } from "../assert_rejects-B-qJtC9Z.mjs";
-import { t as assert } from "../assert-ddO5KLpe.mjs";
-import { t as acceptsJsonLd } from "../negotiation-xb0QR3u_.mjs";
+import { t as assert } from "../assert-DikXweDx.mjs";
+import { t as acceptsJsonLd } from "../negotiation-SQvQgUqe.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/negotiation.test.ts
 test("acceptsJsonLd()", () => {

package/dist/federation/retry.test.mjs

@@ -3,7 +3,7 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { l as AssertionError, t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { t as assertNotEquals } from "../assert_not_equals--wG9hV7u.mjs";
-import { t as createExponentialBackoffPolicy } from "../retry-CJL0poaU.mjs";
+import { t as createExponentialBackoffPolicy } from "../retry-bMXBL97A.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/retry.test.ts
 test("createExponentialBackoffPolicy()", () => {

package/dist/federation/router.test.mjs

@@ -3,10 +3,10 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { n as RouterError, t as Router } from "../router-CrMLXoOr.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-Duiq_YC9.mjs";
+import "../std__assert-CRDpx_HF.mjs";
 import { n as assertFalse } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
-import { t as assert } from "../assert-ddO5KLpe.mjs";
+import { t as assert } from "../assert-DikXweDx.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/router.test.ts
 function setUp(options = {}) {

package/dist/federation/send.test.mjs

@@ -3,15 +3,15 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as esm_default } from "../esm-DVILvP5e.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-Duiq_YC9.mjs";
+import "../std__assert-CRDpx_HF.mjs";
 import { n as assertFalse, t as assertRejects } from "../assert_rejects-B-qJtC9Z.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assertNotEquals } from "../assert_not_equals--wG9hV7u.mjs";
-import { t as assert } from "../assert-ddO5KLpe.mjs";
-import { l as verifyRequest } from "../http-DAbItDan.mjs";
-import { i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
-import { t as doesActorOwnKey } from "../owner-BQOHi8l9.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-BTzs3k9i.mjs";
+import { t as assert } from "../assert-DikXweDx.mjs";
+import { l as verifyRequest } from "../http-pO-cqL07.mjs";
+import { i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DGu1NFwu.mjs";
+import { t as doesActorOwnKey } from "../owner-uOWCZ4oR.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "../send-D-qKOq3i.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { Activity, Application, Endpoints, Group, Person, Service } from "@fedify/vocab";
 //#region src/federation/send.test.ts

package/dist/federation/webfinger.test.mjs

@@ -3,9 +3,9 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { r as createRequestContext } from "../context-Dk_tacqz.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-Duiq_YC9.mjs";
-import { t as MemoryKvStore } from "../kv-C-TG81Sv.mjs";
-import { o as createFederation, s as handleWebFinger } from "../middleware-D3XX3847.mjs";
+import "../std__assert-CRDpx_HF.mjs";
+import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
+import { o as createFederation, s as handleWebFinger } from "../middleware-BOshhaxP.mjs";
 import { test } from "@fedify/fixture";
 import { Image, Link, Person, Tombstone } from "@fedify/vocab";
 //#region src/federation/webfinger.test.ts

package/dist/{http-DPlMNgUK.js → http-DMkdP3lE.js}

@@ -10,7 +10,7 @@ import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } fro
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.2.0-dev.933+2ba4d27a";
+var version = "2.2.0-dev.938+94d98c0c";
 //#endregion
 //#region src/sig/accept.ts
 /**

package/dist/{http-p0UsGIlL.cjs → http-De4te5mA.cjs}

@@ -11,7 +11,7 @@ let _opentelemetry_semantic_conventions = require("@opentelemetry/semantic-conve
 let byte_encodings_base64 = require("byte-encodings/base64");
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.2.0-dev.933+2ba4d27a";
+var version = "2.2.0-dev.938+94d98c0c";
 //#endregion
 //#region src/sig/accept.ts
 /**

package/dist/{http-DAbItDan.mjs → http-pO-cqL07.mjs}

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

package/dist/{key-DN889XzS.mjs → key-Ch1SiRyF.mjs}

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

package/dist/{kv-cache-CuhV7I2P.cjs → kv-cache-BM50uOpt.cjs}

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

package/dist/{kv-cache-BGV0-93s.js → kv-cache-D7IdkIte.js}

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

package/dist/{ld-DYd5xgGv.mjs → ld-DkpX94b7.mjs}

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

package/dist/{middleware-R4UP180T.cjs → middleware-0gXHFt3T.cjs}

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

package/dist/{middleware-D3XX3847.mjs → middleware-BOshhaxP.mjs}

@@ -2,24 +2,24 @@ import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { n as RouterError } from "./router-CrMLXoOr.mjs";
-import { n as version, t as name } from "./deno-B8mWkTTn.mjs";
-import { t as formatAcceptSignature } from "./accept-Dd__NiUL.mjs";
-import { a as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-DN889XzS.mjs";
-import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-DAbItDan.mjs";
-import { t as getAuthenticatedDocumentLoader } from "./docloader-DKJ5e8gU.mjs";
-import { n as kvCache } from "./kv-cache-B01V7s3h.mjs";
-import { a as signJsonLd, i as hasSignatureLike, o as verifyJsonLd, r as detachSignature } from "./ld-DYd5xgGv.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-BQOHi8l9.mjs";
-import { t as normalizePublicAudience } from "./public-audience-eovWqzOF.mjs";
-import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-Bv96WRg6.mjs";
-import { t as getNodeInfo } from "./client-DVu6Fmom.mjs";
-import { t as nodeInfoToJson } from "./types-CGUnLkU3.mjs";
-import { t as FederationBuilderImpl } from "./builder-CC8FC1dV.mjs";
-import { t as buildCollectionSynchronizationHeader } from "./collection-BQRKGS7L.mjs";
-import { t as KvKeyCache } from "./keycache-C2t1kvP5.mjs";
-import { t as acceptsJsonLd } from "./negotiation-xb0QR3u_.mjs";
-import { t as createExponentialBackoffPolicy } from "./retry-CJL0poaU.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-BTzs3k9i.mjs";
+import { n as version, t as name } from "./deno-sVjM503s.mjs";
+import { t as formatAcceptSignature } from "./accept-CPkZzmGN.mjs";
+import { a as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-Ch1SiRyF.mjs";
+import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-pO-cqL07.mjs";
+import { t as getAuthenticatedDocumentLoader } from "./docloader-C5hOIM67.mjs";
+import { n as kvCache } from "./kv-cache-U__xU4qR.mjs";
+import { a as signJsonLd, i as hasSignatureLike, o as verifyJsonLd, r as detachSignature } from "./ld-DkpX94b7.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-uOWCZ4oR.mjs";
+import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-CNmZLixq.mjs";
+import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-B9ynOKyy.mjs";
+import { t as getNodeInfo } from "./client-D_1QpnWt.mjs";
+import { t as nodeInfoToJson } from "./types-J53Kw7so.mjs";
+import { t as FederationBuilderImpl } from "./builder-Dq6ijpsL.mjs";
+import { t as buildCollectionSynchronizationHeader } from "./collection-D-HqUuA2.mjs";
+import { t as KvKeyCache } from "./keycache-EGATflN-.mjs";
+import { t as acceptsJsonLd } from "./negotiation-SQvQgUqe.mjs";
+import { t as createExponentialBackoffPolicy } from "./retry-bMXBL97A.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-D-qKOq3i.mjs";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, Tombstone, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
 import { lookupWebFinger } from "@fedify/webfinger";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
@@ -1952,6 +1952,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		await this.sendActivity(keys, message.inboxes, activity, {
 			collectionSync: message.collectionSync,
 			orderingKey: message.orderingKey,
+			normalizeExistingProofs: message.normalizeExistingProofs,
 			context
 		});
 	}
@@ -2236,6 +2237,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 		else if (keys.length < 1) throw new TypeError("The keys must not be empty.");
 		const contextLoader = this.contextLoaderFactory(this.#getLoaderOptions(ctx.origin));
 		const activityId = activity.id.href;
+		let hasProof = false;
 		let proofCreated = false;
 		let rsaKey = null;
 		for (const { keyId, privateKey } of keys) {
@@ -2246,15 +2248,16 @@ var FederationImpl = class extends FederationBuilderImpl {
 			};
 		}
 		for await (const _ of activity.getProofs({ contextLoader })) {
-			proofCreated = true;
+			hasProof = true;
 			break;
 		}
-		if (!proofCreated) {
+		if (!hasProof) {
 			for (const { keyId, privateKey } of keys) if (privateKey.algorithm.name === "Ed25519") {
 				activity = await signObject(activity, privateKey, keyId, {
 					contextLoader,
 					tracerProvider: this.tracerProvider
 				});
+				hasProof = true;
 				proofCreated = true;
 			}
 		}
@@ -2262,7 +2265,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			format: "compact",
 			contextLoader
 		});
-		jsonLd = await normalizePublicAudience(jsonLd, contextLoader);
+		if (proofCreated || !hasProof || options.normalizeExistingProofs) jsonLd = await normalizeOutgoingActivityJsonLd(jsonLd, contextLoader);
 		if (rsaKey == null) logger.warn("No supported key found to create a Linked Data signature for the activity {activityId}.  The activity will be sent without a Linked Data signature.  In order to create a Linked Data signature, at least one RSASSA-PKCS1-v1_5 key must be provided.", {
 			activityId,
 			keys: keys.map((pair) => ({
@@ -2274,7 +2277,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 			contextLoader,
 			tracerProvider: this.tracerProvider
 		});
-		if (!proofCreated) logger.warn("No supported key found to create a proof for the activity {activityId}.  The activity will be sent without a proof.  In order to create a proof, at least one Ed25519 key must be provided.", {
+		if (!hasProof) logger.warn("No supported key found to create a proof for the activity {activityId}.  The activity will be sent without a proof.  In order to create a proof, at least one Ed25519 key must be provided.", {
 			activityId,
 			keys: keys.map((pair) => ({
 				keyId: pair.keyId.href,
@@ -3071,7 +3074,8 @@ var ContextImpl = class ContextImpl {
 			context: this,
 			orderingKey: options.orderingKey,
 			collectionSync,
-			immediate: options.immediate
+			immediate: options.immediate,
+			normalizeExistingProofs: options.normalizeExistingProofs
 		};
 		span.setAttribute("activitypub.inboxes", expandedRecipients.length);
 		for (const activityTransformer of this.federation.activityTransformers) activity = activityTransformer(activity, this);
@@ -3083,6 +3087,7 @@ var ContextImpl = class ContextImpl {
 			});
 			throw new TypeError("The activity to send must have at least one actor property.");
 		}
+		let proofCreated = false;
 		if (actorKeyPairs != null) {
 			const contextLoader = this.contextLoader;
 			for (const kp of actorKeyPairs) {
@@ -3091,6 +3096,7 @@ var ContextImpl = class ContextImpl {
 					contextLoader,
 					tracerProvider: this.tracerProvider
 				});
+				proofCreated = true;
 			}
 		}
 		const inboxes = extractInboxes({
@@ -3111,7 +3117,10 @@ var ContextImpl = class ContextImpl {
 			activity
 		});
 		if (this.federation.fanoutQueue == null || options.immediate || options.fanout === "skip" || (options.fanout ?? "auto") === "auto" && globalThis.Object.keys(inboxes).length < FANOUT_THRESHOLD) {
-			await this.federation.sendActivity(keys, inboxes, activity, opts);
+			await this.federation.sendActivity(keys, inboxes, activity, {
+				...opts,
+				normalizeExistingProofs: proofCreated || options.normalizeExistingProofs
+			});
 			return true;
 		}
 		const keyJwkPairs = await Promise.all(keys.map(async ({ keyId, privateKey }) => ({
@@ -3137,6 +3146,7 @@ var ContextImpl = class ContextImpl {
 			activityType: getTypeId(activity).href,
 			collectionSync: opts.collectionSync,
 			orderingKey: options.orderingKey,
+			normalizeExistingProofs: proofCreated || options.normalizeExistingProofs,
 			traceContext: carrier
 		};
 		if (!this.federation.manuallyStartQueue) this.federation._startQueueInternal(this.data);

package/dist/{middleware-zZ0oW5en.mjs → middleware-BqT40f_u.mjs}

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