fitvete-food-cli 1.3.0 → 1.4.0

package/README.md

@@ -54,8 +54,12 @@ export FITVETE_API_KEY=fv_live_your_key
 - `--key <key>` — API key (overrides `FITVETE_API_KEY`).
 - `--number, -n <N>` — result count for search commands (1–25).
 - `--base <url>` — API base URL (overrides `FITVETE_API_BASE`).
+- `--timeout <ms>` — request timeout in milliseconds (overrides `FITVETE_API_TIMEOUT`; default `60000`, `none` disables it).
 - `--pretty` — human-readable table instead of JSON.
 - `--json` — force JSON (default).
+- `--version, -v` — print the CLI version.
+
+> `photo` and `label` images must be JPEG, PNG, or WebP and at most 5 MB.
 
 ### Exit codes
 

package/index.js

@@ -20,7 +20,7 @@
 import { readFile } from "node:fs/promises";
 import { basename } from "node:path";
 
-const VERSION = "1.3.0";
+const VERSION = "1.4.0";
 const DEFAULT_BASE = "https://auth.fitvete.com/functions/v1/food-api";
 
 // ---- command registry (drives dispatch, --help, and the agent tool manifest) ----
@@ -180,6 +180,9 @@ const COMMANDS = {
       { name: "avoid", type: "string", description: "Comma-separated ingredients to avoid." },
       { name: "explain", type: "string", description: "Add a natural-language summary (--explain)." },
     ],
