Add site start chat command (fix #23)

.gitignore

@@ -1,3 +1,4 @@
 lapisdeploy
 config.json
+config.lua
 sites/

config.go

@@ -2,14 +2,14 @@
 package main
 
 import (
-	"encoding/json"
-	"log"
-	"os"
+	"errors"
+
+	"github.com/yuin/gopher-lua"
 )
 
 // Configuration stores information retrieved from a configuration file
 type Configuration struct {
-	port      int
+	port      int64
 	sites_dir string
 	matrix    struct {
 		homeserver string
@@ -19,23 +19,64 @@ type Configuration struct {
 	}
 }
 
+// getStringFromTable retrieves a string from a table on the lua stack using the key passed in.
+func getStringFromTable(L *lua.LState, lobj lua.LValue, key string, out *string) error {
+	lv := L.GetTable(lobj, lua.LString(key))
+	if text, ok := lv.(lua.LString); ok {
+		*out = string(text)
+	} else {
+		return errors.New("Failed to get string from table using key '" + key + "'")
+	}
+	return nil
+}
+
+// getIntFromTable retrieves an integer from a table on the Lua stack using the key passed in.
+func getIntFromTable(L *lua.LState, lobj lua.LValue, key string, out *int64) error {
+	lv := L.GetTable(lobj, lua.LString(key))
+	if int, ok := lv.(lua.LNumber); ok {
+		*out = int64(int)
+	} else {
+		return errors.New("Failed to get integer from table using key '" + key + "'")
+	}
+	return nil
+}
+
+// getTableFromTable retrieves a nested table from the Lua stack using the key passed in.
+func getTableFromTable(L *lua.LState, lobj lua.LValue, key string, out *lua.LValue) {
+	*out = L.GetTable(lobj, lua.LString(key))
+
+}
+
 // parseConfig parses the JSON configuration file at 'path' and stores the contents in 'config'
 func parseConfig(path string, config *Configuration) {
-	file, _ := os.Open(path)
-	var data map[string]interface{}
-	err := json.NewDecoder(file).Decode(&data)
-	if err != nil {
-		log.Panic("Failed to parse config:", err)
-	}
-	file.Close()
-	// Main configuration
-	config.port = int(data["port"].(float64)) // this conversion makes no sense
-	config.sites_dir = data["sites_dir"].(string)
+	// Lua state setup
+	L := lua.NewState()
+	defer L.Close()
 
-	// Matrix configuration
-	matrix := data["matrix"].(map[string]interface{})
-	config.matrix.homeserver = matrix["homeserver"].(string)
-	config.matrix.username = matrix["username"].(string)
-	config.matrix.password = matrix["password"].(string)
-	config.matrix.room_id = matrix["room_id"].(string)
+	L.DoFile(path)
+	table := L.Get(-1) // Get the table returned by the config file
+
+	// Main config
+	if err := getStringFromTable(L, table, "sites_dir", &config.sites_dir); err != nil {
+		panic(err)
+	}
+	if err := getIntFromTable(L, table, "port", &config.port); err != nil {
+		panic(err)
+	}
+
+	// Matrix config
+	var matrix lua.LValue
+	getTableFromTable(L, table, "matrix", &matrix)
+	if err := getStringFromTable(L, matrix, "homeserver", &config.matrix.homeserver); err != nil {
+		panic(err)
+	}
+	if err := getStringFromTable(L, matrix, "username", &config.matrix.username); err != nil {
+		panic(err)
+	}
+	if err := getStringFromTable(L, matrix, "password", &config.matrix.password); err != nil {
+		panic(err)
+	}
+	if err := getStringFromTable(L, matrix, "room_id", &config.matrix.room_id); err != nil {
+		panic(err)
+	}
 }

go.mod

@@ -3,8 +3,13 @@ module code.retroedge.tech/noah/lapisdeploy
 go 1.22.0
 
 require (
-	github.com/akamensky/argparse v1.4.0 // indirect
-	github.com/gogs/git-module v1.8.3 // indirect
+	github.com/akamensky/argparse v1.4.0
+	github.com/gogs/git-module v1.8.3
+	github.com/yuin/gopher-lua v1.1.1
+	maunium.net/go/mautrix v0.17.0
+)
+
+require (
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mcuadros/go-version v0.0.0-20190308113854-92cdf37c5b75 // indirect
@@ -22,5 +27,4 @@ require (
 	golang.org/x/sys v0.18.0 // indirect
 	golang.org/x/tools v0.19.0 // indirect
 	maunium.net/go/maulogger/v2 v2.4.1 // indirect
-	maunium.net/go/mautrix v0.17.0 // indirect
 )

go.sum

@@ -37,6 +37,8 @@ github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
 github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
 github.com/yuin/goldmark v1.6.0 h1:boZcn2GTjpsynOsC0iJHnBWa4Bi0qzfJjthwauItG68=
 github.com/yuin/goldmark v1.6.0/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M=
+github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
 go.mau.fi/util v0.4.0 h1:S2X3qU4pUcb/vxBRfAuZjbrR9xVMAXSjQojNBLPBbhs=
 go.mau.fi/util v0.4.0/go.mod h1:leeiHtgVBuN+W9aDii3deAXnfC563iN3WK6BF8/AjNw=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

main.go

@@ -75,13 +75,20 @@ func handler(data map[string]interface{}) {
 func main() {
 	// Parse arguments
 	parser := argparse.NewParser("lapisdeploy", "Easily deploy Lapis web applications through Gitea webhooks")
-	config_path := parser.String("c", "config", &argparse.Options{Required: false, Help: "Configuration file", Default: "./config.json"})
+	config_path := parser.String("c", "config", &argparse.Options{Required: false, Help: "Configuration file", Default: "./config.lua"})
 	disable_matrix := parser.Flag("M", "disable-matrix", &argparse.Options{Required: false, Help: "Disable Matrix chat bot", Default: false})
 	if err := parser.Parse(os.Args); err != nil { // Parse arguments
 		fmt.Print(parser.Usage(err)) // Show usage if there's an error
 		return
 	}
 
+	if exists, err := fileExists(*config_path); !exists {
+		fmt.Printf("Invalid config file '%s'\n", *config_path)
+		os.Exit(1)
+	} else if err != nil {
+		panic(err)
+	}
+
 	parseConfig(*config_path, &configuration) // Parse JSON configuration file
 
 	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { // Webhook receiver

matrix.go

@@ -123,7 +123,7 @@ func initMatrix() {
 			return text + "🔴 Failed to get sites!"
 		}
 		for _, site := range sites {
-			text = fmt.Sprintf("%s- %s\n", text, site.name)
+			text = fmt.Sprintf("%s- %s\n", text, site.getName())
 		}
 		if len(sites) == 0 {
 			text = text + "*No sites found*"
@@ -150,6 +150,43 @@ func initMatrix() {
 		return text + "\n🟢 Successfully restarted site."
 	})
 
+	registerChatCommand("start", "Start a site.", func(ctx context.Context, evt *event.Event, args []string) string {
+		if len(args) < 2 {
+			return "🔴 Invalid site."
+		}
+		site, found, err := getSite(args[1])
+		if err != nil {
+			return "🔴 Failed to get site " + args[2] + "!"
+		} else if !found {
+			return "🔴 Invalid site."
+		}
+
+		text := "⚪️ Starting server..."
+		if derr := site.Start(); derr.code != 0 {
+			derr.SendOverMatrix()
+			return text + "\n🔴 Failed to stop site!"
+		}
+		return text + "\n🟢 Successfully started site."
+	})
+
+	registerChatCommand("stop", "Stop a site.", func(ctx context.Context, evt *event.Event, args []string) string {
+		if len(args) < 2 {
+			return "🔴 Invalid site."
+		}
+		site, found, err := getSite(args[1])
+		if err != nil {
+			return "🔴 Failed to get site " + args[2] + "!"
+		} else if !found {
+			return "🔴 Invalid site."
+		}
+		text := "⚪️ Stopping server..."
+		if derr := site.Stop(); derr.code != 0 {
+			derr.SendOverMatrix()
+			return text + "\n🔴 Failed to stop site!"
+		}
+		return text + "\n🟢 Successfully stopped site."
+	})
+
 	go func() {
 		for range time.Tick(time.Second * 6) {
 			log.Printf("Scanning for queued messages...")

site.go

@@ -2,7 +2,6 @@
 package main
 
 import (
-	"encoding/json"
 	"errors"
 	"fmt"
 	"log"
@@ -12,6 +11,7 @@ import (
 	"syscall"
 
 	"github.com/gogs/git-module"
+	lua "github.com/yuin/gopher-lua"
 )
 
 // Site contains information and methods used for management of a Lapis site.
@@ -20,7 +20,7 @@ type Site struct {
 	config SiteConfig
 }
 
-// SiteConfig contains parsed data from a site's configuration file
+// SiteConfig contains parsed data from a site's configuration file.
 type SiteConfig struct {
 	port int64
 	name string
@@ -42,30 +42,33 @@ func getSite(name string) (Site, bool, error) {
 	}
 }
 
-// getConfig parses a site's configuration file
+// getConfig parses a site's configuration file.
 func (site *Site) getConfig() (bool, error) {
-	path := fmt.Sprintf("%s/%s/deploy_config.json", configuration.sites_dir, site.name)
+	path := fmt.Sprintf("%s/%s/deploy_config.lua", configuration.sites_dir, site.name)
+	// Make sure config file exists
 	if exists, _ := fileExists(path); !exists {
 		return false, nil
 	}
-	file, _ := os.Open(path)
-	var data map[string]interface{}
-	err := json.NewDecoder(file).Decode(&data)
-	if err != nil {
-		log.Panic("Failed to parse config:", err)
-	}
-	file.Close()
+	// Lua state setup
+	L := lua.NewState()
+	defer L.Close()
+
+	L.DoFile(path)     // Load the config
+	table := L.Get(-1) // Get the table returned by the config file
+
 	// Parse the config
 	var config SiteConfig
-	config.name = data["name"].(string)
-	config.port = int64(data["port"].(float64))
+	log.Printf("Loading per-site config %s", path)
+
+	getStringFromTable(L, table, "name", &config.name)
+	getIntFromTable(L, table, "port", &config.port)
 
 	site.config = config
 
 	return true, nil
 }
 
-// getName gets a website's configured name (falls back to technical name if one isn't configured)
+// getName gets a website's configured name (falls back to technical name if one isn't configured).
 func (site *Site) getName() string {
 	if site.config.name == "" {
 		return site.name
@@ -131,6 +134,25 @@ func (site *Site) Start() DeployError {
 	return DeployError{}
 }
 
+// Stop attempts to stop a Lapis server in the given repository.
+func (site *Site) Stop() DeployError {
+	log.Printf("Stopping Lapis server %s...", site.getName())
+
+	old_cwd, _ := os.Getwd()
+	defer syscall.Chdir(old_cwd)
+	syscall.Chdir(configuration.sites_dir + "/" + site.name)
+
+	cmd := exec.Command("lapis", "term")
+	if err := cmd.Start(); err != nil {
+		return newDeployError(1, "stopSite",
+			fmt.Sprintf("Failed to stop Lapis server in '%s'", site.getName()), "")
+	}
+	go func() {
+		cmd.Wait()
+	}()
+	return DeployError{}
+}
+
 // Restart attempts to restart the Lapis server in the given repository.
 func (site *Site) Restart() DeployError {
 	log.Printf("Restarting Lapis server in %s...", site.getName())