@studiometa/forge-cli 0.4.5 → 0.4.6

package/dist/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { S as isOutputFormat, _ as ApiError, a as createContext, b as ValidationError, c as colors, d as deleteToken, g as setToken, h as setOrganizationSlug, i as runCommand, l as setColorEnabled, m as getToken, n as exitWithValidationError, p as getOrganizationSlug, s as OutputFormatter, u as createConfigStore } from "./error-handler-peS_8nl4.js";
-import { activateCertificate, createAuditLogger, createBackupConfig, createCommand, createDatabaseUser, createMonitor, createNginxTemplate, createRedirectRule, createScheduledJob, createSecurityRule, deleteBackupConfig, deleteDatabaseUser, deleteMonitor, deleteNginxTemplate, deleteRedirectRule, deleteScheduledJob, deleteSecurityRule, deploySiteAndWait, getBackupConfig, getCertificate, getCommand, getDaemon, getDatabase, getDatabaseUser, getEnv, getFirewallRule, getMonitor, getNginxConfig, getNginxTemplate, getRecipe, getRedirectRule, getScheduledJob, getSecurityRule, getServer, getSite, getSshKey, getUser, listBackupConfigs, listCommands, listDaemons, listDatabaseUsers, listDatabases, listDeployments, listFirewallRules, listMonitors, listNginxTemplates, listRecipes, listRedirectRules, listScheduledJobs, listSecurityRules, listServers, listSites, listSshKeys, matchByName, rebootServer, restartDaemon, runRecipe, updateBackupConfig, updateDaemon, updateDatabaseUser, updateEnv, updateNginxConfig, updateNginxTemplate, updateRecipe, updateSecurityRule, updateSite } from "@studiometa/forge-core";
+import { S as isOutputFormat, _ as ApiError, a as createContext, b as ValidationError, c as colors, d as deleteToken, g as setToken, h as setOrganizationSlug, i as runCommand, l as setColorEnabled, m as getToken, n as exitWithValidationError, p as getOrganizationSlug, s as OutputFormatter, u as createConfigStore } from "./error-handler-BA357jIr.js";
+import { RESTARTABLE_SERVICES, activateCertificate, createAuditLogger, createBackupConfig, createCommand, createDatabaseUser, createMonitor, createNginxTemplate, createRedirectRule, createScheduledJob, createSecurityRule, deleteBackupConfig, deleteDatabaseUser, deleteMonitor, deleteNginxTemplate, deleteRedirectRule, deleteScheduledJob, deleteSecurityRule, deploySiteAndWait, getBackupConfig, getCertificate, getCommand, getDaemon, getDaemonLog, getDatabase, getDatabaseUser, getDeploymentLog, getEnv, getFirewallRule, getMonitor, getNginxConfig, getNginxTemplate, getRecipe, getRedirectRule, getScheduledJob, getSecurityRule, getServer, getSite, getSshKey, getUser, listBackupConfigs, listCommands, listDaemons, listDatabaseUsers, listDatabases, listDeployments, listFirewallRules, listMonitors, listNginxTemplates, listRecipes, listRedirectRules, listScheduledJobs, listSecurityRules, listServers, listServices, listSites, listSshKeys, matchByName, rebootServer, restartDaemon, restartService, runRecipe, updateBackupConfig, updateDaemon, updateDatabaseUser, updateEnv, updateNginxConfig, updateNginxTemplate, updateRecipe, updateSecurityRule, updateSite } from "@studiometa/forge-core";
 import { mkdirSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
@@ -336,16 +336,16 @@ _forge_completions() {
   prev="\${COMP_WORDS[COMP_CWORD-1]}"
 
   # Main commands
-  commands="config servers s sites deployments d databases db database-users daemons env nginx certificates certs firewall-rules fw ssh ssh-keys backups commands scheduled-jobs user monitors nginx-templates security-rules redirect-rules recipes completion help"
+  commands="config servers s sites deployments d databases db database-users daemons env nginx certificates certs firewall-rules fw ssh ssh-keys backups commands scheduled-jobs services user monitors nginx-templates security-rules redirect-rules recipes completion help"
 
   # Subcommands for each command
   local config_cmds="set get delete"
   local servers_cmds="list ls get reboot"
   local sites_cmds="list ls get"
-  local deployments_cmds="list ls deploy"
+  local deployments_cmds="list ls deploy logs log"
   local databases_cmds="list ls get"
   local database_users_cmds="list ls get create delete"
-  local daemons_cmds="list ls get restart"
+  local daemons_cmds="list ls get restart logs log"
   local env_cmds="get update"
   local nginx_cmds="get update"
   local certificates_cmds="get activate"
@@ -354,6 +354,7 @@ _forge_completions() {
   local backups_cmds="list ls get create delete"
   local commands_cmds="list ls get create"
   local scheduled_jobs_cmds="list ls get create delete"
+  local services_cmds="list ls restart"
   local user_cmds="get"
   local monitors_cmds="list ls get create delete"
   local nginx_templates_cmds="list ls get create update delete"
@@ -422,6 +423,9 @@ _forge_completions() {
         scheduled-jobs)
           COMPREPLY=( $(compgen -W "\${scheduled_jobs_cmds}" -- "\${cur}") )
           ;;
+        services)
+          COMPREPLY=( $(compgen -W "\${services_cmds}" -- "\${cur}") )
+          ;;
         user)
           COMPREPLY=( $(compgen -W "\${user_cmds}" -- "\${cur}") )
           ;;
@@ -505,6 +509,7 @@ _forge() {
         'backups:Manage backup configurations'
         'commands:Manage site commands'
         'scheduled-jobs:Manage scheduled jobs'
+        'services:List and restart server services'
         'user:Display authenticated user profile'
         'monitors:Manage server monitors'
         'nginx-templates:Manage Nginx templates'
@@ -552,6 +557,8 @@ _forge() {
             'list:List deployments'
             'ls:List deployments (alias)'
             'deploy:Trigger a deployment'
+            'logs:Show deployment output'
+            'log:Show deployment output (alias)'
           )
           _describe 'deployments command' deployments_cmds
           ;;
@@ -582,6 +589,8 @@ _forge() {
             'ls:List daemons (alias)'
             'get:Get daemon details'
             'restart:Restart a daemon'
+            'logs:Show daemon log output'
+            'log:Show daemon log output (alias)'
           )
           _describe 'daemons command' daemons_cmds
           ;;
@@ -659,6 +668,15 @@ _forge() {
           )
           _describe 'scheduled-jobs command' scheduled_jobs_cmds
           ;;
+        services)
+          local -a services_cmds
+          services_cmds=(
+            'list:List services on a server'
+            'ls:List services on a server (alias)'
+            'restart:Restart a service'
+          )
+          _describe 'services command' services_cmds
+          ;;
         user)
           local -a user_cmds
           user_cmds=(
@@ -795,6 +813,7 @@ complete -c forge -f -n "__fish_use_subcommand" -a "ssh-keys" -d "Manage SSH key
 complete -c forge -f -n "__fish_use_subcommand" -a "backups" -d "Manage backup configurations"
 complete -c forge -f -n "__fish_use_subcommand" -a "commands" -d "Manage site commands"
 complete -c forge -f -n "__fish_use_subcommand" -a "scheduled-jobs" -d "Manage scheduled jobs"
+complete -c forge -f -n "__fish_use_subcommand" -a "services" -d "List and restart server services"
 complete -c forge -f -n "__fish_use_subcommand" -a "user" -d "Display authenticated user profile"
 complete -c forge -f -n "__fish_use_subcommand" -a "monitors" -d "Manage server monitors"
 complete -c forge -f -n "__fish_use_subcommand" -a "nginx-templates" -d "Manage Nginx templates"
@@ -824,6 +843,8 @@ complete -c forge -f -n "__fish_seen_subcommand_from sites" -a "get" -d "Get sit
 complete -c forge -f -n "__fish_seen_subcommand_from deployments d" -a "list" -d "List deployments"
 complete -c forge -f -n "__fish_seen_subcommand_from deployments d" -a "ls" -d "List deployments (alias)"
 complete -c forge -f -n "__fish_seen_subcommand_from deployments d" -a "deploy" -d "Trigger a deployment"
+complete -c forge -f -n "__fish_seen_subcommand_from deployments d" -a "logs" -d "Show deployment output"
+complete -c forge -f -n "__fish_seen_subcommand_from deployments d" -a "log" -d "Show deployment output (alias)"
 
 # databases subcommands
 complete -c forge -f -n "__fish_seen_subcommand_from databases db" -a "list" -d "List databases"
@@ -842,6 +863,8 @@ complete -c forge -f -n "__fish_seen_subcommand_from daemons" -a "list" -d "List
 complete -c forge -f -n "__fish_seen_subcommand_from daemons" -a "ls" -d "List daemons (alias)"
 complete -c forge -f -n "__fish_seen_subcommand_from daemons" -a "get" -d "Get daemon details"
 complete -c forge -f -n "__fish_seen_subcommand_from daemons" -a "restart" -d "Restart a daemon"
+complete -c forge -f -n "__fish_seen_subcommand_from daemons" -a "logs" -d "Show daemon log output"
+complete -c forge -f -n "__fish_seen_subcommand_from daemons" -a "log" -d "Show daemon log output (alias)"
 
 # env subcommands
 complete -c forge -f -n "__fish_seen_subcommand_from env" -a "get" -d "Get env variables"
@@ -886,6 +909,11 @@ complete -c forge -f -n "__fish_seen_subcommand_from scheduled-jobs" -a "get" -d
 complete -c forge -f -n "__fish_seen_subcommand_from scheduled-jobs" -a "create" -d "Create a scheduled job"
 complete -c forge -f -n "__fish_seen_subcommand_from scheduled-jobs" -a "delete" -d "Delete a scheduled job"
 
+# services subcommands
+complete -c forge -f -n "__fish_seen_subcommand_from services" -a "list" -d "List services on a server"
+complete -c forge -f -n "__fish_seen_subcommand_from services" -a "ls" -d "List services on a server (alias)"
+complete -c forge -f -n "__fish_seen_subcommand_from services" -a "restart" -d "Restart a service"
+
 # user subcommands
 complete -c forge -f -n "__fish_seen_subcommand_from user" -a "get" -d "Get the authenticated user profile"
 
@@ -1432,6 +1460,22 @@ async function daemonsGet(args, ctx) {
 		]);
 	}, ctx.formatter);
 }
