byr-pt-cli 0.1.2 → 0.1.4

package/README.md

@@ -6,7 +6,7 @@ CLI for `byr.pt` with stable machine-readable output (`--json`) and script-frien
 
 ```bash
 npm i -g byr-pt-cli
-byr --help
+byr help
 ```
 
 ## Quick start
@@ -27,6 +27,10 @@ byr download --id 1001 --output ./1001.torrent --dry-run
 ## Commands
 
 ```bash
+byr --help
+byr --version
+byr check --json
+byr whoami --json
 byr search --query "ubuntu" --limit 5 --category movie --spstate free
 byr search --imdb tt0133093 --json
 byr get --id 1001

package/dist/{cli-B6Pr98en.mjs → cli-orER4PKy.mjs}

@@ -1,9 +1,10 @@
 import { renderDownloadOutput, runDownloadCommand } from "./commands/download.mjs";
 import { renderGetOutput, runGetCommand } from "./commands/get.mjs";
 import { renderSearchOutput, runSearchCommand } from "./commands/search.mjs";
-import { a as BYR_INCLDEAD_FACET, c as parseCategoryAliases, i as BYR_BOOKMARKED_FACET, l as parseSimpleFacetAliases, o as BYR_SPSTATE_FACET, s as getByrMetadata, t as createByrClient } from "./client-DT9oDCaE.mjs";
+import { a as BYR_INCLDEAD_FACET, c as parseCategoryAliases, i as BYR_BOOKMARKED_FACET, l as parseSimpleFacetAliases, o as BYR_SPSTATE_FACET, s as getByrMetadata, t as createByrClient } from "./client-CXGKExl2.mjs";
+import { createRequire } from "node:module";
 import { mkdir, readFile, rm, stat, writeFile } from "node:fs/promises";
-import { CliAppError, EXIT_CODES, createCommandContext, createErrorEnvelope, createSuccessEnvelope, mapErrorCodeToExitCode, toCliAppError } from "@onemoreproduct/cli-core";
+import { CliAppError, EXIT_CODES, createCommandContext, createErrorEnvelope, createSuccessEnvelope, mapErrorCodeToExitCode, toCliAppError } from "clawkit-cli-core";
 import { copyFileSync, existsSync, readFileSync, rmSync, statSync } from "node:fs";
 import { homedir, tmpdir } from "node:os";
 import { dirname, join } from "node:path";
@@ -453,6 +454,12 @@ async function resolveClientConfig(input) {
 
 //#endregion
 //#region src/cli.ts
+const SHORT_FLAG_ALIASES = {
+	"-h": "help",
+	"-V": "version",
+	"-v": "verbose"
+};
+const CLI_VERSION = loadVersionInfo();
 async function runCli(argv, deps = {}) {
 	const stdout = deps.stdout ?? process.stdout;
 	const stderr = deps.stderr ?? process.stderr;
@@ -465,8 +472,20 @@ async function runCli(argv, deps = {}) {
 		requestIdFactory: deps.requestIdFactory,
 		verbose
 	});
-	if (parsed.command === void 0 || parsed.command === "help") {
-		stdout.write(`${renderHelp()}\n`);
+	if (hasFlag(parsed.flags, "version") || parsed.command === "version") {
+		if (json) stdout.write(`${JSON.stringify(createSuccessEnvelope(CLI_VERSION, context.toMeta()))}\n`);
+		else stdout.write(`${CLI_VERSION.name} ${CLI_VERSION.version}\n`);
+		return EXIT_CODES.SUCCESS;
+	}
+	if (parsed.command === void 0 || parsed.command === "help" || hasFlag(parsed.flags, "help")) {
+		const helpTarget = resolveHelpTarget(parsed);
+		const helpText = renderHelp(helpTarget.command, helpTarget.subcommand);
+		if (json) {
+			const helpData = { help: helpText };
+			if (helpTarget.command) helpData.command = helpTarget.command;
+			if (helpTarget.subcommand) helpData.subcommand = helpTarget.subcommand;
+			stdout.write(`${JSON.stringify(createSuccessEnvelope(helpData, context.toMeta()))}\n`);
+		} else stdout.write(`${helpText}\n`);
 		return EXIT_CODES.SUCCESS;
 	}
 	let resolvedClient;
@@ -505,6 +524,8 @@ async function runCli(argv, deps = {}) {
 }
 async function dispatch(parsed, deps) {
 	switch (parsed.command) {
+		case "check": return dispatchCheck(parsed, deps);
+		case "whoami": return dispatchWhoami(parsed, deps);
 		case "search": return dispatchSearch(parsed, deps);
 		case "get": return dispatchGet(parsed, deps);
 		case "download": return dispatchDownload(parsed, deps);
@@ -682,29 +703,82 @@ async function dispatchAuth(parsed, deps) {
 		default: throw createArgumentError("E_ARG_UNSUPPORTED", "auth subcommand must be: status|import-cookie|logout", { subcommand });
 	}
 }
+async function dispatchCheck(parsed, deps) {
+	if (parsed.positional.length > 0) throw createArgumentError("E_ARG_UNSUPPORTED", "check command does not accept subcommands", { positional: parsed.positional });
+	const resolved = await resolveClientConfig({
+		cwd: process.cwd(),
+		env: process.env,
+		getFlag: (key) => parsed.flags.get(key)
+	});
+	if (!(typeof resolved.cookie === "string" && resolved.cookie.trim().length > 0)) throw new CliAppError({
+		code: "E_AUTH_REQUIRED",
+		message: "Missing BYR credentials. Set BYR_COOKIE or run `byr auth import-cookie`."
+	});
+	const client = await deps.getClient();
+	let authenticated = true;
+	if (typeof client.verifyAuth === "function") authenticated = (await client.verifyAuth()).authenticated;
+	if (!authenticated) throw new CliAppError({
+		code: "E_AUTH_INVALID",
+		message: "BYR credentials are present but verification failed."
+	});
+	const result = {
+		hasCredentials: true,
+		authenticated: true,
+		source: resolved.cookieSource ?? "none"
+	};
+	return {
+		data: result,
+		humanOutput: ["Authentication: valid", `Source: ${result.source}`].join("\n")
+	};
+}
+async function dispatchWhoami(parsed, deps) {
+	if (parsed.positional.length > 0) throw createArgumentError("E_ARG_UNSUPPORTED", "whoami command does not accept subcommands", { positional: parsed.positional });
+	const client = await deps.getClient();
+	if (typeof client.getUserInfo !== "function") throw createArgumentError("E_ARG_UNSUPPORTED", "Current client does not support user info", {});
+	const info = await client.getUserInfo();
+	return {
+		data: {
+			id: info.id,
+			name: info.name,
+			levelName: info.levelName,
+			levelId: info.levelId,
+			ratio: info.ratio
+		},
+		humanOutput: `${info.name} (${info.id}) | Level: ${info.levelName}${info.levelId ? ` (#${info.levelId})` : ""} | Ratio: ${info.ratio}`
+	};
+}
 function parseArgs(argv) {
-	const command = argv[0];
+	let command;
 	const flags = /* @__PURE__ */ new Map();
 	const positional = [];
-	for (let index = 1; index < argv.length; index += 1) {
+	for (let index = 0; index < argv.length; index += 1) {
 		const token = argv[index];
-		if (!token.startsWith("--")) {
-			positional.push(token);
+		const shortAlias = SHORT_FLAG_ALIASES[token];
+		if (shortAlias !== void 0) {
+			flags.set(shortAlias, true);
 			continue;
 		}
-		const stripped = token.slice(2);
-		const eqIndex = stripped.indexOf("=");
-		if (eqIndex >= 0) {
-			appendFlagValue(flags, stripped.slice(0, eqIndex), stripped.slice(eqIndex + 1));
+		if (token.startsWith("--")) {
+			const stripped = token.slice(2);
+			const eqIndex = stripped.indexOf("=");
+			if (eqIndex >= 0) {
+				appendFlagValue(flags, stripped.slice(0, eqIndex), stripped.slice(eqIndex + 1));
+				continue;
+			}
+			const next = argv[index + 1];
+			if (next !== void 0 && !next.startsWith("-")) {
+				appendFlagValue(flags, stripped, next);
+				index += 1;
+				continue;
+			}
+			flags.set(stripped, true);
 			continue;
 		}
-		const next = argv[index + 1];
-		if (next !== void 0 && !next.startsWith("--")) {
-			appendFlagValue(flags, stripped, next);
-			index += 1;
+		if (command === void 0) {
+			command = token;
 			continue;
 		}
-		flags.set(stripped, true);
+		positional.push(token);
 	}
 	return {
 		command,
@@ -712,6 +786,9 @@ function parseArgs(argv) {
 		positional
 	};
 }
+function hasFlag(flags, key) {
+	return flags.has(key);
+}
 function appendFlagValue(flags, key, value) {
 	const previous = flags.get(key);
 	if (previous === void 0) {
@@ -798,11 +875,107 @@ function parseSingleFacetFlag(flags, key, facet) {
 	if (parsed.values.length !== 1) throw createArgumentError("E_ARG_INVALID", `--${key} expects exactly one value`, { values });
 	return parsed.values[0];
 }
-function renderHelp() {
+function resolveHelpTarget(parsed) {
+	if (parsed.command === "help") return {
+		command: parsed.positional[0],
+		subcommand: parsed.positional[1]
+	};
+	if (hasFlag(parsed.flags, "help")) return {
+		command: parsed.command,
+		subcommand: parsed.positional[0]
+	};
+	return {};
+}
+function renderHelp(command, subcommand) {
+	if (command === "search") return [
+		"byr search",
+		"",
+		"Usage:",
+		"  byr search --query <text> [--limit <n>] [--category <alias|id>] [--incldead <alias|id>] [--spstate <alias|id>] [--bookmarked <alias|id>] [--page <n>] [--json]",
+		"  byr search --imdb <tt-id> [--limit <n>] [--json]"
+	].join("\n");
+	if (command === "get") return [
+		"byr get",
+		"",
+		"Usage:",
+		"  byr get --id <torrent-id> [--json]"
+	].join("\n");
+	if (command === "download") return [
+		"byr download",
+		"",
+		"Usage:",
+		"  byr download --id <torrent-id> --output <path> [--dry-run] [--json]"
+	].join("\n");
+	if (command === "user") return [
+		"byr user",
+		"",
+		"Usage:",
+		"  byr user info [--json]"
+	].join("\n");
+	if (command === "meta") return [
+		"byr meta",
+		"",
+		"Usage:",
+		"  byr meta categories [--json]",
+		"  byr meta levels [--json]"
+	].join("\n");
+	if (command === "auth") {
+		if (subcommand === "status") return [
+			"byr auth status",
+			"",
+			"Usage:",
+			"  byr auth status [--verify] [--json]"
+		].join("\n");
+		if (subcommand === "import-cookie") return [
+			"byr auth import-cookie",
+			"",
+			"Usage:",
+			"  byr auth import-cookie --cookie \"uid=...; pass=...\" [--json]",
+			"  byr auth import-cookie --from-browser <chrome|safari> [--profile <name>] [--json]"
+		].join("\n");
+		if (subcommand === "logout") return [
+			"byr auth logout",
+			"",
+			"Usage:",
+			"  byr auth logout [--json]"
+		].join("\n");
+		return [
+			"byr auth",
+			"",
+			"Usage:",
+			"  byr auth status [--verify] [--json]",
+			"  byr auth import-cookie --cookie \"uid=...; pass=...\" [--json]",
+			"  byr auth import-cookie --from-browser <chrome|safari> [--profile <name>] [--json]",
+			"  byr auth logout [--json]"
+		].join("\n");
+	}
+	if (command === "check") return [
+		"byr check",
+		"",
+		"Usage:",
+		"  byr check [--json]"
+	].join("\n");
+	if (command === "whoami") return [
+		"byr whoami",
+		"",
+		"Usage:",
+		"  byr whoami [--json]"
+	].join("\n");
+	if (command === "version") return [
+		"byr version",
+		"",
+		"Usage:",
+		"  byr version [--json]"
+	].join("\n");
 	return [
 		"byr CLI",
 		"",
 		"Usage:",
+		"  byr [--help|-h] [--version|-V]",
+		"  byr help [command]",
+		"  byr version [--json]",
+		"  byr check [--json]",
+		"  byr whoami [--json]",
 		"  byr search --query <text> [--limit <n>] [--category <alias|id>] [--incldead <alias|id>] [--spstate <alias|id>] [--bookmarked <alias|id>] [--page <n>] [--json]",
 		"  byr search --imdb <tt-id> [--limit <n>] [--json]",
 		"  byr get --id <torrent-id> [--json]",
@@ -819,11 +992,27 @@ function renderHelp() {
 		"  CLI flags > ENV > ./.byrrc.json > ~/.config/byr-cli/config.json > ~/.config/byr-cli/auth.json",
 		"",
 		"Flags:",
+		"  -h, --help   Show help",
+		"  -V, --version Show CLI version",
 		"  --json       Output CliEnvelope JSON",
 		"  --dry-run    Validate and show write plan without writing files",
-		"  --verbose    Include verbose mode in metadata"
+		"  -v, --verbose Include verbose mode in metadata"
 	].join("\n");
 }
+function loadVersionInfo() {
+	try {
+		const pkg = createRequire(import.meta.url)("../package.json");
+		return {
+			name: typeof pkg.name === "string" ? pkg.name : "byr-pt-cli",
+			version: typeof pkg.version === "string" ? pkg.version : "0.0.0"
+		};
+	} catch {
+		return {
+			name: "byr-pt-cli",
+			version: "0.0.0"
+		};
+	}
+}
 function createArgumentError(code, message, details) {
 	return new CliAppError({
 		code,

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import "./client-DT9oDCaE.mjs";
-import { t as runCli } from "./cli-B6Pr98en.mjs";
+import "./client-CXGKExl2.mjs";
+import { t as runCli } from "./cli-orER4PKy.mjs";
 
 export { runCli };

package/dist/{client-DT9oDCaE.mjs → client-CXGKExl2.mjs}

@@ -1,4 +1,4 @@
-import { CliAppError } from "@onemoreproduct/cli-core";
+import { CliAppError } from "clawkit-cli-core";
 
 //#region src/domain/byr-metadata.ts
 function aliases(value, ...extra) {

package/dist/commands/download.mjs

@@ -1,4 +1,4 @@
-import { CliAppError } from "@onemoreproduct/cli-core";
+import { CliAppError } from "clawkit-cli-core";
 
 //#region src/commands/download.ts
 async function runDownloadCommand(client, input) {

package/dist/commands/get.mjs

@@ -1,4 +1,4 @@
-import { CliAppError } from "@onemoreproduct/cli-core";
+import { CliAppError } from "clawkit-cli-core";
 
 //#region src/commands/get.ts
 async function runGetCommand(client, input) {

package/dist/commands/search.mjs

@@ -1,4 +1,4 @@
-import { CliAppError } from "@onemoreproduct/cli-core";
+import { CliAppError } from "clawkit-cli-core";
 
 //#region src/commands/search.ts
 async function runSearchCommand(client, input) {

package/dist/domain/client.mjs

@@ -1,3 +1,3 @@
-import { n as createByrClientFromEnv, r as createMockByrClient, t as createByrClient } from "../client-DT9oDCaE.mjs";
+import { n as createByrClientFromEnv, r as createMockByrClient, t as createByrClient } from "../client-CXGKExl2.mjs";
 
 export { createByrClient, createByrClientFromEnv, createMockByrClient };

package/dist/index.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import "./client-DT9oDCaE.mjs";
-import { t as runCli } from "./cli-B6Pr98en.mjs";
+import "./client-CXGKExl2.mjs";
+import { t as runCli } from "./cli-orER4PKy.mjs";
 
 //#region src/index.ts
 const exitCode = await runCli(process.argv.slice(2));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "byr-pt-cli",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "private": false,
   "description": "BYR CLI with OpenClaw-friendly JSON contract",
   "license": "MIT",