@fedify/vocab-runtime 2.1.0 → 2.1.2

package/dist/tests/{docloader-U31begIa.js → docloader-DiLx08rm.mjs}

@@ -1,11 +1,10 @@
-import { FetchError, createActivityPubRequest, deno_default, logRequest } from "./request-BH_NlxCL.js";
-import { HttpHeaderLink } from "./link-C3q2TC2G.js";
-import { UrlError, validatePublicUrl } from "./url-CWEP9Zs9.js";
+import { a as name, i as logRequest, n as createActivityPubRequest, o as version, t as FetchError } from "./request-Nob25QBF.mjs";
+import { t as HttpHeaderLink } from "./link-NUUWCdnK.mjs";
+import { a as validatePublicUrl, t as UrlError } from "./url-BQ_kgmCk.mjs";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
-
 //#region src/contexts/activitystreams.json
-var __context$11 = {
+var activitystreams_default = { "@context": {
 	"@vocab": "_:",
 	"xsd": "http://www.w3.org/2001/XMLSchema#",
 	"as": "https://www.w3.org/ns/activitystreams#",
@@ -381,12 +380,10 @@ var __context$11 = {
 		"@id": "as:alsoKnownAs",
 		"@type": "@id"
 	}
-};
-var activitystreams_default = { "@context": __context$11 };
-
+} };
 //#endregion
 //#region src/contexts/did-v1.json
-var __context$10 = {
+var did_v1_default = { "@context": {
 	"@protected": true,
 	"id": "@id",
 	"type": "@type",
@@ -440,12 +437,10 @@ var __context$10 = {
 		"@id": "https://w3id.org/security#verificationMethod",
 		"@type": "@id"
 	}
-};
-var did_v1_default = { "@context": __context$10 };
-
+} };
 //#endregion
 //#region src/contexts/fep-5711.json
-var __context$9 = {
+var fep_5711_default = { "@context": {
 	"likesOf": {
 		"@id": "https://w3id.org/fep/5711#likesOf",
 		"@type": "@id"
@@ -478,12 +473,10 @@ var __context$9 = {
 		"@id": "https://w3id.org/fep/5711#likedOf",
 		"@type": "@id"
 	}
-};
-var fep_5711_default = { "@context": __context$9 };
-
+} };
 //#endregion
 //#region src/contexts/gotosocial.json
-var __context$8 = {
+var gotosocial_default = { "@context": {
 	"xsd": "http://www.w3.org/2001/XMLSchema#",
 	"gts": "https://gotosocial.org/ns#",
 	"LikeRequest": "gts:LikeRequest",
@@ -566,12 +559,10 @@ var __context$8 = {
 		"@id": "gts:approvedBy",
 		"@type": "@id"
 	}
-};
-var gotosocial_default = { "@context": __context$8 };
-
+} };
 //#endregion
 //#region src/contexts/identity-v1.json
-var __context$7 = {
+var identity_v1_default = { "@context": {
 	"id": "@id",
 	"type": "@type",
 	"cred": "https://w3id.org/credentials#",
@@ -720,12 +711,10 @@ var __context$7 = {
 		"@id": "perm:writePermission",
 		"@type": "@id"
 	}
-};
-var identity_v1_default = { "@context": __context$7 };
-
+} };
 //#endregion
 //#region src/contexts/joinmastodon.json
-var __context$6 = {
+var joinmastodon_default = { "@context": {
 	"toot": "http://joinmastodon.org/ns#",
 	"Emoji": "toot:Emoji",
 	"featured": {
@@ -750,12 +739,10 @@ var __context$6 = {
 		"@id": "toot:attributionDomains",
 		"@type": "@id"
 	}
-};
-var joinmastodon_default = { "@context": __context$6 };
-
+} };
 //#endregion
 //#region src/contexts/schemaorg.json
-var __context$5 = {
+var schemaorg_default = { "@context": {
 	"type": "@type",
 	"id": "@id",
 	"HTML": { "@id": "rdf:HTML" },
@@ -4057,12 +4044,10 @@ var __context$5 = {
 	"yearlyRevenue": { "@id": "schema:yearlyRevenue" },
 	"yearsInOperation": { "@id": "schema:yearsInOperation" },
 	"yield": { "@id": "schema:yield" }
-};
-var schemaorg_default = { "@context": __context$5 };
-
+} };
 //#endregion
 //#region src/contexts/security-data-integrity-v1.json
-var __context$4 = {
+var security_data_integrity_v1_default = { "@context": {
 	"id": "@id",
 	"type": "@type",
 	"@protected": true,
@@ -4137,12 +4122,10 @@ var __context$4 = {
 			}
 		}
 	}
-};
-var security_data_integrity_v1_default = { "@context": __context$4 };
-
+} };
 //#endregion
 //#region src/contexts/security-data-integrity-v2.json
-var __context$3 = {
+var security_data_integrity_v2_default = { "@context": {
 	"id": "@id",
 	"type": "@type",
 	"@protected": true,
@@ -4220,12 +4203,10 @@ var __context$3 = {
 			}
 		}
 	}
-};
-var security_data_integrity_v2_default = { "@context": __context$3 };
-
+} };
 //#endregion
 //#region src/contexts/security-multikey-v1.json
