@fedify/cli 2.3.0-dev.1358 → 2.3.0-dev.1361

package/dist/bench/scenario/schema.js

@@ -3,14 +3,14 @@ import "@js-temporal/polyfill";
 /**
 * The embedded JSON Schema (draft 2020-12) for benchmark scenario suite files.
 *
-* These objects are the runtime copies used by the validator; they are
-* published, byte-for-byte, under *schema/bench/* and a drift guard keeps them
-* in sync.  The matching TypeScript types live in {@link ./types.ts}.
+* This object is the runtime copy used by the validator; it is published,
+* byte-for-byte, as *schema/bench/scenario-v1.json* and a drift guard keeps the
+* two in sync.  The matching TypeScript types live in {@link ./types.ts}.
 *
 * The schema expresses every scenario type discussed for `fedify bench`
 * (`inbox`, `webfinger`, `actor`, `object`, `fanout`, `collection`, `failure`,
-* `mixed`).  All but `collection` have runners in this version.  Three
-* cross-field rules are enforced here rather than in code:
+* `mixed`), even though only `inbox` and `webfinger` have runners in this
+* version.  Three cross-field rules are enforced here rather than in code:
 *
 *  -  exactly one HTTP request signature scheme per actor group
 *     (`contains` + `minContains`/`maxContains`);
@@ -20,10 +20,8 @@ import "@js-temporal/polyfill";
 * @since 2.3.0
 * @module
 */
-/** The hosted URL that serves the current scenario schema. */
-const SCENARIO_SCHEMA_ID = "https://json-schema.fedify.dev/bench/scenario-v2.json";
-/** The hosted URL that serves the version 1 scenario schema. */
-const SCENARIO_SCHEMA_ID_V1 = "https://json-schema.fedify.dev/bench/scenario-v1.json";
+/** The hosted URL that serves the scenario schema. */
+const SCENARIO_SCHEMA_ID = "https://json-schema.fedify.dev/bench/scenario-v1.json";
 const READ_METRICS = [
 	"successRate",
 	"throughputPerSec",
@@ -53,11 +51,10 @@ const FANOUT_METRICS = [
 	"queueDrain.p99"
 ];
 const MIXED_METRICS = [...new Set([...INBOX_METRICS, ...FANOUT_METRICS])];
-const MIXED_V2_METRICS = [...READ_METRICS, "deliveryThroughput"];
 /** The benchmark scenario suite JSON Schema (draft 2020-12). */
 const scenarioSchemaV1 = {
 	$schema: "https://json-schema.org/draft/2020-12/schema",
-	$id: SCENARIO_SCHEMA_ID_V1,
+	$id: SCENARIO_SCHEMA_ID,
 	title: "Fedify benchmark scenario suite",
 	type: "object",
 	required: ["version", "scenarios"],
@@ -357,43 +354,5 @@ const scenarioSchemaV1 = {
 		}
 	}
 };
-/** The current benchmark scenario suite JSON Schema (draft 2020-12). */
-const scenarioSchemaV2 = {
-	...scenarioSchemaV1,
-	$id: SCENARIO_SCHEMA_ID,
-	$defs: {
-		...scenarioSchemaV1.$defs,
-		scenario: {
-			...scenarioSchemaV1.$defs.scenario,
-			properties: {
-				...scenarioSchemaV1.$defs.scenario.properties,
-				sinkBase: { type: "string" }
-			},
-			allOf: scenarioSchemaV1.$defs.scenario.allOf.map((condition) => condition.if.properties.type.const === "failure" ? {
-				if: condition.if,
-				then: { properties: condition.then.properties }
-			} : condition.if.properties.type.const === "actor" || condition.if.properties.type.const === "object" ? {
-				if: condition.if,
-				then: {
-					required: condition.then.required,
-					allOf: [{
-						if: {
-							required: ["authenticated"],
-							properties: { authenticated: { const: true } }
-						},
-						then: { properties: { expect: { propertyNames: { enum: INBOX_METRICS } } } },
-						else: { properties: { expect: { propertyNames: { enum: READ_METRICS } } } }
-					}]
-				}
-			} : condition.if.properties.type.const === "mixed" ? {
-				if: condition.if,
-				then: {
-					required: condition.then.required,
-					properties: { expect: { propertyNames: { enum: MIXED_V2_METRICS } } }
-				}
-			} : condition)
-		}
-	}
-};
 //#endregion
