@fedify/relay 2.1.0 → 2.1.2

package/dist/mod.cjs

@@ -1,33 +1,8 @@
-
-        const { Temporal } = require("@js-temporal/polyfill");
-      
-//#region rolldown:runtime
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-		key = keys[i];
-		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-			get: ((k) => from[k]).bind(null, key),
-			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-		});
-	}
-	return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-	value: mod,
-	enumerable: true
-}) : target, mod));
-
-//#endregion
-const __fedify_fedify = __toESM(require("@fedify/fedify"));
-const __fedify_vocab = __toESM(require("@fedify/vocab"));
-const __logtape_logtape = __toESM(require("@logtape/logtape"));
-
+const { Temporal } = require("@js-temporal/polyfill");
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+let _fedify_fedify = require("@fedify/fedify");
+let _fedify_vocab = require("@fedify/vocab");
+let _logtape_logtape = require("@logtape/logtape");
 //#region src/types.ts
 const RELAY_SERVER_ACTOR = "relay";
 /**
@@ -43,14 +18,13 @@ 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 = (0, __fedify_fedify.createFederationBuilder)();
+const relayBuilder = (0, _fedify_fedify.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 __fedify_vocab.Application({
+	return new _fedify_vocab.Application({
 		id: ctx.getActorUri(identifier),
 		preferredUsername: identifier,
 		name: ctx.data.name ?? "ActivityPub Relay",
@@ -62,7 +36,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",
@@ -74,55 +48,51 @@ relayBuilder.setActorDispatcher("/users/{identifier}", async (ctx, identifier) =
 		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");
+		const rsaPair = await (0, _fedify_fedify.generateCryptoKeyPair)("RSASSA-PKCS1-v1_5");
+		const ed25519Pair = await (0, _fedify_fedify.generateCryptoKeyPair)("Ed25519");
 		await ctx.data.kv.set([
 			"keypair",
 			"rsa",
 			identifier
 		], {
-			privateKey: await (0, __fedify_fedify.exportJwk)(rsaPair$1.privateKey),
-			publicKey: await (0, __fedify_fedify.exportJwk)(rsaPair$1.publicKey)
+			privateKey: await (0, _fedify_fedify.exportJwk)(rsaPair.privateKey),
+			publicKey: await (0, _fedify_fedify.exportJwk)(rsaPair.publicKey)
 		});
 		await ctx.data.kv.set([
 			"keypair",
 			"ed25519",
 			identifier
 		], {
-			privateKey: await (0, __fedify_fedify.exportJwk)(ed25519Pair$1.privateKey),
-			publicKey: await (0, __fedify_fedify.exportJwk)(ed25519Pair$1.publicKey)
+			privateKey: await (0, _fedify_fedify.exportJwk)(ed25519Pair.privateKey),
+			publicKey: await (0, _fedify_fedify.exportJwk)(ed25519Pair.publicKey)
 		});
-		return [rsaPair$1, ed25519Pair$1];
+		return [rsaPair, ed25519Pair];
 	}
-	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];
+	return [{
+		privateKey: await (0, _fedify_fedify.importJwk)(rsaPairJson.privateKey, "private"),
+		publicKey: await (0, _fedify_fedify.importJwk)(rsaPairJson.publicKey, "public")
+	}, {
+		privateKey: await (0, _fedify_fedify.importJwk)(ed25519PairJson.privateKey, "private"),
+		publicKey: await (0, _fedify_fedify.importJwk)(ed25519PairJson.publicKey, "public")
+	}];
 });
 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;
+		const actor = await _fedify_vocab.Object.fromJsonLd(value.actor);
+		if (!(0, _fedify_vocab.isActor)(actor)) continue;
 		actors.push(actor);
 	}
 	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
 /**
@@ -135,9 +105,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 });
@@ -153,8 +123,8 @@ var BaseRelay = class {
 	*/
 	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;
+		const actor = await _fedify_vocab.Object.fromJsonLd(data.actor);
+		if (!(0, _fedify_vocab.isActor)(actor)) return null;
 		return {
 			actorId,
 			actor,
@@ -234,19 +204,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
 /**
@@ -260,8 +226,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;
@@ -277,7 +242,7 @@ async function validateFollowActivity(ctx, follow) {
 */
 async function sendFollowResponse(ctx, follow, follower, approved) {
 	const relayActorUri = ctx.getActorUri(RELAY_SERVER_ACTOR);
-	const Activity = approved ? __fedify_vocab.Accept : __fedify_vocab.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),
@@ -293,23 +258,22 @@ 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
 	});
