@infomiho/buzz-cli 0.4.0 → 0.6.0

package/dist/cli.mjs

@@ -1,9 +1,11 @@
 #!/usr/bin/env node
+import { createRequire } from "module";
 import { program } from "commander";
 import { existsSync, readFileSync, statSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { homedir } from "node:os";
 import cliProgress from "cli-progress";
+import { createInterface } from "readline";
 
 //#region src/lib.ts
 const CONFIG_PATH = join(homedir(), ".buzz.config.json");
@@ -78,6 +80,17 @@ async function apiRequest(path, options = {}, { requireAuth = true } = {}) {
 	if (response.status === 403) throw new ApiError((await response.json()).error || "Permission denied", 403);
 	return response;
 }
+const IGNORED_DIRS = [
+	".git",
+	"node_modules",
+	".vscode",
+	".idea"
+];
+const IGNORED_FILES = [
+	"**/.DS_Store",
+	"**/.env",
+	"**/.env.*"
+];
 async function createZipBuffer(directory, callbacks) {
 	const archiver = await import("archiver");
 	return new Promise((resolve, reject) => {
@@ -89,7 +102,12 @@ async function createZipBuffer(directory, callbacks) {
 		archive.on("progress", (progress) => {
 			callbacks?.onProgress?.(progress.entries.processed, progress.entries.total);
 		});
-		archive.directory(directory, false);
+		archive.glob("**/*", {
+			cwd: directory,
+			dot: true,
+			skip: IGNORED_DIRS,
+			ignore: IGNORED_FILES
+		});
 		archive.finalize();
 	});
 }
@@ -147,74 +165,91 @@ function createSpinner(message) {
 }
 
 //#endregion
-//#region src/commands/deploy.ts
-async function deploy(directory, subdomain) {
-	const options = getOptions();
-	if (!options.token) throw new CliError("Not authenticated", "Run 'buzz login' first");
+//#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`);
-	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();
-	}
-	const progressBar = createProgressBar("Zipping");
-	let progressStarted = false;
-	let zipBuffer;
-	try {
-		zipBuffer = await createZipBuffer(directory, { onProgress: (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();
+	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 {
-		response = await fetch(`${options.server}/deploy`, {
+		response = await fetchFn(`${server}/deploy`, {
 			method: "POST",
 			headers,
 			body
 		});
 	} catch (error) {
-		uploadSpinner.stop("✗ Upload failed");
 		throw new CliError(`Could not connect to server - ${error instanceof Error ? error.message : error}`);
 	}
 	const data = await response.json();
 	if (response.ok) {
-		uploadSpinner.stop("✓ Uploaded");
-		console.log(`Deployed to ${data.url}`);
 		const deployedSubdomain = new URL(data.url).hostname.split(".")[0];
-		writeFileSync(cwdCnamePath, deployedSubdomain + "\n");
-		return;
+		return {
+			url: data.url,
+			subdomain: deployedSubdomain
+		};
 	}
-	uploadSpinner.stop("✗ Upload failed");
 	if (response.status === 401) throw new CliError("Not authenticated", "Run 'buzz login' first");
 	if (response.status === 403) {
-		const tip = data.error?.includes("owned by another user") ? "Choose a different subdomain with --subdomain <name>" : void 0;
-		throw new CliError(data.error, tip);
+		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");
+}
+
+//#endregion
+//#region src/commands/deploy.ts
+async function deploy(directory, subdomain) {
+	const options = getOptions();
+	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 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) {
+		uploadSpinner.stop("✗ Upload failed");
+		throw error;
 	}
-	throw new CliError(data.error || "Unknown error");
 }
 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));
@@ -240,7 +275,25 @@ function registerListCommand(program$1) {
 
 //#endregion
 //#region src/commands/delete.ts
-async function deleteSite(subdomain) {
+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");
+		});
+	});
+}
+async function deleteSite(subdomain, options) {
+	if (!options.yes) {
+		if (!await confirm(`Delete site '${subdomain}'?`)) {
+			console.log("Aborted.");
+			return;
+		}
+	}
 	const response = await apiRequest(`/sites/${subdomain}`, { method: "DELETE" });
 	if (response.status === 204) {
 		console.log(`Deleted ${subdomain}`);
@@ -250,7 +303,7 @@ async function deleteSite(subdomain) {
 	throw new CliError((await response.json()).error || "Unknown error");
 }
 function registerDeleteCommand(program$1) {
-	program$1.command("delete <subdomain>").description("Delete a deployed site").action(deleteSite);
+	program$1.command("delete <subdomain>").description("Delete a deployed site").option("-y, --yes", "Skip confirmation prompt").action(deleteSite);
 }
 
 //#endregion
@@ -429,7 +482,8 @@ function registerCommands(program$1) {
 
 //#endregion
 //#region src/cli.ts
-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)");
+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();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infomiho/buzz-cli",
-  "version": "0.4.0",
+  "version": "0.6.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": {
@@ -31,9 +32,11 @@
     "@types/archiver": "^7.0.0",
     "@types/cli-progress": "^3.11.6",
     "@types/node": "^22.0.0",
+    "jszip": "^3.10.1",
     "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",