tmp

configui.go

@@ -8,6 +8,7 @@ import (
 	"html/template"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"sync"
 	"time"
@@ -17,8 +18,9 @@ import (
 	"kumoly.io/tools/configui/public"
 )
 
-var UNIX_SHELL = "/usr/bin/sh"
-var WIN_SHELL = "C:\\Windows\\System32\\cmd"
+const UNIX_SHELL = "/usr/bin/sh"
+const WIN_SHELL = "C:\\Windows\\System32\\cmd"
+const DARWIN_SHELL = "/bin/bash"
 
 const version = "v0.1.12"
 
@@ -55,6 +57,7 @@ type ConfigUI struct {
 	Prod       bool   `json:"production"`
 	BaseUrl    string `json:"base_url"`
 	ConfigPath string `json:"config_path"`
+	SHELL      string `json:"shell"`
 
 	NoReconfig bool   `json:"no_reconfig"`
 	AllowIP    string `json:"allow_ip"`
@@ -74,8 +77,8 @@ type ConfigUI struct {
 	LogLevel klog.Llevel `json:"log_level"`
 
 	// Running commands
-	Onitachi []*Oni `json:"-"`
-	OniIndex map[string]int
+	Onitachi []*Oni         `json:"onitachi"`
+	oniIndex map[string]int `json:"-"`
 
 	TmplFS     embed.FS `json:"-"`
 	tmpl       *engine.Engine
@@ -123,8 +126,18 @@ func New() *ConfigUI {
 			}
 		},
 	}).ParseFS(tmplFS, "templates/*.tmpl", "templates/**/*.tmpl"))
+	sh := ""
+	switch runtime.GOOS {
+	case "darwin":
+		sh = DARWIN_SHELL
+	case "windows":
+		sh = WIN_SHELL
+	default:
+		sh = UNIX_SHELL
+	}
 	return &ConfigUI{
 		fileIndex:  map[string]int{},
+		SHELL:      sh,
 		Prod:       true,
 		AppName:    "ConfigUI",
 		BaseUrl:    "/",
@@ -136,7 +149,7 @@ func New() *ConfigUI {
 		cmdTimeout: time.Second * 10,
 		LogLevel:   klog.Lerror | klog.Linfo,
 		log:        klog.Sub("ConfigUI"),
-		OniIndex:   make(map[string]int),
+		oniIndex:   make(map[string]int),
 	}
 }
 
@@ -179,6 +192,28 @@ func (cui *ConfigUI) LoadConfig(confstr string) error {
 		}
 	}
 
+	// construct oni
+	for _, o := range tmpConf.Onitachi {
+		if o.Cmd == "" {
+			continue
+		}
+		if o.Name == "" {
+			o.Name = o.Cmd
+		}
+		// update if exist
+		j, ok := cui.oniIndex[o.Name]
+		if ok {
+			cui.Onitachi[j].Cmd = o.Cmd
+			cui.Onitachi[j].Args = o.Args
+			cui.Onitachi[j].Envs = o.Envs
+			cui.Onitachi[j].Dir = o.Dir
+			cui.Onitachi[j].Policy = o.Policy
+		} else {
+			cui.oniIndex[o.Name] = len(cui.Onitachi)
+			cui.Onitachi = append(cui.Onitachi, o)
+		}
+	}
+
 	// copy
 	cui.configLock.Lock()
 	defer cui.configLock.Unlock()
