@fedify/relay 2.2.0-dev.613 → 2.2.0-dev.622

package/dist/mod.js

@@ -1,10 +1,7 @@
-
-        import { Temporal } from "@js-temporal/polyfill";
-      
+import { Temporal } from "@js-temporal/polyfill";
 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
 const RELAY_SERVER_ACTOR = "relay";
 /**
@@ -20,12 +17,11 @@ function isRelayFollowerData(value) {
 	const obj = value;
 	return "actor" in obj && "state" in obj && typeof obj.state === "string" && (obj.state === "pending" || obj.state === "accepted");
 }
-
 //#endregion
 //#region src/builder.ts
 const relayBuilder = createFederationBuilder();
 relayBuilder.setActorDispatcher("/users/{identifier}", async (ctx, identifier) => {
-	if (identifier !== RELAY_SERVER_ACTOR) return null;
+	if (identifier !== "relay") return null;
 	const keys = await ctx.getActorKeyPairs(identifier);
 	return new Application({
 		id: ctx.getActorUri(identifier),
@@ -39,7 +35,7 @@ relayBuilder.setActorDispatcher("/users/{identifier}", async (ctx, identifier) =
 		assertionMethods: keys.map((k) => k.multikey)
 	});
 }).setKeyPairsDispatcher(async (ctx, identifier) => {
-	if (identifier !== RELAY_SERVER_ACTOR) return [];
+	if (identifier !== "relay") return [];
 	const rsaPairJson = await ctx.data.kv.get([
 		"keypair",
 		"rsa",
@@ -51,35 +47,33 @@ relayBuilder.setActorDispatcher("/users/{identifier}", async (ctx, identifier) =
 		identifier
 	]);
 	if (rsaPairJson == null || ed25519PairJson == null) {
-		const rsaPair$1 = await generateCryptoKeyPair("RSASSA-PKCS1-v1_5");
-		const ed25519Pair$1 = await generateCryptoKeyPair("Ed25519");
+		const rsaPair = await generateCryptoKeyPair("RSASSA-PKCS1-v1_5");
+		const ed25519Pair = await generateCryptoKeyPair("Ed25519");
 		await ctx.data.kv.set([
 			"keypair",
 			"rsa",
 			identifier
 		], {
-			privateKey: await exportJwk(rsaPair$1.privateKey),
-			publicKey: await exportJwk(rsaPair$1.publicKey)
+			privateKey: await exportJwk(rsaPair.privateKey),
+			publicKey: await exportJwk(rsaPair.publicKey)
 		});
 		await ctx.data.kv.set([
 			"keypair",
 			"ed25519",
 			identifier
 		], {
-			privateKey: await exportJwk(ed25519Pair$1.privateKey),
-			publicKey: await exportJwk(ed25519Pair$1.publicKey)
+			privateKey: await exportJwk(ed25519Pair.privateKey),
+			publicKey: await exportJwk(ed25519Pair.publicKey)
 		});
-		return [rsaPair$1, ed25519Pair$1];
+		return [rsaPair, ed25519Pair];
 	}
-	const rsaPair = {
+	return [{
 		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];
+	}];
 });
 async function getFollowerActors(ctx) {
 	const actors = [];
@@ -93,13 +87,11 @@ async function getFollowerActors(ctx) {
 	return actors;
 }
 async function dispatchRelayActors(ctx, identifier) {
-	if (identifier !== RELAY_SERVER_ACTOR) return null;
-	const actors = await getFollowerActors(ctx);
-	return { items: actors };
+	if (identifier !== "relay") return null;
+	return { items: await getFollowerActors(ctx) };
 }
 relayBuilder.setFollowersDispatcher("/users/{identifier}/followers", dispatchRelayActors);
 relayBuilder.setFollowingDispatcher("/users/{identifier}/following", dispatchRelayActors);
-
 //#endregion
 //#region src/base.ts
 /**
@@ -112,9 +104,9 @@ var BaseRelay = class {
 	federationBuilder;
 	options;
 	federation;
-	constructor(options, relayBuilder$1) {
+	constructor(options, relayBuilder) {
 		this.options = options;
-		this.federationBuilder = relayBuilder$1;
+		this.federationBuilder = relayBuilder;
 	}
 	async fetch(request) {
 		return await (await this.#getFederation()).fetch(request, { contextData: this.options });
@@ -211,19 +203,15 @@ var BaseRelay = class {
 		return this.federation;
 	}
 	async #createContext() {
-		const context = (await this.#getFederation()).createContext(new URL(this.options.origin), this.options);
-		return context;
+		return (await this.#getFederation()).createContext(new URL(this.options.origin), this.options);
 	}
 	async getActorUri() {
-		const context = await this.#createContext();
-		return context.getActorUri(RELAY_SERVER_ACTOR);
+		return (await this.#createContext()).getActorUri(RELAY_SERVER_ACTOR);
 	}
 	async getSharedInboxUri() {
-		const context = await this.#createContext();
-		return context.getInboxUri();
+		return (await this.#createContext()).getInboxUri();
 	}
 };
-
 //#endregion
 //#region src/follow.ts
 /**
@@ -237,8 +225,7 @@ var BaseRelay = class {
 async function validateFollowActivity(ctx, follow) {
 	if (follow.id == null || follow.objectId == null) return null;
 	const parsed = ctx.parseUri(follow.objectId);
-	const isPublicFollow = follow.objectId.href === "https://www.w3.org/ns/activitystreams#Public";
-	if (!isPublicFollow && parsed?.type !== "actor") return null;
+	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;
@@ -270,7 +257,7 @@ async function sendFollowResponse(ctx, follow, follower, approved) {
 * @param undo The Undo activity to handle
 * @param logger The logger instance to use for warnings
 */
-async function handleUndoFollow(ctx, undo, logger$2) {
+async function handleUndoFollow(ctx, undo, logger) {
 	const activity = await undo.getObject({
 		crossOrigin: "trust",
 		...ctx
@@ -278,12 +265,11 @@ async function handleUndoFollow(ctx, undo, logger$2) {
 	if (activity instanceof 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}", {
+	} 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([
@@ -318,8 +304,7 @@ var LitePubRelay = class extends BaseRelay {
 		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 existingFollow = await ctx.data.kv.get(["follower", follower.id.href]);
-			if (existingFollow?.state === "pending") 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], {
@@ -356,7 +341,6 @@ var LitePubRelay = class extends BaseRelay {
 		}).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
 //#region src/mastodon.ts
 const logger = getLogger([
@@ -394,7 +378,6 @@ var MastodonRelay = class extends BaseRelay {
 		}).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
 /**
@@ -424,6 +407,5 @@ function createRelay(type, options) {
 		case "litepub": return new LitePubRelay(options, relayBuilder);
 	}
 }
-
 //#endregion
-export { RELAY_SERVER_ACTOR, createRelay };
+export { RELAY_SERVER_ACTOR, createRelay };