@fedify/fedify 2.0.0-dev.1593 → 2.0.0-dev.160

package/dist/federation/middleware.test.js

@@ -3,39 +3,53 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { Activity, Announce, Create, Invite, Multikey, Note, Object as Object$1, Offer, Person, fetchDocumentLoader, getTypeId } from "../type-qs0mWLTm.js";
+import { mockDocumentLoader, test } from "../dist-B5f6a8Tt.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-CovCqg8w.js";
-import "../semver-dArNLkR9.js";
-import "../client-CpxFv8ft.js";
-import { RouterError, lookupObject } from "../lookup-CnJK1NUl.js";
-import "../types-BIgY6c-l.js";
-import "../actor-Bj1Vq2XG.js";
-import "../key-D-s3dQbK.js";
-import { signRequest, verifyRequest } from "../http-CQulyTuw.js";
-import { getAuthenticatedDocumentLoader } from "../authdocloader-DJtdyVPc.js";
-import { detachSignature, signJsonLd, verifyJsonLd } from "../ld-CYUQO1l4.js";
-import { doesActorOwnKey } from "../owner-CBeUJR68.js";
-import { signObject, verifyObject } from "../proof-CHQnDg0z.js";
-import "../inbox-B97Wrppe.js";
-import "../builder-BgzJcrpt.js";
-import "../collection-CSzG2j1P.js";
-import "../keycache-Br0-hsD5.js";
+import { MemoryKvStore } from "../kv-QzKcOQgP.js";
+import "../deno-B74l3pXN.js";
+import { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, createFederation } from "../middleware-D9L8QWDP.js";
+import "../client-CgMTXmAD.js";
+import { RouterError } from "../router-D9eI0s4b.js";
+import "../types-BEdCLHqP.js";
+import "../key-pYEsD-IB.js";
+import { signRequest, verifyRequest } from "../http-CrnYJYhM.js";
+import { detachSignature, signJsonLd, verifyJsonLd } from "../ld-Bmrvt1KE.js";
+import { doesActorOwnKey } from "../owner-vFiFLWHR.js";
+import { signObject, verifyObject } from "../proof-C-k7brtD.js";
+import { fetchDocumentLoader, getAuthenticatedDocumentLoader } from "../docloader-eucHnjj4.js";
+import "../kv-cache-BEeqyGER.js";
+import "../inbox-6-2rtCJf.js";
+import "../builder-C9n2ExVv.js";
+import "../collection-CcnIw1qY.js";
+import "../keycache-DRxpZ5r9.js";
+import "../negotiation-5NPJL6zp.js";
 import "../retry-D4GJ670a.js";
-import "../send-Bc0QdRlp.js";
-import { mockDocumentLoader, test } from "../testing-D4xRiVJV.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-DSk2aqlj.js";
-import { esm_default } from "../esm-5nsZYnVB.js";
+import "../send-BVXXc0Cn.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-ZbcByPg9.js";
+import { esm_default } from "../esm-DGl7uK1r.js";
+import * as vocab from "@fedify/vocab";
+import { getTypeId, lookupObject } from "@fedify/vocab";
 
-//#region src/testing/fixtures/example.com/person.json
+//#region ../fixture/src/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 ../fixture/src/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";
 var type$1 = "Person";
@@ -59,7 +73,7 @@ var person_default = {
 };
 
 //#endregion
