solforge 0.2.3 → 0.2.5

package/src/api-server-entry.ts

@@ -1,109 +1,109 @@
 #!/usr/bin/env node
 
-import { APIServer } from "./services/api-server.js";
-import { configManager } from "./config/manager.js";
 import chalk from "chalk";
+import { configManager } from "./config/manager.js";
+import { APIServer } from "./services/api-server.js";
 
 async function main() {
-  try {
-    // Parse command line arguments
-    const args = process.argv.slice(2);
-    const portIndex = args.indexOf("--port");
-    const hostIndex = args.indexOf("--host");
-    const configIndex = args.indexOf("--config");
-    const rpcIndex = args.indexOf("--rpc-url");
-    const faucetIndex = args.indexOf("--faucet-url");
-    const workDirIndex = args.indexOf("--work-dir");
+	try {
+		// Parse command line arguments
+		const args = process.argv.slice(2);
+		const portIndex = args.indexOf("--port");
+		const hostIndex = args.indexOf("--host");
+		const configIndex = args.indexOf("--config");
+		const rpcIndex = args.indexOf("--rpc-url");
+		const faucetIndex = args.indexOf("--faucet-url");
+		const workDirIndex = args.indexOf("--work-dir");
 
-    if (
-      portIndex === -1 ||
-      configIndex === -1 ||
-      rpcIndex === -1 ||
-      faucetIndex === -1 ||
-      workDirIndex === -1 ||
-      !args[portIndex + 1] ||
-      !args[configIndex + 1] ||
-      !args[rpcIndex + 1] ||
-      !args[faucetIndex + 1] ||
-      !args[workDirIndex + 1]
-    ) {
-      console.error(
-        "Usage: api-server-entry --port <port> --config <config-path> --rpc-url <url> --faucet-url <url> --work-dir <dir> [--host <host>]"
-      );
-      process.exit(1);
-    }
+		if (
+			portIndex === -1 ||
+			configIndex === -1 ||
+			rpcIndex === -1 ||
+			faucetIndex === -1 ||
+			workDirIndex === -1 ||
+			!args[portIndex + 1] ||
+			!args[configIndex + 1] ||
+			!args[rpcIndex + 1] ||
+			!args[faucetIndex + 1] ||
+			!args[workDirIndex + 1]
+		) {
+			console.error(
+				"Usage: api-server-entry --port <port> --config <config-path> --rpc-url <url> --faucet-url <url> --work-dir <dir> [--host <host>]",
+			);
+			process.exit(1);
+		}
 
-    const port = parseInt(args[portIndex + 1]!);
-    const host =
-      hostIndex !== -1 && args[hostIndex + 1] ? args[hostIndex + 1] : undefined;
-    const configPath = args[configIndex + 1]!;
-    const rpcUrl = args[rpcIndex + 1]!;
-    const faucetUrl = args[faucetIndex + 1]!;
-    const workDir = args[workDirIndex + 1]!;
+		const port = parseInt(args[portIndex + 1]!);
+		const host =
+			hostIndex !== -1 && args[hostIndex + 1] ? args[hostIndex + 1] : undefined;
+		const configPath = args[configIndex + 1]!;
+		const rpcUrl = args[rpcIndex + 1]!;
+		const faucetUrl = args[faucetIndex + 1]!;
+		const workDir = args[workDirIndex + 1]!;
 
-    // Load configuration
-    await configManager.load(configPath);
-    const config = configManager.getConfig();
+		// Load configuration
+		await configManager.load(configPath);
+		const config = configManager.getConfig();
 
-    // Create and start API server
-    const apiServer = new APIServer({
-      port,
-      host,
-      validatorRpcUrl: rpcUrl,
-      validatorFaucetUrl: faucetUrl,
-      config,
-      workDir,
-    });
+		// Create and start API server
+		const apiServer = new APIServer({
+			port,
+			host,
+			validatorRpcUrl: rpcUrl,
+			validatorFaucetUrl: faucetUrl,
+			config,
+			workDir,
+		});
 
-    const result = await apiServer.start();
+		const result = await apiServer.start();
 
-    if (result.success) {
-      console.log(chalk.green(`🚀 API Server started on port ${port}`));
+		if (result.success) {
+			console.log(chalk.green(`🚀 API Server started on port ${port}`));
 
-      // Keep the process alive
-      process.on("SIGTERM", async () => {
-        console.log(
-          chalk.yellow("📡 API Server received SIGTERM, shutting down...")
-        );
-        await apiServer.stop();
-        process.exit(0);
-      });
+			// Keep the process alive
+			process.on("SIGTERM", async () => {
+				console.log(
+					chalk.yellow("📡 API Server received SIGTERM, shutting down..."),
+				);
+				await apiServer.stop();
+				process.exit(0);
+			});
 
-      process.on("SIGINT", async () => {
-        console.log(
-          chalk.yellow("📡 API Server received SIGINT, shutting down...")
-        );
-        await apiServer.stop();
-        process.exit(0);
-      });
+			process.on("SIGINT", async () => {
+				console.log(
+					chalk.yellow("📡 API Server received SIGINT, shutting down..."),
+				);
+				await apiServer.stop();
+				process.exit(0);
+			});
 
-      // Keep process alive
-      setInterval(() => {}, 1000);
-    } else {
-      console.error(
-        chalk.red(`❌ Failed to start API server: ${result.error}`)
-      );
-      process.exit(1);
-    }
-  } catch (error) {
-    console.error(
-      chalk.red(
-        `❌ API Server error: ${
-          error instanceof Error ? error.message : String(error)
-        }`
-      )
-    );
-    process.exit(1);
-  }
+			// Keep process alive
+			setInterval(() => {}, 1000);
+		} else {
+			console.error(
+				chalk.red(`❌ Failed to start API server: ${result.error}`),
+			);
+			process.exit(1);
+		}
+	} catch (error) {
+		console.error(
+			chalk.red(
+				`❌ API Server error: ${
+					error instanceof Error ? error.message : String(error)
+				}`,
+			),
+		);
+		process.exit(1);
+	}
 }
 
 main().catch((error) => {
-  console.error(
-    chalk.red(
-      `❌ Fatal error: ${
-        error instanceof Error ? error.message : String(error)
-      }`
-    )
-  );
-  process.exit(1);
+	console.error(
+		chalk.red(
+			`❌ Fatal error: ${
+				error instanceof Error ? error.message : String(error)
+			}`,
+		),
+	);
+	process.exit(1);
 });

