@fedify/fedify 2.4.0-dev.2155 → 2.4.0-dev.2159

package/dist/{builder-CxHALSwA.mjs → builder-D89oOfHC.mjs}

@@ -1,7 +1,7 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-YLLbRq06.mjs";
+import { n as version, t as name } from "./deno-CE_s0yQb.mjs";
 import { c as isPortableId, r as getPortableDid, t as getCanonicalPortableId } from "./portable-key-id-Bg259c4Z.mjs";
 import { t as ActivityListenerSet } from "./activity-listener-C-BSbKI7.mjs";
 import { getLogger } from "@logtape/logtape";
@@ -89,7 +89,7 @@ var FederationBuilderImpl = class {
 	* specified.
 	*/
 	async build(options) {
-		const { FederationImpl } = await import("./middleware-BahNnLfD.mjs");
+		const { FederationImpl } = await import("./middleware-DoVWq8mE.mjs");
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();

package/dist/{client-DpnpgjyX.mjs → client-CEnNz8O7.mjs}

@@ -93,8 +93,8 @@ const DEFAULT_MAX_REDIRECTION = 5;
 * bounce the request to an internal address.
 * @param url The URL to fetch.
 * @param headers The request headers.
-* @returns The final response, or `null` if the URL is disallowed or there
-*          are too many redirects.
+* @returns The final response, or `null` if the URL is disallowed, its
+*          hostname cannot be resolved, or there are too many redirects.
 */
 async function fetchPublicUrl(url, headers) {
 	let current = url instanceof URL ? url : new URL(url);
@@ -104,7 +104,11 @@ async function fetchPublicUrl(url, headers) {
 			await validatePublicUrl(current.href);
 		} catch (e) {
 			if (e instanceof UrlError) {
-				logger.error("Refused to fetch a private or invalid URL {url}: {error}", {
+				if (e.reason === "dns") logger.error("DNS lookup failed for {url}: {error}", {
+					url: current.href,
+					error: e
+				});
+				else logger.error("Refused to fetch a private or invalid URL {url}: {error}", {
 					url: current.href,
 					error: e
 				});

package/dist/compat/mod.d.cts

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { Qt as ActivityTransformer, n as Context } from "../context-BMggDR-l.cjs";
+import { $t as ActivityTransformer, n as Context } from "../context-DpsaHkk1.cjs";
 import { Activity } from "@fedify/vocab";
 
 //#region src/compat/transformers.d.ts

package/dist/compat/mod.d.ts

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { Qt as ActivityTransformer, n as Context } from "../context-exYu7gDU.js";
+import { $t as ActivityTransformer, n as Context } from "../context-JDNkUtnu.js";
 import { Activity } from "@fedify/vocab";
 
 //#region src/compat/transformers.d.ts

package/dist/compat/transformers.test.mjs

@@ -5,7 +5,7 @@ import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-mrXWWNY-.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { E as autoIdAssigner, T as actorDehydrator, n as FederationImpl } from "../middleware-DDa8pCUa.mjs";
+import { E as autoIdAssigner, T as actorDehydrator, n as FederationImpl } from "../middleware-Bdwd_Gg8.mjs";
 import { Follow, Person } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
 //#region src/compat/transformers.test.ts

package/dist/{compound-proof-nhrXTRQO.mjs → compound-proof-B02Os8h2.mjs}

@@ -3,8 +3,8 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { c as isPortableId, i as getRawCanonicalPortableId, t as getCanonicalPortableId } from "./portable-key-id-Bg259c4Z.mjs";
 import { n as preloadedOnlyDocumentLoader } from "./public-audience--klBIOk1.mjs";
-import { c as getNormalizationContextLoader } from "./ld-Djxsq6JR.mjs";
-import { l as verifyPortableObjectProofPolicy, n as classifyFep2277CoreType, o as verifyMapLocalProof } from "./proof-vZ04IAjq.mjs";
+import { c as getNormalizationContextLoader } from "./ld-ya2C1Xip.mjs";
+import { l as verifyPortableObjectProofPolicy, n as classifyFep2277CoreType, o as verifyMapLocalProof } from "./proof-BdO3BbLh.mjs";
 import { parseIri, preloadedContexts } from "@fedify/vocab-runtime";
 import jsonld from "@fedify/vocab-runtime/jsonld";
 //#region src/sig/compound-proof.ts

package/dist/{context-OrnjnuMq.mjs → context-B2rlkkyJ.mjs}

@@ -1,7 +1,7 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { t as mockDocumentLoader } from "./dist-BQvArojP.mjs";
+import { t as mockDocumentLoader } from "./dist-DJQM4u7i.mjs";
 import { RouterError } from "@fedify/uri-template";
 import { lookupObject, traverseCollection } from "@fedify/vocab";
 import { lookupWebFinger } from "@fedify/webfinger";

package/dist/{context-BMggDR-l.d.cts → context-DpsaHkk1.d.cts}

@@ -3348,12 +3348,38 @@ interface Context<TContextData> {
   getPortableFeaturedTagsUri(identifier: string, authority: string): URL;
   /**
   * Determines the type of the URI and extracts the associated data.
+  *
+  * By default, only URIs on this server's origin are recognized.  With
+  * the `portable` option, [FEP-ef61] portable IDs, e.g.,
+  * `ap+ef61://did:key:z6Mk.../users/alice`, and their compatible
+  * identifiers on any gateway, e.g.,
+  * `https://example.com/.well-known/apgateway/did:key:z6Mk.../users/alice`,
+  * are also recognized by the same paths that the gateway endpoint routes
+  * to the dispatchers, and the result has the DID in its `authority`
+  * property.
+  *
+  * The DID of a portable ID is anyone's to choose, so recognizing it does
+  * not mean that this server hosts anything for the DID.  Check that
+  * `authority` is the DID that the application stores for the actor or
+  * object before acting on it:
+  *
+  * ~~~~ typescript
+  * const parsed = ctx.parseUri(follow.objectId, { portable: true });
+  * if (parsed?.type !== "actor") return;
+  * const user = await getUser(parsed.identifier);
+  * if (user == null) return;
+  * if (parsed.authority != null && parsed.authority !== user.did) return;
+  * ~~~~
+  *
+  * [FEP-ef61]: https://w3id.org/fep/ef61
+  *
   * @param uri The URI to parse.
+  * @param options Options for parsing the URI.  Since 2.4.0.
   * @returns The result of parsing the URI.  If `null` is given or
   *          the URI is not recognized, `null` is returned.
   * @since 0.9.0
   */
-  parseUri(uri: URL | null): ParseUriResult | null;
+  parseUri(uri: URL | null, options?: ParseUriOptions): ParseUriResult | null;
   /**
   * Gets the key pairs for an actor.
   * @param identifier The actor's identifier.
@@ -4252,52 +4278,143 @@ interface OutboxContext<TContextData> extends Context<TContextData> {
   clone(data: TContextData): OutboxContext<TContextData>;
 }
 /**
+* Options for {@link Context.parseUri}.
+* @since 2.4.0
+*/
+interface ParseUriOptions {
+  /**
+  * Whether to also recognize [FEP-ef61] portable IDs, i.e., `ap:` and
+  * `ap+ef61:` URIs, and their compatible identifiers on any gateway.
+  * The result of a portable ID has its DID, without percent-encoding, in
+  * the `authority` property, which the caller has to compare with the DID
+  * that it stores for the actor or object, since anyone can make a portable
+  * ID with the same path under another DID.
+  *
+  * Like URIs on this server's origin, a portable ID is recognized by its
+  * path, and its query, e.g., location hints, and fragment are ignored.
+  * A shared inbox is never recognized in a portable ID, and a portable ID
+  * with a malformed DID, or with a `did:key` DID that is not encoded in
+  * base58-btc, is not recognized either.
+  *
+  * [FEP-ef61]: https://w3id.org/fep/ef61
+  * @default `false`
+  */
+  readonly portable?: boolean;
+}
+/**
 * A result of parsing an URI.
 */
 type ParseUriResult = {
   readonly type: "actor";
   readonly identifier: string;
+  /**
+  * The DID of the portable ID, e.g., `did:key:z6Mk...`, or `undefined`
+  * for a URI on this server's origin.  See {@link ParseUriOptions.portable}.
+  * @since 2.4.0
+  */
+  readonly authority?: string;
 } | {
   readonly type: "object";
   readonly class: ConstructorWithTypeId<Object$1>;
   readonly typeId: URL;
   readonly values: Record<string, string>;
+  /**
+  * The DID of the portable ID, e.g., `did:key:z6Mk...`, or `undefined`
+  * for a URI on this server's origin.  See {@link ParseUriOptions.portable}.
+  * @since 2.4.0
+  */
+  readonly authority?: string;
 } | {
   readonly type: "inbox";
   readonly identifier: undefined;
+  readonly authority?: undefined;
 } | {
   readonly type: "inbox";
   readonly identifier: string;
+  /**
+  * The DID of the portable ID, e.g., `did:key:z6Mk...`, or `undefined`
+  * for a URI on this server's origin.  See {@link ParseUriOptions.portable}.
+  * @since 2.4.0
+  */
+  readonly authority?: string;
 } | {
   readonly type: "outbox";
   readonly identifier: string;
+  /**
+  * The DID of the portable ID, e.g., `did:key:z6Mk...`, or `undefined`
+  * for a URI on this server's origin.  See {@link ParseUriOptions.portable}.
+  * @since 2.4.0
+  */
+  readonly authority?: string;
 } | {
   readonly type: "following";
   readonly identifier: string;
+  /**
+  * The DID of the portable ID, e.g., `did:key:z6Mk...`, or `undefined`
+  * for a URI on this server's origin.  See {@link ParseUriOptions.portable}.
+  * @since 2.4.0
+  */
+  readonly authority?: string;
 } | {
   readonly type: "followers";
   readonly identifier: string;
+  /**
+  * The DID of the portable ID, e.g., `did:key:z6Mk...`, or `undefined`
+  * for a URI on this server's origin.  See {@link ParseUriOptions.portable}.
+  * @since 2.4.0
+  */
+  readonly authority?: string;
 } | {
   readonly type: "liked";
   readonly identifier: string;
+  /**
+  * The DID of the portable ID, e.g., `did:key:z6Mk...`, or `undefined`
+  * for a URI on this server's origin.  See {@link ParseUriOptions.portable}.
+  * @since 2.4.0
+  */
+  readonly authority?: string;
 } | {
   readonly type: "featured";
   readonly identifier: string;
+  /**
+  * The DID of the portable ID, e.g., `did:key:z6Mk...`, or `undefined`
+  * for a URI on this server's origin.  See {@link ParseUriOptions.portable}.
+  * @since 2.4.0
+  */
+  readonly authority?: string;
 } | {
   readonly type: "featuredTags";
   readonly identifier: string;
+  /**
+  * The DID of the portable ID, e.g., `did:key:z6Mk...`, or `undefined`
+  * for a URI on this server's origin.  See {@link ParseUriOptions.portable}.
+  * @since 2.4.0
+  */
+  readonly authority?: string;
 } | {
   readonly type: "collection";
   readonly name: string | symbol;
   readonly class: ConstructorWithTypeId<Object$1>;
   readonly typeId: URL;
   readonly values: Record<string, string>;
+  /**
+  * The DID of the portable ID, e.g., `did:key:z6Mk...`, or `undefined`
+  * for a URI on this server's origin.  See {@link ParseUriOptions.portable}.
+  * @since 2.4.0
+  */
+  readonly authority?: string;
 } | {
   readonly type: "orderedCollection";
   readonly name: string | symbol;
   readonly class: ConstructorWithTypeId<Object$1>;
   readonly typeId: URL;
   readonly values: Record<string, string>;
+  /**
+  * The DID of the portable ID, e.g., `did:key:z6Mk...`, or `undefined`
+  * for a URI on this server's origin.  See {@link ParseUriOptions.portable}.
+  * @since 2.4.0
+  */
+  readonly authority?: string;
 };
 /**
 * Options for {@link Context.sendActivity} method.
@@ -4464,4 +4581,4 @@ interface ActorKeyPair extends CryptoKeyPair {
   readonly multikey: Multikey;
 }
 //#endregion
-export { InProcessMessageQueue as $, MediaUploaderSetters as A, HashlinkMediaRequest as At, createFederationBuilder as B, OutboxPermanentFailureHandler as Bt, FederationFetchOptions as C, CollectionCounter as Ct, IdempotencyStrategy as D, CustomCollectionCursor as Dt, IdempotencyKeyCallback as E, CustomCollectionCounter as Et, FederationKvPrefixes as F, ObjectAuthorizePredicate as Ft, TaskRegistry as G, UnverifiedActivityReason as Gt, TaskDefinitionOptions as H, PortableCollectionOwnerMapper as Ht, FederationOrigin as I, ObjectDispatcher as It, RetryPolicy as J, SenderKeyPair as Jt, CreateExponentialBackoffPolicyOptions as K, WebFingerLinksDispatcher as Kt, FederationQueueOptions as L, OutboxErrorHandler as Lt, OutboxListenerSetters as M, InboxListener as Mt, PortableInboxForwardingOptions as N, MediaUploaderCallback as Nt, InboxChallengePolicy as O, CustomCollectionDispatcher as Ot, Rfc6570Expression as P, NodeInfoDispatcher as Pt, respondWithObjectIfAcceptable as Q, ActivityTransformer as Qt, createFederation as R, OutboxListener as Rt, FederationBuilder as S, AuthorizePredicate as St, FederationStartQueueOptions as T, CollectionDispatcher as Tt, TaskEnqueueOptions as U, SharedInboxKeyDispatcher as Ut, TaskDefinition as V, PortableActorIdMapper as Vt, TaskHandler as W, UnverifiedActivityHandler as Wt, RespondWithObjectOptions as X, buildCollectionSynchronizationHeader as Xt, createExponentialBackoffPolicy as Y, PageItems as Yt, respondWithObject as Z, digest as Zt, ConstructorWithTypeId as _, parseCircuitBreakerKvState as _t, GetObjectOptions as a, ParallelMessageQueue as at, Federation as b, ActorHandleMapper as bt, OutboxContext as c, CircuitBreakerBeforeSendDecision as ct, RequestContext as d, CircuitBreakerKvState as dt, InProcessMessageQueueOptions as et, RouteActivityOptions as f, CircuitBreakerOptions as ft, CollectionCallbackSetters as g, normalizeCircuitBreakerOptions as gt, ActorCallbackSetters as h, NormalizedCircuitBreakerOptions as ht, GetActorOptions as i, MessageQueueListenOptions as it, ObjectCallbackSetters as j, InboxErrorHandler as jt, InboxListenerSetters as k, HashlinkMediaDispatcher as kt, ParseUriResult as l, CircuitBreakerCreateOptions as lt, SendActivityOptionsForCollection as m, CircuitBreakerStateChange as mt, Context as n, MessageQueueDepth as nt, GetSignedKeyOptions as o, CircuitBreaker as ot, SendActivityOptions as p, CircuitBreakerState as pt, RetryContext as q, SendActivityError as qt, ForwardActivityOptions as r, MessageQueueEnqueueOptions as rt, InboxContext as s, CircuitBreakerActivityDrop as st, ActorKeyPair as t, MessageQueue as tt, PortableRequest as u, CircuitBreakerFailurePolicy as ut, CustomCollectionCallbackSetters as v, ActorAliasMapper as vt, FederationOptions as w, CollectionCursor as wt, FederationBenchmarkOptions as x, ActorKeyPairsDispatcher as xt, Federatable as y, ActorDispatcher as yt, Message as z, OutboxListenerErrorHandler as zt };
+export { respondWithObjectIfAcceptable as $, ActivityTransformer as $t, InboxListenerSetters as A, HashlinkMediaDispatcher as At, Message as B, OutboxListenerErrorHandler as Bt, FederationBuilder as C, AuthorizePredicate as Ct, IdempotencyKeyCallback as D, CustomCollectionCounter as Dt, FederationStartQueueOptions as E, CollectionDispatcher as Et, Rfc6570Expression as F, NodeInfoDispatcher as Ft, TaskHandler as G, UnverifiedActivityHandler as Gt, TaskDefinition as H, PortableActorIdMapper as Ht, FederationKvPrefixes as I, ObjectAuthorizePredicate as It, RetryContext as J, SendActivityError as Jt, TaskRegistry as K, UnverifiedActivityReason as Kt, FederationOrigin as L, ObjectDispatcher as Lt, ObjectCallbackSetters as M, InboxErrorHandler as Mt, OutboxListenerSetters as N, InboxListener as Nt, IdempotencyStrategy as O, CustomCollectionCursor as Ot, PortableInboxForwardingOptions as P, MediaUploaderCallback as Pt, respondWithObject as Q, digest as Qt, FederationQueueOptions as R, OutboxErrorHandler as Rt, FederationBenchmarkOptions as S, ActorKeyPairsDispatcher as St, FederationOptions as T, CollectionCursor as Tt, TaskDefinitionOptions as U, PortableCollectionOwnerMapper as Ut, createFederationBuilder as V, OutboxPermanentFailureHandler as Vt, TaskEnqueueOptions as W, SharedInboxKeyDispatcher as Wt, createExponentialBackoffPolicy as X, PageItems as Xt, RetryPolicy as Y, SenderKeyPair as Yt, RespondWithObjectOptions as Z, buildCollectionSynchronizationHeader as Zt, CollectionCallbackSetters as _, normalizeCircuitBreakerOptions as _t, GetObjectOptions as a, MessageQueueListenOptions as at, Federatable as b, ActorDispatcher as bt, OutboxContext as c, CircuitBreakerActivityDrop as ct, PortableRequest as d, CircuitBreakerFailurePolicy as dt, InProcessMessageQueue as et, RequestContext as f, CircuitBreakerKvState as ft, ActorCallbackSetters as g, NormalizedCircuitBreakerOptions as gt, SendActivityOptionsForCollection as h, CircuitBreakerStateChange as ht, GetActorOptions as i, MessageQueueEnqueueOptions as it, MediaUploaderSetters as j, HashlinkMediaRequest as jt, InboxChallengePolicy as k, CustomCollectionDispatcher as kt, ParseUriOptions as l, CircuitBreakerBeforeSendDecision as lt, SendActivityOptions as m, CircuitBreakerState as mt, Context as n, MessageQueue as nt, GetSignedKeyOptions as o, ParallelMessageQueue as ot, RouteActivityOptions as p, CircuitBreakerOptions as pt, CreateExponentialBackoffPolicyOptions as q, WebFingerLinksDispatcher as qt, ForwardActivityOptions as r, MessageQueueDepth as rt, InboxContext as s, CircuitBreaker as st, ActorKeyPair as t, InProcessMessageQueueOptions as tt, ParseUriResult as u, CircuitBreakerCreateOptions as ut, ConstructorWithTypeId as v, parseCircuitBreakerKvState as vt, FederationFetchOptions as w, CollectionCounter as wt, Federation as x, ActorHandleMapper as xt, CustomCollectionCallbackSetters as y, ActorAliasMapper as yt, createFederation as z, OutboxListener as zt };

package/dist/{context-exYu7gDU.d.ts → context-JDNkUtnu.d.ts}

@@ -3350,12 +3350,38 @@ interface Context<TContextData> {
   getPortableFeaturedTagsUri(identifier: string, authority: string): URL;
   /**
   * Determines the type of the URI and extracts the associated data.
+  *
+  * By default, only URIs on this server's origin are recognized.  With
+  * the `portable` option, [FEP-ef61] portable IDs, e.g.,
+  * `ap+ef61://did:key:z6Mk.../users/alice`, and their compatible
+  * identifiers on any gateway, e.g.,
+  * `https://example.com/.well-known/apgateway/did:key:z6Mk.../users/alice`,
+  * are also recognized by the same paths that the gateway endpoint routes
+  * to the dispatchers, and the result has the DID in its `authority`
+  * property.
+  *
+  * The DID of a portable ID is anyone's to choose, so recognizing it does
+  * not mean that this server hosts anything for the DID.  Check that
+  * `authority` is the DID that the application stores for the actor or
+  * object before acting on it:
+  *
+  * ~~~~ typescript
+  * const parsed = ctx.parseUri(follow.objectId, { portable: true });
+  * if (parsed?.type !== "actor") return;
+  * const user = await getUser(parsed.identifier);
+  * if (user == null) return;
+  * if (parsed.authority != null && parsed.authority !== user.did) return;
+  * ~~~~
+  *
+  * [FEP-ef61]: https://w3id.org/fep/ef61
+  *
   * @param uri The URI to parse.
+  * @param options Options for parsing the URI.  Since 2.4.0.
   * @returns The result of parsing the URI.  If `null` is given or
   *          the URI is not recognized, `null` is returned.
   * @since 0.9.0
   */
-  parseUri(uri: URL | null): ParseUriResult | null;
+  parseUri(uri: URL | null, options?: ParseUriOptions): ParseUriResult | null;
   /**
   * Gets the key pairs for an actor.
   * @param identifier The actor's identifier.
@@ -4254,52 +4280,143 @@ interface OutboxContext<TContextData> extends Context<TContextData> {
   clone(data: TContextData): OutboxContext<TContextData>;
 }
 /**
+* Options for {@link Context.parseUri}.
+* @since 2.4.0
+*/
+interface ParseUriOptions {
+  /**
+  * Whether to also recognize [FEP-ef61] portable IDs, i.e., `ap:` and
+  * `ap+ef61:` URIs, and their compatible identifiers on any gateway.
+  * The result of a portable ID has its DID, without percent-encoding, in
+  * the `authority` property, which the caller has to compare with the DID
+  * that it stores for the actor or object, since anyone can make a portable
+  * ID with the same path under another DID.
+  *
+  * Like URIs on this server's origin, a portable ID is recognized by its
+  * path, and its query, e.g., location hints, and fragment are ignored.
+  * A shared inbox is never recognized in a portable ID, and a portable ID
+  * with a malformed DID, or with a `did:key` DID that is not encoded in
+  * base58-btc, is not recognized either.
+  *
+  * [FEP-ef61]: https://w3id.org/fep/ef61
+  * @default `false`
+  */
+  readonly portable?: boolean;
+}
+/**
 * A result of parsing an URI.
 */
 type ParseUriResult = {
   readonly type: "actor";
   readonly identifier: string;
+  /**
+  * The DID of the portable ID, e.g., `did:key:z6Mk...`, or `undefined`
+  * for a URI on this server's origin.  See {@link ParseUriOptions.portable}.
+  * @since 2.4.0
+  */
+  readonly authority?: string;
 } | {
   readonly type: "object";
   readonly class: ConstructorWithTypeId<Object$1>;
   readonly typeId: URL;
   readonly values: Record<string, string>;
+  /**
+  * The DID of the portable ID, e.g., `did:key:z6Mk...`, or `undefined`
+  * for a URI on this server's origin.  See {@link ParseUriOptions.portable}.
+  * @since 2.4.0
+  */
+  readonly authority?: string;
 } | {
   readonly type: "inbox";
   readonly identifier: undefined;
+  readonly authority?: undefined;
 } | {
   readonly type: "inbox";
   readonly identifier: string;
+  /**
+  * The DID of the portable ID, e.g., `did:key:z6Mk...`, or `undefined`
+  * for a URI on this server's origin.  See {@link ParseUriOptions.portable}.
+  * @since 2.4.0
+  */
+  readonly authority?: string;
 } | {
   readonly type: "outbox";
   readonly identifier: string;
+  /**
+  * The DID of the portable ID, e.g., `did:key:z6Mk...`, or `undefined`
+  * for a URI on this server's origin.  See {@link ParseUriOptions.portable}.
+  * @since 2.4.0
+  */
+  readonly authority?: string;
 } | {
   readonly type: "following";
   readonly identifier: string;
+  /**
+  * The DID of the portable ID, e.g., `did:key:z6Mk...`, or `undefined`
+  * for a URI on this server's origin.  See {@link ParseUriOptions.portable}.
+  * @since 2.4.0
+  */
+  readonly authority?: string;
 } | {
   readonly type: "followers";
   readonly identifier: string;
+  /**
+  * The DID of the portable ID, e.g., `did:key:z6Mk...`, or `undefined`
+  * for a URI on this server's origin.  See {@link ParseUriOptions.portable}.
+  * @since 2.4.0
+  */
+  readonly authority?: string;
 } | {
   readonly type: "liked";
   readonly identifier: string;
+  /**
+  * The DID of the portable ID, e.g., `did:key:z6Mk...`, or `undefined`
+  * for a URI on this server's origin.  See {@link ParseUriOptions.portable}.
+  * @since 2.4.0
+  */
+  readonly authority?: string;
 } | {
   readonly type: "featured";
   readonly identifier: string;
+  /**
+  * The DID of the portable ID, e.g., `did:key:z6Mk...`, or `undefined`
+  * for a URI on this server's origin.  See {@link ParseUriOptions.portable}.
+  * @since 2.4.0
+  */
+  readonly authority?: string;
 } | {
   readonly type: "featuredTags";
   readonly identifier: string;
+  /**
+  * The DID of the portable ID, e.g., `did:key:z6Mk...`, or `undefined`
+  * for a URI on this server's origin.  See {@link ParseUriOptions.portable}.
+  * @since 2.4.0
+  */
+  readonly authority?: string;
 } | {
   readonly type: "collection";
   readonly name: string | symbol;
   readonly class: ConstructorWithTypeId<Object$1>;
   readonly typeId: URL;
   readonly values: Record<string, string>;
+  /**
+  * The DID of the portable ID, e.g., `did:key:z6Mk...`, or `undefined`
+  * for a URI on this server's origin.  See {@link ParseUriOptions.portable}.
+  * @since 2.4.0
+  */
+  readonly authority?: string;
 } | {
   readonly type: "orderedCollection";
   readonly name: string | symbol;
   readonly class: ConstructorWithTypeId<Object$1>;
   readonly typeId: URL;
   readonly values: Record<string, string>;
+  /**
+  * The DID of the portable ID, e.g., `did:key:z6Mk...`, or `undefined`
+  * for a URI on this server's origin.  See {@link ParseUriOptions.portable}.
+  * @since 2.4.0
+  */
+  readonly authority?: string;
 };
 /**
 * Options for {@link Context.sendActivity} method.
@@ -4466,4 +4583,4 @@ interface ActorKeyPair extends CryptoKeyPair {
   readonly multikey: Multikey;
 }
 //#endregion
-export { InProcessMessageQueue as $, MediaUploaderSetters as A, HashlinkMediaRequest as At, createFederationBuilder as B, OutboxPermanentFailureHandler as Bt, FederationFetchOptions as C, CollectionCounter as Ct, IdempotencyStrategy as D, CustomCollectionCursor as Dt, IdempotencyKeyCallback as E, CustomCollectionCounter as Et, FederationKvPrefixes as F, ObjectAuthorizePredicate as Ft, TaskRegistry as G, UnverifiedActivityReason as Gt, TaskDefinitionOptions as H, PortableCollectionOwnerMapper as Ht, FederationOrigin as I, ObjectDispatcher as It, RetryPolicy as J, SenderKeyPair as Jt, CreateExponentialBackoffPolicyOptions as K, WebFingerLinksDispatcher as Kt, FederationQueueOptions as L, OutboxErrorHandler as Lt, OutboxListenerSetters as M, InboxListener as Mt, PortableInboxForwardingOptions as N, MediaUploaderCallback as Nt, InboxChallengePolicy as O, CustomCollectionDispatcher as Ot, Rfc6570Expression as P, NodeInfoDispatcher as Pt, respondWithObjectIfAcceptable as Q, ActivityTransformer as Qt, createFederation as R, OutboxListener as Rt, FederationBuilder as S, AuthorizePredicate as St, FederationStartQueueOptions as T, CollectionDispatcher as Tt, TaskEnqueueOptions as U, SharedInboxKeyDispatcher as Ut, TaskDefinition as V, PortableActorIdMapper as Vt, TaskHandler as W, UnverifiedActivityHandler as Wt, RespondWithObjectOptions as X, buildCollectionSynchronizationHeader as Xt, createExponentialBackoffPolicy as Y, PageItems as Yt, respondWithObject as Z, digest as Zt, ConstructorWithTypeId as _, parseCircuitBreakerKvState as _t, GetObjectOptions as a, ParallelMessageQueue as at, Federation as b, ActorHandleMapper as bt, OutboxContext as c, CircuitBreakerBeforeSendDecision as ct, RequestContext as d, CircuitBreakerKvState as dt, InProcessMessageQueueOptions as et, RouteActivityOptions as f, CircuitBreakerOptions as ft, CollectionCallbackSetters as g, normalizeCircuitBreakerOptions as gt, ActorCallbackSetters as h, NormalizedCircuitBreakerOptions as ht, GetActorOptions as i, MessageQueueListenOptions as it, ObjectCallbackSetters as j, InboxErrorHandler as jt, InboxListenerSetters as k, HashlinkMediaDispatcher as kt, ParseUriResult as l, CircuitBreakerCreateOptions as lt, SendActivityOptionsForCollection as m, CircuitBreakerStateChange as mt, Context as n, MessageQueueDepth as nt, GetSignedKeyOptions as o, CircuitBreaker as ot, SendActivityOptions as p, CircuitBreakerState as pt, RetryContext as q, SendActivityError as qt, ForwardActivityOptions as r, MessageQueueEnqueueOptions as rt, InboxContext as s, CircuitBreakerActivityDrop as st, ActorKeyPair as t, MessageQueue as tt, PortableRequest as u, CircuitBreakerFailurePolicy as ut, CustomCollectionCallbackSetters as v, ActorAliasMapper as vt, FederationOptions as w, CollectionCursor as wt, FederationBenchmarkOptions as x, ActorKeyPairsDispatcher as xt, Federatable as y, ActorDispatcher as yt, Message as z, OutboxListenerErrorHandler as zt };
+export { respondWithObjectIfAcceptable as $, ActivityTransformer as $t, InboxListenerSetters as A, HashlinkMediaDispatcher as At, Message as B, OutboxListenerErrorHandler as Bt, FederationBuilder as C, AuthorizePredicate as Ct, IdempotencyKeyCallback as D, CustomCollectionCounter as Dt, FederationStartQueueOptions as E, CollectionDispatcher as Et, Rfc6570Expression as F, NodeInfoDispatcher as Ft, TaskHandler as G, UnverifiedActivityHandler as Gt, TaskDefinition as H, PortableActorIdMapper as Ht, FederationKvPrefixes as I, ObjectAuthorizePredicate as It, RetryContext as J, SendActivityError as Jt, TaskRegistry as K, UnverifiedActivityReason as Kt, FederationOrigin as L, ObjectDispatcher as Lt, ObjectCallbackSetters as M, InboxErrorHandler as Mt, OutboxListenerSetters as N, InboxListener as Nt, IdempotencyStrategy as O, CustomCollectionCursor as Ot, PortableInboxForwardingOptions as P, MediaUploaderCallback as Pt, respondWithObject as Q, digest as Qt, FederationQueueOptions as R, OutboxErrorHandler as Rt, FederationBenchmarkOptions as S, ActorKeyPairsDispatcher as St, FederationOptions as T, CollectionCursor as Tt, TaskDefinitionOptions as U, PortableCollectionOwnerMapper as Ut, createFederationBuilder as V, OutboxPermanentFailureHandler as Vt, TaskEnqueueOptions as W, SharedInboxKeyDispatcher as Wt, createExponentialBackoffPolicy as X, PageItems as Xt, RetryPolicy as Y, SenderKeyPair as Yt, RespondWithObjectOptions as Z, buildCollectionSynchronizationHeader as Zt, CollectionCallbackSetters as _, normalizeCircuitBreakerOptions as _t, GetObjectOptions as a, MessageQueueListenOptions as at, Federatable as b, ActorDispatcher as bt, OutboxContext as c, CircuitBreakerActivityDrop as ct, PortableRequest as d, CircuitBreakerFailurePolicy as dt, InProcessMessageQueue as et, RequestContext as f, CircuitBreakerKvState as ft, ActorCallbackSetters as g, NormalizedCircuitBreakerOptions as gt, SendActivityOptionsForCollection as h, CircuitBreakerStateChange as ht, GetActorOptions as i, MessageQueueEnqueueOptions as it, MediaUploaderSetters as j, HashlinkMediaRequest as jt, InboxChallengePolicy as k, CustomCollectionDispatcher as kt, ParseUriOptions as l, CircuitBreakerBeforeSendDecision as lt, SendActivityOptions as m, CircuitBreakerState as mt, Context as n, MessageQueue as nt, GetSignedKeyOptions as o, ParallelMessageQueue as ot, RouteActivityOptions as p, CircuitBreakerOptions as pt, CreateExponentialBackoffPolicyOptions as q, WebFingerLinksDispatcher as qt, ForwardActivityOptions as r, MessageQueueDepth as rt, InboxContext as s, CircuitBreaker as st, ActorKeyPair as t, InProcessMessageQueueOptions as tt, ParseUriResult as u, CircuitBreakerCreateOptions as ut, ConstructorWithTypeId as v, parseCircuitBreakerKvState as vt, FederationFetchOptions as w, CollectionCounter as wt, Federation as x, ActorHandleMapper as xt, CustomCollectionCallbackSetters as y, ActorAliasMapper as yt, createFederation as z, OutboxListener as zt };

package/dist/{deno-YLLbRq06.mjs → deno-CE_s0yQb.mjs}

@@ -3,6 +3,6 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.4.0-dev.2155+2ccc5085";
+var version = "2.4.0-dev.2159+bb072eda";
 //#endregion
 export { version as n, name as t };

package/dist/{dist-BQvArojP.mjs → dist-DJQM4u7i.mjs}

@@ -6,6 +6,7 @@ import { configure, getConsoleSink, getLogger, reset } from "@logtape/logtape";
 import "@opentelemetry/sdk-trace-base";
 import "@opentelemetry/core";
 //#region ../fixture/dist/mod.js
+const fixtureFetch = globalThis.fetch.bind(globalThis);
 const logger = getLogger(["fixture", "docloader"]);
 /**
 * A mock of the document loader.  This does not make any actual HTTP requests
@@ -20,7 +21,7 @@ async function mockDocumentLoader(resource, _options) {
 	if ("navigator" in globalThis && navigator.userAgent === "Cloudflare-Workers") {
 		const testUrl = new URL(url);
 		testUrl.hostname += ".test";
-		const resp = await fetch(testUrl);
+		const resp = await fixtureFetch(testUrl);
 		if (resp.ok) {
 			const document = await resp.json();
 			logger.debug("Successfully fetched fixture {resource}: {status} {statusText}\n{body}", {

package/dist/docloader-C5p26tpa.mjs

@@ -0,0 +1,79 @@
+import "temporal-polyfill";
+import "urlpattern-polyfill";
+globalThis.addEventListener = () => {};
+import { c as validateCryptoKey } from "./key-C6jnekFI.mjs";
+import { n as doubleKnock } from "./http-DV_yW4dv.mjs";
+import { getLogger } from "@logtape/logtape";
+import { curry } from "es-toolkit";
+import { FetchError, UrlError, createActivityPubRequest, getRemoteDocument, logRequest, validatePublicUrl } from "@fedify/vocab-runtime";
+//#region src/utils/docloader.ts
+const logger = getLogger([
+	"fedify",
+	"utils",
+	"docloader"
+]);
+const DEFAULT_MAX_REDIRECTION = 20;
+/**
+* Gets an authenticated {@link DocumentLoader} for the given identity.
+* Note that an authenticated document loader intentionally does not cache
+* the fetched documents.
+* At most 20 HTTP redirects and alternate document links are followed in total
+* per call.  Revisiting a URL within that chain throws a {@link FetchError}.
+* @param identity The identity to get the document loader for.
+*                 The actor's key pair.
+* @param options The options for the document loader.
+* @returns The authenticated document loader.
+* @throws {TypeError} If the key is invalid or unsupported.
+* @since 0.4.0
+*/
+function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, maxRedirection, userAgent, specDeterminer, tracerProvider } = {}) {
+	validateCryptoKey(identity.privateKey);
+	async function load(url, options, redirected = 0, visited = /* @__PURE__ */ new Set()) {
+		options?.signal?.throwIfAborted();
+		let currentUrl = new URL(url).href;
+		await validateUrl(currentUrl, options);
+		visited.add(currentUrl);
+		const originalRequest = createActivityPubRequest(currentUrl, { userAgent });
+		function follow(nextUrl) {
+			options?.signal?.throwIfAborted();
+			if (redirected >= DEFAULT_MAX_REDIRECTION) throw new FetchError(currentUrl, `Too many redirections (${redirected + 1})`);
+			if (visited.has(nextUrl)) throw new FetchError(currentUrl, `Redirect loop detected: ${nextUrl}`);
+			redirected++;
+		}
+		const response = await doubleKnock(originalRequest, identity, {
+			maxRedirection,
+			specDeterminer,
+			log: curry(logRequest)(logger),
+			tracerProvider,
+			signal: options?.signal,
+			validateRedirect: async (nextUrl) => {
+				follow(nextUrl);
+				await validateUrl(nextUrl, options);
+				visited.add(nextUrl);
+				currentUrl = nextUrl;
+			}
+		});
+		return getRemoteDocument(currentUrl, response, (alternateUrl) => {
+			follow(alternateUrl);
+			return load(alternateUrl, options, redirected, visited);
+		}, options);
+	}
+	async function validateUrl(url, options) {
+		if (!allowPrivateAddress) try {
+			await validatePublicUrl(url);
+		} catch (error) {
+			if (error instanceof UrlError) if (error.reason === "dns") logger.debug("DNS lookup failed for {url}", {
+				url,
+				error
+			});
+			else logger[options?.suppressError ? "warn" : "error"]("Disallowed private URL: {url}", {
+				url,
+				error
+			});
+			throw error;
+		}
+	}
+	return (url, options) => load(url, options);
+}
+//#endregion
+export { getAuthenticatedDocumentLoader as t };

package/dist/federation/builder.test.mjs

@@ -6,7 +6,7 @@ import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import { t as assertExists } from "../assert_exists-cffSpJ7X.mjs";
 import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import "../std__assert-DvMDRPes.mjs";
-import { r as createFederationBuilder } from "../builder-CxHALSwA.mjs";
+import { r as createFederationBuilder } from "../builder-D89oOfHC.mjs";
 import { DisallowedOperatorError, DisallowedVarSpecModifierError, DuplicateRouteVariableError, RouteTemplateOptionsNotMatchedError, RouterError } from "@fedify/uri-template";
 import { Activity, Note, Person } from "@fedify/vocab";
 import { test } from "@fedify/fixture";

package/dist/federation/compound-fanout.test.mjs

@@ -6,11 +6,11 @@ import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { n as exportJwk } from "../key-BZ-Z4uez.mjs";
+import { n as exportJwk } from "../key-C6jnekFI.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "../outgoing-jsonld-4IJqPYos.mjs";
-import { a as signObject, d as verifyProof } from "../proof-vZ04IAjq.mjs";
+import { a as signObject, d as verifyProof } from "../proof-BdO3BbLh.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { n as FederationImpl } from "../middleware-DDa8pCUa.mjs";
+import { n as FederationImpl } from "../middleware-Bdwd_Gg8.mjs";
 import { Create, DataIntegrityProof, Note } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 import { exportDidKey, parseIri } from "@fedify/vocab-runtime";

package/dist/federation/handler-compound-proof.test.mjs

@@ -1,14 +1,14 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { r as createRequestContext, t as createInboxContext } from "../context-OrnjnuMq.mjs";
+import { r as createRequestContext, t as createInboxContext } from "../context-B2rlkkyJ.mjs";
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
-import { a as compactJsonLd, m as verifyCompactJsonLd, p as signJsonLd } from "../ld-Djxsq6JR.mjs";
-import { l as signRequest } from "../http-CXnNbRe_.mjs";
+import { a as compactJsonLd, m as verifyCompactJsonLd, p as signJsonLd } from "../ld-ya2C1Xip.mjs";
+import { l as signRequest } from "../http-DV_yW4dv.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { f as handleInbox, o as createFederation } from "../middleware-DDa8pCUa.mjs";
+import { f as handleInbox, o as createFederation } from "../middleware-Bdwd_Gg8.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-C-BSbKI7.mjs";
 import { t as map_local_create_note_default } from "../map-local-create-note-B0SeXJms.mjs";
 import { Create, CryptographicKey, Multikey, Person, Update } from "@fedify/vocab";