@better-sol/cli 0.1.0-alpha.6 → 0.1.0-alpha.7

package/dist/index.js

@@ -4,10 +4,11 @@ import { cancel, confirm, intro, isCancel, log, outro, select, spinner, text } f
 import { Command } from "commander";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import path, { basename, dirname, isAbsolute, join, relative, resolve } from "node:path";
-import { homedir } from "node:os";
-import { execSync } from "node:child_process";
+import { homedir, tmpdir } from "node:os";
+import { execFile, execSync } from "node:child_process";
 import { generateKeyPairSigner, getAddressDecoder } from "@solana/kit";
-import { access, mkdir, opendir, readFile, writeFile } from "node:fs/promises";
+import { access, mkdir, mkdtemp, opendir, readFile, rm, writeFile } from "node:fs/promises";
+import { promisify } from "node:util";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { parseSync } from "oxc-parser";
 import { AnchorProvider, Program } from "@coral-xyz/anchor";
@@ -460,11 +461,23 @@ async function compileProgram(params) {
 		})
 	});
 	if (!response.ok) {
-		const message = await response.text();
-		throw new Error(`Compile failed (${response.status}): ${message}`);
+		const error = await readJson(response);
+		if (response.status === 429 && error.retryAfterSeconds !== void 0) throw new Error(`Rate limit exceeded. Try again in ${formatDuration(error.retryAfterSeconds)}.`);
+		throw new Error(`Compile failed (${response.status}): ${error.error}`);
 	}
+	return readJson(response);
+}
+async function readJson(response) {
 	return await response.json();
 }
