@fedify/cli 2.5.0-dev.2358 → 2.5.0-dev.2370

package/dist/deno.js

@@ -1,5 +1,5 @@
 import "temporal-polyfill";
 //#region deno.json
-var version = "2.5.0-dev.2358+1d1813b7";
+var version = "2.5.0-dev.2370+e0cfd033";
 //#endregion
 export { version };

package/dist/lookup.js

@@ -47,8 +47,8 @@ var RecursiveLookupError = class extends Error {
 	target;
 	/** Why the target could not be fetched, if known. */
 	failure;
-	constructor(target, failure) {
-		super(`Failed to recursively fetch object: ${target}`);
+	constructor(target, failure, options) {
+		super(`Failed to recursively fetch object: ${target}`, options);
 		this.name = "RecursiveLookupError";
 		this.target = target;
 		this.failure = failure;
@@ -235,9 +235,6 @@ function getLookupFailureHint(error, options = {}) {
 function shouldPrintLookupFailureHint(authLoader, hint) {
 	return hint !== "authorized-fetch" || authLoader == null;
 }
-function shouldSuggestSuppressErrorsForLookupFailure(authLoader, hint) {
-	return authLoader != null && hint === "authorized-fetch";
-}
 function printLookupFailureHint(authLoader, error, options = {}) {
 	const hint = getLookupFailureHint(error, options);
 	if (!shouldPrintLookupFailureHint(authLoader, hint)) return;
@@ -256,6 +253,97 @@ function printLookupFailureHint(authLoader, error, options = {}) {
 			return;
 	}
 }
+function isSuppressibleRecursiveFailure(kind) {
+	switch (kind) {
+		case "timeout":
+		case "private-address":
+		case "not-found":
+		case "context":
+		case "fetch-or-parse": return true;
+	}
+}
+/**
+* Classifies recursive follow-up failures and selects their existing hints.
+* @param error The error from collecting a recursive chain.
+* @param options The policies that affect hints, rather than loader behavior.
+* @returns A failure that can be rendered without inspecting its error again.
+*/
+function classifyRecursiveLookupFailure(error, options) {
+	const wrapped = error instanceof RecursiveLookupError ? error : void 0;
+	const failure = wrapped?.failure;
+	const recordedTimeout = failure?.error instanceof TimeoutError;
+	const presentation = wrapped != null && (wrapped.cause == null || recordedTimeout) ? "target" : "generic";
+	const underlyingError = presentation === "target" ? failure?.error : wrapped?.cause ?? error;
+	const timeout = underlyingError instanceof TimeoutError || recordedTimeout;
+	const privateContextUrl = presentation === "generic" || failure?.source === "context" ? getPrivateContextUrl(underlyingError) : null;
+	const blockedTarget = presentation === "target" && !options.allowPrivateAddress && wrapped != null && isPrivateAddressTarget(wrapped.target);
+	let hint = { type: "none" };
+	if (!timeout) if (presentation === "target") {
+		if (blockedTarget) hint = { type: "private-address" };
+		else if (privateContextUrl != null) hint = {
+			type: "private-context",
+			url: privateContextUrl
+		};
+		else if (failure != null) hint = {
+			type: "diagnostic",
+			message: describeLookupFailure(failure, options.authorizedFetch).message
+		};
+		else if (!options.authorizedFetch) hint = { type: "authorized-fetch" };
+	} else if (privateContextUrl != null) hint = {
+		type: "private-context",
+		url: privateContextUrl
+	};
+	else {
+		const legacyHint = getLookupFailureHint(underlyingError, { recursive: true });
+		hint = legacyHint === "authorized-fetch" ? { type: options.authorizedFetch ? "suppress-errors" : legacyHint } : { type: legacyHint === "dns" ? "dns" : "private-address" };
+	}
+	const kind = timeout ? "timeout" : privateContextUrl != null ? "context" : blockedTarget || !(underlyingError instanceof FetchError) && isPrivateAddressError(underlyingError) ? "private-address" : failure?.source === "context" ? "context" : presentation === "target" && failure == null ? "not-found" : "fetch-or-parse";
+	return {
+		target: wrapped?.target,
+		kind,
+		source: failure?.source,
+		suppressible: isSuppressibleRecursiveFailure(kind),
+		presentation,
+		error: presentation === "generic" ? underlyingError : error,
+		hint
+	};
+}
+/**
+* Renders a classified recursive failure without reinterpreting its error.
+* @param failure The classified follow-up failure.
+* @param spinner The spinner that displays the failure headline.
+* @param timeoutSeconds The requested timeout, in seconds.
+* @internal
+*/
+function printRecursiveLookupFailure(failure, spinner, timeoutSeconds) {
+	const target = failure.presentation === "target" ? failure.target : void 0;
+	if (failure.kind === "timeout") {
+		handleTimeoutError(spinner, timeoutSeconds, target);
+		return;
+	}
+	spinner.fail(target == null ? "Failed to recursively fetch object." : `Failed to recursively fetch object: ${colors.red(target)}.`);
+	switch (failure.hint.type) {
+		case "private-address":
+			printRecursivePrivateAddressHint();
+			return;
+		case "private-context":
+			printRecursivePrivateContextHint(failure.hint.url);
+			return;
+		case "dns":
+			printError(message`DNS lookup failed.  Check the hostname and network connectivity.`);
+			return;
+		case "authorized-fetch":
+			printError(message`It may be a private object.  Try with ${optionNames(["-a", "--authorized-fetch"])}.`);
+			return;
+		case "suppress-errors":
+			printError(message`Use the ${optionNames(["-S", "--suppress-errors"])} option to suppress partial errors.`);
+			return;
+		case "diagnostic":
+			printError(message`${text(failure.hint.message)}`);
+			return;
+		case "none": return;
+	}
+}
 /**
 * Gets the next recursion target URL from an ActivityPub object.
 */
@@ -519,8 +607,7 @@ async function runLookup(command, deps = {}) {
 						...getPortableLookupProblem(target) === "no-gateway" ? gatewayOptions : {}
 					});
 					if (result.object != null) return result.object;
-					if (result.thrownError != null && !(result.failure?.error instanceof TimeoutError)) throw result.thrownError;
-					throw new RecursiveLookupError(target, result.failure);
+					throw new RecursiveLookupError(target, result.failure, result.thrownError == null ? void 0 : { cause: result.thrownError });
 				}, {
 					suppressErrors: command.suppressErrors,
 					visited
@@ -536,28 +623,12 @@ async function runLookup(command, deps = {}) {
 					await finalizeAndExit(1);
 					return;
 				}
-				logger.error("Failed to recursively fetch an object in chain: {error}", { error });
-				if (error instanceof TimeoutError) handleTimeoutError(spinner, command.timeout);
-				else if (error instanceof RecursiveLookupError && error.failure?.error instanceof TimeoutError) handleTimeoutError(spinner, command.timeout, error.target);
-				else if (error instanceof RecursiveLookupError) {
-					spinner.fail(`Failed to recursively fetch object: ${colors.red(error.target)}.`);
-					const privateContextUrl = error.failure?.source === "context" ? getPrivateContextUrl(error.failure.error) : null;
-					if (!command.allowPrivateAddress && isPrivateAddressTarget(error.target)) printRecursivePrivateAddressHint();
-					else if (privateContextUrl != null) printRecursivePrivateContextHint(privateContextUrl);
-					else if (error.failure != null) printError(message`${text(describeLookupFailure(error.failure, authLoader != null).message)}`);
-					else if (authLoader == null) printError(message`It may be a private object.  Try with ${optionNames(["-a", "--authorized-fetch"])}.`);
-				} else {
-					spinner.fail("Failed to recursively fetch object.");
-					const privateContextUrl = getPrivateContextUrl(error);
-					if (privateContextUrl != null) {
-						printRecursivePrivateContextHint(privateContextUrl);
-						await finalizeAndExit(1);
-						return;
-					}
-					const hint = getLookupFailureHint(error, { recursive: true });
-					if (shouldSuggestSuppressErrorsForLookupFailure(authLoader, hint)) printError(message`Use the ${optionNames(["-S", "--suppress-errors"])} option to suppress partial errors.`);
-					else printLookupFailureHint(authLoader, error, { recursive: true });
-				}
+				const failure = classifyRecursiveLookupFailure(error, {
+					allowPrivateAddress: command.allowPrivateAddress,
+					authorizedFetch: authLoader != null
+				});
+				logger.error("Failed to recursively fetch an object in chain: {error}", { error: failure.error });
+				printRecursiveLookupFailure(failure, spinner, command.timeout);
 				await finalizeAndExit(1);
 				return;
 			}
@@ -779,4 +850,4 @@ async function runLookup(command, deps = {}) {
 	if (success && command.output) spinner.succeed(`Successfully wrote output to ${colors.green(command.output)}.`);
 }
 //#endregion
-export { RecursiveLookupError, TimeoutError, collectAsyncItems, collectRecursiveObjects, getLookupFailureHint, getPrivateUrlCandidate, getRecursiveTargetId, getVisitedKey, isDocumentLoaderTimeoutError, runLookup, shouldPrintLookupFailureHint, shouldSuggestSuppressErrorsForLookupFailure, toDocumentLoaderTimeout, toPresentationOrder, wrapDocumentLoaderWithTimeout, writeObjectToStream, writeSeparator };
+export { RecursiveLookupError, TimeoutError, classifyRecursiveLookupFailure, collectAsyncItems, collectRecursiveObjects, getLookupFailureHint, getPrivateUrlCandidate, getRecursiveTargetId, getVisitedKey, isDocumentLoaderTimeoutError, printRecursiveLookupFailure, runLookup, shouldPrintLookupFailureHint, toDocumentLoaderTimeout, toPresentationOrder, wrapDocumentLoaderWithTimeout, writeObjectToStream, writeSeparator };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/cli",
-  "version": "2.5.0-dev.2358+1d1813b7",
+  "version": "2.5.0-dev.2370+e0cfd033",
   "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.5.0-dev.2358+1d1813b7",
-    "@fedify/init": "2.5.0-dev.2358+1d1813b7",
-    "@fedify/vocab-runtime": "2.5.0-dev.2358+1d1813b7",
-    "@fedify/relay": "2.5.0-dev.2358+1d1813b7",
-    "@fedify/webfinger": "2.5.0-dev.2358+1d1813b7",
-    "@fedify/vocab": "2.5.0-dev.2358+1d1813b7",
-    "@fedify/sqlite": "2.5.0-dev.2358+1d1813b7",
-    "@fedify/vocab-tools": "2.5.0-dev.2358+1d1813b7"
+    "@fedify/fedify": "2.5.0-dev.2370+e0cfd033",
+    "@fedify/init": "2.5.0-dev.2370+e0cfd033",
+    "@fedify/relay": "2.5.0-dev.2370+e0cfd033",
+    "@fedify/vocab": "2.5.0-dev.2370+e0cfd033",
+    "@fedify/sqlite": "2.5.0-dev.2370+e0cfd033",
+    "@fedify/vocab-runtime": "2.5.0-dev.2370+e0cfd033",
+    "@fedify/vocab-tools": "2.5.0-dev.2370+e0cfd033",
+    "@fedify/webfinger": "2.5.0-dev.2370+e0cfd033"
   },
   "devDependencies": {
     "@types/bun": "^1.2.23",