@fedify/relay 2.4.0-dev.1995 → 2.4.0-dev.2010

package/dist/litepub.test.js

@@ -1,7 +1,7 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-C_5jld-p.js";
+import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-NmdHcaR3.js";
 import { MemoryKvStore, signRequest } from "@fedify/fedify";
 import { createRelay } from "@fedify/relay";
 import { deepStrictEqual, ok, strictEqual } from "node:assert";
@@ -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$/, ""),
@@ -73,6 +73,7 @@ const davePublicKey = {
 	...rsaKeyPair.publicKey
 };
 const INBOX_PREFIX = "https://[2001:db8:1::";
+const aliceInbox = `${INBOX_PREFIX}4]/users/alice/inbox`;
 const daveInbox = `${INBOX_PREFIX}1]/users/dave/inbox`;
 const pendingInbox = `${INBOX_PREFIX}2]/users/bob/inbox`;
 const acceptedInbox = `${INBOX_PREFIX}3]/users/carol/inbox`;
@@ -82,6 +83,15 @@ function recordInbox(inbox) {
 	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);
@@ -229,7 +239,7 @@ describe("LitePubRelay", () => {
 			inbox: new URL(daveInbox)
 		});
 		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")
 		});
@@ -240,8 +250,8 @@ describe("LitePubRelay", () => {
 		});
 		request = await signRequest(request, rsaKeyPair.privateKey, davePublicKey.id);
 		const deliveredActivities = recordInbox(daveInbox);
-		const response = await relay.fetch(request);
-		ok(response.status === 200 || response.status === 202, `Unexpected inbox response status: ${response.status}`);
+		strictEqual((await relay.fetch(request)).status, 202);
+		assertAcceptDelivered(followActivity, deliveredActivities);
 		strictEqual(handlerCalled, true);
 		ok(handlerActor);
 		const followerData = await kv.get(["follower", "https://remote.example.com/users/dave"]);
@@ -267,7 +277,7 @@ describe("LitePubRelay", () => {
 		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"),
@@ -280,7 +290,7 @@ describe("LitePubRelay", () => {
 			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 () => {
@@ -295,10 +305,10 @@ describe("LitePubRelay", () => {
 		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")
 		});
@@ -308,7 +318,8 @@ describe("LitePubRelay", () => {
 			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);
 		const followerData = await kv.get(["follower", "https://remote.example.com/users/alice"]);
 		ok(isRelayFollowerData(followerData));
 		strictEqual(followerData.state, "pending");
@@ -332,7 +343,7 @@ describe("LitePubRelay", () => {
 			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("replaces malformed follower data on Follow", async () => {
@@ -368,7 +379,7 @@ describe("LitePubRelay", () => {
 			});
 			strictEqual(await relay.getFollower(followerId), null);
 			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: new URL(followerId),
 				object: new URL("https://relay.example.com/users/relay")
 			});
@@ -378,7 +389,8 @@ describe("LitePubRelay", () => {
 				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(handlerCallCount, 1);
 			const follower = await relay.getFollower(followerId);
 			ok(follower);
@@ -402,7 +414,7 @@ describe("LitePubRelay", () => {
 		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(),
@@ -419,7 +431,7 @@ describe("LitePubRelay", () => {
 			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(handlerCallCount, 0);
 		const followerData = await kv.get(["follower", "https://remote.example.com/users/alice"]);
 		ok(isRelayFollowerData(followerData));
@@ -430,7 +442,7 @@ describe("LitePubRelay", () => {
 		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(),
@@ -459,7 +471,7 @@ describe("LitePubRelay", () => {
 			body: JSON.stringify(await acceptActivity.toJsonLd({ contextLoader: mockDocumentLoader }))
 		});
 		request = await signRequest(request, rsaKeyPair.privateKey, rsaPublicKey.id);
-		await relay.fetch(request);
+		strictEqual((await relay.fetch(request)).status, 202);
 		const followerData = await kv.get(["follower", "https://remote.example.com/users/alice"]);
 		ok(isRelayFollowerData(followerData));
 		strictEqual(followerData.state, "accepted");
@@ -507,7 +519,7 @@ describe("LitePubRelay", () => {
 				body: JSON.stringify(await acceptActivity.toJsonLd({ contextLoader: mockDocumentLoader }))
 			});
 			request = await signRequest(request, rsaKeyPair.privateKey, rsaPublicKey.id);
-			await relay.fetch(request);
+			strictEqual((await relay.fetch(request)).status, 202);
 			deepStrictEqual(await kv.get(["follower", followerId]), invalidRow);
 		}
 	});
@@ -517,7 +529,7 @@ describe("LitePubRelay", () => {
 		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(),
@@ -546,7 +558,7 @@ describe("LitePubRelay", () => {
 			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 with Announce forwarding", async () => {
@@ -555,7 +567,7 @@ describe("LitePubRelay", () => {
 		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(),
@@ -858,7 +870,7 @@ describe("LitePubRelay", () => {
 			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(),

package/dist/mastodon.test.js

@@ -1,7 +1,7 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-C_5jld-p.js";
+import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-NmdHcaR3.js";
 import { MemoryKvStore, signJsonLd, signRequest } from "@fedify/fedify";
 import { createRelay } from "@fedify/relay";
 import { deepStrictEqual, ok, strictEqual } from "node:assert";
@@ -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$/, ""),
@@ -53,6 +53,7 @@ const rsaPublicKey = {
 	...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) {
@@ -60,6 +61,15 @@ function recordInbox(inbox) {
 	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);
@@ -173,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(),
@@ -187,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(),
@@ -256,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")
 		});
@@ -269,7 +279,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);
 		strictEqual(handlerCalled, true);
 		ok(handlerActor);
 		const followerData = await kv.get(["follower", "https://remote.example.com/users/alice"]);
@@ -290,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"),
@@ -303,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 () => {
@@ -312,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], {
@@ -342,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 () => {
@@ -351,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(),
@@ -508,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 () => {
@@ -523,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")
 		});
@@ -536,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 () => {
@@ -609,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(),
@@ -636,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(),
@@ -678,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(),
@@ -690,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);
 	});
 });

package/dist/{types-C_5jld-p.js → types-NmdHcaR3.js}

@@ -26102,7 +26102,7 @@ const preloadedContexts = {
 	} }
 };
 var name = "@fedify/vocab-runtime";
-var version = "2.4.0-dev.1995+618fd4e7";
+var version = "2.4.0-dev.2010+498229f4";
 /**
 * Error thrown when fetching a JSON-LD document failed.
 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/relay",
-  "version": "2.4.0-dev.1995+618fd4e7",
+  "version": "2.4.0-dev.2010+498229f4",
   "description": "ActivityPub relay support for Fedify",
   "keywords": [
     "Fedify",
@@ -47,14 +47,14 @@
   "dependencies": {
     "@logtape/logtape": "^2.2.0",
     "temporal-polyfill": "^1.0.1",
-    "@fedify/fedify": "^2.4.0-dev.1995+618fd4e7",
-    "@fedify/vocab": "2.4.0-dev.1995+618fd4e7"
+    "@fedify/fedify": "^2.4.0-dev.2010+498229f4",
+    "@fedify/vocab": "2.4.0-dev.2010+498229f4"
   },
   "devDependencies": {
     "tsdown": "^0.22.0",
     "typescript": "^6.0.0",
     "urlpattern-polyfill": "^10.1.0",
-    "@fedify/vocab-runtime": "^2.4.0-dev.1995+618fd4e7"
+    "@fedify/vocab-runtime": "^2.4.0-dev.2010+498229f4"
   },
   "scripts": {
     "build:self": "tsdown",