@fedify/fedify 1.9.6 → 1.9.8

package/dist/federation/{middleware.test.js → middleware.test.mjs}

@@ -1,106 +1,78 @@
-
-      import { Temporal } from "@js-temporal/polyfill";
-      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-COPv6pMi.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-DrhEvfTo.js";
-import "../semver-dArNLkR9.js";
-import "../client-UG5wpNhG.js";
-import { RouterError, lookupObject } from "../lookup-BMAWLsP2.js";
-import "../types-BIgY6c-l.js";
-import "../actor-DbpZ6pzg.js";
-import "../key-CPJcJjp-.js";
-import { signRequest, verifyRequest } from "../http-05HxN-lp.js";
-import { getAuthenticatedDocumentLoader } from "../authdocloader-BLqMyboS.js";
-import { detachSignature, signJsonLd, verifyJsonLd } from "../ld-DHNA2RSQ.js";
-import { doesActorOwnKey } from "../owner-DDHsHYQO.js";
-import { signObject, verifyObject } from "../proof-exgGRW88.js";
-import "../inbox-DcJN1cxM.js";
-import "../builder-BO61xeXE.js";
-import "../collection-CSzG2j1P.js";
-import "../keycache-CMUfqYqr.js";
-import "../retry-D4GJ670a.js";
-import "../send-BfMYakUE.js";
-import { mockDocumentLoader, test } from "../testing-RPOc_gVG.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-IZ5050fT.js";
-import { esm_default } from "../esm-C1EfGjSS.js";
-
+import { Temporal } from "@js-temporal/polyfill";
+import "urlpattern-polyfill";
+globalThis.addEventListener = () => {};
+import { C as Person, G as FetchError, U as getTypeId, _ as Note, g as Multikey, m as Invite, n as Announce, o as Create, q as fetchDocumentLoader, t as Activity, v as Object$1, y as Offer } from "../vocab-DuW9rL1h.mjs";
+import { i as RouterError, t as lookupObject } from "../lookup-DmeJ8WUw.mjs";
+import { a as mockDocumentLoader, t as test } from "../testing-DS3gcq8V.mjs";
+import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
+import { n as assertStrictEquals } from "../std__assert-2v7gYiZp.mjs";
+import { n as assertFalse, t as assertRejects } from "../assert_rejects-CJC9ThS-.mjs";
+import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
+import { t as assertNotEquals } from "../assert_not_equals--wG9hV7u.mjs";
+import { t as assertThrows } from "../assert_throws-BIL7gChy.mjs";
+import { t as assert } from "../assert-DikXweDx.mjs";
+import { t as MemoryKvStore } from "../kv-DM1zFCtL.mjs";
+import { a as createFederation, i as KvSpecDeterminer, n as FederationImpl, r as InboxContextImpl, t as ContextImpl } from "../middleware-Db1yZQaT.mjs";
+import { l as verifyRequest, s as signRequest } from "../http-Bu5ZNlhZ.mjs";
+import { t as getAuthenticatedDocumentLoader } from "../authdocloader-BC2rYCy1.mjs";
+import { a as signJsonLd, o as verifyJsonLd, r as detachSignature } from "../ld-6jAVu3jV.mjs";
+import { t as doesActorOwnKey } from "../owner-CKuGt_T9.mjs";
+import { n as signObject, r as verifyObject } from "../proof-mJLL2gSA.mjs";
+import { t as esm_default } from "../esm-BHJ7sdNg.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-B27nVeIs.mjs";
 //#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";