package/src/cli/commands/rpc-start.ts

@@ -8,7 +8,10 @@ export async function rpcStartCommand(args: string[]) {
 	const cfg = await readConfig(flags["config"] as string | undefined);
 	const rpcPort = Number(flags["port"] ?? cfg.server.rpcPort ?? 8899);
 	const wsPort = Number(flags["ws-port"] ?? cfg.server.wsPort ?? rpcPort + 1);
-	const host = (flags["host"] as string) || "127.0.0.1";
+	const host =
+		flags["network"] === true
+			? "0.0.0.0"
+			: (flags["host"] as string) || "127.0.0.1";
 	const dbMode =
 		(flags["db-mode"] as string) || cfg.server.db.mode || "ephemeral";
 	const dbPath =

package/src/cli/main.ts

@@ -1,11 +1,17 @@
 // Minimal, fast CLI router with @clack/prompts for UX
 import * as p from "@clack/prompts";
+// Load version for --version in both bun script and compiled binary
+// eslint-disable-next-line @typescript-eslint/consistent-type-imports
+import pkg from "../../package.json" assert { type: "json" };
 
 // Robust arg parsing for both bun script and compiled binary
 const known = new Set([
   "help",
   "-h",
   "--help",
+  "version",
+  "-v",
+  "--version",
   "rpc",
   "start",
   "config",
@@ -21,21 +27,28 @@ const argv = firstIdx >= 0 ? raw.slice(firstIdx) : [];
 async function main() {
 	const [cmd, sub, ...rest] = argv;
 
-	if (!cmd) {
-		const { runSolforge } = await import("./run-solforge");
-		await runSolforge();
-		return;
-	}
+  if (!cmd) {
+    const { runSolforge } = await import("./run-solforge");
+    // Pass through any flags provided when no explicit command was given
+    await runSolforge(raw);
+    return;
+  }
 
-	if (cmd === "help" || cmd === "-h" || cmd === "--help") {
-		printHelp();
-		return;
-	}
+  if (cmd === "help" || cmd === "-h" || cmd === "--help") {
+    printHelp();
+    return;
+  }
+
+  if (cmd === "version" || cmd === "-v" || cmd === "--version") {
+    printVersion();
+    return;
+  }
 
 	// Alias: solforge start -> solforge rpc start
 	if (cmd === "start") {
-		const { rpcStartCommand } = await import("./commands/rpc-start");
-		await rpcStartCommand(rest);
+		// Run the full Solforge flow (config ensure + bootstrap + servers)
+		const { runSolforge } = await import("./run-solforge");
+		await runSolforge(rest);
 		return;
 	}
 
@@ -104,7 +117,7 @@ async function main() {
 }
 
 function printHelp() {
-	console.log(`
+  console.log(`
 solforge <command>
 
 Commands:
@@ -119,12 +132,24 @@ Commands:
   token clone <mint>  Clone SPL token mint + accounts
   program clone <programId>              Clone program code (and optionally accounts)
   program accounts clone <programId>     Clone accounts owned by program
+
+Options:
+  -h, --help          Show help
+  -v, --version       Show version
+  --network           Bind servers to 0.0.0.0 (LAN access)
+  -y, --ci            Non-interactive; auto-accept prompts (use existing config)
 `);
 }
 
 async function unknownCommand(parts: (string | undefined)[]) {
-	p.log.error(`Unknown command: ${parts.filter(Boolean).join(" ")}`);
-	printHelp();
+  p.log.error(`Unknown command: ${parts.filter(Boolean).join(" ")}`);
+  printHelp();
+}
+
+function printVersion() {
+	// Prefer package.json version if available
+	const v = (pkg as any)?.version ?? "";
+	console.log(String(v));
 }
 
 main();

package/src/cli/run-solforge.ts

@@ -9,17 +9,25 @@ import { startRpcServers } from "../rpc/start";
 import { bootstrapEnvironment } from "./bootstrap";
 import { cancelSetup } from "./setup-utils";
 import { runSetupWizard } from "./setup-wizard";
+import { parseFlags } from "./utils/args";
 
 const CONFIG_PATH = "sf.config.json";
 
-export async function runSolforge() {
-	const config = await ensureConfig();
-	await startWithConfig(config);
+export async function runSolforge(args: string[] = []) {
+	const { flags } = parseFlags(args);
+	const ci = flags["ci"] === true || flags["y"] === true;
+	const config = await ensureConfig(ci);
+	await startWithConfig(config, args);
 }
 
-async function ensureConfig(): Promise<SolforgeConfig> {
+async function ensureConfig(ci = false): Promise<SolforgeConfig> {
 	const exists = await Bun.file(CONFIG_PATH).exists();
 	if (!exists) {
+		if (ci) {
+			// Non-interactive: write defaults and continue
+			await saveConfig(defaultConfig);
+			return defaultConfig;
+		}
 		p.intro("Solforge setup");
 		const config = await runSetupWizard();
 		await saveConfig(config);
@@ -28,6 +36,7 @@ async function ensureConfig(): Promise<SolforgeConfig> {
 	}
 
 	const current = await readConfig(CONFIG_PATH);
+	if (ci) return current; // Non-interactive: always reuse existing config
 	const reuse = await p.confirm({
 		message: `Use existing config at ${CONFIG_PATH}?`,
 		initialValue: true,
@@ -41,8 +50,13 @@ async function ensureConfig(): Promise<SolforgeConfig> {
 	return updated;
 }
 
-async function startWithConfig(config: SolforgeConfig) {
-	const host = String(process.env.RPC_HOST || "127.0.0.1");
+async function startWithConfig(config: SolforgeConfig, args: string[] = []) {
+	const { flags } = parseFlags(args);
+	const host = String(
+		flags["network"] === true
+			? "0.0.0.0"
+			: ((flags["host"] as string) ?? process.env.RPC_HOST ?? "127.0.0.1"),
+	);
 	const rpcPort = Number(config.server.rpcPort || defaultConfig.server.rpcPort);
 	const wsPort = Number(config.server.wsPort || rpcPort + 1);
 	const guiEnabled = config.gui?.enabled !== false;