-	if (activity instanceof __fedify_vocab.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}", {
+	} 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 = (0, __logtape_logtape.getLogger)([
+const logger$1 = (0, _logtape_logtape.getLogger)([
 	"fedify",
 	"relay",
 	"litepub"
@@ -325,11 +289,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_vocab.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_vocab.PUBLIC_COLLECTION,
+			to: _fedify_vocab.PUBLIC_COLLECTION,
 			published: Temporal.Now.instant()
 		});
 		await ctx.sendActivity({ identifier: RELAY_SERVER_ACTOR }, "followers", announce, {
@@ -338,11 +302,10 @@ var LitePubRelay = class extends BaseRelay {
 		});
 	}
 	setupInboxListeners() {
-		if (this.federation != null) this.federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(__fedify_vocab.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]);
-			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], {
@@ -351,22 +314,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_vocab.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_vocab.Accept, async (ctx, accept) => {
+		}).on(_fedify_vocab.Accept, async (ctx, accept) => {
 			const follow = await accept.getObject({
 				crossOrigin: "trust",
 				...ctx
 			});
-			if (!(follow instanceof __fedify_vocab.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_vocab.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,13 +339,12 @@ var LitePubRelay = class extends BaseRelay {
 				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));
+		}).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
 //#region src/mastodon.ts
-const logger = (0, __logtape_logtape.getLogger)([
+const logger = (0, _logtape_logtape.getLogger)([
 	"fedify",
 	"relay",
 	"mastodon"
@@ -405,7 +367,7 @@ var MastodonRelay = class extends BaseRelay {
 		});
 	}
 	setupInboxListeners() {
-		if (this.federation != null) this.federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(__fedify_vocab.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,10 +376,9 @@ var MastodonRelay = class extends BaseRelay {
 				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));
+		}).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
 /**
@@ -447,7 +408,6 @@ function createRelay(type, options) {
 		case "litepub": return new LitePubRelay(options, relayBuilder);
 	}
 }
-
 //#endregion
 exports.RELAY_SERVER_ACTOR = RELAY_SERVER_ACTOR;
-exports.createRelay = createRelay;
+exports.createRelay = createRelay;

package/dist/mod.d.cts

@@ -1,7 +1,117 @@
 import { Context, KvStore, MessageQueue } from "@fedify/fedify";
 import { Actor } from "@fedify/vocab";
-import { AuthenticatedDocumentLoaderFactory, DocumentLoaderFactory } from "@fedify/vocab-runtime";
-
+//#region ../vocab-runtime/dist/mod.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;
+}
+/**
+* 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";
 /**
@@ -53,14 +163,6 @@ interface RelayOptions {
   */
   subscriptionHandler: SubscriptionRequestHandler;
 }
-/**
-* Internal storage format for follower data in KV store.
-* Contains JSON-LD representation of the actor.
-* Exported for internal package use but not re-exported from mod.ts.
-*
-* @internal
-*/
-
 /**
 * A follower of the relay with validated Actor instance.
 * This is the public API type returned by follower query methods.
@@ -115,14 +217,6 @@ interface Relay {
   */
   getSharedInboxUri(): Promise<URL>;
 }
-/**
-* Type predicate to check if a value is valid RelayFollowerData from KV store.
-* Validates the storage format (JSON-LD), not the deserialized Actor instance.
-*
-* @param value The value to check
-* @returns true if the value is a RelayFollowerData
-* @internal
-*/
 //#endregion
 //#region src/factory.d.ts
 /**
@@ -148,4 +242,4 @@ interface Relay {
 */
 declare function createRelay(type: RelayType, options: RelayOptions): Relay;
 //#endregion
-export { RELAY_SERVER_ACTOR, Relay, RelayFollower, RelayOptions, RelayType, SubscriptionRequestHandler, createRelay };
+export { RELAY_SERVER_ACTOR, type Relay, type RelayFollower, type RelayOptions, type RelayType, type SubscriptionRequestHandler, createRelay };

package/dist/mod.d.ts

@@ -1,8 +1,118 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { Context, KvStore, MessageQueue } from "@fedify/fedify";
 import { Actor } from "@fedify/vocab";
-import { AuthenticatedDocumentLoaderFactory, DocumentLoaderFactory } from "@fedify/vocab-runtime";
-
+//#region ../vocab-runtime/dist/mod.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;
+}
+/**
+* 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";
 /**
@@ -54,14 +164,6 @@ interface RelayOptions {
   */
   subscriptionHandler: SubscriptionRequestHandler;
 }
-/**
-* Internal storage format for follower data in KV store.
-* Contains JSON-LD representation of the actor.
-* Exported for internal package use but not re-exported from mod.ts.
-*
-* @internal
-*/
-
 /**
 * A follower of the relay with validated Actor instance.
 * This is the public API type returned by follower query methods.
@@ -116,14 +218,6 @@ interface Relay {
   */
   getSharedInboxUri(): Promise<URL>;
 }
-/**
-* Type predicate to check if a value is valid RelayFollowerData from KV store.
-* Validates the storage format (JSON-LD), not the deserialized Actor instance.
-*
-* @param value The value to check
-* @returns true if the value is a RelayFollowerData
-* @internal
-*/
 //#endregion
 //#region src/factory.d.ts
 /**
@@ -149,4 +243,4 @@ interface Relay {
 */
 declare function createRelay(type: RelayType, options: RelayOptions): Relay;
 //#endregion
-export { RELAY_SERVER_ACTOR, Relay, RelayFollower, RelayOptions, RelayType, SubscriptionRequestHandler, createRelay };
+export { RELAY_SERVER_ACTOR, type Relay, type RelayFollower, type RelayOptions, type RelayType, type SubscriptionRequestHandler, createRelay };