-var type$1 = "Person";
-var name$1 = "John Doe";
-var publicKey$1 = [{
-	"id": "https://example.com/key",
-	"owner": "https://example.com/person",
-	"type": "CryptographicKey",
-	"publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyIB9rotX8G6r6/6toT+x\n24BUiQ/HaPH1Em9dOt4c94s+OPFoEdH7DY7Iym9A8LlH4JaGF8KD38bLHWe1S4x0\njV3gHJKhK7veJfGZCKUENcQecBZ+YWUs5HWvUIX1vVB//0luHrg6BQKGOrSOE+WI\nAxyr0qsWCFfZzQrvSnUD2yvg1arJX2xhms14uxoRd5Kg9efKSCmmQaNEapicARUm\nFWrIEpGFa/nUUnqimssAGw1eZFqf3wA4TjhsuARBhGaJtv/3KEa016eMZxy3kDlO\njZnXZTaTgWkXdodwUvy8563fes3Al6BlcS2iJ9qbtha8rSm0FHqoUKH73JsLPKQI\nwQIDAQAB\n-----END PUBLIC KEY-----"
-}, {
-	"id": "https://example.com/key2",
-	"type": "CryptographicKey",
-	"publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoRmBtnxbdFutoRd1GLGw\nwGTrsqlRRWUe11hHQaoRLGf5LwQ0tIc6I9q+dynliw+2kxYsLn9SH2je6HcTYOol\ngW7F/cOWXZQN04b+OiYcU1ConAhLjmn4k1uKawJ614y0ScPNd8PQ+CljsnlPxbq9\nofaCMe2BV3B6y09aCuGFJ0nxn1/ubjmIBIWWFTAznoz1J9BhJDGyt3IO3ABy3f9z\nDVlR32L/n5VIkXnxkjUKdzMAOzYb62kuKOp1iznRTPrV71SNtivJMwSh/LVgBrmZ\njtIn/oim+KyX/fdLU3tQ7VClyqmJzyAjccOH6Qj6nFTPh+vX07gqN8IlLT2uye4w\nawIDAQAB\n-----END PUBLIC KEY-----"
-}];
 var person_default = {
-	"@context": __context$1,
-	id: id$1,
-	type: type$1,
-	name: name$1,
-	publicKey: publicKey$1
+	"@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"],
+	id: "https://example.com/person",
+	type: "Person",
+	name: "John Doe",
+	publicKey: [{
+		"id": "https://example.com/key",
+		"owner": "https://example.com/person",
+		"type": "CryptographicKey",
+		"publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyIB9rotX8G6r6/6toT+x\n24BUiQ/HaPH1Em9dOt4c94s+OPFoEdH7DY7Iym9A8LlH4JaGF8KD38bLHWe1S4x0\njV3gHJKhK7veJfGZCKUENcQecBZ+YWUs5HWvUIX1vVB//0luHrg6BQKGOrSOE+WI\nAxyr0qsWCFfZzQrvSnUD2yvg1arJX2xhms14uxoRd5Kg9efKSCmmQaNEapicARUm\nFWrIEpGFa/nUUnqimssAGw1eZFqf3wA4TjhsuARBhGaJtv/3KEa016eMZxy3kDlO\njZnXZTaTgWkXdodwUvy8563fes3Al6BlcS2iJ9qbtha8rSm0FHqoUKH73JsLPKQI\nwQIDAQAB\n-----END PUBLIC KEY-----"
+	}, {
+		"id": "https://example.com/key2",
+		"type": "CryptographicKey",
+		"publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoRmBtnxbdFutoRd1GLGw\nwGTrsqlRRWUe11hHQaoRLGf5LwQ0tIc6I9q+dynliw+2kxYsLn9SH2je6HcTYOol\ngW7F/cOWXZQN04b+OiYcU1ConAhLjmn4k1uKawJ614y0ScPNd8PQ+CljsnlPxbq9\nofaCMe2BV3B6y09aCuGFJ0nxn1/ubjmIBIWWFTAznoz1J9BhJDGyt3IO3ABy3f9z\nDVlR32L/n5VIkXnxkjUKdzMAOzYb62kuKOp1iznRTPrV71SNtivJMwSh/LVgBrmZ\njtIn/oim+KyX/fdLU3tQ7VClyqmJzyAjccOH6Qj6nFTPh+vX07gqN8IlLT2uye4w\nawIDAQAB\n-----END PUBLIC KEY-----"
+	}]
 };
-
 //#endregion
 //#region src/testing/fixtures/example.com/person2.json