+async function daemonsLogs(args, ctx) {
+	const [id] = args;
+	const server = String(ctx.options.server ?? "");
+	if (!id) exitWithValidationError("daemon_id", "forge daemons logs <daemon_id> --server <server_id>", ctx.formatter);
+	if (!server) exitWithValidationError("server_id", "forge daemons logs <daemon_id> --server <server_id>", ctx.formatter);
+	await runCommand(async () => {
+		const token = ctx.getToken();
+		const execCtx = ctx.createExecutorContext(token);
+		const result = await getDaemonLog({
+			server_id: await resolveServerId(server, execCtx),
+			id
+		}, execCtx);
+		if (result.data) ctx.formatter.outputText(result.data);
+		else ctx.formatter.info("No log output available.");
+	}, ctx.formatter);
+}
 async function daemonsUpdate(args, ctx) {
 	const [id] = args;
 	const server = String(ctx.options.server ?? "");
@@ -1483,6 +1527,8 @@ var handleDaemonsCommand = createCommandRouter({
 		list: daemonsList,
 		ls: daemonsList,
 		get: [daemonsGet, "args"],
+		logs: [daemonsLogs, "args"],
+		log: [daemonsLogs, "args"],
 		restart: [daemonsRestart, "args"],
 		update: [daemonsUpdate, "args"]
 	},
@@ -1502,6 +1548,12 @@ ${colors.bold("forge daemons get")} - Get daemon details
 
 ${colors.bold("USAGE:")}
   forge daemons get <daemon_id> --server <server_id>
+`);
+	else if (subcommand === "logs" || subcommand === "log") console.log(`
+${colors.bold("forge daemons logs")} - Show the log output of a daemon
+
+${colors.bold("USAGE:")}
+  forge daemons logs <daemon_id> --server <server_id>
 `);
 	else if (subcommand === "update") console.log(`
 ${colors.bold("forge daemons update")} - Update a daemon
@@ -1524,6 +1576,7 @@ ${colors.bold("USAGE:")}
 ${colors.bold("SUBCOMMANDS:")}
   list, ls            List daemons
   get <id>            Get daemon details
+  logs <id>           Show the log output of a daemon
   update <id>         Update a daemon
   restart <id>        Restart a daemon
 
@@ -1832,6 +1885,38 @@ async function deploymentsList(ctx) {
 		], "No deployments found.", (d) => `${String(d.id).padEnd(8)} ${d.status.padEnd(12)} ${(d.commit.hash ?? "—").padEnd(10)} ${d.started_at}`);
 	}, ctx.formatter);
 }
