add ability to register services for multiple domains

pomdtr · pomdtr · commit 624daada6213 · 2024-12-12T16:56:16.000+01:00
diff --git a/cmd/embed/smallweb.plist b/cmd/embed/smallweb.plist
diff --git a/cmd/root.go b/cmd/root.go
@@ -61,21 +61,27 @@ func NewCmdRoot(changelog string) *cobra.Command {
 		Use:     "smallweb",
 		Short:   "Host websites from your internet folder",
 		Version: build.Version,
-		PersistentPreRun: func(cmd *cobra.Command, args []string) {
+		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
 			flagProvider := posflag.Provider(cmd.Root().PersistentFlags(), ".", k)
 			_ = k.Load(flagProvider, nil)
 
 			configPath := filepath.Join(k.String("dir"), ".smallweb", "config.json")
 			fileProvider := file.Provider(configPath)
 			_ = k.Load(fileProvider, utils.ConfigParser())
 
+			if k.String("domain") == "" {
+				return fmt.Errorf("domain is required")
+			}
+
 			_ = fileProvider.Watch(func(event interface{}, err error) {
 				k = koanf.New(".")
 				_ = k.Load(defaultProvider, nil)
 				_ = k.Load(envProvider, nil)
 				_ = k.Load(posflag.Provider(cmd.PersistentFlags(), ".", k), nil)
 				_ = k.Load(fileProvider, utils.ConfigParser())
 			})
+
+			return nil
 		},
 		ValidArgsFunction: completePlugins,
 		Args:              cobra.MinimumNArgs(1),
diff --git a/cmd/service.go b/cmd/service.go
@@ -2,10 +2,19 @@ package cmd
 
 import (
 	_ "embed"
+	"slices"
+	"strings"
 
 	"github.com/spf13/cobra"
 )
 
+func getServiceName(domain string) string {
+	parts := strings.Split(domain, ".")
+	slices.Reverse(parts)
+	parts = append(parts, "server")
+	return strings.Join(parts, ".")
+}
+
 func NewCmdService() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "service",
diff --git a/cmd/service_darwin.go b/cmd/service_darwin.go
@@ -9,17 +9,26 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"slices"
+	"strings"
 	"text/template"
 
 	"github.com/pomdtr/smallweb/utils"
 )
 
-//go:embed embed/com.pomdtr.smallweb.plist
+//go:embed embed/smallweb.plist
 var serviceConfigBytes []byte
 var serviceConfig = template.Must(template.New("service").Parse(string(serviceConfigBytes)))
