Simplify benchmark review helpers

Use stable fixture key pairs without a mutable cache, share error
message formatting through the CLI utilities, pass suite defaults to
unsafe override planning directly, and fold DNS tier fallback handling
into a single conservative catch path.

#795 (comment)
#795 (comment)
#795 (comment)
#795 (comment)

Assisted-by: Codex:gpt-5.5

Author: dahlia

packages/cli/src/bench/action.ts

@@ -2,6 +2,7 @@ import { writeFile } from "node:fs/promises";
 import type { DocumentLoader } from "@fedify/vocab-runtime";
 import process from "node:process";
 import { getContextLoader, getDocumentLoader } from "../docloader.ts";
+import { describeError } from "../utils.ts";
 import { buildFleet } from "./actor/fleet.ts";
 import type { BenchCommand } from "./command.ts";
 import {
@@ -24,7 +25,7 @@ import {
   type ResolvedScenario,
   type ResolvedSuite,
 } from "./scenario/normalize.ts";
-import type { LoadConfig, Suite } from "./scenario/types.ts";
+import type { LoadConfig, Suite, SuiteDefaults } from "./scenario/types.ts";
 import { validateSuite } from "./scenario/validate.ts";
 import {
   assertInboxDestinationAllowed,
@@ -100,7 +101,7 @@ export default async function runBench(
     validated = validateSuite(rendered, command.scenario);
     suite = normalizeSuite(validated, { target: command.target });
   } catch (error) {
-    log(error instanceof Error ? error.message : String(error));
+    log(describeError(error));
     return void exit(2);
   }
 
@@ -119,7 +120,7 @@ export default async function runBench(
       resolveAdvertiseHost(command.advertiseHost);
     }
   } catch (error) {
-    log(error instanceof Error ? error.message : String(error));
+    log(describeError(error));
     return void exit(2);
   }
 
@@ -190,7 +191,7 @@ export default async function runBench(
       allowUnsafe: command.allowUnsafeTarget,
       explicitCliTarget: command.target != null,
       destinationTier,
-      suite: validated,
+      defaults: validated.defaults,
     });
   };
 
@@ -207,7 +208,7 @@ export default async function runBench(
       );
       return void exit(0);
     } catch (error) {
-      log(error instanceof Error ? error.message : String(error));
+      log(describeError(error));
       return void exit(2);
     }
   }
@@ -431,10 +432,6 @@ async function describeInboxDiscoveryPlan(
   return lines;
 }
 
