@fedify/fedify 1.10.0-dev.2 → 2.0.0-dev.12

package/dist/federation/kv.test.js

@@ -3,18 +3,16 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import "../type-E_91dusN.js";
+import "../lookup-C7SSHgK7.js";
 import { assertEquals } from "../assert_equals-DSbWqCm3.js";
 import "../assert-MZs1qjMx.js";
 import "../assert_instance_of-DHz7EHNU.js";
 import { MemoryKvStore } from "../kv-CRZrzyXm.js";
-import "../lookup-Co4Y1ycg.js";
-import { test } from "../testing-B17zODFD.js";
-import "../std__assert-X-_kMxKM.js";
-import "../assert_rejects-DiIiJbZn.js";
-import "../assert_is_error-BPGph1Jx.js";
-import "../assert_not_equals-f3m3epl3.js";
-import "../assert_throws-BOO88avQ.js";
+import { test } from "../testing-D-nLIHkh.js";
+import "../std__assert-DWivtrGR.js";
+import "../assert_rejects-Ce45JcFg.js";
+import "../assert_throws-BNXdRGWP.js";
+import "../assert_not_equals-C80BG-_5.js";
 
 //#region src/federation/kv.test.ts
 test("MemoryKvStore", async (t) => {

package/dist/federation/middleware.test.js

@@ -3,38 +3,50 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { Activity, Announce, Create, FetchError, Invite, Multikey, Note, Object as Object$1, Offer, Person, fetchDocumentLoader, getTypeId } from "../type-E_91dusN.js";
+import { Activity, Announce, Create, Invite, Multikey, Note, Object as Object$1, Offer, Person, RouterError, getTypeId, lookupObject } from "../lookup-C7SSHgK7.js";
 import { assertEquals } from "../assert_equals-DSbWqCm3.js";
 import { assert } from "../assert-MZs1qjMx.js";
 import { assertInstanceOf } from "../assert_instance_of-DHz7EHNU.js";
 import { MemoryKvStore } from "../kv-CRZrzyXm.js";
-import { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, createFederation } from "../middleware-nSw7nWf8.js";
-import "../semver-dArNLkR9.js";
-import "../client-Bwnrdh_A.js";
-import { RouterError, lookupObject } from "../lookup-Co4Y1ycg.js";
-import "../types-BIgY6c-l.js";
-import "../actor-Bv7llTFW.js";
-import "../key-Tt9B2Qkj.js";
-import { signRequest, verifyRequest } from "../http-DXmKLE1t.js";
-import { getAuthenticatedDocumentLoader } from "../authdocloader-TNeksncq.js";
-import { detachSignature, signJsonLd, verifyJsonLd } from "../ld-CqoYKNwB.js";
-import { doesActorOwnKey } from "../owner-9jSx_21P.js";
-import { signObject, verifyObject } from "../proof-B5YI7sn5.js";
-import "../inbox-Dt-Q2rJt.js";
-import "../builder-C7fApQY_.js";
-import "../collection-CSzG2j1P.js";
-import "../keycache-CXF4YAON.js";
-import "../retry-D4GJ670a.js";
-import "../send-DlPE7bKe.js";
-import { mockDocumentLoader, test } from "../testing-B17zODFD.js";
-import { assertStrictEquals } from "../std__assert-X-_kMxKM.js";
-import { assertFalse, assertRejects } from "../assert_rejects-DiIiJbZn.js";
-import "../assert_is_error-BPGph1Jx.js";
-import { assertNotEquals } from "../assert_not_equals-f3m3epl3.js";
-import { assertThrows } from "../assert_throws-BOO88avQ.js";
-import { ed25519Multikey, ed25519PrivateKey, ed25519PublicKey, rsaPrivateKey2, rsaPrivateKey3, rsaPublicKey2, rsaPublicKey3 } from "../keys-CAUbEZtV.js";
-import { esm_default } from "../esm-aj4vkb76.js";
+import { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, createFederation } from "../middleware-C3ml59Hp.js";
+import "../client-pY7-3icS.js";
+import "../types-C2XVl6gj.js";
+import "../actor-rOm0sXHU.js";
+import "../key-khQpfFdw.js";
+import { signRequest, verifyRequest } from "../http-Bmx7ea3F.js";
+import { detachSignature, signJsonLd, verifyJsonLd } from "../ld-BLMebnep.js";
+import { doesActorOwnKey } from "../owner-XzzTSr4S.js";
+import { signObject, verifyObject } from "../proof-C9sfVit1.js";
+import { fetchDocumentLoader, getAuthenticatedDocumentLoader } from "../docloader-CE1lRhEV.js";
+import "../kv-cache-DN9pfMBe.js";
+import "../inbox-B9PjFn2S.js";
+import "../builder-hArjoWjW.js";
+import "../collection-BzWsN9pB.js";
+import "../keycache-BU3fsZFa.js";
+import "../negotiation-C4nFufNk.js";
+import "../retry-CfF8Gn4d.js";
+import "../send-yEkZlxzW.js";
+import { mockDocumentLoader, test } from "../testing-D-nLIHkh.js";
+import { assertStrictEquals } from "../std__assert-DWivtrGR.js";
+import { assertFalse, assertRejects } from "../assert_rejects-Ce45JcFg.js";
+import { assertThrows } from "../assert_throws-BNXdRGWP.js";
+import { assertNotEquals } from "../assert_not_equals-C80BG-_5.js";
+import { ed25519Multikey, ed25519PrivateKey, ed25519PublicKey, rsaPrivateKey2, rsaPrivateKey3, rsaPublicKey2, rsaPublicKey3 } from "../keys-BaMFfIdL.js";
+import { esm_default } from "../esm-BEFbR5eN.js";
 
+//#region src/testing/fixtures/example.com/create.json
+var __context$2 = "https://www.w3.org/ns/activitystreams";
+var type$2 = "Create";
+var id$2 = "https://example.com/create";
+var actor = "https://example.com/person";
+var create_default = {
+	"@context": __context$2,
+	type: type$2,
+	id: id$2,
+	actor
+};
+
+//#endregion
 //#region src/testing/fixtures/example.com/person.json
 var __context$1 = ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"];
 var id$1 = "https://example.com/person";
@@ -108,12 +120,7 @@ test("createFederation()", async (t) => {
 	await t.step("allowPrivateAddress", () => {
 		assertThrows(() => createFederation({
 			kv,
-			documentLoader: mockDocumentLoader,
-			allowPrivateAddress: true
-		}), TypeError);
-		assertThrows(() => createFederation({
-			kv,
-			contextLoader: mockDocumentLoader,
+			contextLoaderFactory: () => mockDocumentLoader,
 			allowPrivateAddress: true
 		}), TypeError);
 		assertThrows(() => createFederation({
@@ -223,11 +230,8 @@ test({
 	},
 	async fn(t) {
 		const kv = new MemoryKvStore();
-		const documentLoader = (url) => {
-			throw new FetchError(new URL(url), "Not found");
-		};
 		esm_default.spyGlobal();
-		esm_default.get("https://example.com/object", async (cl) => {
+		esm_default.get("https://example.com/auth-check", async (cl) => {
 			const v = await verifyRequest(cl.request, {
 				contextLoader: mockDocumentLoader,
 				documentLoader: mockDocumentLoader,
@@ -236,10 +240,11 @@ test({
 			return new Response(JSON.stringify(v != null), { headers: { "Content-Type": "application/json" } });
 		});
 		await t.step("Context", async () => {
+			const rejectingLoader = (_url) => Promise.reject(/* @__PURE__ */ new Error("Not found"));
 			const federation = createFederation({
 				kv,
-				documentLoader,
-				contextLoader: mockDocumentLoader
+				documentLoaderFactory: () => rejectingLoader,
+				contextLoaderFactory: () => mockDocumentLoader
 			});
 			let ctx = federation.createContext(new URL("https://example.com:1234/"), 123);
 			assertEquals(ctx.data, 123);
@@ -247,7 +252,7 @@ test({
 			assertEquals(ctx.canonicalOrigin, "https://example.com:1234");
 			assertEquals(ctx.host, "example.com:1234");
 			assertEquals(ctx.hostname, "example.com");
-			assertStrictEquals(ctx.documentLoader, documentLoader);
+			assertStrictEquals(ctx.documentLoader, rejectingLoader);
 			assertStrictEquals(ctx.contextLoader, mockDocumentLoader);
 			assertStrictEquals(ctx.federation, federation);
 			assertThrows(() => ctx.getNodeInfoUri(), RouterError);
@@ -273,11 +278,7 @@ test({
 			federation.setNodeInfoDispatcher("/nodeinfo/2.1", () => ({
 				software: {
 					name: "Example",
-					version: {
-						major: 1,
-						minor: 2,
-						patch: 3
-					}
+					version: "1.2.3"
 				},
 				protocols: ["activitypub"],
 				usage: {
@@ -332,33 +333,39 @@ test({
 				})
 			}]);
 			const loader = await ctx.getDocumentLoader({ identifier: "handle" });
-			assertEquals(await loader("https://example.com/object"), {
+			assertEquals(await loader("https://example.com/auth-check"), {
 				contextUrl: null,
-				documentUrl: "https://example.com/object",
+				documentUrl: "https://example.com/auth-check",
 				document: true
 			});
 			const loader2 = await ctx.getDocumentLoader({ username: "HANDLE" });
-			assertEquals(await loader2("https://example.com/object"), {
+			assertEquals(await loader2("https://example.com/auth-check"), {
 				contextUrl: null,
-				documentUrl: "https://example.com/object",
+				documentUrl: "https://example.com/auth-check",
 				document: true
 			});
 			const loader3 = ctx.getDocumentLoader({
 				keyId: new URL("https://example.com/key2"),
 				privateKey: rsaPrivateKey2
 			});
-			assertEquals(await loader3("https://example.com/object"), {
+			assertEquals(await loader3("https://example.com/auth-check"), {
 				contextUrl: null,
-				documentUrl: "https://example.com/object",
+				documentUrl: "https://example.com/auth-check",
 				document: true
 			});
 			assertEquals(await ctx.lookupObject("https://example.com/object"), null);
 			await assertRejects(() => ctx.sendActivity({ identifier: "handle" }, [], new Create({})), TypeError, "The activity to send must have at least one actor property.");
 			await ctx.sendActivity({ identifier: "handle" }, [], new Create({ actor: new URL("https://example.com/users/handle") }));
+			esm_default.get("https://example.com/object", () => new Response(JSON.stringify({
+				"@context": "https://www.w3.org/ns/activitystreams",
+				type: "Object",
+				id: "https://example.com/object",
+				name: "Fetched object"
+			}), { headers: { "Content-Type": "application/activity+json" } }));
 			const federation2 = createFederation({
 				kv,
-				documentLoader: mockDocumentLoader,
-				contextLoader: mockDocumentLoader
+				documentLoaderFactory: () => fetchDocumentLoader,
+				contextLoaderFactory: () => mockDocumentLoader
 			});
 			const ctx2 = federation2.createContext(new URL("https://example.com/"), 123);
 			assertEquals(await ctx2.lookupObject("https://example.com/object"), new Object$1({
@@ -457,8 +464,8 @@ test({
 			const federation = createFederation({
 				kv,
 				origin: "https://ap.example.com",
-				documentLoader,
-				contextLoader: mockDocumentLoader
+				documentLoaderFactory: () => mockDocumentLoader,
+				contextLoaderFactory: () => mockDocumentLoader
 			});
 			const ctx = federation.createContext(new URL("https://example.com:1234/"));
 			assertEquals(ctx.origin, "https://example.com:1234");
@@ -468,11 +475,7 @@ test({
 			federation.setNodeInfoDispatcher("/nodeinfo/2.1", () => ({
 				software: {
 					name: "Example",
-					version: {
-						major: 1,
-						minor: 2,
-						patch: 3
-					}
+					version: "1.2.3"
 				},
 				protocols: ["activitypub"],
 				usage: {
@@ -662,13 +665,7 @@ test({
 			assertEquals(nodeInfo, {
 				software: {
 					name: "foo",
-					version: {
-						major: 1,
-						minor: 2,
-						patch: 3,
-						build: [],
-						prerelease: []
-					}
+					version: "1.2.3"
 				},
 				protocols: ["activitypub", "diaspora"],
 				usage: {
@@ -694,9 +691,9 @@ test({
 		await t.step("RequestContext", async () => {
 			const federation = createFederation({
 				kv,
-				documentLoader: mockDocumentLoader
+				documentLoaderFactory: () => mockDocumentLoader
 			});
-			const req = new Request("https://example.com/");
+			const req = new Request("https://example.com/", { headers: { "accept": "application/ld+json" } });
 			const ctx = federation.createContext(req, 123);
 			assertEquals(ctx.request, req);
 			assertEquals(ctx.url, new URL("https://example.com/"));
@@ -714,7 +711,7 @@ test({
 			assertEquals(await ctx.getSignedKey(), null);
 			assertEquals(await ctx.getSignedKeyOwner(), null);
 			await assertRejects(() => ctx.getActor("someone"), Error, "No actor dispatcher registered");
-			const signedReq = await signRequest(new Request("https://example.com/"), rsaPrivateKey2, rsaPublicKey2.id);
+			const signedReq = await signRequest(new Request("https://example.com/", { headers: { "accept": "application/ld+json" } }), rsaPrivateKey2, rsaPublicKey2.id);
 			const signedCtx = federation.createContext(signedReq, 456);
 			assertEquals(signedCtx.request, signedReq);
 			assertEquals(signedCtx.url, new URL("https://example.com/"));
@@ -723,7 +720,7 @@ test({
 			assertEquals(await signedCtx.getSignedKeyOwner(), null);
 			assertEquals(await signedCtx.getSignedKey(), rsaPublicKey2);
 			assertEquals(await signedCtx.getSignedKeyOwner(), null);
-			const signedReq2 = await signRequest(new Request("https://example.com/"), rsaPrivateKey3, rsaPublicKey3.id);
+			const signedReq2 = await signRequest(new Request("https://example.com/", { headers: { "accept": "application/ld+json" } }), rsaPrivateKey3, rsaPublicKey3.id);
 			const signedCtx2 = federation.createContext(signedReq2, 456);
 			assertEquals(signedCtx2.request, signedReq2);
 			assertEquals(signedCtx2.url, new URL("https://example.com/"));
@@ -756,7 +753,7 @@ test({
 		});
 		await t.step("RequestContext.clone()", () => {
 			const federation = createFederation({ kv });
-			const req = new Request("https://example.com/");
+			const req = new Request("https://example.com/", { headers: { "accept": "application/ld+json" } });
 			const ctx = federation.createContext(req, 123);
 			const clone = ctx.clone(456);
 			assertStrictEquals(clone.request, ctx.request);
@@ -772,6 +769,157 @@ test({
 		esm_default.hardReset();
 	}
 });
+test("Federation.fetch()", async (t) => {
+	esm_default.spyGlobal();
+	esm_default.get("https://example.com/key2", {
+		headers: { "Content-Type": "application/activity+json" },
+		body: await rsaPublicKey2.toJsonLd({ contextLoader: mockDocumentLoader })
+	});
+	esm_default.get("begin:https://example.com/person", {
+		headers: { "Content-Type": "application/activity+json" },
+		body: person_default
+	});
+	const createTestContext = () => {
+		const kv = new MemoryKvStore();
+		const inbox = [];
+		const dispatches = [];
+		const federation = createFederation({
+			kv,
+			documentLoaderFactory: () => mockDocumentLoader,
+			authenticatedDocumentLoaderFactory(identity) {
+				const docLoader = getAuthenticatedDocumentLoader(identity);
+				return (url) => {
+					const urlObj = new URL(url);
+					if (urlObj.host === "example.com") return docLoader(url);
+					return mockDocumentLoader(url);
+				};
+			}
+		});
+		federation.setActorDispatcher("/users/{identifier}", (ctx, identifier) => {
+			dispatches.push(identifier);
+			return new Person({
+				id: ctx.getActorUri(identifier),
+				inbox: ctx.getInboxUri(identifier),
+				preferredUsername: identifier
+			});
+		}).setKeyPairsDispatcher(() => {
+			return [{
+				privateKey: rsaPrivateKey2,
+				publicKey: rsaPublicKey2.publicKey
+			}];
+		});
+		federation.setInboxDispatcher("/users/{identifier}/inbox", () => {
+			return { items: [] };
+		});
+		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(Create, (_ctx, activity) => {
+			inbox.push(activity.id.toString());
+			return;
+		});
+		return {
+			federation,
+			inbox,
+			dispatches
+		};
+	};
+	await t.step("GET without accepts header", async () => {
+		const { federation, dispatches } = createTestContext();
+		const response = await federation.fetch(new Request("https://example.com/users/actor", { method: "GET" }), { contextData: void 0 });
+		assertEquals(dispatches, []);
+		assertEquals(response.status, 406);
+	});
+	await t.step("POST with application/json", async () => {
+		const { federation, inbox } = createTestContext();
+		const request = await signRequest(new Request("https://example.com/users/json/inbox", {
+			method: "POST",
+			headers: {
+				"Accept": "application/json",
+				"Content-Type": "application/json"
+			},
+			body: JSON.stringify(create_default)
+		}), rsaPrivateKey2, rsaPublicKey2.id);
+		const response = await federation.fetch(request, { contextData: void 0 });
+		assertEquals(response.status, 202);
+		assertEquals(inbox.length, 1, "Expected one item in the inbox, json");
+		assertEquals(inbox[0], create_default.id);
+	});
+	await t.step("GET with application/json", async () => {
+		const { federation, dispatches } = createTestContext();
+		const response = await federation.fetch(new Request("https://example.com/users/json", {
+			method: "GET",
+			headers: { "Accept": "application/json" }
+		}), { contextData: void 0 });
+		assertEquals(dispatches, ["json"]);
+		assertEquals(response.status, 200);
+	});
+	await t.step("POST with application/ld+json", async () => {
+		const { federation, inbox } = createTestContext();
+		const request = await signRequest(new Request("https://example.com/users/ld/inbox", {
+			method: "POST",
+			headers: {
+				"Accept": "application/ld+json",
+				"Content-Type": "application/activity+json"
+			},
+			body: JSON.stringify(create_default)
+		}), rsaPrivateKey2, rsaPublicKey2.id);
+		const response = await federation.fetch(request, { contextData: void 0 });
+		assertEquals(response.status, 202);
+		assertEquals(inbox.length, 1, "Expected one inbox activity, ld+json");
+		assertEquals(inbox[0], create_default.id);
+	});
+	await t.step("GET with application/ld+json", async () => {
+		const { federation, dispatches } = createTestContext();
+		const request = new Request("https://example.com/users/ld", {
+			method: "GET",
+			headers: { "Accept": "application/ld+json" }
+		});
+		const response = await federation.fetch(request, { contextData: void 0 });
+		assertEquals(dispatches, ["ld"]);
+		assertEquals(response.status, 200);
+	});
+	await t.step("POST with application/activity+json", async () => {
+		const { federation, inbox } = createTestContext();
+		const request = await signRequest(new Request("https://example.com/users/activity/inbox", {
+			method: "POST",
+			headers: {
+				"Accept": "application/activity+json",
+				"Content-Type": "application/activity+json"
+			},
+			body: JSON.stringify(create_default)
+		}), rsaPrivateKey2, rsaPublicKey2.id);
+		const response = await federation.fetch(request, { contextData: void 0 });
+		assertEquals(response.status, 202);
+		assertEquals(inbox.length, 1);
+		assertEquals(inbox[0], create_default.id);
+	});
+	await t.step("GET with application/activity+json", async () => {
+		const { federation, dispatches } = createTestContext();
+		const request = new Request("https://example.com/users/activity", {
+			method: "GET",
+			headers: { "Accept": "application/ld+json" }
+		});
+		const response = await federation.fetch(request, { contextData: void 0 });
+		assertEquals(dispatches, ["activity"]);
+		assertEquals(response.status, 200);
+	});
+	await t.step("onNotAcceptable with GET", async () => {
+		const { federation } = createTestContext();
+		let notAcceptableCalled = false;
+		const response = await federation.fetch(new Request("https://example.com/users/html", {
+			method: "GET",
+			headers: { "Accept": "text/html" }
+		}), {
+			contextData: void 0,
+			onNotAcceptable: () => {
+				notAcceptableCalled = true;
+				return new Response("handled by onNotAcceptable", { status: 200 });
+			}
+		});
+		assertEquals(notAcceptableCalled, true);
+		assertEquals(response.status, 200);
+		assertEquals(await response.text(), "handled by onNotAcceptable");
+	});
+	esm_default.hardReset();
+});
 test("Federation.setInboxListeners()", async (t) => {
 	const kv = new MemoryKvStore();
 	esm_default.spyGlobal();
@@ -790,7 +938,7 @@ test("Federation.setInboxListeners()", async (t) => {
 	await t.step("path match", () => {
 		const federation = createFederation({
 			kv,
-			documentLoader: mockDocumentLoader
+			documentLoaderFactory: () => mockDocumentLoader
 		});
 		federation.setInboxDispatcher("/users/{identifier}/inbox", () => ({ items: [] }));
 		assertThrows(() => federation.setInboxListeners("/users/{identifier}/inbox2"), RouterError);
@@ -798,7 +946,7 @@ test("Federation.setInboxListeners()", async (t) => {
 	await t.step("wrong variables in path", () => {
 		const federation = createFederation({
 			kv,
-			documentLoader: mockDocumentLoader
+			documentLoaderFactory: () => mockDocumentLoader
 		});
 		assertThrows(() => federation.setInboxListeners("/users/inbox"), RouterError);
 		assertThrows(() => federation.setInboxListeners("/users/{identifier}/inbox/{id2}"), RouterError);
@@ -809,7 +957,7 @@ test("Federation.setInboxListeners()", async (t) => {
 		const authenticatedRequests = [];
 		const federation = createFederation({
 			kv,
-			documentLoader: mockDocumentLoader,
+			documentLoaderFactory: () => mockDocumentLoader,
 			authenticatedDocumentLoaderFactory(identity) {
 				const docLoader = getAuthenticatedDocumentLoader(identity);
 				return (url) => {
@@ -824,7 +972,10 @@ test("Federation.setInboxListeners()", async (t) => {
 		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(Create, (ctx, create) => {
 			inbox.push([ctx, create]);
 		});
-		let response = await federation.fetch(new Request("https://example.com/inbox", { method: "POST" }), { contextData: void 0 });
+		let response = await federation.fetch(new Request("https://example.com/inbox", {
+			method: "POST",
+			headers: { "accept": "application/ld+json" }
+		}), { contextData: void 0 });
 		assertEquals(inbox, []);
 		assertEquals(response.status, 404);
 		federation.setActorDispatcher("/users/{identifier}", (_, identifier) => identifier === "john" ? new Person({}) : null).setKeyPairsDispatcher(() => [{
@@ -841,23 +992,37 @@ test("Federation.setInboxListeners()", async (t) => {
 		});
 		response = await federation.fetch(new Request("https://example.com/inbox", {
 			method: "POST",
-			body: JSON.stringify(await activity().toJsonLd(options))
+			body: JSON.stringify(await activity().toJsonLd(options)),
+			headers: {
+				"accept": "application/ld+json",
+				"content-type": "application/ld+json"
+			}
 		}), { contextData: void 0 });
 		assertEquals(inbox, []);
 		assertEquals(response.status, 401);
-		response = await federation.fetch(new Request("https://example.com/users/no-one/inbox", { method: "POST" }), { contextData: void 0 });
+		response = await federation.fetch(new Request("https://example.com/users/no-one/inbox", {
+			method: "POST",
+			headers: { "accept": "application/ld+json" }
+		}), { contextData: void 0 });
 		assertEquals(inbox, []);
 		assertEquals(response.status, 404);
 		response = await federation.fetch(new Request("https://example.com/users/john/inbox", {
 			method: "POST",
-			body: JSON.stringify(await activity().toJsonLd(options))
+			body: JSON.stringify(await activity().toJsonLd(options)),
+			headers: {
+				"accept": "application/ld+json",
+				"content-type": "application/ld+json"
+			}
 		}), { contextData: void 0 });
 		assertEquals(inbox, []);
 		assertEquals(response.status, 401);
 		const activityPayload = await activity().toJsonLd(options);
 		let request = new Request("https://example.com/users/john/inbox", {
 			method: "POST",
-			headers: { "Content-Type": "application/activity+json" },
+			headers: {
+				"Content-Type": "application/activity+json",
+				accept: "application/ld+json"
+			},
 			body: JSON.stringify(activityPayload)
 		});
 		request = await signRequest(request, rsaPrivateKey3, new URL("https://example.com/person2#key3"));
@@ -874,7 +1039,10 @@ test("Federation.setInboxListeners()", async (t) => {
 		inbox.shift();
 		request = new Request("https://another.host/users/john/inbox", {
 			method: "POST",
-			headers: { "Content-Type": "application/activity+json" },
+			headers: {
+				"Content-Type": "application/activity+json",
+				"accept": "application/ld+json"
+			},
 			body: JSON.stringify(activityPayload)
 		});
 		request = await signRequest(request, rsaPrivateKey3, new URL("https://example.com/person2#key3"));
@@ -889,7 +1057,10 @@ test("Federation.setInboxListeners()", async (t) => {
 		inbox.shift();
 		request = new Request("https://example.com/inbox", {
 			method: "POST",
-			headers: { "Content-Type": "application/activity+json" },
+			headers: {
+				"Content-Type": "application/activity+json",
+				"accept": "application/ld+json"
+			},
 			body: JSON.stringify(await activity().toJsonLd(options))
 		});
 		request = await signRequest(request, rsaPrivateKey3, new URL("https://example.com/person2#key3"));
@@ -904,7 +1075,10 @@ test("Federation.setInboxListeners()", async (t) => {
 		inbox.shift();
 		request = new Request("https://example.com/users/john/inbox", {
 			method: "POST",
-			headers: { "Content-Type": "application/activity+json" },
+			headers: {
+				"Content-Type": "application/activity+json",
+				"accept": "application/ld+json"
+			},
 			body: JSON.stringify(await (await signObject(activity(), ed25519PrivateKey, ed25519Multikey.id, options)).toJsonLd(options))
 		});
 		response = await federation.fetch(request, { contextData: void 0 });
@@ -919,7 +1093,7 @@ test("Federation.setInboxListeners()", async (t) => {
 	await t.step("onError()", async () => {
 		const federation = createFederation({
 			kv,
-			documentLoader: mockDocumentLoader,
+			documentLoaderFactory: () => mockDocumentLoader,
 			authenticatedDocumentLoaderFactory(identity) {
 				const docLoader = getAuthenticatedDocumentLoader(identity);
 				return (url) => {
@@ -943,7 +1117,10 @@ test("Federation.setInboxListeners()", async (t) => {
 		const activity = new Create({ actor: new URL("https://example.com/person") });
 		let request = new Request("https://example.com/users/john/inbox", {
 			method: "POST",
-			headers: { "Content-Type": "application/activity+json" },
+			headers: {
+				"Content-Type": "application/activity+json",
+				"Accept": "application/activity+json"
+			},
 			body: JSON.stringify(await activity.toJsonLd({ contextLoader: mockDocumentLoader }))
 		});
 		request = await signRequest(request, rsaPrivateKey2, new URL("https://example.com/key2"));
@@ -959,7 +1136,7 @@ test("Federation.setInboxDispatcher()", async (t) => {
 	await t.step("path match", () => {
 		const federation = createFederation({
 			kv,
-			documentLoader: mockDocumentLoader
+			documentLoaderFactory: () => mockDocumentLoader
 		});
 		federation.setInboxListeners("/users/{identifier}/inbox");
 		assertThrows(() => federation.setInboxDispatcher("/users/{identifier}/inbox2", () => ({ items: [] })), RouterError);
@@ -967,7 +1144,7 @@ test("Federation.setInboxDispatcher()", async (t) => {
 	await t.step("path match", () => {
 		const federation = createFederation({
 			kv,
-			documentLoader: mockDocumentLoader
+			documentLoaderFactory: () => mockDocumentLoader
 		});
 		federation.setInboxListeners("/users/{identifier}/inbox");
 		federation.setInboxDispatcher("/users/{identifier}/inbox", () => ({ items: [] }));
@@ -975,7 +1152,7 @@ test("Federation.setInboxDispatcher()", async (t) => {
 	await t.step("wrong variables in path", () => {
 		const federation = createFederation({
 			kv,
-			documentLoader: mockDocumentLoader
+			documentLoaderFactory: () => mockDocumentLoader
 		});
 		assertThrows(() => federation.setInboxDispatcher("/users/inbox", () => ({ items: [] })), RouterError);
 		assertThrows(() => federation.setInboxDispatcher("/users/{identifier}/inbox/{identifier2}", () => ({ items: [] })), RouterError);
@@ -1007,7 +1184,7 @@ test("FederationImpl.sendActivity()", async (t) => {
 	const kv = new MemoryKvStore();
 	const federation = new FederationImpl({
 		kv,
-		contextLoader: mockDocumentLoader
+		contextLoaderFactory: () => mockDocumentLoader
 	});
 	const context = federation.createContext(new URL("https://example.com/"));
 	await t.step("success", async () => {
@@ -1259,7 +1436,7 @@ test("ContextImpl.sendActivity()", async (t) => {
 		collectionSyncHeader = cl.request.headers.get("Collection-Synchronization");
 		const options = {
 			async documentLoader(url) {
-				const response = await federation.fetch(new Request(url), { contextData: void 0 });
+				const response = await federation.fetch(new Request(url, { headers: { "accept": "application/ld+json" } }), { contextData: void 0 });
 				if (response.ok) return {
 					contextUrl: null,
 					document: await response.json(),
@@ -1293,7 +1470,7 @@ test("ContextImpl.sendActivity()", async (t) => {
 	const kv = new MemoryKvStore();
 	const federation = new FederationImpl({
 		kv,
-		contextLoader: mockDocumentLoader
+		contextLoaderFactory: () => mockDocumentLoader
 	});
 	federation.setActorDispatcher("/{identifier}", async (ctx, identifier) => {
 		if (identifier !== "1") return null;
@@ -1402,7 +1579,7 @@ test("ContextImpl.sendActivity()", async (t) => {
 	};
 	const federation2 = new FederationImpl({
 		kv,
-		contextLoader: mockDocumentLoader,
+		contextLoaderFactory: () => mockDocumentLoader,
 		queue
 	});
 	federation2.setActorDispatcher("/{identifier}", async (ctx, identifier) => {
@@ -1682,7 +1859,7 @@ test("InboxContextImpl.forwardActivity()", async (t) => {
 	const kv = new MemoryKvStore();
 	const federation = new FederationImpl({
 		kv,
-		contextLoader: mockDocumentLoader
+		contextLoaderFactory: () => mockDocumentLoader
 	});
 	await t.step("skip", async () => {
 		const activity = {