-export { scenarioSchemaV2 };
+export { scenarioSchemaV1 };

package/dist/bench/scenario/validate.js

@@ -1,5 +1,5 @@
 import "@js-temporal/polyfill";
-import { scenarioSchemaV2 } from "./schema.js";
+import { scenarioSchemaV1 } from "./schema.js";
 import { SuiteValidationError } from "./errors.js";
 import { Validator } from "@cfworker/json-schema";
 //#region src/bench/scenario/validate.ts
@@ -10,7 +10,7 @@ import { Validator } from "@cfworker/json-schema";
 */
 let validator;
 function getValidator() {
-	validator ??= new Validator(scenarioSchemaV2, "2020-12");
+	validator ??= new Validator(scenarioSchemaV1, "2020-12");
 	return validator;
 }
 /**

package/dist/bench/scenarios/inbox.js

@@ -4,11 +4,11 @@ import { asList } from "../scenario/coerce.js";
 import { runLoad } from "../load/generator.js";
 import { aggregateSamples } from "../metrics/aggregate.js";
 import { diffSnapshots, fetchServerSnapshot, snapshotToMetrics } from "../metrics/stats-client.js";
-import { createSigningPipeline } from "../signing/pipeline.js";
-import { estimateTotal, loadPlanOf, measuredWindowMs, sendRequest, validateInboxSelector, withMeasuredWindowStart } from "./runner.js";
 import { createActivityIdMinter } from "../signing/activity-id.js";
+import { createSigningPipeline } from "../signing/pipeline.js";
 import { signInboxDelivery } from "../signing/signer.js";
 import { isGenerateDirective, resolveGenerate } from "../template/generate.js";
+import { estimateTotal, loadPlanOf, measuredWindowMs, sendRequest, withMeasuredWindowStart } from "./runner.js";
 import { Create, Note } from "@fedify/vocab";
 //#region src/bench/scenarios/inbox.ts
 /**
@@ -84,7 +84,7 @@ const inboxRunner = {
 		}, rawSend);
 		try {
 			await pipeline.prime();
-			const measurement = aggregateSamples((await runLoad(loadPlanOf(scenario, context.rng), send, context.clock, context.signal)).samples, {
+			const measurement = aggregateSamples((await runLoad(loadPlanOf(scenario, context.rng), send, context.clock)).samples, {
 				measuredWindowMs: measuredWindowMs(scenario),
 				includeHistogram: true
 			});
@@ -107,7 +107,15 @@ const inboxRunner = {
 * mid-run, and a non-http URL would slip through to the send path.
 */
 function validateInbox(scenario) {
-	validateInboxSelector(scenario.name, scenario.inbox);
+	const mode = scenario.inbox;
+	if (mode == null || mode === "shared" || mode === "personal") return;
+	let url;
+	try {
+		url = new URL(mode);
+	} catch {
+		throw new Error(`Scenario "${scenario.name}": inbox must be "shared", "personal", or an http(s) URL; got ${JSON.stringify(mode)}.`);
+	}
+	if (url.protocol !== "http:" && url.protocol !== "https:" || url.hostname === "" || url.username !== "" || url.password !== "") throw new Error(`Scenario "${scenario.name}": inbox URL must be a bare http(s) URL with a host and no credentials; got ${JSON.stringify(mode)}.`);
 }
 /**
 * Rejects the activity options the inbox runner cannot yet honor: it always

package/dist/bench/scenarios/registry.js

@@ -1,22 +1,9 @@
 import "@js-temporal/polyfill";
-import { actorRunner } from "./actor.js";
-import { fanoutRunner } from "./fanout.js";
-import { failureRunner } from "./failure.js";
 import { inboxRunner } from "./inbox.js";
-import { objectRunner } from "./object.js";
 import { webfingerRunner } from "./webfinger.js";
-import { mixedRunner } from "./mixed.js";
 //#region src/bench/scenarios/registry.ts
 /** The scenario types that have runners in this version. */
