@fedify/cli 2.4.0-dev.2169 → 2.4.0-dev.2190

package/dist/deno.js

@@ -1,5 +1,5 @@
 import "temporal-polyfill";
 //#region deno.json
-var version = "2.4.0-dev.2169+0a45df07";
+var version = "2.4.0-dev.2190+be3a8be0";
 //#endregion
 export { version };

package/dist/docloader.js

@@ -17,8 +17,8 @@ function getDocumentLoaderCachePrefix(userAgent, allowPrivateAddress) {
 		allowPrivateAddress ? "allow-private" : "deny-private"
 	];
 }
-async function getDocumentLoader$1({ userAgent, allowPrivateAddress = false } = {}) {
-	const cacheKey = `${userAgent ?? ""}:${allowPrivateAddress}`;
+async function getDocumentLoader$1({ userAgent, allowPrivateAddress = false, timeout } = {}) {
+	const cacheKey = `${userAgent ?? ""}:${allowPrivateAddress}:${timeout ?? ""}`;
 	if (documentLoaders[cacheKey]) return documentLoaders[cacheKey];
 	const kv = await getKvStore();
 	return documentLoaders[cacheKey] = kvCache({
@@ -52,7 +52,8 @@ async function getDocumentLoader$1({ userAgent, allowPrivateAddress = false } =
 		],
 		loader: getDocumentLoader({
 			allowPrivateAddress,
-			userAgent
+			userAgent,
+			timeout
 		})
 	});
 }

package/dist/lookup.js

@@ -10,7 +10,7 @@ import process from "node:process";
 import { message, optionNames, text } from "@optique/core";
 import { printError } from "@optique/run";
 import { createWriteStream } from "node:fs";
-import { UrlError, expandIPv6Address, isValidPublicIPv4Address, isValidPublicIPv6Address } from "@fedify/vocab-runtime";
+import { FetchError, UrlError, expandIPv6Address, isValidPublicIPv4Address, isValidPublicIPv6Address } from "@fedify/vocab-runtime";
 import { generateCryptoKeyPair, getAuthenticatedDocumentLoader, respondWithObject } from "@fedify/fedify";
 import { getLogger } from "@logtape/logtape";
 import ora from "ora";
@@ -25,12 +25,21 @@ const logger = getLogger([
 ]);
 var TimeoutError = class extends Error {
 	name = "TimeoutError";
-	constructor(message) {
-		super(message);
+	constructor(message, options) {
+		super(message, options);
 		this.name = "TimeoutError";
 	}
 };
 /**
+* The timeout that the built-in document loaders use when `-T`/`--timeout`
+* is not given, in seconds.
+*/
+const DEFAULT_TIMEOUT_SECONDS = 10;
+/**
+* The maximum delay in milliseconds that timers accept.
+*/
+const MAX_TIMEOUT_MS = 2147483647;
+/**
 * Error thrown when a recursive lookup target cannot be fetched.
 */
 var RecursiveLookupError = class extends Error {
@@ -140,40 +149,39 @@ async function collectAsyncItems(iterable) {
 		};
 	}
 }
-const signalTimers = /* @__PURE__ */ new WeakMap();
-function createTimeoutSignal(timeoutSeconds) {
+/**
+* Converts the `-T`/`--timeout` option in seconds into the `timeout` option
+* of the built-in document loaders in milliseconds.  Zero means timing out
+* immediately, and too long timeouts are clamped to what timers accept.
+* @param timeoutSeconds The timeout in seconds, if given.
+* @returns The timeout in milliseconds, or `undefined` for the default.
+*/
+function toDocumentLoaderTimeout(timeoutSeconds) {
 	if (timeoutSeconds == null) return void 0;
-	const controller = new AbortController();
-	const timerId = setTimeout(() => {
-		controller.abort(new TimeoutError(`Request timed out after ${timeoutSeconds} seconds`));
-	}, timeoutSeconds * 1e3);
-	signalTimers.set(controller.signal, timerId);
-	return controller.signal;
+	return Math.min(MAX_TIMEOUT_MS, Math.max(1, Math.ceil(timeoutSeconds * 1e3)));
 }
-function clearTimeoutSignal(signal) {
-	if (!signal) return;
-	const timerId = signalTimers.get(signal);
-	if (timerId !== void 0) {
-		clearTimeout(timerId);
-		signalTimers.delete(signal);
-	}
+/**
+* Checks whether the given error was thrown by a built-in document loader
+* that timed out.
+* @param error The error to check.
+* @returns `true` if the document loader timed out.
+*/
+function isDocumentLoaderTimeoutError(error) {
+	return error instanceof FetchError && error.response == null && error.cause instanceof Error && error.cause.name === "TimeoutError";
 }
+/**
+* Wraps a built-in document loader so that its timeouts are thrown as
+* {@link TimeoutError}s, which the lookup command reports specially.
+*/
 function wrapDocumentLoaderWithTimeout(loader, timeoutSeconds) {
-	if (timeoutSeconds == null) return loader;
-	return (url, options) => {
-		const signal = createTimeoutSignal(timeoutSeconds);
-		return loader(url, {
-			...options,
-			signal
-		}).catch((error) => {
-			if (signal?.aborted) throw signal.reason;
-			throw error;
-		}).finally(() => clearTimeoutSignal(signal));
-	};
+	return (url, options) => loader(url, options).catch((error) => {
+		if (isDocumentLoaderTimeoutError(error)) throw new TimeoutError(`Request timed out after ${timeoutSeconds ?? DEFAULT_TIMEOUT_SECONDS} seconds`, { cause: error });
+		throw error;
+	});
 }
 function handleTimeoutError(spinner, timeoutSeconds, url) {
 	const urlText = url ? ` for: ${colors.red(url)}` : "";
-	spinner.fail(`Request timed out after ${timeoutSeconds} seconds${urlText}.`);
+	spinner.fail(`Request timed out after ${timeoutSeconds ?? DEFAULT_TIMEOUT_SECONDS} seconds${urlText}.`);
 	printError(message`Try increasing the timeout with ${optionNames(["-T", "--timeout"])} option or check network connectivity.`);
 }
 function isPrivateAddressError(error) {
@@ -348,15 +356,18 @@ async function runLookup(command, deps = {}) {
 	let server = void 0;
 	const initialDocumentLoader = wrapDocumentLoaderWithTimeout(await getDocumentLoader$1({
 		userAgent: command.userAgent,
-		allowPrivateAddress: true
+		allowPrivateAddress: true,
+		timeout: toDocumentLoaderTimeout(command.timeout)
 	}), command.timeout);
 	const documentLoader = wrapDocumentLoaderWithTimeout(await getDocumentLoader$1({
 		userAgent: command.userAgent,
-		allowPrivateAddress: command.allowPrivateAddress
+		allowPrivateAddress: command.allowPrivateAddress,
+		timeout: toDocumentLoaderTimeout(command.timeout)
 	}), command.timeout);
 	const contextLoader = wrapDocumentLoaderWithTimeout(await getContextLoader({
 		userAgent: command.userAgent,
-		allowPrivateAddress: command.allowPrivateAddress
+		allowPrivateAddress: command.allowPrivateAddress,
+		timeout: toDocumentLoaderTimeout(command.timeout)
 	}), command.timeout);
 	let authLoader = void 0;
 	let initialAuthLoader = void 0;
@@ -429,6 +440,7 @@ async function runLookup(command, deps = {}) {
 		authLoader = wrapDocumentLoaderWithTimeout(getAuthenticatedDocumentLoader(authIdentity, {
 			allowPrivateAddress: command.allowPrivateAddress,
 			userAgent: command.userAgent,
+			timeout: toDocumentLoaderTimeout(command.timeout),
 			specDeterminer: {
 				determineSpec() {
 					return firstKnock;
@@ -439,6 +451,7 @@ async function runLookup(command, deps = {}) {
 		initialAuthLoader = wrapDocumentLoaderWithTimeout(getAuthenticatedDocumentLoader(authIdentity, {
 			allowPrivateAddress: true,
 			userAgent: command.userAgent,
+			timeout: toDocumentLoaderTimeout(command.timeout),
 			specDeterminer: {
 				determineSpec() {
 					return firstKnock;
@@ -453,7 +466,8 @@ async function runLookup(command, deps = {}) {
 		const recursiveLookupDocumentLoader = authLoader ?? documentLoader;
 		const recursiveContextLoader = wrapDocumentLoaderWithTimeout(await getContextLoader({
 			userAgent: command.userAgent,
-			allowPrivateAddress: false
+			allowPrivateAddress: false,
+			timeout: toDocumentLoaderTimeout(command.timeout)
 		}), command.timeout);
 		let totalObjects = 0;
 		const recurseDepth = command.recurseDepth;
@@ -747,4 +761,4 @@ async function runLookup(command, deps = {}) {
 	if (success && command.output) spinner.succeed(`Successfully wrote output to ${colors.green(command.output)}.`);
 }
 //#endregion
-export { RecursiveLookupError, TimeoutError, clearTimeoutSignal, collectAsyncItems, collectRecursiveObjects, createTimeoutSignal, getLookupFailureHint, getPrivateUrlCandidate, getRecursiveTargetId, runLookup, shouldPrintLookupFailureHint, shouldSuggestSuppressErrorsForLookupFailure, toPresentationOrder, writeObjectToStream, writeSeparator };
+export { RecursiveLookupError, TimeoutError, collectAsyncItems, collectRecursiveObjects, getLookupFailureHint, getPrivateUrlCandidate, getRecursiveTargetId, isDocumentLoaderTimeoutError, runLookup, shouldPrintLookupFailureHint, shouldSuggestSuppressErrorsForLookupFailure, toDocumentLoaderTimeout, toPresentationOrder, wrapDocumentLoaderWithTimeout, writeObjectToStream, writeSeparator };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/cli",
-  "version": "2.4.0-dev.2169+0a45df07",
+  "version": "2.4.0-dev.2190+be3a8be0",
   "type": "module",
   "files": [
     "README.md",
@@ -88,14 +88,14 @@
     "temporal-polyfill": "^1.0.1",
     "valibot": "^1.4.0",
     "yaml": "^2.9.0",
-    "@fedify/fedify": "2.4.0-dev.2169+0a45df07",
-    "@fedify/init": "2.4.0-dev.2169+0a45df07",
-    "@fedify/relay": "2.4.0-dev.2169+0a45df07",
-    "@fedify/sqlite": "2.4.0-dev.2169+0a45df07",
-    "@fedify/vocab": "2.4.0-dev.2169+0a45df07",
-    "@fedify/vocab-tools": "2.4.0-dev.2169+0a45df07",
-    "@fedify/vocab-runtime": "2.4.0-dev.2169+0a45df07",
-    "@fedify/webfinger": "2.4.0-dev.2169+0a45df07"
+    "@fedify/init": "2.4.0-dev.2190+be3a8be0",
+    "@fedify/fedify": "2.4.0-dev.2190+be3a8be0",
+    "@fedify/sqlite": "2.4.0-dev.2190+be3a8be0",
+    "@fedify/vocab-runtime": "2.4.0-dev.2190+be3a8be0",
+    "@fedify/vocab": "2.4.0-dev.2190+be3a8be0",
+    "@fedify/vocab-tools": "2.4.0-dev.2190+be3a8be0",
+    "@fedify/relay": "2.4.0-dev.2190+be3a8be0",
+    "@fedify/webfinger": "2.4.0-dev.2190+be3a8be0"
   },
   "devDependencies": {
     "@types/bun": "^1.2.23",