@fedify/fedify 2.3.0-dev.1079 → 2.3.0-dev.1099

package/dist/{http-aQzN9Ayi.d.ts → http-C87EWkO0.d.cts}

@@ -1,8 +1,7 @@
-import { Temporal } from "@js-temporal/polyfill";
-import { URLPattern } from "urlpattern-polyfill";
+/// <reference lib="esnext.temporal" />
 import { CryptographicKey, Multikey } from "@fedify/vocab";
-import { TracerProvider } from "@opentelemetry/api";
 import { DocumentLoader } from "@fedify/vocab-runtime";
+import { TracerProvider } from "@opentelemetry/api";
 
 //#region src/sig/key.d.ts
 /**

package/dist/{http-b__OS_rJ.js → http-Dzy5c472.js}

@@ -1,5 +1,5 @@
 import { Temporal } from "@js-temporal/polyfill";
-import "urlpattern-polyfill";
+import { URLPattern } from "urlpattern-polyfill";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
@@ -10,7 +10,7 @@ import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } fro
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.3.0-dev.1079+36ac23d1";
+var version = "2.3.0-dev.1099+fafcfa78";
 //#endregion
 //#region src/sig/accept.ts
 /**
@@ -496,6 +496,7 @@ async function fetchKeyInternal(keyId, cls, options = {}) {
 //#endregion
 //#region src/sig/http.ts
 const DEFAULT_MAX_REDIRECTION = 20;
+const DOUBLE_KNOCK_TRANSPORT_RETRY_DELAY_MS = 100;
 /**
 * Signs a request using the given private key.
 * @param request The request to sign.
@@ -1324,6 +1325,59 @@ function createRedirectRequest(request, location, body) {
 		cache: request.cache
 	});
 }
+async function fetchDoubleKnockRequest(request, signedRequest, signal) {
+	const maxAttempts = request.method === "GET" || request.method === "HEAD" ? 2 : 1;
+	for (let attempt = 1;; attempt++) try {
+		return await fetch(signedRequest, {
+			redirect: "manual",
+			signal
+		});
+	} catch (error) {
+		const abortedSignal = getAbortedSignal(signal, request.signal, signedRequest.signal);
+		if (abortedSignal != null) throw getAbortReason(abortedSignal);
+		if (isAbortError(error)) throw error;
+		if (attempt >= maxAttempts) throw createFetchError(request.url, error);
+		await sleep(DOUBLE_KNOCK_TRANSPORT_RETRY_DELAY_MS, signal, request.signal, signedRequest.signal);
+	}
+}
+function createFetchError(url, cause) {
+	const error = new FetchError(url, cause instanceof Error ? cause.message : String(cause));
+	error.cause = cause;
+	return error;
+}
+function isAbortError(error) {
+	return error instanceof Error && error.name === "AbortError";
+}
+async function sleep(ms, ...signals) {
+	const abortSignals = signals.filter((signal) => signal != null);
+	const abortedSignal = getAbortedSignal(...abortSignals);
+	if (abortedSignal != null) throw getAbortReason(abortedSignal);
+	if (abortSignals.length < 1) {
+		await new Promise((resolve) => setTimeout(resolve, ms));
+		return;
+	}
+	await new Promise((resolve, reject) => {
+		const removeAbortListeners = () => {
+			for (const signal of abortSignals) signal.removeEventListener("abort", handleAbort);
+		};
+		const timeout = setTimeout(() => {
+			removeAbortListeners();
+			resolve();
+		}, ms);
+		function handleAbort(event) {
+			clearTimeout(timeout);
+			removeAbortListeners();
+			reject(getAbortReason(event.currentTarget));
+		}
+		for (const signal of abortSignals) signal.addEventListener("abort", handleAbort, { once: true });
+	});
+}
+function getAbortedSignal(...signals) {
+	return signals.find((signal) => signal?.aborted);
+}
+function getAbortReason(signal) {
+	return signal.reason ?? new DOMException("The operation was aborted.", "AbortError");
+}
 /**
 * Performs a double-knock request to the given URL.  For the details of
 * double-knocking, see
@@ -1350,10 +1404,7 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
 		body
 	});
 	log?.(signedRequest);
-	let response = await fetch(signedRequest, {
-		redirect: "manual",
-		signal
-	});
+	let response = await fetchDoubleKnockRequest(request, signedRequest, signal);
 	if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
 		if (redirected >= maximumRedirection) throw new FetchError(request.url, `Too many redirections (${redirected + 1})`);
 		const redirectRequest = createRedirectRequest(request, response.headers.get("Location"), body);
@@ -1428,10 +1479,7 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
 			body
 		});
 		log?.(signedRequest);
-		response = await fetch(signedRequest, {
-			redirect: "manual",
-			signal
-		});
+		response = await fetchDoubleKnockRequest(request, signedRequest, signal);
 		if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
 			if (redirected >= maximumRedirection) throw new FetchError(request.url, `Too many redirections (${redirected + 1})`);
 			const redirectRequest = createRedirectRequest(request, response.headers.get("Location"), body);

package/dist/{http-DQ25_ruv.cjs → http-W2u_KBoQ.cjs}

@@ -11,7 +11,7 @@ let _opentelemetry_semantic_conventions = require("@opentelemetry/semantic-conve
 let byte_encodings_base64 = require("byte-encodings/base64");
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.3.0-dev.1079+36ac23d1";
+var version = "2.3.0-dev.1099+fafcfa78";
 //#endregion
 //#region src/sig/accept.ts
 /**
@@ -497,6 +497,7 @@ async function fetchKeyInternal(keyId, cls, options = {}) {
 //#endregion
 //#region src/sig/http.ts
 const DEFAULT_MAX_REDIRECTION = 20;
+const DOUBLE_KNOCK_TRANSPORT_RETRY_DELAY_MS = 100;
 /**
 * Signs a request using the given private key.
 * @param request The request to sign.
@@ -1325,6 +1326,59 @@ function createRedirectRequest(request, location, body) {
 		cache: request.cache
 	});
 }
+async function fetchDoubleKnockRequest(request, signedRequest, signal) {
+	const maxAttempts = request.method === "GET" || request.method === "HEAD" ? 2 : 1;
+	for (let attempt = 1;; attempt++) try {
+		return await fetch(signedRequest, {
+			redirect: "manual",
+			signal
+		});
+	} catch (error) {
+		const abortedSignal = getAbortedSignal(signal, request.signal, signedRequest.signal);
+		if (abortedSignal != null) throw getAbortReason(abortedSignal);
+		if (isAbortError(error)) throw error;
+		if (attempt >= maxAttempts) throw createFetchError(request.url, error);
+		await sleep(DOUBLE_KNOCK_TRANSPORT_RETRY_DELAY_MS, signal, request.signal, signedRequest.signal);
+	}
+}
+function createFetchError(url, cause) {
+	const error = new _fedify_vocab_runtime.FetchError(url, cause instanceof Error ? cause.message : String(cause));
+	error.cause = cause;
+	return error;
+}
+function isAbortError(error) {
+	return error instanceof Error && error.name === "AbortError";
+}
+async function sleep(ms, ...signals) {
+	const abortSignals = signals.filter((signal) => signal != null);
+	const abortedSignal = getAbortedSignal(...abortSignals);
+	if (abortedSignal != null) throw getAbortReason(abortedSignal);
+	if (abortSignals.length < 1) {
+		await new Promise((resolve) => setTimeout(resolve, ms));
+		return;
+	}
+	await new Promise((resolve, reject) => {
+		const removeAbortListeners = () => {
+			for (const signal of abortSignals) signal.removeEventListener("abort", handleAbort);
+		};
+		const timeout = setTimeout(() => {
+			removeAbortListeners();
+			resolve();
+		}, ms);
+		function handleAbort(event) {
+			clearTimeout(timeout);
+			removeAbortListeners();
+			reject(getAbortReason(event.currentTarget));
+		}
+		for (const signal of abortSignals) signal.addEventListener("abort", handleAbort, { once: true });
+	});
+}
+function getAbortedSignal(...signals) {
+	return signals.find((signal) => signal?.aborted);
+}
+function getAbortReason(signal) {
+	return signal.reason ?? new DOMException("The operation was aborted.", "AbortError");
+}
 /**
 * Performs a double-knock request to the given URL.  For the details of
 * double-knocking, see
@@ -1351,10 +1405,7 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
 		body
 	});
 	log?.(signedRequest);
-	let response = await fetch(signedRequest, {
-		redirect: "manual",
-		signal
-	});
+	let response = await fetchDoubleKnockRequest(request, signedRequest, signal);
 	if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
 		if (redirected >= maximumRedirection) throw new _fedify_vocab_runtime.FetchError(request.url, `Too many redirections (${redirected + 1})`);
 		const redirectRequest = createRedirectRequest(request, response.headers.get("Location"), body);
@@ -1429,10 +1480,7 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
 			body
 		});
 		log?.(signedRequest);
-		response = await fetch(signedRequest, {
-			redirect: "manual",
-			signal
-		});
+		response = await fetchDoubleKnockRequest(request, signedRequest, signal);
 		if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
 			if (redirected >= maximumRedirection) throw new _fedify_vocab_runtime.FetchError(request.url, `Too many redirections (${redirected + 1})`);
 			const redirectRequest = createRedirectRequest(request, response.headers.get("Location"), body);

package/dist/{key-BNp_b9oE.mjs → key-D9dUsyow.mjs}

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-BxqkYxIf.mjs";
+import { n as version, t as name } from "./deno-DBabeupC.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";

package/dist/{kv-CbLNp3zQ.d.cts → kv-D6hNiMTK.d.ts}

@@ -1,3 +1,4 @@
+/// <reference lib="esnext.temporal" />
 //#region src/federation/kv.d.ts
 /**
 * A key for a key–value store.  An array of one or more strings.

package/dist/{kv-cache-DzctboPD.cjs → kv-cache-BygrlQ1c.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-DQ25_ruv.cjs");
+const require_http = require("./http-W2u_KBoQ.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let es_toolkit = require("es-toolkit");
 let _fedify_vocab_runtime = require("@fedify/vocab-runtime");
@@ -98,7 +98,7 @@ function kvCache({ loader, kv, prefix, rules }) {
 }
 function matchRule(url, rules) {
 	for (const [pattern, d] of rules) {
-		const duration = d instanceof Temporal.Duration ? d : Temporal.Duration.from(d);
+		const duration = Temporal.Duration.from(d);
 		if (typeof pattern === "string") {
 			if (url === pattern) return duration;
 			continue;

package/dist/{kv-cache-D5vjOi5y.js → kv-cache-CBSgxEsZ.js}

@@ -1,6 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { d as validateCryptoKey, t as doubleKnock } from "./http-b__OS_rJ.js";
+import { d as validateCryptoKey, t as doubleKnock } from "./http-Dzy5c472.js";
 import { getLogger } from "@logtape/logtape";
 import { curry } from "es-toolkit";
 import { UrlError, createActivityPubRequest, getRemoteDocument, logRequest, preloadedContexts, validatePublicUrl } from "@fedify/vocab-runtime";
@@ -97,7 +97,7 @@ function kvCache({ loader, kv, prefix, rules }) {
 }
 function matchRule(url, rules) {
 	for (const [pattern, d] of rules) {
-		const duration = d instanceof Temporal.Duration ? d : Temporal.Duration.from(d);
+		const duration = Temporal.Duration.from(d);
 		if (typeof pattern === "string") {
 			if (url === pattern) return duration;
 			continue;

package/dist/{kv-cache-EaVpV2xQ.mjs → kv-cache-CiiNwT6W.mjs}

@@ -86,7 +86,7 @@ function kvCache({ loader, kv, prefix, rules }) {
 }
 function matchRule(url, rules) {
 	for (const [pattern, d] of rules) {
-		const duration = d instanceof Temporal.Duration ? d : Temporal.Duration.from(d);
+		const duration = Temporal.Duration.from(d);
 		if (typeof pattern === "string") {
 			if (url === pattern) return duration;
 			continue;

package/dist/{kv-GFYnFoOl.d.ts → kv-gJ8LYbxX.d.cts}

@@ -1,6 +1,4 @@
-import { Temporal } from "@js-temporal/polyfill";
-import { URLPattern } from "urlpattern-polyfill";
-
+/// <reference lib="esnext.temporal" />
 //#region src/federation/kv.d.ts
 /**
 * A key for a key–value store.  An array of one or more strings.

package/dist/{ld-L9w529xq.mjs → ld-hbxDLO1k.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-BxqkYxIf.mjs";
-import { n as fetchKey, o as validateCryptoKey } from "./key-BNp_b9oE.mjs";
+import { n as version, t as name } from "./deno-DBabeupC.mjs";
+import { n as fetchKey, o as validateCryptoKey } from "./key-D9dUsyow.mjs";
 import { getLogger } from "@logtape/logtape";
 import { Activity, CryptographicKey, Object as Object$1, getTypeId } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";