@bcts/seedtool-cli 1.0.0-alpha.23 → 1.0.0-beta.0

package/dist/main.mjs

@@ -3,6 +3,7 @@ import { Command, Option } from "commander";
 import { SecureRandomNumberGenerator } from "@bcts/rand";
 import { SSKRGroupSpec, SSKRSecret, SSKRShare, SSKRSpec, Seed, sskrCombine, sskrGenerate } from "@bcts/components";
 import * as readline from "node:readline";
+import * as fs from "node:fs";
 import { Envelope, SymmetricKey } from "@bcts/envelope";
 import { DATE, NAME, NOTE, SEED_TYPE } from "@bcts/known-values";
 import { CborDate, decodeCbor, expectBytes, toByteString, toTaggedValue } from "@bcts/dcbor";
@@ -12,7 +13,6 @@ import { BytewordsStyle, MultipartDecoder, MultipartEncoder, UR, decodeBytewords
 import { SSKR_SHARE, SSKR_SHARE_V1 } from "@bcts/tags";
 import { sha256 } from "@noble/hashes/sha2.js";
 import { hkdf } from "@noble/hashes/hkdf.js";
-import fs from "node:fs";
 //#region src/cli.ts
 /**
 * Copyright © 2023-2026 Blockchain Commons, LLC
@@ -62,12 +62,21 @@ var Cli = class Cli {
 	/** The RNG source (internal state). */
 	rng;
 	/**
-	* Get input from argument or read from stdin.
-	* Matches Rust expect_input method.
+	* Get input from argument or lazily read it from stdin.
+	*
+	* Mirrors Rust's `Cli::expect_input` (seedtool-cli-rust/src/cli.rs:191-200):
+	* stdin is touched only when an input-consuming code path actually needs it.
+	* Modes like `--in random` or `-d <SEED>` (deterministic) never call this,
+	* so they exit cleanly even when stdin is a non-TTY but no input is piped.
+	*
+	* Reads the stdin file descriptor synchronously via `fs.readFileSync(0, ...)`
+	* and caches the trimmed result on `this.input` so subsequent calls don't
+	* re-read.
 	*/
 	expectInput() {
 		if (this.input !== void 0) return this.input;
-		throw new Error("Input required but not provided. Use stdin or pass as argument.");
+		this.input = fs.readFileSync(0, "utf-8").trim();
+		return this.input;
 	}
 	/**
 	* Get input from argument or read from stdin asynchronously.
@@ -386,18 +395,34 @@ function dataToHex(bytes) {
 }
 /**
 * Convert hex string to bytes.
-* Matches Rust hex_to_data function.
+*
+* Mirrors the error wording produced by Rust's `hex` crate
+* (`FromHexError::OddLength` and `FromHexError::InvalidHexCharacter`),
+* which seedtool-cli-rust surfaces unchanged through anyhow:
+*
+*   "Odd number of digits"
+*   "Invalid character '{c}' at position {n}"
+*
+* The outer CLI layer adds the `Error: ` prefix to match Rust's anyhow
+* output.
 */
 function hexToData(hex) {
-	if (hex.length % 2 !== 0) throw new Error("Hex string must have even length");
+	if (hex.length % 2 !== 0) throw new Error("Odd number of digits");
 	const bytes = new Uint8Array(hex.length / 2);
 	for (let i = 0; i < hex.length; i += 2) {
-		const byte = parseInt(hex.substring(i, i + 2), 16);
-		if (isNaN(byte)) throw new Error(`Invalid hex character at position ${i}`);
-		bytes[i / 2] = byte;
+		const hi = hexCharToNibble(hex, i);
+		const lo = hexCharToNibble(hex, i + 1);
+		bytes[i / 2] = hi << 4 | lo;
 	}
 	return bytes;
 }
+function hexCharToNibble(hex, index) {
+	const c = hex.charCodeAt(index);
+	if (c >= 48 && c <= 57) return c - 48;
+	if (c >= 97 && c <= 102) return c - 97 + 10;
+	if (c >= 65 && c <= 70) return c - 65 + 10;
+	throw new Error(`Invalid character '${hex[index]}' at position ${index}`);
+}
 /**
 * Convert byte values to a different base range [0, base-1].
 * Each byte (0-255) is scaled proportionally to the target base.
@@ -475,7 +500,7 @@ function digitsToData(inStr, low, high) {
 	const result = [];
 	for (const c of inStr) {
 		const n = c.charCodeAt(0) - "0".charCodeAt(0);
-		if (n < low || n > high) throw new Error(`Invalid digit: ${c}. Expected range [${low}-${high}].`);
+		if (n < low || n > high) throw new Error("Invalid digit.");
 		result.push(n);
 	}
 	return new Uint8Array(result);
@@ -739,7 +764,7 @@ var MultipartFormat = class {
 			decoder.receive(share);
 			if (decoder.isComplete()) break;
 		}
-		if (!decoder.isComplete()) throw new Error("Insufficient multipart shares");
+		if (!decoder.isComplete()) throw new Error("Insufficient SSKR shares");
 		const ur = decoder.message();
 		if (ur === void 0 || ur === null) throw new Error("Failed to decode multipart message");
 		const envelope = Envelope.fromUR(ur);
@@ -991,7 +1016,7 @@ const CARD_RANKS = "a23456789tjqk";
 function parseRank(c) {
 	const lower = c.toLowerCase();
 	const index = CARD_RANKS.indexOf(lower);
-	if (index === -1) throw new Error(`Invalid card rank: ${c}. Allowed: [A,2-9,T,J,Q,K]`);
+	if (index === -1) throw new Error("Invalid card rank. Allowed: [A,2-9,T,J,Q,K]");
 	return index;
 }
 /**
@@ -1001,7 +1026,7 @@ function parseRank(c) {
 function parseSuit(c) {
 	const lower = c.toLowerCase();
 	const index = CARD_SUITS.indexOf(lower);
-	if (index === -1) throw new Error(`Invalid card suit: ${c}. Allowed: [C,D,H,S]`);
+	if (index === -1) throw new Error("Invalid card rank. Allowed: [D,C,H,S]");
 	return index;
 }
 /**
@@ -1200,7 +1225,74 @@ function selectOutputFormat(key) {
 * A tool for generating and transforming cryptographic seeds.
 * Ported from seedtool-cli-rust/src/main.rs
 */
-const VERSION = "0.4.0";
+/**
+* Package version, sourced from `package.json` so the CLI's `--version` output
+* never drifts from the published version.
+*/
+const VERSION = "1.0.0-beta.0";
+/**
+* Build an argParser that validates a value against the given choices and,
+* on failure, emits the clap-style error format used by Rust's seedtool-cli:
+*
+*   error: invalid value 'X' for '--<long> <UPPER>'
+*     [possible values: a, b, c]
+*
+*   For more information, try '--help'.
+*
+* `metavar` is the value-name placeholder (e.g. INPUT_TYPE), normally derived
+* from the option's `<META>` declaration. Used in conjunction with `.choices()`
+* for help-text generation — argParser runs first, so on a bad value we exit
+* before commander's own choice-validation message can fire.
+*/
+function clapChoiceParser(longName, metavar, choices) {
+	return (value) => {
+		if (choices.includes(value)) return value;
+		process.stderr.write(`error: invalid value '${value}' for '--${longName} <${metavar}>'\n  [possible values: ${choices.join(", ")}]\n\nFor more information, try '--help'.\n`);
+		process.exit(2);
+	};
+}
+const IN_CHOICES = [
+	"random",
+	"hex",
+	"btw",
+	"btwu",
+	"btwm",
+	"bits",
+	"cards",
+	"dice",
+	"base6",
+	"base10",
+	"ints",
+	"bip39",
+	"sskr",
+	"envelope",
+	"multipart",
+	"seed"
+];
+const OUT_CHOICES = [
+	"hex",
+	"btw",
+	"btwu",
+	"btwm",
+	"bits",
+	"cards",
+	"dice",
+	"base6",
+	"base10",
+	"ints",
+	"bip39",
+	"sskr",
+	"envelope",
+	"multipart",
+	"seed"
+];
+const SSKR_FORMAT_CHOICES = [
+	"envelope",
+	"btw",
+	"btwm",
+	"btwu",
+	"ur"
+];
 function parseLowInt(value) {
 	const num = parseInt(value, 10);
 	if (isNaN(num) || num < 0 || num > 254) throw new Error("LOW must be between 0 and 254");
@@ -1228,52 +1320,12 @@ function parseGroupSpec(value, previous) {
 }
 function main() {
 	const program = new Command();
-	program.name("seedtool").description("A tool for generating and transforming cryptographic seeds.\n\nby Wolf McNally and Christopher Allen\n\nReport bugs to ChristopherA@BlockchainCommons.com.\n© 2024 Blockchain Commons.").version(VERSION).argument("[INPUT]", "The input to be transformed. If required and not present, it will be read from stdin.").option("-c, --count <COUNT>", "The number of output units (hex bytes, base-10 digits, etc.)", "16").addOption(new Option("-i, --in <INPUT_TYPE>", "The input format. If not specified, a new random seed is generated using a secure random number generator.").choices([
-		"random",
-		"hex",
-		"btw",
-		"btwm",
-		"btwu",
-		"bits",
-		"cards",
-		"dice",
-		"base6",
-		"base10",
-		"ints",
-		"bip39",
-		"sskr",
-		"envelope",
-		"seed",
-		"multipart"
-	]).default("random")).addOption(new Option("-o, --out <OUTPUT_TYPE>", "The output format.").choices([
-		"hex",
-		"btw",
-		"btwm",
-		"btwu",
-		"bits",
-		"cards",
-		"dice",
-		"base6",
-		"base10",
-		"ints",
-		"bip39",
-		"sskr",
-		"envelope",
-		"seed",
-		"multipart"
-	]).default("hex")).option("--low <LOW>", "The lowest int returned (0-254)", parseLowInt, 0).option("--high <HIGH>", "The highest int returned (1-255), low < high", parseHighInt, 9).option("--name <NAME>", "The name of the seed.").option("--note <NOTE>", "The note associated with the seed.").option("--date <DATE>", "The seed's creation date, in ISO-8601 format. May also be `now`.").option("--max-fragment-len <MAX_FRAG_LEN>", "For `multipart` output, the UR will be segmented into parts with fragments no larger than MAX_FRAG_LEN", "500").option("--additional-parts <NUM_PARTS>", "For `multipart` output, the number of additional parts above the minimum to generate using fountain encoding.", "0").option("-g, --groups <M-of-N>", "Group specifications. May appear more than once. M must be < N", parseGroupSpec, []).option("-t, --group-threshold <THRESHOLD>", "The number of groups that must meet their threshold. Must be <= the number of group specifications.", parseGroupThreshold, 1).addOption(new Option("-s, --sskr-format <SSKR_FORMAT>", "SSKR output format.").choices([
-		"envelope",
-		"btw",
-		"btwm",
-		"btwu",
-		"ur"
-	]).default("envelope")).option("-d, --deterministic <SEED_STRING>", "Use a deterministic random number generator with the given seed string. Output generated from this seed will be the same every time, so generated seeds are only as secure as the seed string.");
+	program.name("seedtool").description("A tool for generating and transforming cryptographic seeds.\n\nby Wolf McNally and Christopher Allen\n\nReport bugs to ChristopherA@BlockchainCommons.com.\n© 2024 Blockchain Commons.").version(`@bcts/seedtool-cli ${VERSION}`).argument("[INPUT]", "The input to be transformed. If required and not present, it will be read from stdin").option("-c, --count <COUNT>", "The number of output units (hex bytes, base-10 digits, etc.)", "16").addOption(new Option("-i, --in <INPUT_TYPE>", "The input format. If not specified, a new random seed is generated using a secure random number generator").choices([...IN_CHOICES]).argParser(clapChoiceParser("in", "INPUT_TYPE", IN_CHOICES)).default("random")).addOption(new Option("-o, --out <OUTPUT_TYPE>", "The output format").choices([...OUT_CHOICES]).argParser(clapChoiceParser("out", "OUTPUT_TYPE", OUT_CHOICES)).default("hex")).option("--low <LOW>", "The lowest int returned (0-254)", parseLowInt, 0).option("--high <HIGH>", "The highest int returned (1-255), low < high", parseHighInt, 9).option("--name <NAME>", "The name of the seed").option("--note <NOTE>", "The note associated with the seed").option("--date <DATE>", "The seed's creation date, in ISO-8601 format. May also be `now`").option("--max-fragment-len <MAX_FRAG_LEN>", "For `multipart` output, the UR will be segmented into parts with fragments no larger than MAX_FRAG_LEN", "500").option("--additional-parts <NUM_PARTS>", "For `multipart` output, the number of additional parts above the minimum to generate using fountain encoding", "0").option("-g, --groups <M-of-N>", "Group specifications. May appear more than once. M must be < N", parseGroupSpec, []).option("-t, --group-threshold <THRESHOLD>", "The number of groups that must meet their threshold. Must be <= the number of group specifications", parseGroupThreshold, 1).addOption(new Option("-s, --sskr-format <SSKR_FORMAT>", "Output format").choices([...SSKR_FORMAT_CHOICES]).argParser(clapChoiceParser("sskr-format", "SSKR_FORMAT", SSKR_FORMAT_CHOICES)).default("envelope")).option("-d, --deterministic <SEED_STRING>", "Use a deterministic random number generator with the given seed string. Output generated from this seed will be the same every time, so generated seeds are only as secure as the seed string");
 	program.parse();
 	const options = program.opts();
 	const args = program.args;
 	const cli = new Cli();
 	if (args.length > 0) cli.input = args[0];
-	else if (process.stdin.isTTY !== true) cli.input = fs.readFileSync(process.stdin.fd, "utf-8").trim();
 	cli.count = parseInt(options.count, 10);
 	cli.in = options.in;
 	cli.out = options.out;
@@ -1309,7 +1361,8 @@ try {
 	main();
 } catch (error) {
 	const message = error instanceof Error ? error.message : String(error);
-	console.error(message);
+	const prefixed = message.startsWith("Error: ") ? message : `Error: ${message}`;
+	console.error(prefixed);
 	process.exit(1);
 }
 //#endregion