@infomiho/buzz-cli 0.3.0 → 0.5.0

package/dist/cli.mjs

@@ -1,10 +1,13 @@
 #!/usr/bin/env node
+import { createRequire } from "module";
 import { program } from "commander";
 import { existsSync, readFileSync, statSync, writeFileSync } from "node:fs";
-import { homedir } from "node:os";
 import { join } from "node:path";
+import { homedir } from "node:os";
+import cliProgress from "cli-progress";
+import { createInterface } from "readline";
 
-//#region src/cli.ts
+//#region src/lib.ts
 const CONFIG_PATH = join(homedir(), ".buzz.config.json");
 const DEFAULT_SERVER = "http://localhost:8080";
 function loadConfig() {
@@ -22,7 +25,7 @@ function getOptions() {
 	const config = loadConfig();
 	const opts = program.opts();
 	return {
-		server: opts.server || config.server || DEFAULT_SERVER,
+		server: opts.server || process.env.BUZZ_SERVER || config.server || DEFAULT_SERVER,
 		token: opts.token || process.env.BUZZ_TOKEN || config.token
 	};
 }
@@ -35,7 +38,49 @@ function authHeaders(token) {
 	if (token) return { Authorization: `Bearer ${token}` };
 	return {};
 }
-async function createZipBuffer(directory) {
+var ApiError = class extends Error {
+	constructor(message, status, code) {
+		super(message);
+		this.status = status;
+		this.code = code;
+		this.name = "ApiError";
+	}
+};
+var CliError = class extends Error {
+	constructor(message, tip) {
+		super(message);
+		this.tip = tip;
+		this.name = "CliError";
+	}
+};
+function handleError(error) {
+	if (error instanceof CliError) {
+		console.error(`Error: ${error.message}`);
+		if (error.tip) console.error(`Tip: ${error.tip}`);
+	} else if (error instanceof Error) console.error(`Error: ${error.message}`);
+	else console.error(`Error: ${String(error ?? "Unknown error")}`);
+	process.exitCode = 1;
+}
+async function apiRequest(path, options = {}, { requireAuth = true } = {}) {
+	const opts = getOptions();
+	if (requireAuth && !opts.token) throw new CliError("Not authenticated", "Run 'buzz login' first");
+	let response;
+	try {
+		response = await fetch(`${opts.server}${path}`, {
+			...options,
+			headers: {
+				...authHeaders(opts.token),
+				...options.headers
+			}
+		});
+	} catch (error) {
+		throw new CliError(`Could not connect to server - ${error instanceof Error ? error.message : error}`);
+	}
+	if (response.status === 401) throw new CliError("Session expired", "Run 'buzz login' to re-authenticate");
+	if (response.status === 403) throw new ApiError((await response.json()).error || "Permission denied", 403);
+	return response;
+}
+async function createZipBuffer(directory, callbacks) {
 	const archiver = await import("archiver");
 	return new Promise((resolve, reject) => {
 		const archive = archiver.default("zip", { zlib: { level: 9 } });
@@ -43,131 +88,210 @@ async function createZipBuffer(directory) {
 		archive.on("data", (chunk) => chunks.push(chunk));
 		archive.on("end", () => resolve(Buffer.concat(chunks)));
 		archive.on("error", reject);
+		archive.on("progress", (progress) => {
+			callbacks?.onProgress?.(progress.entries.processed, progress.entries.total);
+		});
 		archive.directory(directory, false);
 		archive.finalize();
 	});
 }
-async function deploy(directory, subdomain) {
-	const options = getOptions();
-	if (!options.token) {
-		console.error("Error: Not authenticated. Run 'buzz login' first");
-		process.exit(1);
-	}
-	if (!statSync(directory).isDirectory()) {
-		console.error(`Error: '${directory}' is not a directory`);
-		process.exit(1);
-	}
-	const cwdCnamePath = join(process.cwd(), "CNAME");
-	if (!subdomain && existsSync(cwdCnamePath)) subdomain = readFileSync(cwdCnamePath, "utf-8").trim();
-	else if (!subdomain) {
-		const dirCnamePath = join(directory, "CNAME");
-		if (existsSync(dirCnamePath)) subdomain = readFileSync(dirCnamePath, "utf-8").trim();
-	}
-	console.log(`Zipping ${directory}...`);
-	const zipBuffer = await createZipBuffer(directory);
+function isCI() {
+	return !process.stdout.isTTY || !!process.env.CI;
+}
+function createProgressBar(task) {
+	const ci = isCI();
+	return new cliProgress.SingleBar({
+		format: `${task} [{bar}] {percentage}% | {value}/{total} files`,
+		barCompleteChar: "█",
+		barIncompleteChar: "░",
+		barsize: 20,
+		hideCursor: true,
+		clearOnComplete: false,
+		noTTYOutput: ci,
+		notTTYSchedule: ci ? 2e3 : 100
+	});
+}
+function createSpinner(message) {
+	const ci = isCI();
+	const frames = [
+		"⠋",
+		"⠙",
+		"⠹",
+		"⠸",
+		"⠼",
+		"⠴",
+		"⠦",
+		"⠧",
+		"⠇",
+		"⠏"
+	];
+	let frameIndex = 0;
+	let interval = null;
+	return {
+		start: () => {
+			if (ci) {
+				console.log(`${message}...`);
+				return;
+			}
+			process.stdout.write(`${frames[0]} ${message}`);
+			interval = setInterval(() => {
+				frameIndex = (frameIndex + 1) % frames.length;
+				process.stdout.write(`\r${frames[frameIndex]} ${message}`);
+			}, 80);
+		},
+		stop: (finalMessage) => {
+			if (interval) {
+				clearInterval(interval);
+				process.stdout.write(`\r\x1b[K${finalMessage}\n`);
+			} else if (ci) console.log(finalMessage);
+		}
+	};
+}
+
+//#endregion
+//#region src/deploy.ts
+function resolveSubdomain(cwd, directory, explicit) {
+	if (explicit) return explicit;
+	const cwdCname = join(cwd, "CNAME");
+	if (existsSync(cwdCname)) return readFileSync(cwdCname, "utf-8").trim();
+	const dirCname = join(directory, "CNAME");
+	if (existsSync(dirCname)) return readFileSync(dirCname, "utf-8").trim();
+}
+async function packSite(directory, onProgress) {
+	if (!existsSync(directory)) throw new CliError(`'${directory}' does not exist`);
+	if (!statSync(directory).isDirectory()) throw new CliError(`'${directory}' is not a directory`);
+	return createZipBuffer(directory, { onProgress });
+}
+async function uploadSite(server, token, zip, subdomain, fetchFn = globalThis.fetch) {
 	const boundary = "----BuzzFormBoundary" + Math.random().toString(36).slice(2);
 	const header = `--${boundary}\r\nContent-Disposition: form-data; name="file"; filename="site.zip"\r\nContent-Type: application/zip\r\n\r\n`;
 	const footer = `\r\n--${boundary}--\r\n`;
 	const body = Buffer.concat([
 		Buffer.from(header),
-		zipBuffer,
+		zip,
 		Buffer.from(footer)
 	]);
 	const headers = {
 		"Content-Type": `multipart/form-data; boundary=${boundary}`,
-		...authHeaders(options.token)
+		...authHeaders(token)
 	};
 	if (subdomain) headers["x-subdomain"] = subdomain;
+	let response;
 	try {
-		const response = await fetch(`${options.server}/deploy`, {
+		response = await fetchFn(`${server}/deploy`, {
 			method: "POST",
 			headers,
 			body
 		});
-		const data = await response.json();
-		if (response.ok) {
-			console.log(`Deployed to ${data.url}`);
-			const deployedSubdomain = new URL(data.url).hostname.split(".")[0];
-			writeFileSync(cwdCnamePath, deployedSubdomain + "\n");
-		} else if (response.status === 401) {
-			console.error("Error: Not authenticated. Run 'buzz login' first");
-			process.exit(1);
-		} else if (response.status === 403) {
-			console.error(`Error: ${data.error}`);
-			if (data.error?.includes("owned by another user")) console.error("Tip: Choose a different subdomain with --subdomain <name>");
-			process.exit(1);
-		} else {
-			console.error(`Error: ${data.error || "Unknown error"}`);
-			process.exit(1);
-		}
 	} catch (error) {
-		console.error(`Error: Could not connect to server - ${error instanceof Error ? error.message : error}`);
-		process.exit(1);
+		throw new CliError(`Could not connect to server - ${error instanceof Error ? error.message : error}`);
+	}
+	const data = await response.json();
+	if (response.ok) {
+		const deployedSubdomain = new URL(data.url).hostname.split(".")[0];
+		return {
+			url: data.url,
+			subdomain: deployedSubdomain
+		};
+	}
+	if (response.status === 401) throw new CliError("Not authenticated", "Run 'buzz login' first");
+	if (response.status === 403) {
+		const tip = data.detail?.includes("owned by another user") ? "Choose a different subdomain with --subdomain <name>" : void 0;
+		throw new CliError(data.detail || "Permission denied", tip);
 	}
+	throw new CliError(data.detail || "Unknown error");
 }
-async function list() {
+
+//#endregion
+//#region src/commands/deploy.ts
+async function deploy(directory, subdomain) {
 	const options = getOptions();
-	if (!options.token) {
-		console.error("Error: Not authenticated. Run 'buzz login' first");
-		process.exit(1);
+	if (!options.token) throw new CliError("Not authenticated", "Run 'buzz login' first");
+	subdomain = resolveSubdomain(process.cwd(), directory, subdomain);
+	const progressBar = createProgressBar("Zipping");
+	let progressStarted = false;
+	let zipBuffer;
+	try {
+		zipBuffer = await packSite(directory, (processed, total) => {
+			if (!progressStarted && total > 0) {
+				progressBar.start(total, 0);
+				progressStarted = true;
+			}
+			if (progressStarted) progressBar.update(processed);
+		});
+	} finally {
+		if (progressStarted) progressBar.stop();
 	}
+	console.log(`Compressed to ${formatSize(zipBuffer.length)}`);
+	const uploadSpinner = createSpinner("Uploading");
+	uploadSpinner.start();
 	try {
-		const response = await fetch(`${options.server}/sites`, { headers: authHeaders(options.token) });
-		if (response.status === 401) {
-			console.error("Error: Session expired. Run 'buzz login' to re-authenticate");
-			process.exit(1);
-		}
-		if (response.status === 403) {
-			console.error("Error: Deploy tokens cannot list sites. Use 'buzz login' for a session token.");
-			process.exit(1);
-		}
-		const sites = await response.json();
-		if (sites.length === 0) {
-			console.log("No sites deployed");
-			return;
-		}
-		console.log(`${"NAME".padEnd(24)} ${"CREATED".padEnd(20)} ${"SIZE".padEnd(10)}`);
-		for (const site of sites) {
-			const created = site.created.slice(0, 19).replace("T", " ");
-			console.log(`${site.name.padEnd(24)} ${created.padEnd(20)} ${formatSize(site.size_bytes).padEnd(10)}`);
-		}
+		const result = await uploadSite(options.server, options.token, zipBuffer, subdomain);
+		uploadSpinner.stop("✓ Uploaded");
+		console.log(`Deployed to ${result.url}`);
+		writeFileSync(join(process.cwd(), "CNAME"), result.subdomain + "\n");
 	} catch (error) {
-		console.error(`Error: Could not connect to server - ${error instanceof Error ? error.message : error}`);
-		process.exit(1);
+		uploadSpinner.stop("✗ Upload failed");
+		throw error;
 	}
 }
-async function deleteSite(subdomain) {
-	const options = getOptions();
-	if (!options.token) {
-		console.error("Error: Not authenticated. Run 'buzz login' first");
-		process.exit(1);
+function registerDeployCommand(program$1) {
+	program$1.command("deploy <directory>").description("Deploy a directory to the server").option("--subdomain <name>", "Subdomain for the site").action((directory, cmdOptions) => deploy(directory, cmdOptions.subdomain));
+}
+
+//#endregion
+//#region src/commands/list.ts
+async function list() {
+	const sites = await (await apiRequest("/sites")).json();
+	if (sites.length === 0) {
+		console.log("No sites deployed");
+		return;
 	}
-	try {
-		const response = await fetch(`${options.server}/sites/${subdomain}`, {
-			method: "DELETE",
-			headers: authHeaders(options.token)
+	console.log(`${"NAME".padEnd(24)} ${"CREATED".padEnd(20)} ${"SIZE".padEnd(10)}`);
+	for (const site of sites) {
+		const created = site.created.slice(0, 19).replace("T", " ");
+		console.log(`${site.name.padEnd(24)} ${created.padEnd(20)} ${formatSize(site.size_bytes).padEnd(10)}`);
+	}
+}
+function registerListCommand(program$1) {
+	program$1.command("list").description("List all deployed sites").action(list);
+}
+
+//#endregion
+//#region src/commands/delete.ts
+function confirm(message) {
+	const rl = createInterface({
+		input: process.stdin,
+		output: process.stdout
+	});
+	return new Promise((resolve) => {
+		rl.question(`${message} [y/N] `, (answer) => {
+			rl.close();
+			resolve(answer.toLowerCase() === "y");
 		});
-		if (response.status === 204) console.log(`Deleted ${subdomain}`);
-		else if (response.status === 401) {
-			console.error("Error: Session expired. Run 'buzz login' to re-authenticate");
-			process.exit(1);
-		} else if (response.status === 403) {
-			const data = await response.json();
-			console.error(`Error: ${data.error || "You don't have permission to delete this site"}`);
-			process.exit(1);
-		} else if (response.status === 404) {
-			console.error(`Error: Site '${subdomain}' not found`);
-			process.exit(1);
-		} else {
-			const data = await response.json();
-			console.error(`Error: ${data.error || "Unknown error"}`);
-			process.exit(1);
+	});
+}
+async function deleteSite(subdomain, options) {
+	if (!options.yes) {
+		if (!await confirm(`Delete site '${subdomain}'?`)) {
+			console.log("Aborted.");
+			return;
 		}
-	} catch (error) {
-		console.error(`Error: Could not connect to server - ${error instanceof Error ? error.message : error}`);
-		process.exit(1);
 	}
+	const response = await apiRequest(`/sites/${subdomain}`, { method: "DELETE" });
+	if (response.status === 204) {
+		console.log(`Deleted ${subdomain}`);
+		return;
+	}
+	if (response.status === 404) throw new CliError(`Site '${subdomain}' not found`);
+	throw new CliError((await response.json()).error || "Unknown error");
 }
+function registerDeleteCommand(program$1) {
+	program$1.command("delete <subdomain>").description("Delete a deployed site").option("-y, --yes", "Skip confirmation prompt").action(deleteSite);
+}
+
+//#endregion
+//#region src/commands/config.ts
 function configCommand(key, value) {
 	const config = loadConfig();
 	if (!key) {
@@ -188,53 +312,71 @@ function configCommand(key, value) {
 		config.server = value;
 		saveConfig(config);
 		console.log(`Server set to ${value}`);
-	} else {
-		console.error("Usage: buzz config server <url>");
-		console.error("Use 'buzz login' to authenticate");
-		process.exit(1);
+	} else throw new CliError("Invalid config command", "Usage: buzz config server <url>");
+}
+function registerConfigCommand(program$1) {
+	program$1.command("config [key] [value]").description("View or set configuration (server)").action(configCommand);
+}
+
+//#endregion
+//#region src/commands/url.ts
+function url() {
+	const cnamePath = join(process.cwd(), "CNAME");
+	if (!existsSync(cnamePath)) throw new CliError("No CNAME file found", "Deploy first with: buzz deploy .");
+	const subdomain = readFileSync(cnamePath, "utf-8").trim();
+	const server = loadConfig().server || DEFAULT_SERVER;
+	try {
+		const host = new URL(server).hostname;
+		console.log(`https://${subdomain}.${host}`);
+	} catch {
+		console.log(`http://${subdomain}.localhost:8080`);
 	}
 }
+function registerUrlCommand(program$1) {
+	program$1.command("url").description("Show the URL for the current directory").action(url);
+}
+
+//#endregion
+//#region src/commands/auth.ts
 async function login() {
 	const options = getOptions();
+	let deviceResponse;
 	try {
-		const deviceResponse = await fetch(`${options.server}/auth/device`, { method: "POST" });
-		if (!deviceResponse.ok) {
-			const data = await deviceResponse.json();
-			console.error(`Error: ${data.error || "Failed to start login"}`);
-			process.exit(1);
-		}
-		const deviceData = await deviceResponse.json();
-		console.log(`\nVisit: ${deviceData.verification_uri}`);
-		console.log(`Enter code: ${deviceData.user_code}\n`);
-		console.log("Waiting for authorization...");
-		const interval = (deviceData.interval || 5) * 1e3;
-		const maxAttempts = Math.ceil((deviceData.expires_in || 900) / (deviceData.interval || 5));
-		for (let i = 0; i < maxAttempts; i++) {
-			await new Promise((resolve) => setTimeout(resolve, interval));
-			const pollData = await (await fetch(`${options.server}/auth/device/poll`, {
+		deviceResponse = await fetch(`${options.server}/auth/device`, { method: "POST" });
+	} catch (error) {
+		throw new CliError(`Could not connect to server - ${error instanceof Error ? error.message : error}`);
+	}
+	if (!deviceResponse.ok) throw new CliError((await deviceResponse.json()).error || "Failed to start login");
+	const deviceData = await deviceResponse.json();
+	console.log(`\nVisit: ${deviceData.verification_uri}`);
+	console.log(`Enter code: ${deviceData.user_code}\n`);
+	console.log("Waiting for authorization...");
+	const interval = (deviceData.interval || 5) * 1e3;
+	const maxAttempts = Math.ceil((deviceData.expires_in || 900) / (deviceData.interval || 5));
+	for (let i = 0; i < maxAttempts; i++) {
+		await new Promise((resolve) => setTimeout(resolve, interval));
+		let pollResponse;
+		try {
+			pollResponse = await fetch(`${options.server}/auth/device/poll`, {
 				method: "POST",
 				headers: { "Content-Type": "application/json" },
 				body: JSON.stringify({ device_code: deviceData.device_code })
-			})).json();
-			if (pollData.status === "pending") continue;
-			if (pollData.error) {
-				console.error(`\nError: ${pollData.error}`);
-				process.exit(1);
-			}
-			if (pollData.status === "complete") {
-				const config = loadConfig();
-				config.token = pollData.token;
-				saveConfig(config);
-				console.log(`\nLogged in as ${pollData.user.login}`);
-				return;
-			}
+			});
+		} catch (error) {
+			throw new CliError(`Could not connect to server - ${error instanceof Error ? error.message : error}`);
+		}
+		const pollData = await pollResponse.json();
+		if (pollData.status === "pending") continue;
+		if (pollData.error) throw new CliError(pollData.error);
+		if (pollData.status === "complete") {
+			const config = loadConfig();
+			config.token = pollData.token;
+			saveConfig(config);
+			console.log(`\nLogged in as ${pollData.user.login}`);
+			return;
 		}
-		console.error("\nLogin timed out");
-		process.exit(1);
-	} catch (error) {
-		console.error(`Error: Could not connect to server - ${error instanceof Error ? error.message : error}`);
-		process.exit(1);
 	}
+	throw new CliError("Login timed out");
 }
 async function logout() {
 	const options = getOptions();
@@ -254,171 +396,83 @@ async function logout() {
 	console.log("Logged out");
 }
 async function whoami() {
-	const options = getOptions();
-	if (!options.token) {
-		console.log("Not logged in");
-		console.log("Run 'buzz login' to authenticate");
-		process.exit(1);
-	}
-	try {
-		const response = await fetch(`${options.server}/auth/me`, { headers: authHeaders(options.token) });
-		if (response.status === 401) {
-			console.error("Session expired. Run 'buzz login' to re-authenticate");
-			process.exit(1);
-		}
-		if (!response.ok) {
-			const data = await response.json();
-			console.error(`Error: ${data.error || "Unknown error"}`);
-			process.exit(1);
-		}
-		const user = await response.json();
-		console.log(`Logged in as ${user.login}${user.name ? ` (${user.name})` : ""}`);
-	} catch (error) {
-		console.error(`Error: Could not connect to server - ${error instanceof Error ? error.message : error}`);
-		process.exit(1);
-	}
+	const user = await (await apiRequest("/auth/me")).json();
+	console.log(`Logged in as ${user.login}${user.name ? ` (${user.name})` : ""}`);
 }
+function registerAuthCommands(program$1) {
+	program$1.command("login").description("Login with GitHub OAuth").action(login);
+	program$1.command("logout").description("Logout and clear session").action(logout);
+	program$1.command("whoami").description("Show current logged-in user").action(whoami);
+}
+
+//#endregion
+//#region src/commands/tokens.ts
 async function listTokens() {
-	const options = getOptions();
-	if (!options.token) {
-		console.error("Not logged in. Run 'buzz login' first");
-		process.exit(1);
+	const tokens = await (await apiRequest("/tokens")).json();
+	if (tokens.length === 0) {
+		console.log("No deployment tokens");
+		return;
 	}
-	try {
-		const response = await fetch(`${options.server}/tokens`, { headers: authHeaders(options.token) });
-		if (response.status === 401) {
-			console.error("Session expired. Run 'buzz login' to re-authenticate");
-			process.exit(1);
-		}
-		if (response.status === 403) {
-			console.error("Deploy tokens cannot list tokens. Use a session token.");
-			process.exit(1);
-		}
-		if (!response.ok) {
-			const data = await response.json();
-			console.error(`Error: ${data.error || "Unknown error"}`);
-			process.exit(1);
-		}
-		const tokens = await response.json();
-		if (tokens.length === 0) {
-			console.log("No deployment tokens");
-			return;
-		}
-		console.log(`${"ID".padEnd(18)} ${"NAME".padEnd(20)} ${"SITE".padEnd(20)} ${"LAST USED".padEnd(20)}`);
-		for (const token of tokens) {
-			const lastUsed = token.last_used_at ? token.last_used_at.slice(0, 19).replace("T", " ") : "Never";
-			console.log(`${token.id.padEnd(18)} ${token.name.slice(0, 18).padEnd(20)} ${token.site_name.slice(0, 18).padEnd(20)} ${lastUsed.padEnd(20)}`);
-		}
-	} catch (error) {
-		console.error(`Error: Could not connect to server - ${error instanceof Error ? error.message : error}`);
-		process.exit(1);
+	console.log(`${"ID".padEnd(18)} ${"NAME".padEnd(20)} ${"SITE".padEnd(20)} ${"LAST USED".padEnd(20)}`);
+	for (const token of tokens) {
+		const lastUsed = token.last_used_at ? token.last_used_at.slice(0, 19).replace("T", " ") : "Never";
+		console.log(`${token.id.padEnd(18)} ${token.name.slice(0, 18).padEnd(20)} ${token.site_name.slice(0, 18).padEnd(20)} ${lastUsed.padEnd(20)}`);
 	}
 }
 async function createToken(siteName, cmdOptions) {
-	const options = getOptions();
-	if (!options.token) {
-		console.error("Not logged in. Run 'buzz login' first");
-		process.exit(1);
-	}
-	try {
-		const response = await fetch(`${options.server}/tokens`, {
-			method: "POST",
-			headers: {
-				...authHeaders(options.token),
-				"Content-Type": "application/json"
-			},
-			body: JSON.stringify({
-				site_name: siteName,
-				name: cmdOptions.name || "Deployment token"
-			})
-		});
-		if (response.status === 401) {
-			console.error("Session expired. Run 'buzz login' to re-authenticate");
-			process.exit(1);
-		}
-		if (response.status === 403) {
-			const data$1 = await response.json();
-			console.error(`Error: ${data$1.error}`);
-			process.exit(1);
-		}
-		if (response.status === 404) {
-			console.error(`Error: Site '${siteName}' not found`);
-			process.exit(1);
-		}
-		if (!response.ok) {
-			const data$1 = await response.json();
-			console.error(`Error: ${data$1.error || "Unknown error"}`);
-			process.exit(1);
-		}
-		const data = await response.json();
-		console.log(`Token created for site '${siteName}':\n`);
-		console.log(`  ${data.token}\n`);
-		console.log("Save this token - it won't be shown again!");
-		console.log("\nUse in CI by setting BUZZ_TOKEN environment variable.");
-	} catch (error) {
-		console.error(`Error: Could not connect to server - ${error instanceof Error ? error.message : error}`);
-		process.exit(1);
-	}
+	const response = await apiRequest("/tokens", {
+		method: "POST",
+		headers: { "Content-Type": "application/json" },
+		body: JSON.stringify({
+			site_name: siteName,
+			name: cmdOptions.name || "Deployment token"
+		})
+	});
+	if (response.status === 404) throw new CliError(`Site '${siteName}' not found`);
+	if (!response.ok) throw new CliError((await response.json()).error || "Unknown error");
+	const data = await response.json();
+	console.log(`Token created for site '${siteName}':\n`);
+	console.log(`  ${data.token}\n`);
+	console.log("Save this token - it won't be shown again!");
+	console.log("\nUse in CI by setting BUZZ_TOKEN environment variable.");
 }
 async function deleteToken(tokenId) {
-	const options = getOptions();
-	if (!options.token) {
-		console.error("Not logged in. Run 'buzz login' first");
-		process.exit(1);
-	}
-	try {
-		const response = await fetch(`${options.server}/tokens/${tokenId}`, {
-			method: "DELETE",
-			headers: authHeaders(options.token)
-		});
-		if (response.status === 204) {
-			console.log("Token deleted");
-			return;
-		}
-		if (response.status === 401) {
-			console.error("Session expired. Run 'buzz login' to re-authenticate");
-			process.exit(1);
-		}
-		if (response.status === 404) {
-			console.error("Token not found");
-			process.exit(1);
-		}
-		const data = await response.json();
-		console.error(`Error: ${data.error || "Unknown error"}`);
-		process.exit(1);
-	} catch (error) {
-		console.error(`Error: Could not connect to server - ${error instanceof Error ? error.message : error}`);
-		process.exit(1);
+	const response = await apiRequest(`/tokens/${tokenId}`, { method: "DELETE" });
+	if (response.status === 204) {
+		console.log("Token deleted");
+		return;
 	}
+	if (response.status === 404) throw new CliError("Token not found");
+	throw new CliError((await response.json()).error || "Unknown error");
 }
-program.name("buzz").description("CLI for deploying static sites to Buzz hosting").version("1.0.0").option("-s, --server <url>", "Server URL (overrides config)").option("-t, --token <token>", "Auth token (overrides config)");
-program.command("deploy <directory>").description("Deploy a directory to the server").option("--subdomain <name>", "Subdomain for the site").action((directory, cmdOptions) => deploy(directory, cmdOptions.subdomain));
-program.command("list").description("List all deployed sites").action(list);
-program.command("delete <subdomain>").description("Delete a deployed site").action(deleteSite);
-program.command("config [key] [value]").description("View or set configuration (server)").action(configCommand);
-program.command("url").description("Show the URL for the current directory").action(() => {
-	const cnamePath = join(process.cwd(), "CNAME");
-	if (!existsSync(cnamePath)) {
-		console.error("No CNAME file found. Deploy first with: buzz deploy .");
-		process.exit(1);
-	}
-	const subdomain = readFileSync(cnamePath, "utf-8").trim();
-	const server = loadConfig().server || DEFAULT_SERVER;
-	try {
-		const host = new URL(server).hostname;
-		console.log(`https://${subdomain}.${host}`);
-	} catch {
-		console.log(`http://${subdomain}.localhost:8080`);
-	}
-});
-program.command("login").description("Login with GitHub OAuth").action(login);
-program.command("logout").description("Logout and clear session").action(logout);
-program.command("whoami").description("Show current logged-in user").action(whoami);
-const tokensCmd = program.command("tokens").description("Manage deployment tokens");
-tokensCmd.command("list").description("List your deployment tokens").action(listTokens);
-tokensCmd.command("create <site>").description("Create a deployment token for a site").option("-n, --name <name>", "Token name (for identification)").action(createToken);
-tokensCmd.command("delete <token-id>").description("Delete a deployment token").action(deleteToken);
-program.parse();
+function registerTokensCommand(program$1) {
+	const tokensCmd = program$1.command("tokens").description("Manage deployment tokens");
+	tokensCmd.command("list").description("List your deployment tokens").action(listTokens);
+	tokensCmd.command("create <site>").description("Create a deployment token for a site").option("-n, --name <name>", "Token name (for identification)").action(createToken);
+	tokensCmd.command("delete <token-id>").description("Delete a deployment token").action(deleteToken);
+}
+
+//#endregion
+//#region src/commands/index.ts
+function registerCommands(program$1) {
+	registerDeployCommand(program$1);
+	registerListCommand(program$1);
+	registerDeleteCommand(program$1);
+	registerConfigCommand(program$1);
+	registerUrlCommand(program$1);
+	registerAuthCommands(program$1);
+	registerTokensCommand(program$1);
+}
+
+//#endregion
+//#region src/cli.ts
+const { version } = createRequire(import.meta.url)("../package.json");
+program.name("buzz").description("CLI for deploying static sites to Buzz hosting").version(version).option("-s, --server <url>", "Server URL (overrides config)").option("-t, --token <token>", "Auth token (overrides config)");
+registerCommands(program);
+async function main() {
+	await program.parseAsync();
+}
+main().catch(handleError);
 
 //#endregion
 export {  };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infomiho/buzz-cli",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "description": "CLI for deploying static sites to Buzz hosting",
   "type": "module",
   "bin": {
@@ -12,6 +12,7 @@
   "scripts": {
     "build": "tsdown",
     "dev": "tsdown --watch",
+    "test": "vitest run",
     "prepublishOnly": "npm run build"
   },
   "repository": {
@@ -29,13 +30,16 @@
   "license": "MIT",
   "devDependencies": {
     "@types/archiver": "^7.0.0",
+    "@types/cli-progress": "^3.11.6",
     "@types/node": "^22.0.0",
     "publint": "^0.3.16",
     "tsdown": "^0.20.0-beta.4",
-    "typescript": "^5.7.0"
+    "typescript": "^5.7.0",
+    "vitest": "^4.1.1"
   },
   "dependencies": {
     "archiver": "^7.0.0",
+    "cli-progress": "^3.12.0",
     "commander": "^13.0.0"
   },
   "exports": {