-const IMPLEMENTED_SCENARIO_TYPES = [
-	"inbox",
-	"webfinger",
-	"actor",
-	"object",
-	"fanout",
-	"failure",
-	"mixed"
-];
+const IMPLEMENTED_SCENARIO_TYPES = ["inbox", "webfinger"];
 /**
 * Returns the runner for a scenario type.
 * @param type The scenario type.
@@ -27,11 +14,6 @@ function runnerFor(type) {
 	switch (type) {
 		case "inbox": return inboxRunner;
 		case "webfinger": return webfingerRunner;
-		case "actor": return actorRunner;
-		case "object": return objectRunner;
-		case "fanout": return fanoutRunner;
-		case "failure": return failureRunner;
-		case "mixed": return mixedRunner;
 		default: throw new Error(`The "${type}" scenario type is not implemented in this version of fedify bench; supported types: ${IMPLEMENTED_SCENARIO_TYPES.join(", ")}.`);
 	}
 }

package/dist/bench/scenarios/runner.js

@@ -46,26 +46,6 @@ function estimateTotal(scenario) {
 	if (scenario.load.kind !== "open") return void 0;
 	return Math.ceil(scenario.load.ratePerSec * (scenario.durationMs / 1e3));
 }
-/** Returns whether a URL is fetchable by benchmark runners without surprises. */
-function isBareHttpUrl(url) {
-	return (url.protocol === "http:" || url.protocol === "https:") && url.hostname !== "" && url.username === "" && url.password === "";
-}
-/** Rejects URLs that are not bare http(s) URLs with a host and no credentials. */
-function assertBareHttpUrl(scenarioName, label, url) {
-	if (isBareHttpUrl(url)) return;
-	throw new Error(`Scenario "${scenarioName}": ${label} must be a bare http(s) URL with a host and no credentials; got ${JSON.stringify(url.href)}.`);
-}
-/** Validates an inbox selector or explicit inbox URL. */
-function validateInboxSelector(scenarioName, inbox) {
-	if (inbox == null || inbox === "shared" || inbox === "personal") return;
-	let url;
-	try {
-		url = new URL(inbox);
-	} catch {
-		throw new Error(`Scenario "${scenarioName}": inbox must be "shared", "personal", or an http(s) URL; got ${JSON.stringify(inbox)}.`);
-	}
-	assertBareHttpUrl(scenarioName, "inbox URL", url);
-}
 /**
 * Wraps a send function so that `onMeasuredWindowStart` runs exactly once, at
 * the warm-up boundary, and *every* measured request waits for it to settle
@@ -93,4 +73,4 @@ function withMeasuredWindowStart(warmupMs, onMeasuredWindowStart, send) {
 	};
 }
 //#endregion
-export { assertBareHttpUrl, estimateTotal, isBareHttpUrl, loadPlanOf, measuredWindowMs, sendRequest, validateInboxSelector, withMeasuredWindowStart };
+export { estimateTotal, loadPlanOf, measuredWindowMs, sendRequest, withMeasuredWindowStart };

package/dist/bench/scenarios/webfinger.js

@@ -29,7 +29,7 @@ const webfingerRunner = { async run(context) {
 		baseline = await fetchServerSnapshot(context.target, fetchImpl);
 		baselineTaken = true;
 	}, rawSend);
-	const measurement = aggregateSamples((await runLoad(loadPlanOf(context.scenario, context.rng), send, context.clock, context.signal)).samples, {
+	const measurement = aggregateSamples((await runLoad(loadPlanOf(context.scenario, context.rng), send, context.clock)).samples, {
 		measuredWindowMs: measuredWindowMs(context.scenario),
 		includeHistogram: true
 	});

package/dist/cache.js

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
+import { mkdir } from "node:fs/promises";
 import process from "node:process";
 import { homedir } from "node:os";
 import { join } from "node:path";
-import { mkdir } from "node:fs/promises";
 //#region src/cache.ts
 /**
 * Returns the default cache directory path.

package/dist/config.js

@@ -1,9 +1,9 @@
 import "@js-temporal/polyfill";
 import { message } from "@optique/core";
 import { printError } from "@optique/run";
+import { createConfigContext } from "@optique/config";
 import { readFileSync } from "node:fs";
 import { parse } from "smol-toml";
-import { createConfigContext } from "@optique/config";
 import { array, boolean, check, forward, integer as integer$1, minValue, number, object as object$1, optional as optional$1, picklist, pipe, string as string$1 } from "valibot";
 //#region src/config.ts
 /**

package/dist/deno.js

@@ -1,5 +1,5 @@
 import "@js-temporal/polyfill";
 //#region deno.json
-var version = "2.3.0-dev.1358+6152d3d0";
+var version = "2.3.0-dev.1361+15c6e619";
 //#endregion
 export { version };

package/dist/docloader.js

@@ -1,6 +1,6 @@
 import "@js-temporal/polyfill";
-import { getDocumentLoader } from "@fedify/vocab-runtime";
 import { kvCache } from "@fedify/fedify";
+import { getDocumentLoader } from "@fedify/vocab-runtime";
 import { getKvStore } from "#kv";
 //#region src/docloader.ts
 const documentLoaders = {};

package/dist/generate-vocab/action.js

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
+import { stat } from "node:fs/promises";
 import process from "node:process";
 import { printError } from "@optique/run";
-import { stat } from "node:fs/promises";
 import { generateVocab } from "@fedify/vocab-tools";
 import { message } from "@optique/core/message";
 //#region src/generate-vocab/action.ts

package/dist/generate-vocab/command.js

@@ -12,12 +12,10 @@ const generatedPath = argument(path({
 	type: "file",
 	allowCreate: true
 }), { description: message`Path to output the generated vocabulary classes.  Should end with ${".ts"} suffix.` });
-const generateVocabOptions = object("Generation options", {
+const generateVocabCommand = command("generate-vocab", object("Generation options", {
 	command: constant("generate-vocab"),
 	schemaDir,
 	generatedPath
-});
-const generateVocabMetadata = { description: message`Generate vocabulary classes from schema files.` };
-command("generate-vocab", generateVocabOptions, generateVocabMetadata);
+}), { description: message`Generate vocabulary classes from schema files.` });
 //#endregion
-export { generateVocabMetadata, generateVocabOptions };
+export { generateVocabCommand as default };

package/dist/generate-vocab/mod.js

@@ -0,0 +1,4 @@
+import "@js-temporal/polyfill";
+import "./action.js";
+import "./command.js";
+export {};

package/dist/imagerenderer.js

@@ -1,10 +1,10 @@
 import "@js-temporal/polyfill";
 import { Jimp } from "./nodeinfo.js";
+import fs from "node:fs/promises";
 import process from "node:process";
+import { validatePublicUrl } from "@fedify/vocab-runtime";
 import os from "node:os";
 import path from "node:path";
-import { validatePublicUrl } from "@fedify/vocab-runtime";
-import fs from "node:fs/promises";
 import { encodeBase64 } from "byte-encodings/base64";
 //#region src/imagerenderer.ts
 const KITTY_IDENTIFIERS = [

package/dist/inbox/command.js

@@ -6,7 +6,7 @@ import { bindConfig } from "@optique/config";
 //#region src/inbox/command.ts
 const DEFAULT_EPHEMERAL_INBOX_NAME = "Fedify Ephemeral Inbox";
 const DEFAULT_EPHEMERAL_INBOX_SUMMARY = "An ephemeral ActivityPub inbox for testing purposes.";
-const inboxOptions = merge(object("Inbox options", {
+const inboxCommand = command("inbox", merge(object("Inbox options", {
 	command: constant("inbox"),
 	follow: bindConfig(multiple(option("-f", "--follow", string({ metavar: "URI" }), { description: message`Follow the given actor. The argument can be either an actor URI or a handle. Can be specified multiple times.` })), {
 		context: configContext,
@@ -33,11 +33,9 @@ const inboxOptions = merge(object("Inbox options", {
 		key: (config) => config.inbox?.authorizedFetch ?? false,
 		default: false
 	})
-}), group("Tunnel options", createTunnelOption("inbox")));
-const inboxMetadata = {
+}), group("Tunnel options", createTunnelOption("inbox"))), {
 	brief: message`Run an ephemeral ActivityPub inbox server.`,
 	description: message`Spins up an ephemeral server that serves the ActivityPub inbox with a one-time actor, through a short-lived public DNS with HTTPS. You can monitor the incoming activities in real-time.`
-};
-command("inbox", inboxOptions, inboxMetadata);
+});
 //#endregion
-export { inboxMetadata, inboxOptions };
+export { inboxCommand };

package/dist/inbox.js

@@ -1,18 +1,18 @@
 import { Temporal } from "@js-temporal/polyfill";
+import { getDocumentLoader } from "./docloader.js";
 import { colors, matchesActor } from "./utils.js";
-import { configureLogging, recordingSink } from "./log.js";
 import { version } from "./deno.js";
-import { getDocumentLoader } from "./docloader.js";
 import { ActivityEntryPage, ActivityListPage } from "./inbox/view.js";
+import { configureLogging, recordingSink } from "./log.js";
 import { tableStyle } from "./table.js";
 import { spawnTemporaryServer } from "./tempserver.js";
 import process from "node:process";
 import { MemoryKvStore, createFederation, generateCryptoKeyPair } from "@fedify/fedify";
-import { getLogger } from "@logtape/logtape";
-import ora from "ora";
 import { Accept, Activity, Application, Delete, Endpoints, Follow, Image, PUBLIC_COLLECTION, isActor, lookupObject } from "@fedify/vocab";
+import { getLogger } from "@logtape/logtape";
 import Table from "cli-table3";
 import { Hono } from "hono";
+import ora from "ora";
 import { jsx } from "hono/jsx/jsx-runtime";
 //#region src/inbox.tsx
 /** @jsx react-jsx */

