@tikoci/centrs 0.1.3 → 0.1.6

package/src/cli/api.ts

@@ -21,6 +21,7 @@ import {
 	formatCentrsErrorText,
 } from "../errors.ts";
 import { describeCentrs } from "../index.ts";
+import { assertNoQuickchrOverrideConflict } from "../resolver/index.ts";
 import {
 	type CliCommandMetadata,
 	expectValue,
@@ -36,6 +37,7 @@ import {
 	withTips,
 } from "./missing-target.ts";
 import {
+	assertQuickchrExclusive,
 	buildTargetSelection,
 	consumeSelectionFlag,
 	emptySelectionFlags,
@@ -57,7 +59,7 @@ export const apiCommand: CliCommandMetadata = {
 				"HTTP method, default GET (case-insensitive). GET→print, PUT→add, PATCH→set, DELETE→remove, POST→run.",
 		},
 		{
-			flag: "-f",
+			flag: "-f / --field",
 			valueName: "<key=value>",
 			description:
 				"Body field, repeatable; assembled into the JSON body (verbatim string values).",
@@ -92,7 +94,7 @@ export const apiCommand: CliCommandMetadata = {
 		{
 			flag: "--raw",
 			description:
-				"Strip the envelope; emit bare RouterOS JSON. Implies `--validate=false`; does not imply `--yes`.",
+				"Strip the envelope; emit bare RouterOS JSON. Defaults `--validate` to false (an explicit `--validate=true` still runs the gate); does not imply `--yes`.",
 		},
 		{
 			flag: "--yes",
@@ -168,9 +170,9 @@ export const apiCommand: CliCommandMetadata = {
 			description: "Per-request timeout (for REST, max 60s).",
 		},
 		{
-			flag: "--validate[=false]",
+			flag: "--validate / --no-validate",
 			description:
-				"Run `/console/inspect` validation before the request (default true).",
+				"Run `/console/inspect` validation before the request (default true; `--validate=false` also accepted).",
 		},
 		{
 			flag: "--format",
@@ -366,6 +368,20 @@ export async function runApiCli(args: readonly string[]): Promise<number> {
 			console.log(renderCommandHelp(describeCentrs(), apiCommand));
 			return 0;
 		}
+		// Selection-shape usage errors fire before `--input` is read: a bad
+		// `--quickchr` combination must not block on stdin (`--input -`) or
+		// degrade into per-member fan-out failures. The resolver re-checks the
+		// override conflict for library callers.
+		const selectionFlags = parsed.selectionFlags ?? emptySelectionFlags();
+		const targetPositionals = parsed.targetPositionals ?? [];
+		assertQuickchrExclusive(selectionFlags, targetPositionals.length);
+		if (selectionFlags.quickchr.length > 0) {
+			assertNoQuickchrOverrideConflict(
+				parsed,
+				selectionFlags.quickchr[0] ?? "",
+			);
+		}
+
 		// Resolve `--input` (file / stdin) before handing the body to the orchestrator.
 		if (parsed.inputPath !== undefined) {
 			const inputPath = parsed.inputPath;
@@ -389,8 +405,6 @@ export async function runApiCli(args: readonly string[]): Promise<number> {
 		// Fan-out mode (selector flag present, or >1 positional target) has its own
 		// envelope shape, guards, and granular exit code. It runs first and rejects
 		// `--stream`/`--listen` + fan-out itself (single-session is exclusive).
-		const selectionFlags = parsed.selectionFlags ?? emptySelectionFlags();
-		const targetPositionals = parsed.targetPositionals ?? [];
 		if (isFanoutMode(selectionFlags, targetPositionals.length)) {
 			return await runApiFanoutCli(
 				parsed,
@@ -399,6 +413,11 @@ export async function runApiCli(args: readonly string[]): Promise<number> {
 				args,
 			);
 		}
+		// A single `--quickchr <name>` is single-target mode (streaming included):
+		// the machine name is the target, resolved from the live descriptor.
+		if (selectionFlags.quickchr.length === 1) {
+			parsed.quickchr = selectionFlags.quickchr[0];
+		}
 
 		// Open-ended follow (`--stream`/`--listen`, or a `/listen` endpoint) consumes
 		// the NDJSON envelope stream instead of a single one-shot envelope.
@@ -410,7 +429,7 @@ export async function runApiCli(args: readonly string[]): Promise<number> {
 			return await runApiListenCli(parsed, args);
 		}
 
-		if (!parsed.targetInput) {
+		if (!parsed.targetInput && parsed.quickchr === undefined) {
 			throw missingTargetError({
 				command: "api",
 				summary: "`centrs api` requires a <router> and an <endpoint>.",

package/src/cli/btest.ts

@@ -23,10 +23,10 @@ import {
 	renderBtestClientEnvelope,
 	renderBtestServerEnvelope,
 } from "../btest.ts";
+import { toYaml } from "../core/yaml.ts";
 import { asCentrsError, formatCentrsErrorText } from "../errors.ts";
 import { describeCentrs, parseDuration } from "../index.ts";
 import type { BtestDirection, BtestProtocol } from "../protocols/btest.ts";
-import { toYaml } from "../retrieve.ts";
 import {
 	type CliCommandMetadata,
 	type CliCommandOption,
@@ -95,8 +95,14 @@ export const btestCommand: CliCommandMetadata = {
 		},
 		{ flag: "--random-data", description: "(client) Incompressible payload." },
 		{
-			flag: "--authenticate[=false]",
-			description: "(server) Require EC-SRP5 auth. Default true.",
+			flag: "--nat-mode",
+			description:
+				"(client, UDP only) Originate an outbound datagram first so server→client data can traverse NAT. Automatic when the test receives.",
+		},
+		{
+			flag: "--authenticate / --no-authenticate",
+			description:
+				"(server) Require EC-SRP5 auth. Default true; `--authenticate=false` also accepted.",
 		},
 		{
 			flag: "--bind",
@@ -129,6 +135,16 @@ export const btestCommand: CliCommandMetadata = {
 			valueName: "<port>",
 			description: "Control port. Default 2000.",
 		},
+		{
+			flag: "--cdb-file",
+			valueName: "<path>",
+			description: "(client) Read target credentials from a WinBox CDB file.",
+		},
+		{
+			flag: "--cdb-password",
+			valueName: "<password>",
+			description: "(client) Decrypt an encrypted WinBox CDB file.",
+		},
 		{
 			flag: "--format",
 			valueName: `<${btestOutputFormats.join("|")}>`,

package/src/cli/execute.ts

@@ -14,6 +14,7 @@ import {
 	renderExecuteFanoutEnvelope,
 } from "../execute-fanout.ts";
 import { describeCentrs } from "../index.ts";
+import { assertNoQuickchrOverrideConflict } from "../resolver/index.ts";
 import {
 	type CliCommandMetadata,
 	expectValue,
@@ -29,9 +30,11 @@ import {
 	withTips,
 } from "./missing-target.ts";
 import {
+	assertQuickchrExclusive,
 	buildTargetSelection,
 	consumeSelectionFlag,
 	emptySelectionFlags,
+	hasTargetSelector,
 	isFanoutMode,
 	type SelectionFlags,
 	selectionCommandOptions,
@@ -105,9 +108,9 @@ export const executeCommand: CliCommandMetadata = {
 			description: "Per-request timeout (for REST, max 60s).",
 		},
 		{
-			flag: "--validate[=false]",
+			flag: "--validate / --no-validate",
 			description:
-				"Run RouterOS :parse and /console/inspect validation before execution (default true).",
+				"Run RouterOS :parse and /console/inspect validation before execution (default true; `--validate=false` also accepted).",
 		},
 		{
 			flag: "--yes",
@@ -265,12 +268,12 @@ export function parseExecuteCliArgs(args: readonly string[]): ExecuteCliArgs {
 	parsed.selectionFlags = selectionFlags;
 	// Positional boundary for execute (see `docs/CONSTITUTION.md` → Target selection):
 	//   - `--` present: targets are the positionals BEFORE it, command is AFTER it.
-	//   - selector flag present, no `--`: every positional is the command (targets
-	//     come from the selector).
+	//   - selector flag (or `--quickchr`) present, no `--`: every positional is the
+	//     command (targets come from the flag).
 	//   - otherwise (no `--`, no selector): legacy single-target split — first
 	//     positional is the target, the rest is the command. Multiple positional
 	//     targets therefore REQUIRE `--`.
-	const hasSelector = isFanoutMode(selectionFlags, 0);
+	const hasSelector = hasTargetSelector(selectionFlags);
 	if (endOfOptions) {
 		parsed.targetPositionals = positional;
 		parsed.command = afterDashDash.join(" ");
@@ -300,6 +303,17 @@ export async function runExecuteCli(args: readonly string[]): Promise<number> {
 		// own envelope shape, single up-front write-confirm, and granular exit code.
 		const selectionFlags = parsed.selectionFlags ?? emptySelectionFlags();
 		const targetPositionals = parsed.targetPositionals ?? [];
+		assertQuickchrExclusive(selectionFlags, targetPositionals.length);
+		// Direct connection overrides conflict with `--quickchr` globally: reject
+		// before fan-out dispatch so a repeated `--quickchr` gets one usage error
+		// (exit 1), never per-member failures. The resolver re-checks for library
+		// callers.
+		if (selectionFlags.quickchr.length > 0) {
+			assertNoQuickchrOverrideConflict(
+				parsed,
+				selectionFlags.quickchr[0] ?? "",
+			);
+		}
 		if (isFanoutMode(selectionFlags, targetPositionals.length)) {
 			return await runExecuteFanoutCli(
 				parsed,
@@ -308,12 +322,17 @@ export async function runExecuteCli(args: readonly string[]): Promise<number> {
 				args,
 			);
 		}
+		// A single `--quickchr <name>` is single-target mode: the machine name is
+		// the target (resolved from the live descriptor inside the resolver).
+		if (selectionFlags.quickchr.length === 1) {
+			parsed.quickchr = selectionFlags.quickchr[0];
+		}
 
 		// No positional at all: lead with the missing-target guidance (CDB picker /
 		// discover) rather than the missing-command error — there is nothing to run
 		// without a device. A lone positional is treated as the target, so the
 		// "requires a command" path still fires for `execute <target>`.
-		if (!parsed.targetInput) {
+		if (!parsed.targetInput && parsed.quickchr === undefined) {
 			throw missingTargetError({
 				command: "execute",
 				summary: "`centrs execute` requires a <target> and a RouterOS command.",