-var servicePath = filepath.Join(os.Getenv("HOME"), "Library", "LaunchAgents", "com.pomdtr.smallweb.plist")
+
+func getServicePath(domain string) string {
+	parts := strings.Split(domain, ".")
+	slices.Reverse(parts)
+
+	return filepath.Join(os.Getenv("HOME"), "Library", "LaunchAgents", getServiceName(domain)+".plist")
+}
 
 func InstallService(args []string) error {
+	servicePath := getServicePath(k.String("domain"))
 	if utils.FileExists(servicePath) {
 		return fmt.Errorf("service already installed")
 	}
@@ -56,23 +65,25 @@ func InstallService(args []string) error {
 }
 
 func StartService() error {
+	servicePath := getServicePath(k.String("domain"))
 	if !utils.FileExists(servicePath) {
 		return fmt.Errorf("service not installed")
 	}
 
-	if err := exec.Command("launchctl", "start", "com.pomdtr.smallweb").Run(); err != nil {
+	if err := exec.Command("launchctl", "start", getServiceName(k.String("domain"))).Run(); err != nil {
 		return fmt.Errorf("failed to start service: %v", err)
 	}
 
 	return nil
 }
 
 func StopService() error {
+	servicePath := getServicePath(k.String("domain"))
 	if !utils.FileExists(servicePath) {
 		return fmt.Errorf("service not installed")
 	}
 
-	if err := exec.Command("launchctl", "stop", "com.pomdtr.smallweb").Run(); err != nil {
+	if err := exec.Command("launchctl", "stop", getServiceName(k.String("domain"))).Run(); err != nil {
 		return fmt.Errorf("failed to stop service: %v", err)
 	}
 
@@ -84,6 +95,7 @@ func RestartService() error {
 }
 
 func UninstallService() error {
+	servicePath := getServicePath(k.String("domain"))
 	if !utils.FileExists(servicePath) {
 		return fmt.Errorf("service not installed")
 	}
@@ -101,6 +113,7 @@ func UninstallService() error {
 }
 
 func PrintServiceLogs(follow bool) error {
+	servicePath := getServicePath(k.String("domain"))
 	if !utils.FileExists(servicePath) {
 		return fmt.Errorf("service not installed")
 	}
@@ -135,7 +148,7 @@ func PrintServiceLogs(follow bool) error {
 }
 
 func ViewServiceStatus() error {
-	cmd := exec.Command("launchctl", "list", "com.pomdtr.smallweb")
+	cmd := exec.Command("launchctl", "list", getServiceName(k.String("domain")))
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	if err := cmd.Run(); err != nil {
diff --git a/cmd/service_linux.go b/cmd/service_linux.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"path"
 	"path/filepath"
 	"strings"
 	"text/template"
@@ -17,9 +18,13 @@ import (
 //go:embed embed/smallweb.service
 var serviceConfigBytes []byte
 var serviceConfig = template.Must(template.New("service").Parse(string(serviceConfigBytes)))
-var servicePath = filepath.Join(os.Getenv("HOME"), ".config", "systemd", "user", "smallweb.service")
+
+func getServicePath(domain string) string {
+	return path.Join(os.Getenv("HOME"), ".config", "systemd", "user", getServiceName(domain)+".service")
+}
 
 func InstallService(args []string) error {
+	servicePath := getServicePath(k.String("domain"))
 	if utils.FileExists(servicePath) {
 		return fmt.Errorf("service already installed")
 	}
@@ -66,6 +71,7 @@ func InstallService(args []string) error {
 }
 
 func StartService() error {
+	servicePath := getServicePath(k.String("domain"))
 	if !utils.FileExists(servicePath) {
 		return fmt.Errorf("service not installed")
 	}
@@ -78,6 +84,7 @@ func StartService() error {
 }
 
 func StopService() error {
+	servicePath := getServicePath(k.String("domain"))
 	if !utils.FileExists(servicePath) {
 		return fmt.Errorf("service not installed")
 	}
@@ -90,6 +97,7 @@ func StopService() error {
 }
 
 func RestartService() error {
+	servicePath := getServicePath(k.String("domain"))
 	if !utils.FileExists(servicePath) {
 		return fmt.Errorf("service not installed")
 	}
@@ -102,6 +110,7 @@ func RestartService() error {
 }
 
 func UninstallService() error {
+	servicePath := getServicePath(k.String("domain"))
 	if !utils.FileExists(servicePath) {
 		return fmt.Errorf("service not installed")
 	}
@@ -129,6 +138,7 @@ func UninstallService() error {
 }
 
 func PrintServiceLogs(follow bool) error {
+	servicePath := getServicePath(k.String("domain"))
 	if !utils.FileExists(servicePath) {
 		return fmt.Errorf("service not installed")
 	}

Original file line number	Diff line number	Diff line change
`@@ -9,17 +9,26 @@ import (`
`9`	`9`	`"os"`
`10`	`10`	`"os/exec"`
`11`	`11`	`"path/filepath"`
	`12`	`+ "slices"`
	`13`	`+ "strings"`
`12`	`14`	`"text/template"`
`13`	`15`
`14`	`16`	`"github.com/pomdtr/smallweb/utils"`
`15`	`17`	`)`
`16`	`18`
`17`		`-//go:embed embed/com.pomdtr.smallweb.plist`
	`19`	`+//go:embed embed/smallweb.plist`
`18`	`20`	`var serviceConfigBytes []byte`
`19`	`21`	`var serviceConfig = template.Must(template.New("service").Parse(string(serviceConfigBytes)))`
`20`		`-var servicePath = filepath.Join(os.Getenv("HOME"), "Library", "LaunchAgents", "com.pomdtr.smallweb.plist")`
	`22`	`+`
	`23`	`+func getServicePath(domain string) string {`
	`24`	`+ parts := strings.Split(domain, ".")`
	`25`	`+ slices.Reverse(parts)`
	`26`	`+`
	`27`	`+ return filepath.Join(os.Getenv("HOME"), "Library", "LaunchAgents", getServiceName(domain)+".plist")`
	`28`	`+}`
`21`	`29`
`22`	`30`	`func InstallService(args []string) error {`
	`31`	`+ servicePath := getServicePath(k.String("domain"))`
`23`	`32`	`if utils.FileExists(servicePath) {`
`24`	`33`	`return fmt.Errorf("service already installed")`
`25`	`34`	`}`
`@@ -56,23 +65,25 @@ func InstallService(args []string) error {`
`56`	`65`	`}`
`57`	`66`
`58`	`67`	`func StartService() error {`
	`68`	`+ servicePath := getServicePath(k.String("domain"))`
`59`	`69`	`if !utils.FileExists(servicePath) {`
`60`	`70`	`return fmt.Errorf("service not installed")`
`61`	`71`	`}`
`62`	`72`
`63`		`- if err := exec.Command("launchctl", "start", "com.pomdtr.smallweb").Run(); err != nil {`
	`73`	`+ if err := exec.Command("launchctl", "start", getServiceName(k.String("domain"))).Run(); err != nil {`
`64`	`74`	`return fmt.Errorf("failed to start service: %v", err)`
`65`	`75`	`}`
`66`	`76`
`67`	`77`	`return nil`
`68`	`78`	`}`
`69`	`79`
`70`	`80`	`func StopService() error {`
	`81`	`+ servicePath := getServicePath(k.String("domain"))`
`71`	`82`	`if !utils.FileExists(servicePath) {`
`72`	`83`	`return fmt.Errorf("service not installed")`
`73`	`84`	`}`
`74`	`85`
`75`		`- if err := exec.Command("launchctl", "stop", "com.pomdtr.smallweb").Run(); err != nil {`
	`86`	`+ if err := exec.Command("launchctl", "stop", getServiceName(k.String("domain"))).Run(); err != nil {`
`76`	`87`	`return fmt.Errorf("failed to stop service: %v", err)`
`77`	`88`	`}`
`78`	`89`
`@@ -84,6 +95,7 @@ func RestartService() error {`
`84`	`95`	`}`
`85`	`96`
`86`	`97`	`func UninstallService() error {`
	`98`	`+ servicePath := getServicePath(k.String("domain"))`
`87`	`99`	`if !utils.FileExists(servicePath) {`
`88`	`100`	`return fmt.Errorf("service not installed")`
`89`	`101`	`}`
`@@ -101,6 +113,7 @@ func UninstallService() error {`
`101`	`113`	`}`
`102`	`114`
`103`	`115`	`func PrintServiceLogs(follow bool) error {`
	`116`	`+ servicePath := getServicePath(k.String("domain"))`
`104`	`117`	`if !utils.FileExists(servicePath) {`
`105`	`118`	`return fmt.Errorf("service not installed")`
`106`	`119`	`}`
`@@ -135,7 +148,7 @@ func PrintServiceLogs(follow bool) error {`
`135`	`148`	`}`
`136`	`149`
`137`	`150`	`func ViewServiceStatus() error {`
`138`		`- cmd := exec.Command("launchctl", "list", "com.pomdtr.smallweb")`
	`151`	`+ cmd := exec.Command("launchctl", "list", getServiceName(k.String("domain")))`
`139`	`152`	`cmd.Stdout = os.Stdout`
`140`	`153`	`cmd.Stderr = os.Stderr`
`141`	`154`	`if err := cmd.Run(); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import (`
`7`	`7`	`"fmt"`
`8`	`8`	`"os"`
`9`	`9`	`"os/exec"`
	`10`	`+ "path"`
`10`	`11`	`"path/filepath"`
`11`	`12`	`"strings"`
`12`	`13`	`"text/template"`
`@@ -17,9 +18,13 @@ import (`
`17`	`18`	`//go:embed embed/smallweb.service`
`18`	`19`	`var serviceConfigBytes []byte`
`19`	`20`	`var serviceConfig = template.Must(template.New("service").Parse(string(serviceConfigBytes)))`
`20`		`-var servicePath = filepath.Join(os.Getenv("HOME"), ".config", "systemd", "user", "smallweb.service")`
	`21`	`+`
	`22`	`+func getServicePath(domain string) string {`
	`23`	`+ return path.Join(os.Getenv("HOME"), ".config", "systemd", "user", getServiceName(domain)+".service")`
	`24`	`+}`
`21`	`25`
`22`	`26`	`func InstallService(args []string) error {`
	`27`	`+ servicePath := getServicePath(k.String("domain"))`
`23`	`28`	`if utils.FileExists(servicePath) {`
`24`	`29`	`return fmt.Errorf("service already installed")`
`25`	`30`	`}`
`@@ -66,6 +71,7 @@ func InstallService(args []string) error {`
`66`	`71`	`}`
`67`	`72`
`68`	`73`	`func StartService() error {`
	`74`	`+ servicePath := getServicePath(k.String("domain"))`
`69`	`75`	`if !utils.FileExists(servicePath) {`
`70`	`76`	`return fmt.Errorf("service not installed")`
`71`	`77`	`}`
`@@ -78,6 +84,7 @@ func StartService() error {`
`78`	`84`	`}`
`79`	`85`
`80`	`86`	`func StopService() error {`
	`87`	`+ servicePath := getServicePath(k.String("domain"))`
`81`	`88`	`if !utils.FileExists(servicePath) {`
`82`	`89`	`return fmt.Errorf("service not installed")`
`83`	`90`	`}`
`@@ -90,6 +97,7 @@ func StopService() error {`
`90`	`97`	`}`
`91`	`98`
`92`	`99`	`func RestartService() error {`
	`100`	`+ servicePath := getServicePath(k.String("domain"))`
`93`	`101`	`if !utils.FileExists(servicePath) {`
`94`	`102`	`return fmt.Errorf("service not installed")`
`95`	`103`	`}`
`@@ -102,6 +110,7 @@ func RestartService() error {`
`102`	`110`	`}`
`103`	`111`
`104`	`112`	`func UninstallService() error {`
	`113`	`+ servicePath := getServicePath(k.String("domain"))`
`105`	`114`	`if !utils.FileExists(servicePath) {`
`106`	`115`	`return fmt.Errorf("service not installed")`
`107`	`116`	`}`
`@@ -129,6 +138,7 @@ func UninstallService() error {`
`129`	`138`	`}`
`130`	`139`
`131`	`140`	`func PrintServiceLogs(follow bool) error {`
	`141`	`+ servicePath := getServicePath(k.String("domain"))`
`132`	`142`	`if !utils.FileExists(servicePath) {`
`133`	`143`	`return fmt.Errorf("service not installed")`
`134`	`144`	`}`