@fedify/relay 2.2.13 → 2.2.14

package/dist/litepub.test.js

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-BFzM7PGw.js";
+import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-BoqZOOtA.js";
 import { MemoryKvStore, signRequest } from "@fedify/fedify";
 import { createRelay } from "@fedify/relay";
 import { Accept, Announce, Create, Delete, Follow, Move, Note, Person, Undo, Update } from "@fedify/vocab";

package/dist/mastodon.test.js

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-BFzM7PGw.js";
+import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-BoqZOOtA.js";
 import { MemoryKvStore, signRequest } from "@fedify/fedify";
 import { createRelay } from "@fedify/relay";
 import { Create, Delete, Follow, Move, Note, Person, Undo, Update } from "@fedify/vocab";

package/dist/{types-BFzM7PGw.js → types-BoqZOOtA.js}

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import { createRequire } from "node:module";
 import { getLogger } from "@logtape/logtape";
 import process$1 from "node:process";
-import { lookup } from "node:dns/promises";
+import dns from "node:dns/promises";
 import { isIP } from "node:net";
 //#region \0rolldown/runtime.js
 var __create = Object.create;
@@ -21815,6 +21815,28 @@ var fep_5711_default = { "@context": {
 		"@type": "@id"
 	}
 } };
+var fep_7aa9_default = { "@context": {
+	"FeaturedCollection": "https://w3id.org/fep/7aa9#FeaturedCollection",
+	"FeaturedItem": "https://w3id.org/fep/7aa9#FeaturedItem",
+	"FeatureRequest": "https://w3id.org/fep/7aa9#FeatureRequest",
+	"FeatureAuthorization": "https://w3id.org/fep/7aa9#FeatureAuthorization",
+	"topic": {
+		"@id": "https://w3id.org/fep/7aa9#topic",
+		"@type": "@id"
+	},
+	"featuredObject": {
+		"@id": "https://w3id.org/fep/7aa9#featuredObject",
+		"@type": "@id"
+	},
+	"canFeature": {
+		"@id": "https://w3id.org/fep/7aa9#canFeature",
+		"@type": "@id"
+	},
+	"featureAuthorization": {
+		"@id": "https://w3id.org/fep/7aa9#featureAuthorization",
+		"@type": "@id"
+	}
+} };
 var fep_ef61_default = { "@context": {
 	"gateways": {
 		"@id": "https://w3id.org/fep/ef61/gateways",
@@ -25707,12 +25729,13 @@ const preloadedContexts = {
 	"https://w3id.org/fep/5711": fep_5711_default,
 	"https://www.w3.org/ns/cid/v1": cid_v1_default,
 	"https://w3id.org/fep/ef61": fep_ef61_default,
+	"https://w3id.org/fep/7aa9": fep_7aa9_default,
 	"https://join-lemmy.org/context.json": join_lemmy_default,
 	"http://joinmastodon.org/ns": joinmastodon_default,
 	"https://purl.archive.org/miscellany": miscellany_default
 };
 var name = "@fedify/vocab-runtime";
-var version = "2.2.13";
+var version = "2.2.14";
 /**
 * Error thrown when fetching a JSON-LD document failed.
 */
@@ -26033,9 +26056,16 @@ var HttpHeaderLink = class HttpHeaderLink {
 	}
 };
 var UrlError = class extends Error {
+	/**
+	* The failure category. Defaults to `"disallowed"`.
+	* `"dns"` includes lookup errors and results with no usable IP addresses.
+	* @since 2.0.29
+	*/
+	reason;
 	constructor(message, options) {
 		super(message, options);
 		this.name = "UrlError";
+		this.reason = options?.reason ?? "disallowed";
 	}
 };
 /**
@@ -26061,9 +26091,12 @@ async function validatePublicUrl(url) {
 	}
 	let addresses;
 	try {
-		addresses = await lookup(hostname, { all: true });
+		addresses = await dns.lookup(hostname, { all: true });
 	} catch (error) {
-		throw new UrlError("DNS lookup failed", { cause: error });
+		throw new UrlError("DNS lookup failed", {
+			cause: error,
+			reason: "dns"
+		});
 	}
 	validateLookupAddresses(addresses);
 }
@@ -26092,7 +26125,7 @@ function validateLookupAddresses(addresses) {
 		ipAddressCount++;
 		validatePublicIpAddress(address, family);
 	}
-	if (ipAddressCount === 0) throw new UrlError("DNS lookup did not return any IP address");
+	if (ipAddressCount === 0) throw new UrlError("DNS lookup did not return any IP address", { reason: "dns" });
 }
 function validatePublicIpAddress(address, family) {
 	if (family === 4 && isValidPublicIPv4Address(address) || family === 6 && isValidPublicIPv6Address(address)) return;
@@ -26326,6 +26359,8 @@ async function getRemoteDocument(url, response, fetch) {
 }
 /**
 * Creates a JSON-LD document loader that utilizes the browser's `fetch` API.
+* 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}.
 *
 * The created loader preloads the below frequently used contexts by default
 * (unless `options.skipPreloadedContexts` is set to `true`):
@@ -26337,6 +26372,7 @@ async function getRemoteDocument(url, response, fetch) {
 * - <https://www.w3.org/ns/cid/v1>
 * - <https://w3id.org/security/multikey/v1>
 * - <https://w3id.org/fep/ef61>
+* - <https://w3id.org/fep/7aa9>
 * - <https://purl.archive.org/socialweb/webfinger>
 * - <http://schema.org/>
 * @param options Options for the document loader.
@@ -26360,7 +26396,11 @@ function getDocumentLoader({ allowPrivateAddress, maxRedirection, skipPreloadedC
 		if (!allowPrivateAddress) try {
 			await validatePublicUrl(currentUrl);
 		} catch (error) {
-			if (error instanceof UrlError) logger.error("Disallowed private URL: {url}", {
+			if (error instanceof UrlError) if (error.reason === "dns") logger.debug("DNS lookup failed for {url}", {
+				url: currentUrl,
+				error
+			});
+			else logger.error("Disallowed private URL: {url}", {
 				url: currentUrl,
 				error
 			});
@@ -26398,7 +26438,12 @@ function getDocumentLoader({ allowPrivateAddress, maxRedirection, skipPreloadedC
 					}
 					return await load(redirectUrl, options, redirected + 1, visited);
 				}
-				const result = await getRemoteDocument(currentUrl, response, load);
+				const result = await getRemoteDocument(currentUrl, response, async (alternateUrl) => {
+					options?.signal?.throwIfAborted();
+					if (redirected >= DEFAULT_MAX_REDIRECTION) throw new FetchError(currentUrl, `Too many redirections (${redirected + 1})`);
+					if (visited.has(alternateUrl)) throw new FetchError(currentUrl, `Redirect loop detected: ${alternateUrl}`);
+					return await load(alternateUrl, options, redirected + 1, visited);
+				});
 				span.setAttribute("docloader.document_url", result.documentUrl);
 				if (result.contextUrl != null) span.setAttribute("docloader.context_url", result.contextUrl);
 				return result;
@@ -26414,7 +26459,7 @@ function getDocumentLoader({ allowPrivateAddress, maxRedirection, skipPreloadedC
 			}
 		});
 	}
-	return load;
+	return (url, options) => load(url, options);
 }
 function validateCryptoKey(key, type) {
 	if (type != null && key.type !== type) throw new TypeError(`The key is not a ${type} key.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/relay",
-  "version": "2.2.13",
+  "version": "2.2.14",
   "description": "ActivityPub relay support for Fedify",
   "keywords": [
     "Fedify",
@@ -50,14 +50,14 @@
   "dependencies": {
     "@js-temporal/polyfill": "^0.5.1",
     "@logtape/logtape": "^2.0.5",
-    "@fedify/fedify": "^2.2.13",
-    "@fedify/vocab": "2.2.13"
+    "@fedify/vocab": "2.2.14",
+    "@fedify/fedify": "^2.2.14"
   },
   "devDependencies": {
     "tsdown": "^0.21.6",
     "typescript": "^6.0.0",
     "urlpattern-polyfill": "^10.1.0",
-    "@fedify/vocab-runtime": "^2.2.13"
+    "@fedify/vocab-runtime": "^2.2.14"
   },
   "scripts": {
     "build:self": "tsdown",