feat(sess): made goroutines die with connection optional

webzard-io · Aug 23, 2023 · 764b920 · 764b920
1 parent e02e4d7
commit 764b920
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 2 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -6,14 +6,24 @@ import (
 	"CLI2UI/pkg/ui/flat"
 	"CLI2UI/pkg/ui/naive"
 	"encoding/json"
+	"fmt"
 	"log"
 	"os"
+	"runtime"
+	"time"
 
 	"github.com/invopop/jsonschema"
 	"github.com/urfave/cli/v2"
 )
 
 func main() {
+	go func() {
+		for {
+			fmt.Printf("Number of goroutines: %d\n", runtime.NumGoroutine())
+			time.Sleep(1 * time.Second)
+		}
+	}()
+
 	app := &cli.App{
 		Name:  "CLI2UI",
 		Usage: "Usage: cli2ui <config>",

diff --git a/pkg/ui/events.go b/pkg/ui/events.go
@@ -51,3 +51,7 @@ type UpdateCheckedOptionsParams[T []string | string] struct {
 	Path          Path
 	CheckedValues T
 }
+
+type RunParams struct {
+	DieWithConn any
+}
diff --git a/pkg/ui/flat/events.go b/pkg/ui/flat/events.go
@@ -65,6 +65,7 @@ func (u UI) registerEvents() {
 
 	u.Runtime.Handle("Run", func(m *runtime.Message, connId int) error {
 		sess := ui.GetOrCreateSession(0, u.FormTemplates, connId)
+		p := ui.ToStruct[ui.RunParams](m.Params)
 
 		script, f := u.CLIs[0].Script(*sess.Form)
 		formatState.SetState(f, &connId)
@@ -97,6 +98,10 @@ func (u UI) registerEvents() {
 		sess.Exec.StateCh <- struct{}{}
 
 		go func() {
+			if !p.DieWithConn.(bool) {
+				return
+			}
+
 			for sess.Exec.State.IsRunning {
 				// TODO(xinxi.guo): this can be extended to send more useful messages
 				err := u.Runtime.Ping(&connId, "Ping")

diff --git a/pkg/ui/flat/page.go b/pkg/ui/flat/page.go
@@ -111,6 +111,9 @@ func (u UI) runButton() sunmao.BaseComponentBuilder {
 				ComponentId: "$utils",
 				Method: sunmao.EventMethod{
 					Name: "binding/v1/Run",
+					Parameters: ui.RunParams{
+						DieWithConn: "{{ dieWithConnCheckbox.isCheckAll }}",
+					},
 				},
 			},
 		}).
@@ -192,7 +195,21 @@ func (u UI) checkbox(c config.Command) sunmao.BaseComponentBuilder {
 			min-width: 8rem;
 			`).
 		Children(map[string][]sunmao.BaseComponentBuilder{
-			"content": {u.checkboxStack(Path{}, c)},
+			"content": {
+				u.Arco.NewCheckbox().
+					Id("dieWithConnCheckbox").
+					Properties(ui.StructToMap(ui.CheckboxProperties[string]{
+						Options: []ui.CheckboxOptionProperties{
+							{
+								Label:    "Die with Connection",
+								Value:    "dieWithConn",
+								Disabled: false,
+							},
+						},
+						DefaultCheckedValues: []string{"dieWithConn"},
+					})),
+				u.checkboxStack(Path{}, c),
+			},
 		})
 
 	return container

diff --git a/pkg/ui/naive/events.go b/pkg/ui/naive/events.go
@@ -58,6 +58,7 @@ func (u UI) registerEvents() {
 
 	u.Runtime.Handle("Run", func(m *runtime.Message, connId int) error {
 		sess := ui.GetOrCreateSession(0, u.FormTemplates, connId)
+		p := ui.ToStruct[ui.RunParams](m.Params)
 
 		script, f := u.CLIs[0].Script(*sess.Form)
 		formatState.SetState(f, &connId)
@@ -90,6 +91,10 @@ func (u UI) registerEvents() {
 		sess.Exec.StateCh <- struct{}{}
 
 		go func() {
+			if !p.DieWithConn.(bool) {
+				return
+			}
+
 			for sess.Exec.State.IsRunning {
 				// TODO(xinxi.guo): this can be extended to send more useful messages
 				err := u.Runtime.Ping(&connId, "Ping")

diff --git a/pkg/ui/naive/page.go b/pkg/ui/naive/page.go
@@ -215,6 +215,9 @@ func (u UI) runButton() sunmao.BaseComponentBuilder {
 				ComponentId: "$utils",
 				Method: sunmao.EventMethod{
 					Name: "binding/v1/Run",
+					Parameters: ui.RunParams{
+						DieWithConn: "{{ dieWithConnCheckbox.isCheckAll }}",
+					},
 				},
 			},
 		})
@@ -437,7 +440,20 @@ func (u UI) headerElements() []sunmao.BaseComponentBuilder {
 			},
 		})
 
-	return []sunmao.BaseComponentBuilder{title, help}
+	cb := u.Arco.NewCheckbox().
+		Id("dieWithConnCheckbox").
+		Properties(ui.StructToMap(ui.CheckboxProperties[string]{
+			Options: []ui.CheckboxOptionProperties{
+				{
+					Label:    "Die with Connection",
+					Value:    "dieWithConn",
+					Disabled: false,
+				},
+			},
+			DefaultCheckedValues: []string{"dieWithConn"},
+		}))
+
+	return []sunmao.BaseComponentBuilder{title, help, cb}
 }
 
 func (u UI) helpModal() sunmao.BaseComponentBuilder {