@fedify/vocab-runtime 2.4.0-pr.936.41 → 2.4.1

package/dist/{tests/docloader-S_gQZ2tt.cjs → contexts-DWrj4AGR.js}

@@ -1,9 +1,4 @@
-require("./chunk-C2EiDwsr.cjs");
-const require_request = require("./request-uk51rkhO.cjs");
-const require_link = require("./link-FguCydMA.cjs");
-const require_url = require("./url-CsOV_B_P.cjs");
-let _logtape_logtape = require("@logtape/logtape");
-let _opentelemetry_api = require("@opentelemetry/api");
+
 //#endregion
 //#region src/contexts.ts
 const preloadedContexts = {
@@ -4240,6 +4235,34 @@ const preloadedContexts = {
 			"@type": "@id"
 		}
 	} },
+	"https://w3id.org/fep/22cd": { "@context": {
+		"fep-22cd": "https://w3id.org/fep/22cd#",
+		"schema": "https://schema.org/",
+		"xsd": "http://www.w3.org/2001/XMLSchema#",
+		"translations": {
+			"@id": "fep-22cd:translations",
+			"@container": "@set"
+		},
+		"Translation": "fep-22cd:Translation",
+		"sourceUpdated": {
+			"@id": "fep-22cd:sourceUpdated",
+			"@type": "xsd:dateTime"
+		},
+		"translator": {
+			"@id": "schema:translator",
+			"@type": "@id",
+			"@container": "@set"
+		},
+		"inLanguage": "schema:inLanguage",
+		"translationOfWork": {
+			"@id": "schema:translationOfWork",
+			"@type": "@id"
+		},
+		"isBasedOn": {
+			"@id": "schema:isBasedOn",
+			"@type": "@id"
+		}
+	} },
 	"https://w3id.org/fep/5711": { "@context": {
 		"likesOf": {
 			"@id": "https://w3id.org/fep/5711#likesOf",
@@ -4274,6 +4297,125 @@ const preloadedContexts = {
 			"@type": "@id"
 		}
 	} },
+	"https://www.w3.org/ns/cid/v1": { "@context": {
+		"@protected": true,
+		"id": "@id",
+		"type": "@type",
+		"alsoKnownAs": {
+			"@id": "https://www.w3.org/ns/activitystreams#alsoKnownAs",
+			"@type": "@id"
+		},
+		"assertionMethod": {
+			"@id": "https://w3id.org/security#assertionMethod",
+			"@type": "@id",
+			"@container": "@set"
+		},
+		"authentication": {
+			"@id": "https://w3id.org/security#authenticationMethod",
+			"@type": "@id",
+			"@container": "@set"
+		},
+		"capabilityDelegation": {
+			"@id": "https://w3id.org/security#capabilityDelegationMethod",
+			"@type": "@id",
+			"@container": "@set"
+		},
+		"capabilityInvocation": {
+			"@id": "https://w3id.org/security#capabilityInvocationMethod",
+			"@type": "@id",
+			"@container": "@set"
+		},
+		"controller": {
+			"@id": "https://w3id.org/security#controller",
+			"@type": "@id"
+		},
+		"keyAgreement": {
+			"@id": "https://w3id.org/security#keyAgreementMethod",
+			"@type": "@id",
+			"@container": "@set"
+		},
+		"service": {
+			"@id": "https://www.w3.org/ns/did#service",
+			"@type": "@id",
+			"@context": {
+				"@protected": true,
+				"id": "@id",
+				"type": "@type",
+				"serviceEndpoint": {
+					"@id": "https://www.w3.org/ns/did#serviceEndpoint",
+					"@type": "@id"
+				}
+			}
+		},
+		"verificationMethod": {
+			"@id": "https://w3id.org/security#verificationMethod",
+			"@type": "@id"
+		},
+		"Multikey": {
+			"@id": "https://w3id.org/security#Multikey",
+			"@context": {
+				"@protected": true,
+				"id": "@id",
+				"type": "@type",
+				"controller": {
+					"@id": "https://w3id.org/security#controller",
+					"@type": "@id"
+				},
+				"revoked": {
+					"@id": "https://w3id.org/security#revoked",
+					"@type": "http://www.w3.org/2001/XMLSchema#dateTime"
+				},
+				"expires": {
+					"@id": "https://w3id.org/security#expiration",
+					"@type": "http://www.w3.org/2001/XMLSchema#dateTime"
+				},
+				"publicKeyMultibase": {
+					"@id": "https://w3id.org/security#publicKeyMultibase",
+					"@type": "https://w3id.org/security#multibase"
+				},
+				"secretKeyMultibase": {
+					"@id": "https://w3id.org/security#secretKeyMultibase",
+					"@type": "https://w3id.org/security#multibase"
+				}
+			}
+		},
+		"JsonWebKey": {
+			"@id": "https://w3id.org/security#JsonWebKey",
+			"@context": {
+				"@protected": true,
+				"id": "@id",
+				"type": "@type",
+				"controller": {
+					"@id": "https://w3id.org/security#controller",
+					"@type": "@id"
+				},
+				"revoked": {
+					"@id": "https://w3id.org/security#revoked",
+					"@type": "http://www.w3.org/2001/XMLSchema#dateTime"
+				},
+				"expires": {
+					"@id": "https://w3id.org/security#expiration",
+					"@type": "http://www.w3.org/2001/XMLSchema#dateTime"
+				},
+				"publicKeyJwk": {
+					"@id": "https://w3id.org/security#publicKeyJwk",
+					"@type": "@json"
+				},
+				"secretKeyJwk": {
+					"@id": "https://w3id.org/security#secretKeyJwk",
+					"@type": "@json"
+				}
+			}
+		}
+	} },
+	"https://w3id.org/fep/ef61": { "@context": {
+		"gateways": {
+			"@id": "https://w3id.org/fep/ef61/gateways",
+			"@type": "@id",
+			"@container": "@list"
+		},
+		"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",
@@ -4296,13 +4438,15 @@ const preloadedContexts = {
 			"@type": "@id"
 		}
 	} },
-	"https://w3id.org/fep/ef61": { "@context": {
-		"gateways": {
-			"@id": "https://w3id.org/fep/ef61/gateways",
-			"@type": "@id",
-			"@container": "@list"
+	"https://w3id.org/fep/6757": { "@context": {
+		"license": {
+			"@id": "http://purl.org/dc/terms/license",
+			"@type": "@id"
 		},
-		"digestMultibase": "https://www.w3.org/ns/credentials/v2#digestMultibase"
+		"preferredLicense": {
+			"@id": "https://w3id.org/fep/6757#preferredLicense",
+			"@type": "@id"
+		}
 	} },
 	"https://join-lemmy.org/context.json": { "@context": ["https://w3id.org/security/v1", {
 		"as": "https://www.w3.org/ns/activitystreams#",
@@ -4355,288 +4499,20 @@ const preloadedContexts = {
 		"suspended": "toot:suspended",
 		"attributionDomains": {
 			"@id": "toot:attributionDomains",
-			"@type": "@id"
+			"@container": "@set"
 		}
+	} },
+	"https://purl.archive.org/miscellany": { "@context": {
+		"as": "https://www.w3.org/ns/activitystreams#",
+		"xsd": "http://www.w3.org/2001/XMLSchema#",
+		"Hashtag": "as:Hashtag",
+		"manuallyApprovesFollowers": { "@id": "as:manuallyApprovesFollowers" },
+		"movedTo": {
+			"@id": "as:movedTo",
+			"@type": "@id"
+		},
+		"sensitive": { "@id": "as:sensitive" }
 	} }
 };
 //#endregion
-//#region src/docloader.ts
-const logger = (0, _logtape_logtape.getLogger)([
-	"fedify",
-	"runtime",
-	"docloader"
-]);
-const DEFAULT_MAX_REDIRECTION = 20;
-const MAX_HTML_SIZE = 1024 * 1024;
-function createResponseMetadata(response) {
-	return new Response(null, {
-		headers: response.headers,
-		status: response.status,
-		statusText: response.statusText
-	});
-}
-async function cancelResponseBody(response) {
-	if (response.body != null) await response.body.cancel();
-}
-async function readBoundedText(response, maxBytes) {
-	const contentLength = response.headers.get("Content-Length");
-	if (contentLength != null) {
-		const size = Number(contentLength);
-		if (size > maxBytes) {
-			await cancelResponseBody(response);
-			return {
-				text: "",
-				size,
-				tooLarge: true
-			};
-		}
-	}
-	if (response.body == null) return {
-		text: "",
-		size: 0,
-		tooLarge: false
-	};
-	const reader = response.body.getReader();
-	const decoder = new TextDecoder();
-	let text = "";
-	let size = 0;
-	try {
-		while (true) {
-			const result = await reader.read();
-			if (result.done) break;
-			const chunkSize = result.value.byteLength;
-			if (size + chunkSize > maxBytes) {
-				size += chunkSize;
-				await reader.cancel();
-				return {
-					text: "",
-					size,
-					tooLarge: true
-				};
-			}
-			size += chunkSize;
-			text += decoder.decode(result.value, { stream: true });
-		}
-		text += decoder.decode();
-		return {
-			text,
-			size,
-			tooLarge: false
-		};
-	} finally {
-		reader.releaseLock();
-	}
-}
-/**
-* Gets a {@link RemoteDocument} from the given response.
-* @param url The URL of the document to load.
-* @param response The response to get the document from.
-* @param fetch The function to fetch the document.
-* @returns The loaded remote document.
-* @throws {FetchError} If the response is not OK.
-* @internal
-*/
-async function getRemoteDocument(url, response, fetch) {
-	const documentUrl = response.url === "" ? url : response.url;
-	const docUrl = new URL(documentUrl);
-	if (!response.ok) {
-		logger.error("Failed to fetch document: {status} {url} {headers}", {
-			status: response.status,
-			url: documentUrl,
-			headers: Object.fromEntries(response.headers.entries())
-		});
-		throw new require_request.FetchError(documentUrl, `HTTP ${response.status}: ${documentUrl}`, response.clone());
-	}
-	const contentType = response.headers.get("Content-Type");
-	const jsonLd = contentType == null || contentType === "application/activity+json" || contentType.startsWith("application/activity+json;") || contentType === "application/ld+json" || contentType.startsWith("application/ld+json;");
-	const linkHeader = response.headers.get("Link");
-	let contextUrl = null;
-	if (linkHeader != null) {
-		let link;
-		try {
-			link = new require_link.HttpHeaderLink(linkHeader);
-		} catch (e) {
-			if (e instanceof SyntaxError) link = new require_link.HttpHeaderLink();
-			else throw e;
-		}
-		if (jsonLd) {
-			const entries = link.getByRel("http://www.w3.org/ns/json-ld#context");
-			for (const [uri, params] of entries) if ("type" in params && params.type === "application/ld+json") {
-				contextUrl = uri;
-				break;
-			}
-		} else {
-			const entries = link.getByRel("alternate");
-			for (const [uri, params] of entries) {
-				const altUri = new URL(uri, docUrl);
-				if ("type" in params && (params.type === "application/activity+json" || params.type === "application/ld+json" || params.type.startsWith("application/ld+json;")) && altUri.href !== docUrl.href) {
-					logger.debug("Found alternate document: {alternateUrl} from {url}", {
-						alternateUrl: altUri.href,
-						url: documentUrl
-					});
-					return await fetch(altUri.href);
-				}
-			}
-		}
-	}
-	let document;
-	if (!jsonLd && (contentType === "text/html" || contentType?.startsWith("text/html;") || contentType === "application/xhtml+xml" || contentType?.startsWith("application/xhtml+xml;"))) {
-		const errorResponse = createResponseMetadata(response);
-		const html = await readBoundedText(response, MAX_HTML_SIZE);
-		if (html.tooLarge) {
-			logger.warn("HTML response too large, skipping alternate link discovery: {url}", {
-				url: documentUrl,
-				size: html.size
-			});
-			throw new require_request.FetchError(documentUrl, `HTML document is too large to scan for an ActivityPub alternate link (Content-Type: ${contentType})`, errorResponse);
-		} else {
-			const tagPattern = /<(a|link)\s+([^>]*?)\s*\/?>/gi;
-			const attrPattern = /([a-z][a-z:_-]*)=(?:"([^"]*)"|'([^']*)'|([^\s>]+))/gi;
-			let tagMatch;
-			while ((tagMatch = tagPattern.exec(html.text)) !== null) {
-				const tagContent = tagMatch[2];
-				let attrMatch;
-				const attribs = {};
-				attrPattern.lastIndex = 0;
-				while ((attrMatch = attrPattern.exec(tagContent)) !== null) {
-					const key = attrMatch[1].toLowerCase();
-					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(new URL(attribs.href, docUrl).href);
-				}
-			}
-			try {
-				document = JSON.parse(html.text);
-			} catch (error) {
-				if (!(error instanceof SyntaxError)) throw error;
-				throw new require_request.FetchError(documentUrl, `HTML document has no ActivityPub alternate link (Content-Type: ${contentType})`, errorResponse);
-			}
-		}
-	} else document = await response.json();
-	logger.debug("Fetched document: {status} {url} {headers}", {
-		status: response.status,
-		url: documentUrl,
-		headers: Object.fromEntries(response.headers.entries())
-	});
-	return {
-		contextUrl,
-		document,
-		documentUrl
-	};
-}
-/**
-* Creates a JSON-LD document loader that utilizes the browser's `fetch` API.
-*
-* The created loader preloads the below frequently used contexts by default
-* (unless `options.skipPreloadedContexts` is set to `true`):
-*
-* - <https://www.w3.org/ns/activitystreams>
-* - <https://w3id.org/security/v1>
-* - <https://w3id.org/security/data-integrity/v1>
-* - <https://w3id.org/security/data-integrity/v2>
-* - <https://www.w3.org/ns/did/v1>
-* - <https://w3id.org/security/multikey/v1>
-* - <https://w3id.org/fep/ef61>
-* - <https://purl.archive.org/socialweb/webfinger>
-* - <http://schema.org/>
-* @param options Options for the document loader.
-* @returns The document loader.
-* @since 1.3.0
-*/
-function getDocumentLoader({ allowPrivateAddress, maxRedirection, skipPreloadedContexts, userAgent } = {}) {
-	const tracer = _opentelemetry_api.trace.getTracerProvider().getTracer(require_request.name, require_request.version);
-	const maximumRedirection = maxRedirection ?? DEFAULT_MAX_REDIRECTION;
-	async function load(url, options, redirected = 0, visited = /* @__PURE__ */ new Set()) {
-		options?.signal?.throwIfAborted();
-		const currentUrl = new URL(url).href;
-		if (!skipPreloadedContexts && currentUrl in preloadedContexts) {
-			logger.debug("Using preloaded context: {url}.", { url: currentUrl });
-			return {
-				contextUrl: null,
-				document: preloadedContexts[currentUrl],
-				documentUrl: currentUrl
-			};
-		}
-		if (!allowPrivateAddress) try {
-			await require_url.validatePublicUrl(currentUrl);
-		} catch (error) {
-			if (error instanceof require_url.UrlError) logger.error("Disallowed private URL: {url}", {
-				url: currentUrl,
-				error
-			});
-			throw error;
-		}
-		visited.add(currentUrl);
-		return await tracer.startActiveSpan("activitypub.fetch_document", {
-			kind: _opentelemetry_api.SpanKind.CLIENT,
-			attributes: { "url.full": currentUrl }
-		}, async (span) => {
-			try {
-				const request = require_request.createActivityPubRequest(currentUrl, { userAgent });
-				require_request.logRequest(logger, request);
-				const response = await fetch(request, {
-					redirect: "manual",
-					signal: options?.signal
-				});
-				span.setAttribute("http.response.status_code", response.status);
-				if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
-					if (redirected >= maximumRedirection) {
-						logger.error("Too many redirections ({redirections}) while fetching document.", {
-							redirections: redirected + 1,
-							url: currentUrl
-						});
-						throw new require_request.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);
-					if (visited.has(redirectUrl)) {
-						logger.error("Detected a redirect loop while fetching document: {url} -> {redirectUrl}", {
-							url: currentUrl,
-							redirectUrl
-						});
-						throw new require_request.FetchError(currentUrl, `Redirect loop detected: ${redirectUrl}`);
-					}
-					return await load(redirectUrl, options, redirected + 1, visited);
-				}
-				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;
-			} catch (error) {
-				span.recordException(error);
-				span.setStatus({
-					code: _opentelemetry_api.SpanStatusCode.ERROR,
-					message: String(error)
-				});
-				throw error;
-			} finally {
-				span.end();
-			}
-		});
-	}
-	return load;
-}
-//#endregion
-Object.defineProperty(exports, "getDocumentLoader", {
-	enumerable: true,
-	get: function() {
-		return getDocumentLoader;
-	}
-});
-Object.defineProperty(exports, "getRemoteDocument", {
-	enumerable: true,
-	get: function() {
-		return getRemoteDocument;
-	}
-});
-Object.defineProperty(exports, "preloadedContexts", {
-	enumerable: true,
-	get: function() {
-		return preloadedContexts;
-	}
-});
+export { preloadedContexts as t };

package/dist/{docloader-C_dir7Xb.d.ts → docloader-BMHljyYb.d.cts}

@@ -100,6 +100,13 @@ interface DocumentLoaderOptions {
   * @since 1.8.0
   */
   signal?: AbortSignal;
+  /**
+  * Whether to lower error-level logs for recoverable document loading
+  * failures to warning-level logs.  The loader still throws the error.
+  * @default `false`
+  * @since 2.4.0
+  */
+  suppressError?: boolean;
 }
 /**
 * A JSON-LD document loader that fetches documents from the Web.
@@ -140,6 +147,28 @@ interface DocumentLoaderFactoryOptions {
   * @since 2.2.0
   */
   maxRedirection?: number;
+  /**
+  * The timeout in milliseconds for each call of the created document
+  * loader.  The timeout is shared by all the steps of a call, including
+  * URL validation, every HTTP redirect and alternate document link it
+  * follows, retries, and reading the response body; it does not restart
+  * for each of them.  It does not interrupt synchronous work such as
+  * parsing a document that has already been received.
+  *
+  * When a call times out, the loader throws a {@link FetchError} without
+  * a {@link FetchError.response}, whose `cause` is a `DOMException` named
+  * `"TimeoutError"`.  An `AbortSignal` passed through
+  * {@link DocumentLoaderOptions.signal} still cancels a call; in that case
+  * the loader throws the signal's reason as before.
+  *
+  * Fractional values are rounded up.  Set it to `null` to turn off the
+  * timeout.
+  * @default `10000` (10 seconds)
+  * @throws {RangeError} If the value is not a positive finite number or is
+  *                      greater than 2,147,483,647 (about 24.8 days).
+  * @since 2.4.0
+  */
+  timeout?: number | null;
 }
 /**
 * A factory function that creates an authenticated {@link DocumentLoader} for
@@ -160,11 +189,39 @@ type AuthenticatedDocumentLoaderFactory = (identity: {
 * @param url The URL of the document to load.
 * @param response The response to get the document from.
 * @param fetch The function to fetch the document.
+* @param options The options for loading the document.
 * @returns The loaded remote document.
 * @throws {FetchError} If the response is not OK.
 * @internal
 */
-declare function getRemoteDocument(url: string, response: Response, fetch: (url: string, options?: DocumentLoaderOptions) => Promise<RemoteDocument>): Promise<RemoteDocument>;
+declare function getRemoteDocument(url: string, response: Response, fetch: (url: string, options?: DocumentLoaderOptions) => Promise<RemoteDocument>, options?: DocumentLoaderOptions): Promise<RemoteDocument>;
+/**
+* Resolves {@link DocumentLoaderFactoryOptions.timeout} into milliseconds.
+* @param timeout The timeout option.  `undefined` means the default timeout,
+*                and `null` means no timeout.
+* @returns The timeout in milliseconds, or `null` if it is turned off.
+* @throws {RangeError} If the timeout is invalid.
+* @internal
+*/
+declare function resolveDocumentLoaderTimeout(timeout: number | null | undefined): number | null;
+/**
+* Bounds each call of the given document loader by the given timeout.
+* The timeout is combined with the caller's `signal`, and the combined
+* signal is passed to the loader.  The call settles no later than the
+* timeout even if the loader is stuck in a step that cannot be aborted,
+* e.g., a DNS lookup.
+*
+* A timed-out call throws a {@link FetchError} without a response, whose
+* `cause` is a `DOMException` named `"TimeoutError"`.  If the caller's
+* signal is aborted, its reason is thrown instead.
+* @param loader The document loader to bound.
+* @param timeout The timeout in milliseconds, or `null` for no timeout.
+*                It is assumed to have been resolved by
+*                {@link resolveDocumentLoaderTimeout}.
+* @returns The bounded document loader.
+* @internal
+*/
+declare function withDocumentLoaderTimeout(loader: DocumentLoader, timeout: number | null): DocumentLoader;
 /**
 * Options for {@link getDocumentLoader}.
 * @since 1.3.0
@@ -177,6 +234,10 @@ 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}.
+* Each call times out after 10 seconds by default; see
+* {@link DocumentLoaderFactoryOptions.timeout}.
 *
 * The created loader preloads the below frequently used contexts by default
 * (unless `options.skipPreloadedContexts` is set to `true`):
@@ -186,8 +247,12 @@ interface GetDocumentLoaderOptions extends DocumentLoaderFactoryOptions {
 * - <https://w3id.org/security/data-integrity/v1>
 * - <https://w3id.org/security/data-integrity/v2>
 * - <https://www.w3.org/ns/did/v1>
+* - <https://www.w3.org/ns/cid/v1>
 * - <https://w3id.org/security/multikey/v1>
 * - <https://w3id.org/fep/ef61>
+* - <https://w3id.org/fep/7aa9>
+* - <https://w3id.org/fep/6757>
+* - <https://w3id.org/fep/22cd>
 * - <https://purl.archive.org/socialweb/webfinger>
 * - <http://schema.org/>
 * @param options Options for the document loader.
@@ -198,7 +263,8 @@ declare function getDocumentLoader({
   allowPrivateAddress,
   maxRedirection,
   skipPreloadedContexts,
+  timeout,
   userAgent
 }?: GetDocumentLoaderOptions): DocumentLoader;
 //#endregion
-export { DocumentLoaderOptions as a, getDocumentLoader as c, FetchError as d, GetUserAgentOptions as f, logRequest as h, DocumentLoaderFactoryOptions as i, getRemoteDocument as l, getUserAgent as m, DocumentLoader as n, GetDocumentLoaderOptions as o, createActivityPubRequest as p, DocumentLoaderFactory as r, RemoteDocument as s, AuthenticatedDocumentLoaderFactory as t, CreateRequestOptions as u };
+export { logRequest as _, DocumentLoaderOptions as a, getDocumentLoader as c, withDocumentLoaderTimeout as d, CreateRequestOptions as f, getUserAgent as g, createActivityPubRequest as h, DocumentLoaderFactoryOptions as i, getRemoteDocument as l, GetUserAgentOptions as m, DocumentLoader as n, GetDocumentLoaderOptions as o, FetchError as p, DocumentLoaderFactory as r, RemoteDocument as s, AuthenticatedDocumentLoaderFactory as t, resolveDocumentLoaderTimeout as u };