@fedify/vocab-runtime 2.4.0-dev.2169 → 2.4.0-dev.2193

package/dist/mod.js

@@ -1,6 +1,6 @@
 
 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 { _ 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-Be3moMor.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.2169+0a45df07";
+var version = "2.4.0-dev.2193+402149b5";
 //#endregion
 //#region src/request.ts
 /**
@@ -163,6 +163,59 @@ async function readBoundedText(message, maxBytes, url) {
 		reader?.releaseLock();
 	}
 }
+/**
+* Reads raw bytes while limiting bytes received from the body stream.
+* Unlike {@link readBoundedText}, the bytes are returned as they were
+* received, without decoding.
+* @param message The response or request to read.
+* @param maxBytes The maximum number of decoded bytes to read.
+* @param url The URL to include in errors and logs.
+* @returns The body bytes.
+* @throws {BodyTooLargeError} If the body exceeds the limit.
+* @internal
+*/
+async function readBoundedBytes(message, maxBytes, url) {
+	validateBodySizeLimit(maxBytes);
+	const reader = message.body?.getReader();
+	const tooLarge = () => {
+		getLogger([
+			"fedify",
+			"runtime",
+			"body"
+		]).warn("Body from {url} exceeds the limit of {maxBytes} bytes.", {
+			url: url.toString(),
+			maxBytes
+		});
+		throw new BodyTooLargeError(url, maxBytes);
+	};
+	try {
+		const length = message.headers.get("Content-Length");
+		const encoding = message.headers.get("Content-Encoding");
+		if ((encoding == null || encoding.toLowerCase() === "identity") && length != null && /^\d+$/.test(length) && Number(length) > maxBytes) tooLarge();
+		if (reader == null) return /* @__PURE__ */ new Uint8Array(0);
+		const chunks = [];
+		let size = 0;
+		while (true) {
+			const { done, value } = await reader.read();
+			if (done) break;
+			size += value.byteLength;
+			if (size > maxBytes) tooLarge();
+			chunks.push(value);
+		}
+		const bytes = new Uint8Array(size);
+		let offset = 0;
+		for (const chunk of chunks) {
+			bytes.set(chunk, offset);
+			offset += chunk.byteLength;
+		}
+		return bytes;
+	} catch (error) {
+		if (reader != null) reader.cancel(error).catch(() => {});
+		throw error;
+	} finally {
+		reader?.releaseLock();
+	}
+}
 //#endregion
 //#region src/link.ts
 const parametersNeedLowerCase = ["rel", "type"];
@@ -353,6 +406,9 @@ const logger = getLogger([
 ]);
 const DEFAULT_MAX_REDIRECTION = 20;
 const MAX_HTML_SIZE = 1024 * 1024;
+const MAX_ERROR_BODY_SIZE = 1024 * 1024;
+const DEFAULT_TIMEOUT = 1e4;
+const MAX_TIMEOUT = 2147483647;
 function createResponseMetadata(response) {
 	return new Response(null, {
 		headers: response.headers,
@@ -360,6 +416,55 @@ function createResponseMetadata(response) {
 		statusText: response.statusText
 	});
 }
+const NULL_BODY_STATUSES = /* @__PURE__ */ new Set([
+	204,
+	205,
+	304
+]);
+/**
+* Reads the body of an error response while the document loader is still
+* running, so that its timeout and `AbortSignal` also bound the read, and
+* nothing reading {@link FetchError.response} later waits on the network.
+* The body is kept byte for byte, unless it is too large or cannot be read;
+* then only the status and headers are kept.  A response whose status
+* the `Response` constructor does not accept (e.g., 999) is kept as a clone
+* whose body has been read in full; if its body is too large or cannot be
+* read, no response is kept at all.
+*/
+async function bufferErrorResponse(response, url, signal) {
+	if (response.status < 200 || response.status > 599) {
+		const clone = response.clone();
+		try {
+			await readBoundedBytes(response, MAX_ERROR_BODY_SIZE, url);
+		} catch (error) {
+			await clone.body?.cancel().catch(() => {});
+			if (signal?.aborted) throw error;
+			logger.debug("Failed to read the error response body from {url}: {error}", {
+				url,
+				error
+			});
+			return;
+		}
+		return clone;
+	}
+	if (response.body == null || NULL_BODY_STATUSES.has(response.status)) return createResponseMetadata(response);
+	let body;
+	try {
+		body = await readBoundedBytes(response, MAX_ERROR_BODY_SIZE, url);
+	} catch (error) {
+		if (signal?.aborted) throw error;
+		logger.debug("Failed to read the error response body from {url}: {error}", {
+			url,
+			error
+		});
+		return createResponseMetadata(response);
+	}
+	return new Response(body, {
+		headers: response.headers,
+		status: response.status,
+		statusText: response.statusText
+	});
+}
 /**
 * Gets a {@link RemoteDocument} from the given response.
 * @param url The URL of the document to load.
@@ -384,7 +489,7 @@ async function getRemoteDocument(url, response, fetch, options) {
 			url: documentUrl,
 			headers: Object.fromEntries(response.headers.entries())
 		});
-		throw new FetchError(documentUrl, `HTTP ${response.status}: ${documentUrl}`, response.clone());
+		throw new FetchError(documentUrl, `HTTP ${response.status}: ${documentUrl}`, await bufferErrorResponse(response, documentUrl, options?.signal));
 	}
 	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;");
@@ -471,9 +576,87 @@ async function getRemoteDocument(url, response, fetch, options) {
 	};
 }
 /**
+* 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
+*/
+function resolveDocumentLoaderTimeout(timeout) {
+	if (timeout === void 0) return DEFAULT_TIMEOUT;
+	if (timeout === null) return null;
+	if (typeof timeout !== "number" || !Number.isFinite(timeout) || timeout <= 0) throw new RangeError(`The document loader timeout must be a positive finite number of milliseconds, but got ${String(timeout)}.`);
+	const ms = Math.ceil(timeout);
+	if (ms > MAX_TIMEOUT) throw new RangeError(`The document loader timeout must not be greater than ${MAX_TIMEOUT} milliseconds, but got ${timeout}.`);
+	return ms;
+}
+/**
+* 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
+*/
+function withDocumentLoaderTimeout(loader, timeout) {
+	if (timeout == null) return loader;
+	return async (url, options) => {
+		const callerSignal = options?.signal;
+		callerSignal?.throwIfAborted();
+		const controller = new AbortController();
+		const timeoutReason = new DOMException(`The document loader timed out after ${timeout} ms.`, "TimeoutError");
+		let timedOut = false;
+		const timer = setTimeout(() => {
+			timedOut = true;
+			controller.abort(timeoutReason);
+		}, timeout);
+		const onCallerAbort = () => controller.abort(callerSignal?.reason);
+		callerSignal?.addEventListener("abort", onCallerAbort, { once: true });
+		let onAbort;
+		const aborted = new Promise((_, reject) => {
+			onAbort = () => reject(controller.signal.reason);
+			controller.signal.addEventListener("abort", onAbort, { once: true });
+		});
+		const loading = loader(url, {
+			...options,
+			signal: controller.signal
+		});
+		loading.catch(() => {});
+		try {
+			return await Promise.race([loading, aborted]);
+		} catch (error) {
+			if (callerSignal?.aborted) throw callerSignal.reason;
+			if (!timedOut) throw error;
+			logger[options?.suppressError ? "warn" : "error"]("Timed out after {timeout} ms while fetching document: {url}", {
+				timeout,
+				url
+			});
+			const fetchError = new FetchError(url, `Timed out after ${timeout} ms`);
+			fetchError.cause = timeoutReason;
+			throw fetchError;
+		} finally {
+			clearTimeout(timer);
+			callerSignal?.removeEventListener("abort", onCallerAbort);
+			if (onAbort != null) controller.signal.removeEventListener("abort", onAbort);
+		}
+	};
+}
+/**
 * 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`):
@@ -493,7 +676,8 @@ async function getRemoteDocument(url, response, fetch, options) {
 * @returns The document loader.
 * @since 1.3.0
 */
-function getDocumentLoader({ allowPrivateAddress, maxRedirection, skipPreloadedContexts, userAgent } = {}) {
+function getDocumentLoader({ allowPrivateAddress, maxRedirection, skipPreloadedContexts, timeout, userAgent } = {}) {
+	const resolvedTimeout = resolveDocumentLoaderTimeout(timeout);
 	const tracer = trace.getTracerProvider().getTracer(name, version);
 	const maximumRedirection = maxRedirection ?? DEFAULT_MAX_REDIRECTION;
 	async function load(url, options, redirected = 0, visited = /* @__PURE__ */ new Set()) {
@@ -507,18 +691,21 @@ function getDocumentLoader({ allowPrivateAddress, maxRedirection, skipPreloadedC
 				documentUrl: currentUrl
 			};
 		}
-		if (!allowPrivateAddress) try {
-			await validatePublicUrl(currentUrl);
-		} catch (error) {
-			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
-			});
-			throw error;
+		if (!allowPrivateAddress) {
+			try {
+				await validatePublicUrl(currentUrl);
+			} catch (error) {
+				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
+				});
+				throw error;
+			}
+			options?.signal?.throwIfAborted();
 		}
 		visited.add(currentUrl);
 		return await tracer.startActiveSpan("activitypub.fetch_document", {
@@ -573,7 +760,7 @@ function getDocumentLoader({ allowPrivateAddress, maxRedirection, skipPreloadedC
 			}
 		});
 	}
-	return (url, options) => load(url, options);
+	return withDocumentLoaderTimeout((url, options) => load(url, options), resolvedTimeout);
 }
 //#endregion
 //#region src/internal/multicodec.ts
@@ -1390,4 +1577,4 @@ LanguageString.prototype[Symbol.for("nodejs.util.inspect.custom")] = function(_d
 	return `<${this.locale.baseName}> ${inspect(this.toString(), options)}`;
 };
 //#endregion
-export { FetchError, LanguageString, UrlError, arePortableUrisEqual, canParseDecimal, canonicalizePortableUri, computeDigestMultibase, createActivityPubRequest, createHashlink, decodeMultibase, encodeMultibase, encodingFromBaseData, expandIPv6Address, exportDidKey, exportMultibaseKey, exportSpki, formatIri, fromCompatibleEf61Id, getDocumentLoader, getFe34Origin, getRemoteDocument, getUserAgent, haveSameFe34Origin, haveSameIriOrigin, importDidKey, importMultibaseKey, importPem, importPkcs1, importSpki, isDecimal, isGatewayUrl, isValidPublicIPv4Address, isValidPublicIPv6Address, logRequest, parseDecimal, parseDidKeyVerificationMethod, parseDigestMultibase, parseGatewayUrl, parseHashlink, parseIri, parseJsonLdId, preloadedContexts, toCompatibleEf61Id, validatePublicUrl, verifyDigestMultibase, verifyHashlink };
+export { FetchError, LanguageString, UrlError, arePortableUrisEqual, canParseDecimal, canonicalizePortableUri, computeDigestMultibase, createActivityPubRequest, createHashlink, decodeMultibase, encodeMultibase, encodingFromBaseData, expandIPv6Address, exportDidKey, exportMultibaseKey, exportSpki, formatIri, fromCompatibleEf61Id, getDocumentLoader, getFe34Origin, getRemoteDocument, getUserAgent, haveSameFe34Origin, haveSameIriOrigin, importDidKey, importMultibaseKey, importPem, importPkcs1, importSpki, isDecimal, isGatewayUrl, isValidPublicIPv4Address, isValidPublicIPv6Address, logRequest, parseDecimal, parseDidKeyVerificationMethod, parseDigestMultibase, parseGatewayUrl, parseHashlink, parseIri, parseJsonLdId, preloadedContexts, resolveDocumentLoaderTimeout, toCompatibleEf61Id, validatePublicUrl, verifyDigestMultibase, verifyHashlink, withDocumentLoaderTimeout };

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

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

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

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

package/dist/tests/{body-CNwDKYQs.mjs → body-D1z0X88T.mjs}

@@ -1,4 +1,4 @@
-import { t as FetchError } from "./request-Cg8MQByW.mjs";
+import { t as FetchError } from "./request-IIntZ5kj.mjs";
 import { getLogger } from "@logtape/logtape";
 //#region src/body.ts
 /** Decoded JSON body limit: 16 MiB.  @internal */
@@ -73,5 +73,58 @@ async function readBoundedText(message, maxBytes, url) {
 		reader?.releaseLock();
 	}
 }
