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

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-runtime",
-  "version": "2.4.0-dev.2155+2ccc5085",
+  "version": "2.4.0-dev.2159+bb072eda",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts",

package/dist/{docloader-oRpq1nQ8.d.cts → docloader-ClQraSWr.d.cts}

@@ -184,6 +184,8 @@ interface GetDocumentLoaderOptions extends DocumentLoaderFactoryOptions {
 }
 /**
 * 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`):
@@ -196,6 +198,7 @@ interface GetDocumentLoaderOptions extends DocumentLoaderFactoryOptions {
 * - <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.

package/dist/{docloader-oRpq1nQ8.d.ts → docloader-ClQraSWr.d.ts}

@@ -184,6 +184,8 @@ interface GetDocumentLoaderOptions extends DocumentLoaderFactoryOptions {
 }
 /**
 * 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`):
@@ -196,6 +198,7 @@ interface GetDocumentLoaderOptions extends DocumentLoaderFactoryOptions {
 * - <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.

package/dist/internal/jsonld-cache.cjs

@@ -1,6 +1,6 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_url = require("../url-Cke4irYD.cjs");
+const require_url = require("../url-P6l9s9dN.cjs");
 const require_jsonld = require("../jsonld.cjs");
 //#region src/internal/jsonld-cache.ts
 const noJsonLdContext = Symbol("noJsonLdContext");

package/dist/internal/jsonld-cache.d.cts

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { n as DocumentLoader } from "../docloader-oRpq1nQ8.cjs";
+import { n as DocumentLoader } from "../docloader-ClQraSWr.cjs";
 
 //#region src/internal/jsonld-cache.d.ts
 /**

package/dist/internal/jsonld-cache.d.ts

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { n as DocumentLoader } from "../docloader-oRpq1nQ8.js";
+import { n as DocumentLoader } from "../docloader-ClQraSWr.js";
 
 //#region src/internal/jsonld-cache.d.ts
 /**

package/dist/internal/jsonld-cache.js

@@ -1,5 +1,5 @@
 
-import { a as formatIri, c as haveSameFe34Origin, l as haveSameIriOrigin } from "../url-CEhi4hb4.js";
+import { a as formatIri, c as haveSameFe34Origin, l as haveSameIriOrigin } from "../url-BHZYe8Vu.js";
 import jsonld_default from "../jsonld.js";
 //#region src/internal/jsonld-cache.ts
 const noJsonLdContext = Symbol("noJsonLdContext");

package/dist/internal/portable-dereference.cjs

@@ -1,7 +1,7 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_contexts = require("../contexts-2hEbs3Qk.cjs");
-const require_url = require("../url-Cke4irYD.cjs");
+const require_contexts = require("../contexts-BK1CqBR5.cjs");
+const require_url = require("../url-P6l9s9dN.cjs");
 const require_jsonld = require("../jsonld.cjs");
 const require_internal_jsonld_cache = require("./jsonld-cache.cjs");
 let _logtape_logtape = require("@logtape/logtape");

package/dist/internal/portable-dereference.d.cts

@@ -1,6 +1,6 @@
 /// <reference lib="esnext.temporal" />
-import { n as DocumentLoader, s as RemoteDocument } from "../docloader-oRpq1nQ8.cjs";
-import { r as PortableObjectVerifier } from "../portable-Drfl02vZ.cjs";
+import { n as DocumentLoader, s as RemoteDocument } from "../docloader-ClQraSWr.cjs";
+import { r as PortableObjectVerifier } from "../portable-ilkFPcXa.cjs";
 import { Span, TracerProvider } from "@opentelemetry/api";
 
 //#region src/internal/portable-dereference.d.ts

package/dist/internal/portable-dereference.d.ts

@@ -1,6 +1,6 @@
 /// <reference lib="esnext.temporal" />
-import { n as DocumentLoader, s as RemoteDocument } from "../docloader-oRpq1nQ8.js";
-import { r as PortableObjectVerifier } from "../portable-rwhiyMvY.js";
+import { n as DocumentLoader, s as RemoteDocument } from "../docloader-ClQraSWr.js";
+import { r as PortableObjectVerifier } from "../portable-DRtvOxTb.js";
 import { Span, TracerProvider } from "@opentelemetry/api";
 
 //#region src/internal/portable-dereference.d.ts

package/dist/internal/portable-dereference.js

@@ -1,6 +1,6 @@
 
-import { t as preloadedContexts } from "../contexts-DoZUIW7y.js";
-import { a as formatIri, c as haveSameFe34Origin, g as toCompatibleEf61Id, m as parseIri, o as fromCompatibleEf61Id, r as canonicalizePortableUri } from "../url-CEhi4hb4.js";
+import { t as preloadedContexts } from "../contexts-DPuJ4UYL.js";
+import { a as formatIri, c as haveSameFe34Origin, g as toCompatibleEf61Id, m as parseIri, o as fromCompatibleEf61Id, r as canonicalizePortableUri } from "../url-BHZYe8Vu.js";
 import jsonld_default from "../jsonld.js";
 import { createScopedContextLoader, registerDocumentLoaderWrapper, unwrapReleasedDocumentLoader } from "./jsonld-cache.js";
 import { getLogger } from "@logtape/logtape";

package/dist/internal/signed-representation.cjs

@@ -1,6 +1,6 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_contexts = require("../contexts-2hEbs3Qk.cjs");
+const require_contexts = require("../contexts-BK1CqBR5.cjs");
 //#region src/internal/signed-representation.ts
 const RETAINED_SIGNED_REPRESENTATION = Symbol.for("@fedify/vocab-runtime.signedRepresentation.v1");
 const SIGNED_VALUE_SCOPE = Symbol.for("@fedify/vocab-runtime.signedValueScope.v1");

package/dist/internal/signed-representation.js

@@ -1,5 +1,5 @@
 
-import { t as preloadedContexts } from "../contexts-DoZUIW7y.js";
+import { t as preloadedContexts } from "../contexts-DPuJ4UYL.js";
 //#region src/internal/signed-representation.ts
 const RETAINED_SIGNED_REPRESENTATION = Symbol.for("@fedify/vocab-runtime.signedRepresentation.v1");
 const SIGNED_VALUE_SCOPE = Symbol.for("@fedify/vocab-runtime.signedValueScope.v1");

package/dist/mod.cjs

@@ -1,8 +1,8 @@
 
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_rolldown_runtime = require("./rolldown-runtime-B7lfambq.cjs");
-const require_contexts = require("./contexts-2hEbs3Qk.cjs");
-const require_url = require("./url-Cke4irYD.cjs");
+const require_contexts = require("./contexts-BK1CqBR5.cjs");
+const require_url = require("./url-P6l9s9dN.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _opentelemetry_api = require("@opentelemetry/api");
 let node_process = require("node:process");
@@ -16,7 +16,7 @@ let _multiformats_base_x = require("@multiformats/base-x");
 _multiformats_base_x = require_rolldown_runtime.__toESM(_multiformats_base_x, 1);
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.4.0-dev.2155+2ccc5085";
+var version = "2.4.0-dev.2159+bb072eda";
 //#endregion
 //#region src/request.ts
 /**
@@ -476,6 +476,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`):
@@ -488,6 +490,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.
@@ -511,7 +514,11 @@ function getDocumentLoader({ allowPrivateAddress, maxRedirection, skipPreloadedC
 		if (!allowPrivateAddress) try {
 			await require_url.validatePublicUrl(currentUrl);
 		} catch (error) {
-			if (error instanceof require_url.UrlError) logger[options?.suppressError ? "warn" : "error"]("Disallowed private URL: {url}", {
+			if (error instanceof require_url.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
 			});
@@ -549,7 +556,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;
@@ -565,7 +577,7 @@ function getDocumentLoader({ allowPrivateAddress, maxRedirection, skipPreloadedC
 			}
 		});
 	}
-	return load;
+	return (url, options) => load(url, options);
 }
 //#endregion
 //#region src/internal/multicodec.ts

package/dist/mod.d.cts

@@ -1,6 +1,6 @@
 /// <reference lib="esnext.temporal" />
-import { a as DocumentLoaderOptions, c as getDocumentLoader, d as FetchError, f as GetUserAgentOptions, h as logRequest, i as DocumentLoaderFactoryOptions, l as getRemoteDocument, m as getUserAgent, n as DocumentLoader, o as GetDocumentLoaderOptions, p as createActivityPubRequest, r as DocumentLoaderFactory, s as RemoteDocument, t as AuthenticatedDocumentLoaderFactory, u as CreateRequestOptions } from "./docloader-oRpq1nQ8.cjs";
-import { i as PortableObjectVerifierOptions, n as PortableObjectVerification, r as PortableObjectVerifier, t as PortableObjectReferrer } from "./portable-Drfl02vZ.cjs";
+import { a as DocumentLoaderOptions, c as getDocumentLoader, d as FetchError, f as GetUserAgentOptions, h as logRequest, i as DocumentLoaderFactoryOptions, l as getRemoteDocument, m as getUserAgent, n as DocumentLoader, o as GetDocumentLoaderOptions, p as createActivityPubRequest, r as DocumentLoaderFactory, s as RemoteDocument, t as AuthenticatedDocumentLoaderFactory, u as CreateRequestOptions } from "./docloader-ClQraSWr.cjs";
+import { i as PortableObjectVerifierOptions, n as PortableObjectVerification, r as PortableObjectVerifier, t as PortableObjectReferrer } from "./portable-ilkFPcXa.cjs";
 import { TracerProvider } from "@opentelemetry/api";
 
 //#region src/contexts.d.ts
@@ -406,8 +406,15 @@ type PropertyPreprocessor<T = unknown> = (value: Json, context: PropertyPreproce
 //#endregion
 //#region src/url.d.ts
 declare class UrlError extends Error {
+  /**
+  * The failure category. Defaults to `"disallowed"`.
+  * `"dns"` includes lookup errors and results with no usable IP addresses.
+  * @since 2.0.29
+  */
+  readonly reason: "dns" | "disallowed";
   constructor(message: string, options?: {
     cause?: unknown;
+    reason?: "dns" | "disallowed";
   });
 }
 /**

package/dist/mod.d.ts

@@ -1,6 +1,6 @@
 /// <reference lib="esnext.temporal" />
-import { a as DocumentLoaderOptions, c as getDocumentLoader, d as FetchError, f as GetUserAgentOptions, h as logRequest, i as DocumentLoaderFactoryOptions, l as getRemoteDocument, m as getUserAgent, n as DocumentLoader, o as GetDocumentLoaderOptions, p as createActivityPubRequest, r as DocumentLoaderFactory, s as RemoteDocument, t as AuthenticatedDocumentLoaderFactory, u as CreateRequestOptions } from "./docloader-oRpq1nQ8.js";
-import { i as PortableObjectVerifierOptions, n as PortableObjectVerification, r as PortableObjectVerifier, t as PortableObjectReferrer } from "./portable-rwhiyMvY.js";
+import { a as DocumentLoaderOptions, c as getDocumentLoader, d as FetchError, f as GetUserAgentOptions, h as logRequest, i as DocumentLoaderFactoryOptions, l as getRemoteDocument, m as getUserAgent, n as DocumentLoader, o as GetDocumentLoaderOptions, p as createActivityPubRequest, r as DocumentLoaderFactory, s as RemoteDocument, t as AuthenticatedDocumentLoaderFactory, u as CreateRequestOptions } from "./docloader-ClQraSWr.js";
+import { i as PortableObjectVerifierOptions, n as PortableObjectVerification, r as PortableObjectVerifier, t as PortableObjectReferrer } from "./portable-DRtvOxTb.js";
 import { TracerProvider } from "@opentelemetry/api";
 //#region src/contexts.d.ts
 declare const preloadedContexts: Record<string, unknown>;
@@ -405,8 +405,15 @@ type PropertyPreprocessor<T = unknown> = (value: Json, context: PropertyPreproce
 //#endregion
 //#region src/url.d.ts
 declare class UrlError extends Error {
+  /**
+  * The failure category. Defaults to `"disallowed"`.
+  * `"dns"` includes lookup errors and results with no usable IP addresses.
+  * @since 2.0.29
+  */
+  readonly reason: "dns" | "disallowed";
   constructor(message: string, options?: {
     cause?: unknown;
+    reason?: "dns" | "disallowed";
   });
 }
 /**

package/dist/mod.js

@@ -1,6 +1,6 @@
 
-import { t as preloadedContexts } from "./contexts-DoZUIW7y.js";
-import { _ as validatePublicUrl, a as formatIri, c as haveSameFe34Origin, d as isValidPublicIPv4Address, f as isValidPublicIPv6Address, g as toCompatibleEf61Id, h as parseJsonLdId, i as expandIPv6Address, l as haveSameIriOrigin, m as parseIri, n as arePortableUrisEqual, o as fromCompatibleEf61Id, p as parseGatewayUrl, r as canonicalizePortableUri, s as getFe34Origin, t as UrlError, u as isGatewayUrl } from "./url-CEhi4hb4.js";
+import { t as preloadedContexts } from "./contexts-DPuJ4UYL.js";
+import { _ as validatePublicUrl, a as formatIri, c as haveSameFe34Origin, d as isValidPublicIPv4Address, f as isValidPublicIPv6Address, g as toCompatibleEf61Id, h as parseJsonLdId, i as expandIPv6Address, l as haveSameIriOrigin, m as parseIri, n as arePortableUrisEqual, o as fromCompatibleEf61Id, p as parseGatewayUrl, r as canonicalizePortableUri, s as getFe34Origin, t as UrlError, u as isGatewayUrl } from "./url-BHZYe8Vu.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import process from "node:process";
@@ -12,7 +12,7 @@ import { PublicKeyInfo } from "pkijs";
 import baseX from "@multiformats/base-x";
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.4.0-dev.2155+2ccc5085";
+var version = "2.4.0-dev.2159+bb072eda";
 //#endregion
 //#region src/request.ts
 /**
@@ -472,6 +472,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`):
@@ -484,6 +486,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.
@@ -507,7 +510,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
 			});
@@ -545,7 +552,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;
@@ -561,7 +573,7 @@ function getDocumentLoader({ allowPrivateAddress, maxRedirection, skipPreloadedC
 			}
 		});
 	}
-	return load;
+	return (url, options) => load(url, options);
 }
 //#endregion
 //#region src/internal/multicodec.ts

package/dist/{portable-rwhiyMvY.d.ts → portable-DRtvOxTb.d.ts}

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { n as DocumentLoader } from "./docloader-oRpq1nQ8.js";
+import { n as DocumentLoader } from "./docloader-ClQraSWr.js";
 import { TracerProvider } from "@opentelemetry/api";
 
 //#region src/portable.d.ts

package/dist/{portable-Drfl02vZ.d.cts → portable-ilkFPcXa.d.cts}

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { n as DocumentLoader } from "./docloader-oRpq1nQ8.cjs";
+import { n as DocumentLoader } from "./docloader-ClQraSWr.cjs";
 import { TracerProvider } from "@opentelemetry/api";
 
 //#region src/portable.d.ts

package/dist/tests/{body-BJRBGr6n.mjs → body-BtHFjNgj.mjs}

@@ -1,4 +1,4 @@
-import { t as FetchError } from "./request-BzZ8Wn6I.mjs";
+import { t as FetchError } from "./request-1y3WTvsB.mjs";
 import { getLogger } from "@logtape/logtape";
 //#region src/body.ts
 /** Decoded JSON body limit: 16 MiB.  @internal */

