@fedify/relay 2.0.0-pr.471.1 → 2.0.0-pr.471.1920

package/dist/mod.cjs

@@ -120,21 +120,21 @@ var MastodonRelay = class {
 			const isPublicFollow = follow.objectId.href === "https://www.w3.org/ns/activitystreams#Public";
 			if (!isPublicFollow && parsed?.type !== "actor") return;
 			const relayActorUri = ctx.getActorUri(RELAY_SERVER_ACTOR);
-			const recipient = await follow.getActor(ctx);
-			if (recipient == null || recipient.id == null || recipient.preferredUsername == null || recipient.inboxId == null) return;
+			const follower = await follow.getActor(ctx);
+			if (follower == null || follower.id == null || follower.preferredUsername == null || follower.inboxId == null) return;
 			let approved = false;
-			if (this.#subscriptionHandler) approved = await this.#subscriptionHandler(ctx, recipient);
+			if (this.#subscriptionHandler) approved = await this.#subscriptionHandler(ctx, follower);
 			if (approved) {
 				const followers = await options.kv.get(["followers"]) ?? [];
 				followers.push(follow.id.href);
 				await options.kv.set(["followers"], followers);
-				await options.kv.set(["follower", follow.id.href], await recipient.toJsonLd());
-				await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, recipient, new __fedify_fedify_vocab.Accept({
+				await options.kv.set(["follower", follow.id.href], await follower.toJsonLd());
+				await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new __fedify_fedify_vocab.Accept({
 					id: new URL(`#accepts`, relayActorUri),
 					actor: relayActorUri,
 					object: follow
 				}));
-			} else await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, recipient, new __fedify_fedify_vocab.Reject({
+			} else await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new __fedify_fedify_vocab.Reject({
 				id: new URL(`#rejects`, relayActorUri),
 				actor: relayActorUri,
 				object: follow
@@ -210,7 +210,222 @@ var LitePubRelay = class {
 	#subscriptionHandler;
 	constructor(options) {
 		this.#options = options;
-		this.#federation = (0, __fedify_fedify.createFederation)({ kv: options.kv });
+		this.#federation = options.federation ?? (0, __fedify_fedify.createFederation)({
+			kv: options.kv,
+			queue: options.queue,
+			documentLoaderFactory: options.documentLoaderFactory,
+			authenticatedDocumentLoaderFactory: options.authenticatedDocumentLoaderFactory
+		});
+		this.#federation.setActorDispatcher("/users/{identifier}", async (ctx, identifier) => {
+			if (identifier !== RELAY_SERVER_ACTOR) return null;
+			const keys = await ctx.getActorKeyPairs(identifier);
+			return new __fedify_fedify_vocab.Application({
+				id: ctx.getActorUri(identifier),
+				preferredUsername: identifier,
+				name: "ActivityPub Relay",
+				summary: "LitePub-compatible ActivityPub relay server",
+				inbox: ctx.getInboxUri(),
+				followers: ctx.getFollowersUri(identifier),
+				following: ctx.getFollowingUri(identifier),
+				url: ctx.getActorUri(identifier),
+				publicKey: keys[0].cryptographicKey,
+				assertionMethods: keys.map((k) => k.multikey)
+			});
+		}).setKeyPairsDispatcher(async (_ctx, identifier) => {
+			if (identifier !== RELAY_SERVER_ACTOR) return [];
+			const rsaPairJson = await options.kv.get([
+				"keypair",
+				"rsa",
+				identifier
+			]);
+			const ed25519PairJson = await options.kv.get([
+				"keypair",
+				"ed25519",
+				identifier
+			]);
+			if (rsaPairJson == null || ed25519PairJson == null) {
+				const rsaPair$1 = await (0, __fedify_fedify.generateCryptoKeyPair)("RSASSA-PKCS1-v1_5");
+				const ed25519Pair$1 = await (0, __fedify_fedify.generateCryptoKeyPair)("Ed25519");
+				await options.kv.set([
+					"keypair",
+					"rsa",
+					identifier
+				], {
+					privateKey: await (0, __fedify_fedify.exportJwk)(rsaPair$1.privateKey),
+					publicKey: await (0, __fedify_fedify.exportJwk)(rsaPair$1.publicKey)
+				});
+				await options.kv.set([
+					"keypair",
+					"ed25519",
+					identifier
+				], {
+					privateKey: await (0, __fedify_fedify.exportJwk)(ed25519Pair$1.privateKey),
+					publicKey: await (0, __fedify_fedify.exportJwk)(ed25519Pair$1.publicKey)
+				});
+				return [rsaPair$1, ed25519Pair$1];
+			}
+			const rsaPair = {
+				privateKey: await (0, __fedify_fedify.importJwk)(rsaPairJson.privateKey, "private"),
+				publicKey: await (0, __fedify_fedify.importJwk)(rsaPairJson.publicKey, "public")
+			};
+			const ed25519Pair = {
+				privateKey: await (0, __fedify_fedify.importJwk)(ed25519PairJson.privateKey, "private"),
+				publicKey: await (0, __fedify_fedify.importJwk)(ed25519PairJson.publicKey, "public")
+			};
+			return [rsaPair, ed25519Pair];
+		});
+		this.#federation.setFollowingDispatcher("/users/{identifier}/following", (_ctx, _identifier) => {
+			return { items: [] };
+		}).setCounter((_ctx, _identifier) => 0);
+		this.#federation.setFollowersDispatcher("/users/{identifier}/followers", async (_ctx, identifier) => {
+			if (identifier !== RELAY_SERVER_ACTOR) return null;
+			const followers = await options.kv.get(["followers"]) ?? [];
+			const actors = [];
+			for (const followerId of followers) {
+				const follower = await options.kv.get(["follower", followerId]);
+				if (!follower) continue;
+				const actor = await __fedify_fedify_vocab.Object.fromJsonLd(follower.actor);
+				if (!(0, __fedify_fedify_vocab.isActor)(actor)) continue;
+				actors.push(actor);
+			}
+			return { items: actors };
+		});
+		this.#federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(__fedify_fedify_vocab.Follow, async (ctx, follow) => {
+			if (follow.id == null || follow.objectId == null) return;
+			const parsed = ctx.parseUri(follow.objectId);
+			const isPublicFollow = follow.objectId.href === "https://www.w3.org/ns/activitystreams#Public";
+			if (!isPublicFollow && parsed?.type !== "actor") return;
+			const relayActorUri = ctx.getActorUri(RELAY_SERVER_ACTOR);
+			const follower = await follow.getActor(ctx);
+			if (follower == null || follower.id == null || follower.preferredUsername == null || follower.inboxId == null) return;
+			const existingFollow = await options.kv.get(["follower", follower.id.href]);
+			if (existingFollow?.state === "pending") return;
+			let subscriptionApproved = false;
+			if (this.#subscriptionHandler) subscriptionApproved = await this.#subscriptionHandler(ctx, follower);
+			if (subscriptionApproved) {
+				await options.kv.set(["follower", follower.id.href], {
+					"actor": await follower.toJsonLd(),
+					"state": "pending"
+				});
+				await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new __fedify_fedify_vocab.Accept({
+					id: new URL(`#accepts`, relayActorUri),
+					actor: relayActorUri,
+					object: follow
+				}));
+				await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new __fedify_fedify_vocab.Follow({
+					actor: relayActorUri,
+					object: follower.id,
+					to: follower.id
+				}));
+			} else await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new __fedify_fedify_vocab.Reject({
+				id: new URL(`#rejects`, relayActorUri),
+				actor: relayActorUri,
+				object: follow
+			}));
+		}).on(__fedify_fedify_vocab.Accept, async (ctx, accept) => {
+			const follow = await accept.getObject({
+				crossOrigin: "trust",
+				...ctx
+			});
+			if (!(follow instanceof __fedify_fedify_vocab.Follow)) return;
+			const follower = follow.actorId;
+			if (follower == null) return;
+			const following = await accept.getActor();
+			if (!(0, __fedify_fedify_vocab.isActor)(following) || !following.id) return;
+			const parsed = ctx.parseUri(follower);
+			if (parsed == null || parsed.type !== "actor") return;
+			const followerData = await options.kv.get(["follower", following.id.href]);
+			if (followerData == null) return;
+			const updatedFollowerData = {
+				...followerData,
+				status: "accepted"
+			};
+			await options.kv.set(["follower", following.id.href], updatedFollowerData);
+			const followers = await options.kv.get(["followers"]) ?? [];
+			followers.push(following.id.href);
+			await options.kv.set(["followers"], followers);
+		}).on(__fedify_fedify_vocab.Undo, async (ctx, undo) => {
+			const activity = await undo.getObject({
+				crossOrigin: "trust",
+				...ctx
+			});
+			if (activity instanceof __fedify_fedify_vocab.Follow) {
+				if (activity.id == null || activity.actorId == null) return;
+				const followers = await options.kv.get(["followers"]) ?? [];
+				const updatedFollowers = followers.filter((id) => id !== activity.actorId?.href);
+				await options.kv.set(["followers"], updatedFollowers);
+				options.kv.delete(["follower", activity.actorId?.href]);
+			} else console.warn("Unsupported object type ({type}) for Undo activity: {object}", {
+				type: activity?.constructor.name,
+				object: activity
+			});
+		}).on(__fedify_fedify_vocab.Create, async (ctx, create) => {
+			const sender = await create.getActor(ctx);
+			const excludeBaseUris = sender?.id ? [new URL(sender.id)] : [];
+			const announce = new __fedify_fedify_vocab.Announce({
+				id: new URL(`/announce#${crypto.randomUUID()}`, ctx.origin),
+				actor: ctx.getActorUri(RELAY_SERVER_ACTOR),
+				object: create.objectId,
+				to: __fedify_fedify_vocab.PUBLIC_COLLECTION,
+				published: Temporal.Now.instant()
+			});
+			await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, "followers", announce, {
+				excludeBaseUris,
+				preferSharedInbox: true
+			});
+		}).on(__fedify_fedify_vocab.Update, async (ctx, update) => {
+			const sender = await update.getActor(ctx);
+			const excludeBaseUris = sender?.id ? [new URL(sender.id)] : [];
+			const announce = new __fedify_fedify_vocab.Announce({
+				id: new URL(`/announce#${crypto.randomUUID()}`, ctx.origin),
+				actor: ctx.getActorUri(RELAY_SERVER_ACTOR),
+				object: update.objectId,
+				to: __fedify_fedify_vocab.PUBLIC_COLLECTION
+			});
+			await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, "followers", announce, {
+				excludeBaseUris,
+				preferSharedInbox: true
+			});
+		}).on(__fedify_fedify_vocab.Move, async (ctx, move) => {
+			const sender = await move.getActor(ctx);
+			const excludeBaseUris = sender?.id ? [new URL(sender.id)] : [];
+			const announce = new __fedify_fedify_vocab.Announce({
+				id: new URL(`/announce#${crypto.randomUUID()}`, ctx.origin),
+				actor: ctx.getActorUri(RELAY_SERVER_ACTOR),
+				object: move.objectId,
+				to: __fedify_fedify_vocab.PUBLIC_COLLECTION
+			});
+			await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, "followers", announce, {
+				excludeBaseUris,
+				preferSharedInbox: true
+			});
+		}).on(__fedify_fedify_vocab.Delete, async (ctx, deleteActivity) => {
+			const sender = await deleteActivity.getActor(ctx);
+			const excludeBaseUris = sender?.id ? [new URL(sender.id)] : [];
+			const announce = new __fedify_fedify_vocab.Announce({
+				id: new URL(`/announce#${crypto.randomUUID()}`, ctx.origin),
+				actor: ctx.getActorUri(RELAY_SERVER_ACTOR),
+				object: deleteActivity.objectId,
+				to: __fedify_fedify_vocab.PUBLIC_COLLECTION
+			});
+			await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, "followers", announce, {
+				excludeBaseUris,
+				preferSharedInbox: true
+			});
+		}).on(__fedify_fedify_vocab.Announce, async (ctx, announceActivity) => {
+			const sender = await announceActivity.getActor(ctx);
+			const excludeBaseUris = sender?.id ? [new URL(sender.id)] : [];
+			const announce = new __fedify_fedify_vocab.Announce({
+				id: new URL(`/announce#${crypto.randomUUID()}`, ctx.origin),
+				actor: ctx.getActorUri(RELAY_SERVER_ACTOR),
+				object: announceActivity.objectId,
+				to: __fedify_fedify_vocab.PUBLIC_COLLECTION
+			});
+			await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, "followers", announce, {
+				excludeBaseUris,
+				preferSharedInbox: true
+			});
+		});
 	}
 	get domain() {
 		return this.#options.domain || "localhost";

package/dist/mod.js

@@ -1,5 +1,5 @@
 import { createFederation, exportJwk, generateCryptoKeyPair, importJwk } from "@fedify/fedify";
-import { Accept, Create, Delete, Follow, Move, Object as Object$1, Reject, Service, Undo, Update, isActor } from "@fedify/fedify/vocab";
+import { Accept, Announce, Application, Create, Delete, Follow, Move, Object as Object$1, PUBLIC_COLLECTION, Reject, Service, Undo, Update, isActor } from "@fedify/fedify/vocab";
 
 //#region src/relay.ts
 const RELAY_SERVER_ACTOR = "relay";
@@ -97,21 +97,21 @@ var MastodonRelay = class {
 			const isPublicFollow = follow.objectId.href === "https://www.w3.org/ns/activitystreams#Public";
 			if (!isPublicFollow && parsed?.type !== "actor") return;
 			const relayActorUri = ctx.getActorUri(RELAY_SERVER_ACTOR);
-			const recipient = await follow.getActor(ctx);
-			if (recipient == null || recipient.id == null || recipient.preferredUsername == null || recipient.inboxId == null) return;
+			const follower = await follow.getActor(ctx);
+			if (follower == null || follower.id == null || follower.preferredUsername == null || follower.inboxId == null) return;
 			let approved = false;
-			if (this.#subscriptionHandler) approved = await this.#subscriptionHandler(ctx, recipient);
+			if (this.#subscriptionHandler) approved = await this.#subscriptionHandler(ctx, follower);
 			if (approved) {
 				const followers = await options.kv.get(["followers"]) ?? [];
 				followers.push(follow.id.href);
 				await options.kv.set(["followers"], followers);
-				await options.kv.set(["follower", follow.id.href], await recipient.toJsonLd());
-				await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, recipient, new Accept({
+				await options.kv.set(["follower", follow.id.href], await follower.toJsonLd());
+				await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new Accept({
 					id: new URL(`#accepts`, relayActorUri),
 					actor: relayActorUri,
 					object: follow
 				}));
-			} else await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, recipient, new Reject({
+			} else await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new Reject({
 				id: new URL(`#rejects`, relayActorUri),
 				actor: relayActorUri,
 				object: follow
@@ -187,7 +187,222 @@ var LitePubRelay = class {
 	#subscriptionHandler;
 	constructor(options) {
 		this.#options = options;
-		this.#federation = createFederation({ kv: options.kv });
+		this.#federation = options.federation ?? createFederation({
+			kv: options.kv,
+			queue: options.queue,
+			documentLoaderFactory: options.documentLoaderFactory,
+			authenticatedDocumentLoaderFactory: options.authenticatedDocumentLoaderFactory
+		});
+		this.#federation.setActorDispatcher("/users/{identifier}", async (ctx, identifier) => {
+			if (identifier !== RELAY_SERVER_ACTOR) return null;
+			const keys = await ctx.getActorKeyPairs(identifier);
+			return new Application({
+				id: ctx.getActorUri(identifier),
+				preferredUsername: identifier,
+				name: "ActivityPub Relay",
+				summary: "LitePub-compatible ActivityPub relay server",
+				inbox: ctx.getInboxUri(),
+				followers: ctx.getFollowersUri(identifier),
+				following: ctx.getFollowingUri(identifier),
+				url: ctx.getActorUri(identifier),
+				publicKey: keys[0].cryptographicKey,
+				assertionMethods: keys.map((k) => k.multikey)
+			});
+		}).setKeyPairsDispatcher(async (_ctx, identifier) => {
+			if (identifier !== RELAY_SERVER_ACTOR) return [];
+			const rsaPairJson = await options.kv.get([
+				"keypair",
+				"rsa",
+				identifier
+			]);
+			const ed25519PairJson = await options.kv.get([
+				"keypair",
+				"ed25519",
+				identifier
+			]);
+			if (rsaPairJson == null || ed25519PairJson == null) {
+				const rsaPair$1 = await generateCryptoKeyPair("RSASSA-PKCS1-v1_5");
+				const ed25519Pair$1 = await generateCryptoKeyPair("Ed25519");
+				await options.kv.set([
+					"keypair",
+					"rsa",
+					identifier
+				], {
+					privateKey: await exportJwk(rsaPair$1.privateKey),
+					publicKey: await exportJwk(rsaPair$1.publicKey)
+				});
+				await options.kv.set([
+					"keypair",
+					"ed25519",
+					identifier
+				], {
+					privateKey: await exportJwk(ed25519Pair$1.privateKey),
+					publicKey: await exportJwk(ed25519Pair$1.publicKey)
+				});
+				return [rsaPair$1, ed25519Pair$1];
+			}
+			const rsaPair = {
+				privateKey: await importJwk(rsaPairJson.privateKey, "private"),
+				publicKey: await importJwk(rsaPairJson.publicKey, "public")
+			};
+			const ed25519Pair = {
+				privateKey: await importJwk(ed25519PairJson.privateKey, "private"),
+				publicKey: await importJwk(ed25519PairJson.publicKey, "public")
+			};
+			return [rsaPair, ed25519Pair];
+		});
+		this.#federation.setFollowingDispatcher("/users/{identifier}/following", (_ctx, _identifier) => {
+			return { items: [] };
+		}).setCounter((_ctx, _identifier) => 0);
+		this.#federation.setFollowersDispatcher("/users/{identifier}/followers", async (_ctx, identifier) => {
+			if (identifier !== RELAY_SERVER_ACTOR) return null;
+			const followers = await options.kv.get(["followers"]) ?? [];
+			const actors = [];
+			for (const followerId of followers) {
+				const follower = await options.kv.get(["follower", followerId]);
+				if (!follower) continue;
+				const actor = await Object$1.fromJsonLd(follower.actor);
+				if (!isActor(actor)) continue;
+				actors.push(actor);
+			}
+			return { items: actors };
+		});
+		this.#federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(Follow, async (ctx, follow) => {
+			if (follow.id == null || follow.objectId == null) return;
+			const parsed = ctx.parseUri(follow.objectId);
+			const isPublicFollow = follow.objectId.href === "https://www.w3.org/ns/activitystreams#Public";
+			if (!isPublicFollow && parsed?.type !== "actor") return;
+			const relayActorUri = ctx.getActorUri(RELAY_SERVER_ACTOR);
+			const follower = await follow.getActor(ctx);
+			if (follower == null || follower.id == null || follower.preferredUsername == null || follower.inboxId == null) return;
+			const existingFollow = await options.kv.get(["follower", follower.id.href]);
+			if (existingFollow?.state === "pending") return;
+			let subscriptionApproved = false;
+			if (this.#subscriptionHandler) subscriptionApproved = await this.#subscriptionHandler(ctx, follower);
+			if (subscriptionApproved) {
+				await options.kv.set(["follower", follower.id.href], {
+					"actor": await follower.toJsonLd(),
+					"state": "pending"
+				});
+				await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new Accept({
+					id: new URL(`#accepts`, relayActorUri),
+					actor: relayActorUri,
+					object: follow
+				}));
+				await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new Follow({
+					actor: relayActorUri,
+					object: follower.id,
+					to: follower.id
+				}));
+			} else await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new Reject({
+				id: new URL(`#rejects`, relayActorUri),
+				actor: relayActorUri,
+				object: follow
+			}));
+		}).on(Accept, async (ctx, accept) => {
+			const follow = await accept.getObject({
+				crossOrigin: "trust",
+				...ctx
+			});
+			if (!(follow instanceof Follow)) return;
+			const follower = follow.actorId;
+			if (follower == null) return;
+			const following = await accept.getActor();
+			if (!isActor(following) || !following.id) return;
+			const parsed = ctx.parseUri(follower);
+			if (parsed == null || parsed.type !== "actor") return;
+			const followerData = await options.kv.get(["follower", following.id.href]);
+			if (followerData == null) return;
+			const updatedFollowerData = {
+				...followerData,
+				status: "accepted"
+			};
+			await options.kv.set(["follower", following.id.href], updatedFollowerData);
+			const followers = await options.kv.get(["followers"]) ?? [];
+			followers.push(following.id.href);
+			await options.kv.set(["followers"], followers);
+		}).on(Undo, async (ctx, undo) => {
+			const activity = await undo.getObject({
+				crossOrigin: "trust",
+				...ctx
+			});
+			if (activity instanceof Follow) {
+				if (activity.id == null || activity.actorId == null) return;
+				const followers = await options.kv.get(["followers"]) ?? [];
+				const updatedFollowers = followers.filter((id) => id !== activity.actorId?.href);
+				await options.kv.set(["followers"], updatedFollowers);
+				options.kv.delete(["follower", activity.actorId?.href]);
+			} else console.warn("Unsupported object type ({type}) for Undo activity: {object}", {
+				type: activity?.constructor.name,
+				object: activity
+			});
+		}).on(Create, async (ctx, create) => {
+			const sender = await create.getActor(ctx);
+			const excludeBaseUris = sender?.id ? [new URL(sender.id)] : [];
+			const announce = new Announce({
+				id: new URL(`/announce#${crypto.randomUUID()}`, ctx.origin),
+				actor: ctx.getActorUri(RELAY_SERVER_ACTOR),
+				object: create.objectId,
+				to: PUBLIC_COLLECTION,
+				published: Temporal.Now.instant()
+			});
+			await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, "followers", announce, {
+				excludeBaseUris,
+				preferSharedInbox: true
+			});
+		}).on(Update, async (ctx, update) => {
+			const sender = await update.getActor(ctx);
+			const excludeBaseUris = sender?.id ? [new URL(sender.id)] : [];
+			const announce = new Announce({
+				id: new URL(`/announce#${crypto.randomUUID()}`, ctx.origin),
+				actor: ctx.getActorUri(RELAY_SERVER_ACTOR),
+				object: update.objectId,
+				to: PUBLIC_COLLECTION
+			});
+			await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, "followers", announce, {
+				excludeBaseUris,
+				preferSharedInbox: true
+			});
+		}).on(Move, async (ctx, move) => {
+			const sender = await move.getActor(ctx);
+			const excludeBaseUris = sender?.id ? [new URL(sender.id)] : [];
+			const announce = new Announce({
+				id: new URL(`/announce#${crypto.randomUUID()}`, ctx.origin),
+				actor: ctx.getActorUri(RELAY_SERVER_ACTOR),
+				object: move.objectId,
+				to: PUBLIC_COLLECTION
+			});
+			await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, "followers", announce, {
+				excludeBaseUris,
+				preferSharedInbox: true
+			});
+		}).on(Delete, async (ctx, deleteActivity) => {
+			const sender = await deleteActivity.getActor(ctx);
+			const excludeBaseUris = sender?.id ? [new URL(sender.id)] : [];
+			const announce = new Announce({
+				id: new URL(`/announce#${crypto.randomUUID()}`, ctx.origin),
+				actor: ctx.getActorUri(RELAY_SERVER_ACTOR),
+				object: deleteActivity.objectId,
+				to: PUBLIC_COLLECTION
+			});
+			await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, "followers", announce, {
+				excludeBaseUris,
+				preferSharedInbox: true
+			});
+		}).on(Announce, async (ctx, announceActivity) => {
+			const sender = await announceActivity.getActor(ctx);
+			const excludeBaseUris = sender?.id ? [new URL(sender.id)] : [];
+			const announce = new Announce({
+				id: new URL(`/announce#${crypto.randomUUID()}`, ctx.origin),
+				actor: ctx.getActorUri(RELAY_SERVER_ACTOR),
+				object: announceActivity.objectId,
+				to: PUBLIC_COLLECTION
+			});
+			await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, "followers", announce, {
+				excludeBaseUris,
+				preferSharedInbox: true
+			});
+		});
 	}
 	get domain() {
 		return this.#options.domain || "localhost";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/relay",
-  "version": "2.0.0-pr.471.1",
+  "version": "2.0.0-pr.471.1920+38258210",
   "description": "ActivityPub relay support for Fedify",
   "keywords": [
     "Fedify",
@@ -48,17 +48,19 @@
     "package.json"
   ],
   "peerDependencies": {
-    "@fedify/fedify": "^2.0.0-pr.471.1"
+    "@fedify/fedify": "^2.0.0-pr.471.1920+38258210"
   },
   "devDependencies": {
     "tsdown": "^0.12.9",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "@fedify/testing": "^2.0.0-pr.471.1920+38258210",
+    "@fedify/vocab-runtime": "^2.0.0-pr.471.1920+38258210"
   },
   "scripts": {
     "build": "deno task codegen && tsdown",
     "prepublish": "deno task codegen && tsdown",
-    "test": "deno task codegen && tsdown && cd dist/ && node --test",
-    "test:bun": "deno task codegen && deno task pnpm:build-vocab && tsdown && cd dist/ && bun test --timeout 60000",
+    "test": "deno task codegen && tsdown && node --test",
+    "test:bun": "deno task codegen && tsdown && bun test --timeout 60000",
     "test:cfworkers": "deno task codegen && wrangler deploy --dry-run --outdir src/cfworkers && node --import=tsx src/cfworkers/client.ts"
   }
 }