@fedify/fedify 2.0.0-pr.412.1559 → 2.0.0-pr.412.1692

package/dist/federation/handler.test.js

@@ -3,45 +3,38 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { Create, Note, Person } from "../type-SK-d7Tbw.js";
+import { Create, Note, Person } from "../type-NEA09tSC.js";
 import { assertEquals } from "../assert_equals-DSbWqCm3.js";
 import { assert } from "../assert-MZs1qjMx.js";
 import "../assert_instance_of-DHz7EHNU.js";
 import { MemoryKvStore } from "../kv-CRZrzyXm.js";
-import { acceptsJsonLd, createFederation, handleActor, handleCollection, handleCustomCollection, handleInbox, handleObject, respondWithObject, respondWithObjectIfAcceptable } from "../middleware-BRgu1IH8.js";
-import "../semver-dArNLkR9.js";
-import "../client-De-z2UnN.js";
-import "../lookup-Bn_HEC_d.js";
-import "../types-BIgY6c-l.js";
-import "../actor-Cc6B76eG.js";
-import "../key-CzLv1phF.js";
-import { signRequest } from "../http-CcdM1brU.js";
-import "../authdocloader-CLgDGafZ.js";
-import "../ld-CBcQdZ6N.js";
-import "../owner-VEIjmR8r.js";
-import "../proof-DoSQAGkE.js";
-import { InboxListenerSet } from "../inbox-B6DZbGNf.js";
-import "../builder-BOEBObR8.js";
-import "../collection-CSzG2j1P.js";
-import "../keycache-B8HdZJSt.js";
+import { createFederation, handleActor, handleCollection, handleCustomCollection, handleInbox, handleObject, respondWithObject, respondWithObjectIfAcceptable } from "../middleware-Cgr3PtaJ.js";
+import "../client-Bmd-i8x8.js";
+import "../lookup-DhQCVVja.js";
+import "../types-BSuWJsOm.js";
+import "../actor-D5S46edz.js";
+import "../key-IxRhZpOF.js";
+import { signRequest } from "../http-DGjdMiLc.js";
+import "../authdocloader-SjwloJUA.js";
+import "../ld-DW7A0uIc.js";
+import "../owner-6Vc3UXXE.js";
+import "../proof-C1jhbeNv.js";
+import { InboxListenerSet } from "../inbox-BoDY3z8G.js";
+import "../builder-OA47XRft.js";
+import "../collection-CcnIw1qY.js";
+import "../keycache-TEniXNel.js";
+import "../negotiation-5NPJL6zp.js";
 import "../retry-D4GJ670a.js";
-import "../send-BzS7w-QF.js";
-import { createInboxContext, createRequestContext, mockDocumentLoader, test } from "../testing-Z2omCvKy.js";
+import "../send-DjATl6i3.js";
+import { createInboxContext, createRequestContext, mockDocumentLoader, test } from "../testing-BnfPB5T-.js";
 import "../std__assert-X-_kMxKM.js";
-import { assertFalse } from "../assert_rejects-DiIiJbZn.js";
+import "../assert_rejects-DiIiJbZn.js";
 import "../assert_is_error-BPGph1Jx.js";
 import "../assert_not_equals-f3m3epl3.js";
 import "../assert_throws-BOO88avQ.js";
-import { rsaPrivateKey3, rsaPublicKey2, rsaPublicKey3 } from "../keys-zZwiKkfx.js";
+import { rsaPrivateKey3, rsaPublicKey2, rsaPublicKey3 } from "../keys-bZxcrZ9Z.js";
 
 //#region src/federation/handler.test.ts