+    validate: (a, o) => {
+      if (!o.barcode && a.join(" ").trim() === "") fail(2, "score needs a food name or --barcode CODE");
+    },
     path: () => "/v1/score",
     jsonBody: (a, o) => ({
       food: o.barcode ? { barcode: String(o.barcode) } : { name: a.join(" ") },
@@ -209,6 +212,9 @@ const COMMANDS = {
     optionalArgs: true,
     args: [{ name: "name", type: "string", required: false, description: "Food name (or use --barcode)." }],
     options: [{ name: "barcode", type: "string", description: "Look up by UPC/EAN." }, { name: "number", type: "integer", description: "Max swaps, 1-10 (default 5)." }],
+    validate: (a, o) => {
+      if (!o.barcode && a.join(" ").trim() === "") fail(2, "alternatives needs a food name or --barcode CODE");
+    },
     path: (a, o) => {
       const p = new URLSearchParams();
       if (o.barcode) p.set("barcode", String(o.barcode)); else p.set("name", a.join(" "));
@@ -238,11 +244,27 @@ function buildProfile(o) {
 
 const enc = (s) => encodeURIComponent(s);
 
+const DEFAULT_TIMEOUT_MS = 60000;
+
+// Resolve the request timeout (ms) from --timeout, then FITVETE_API_TIMEOUT, then
+// the default. `0` (or "none") disables the timeout for long-running AI calls.
+function resolveTimeout(flag) {
+  const raw = flag != null ? flag : process.env.FITVETE_API_TIMEOUT;
+  if (raw == null || raw === "") return DEFAULT_TIMEOUT_MS;
+  if (String(raw).toLowerCase() === "none") return 0;
+  const n = Number(raw);
+  if (!Number.isFinite(n) || n < 0) fail(2, "--timeout must be a non-negative number of milliseconds (or 'none')");
+  return n;
+}
+
 function fail(code, msg) {
   process.stderr.write(`fitvete-food: ${msg}\n`);
   process.exit(code);
 }
 
+// Flags that never take a value (must not swallow the following positional).
+const BOOLEAN_FLAGS = new Set(["pretty", "json", "help", "version", "explain"]);
+
 // ---- argv parsing: positionals + --flags (--key, --base, --number, --pretty, --json) ----
 function parseArgs(argv) {
   const pos = [];
@@ -258,12 +280,17 @@ function parseArgs(argv) {
     else if (a.startsWith("--key=")) opts.key = a.slice(6);
     else if (a.startsWith("--base=")) opts.base = a.slice(7);
     else if (a === "-h" || a === "--help") opts.help = true;
+    else if (a === "-v" || a === "--version") opts.version = true;
     // Generic --flag value / --flag=value (recipe filters etc.), kebab -> camelCase.
     else if (a.startsWith("--")) {
       const eq = a.indexOf("=");
       const rawKey = eq >= 0 ? a.slice(2, eq) : a.slice(2);
-      const val = eq >= 0 ? a.slice(eq + 1) : (argv[i + 1] && !argv[i + 1].startsWith("--") ? argv[++i] : "true");
-      opts[rawKey.replace(/-([a-z])/g, (_, c) => c.toUpperCase())] = val;
+      const key = rawKey.replace(/-([a-z])/g, (_, c) => c.toUpperCase());
+      // Boolean flags never consume the next token; everyone else takes --flag value.
+      const val = eq >= 0
+        ? a.slice(eq + 1)
+        : (!BOOLEAN_FLAGS.has(key) && argv[i + 1] != null && !argv[i + 1].startsWith("--") ? argv[++i] : "true");
+      opts[key] = val;
     }
     else if (a.startsWith("-") && a !== "-") fail(2, `unknown option: ${a}`);
     else pos.push(a);
@@ -285,18 +312,22 @@ function helpText() {
     "",
     "Commands:",
   ];
-  for (const [name, c] of Object.entries(COMMANDS)) lines.push(`  ${name.padEnd(14)} ${c.summary}`);
+  const names = [...Object.keys(COMMANDS), "tools", "help", "version"];
+  const w = Math.max(...names.map((n) => n.length));
+  for (const [name, c] of Object.entries(COMMANDS)) lines.push(`  ${name.padEnd(w)}  ${c.summary}`);
   lines.push(
-    "  tools          Print a JSON tool manifest for AI agents (function-calling).",
-    "  help           Show this help.",
-    "  version        Print the CLI version.",
+    `  ${"tools".padEnd(w)}  Print a JSON tool manifest for AI agents (function-calling).`,
+    `  ${"help".padEnd(w)}  Show this help.`,
+    `  ${"version".padEnd(w)}  Print the CLI version.`,
     "",
     "Options:",
-    "  --key <key>    API key (overrides FITVETE_API_KEY).",
-    "  --number, -n   Max results for search commands (1-25).",
-    "  --base <url>   API base URL (overrides FITVETE_API_BASE).",
-    "  --pretty       Human-readable table instead of JSON.",
-    "  --json         Force JSON output (default).",
+    "  --key <key>      API key (overrides FITVETE_API_KEY).",
+    "  --number, -n     Max results for search commands (1-25).",
+    "  --base <url>     API base URL (overrides FITVETE_API_BASE).",
+    "  --timeout <ms>   Request timeout in ms (default 60000; 'none' to disable).",
+    "  --pretty         Human-readable table instead of JSON.",
+    "  --json           Force JSON output (default).",
+    "  --version, -v    Print the CLI version.",
     "",
     "Auth: set FITVETE_API_KEY or pass --key. Get a free key at https://fitvete.com/api/",
     "",
@@ -371,10 +402,15 @@ async function request(spec, args, opts) {
     form.append("image", new Blob([bytes], { type: mimeType(filePath) }), basename(filePath));
     init.body = form;
   }
+  const timeoutMs = resolveTimeout(opts.timeout);
+  if (timeoutMs) init.signal = AbortSignal.timeout(timeoutMs);
   let res;
   try {
     res = await fetch(base + path, init);
   } catch (e) {
+    if (e && (e.name === "TimeoutError" || e.name === "AbortError")) {
+      fail(1, `request timed out after ${timeoutMs}ms (raise it with --timeout or FITVETE_API_TIMEOUT)`);
+    }
     fail(1, `network error: ${e.message}`);
   }
   const text = await res.text();
@@ -426,13 +462,14 @@ function pretty(command, data) {
 const { pos, opts } = parseArgs(process.argv.slice(2));
 const command = pos.shift();
 
+if (opts.version || command === "version") { process.stdout.write(VERSION + "\n"); process.exit(0); }
 if (!command || command === "help" || opts.help) { process.stdout.write(helpText() + "\n"); process.exit(0); }
-if (command === "version" || command === "--version" || command === "-v") { process.stdout.write(VERSION + "\n"); process.exit(0); }
 if (command === "tools") { process.stdout.write(JSON.stringify(toolManifest(), null, 2) + "\n"); process.exit(0); }
 
 const spec = COMMANDS[command];
 if (!spec) fail(2, `unknown command: ${command}. Run 'fitvete-food help'.`);
 if (pos.length === 0 && !spec.optionalArgs) fail(2, `usage: fitvete-food ${spec.usage}`);
+if (spec.validate) spec.validate(pos, opts);
 
 const data = await request(spec, pos, opts);
 process.stdout.write((opts.pretty ? pretty(command, data) : JSON.stringify(data)) + "\n");

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "fitvete-food-cli",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "CLI for the FitVete Food & Nutrition API — clean JSON output for scripts and AI agents.",
   "bin": {
-    "fitvete-food": "index.js"
+    "fitvete-food": "index.js",
+    "fitvete-food-cli": "index.js"
   },
   "type": "module",
   "engines": {