@fedify/relay 2.4.0-pr.936.41 → 2.4.1

package/dist/mastodon.test.js

@@ -1,12 +1,12 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-B1cI0tFL.js";
-import { MemoryKvStore, signRequest } from "@fedify/fedify";
+import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-Cn5XbKiD.js";
+import { MemoryKvStore, signJsonLd, signRequest } from "@fedify/fedify";
 import { createRelay } from "@fedify/relay";
-import { Create, Delete, Follow, Move, Note, Person, Undo, Update } from "@fedify/vocab";
-import { ok, strictEqual } from "node:assert";
+import { deepStrictEqual, ok, strictEqual } from "node:assert";
 import test, { describe } from "node:test";
+import { Announce, Create, Delete, Follow, Move, Note, Person, Undo, Update } from "@fedify/vocab";
 //#region src/mastodon.test.ts
 const mockDocumentLoader = async (url) => {
 	if (url === "https://remote.example.com/users/alice" || url === "https://remote.example.com/users/alice#main-key") return {
@@ -17,7 +17,7 @@ const mockDocumentLoader = async (url) => {
 			id: url,
 			type: "Person",
 			preferredUsername: "alice",
-			inbox: "https://remote.example.com/users/alice/inbox",
+			inbox: aliceInbox,
 			publicKey: {
 				id: "https://remote.example.com/users/alice#main-key",
 				owner: url.replace(/#main-key$/, ""),
@@ -52,6 +52,35 @@ const rsaPublicKey = {
 	id: new URL("https://remote.example.com/users/alice#main-key"),
 	...rsaKeyPair.publicKey
 };
+const INBOX_PREFIX = "https://[2001:db8:2::";
+const aliceInbox = `${INBOX_PREFIX}2]/users/alice/inbox`;
+const followerInbox = `${INBOX_PREFIX}1]/users/bob/inbox`;
+const recorders = /* @__PURE__ */ new Map();
+function recordInbox(inbox) {
+	const recorded = [];
+	recorders.set(inbox, recorded);
+	return recorded;
+}
+const aliceDeliveries = recordInbox(aliceInbox);
+function assertAcceptDelivered(follow, deliveries = aliceDeliveries) {
+	const accepts = deliveries.filter(({ body }) => body.type === "Accept" && body.object?.id === follow.id?.href);
+	strictEqual(accepts.length, 1, "Expected exactly one Accept for this Follow");
+	strictEqual(accepts[0].method, "POST");
+	strictEqual(accepts[0].body.actor, "https://relay.example.com/users/relay");
+	strictEqual(accepts[0].body.object.type, "Follow");
+	strictEqual(accepts[0].body.object.actor.id, follow.actorId?.href);
+}
+const nextFetch = globalThis.fetch;
+globalThis.fetch = (async (input, init) => {
+	const request = input instanceof Request ? input : new Request(input, init);
+	if (!request.url.startsWith(INBOX_PREFIX)) return await nextFetch(input, init);
+	const recorded = recorders.get(request.url);
+	if (recorded != null) recorded.push({
+		method: request.method,
+		body: await request.json()
+	});
+	return new Response(null, { status: 202 });
+});
 describe("MastodonRelay", () => {
 	test("constructor with required options", () => {
 		ok(createRelay("mastodon", {
@@ -154,7 +183,7 @@ describe("MastodonRelay", () => {
 		const follower = new Person({
 			id: new URL(followerId),
 			preferredUsername: "alice",
-			inbox: new URL("https://remote.example.com/users/alice/inbox")
+			inbox: new URL(aliceInbox)
 		});
 		await kv.set(["follower", followerId], {
 			actor: await follower.toJsonLd(),
@@ -168,7 +197,7 @@ describe("MastodonRelay", () => {
 		const follower = new Person({
 			id: new URL(followerId),
 			preferredUsername: "alice",
-			inbox: new URL("https://remote.example.com/users/alice/inbox")
+			inbox: new URL(aliceInbox)
 		});
 		await kv.set(["follower", followerId], {
 			actor: await follower.toJsonLd(),
@@ -237,10 +266,10 @@ describe("MastodonRelay", () => {
 		const follower = new Person({
 			id: new URL("https://remote.example.com/users/alice"),
 			preferredUsername: "alice",
-			inbox: new URL("https://remote.example.com/users/alice/inbox")
+			inbox: new URL(aliceInbox)
 		});
 		const followActivity = new Follow({
-			id: new URL("https://remote.example.com/activities/follow/1"),
+			id: new URL(`https://remote.example.com/activities/follow/${crypto.randomUUID()}`),
 			actor: follower.id,
 			object: new URL("https://relay.example.com/users/relay")
 		});
@@ -250,10 +279,13 @@ describe("MastodonRelay", () => {
 			body: JSON.stringify(await followActivity.toJsonLd({ contextLoader: mockDocumentLoader }))
 		});
 		request = await signRequest(request, rsaKeyPair.privateKey, rsaPublicKey.id);
-		await relay.fetch(request);
+		strictEqual((await relay.fetch(request)).status, 202);
+		assertAcceptDelivered(followActivity);
 		strictEqual(handlerCalled, true);
 		ok(handlerActor);
-		ok(await kv.get(["follower", "https://remote.example.com/users/alice"]));
+		const followerData = await kv.get(["follower", "https://remote.example.com/users/alice"]);
+		ok(isRelayFollowerData(followerData));
+		strictEqual(followerData.state, "accepted");
 	});
 	test("handles Follow activity with subscription rejection", async () => {
 		const kv = new MemoryKvStore();
@@ -269,7 +301,7 @@ describe("MastodonRelay", () => {
 		const follower = new Person({
 			id: new URL("https://remote.example.com/users/alice"),
 			preferredUsername: "alice",
-			inbox: new URL("https://remote.example.com/users/alice/inbox")
+			inbox: new URL(aliceInbox)
 		});
 		const followActivity = new Follow({
 			id: new URL("https://remote.example.com/activities/follow/1"),
@@ -282,7 +314,7 @@ describe("MastodonRelay", () => {
 			body: JSON.stringify(await followActivity.toJsonLd({ contextLoader: mockDocumentLoader }))
 		});
 		request = await signRequest(request, rsaKeyPair.privateKey, rsaPublicKey.id);
-		await relay.fetch(request);
+		strictEqual((await relay.fetch(request)).status, 202);
 		strictEqual(await kv.get(["follower", "https://remote.example.com/users/alice"]), void 0);
 	});
 	test("handles Undo Follow activity", async () => {
@@ -291,7 +323,7 @@ describe("MastodonRelay", () => {
 		const follower = new Person({
 			id: new URL(followerId),
 			preferredUsername: "alice",
-			inbox: new URL("https://remote.example.com/users/alice/inbox")
+			inbox: new URL(aliceInbox)
 		});
 		const followActivityId = "https://remote.example.com/activities/follow/1";
 		await kv.set(["follower", followerId], {
@@ -321,7 +353,7 @@ describe("MastodonRelay", () => {
 			body: JSON.stringify(await undoActivity.toJsonLd({ contextLoader: mockDocumentLoader }))
 		});
 		request = await signRequest(request, rsaKeyPair.privateKey, rsaPublicKey.id);
-		await relay.fetch(request);
+		strictEqual((await relay.fetch(request)).status, 202);
 		strictEqual(await kv.get(["follower", followerId]), void 0);
 	});
 	test("handles Create activity forwarding", async () => {
@@ -330,7 +362,7 @@ describe("MastodonRelay", () => {
 		const follower = new Person({
 			id: new URL(followerId),
 			preferredUsername: "alice",
-			inbox: new URL("https://remote.example.com/users/alice/inbox")
+			inbox: new URL(aliceInbox)
 		});
 		await kv.set(["follower", followerId], {
 			actor: await follower.toJsonLd(),
@@ -432,6 +464,42 @@ describe("MastodonRelay", () => {
 		const response = await relay.fetch(request);
 		ok(response.status === 200 || response.status === 202);
 	});
+	test("handles Announce activity forwarding", async () => {
+		const kv = new MemoryKvStore();
+		const follower = new Person({
+			id: new URL("https://follower.example.com/users/bob"),
+			preferredUsername: "bob",
+			inbox: new URL(followerInbox)
+		});
+		await kv.set(["follower", follower.id.href], {
+			actor: await follower.toJsonLd(),
+			state: "accepted"
+		});
+		const relay = createRelay("mastodon", {
+			kv,
+			origin: "https://relay.example.com",
+			documentLoaderFactory: () => mockDocumentLoader,
+			authenticatedDocumentLoaderFactory: () => mockDocumentLoader,
+			subscriptionHandler: () => Promise.resolve(true)
+		});
+		const signedAnnounce = await signJsonLd(await new Announce({
+			id: new URL("https://remote.example.com/activities/announce/1"),
+			actor: new URL("https://remote.example.com/users/alice"),
+			object: new URL("https://remote.example.com/notes/1")
+		}).toJsonLd({ contextLoader: mockDocumentLoader }), rsaKeyPair.privateKey, rsaPublicKey.id, { contextLoader: mockDocumentLoader });
+		let request = new Request("https://relay.example.com/inbox", {
+			method: "POST",
+			headers: { "Content-Type": "application/activity+json" },
+			body: JSON.stringify(signedAnnounce)
+		});
+		request = await signRequest(request, rsaKeyPair.privateKey, rsaPublicKey.id);
+		const delivered = recordInbox(followerInbox);
+		const response = await relay.fetch(request);
+		ok(response.status === 200 || response.status === 202, `Unexpected inbox response status: ${response.status}`);
+		strictEqual(delivered.length, 1, "Expected exactly one delivery");
+		strictEqual(delivered[0].method, "POST");
+		deepStrictEqual(delivered[0].body, signedAnnounce);
+	});
 	test("ignores Follow activity without required fields", async () => {
 		const kv = new MemoryKvStore();
 		const relay = createRelay("mastodon", {
@@ -451,7 +519,7 @@ describe("MastodonRelay", () => {
 			body: JSON.stringify(await followActivity.toJsonLd({ contextLoader: mockDocumentLoader }))
 		});
 		request = await signRequest(request, rsaKeyPair.privateKey, rsaPublicKey.id);
-		await relay.fetch(request);
+		strictEqual((await relay.fetch(request)).status, 202);
 		strictEqual(await kv.get(["follower", "https://remote.example.com/users/alice"]), void 0);
 	});
 	test("handles public Follow activity", async () => {
@@ -466,10 +534,10 @@ describe("MastodonRelay", () => {
 		const follower = new Person({
 			id: new URL("https://remote.example.com/users/alice"),
 			preferredUsername: "alice",
-			inbox: new URL("https://remote.example.com/users/alice/inbox")
+			inbox: new URL(aliceInbox)
 		});
 		const followActivity = new Follow({
-			id: new URL("https://remote.example.com/activities/follow/1"),
+			id: new URL(`https://remote.example.com/activities/follow/${crypto.randomUUID()}`),
 			actor: follower.id,
 			object: new URL("https://www.w3.org/ns/activitystreams#Public")
 		});
@@ -479,7 +547,8 @@ describe("MastodonRelay", () => {
 			body: JSON.stringify(await followActivity.toJsonLd({ contextLoader: mockDocumentLoader }))
 		});
 		request = await signRequest(request, rsaKeyPair.privateKey, rsaPublicKey.id);
-		await relay.fetch(request);
+		strictEqual((await relay.fetch(request)).status, 202);
+		assertAcceptDelivered(followActivity);
 		ok(await kv.get(["follower", "https://remote.example.com/users/alice"]));
 	});
 	test("list() returns empty when no followers exist", async () => {
@@ -552,7 +621,7 @@ describe("MastodonRelay", () => {
 			id: new URL(followerId),
 			preferredUsername: "alice",
 			name: "Alice Wonderland",
-			inbox: new URL("https://remote.example.com/users/alice/inbox")
+			inbox: new URL(aliceInbox)
 		});
 		await kv.set(["follower", followerId], {
 			actor: await follower.toJsonLd(),
@@ -579,12 +648,12 @@ describe("MastodonRelay", () => {
 		const follower1 = new Person({
 			id: new URL("https://remote.example.com/users/alice"),
 			preferredUsername: "alice",
-			inbox: new URL("https://remote.example.com/users/alice/inbox")
+			inbox: new URL(aliceInbox)
 		});
 		const follower2 = new Person({
 			id: new URL("https://remote.example.com/users/bob"),
 			preferredUsername: "bob",
-			inbox: new URL("https://remote.example.com/users/bob/inbox")
+			inbox: new URL(`${INBOX_PREFIX}3]/users/bob/inbox`)
 		});
 		await kv.set(["follower", "https://remote.example.com/users/alice"], {
 			actor: await follower1.toJsonLd(),
@@ -621,7 +690,7 @@ describe("MastodonRelay", () => {
 		const follower = new Person({
 			id: new URL("https://remote.example.com/users/alice"),
 			preferredUsername: "alice",
-			inbox: new URL("https://remote.example.com/users/alice/inbox")
+			inbox: new URL(aliceInbox)
 		});
 		await kv.set(["follower", "https://remote.example.com/users/alice"], {
 			actor: await follower.toJsonLd(),
@@ -633,7 +702,7 @@ describe("MastodonRelay", () => {
 		strictEqual(result.state, "accepted");
 		ok(result.actor);
 		strictEqual(result.actor.preferredUsername, "alice");
-		strictEqual(result.actor.inboxId?.href, "https://remote.example.com/users/alice/inbox");
+		strictEqual(result.actor.inboxId?.href, aliceInbox);
 		strictEqual(await relay.getFollower("https://remote.example.com/users/nonexistent"), null);
 	});
 });