@fedify/fedify 2.3.9-dev.2048 → 2.3.10

package/dist/{builder-BfY2wZ4V.mjs → builder-Bal9bfuM.mjs}

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-ayal9buz.mjs";
+import { n as version, t as name } from "./deno-DUgFsCmM.mjs";
 import { t as ActivityListenerSet } from "./activity-listener-ell7W1s9.mjs";
 import { getLogger } from "@logtape/logtape";
 import { Router, RouterError, assertPath } from "@fedify/uri-template";
@@ -65,6 +65,7 @@ var FederationBuilderImpl = class {
 	* Symbol registry for unique identification of unnamed symbols.
 	*/
 	#symbolRegistry = /* @__PURE__ */ new Map();
+	#collectionNames = /* @__PURE__ */ new Map();
 	constructor() {
 		this.router = new Router();
 		this.objectCallbacks = {};
@@ -80,7 +81,7 @@ var FederationBuilderImpl = class {
 	* specified.
 	*/
 	async build(options) {
-		const { FederationImpl } = await import("./middleware-C96wm_7x.mjs");
+		const { FederationImpl } = await import("./middleware-54KSGAQA.mjs");
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -93,6 +94,8 @@ var FederationBuilderImpl = class {
 		f.objectTypeIds = { ...this.objectTypeIds };
 		f.collectionCallbacks = { ...this.collectionCallbacks };
 		f.collectionTypeIds = { ...this.collectionTypeIds };
+		f.#symbolRegistry = new Map(this.#symbolRegistry);
+		f.#collectionNames = new Map(this.#collectionNames);
 		f.inboxPath = this.inboxPath;
 		f.outboxPath = this.outboxPath;
 		f.inboxCallbacks = this.inboxCallbacks == null ? void 0 : { ...this.inboxCallbacks };
@@ -572,6 +575,7 @@ var FederationBuilderImpl = class {
 		if (this.collectionCallbacks[name] != null) throw new RouterError(`Collection dispatcher for ${strName} already set.`);
 		assertPath(path);
 		if (Router.variables(path).size < 1) throw new RouterError("Path for collection dispatcher must have at least one variable.");
+		this.#collectionNames.set(routeName, name);
 		this.router.add(path, routeName);
 		const callbacks = { dispatcher };
 		this.collectionCallbacks[name] = callbacks;
@@ -609,6 +613,10 @@ var FederationBuilderImpl = class {
 		const routeName = this.#uniqueCollectionId(name);
 		return this.router.build(`collection:${routeName}`, values) ?? this.router.build(`orderedCollection:${routeName}`, values);
 	}
+	/** Resolves a custom collection route to its original name. */
+	getCollectionName(routeName) {
+		return this.#collectionNames.get(routeName) ?? routeName.replace(/^(collection|orderedCollection):/, "");
+	}
 	setOutboxPermanentFailureHandler(handler) {
 		this.outboxPermanentFailureHandler = handler;
 	}

package/dist/{client-DYDoDpMa.mjs → client-Ccbsek6u.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 { jt as ActivityTransformer, n as Context } from "../context-CSIggG9_.cjs";
+import { jt as ActivityTransformer, n as Context } from "../context-MOrCC7yl.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 { jt as ActivityTransformer, n as Context } from "../context-CAKnQy1x.js";
+import { jt as ActivityTransformer, n as Context } from "../context-BWbdE_MZ.js";
 import { Activity } from "@fedify/vocab";
 
 //#region src/compat/transformers.d.ts

package/dist/compat/transformers.test.mjs

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
 import { n as assertInstanceOf, t as assert } from "../assert-jSdZMYam.mjs";
 import { t as MemoryKvStore } from "../kv-CX8qfaad.mjs";
-import { b as autoIdAssigner, n as FederationImpl, y as actorDehydrator } from "../middleware-BCG2BX1n.mjs";
+import { b as autoIdAssigner, n as FederationImpl, y as actorDehydrator } from "../middleware-Bj9s3J_0.mjs";
 import { Follow, Person } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
 //#region src/compat/transformers.test.ts

package/dist/{context-CAKnQy1x.d.ts → context-BWbdE_MZ.d.ts}

@@ -2,7 +2,7 @@
 import { o as JsonValue, s as NodeInfo, t as GetNodeInfoOptions } from "./client-CSddvgWN.js";
 import { o as VerifyRequestFailureReason, t as HttpMessageSignaturesSpec } from "./http-DQmNpfym.js";
 import { n as GetKeyOwnerOptions } from "./owner-CiBPcC6F.js";
-import { n as KvStore, t as KvKey } from "./kv-D6hNiMTK.js";
+import { n as KvStore, t as KvKey } from "./kv-CxaI4eGo.js";
 import { r as MessageQueue } from "./mq-D-nlpY04.js";
 import { Router } from "@fedify/uri-template";
 import { Activity, Actor, Collection, CryptographicKey, Hashtag, Link, LookupObjectOptions, Multikey, Object as Object$1, Recipient, Tombstone, TraverseCollectionOptions } from "@fedify/vocab";

package/dist/{context-BepjCFHN.mjs → context-CxbCIptr.mjs}

@@ -10,6 +10,7 @@ import { lookupObject, traverseCollection } from "@fedify/vocab";
 import { lookupWebFinger } from "@fedify/webfinger";
 import { metrics, trace } from "@opentelemetry/api";
 //#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
@@ -24,7 +25,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/{context-CSIggG9_.d.cts → context-MOrCC7yl.d.cts}

@@ -2,7 +2,7 @@
 import { o as JsonValue, s as NodeInfo, t as GetNodeInfoOptions } from "./client-CAM_bQXx.cjs";
 import { o as VerifyRequestFailureReason, t as HttpMessageSignaturesSpec } from "./http-DiWQB8Mr.cjs";
 import { n as GetKeyOwnerOptions } from "./owner-B3hNQCG8.cjs";
-import { n as KvStore, t as KvKey } from "./kv-gJ8LYbxX.cjs";
+import { n as KvStore, t as KvKey } from "./kv-CZKl1IUS.cjs";
 import { r as MessageQueue } from "./mq-D8uSFzxe.cjs";
 import { Activity, Actor, Collection, CryptographicKey, Hashtag, Link, LookupObjectOptions, Multikey, Object as Object$1, Recipient, Tombstone, TraverseCollectionOptions } from "@fedify/vocab";
 import { AuthenticatedDocumentLoaderFactory, DocumentLoader, DocumentLoaderFactory, GetUserAgentOptions } from "@fedify/vocab-runtime";

package/dist/{deno-ayal9buz.mjs → deno-DUgFsCmM.mjs}

@@ -3,6 +3,6 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.3.9-dev.2048+c88fcc8c";
+var version = "2.3.10";
 //#endregion
 export { version as n, name as t };

package/dist/docloader-w72ipM49.mjs

@@ -0,0 +1,79 @@
+import "@js-temporal/polyfill";
+import "urlpattern-polyfill";
+globalThis.addEventListener = () => {};
+import { s as validateCryptoKey } from "./key-BbuFo4CW.mjs";
+import { n as doubleKnock } from "./http-BNDHRNJP.mjs";
+import { getLogger } from "@logtape/logtape";
+import { FetchError, UrlError, createActivityPubRequest, getRemoteDocument, logRequest, validatePublicUrl } from "@fedify/vocab-runtime";
+import { curry } from "es-toolkit";
+//#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);
+		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);
+				visited.add(nextUrl);
+				currentUrl = nextUrl;
+			}
+		});
+		return getRemoteDocument(currentUrl, response, (alternateUrl) => {
+			follow(alternateUrl);
+			return load(alternateUrl, options, redirected, visited);
+		});
+	}
+	async function validateUrl(url) {
+		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.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

@@ -2,10 +2,11 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
-import { r as assertExists } from "../std__assert-BBjXFNOb.mjs";
+import { n as assertExists } from "../std__assert-BvGuO4xO.mjs";
 import { t as assertThrows } from "../assert_throws-BOkhLGYc.mjs";
+import { t as assertStrictEquals } from "../assert_strict_equals-XEgZAlrj.mjs";
 import { t as MemoryKvStore } from "../kv-CX8qfaad.mjs";
-import { r as createFederationBuilder } from "../builder-BfY2wZ4V.mjs";
+import { r as createFederationBuilder } from "../builder-Bal9bfuM.mjs";
 import { DisallowedOperatorError, DisallowedVarSpecModifierError, DuplicateRouteVariableError, RouteTemplateOptionsNotMatchedError, RouterError } from "@fedify/uri-template";
 import { Activity, Note, Person } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
@@ -344,6 +345,41 @@ test("FederationBuilder", async (t) => {
 		assertEquals(impl.collectionTypeIds["test"], Note);
 		assertEquals((await impl.fetch(new Request("https://example.com/c/x", { headers: { accept: "application/activity+json" } }), { contextData: void 0 })).status, 200);
 	});
+	await t.step("preserves symbol-named collections through build()", async () => {
+		const builder = createFederationBuilder();
+		const collection = Symbol("saved");
+		const ordered = Symbol("saved");
+		builder.setCollectionDispatcher(collection, Note, "/users/{identifier}/saved", () => ({ items: [] }));
+		builder.setOrderedCollectionDispatcher(ordered, Note, "/users/{identifier}/ordered-saved", () => ({ items: [] }));
+		for (let build = 0; build < 2; build++) {
+			const federation = await builder.build({ kv: new MemoryKvStore() });
+			const ctx = federation.createContext(new URL("https://example.com/"));
+			for (const [name, path, type] of [[
+				collection,
+				"/users/alice/saved",
+				"collection"
+			], [
+				ordered,
+				"/users/alice/ordered-saved",
+				"orderedCollection"
+			]]) {
+				const uri = ctx.getCollectionUri(name, { identifier: "alice" });
+				assertEquals(uri.pathname, path);
+				const parsed = ctx.parseUri(uri);
+				assertEquals(parsed?.type, type);
+				if (parsed?.type !== "collection" && parsed?.type !== "orderedCollection") throw new Error("Expected a custom collection URI");
+				assertStrictEquals(parsed.name, name);
+				assertStrictEquals(parsed.class, Note);
+				assertEquals(parsed.values, { identifier: "alice" });
+				for (const cursor of [null, "next"]) {
+					const pageUri = new URL(uri);
+					if (cursor != null) pageUri.searchParams.set("cursor", cursor);
+					assertEquals((await federation.fetch(new Request(pageUri, { headers: { accept: "application/activity+json" } }), { contextData: void 0 })).status, 200);
+				}
+			}
+			assertThrows(() => federation.setCollectionDispatcher(collection, Note, "/users/{identifier}/duplicate", () => ({ items: [] })));
+		}
+	});
 });
 //#endregion
 export {};

package/dist/federation/circuit-breaker.test.mjs

@@ -2,7 +2,7 @@ import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
-import "../std__assert-BBjXFNOb.mjs";
+import "../std__assert-BvGuO4xO.mjs";
 import { t as assertThrows } from "../assert_throws-BOkhLGYc.mjs";
 import { t as MemoryKvStore } from "../kv-CX8qfaad.mjs";
 import { n as normalizeCircuitBreakerOptions, r as parseCircuitBreakerKvState, t as CircuitBreaker } from "../circuit-breaker-CDABzqVf.mjs";

package/dist/federation/collection.test.mjs

@@ -2,7 +2,7 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
-import "../std__assert-BBjXFNOb.mjs";
+import "../std__assert-BvGuO4xO.mjs";
 import { n as digest, t as buildCollectionSynchronizationHeader } from "../collection-CA3V5zyK.mjs";
 import { test } from "@fedify/fixture";
 import { decodeHex } from "byte-encodings/hex";

package/dist/federation/handler.test.mjs

@@ -1,19 +1,19 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as createOutboxContext, r as createRequestContext, t as createInboxContext } from "../context-BepjCFHN.mjs";
+import { n as createOutboxContext, r as createRequestContext, t as createInboxContext } from "../context-CxbCIptr.mjs";
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
-import "../std__assert-BBjXFNOb.mjs";
+import "../std__assert-BvGuO4xO.mjs";
 import { n as assertGreaterOrEqual, t as assertRejects } from "../assert_rejects-DN60FHPX.mjs";
 import { n as assertInstanceOf, t as assert } from "../assert-jSdZMYam.mjs";
 import { r as parseAcceptSignature } from "../accept-Dd__NiUL.mjs";