-function describeError(error: unknown): string {
-  return error instanceof Error ? error.message : String(error);
-}
-
 function describeWebFingerPlan(
   scenario: ResolvedScenario,
   target: URL,
@@ -472,7 +469,7 @@ interface PublicDestinationOverrideContext {
   readonly allowUnsafe: boolean;
   readonly explicitCliTarget: boolean;
   readonly destinationTier: TargetTier;
-  readonly suite: Suite;
+  readonly defaults?: SuiteDefaults;
 }
 
 function assertPublicDestinationOverrideAllowed(
@@ -493,24 +490,24 @@ function assertPublicDestinationOverrideAllowed(
     benchmarkMode: false,
     allowUnsafe: true,
     explicitCliTarget: context.explicitCliTarget,
-    scenarios: [unsafeOverrideScenario(scenario, context.suite)],
+    scenarios: [unsafeOverrideScenario(scenario, context.defaults)],
   });
 }
 
 function unsafeOverrideScenarios(
   suite: Suite,
 ): Parameters<typeof assertUnsafeOverrideAllowed>[0]["scenarios"] {
   return suite.scenarios.map((scenario) =>
-    unsafeOverrideScenario(scenario, suite)
+    unsafeOverrideScenario(scenario, suite.defaults)
   );
 }
 
 function unsafeOverrideScenario(
   scenario: ResolvedScenario | Suite["scenarios"][number],
-  suite?: Suite,
+  defaults?: SuiteDefaults,
 ): Parameters<typeof assertUnsafeOverrideAllowed>[0]["scenarios"][number] {
-  const defaultDuration = suite?.defaults?.duration != null;
-  const defaultLoad = hasExplicitLoad(suite?.defaults?.load);
+  const defaultDuration = defaults?.duration != null;
+  const defaultLoad = hasExplicitLoad(defaults?.load);
   const raw = "raw" in scenario ? scenario.raw : scenario;
   return {
     name: scenario.name,

packages/cli/src/bench/safety/tiers.ts

@@ -56,26 +56,21 @@ export async function classifyResolvedTarget(
   const host = normalizedHost(target);
   const direct = classifyTarget(target);
   if (direct !== "public" || isIpLiteral(host)) return direct;
-  let addresses: readonly string[];
   try {
     const resolved = await resolveAddresses(host);
-    addresses = Array.isArray(resolved) ? resolved : [];
+    if (!Array.isArray(resolved) || resolved.length < 1) return "public";
+    let aggregate: TargetTier = "loopback";
+    for (const address of resolved) {
+      const tier = classifyTarget(
+        new URL(`http://${hostForAddress(address)}/`),
+      );
+      if (tier === "public") return "public";
+      if (tier === "private") aggregate = "private";
+    }
+    return aggregate;
   } catch {
     return "public";
   }
-  if (addresses.length < 1) return "public";
-  let aggregate: TargetTier = "loopback";
-  for (const address of addresses) {
-    let tier: TargetTier;
-    try {
-      tier = classifyTarget(new URL(`http://${hostForAddress(address)}/`));
-    } catch {
-      return "public";
-    }
-    if (tier === "public") return "public";
-    if (tier === "private") aggregate = "private";
-  }
-  return aggregate;
 }
 
 /** Resolves a hostname with the platform DNS resolver. */

packages/cli/src/lookup.ts

@@ -59,7 +59,7 @@ import {
   userAgentOption,
 } from "./options.ts";
 import { spawnTemporaryServer, type TemporaryServer } from "./tempserver.ts";
-import { colorEnabled, colors, formatObject } from "./utils.ts";
+import { colorEnabled, colors, describeError, formatObject } from "./utils.ts";
 
 const logger = getLogger(["fedify", "cli", "lookup"]);
 
@@ -538,7 +538,7 @@ function handleTimeoutError(
 }
 
 function isPrivateAddressError(error: unknown): boolean {
-  const errorMessage = error instanceof Error ? error.message : String(error);
+  const errorMessage = describeError(error);
   const lowerMessage = errorMessage.toLowerCase();
   if (error instanceof UrlError) {
     return (
@@ -600,7 +600,7 @@ function getPrivateContextUrl(error: unknown): URL | null {
   // a trailing `URL: "..."` segment all at once. If jsonld changes those
   // details, this helper and the related lookup tests need to be updated
   // together.
-  const errorMessage = error instanceof Error ? error.message : String(error);
+  const errorMessage = describeError(error);
   if (
     !(error instanceof Error) ||
     error.name !== "jsonld.InvalidUrl" ||

packages/cli/src/runner.ts

@@ -16,6 +16,7 @@ import { nodeInfoCommand } from "./nodeinfo.ts";
 import { globalOptions } from "./options.ts";
 import { relayCommand } from "./relay/command.ts";
 import { tunnelCommand } from "./tunnel.ts";
+import { describeError } from "./utils.ts";
 import { webFingerCommand } from "./webfinger/mod.ts";
 import metadata from "../deno.json" with { type: "json" };
 
@@ -105,7 +106,7 @@ export function loadConfig(
     } catch (error) {
       printError(
         message`Could not load config file at ${parsed.configPath}: ${
-          error instanceof Error ? error.message : String(error)
+          describeError(error)
         }`,
       );
       process.exit(1);

packages/cli/src/utils.ts

@@ -81,6 +81,10 @@ export const isNotFoundError = (e: unknown): e is { code: "ENOENT" } =>
   "code" in e &&
   e.code === "ENOENT";
 
+export function describeError(error: unknown): string {
+  return error instanceof Error ? error.message : String(error);
+}
+
 export class CommandError extends Error {
   public commandLine: string;
   constructor(

packages/cli/test/bench/fixture.ts

@@ -38,7 +38,10 @@ export async function spawnBenchmarkTarget(): Promise<BenchmarkTargetFixture> {
     kv: new MemoryKvStore(),
     benchmarkMode: true,
   });
-  let keyPairs: CryptoKeyPair[] | undefined;
+  const keyPairs = Promise.all([
+    generateCryptoKeyPair("RSASSA-PKCS1-v1_5"),
+    generateCryptoKeyPair("Ed25519"),
+  ]);
   const requests: { method: string; path: string }[] = [];
   federation
     .setActorDispatcher("/users/{identifier}", async (ctx, identifier) => {
@@ -56,11 +59,7 @@ export async function spawnBenchmarkTarget(): Promise<BenchmarkTargetFixture> {
     .mapHandle((_ctx, username) => (username === "alice" ? "alice" : null))
     .setKeyPairsDispatcher(async (_ctx, identifier) => {
       if (identifier !== "alice") return [];
-      keyPairs ??= [
-        await generateCryptoKeyPair("RSASSA-PKCS1-v1_5"),
-        await generateCryptoKeyPair("Ed25519"),
-      ];
-      return keyPairs;
+      return await keyPairs;
     });
   federation.setInboxListeners("/users/{identifier}/inbox", "/inbox").on(
     Create,