package/dist/init/mod.js

@@ -0,0 +1,3 @@
+import "@js-temporal/polyfill";
+import { initCommand, runInit } from "@fedify/init";
+export { initCommand, runInit };

package/dist/log.js

@@ -1,10 +1,10 @@
 import "@js-temporal/polyfill";
+import { mkdir } from "node:fs/promises";
 import process from "node:process";
-import { dirname } from "node:path";
 import { configure, getConsoleSink } from "@logtape/logtape";
-import { mkdir } from "node:fs/promises";
 import { getFileSink } from "@logtape/file";
 import { AsyncLocalStorage } from "node:async_hooks";
+import { dirname } from "node:path";
 //#region src/log.ts
 function getRecordingSink() {
 	let records = [];

package/dist/lookup.js

@@ -1,20 +1,22 @@
 import "@js-temporal/polyfill";
-import { FEDIBIRD_QUOTE_IRI, IN_REPLY_TO_IRI, MISSKEY_QUOTE_IRI, QUOTE_IRI, QUOTE_URL_IRI } from "./lookup/command.js";
+import { getContextLoader, getDocumentLoader as getDocumentLoader$1 } from "./docloader.js";
 import { colorEnabled, colors, describeError, formatObject } from "./utils.js";
+import { configContext } from "./config.js";
+import { createTunnelServiceOption, userAgentOption } from "./options.js";
 import { configureLogging } from "./log.js";
-import { getContextLoader, getDocumentLoader as getDocumentLoader$1 } from "./docloader.js";
 import { spawnTemporaryServer } from "./tempserver.js";
 import { renderImages } from "./imagerenderer.js";
 import process from "node:process";
-import { message, optionNames } from "@optique/core";
-import { printError } from "@optique/run";
-import { createWriteStream } from "node:fs";
-import { UrlError, expandIPv6Address, isValidPublicIPv4Address, isValidPublicIPv6Address } from "@fedify/vocab-runtime";
 import { generateCryptoKeyPair, getAuthenticatedDocumentLoader, respondWithObject } from "@fedify/fedify";
-import { getLogger } from "@logtape/logtape";
-import ora from "ora";
+import { UrlError, expandIPv6Address, isValidPublicIPv4Address, isValidPublicIPv6Address } from "@fedify/vocab-runtime";
 import { Application, Collection, CryptographicKey, Object as Object$1, lookupObject, traverseCollection } from "@fedify/vocab";
+import { argument, choice, command, constant, flag, float, integer, map, merge, message, multiple, object, option, optionNames, optional, or, string, withDefault } from "@optique/core";
+import { path, printError } from "@optique/run";
+import { getLogger } from "@logtape/logtape";
+import { bindConfig } from "@optique/config";
+import { createWriteStream } from "node:fs";
 import { url } from "@optique/core/message";
+import ora from "ora";
 import { isIP } from "node:net";
 //#region src/lookup.ts
 const logger = getLogger([
@@ -22,6 +24,116 @@ const logger = getLogger([
 	"cli",
 	"lookup"
 ]);
+const IN_REPLY_TO_IRI = "https://www.w3.org/ns/activitystreams#inReplyTo";
+const QUOTE_IRI = "https://w3id.org/fep/044f#quote";
+const QUOTE_URL_IRI = "https://www.w3.org/ns/activitystreams#quoteUrl";
+const MISSKEY_QUOTE_IRI = "https://misskey-hub.net/ns#_misskey_quote";
+const FEDIBIRD_QUOTE_IRI = "http://fedibird.com/ns#quoteUri";
+const recurseProperties = [
+	"replyTarget",
+	"quote",
+	"quoteUrl",
+	IN_REPLY_TO_IRI,
+	QUOTE_IRI,
+	QUOTE_URL_IRI,
+	MISSKEY_QUOTE_IRI,
+	FEDIBIRD_QUOTE_IRI
+];
+const suppressErrorsOption = bindConfig(flag("-S", "--suppress-errors", { description: message`Suppress partial errors during traversal or recursion.` }), {
+	context: configContext,
+	key: (config) => config.lookup?.suppressErrors ?? false,
+	default: false
+});
+const allowPrivateAddressOption = bindConfig(flag("-p", "--allow-private-address", { description: message`Allow private IP addresses for URLs discovered \
+during traversal or recursive object fetches. Recursive JSON-LD \
+context URLs always remain blocked. URLs explicitly provided on the \
+command line always allow private addresses.` }), {
+	context: configContext,
+	key: (config) => config.lookup?.allowPrivateAddress ?? false,
+	default: false
+});
+const authorizedFetchOption = withDefault(object("Authorized fetch options", {
+	authorizedFetch: bindConfig(map(flag("-a", "--authorized-fetch", { description: message`Sign the request with an one-time key.` }), () => true), {
+		context: configContext,
+		key: (config) => config.lookup?.authorizedFetch ? true : void 0
+	}),
+	firstKnock: bindConfig(option("--first-knock", choice(["draft-cavage-http-signatures-12", "rfc9421"]), { description: message`The first-knock spec for ${optionNames(["-a", "--authorized-fetch"])}. It is used for the double-knocking technique.` }), {
+		context: configContext,
+		key: (config) => config.lookup?.firstKnock ?? "draft-cavage-http-signatures-12",
+		default: "draft-cavage-http-signatures-12"
+	}),
+	tunnelService: optional(createTunnelServiceOption())
+}), {
+	authorizedFetch: false,
+	firstKnock: void 0,
+	tunnelService: void 0
+});
+const lookupModeOption = withDefault(or(object("Recurse options", {
+	traverse: constant(false),
+	recurse: bindConfig(option("--recurse", choice(recurseProperties, { metavar: "PROPERTY" }), { description: message`Recursively follow a relationship property.` }), {
+		context: configContext,
+		key: (config) => config.lookup?.recurse
+	}),
+	recurseDepth: bindConfig(option("--recurse-depth", integer({
+		min: 1,
+		metavar: "DEPTH"
+	}), { description: message`Maximum recursion depth for ${optionNames(["--recurse"])}.` }), {
+		context: configContext,
+		key: (config) => config.lookup?.recurseDepth,
+		default: 20
+	}),
+	suppressErrors: suppressErrorsOption
+}), object("Traverse options", {
+	traverse: bindConfig(flag("-t", "--traverse", { description: message`Traverse the given collection(s) to fetch all items.` }), {
+		context: configContext,
+		key: (config) => config.lookup?.traverse ?? false,
+		default: false
+	}),
+	recurse: constant(void 0),
+	recurseDepth: constant(void 0),
+	suppressErrors: suppressErrorsOption
+})), {
+	traverse: false,
+	recurse: void 0,
+	recurseDepth: void 0,
+	suppressErrors: false
+});
+const lookupCommand = command("lookup", merge(object({ command: constant("lookup") }), lookupModeOption, authorizedFetchOption, merge("Network options", userAgentOption, object({
+	allowPrivateAddress: allowPrivateAddressOption,
+	timeout: optional(bindConfig(option("-T", "--timeout", float({
+		min: 0,
+		metavar: "SECONDS"
+	}), { description: message`Set timeout for network requests in seconds.` }), {
+		context: configContext,
+		key: (config) => config.lookup?.timeout
+	}))
+})), object("Arguments", { urls: multiple(argument(string({ metavar: "URL_OR_HANDLE" }), { description: message`One or more URLs or handles to look up.` }), { min: 1 }) }), object("Output options", {
+	reverse: bindConfig(flag("--reverse", { description: message`Reverse the output order of fetched objects or items.` }), {
+		context: configContext,
+		key: (config) => config.lookup?.reverse ?? false,
+		default: false
+	}),
+	format: bindConfig(optional(or(map(flag("-r", "--raw", { description: message`Print the fetched JSON-LD document as is.` }), () => "raw"), map(flag("-C", "--compact", { description: message`Compact the fetched JSON-LD document.` }), () => "compact"), map(flag("-e", "--expand", { description: message`Expand the fetched JSON-LD document.` }), () => "expand"))), {
+		context: configContext,
+		key: (config) => config.lookup?.defaultFormat ?? "default",
+		default: "default"
+	}),
+	separator: bindConfig(option("-s", "--separator", string({ metavar: "SEPARATOR" }), { description: message`Specify the separator between adjacent output objects or collection items.` }), {
+		context: configContext,
+		key: (config) => config.lookup?.separator ?? "----",
+		default: "----"
+	}),
+	output: optional(option("-o", "--output", path({
+		metavar: "OUTPUT_PATH",
+		type: "file",
+		allowCreate: true
+	}), { description: message`Specify the output file path.` }))
+})), {
+	brief: message`Look up Activity Streams objects.`,
+	description: message`Look up Activity Streams objects by URL or actor handle.
+
+The arguments can be either URLs or actor handles (e.g., ${"@username@domain"}), and they can be multiple.`
+});
 var TimeoutError = class extends Error {
 	name = "TimeoutError";
 	constructor(message) {
@@ -360,7 +472,6 @@ async function runLookup(command, deps = {}) {
 		effectiveDeps.exit(cleanupFailed && code === 0 ? 1 : code);
 	};
 	if (command.authorizedFetch) {
-		const firstKnock = command.firstKnock ?? "draft-cavage-http-signatures-12";
 		spinner.text = "Generating a one-time key pair...";
 		const key = await generateCryptoKeyPair();
 		spinner.text = "Spinning up a temporary ActivityPub server...";
@@ -400,7 +511,7 @@ async function runLookup(command, deps = {}) {
 			userAgent: command.userAgent,
 			specDeterminer: {
 				determineSpec() {
-					return firstKnock;
+					return command.firstKnock;
 				},
 				rememberSpec() {}
 			}
@@ -410,7 +521,7 @@ async function runLookup(command, deps = {}) {
 			userAgent: command.userAgent,
 			specDeterminer: {
 				determineSpec() {
-					return firstKnock;
+					return command.firstKnock;
 				},
 				rememberSpec() {}
 			}
@@ -707,4 +818,4 @@ async function runLookup(command, deps = {}) {
 	if (success && command.output) spinner.succeed(`Successfully wrote output to ${colors.green(command.output)}.`);
 }
 //#endregion
-export { runLookup };
+export { lookupCommand, runLookup };

package/dist/mod.js

@@ -1,10 +1,31 @@
 #!/usr/bin/env -S node --disable-warning=ExperimentalWarning
 import "@js-temporal/polyfill";
-import { parseCliProgram } from "./runner.js";
+import runBench from "./bench/action.js";
+import "./bench/mod.js";
+import runGenerateVocab from "./generate-vocab/action.js";
+import "./generate-vocab/mod.js";
+import { runInbox } from "./inbox.js";
+import { runInit } from "./init/mod.js";
+import { runNodeInfo } from "./nodeinfo.js";
+import { runLookup } from "./lookup.js";
+import { runRelay } from "./relay.js";
+import { runTunnel } from "./tunnel.js";
+import runWebFinger from "./webfinger/action.js";
+import "./webfinger/mod.js";
+import { runCli } from "./runner.js";
 import process from "node:process";
 //#region src/mod.ts
 async function main() {
-	await (await parseCliProgram(process.argv.slice(2))).run();
+	const result = await runCli(process.argv.slice(2));
+	if (result.command === "init") await runInit(result);
+	else if (result.command === "lookup") await runLookup(result);
+	else if (result.command === "webfinger") await runWebFinger(result);
+	else if (result.command === "inbox") await runInbox(result);
+	else if (result.command === "nodeinfo") await runNodeInfo(result);
+	else if (result.command === "tunnel") await runTunnel(result);
+	else if (result.command === "generate-vocab") await runGenerateVocab(result);
+	else if (result.command === "relay") await runRelay(result);
+	else if (result.command === "bench") await runBench(result);
 }
 await main();
 //#endregion

package/dist/nodeinfo.js

@@ -1,20 +1,20 @@
 import "@js-temporal/polyfill";
+import { colors, formatObject } from "./utils.js";
 import { configContext } from "./config.js";
 import { userAgentOption } from "./options.js";
-import { colors, formatObject } from "./utils.js";
 import process from "node:process";
+import { getNodeInfo } from "@fedify/fedify";
+import { getUserAgent } from "@fedify/vocab-runtime";
 import { argument, command, constant, flag, group, merge, message, object, string, text } from "@optique/core";
 import { print, printError } from "@optique/run";
+import { getLogger } from "@logtape/logtape";
 import os from "node:os";
 import { bindConfig } from "@optique/config";
-import { getUserAgent } from "@fedify/vocab-runtime";
-import { getNodeInfo } from "@fedify/fedify";
+import ora from "ora";
 import { createJimp } from "@jimp/core";
 import webp from "@jimp/wasm-webp";
-import { getLogger } from "@logtape/logtape";
 import { isICO, parseICO } from "icojs";
 import { defaultFormats, defaultPlugins, intToRGBA } from "jimp";
-import ora from "ora";
 //#region src/nodeinfo.ts
 const logger = getLogger([
 	"fedify",
@@ -46,17 +46,15 @@ const nodeInfoOption = merge(object("Display options", {
 	key: (config) => config.nodeinfo?.bestEffort ?? false,
 	default: false
 }) }));
-const nodeInfoOptions = merge(object("Arguments", {
+const nodeInfoCommand = command("nodeinfo", merge(object("Arguments", {
 	command: constant("nodeinfo"),
 	host: argument(string({ metavar: "HOST" }), { description: message`Bare hostname or a full URL of the instance` })
-}), nodeInfoOption, group("Network options", userAgentOption));
-const nodeInfoMetadata = {
+}), nodeInfoOption, group("Network options", userAgentOption)), {
 	brief: message`Get information about a remote node using the NodeInfo protocol`,
 	description: message`Get information about a remote node using the NodeInfo protocol.
 
 The argument is the hostname of the remote node, or the URL of the remote node.`
-};
-command("nodeinfo", nodeInfoOptions, nodeInfoMetadata);
+});
 async function runNodeInfo(command) {
 	const spinner = ora({
 		text: "Fetching a NodeInfo document...",
@@ -272,4 +270,4 @@ function getAsciiArt(image, width = DEFAULT_IMAGE_WIDTH, colorSupport, colors) {
 	return art;
 }
 //#endregion
-export { Jimp, nodeInfoMetadata, nodeInfoOptions, runNodeInfo };
+export { Jimp, nodeInfoCommand, runNodeInfo };