+function formatDuration(totalSeconds) {
+	const seconds = Math.max(0, Math.ceil(totalSeconds));
+	const minutes = Math.floor(seconds / 60);
+	const remainder = seconds % 60;
+	if (minutes === 0) return `${remainder}s`;
+	if (remainder === 0) return `${minutes}m`;
+	return `${minutes}m ${remainder}s`;
+}
 //#endregion
 //#region src/lib/solana-rpc.ts
 const CLUSTER_URLS = {
@@ -3103,6 +3116,7 @@ async function discoverProgramsWithSpinner(src) {
 }
 //#endregion
 //#region src/commands/deploy.ts
+const execFileAsync = promisify(execFile);
 const DEFAULT_PAYER_PATH = "keypair.json";
 const AIRDROP_LAMPORTS = 2000000000n;
 const AIRDROP_RETRIES = 3;
@@ -3118,9 +3132,10 @@ async function deploy(options) {
 	const payerPath = resolvePayerPath(options.payer, config.payer);
 	const payer = await readKeypair(payerPath);
 	const rpcUrl = clusterUrl(cluster);
+	const writesRust = options.verify || options.dryRun || options.output !== void 0;
 	log.step(`Cluster: ${cluster}`);
 	log.step(`Source:  ${src}`);
-	log.step(`Output:  ${out}`);
+	if (writesRust) log.step(`Output:  ${out}`);
 	await ensureFunded(payer.publicKey, cluster, rpcUrl);
 	const programs = await discoverProgramsWithSpinner(src);
 	const s = spinner();
@@ -3131,7 +3146,7 @@ async function deploy(options) {
 		throw new Error(`No program named '${options.program}' found in ${src}.\nAvailable programs:\n${available}`);
 	}
 	const projects = matched.map((program) => generateAnchorProject(program));
-	if (options.verify || options.dryRun || options.output !== void 0) {
+	if (writesRust) {
 		s.message(`Writing generated Anchor projects`);
 		await ensureDirectory(outDir);
 		await Promise.all(projects.map(async (project) => {
@@ -3147,44 +3162,51 @@ async function deploy(options) {
 		outro(`Dry run complete — Rust written to ${out}/. No compilation or deployment performed.`);
 		return;
 	}
-	s.message(`Compiling ${matched.length === 1 ? matched[0]?.name : matched.length + " programs"}`);
-	const compileResults = await Promise.all(projects.map((project) => compileProgram({
-		apiKey,
-		program: project.program,
-		libRs: project.libRs,
-		cargoToml: project.cargoToml,
-		idl: project.idl
-	})));
-	s.stop("Compilation completed");
+	const compileSpinner = spinner();
+	compileSpinner.start(`Compiling ${matched.length === 1 ? matched[0]?.name : matched.length + " programs"}`);
+	let compileResults;
+	try {
+		compileResults = await Promise.all(projects.map((project) => compileProgram({
+			apiKey,
+			program: project.program,
+			libRs: project.libRs,
+			cargoToml: project.cargoToml,
+			idl: project.idl
+		})));
+		compileSpinner.stop("Compilation completed");
+	} catch (error) {
+		compileSpinner.stop("Compilation failed");
+		throw error;
+	}
 	for (const [i, project] of projects.entries()) {
 		const result = compileResults[i];
-		printProgramSummary(project.program, cluster, outDir, options.verify);
-		const statusLabel = result.status === "success" ? "✓ Success" : `✗ ${result.status}`;
 		const compileTime = `${(result.compileTimeMs / 1e3).toFixed(1)}s`;
-		log.info(`${statusLabel} compiled in ${compileTime}`);
-		if (result.status === "failed" && result.logs) log.info(`Compile logs:\n${result.logs}`);
-		log.step(`Explorer:   https://explorer.solana.com/address/${project.program.address}?cluster=${cluster}`);
-		if (result.status === "success" && result.bytecode !== null) {
-			const soDir = join(outDir, project.program.name, "target", "deploy");
-			const soPath = join(soDir, `${project.program.name}.so`);
-			const programKeypairPath = cwdJoin(BETTER_SOL_DIR, `${project.program.name}.json`);
-			mkdirSync(soDir, { recursive: true });
-			writeFileSync(soPath, Buffer.from(result.bytecode, "base64"));
-			s.message(`Deploying ${project.program.name} to ${cluster}`);
-			const solanaPath = ensureSolanaCli();
-			try {
-				execSync(`"${solanaPath}" program deploy "${soPath}" --program-id "${programKeypairPath}" --keypair "${payerPath}" --url ${cluster}`, {
-					encoding: "utf8",
-					timeout: 12e4,
-					stdio: "pipe"
-				});
-				s.stop(`Deployed to ${cluster}`);
-				log.step(`Deployed:   ${project.program.address}`);
-			} catch (error) {
-				s.stop("Deployment failed");
-				const message = error instanceof Error && "stderr" in error ? error.stderr.trim() : String(error);
-				throw new Error(`Deployment failed: ${message}`, { cause: error });
-			}
+		log.info(`Program: ${project.program.name}`);
+		log.step(`Address:  ${project.program.address}`);
+		if (result.status === "failed" || result.bytecode === null) {
+			const logs = result.logs !== void 0 && result.logs.length > 0 ? `\n${result.logs}` : "";
+			throw new Error(`Compilation failed for ${project.program.name}.${logs}`);
+		}
+		log.step(`Compiled: ${compileTime}`);
+		const programKeypairPath = cwdJoin(BETTER_SOL_DIR, `${project.program.name}.json`);
+		const solanaPath = ensureSolanaCli();
+		const deploySpinner = spinner();
+		deploySpinner.start(`Deploying ${project.program.name} to ${cluster}`);
+		try {
+			const signature = await deployCompiledProgram({
+				bytecode: result.bytecode,
+				programName: project.program.name,
+				programKeypairPath,
+				payerPath,
+				cluster,
+				solanaPath
+			});
+			deploySpinner.stop("Deployment completed");
+			log.step(`Signature: ${signature}`);
+			log.step(`Explorer:  https://explorer.solana.com/address/${project.program.address}?cluster=${cluster}`);
+		} catch (error) {
+			deploySpinner.stop("Deployment failed");
+			throw new Error(`Deployment failed: ${extractProcessErrorMessage(error)}`, { cause: error });
 		}
 	}
 	if (options.verify) {
@@ -3194,6 +3216,44 @@ async function deploy(options) {
 	}
 	outro("Deploy complete.");
 }
+async function deployCompiledProgram(params) {
+	const deployDir = await mkdtemp(join(tmpdir(), "better-sol-deploy-"));
+	const soPath = join(deployDir, `${params.programName}.so`);
+	try {
+		writeFileSync(soPath, Buffer.from(params.bytecode, "base64"));
+		const { stdout } = await execFileAsync(params.solanaPath, [
+			"program",
+			"deploy",
+			soPath,
+			"--program-id",
+			params.programKeypairPath,
+			"--keypair",
+			params.payerPath,
+			"--url",
+			params.cluster
+		], {
+			encoding: "utf8",
+			timeout: 12e4
+		});
+		return extractDeploymentSignature(stdout);
+	} finally {
+		await rm(deployDir, {
+			recursive: true,
+			force: true
+		});
+	}
+}
+function extractDeploymentSignature(stdout) {
+	return stdout.split("\n").map((line) => line.trim()).find((line) => line.startsWith("Signature:"))?.replace("Signature:", "").trim() ?? "submitted";
+}
+function extractProcessErrorMessage(error) {
+	if (typeof error === "object" && error !== null) {
+		const record = error;
+		if (typeof record.stderr === "string" && record.stderr.trim().length > 0) return record.stderr.trim();
+		if (typeof record.stdout === "string" && record.stdout.trim().length > 0) return record.stdout.trim();
+	}
+	return error instanceof Error ? error.message : String(error);
+}
 function resolvePayerPath(payerFlag, configPayer) {
 	if (payerFlag !== void 0) return cwdPath(payerFlag);
 	if (configPayer !== void 0) return configPayer;
@@ -69260,7 +69320,7 @@ async function gitCommit() {
 //#endregion
 //#region src/index.ts
 const cli = new Command();
-cli.name("better-sol").description("TypeScript-first Solana program tooling — run with npx @better-sol/cli").version("0.1.0-alpha.6");
+cli.name("better-sol").description("TypeScript-first Solana program tooling — run with npx @better-sol/cli").version("0.1.0-alpha.7");
 cli.command("init").description("Initialize a better-sol project").option("--force", "overwrite existing files", false).option("--skip-install", "skip installing dependencies", false).action((options) => run(() => init(options)));
 cli.command("create").description("Create a new better-sol program").argument("[name]", "program name").option("--dir <dir>", "program directory", "programs").option("--force", "overwrite existing files", false).action((name, options) => run(() => create(name, options)));
 cli.command("login").description("Save your compiler API key").action(() => run(() => login()));