-var __context = [
-	"https://www.w3.org/ns/activitystreams",
-	"https://w3id.org/security/v1",
-	"https://w3id.org/security/multikey/v1",
-	"https://w3id.org/security/data-integrity/v1",
-	"https://www.w3.org/ns/did/v1"
-];
-var id = "https://example.com/person2";
-var type = "Person";
-var name = "Jane Doe";
-var publicKey = [{
-	"id": "https://example.com/person2#key3",
-	"type": "CryptographicKey",
-	"owner": "https://example.com/person2",
-	"publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4GUqWgdiYlN3Su5Gr4l6\ni+xRS8gDDVKZ718vpGk6eIpvqs33q430nRbHIzbHRXRaAhc/1++rUBcK0V4/kjZl\nCSzVtRgGU6HMkmjcD+uE56a8XbTczfltbEDj7afoEuB2F3UhQEWrSz+QJ29DPXaL\nMIa1Yv61NR2vxGqNbdtoMjDORMBYtg77CYbcFkiJHw65PDa7+f/yjLxuCRPye5L7\nhncN0UZuuFoRJmHNRLSg5omBad9WTvQXmSyXEhEdk9fHwlI022AqAzlWbT79hldc\nDSKGGLLbQIs1c3JZIG8G5i6Uh5Vy0Z7tSNBcxbhqoI9i9je4f/x/OPIVc19f04BE\n1LgWuHsftZzRgW9Sdqz53W83XxVdxlyHeywXOnstSWT11f8dkLyQUcHKTH+E6urb\nH+aiPLiRpYK8W7D9KTQA9kZ5JXaEuveBd5vJX7wakhbzAn8pWJU7GYIHNY38Ycok\nmivkU5pY8S2cKFMwY0b7ade3MComlir5P3ZYSjF+n6gRVsT96P+9mNfCu9gXt/f8\nXCyjKlH89kGwuJ7HhR8CuVdm0l+jYozVt6GsDy0hHYyn79NCCAEzP7ZbhBMR0T5V\nrkl+TIGXoJH9WFiz4VxO+NnglF6dNQjDS5IzYLoFRXIK1f3cmQiEB4FZmL70l9HL\nrgwR+Xys83xia79OqFDRezMCAwEAAQ==\n-----END PUBLIC KEY-----\n"
-}, {
-	"id": "https://example.com/person2#key4",
-	"type": "CryptographicKey",
-	"owner": "https://example.com/person2",
-	"publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMCowBQYDK2VwAyEALR8epAGDe+cVq5p2Tx49CCfphpk1rNhkNoY9i+XEUfg=\n-----END PUBLIC KEY-----\n"
-}];
-var assertionMethod = [{
-	"id": "https://example.com/peson2#key3",
-	"type": "Multikey",
-	"controller": "https://example.com/person2",
-	"publicKeyMultibase": "zgghBUVkqmWS8e1j4aN2yowLAEkJC6wowB9wWmLRACYCok7UzstWcTBp3waKiDUM7wqL9bbBD9W9FvNaXEK2KPCZ9ffhvd5dxChJL9bdPQSrMwa28FEYMGDtcF1uocrYNmZm2dBBMaWrCu8U3s4PpVVhn4hsWDL8GLuE466pkJs9Hy8xmECoaaVgAZLiYDw2gwrjHDiX2i7aDHKfE7aSZWUWmC8nAGNZ7DX5pXoyXK3pxuaCWxNxXwPmaFwgKDyy9uhtBJ8znp9NZXkXHBTQe5uAi8GFwHY5asvqCmYPrAGWxcT6pdbZaJHdWkM7nw6apBHfakKs42oMqdBoJ2WkkresoT1qHrX2GW7gNP9PLtveF4vfEd6cwgHKQCdYgayG3muGfZiPvML75cyfkNrjkctvuQUfMxY9umbd2TG3V3mPnLrvQnqHpuRMZYtCn3nX1qfZaqFhTwT4NFPqVNLqvgR6k9vcuGXn6Ndaumhd5xtTK64jk3e2gPBit9iq6MrFUSoxNsbTty4kqcHAodtkK8CMSxUxbFP1kK3nyy8ZfeMgDCts1KboBcT2m5FMpQpYxKtNBfvhTuyeDDC34uhbY8itmTAnDwSr5mKrniwwDUGPZFejda51TYs1N9D9Ejzaw5Mvr8qN6wahHmsDBWTbWwV6YKVMD1MjAhJBUopWJWB5x6mEBAX25MssKfAEhJyDtqYWjq63uQHUJCsPJp"
-}, {
-	"id": "https://example.com/person2#key4",
-	"type": "Multikey",
-	"controller": "https://example.com/person2",
-	"publicKeyMultibase": "z6MkhVPuyvgG1RkMv67azDqDCDERPXVrUg1i3qchXY5EACE3"
-}];
 var person2_default = {
-	"@context": __context,
-	id,
-	type,
-	name,
-	publicKey,
-	assertionMethod
+	"@context": [
+		"https://www.w3.org/ns/activitystreams",
+		"https://w3id.org/security/v1",
+		"https://w3id.org/security/multikey/v1",
+		"https://w3id.org/security/data-integrity/v1",
+		"https://www.w3.org/ns/did/v1"
+	],
+	id: "https://example.com/person2",
+	type: "Person",
+	name: "Jane Doe",
+	publicKey: [{
+		"id": "https://example.com/person2#key3",
+		"type": "CryptographicKey",
+		"owner": "https://example.com/person2",
+		"publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4GUqWgdiYlN3Su5Gr4l6\ni+xRS8gDDVKZ718vpGk6eIpvqs33q430nRbHIzbHRXRaAhc/1++rUBcK0V4/kjZl\nCSzVtRgGU6HMkmjcD+uE56a8XbTczfltbEDj7afoEuB2F3UhQEWrSz+QJ29DPXaL\nMIa1Yv61NR2vxGqNbdtoMjDORMBYtg77CYbcFkiJHw65PDa7+f/yjLxuCRPye5L7\nhncN0UZuuFoRJmHNRLSg5omBad9WTvQXmSyXEhEdk9fHwlI022AqAzlWbT79hldc\nDSKGGLLbQIs1c3JZIG8G5i6Uh5Vy0Z7tSNBcxbhqoI9i9je4f/x/OPIVc19f04BE\n1LgWuHsftZzRgW9Sdqz53W83XxVdxlyHeywXOnstSWT11f8dkLyQUcHKTH+E6urb\nH+aiPLiRpYK8W7D9KTQA9kZ5JXaEuveBd5vJX7wakhbzAn8pWJU7GYIHNY38Ycok\nmivkU5pY8S2cKFMwY0b7ade3MComlir5P3ZYSjF+n6gRVsT96P+9mNfCu9gXt/f8\nXCyjKlH89kGwuJ7HhR8CuVdm0l+jYozVt6GsDy0hHYyn79NCCAEzP7ZbhBMR0T5V\nrkl+TIGXoJH9WFiz4VxO+NnglF6dNQjDS5IzYLoFRXIK1f3cmQiEB4FZmL70l9HL\nrgwR+Xys83xia79OqFDRezMCAwEAAQ==\n-----END PUBLIC KEY-----\n"
+	}, {
+		"id": "https://example.com/person2#key4",
+		"type": "CryptographicKey",
+		"owner": "https://example.com/person2",
+		"publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMCowBQYDK2VwAyEALR8epAGDe+cVq5p2Tx49CCfphpk1rNhkNoY9i+XEUfg=\n-----END PUBLIC KEY-----\n"
+	}],
+	assertionMethod: [{
+		"id": "https://example.com/peson2#key3",
+		"type": "Multikey",
+		"controller": "https://example.com/person2",
+		"publicKeyMultibase": "zgghBUVkqmWS8e1j4aN2yowLAEkJC6wowB9wWmLRACYCok7UzstWcTBp3waKiDUM7wqL9bbBD9W9FvNaXEK2KPCZ9ffhvd5dxChJL9bdPQSrMwa28FEYMGDtcF1uocrYNmZm2dBBMaWrCu8U3s4PpVVhn4hsWDL8GLuE466pkJs9Hy8xmECoaaVgAZLiYDw2gwrjHDiX2i7aDHKfE7aSZWUWmC8nAGNZ7DX5pXoyXK3pxuaCWxNxXwPmaFwgKDyy9uhtBJ8znp9NZXkXHBTQe5uAi8GFwHY5asvqCmYPrAGWxcT6pdbZaJHdWkM7nw6apBHfakKs42oMqdBoJ2WkkresoT1qHrX2GW7gNP9PLtveF4vfEd6cwgHKQCdYgayG3muGfZiPvML75cyfkNrjkctvuQUfMxY9umbd2TG3V3mPnLrvQnqHpuRMZYtCn3nX1qfZaqFhTwT4NFPqVNLqvgR6k9vcuGXn6Ndaumhd5xtTK64jk3e2gPBit9iq6MrFUSoxNsbTty4kqcHAodtkK8CMSxUxbFP1kK3nyy8ZfeMgDCts1KboBcT2m5FMpQpYxKtNBfvhTuyeDDC34uhbY8itmTAnDwSr5mKrniwwDUGPZFejda51TYs1N9D9Ejzaw5Mvr8qN6wahHmsDBWTbWwV6YKVMD1MjAhJBUopWJWB5x6mEBAX25MssKfAEhJyDtqYWjq63uQHUJCsPJp"
+	}, {
+		"id": "https://example.com/person2#key4",
+		"type": "Multikey",
+		"controller": "https://example.com/person2",
+		"publicKeyMultibase": "z6MkhVPuyvgG1RkMv67azDqDCDERPXVrUg1i3qchXY5EACE3"
+	}]
 };