+/**
+* Reads raw bytes while limiting bytes received from the body stream.
+* Unlike {@link readBoundedText}, the bytes are returned as they were
+* received, without decoding.
+* @param message The response or request to read.
+* @param maxBytes The maximum number of decoded bytes to read.
+* @param url The URL to include in errors and logs.
+* @returns The body bytes.
+* @throws {BodyTooLargeError} If the body exceeds the limit.
+* @internal
+*/
+async function readBoundedBytes(message, maxBytes, url) {
+	validateBodySizeLimit(maxBytes);
+	const reader = message.body?.getReader();
+	const tooLarge = () => {
+		getLogger([
+			"fedify",
+			"runtime",
+			"body"
+		]).warn("Body from {url} exceeds the limit of {maxBytes} bytes.", {
+			url: url.toString(),
+			maxBytes
+		});
+		throw new BodyTooLargeError(url, maxBytes);
+	};
+	try {
+		const length = message.headers.get("Content-Length");
+		const encoding = message.headers.get("Content-Encoding");
+		if ((encoding == null || encoding.toLowerCase() === "identity") && length != null && /^\d+$/.test(length) && Number(length) > maxBytes) tooLarge();
+		if (reader == null) return /* @__PURE__ */ new Uint8Array(0);
+		const chunks = [];
+		let size = 0;
+		while (true) {
+			const { done, value } = await reader.read();
+			if (done) break;
+			size += value.byteLength;
+			if (size > maxBytes) tooLarge();
+			chunks.push(value);
+		}
+		const bytes = new Uint8Array(size);
+		let offset = 0;
+		for (const chunk of chunks) {
+			bytes.set(chunk, offset);
+			offset += chunk.byteLength;
+		}
+		return bytes;
+	} catch (error) {
+		if (reader != null) reader.cancel(error).catch(() => {});
+		throw error;
+	} finally {
+		reader?.releaseLock();
+	}
+}
 //#endregion
