@fedify/relay 2.4.0-dev.1794 → 2.4.0-dev.1797

package/dist/litepub.test.js

@@ -1,12 +1,12 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { t as isRelayFollowerData } from "./types-CZvP2qE2.js";
+import { t as isRelayFollowerData } from "./types-BDWJ2_j0.js";
 import { MemoryKvStore, signRequest } from "@fedify/fedify";
 import { createRelay } from "@fedify/relay";
 import { Accept, Announce, Create, Delete, Follow, Move, Note, Person, Undo, Update } from "@fedify/vocab";
 import { exportSpki, getDocumentLoader } from "@fedify/vocab-runtime";
-import { ok, strictEqual } from "node:assert";
+import { deepStrictEqual, ok, strictEqual } from "node:assert";
 import test, { describe } from "node:test";
 //#region src/litepub.test.ts
 const mockDocumentLoader = async (url) => {
@@ -288,7 +288,58 @@ describe("LitePubRelay", () => {
 		await relay.fetch(request);
 		strictEqual(await kv.get(["follower", "https://remote.example.com/users/alice"]), void 0);
 	});
-	test("ignores duplicate Follow activity from pending follower", async () => {
+	test("replaces malformed follower data on Follow", async () => {
+		const followerId = "https://remote.example.com/users/alice";
+		const malformedRows = [
+			{ state: "pending" },
+			{
+				actor: null,
+				state: "pending"
+			},
+			{
+				actor: {},
+				state: "pending"
+			},
+			{
+				actor: await new Person({ id: new URL("https://remote.example.com/users/bob") }).toJsonLd(),
+				state: "pending"
+			}
+		];
+		for (const malformedRow of malformedRows) {
+			const kv = new MemoryKvStore();
+			await kv.set(["follower", followerId], malformedRow);
+			let handlerCallCount = 0;
+			const relay = createRelay("litepub", {
+				kv,
+				origin: "https://relay.example.com",
+				documentLoaderFactory: () => mockDocumentLoader,
+				authenticatedDocumentLoaderFactory: () => mockDocumentLoader,
+				subscriptionHandler: () => {
+					handlerCallCount++;
+					return Promise.resolve(true);
+				}
+			});
+			strictEqual(await relay.getFollower(followerId), null);
+			const followActivity = new Follow({
+				id: new URL("https://remote.example.com/activities/follow/1"),
+				actor: new URL(followerId),
+				object: new URL("https://relay.example.com/users/relay")
+			});
+			let request = new Request("https://relay.example.com/inbox", {
+				method: "POST",
+				headers: { "Content-Type": "application/activity+json" },
+				body: JSON.stringify(await followActivity.toJsonLd({ contextLoader: mockDocumentLoader }))
+			});
+			request = await signRequest(request, rsaKeyPair.privateKey, rsaPublicKey.id);
+			await relay.fetch(request);
+			strictEqual(handlerCallCount, 1);
+			const follower = await relay.getFollower(followerId);
+			ok(follower);
+			strictEqual(follower.state, "pending");
+			strictEqual(follower.actor.id?.href, followerId);
+		}
+	});
+	for (const state of ["pending", "accepted"]) test(`ignores duplicate Follow activity from ${state} follower`, async () => {
 		const kv = new MemoryKvStore();
 		let handlerCallCount = 0;
 		const relay = createRelay("litepub", {
@@ -308,7 +359,7 @@ describe("LitePubRelay", () => {
 		});
 		await kv.set(["follower", "https://remote.example.com/users/alice"], {
 			actor: await follower.toJsonLd(),
-			state: "pending"
+			state
 		});
 		const followActivity = new Follow({
 			id: new URL("https://remote.example.com/activities/follow/1"),
@@ -323,6 +374,9 @@ describe("LitePubRelay", () => {
 		request = await signRequest(request, rsaKeyPair.privateKey, rsaPublicKey.id);
 		await relay.fetch(request);
 		strictEqual(handlerCallCount, 0);
+		const followerData = await kv.get(["follower", "https://remote.example.com/users/alice"]);
+		ok(isRelayFollowerData(followerData));
+		strictEqual(followerData.state, state);
 	});
 	test("handles Accept activity completing reciprocal follow", async () => {
 		const kv = new MemoryKvStore();
@@ -363,7 +417,54 @@ describe("LitePubRelay", () => {
 		ok(isRelayFollowerData(followerData));
 		strictEqual(followerData.state, "accepted");
 	});
-	test("handles Undo Follow activity", async () => {
+	test("ignores Accept activity for invalid follower data", async () => {
+		const followerId = "https://remote.example.com/users/alice";
+		const invalidRows = [
+			{ state: "pending" },
+			{
+				actor: null,
+				state: "pending"
+			},
+			{
+				actor: {},
+				state: "pending"
+			},
+			{
+				actor: await new Person({ id: new URL("https://remote.example.com/users/bob") }).toJsonLd(),
+				state: "pending"
+			}
+		];
+		for (const invalidRow of invalidRows) {
+			const kv = new MemoryKvStore();
+			await kv.set(["follower", followerId], invalidRow);
+			const relay = createRelay("litepub", {
+				kv,
+				origin: "https://relay.example.com",
+				documentLoaderFactory: () => mockDocumentLoader,
+				authenticatedDocumentLoaderFactory: () => mockDocumentLoader,
+				subscriptionHandler: () => Promise.resolve(true)
+			});
+			const relayFollow = new Follow({
+				id: new URL("https://relay.example.com/activities/follow/1"),
+				actor: new URL("https://relay.example.com/users/relay"),
+				object: new URL(followerId)
+			});
+			const acceptActivity = new Accept({
+				id: new URL("https://remote.example.com/activities/accept/1"),
+				actor: new URL(followerId),
+				object: relayFollow
+			});
+			let request = new Request("https://relay.example.com/inbox", {
+				method: "POST",
+				headers: { "Content-Type": "application/activity+json" },
+				body: JSON.stringify(await acceptActivity.toJsonLd({ contextLoader: mockDocumentLoader }))
+			});
+			request = await signRequest(request, rsaKeyPair.privateKey, rsaPublicKey.id);
+			await relay.fetch(request);
+			deepStrictEqual(await kv.get(["follower", followerId]), invalidRow);
+		}
+	});
+	for (const state of ["pending", "accepted"]) test(`handles Undo Follow activity for ${state} follower`, async () => {
 		const kv = new MemoryKvStore();
 		const followerId = "https://remote.example.com/users/alice";
 		const follower = new Person({
@@ -373,7 +474,7 @@ describe("LitePubRelay", () => {
 		});
 		await kv.set(["follower", followerId], {
 			actor: await follower.toJsonLd(),
-			state: "accepted"
+			state
 		});
 		const relay = createRelay("litepub", {
 			kv,

package/dist/mastodon.test.js

@@ -1,12 +1,12 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { t as isRelayFollowerData } from "./types-CZvP2qE2.js";
-import { MemoryKvStore, signRequest } from "@fedify/fedify";
+import { t as isRelayFollowerData } from "./types-BDWJ2_j0.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 { Announce, Create, Delete, Follow, Move, Note, Person, Undo, Update } from "@fedify/vocab";
 import { exportSpki, getDocumentLoader } from "@fedify/vocab-runtime";
-import { ok, strictEqual } from "node:assert";
+import { deepStrictEqual, ok, strictEqual } from "node:assert";
 import test, { describe } from "node:test";
 //#region src/mastodon.test.ts
 const mockDocumentLoader = async (url) => {
@@ -254,7 +254,9 @@ describe("MastodonRelay", () => {
 		await relay.fetch(request);
 		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();
@@ -433,6 +435,57 @@ 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("https://follower.example.com/users/bob/inbox")
+		});
+		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 originalFetch = globalThis.fetch;
+		let deliveryMethod;
+		let deliveredActivity;
+		globalThis.fetch = (async (input, init) => {
+			const outboundRequest = input instanceof Request ? input : new Request(input, init);
+			if (outboundRequest.url === "https://follower.example.com/users/bob/inbox") {
+				deliveryMethod = outboundRequest.method;
+				deliveredActivity = await outboundRequest.json();
+				return new Response(null, { status: 202 });
+			}
+			return originalFetch(input, init);
+		});
+		try {
+			const response = await relay.fetch(request);
+			ok(response.status === 200 || response.status === 202, `Unexpected inbox response status: ${response.status}`);
+		} finally {
+			globalThis.fetch = originalFetch;
+		}
+		ok(deliveredActivity, "Expected Announce delivery to the follower inbox");
+		strictEqual(deliveryMethod, "POST");
+		deepStrictEqual(deliveredActivity, signedAnnounce);
+	});
 	test("ignores Follow activity without required fields", async () => {
 		const kv = new MemoryKvStore();
 		const relay = createRelay("mastodon", {

package/dist/mod.cjs

@@ -18,6 +18,28 @@ function isRelayFollowerData(value) {
 	const obj = value;
 	return "actor" in obj && "state" in obj && typeof obj.state === "string" && (obj.state === "pending" || obj.state === "accepted");
 }
+/**
+* Parses and semantically validates follower data from storage.
+*
+* @param actorId The actor ID used as the follower's storage key.
+* @param value The stored follower data.
+* @returns The parsed follower, or `null` if the row is invalid.
+* @internal
+*/
+async function parseRelayFollowerData(actorId, value) {
+	if (!isRelayFollowerData(value)) return null;
+	try {
+		const actor = await _fedify_vocab.Object.fromJsonLd(value.actor);
+		if (!(0, _fedify_vocab.isActor)(actor) || actor.id?.href !== actorId) return null;
+		return {
+			actorId,
+			actor,
+			state: value.state
+		};
+	} catch {
+		return null;
+	}
+}
 //#endregion
 //#region src/builder.ts
 const relayBuilder = (0, _fedify_fedify.createFederationBuilder)();
@@ -78,12 +100,12 @@ relayBuilder.setActorDispatcher("/users/{identifier}", async (ctx, identifier) =
 });
 async function getFollowerActors(ctx) {
 	const actors = [];
-	for await (const { value } of ctx.data.kv.list(["follower"])) {
-		if (!isRelayFollowerData(value)) continue;
-		if (value.state !== "accepted") continue;
-		const actor = await _fedify_vocab.Object.fromJsonLd(value.actor);
-		if (!(0, _fedify_vocab.isActor)(actor)) continue;
-		actors.push(actor);
+	for await (const { key, value } of ctx.data.kv.list(["follower"])) {
+		const actorId = key[1];
+		if (typeof actorId !== "string") continue;
+		const follower = await parseRelayFollowerData(actorId, value);
+		if (follower?.state !== "accepted") continue;
+		actors.push(follower.actor);
 	}
 	return actors;
 }
@@ -3658,6 +3680,64 @@ const Temporal$2 = /*@__PURE__*/ Object.defineProperties({}, {
 const Temporal$1 = NativeTemporal || Temporal$2;
 NativeTemporal && Date.prototype.toTemporalInstant;
 //#endregion
+//#region src/follow.ts
+/**
+* Validate Follow activity and return follower actor if valid.
+* This validation is common to both Mastodon and LitePub relay protocols.
+*
+* @param ctx The federation context
+* @param follow The Follow activity to validate
+* @returns The follower Actor if valid, null otherwise
+*/
+async function validateFollowActivity(ctx, follow) {
+	if (follow.id == null || follow.objectId == null) return null;
+	const parsed = ctx.parseUri(follow.objectId);
+	if (!(follow.objectId.href === "https://www.w3.org/ns/activitystreams#Public") && parsed?.type !== "actor") return null;
+	const follower = await follow.getActor(ctx);
+	if (follower == null || follower.id == null || follower.preferredUsername == null || follower.inboxId == null) return null;
+	return follower;
+}
+/**
+* Send Accept or Reject response for a Follow activity.
+* This is common to both Mastodon and LitePub relay protocols.
+*
+* @param ctx The federation context
+* @param follow The Follow activity being responded to
+* @param follower The actor who sent the Follow
+* @param approved Whether the follow was approved
+*/
+async function sendFollowResponse(ctx, follow, follower, approved) {
+	const relayActorUri = ctx.getActorUri(RELAY_SERVER_ACTOR);
+	const Activity = approved ? _fedify_vocab.Accept : _fedify_vocab.Reject;
+	const action = approved ? "accepts" : "rejects";
+	await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new Activity({
+		id: new URL(`#${action}`, relayActorUri),
+		actor: relayActorUri,
+		object: follow
+	}));
+}
+/**
+* Handle Undo activity for Follow.
+* This logic is identical for both Mastodon and LitePub relay protocols.
+*
+* @param ctx The federation context
+* @param undo The Undo activity to handle
+* @param logger The logger instance to use for warnings
+*/
+async function handleUndoFollow(ctx, undo, logger) {
+	const activity = await undo.getObject({
+		crossOrigin: "trust",
+		...ctx
+	});
+	if (activity instanceof _fedify_vocab.Follow) {
+		if (activity.id == null || activity.actorId == null) return;
+		await ctx.data.kv.delete(["follower", activity.actorId.href]);
+	} else logger.warn("Unsupported object type ({type}) for Undo activity: {object}", {
+		type: activity?.constructor.name,
+		object: activity
+	});
+}
+//#endregion
 //#region src/base.ts
 /**
 * Abstract base class for relay implementations.
@@ -3677,25 +3757,6 @@ var BaseRelay = class {
 		return await (await this.#getFederation()).fetch(request, { contextData: this.options });
 	}
 	/**
-	* Helper method to parse and validate follower data from storage.
-	* Deserializes JSON-LD actor data and validates it.
-	*
-	* @param actorId The actor ID of the follower
-	* @param data Raw data from KV store
-	* @returns RelayFollower object if valid, null otherwise
-	* @internal
-	*/
-	async parseFollowerData(actorId, data) {
-		if (!isRelayFollowerData(data)) return null;
-		const actor = await _fedify_vocab.Object.fromJsonLd(data.actor);
-		if (!(0, _fedify_vocab.isActor)(actor)) return null;
-		return {
-			actorId,
-			actor,
-			state: data.state
-		};
-	}
-	/**
 	* Lists all followers of the relay.
 	*
 	* @returns An async iterator of follower entries
@@ -3724,7 +3785,7 @@ var BaseRelay = class {
 		for await (const entry of this.options.kv.list(["follower"])) {
 			const actorId = entry.key[1];
 			if (typeof actorId !== "string") continue;
-			const follower = await this.parseFollowerData(actorId, entry.value);
+			const follower = await parseRelayFollowerData(actorId, entry.value);
 			if (follower) yield follower;
 		}
 	}
@@ -3757,8 +3818,35 @@ var BaseRelay = class {
 	* @since 2.0.0
 	*/
 	async getFollower(actorId) {
-		const followerData = await this.options.kv.get(["follower", actorId]);
-		return await this.parseFollowerData(actorId, followerData);
+		return await parseRelayFollowerData(actorId, await this.options.kv.get(["follower", actorId]));
+	}
+	shouldSkipFollow(_ctx, _follower) {
+		return Promise.resolve(false);
+	}
+	afterFollowApproved(_ctx, _follower) {
+		return Promise.resolve();
+	}
+	async #handleFollow(ctx, follow) {
+		const follower = await validateFollowActivity(ctx, follow);
+		if (follower?.id == null || await this.shouldSkipFollow(ctx, follower)) return;
+		const approved = await this.options.subscriptionHandler(ctx, follower);
+		if (approved) await ctx.data.kv.set(["follower", follower.id.href], {
+			actor: await follower.toJsonLd(),
+			state: this.initialFollowerState
+		});
+		await sendFollowResponse(ctx, follow, follower, approved);
+		if (approved) await this.afterFollowApproved(ctx, follower);
+	}
+	async #relayActivity(ctx, activity) {
+		const senderId = activity.actorId;
+		const excludeBaseUris = senderId == null ? [] : [senderId];
+		await this.deliverActivity(ctx, activity, excludeBaseUris);
+	}
+	setupInboxListeners() {
+		if (this.federation == null) throw new Error("Federation must be initialized before inbox listeners");
+		const listeners = this.federation.setInboxListeners("/users/{identifier}/inbox", "/inbox");
+		listeners.on(_fedify_vocab.Follow, async (ctx, follow) => await this.#handleFollow(ctx, follow)).on(_fedify_vocab.Undo, async (ctx, undo) => await handleUndoFollow(ctx, undo, this.logger)).on(_fedify_vocab.Create, async (ctx, create) => await this.#relayActivity(ctx, create)).on(_fedify_vocab.Delete, async (ctx, deleteActivity) => await this.#relayActivity(ctx, deleteActivity)).on(_fedify_vocab.Move, async (ctx, move) => await this.#relayActivity(ctx, move)).on(_fedify_vocab.Update, async (ctx, update) => await this.#relayActivity(ctx, update)).on(_fedify_vocab.Announce, async (ctx, announce) => await this.#relayActivity(ctx, announce));
+		return listeners;
 	}
 	async #getFederation() {
 		if (this.federation == null) {
@@ -3778,64 +3866,6 @@ var BaseRelay = class {
 	}
 };
 //#endregion
-//#region src/follow.ts
-/**
-* Validate Follow activity and return follower actor if valid.
-* This validation is common to both Mastodon and LitePub relay protocols.
-*
-* @param ctx The federation context
-* @param follow The Follow activity to validate
-* @returns The follower Actor if valid, null otherwise
-*/
-async function validateFollowActivity(ctx, follow) {
-	if (follow.id == null || follow.objectId == null) return null;
-	const parsed = ctx.parseUri(follow.objectId);
-	if (!(follow.objectId.href === "https://www.w3.org/ns/activitystreams#Public") && parsed?.type !== "actor") return null;
-	const follower = await follow.getActor(ctx);
-	if (follower == null || follower.id == null || follower.preferredUsername == null || follower.inboxId == null) return null;
-	return follower;
-}
-/**
-* Send Accept or Reject response for a Follow activity.
-* This is common to both Mastodon and LitePub relay protocols.
-*
-* @param ctx The federation context
-* @param follow The Follow activity being responded to
-* @param follower The actor who sent the Follow
-* @param approved Whether the follow was approved
-*/
-async function sendFollowResponse(ctx, follow, follower, approved) {
-	const relayActorUri = ctx.getActorUri(RELAY_SERVER_ACTOR);
-	const Activity = approved ? _fedify_vocab.Accept : _fedify_vocab.Reject;
-	const action = approved ? "accepts" : "rejects";
-	await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new Activity({
-		id: new URL(`#${action}`, relayActorUri),
-		actor: relayActorUri,
-		object: follow
-	}));
-}
-/**
-* Handle Undo activity for Follow.
-* This logic is identical for both Mastodon and LitePub relay protocols.
-*
-* @param ctx The federation context
-* @param undo The Undo activity to handle
-* @param logger The logger instance to use for warnings
-*/
-async function handleUndoFollow(ctx, undo, logger) {
-	const activity = await undo.getObject({
-		crossOrigin: "trust",
-		...ctx
-	});
-	if (activity instanceof _fedify_vocab.Follow) {
-		if (activity.id == null || activity.actorId == null) return;
-		await ctx.data.kv.delete(["follower", activity.actorId.href]);
-	} else logger.warn("Unsupported object type ({type}) for Undo activity: {object}", {
-		type: activity?.constructor.name,
-		object: activity
-	});
-}
-//#endregion
 //#region src/litepub.ts
 const Temporal = Temporal$1;
 const logger$1 = (0, _logtape_logtape.getLogger)([
@@ -3851,9 +3881,23 @@ const logger$1 = (0, _logtape_logtape.getLogger)([
 * @since 2.0.0
 */
 var LitePubRelay = class extends BaseRelay {
-	async #announceToFollowers(ctx, activity) {
-		const sender = await activity.getActor(ctx);
-		const excludeBaseUris = sender?.id ? [new URL(sender.id)] : [];
+	initialFollowerState = "pending";
+	logger = logger$1;
+	async shouldSkipFollow(ctx, follower) {
+		if (follower.id == null) return true;
+		const existingFollow = await ctx.data.kv.get(["follower", follower.id.href]);
+		return await parseRelayFollowerData(follower.id.href, existingFollow) != null;
+	}
+	async afterFollowApproved(ctx, follower) {
+		if (follower.id == null) return;
+		const relayActorUri = ctx.getActorUri(RELAY_SERVER_ACTOR);
+		await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new _fedify_vocab.Follow({
+			actor: relayActorUri,
+			object: follower.id,
+			to: follower.id
+		}));
+	}
+	async deliverActivity(ctx, activity, excludeBaseUris) {
 		const announce = new _fedify_vocab.Announce({
 			id: new URL(`/announce#${crypto.randomUUID()}`, ctx.origin),
 			actor: ctx.getActorUri(RELAY_SERVER_ACTOR),
@@ -3867,25 +3911,7 @@ var LitePubRelay = class extends BaseRelay {
 		});
 	}
 	setupInboxListeners() {
-		if (this.federation != null) this.federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(_fedify_vocab.Follow, async (ctx, follow) => {
-			const follower = await validateFollowActivity(ctx, follow);
-			if (!follower || !follower.id) return;
-			if ((await ctx.data.kv.get(["follower", follower.id.href]))?.state === "pending") return;
-			const approved = await this.options.subscriptionHandler(ctx, follower);
-			if (approved) {
-				await ctx.data.kv.set(["follower", follower.id.href], {
-					actor: await follower.toJsonLd(),
-					state: "pending"
-				});
-				await sendFollowResponse(ctx, follow, follower, approved);
-				const relayActorUri = ctx.getActorUri(RELAY_SERVER_ACTOR);
-				await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new _fedify_vocab.Follow({
-					actor: relayActorUri,
-					object: follower.id,
-					to: follower.id
-				}));
-			} else await sendFollowResponse(ctx, follow, follower, approved);
-		}).on(_fedify_vocab.Accept, async (ctx, accept) => {
+		return super.setupInboxListeners().on(_fedify_vocab.Accept, async (ctx, accept) => {
 			const follow = await accept.getObject({
 				crossOrigin: "trust",
 				...ctx
@@ -3893,18 +3919,19 @@ var LitePubRelay = class extends BaseRelay {
 			if (!(follow instanceof _fedify_vocab.Follow)) return;
 			const relayActorId = follow.actorId;
 			if (relayActorId == null) return;
-			const followerActor = await accept.getActor();
+			const followerActor = await accept.getActor(ctx);
 			if (!(0, _fedify_vocab.isActor)(followerActor) || !followerActor.id) return;
 			const parsed = ctx.parseUri(relayActorId);
 			if (parsed == null || parsed.type !== "actor") return;
 			const followerData = await ctx.data.kv.get(["follower", followerActor.id.href]);
-			if (followerData == null) return;
+			if (!isRelayFollowerData(followerData)) return;
+			if (await parseRelayFollowerData(followerActor.id.href, followerData) == null) return;
 			const updatedFollowerData = {
 				...followerData,
 				state: "accepted"
 			};
 			await ctx.data.kv.set(["follower", followerActor.id.href], updatedFollowerData);
-		}).on(_fedify_vocab.Undo, async (ctx, undo) => await handleUndoFollow(ctx, undo, logger$1)).on(_fedify_vocab.Create, async (ctx, create) => await this.#announceToFollowers(ctx, create)).on(_fedify_vocab.Update, async (ctx, update) => await this.#announceToFollowers(ctx, update)).on(_fedify_vocab.Move, async (ctx, move) => await this.#announceToFollowers(ctx, move)).on(_fedify_vocab.Delete, async (ctx, deleteActivity) => await this.#announceToFollowers(ctx, deleteActivity)).on(_fedify_vocab.Announce, async (ctx, announce) => await this.#announceToFollowers(ctx, announce));
+		});
 	}
 };
 //#endregion
@@ -3922,27 +3949,15 @@ const logger = (0, _logtape_logtape.getLogger)([
 * @since 2.0.0
 */
 var MastodonRelay = class extends BaseRelay {
-	async #forwardToFollowers(ctx, activity) {
-		const sender = await activity.getActor(ctx);
-		const excludeBaseUris = sender?.id ? [new URL(sender.id)] : [];
+	initialFollowerState = "accepted";
+	logger = logger;
+	async deliverActivity(ctx, _activity, excludeBaseUris) {
 		await ctx.forwardActivity({ identifier: RELAY_SERVER_ACTOR }, "followers", {
 			skipIfUnsigned: true,
 			excludeBaseUris,
 			preferSharedInbox: true
 		});
 	}
-	setupInboxListeners() {
-		if (this.federation != null) this.federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(_fedify_vocab.Follow, async (ctx, follow) => {
-			const follower = await validateFollowActivity(ctx, follow);
-			if (!follower || !follower.id) return;
-			const approved = await this.options.subscriptionHandler(ctx, follower);
-			if (approved) await ctx.data.kv.set(["follower", follower.id.href], {
-				actor: await follower.toJsonLd(),
-				state: "accepted"
-			});
-			await sendFollowResponse(ctx, follow, follower, approved);
-		}).on(_fedify_vocab.Undo, async (ctx, undo) => await handleUndoFollow(ctx, undo, logger)).on(_fedify_vocab.Create, async (ctx, create) => await this.#forwardToFollowers(ctx, create)).on(_fedify_vocab.Delete, async (ctx, deleteActivity) => await this.#forwardToFollowers(ctx, deleteActivity)).on(_fedify_vocab.Move, async (ctx, move) => await this.#forwardToFollowers(ctx, move)).on(_fedify_vocab.Update, async (ctx, update) => await this.#forwardToFollowers(ctx, update)).on(_fedify_vocab.Announce, async (ctx, announce) => await this.#forwardToFollowers(ctx, announce));
-	}
 };
 //#endregion
 //#region src/factory.ts

package/dist/mod.d.cts

@@ -1,8 +1,124 @@
 /// <reference lib="esnext.temporal" />
 import { Context, KvStore, MessageQueue } from "@fedify/fedify";
 import { Actor } from "@fedify/vocab";
-import { AuthenticatedDocumentLoaderFactory, DocumentLoaderFactory } from "@fedify/vocab-runtime";
-
+//#region ../vocab-runtime/dist/docloader-BK627tQQ.d.ts
+/**
+* Options for making `User-Agent` string.
+* @see {@link getUserAgent}
+* @since 1.3.0
+*/
+interface GetUserAgentOptions {
+  /**
+  * An optional software name and version, e.g., `"Hollo/1.0.0"`.
+  */
+  software?: string | null;
+  /**
+  * An optional URL to append to the user agent string.
+  * Usually the URL of the ActivityPub instance.
+  */
+  url?: string | URL | null;
+}
+/**
+* Gets the user agent string for the given application and URL.
+* @param options The options for making the user agent string.
+* @returns The user agent string.
+* @since 1.3.0
+*/
+//#endregion
+//#region src/docloader.d.ts
+/**
+* A remote JSON-LD document and its context fetched by
+* a {@link DocumentLoader}.
+*/
+interface RemoteDocument {
+  /**
+  * The URL of the context document.
+  */
+  contextUrl: string | null;
+  /**
+  * The fetched JSON-LD document.
+  */
+  document: unknown;
+  /**
+  * The URL of the fetched document.
+  */
+  documentUrl: string;
+}
+/**
+* Options for {@link DocumentLoader}.
+* @since 1.8.0
+*/
+interface DocumentLoaderOptions {
+  /**
+  * An `AbortSignal` for cancellation.
+  * @since 1.8.0
+  */
+  signal?: AbortSignal;
+}
+/**
+* A JSON-LD document loader that fetches documents from the Web.
+* @param url The URL of the document to load.
+* @param options The options for the document loader.
+* @returns The loaded remote document.
+*/
+type DocumentLoader = (url: string, options?: DocumentLoaderOptions) => Promise<RemoteDocument>;
+/**
+* A factory function that creates a {@link DocumentLoader} with options.
+* @param options The options for the document loader.
+* @returns The document loader.
+* @since 1.4.0
+*/
+type DocumentLoaderFactory = (options?: DocumentLoaderFactoryOptions) => DocumentLoader;
+/**
+* Options for {@link DocumentLoaderFactory}.
+* @see {@link DocumentLoaderFactory}
+* @see {@link AuthenticatedDocumentLoaderFactory}
+* @since 1.4.0
+*/
+interface DocumentLoaderFactoryOptions {
+  /**
+  * Whether to allow fetching private network addresses.
+  * Turned off by default.
+  * @default `false``
+  */
+  allowPrivateAddress?: boolean;
+  /**
+  * Options for making `User-Agent` string.
+  * If a string is given, it is used as the `User-Agent` header value.
+  * If an object is given, it is passed to {@link getUserAgent} function.
+  */
+  userAgent?: GetUserAgentOptions | string;
+  /**
+  * The maximum number of redirections to follow.
+  * @default `20`
+  * @since 2.2.0
+  */
+  maxRedirection?: number;
+}
+/**
+* A factory function that creates an authenticated {@link DocumentLoader} for
+* a given identity.  This is used for fetching documents that require
+* authentication.
+* @param identity The identity to create the document loader for.
+*                 The actor's key pair.
+* @param options The options for the document loader.
+* @returns The authenticated document loader.
+* @since 0.4.0
+*/
+type AuthenticatedDocumentLoaderFactory = (identity: {
+  keyId: URL;
+  privateKey: CryptoKey;
+}, options?: DocumentLoaderFactoryOptions) => DocumentLoader;
+/**
+* Gets a {@link RemoteDocument} from the given response.
+* @param url The URL of the document to load.
+* @param response The response to get the document from.
+* @param fetch The function to fetch the document.
+* @returns The loaded remote document.
+* @throws {FetchError} If the response is not OK.
+* @internal
+*/
+//#endregion
 //#region src/types.d.ts
 declare const RELAY_SERVER_ACTOR = "relay";
 /**
@@ -10,6 +126,12 @@ declare const RELAY_SERVER_ACTOR = "relay";
 */
 type RelayType = "mastodon" | "litepub";
 /**
+* A follower's subscription state.
+*
+* @internal
+*/
+type RelayFollowerState = "pending" | "accepted";
+/**
 * Handler for subscription requests (Follow/Undo activities).
 */
 type SubscriptionRequestHandler = (ctx: Context<RelayOptions>, clientActor: Actor) => Promise<boolean>;
@@ -66,7 +188,7 @@ interface RelayFollower {
   /** The validated Actor object. */
   readonly actor: Actor;
   /** The follower's state. */
-  readonly state: "pending" | "accepted";
+  readonly state: RelayFollowerState;
 }
 /**
 * Public interface for ActivityPub relay implementations.

package/dist/mod.d.ts

@@ -1,8 +1,124 @@
 /// <reference lib="esnext.temporal" />
 import { Context, KvStore, MessageQueue } from "@fedify/fedify";
 import { Actor } from "@fedify/vocab";
-import { AuthenticatedDocumentLoaderFactory, DocumentLoaderFactory } from "@fedify/vocab-runtime";
-
+//#region ../vocab-runtime/dist/docloader-BK627tQQ.d.ts
+/**
+* Options for making `User-Agent` string.
+* @see {@link getUserAgent}
+* @since 1.3.0
+*/
+interface GetUserAgentOptions {
+  /**
+  * An optional software name and version, e.g., `"Hollo/1.0.0"`.
+  */
+  software?: string | null;
+  /**
+  * An optional URL to append to the user agent string.
+  * Usually the URL of the ActivityPub instance.
+  */
+  url?: string | URL | null;
+}
+/**
+* Gets the user agent string for the given application and URL.
+* @param options The options for making the user agent string.
+* @returns The user agent string.
+* @since 1.3.0
+*/
+//#endregion
+//#region src/docloader.d.ts
+/**
+* A remote JSON-LD document and its context fetched by
+* a {@link DocumentLoader}.
+*/
+interface RemoteDocument {
+  /**
+  * The URL of the context document.
+  */
+  contextUrl: string | null;
+  /**
+  * The fetched JSON-LD document.
+  */
+  document: unknown;
+  /**
+  * The URL of the fetched document.
+  */
+  documentUrl: string;
+}
+/**
+* Options for {@link DocumentLoader}.
+* @since 1.8.0
+*/
+interface DocumentLoaderOptions {
+  /**
+  * An `AbortSignal` for cancellation.
+  * @since 1.8.0
+  */
+  signal?: AbortSignal;
+}
+/**
+* A JSON-LD document loader that fetches documents from the Web.
+* @param url The URL of the document to load.
+* @param options The options for the document loader.
+* @returns The loaded remote document.
+*/
+type DocumentLoader = (url: string, options?: DocumentLoaderOptions) => Promise<RemoteDocument>;
+/**
+* A factory function that creates a {@link DocumentLoader} with options.
+* @param options The options for the document loader.
+* @returns The document loader.
+* @since 1.4.0
+*/
+type DocumentLoaderFactory = (options?: DocumentLoaderFactoryOptions) => DocumentLoader;
+/**
+* Options for {@link DocumentLoaderFactory}.
+* @see {@link DocumentLoaderFactory}
+* @see {@link AuthenticatedDocumentLoaderFactory}
+* @since 1.4.0
+*/
+interface DocumentLoaderFactoryOptions {
+  /**
+  * Whether to allow fetching private network addresses.
+  * Turned off by default.
+  * @default `false``
+  */
+  allowPrivateAddress?: boolean;
+  /**
+  * Options for making `User-Agent` string.
+  * If a string is given, it is used as the `User-Agent` header value.
+  * If an object is given, it is passed to {@link getUserAgent} function.
+  */
+  userAgent?: GetUserAgentOptions | string;
+  /**
+  * The maximum number of redirections to follow.
+  * @default `20`
+  * @since 2.2.0
+  */
+  maxRedirection?: number;
+}
+/**
+* A factory function that creates an authenticated {@link DocumentLoader} for
+* a given identity.  This is used for fetching documents that require
+* authentication.
+* @param identity The identity to create the document loader for.
+*                 The actor's key pair.
+* @param options The options for the document loader.
+* @returns The authenticated document loader.
+* @since 0.4.0
+*/
+type AuthenticatedDocumentLoaderFactory = (identity: {
+  keyId: URL;
+  privateKey: CryptoKey;
+}, options?: DocumentLoaderFactoryOptions) => DocumentLoader;
+/**
+* Gets a {@link RemoteDocument} from the given response.
+* @param url The URL of the document to load.
+* @param response The response to get the document from.
+* @param fetch The function to fetch the document.
+* @returns The loaded remote document.
+* @throws {FetchError} If the response is not OK.
+* @internal
+*/
+//#endregion
 //#region src/types.d.ts
 declare const RELAY_SERVER_ACTOR = "relay";
 /**
@@ -10,6 +126,12 @@ declare const RELAY_SERVER_ACTOR = "relay";
 */
 type RelayType = "mastodon" | "litepub";
 /**
+* A follower's subscription state.
+*
+* @internal
+*/
+type RelayFollowerState = "pending" | "accepted";
+/**
 * Handler for subscription requests (Follow/Undo activities).
 */
 type SubscriptionRequestHandler = (ctx: Context<RelayOptions>, clientActor: Actor) => Promise<boolean>;
@@ -66,7 +188,7 @@ interface RelayFollower {
   /** The validated Actor object. */
   readonly actor: Actor;
   /** The follower's state. */
-  readonly state: "pending" | "accepted";
+  readonly state: RelayFollowerState;
 }
 /**
 * Public interface for ActivityPub relay implementations.

package/dist/mod.js

@@ -17,6 +17,28 @@ function isRelayFollowerData(value) {
 	const obj = value;
 	return "actor" in obj && "state" in obj && typeof obj.state === "string" && (obj.state === "pending" || obj.state === "accepted");
 }
+/**
+* Parses and semantically validates follower data from storage.
+*
+* @param actorId The actor ID used as the follower's storage key.
+* @param value The stored follower data.
+* @returns The parsed follower, or `null` if the row is invalid.
+* @internal
+*/
+async function parseRelayFollowerData(actorId, value) {
+	if (!isRelayFollowerData(value)) return null;
+	try {
+		const actor = await Object$1.fromJsonLd(value.actor);
+		if (!isActor(actor) || actor.id?.href !== actorId) return null;
+		return {
+			actorId,
+			actor,
+			state: value.state
+		};
+	} catch {
+		return null;
+	}
+}
 //#endregion
 //#region src/builder.ts
 const relayBuilder = createFederationBuilder();
@@ -77,12 +99,12 @@ relayBuilder.setActorDispatcher("/users/{identifier}", async (ctx, identifier) =
 });
 async function getFollowerActors(ctx) {
 	const actors = [];
-	for await (const { value } of ctx.data.kv.list(["follower"])) {
-		if (!isRelayFollowerData(value)) continue;
-		if (value.state !== "accepted") continue;
-		const actor = await Object$1.fromJsonLd(value.actor);
-		if (!isActor(actor)) continue;
-		actors.push(actor);
+	for await (const { key, value } of ctx.data.kv.list(["follower"])) {
+		const actorId = key[1];
+		if (typeof actorId !== "string") continue;
+		const follower = await parseRelayFollowerData(actorId, value);
+		if (follower?.state !== "accepted") continue;
+		actors.push(follower.actor);
 	}
 	return actors;
 }
@@ -93,6 +115,64 @@ async function dispatchRelayActors(ctx, identifier) {
 relayBuilder.setFollowersDispatcher("/users/{identifier}/followers", dispatchRelayActors);
 relayBuilder.setFollowingDispatcher("/users/{identifier}/following", dispatchRelayActors);
 //#endregion
+//#region src/follow.ts
+/**
+* Validate Follow activity and return follower actor if valid.
+* This validation is common to both Mastodon and LitePub relay protocols.
+*
+* @param ctx The federation context
+* @param follow The Follow activity to validate
+* @returns The follower Actor if valid, null otherwise
+*/
+async function validateFollowActivity(ctx, follow) {
+	if (follow.id == null || follow.objectId == null) return null;
+	const parsed = ctx.parseUri(follow.objectId);
+	if (!(follow.objectId.href === "https://www.w3.org/ns/activitystreams#Public") && parsed?.type !== "actor") return null;
+	const follower = await follow.getActor(ctx);
+	if (follower == null || follower.id == null || follower.preferredUsername == null || follower.inboxId == null) return null;
+	return follower;
+}
+/**
+* Send Accept or Reject response for a Follow activity.
+* This is common to both Mastodon and LitePub relay protocols.
+*
+* @param ctx The federation context
+* @param follow The Follow activity being responded to
+* @param follower The actor who sent the Follow
+* @param approved Whether the follow was approved
+*/
+async function sendFollowResponse(ctx, follow, follower, approved) {
+	const relayActorUri = ctx.getActorUri(RELAY_SERVER_ACTOR);
+	const Activity = approved ? Accept : Reject;
+	const action = approved ? "accepts" : "rejects";
+	await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new Activity({
+		id: new URL(`#${action}`, relayActorUri),
+		actor: relayActorUri,
+		object: follow
+	}));
+}
+/**
+* Handle Undo activity for Follow.
+* This logic is identical for both Mastodon and LitePub relay protocols.
+*
+* @param ctx The federation context
+* @param undo The Undo activity to handle
+* @param logger The logger instance to use for warnings
+*/
+async function handleUndoFollow(ctx, undo, logger) {
+	const activity = await undo.getObject({
+		crossOrigin: "trust",
+		...ctx
+	});
+	if (activity instanceof Follow) {
+		if (activity.id == null || activity.actorId == null) return;
+		await ctx.data.kv.delete(["follower", activity.actorId.href]);
+	} else logger.warn("Unsupported object type ({type}) for Undo activity: {object}", {
+		type: activity?.constructor.name,
+		object: activity
+	});
+}
+//#endregion
 //#region src/base.ts
 /**
 * Abstract base class for relay implementations.
@@ -112,25 +192,6 @@ var BaseRelay = class {
 		return await (await this.#getFederation()).fetch(request, { contextData: this.options });
 	}
 	/**
-	* Helper method to parse and validate follower data from storage.
-	* Deserializes JSON-LD actor data and validates it.
-	*
-	* @param actorId The actor ID of the follower
-	* @param data Raw data from KV store
-	* @returns RelayFollower object if valid, null otherwise
-	* @internal
-	*/
-	async parseFollowerData(actorId, data) {
-		if (!isRelayFollowerData(data)) return null;
-		const actor = await Object$1.fromJsonLd(data.actor);
-		if (!isActor(actor)) return null;
-		return {
-			actorId,
-			actor,
-			state: data.state
-		};
-	}
-	/**
 	* Lists all followers of the relay.
 	*
 	* @returns An async iterator of follower entries
@@ -159,7 +220,7 @@ var BaseRelay = class {
 		for await (const entry of this.options.kv.list(["follower"])) {
 			const actorId = entry.key[1];
 			if (typeof actorId !== "string") continue;
-			const follower = await this.parseFollowerData(actorId, entry.value);
+			const follower = await parseRelayFollowerData(actorId, entry.value);
 			if (follower) yield follower;
 		}
 	}
@@ -192,8 +253,35 @@ var BaseRelay = class {
 	* @since 2.0.0
 	*/
 	async getFollower(actorId) {
-		const followerData = await this.options.kv.get(["follower", actorId]);
-		return await this.parseFollowerData(actorId, followerData);
+		return await parseRelayFollowerData(actorId, await this.options.kv.get(["follower", actorId]));
+	}
+	shouldSkipFollow(_ctx, _follower) {
+		return Promise.resolve(false);
+	}
+	afterFollowApproved(_ctx, _follower) {
+		return Promise.resolve();
+	}
+	async #handleFollow(ctx, follow) {
+		const follower = await validateFollowActivity(ctx, follow);
+		if (follower?.id == null || await this.shouldSkipFollow(ctx, follower)) return;
+		const approved = await this.options.subscriptionHandler(ctx, follower);
+		if (approved) await ctx.data.kv.set(["follower", follower.id.href], {
+			actor: await follower.toJsonLd(),
+			state: this.initialFollowerState
+		});
+		await sendFollowResponse(ctx, follow, follower, approved);
+		if (approved) await this.afterFollowApproved(ctx, follower);
+	}
+	async #relayActivity(ctx, activity) {
+		const senderId = activity.actorId;
+		const excludeBaseUris = senderId == null ? [] : [senderId];
+		await this.deliverActivity(ctx, activity, excludeBaseUris);
+	}
+	setupInboxListeners() {
+		if (this.federation == null) throw new Error("Federation must be initialized before inbox listeners");
+		const listeners = this.federation.setInboxListeners("/users/{identifier}/inbox", "/inbox");
+		listeners.on(Follow, async (ctx, follow) => await this.#handleFollow(ctx, follow)).on(Undo, async (ctx, undo) => await handleUndoFollow(ctx, undo, this.logger)).on(Create, async (ctx, create) => await this.#relayActivity(ctx, create)).on(Delete, async (ctx, deleteActivity) => await this.#relayActivity(ctx, deleteActivity)).on(Move, async (ctx, move) => await this.#relayActivity(ctx, move)).on(Update, async (ctx, update) => await this.#relayActivity(ctx, update)).on(Announce, async (ctx, announce) => await this.#relayActivity(ctx, announce));
+		return listeners;
 	}
 	async #getFederation() {
 		if (this.federation == null) {
@@ -213,64 +301,6 @@ var BaseRelay = class {
 	}
 };
 //#endregion
-//#region src/follow.ts
-/**
-* Validate Follow activity and return follower actor if valid.
-* This validation is common to both Mastodon and LitePub relay protocols.
-*
-* @param ctx The federation context
-* @param follow The Follow activity to validate
-* @returns The follower Actor if valid, null otherwise
-*/
-async function validateFollowActivity(ctx, follow) {
-	if (follow.id == null || follow.objectId == null) return null;
-	const parsed = ctx.parseUri(follow.objectId);
-	if (!(follow.objectId.href === "https://www.w3.org/ns/activitystreams#Public") && parsed?.type !== "actor") return null;
-	const follower = await follow.getActor(ctx);
-	if (follower == null || follower.id == null || follower.preferredUsername == null || follower.inboxId == null) return null;
-	return follower;
-}
-/**
-* Send Accept or Reject response for a Follow activity.
-* This is common to both Mastodon and LitePub relay protocols.
-*
-* @param ctx The federation context
-* @param follow The Follow activity being responded to
-* @param follower The actor who sent the Follow
-* @param approved Whether the follow was approved
-*/
-async function sendFollowResponse(ctx, follow, follower, approved) {
-	const relayActorUri = ctx.getActorUri(RELAY_SERVER_ACTOR);
-	const Activity = approved ? Accept : Reject;
-	const action = approved ? "accepts" : "rejects";
-	await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new Activity({
-		id: new URL(`#${action}`, relayActorUri),
-		actor: relayActorUri,
-		object: follow
-	}));
-}
-/**
-* Handle Undo activity for Follow.
-* This logic is identical for both Mastodon and LitePub relay protocols.
-*
-* @param ctx The federation context
-* @param undo The Undo activity to handle
-* @param logger The logger instance to use for warnings
-*/
-async function handleUndoFollow(ctx, undo, logger) {
-	const activity = await undo.getObject({
-		crossOrigin: "trust",
-		...ctx
-	});
-	if (activity instanceof Follow) {
-		if (activity.id == null || activity.actorId == null) return;
-		await ctx.data.kv.delete(["follower", activity.actorId.href]);
-	} else logger.warn("Unsupported object type ({type}) for Undo activity: {object}", {
-		type: activity?.constructor.name,
-		object: activity
-	});
-}
-//#endregion
 //#region src/litepub.ts
 const logger$1 = getLogger([
 	"fedify",
@@ -285,9 +315,23 @@ const logger$1 = getLogger([
 * @since 2.0.0
 */
 var LitePubRelay = class extends BaseRelay {
-	async #announceToFollowers(ctx, activity) {
-		const sender = await activity.getActor(ctx);
-		const excludeBaseUris = sender?.id ? [new URL(sender.id)] : [];
+	initialFollowerState = "pending";
+	logger = logger$1;
+	async shouldSkipFollow(ctx, follower) {
+		if (follower.id == null) return true;
+		const existingFollow = await ctx.data.kv.get(["follower", follower.id.href]);
+		return await parseRelayFollowerData(follower.id.href, existingFollow) != null;
+	}
+	async afterFollowApproved(ctx, follower) {
+		if (follower.id == null) return;
+		const relayActorUri = ctx.getActorUri(RELAY_SERVER_ACTOR);
+		await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new Follow({
+			actor: relayActorUri,
+			object: follower.id,
+			to: follower.id
+		}));
+	}
+	async deliverActivity(ctx, activity, excludeBaseUris) {
 		const announce = new Announce({
 			id: new URL(`/announce#${crypto.randomUUID()}`, ctx.origin),
 			actor: ctx.getActorUri(RELAY_SERVER_ACTOR),
@@ -301,25 +345,7 @@ var LitePubRelay = class extends BaseRelay {
 		});
 	}
 	setupInboxListeners() {
-		if (this.federation != null) this.federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(Follow, async (ctx, follow) => {
-			const follower = await validateFollowActivity(ctx, follow);
-			if (!follower || !follower.id) return;
-			if ((await ctx.data.kv.get(["follower", follower.id.href]))?.state === "pending") return;
-			const approved = await this.options.subscriptionHandler(ctx, follower);
-			if (approved) {
-				await ctx.data.kv.set(["follower", follower.id.href], {
-					actor: await follower.toJsonLd(),
-					state: "pending"
-				});
-				await sendFollowResponse(ctx, follow, follower, approved);
-				const relayActorUri = ctx.getActorUri(RELAY_SERVER_ACTOR);
-				await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new Follow({
-					actor: relayActorUri,
-					object: follower.id,
-					to: follower.id
-				}));
-			} else await sendFollowResponse(ctx, follow, follower, approved);
-		}).on(Accept, async (ctx, accept) => {
+		return super.setupInboxListeners().on(Accept, async (ctx, accept) => {
 			const follow = await accept.getObject({
 				crossOrigin: "trust",
 				...ctx
@@ -327,18 +353,19 @@ var LitePubRelay = class extends BaseRelay {
 			if (!(follow instanceof Follow)) return;
 			const relayActorId = follow.actorId;
 			if (relayActorId == null) return;
-			const followerActor = await accept.getActor();
+			const followerActor = await accept.getActor(ctx);
 			if (!isActor(followerActor) || !followerActor.id) return;
 			const parsed = ctx.parseUri(relayActorId);
 			if (parsed == null || parsed.type !== "actor") return;
 			const followerData = await ctx.data.kv.get(["follower", followerActor.id.href]);
-			if (followerData == null) return;
+			if (!isRelayFollowerData(followerData)) return;
+			if (await parseRelayFollowerData(followerActor.id.href, followerData) == null) return;
 			const updatedFollowerData = {
 				...followerData,
 				state: "accepted"
 			};
 			await ctx.data.kv.set(["follower", followerActor.id.href], updatedFollowerData);
-		}).on(Undo, async (ctx, undo) => await handleUndoFollow(ctx, undo, logger$1)).on(Create, async (ctx, create) => await this.#announceToFollowers(ctx, create)).on(Update, async (ctx, update) => await this.#announceToFollowers(ctx, update)).on(Move, async (ctx, move) => await this.#announceToFollowers(ctx, move)).on(Delete, async (ctx, deleteActivity) => await this.#announceToFollowers(ctx, deleteActivity)).on(Announce, async (ctx, announce) => await this.#announceToFollowers(ctx, announce));
+		});
 	}
 };
 //#endregion
@@ -356,27 +383,15 @@ const logger = getLogger([
 * @since 2.0.0
 */
 var MastodonRelay = class extends BaseRelay {
-	async #forwardToFollowers(ctx, activity) {
-		const sender = await activity.getActor(ctx);
-		const excludeBaseUris = sender?.id ? [new URL(sender.id)] : [];
+	initialFollowerState = "accepted";
+	logger = logger;
+	async deliverActivity(ctx, _activity, excludeBaseUris) {
 		await ctx.forwardActivity({ identifier: RELAY_SERVER_ACTOR }, "followers", {
 			skipIfUnsigned: true,
 			excludeBaseUris,
 			preferSharedInbox: true
 		});
 	}
-	setupInboxListeners() {
-		if (this.federation != null) this.federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(Follow, async (ctx, follow) => {
-			const follower = await validateFollowActivity(ctx, follow);
-			if (!follower || !follower.id) return;
-			const approved = await this.options.subscriptionHandler(ctx, follower);
-			if (approved) await ctx.data.kv.set(["follower", follower.id.href], {
-				actor: await follower.toJsonLd(),
-				state: "accepted"
-			});
-			await sendFollowResponse(ctx, follow, follower, approved);
-		}).on(Undo, async (ctx, undo) => await handleUndoFollow(ctx, undo, logger)).on(Create, async (ctx, create) => await this.#forwardToFollowers(ctx, create)).on(Delete, async (ctx, deleteActivity) => await this.#forwardToFollowers(ctx, deleteActivity)).on(Move, async (ctx, move) => await this.#forwardToFollowers(ctx, move)).on(Update, async (ctx, update) => await this.#forwardToFollowers(ctx, update)).on(Announce, async (ctx, announce) => await this.#forwardToFollowers(ctx, announce));
-	}
 };
 //#endregion
 //#region src/factory.ts

package/dist/{types-CZvP2qE2.js → types-BDWJ2_j0.js}

@@ -1,6 +1,7 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
+import "@fedify/vocab";
 //#region src/types.ts
 /**
 * Type predicate to check if a value is valid RelayFollowerData from KV store.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/relay",
-  "version": "2.4.0-dev.1794+c3923792",
+  "version": "2.4.0-dev.1797+6c3f0b36",
   "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.1794+c3923792",
-    "@fedify/vocab": "2.4.0-dev.1794+c3923792"
+    "@fedify/fedify": "^2.4.0-dev.1797+6c3f0b36",
+    "@fedify/vocab": "2.4.0-dev.1797+6c3f0b36"
   },
   "devDependencies": {
     "tsdown": "^0.22.0",
     "typescript": "^6.0.0",
     "urlpattern-polyfill": "^10.1.0",
-    "@fedify/vocab-runtime": "^2.4.0-dev.1794+c3923792"
+    "@fedify/vocab-runtime": "^2.4.0-dev.1797+6c3f0b36"
   },
   "scripts": {
     "build:self": "tsdown",