-import { a as generateCryptoKeyPair } from "../key-C9DkrWwb.mjs";
-import { s as signRequest } from "../http-B2u6PvNX.mjs";
+import { a as generateCryptoKeyPair } from "../key-BbuFo4CW.mjs";
+import { s as signRequest } from "../http-BNDHRNJP.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, s as rsaPublicKey2 } from "../keys-BAK-tUlf.mjs";
-import { a as compactJsonLd, p as signJsonLd } from "../ld-DNl7KwLY.mjs";
-import { r as signObject } from "../proof-D5vP7VIN.mjs";
+import { a as compactJsonLd, p as signJsonLd } from "../ld-BYV2Luge.mjs";
+import { r as signObject } from "../proof-cXVkPBIU.mjs";
 import { t as MemoryKvStore } from "../kv-CX8qfaad.mjs";
-import { c as handleActor, d as handleInbox, f as handleObject, h as respondWithObjectIfAcceptable, l as handleCollection, m as respondWithObject, o as createFederation, p as handleOutbox, u as handleCustomCollection } from "../middleware-BCG2BX1n.mjs";
+import { c as handleActor, d as handleInbox, f as handleObject, h as respondWithObjectIfAcceptable, l as handleCollection, m as respondWithObject, o as createFederation, p as handleOutbox, u as handleCustomCollection } from "../middleware-Bj9s3J_0.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-ell7W1s9.mjs";
 import { Activity, Create, CryptographicKey, Multikey, Note, Person, Tombstone } from "@fedify/vocab";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";