-
 //#endregion
 //#region src/federation/middleware.test.ts
 test("createFederation()", async (t) => {
@@ -331,23 +303,20 @@ test({
 					publicKey: ed25519PublicKey.publicKey
 				})
 			}]);
-			const loader = await ctx.getDocumentLoader({ identifier: "handle" });
-			assertEquals(await loader("https://example.com/object"), {
+			assertEquals(await (await ctx.getDocumentLoader({ identifier: "handle" }))("https://example.com/object"), {
 				contextUrl: null,
 				documentUrl: "https://example.com/object",
 				document: true
 			});
-			const loader2 = await ctx.getDocumentLoader({ username: "HANDLE" });
-			assertEquals(await loader2("https://example.com/object"), {
+			assertEquals(await (await ctx.getDocumentLoader({ username: "HANDLE" }))("https://example.com/object"), {
 				contextUrl: null,
 				documentUrl: "https://example.com/object",
 				document: true
 			});
-			const loader3 = ctx.getDocumentLoader({
+			assertEquals(await ctx.getDocumentLoader({
 				keyId: new URL("https://example.com/key2"),
 				privateKey: rsaPrivateKey2
-			});
-			assertEquals(await loader3("https://example.com/object"), {
+			})("https://example.com/object"), {
 				contextUrl: null,
 				documentUrl: "https://example.com/object",
 				document: true
@@ -355,13 +324,11 @@ test({
 			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") }));
-			const federation2 = createFederation({
+			assertEquals(await createFederation({
 				kv,
 				documentLoader: mockDocumentLoader,
 				contextLoader: mockDocumentLoader
-			});
-			const ctx2 = federation2.createContext(new URL("https://example.com/"), 123);
-			assertEquals(await ctx2.lookupObject("https://example.com/object"), new Object$1({
+			}).createContext(new URL("https://example.com/"), 123).lookupObject("https://example.com/object"), new Object$1({
 				id: new URL("https://example.com/object"),
 				name: "Fetched object"
 			}));
@@ -616,8 +583,7 @@ test({
 			});
 		});
 		await t.step("Context.clone()", () => {
-			const federation = createFederation({ kv });
-			const ctx = federation.createContext(new URL("https://example.com/"), 123);
+			const ctx = createFederation({ kv }).createContext(new URL("https://example.com/"), 123);
 			const clone = ctx.clone(456);
 			assertStrictEquals(clone.canonicalOrigin, ctx.canonicalOrigin);
 			assertStrictEquals(clone.origin, ctx.origin);
@@ -653,13 +619,11 @@ test({
 			}));
 		});
 		await t.step("Context.lookupNodeInfo()", async () => {
-			const federation = createFederation({
+			const ctx = createFederation({
 				kv,
 				userAgent: "CustomUserAgent/1.2.3"
-			});
-			const ctx = federation.createContext(new URL("https://example.com/"), 123);
-			const nodeInfo = await ctx.lookupNodeInfo("https://example.com/");
-			assertEquals(nodeInfo, {
+			}).createContext(new URL("https://example.com/"), 123);
+			assertEquals(await ctx.lookupNodeInfo("https://example.com/"), {
 				software: {
 					name: "foo",
 					version: {
@@ -677,8 +641,7 @@ test({
 					localComments: 456
 				}
 			});
-			const rawNodeInfo = await ctx.lookupNodeInfo("https://example.com/", { parse: "none" });
-			assertEquals(rawNodeInfo, {
+			assertEquals(await ctx.lookupNodeInfo("https://example.com/", { parse: "none" }), {
 				software: {
 					name: "foo",
 					version: "1.2.3"
@@ -923,8 +886,7 @@ test("Federation.setInboxListeners()", async (t) => {
 			authenticatedDocumentLoaderFactory(identity) {
 				const docLoader = getAuthenticatedDocumentLoader(identity);
 				return (url) => {
-					const urlObj = new URL(url);
-					if (urlObj.host === "example.com") return docLoader(url);
+					if (new URL(url).host === "example.com") return docLoader(url);
 					return mockDocumentLoader(url);
 				};
 			}
@@ -1004,9 +966,8 @@ test("FederationImpl.sendActivity()", async (t) => {
 		if (verified.length > 0) return new Response(null, { status: 202 });
 		return new Response(null, { status: 401 });
 	});
-	const kv = new MemoryKvStore();
 	const federation = new FederationImpl({
-		kv,
+		kv: new MemoryKvStore(),
 		contextLoader: mockDocumentLoader
 	});
 	const context = federation.createContext(new URL("https://example.com/"));
@@ -1072,19 +1033,18 @@ test("FederationImpl.processQueuedTask()", async (t) => {
 	await t.step("with MessageQueue having nativeRetrial", async () => {
 		const kv = new MemoryKvStore();
 		const queuedMessages = [];
-		const queue = {
-			nativeRetrial: true,
-			enqueue(message, _options) {
-				queuedMessages.push(message);
-				return Promise.resolve();
-			},
-			listen(_handler, _options) {
-				return Promise.resolve();
-			}
-		};
 		const federation = new FederationImpl({
 			kv,
-			queue
+			queue: {
+				nativeRetrial: true,
+				enqueue(message, _options) {
+					queuedMessages.push(message);
+					return Promise.resolve();
+				},
+				listen(_handler, _options) {
+					return Promise.resolve();
+				}
+			}
 		});
 		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(Create, () => {
 			throw new Error("Intended error for testing");
@@ -1135,18 +1095,17 @@ test("FederationImpl.processQueuedTask()", async (t) => {
 	await t.step("with MessageQueue having no nativeRetrial", async () => {
 		const kv = new MemoryKvStore();
 		let queuedMessages = [];
-		const queue = {
-			enqueue(message, _options) {
-				queuedMessages.push(message);
-				return Promise.resolve();
-			},
-			listen(_handler, _options) {
-				return Promise.resolve();
-			}
-		};
 		const federation = new FederationImpl({
 			kv,
-			queue
+			queue: {
+				enqueue(message, _options) {
+					queuedMessages.push(message);
+					return Promise.resolve();
+				},
+				listen(_handler, _options) {
+					return Promise.resolve();
+				}
+			}
 		});
 		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(Create, () => {
 			throw new Error("Intended error for testing");
@@ -1227,24 +1186,19 @@ test("ContextImpl.lookupObject()", async (t) => {
 		}
 	});
 	await t.step("allowPrivateAddress: true", async () => {
-		const federation = createFederation({
+		const result = await createFederation({
 			kv: new MemoryKvStore(),
 			allowPrivateAddress: true
-		});
-		const ctx = federation.createContext(new URL("https://example.com/"));
-		const result = await ctx.lookupObject("@test@localhost");
+		}).createContext(new URL("https://example.com/")).lookupObject("@test@localhost");
 		assertInstanceOf(result, Person);
 		assertEquals(result.id, new URL("https://localhost/actor"));
 		assertEquals(result.preferredUsername, "test");
 	});
 	await t.step("allowPrivateAddress: false", async () => {
-		const federation = createFederation({
+		assertEquals(await createFederation({
 			kv: new MemoryKvStore(),
 			allowPrivateAddress: false
-		});
-		const ctx = federation.createContext(new URL("https://example.com/"));
-		const result = await ctx.lookupObject("@test@localhost");
-		assertEquals(result, null);
+		}).createContext(new URL("https://example.com/")).lookupObject("@test@localhost"), null);
 	});
 	esm_default.hardReset();
 });
@@ -1270,11 +1224,9 @@ test("ContextImpl.sendActivity()", async (t) => {
 			contextLoader: mockDocumentLoader,
 			keyCache: {
 				async get(keyId) {
-					const ctx = federation.createContext(new URL("https://example.com/"), void 0);
-					const keys = await ctx.getActorKeyPairs("1");
-					for (const key$1 of keys) if (key$1.keyId.href === keyId.href) if (key$1.publicKey.algorithm.name === "Ed25519") return key$1.multikey;
-					else return key$1.cryptographicKey;
-					return void 0;
+					const keys = await federation.createContext(new URL("https://example.com/"), void 0).getActorKeyPairs("1");
+					for (const key of keys) if (key.keyId.href === keyId.href) if (key.publicKey.algorithm.name === "Ed25519") return key.multikey;
+					else return key.cryptographicKey;
 				},
 				async set(_keyId, _key) {}
 			}
@@ -1516,6 +1468,60 @@ test("ContextImpl.sendActivity()", async (t) => {
 			type: "fanout"
 		}]);
 	});
+	await t.step("fanout: fanoutQueue.enqueue() is awaited before sendActivity() returns", async () => {
+		const asyncEnqueued = [];
+		const fed = new FederationImpl({
+			kv,
+			contextLoader: mockDocumentLoader,
+			queue: {
+				enqueue(message) {
+					return new Promise((resolve) => {
+						setTimeout(() => {
+							asyncEnqueued.push(message);
+							resolve();
+						}, 0);
+					});
+				},
+				async listen() {}
+			},
+			manuallyStartQueue: true
+		});
+		fed.setActorDispatcher("/{identifier}", async (ctx, identifier) => {
+			if (identifier !== "john") return null;
+			const keys = await ctx.getActorKeyPairs(identifier);
+			return new Person({
+				id: ctx.getActorUri(identifier),
+				preferredUsername: "john",
+				publicKey: keys[0].cryptographicKey,
+				assertionMethods: keys.map((k) => k.multikey)
+			});
+		}).setKeyPairsDispatcher((_ctx, identifier) => {
+			if (identifier !== "john") return [];
+			return [{
+				privateKey: rsaPrivateKey2,
+				publicKey: rsaPublicKey2.publicKey
+			}, {
+				privateKey: ed25519PrivateKey,
+				publicKey: ed25519PublicKey.publicKey
+			}];
+		});
+		const ctx3 = new ContextImpl({
+			data: void 0,
+			federation: fed,
+			url: new URL("https://example.com/"),
+			documentLoader: fetchDocumentLoader,
+			contextLoader: fetchDocumentLoader
+		});
+		const activity = new Create({
+			id: new URL("https://example.com/activity/1"),
+			actor: new URL("https://example.com/person")
+		});
+		await ctx3.sendActivity({ username: "john" }, {
+			id: new URL("https://example.com/recipient"),
+			inboxId: new URL("https://example.com/inbox")
+		}, activity, { fanout: "force" });
+		assertEquals(asyncEnqueued.length, 1, "fanoutQueue.enqueue() must be awaited before sendActivity() returns");
+	});
 	collectionSyncHeader = null;
 	await t.step("followers collection without syncCollection", async () => {
 		const ctx = new ContextImpl({
@@ -1564,8 +1570,8 @@ test({
 	async fn() {
 		const federation = new FederationImpl({ kv: new MemoryKvStore() });
 		const activities = [];
-		federation.setInboxListeners("/u/{identifier}/i", "/i").on(Offer, (ctx$1, offer) => {
-			activities.push([ctx$1.recipient, offer]);
+		federation.setInboxListeners("/u/{identifier}/i", "/i").on(Offer, (ctx, offer) => {
+			activities.push([ctx.recipient, offer]);
 		});
 		const ctx = new ContextImpl({
 			url: new URL("https://example.com/"),
@@ -1679,26 +1685,23 @@ test("InboxContextImpl.forwardActivity()", async (t) => {
 		if (verified.length > 0) return new Response(null, { status: 202 });
 		return new Response(null, { status: 401 });
 	});
-	const kv = new MemoryKvStore();
 	const federation = new FederationImpl({
-		kv,
+		kv: new MemoryKvStore(),
 		contextLoader: mockDocumentLoader
 	});
 	await t.step("skip", async () => {
-		const activity = {
+		await new InboxContextImpl(null, {
 			"@context": "https://www.w3.org/ns/activitystreams",
 			"type": "Create",
 			"id": "https://example.com/activity",
 			"actor": "https://example.com/person2"
-		};
-		const ctx = new InboxContextImpl(null, activity, "https://example.com/activity", "https://www.w3.org/ns/activitystreams#Create", {
+		}, "https://example.com/activity", "https://www.w3.org/ns/activitystreams#Create", {
 			data: void 0,
 			federation,
 			url: new URL("https://example.com/"),
 			documentLoader: fetchDocumentLoader,
 			contextLoader: fetchDocumentLoader
-		});
-		await ctx.forwardActivity([{
+		}).forwardActivity([{
 			privateKey: rsaPrivateKey2,
 			keyId: rsaPublicKey2.id
 		}], {
@@ -1708,13 +1711,12 @@ test("InboxContextImpl.forwardActivity()", async (t) => {
 		assertEquals(verified, null);
 	});
 	await t.step("unsigned", async () => {
-		const activity = {
+		const ctx = new InboxContextImpl(null, {
 			"@context": "https://www.w3.org/ns/activitystreams",
 			"type": "Create",
 			"id": "https://example.com/activity",
 			"actor": "https://example.com/person2"
-		};
-		const ctx = new InboxContextImpl(null, activity, "https://example.com/activity", "https://www.w3.org/ns/activitystreams#Create", {
+		}, "https://example.com/activity", "https://www.w3.org/ns/activitystreams#Create", {
 			data: void 0,
 			federation,
 			url: new URL("https://example.com/"),
@@ -1738,14 +1740,13 @@ test("InboxContextImpl.forwardActivity()", async (t) => {
 			contextLoader: mockDocumentLoader,
 			documentLoader: mockDocumentLoader
 		});
-		const ctx = new InboxContextImpl(null, await activity.toJsonLd({ contextLoader: mockDocumentLoader }), activity.id?.href, getTypeId(activity).href, {
+		await new InboxContextImpl(null, await activity.toJsonLd({ contextLoader: mockDocumentLoader }), activity.id?.href, getTypeId(activity).href, {
 			data: void 0,
 			federation,
 			url: new URL("https://example.com/"),
 			documentLoader: fetchDocumentLoader,
 			contextLoader: fetchDocumentLoader
-		});
-		await ctx.forwardActivity([{
+		}).forwardActivity([{
 			privateKey: rsaPrivateKey2,
 			keyId: rsaPublicKey2.id
 		}], {
@@ -1755,20 +1756,18 @@ test("InboxContextImpl.forwardActivity()", async (t) => {
 		assertEquals(verified, ["proof"]);
 	});
 	await t.step("LD Signatures", async () => {
-		const activity = await signJsonLd({
+		await new InboxContextImpl(null, await signJsonLd({
 			"@context": "https://www.w3.org/ns/activitystreams",
 			"type": "Create",
 			"id": "https://example.com/activity",
 			"actor": "https://example.com/person2"
-		}, rsaPrivateKey3, rsaPublicKey3.id, { contextLoader: mockDocumentLoader });
-		const ctx = new InboxContextImpl(null, activity, "https://example.com/activity", "https://www.w3.org/ns/activitystreams#Create", {
+		}, rsaPrivateKey3, rsaPublicKey3.id, { contextLoader: mockDocumentLoader }), "https://example.com/activity", "https://www.w3.org/ns/activitystreams#Create", {
 			data: void 0,
 			federation,
 			url: new URL("https://example.com/"),
 			documentLoader: fetchDocumentLoader,
 			contextLoader: fetchDocumentLoader
-		});
-		await ctx.forwardActivity([{
+		}).forwardActivity([{
 			privateKey: rsaPrivateKey2,
 			keyId: rsaPublicKey2.id
 		}], {
@@ -1781,33 +1780,19 @@ test("InboxContextImpl.forwardActivity()", async (t) => {
 });
 test("KvSpecDeterminer", async (t) => {
 	await t.step("should use default spec when not found in KV", async () => {
-		const kv = new MemoryKvStore();
-		const prefix = ["test", "spec"];
-		const determiner = new KvSpecDeterminer(kv, prefix);
-		const spec = await determiner.determineSpec("example.com");
-		assertEquals(spec, "rfc9421");
+		assertEquals(await new KvSpecDeterminer(new MemoryKvStore(), ["test", "spec"]).determineSpec("example.com"), "rfc9421");
 	});
 	await t.step("should use custom default spec", async () => {
-		const kv = new MemoryKvStore();
-		const prefix = ["test", "spec"];
-		const determiner = new KvSpecDeterminer(kv, prefix, "draft-cavage-http-signatures-12");
-		const spec = await determiner.determineSpec("example.com");
-		assertEquals(spec, "draft-cavage-http-signatures-12");
+		assertEquals(await new KvSpecDeterminer(new MemoryKvStore(), ["test", "spec"], "draft-cavage-http-signatures-12").determineSpec("example.com"), "draft-cavage-http-signatures-12");
 	});
 	await t.step("should remember and retrieve spec from KV", async () => {
-		const kv = new MemoryKvStore();
-		const prefix = ["test", "spec"];
-		const determiner = new KvSpecDeterminer(kv, prefix);
+		const determiner = new KvSpecDeterminer(new MemoryKvStore(), ["test", "spec"]);
 		await determiner.rememberSpec("example.com", "draft-cavage-http-signatures-12");
-		const spec = await determiner.determineSpec("example.com");
-		assertEquals(spec, "draft-cavage-http-signatures-12");
-		const defaultSpec = await determiner.determineSpec("other.com");
-		assertEquals(defaultSpec, "rfc9421");
+		assertEquals(await determiner.determineSpec("example.com"), "draft-cavage-http-signatures-12");
+		assertEquals(await determiner.determineSpec("other.com"), "rfc9421");
 	});
 	await t.step("should override remembered spec", async () => {
-		const kv = new MemoryKvStore();
-		const prefix = ["test", "spec"];
-		const determiner = new KvSpecDeterminer(kv, prefix);
+		const determiner = new KvSpecDeterminer(new MemoryKvStore(), ["test", "spec"]);
 		await determiner.rememberSpec("example.com", "draft-cavage-http-signatures-12");
 		let spec = await determiner.determineSpec("example.com");
 		assertEquals(spec, "draft-cavage-http-signatures-12");
@@ -1816,5 +1801,5 @@ test("KvSpecDeterminer", async (t) => {
 		assertEquals(spec, "rfc9421");
 	});
 });
-
-//#endregion
+//#endregion
+export {};