-export { MAX_BODY_SIZE as n, readBoundedText as r, BodyTooLargeError as t };
+export { readBoundedText as i, MAX_BODY_SIZE as n, readBoundedBytes as r, BodyTooLargeError as t };

package/dist/tests/{body-DHAC8qhR.cjs → body-ORlui-Nx.cjs}

@@ -1,4 +1,4 @@
-const require_request = require("./request-Dm3ye46t.cjs");
+const require_request = require("./request-C5_3S-un.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 //#region src/body.ts
 /** Decoded JSON body limit: 16 MiB.  @internal */
@@ -73,6 +73,59 @@ async function readBoundedText(message, maxBytes, url) {
 		reader?.releaseLock();
 	}
 }
+/**
+* Reads raw bytes while limiting bytes received from the body stream.
+* Unlike {@link readBoundedText}, the bytes are returned as they were
+* received, without decoding.
+* @param message The response or request to read.
+* @param maxBytes The maximum number of decoded bytes to read.
+* @param url The URL to include in errors and logs.
+* @returns The body bytes.
+* @throws {BodyTooLargeError} If the body exceeds the limit.
+* @internal
+*/
+async function readBoundedBytes(message, maxBytes, url) {
+	validateBodySizeLimit(maxBytes);
+	const reader = message.body?.getReader();
+	const tooLarge = () => {
+		(0, _logtape_logtape.getLogger)([
+			"fedify",
+			"runtime",
+			"body"
+		]).warn("Body from {url} exceeds the limit of {maxBytes} bytes.", {
+			url: url.toString(),
+			maxBytes
+		});
+		throw new BodyTooLargeError(url, maxBytes);
+	};
+	try {
+		const length = message.headers.get("Content-Length");
+		const encoding = message.headers.get("Content-Encoding");
+		if ((encoding == null || encoding.toLowerCase() === "identity") && length != null && /^\d+$/.test(length) && Number(length) > maxBytes) tooLarge();
+		if (reader == null) return /* @__PURE__ */ new Uint8Array(0);
+		const chunks = [];
+		let size = 0;
+		while (true) {
+			const { done, value } = await reader.read();
+			if (done) break;
+			size += value.byteLength;
+			if (size > maxBytes) tooLarge();
+			chunks.push(value);
+		}
+		const bytes = new Uint8Array(size);
+		let offset = 0;
+		for (const chunk of chunks) {
+			bytes.set(chunk, offset);
+			offset += chunk.byteLength;
+		}
+		return bytes;
+	} catch (error) {
+		if (reader != null) reader.cancel(error).catch(() => {});
+		throw error;
+	} finally {
+		reader?.releaseLock();
+	}
+}
 //#endregion
 Object.defineProperty(exports, "BodyTooLargeError", {
 	enumerable: true,
@@ -86,6 +139,12 @@ Object.defineProperty(exports, "MAX_BODY_SIZE", {
 		return MAX_BODY_SIZE;
 	}
 });
+Object.defineProperty(exports, "readBoundedBytes", {
+	enumerable: true,
+	get: function() {
+		return readBoundedBytes;
+	}
+});
 Object.defineProperty(exports, "readBoundedText", {
 	enumerable: true,
 	get: function() {

package/dist/tests/body.test.cjs

@@ -1,4 +1,4 @@
-const require_body = require("./body-DHAC8qhR.cjs");
+const require_body = require("./body-ORlui-Nx.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-CNwDKYQs.mjs";
+import { i as readBoundedText, t as BodyTooLargeError } from "./body-D1z0X88T.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-gLKqAO1H.cjs");
-require("./docloader-DLkb9qAS.cjs");
+require("./url-B8xyTwP-.cjs");
+require("./docloader-Vc3BC9ad.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-D7qRF-dF.mjs";
-import "./docloader-DWkl3u7X.mjs";
+import "./url-DfS-cvwr.mjs";
+import "./docloader-CUdtpDuf.mjs";
 import "./key-C2Db_TAJ.mjs";
 import "./multibase-BPnF_L4e.mjs";
 import "./digest-COC7xDiQ.mjs";