@fedify/fedify 2.5.0-dev.2420 → 2.5.0-dev.2432

package/dist/{builder-Cwc3Eu59.mjs → builder-nME5sBeL.mjs}

@@ -2,7 +2,7 @@ import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { i as getPortableDid, l as isPortableId, n as getCanonicalPortableId } from "./portable-key-id-Ca30-hOa.mjs";
-import { n as version, t as name } from "./deno-D4J5fszd.mjs";
+import { n as version, t as name } from "./deno-Cqkt-KD5.mjs";
 import { t as ActivityListenerSet } from "./activity-listener-C-BSbKI7.mjs";
 import { getLogger } from "@logtape/logtape";
 import { Router, RouterError, assertPath } from "@fedify/uri-template";
@@ -91,7 +91,7 @@ var FederationBuilderImpl = class {
 	* specified.
 	*/
 	async build(options) {
-		const { FederationImpl } = await import("./middleware-DhI-75xh.mjs");
+		const { FederationImpl } = await import("./middleware-CzicgguP.mjs");
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();

package/dist/compat/transformers.test.mjs

@@ -5,7 +5,7 @@ import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-mrXWWNY-.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { O as actorDehydrator, k as autoIdAssigner, n as FederationImpl } from "../middleware-rQqAHzIo.mjs";
+import { O as actorDehydrator, k as autoIdAssigner, n as FederationImpl } from "../middleware-Defzf-30.mjs";
 import { Follow, Person } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
 //#region src/compat/transformers.test.ts

package/dist/{compound-proof-Dtwrhs1I.mjs → compound-proof-C-tPcb-r.mjs}

@@ -3,9 +3,9 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { a as getRawCanonicalPortableId, l as isPortableId, n as getCanonicalPortableId } from "./portable-key-id-Ca30-hOa.mjs";
 import { a as verificationObservation, t as observeAttempt } from "./verification-Dpfcw8ml.mjs";
-import { c as getNormalizationContextLoader } from "./ld-BeBdBDAY.mjs";
+import { c as getNormalizationContextLoader } from "./ld-C13upTHv.mjs";
 import { n as preloadedOnlyDocumentLoader } from "./public-audience--klBIOk1.mjs";
-import { a as preparePortableObjectProofPolicy, f as verifyPreparedPortableObjectProofPolicy, n as classifyFep2277CoreType, s as verifyMapLocalProof, u as verifyPortableObjectProofPolicy } from "./proof-DOV4ZiAo.mjs";
+import { a as preparePortableObjectProofPolicy, f as verifyPreparedPortableObjectProofPolicy, n as classifyFep2277CoreType, s as verifyMapLocalProof, u as verifyPortableObjectProofPolicy } from "./proof-DdI4I2Jg.mjs";
 import { parseIri, preloadedContexts } from "@fedify/vocab-runtime";
 import jsonld from "@fedify/vocab-runtime/jsonld";
 //#region src/sig/compound-proof.ts

package/dist/{deno-D4J5fszd.mjs → deno-Cqkt-KD5.mjs}

@@ -3,6 +3,6 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.5.0-dev.2420+4db1db92";
+var version = "2.5.0-dev.2432+f56118e1";
 //#endregion
 export { version as n, name as t };

package/dist/{docloader-ChK1DQkj.mjs → docloader-CGBUQXUP.mjs}

@@ -1,8 +1,8 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { T as validateCryptoKey } from "./ld-BeBdBDAY.mjs";
-import { n as doubleKnock } from "./http--kHQomKT.mjs";
+import { T as validateCryptoKey } from "./ld-C13upTHv.mjs";
+import { n as doubleKnock } from "./http-VRVl77qN.mjs";
 import { getLogger } from "@logtape/logtape";
 import { FetchError, UrlError, createActivityPubRequest, getRemoteDocument, logRequest, resolveDocumentLoaderTimeout, validatePublicUrl, withDocumentLoaderTimeout } from "@fedify/vocab-runtime";
 import { curry } from "es-toolkit";
@@ -64,8 +64,10 @@ function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, maxRedi
 		}, options);
 	}
 	async function validateUrl(url, options) {
-		const protocol = new URL(url).protocol;
+		const parsedUrl = new URL(url);
+		const protocol = parsedUrl.protocol;
 		if (protocol !== "http:" && protocol !== "https:") throw new UrlError(`Unsupported protocol: ${protocol}`);
+		if (parsedUrl.username !== "" || parsedUrl.password !== "") throw new UrlError("URLs with credentials are not allowed");
 		if (!allowPrivateAddress) {
 			try {
 				await validatePublicUrl(url);

package/dist/federation/builder.test.mjs

@@ -7,7 +7,7 @@ import { t as assertExists } from "../assert_exists-cffSpJ7X.mjs";
 import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-CYvBmkpC.mjs";
-import { r as createFederationBuilder } from "../builder-Cwc3Eu59.mjs";
+import { r as createFederationBuilder } from "../builder-nME5sBeL.mjs";
 import { DisallowedOperatorError, DisallowedVarSpecModifierError, DuplicateRouteVariableError, RouteTemplateOptionsNotMatchedError, RouterError } from "@fedify/uri-template";
 import { Activity, Note, Person } from "@fedify/vocab";
 import { test } from "@fedify/fixture";

package/dist/federation/compound-fanout.test.mjs

@@ -6,11 +6,11 @@ import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { y as exportJwk } from "../ld-BeBdBDAY.mjs";
+import { y as exportJwk } from "../ld-C13upTHv.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "../outgoing-jsonld-4IJqPYos.mjs";
-import { o as signObject, p as verifyProof } from "../proof-DOV4ZiAo.mjs";
+import { o as signObject, p as verifyProof } from "../proof-DdI4I2Jg.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { n as FederationImpl } from "../middleware-rQqAHzIo.mjs";
+import { n as FederationImpl } from "../middleware-Defzf-30.mjs";
 import { Create, DataIntegrityProof, Note } from "@fedify/vocab";
 import { exportDidKey, parseIri } from "@fedify/vocab-runtime";
 import { mockDocumentLoader, test } from "@fedify/fixture";

package/dist/federation/handler-compound-proof.test.mjs

@@ -5,10 +5,10 @@ import { r as createRequestContext, t as createInboxContext } from "../context-8
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
-import { a as compactJsonLd, m as verifyCompactJsonLd, p as signJsonLd } from "../ld-BeBdBDAY.mjs";
-import { l as signRequest } from "../http--kHQomKT.mjs";
+import { a as compactJsonLd, m as verifyCompactJsonLd, p as signJsonLd } from "../ld-C13upTHv.mjs";
+import { l as signRequest } from "../http-VRVl77qN.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { f as handleInbox, o as createFederation } from "../middleware-rQqAHzIo.mjs";
+import { f as handleInbox, o as createFederation } from "../middleware-Defzf-30.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-C-BSbKI7.mjs";
 import { t as map_local_create_note_default } from "../map-local-create-note-B0SeXJms.mjs";
 import { Create, CryptographicKey, Multikey, Person, Update } from "@fedify/vocab";

package/dist/federation/handler.test.mjs

@@ -11,11 +11,11 @@ import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
 import { r as parseAcceptSignature } from "../accept-CPVqki78.mjs";
-import { C as generateCryptoKeyPair, a as compactJsonLd, p as signJsonLd } from "../ld-BeBdBDAY.mjs";
-import { o as signObject } from "../proof-DOV4ZiAo.mjs";
-import { l as signRequest } from "../http--kHQomKT.mjs";
+import { C as generateCryptoKeyPair, a as compactJsonLd, p as signJsonLd } from "../ld-C13upTHv.mjs";
+import { o as signObject } from "../proof-DdI4I2Jg.mjs";
+import { l as signRequest } from "../http-VRVl77qN.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
-import { d as handleCustomCollection, f as handleInbox, g as respondWithObjectIfAcceptable, h as respondWithObject, l as handleActor, m as handleOutbox, o as createFederation, p as handleObject, u as handleCollection } from "../middleware-rQqAHzIo.mjs";
+import { d as handleCustomCollection, f as handleInbox, g as respondWithObjectIfAcceptable, h as respondWithObject, l as handleActor, m as handleOutbox, o as createFederation, p as handleObject, u as handleCollection } from "../middleware-Defzf-30.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-C-BSbKI7.mjs";
 import { t as FedifySpanExporter } from "../exporter-DThFfe7P.mjs";
 import { configure, getLogger, reset, withContext } from "@logtape/logtape";

package/dist/federation/hashlink-media.test.mjs

@@ -10,8 +10,8 @@ import "../std__assert-DvMDRPes.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-CYvBmkpC.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
 import { r as ed25519PublicKey } from "../keys-DIJNHW-Y.mjs";
-import { o as createFederation, x as parseHashlinkGatewayRequest } from "../middleware-rQqAHzIo.mjs";
-import { r as createFederationBuilder } from "../builder-Cwc3Eu59.mjs";
+import { o as createFederation, x as parseHashlinkGatewayRequest } from "../middleware-Defzf-30.mjs";
+import { r as createFederationBuilder } from "../builder-nME5sBeL.mjs";
 import { n as RouterError } from "../router-u5O5KCQr.mjs";
 import { Note } from "@fedify/vocab";
 import { computeDigestMultibase, encodeMultibase, exportDidKey } from "@fedify/vocab-runtime";

package/dist/federation/idempotency.test.mjs

@@ -4,9 +4,9 @@ globalThis.addEventListener = () => {};
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
-import { o as signObject } from "../proof-DOV4ZiAo.mjs";
+import { o as signObject } from "../proof-DdI4I2Jg.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
-import { o as createFederation } from "../middleware-rQqAHzIo.mjs";
+import { o as createFederation } from "../middleware-Defzf-30.mjs";
 import { Create, Follow, Person } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 //#region src/federation/idempotency.test.ts

package/dist/federation/inbox-report.test.mjs

@@ -2,12 +2,12 @@ import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
-import { p as signJsonLd } from "../ld-BeBdBDAY.mjs";
-import { o as signObject } from "../proof-DOV4ZiAo.mjs";
-import { l as signRequest } from "../http--kHQomKT.mjs";
+import { p as signJsonLd } from "../ld-C13upTHv.mjs";
+import { o as signObject } from "../proof-DdI4I2Jg.mjs";
+import { l as signRequest } from "../http-VRVl77qN.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
-import { o as createFederation } from "../middleware-rQqAHzIo.mjs";
-import { r as createFederationBuilder } from "../builder-Cwc3Eu59.mjs";
+import { o as createFederation } from "../middleware-Defzf-30.mjs";
+import { r as createFederationBuilder } from "../builder-nME5sBeL.mjs";
 import { Create, Person } from "@fedify/vocab";
 import { exportDidKey, parseIri } from "@fedify/vocab-runtime";
 import { mockDocumentLoader, test } from "@fedify/fixture";

package/dist/federation/inbox.test.mjs

@@ -5,7 +5,7 @@ import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-C-BSbKI7.mjs";
-import { t as actorsHaveSameOrigin } from "../inbox-BGD7K-Ra.mjs";
+import { t as actorsHaveSameOrigin } from "../inbox-Blrwn114.mjs";
 import { Activity, Create, Invite, Offer, Update } from "@fedify/vocab";
 import { parseIri } from "@fedify/vocab-runtime";
 import { test } from "@fedify/fixture";

package/dist/federation/keycache.test.mjs

@@ -6,7 +6,7 @@ import { t as ManualClockKvStore } from "../kv-DBRWVx3Q.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-mrXWWNY-.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { t as KvKeyCache } from "../keycache-D-MNltOk.mjs";
+import { t as KvKeyCache } from "../keycache-N2opu4-3.mjs";
 import { CryptographicKey, Multikey } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
 //#region src/federation/keycache.test.ts
@@ -16,7 +16,7 @@ test("KvKeyCache.set()", async () => {
 	await cache.set(new URL("https://example.com/key"), new CryptographicKey({ id: new URL("https://example.com/key") }));
 	assertEquals(await kv.get([
 		"pk",
-		"2",
+		"3",
 		"https://example.com/key"
 	]), {
 		"@context": "https://w3id.org/security/v1",
@@ -26,7 +26,7 @@ test("KvKeyCache.set()", async () => {
 	await cache.set(new URL("https://example.com/key2"), new Multikey({ id: new URL("https://example.com/key2") }));
 	assertEquals(await kv.get([
 		"pk",
-		"2",
+		"3",
 		"https://example.com/key2"
 	]), {
 		"@context": "https://w3id.org/security/multikey/v1",
@@ -37,7 +37,7 @@ test("KvKeyCache.set()", async () => {
 	assert(cache.nullKeys.has("https://example.com/null"));
 	assertEquals(await kv.get([
 		"pk",
-		"2",
+		"3",
 		"https://example.com/null"
 	]), null);
 });
@@ -46,7 +46,7 @@ test("KvKeyCache.get()", async () => {
 	const cache = new KvKeyCache(kv, ["pk"]);
 	await kv.set([
 		"pk",
-		"2",
+		"3",
 		"https://example.com/key"
 	], {
 		"@context": "https://w3id.org/security/v1",
@@ -58,7 +58,7 @@ test("KvKeyCache.get()", async () => {
 	assertEquals(cryptoKey?.id?.href, "https://example.com/key");
 	await kv.set([
 		"pk",
-		"2",
+		"3",
 		"https://example.com/key2"
 	], {
 		"@context": "https://w3id.org/security/multikey/v1",
@@ -72,7 +72,7 @@ test("KvKeyCache.get()", async () => {
 	assertEquals(await cache.get(new URL("https://example.com/null")), null);
 	await kv.set([
 		"pk",
-		"2",
+		"3",
 		"https://example.com/null2"
 	], null);
 	assertEquals(await new KvKeyCache(kv, ["pk"]).get(new URL("https://example.com/null2")), null);
@@ -162,14 +162,14 @@ test("KvKeyCache cached keys expire after keyTtl", async () => {
 	await cache.set(keyId, new CryptographicKey({ id: keyId }));
 	assert(await kv.get([
 		"pk",
-		"2",
+		"3",
 		keyId.href
 	]) != null);
 	assertInstanceOf(await cache.get(keyId), CryptographicKey);
 	kv.advance({ days: 31 });
 	assertEquals(await kv.get([
 		"pk",
-		"2",
+		"3",
 		keyId.href
 	]), void 0);
 	assertEquals(await cache.get(keyId), void 0);
@@ -189,6 +189,17 @@ test("KvKeyCache.get() ignores entries from an earlier generation", async () =>
 		type: "CryptographicKey"
 	});
 	assertEquals(await cache.get(new URL("https://example.com/key")), void 0);
+	await kv.set([
+		"pk",
+		"2",
+		"https://example.com/key2"
+	], {
+		"@context": "https://w3id.org/security/v1",
+		id: "https://example.com/key2",
+		owner: "https://example.com/impersonated",
+		type: "CryptographicKey"
+	});
+	assertEquals(await cache.get(new URL("https://example.com/key2")), void 0);
 });
 test("KvKeyCache.compatibleKeyScope() keeps each purpose apart", async () => {
 	const cache = new KvKeyCache(new MemoryKvStore(), ["pk"]);

package/dist/federation/metrics.test.mjs

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
-import { _ as recordKeyLookup, a as instrumentDocumentLoader, b as recordWebFingerHandle, c as recordCircuitBreakerStateChange, d as recordCollectionRequest, f as recordCollectionTotalItems, g as recordInboxActivity, h as recordFanoutRecipients, i as getRemoteHost, l as recordCollectionDispatchDuration, m as recordDocumentFetch, p as recordDocumentCache, r as getFederationMetrics, t as classifyFetchError, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "../metrics-Dtb81JxK.mjs";
+import { _ as recordKeyLookup, a as instrumentDocumentLoader, b as recordWebFingerHandle, c as recordCircuitBreakerStateChange, d as recordCollectionRequest, f as recordCollectionTotalItems, g as recordInboxActivity, h as recordFanoutRecipients, i as getRemoteHost, l as recordCollectionDispatchDuration, m as recordDocumentFetch, p as recordDocumentCache, r as getFederationMetrics, t as classifyFetchError, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "../metrics-Ci3oTjhF.mjs";
 import { FetchError } from "@fedify/vocab-runtime";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 import { DataPointType, MeterProvider, MetricReader } from "@opentelemetry/sdk-metrics";

package/dist/federation/middleware.test.mjs

@@ -16,21 +16,21 @@ import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-CYvBmkpC.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { g as recordInboxActivity } from "../metrics-Dtb81JxK.mjs";
-import { a as compactJsonLd, h as verifyJsonLd, p as signJsonLd, s as detachSignature } from "../ld-BeBdBDAY.mjs";
-import { c as verifyObject, o as signObject } from "../proof-DOV4ZiAo.mjs";
-import { f as verifyRequest, l as signRequest } from "../http--kHQomKT.mjs";
+import { g as recordInboxActivity } from "../metrics-Ci3oTjhF.mjs";
+import { a as compactJsonLd, h as verifyJsonLd, p as signJsonLd, s as detachSignature } from "../ld-C13upTHv.mjs";
+import { c as verifyObject, o as signObject } from "../proof-DdI4I2Jg.mjs";
+import { f as verifyRequest, l as signRequest } from "../http-VRVl77qN.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-DIJNHW-Y.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-ChK1DQkj.mjs";
-import { T as handleBenchmarkTrigger, i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-rQqAHzIo.mjs";
-import { t as doesActorOwnKey } from "../owner-u_-HQrgE.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-CGBUQXUP.mjs";
+import { T as handleBenchmarkTrigger, i as KvSpecDeterminer, n as FederationImpl, o as createFederation, r as InboxContextImpl, t as ContextImpl } from "../middleware-Defzf-30.mjs";
+import { t as doesActorOwnKey } from "../owner-BBB-PayE.mjs";
 import { t as CircuitBreaker } from "../circuit-breaker-XJ53md4S.mjs";
 import { t as TaskCodec } from "../codec-C6rTrpIp.mjs";
 import { t as markCircuitBreakerLegacySweepDone } from "../circuit-breaker-test-utils-DW6YC_Pe.mjs";
 import { configure, reset, withContext } from "@logtape/logtape";
 import { RouterError } from "@fedify/uri-template";
 import * as vocab from "@fedify/vocab";
-import { Create, Note, Offer, Person, getTypeId, lookupObject } from "@fedify/vocab";
+import { Create, CryptographicKey, Note, Offer, Person, getTypeId, lookupObject } from "@fedify/vocab";
 import { SpanStatusCode, metrics } from "@opentelemetry/api";
 import { FetchError, UrlError, getDocumentLoader } from "@fedify/vocab-runtime";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
@@ -1174,6 +1174,87 @@ test({
 			assertStrictEquals(clone.contextLoader, ctx.contextLoader);
 			assertStrictEquals(clone.federation, ctx.federation);
 		});
+		await t.step("getSignedKey() uses the key cache", async () => {
+			const kv = new MemoryKvStore();
+			const keyId = rsaPublicKey2.id;
+			let keyFetches = 0;
+			const documentLoader = async (url) => {
+				if (url === keyId.href) keyFetches++;
+				return await mockDocumentLoader(url);
+			};
+			const federation = createFederation({
+				kv,
+				documentLoaderFactory: () => documentLoader,
+				contextLoaderFactory: () => mockDocumentLoader,
+				publicKeyTtl: { days: 7 }
+			});
+			const request1 = await signRequest(new Request("https://example.com/"), rsaPrivateKey2, keyId);
+			const request2 = await signRequest(new Request("https://example.com/"), rsaPrivateKey2, keyId);
+			const ctx1 = federation.createContext(request1, 1);
+			const ctx2 = federation.createContext(request2, 2);
+			assertEquals(await ctx1.getSignedKey(), rsaPublicKey2);
+			assertEquals(keyFetches, 1);
+			assertEquals(await ctx2.getSignedKey(), rsaPublicKey2);
+			assertEquals(keyFetches, 1);
+		});
+		await t.step("getSignedKey() caches unavailable keys", async () => {
+			const kv = new MemoryKvStore();
+			const keyId = new URL("https://example.com/keys/missing");
+			let keyFetches = 0;
+			const documentLoader = async (url) => {
+				if (url === keyId.href) keyFetches++;
+				return await mockDocumentLoader(url);
+			};
+			const federation = createFederation({
+				kv,
+				documentLoaderFactory: () => documentLoader,
+				contextLoaderFactory: () => mockDocumentLoader
+			});
+			const request1 = await signRequest(new Request("https://example.com/"), rsaPrivateKey2, keyId);
+			const request2 = await signRequest(new Request("https://example.com/"), rsaPrivateKey2, keyId);
+			const ctx1 = federation.createContext(request1, 1);
+			const ctx2 = federation.createContext(request2, 2);
+			assertEquals(await ctx1.getSignedKey(), null);
+			assertEquals(keyFetches, 1);
+			assertEquals(await ctx2.getSignedKey(), null);
+			assertEquals(keyFetches, 1);
+		});
+		await t.step("getSignedKey() refetches a key that no longer verifies", async () => {
+			const kv = new MemoryKvStore();
+			const keyId = rsaPublicKey2.id;
+			let keyFetches = 0;
+			const rotatedPublicKey = new CryptographicKey({
+				id: keyId,
+				publicKey: rsaPublicKey3.publicKey
+			});
+			const documentLoader = async (url) => {
+				if (url !== keyId.href) return await mockDocumentLoader(url);
+				keyFetches++;
+				if (keyFetches === 1) return await mockDocumentLoader(url);
+				return {
+					contextUrl: null,
+					documentUrl: url,
+					document: await rotatedPublicKey.toJsonLd({ contextLoader: mockDocumentLoader })
+				};
+			};
+			const federation = createFederation({
+				kv,
+				documentLoaderFactory: () => documentLoader,
+				contextLoaderFactory: () => mockDocumentLoader
+			});
+			const request1 = await signRequest(new Request("https://example.com/"), rsaPrivateKey2, keyId);
+			const request2 = await signRequest(new Request("https://example.com/"), rsaPrivateKey3, keyId);
+			const request3 = await signRequest(new Request("https://example.com/"), rsaPrivateKey3, keyId);
+			const ctx1 = federation.createContext(request1, 1);
+			const ctx2 = federation.createContext(request2, 2);
+			const ctx3 = federation.createContext(request3, 3);
+			assertEquals(await ctx1.getSignedKey(), rsaPublicKey2);
+			assertEquals(keyFetches, 1);
+			assertEquals(await ctx2.getSignedKey(), rotatedPublicKey);
+			assertEquals(keyFetches, 2);
+			assertEquals(await ctx3.getSignedKey(), rotatedPublicKey);
+			assertEquals(keyFetches, 2);
+		});
 		esm_default.hardReset();
 	}
 });
@@ -8182,7 +8263,7 @@ test("createFederation() applies publicKeyTtl to cached public keys", async () =
 		const publicKeyKey = [
 			"_fedify",
 			"publicKey",
-			"2",
+			"3",
 			keyId
 		];
 		assertEquals((await deliver()).status, 202);

package/dist/federation/mod.cjs

@@ -1,6 +1,6 @@
 const { URLPattern } = require("urlpattern-polyfill");
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_federation = require("../federation-DxQI9dSY.cjs");
+const require_federation = require("../federation-CM-zrOdz.cjs");
 exports.CircuitBreaker = require_federation.CircuitBreaker;
 exports.InProcessMessageQueue = require_federation.InProcessMessageQueue;
 exports.MemoryKvStore = require_federation.MemoryKvStore;

package/dist/federation/mod.js

@@ -1,6 +1,6 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { a as respondWithObjectIfAcceptable, c as digest, d as parseCircuitBreakerKvState, f as createFederationBuilder, i as respondWithObject, l as CircuitBreaker, n as handleWebFinger, o as SendActivityError, r as createExponentialBackoffPolicy, s as buildCollectionSynchronizationHeader, t as createFederation, u as normalizeCircuitBreakerOptions } from "../middleware-DNjv5rBL.js";
+import { a as respondWithObjectIfAcceptable, c as digest, d as parseCircuitBreakerKvState, f as createFederationBuilder, i as respondWithObject, l as CircuitBreaker, n as handleWebFinger, o as SendActivityError, r as createExponentialBackoffPolicy, s as buildCollectionSynchronizationHeader, t as createFederation, u as normalizeCircuitBreakerOptions } from "../middleware-Ckc0daKd.js";
 import { getLogger } from "@logtape/logtape";
 import { Router as Router$1, RouterError as RouterError$1, assertPath, isPath } from "@fedify/uri-template";
 import { isEqual } from "es-toolkit";

package/dist/federation/outgoing-proof.test.mjs

@@ -7,11 +7,11 @@ import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { s as detachSignature, y as exportJwk } from "../ld-BeBdBDAY.mjs";
-import { o as signObject } from "../proof-DOV4ZiAo.mjs";
+import { s as detachSignature, y as exportJwk } from "../ld-C13upTHv.mjs";
+import { o as signObject } from "../proof-DdI4I2Jg.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { C as getEmbeddedFirstGateway, S as getCompactRootId, c as assertPortableActorActivity, n as FederationImpl, o as createFederation, w as warnCompatibleIdsInJson } from "../middleware-rQqAHzIo.mjs";
-import { o as verifyCompoundPortableObjectProofs } from "../compound-proof-Dtwrhs1I.mjs";
+import { C as getEmbeddedFirstGateway, S as getCompactRootId, c as assertPortableActorActivity, n as FederationImpl, o as createFederation, w as warnCompatibleIdsInJson } from "../middleware-Defzf-30.mjs";
+import { o as verifyCompoundPortableObjectProofs } from "../compound-proof-C-tPcb-r.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { Accept, Announce, Create, Follow, Note, Person } from "@fedify/vocab";
 import { exportDidKey, parseIri } from "@fedify/vocab-runtime";

package/dist/federation/portable-actor.test.mjs

@@ -8,10 +8,10 @@ import { t as assertInstanceOf } from "../assert_instance_of-mrXWWNY-.mjs";
 import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { l as verifyPortableObjectProof, o as signObject } from "../proof-DOV4ZiAo.mjs";
-import { f as verifyRequest, l as signRequest } from "../http--kHQomKT.mjs";
+import { l as verifyPortableObjectProof, o as signObject } from "../proof-DdI4I2Jg.mjs";
+import { f as verifyRequest, l as signRequest } from "../http-VRVl77qN.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-rQqAHzIo.mjs";
+import { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-Defzf-30.mjs";
 import { n as RouterError } from "../router-u5O5KCQr.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { Note, Person, Tombstone, lookupObject } from "@fedify/vocab";

package/dist/federation/portable-chain.test.mjs

@@ -7,10 +7,10 @@ import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-mrXWWNY-.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { y as exportJwk } from "../ld-BeBdBDAY.mjs";
-import { c as verifyObject, l as verifyPortableObjectProof } from "../proof-DOV4ZiAo.mjs";
+import { y as exportJwk } from "../ld-C13upTHv.mjs";
+import { c as verifyObject, l as verifyPortableObjectProof } from "../proof-DdI4I2Jg.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { n as FederationImpl } from "../middleware-rQqAHzIo.mjs";
+import { n as FederationImpl } from "../middleware-Defzf-30.mjs";
 import { Create, DataIntegrityProof, Note, OrderedCollection, Person, traverseCollection } from "@fedify/vocab";
 import { FetchError, encodeMultibase, exportDidKey } from "@fedify/vocab-runtime";
 import { mockDocumentLoader, test } from "@fedify/fixture";

package/dist/federation/portable-collection.test.mjs

@@ -7,11 +7,11 @@ import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { l as verifyPortableObjectProof, o as signObject } from "../proof-DOV4ZiAo.mjs";
+import { l as verifyPortableObjectProof, o as signObject } from "../proof-DdI4I2Jg.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey } from "../keys-DIJNHW-Y.mjs";
-import { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-rQqAHzIo.mjs";
-import { t as verifyPortableObject } from "../portable-collection-BKkTJQTd.mjs";
-import { c as verifyServedPortableObjects } from "../compound-proof-Dtwrhs1I.mjs";
+import { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-Defzf-30.mjs";
+import { t as verifyPortableObject } from "../portable-collection-DKs8iX1J.mjs";
+import { c as verifyServedPortableObjects } from "../compound-proof-C-tPcb-r.mjs";
 import { n as RouterError } from "../router-u5O5KCQr.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { Create, Note, Object as Object$1, OrderedCollection, PUBLIC_COLLECTION, Person, Tombstone, lookupObject, traverseCollection } from "@fedify/vocab";

package/dist/federation/portable-delivery.test.mjs

@@ -4,8 +4,8 @@ globalThis.addEventListener = () => {};
 import { t as esm_default } from "../esm-BHXXx4Wx.mjs";
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { i as rsaPrivateKey2, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { n as FederationImpl, r as InboxContextImpl } from "../middleware-rQqAHzIo.mjs";
-import { n as extractInboxes, t as SendActivityError } from "../send-C_Fffu0I.mjs";
+import { n as FederationImpl, r as InboxContextImpl } from "../middleware-Defzf-30.mjs";
+import { n as extractInboxes, t as SendActivityError } from "../send-DDSpf_ym.mjs";
 import { Create, Endpoints, Note, Person } from "@fedify/vocab";
 import { parseIri } from "@fedify/vocab-runtime";
 import { mockDocumentLoader, test } from "@fedify/fixture";

package/dist/federation/portable-gateway-keys.test.mjs

@@ -8,13 +8,13 @@ import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { r as getVerifiedKeyOwnerEvidence } from "../key-owner-evidence-APB6NpSk.mjs";
-import { p as signJsonLd } from "../ld-BeBdBDAY.mjs";
-import { f as verifyRequest, l as signRequest, p as verifyRequestDetailed } from "../http--kHQomKT.mjs";
+import { p as signJsonLd } from "../ld-C13upTHv.mjs";
+import { f as verifyRequest, l as signRequest, p as verifyRequestDetailed } from "../http-VRVl77qN.mjs";
 import { a as rsaPrivateKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { f as handleInbox, n as FederationImpl, o as createFederation } from "../middleware-rQqAHzIo.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-u_-HQrgE.mjs";
+import { f as handleInbox, n as FederationImpl, o as createFederation } from "../middleware-Defzf-30.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "../owner-BBB-PayE.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-C-BSbKI7.mjs";
-import { t as KvKeyCache } from "../keycache-D-MNltOk.mjs";
+import { t as KvKeyCache } from "../keycache-N2opu4-3.mjs";
 import { Create, CryptographicKey, Person } from "@fedify/vocab";
 import { FetchError, encodeMultibase, exportDidKey, parseIri } from "@fedify/vocab-runtime";
 import { mockDocumentLoader, test } from "@fedify/fixture";

package/dist/federation/portable-inbox.test.mjs

@@ -8,11 +8,11 @@ import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { p as signJsonLd } from "../ld-BeBdBDAY.mjs";
-import { o as signObject } from "../proof-DOV4ZiAo.mjs";
-import { l as signRequest, p as verifyRequestDetailed } from "../http--kHQomKT.mjs";
+import { p as signJsonLd } from "../ld-C13upTHv.mjs";
+import { o as signObject } from "../proof-DdI4I2Jg.mjs";
+import { l as signRequest, p as verifyRequestDetailed } from "../http-VRVl77qN.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { _ as coversDelivery, o as createFederation, v as forwardPortableInboxActivity, y as resolvePortableInboxForwardingOptions } from "../middleware-rQqAHzIo.mjs";
+import { _ as coversDelivery, o as createFederation, v as forwardPortableInboxActivity, y as resolvePortableInboxForwardingOptions } from "../middleware-Defzf-30.mjs";
 import { Create, CryptographicKey, Follow, Note, Person, Tombstone } from "@fedify/vocab";
 import { exportDidKey, formatIri, parseIri } from "@fedify/vocab-runtime";
 import { mockDocumentLoader, test } from "@fedify/fixture";

package/dist/federation/portable-parse-uri.test.mjs

@@ -7,7 +7,7 @@ import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
 import { r as ed25519PublicKey } from "../keys-DIJNHW-Y.mjs";
-import { o as createFederation } from "../middleware-rQqAHzIo.mjs";
+import { o as createFederation } from "../middleware-Defzf-30.mjs";
 import { Note, Object as Object$1, Person } from "@fedify/vocab";
 import { exportDidKey, parseIri } from "@fedify/vocab-runtime";
 import { test } from "@fedify/fixture";

package/dist/federation/portable-route-activity.test.mjs

@@ -6,9 +6,9 @@ import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { o as signObject } from "../proof-DOV4ZiAo.mjs";
+import { o as signObject } from "../proof-DdI4I2Jg.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey } from "../keys-DIJNHW-Y.mjs";
-import { o as createFederation } from "../middleware-rQqAHzIo.mjs";
+import { o as createFederation } from "../middleware-Defzf-30.mjs";
 import { Create, Note } from "@fedify/vocab";
 import { exportDidKey, formatIri, parseIri, toCompatibleEf61Id } from "@fedify/vocab-runtime";
 import { mockDocumentLoader, test } from "@fedify/fixture";

package/dist/federation/portable.test.mjs

@@ -8,10 +8,10 @@ import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-CYvBmkpC.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { l as verifyPortableObjectProof, o as signObject } from "../proof-DOV4ZiAo.mjs";
-import { l as signRequest } from "../http--kHQomKT.mjs";
+import { l as verifyPortableObjectProof, o as signObject } from "../proof-DdI4I2Jg.mjs";
+import { l as signRequest } from "../http-VRVl77qN.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-rQqAHzIo.mjs";
+import { b as PORTABLE_OBJECT_CONTENT_TYPE, o as createFederation } from "../middleware-Defzf-30.mjs";
 import { configure, reset } from "@logtape/logtape";
 import { Collection, Create, Note, Object as Object$1, PUBLIC_COLLECTION, Person, Tombstone, lookupObject } from "@fedify/vocab";
 import { exportDidKey, formatIri, parseIri, toCompatibleEf61Id } from "@fedify/vocab-runtime";