-var __context$2 = {
+var security_multikey_v1_default = { "@context": {
 	"id": "@id",
 	"type": "@type",
 	"@protected": true,
@@ -4257,12 +4238,10 @@ var __context$2 = {
 			}
 		}
 	}
-};
-var security_multikey_v1_default = { "@context": __context$2 };
-
+} };
 //#endregion
 //#region src/contexts/security-v1.json
-var __context$1 = {
+var security_v1_default = { "@context": {
 	"id": "@id",
 	"type": "@type",
 	"dc": "http://purl.org/dc/terms/",
@@ -4333,21 +4312,17 @@ var __context$1 = {
 	"signature": "sec:signature",
 	"signatureAlgorithm": "sec:signingAlgorithm",
 	"signatureValue": "sec:signatureValue"
-};
-var security_v1_default = { "@context": __context$1 };
-
+} };
 //#endregion
 //#region src/contexts/webfinger.json
-var __context = {
+var webfinger_default = { "@context": {
 	"wf": "https://purl.archive.org/socialweb/webfinger#",
 	"xsd": "http://www.w3.org/2001/XMLSchema#",
 	"webfinger": {
 		"@id": "wf:webfinger",
 		"@type": "xsd:string"
 	}
-};
-var webfinger_default = { "@context": __context };
-
+} };
 //#endregion
 //#region src/contexts.ts
 const preloadedContexts = {
@@ -4364,8 +4339,6 @@ const preloadedContexts = {
 	"https://w3id.org/fep/5711": fep_5711_default,
 	"http://joinmastodon.org/ns": joinmastodon_default
 };
-var contexts_default = preloadedContexts;
-
 //#endregion
 //#region src/docloader.ts
 const logger = getLogger([
@@ -4373,6 +4346,7 @@ const logger = getLogger([
 	"runtime",
 	"docloader"
 ]);
+const DEFAULT_MAX_REDIRECTION = 20;
 /**
 * Gets a {@link RemoteDocument} from the given response.
 * @param url The URL of the document to load.
@@ -4382,7 +4356,7 @@ const logger = getLogger([
 * @throws {FetchError} If the response is not OK.
 * @internal
 */
-async function getRemoteDocument(url, response, fetch$1) {
+async function getRemoteDocument(url, response, fetch) {
 	const documentUrl = response.url === "" ? url : response.url;
 	const docUrl = new URL(documentUrl);
 	if (!response.ok) {
@@ -4420,7 +4394,7 @@ async function getRemoteDocument(url, response, fetch$1) {
 						alternateUrl: altUri.href,
 						url: documentUrl
 					});
-					return await fetch$1(altUri.href);
+					return await fetch(altUri.href);
 				}
 			}
 		}
@@ -4446,15 +4420,14 @@ async function getRemoteDocument(url, response, fetch$1) {
 				attrPattern.lastIndex = 0;
 				while ((attrMatch = attrPattern.exec(tagContent)) !== null) {
 					const key = attrMatch[1].toLowerCase();
-					const value = attrMatch[2] ?? attrMatch[3] ?? attrMatch[4] ?? "";
-					attribs[key] = value;
+					attribs[key] = attrMatch[2] ?? attrMatch[3] ?? attrMatch[4] ?? "";
 				}
 				if (attribs.rel === "alternate" && "type" in attribs && (attribs.type === "application/activity+json" || attribs.type === "application/ld+json" || attribs.type.startsWith("application/ld+json;")) && "href" in attribs && new URL(attribs.href, docUrl).href !== docUrl.href) {
 					logger.debug("Found alternate document: {alternateUrl} from {url}", {
 						alternateUrl: attribs.href,
 						url: documentUrl
 					});
-					return await fetch$1(new URL(attribs.href, docUrl).href);
+					return await fetch(new URL(attribs.href, docUrl).href);
 				}
 			}
 			document = JSON.parse(html);
@@ -4489,33 +4462,34 @@ async function getRemoteDocument(url, response, fetch$1) {
 * @since 1.3.0
 */
 function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAgent } = {}) {
-	const tracerProvider = trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
-	async function load(url, options) {
+	const tracer = trace.getTracerProvider().getTracer(name, version);
+	async function load(url, options, redirected = 0, visited = /* @__PURE__ */ new Set()) {
 		options?.signal?.throwIfAborted();
-		if (!skipPreloadedContexts && url in contexts_default) {
-			logger.debug("Using preloaded context: {url}.", { url });
+		const currentUrl = new URL(url).href;
+		if (!skipPreloadedContexts && currentUrl in preloadedContexts) {
+			logger.debug("Using preloaded context: {url}.", { url: currentUrl });
 			return {
 				contextUrl: null,
-				document: contexts_default[url],
-				documentUrl: url
+				document: preloadedContexts[currentUrl],
+				documentUrl: currentUrl
 			};
 		}
 		if (!allowPrivateAddress) try {
-			await validatePublicUrl(url);
+			await validatePublicUrl(currentUrl);
 		} catch (error) {
 			if (error instanceof UrlError) logger.error("Disallowed private URL: {url}", {
-				url,
+				url: currentUrl,
 				error
 			});
 			throw error;
 		}
+		visited.add(currentUrl);
 		return await tracer.startActiveSpan("activitypub.fetch_document", {
 			kind: SpanKind.CLIENT,
-			attributes: { "url.full": url }
+			attributes: { "url.full": currentUrl }
 		}, async (span) => {
 			try {
-				const request = createActivityPubRequest(url, { userAgent });
+				const request = createActivityPubRequest(currentUrl, { userAgent });
 				logRequest(logger, request);
 				const response = await fetch(request, {
 					redirect: "manual",
@@ -4523,11 +4497,25 @@ function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAge
 				});
 				span.setAttribute("http.response.status_code", response.status);
 				if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
-					const redirectUrl = response.headers.get("Location");
+					if (redirected >= DEFAULT_MAX_REDIRECTION) {
+						logger.error("Too many redirections ({redirections}) while fetching document.", {
+							redirections: redirected + 1,
+							url: currentUrl
+						});
+						throw new FetchError(currentUrl, `Too many redirections (${redirected + 1})`);
+					}
+					const redirectUrl = new URL(response.headers.get("Location"), response.url === "" ? currentUrl : response.url).href;
 					span.setAttribute("http.redirect.url", redirectUrl);
-					return await load(redirectUrl, options);
+					if (visited.has(redirectUrl)) {
+						logger.error("Detected a redirect loop while fetching document: {url} -> {redirectUrl}", {
+							url: currentUrl,
+							redirectUrl
+						});
+						throw new FetchError(currentUrl, `Redirect loop detected: ${redirectUrl}`);
+					}
+					return await load(redirectUrl, options, redirected + 1, visited);
 				}
-				const result = await getRemoteDocument(url, response, load);
+				const result = await getRemoteDocument(currentUrl, response, load);
 				span.setAttribute("docloader.document_url", result.documentUrl);
 				if (result.contextUrl != null) span.setAttribute("docloader.context_url", result.contextUrl);
 				return result;
@@ -4545,6 +4533,5 @@ function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAge
 	}
 	return load;
 }
-
 //#endregion
-export { contexts_default, getDocumentLoader };
+export { preloadedContexts as n, getDocumentLoader as t };