package/dist/tests/{body-CLlfvGkr.cjs → body-qXqIp808.cjs}

@@ -1,4 +1,4 @@
-const require_request = require("./request-Dt_khD3j.cjs");
+const require_request = require("./request-nfOih0SA.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 //#region src/body.ts
 /** Decoded JSON body limit: 16 MiB.  @internal */

package/dist/tests/body.test.cjs

@@ -1,4 +1,4 @@
-const require_body = require("./body-CLlfvGkr.cjs");
+const require_body = require("./body-qXqIp808.cjs");
 let node_assert_strict = require("node:assert/strict");
 let node_test = require("node:test");
 let node_zlib = require("node:zlib");

package/dist/tests/body.test.mjs

@@ -1,4 +1,4 @@
-import { r as readBoundedText, t as BodyTooLargeError } from "./body-BJRBGr6n.mjs";
+import { r as readBoundedText, t as BodyTooLargeError } from "./body-BtHFjNgj.mjs";
 import { deepStrictEqual, ok, rejects } from "node:assert/strict";
 import { test } from "node:test";
 import { gunzipSync, gzipSync } from "node:zlib";

package/dist/tests/decimal.test.cjs

@@ -1,5 +1,5 @@
-require("./url-BqlldzT8.cjs");
-require("./docloader-s_sA2gs3.cjs");
+require("./url-gLKqAO1H.cjs");
+require("./docloader-DeoYwxVw.cjs");
 require("./key-C-AYkdJJ.cjs");
 require("./multibase-B5Mea7Ip.cjs");
 require("./digest-3FeH2Y-Q.cjs");

package/dist/tests/decimal.test.mjs

@@ -1,5 +1,5 @@
-import "./url-DgJM9WJn.mjs";
-import "./docloader-DsoAI6Tk.mjs";
+import "./url-D7qRF-dF.mjs";
+import "./docloader-D6THKCoD.mjs";
 import "./key-C2Db_TAJ.mjs";
 import "./multibase-BPnF_L4e.mjs";
 import "./digest-COC7xDiQ.mjs";

package/dist/tests/{docloader-DsoAI6Tk.mjs → docloader-D6THKCoD.mjs}

@@ -1,8 +1,8 @@
-import { a as name, i as logRequest, n as createActivityPubRequest, o as version, t as FetchError } from "./request-BzZ8Wn6I.mjs";
-import { n as MAX_BODY_SIZE, r as readBoundedText, t as BodyTooLargeError } from "./body-BJRBGr6n.mjs";
-import { t as preloadedContexts } from "./contexts-BBX_qhBL.mjs";
+import { a as name, i as logRequest, n as createActivityPubRequest, o as version, t as FetchError } from "./request-1y3WTvsB.mjs";
+import { n as MAX_BODY_SIZE, r as readBoundedText, t as BodyTooLargeError } from "./body-BtHFjNgj.mjs";
+import { t as preloadedContexts } from "./contexts-CIKsin4e.mjs";
 import { t as HttpHeaderLink } from "./link-Cevmc87v.mjs";
-import { t as UrlError, v as validatePublicUrl } from "./url-DgJM9WJn.mjs";
+import { t as UrlError, v as validatePublicUrl } from "./url-D7qRF-dF.mjs";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 //#region src/docloader.ts
@@ -132,6 +132,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`):
@@ -144,6 +146,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.
@@ -167,7 +170,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
 			});
@@ -205,7 +212,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;
@@ -221,7 +233,7 @@ function getDocumentLoader({ allowPrivateAddress, maxRedirection, skipPreloadedC
 			}
 		});
 	}
-	return load;
+	return (url, options) => load(url, options);
 }
 //#endregion
 export { getRemoteDocument as n, getDocumentLoader as t };

package/dist/tests/{docloader-s_sA2gs3.cjs → docloader-DeoYwxVw.cjs}

@@ -1,8 +1,8 @@
-const require_request = require("./request-Dt_khD3j.cjs");
-const require_body = require("./body-CLlfvGkr.cjs");
-const require_contexts = require("./contexts-Ch3v2Cgu.cjs");
+const require_request = require("./request-nfOih0SA.cjs");
+const require_body = require("./body-qXqIp808.cjs");
+const require_contexts = require("./contexts-DizzBjz4.cjs");
 const require_link = require("./link-DlKm8bEr.cjs");
-const require_url = require("./url-BqlldzT8.cjs");
+const require_url = require("./url-gLKqAO1H.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _opentelemetry_api = require("@opentelemetry/api");
 //#region src/docloader.ts
@@ -132,6 +132,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`):
@@ -144,6 +146,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.
@@ -167,7 +170,11 @@ function getDocumentLoader({ allowPrivateAddress, maxRedirection, skipPreloadedC
 		if (!allowPrivateAddress) try {
 			await require_url.validatePublicUrl(currentUrl);
 		} catch (error) {
-			if (error instanceof require_url.UrlError) logger[options?.suppressError ? "warn" : "error"]("Disallowed private URL: {url}", {
+			if (error instanceof require_url.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
 			});
@@ -205,7 +212,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 require_request.FetchError(currentUrl, `Too many redirections (${redirected + 1})`);
+					if (visited.has(alternateUrl)) throw new require_request.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;
@@ -221,7 +233,7 @@ function getDocumentLoader({ allowPrivateAddress, maxRedirection, skipPreloadedC
 			}
 		});
 	}
-	return load;
+	return (url, options) => load(url, options);
 }
 //#endregion
 Object.defineProperty(exports, "getDocumentLoader", {