package/dist/federation/idempotency.test.mjs

@@ -2,11 +2,11 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
-import "../std__assert-BBjXFNOb.mjs";
+import "../std__assert-BvGuO4xO.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey, t as ed25519Multikey } from "../keys-BAK-tUlf.mjs";
-import { r as signObject } from "../proof-D5vP7VIN.mjs";
+import { r as signObject } from "../proof-cXVkPBIU.mjs";
 import { t as MemoryKvStore } from "../kv-CX8qfaad.mjs";
-import { o as createFederation } from "../middleware-BCG2BX1n.mjs";
+import { o as createFederation } from "../middleware-Bj9s3J_0.mjs";
 import { Create, Follow, Person } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 //#region src/federation/idempotency.test.ts

package/dist/federation/kv.test.mjs

@@ -2,7 +2,7 @@ import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
-import "../std__assert-BBjXFNOb.mjs";
+import "../std__assert-BvGuO4xO.mjs";
 import { t as MemoryKvStore } from "../kv-CX8qfaad.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/kv.test.ts

package/dist/federation/metrics.test.mjs

@@ -2,9 +2,9 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
-import "../std__assert-BBjXFNOb.mjs";
+import "../std__assert-BvGuO4xO.mjs";
 import { t as assertRejects } from "../assert_rejects-DN60FHPX.mjs";
-import { _ as recordKeyLookup, a as instrumentDocumentLoader, b as recordWebFingerHandle, c as recordCircuitBreakerStateChange, d as recordCollectionRequest, f as recordCollectionTotalItems, g as recordInboxActivity, h as recordFanoutRecipients, i as getRemoteHost, l as recordCollectionDispatchDuration, m as recordDocumentFetch, p as recordDocumentCache, r as getFederationMetrics, t as classifyFetchError, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "../metrics-Ce55disp.mjs";
+import { _ as recordKeyLookup, a as instrumentDocumentLoader, b as recordWebFingerHandle, c as recordCircuitBreakerStateChange, d as recordCollectionRequest, f as recordCollectionTotalItems, g as recordInboxActivity, h as recordFanoutRecipients, i as getRemoteHost, l as recordCollectionDispatchDuration, m as recordDocumentFetch, p as recordDocumentCache, r as getFederationMetrics, t as classifyFetchError, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "../metrics-QrVsKSG9.mjs";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 import { FetchError } from "@fedify/vocab-runtime";
 import { DataPointType, MeterProvider, MetricReader } from "@opentelemetry/sdk-metrics";