@@ -191,6 +226,7 @@ func (cui *ConfigUI) LoadConfig(confstr string) error {
 	cui.HideConfig = tmpConf.HideConfig
 	cui.NoReconfig = tmpConf.NoReconfig
 	cui.ResultBellow = tmpConf.ResultBellow
+	cui.SHELL = tmpConf.SHELL
 
 	cui.Actions = tmpConf.Actions
 	for i := range cui.Actions {

file.go

@@ -80,9 +80,9 @@ func (f *File) Do(CmdTimeout time.Duration, report chan int) (string, error) {
 	// prepare cmd
 	cmd := &exec.Cmd{}
 	if runtime.GOOS == "windows" {
-		cmd = exec.Command(WIN_SHELL, "/c", f.Cmd)
+		cmd = exec.Command(f.owner.SHELL, "/c", f.Cmd)
 	} else {
-		cmd = exec.Command(UNIX_SHELL, "-c", f.Cmd)
+		cmd = exec.Command(f.owner.SHELL, "-c", f.Cmd)
 	}
 	f.owner.log.Info("DO: ", f.Cmd)
 	done := make(chan string, 1)

go.mod

@@ -10,4 +10,5 @@ require (
 require (
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	golang.org/x/sys v0.0.0-20211103235746-7861aae1554b // indirect
+	kumoly.io/lib/stat v0.0.1 // indirect
 )

go.sum

@@ -10,3 +10,5 @@ kumoly.io/lib/ksrv v0.0.1 h1:JfWwJ9GeiTtDfGoeG7YxJwsckralbhsLKEPLQb20Uzo=
 kumoly.io/lib/ksrv v0.0.1/go.mod h1:ykHXeAPjNvA5jEZo5rp32edzkugLf0e+2pspct3FOFQ=
 kumoly.io/lib/ksrv v0.0.2-0.20211112060911-0d61b343a298 h1:0raqoIXmNpD6s1SrJbieAyIIkDyhe+aqfaXvx8wenrI=
 kumoly.io/lib/ksrv v0.0.2-0.20211112060911-0d61b343a298/go.mod h1:pwd+NspxnoxPJAETRY2V4i2qZc+orKLxvWzGUBiqBW8=
+kumoly.io/lib/stat v0.0.1 h1:Ck596El7Ixk7GZyzQq/86F1YCl7iYffHmzEdFx1sSRM=
+kumoly.io/lib/stat v0.0.1/go.mod h1:zqMV9q4TC94VGbpDn/mGBTwRNWBVWlVg1taLlCBAWc8=

handler.go

@@ -196,8 +196,8 @@ func (cui *ConfigUI) Download(w http.ResponseWriter, r *http.Request) {
 				panic(err)
 			}
 			w.Header().Set(
-				"Content-Disposition", `
-				attachment; filename="`+cui.AppName+`.json"`,
+				"Content-Disposition",
+				`attachment; filename="`+cui.AppName+`.json"`,
 			)
 			w.Write(data)
 			return
@@ -260,13 +260,23 @@ func (cui *ConfigUI) GetConfig(w http.ResponseWriter, r *http.Request) {
 	w.Write(data)
 }
 
-func (cui *ConfigUI) GetRunning(w http.ResponseWriter, r *http.Request) {
+func (cui *ConfigUI) GetOni(w http.ResponseWriter, r *http.Request) {
+	name := r.URL.Query().Get("name")
+	if name == "" {
 		ksrv.JSON(w, cui.Onitachi)
+		return
+	}
+	i, ok := cui.oniIndex[name]
+	if !ok {
+		panic(ErrorOniNotFound.New(name))
+	}
+	oni := cui.Onitachi[i]
+	ksrv.JSON(w, oni)
 }
 
 func (cui *ConfigUI) OniStart(w http.ResponseWriter, r *http.Request) {
 	name := r.URL.Query().Get("name")
-	i, ok := cui.OniIndex[name]
+	i, ok := cui.oniIndex[name]
 	if !ok {
 		panic(ErrorOniNotFound.New(name))
 	}
@@ -277,13 +287,16 @@ func (cui *ConfigUI) OniStart(w http.ResponseWriter, r *http.Request) {
 	case STARTED:
 		panic(ErrorOniHasStarted)
 	}
-	oni.Start()
+	err := oni.Start()
+	if err != nil {
+		panic(err)
+	}
 	w.Write([]byte("ok"))
 }
 
 func (cui *ConfigUI) OniStop(w http.ResponseWriter, r *http.Request) {
 	name := r.URL.Query().Get("name")
-	i, ok := cui.OniIndex[name]
+	i, ok := cui.oniIndex[name]
 	if !ok {
 		panic(ErrorOniNotFound.New(name))
 	}

package.json

@@ -17,10 +17,6 @@
   "dependencies": {
     "@creativebulma/bulma-tooltip": "^1.2.0",
     "bulma": "^0.9.3",
-    "prismjs": "^1.25.0",
     "sass": "^1.43.2"
-  },
-  "devDependencies": {
-    "parcel": "^2.0.0"
   }
 }

server.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	"kumoly.io/lib/ksrv"
+	"kumoly.io/lib/stat"
 )
 
 func (cui *ConfigUI) ServeHTTP(w http.ResponseWriter, r *http.Request) {
@@ -98,9 +99,30 @@ func (cui *ConfigUI) mux() *http.ServeMux {
 			w.WriteHeader(404)
 		}
 	})
-	cuiR.HandleFunc("/api/running", func(w http.ResponseWriter, r *http.Request) {
+	cuiR.HandleFunc("/api/profile", func(w http.ResponseWriter, r *http.Request) {
 		if r.Method == "GET" {
-			cui.GetRunning(w, r)
+			ksrv.JSON(w, stat.GetProfile())
+		} else {
+			w.WriteHeader(404)
+		}
+	})
+	cuiR.HandleFunc("/api/oni", func(w http.ResponseWriter, r *http.Request) {
+		if r.Method == "GET" {
+			cui.GetOni(w, r)
+		} else {
+			w.WriteHeader(404)
+		}
+	})
+	cuiR.HandleFunc("/api/oni/start", func(w http.ResponseWriter, r *http.Request) {
+		if r.Method == "POST" {
+			cui.OniStart(w, r)
+		} else {
+			w.WriteHeader(404)
+		}
+	})
+	cuiR.HandleFunc("/api/oni/stop", func(w http.ResponseWriter, r *http.Request) {
+		if r.Method == "POST" {
+			cui.OniStart(w, r)
 		} else {
 			w.WriteHeader(404)
 		}

templates/components/menu.tmpl

@@ -14,7 +14,7 @@
       </li>
       {{ end }}
     </ul>
-    <!-- {{if .Actions}}
+    {{/* {{if .Actions}}
     <p class="menu-label">
       Actions
     </p>
@@ -31,7 +31,7 @@
       </li>
       {{- end -}}
     </ul>
-    {{end}} -->
+    {{end}} */}}
     {{if not .HideConfig}}
     <p class="menu-label">
       System