+async function deploymentsLogs(args, ctx) {
+	const [deploymentId] = args;
+	const server = String(ctx.options.server ?? "");
+	const site = String(ctx.options.site ?? "");
+	if (!server) exitWithValidationError("server_id", "forge deployments logs [deployment_id] --server <server_id> --site <site_id>", ctx.formatter);
+	if (!site) exitWithValidationError("site_id", "forge deployments logs [deployment_id] --server <server_id> --site <site_id>", ctx.formatter);
+	await runCommand(async () => {
+		const token = ctx.getToken();
+		const execCtx = ctx.createExecutorContext(token);
+		const server_id = await resolveServerId(server, execCtx);
+		const site_id = await resolveSiteId(site, server_id, execCtx);
+		let deployment_id = deploymentId;
+		if (!deployment_id) {
+			const deployments = await listDeployments({
+				server_id,
+				site_id
+			}, execCtx);
+			if (deployments.data.length === 0) {
+				ctx.formatter.info("No deployments found.");
+				return;
+			}
+			deployment_id = String(deployments.data[0].id);
+		}
+		const result = await getDeploymentLog({
+			server_id,
+			site_id,
+			deployment_id
+		}, execCtx);
+		if (result.data) ctx.formatter.outputText(result.data);
+		else ctx.formatter.info("No log output available.");
+	}, ctx.formatter);
+}
 async function deploymentsDeploy(ctx) {
 	const server = String(ctx.options.server ?? "");
 	const site = String(ctx.options.site ?? "");
@@ -1868,7 +1953,9 @@ var handleDeploymentsCommand = createCommandRouter({
 	handlers: {
 		list: deploymentsList,
 		ls: deploymentsList,
-		deploy: deploymentsDeploy
+		deploy: deploymentsDeploy,
+		logs: [deploymentsLogs, "args"],
+		log: [deploymentsLogs, "args"]
 	},
 	writeSubcommands: ["deploy"]
 });
@@ -1881,6 +1968,17 @@ ${colors.bold("forge deployments list")} - List deployments for a site
 ${colors.bold("USAGE:")}
   forge deployments list --server <server_id> --site <site_id> [options]
 
+${colors.bold("OPTIONS:")}
+  --server <id>       Server ID (required)
+  --site <id>         Site ID (required)
+  -f, --format <fmt>  Output format: json, human, table
+`);
+	else if (subcommand === "logs" || subcommand === "log") console.log(`
+${colors.bold("forge deployments logs")} - Show output of a deployment (latest if no id)
+
+${colors.bold("USAGE:")}
+  forge deployments logs [deployment_id] --server <server_id> --site <site_id>
+
 ${colors.bold("OPTIONS:")}
   --server <id>       Server ID (required)
   --site <id>         Site ID (required)
@@ -1910,6 +2008,7 @@ ${colors.bold("ALIASES:")}
 ${colors.bold("SUBCOMMANDS:")}
   list, ls            List deployments for a site
   deploy              Trigger a deployment
+  logs                Show output of a deployment (latest if no id)
 
 ${colors.bold("OPTIONS:")}
   --server <id>       Server ID (required)
@@ -3321,6 +3420,122 @@ Run ${colors.cyan("forge servers <subcommand> --help")} for subcommand details.
 `);
 }
 //#endregion
+//#region src/commands/services/handlers.ts
+/**
+* List services on a server with a derived availability flag.
+*/
+async function servicesList(args, ctx) {
+	const [server] = args;
+	if (!server) exitWithValidationError("server", "forge services list <server>", ctx.formatter);
+	await runCommand(async () => {
+		const token = ctx.getToken();
+		const execCtx = ctx.createExecutorContext(token);
+		const result = await listServices({ server_id: await resolveServerId(server, execCtx) }, execCtx);
+		ctx.formatter.outputList(result.data, [
+			"service",
+			"available",
+			"detail"
+		], "No services.", (row) => {
+			const status = row.available ? "yes" : "no";
+			const detail = row.detail ? ` (${row.detail})` : "";
+			return `${row.service.padEnd(12)}${status}${detail}`;
+		});
+	}, ctx.formatter);
+}
+/**
+* Restart a service on a server.
+*/
+async function servicesRestart(args, ctx) {
+	const [server, service] = args;
+	if (!server) exitWithValidationError("server", "forge services restart <server> <service>", ctx.formatter);
+	if (!service) exitWithValidationError("service", "forge services restart <server> <service>", ctx.formatter);
+	const version = ctx.options.version ? String(ctx.options.version) : void 0;
+	await runCommand(async () => {
+		if (!RESTARTABLE_SERVICES.includes(service)) throw new ValidationError(`Invalid service "${service}"`, "service", [`Valid services: ${RESTARTABLE_SERVICES.join(", ")}`]);
+		const token = ctx.getToken();
+		const execCtx = ctx.createExecutorContext(token);
+		const server_id = await resolveServerId(server, execCtx);
+		let resolvedVersion = version;
+		if (service === "php" && !resolvedVersion) {
+			const { data: srv } = await getServer({ server_id }, execCtx);
+			if (!srv.php_version) throw new ValidationError("The php service requires a version", "version", ["Pass --version <php_version> (e.g. --version php83)"]);
+			resolvedVersion = srv.php_version;
+		}
+		await restartService({
+			server_id,
+			service,
+			version: resolvedVersion
+		}, execCtx);
+		ctx.formatter.success(`${service} restart initiated on server ${server_id}.`);
+	}, ctx.formatter);
+}
+//#endregion
+//#region src/commands/services/command.ts
+var handleServicesCommand = createCommandRouter({
+	resource: "services",
+	handlers: {
+		list: [servicesList, "args"],
+		ls: [servicesList, "args"],
+		restart: [servicesRestart, "args"]
+	},
+	writeSubcommands: ["restart"]
+});
+//#endregion
+//#region src/commands/services/help.ts
+function showServicesHelp(subcommand) {
+	if (subcommand === "list" || subcommand === "ls") console.log(`
+${colors.bold("forge services list")} - List services on a server
+
+${colors.bold("USAGE:")}
+  forge services list <server> [options]
+
+${colors.bold("ARGUMENTS:")}
+  <server>            Server ID or name (required)
+
+${colors.bold("NOTES:")}
+  Availability is a heuristic derived from the server object — the API has
+  no services listing endpoint.
+
+${colors.bold("EXAMPLES:")}
+  forge services list 123
+  forge services list my-server --format json
+`);
+	else if (subcommand === "restart") console.log(`
+${colors.bold("forge services restart")} - Restart a service on a server
+
+${colors.bold("USAGE:")}
+  forge services restart <server> <service> [options]
+
+${colors.bold("ARGUMENTS:")}
+  <server>            Server ID or name (required)
+  <service>           One of: nginx, php, mysql, postgres, redis, supervisor
+
+${colors.bold("OPTIONS:")}
+  --version <ver>     PHP version (e.g. php83) — required for the php service
+                        (defaults to the server's php_version when omitted)
+
+${colors.bold("EXAMPLES:")}
+  forge services restart 123 nginx
+  forge services restart 123 php --version php83
+`);
+	else console.log(`
+${colors.bold("forge services")} - List and restart server services
+
+${colors.bold("USAGE:")}
+  forge services <subcommand> [options]
+
+${colors.bold("SUBCOMMANDS:")}
+  list, ls            List services on a server
+  restart <service>   Restart a service (nginx, php, mysql, postgres, redis, supervisor)
+
+${colors.bold("OPTIONS:")}
+  --version <ver>     PHP version (for the php service)
+  -f, --format <fmt>  Output format: json, human, table
+
+Run ${colors.cyan("forge services <subcommand> --help")} for details.
+`);
+}
+//#endregion
 //#region src/commands/sites/handlers.ts
 async function sitesList(ctx) {
 	const server = String(ctx.options.server ?? "");
@@ -3784,7 +3999,7 @@ function parseArgs(argv = process.argv.slice(2)) {
 }
 //#endregion
 //#region src/cli.ts
-var VERSION = "0.4.5";
+var VERSION = "0.4.6";
 function showHelp() {
 	console.log(`
 ${colors.bold("forge")} v${VERSION}
@@ -3867,6 +4082,10 @@ ${colors.bold("COMMANDS:")}
     create              Create a scheduled job (requires --server --command)
     delete <id>         Delete a scheduled job (requires --server)
 
+  services            List and restart server services
+    list, ls            List services on a server (forge services list <server>)
+    restart <service>   Restart a service (forge services restart <server> <service>)
+
   user                Display authenticated user profile
     get                 Get the authenticated user profile
 
@@ -3955,7 +4174,7 @@ async function main() {
 		showHelp();
 		process.exit(0);
 	}
-	if (options.version || options.v) {
+	if (options.version === true || options.v === true) {
 		console.log(VERSION);
 		process.exit(0);
 	}
@@ -4083,6 +4302,13 @@ async function main() {
 				}
 				await handleScheduledJobsCommand(subcommand ?? "list", positional, options);
 				break;
+			case "services":
+				if (wantsHelp) {
+					showServicesHelp(subcommand);
+					process.exit(0);
+				}
+				await handleServicesCommand(subcommand ?? "list", positional, options);
+				break;
 			case "user":
 				if (wantsHelp) {
 					showUserHelp(subcommand);