faceless-cli 1.1.7 → 1.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "faceless-cli",
-	"version": "1.1.7",
+	"version": "1.1.8",
 	"description": "CLI for Faceless.so: create AI faceless videos, run automated series and publish to YouTube, TikTok, Instagram and more.",
 	"type": "module",
 	"bin": {

package/src/client.mjs

@@ -1,129 +1,122 @@
 import { randomUUID } from "node:crypto";
 
 export class CliError extends Error {
-  constructor(type, message, status) {
-    super(message);
-    this.name = "CliError";
-    this.type = type || "internal_error";
-    this.status = status;
-  }
+	constructor(type, message, status) {
+		super(message);
+		this.name = "CliError";
+		this.type = type || "internal_error";
+		this.status = status;
+	}
 }
 
 export function exitCodeFor(err) {
-  const type = err && err.type;
-  if (type === "unauthorized" || type === "forbidden_scope") return 2;
-  if (type === "insufficient_credits") return 3;
-  if (type === "rate_limited") return 4;
-  return 1;
+	const type = err && err.type;
+	if (type === "unauthorized" || type === "forbidden_scope") return 2;
+	if (type === "insufficient_credits") return 3;
+	if (type === "rate_limited") return 4;
+	return 1;
 }
 
 function typeForStatus(status) {
-  switch (status) {
-    case 400:
-      return "invalid_input";
-    case 401:
-      return "unauthorized";
-    case 402:
-      return "insufficient_credits";
-    case 403:
-      return "forbidden_scope";
-    case 404:
-      return "not_found";
-    case 409:
-      return "conflict";
-    case 429:
-      return "rate_limited";
-    default:
-      return "internal_error";
-  }
+	switch (status) {
+		case 400:
+			return "invalid_input";
+		case 401:
+			return "unauthorized";
+		case 402:
+			return "insufficient_credits";
+		case 403:
+			return "forbidden_scope";
+		case 404:
+			return "not_found";
+		case 409:
+			return "conflict";
+		case 429:
+			return "rate_limited";
+		default:
+			return "internal_error";
+	}
 }
 
 function buildUrl(baseUrl, path, query) {
-  const url = new URL(baseUrl + path);
-  if (query) {
-    for (const [key, value] of Object.entries(query)) {
-      if (value === undefined || value === null || value === "") continue;
-      url.searchParams.set(key, String(value));
-    }
-  }
-  return url;
+	const url = new URL(baseUrl + path);
+	if (query) {
+		for (const [key, value] of Object.entries(query)) {
+			if (value === undefined || value === null || value === "") continue;
+			url.searchParams.set(key, String(value));
+		}
+	}
+	return url;
 }
 
 export function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
+	return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
 function retryAfterMs(res) {
-  const header = res.headers.get("retry-after");
-  let seconds = Number(header);
-  if (!Number.isFinite(seconds) || seconds < 0) seconds = 1;
-  return Math.min(seconds, 30) * 1000;
+	const header = res.headers.get("retry-after");
+	let seconds = Number(header);
+	if (!Number.isFinite(seconds) || seconds < 0) seconds = 1;
+	return Math.min(seconds, 30) * 1000;
 }
 
 export async function request({ method, path, query, body, apiKey, baseUrl, idempotencyKey }) {
-  if (!apiKey) {
-    throw new CliError(
-      "unauthorized",
-      'No API key configured. Run "faceless login" or set FACELESS_API_KEY.'
-    );
-  }
+	// Credential order: an explicit key (flag > env > saved key, resolved by the caller) wins; with
+	// no key, fall back to the stored OAuth session from `faceless login`, refreshing it as needed.
+	// The import is lazy because oauth.mjs imports CliError from this file.
+	let bearer = apiKey;
+	if (!bearer) {
+		const { ensureOauthAccessToken } = await import("./oauth.mjs");
+		bearer = await ensureOauthAccessToken();
+	}
+	if (!bearer) {
+		throw new CliError("unauthorized", 'Not authenticated. Run "faceless login" (opens your browser, no key needed) or set FACELESS_API_KEY.');
+	}
 
-  const url = buildUrl(baseUrl, path, query);
-  const headers = { Authorization: `Bearer ${apiKey}` };
-  const httpMethod = method.toUpperCase();
-  const init = { method: httpMethod, headers };
-  if (body !== undefined && body !== null) {
-    headers["Content-Type"] = "application/json";
-    init.body = JSON.stringify(body);
-  }
-  // Every mutating request carries an Idempotency-Key so a retry can never be
-  // applied (or charge credits) twice. Ops without server-side idempotency
-  // simply ignore the header. A user-provided --idempotency-key wins.
-  const isMutating = httpMethod !== "GET" && httpMethod !== "HEAD";
-  if (isMutating && !idempotencyKey) idempotencyKey = randomUUID();
-  if (idempotencyKey) headers["Idempotency-Key"] = idempotencyKey;
+	const url = buildUrl(baseUrl, path, query);
+	const headers = { Authorization: `Bearer ${bearer}` };
+	const httpMethod = method.toUpperCase();
+	const init = { method: httpMethod, headers };
+	if (body !== undefined && body !== null) {
+		headers["Content-Type"] = "application/json";
+		init.body = JSON.stringify(body);
+	}
+	// Every mutating request carries an Idempotency-Key so a retry can never be
+	// applied (or charge credits) twice. Ops without server-side idempotency
+	// simply ignore the header. A user-provided --idempotency-key wins.
+	const isMutating = httpMethod !== "GET" && httpMethod !== "HEAD";
+	if (isMutating && !idempotencyKey) idempotencyKey = randomUUID();
+	if (idempotencyKey) headers["Idempotency-Key"] = idempotencyKey;
 
-  let res;
-  try {
-    res = await fetch(url, init);
-    // Retry a rate-limited request once. Insufficient credits is 402 (never
-    // retried); mutating retries are safe because of the Idempotency-Key.
-    if (res.status === 429) {
-      await sleep(retryAfterMs(res));
-      res = await fetch(url, init);
-    }
-  } catch (err) {
-    throw new CliError("internal_error", `Network error calling ${url.origin}: ${err.message}`);
-  }
+	let res;
+	try {
+		res = await fetch(url, init);
+		// Retry a rate-limited request once. Insufficient credits is 402 (never
+		// retried); mutating retries are safe because of the Idempotency-Key.
+		if (res.status === 429) {
+			await sleep(retryAfterMs(res));
+			res = await fetch(url, init);
+		}
+	} catch (err) {
+		throw new CliError("internal_error", `Network error calling ${url.origin}: ${err.message}`);
+	}
 
-  const text = await res.text();
-  let parsed = null;
-  if (text) {
-    try {
-      parsed = JSON.parse(text);
-    } catch {
-      throw new CliError(
-        typeForStatus(res.status),
-        `Unexpected non-JSON response (HTTP ${res.status})`,
-        res.status
-      );
-    }
-  }
+	const text = await res.text();
+	let parsed = null;
+	if (text) {
+		try {
+			parsed = JSON.parse(text);
+		} catch {
+			throw new CliError(typeForStatus(res.status), `Unexpected non-JSON response (HTTP ${res.status})`, res.status);
+		}
+	}
 
-  if (parsed && parsed.success === false) {
-    const e = parsed.error || {};
-    throw new CliError(
-      e.type || typeForStatus(res.status),
-      e.message || `Request failed (HTTP ${res.status})`,
-      res.status
-    );
-  }
-  if (!res.ok) {
-    throw new CliError(
-      typeForStatus(res.status),
-      `Request failed (HTTP ${res.status})`,
-      res.status
-    );
-  }
-  return parsed;
+	if (parsed && parsed.success === false) {
+		const e = parsed.error || {};
+		throw new CliError(e.type || typeForStatus(res.status), e.message || `Request failed (HTTP ${res.status})`, res.status);
+	}
+	if (!res.ok) {
+		throw new CliError(typeForStatus(res.status), `Request failed (HTTP ${res.status})`, res.status);
+	}
+	return parsed;
 }

package/src/config.mjs

@@ -3,45 +3,45 @@ import os from "node:os";
 import path from "node:path";
 
 export const DEFAULT_BASE_URL = "https://faceless.so/api/v1";
-export const CONFIG_DIR = path.join(os.homedir(), ".faceless");
+// FACELESS_CONFIG_DIR exists for tests and for containers that mount config somewhere writable.
+export const CONFIG_DIR = process.env.FACELESS_CONFIG_DIR || path.join(os.homedir(), ".faceless");
 export const CONFIG_PATH = path.join(CONFIG_DIR, "config.json");
 
 export function loadConfig() {
-  try {
-    const raw = fs.readFileSync(CONFIG_PATH, "utf8");
-    const parsed = JSON.parse(raw);
-    return parsed && typeof parsed === "object" ? parsed : {};
-  } catch {
-    return {};
-  }
+	try {
+		const raw = fs.readFileSync(CONFIG_PATH, "utf8");
+		const parsed = JSON.parse(raw);
+		return parsed && typeof parsed === "object" ? parsed : {};
+	} catch {
+		return {};
+	}
 }
 
 export function saveConfig(partial) {
-  const config = { ...loadConfig(), ...partial };
-  for (const key of Object.keys(config)) {
-    if (config[key] === undefined || config[key] === null) delete config[key];
-  }
-  fs.mkdirSync(CONFIG_DIR, { recursive: true, mode: 0o700 });
-  fs.writeFileSync(CONFIG_PATH, JSON.stringify(config, null, 2) + "\n", {
-    mode: 0o600,
-  });
-  try {
-    fs.chmodSync(CONFIG_PATH, 0o600);
-  } catch {
-    /* best effort on platforms without chmod */
-  }
-  return config;
+	const config = { ...loadConfig(), ...partial };
+	for (const key of Object.keys(config)) {
+		if (config[key] === undefined || config[key] === null) delete config[key];
+	}
+	fs.mkdirSync(CONFIG_DIR, { recursive: true, mode: 0o700 });
+	fs.writeFileSync(CONFIG_PATH, JSON.stringify(config, null, 2) + "\n", {
+		mode: 0o600,
+	});
+	try {
+		fs.chmodSync(CONFIG_PATH, 0o600);
+	} catch {
+		/* best effort on platforms without chmod */
+	}
+	return config;
 }
 
 export function resolveApiKey(flags = {}) {
-  if (flags.apiKey) return flags.apiKey;
-  if (process.env.FACELESS_API_KEY) return process.env.FACELESS_API_KEY;
-  const config = loadConfig();
-  return config.apiKey || null;
+	if (flags.apiKey) return flags.apiKey;
+	if (process.env.FACELESS_API_KEY) return process.env.FACELESS_API_KEY;
+	const config = loadConfig();
+	return config.apiKey || null;
 }
 
 export function resolveBaseUrl(flags = {}) {
-  const url =
-    flags.apiUrl || process.env.FACELESS_API_URL || loadConfig().baseUrl || DEFAULT_BASE_URL;
-  return String(url).replace(/\/+$/, "");
+	const url = flags.apiUrl || process.env.FACELESS_API_URL || loadConfig().baseUrl || DEFAULT_BASE_URL;
+	return String(url).replace(/\/+$/, "");
 }

package/src/generated/operations.json

@@ -1,6 +1,6 @@
 {
   "generatedFrom": "src/backend/api/v1/spec/registry.mjs",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "baseUrl": "https://faceless.so/api/v1",
   "operations": [
     {