@fedify/relay 2.0.0-dev.150 → 2.0.0-dev.159

package/dist/mod.cjs

@@ -25,7 +25,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 //#endregion
 const __fedify_fedify = __toESM(require("@fedify/fedify"));
-const __fedify_fedify_vocab = __toESM(require("@fedify/fedify/vocab"));
+const __fedify_vocab = __toESM(require("@fedify/vocab"));
 const __logtape_logtape = __toESM(require("@logtape/logtape"));
 
 //#region src/types.ts
@@ -50,7 +50,7 @@ const relayBuilder = (0, __fedify_fedify.createFederationBuilder)();
 relayBuilder.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({
+	return new __fedify_vocab.Application({
 		id: ctx.getActorUri(identifier),
 		preferredUsername: identifier,
 		name: ctx.data.name ?? "ActivityPub Relay",
@@ -109,8 +109,8 @@ async function getFollowerActors(ctx) {
 	for await (const { value } of ctx.data.kv.list(["follower"])) {
 		if (!isRelayFollowerData(value)) continue;
 		if (value.state !== "accepted") continue;
-		const actor = await __fedify_fedify_vocab.Object.fromJsonLd(value.actor);
-		if (!(0, __fedify_fedify_vocab.isActor)(actor)) continue;
+		const actor = await __fedify_vocab.Object.fromJsonLd(value.actor);
+		if (!(0, __fedify_vocab.isActor)(actor)) continue;
 		actors.push(actor);
 	}
 	return actors;
@@ -153,8 +153,8 @@ var BaseRelay = class {
 	*/
 	async parseFollowerData(actorId, data) {
 		if (!isRelayFollowerData(data)) return null;
-		const actor = await __fedify_fedify_vocab.Object.fromJsonLd(data.actor);
-		if (!(0, __fedify_fedify_vocab.isActor)(actor)) return null;
+		const actor = await __fedify_vocab.Object.fromJsonLd(data.actor);
+		if (!(0, __fedify_vocab.isActor)(actor)) return null;
 		return {
 			actorId,
 			actor,
@@ -277,7 +277,7 @@ async function validateFollowActivity(ctx, follow) {
 */
 async function sendFollowResponse(ctx, follow, follower, approved) {
 	const relayActorUri = ctx.getActorUri(RELAY_SERVER_ACTOR);
-	const Activity = approved ? __fedify_fedify.Accept : __fedify_fedify.Reject;
+	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),
@@ -298,7 +298,7 @@ async function handleUndoFollow(ctx, undo, logger$2) {
 		crossOrigin: "trust",
 		...ctx
 	});
-	if (activity instanceof __fedify_fedify.Follow) {
+	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$2.warn("Unsupported object type ({type}) for Undo activity: {object}", {
@@ -325,11 +325,11 @@ var LitePubRelay = class extends BaseRelay {
 	async #announceToFollowers(ctx, activity) {
 		const sender = await activity.getActor(ctx);
 		const excludeBaseUris = sender?.id ? [new URL(sender.id)] : [];
-		const announce = new __fedify_fedify.Announce({
+		const announce = new __fedify_vocab.Announce({
 			id: new URL(`/announce#${crypto.randomUUID()}`, ctx.origin),
 			actor: ctx.getActorUri(RELAY_SERVER_ACTOR),
 			object: activity.objectId,
-			to: __fedify_fedify.PUBLIC_COLLECTION,
+			to: __fedify_vocab.PUBLIC_COLLECTION,
 			published: Temporal.Now.instant()
 		});
 		await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, "followers", announce, {
@@ -338,7 +338,7 @@ var LitePubRelay = class extends BaseRelay {
 		});
 	}
 	setupInboxListeners() {
-		if (this.federation != null) this.federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(__fedify_fedify.Follow, async (ctx, follow) => {
+		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 existingFollow = await ctx.data.kv.get(["follower", follower.id.href]);
@@ -351,22 +351,22 @@ var LitePubRelay = class extends BaseRelay {
 				});
 				await sendFollowResponse(ctx, follow, follower, approved);
 				const relayActorUri = ctx.getActorUri(RELAY_SERVER_ACTOR);
-				await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, follower, new __fedify_fedify.Follow({
+				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_fedify.Accept, async (ctx, accept) => {
+		}).on(__fedify_vocab.Accept, async (ctx, accept) => {
 			const follow = await accept.getObject({
 				crossOrigin: "trust",
 				...ctx
 			});
-			if (!(follow instanceof __fedify_fedify.Follow)) return;
+			if (!(follow instanceof __fedify_vocab.Follow)) return;
 			const relayActorId = follow.actorId;
 			if (relayActorId == null) return;
 			const followerActor = await accept.getActor();
-			if (!(0, __fedify_fedify.isActor)(followerActor) || !followerActor.id) return;
+			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]);
@@ -376,7 +376,7 @@ var LitePubRelay = class extends BaseRelay {
 				state: "accepted"
 			};
 			await ctx.data.kv.set(["follower", followerActor.id.href], updatedFollowerData);
-		}).on(__fedify_fedify.Undo, async (ctx, undo) => await handleUndoFollow(ctx, undo, logger$1)).on(__fedify_fedify.Create, async (ctx, create) => await this.#announceToFollowers(ctx, create)).on(__fedify_fedify.Update, async (ctx, update) => await this.#announceToFollowers(ctx, update)).on(__fedify_fedify.Move, async (ctx, move) => await this.#announceToFollowers(ctx, move)).on(__fedify_fedify.Delete, async (ctx, deleteActivity) => await this.#announceToFollowers(ctx, deleteActivity)).on(__fedify_fedify.Announce, async (ctx, announce) => await this.#announceToFollowers(ctx, announce));
+		}).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));
 	}
 };
 
@@ -405,7 +405,7 @@ var MastodonRelay = class extends BaseRelay {
 		});
 	}
 	setupInboxListeners() {
-		if (this.federation != null) this.federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(__fedify_fedify.Follow, async (ctx, follow) => {
+		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);
@@ -414,7 +414,7 @@ var MastodonRelay = class extends BaseRelay {
 				state: "accepted"
 			});
 			await sendFollowResponse(ctx, follow, follower, approved);
-		}).on(__fedify_fedify.Undo, async (ctx, undo) => await handleUndoFollow(ctx, undo, logger)).on(__fedify_fedify.Create, async (ctx, create) => await this.#forwardToFollowers(ctx, create)).on(__fedify_fedify.Delete, async (ctx, deleteActivity) => await this.#forwardToFollowers(ctx, deleteActivity)).on(__fedify_fedify.Move, async (ctx, move) => await this.#forwardToFollowers(ctx, move)).on(__fedify_fedify.Update, async (ctx, update) => await this.#forwardToFollowers(ctx, update)).on(__fedify_fedify.Announce, async (ctx, announce) => await this.#forwardToFollowers(ctx, announce));
+		}).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));
 	}
 };
 

package/dist/mod.d.cts

@@ -1,5 +1,5 @@
 import { Context, KvStore, MessageQueue } from "@fedify/fedify";
-import { Actor } from "@fedify/fedify/vocab";
+import { Actor } from "@fedify/vocab";
 import { AuthenticatedDocumentLoaderFactory, DocumentLoaderFactory } from "@fedify/vocab-runtime";
 
 //#region src/types.d.ts

package/dist/mod.d.ts

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { Context, KvStore, MessageQueue } from "@fedify/fedify";
-import { Actor } from "@fedify/fedify/vocab";
+import { Actor } from "@fedify/vocab";
 import { AuthenticatedDocumentLoaderFactory, DocumentLoaderFactory } from "@fedify/vocab-runtime";
 
 //#region src/types.d.ts

package/dist/mod.js

@@ -1,8 +1,8 @@
 
         import { Temporal } from "@js-temporal/polyfill";
       
-import { Accept, Announce, Create, Delete, Follow, Move, PUBLIC_COLLECTION, Reject, Undo, Update, createFederationBuilder, exportJwk, generateCryptoKeyPair, importJwk, isActor } from "@fedify/fedify";
-import { Application, Object as Object$1, isActor as isActor$1 } from "@fedify/fedify/vocab";
+import { createFederationBuilder, exportJwk, generateCryptoKeyPair, importJwk } from "@fedify/fedify";
+import { Accept, Announce, Application, Create, Delete, Follow, Move, Object as Object$1, PUBLIC_COLLECTION, Reject, Undo, Update, isActor } from "@fedify/vocab";
 import { getLogger } from "@logtape/logtape";
 
 //#region src/types.ts
@@ -87,7 +87,7 @@ async function getFollowerActors(ctx) {
 		if (!isRelayFollowerData(value)) continue;
 		if (value.state !== "accepted") continue;
 		const actor = await Object$1.fromJsonLd(value.actor);
-		if (!isActor$1(actor)) continue;
+		if (!isActor(actor)) continue;
 		actors.push(actor);
 	}
 	return actors;
@@ -131,7 +131,7 @@ var BaseRelay = class {
 	async parseFollowerData(actorId, data) {
 		if (!isRelayFollowerData(data)) return null;
 		const actor = await Object$1.fromJsonLd(data.actor);
-		if (!isActor$1(actor)) return null;
+		if (!isActor(actor)) return null;
 		return {
 			actorId,
 			actor,