@fedify/fedify 2.2.15 → 2.2.17

package/dist/{http-DlBFaZ7A.js → http-DkzPSl5o.js}

@@ -4,13 +4,13 @@ import { getLogger } from "@logtape/logtape";
 import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { encodeHex } from "byte-encodings/hex";
-import { FetchError, getDocumentLoader } from "@fedify/vocab-runtime";
+import { FetchError, UrlError, getDocumentLoader } from "@fedify/vocab-runtime";
 import { Item, decodeDict, encodeDict, encodeItem } from "structured-field-values";
 import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } from "@opentelemetry/semantic-conventions";
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.2.15";
+var version = "2.2.17";
 //#endregion
 //#region src/sig/accept.ts
 /**
@@ -152,6 +152,64 @@ function fulfillAcceptSignature(entry, localKeyId, localAlg) {
 }
 //#endregion
 //#region src/sig/key.ts
+/** Classifies decoding failures without hiding unexpected loader errors. */
+function classifyKeyJsonLdError(error, seen = /* @__PURE__ */ new Set()) {
+	if (!(error instanceof Error) || !error.name.startsWith("jsonld.")) return null;
+	if (seen.has(error)) throw error;
+	seen.add(error);
+	const details = error.details;
+	if (typeof details?.code !== "string") return null;
+	if (details.code !== "loading remote context failed" || !("cause" in details) && !("cause" in error)) return "invalid";
+	const cause = "cause" in details ? details.cause : error.cause;
+	const nestedFailure = classifyKeyJsonLdError(cause, seen);
+	if (nestedFailure != null) return nestedFailure;
+	if (cause instanceof SyntaxError) return "invalid";
+	if (cause instanceof FetchError || cause instanceof UrlError) return "fetch";
+	if (cause instanceof Error && [
+		"AbortError",
+		"TimeoutError",
+		"NetworkError"
+	].includes(cause.name)) return "fetch";
+	if (cause instanceof TypeError) {
+		const urlCode = cause.code;
+		if (cause.name === "InvalidContextReferenceError") return "invalid";
+		if (urlCode === "ERR_INVALID_URL" || cause.message === "Invalid URL string." || /^Invalid URL(?::|$)/.test(cause.message) || / cannot be parsed as a URL\.?$/.test(cause.message)) return typeof details.url === "string" && /^[A-Za-z][A-Za-z0-9+.-]*:/.test(details.url) && !URL.canParse(details.url) ? "invalid" : "fetch";
+		const networkCause = cause.cause;
+		const code = cause.code ?? networkCause?.code;
+		if (typeof code === "string" && [
+			"ECONNREFUSED",
+			"ECONNRESET",
+			"ECONNABORTED",
+			"ETIMEDOUT",
+			"EHOSTUNREACH",
+			"ENETUNREACH",
+			"ENOTFOUND",
+			"EAI_AGAIN",
+			"UND_ERR_CONNECT_TIMEOUT",
+			"UND_ERR_HEADERS_TIMEOUT",
+			"UND_ERR_BODY_TIMEOUT",
+			"UND_ERR_SOCKET"
+		].includes(code) || /^(fetch failed|Failed to fetch|error sending request|error reading a body from connection|Unable to connect|ConnectionRefused|Network connection lost|The socket connection was closed unexpectedly)/.test(cause.message)) return "fetch";
+	}
+	throw cause;
+}
+/** Carries a context transport failure through the key decoding boundary. */
+var KeyContextFetchError = class extends Error {
+	constructor(error) {
+		super("Failed to fetch a key's JSON-LD context.", { cause: error });
+		this.error = error;
+	}
+};
+function contextFetchError(error) {
+	const seen = /* @__PURE__ */ new Set();
+	while (error instanceof Error && !seen.has(error)) {
+		seen.add(error);
+		const details = error.details;
+		if (!error.name.startsWith("jsonld.") || details?.code !== "loading remote context failed") break;
+		error = "cause" in details ? details.cause : error.cause;
+	}
+	return new KeyContextFetchError(error);
+}
 /**
 * Checks if the given key is valid and supported.  No-op if the key is valid,
 * otherwise throws an error.
@@ -246,6 +304,9 @@ async function importJwk(jwk, type) {
 * @internal
 */
 async function fetchActorDocument(actorId, options = {}) {
+	return await fetchActorDocumentInternal(actorId, options, false);
+}
+async function fetchActorDocumentInternal(actorId, options, propagateContextFetchErrors) {
 	const logger = getLogger([
 		"fedify",
 		"sig",
@@ -276,9 +337,12 @@ async function fetchActorDocument(actorId, options = {}) {
 			baseUrl: documentUrl
 		});
 	} catch (error) {
-		if (!(error instanceof TypeError)) throw error;
-		logger.debug("The document served at {documentUrl} is not a valid object: {error}", {
+		const failure = classifyKeyJsonLdError(error);
+		if (failure === "fetch" && propagateContextFetchErrors) throw contextFetchError(error);
+		if (failure == null && !(error instanceof TypeError)) throw error;
+		logger.debug("Failed to decode the actor document at {documentUrl}: {error}", {
 			documentUrl: documentUrl.href,
+			failure: failure ?? "invalid",
 			error
 		});
 		return null;
@@ -317,6 +381,9 @@ async function fetchActorDocument(actorId, options = {}) {
 * @internal
 */
 async function verifyKeyOwnership(key, options = {}) {
+	return await verifyKeyOwnershipInternal(key, options, false);
+}
+async function verifyKeyOwnershipInternal(key, options, propagateContextFetchErrors) {
 	const logger = getLogger([
 		"fedify",
 		"sig",
@@ -326,7 +393,7 @@ async function verifyKeyOwnership(key, options = {}) {
 	if (keyId == null) return null;
 	const claimedOwnerId = key instanceof CryptographicKey ? key.ownerId : key.controllerId;
 	if (claimedOwnerId == null) return null;
-	const owner = await fetchActorDocument(claimedOwnerId, options);
+	const owner = await fetchActorDocumentInternal(claimedOwnerId, options, propagateContextFetchErrors);
 	if (owner == null) {
 		logger.debug("The owner ({claimedOwnerId}) that key {keyId} claims could not be resolved.", {
 			keyId: keyId.href,
@@ -478,6 +545,21 @@ async function resolveFetchedKey(document, cacheKey, documentUrl, keyId, cls, {
 			tracerProvider
 		});
 	} catch (e) {
+		const failure = classifyKeyJsonLdError(e);
+		if (failure === "fetch") throw contextFetchError(e);
+		if (failure != null) {
+			logger.debug("Failed to decode key {keyId}: {error}", {
+				keyId,
+				failure,
+				error: e
+			});
+			await keyCache?.set(cacheKey, null);
+			await clearFetchErrorMetadata(cacheKey, keyCache);
+			return {
+				key: null,
+				cached: false
+			};
+		}
 		if (!(e instanceof TypeError)) throw e;
 		try {
 			object = await cls.fromJsonLd(document, {
@@ -486,8 +568,14 @@ async function resolveFetchedKey(document, cacheKey, documentUrl, keyId, cls, {
 				tracerProvider
 			});
 		} catch (e) {
-			if (e instanceof TypeError) {
-				logger.debug("Failed to verify; key {keyId} returned an invalid object.", { keyId });
+			const failure = classifyKeyJsonLdError(e);
+			if (failure === "fetch") throw contextFetchError(e);
+			if (failure != null || e instanceof TypeError) {
+				logger.debug("Failed to decode key {keyId}: {error}", {
+					keyId,
+					failure: failure ?? "invalid",
+					error: e
+				});
 				await keyCache?.set(cacheKey, null);
 				await clearFetchErrorMetadata(cacheKey, keyCache);
 				return {
@@ -579,16 +667,17 @@ async function resolveFetchedKey(document, cacheKey, documentUrl, keyId, cls, {
 	const claimedOwnerId = key instanceof CryptographicKey ? key.ownerId : key.controllerId;
 	if (ownerDocument != null && claimedOwnerId == null) key = key instanceof CryptographicKey ? key.clone({ owner: ownerDocument.id }) : key.clone({ controller: ownerDocument.id });
 	else if (claimedOwnerId != null && claimedOwnerId.href !== ownerDocument?.id?.href) {
-		if (await verifyKeyOwnership(key, {
+		if (await verifyKeyOwnershipInternal(key, {
 			documentLoader,
 			contextLoader,
 			tracerProvider
-		}) == null) {
+		}, true) == null) {
 			logger.debug("Failed to verify; the owner {claimedOwnerId} that key {keyId} claims does not list the key as its own.", {
 				keyId,
 				claimedOwnerId: claimedOwnerId.href
 			});
 			await keyCache?.set(cacheKey, null);
+			await clearFetchErrorMetadata(cacheKey, keyCache);
 			return {
 				key: null,
 				cached: false
@@ -626,7 +715,12 @@ async function fetchKeyWithResult(cacheKey, cls, options, onCachedUnavailable, o
 	} catch (error) {
 		return await onFetchError(error, cacheKey, keyId, keyCache, logger);
 	}
-	return await resolveFetchedKey(document, cacheKey, documentUrl, keyId, cls, options, logger);
+	try {
+		return await resolveFetchedKey(document, cacheKey, documentUrl, keyId, cls, options, logger);
+	} catch (error) {
+		if (!(error instanceof KeyContextFetchError)) throw error;
+		return await onFetchError(error.error, cacheKey, keyId, keyCache, logger);
+	}
 }
 async function fetchKeyInternal(keyId, cls, options = {}) {
 	return await fetchKeyWithResult(typeof keyId === "string" ? new URL(keyId) : keyId, cls, options, (_cacheKey, _keyId, _keyCache, _logger) => {

package/dist/{http-DytBXprv.mjs → http-dobCLGG2.mjs}

@@ -1,9 +1,9 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-duAPwAHH.mjs";
+import { n as version, t as name } from "./deno-Cya0rbEr.mjs";
 import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature } from "./accept-Dd__NiUL.mjs";
-import { i as fetchKeyDetailed, s as validateCryptoKey } from "./key-5QlWv3sx.mjs";
+import { i as fetchKeyDetailed, s as validateCryptoKey } from "./key-BMHNd0gP.mjs";
 import { CryptographicKey } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { FetchError } from "@fedify/vocab-runtime";

package/dist/{key-5QlWv3sx.mjs → key-BMHNd0gP.mjs}

@@ -1,12 +1,70 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-duAPwAHH.mjs";
+import { n as version, t as name } from "./deno-Cya0rbEr.mjs";
 import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
-import { FetchError, getDocumentLoader } from "@fedify/vocab-runtime";
+import { FetchError, UrlError, getDocumentLoader } from "@fedify/vocab-runtime";
 import { getLogger } from "@logtape/logtape";
 //#region src/sig/key.ts
+/** Classifies decoding failures without hiding unexpected loader errors. */
+function classifyKeyJsonLdError(error, seen = /* @__PURE__ */ new Set()) {
+	if (!(error instanceof Error) || !error.name.startsWith("jsonld.")) return null;
+	if (seen.has(error)) throw error;
+	seen.add(error);
+	const details = error.details;
+	if (typeof details?.code !== "string") return null;
+	if (details.code !== "loading remote context failed" || !("cause" in details) && !("cause" in error)) return "invalid";
+	const cause = "cause" in details ? details.cause : error.cause;
+	const nestedFailure = classifyKeyJsonLdError(cause, seen);
+	if (nestedFailure != null) return nestedFailure;
+	if (cause instanceof SyntaxError) return "invalid";
+	if (cause instanceof FetchError || cause instanceof UrlError) return "fetch";
+	if (cause instanceof Error && [
+		"AbortError",
+		"TimeoutError",
+		"NetworkError"
+	].includes(cause.name)) return "fetch";
+	if (cause instanceof TypeError) {
+		const urlCode = cause.code;
+		if (cause.name === "InvalidContextReferenceError") return "invalid";
+		if (urlCode === "ERR_INVALID_URL" || cause.message === "Invalid URL string." || /^Invalid URL(?::|$)/.test(cause.message) || / cannot be parsed as a URL\.?$/.test(cause.message)) return typeof details.url === "string" && /^[A-Za-z][A-Za-z0-9+.-]*:/.test(details.url) && !URL.canParse(details.url) ? "invalid" : "fetch";
+		const networkCause = cause.cause;
+		const code = cause.code ?? networkCause?.code;
+		if (typeof code === "string" && [
+			"ECONNREFUSED",
+			"ECONNRESET",
+			"ECONNABORTED",
+			"ETIMEDOUT",
+			"EHOSTUNREACH",
+			"ENETUNREACH",
+			"ENOTFOUND",
+			"EAI_AGAIN",
+			"UND_ERR_CONNECT_TIMEOUT",
+			"UND_ERR_HEADERS_TIMEOUT",
+			"UND_ERR_BODY_TIMEOUT",
+			"UND_ERR_SOCKET"
+		].includes(code) || /^(fetch failed|Failed to fetch|error sending request|error reading a body from connection|Unable to connect|ConnectionRefused|Network connection lost|The socket connection was closed unexpectedly)/.test(cause.message)) return "fetch";
+	}
+	throw cause;
+}
+/** Carries a context transport failure through the key decoding boundary. */
+var KeyContextFetchError = class extends Error {
+	constructor(error) {
+		super("Failed to fetch a key's JSON-LD context.", { cause: error });
+		this.error = error;
+	}
+};
+function contextFetchError(error) {
+	const seen = /* @__PURE__ */ new Set();
+	while (error instanceof Error && !seen.has(error)) {
+		seen.add(error);
+		const details = error.details;
+		if (!error.name.startsWith("jsonld.") || details?.code !== "loading remote context failed") break;
+		error = "cause" in details ? details.cause : error.cause;
+	}
+	return new KeyContextFetchError(error);
+}
 /**
 * Checks if the given key is valid and supported.  No-op if the key is valid,
 * otherwise throws an error.
@@ -101,6 +159,9 @@ async function importJwk(jwk, type) {
 * @internal
 */
 async function fetchActorDocument(actorId, options = {}) {
+	return await fetchActorDocumentInternal(actorId, options, false);
+}
+async function fetchActorDocumentInternal(actorId, options, propagateContextFetchErrors) {
 	const logger = getLogger([
 		"fedify",
 		"sig",
@@ -131,9 +192,12 @@ async function fetchActorDocument(actorId, options = {}) {
 			baseUrl: documentUrl
 		});
 	} catch (error) {
-		if (!(error instanceof TypeError)) throw error;
-		logger.debug("The document served at {documentUrl} is not a valid object: {error}", {
+		const failure = classifyKeyJsonLdError(error);
+		if (failure === "fetch" && propagateContextFetchErrors) throw contextFetchError(error);
+		if (failure == null && !(error instanceof TypeError)) throw error;
+		logger.debug("Failed to decode the actor document at {documentUrl}: {error}", {
 			documentUrl: documentUrl.href,
+			failure: failure ?? "invalid",
 			error
 		});
 		return null;
@@ -172,6 +236,9 @@ async function fetchActorDocument(actorId, options = {}) {
 * @internal
 */
 async function verifyKeyOwnership(key, options = {}) {
+	return await verifyKeyOwnershipInternal(key, options, false);
+}
+async function verifyKeyOwnershipInternal(key, options, propagateContextFetchErrors) {
 	const logger = getLogger([
 		"fedify",
 		"sig",
@@ -181,7 +248,7 @@ async function verifyKeyOwnership(key, options = {}) {
 	if (keyId == null) return null;
 	const claimedOwnerId = key instanceof CryptographicKey ? key.ownerId : key.controllerId;
 	if (claimedOwnerId == null) return null;
-	const owner = await fetchActorDocument(claimedOwnerId, options);
+	const owner = await fetchActorDocumentInternal(claimedOwnerId, options, propagateContextFetchErrors);
 	if (owner == null) {
 		logger.debug("The owner ({claimedOwnerId}) that key {keyId} claims could not be resolved.", {
 			keyId: keyId.href,
@@ -333,6 +400,21 @@ async function resolveFetchedKey(document, cacheKey, documentUrl, keyId, cls, {
 			tracerProvider
 		});
 	} catch (e) {
+		const failure = classifyKeyJsonLdError(e);
+		if (failure === "fetch") throw contextFetchError(e);
+		if (failure != null) {
+			logger.debug("Failed to decode key {keyId}: {error}", {
+				keyId,
+				failure,
+				error: e
+			});
+			await keyCache?.set(cacheKey, null);
+			await clearFetchErrorMetadata(cacheKey, keyCache);
+			return {
+				key: null,
+				cached: false
+			};
+		}
 		if (!(e instanceof TypeError)) throw e;
 		try {
 			object = await cls.fromJsonLd(document, {
@@ -341,8 +423,14 @@ async function resolveFetchedKey(document, cacheKey, documentUrl, keyId, cls, {
 				tracerProvider
 			});
 		} catch (e) {
-			if (e instanceof TypeError) {
-				logger.debug("Failed to verify; key {keyId} returned an invalid object.", { keyId });
+			const failure = classifyKeyJsonLdError(e);
+			if (failure === "fetch") throw contextFetchError(e);
+			if (failure != null || e instanceof TypeError) {
+				logger.debug("Failed to decode key {keyId}: {error}", {
+					keyId,
+					failure: failure ?? "invalid",
+					error: e
+				});
 				await keyCache?.set(cacheKey, null);
 				await clearFetchErrorMetadata(cacheKey, keyCache);
 				return {
@@ -434,16 +522,17 @@ async function resolveFetchedKey(document, cacheKey, documentUrl, keyId, cls, {
 	const claimedOwnerId = key instanceof CryptographicKey ? key.ownerId : key.controllerId;
 	if (ownerDocument != null && claimedOwnerId == null) key = key instanceof CryptographicKey ? key.clone({ owner: ownerDocument.id }) : key.clone({ controller: ownerDocument.id });
 	else if (claimedOwnerId != null && claimedOwnerId.href !== ownerDocument?.id?.href) {
-		if (await verifyKeyOwnership(key, {
+		if (await verifyKeyOwnershipInternal(key, {
 			documentLoader,
 			contextLoader,
 			tracerProvider
-		}) == null) {
+		}, true) == null) {
 			logger.debug("Failed to verify; the owner {claimedOwnerId} that key {keyId} claims does not list the key as its own.", {
 				keyId,
 				claimedOwnerId: claimedOwnerId.href
 			});
 			await keyCache?.set(cacheKey, null);
+			await clearFetchErrorMetadata(cacheKey, keyCache);
 			return {
 				key: null,
 				cached: false
@@ -481,7 +570,12 @@ async function fetchKeyWithResult(cacheKey, cls, options, onCachedUnavailable, o
 	} catch (error) {
 		return await onFetchError(error, cacheKey, keyId, keyCache, logger);
 	}
-	return await resolveFetchedKey(document, cacheKey, documentUrl, keyId, cls, options, logger);
+	try {
+		return await resolveFetchedKey(document, cacheKey, documentUrl, keyId, cls, options, logger);
+	} catch (error) {
+		if (!(error instanceof KeyContextFetchError)) throw error;
+		return await onFetchError(error.error, cacheKey, keyId, keyCache, logger);
+	}
 }
 async function fetchKeyInternal(keyId, cls, options = {}) {
 	return await fetchKeyWithResult(typeof keyId === "string" ? new URL(keyId) : keyId, cls, options, (_cacheKey, _keyId, _keyCache, _logger) => {

package/dist/{keycache-C1aVprwy.mjs → keycache-Dkc_sflV.mjs}

@@ -2,6 +2,7 @@ import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { CryptographicKey, Multikey } from "@fedify/vocab";
+import { FetchError, UrlError } from "@fedify/vocab-runtime";
 //#region src/federation/keycache.ts
 const KEY_CACHE_GENERATION = "2";
 var KvKeyCache = class {
@@ -76,8 +77,15 @@ var KvKeyCache = class {
 			})
 		};
 		else if ("errorName" in cached && typeof cached.errorName === "string" && "errorMessage" in cached && typeof cached.errorMessage === "string") {
-			const error = new Error(cached.errorMessage);
+			let error;
+			if ("errorType" in cached && cached.errorType === "FetchError" && "errorUrl" in cached && typeof cached.errorUrl === "string" && URL.canParse(cached.errorUrl)) {
+				error = new FetchError(cached.errorUrl);
+				error.message = cached.errorMessage;
+			} else if ("errorType" in cached && cached.errorType === "UrlError" && "errorReason" in cached && (cached.errorReason === "dns" || cached.errorReason === "disallowed")) error = new UrlError(cached.errorMessage, { reason: cached.errorReason });
+			else error = new Error(cached.errorMessage);
 			error.name = cached.errorName;
+			if ("errorCause" in cached && cached.errorCause != null && typeof cached.errorCause === "object" && "name" in cached.errorCause && typeof cached.errorCause.name === "string" && "message" in cached.errorCause && typeof cached.errorCause.message === "string") if ("isDomException" in cached.errorCause && cached.errorCause.isDomException === true) error.cause = new DOMException(cached.errorCause.message, cached.errorCause.name);
+			else error.cause = Object.assign(new Error(cached.errorCause.message), { name: cached.errorCause.name });
 			return { error };
 		}
 	}
@@ -95,9 +103,22 @@ var KvKeyCache = class {
 			}, { ttl: this.unavailableKeyTtl });
 			return;
 		}
+		const cause = error.error.cause;
 		await this.kv.set(this.#getFetchErrorKey(keyId), {
 			errorName: error.error.name,
-			errorMessage: error.error.message
+			errorMessage: error.error.message,
+			...error.error instanceof FetchError ? {
+				errorType: "FetchError",
+				errorUrl: error.error.url.href
+			} : error.error instanceof UrlError ? {
+				errorType: "UrlError",
+				errorReason: error.error.reason
+			} : {},
+			...cause instanceof Error || cause instanceof DOMException ? { errorCause: {
+				name: cause.name,
+				message: cause.message,
+				isDomException: cause instanceof DOMException
+			} } : {}
 		}, { ttl: this.unavailableKeyTtl });
 	}
 };

package/dist/{kv-cache-K6z1D4HS.cjs → kv-cache-Btp4kC_U.cjs}

@@ -1,7 +1,7 @@
 const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 require("./chunk-DDcVe30Y.cjs");
-const require_http = require("./http-CJuCjxWI.cjs");
+const require_http = require("./http-C_aA2Zx1.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let es_toolkit = require("es-toolkit");
 let _fedify_vocab_runtime = require("@fedify/vocab-runtime");

package/dist/{kv-cache-DJ3q30Nl.js → kv-cache-DVhfMtqE.js}

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { f as validateCryptoKey, t as doubleKnock } from "./http-DlBFaZ7A.js";
+import { f as validateCryptoKey, t as doubleKnock } from "./http-DkzPSl5o.js";
 import { getLogger } from "@logtape/logtape";
 import { curry } from "es-toolkit";
 import { FetchError, UrlError, createActivityPubRequest, getRemoteDocument, logRequest, preloadedContexts, validatePublicUrl } from "@fedify/vocab-runtime";

package/dist/{ld-D-oK3e4r.mjs → ld-B_m0qw8j.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-duAPwAHH.mjs";
-import { r as fetchKey, s as validateCryptoKey } from "./key-5QlWv3sx.mjs";
+import { n as version, t as name } from "./deno-Cya0rbEr.mjs";
+import { r as fetchKey, s as validateCryptoKey } from "./key-BMHNd0gP.mjs";
 import { Activity, CryptographicKey, Object as Object$1, getTypeId } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { getDocumentLoader } from "@fedify/vocab-runtime";

package/dist/{middleware-DTIhauqW.mjs → middleware-5qLdPLro.mjs}

@@ -2,25 +2,25 @@ import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { n as RouterError } from "./router-CrMLXoOr.mjs";
-import { n as version, t as name } from "./deno-duAPwAHH.mjs";
+import { n as version, t as name } from "./deno-Cya0rbEr.mjs";
 import { t as formatAcceptSignature } from "./accept-Dd__NiUL.mjs";
-import { o as importJwk, s as validateCryptoKey, t as exportJwk } from "./key-5QlWv3sx.mjs";
-import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-DytBXprv.mjs";
-import { t as getAuthenticatedDocumentLoader } from "./docloader-DI88Lx6y.mjs";
+import { o as importJwk, s as validateCryptoKey, t as exportJwk } from "./key-BMHNd0gP.mjs";
+import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-dobCLGG2.mjs";
+import { t as getAuthenticatedDocumentLoader } from "./docloader-Dz0Z1Y07.mjs";
 import { n as kvCache } from "./kv-cache-FsT1ljhs.mjs";
-import { _ as wrapContextLoaderForJsonLd, a as compactJsonLd, c as getNormalizationContextLoader, d as isClearlyMalformedContextReference, f as isInvalidUrlTypeError, l as hasSignature, m as verifyCompactJsonLd, p as signJsonLd, r as assertSafeJsonLd, s as detachSignature, t as InvalidContextReferenceError, u as hasSignatureLike } from "./ld-D-oK3e4r.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-CHkNw8Fk.mjs";
-import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-Dc2OXyB-.mjs";
-import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-o8Ly9XSp.mjs";
-import { d as readBoundedText, l as BodyTooLargeError, t as getNodeInfo, u as MAX_BODY_SIZE } from "./client-CJ4Y0keQ.mjs";
-import { t as nodeInfoToJson } from "./types-s4mCTGkT.mjs";
-import { t as FederationBuilderImpl } from "./builder-CcReUrBQ.mjs";
-import { t as buildCollectionSynchronizationHeader } from "./collection-DnoYNwBC.mjs";
-import { t as KvKeyCache } from "./keycache-C1aVprwy.mjs";
+import { t as KvKeyCache } from "./keycache-Dkc_sflV.mjs";
+import { _ as wrapContextLoaderForJsonLd, a as compactJsonLd, c as getNormalizationContextLoader, d as isClearlyMalformedContextReference, f as isInvalidUrlTypeError, l as hasSignature, m as verifyCompactJsonLd, p as signJsonLd, r as assertSafeJsonLd, s as detachSignature, t as InvalidContextReferenceError, u as hasSignatureLike } from "./ld-B_m0qw8j.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-Dk85kXZz.mjs";
+import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-amccRMrV.mjs";
+import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-DrGrnZVE.mjs";
+import { d as readBoundedText, l as BodyTooLargeError, t as getNodeInfo, u as MAX_BODY_SIZE } from "./client-9F_u23dc.mjs";
+import { t as nodeInfoToJson } from "./types-J53Kw7so.mjs";
+import { t as FederationBuilderImpl } from "./builder-a-kl29PE.mjs";
+import { t as buildCollectionSynchronizationHeader } from "./collection-D-HqUuA2.mjs";
 import { t as acceptsJsonLd } from "./negotiation-BHtZN6Y1.mjs";
-import { t as hasMalformedKnownTemporalLiteral } from "./temporal-8bTjf1mO.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "./temporal-Bnwa_2NC.mjs";
 import { t as createExponentialBackoffPolicy } from "./retry-bMXBL97A.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-Ck74ndlE.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-Co-E7yJn.mjs";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, Tombstone, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
 import { lookupWebFinger } from "@fedify/webfinger";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";

package/dist/{middleware-ROzi4oVa.mjs → middleware-BYxKsDHj.mjs}

@@ -1,5 +1,5 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as FederationImpl } from "./middleware-DTIhauqW.mjs";
+import { n as FederationImpl } from "./middleware-5qLdPLro.mjs";
 export { FederationImpl };

package/dist/{middleware-CYAtT9KB.js → middleware-BchkzbpG.js}

@@ -2,10 +2,10 @@ import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 import { t as __exportAll } from "./chunk-CRNNMoPX.js";
 import { r as getDefaultActivityTransformers } from "./transformers-BGMIq1cs.js";
-import { a as verifyRequestDetailed, d as importJwk, f as validateCryptoKey, i as verifyRequest, m as formatAcceptSignature, n as parseRfc9421SignatureInput, o as exportJwk, t as doubleKnock, v as name, y as version } from "./http-DlBFaZ7A.js";
+import { a as verifyRequestDetailed, d as importJwk, f as validateCryptoKey, i as verifyRequest, m as formatAcceptSignature, n as parseRfc9421SignatureInput, o as exportJwk, t as doubleKnock, v as name, y as version } from "./http-DkzPSl5o.js";
 import { a as MAX_BODY_SIZE, i as BodyTooLargeError, n as getNodeInfo, o as readBoundedText, t as nodeInfoToJson } from "./types-miAYfiGO.js";
-import { _ as hasSignatureLike, b as signJsonLd, c as getKeyOwner, f as compactJsonLd, g as hasSignature, h as getNormalizationContextLoader, i as verifyObject, l as InvalidContextReferenceError, m as detachSignature, n as hasProofLike, o as normalizeOutgoingActivityJsonLd, r as signObject, s as doesActorOwnKey, u as assertSafeJsonLd, v as isClearlyMalformedContextReference, w as wrapContextLoaderForJsonLd, x as verifyCompactJsonLd, y as isInvalidUrlTypeError } from "./proof-BJ_pqvov.js";
-import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-DJ3q30Nl.js";
+import { _ as hasSignatureLike, b as signJsonLd, c as getKeyOwner, f as compactJsonLd, g as hasSignature, h as getNormalizationContextLoader, i as verifyObject, l as InvalidContextReferenceError, m as detachSignature, n as hasProofLike, o as normalizeOutgoingActivityJsonLd, r as signObject, s as doesActorOwnKey, u as assertSafeJsonLd, v as isClearlyMalformedContextReference, w as wrapContextLoaderForJsonLd, x as verifyCompactJsonLd, y as isInvalidUrlTypeError } from "./proof-Bz6IdT2p.js";
+import { n as getAuthenticatedDocumentLoader, t as kvCache } from "./kv-cache-DVhfMtqE.js";
 import { getLogger, withContext } from "@logtape/logtape";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, Tombstone, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
@@ -995,8 +995,15 @@ var KvKeyCache = class {
 			})
 		};
 		else if ("errorName" in cached && typeof cached.errorName === "string" && "errorMessage" in cached && typeof cached.errorMessage === "string") {
-			const error = new Error(cached.errorMessage);
+			let error;
+			if ("errorType" in cached && cached.errorType === "FetchError" && "errorUrl" in cached && typeof cached.errorUrl === "string" && URL.canParse(cached.errorUrl)) {
+				error = new FetchError(cached.errorUrl);
+				error.message = cached.errorMessage;
+			} else if ("errorType" in cached && cached.errorType === "UrlError" && "errorReason" in cached && (cached.errorReason === "dns" || cached.errorReason === "disallowed")) error = new UrlError(cached.errorMessage, { reason: cached.errorReason });
+			else error = new Error(cached.errorMessage);
 			error.name = cached.errorName;
+			if ("errorCause" in cached && cached.errorCause != null && typeof cached.errorCause === "object" && "name" in cached.errorCause && typeof cached.errorCause.name === "string" && "message" in cached.errorCause && typeof cached.errorCause.message === "string") if ("isDomException" in cached.errorCause && cached.errorCause.isDomException === true) error.cause = new DOMException(cached.errorCause.message, cached.errorCause.name);
+			else error.cause = Object.assign(new Error(cached.errorCause.message), { name: cached.errorCause.name });
 			return { error };
 		}
 	}
@@ -1014,9 +1021,22 @@ var KvKeyCache = class {
 			}, { ttl: this.unavailableKeyTtl });
 			return;
 		}
+		const cause = error.error.cause;
 		await this.kv.set(this.#getFetchErrorKey(keyId), {
 			errorName: error.error.name,
-			errorMessage: error.error.message
+			errorMessage: error.error.message,
+			...error.error instanceof FetchError ? {
+				errorType: "FetchError",
+				errorUrl: error.error.url.href
+			} : error.error instanceof UrlError ? {
+				errorType: "UrlError",
+				errorReason: error.error.reason
+			} : {},
+			...cause instanceof Error || cause instanceof DOMException ? { errorCause: {
+				name: cause.name,
+				message: cause.message,
+				isDomException: cause instanceof DOMException
+			} } : {}
 		}, { ttl: this.unavailableKeyTtl });
 	}
 };

package/dist/{middleware-IHStfDZ2.cjs → middleware-C7mI18WE.cjs}

@@ -2,10 +2,10 @@ const { Temporal } = require("@js-temporal/polyfill");
 const { URLPattern } = require("urlpattern-polyfill");
 const require_chunk = require("./chunk-DDcVe30Y.cjs");
 const require_transformers = require("./transformers-NeAONrAq.cjs");
-const require_http = require("./http-CJuCjxWI.cjs");
+const require_http = require("./http-C_aA2Zx1.cjs");
 const require_types = require("./types-DRPjmHVV.cjs");
-const require_proof = require("./proof-DC3IlY_8.cjs");
-const require_kv_cache = require("./kv-cache-K6z1D4HS.cjs");
+const require_proof = require("./proof-ClpE9zhD.cjs");
+const require_kv_cache = require("./kv-cache-Btp4kC_U.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_vocab = require("@fedify/vocab");
 let _opentelemetry_api = require("@opentelemetry/api");
@@ -213,7 +213,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl } = await Promise.resolve().then(() => require("./middleware-RmEidCmR.cjs"));
+		const { FederationImpl } = await Promise.resolve().then(() => require("./middleware-ZKHfZ7zj.cjs"));
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -996,8 +996,15 @@ var KvKeyCache = class {
 			})
 		};
 		else if ("errorName" in cached && typeof cached.errorName === "string" && "errorMessage" in cached && typeof cached.errorMessage === "string") {
-			const error = new Error(cached.errorMessage);
+			let error;
+			if ("errorType" in cached && cached.errorType === "FetchError" && "errorUrl" in cached && typeof cached.errorUrl === "string" && URL.canParse(cached.errorUrl)) {
+				error = new _fedify_vocab_runtime.FetchError(cached.errorUrl);
+				error.message = cached.errorMessage;
+			} else if ("errorType" in cached && cached.errorType === "UrlError" && "errorReason" in cached && (cached.errorReason === "dns" || cached.errorReason === "disallowed")) error = new _fedify_vocab_runtime.UrlError(cached.errorMessage, { reason: cached.errorReason });
+			else error = new Error(cached.errorMessage);
 			error.name = cached.errorName;
+			if ("errorCause" in cached && cached.errorCause != null && typeof cached.errorCause === "object" && "name" in cached.errorCause && typeof cached.errorCause.name === "string" && "message" in cached.errorCause && typeof cached.errorCause.message === "string") if ("isDomException" in cached.errorCause && cached.errorCause.isDomException === true) error.cause = new DOMException(cached.errorCause.message, cached.errorCause.name);
+			else error.cause = Object.assign(new Error(cached.errorCause.message), { name: cached.errorCause.name });
 			return { error };
 		}
 	}
@@ -1015,9 +1022,22 @@ var KvKeyCache = class {
 			}, { ttl: this.unavailableKeyTtl });
 			return;
 		}
+		const cause = error.error.cause;
 		await this.kv.set(this.#getFetchErrorKey(keyId), {
 			errorName: error.error.name,
-			errorMessage: error.error.message
+			errorMessage: error.error.message,
+			...error.error instanceof _fedify_vocab_runtime.FetchError ? {
+				errorType: "FetchError",
+				errorUrl: error.error.url.href
+			} : error.error instanceof _fedify_vocab_runtime.UrlError ? {
+				errorType: "UrlError",
+				errorReason: error.error.reason
+			} : {},
+			...cause instanceof Error || cause instanceof DOMException ? { errorCause: {
+				name: cause.name,
+				message: cause.message,
+				isDomException: cause instanceof DOMException
+			} } : {}
 		}, { ttl: this.unavailableKeyTtl });
 	}
 };