spooder 3.0.7 → 3.0.8

package/README.md

@@ -71,13 +71,26 @@ When starting your server, `spooder` can automatically update the source code in
 ```json
 {
 	"spooder": {
-		"update": "git pull && bun install"
+		"update": "git pull"
 	}
 }
 ```
-It is worth nothing that if the `update` command fails to execute, the server will still be started. This is preferred over entering a restart loop or failing to start the server at all.
+To execute multiple commands in sequence, provide an array rather than using the `&&` operator.
 
-As well as being executed when the server is first started, the `update` command is also run when `spooder` automatically restarts the server after it exits.
+```json
+{
+	"spooder": {
+		"update": [
+			"git pull",
+			"bun install"
+		]
+	}
+}
+```
+
+If a command in the sequence fails, the remaining commands will not be executed. However, if the update fails, the server will still be started. This is preferred over entering a restart loop or failing to start the server at all.
+
+As well as being executed when the server is first started, the `update` commands are also run when `spooder` automatically restarts the server after it exits.
 
 You can utilize this to automatically update your server in response to a webhook or other event by simply exiting the process.
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "spooder",
 	"type": "module",
-	"version": "3.0.7",
+	"version": "3.0.8",
 	"exports": {
 		".": {
 			"bun": "./src/api.ts",

package/src/cli.ts

@@ -59,41 +59,59 @@ function log(message: string, ...args: unknown[]): void {
 }
 
 const config = await load_config();
-const config_update_command = config.update as string ?? '';
 const config_run_command = config.run as string ?? 'bun run index.ts';
 const config_auto_restart_ms = config.autoRestart as number ?? 5000;
 
+let config_update_commands = [] as string[];
+if (config.update) {
+	if (typeof config.update === 'string')
+		config_update_commands = [config.update]
+	else if (Array.isArray(config.update))
+		config_update_commands = config.update;
+}
+
 async function start_server() {
 	log('start_server');
 
-	if (config_update_command.length > 0) {
-		log('running update command: %s', config_update_command);
-		const update = Bun.spawn(parse_command(config_update_command), {
-			cwd: process.cwd(),
-			stdout: 'inherit',
-			stderr: 'inherit'
-		});
+	if (config_update_commands.length > 0) {
+		log('running %d update commands', config_update_commands.length);
+
+		for (let i = 0; i < config_update_commands.length; i++) {
+			const config_update_command = config_update_commands[i];
+
+			log('[%d] %s', i, config_update_command);
+
+			const update_proc = Bun.spawn(parse_command(config_update_command), {
+				cwd: process.cwd(),
+				stdout: 'inherit',
+				stderr: 'inherit'
+			});
 
-		await update.exited;
-		log('auto update exited with code %d', update.exitCode)
+			await update_proc.exited;
+
+			log('[%d] exited with code %d', i, update_proc.exitCode);
+
+			if (update_proc.exitCode !== 0) {
+				log('aborting update due to non-zero exit code from [%d]', i);
+				break;
+			}
+		}
 	}
 
-	const server_process = Bun.spawn(parse_command(config_run_command), {
+	Bun.spawn(parse_command(config_run_command), {
 		cwd: process.cwd(),
 		stdout: 'inherit',
-		stderr: 'inherit'
-	});
-
-	log('server process started with pid %d', server_process.pid);
+		stderr: 'inherit',
 
-	server_process.exited.then(() => {
-		log('server exited with code %d', server_process.exitCode);
+		onExit: (proc, exitCode, signal) => {
+			log('server exited with code %d', exitCode);
 
-		if (config_auto_restart_ms > -1) {
-			log('restarting server in %dms', config_auto_restart_ms);
-			setTimeout(start_server, config_auto_restart_ms);
+			if (config_auto_restart_ms > -1) {
+				log('restarting server in %dms', config_auto_restart_ms);
+				setTimeout(start_server, config_auto_restart_ms);
+			}
 		}
 	});
 }
 
-start_server();
+await start_server();