@fedify/fedify 2.0.35-dev.2465 → 2.0.35-dev.2469

package/dist/{builder-COVPHcS_.mjs → builder-vEXq-lKC.mjs}

@@ -2,8 +2,8 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { n as RouterError, t as Router } from "./router-CrMLXoOr.mjs";
-import { n as version, t as name } from "./deno-ClkjKd1Y.mjs";
-import { t as InboxListenerSet } from "./inbox-CUDMg8zO.mjs";
+import { n as version, t as name } from "./deno-HyjpIMD2.mjs";
+import { t as InboxListenerSet } from "./inbox-Ca4SopAP.mjs";
 import { getTypeId } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { getLogger } from "@logtape/logtape";
@@ -43,7 +43,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl } = await import("./middleware-DKxi2SGD.mjs");
+		const { FederationImpl } = await import("./middleware-BE2KpCCl.mjs");
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();

package/dist/compat/mod.d.cts

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { bt as ActivityTransformer, n as Context } from "../context-C-KTxW8v.cjs";
+import { bt as ActivityTransformer, n as Context } from "../context-r8sjhltN.cjs";
 import { Activity } from "@fedify/vocab";
 
 //#region src/compat/transformers.d.ts

package/dist/compat/mod.d.ts

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { bt as ActivityTransformer, n as Context } from "../context-DDPUfQkR.js";
+import { bt as ActivityTransformer, n as Context } from "../context-B2iX3heK.js";
 import { Activity } from "@fedify/vocab";
 
 //#region src/compat/transformers.d.ts

package/dist/compat/transformers.test.mjs

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { n as assertInstanceOf, t as assert } from "../assert-BhQd8QHP.mjs";
 import { t as MemoryKvStore } from "../kv-mI4Ix2EU.mjs";
-import { _ as autoIdAssigner, g as actorDehydrator, n as FederationImpl } from "../middleware-7c0Theyb.mjs";
+import { _ as autoIdAssigner, g as actorDehydrator, n as FederationImpl } from "../middleware-B-PC2OBb.mjs";
 import { test } from "@fedify/fixture";
 import { Follow, Person } from "@fedify/vocab";
 //#region src/compat/transformers.test.ts

package/dist/{context-DDPUfQkR.d.ts → context-B2iX3heK.d.ts}