-//#region src/testing/fixtures/example.com/person2.json
+//#region ../fixture/src/fixtures/example.com/person2.json
 var __context = [
 	"https://www.w3.org/ns/activitystreams",
 	"https://w3id.org/security/v1",
@@ -108,7 +122,7 @@ test("createFederation()", async (t) => {
 	await t.step("allowPrivateAddress", () => {
 		assertThrows(() => createFederation({
 			kv,
-			contextLoader: mockDocumentLoader,
+			contextLoaderFactory: () => mockDocumentLoader,
 			allowPrivateAddress: true
 		}), TypeError);
 		assertThrows(() => createFederation({
@@ -245,7 +259,7 @@ test({
 			assertStrictEquals(ctx.federation, federation);
 			assertThrows(() => ctx.getNodeInfoUri(), RouterError);
 			assertThrows(() => ctx.getActorUri("handle"), RouterError);
-			assertThrows(() => ctx.getObjectUri(Note, {
+			assertThrows(() => ctx.getObjectUri(vocab.Note, {
 				handle: "handle",
 				id: "id"
 			}), RouterError);
@@ -262,15 +276,11 @@ test({
 			assertEquals(ctx.parseUri(null), null);
 			assertEquals(await ctx.getActorKeyPairs("handle"), []);
 			await assertRejects(() => ctx.getDocumentLoader({ identifier: "handle" }), Error, "No actor key pairs dispatcher registered");
-			await assertRejects(() => ctx.sendActivity({ identifier: "handle" }, [], new Create({})), Error, "No actor key pairs dispatcher registered");
+			await assertRejects(() => ctx.sendActivity({ identifier: "handle" }, [], new vocab.Create({})), Error, "No actor key pairs dispatcher registered");
 			federation.setNodeInfoDispatcher("/nodeinfo/2.1", () => ({
 				software: {
 					name: "Example",
-					version: {
-						major: 1,
-						minor: 2,
-						patch: 3
-					}
+					version: "1.2.3"
 				},
 				protocols: ["activitypub"],
 				usage: {
@@ -281,7 +291,7 @@ test({
 			}));
 			ctx = federation.createContext(new URL("https://example.com/"), 123);
 			assertEquals(ctx.getNodeInfoUri(), new URL("https://example.com/nodeinfo/2.1"));
-			federation.setActorDispatcher("/users/{identifier}", () => new Person({})).setKeyPairsDispatcher(() => [{
+			federation.setActorDispatcher("/users/{identifier}", () => new vocab.Person({})).setKeyPairsDispatcher(() => [{
 				privateKey: rsaPrivateKey2,
 				publicKey: rsaPublicKey2.publicKey
 			}, {
@@ -305,7 +315,7 @@ test({
 					id: new URL("https://example.com/users/handle#main-key"),
 					owner: new URL("https://example.com/users/handle")
 				}),
-				multikey: new Multikey({
+				multikey: new vocab.Multikey({
 					id: new URL("https://example.com/users/handle#main-key"),
 					controller: new URL("https://example.com/users/handle"),
 					publicKey: rsaPublicKey2.publicKey
@@ -318,7 +328,7 @@ test({
 					id: new URL("https://example.com/users/handle#key-2"),
 					owner: new URL("https://example.com/users/handle")
 				}),
-				multikey: new Multikey({
+				multikey: new vocab.Multikey({
 					id: new URL("https://example.com/users/handle#key-2"),
 					controller: new URL("https://example.com/users/handle"),
 					publicKey: ed25519PublicKey.publicKey
@@ -346,8 +356,8 @@ test({
 				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") }));
+			await assertRejects(() => ctx.sendActivity({ identifier: "handle" }, [], new vocab.Create({})), TypeError, "The activity to send must have at least one actor property.");
+			await ctx.sendActivity({ identifier: "handle" }, [], new vocab.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",
@@ -360,21 +370,21 @@ test({
 				contextLoaderFactory: () => mockDocumentLoader
 			});
 			const ctx2 = federation2.createContext(new URL("https://example.com/"), 123);
-			assertEquals(await ctx2.lookupObject("https://example.com/object"), new Object$1({
+			assertEquals(await ctx2.lookupObject("https://example.com/object"), new vocab.Object({
 				id: new URL("https://example.com/object"),
 				name: "Fetched object"
 			}));
-			federation.setObjectDispatcher(Note, "/users/{identifier}/notes/{id}", (_ctx, values) => {
-				return new Note({ summary: `Note ${values.id} by ${values.identifier}` });
+			federation.setObjectDispatcher(vocab.Note, "/users/{identifier}/notes/{id}", (_ctx, values) => {
+				return new vocab.Note({ summary: `Note ${values.id} by ${values.identifier}` });
 			});
 			ctx = federation.createContext(new URL("https://example.com/"), 123);
-			assertEquals(ctx.getObjectUri(Note, {
+			assertEquals(ctx.getObjectUri(vocab.Note, {
 				identifier: "john",
 				id: "123"
 			}), new URL("https://example.com/users/john/notes/123"));
 			assertEquals(ctx.parseUri(new URL("https://example.com/users/john/notes/123")), {
 				type: "object",
-				class: Note,
+				class: vocab.Note,
 				typeId: new URL("https://www.w3.org/ns/activitystreams#Note"),
 				values: {
 					identifier: "john",
@@ -457,7 +467,7 @@ test({
 				kv,
 				origin: "https://ap.example.com",
 				documentLoaderFactory: () => mockDocumentLoader,
-				contextLoader: mockDocumentLoader
+				contextLoaderFactory: () => mockDocumentLoader
 			});
 			const ctx = federation.createContext(new URL("https://example.com:1234/"));
 			assertEquals(ctx.origin, "https://example.com:1234");
@@ -467,11 +477,7 @@ test({
 			federation.setNodeInfoDispatcher("/nodeinfo/2.1", () => ({
 				software: {
 					name: "Example",
-					version: {
-						major: 1,
-						minor: 2,
-						patch: 3
-					}
+					version: "1.2.3"
 				},
 				protocols: ["activitypub"],
 				usage: {
@@ -481,7 +487,7 @@ test({
 				}
 			}));
 			assertEquals(ctx.getNodeInfoUri(), new URL("https://ap.example.com/nodeinfo/2.1"));
-			federation.setActorDispatcher("/users/{identifier}", () => new Person({}));
+			federation.setActorDispatcher("/users/{identifier}", () => new vocab.Person({}));
 			assertEquals(ctx.getActorUri("handle"), new URL("https://ap.example.com/users/handle"));
 			assertEquals(ctx.parseUri(new URL("https://ap.example.com/users/handle")), {
 				type: "actor",
@@ -493,16 +499,16 @@ test({
 				handle: "handle",
 				identifier: "handle"
 			});
-			federation.setObjectDispatcher(Note, "/users/{identifier}/notes/{id}", (_ctx, values) => {
-				return new Note({ summary: `Note ${values.id} by ${values.identifier}` });
+			federation.setObjectDispatcher(vocab.Note, "/users/{identifier}/notes/{id}", (_ctx, values) => {
+				return new vocab.Note({ summary: `Note ${values.id} by ${values.identifier}` });
 			});
-			assertEquals(ctx.getObjectUri(Note, {
+			assertEquals(ctx.getObjectUri(vocab.Note, {
 				identifier: "john",
 				id: "123"
 			}), new URL("https://ap.example.com/users/john/notes/123"));
 			assertEquals(ctx.parseUri(new URL("https://ap.example.com/users/john/notes/123")), {
 				type: "object",
-				class: Note,
+				class: vocab.Note,
 				typeId: new URL("https://www.w3.org/ns/activitystreams#Note"),
 				values: {
 					identifier: "john",
@@ -511,7 +517,7 @@ test({
 			});
 			assertEquals(ctx.parseUri(new URL("https://example.com:1234/users/john/notes/123")), {
 				type: "object",
-				class: Note,
+				class: vocab.Note,
 				typeId: new URL("https://www.w3.org/ns/activitystreams#Note"),
 				values: {
 					identifier: "john",
@@ -661,13 +667,7 @@ test({
 			assertEquals(nodeInfo, {
 				software: {
 					name: "foo",
-					version: {
-						major: 1,
-						minor: 2,
-						patch: 3,
-						build: [],
-						prerelease: []
-					}
+					version: "1.2.3"
 				},
 				protocols: ["activitypub", "diaspora"],
 				usage: {
@@ -695,7 +695,7 @@ test({
 				kv,
 				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/"));
@@ -704,7 +704,7 @@ test({
 			assertEquals(ctx.hostname, "example.com");
 			assertEquals(ctx.data, 123);
 			await assertRejects(() => ctx.getActor("someone"), Error);
-			await assertRejects(() => ctx.getObject(Note, {
+			await assertRejects(() => ctx.getObject(vocab.Note, {
 				handle: "someone",
 				id: "123"
 			}), Error);
@@ -713,7 +713,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/"));
@@ -722,7 +722,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/"));
@@ -735,27 +735,27 @@ test({
 			assertEquals(await signedCtx2.getSignedKeyOwner(), expectedOwner);
 			assertEquals(await signedCtx2.getSignedKey(), rsaPublicKey3);
 			assertEquals(await signedCtx2.getSignedKeyOwner(), expectedOwner);
-			federation.setActorDispatcher("/users/{identifier}", (_ctx, identifier) => new Person({ preferredUsername: identifier }));
+			federation.setActorDispatcher("/users/{identifier}", (_ctx, identifier) => new vocab.Person({ preferredUsername: identifier }));
 			const ctx2 = federation.createContext(req, 789);
 			assertEquals(ctx2.request, req);
 			assertEquals(ctx2.url, new URL("https://example.com/"));
 			assertEquals(ctx2.data, 789);
-			assertEquals(await ctx2.getActor("john"), new Person({ preferredUsername: "john" }));
-			federation.setObjectDispatcher(Note, "/users/{identifier}/notes/{id}", (_ctx, values) => {
-				return new Note({ summary: `Note ${values.id} by ${values.identifier}` });
+			assertEquals(await ctx2.getActor("john"), new vocab.Person({ preferredUsername: "john" }));
+			federation.setObjectDispatcher(vocab.Note, "/users/{identifier}/notes/{id}", (_ctx, values) => {
+				return new vocab.Note({ summary: `Note ${values.id} by ${values.identifier}` });
 			});
 			const ctx3 = federation.createContext(req, 123);
 			assertEquals(ctx3.request, req);
 			assertEquals(ctx3.url, new URL("https://example.com/"));
 			assertEquals(ctx3.data, 123);
-			assertEquals(await ctx2.getObject(Note, {
+			assertEquals(await ctx2.getObject(vocab.Note, {
 				identifier: "john",
 				id: "123"
-			}), new Note({ summary: "Note 123 by john" }));
+			}), new vocab.Note({ summary: "Note 123 by john" }));
 		});
 		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);
@@ -771,6 +771,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 vocab.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(vocab.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();
@@ -820,13 +971,16 @@ test("Federation.setInboxListeners()", async (t) => {
 			}
 		});
 		const inbox = [];
-		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(Create, (ctx, create) => {
+		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(vocab.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(() => [{
+		federation.setActorDispatcher("/users/{identifier}", (_, identifier) => identifier === "john" ? new vocab.Person({}) : null).setKeyPairsDispatcher(() => [{
 			privateKey: rsaPrivateKey2,
 			publicKey: rsaPublicKey2.publicKey
 		}]);
@@ -834,29 +988,43 @@ test("Federation.setInboxListeners()", async (t) => {
 			documentLoader: mockDocumentLoader,
 			contextLoader: mockDocumentLoader
 		};
-		const activity = () => new Create({
+		const activity = () => new vocab.Create({
 			id: new URL("https://example.com/activities/" + crypto.randomUUID()),
 			actor: new URL("https://example.com/person2")
 		});
 		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"));
@@ -873,7 +1041,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"));
@@ -888,7 +1059,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"));
@@ -903,7 +1077,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 });
@@ -928,21 +1105,24 @@ test("Federation.setInboxListeners()", async (t) => {
 				};
 			}
 		});
-		federation.setActorDispatcher("/users/{identifier}", (_, identifier) => identifier === "john" ? new Person({}) : null).setKeyPairsDispatcher(() => [{
+		federation.setActorDispatcher("/users/{identifier}", (_, identifier) => identifier === "john" ? new vocab.Person({}) : null).setKeyPairsDispatcher(() => [{
 			privateKey: rsaPrivateKey2,
 			publicKey: rsaPublicKey2.publicKey
 		}]);
 		const error = /* @__PURE__ */ new Error("test");
 		const errors = [];
-		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(Create, () => {
+		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(vocab.Create, () => {
 			throw error;
 		}).onError((_, e) => {
 			errors.push(e);
 		});
-		const activity = new Create({ actor: new URL("https://example.com/person") });
+		const activity = new vocab.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"));
@@ -995,8 +1175,8 @@ test("FederationImpl.sendActivity()", async (t) => {
 		let json = await cl.request.json();
 		if (await verifyJsonLd(json, options)) verified.push("ld");
 		json = detachSignature(json);
-		let activity = await verifyObject(Activity, json, options);
-		if (activity == null) activity = await Activity.fromJsonLd(json, options);
+		let activity = await verifyObject(vocab.Activity, json, options);
+		if (activity == null) activity = await vocab.Activity.fromJsonLd(json, options);
 		else verified.push("proof");
 		const key = await verifyRequest(request, options);
 		if (key != null && await doesActorOwnKey(activity, key, options)) verified.push("http");
@@ -1006,11 +1186,11 @@ 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 () => {
-		const activity = new Create({
+		const activity = new vocab.Create({
 			id: new URL("https://example.com/activity/1"),
 			actor: new URL("https://example.com/person")
 		});
@@ -1085,7 +1265,7 @@ test("FederationImpl.processQueuedTask()", async (t) => {
 			kv,
 			queue
 		});
-		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(Create, () => {
+		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(vocab.Create, () => {
 			throw new Error("Intended error for testing");
 		});
 		await assertRejects(() => federation.processQueuedTask(void 0, {
@@ -1147,7 +1327,7 @@ test("FederationImpl.processQueuedTask()", async (t) => {
 			kv,
 			queue
 		});
-		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(Create, () => {
+		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(vocab.Create, () => {
 			throw new Error("Intended error for testing");
 		});
 		const outboxMessage = {
@@ -1232,7 +1412,7 @@ test("ContextImpl.lookupObject()", async (t) => {
 		});
 		const ctx = federation.createContext(new URL("https://example.com/"));
 		const result = await ctx.lookupObject("@test@localhost");
-		assertInstanceOf(result, Person);
+		assertInstanceOf(result, vocab.Person);
 		assertEquals(result.id, new URL("https://localhost/actor"));
 		assertEquals(result.preferredUsername, "test");
 	});
@@ -1258,7 +1438,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(),
@@ -1281,8 +1461,8 @@ test("ContextImpl.sendActivity()", async (t) => {
 		let json = await cl.request.json();
 		if (await verifyJsonLd(json, options)) verified.push("ld");
 		json = detachSignature(json);
-		let activity = await verifyObject(Activity, json, options);
-		if (activity == null) activity = await Activity.fromJsonLd(json, options);
+		let activity = await verifyObject(vocab.Activity, json, options);
+		if (activity == null) activity = await vocab.Activity.fromJsonLd(json, options);
 		else verified.push("proof");
 		const key = await verifyRequest(request, options);
 		if (key != null && await doesActorOwnKey(activity, key, options)) verified.push("http");
@@ -1292,12 +1472,12 @@ 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;
 		const keys = await ctx.getActorKeyPairs(identifier);
-		return new Person({
+		return new vocab.Person({
 			id: ctx.getActorUri(identifier),
 			preferredUsername: "john",
 			publicKey: keys[0].cryptographicKey,
@@ -1318,7 +1498,7 @@ test("ContextImpl.sendActivity()", async (t) => {
 		inboxId: new URL("https://example.com/inbox")
 	}] }));
 	await t.step("success", async () => {
-		const activity = new Create({ actor: new URL("https://example.com/person") });
+		const activity = new vocab.Create({ actor: new URL("https://example.com/person") });
 		const ctx = new ContextImpl({
 			data: void 0,
 			federation,
@@ -1401,13 +1581,13 @@ test("ContextImpl.sendActivity()", async (t) => {
 	};
 	const federation2 = new FederationImpl({
 		kv,
-		contextLoader: mockDocumentLoader,
+		contextLoaderFactory: () => mockDocumentLoader,
 		queue
 	});
 	federation2.setActorDispatcher("/{identifier}", async (ctx, identifier) => {
 		if (identifier !== "john") return null;
 		const keys = await ctx.getActorKeyPairs(identifier);
-		return new Person({
+		return new vocab.Person({
 			id: ctx.getActorUri(identifier),
 			preferredUsername: "john",
 			publicKey: keys[0].cryptographicKey,
@@ -1431,7 +1611,7 @@ test("ContextImpl.sendActivity()", async (t) => {
 		contextLoader: fetchDocumentLoader
 	});
 	await t.step("fanout: \"force\"", async () => {
-		const activity = new Create({
+		const activity = new vocab.Create({
 			id: new URL("https://example.com/activity/1"),
 			actor: new URL("https://example.com/person")
 		});
@@ -1460,7 +1640,7 @@ test("ContextImpl.sendActivity()", async (t) => {
 	});
 	queue.clear();
 	await t.step("fanout: \"skip\"", async () => {
-		const activity = new Create({
+		const activity = new vocab.Create({
 			id: new URL("https://example.com/activity/1"),
 			actor: new URL("https://example.com/person")
 		});
@@ -1475,7 +1655,7 @@ test("ContextImpl.sendActivity()", async (t) => {
 	});
 	queue.clear();
 	await t.step("fanout: \"auto\"", async () => {
-		const activity = new Create({
+		const activity = new vocab.Create({
 			id: new URL("https://example.com/activity/1"),
 			actor: new URL("https://example.com/person")
 		});
@@ -1524,7 +1704,7 @@ test("ContextImpl.sendActivity()", async (t) => {
 			documentLoader: fetchDocumentLoader,
 			contextLoader: fetchDocumentLoader
 		});
-		const activity = new Create({
+		const activity = new vocab.Create({
 			id: new URL("https://example.com/activity/1"),
 			actor: ctx.getActorUri("1"),
 			to: ctx.getFollowersUri("1")
@@ -1541,7 +1721,7 @@ test("ContextImpl.sendActivity()", async (t) => {
 			documentLoader: fetchDocumentLoader,
 			contextLoader: fetchDocumentLoader
 		});
-		const activity = new Create({
+		const activity = new vocab.Create({
 			id: new URL("https://example.com/activity/2"),
 			actor: ctx.getActorUri("1"),
 			to: ctx.getFollowersUri("1")
@@ -1563,7 +1743,7 @@ test({
 	async fn() {
 		const federation = new FederationImpl({ kv: new MemoryKvStore() });
 		const activities = [];
-		federation.setInboxListeners("/u/{identifier}/i", "/i").on(Offer, (ctx$1, offer) => {
+		federation.setInboxListeners("/u/{identifier}/i", "/i").on(vocab.Offer, (ctx$1, offer) => {
 			activities.push([ctx$1.recipient, offer]);
 		});
 		const ctx = new ContextImpl({
@@ -1573,52 +1753,52 @@ test({
 			documentLoader: mockDocumentLoader,
 			contextLoader: fetchDocumentLoader
 		});
-		assertFalse(await ctx.routeActivity(null, new Offer({ actor: new URL("https://example.com/person") })));
+		assertFalse(await ctx.routeActivity(null, new vocab.Offer({ actor: new URL("https://example.com/person") })));
 		assertEquals(activities, []);
-		const signedOffer = await signObject(new Offer({ actor: new URL("https://example.com/person2") }), ed25519PrivateKey, ed25519Multikey.id);
+		const signedOffer = await signObject(new vocab.Offer({ actor: new URL("https://example.com/person2") }), ed25519PrivateKey, ed25519Multikey.id);
 		assert(await ctx.routeActivity(null, signedOffer));
 		assertEquals(activities, [[null, signedOffer]]);
-		const signedInvite = await signObject(new Invite({ actor: new URL("https://example.com/person2") }), ed25519PrivateKey, ed25519Multikey.id);
+		const signedInvite = await signObject(new vocab.Invite({ actor: new URL("https://example.com/person2") }), ed25519PrivateKey, ed25519Multikey.id);
 		assert(await ctx.routeActivity("id", signedInvite));
 		assertEquals(activities, [[null, signedOffer], ["id", signedInvite]]);
-		assertFalse(await ctx.routeActivity(null, new Create({
+		assertFalse(await ctx.routeActivity(null, new vocab.Create({
 			id: new URL("https://example.com/not-found"),
 			actor: new URL("https://example.com/person")
 		})));
 		assertEquals(activities, [[null, signedOffer], ["id", signedInvite]]);
-		assertFalse(await ctx.routeActivity(null, new Create({
+		assertFalse(await ctx.routeActivity(null, new vocab.Create({
 			id: new URL("https://example.com/person"),
 			actor: new URL("https://example.com/person")
 		})));
 		assertEquals(activities, [[null, signedOffer], ["id", signedInvite]]);
-		assertFalse(await ctx.routeActivity(null, new Announce({
+		assertFalse(await ctx.routeActivity(null, new vocab.Announce({
 			id: new URL("https://example.com/announce#diffrent-id"),
 			actor: new URL("https://example.com/person")
 		})));
 		assertEquals(activities, [[null, signedOffer], ["id", signedInvite]]);
-		assertFalse(await ctx.routeActivity(null, new Announce({
+		assertFalse(await ctx.routeActivity(null, new vocab.Announce({
 			id: new URL("https://example.com/announce"),
 			actor: new URL("https://example.com/person")
 		})));
 		assertEquals(activities, [[null, signedOffer], ["id", signedInvite]]);
-		assertFalse(await ctx.routeActivity(null, new Create({
+		assertFalse(await ctx.routeActivity(null, new vocab.Create({
 			id: new URL("https://example.com/cross-origin-actor"),
 			actor: new URL("https://cross-origin.com/actor")
 		})));
 		assertEquals(activities, [[null, signedOffer], ["id", signedInvite]]);
-		assert(await ctx.routeActivity(null, new Create({
+		assert(await ctx.routeActivity(null, new vocab.Create({
 			id: new URL("https://example.com/create"),
 			actor: new URL("https://example.com/person")
 		})));
 		assertEquals(activities, [[null, signedOffer], ["id", signedInvite]]);
-		assert(await ctx.routeActivity(null, new Invite({
+		assert(await ctx.routeActivity(null, new vocab.Invite({
 			id: new URL("https://example.com/invite"),
 			actor: new URL("https://example.com/person")
 		})));
 		assertEquals(activities, [
 			[null, signedOffer],
 			["id", signedInvite],
-			[null, new Invite({
+			[null, new vocab.Invite({
 				id: new URL("https://example.com/invite"),
 				actor: new URL("https://example.com/person"),
 				object: new URL("https://example.com/object")
@@ -1640,15 +1820,15 @@ test("ContextImpl.getCollectionUri()", () => {
 	const dispatcher = (_ctx, _values) => ({ items: [] });
 	let url;
 	const strName = "registered";
-	federation.setCollectionDispatcher(strName, Object$1, "/string-route/{id}", dispatcher);
+	federation.setCollectionDispatcher(strName, vocab.Object, "/string-route/{id}", dispatcher);
 	url = ctx.getCollectionUri(strName, values);
 	assertEquals(url.href, `${base}/string-route/123`);
 	const unnamedSymName = Symbol(strName);
-	federation.setCollectionDispatcher(unnamedSymName, Object$1, "/symbol-route/{id}", dispatcher);
+	federation.setCollectionDispatcher(unnamedSymName, vocab.Object, "/symbol-route/{id}", dispatcher);
 	url = ctx.getCollectionUri(unnamedSymName, values);
 	assertEquals(url.href, `${base}/symbol-route/123`);
 	const namedSymName = Symbol.for(strName);
-	federation.setCollectionDispatcher(namedSymName, Object$1, "/named-symbol-route/{id}", dispatcher);
+	federation.setCollectionDispatcher(namedSymName, vocab.Object, "/named-symbol-route/{id}", dispatcher);
 	url = ctx.getCollectionUri(namedSymName, values);
 	assertEquals(url.href, `${base}/named-symbol-route/123`);
 	const notReg = "not-registered";
@@ -1670,8 +1850,8 @@ test("InboxContextImpl.forwardActivity()", async (t) => {
 		let json = await cl.request.json();
 		if (await verifyJsonLd(json, options)) verified.push("ld");
 		json = detachSignature(json);
-		let activity = await verifyObject(Activity, json, options);
-		if (activity == null) activity = await Activity.fromJsonLd(json, options);
+		let activity = await verifyObject(vocab.Activity, json, options);
+		if (activity == null) activity = await vocab.Activity.fromJsonLd(json, options);
 		else verified.push("proof");
 		const key = await verifyRequest(request, options);
 		if (key != null && await doesActorOwnKey(activity, key, options)) verified.push("http");
@@ -1681,7 +1861,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 = {
@@ -1730,7 +1910,7 @@ test("InboxContextImpl.forwardActivity()", async (t) => {
 		assertEquals(verified, []);
 	});
 	await t.step("Object Integrity Proofs", async () => {
-		const activity = await signObject(new Create({
+		const activity = await signObject(new vocab.Create({
 			id: new URL("https://example.com/activity"),
 			actor: new URL("https://example.com/person2")
 		}), ed25519PrivateKey, ed25519Multikey.id, {