@fedify/relay 2.4.0-dev.2149 → 2.4.0-dev.2157

package/dist/litepub.test.js

@@ -1,7 +1,7 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-B028tKOW.js";
+import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-Co-uPXfa.js";
 import { MemoryKvStore, signRequest } from "@fedify/fedify";
 import { createRelay } from "@fedify/relay";
 import { deepStrictEqual, ok, strictEqual } from "node:assert";

package/dist/mastodon.test.js

@@ -1,7 +1,7 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-B028tKOW.js";
+import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-Co-uPXfa.js";
 import { MemoryKvStore, signJsonLd, signRequest } from "@fedify/fedify";
 import { createRelay } from "@fedify/relay";
 import { deepStrictEqual, ok, strictEqual } from "node:assert";

package/dist/mod.d.cts

@@ -1,7 +1,7 @@
 /// <reference lib="esnext.temporal" />
 import { Context, KvStore, MessageQueue } from "@fedify/fedify";
 import { Actor } from "@fedify/vocab";
-//#region ../vocab-runtime/dist/docloader-oRpq1nQ8.d.ts
+//#region ../vocab-runtime/dist/docloader-ClQraSWr.d.ts
 /**
 * Options for making `User-Agent` string.
 * @see {@link getUserAgent}

package/dist/mod.d.ts

@@ -1,7 +1,7 @@
 /// <reference lib="esnext.temporal" />
 import { Context, KvStore, MessageQueue } from "@fedify/fedify";
 import { Actor } from "@fedify/vocab";
-//#region ../vocab-runtime/dist/docloader-oRpq1nQ8.d.ts
+//#region ../vocab-runtime/dist/docloader-ClQraSWr.d.ts
 /**
 * Options for making `User-Agent` string.
 * @see {@link getUserAgent}

package/dist/{types-B028tKOW.js → types-Co-uPXfa.js}

@@ -3,7 +3,7 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { createRequire } from "node:module";
 import "@fedify/vocab";
-import { lookup } from "node:dns/promises";
+import dns from "node:dns/promises";
 import { isIP } from "node:net";
 import { getLogger } from "@logtape/logtape";
 import process$1 from "node:process";
@@ -31,7 +31,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 var __require = /* #__PURE__ */ (() => createRequire(import.meta.url))();
 //#endregion
-//#region ../vocab-runtime/dist/contexts-DoZUIW7y.js
+//#region ../vocab-runtime/dist/contexts-DPuJ4UYL.js
 const preloadedContexts = {
 	"https://www.w3.org/ns/activitystreams": { "@context": {
 		"@vocab": "_:",
@@ -4328,28 +4328,6 @@ const preloadedContexts = {
 			"@type": "@id"
 		}
 	} },
-	"https://w3id.org/fep/7aa9": { "@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"
-		}
-	} },
 	"https://www.w3.org/ns/cid/v1": { "@context": {
 		"@protected": true,
 		"id": "@id",
@@ -4469,6 +4447,28 @@ const preloadedContexts = {
 		},
 		"digestMultibase": "https://www.w3.org/ns/credentials/v2#digestMultibase"
 	} },
+	"https://w3id.org/fep/7aa9": { "@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"
+		}
+	} },
 	"https://join-lemmy.org/context.json": { "@context": ["https://w3id.org/security/v1", {
 		"as": "https://www.w3.org/ns/activitystreams#",
 		"lemmy": "https://join-lemmy.org/ns#",
@@ -4536,11 +4536,18 @@ const preloadedContexts = {
 	} }
 };
 //#endregion
-//#region ../vocab-runtime/dist/url-CEhi4hb4.js
+//#region ../vocab-runtime/dist/url-BHZYe8Vu.js
 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";
 	}
 };
 /**
@@ -4566,9 +4573,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);
 }
@@ -4597,7 +4607,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;
@@ -26104,7 +26114,7 @@ var require_src = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 require_build();
 var import_src = /* @__PURE__ */ __toESM(require_src(), 1);
 var name = "@fedify/vocab-runtime";
-var version = "2.4.0-dev.2149+e2302034";
+var version = "2.4.0-dev.2157+b76e5888";
 /**
 * Error thrown when fetching a JSON-LD document failed.
 */
@@ -26556,6 +26566,8 @@ async function getRemoteDocument(url, response, fetch, options) {
 }
 /**
 * 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`):
@@ -26568,6 +26580,7 @@ async function getRemoteDocument(url, response, fetch, options) {
 * - <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.
@@ -26591,7 +26604,11 @@ function getDocumentLoader({ allowPrivateAddress, maxRedirection, skipPreloadedC
 		if (!allowPrivateAddress) try {
 			await validatePublicUrl(currentUrl);
 		} catch (error) {
-			if (error instanceof UrlError) logger[options?.suppressError ? "warn" : "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[options?.suppressError ? "warn" : "error"]("Disallowed private URL: {url}", {
 				url: currentUrl,
 				error
 			});
@@ -26629,7 +26646,12 @@ function getDocumentLoader({ allowPrivateAddress, maxRedirection, skipPreloadedC
 					}
 					return await load(redirectUrl, options, redirected + 1, visited);
 				}
-				const result = await getRemoteDocument(currentUrl, response, load, options);
+				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);
+				}, options);
 				span.setAttribute("docloader.document_url", result.documentUrl);
 				if (result.contextUrl != null) span.setAttribute("docloader.context_url", result.contextUrl);
 				return result;
@@ -26645,7 +26667,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.4.0-dev.2149+e2302034",
+  "version": "2.4.0-dev.2157+b76e5888",
   "description": "ActivityPub relay support for Fedify",
   "keywords": [
     "Fedify",
@@ -47,14 +47,14 @@
   "dependencies": {
     "@logtape/logtape": "^2.2.0",
     "temporal-polyfill": "^1.0.1",
-    "@fedify/fedify": "^2.4.0-dev.2149+e2302034",
-    "@fedify/vocab": "2.4.0-dev.2149+e2302034"
+    "@fedify/fedify": "^2.4.0-dev.2157+b76e5888",
+    "@fedify/vocab": "2.4.0-dev.2157+b76e5888"
   },
   "devDependencies": {
     "tsdown": "^0.22.0",
     "typescript": "^6.0.0",
     "urlpattern-polyfill": "^10.1.0",
-    "@fedify/vocab-runtime": "^2.4.0-dev.2149+e2302034"
+    "@fedify/vocab-runtime": "^2.4.0-dev.2157+b76e5888"
   },
   "scripts": {
     "build:self": "tsdown",