-test("acceptsJsonLd()", () => {
-	assert(acceptsJsonLd(new Request("https://example.com/", { headers: { Accept: "application/activity+json" } })));
-	assert(acceptsJsonLd(new Request("https://example.com/", { headers: { Accept: "application/ld+json" } })));
-	assert(acceptsJsonLd(new Request("https://example.com/", { headers: { Accept: "application/json" } })));
-	assertFalse(acceptsJsonLd(new Request("https://example.com/", { headers: { Accept: "application/ld+json; q=0.5, text/html; q=0.8" } })));
-	assertFalse(acceptsJsonLd(new Request("https://example.com/", { headers: { Accept: "application/ld+json; q=0.4, application/xhtml+xml; q=0.9" } })));
-});
 test("handleActor()", async () => {
 	const federation = createFederation({ kv: new MemoryKvStore() });
 	let context = createRequestContext({
@@ -64,11 +57,6 @@ test("handleActor()", async () => {
 		onNotFoundCalled = request;
 		return new Response("Not found", { status: 404 });
 	};
-	let onNotAcceptableCalled = null;
-	const onNotAcceptable = (request) => {
-		onNotAcceptableCalled = request;
-		return new Response("Not acceptable", { status: 406 });
-	};
 	let onUnauthorizedCalled = null;
 	const onUnauthorized = (request) => {
 		onUnauthorizedCalled = request;
@@ -78,44 +66,21 @@ test("handleActor()", async () => {
 		context,
 		identifier: "someone",
 		onNotFound,
-		onNotAcceptable,
 		onUnauthorized
 	});
 	assertEquals(response.status, 404);
 	assertEquals(onNotFoundCalled, context.request);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 	onNotFoundCalled = null;
-	context = createRequestContext({
-		...context,
-		getActor(handle) {
-			return Promise.resolve(actorDispatcher(context, handle));
-		}
-	});
-	response = await handleActor(context.request, {
-		context,
-		identifier: "someone",
-		actorDispatcher,
-		onNotFound,
-		onNotAcceptable,
-		onUnauthorized
-	});
-	assertEquals(response.status, 406);
-	assertEquals(onNotFoundCalled, null);
-	assertEquals(onNotAcceptableCalled, context.request);
-	assertEquals(onUnauthorizedCalled, null);
-	onNotAcceptableCalled = null;
 	response = await handleActor(context.request, {
 		context,
 		identifier: "no-one",
 		actorDispatcher,
 		onNotFound,
-		onNotAcceptable,
 		onUnauthorized
 	});
 	assertEquals(response.status, 404);
 	assertEquals(onNotFoundCalled, context.request);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 	onNotFoundCalled = null;
 	context = createRequestContext({
@@ -127,7 +92,6 @@ test("handleActor()", async () => {
 		identifier: "someone",
 		actorDispatcher,
 		onNotFound,
-		onNotAcceptable,
 		onUnauthorized
 	});
 	assertEquals(response.status, 200);
@@ -176,19 +140,16 @@ test("handleActor()", async () => {
 		name: "Someone"
 	});
 	assertEquals(onNotFoundCalled, null);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 	response = await handleActor(context.request, {
 		context,
 		identifier: "no-one",
 		actorDispatcher,
 		onNotFound,
-		onNotAcceptable,
 		onUnauthorized
 	});
 	assertEquals(response.status, 404);
 	assertEquals(onNotFoundCalled, context.request);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 	onNotFoundCalled = null;
 	response = await handleActor(context.request, {
@@ -197,12 +158,10 @@ test("handleActor()", async () => {
 		actorDispatcher,
 		authorizePredicate: (_ctx, _handle, signedKey, signedKeyOwner) => signedKey != null && signedKeyOwner != null,
 		onNotFound,
-		onNotAcceptable,
 		onUnauthorized
 	});
 	assertEquals(response.status, 401);
 	assertEquals(onNotFoundCalled, null);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, context.request);
 	onUnauthorizedCalled = null;
 	context = createRequestContext({
@@ -216,7 +175,6 @@ test("handleActor()", async () => {
 		actorDispatcher,
 		authorizePredicate: (_ctx, _handle, signedKey, signedKeyOwner) => signedKey != null && signedKeyOwner != null,
 		onNotFound,
-		onNotAcceptable,
 		onUnauthorized
 	});
 	assertEquals(response.status, 200);
@@ -265,7 +223,6 @@ test("handleActor()", async () => {
 		name: "Someone"
 	});
 	assertEquals(onNotFoundCalled, null);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 });
 test("handleObject()", async () => {
@@ -290,11 +247,6 @@ test("handleObject()", async () => {
 		onNotFoundCalled = request;
 		return new Response("Not found", { status: 404 });
 	};
-	let onNotAcceptableCalled = null;
-	const onNotAcceptable = (request) => {
-		onNotAcceptableCalled = request;
-		return new Response("Not acceptable", { status: 406 });
-	};
 	let onUnauthorizedCalled = null;
 	const onUnauthorized = (request) => {
 		onUnauthorizedCalled = request;
@@ -307,12 +259,10 @@ test("handleObject()", async () => {
 			id: "123"
 		},
 		onNotFound,
-		onNotAcceptable,
 		onUnauthorized
 	});
 	assertEquals(response.status, 404);
 	assertEquals(onNotFoundCalled, context.request);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 	onNotFoundCalled = null;
 	response = await handleObject(context.request, {
@@ -323,14 +273,11 @@ test("handleObject()", async () => {
 		},
 		objectDispatcher,
 		onNotFound,
-		onNotAcceptable,
 		onUnauthorized
 	});
-	assertEquals(response.status, 406);
+	assertEquals(response.status, 200);
 	assertEquals(onNotFoundCalled, null);
-	assertEquals(onNotAcceptableCalled, context.request);
 	assertEquals(onUnauthorizedCalled, null);
-	onNotAcceptableCalled = null;
 	response = await handleObject(context.request, {
 		context,
 		values: {
@@ -339,12 +286,10 @@ test("handleObject()", async () => {
 		},
 		objectDispatcher,
 		onNotFound,
-		onNotAcceptable,
 		onUnauthorized
 	});
 	assertEquals(response.status, 404);
 	assertEquals(onNotFoundCalled, context.request);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 	onNotFoundCalled = null;
 	response = await handleObject(context.request, {
@@ -355,12 +300,10 @@ test("handleObject()", async () => {
 		},
 		objectDispatcher,
 		onNotFound,
-		onNotAcceptable,
 		onUnauthorized
 	});
 	assertEquals(response.status, 404);
 	assertEquals(onNotFoundCalled, context.request);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 	onNotFoundCalled = null;
 	context = createRequestContext({
@@ -375,7 +318,6 @@ test("handleObject()", async () => {
 		},
 		objectDispatcher,
 		onNotFound,
-		onNotAcceptable,
 		onUnauthorized
 	});
 	assertEquals(response.status, 200);
@@ -405,7 +347,6 @@ test("handleObject()", async () => {
 		type: "Note"
 	});
 	assertEquals(onNotFoundCalled, null);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 	response = await handleObject(context.request, {
 		context,
@@ -415,12 +356,10 @@ test("handleObject()", async () => {
 		},
 		objectDispatcher,
 		onNotFound,
-		onNotAcceptable,
 		onUnauthorized
 	});
 	assertEquals(response.status, 404);
 	assertEquals(onNotFoundCalled, context.request);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 	onNotFoundCalled = null;
 	response = await handleObject(context.request, {
@@ -431,12 +370,10 @@ test("handleObject()", async () => {
 		},
 		objectDispatcher,
 		onNotFound,
-		onNotAcceptable,
 		onUnauthorized
 	});
 	assertEquals(response.status, 404);
 	assertEquals(onNotFoundCalled, context.request);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 	onNotFoundCalled = null;
 	response = await handleObject(context.request, {
@@ -448,12 +385,10 @@ test("handleObject()", async () => {
 		objectDispatcher,
 		authorizePredicate: (_ctx, _values, signedKey, signedKeyOwner) => signedKey != null && signedKeyOwner != null,
 		onNotFound,
-		onNotAcceptable,
 		onUnauthorized
 	});
 	assertEquals(response.status, 401);
 	assertEquals(onNotFoundCalled, null);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, context.request);
 	onUnauthorizedCalled = null;
 	context = createRequestContext({
@@ -470,7 +405,6 @@ test("handleObject()", async () => {
 		objectDispatcher,
 		authorizePredicate: (_ctx, _values, signedKey, signedKeyOwner) => signedKey != null && signedKeyOwner != null,
 		onNotFound,
-		onNotAcceptable,
 		onUnauthorized
 	});
 	assertEquals(response.status, 200);
@@ -500,7 +434,6 @@ test("handleObject()", async () => {
 		type: "Note"
 	});
 	assertEquals(onNotFoundCalled, null);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 });
 test("handleCollection()", async () => {
@@ -538,11 +471,6 @@ test("handleCollection()", async () => {
 		onNotFoundCalled = request;
 		return new Response("Not found", { status: 404 });
 	};
-	let onNotAcceptableCalled = null;
-	const onNotAcceptable = (request) => {
-		onNotAcceptableCalled = request;
-		return new Response("Not acceptable", { status: 406 });
-	};
 	let onUnauthorizedCalled = null;
 	const onUnauthorized = (request) => {
 		onUnauthorizedCalled = request;
@@ -556,12 +484,10 @@ test("handleCollection()", async () => {
 			return new URL(`https://example.com/users/${identifier}`);
 		},
 		onNotFound,
-		onNotAcceptable,
 		onUnauthorized
 	});
 	assertEquals(response.status, 404);
 	assertEquals(onNotFoundCalled, context.request);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 	onNotFoundCalled = null;
 	response = await handleCollection(context.request, {
@@ -573,14 +499,11 @@ test("handleCollection()", async () => {
 		},
 		collectionCallbacks: { dispatcher },
 		onNotFound,
-		onNotAcceptable,
 		onUnauthorized
 	});
-	assertEquals(response.status, 406);
+	assertEquals(response.status, 200);
 	assertEquals(onNotFoundCalled, null);
-	assertEquals(onNotAcceptableCalled, context.request);
 	assertEquals(onUnauthorizedCalled, null);
-	onNotAcceptableCalled = null;
 	response = await handleCollection(context.request, {
 		context,
 		name: "collection",
@@ -590,12 +513,10 @@ test("handleCollection()", async () => {
 		},
 		collectionCallbacks: { dispatcher },
 		onNotFound,
-		onNotAcceptable,
 		onUnauthorized
 	});
 	assertEquals(response.status, 404);
 	assertEquals(onNotFoundCalled, context.request);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 	onNotFoundCalled = null;
 	context = createRequestContext({
@@ -611,12 +532,10 @@ test("handleCollection()", async () => {
 		},
 		collectionCallbacks: { dispatcher },
 		onNotFound,
-		onNotAcceptable,
 		onUnauthorized
 	});
 	assertEquals(response.status, 404);
 	assertEquals(onNotFoundCalled, context.request);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 	onNotFoundCalled = null;
 	response = await handleCollection(context.request, {
@@ -628,7 +547,6 @@ test("handleCollection()", async () => {
 		},
 		collectionCallbacks: { dispatcher },
 		onNotFound,
-		onNotAcceptable,
 		onUnauthorized
 	});
 	assertEquals(response.status, 200);
@@ -701,7 +619,6 @@ test("handleCollection()", async () => {
 		]
 	});
 	assertEquals(onNotFoundCalled, null);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 	response = await handleCollection(context.request, {
 		context,
@@ -715,12 +632,10 @@ test("handleCollection()", async () => {
 			authorizePredicate: (_ctx, _handle, key, keyOwner) => key != null && keyOwner != null
 		},
 		onNotFound,
-		onNotAcceptable,
 		onUnauthorized
 	});
 	assertEquals(response.status, 401);
 	assertEquals(onNotFoundCalled, null);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, context.request);
 	onUnauthorizedCalled = null;
 	context = createRequestContext({
@@ -740,7 +655,6 @@ test("handleCollection()", async () => {
 			authorizePredicate: (_ctx, _handle, key, keyOwner) => key != null && keyOwner != null
 		},
 		onNotFound,
-		onNotAcceptable,
 		onUnauthorized
 	});
 	assertEquals(response.status, 200);
@@ -788,7 +702,6 @@ test("handleCollection()", async () => {
 		]
 	});
 	assertEquals(onNotFoundCalled, null);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 	response = await handleCollection(context.request, {
 		context,
@@ -804,7 +717,6 @@ test("handleCollection()", async () => {
 			lastCursor
 		},
 		onNotFound,
-		onNotAcceptable,
 		onUnauthorized
 	});
 	assertEquals(response.status, 200);
@@ -838,7 +750,6 @@ test("handleCollection()", async () => {
 		last: "https://example.com/?cursor=2"
 	});
 	assertEquals(onNotFoundCalled, null);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 	let url = new URL("https://example.com/?cursor=0");
 	context = createRequestContext({
@@ -860,7 +771,6 @@ test("handleCollection()", async () => {
 			lastCursor
 		},
 		onNotFound,
-		onNotAcceptable,
 		onUnauthorized
 	});
 	assertEquals(response.status, 200);
@@ -898,7 +808,6 @@ test("handleCollection()", async () => {
 		}]
 	});
 	assertEquals(onNotFoundCalled, null);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 	url = new URL("https://example.com/?cursor=2");
 	context = createRequestContext({
@@ -920,7 +829,6 @@ test("handleCollection()", async () => {
 			lastCursor
 		},
 		onNotFound,
-		onNotAcceptable,
 		onUnauthorized
 	});
 	assertEquals(response.status, 200);
@@ -958,7 +866,6 @@ test("handleCollection()", async () => {
 		}]
 	});
 	assertEquals(onNotFoundCalled, null);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 });
 test("handleInbox()", async () => {
@@ -1330,11 +1237,6 @@ test("handleCustomCollection()", async () => {
 		onNotFoundCalled = request;
 		return new Response("Not found", { status: 404 });
 	};
-	let onNotAcceptableCalled = null;
-	const onNotAcceptable = (request) => {
-		onNotAcceptableCalled = request;
-		return new Response("Not acceptable", { status: 406 });
-	};
 	let onUnauthorizedCalled = null;
 	const onUnauthorized = (request) => {
 		onUnauthorizedCalled = request;
@@ -1342,7 +1244,6 @@ test("handleCustomCollection()", async () => {
 	};
 	const errorHandlers = {
 		onNotFound,
-		onNotAcceptable,
 		onUnauthorized
 	};
 	let response = await handleCustomCollection(context.request, {
@@ -1353,21 +1254,7 @@ test("handleCustomCollection()", async () => {
 	});
 	assertEquals(response.status, 404);
 	assertEquals(onNotFoundCalled, context.request);
-	assertEquals(onNotAcceptableCalled, null);
-	assertEquals(onUnauthorizedCalled, null);
-	onNotFoundCalled = null;
-	response = await handleCustomCollection(context.request, {
-		context,
-		name: "custom collection",
-		values: { handle: "someone" },
-		collectionCallbacks: { dispatcher },
-		...errorHandlers
-	});
-	assertEquals(response.status, 406);
-	assertEquals(onNotFoundCalled, null);
-	assertEquals(onNotAcceptableCalled, context.request);
 	assertEquals(onUnauthorizedCalled, null);
-	onNotAcceptableCalled = null;
 	context = createRequestContext({
 		...context,
 		request: new Request(context.url, { headers: { Accept: "application/activity+json" } })
@@ -1381,7 +1268,6 @@ test("handleCustomCollection()", async () => {
 	});
 	assertEquals(response.status, 404);
 	assertEquals(onNotFoundCalled, context.request);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 	onNotFoundCalled = null;
 	response = await handleCustomCollection(context.request, {
@@ -1462,7 +1348,6 @@ test("handleCustomCollection()", async () => {
 		]
 	});
 	assertEquals(onNotFoundCalled, null);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 	response = await handleCustomCollection(context.request, {
 		context,
@@ -1476,7 +1361,6 @@ test("handleCustomCollection()", async () => {
 	});
 	assertEquals(response.status, 401);
 	assertEquals(onNotFoundCalled, null);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, context.request);
 	onUnauthorizedCalled = null;
 	context = createRequestContext({
@@ -1519,7 +1403,6 @@ test("handleCustomCollection()", async () => {
 		]
 	});
 	assertEquals(onNotFoundCalled, null);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 	response = await handleCustomCollection(context.request, {
 		context,
@@ -1539,7 +1422,6 @@ test("handleCustomCollection()", async () => {
 		last: "https://example.com/?cursor=2"
 	});
 	assertEquals(onNotFoundCalled, null);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 	let url = new URL("https://example.com/?cursor=0");
 	context = createRequestContext({
@@ -1569,7 +1451,6 @@ test("handleCustomCollection()", async () => {
 		}
 	});
 	assertEquals(onNotFoundCalled, null);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 	url = new URL("https://example.com/?cursor=2");
 	context = createRequestContext({
@@ -1599,7 +1480,6 @@ test("handleCustomCollection()", async () => {
 		}
 	});
 	assertEquals(onNotFoundCalled, null);
-	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 });