@@ -2204,6 +2204,11 @@ interface RequestContext<TContextData> extends Context<TContextData> {
   * Gets the public key of the sender, if any exists and it is verified.
   * Otherwise, `null` is returned.
   *
+  * Successful results are reused for this request regardless of the options.
+  * Pending checks and `null` results are reused for the same effective
+  * document and context loaders, including failed lookups.  Rejected checks
+  * can be retried.  Shared work uses the first caller's tracer provider.
+  *
   * This can be used for implementing [authorized fetch] (also known as
   * secure mode) in ActivityPub.
   *
@@ -2217,6 +2222,11 @@ interface RequestContext<TContextData> extends Context<TContextData> {
   * Gets the public key of the sender, if any exists and it is verified.
   * Otherwise, `null` is returned.
   *
+  * Successful results are reused for this request regardless of the options.
+  * Pending checks and `null` results are reused for the same effective
+  * document and context loaders, including failed lookups.  Rejected checks
+  * can be retried.  Shared work uses the first caller's tracer provider.
+  *
   * This can be used for implementing [authorized fetch] (also known as
   * secure mode) in ActivityPub.
   *
@@ -2236,6 +2246,14 @@ interface RequestContext<TContextData> extends Context<TContextData> {
   * Gets the owner of the signed key, if any exists and it is verified.
   * Otherwise, `null` is returned.
   *
+  * Verified keys and owners are reused for this request regardless of the
+  * options.  Pending checks are shared for the same effective document and
+  * context loaders.  A `null` result from an owner lookup after key
+  * verification is retained for those loaders.  A `null` result caused by
+  * an unverified key is not retained, allowing an owner lookup after another
+  * loader verifies the key.  Rejected checks can be retried.  Shared work
+  * uses the first caller's tracer provider.
+  *
   * This can be used for implementing [authorized fetch] (also known as
   * secure mode) in ActivityPub.
   *
@@ -2250,6 +2268,14 @@ interface RequestContext<TContextData> extends Context<TContextData> {
   * Gets the owner of the signed key, if any exists and it is verified.
   * Otherwise, `null` is returned.
   *
+  * Verified keys and owners are reused for this request regardless of the
+  * options.  Pending checks are shared for the same effective document and
+  * context loaders.  A `null` result from an owner lookup after key
+  * verification is retained for those loaders.  A `null` result caused by
+  * an unverified key is not retained, allowing an owner lookup after another
+  * loader verifies the key.  Rejected checks can be retried.  Shared work
+  * uses the first caller's tracer provider.
+  *
   * This can be used for implementing [authorized fetch] (also known as
   * secure mode) in ActivityPub.
   *

package/dist/{context-C-KTxW8v.d.cts → context-r8sjhltN.d.cts}

@@ -2204,6 +2204,11 @@ interface RequestContext<TContextData> extends Context<TContextData> {
   * Gets the public key of the sender, if any exists and it is verified.
   * Otherwise, `null` is returned.
   *
+  * Successful results are reused for this request regardless of the options.
+  * Pending checks and `null` results are reused for the same effective
+  * document and context loaders, including failed lookups.  Rejected checks
+  * can be retried.  Shared work uses the first caller's tracer provider.
+  *
   * This can be used for implementing [authorized fetch] (also known as
   * secure mode) in ActivityPub.
   *
@@ -2217,6 +2222,11 @@ interface RequestContext<TContextData> extends Context<TContextData> {
   * Gets the public key of the sender, if any exists and it is verified.
   * Otherwise, `null` is returned.
   *
+  * Successful results are reused for this request regardless of the options.
+  * Pending checks and `null` results are reused for the same effective
+  * document and context loaders, including failed lookups.  Rejected checks
+  * can be retried.  Shared work uses the first caller's tracer provider.
+  *
   * This can be used for implementing [authorized fetch] (also known as
   * secure mode) in ActivityPub.
   *
@@ -2236,6 +2246,14 @@ interface RequestContext<TContextData> extends Context<TContextData> {
   * Gets the owner of the signed key, if any exists and it is verified.
   * Otherwise, `null` is returned.
   *
+  * Verified keys and owners are reused for this request regardless of the
+  * options.  Pending checks are shared for the same effective document and
+  * context loaders.  A `null` result from an owner lookup after key
+  * verification is retained for those loaders.  A `null` result caused by
+  * an unverified key is not retained, allowing an owner lookup after another
+  * loader verifies the key.  Rejected checks can be retried.  Shared work
+  * uses the first caller's tracer provider.
+  *
   * This can be used for implementing [authorized fetch] (also known as
   * secure mode) in ActivityPub.
   *
@@ -2250,6 +2268,14 @@ interface RequestContext<TContextData> extends Context<TContextData> {
   * Gets the owner of the signed key, if any exists and it is verified.
   * Otherwise, `null` is returned.
   *
+  * Verified keys and owners are reused for this request regardless of the
+  * options.  Pending checks are shared for the same effective document and
+  * context loaders.  A `null` result from an owner lookup after key
+  * verification is retained for those loaders.  A `null` result caused by
+  * an unverified key is not retained, allowing an owner lookup after another
+  * loader verifies the key.  Rejected checks can be retried.  Shared work
+  * uses the first caller's tracer provider.
+  *
   * This can be used for implementing [authorized fetch] (also known as
   * secure mode) in ActivityPub.
   *

package/dist/{deno-ClkjKd1Y.mjs → deno-HyjpIMD2.mjs}

@@ -3,6 +3,6 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.0.35-dev.2465+5a048d17";
+var version = "2.0.35-dev.2469+53a29875";
 //#endregion
 export { version as n, name as t };

package/dist/{docloader-CEKVqrZZ.mjs → docloader-C3V1CA__.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { o as validateCryptoKey } from "./key-C0z4FgyY.mjs";
-import { n as doubleKnock } from "./http-BbieND-q.mjs";
+import { o as validateCryptoKey } from "./key-CLtu73m3.mjs";
+import { n as doubleKnock } from "./http-xlEvsjp2.mjs";
 import { curry } from "es-toolkit";
 import { FetchError, UrlError, createActivityPubRequest, getRemoteDocument, logRequest, validatePublicUrl } from "@fedify/vocab-runtime";
 import { getLogger } from "@logtape/logtape";

package/dist/federation/builder.test.mjs

@@ -5,7 +5,7 @@ import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { i as assertExists, n as assertStrictEquals } from "../std__assert-DflMZha5.mjs";
 import { t as assertThrows } from "../assert_throws-D4DNWrux.mjs";
 import { t as MemoryKvStore } from "../kv-mI4Ix2EU.mjs";
-import { n as createFederationBuilder } from "../builder-COVPHcS_.mjs";
+import { n as createFederationBuilder } from "../builder-vEXq-lKC.mjs";
 import { test } from "@fedify/fixture";
 import { Activity, Note, Person } from "@fedify/vocab";
 //#region src/federation/builder.test.ts

package/dist/federation/handler.test.mjs

@@ -6,14 +6,14 @@ import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-DflMZha5.mjs";
 import { t as assert } from "../assert-BhQd8QHP.mjs";
 import { t as assertRejects } from "../assert_rejects-WyYSTDDX.mjs";
-import { i as generateCryptoKeyPair } from "../key-C0z4FgyY.mjs";
-import { s as signRequest } from "../http-BbieND-q.mjs";
+import { i as generateCryptoKeyPair } from "../key-CLtu73m3.mjs";
+import { s as signRequest } from "../http-xlEvsjp2.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-CCxRJhWa.mjs";
-import { a as compactJsonLd, f as signJsonLd } from "../ld-jTWJ8N8H.mjs";
-import { n as signObject } from "../proof-C-TDIi4A.mjs";
+import { a as compactJsonLd, f as signJsonLd } from "../ld-CwZHzx6E.mjs";
+import { n as signObject } from "../proof-CDgXDfMX.mjs";
 import { t as MemoryKvStore } from "../kv-mI4Ix2EU.mjs";
-import { a as createFederation, c as handleCollection, d as handleObject, f as respondWithObject, l as handleCustomCollection, p as respondWithObjectIfAcceptable, s as handleActor, u as handleInbox } from "../middleware-7c0Theyb.mjs";
-import { t as InboxListenerSet } from "../inbox-CUDMg8zO.mjs";
+import { a as createFederation, c as handleCollection, d as handleObject, f as respondWithObject, l as handleCustomCollection, p as respondWithObjectIfAcceptable, s as handleActor, u as handleInbox } from "../middleware-B-PC2OBb.mjs";
+import { t as InboxListenerSet } from "../inbox-Ca4SopAP.mjs";
 import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, CryptographicKey, Multikey, Note, Person } from "@fedify/vocab";
 //#region src/federation/handler.test.ts

package/dist/federation/idempotency.test.mjs

@@ -4,9 +4,9 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import "../std__assert-DflMZha5.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey, t as ed25519Multikey } from "../keys-CCxRJhWa.mjs";
-import { n as signObject } from "../proof-C-TDIi4A.mjs";
+import { n as signObject } from "../proof-CDgXDfMX.mjs";
 import { t as MemoryKvStore } from "../kv-mI4Ix2EU.mjs";
-import { a as createFederation } from "../middleware-7c0Theyb.mjs";
+import { a as createFederation } from "../middleware-B-PC2OBb.mjs";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { Create, Follow, Person } from "@fedify/vocab";
 //#region src/federation/idempotency.test.ts

package/dist/federation/inbox.test.mjs

@@ -3,7 +3,7 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { r as assertFalse, t as assertThrows } from "../assert_throws-D4DNWrux.mjs";
-import { n as actorsHaveSameOrigin, t as InboxListenerSet } from "../inbox-CUDMg8zO.mjs";
+import { n as actorsHaveSameOrigin, t as InboxListenerSet } from "../inbox-Ca4SopAP.mjs";
 import { test } from "@fedify/fixture";
 import { Activity, Create, Invite, Offer, Update } from "@fedify/vocab";
 //#region src/federation/inbox.test.ts

package/dist/federation/middleware.test.mjs

@@ -9,15 +9,15 @@ import { r as assertFalse, t as assertThrows } from "../assert_throws-D4DNWrux.m
 import { n as assertInstanceOf, t as assert } from "../assert-BhQd8QHP.mjs";
 import { t as assertNotEquals } from "../assert_not_equals-BkxW5QJI.mjs";
 import { t as assertRejects } from "../assert_rejects-WyYSTDDX.mjs";
-import { l as verifyRequest, s as signRequest } from "../http-BbieND-q.mjs";
+import { l as verifyRequest, s as signRequest } from "../http-xlEvsjp2.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-CCxRJhWa.mjs";
-import { t as getAuthenticatedDocumentLoader } from "../docloader-CEKVqrZZ.mjs";
-import { a as compactJsonLd, f as signJsonLd, m as verifyJsonLd, s as detachSignature } from "../ld-jTWJ8N8H.mjs";
-import { t as doesActorOwnKey } from "../owner-D8l8hvDa.mjs";
-import { n as signObject, r as verifyObject } from "../proof-C-TDIi4A.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../docloader-C3V1CA__.mjs";
+import { a as compactJsonLd, f as signJsonLd, m as verifyJsonLd, s as detachSignature } from "../ld-CwZHzx6E.mjs";
+import { t as doesActorOwnKey } from "../owner-CI6RnH-j.mjs";
+import { n as signObject, r as verifyObject } from "../proof-CDgXDfMX.mjs";
 import { t as MemoryKvStore } from "../kv-mI4Ix2EU.mjs";
-import { a as createFederation, i as KvSpecDeterminer, n as FederationImpl, r as InboxContextImpl, t as ContextImpl } from "../middleware-7c0Theyb.mjs";
-import { mockDocumentLoader, test } from "@fedify/fixture";
+import { a as createFederation, i as KvSpecDeterminer, n as FederationImpl, r as InboxContextImpl, t as ContextImpl } from "../middleware-B-PC2OBb.mjs";
+import { createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import * as vocab from "@fedify/vocab";
 import { Create, Offer, Person, getTypeId, lookupObject } from "@fedify/vocab";
 import { FetchError, UrlError, getDocumentLoader } from "@fedify/vocab-runtime";
@@ -705,6 +705,329 @@ test({
 		esm_default.hardReset();
 	}
 });
+test("RequestContext signature checks", async (t) => {
+	const [tracerProvider, exporter] = createTestTracerProvider();
+	const keyId = rsaPublicKey3.id.href;
+	const ownerId = rsaPublicKey3.ownerId.href;
+	const request = await signRequest(new Request("https://example.com/"), rsaPrivateKey3, rsaPublicKey3.id);
+	function setup(options = {}) {
+		const loads = {
+			key: 0,
+			owner: 0
+		};
+		const loader = async (url, loaderOptions) => {
+			if (url === keyId) loads.key++;
+			else if (url === ownerId) loads.owner++;
+			await options.gate;
+			return await (options.load ?? mockDocumentLoader)(url, loaderOptions);
+		};
+		const federation = createFederation({
+			kv: new MemoryKvStore(),
+			documentLoaderFactory: () => loader,
+			contextLoaderFactory: () => mockDocumentLoader,
+			tracerProvider: options.tracerProvider ?? tracerProvider
+		});
+		return {
+			ctx: federation.createContext(options.request ?? new Request(request), void 0),
+			loads,
+			loader,
+			federation
+		};
+	}
+	try {
+		for (const mode of [
+			"keys",
+			"owners",
+			"warm owners",
+			"mixed"
+		]) await t.step(`coalesces ${mode}`, async () => {
+			exporter.clear();
+			let release;
+			const { ctx, loads, loader } = setup({ gate: new Promise((resolve) => release = resolve) });
+			if (mode === "warm owners") {
+				release();
+				assert(await ctx.getSignedKey());
+			}
+			const results = Promise.all(Array.from({ length: 8 }, (_, i) => {
+				const options = i % 2 === 0 ? {} : {
+					documentLoader: loader,
+					contextLoader: ctx.contextLoader,
+					tracerProvider
+				};
+				return mode === "keys" || mode === "mixed" && i % 2 === 0 ? ctx.getSignedKey(options) : ctx.getSignedKeyOwner(options);
+			}));
+			release();
+			for (const result of await results) assert(result != null);
+			assertEquals(loads, {
+				key: 1,
+				owner: mode === "keys" ? 0 : 1
+			});
+			assertEquals(exporter.getSpans("http_signatures.verify").length, 1);
+			assert(await ctx.getSignedKey());
+			if (mode !== "keys") assert(await ctx.getSignedKeyOwner());
+			assertEquals(loads, {
+				key: 1,
+				owner: mode === "keys" ? 0 : 1
+			});
+		});
+		await t.step("memoizes null keys", async () => {
+			exporter.clear();
+			const { ctx, loads } = setup({ load: () => Promise.reject(/* @__PURE__ */ new Error("unavailable")) });
+			for (let i = 0; i < 3; i++) {
+				assertEquals(await ctx.getSignedKey(), null);
+				assertEquals(await ctx.getSignedKeyOwner(), null);
+			}
+			assertEquals(loads, {
+				key: 1,
+				owner: 0
+			});
+			assertEquals(exporter.getSpans("http_signatures.verify").length, 1);
+			assert(await ctx.getSignedKey({ documentLoader: mockDocumentLoader }));
+			assert(await ctx.getSignedKeyOwner({ documentLoader: mockDocumentLoader }));
+		});
+		await t.step("memoizes unsigned requests", async () => {
+			exporter.clear();
+			const { ctx, loads } = setup({ request: new Request("https://example.com/") });
+			for (let i = 0; i < 3; i++) {
+				assertEquals(await ctx.getSignedKey(), null);
+				assertEquals(await ctx.getSignedKeyOwner(), null);
+			}
+			assertEquals(loads, {
+				key: 0,
+				owner: 0
+			});
+			assertEquals(exporter.getSpans("http_signatures.verify").length, 1);
+		});
+		await t.step("memoizes null owners without trusting a key's owner claim", async () => {
+			const { ctx, loads } = setup({ load: async (url, options) => url === ownerId ? {
+				documentUrl: url,
+				contextUrl: null,
+				document: {
+					...person2_default,
+					publicKey: []
+				}
+			} : await mockDocumentLoader(url, options) });
+			assert(await ctx.getSignedKey());
+			assertEquals(await Promise.all(Array.from({ length: 8 }, () => ctx.getSignedKeyOwner())), Array(8).fill(null));
+			for (let i = 0; i < 3; i++) assertEquals(await ctx.getSignedKeyOwner(), null);
+			assertEquals(loads, {
+				key: 1,
+				owner: 1
+			});
+			assert(await ctx.getSignedKeyOwner({ documentLoader: mockDocumentLoader }));
+			assert(await ctx.getSignedKeyOwner());
+		});
+		await t.step("isolates concurrent document loaders before success", async () => {
+			const { ctx, loads } = setup();
+			let otherLoads = 0;
+			const otherLoader = async (url, options) => {
+				otherLoads++;
+				if (url === ownerId) return {
+					documentUrl: url,
+					contextUrl: null,
+					document: {
+						...person2_default,
+						name: "Other view"
+					}
+				};
+				return await mockDocumentLoader(url, options);
+			};
+			const [first, second] = await Promise.all([ctx.getSignedKeyOwner(), ctx.getSignedKeyOwner({ documentLoader: otherLoader })]);
+			assertEquals(first?.name, "Jane Doe");
+			assertEquals(second?.name, "Other view");
+			const cached = await ctx.getSignedKeyOwner();
+			assert(cached === first || cached === second);
+			assertStrictEquals(await ctx.getSignedKeyOwner({ documentLoader: otherLoader }), cached);
+			assertEquals(loads, {
+				key: 1,
+				owner: 1
+			});
+			assertEquals(otherLoads, 2);
+		});
+		await t.step("preserves in-flight null while another loader succeeds", async () => {
+			exporter.clear();
+			let release;
+			const gate = new Promise((resolve) => release = resolve);
+			const { ctx, loads } = setup({ load: async () => {
+				await gate;
+				throw new TypeError("fetch failed");
+			} });
+			const failed = Promise.all([ctx.getSignedKey(), ctx.getSignedKeyOwner()]);
+			const owner = await ctx.getSignedKeyOwner({ documentLoader: mockDocumentLoader });
+			assert(owner);
+			release();
+			assertEquals(await failed, [null, null]);
+			assertStrictEquals(await ctx.getSignedKeyOwner(), owner);
+			assert(await ctx.getSignedKey());
+			assertEquals(loads, {
+				key: 1,
+				owner: 0
+			});
+			assertEquals(exporter.getSpans("http_signatures.verify").length, 2);
+		});
+		await t.step("isolates context loaders", async () => {
+			exporter.clear();
+			const { ctx, loads } = setup();
+			const otherContextLoader = (url, options) => mockDocumentLoader(url, options);
+			await Promise.all([ctx.getSignedKeyOwner(), ctx.getSignedKeyOwner({ contextLoader: otherContextLoader })]);
+			assertEquals(loads, {
+				key: 2,
+				owner: 2
+			});
+			assertEquals(exporter.getSpans("http_signatures.verify").length, 2);
+		});
+		await t.step("shares work across tracer providers", async () => {
+			exporter.clear();
+			const [otherProvider, otherExporter] = createTestTracerProvider();
+			try {
+				const { ctx, loads } = setup();
+				await Promise.all([
+					ctx.getSignedKeyOwner(),
+					ctx.getSignedKeyOwner({ tracerProvider: otherProvider }),
+					ctx.getSignedKey(),
+					ctx.getSignedKey({ tracerProvider: otherProvider })
+				]);
+				assert(await ctx.getSignedKeyOwner({ tracerProvider: otherProvider }));
+				assertEquals(loads, {
+					key: 1,
+					owner: 1
+				});
+				assertEquals(exporter.getSpans("http_signatures.verify").length, 1);
+				assertEquals(otherExporter.getSpans("http_signatures.verify").length, 0);
+			} finally {
+				await otherProvider.shutdown();
+			}
+		});
+		await t.step("reuses success with a fresh authorization loader", async () => {
+			exporter.clear();
+			const { ctx, loads } = setup();
+			let freshLoads = 0;
+			const freshLoader = (url, options) => {
+				freshLoads++;
+				return mockDocumentLoader(url, options);
+			};
+			const key = await ctx.getSignedKey({ documentLoader: freshLoader });
+			assert(key);
+			assertStrictEquals(await ctx.getSignedKey(), key);
+			const owner = await ctx.getSignedKeyOwner();
+			assert(owner);
+			assertStrictEquals(await ctx.getSignedKeyOwner({ documentLoader: freshLoader }), owner);
+			assertEquals(loads, {
+				key: 0,
+				owner: 1
+			});
+			assertEquals(freshLoads, 1);
+			assertEquals(exporter.getSpans("http_signatures.verify").length, 1);
+		});
+		await t.step("retains a transient owner lookup failure as null", async () => {
+			let fail = true;
+			const { ctx, loads } = setup({ load: async (url, options) => {
+				if (url === ownerId && fail) throw new TypeError("fetch failed");
+				return await mockDocumentLoader(url, options);
+			} });
+			assert(await ctx.getSignedKey());
+			assertEquals(await ctx.getSignedKeyOwner(), null);
+			fail = false;
+			assertEquals(await ctx.getSignedKeyOwner(), null);
+			assertEquals(loads, {
+				key: 1,
+				owner: 1
+			});
+			assert(await ctx.getSignedKeyOwner({ documentLoader: mockDocumentLoader }));
+		});
+		await t.step("rechecks an owner after another loader verifies the key", async () => {
+			let fail = true;
+			const { ctx, loads } = setup({ load: async (url, options) => {
+				if (url === keyId && fail) throw new TypeError("fetch failed");
+				return await mockDocumentLoader(url, options);
+			} });
+			assertEquals(await ctx.getSignedKeyOwner(), null);
+			fail = false;
+			assertEquals(await ctx.getSignedKeyOwner(), null);
+			assertEquals(loads, {
+				key: 1,
+				owner: 0
+			});
+			assert(await ctx.getSignedKey({ documentLoader: mockDocumentLoader }));
+			assertEquals((await ctx.getSignedKeyOwner())?.id?.href, ownerId);
+			assertEquals(loads, {
+				key: 1,
+				owner: 1
+			});
+		});
+		await t.step("retries unexpected key rejections from a rejection handler", async () => {
+			exporter.clear();
+			const failure = /* @__PURE__ */ new Error("transient context loader failure");
+			let rejectContext = true;
+			const contextLoader = async (url, options) => {
+				if (rejectContext) throw failure;
+				return await mockDocumentLoader(url, options);
+			};
+			const { ctx, loads } = setup();
+			const options = { contextLoader };
+			const failedKeys = Promise.allSettled([
+				ctx.getSignedKey(options),
+				ctx.getSignedKeyOwner(options),
+				ctx.getSignedKey(options)
+			]);
+			const recovery = ctx.getSignedKey(options).catch(() => {
+				rejectContext = false;
+				return ctx.getSignedKey(options);
+			});
+			for (const result of await failedKeys) assertEquals(result.status, "rejected");
+			assert(await recovery);
+			assertEquals(loads, {
+				key: 2,
+				owner: 0
+			});
+			assertEquals(exporter.getSpans("http_signatures.verify").length, 2);
+		});
+		await t.step("retries owner rejections while retaining the verified key", async () => {
+			exporter.clear();
+			let rejectContext = false;
+			const contextLoader = async (url, options) => {
+				if (rejectContext) throw new Error("transient owner context failure");
+				return await mockDocumentLoader(url, options);
+			};
+			const { ctx, loads } = setup();
+			const options = { contextLoader };
+			assert(await ctx.getSignedKey(options));
+			assertEquals(loads, {
+				key: 1,
+				owner: 0
+			});
+			rejectContext = true;
+			const failures = await Promise.allSettled([ctx.getSignedKeyOwner(options), ctx.getSignedKeyOwner(options)]);
+			for (const result of failures) assertEquals(result.status, "rejected");
+			assertEquals(loads, {
+				key: 1,
+				owner: 1
+			});
+			rejectContext = false;
+			assert(await ctx.getSignedKeyOwner(options));
+			assertEquals(loads, {
+				key: 1,
+				owner: 2
+			});
+			assertEquals(exporter.getSpans("http_signatures.verify").length, 1);
+		});
+		await t.step("keeps clones and separate requests independent", async () => {
+			exporter.clear();
+			const { ctx, loads, federation } = setup();
+			assert(await ctx.getSignedKeyOwner());
+			const clone = ctx.clone(void 0);
+			const separate = federation.createContext(new Request(request), void 0);
+			await Promise.all([clone.getSignedKeyOwner(), separate.getSignedKeyOwner()]);
+			assertEquals(loads, {
+				key: 3,
+				owner: 3
+			});
+			assertEquals(exporter.getSpans("http_signatures.verify").length, 3);
+		});
+	} finally {
+		await tracerProvider.shutdown();
+	}
+});
 test("Federation.fetch() [rfc9421] multiple POST signatures", async (t) => {
 	for (const validSecond of [true, false]) await t.step(validSecond ? "valid second signature" : "both signatures invalid", async () => {
 		const inbox = [];

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-CQXidl_F.cjs");
+const require_middleware = require("../middleware-DegTN2kB.cjs");
 let es_toolkit = require("es-toolkit");
 //#region src/federation/kv.ts
 /**

package/dist/federation/mod.d.cts

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

package/dist/federation/mod.d.ts

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { $ as AuthorizePredicate, A as CreateExponentialBackoffPolicyOptions, B as RespondWithObjectOptions, C as InboxListenerSetters, D as FederationOrigin, E as FederationKvPrefixes, F as createFederationBuilder, G as MessageQueue, H as respondWithObjectIfAcceptable, I as Router, J as ParallelMessageQueue, K as MessageQueueEnqueueOptions, L as RouterError, M as RetryPolicy, N as createExponentialBackoffPolicy, O as FederationQueueOptions, P as Message, Q as ActorKeyPairsDispatcher, R as RouterOptions, S as IdempotencyStrategy, T as Rfc6570Expression, U as InProcessMessageQueue, V as respondWithObject, W as InProcessMessageQueueOptions, X as ActorDispatcher, Y as ActorAliasMapper, Z as ActorHandleMapper, _ as FederationBuilder, _t as PageItems, a as InboxContext, at as CustomCollectionDispatcher, b as FederationStartQueueOptions, c as RouteActivityOptions, ct as NodeInfoDispatcher, d as ActorCallbackSetters, dt as OutboxErrorHandler, et as CollectionCounter, f as CollectionCallbackSetters, ft as OutboxPermanentFailureHandler, g as Federation, gt as SenderKeyPair, h as Federatable, ht as SendActivityError, i as GetSignedKeyOptions, it as CustomCollectionCursor, j as RetryContext, k as createFederation, l as SendActivityOptions, lt as ObjectAuthorizePredicate, m as CustomCollectionCallbackSetters, mt as WebFingerLinksDispatcher, n as Context, nt as CollectionDispatcher, o as ParseUriResult, ot as InboxErrorHandler, p as ConstructorWithTypeId, pt as SharedInboxKeyDispatcher, q as MessageQueueListenOptions, r as ForwardActivityOptions, rt as CustomCollectionCounter, s as RequestContext, st as InboxListener, t as ActorKeyPair, tt as CollectionCursor, u as SendActivityOptionsForCollection, ut as ObjectDispatcher, v as FederationFetchOptions, vt as buildCollectionSynchronizationHeader, w as ObjectCallbackSetters, x as IdempotencyKeyCallback, y as FederationOptions, yt as digest, z as RouterRouteResult } from "../context-DDPUfQkR.js";
+import { $ as AuthorizePredicate, A as CreateExponentialBackoffPolicyOptions, B as RespondWithObjectOptions, C as InboxListenerSetters, D as FederationOrigin, E as FederationKvPrefixes, F as createFederationBuilder, G as MessageQueue, H as respondWithObjectIfAcceptable, I as Router, J as ParallelMessageQueue, K as MessageQueueEnqueueOptions, L as RouterError, M as RetryPolicy, N as createExponentialBackoffPolicy, O as FederationQueueOptions, P as Message, Q as ActorKeyPairsDispatcher, R as RouterOptions, S as IdempotencyStrategy, T as Rfc6570Expression, U as InProcessMessageQueue, V as respondWithObject, W as InProcessMessageQueueOptions, X as ActorDispatcher, Y as ActorAliasMapper, Z as ActorHandleMapper, _ as FederationBuilder, _t as PageItems, a as InboxContext, at as CustomCollectionDispatcher, b as FederationStartQueueOptions, c as RouteActivityOptions, ct as NodeInfoDispatcher, d as ActorCallbackSetters, dt as OutboxErrorHandler, et as CollectionCounter, f as CollectionCallbackSetters, ft as OutboxPermanentFailureHandler, g as Federation, gt as SenderKeyPair, h as Federatable, ht as SendActivityError, i as GetSignedKeyOptions, it as CustomCollectionCursor, j as RetryContext, k as createFederation, l as SendActivityOptions, lt as ObjectAuthorizePredicate, m as CustomCollectionCallbackSetters, mt as WebFingerLinksDispatcher, n as Context, nt as CollectionDispatcher, o as ParseUriResult, ot as InboxErrorHandler, p as ConstructorWithTypeId, pt as SharedInboxKeyDispatcher, q as MessageQueueListenOptions, r as ForwardActivityOptions, rt as CustomCollectionCounter, s as RequestContext, st as InboxListener, t as ActorKeyPair, tt as CollectionCursor, u as SendActivityOptionsForCollection, ut as ObjectDispatcher, v as FederationFetchOptions, vt as buildCollectionSynchronizationHeader, w as ObjectCallbackSetters, x as IdempotencyKeyCallback, y as FederationOptions, yt as digest, z as RouterRouteResult } from "../context-B2iX3heK.js";
 import { a as MemoryKvStore, i as KvStoreSetOptions, n as KvStore, r as KvStoreListEntry, t as KvKey } from "../kv-CxaI4eGo.js";
-import { n as handleWebFinger, t as WebFingerHandlerParameters } from "../mod-CI9TwVC1.js";
+import { n as handleWebFinger, t as WebFingerHandlerParameters } from "../mod-CM_eR8hQ.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, GetSignedKeyOptions, IdempotencyKeyCallback, IdempotencyStrategy, InProcessMessageQueue, InProcessMessageQueueOptions, InboxContext, InboxErrorHandler, InboxListener, InboxListenerSetters, KvKey, KvStore, KvStoreListEntry, KvStoreSetOptions, MemoryKvStore, Message, MessageQueue, MessageQueueEnqueueOptions, MessageQueueListenOptions, NodeInfoDispatcher, ObjectAuthorizePredicate, ObjectCallbackSetters, ObjectDispatcher, OutboxErrorHandler, OutboxPermanentFailureHandler, PageItems, ParallelMessageQueue, ParseUriResult, RequestContext, RespondWithObjectOptions, RetryContext, RetryPolicy, Rfc6570Expression, RouteActivityOptions, Router, RouterError, RouterOptions, RouterRouteResult, SendActivityError, SendActivityOptions, SendActivityOptionsForCollection, SenderKeyPair, SharedInboxKeyDispatcher, 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 } from "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-CpGD9Bck.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-DKzhsZ6a.js";
 import { isEqual } from "es-toolkit";
 //#region src/federation/kv.ts
 /**