Merge pull request #38 from webzard-io/x6guo/multiple-clis

feat(multiple-cli): support multiple clis with BaseUI
webzard-io · Jul 21, 2023 · 9a4bfc5 · 9a4bfc5
2 parents a4be93a + ac81257
commit 9a4bfc5
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 42 deletions.
diff --git a/pkg/ui/flat/events.go b/pkg/ui/flat/events.go
@@ -28,7 +28,7 @@ func (u UI) registerEvents() {
 	u.Arco.Component(pathState.AsComponent())
 
 	u.Runtime.Handle("UpdateSubcommand", func(m *runtime.Message, connId int) error {
-		s := ui.GetOrCreateSession(*u.FormTemplate, connId)
+		s := ui.GetOrCreateSession(0, u.FormTemplates, connId)
 		p := ui.ToStruct[UpdateSubcommandParams[ui.Path]](m.Params)
 
 		form := p.Path.TraverseFormWithCallback(s.Form, func(s string, f *config.Form) {
@@ -42,7 +42,7 @@ func (u UI) registerEvents() {
 	})
 
 	u.Runtime.Handle("UpdateOptionValue", func(m *runtime.Message, connId int) error {
-		s := ui.GetOrCreateSession(*u.FormTemplate, connId)
+		s := ui.GetOrCreateSession(0, u.FormTemplates, connId)
 
 		p := ui.ToStruct[ui.UpdateOptionValueParams](m.Params)
 		form := p.Path.TraverseForm(s.Form)
@@ -58,15 +58,15 @@ func (u UI) registerEvents() {
 	})
 
 	u.Runtime.Handle("Heartbeat", func(m *runtime.Message, connId int) error {
-		s := ui.GetOrCreateSession(*u.FormTemplate, connId)
+		s := ui.GetOrCreateSession(0, u.FormTemplates, connId)
 		s.HeartbeatCh <- struct{}{}
 		return nil
 	})
 
 	u.Runtime.Handle("Run", func(m *runtime.Message, connId int) error {
-		sess := ui.GetOrCreateSession(*u.FormTemplate, connId)
+		sess := ui.GetOrCreateSession(0, u.FormTemplates, connId)
 
-		script, f := u.CLI.Script(*sess.Form)
+		script, f := u.CLIs[0].Script(*sess.Form)
 		formatState.SetState(f, &connId)
 
 		finishedCh, err := sess.Exec.Run(script)
@@ -123,19 +123,19 @@ func (u UI) registerEvents() {
 	})
 
 	u.Runtime.Handle("Stop", func(m *runtime.Message, connId int) error {
-		s := ui.GetOrCreateSession(*u.FormTemplate, connId)
+		s := ui.GetOrCreateSession(0, u.FormTemplates, connId)
 		s.Exec.StopCh <- struct{}{}
 		return nil
 	})
 
 	u.Runtime.Handle("DryRun", func(m *runtime.Message, connId int) error {
-		sess := ui.GetOrCreateSession(*u.FormTemplate, connId)
-		s, _ := u.CLI.Script(*sess.Form)
+		sess := ui.GetOrCreateSession(0, u.FormTemplates, connId)
+		s, _ := u.CLIs[0].Script(*sess.Form)
 		return dryRunState.SetState(s, &connId)
 	})
 
 	u.Runtime.Handle("UpdateCheckedOptions", func(m *runtime.Message, connId int) error {
-		s := ui.GetOrCreateSession(*u.FormTemplate, connId)
+		s := ui.GetOrCreateSession(0, u.FormTemplates, connId)
 		p := ui.ToStruct[ui.UpdateCheckedOptionsParams[[]string]](m.Params)
 		f := p.Path.TraverseForm(s.Form)
 		ui.UpdateCheckedOptions(&f.Flags, p.CheckedValues)
@@ -144,7 +144,7 @@ func (u UI) registerEvents() {
 	})
 
 	u.Runtime.Handle("EstablishedConnection", func(m *runtime.Message, connId int) error {
-		ui.GetOrCreateSession(*u.FormTemplate, connId)
+		ui.GetOrCreateSession(0, u.FormTemplates, connId)
 		return nil
 	})
 }
diff --git a/pkg/ui/flat/page.go b/pkg/ui/flat/page.go
@@ -68,8 +68,8 @@ func (u UI) optionSection() sunmao.BaseComponentBuilder {
 		`).
 		Children(map[string][]sunmao.BaseComponentBuilder{
 			"content": {
-				u.commandStack(Path{}, u.CLI.Command),
-				u.checkbox(Path{}, u.CLI.Command),
+				u.commandStack(Path{}, u.CLIs[0].Command),
+				u.checkbox(Path{}, u.CLIs[0].Command),
 				u.Arco.NewStack(),
 				u.buttons(),
 			},
@@ -440,7 +440,7 @@ func (u UI) outputSection() sunmao.BaseComponentBuilder {
 
 func (u UI) sidebar() sunmao.BaseComponentBuilder {
 	title := u.Arco.NewText().
-		Content(u.CLI.Name).
+		Content(u.CLIs[0].Name).
 		Style("content", `
 		font-size: 1.25rem;
 		font-weight: bold;
@@ -497,7 +497,7 @@ func (u UI) commandMenu() sunmao.BaseComponentBuilder {
 }
 
 func (u UI) menuItems() []ui.TreeNodeProperties {
-	return menuItems(u.CLI.Command, []ui.TreeNodeProperties{})
+	return menuItems(u.CLIs[0].Command, []ui.TreeNodeProperties{})
 }
 
 func menuItems(c config.Command, i []ui.TreeNodeProperties) []ui.TreeNodeProperties {

diff --git a/pkg/ui/naive/events.go b/pkg/ui/naive/events.go
@@ -25,7 +25,7 @@ func (u UI) registerEvents() {
 	u.Arco.Component(formatState.AsComponent())
 
 	u.Runtime.Handle("UpdateSubcommand", func(m *runtime.Message, connId int) error {
-		s := ui.GetOrCreateSession(*u.FormTemplate, connId)
+		s := ui.GetOrCreateSession(0, u.FormTemplates, connId)
 
 		p := ui.ToStruct[UpdateSubcommandParams[int]](m.Params)
 		form := p.Path.TraverseForm(s.Form)
@@ -35,7 +35,7 @@ func (u UI) registerEvents() {
 	})
 
 	u.Runtime.Handle("UpdateOptionValue", func(m *runtime.Message, connId int) error {
-		s := ui.GetOrCreateSession(*u.FormTemplate, connId)
+		s := ui.GetOrCreateSession(0, u.FormTemplates, connId)
 
 		p := ui.ToStruct[ui.UpdateOptionValueParams](m.Params)
 		form := p.Path.TraverseForm(s.Form)
@@ -51,15 +51,15 @@ func (u UI) registerEvents() {
 	})
 
 	u.Runtime.Handle("Heartbeat", func(m *runtime.Message, connId int) error {
-		s := ui.GetOrCreateSession(*u.FormTemplate, connId)
+		s := ui.GetOrCreateSession(0, u.FormTemplates, connId)
 		s.HeartbeatCh <- struct{}{}
 		return nil
 	})
 
 	u.Runtime.Handle("Run", func(m *runtime.Message, connId int) error {
-		sess := ui.GetOrCreateSession(*u.FormTemplate, connId)
+		sess := ui.GetOrCreateSession(0, u.FormTemplates, connId)
 
-		script, f := u.CLI.Script(*sess.Form)
+		script, f := u.CLIs[0].Script(*sess.Form)
 		formatState.SetState(f, &connId)
 
 		finishedCh, err := sess.Exec.Run(script)
@@ -116,24 +116,24 @@ func (u UI) registerEvents() {
 	})
 
 	u.Runtime.Handle("Stop", func(m *runtime.Message, connId int) error {
-		s := ui.GetOrCreateSession(*u.FormTemplate, connId)
+		s := ui.GetOrCreateSession(0, u.FormTemplates, connId)
 		s.Exec.StopCh <- struct{}{}
 		return nil
 	})
 
 	u.Runtime.Handle("EstablishedConnection", func(m *runtime.Message, connId int) error {
-		ui.GetOrCreateSession(*u.FormTemplate, connId)
+		ui.GetOrCreateSession(0, u.FormTemplates, connId)
 		return nil
 	})
 
 	u.Runtime.Handle("DryRun", func(m *runtime.Message, connId int) error {
-		sess := ui.GetOrCreateSession(*u.FormTemplate, connId)
-		s, _ := u.CLI.Script(*sess.Form)
+		sess := ui.GetOrCreateSession(0, u.FormTemplates, connId)
+		s, _ := u.CLIs[0].Script(*sess.Form)
 		return dryRunState.SetState(s, &connId)
 	})
 
 	u.Runtime.Handle("UpdateCheckedOptions", func(m *runtime.Message, connId int) error {
-		s := ui.GetOrCreateSession(*u.FormTemplate, connId)
+		s := ui.GetOrCreateSession(0, u.FormTemplates, connId)
 		p := ui.ToStruct[ui.UpdateCheckedOptionsParams[[]string]](m.Params)
 		f := p.Path.TraverseForm(s.Form)
 		ui.UpdateCheckedOptions(&f.Flags, p.CheckedValues)

diff --git a/pkg/ui/naive/page.go b/pkg/ui/naive/page.go
@@ -44,7 +44,7 @@ func (u UI) layout() sunmao.BaseComponentBuilder {
 		Children(map[string][]sunmao.BaseComponentBuilder{
 			"header": u.headerElements(),
 			"content": {
-				u.commandStack(p, u.CLI.Command),
+				u.commandStack(p, u.CLIs[0].Command),
 				u.runButton(),
 				u.dryRunButton(),
 				u.terminal(),
@@ -265,7 +265,7 @@ func (u UI) subcommandsTab(p Path, c config.Command) sunmao.BaseComponentBuilder
 		values = append(values, c.Name)
 	}
 
-	form := p.TraverseForm(u.FormTemplate)
+	form := p.TraverseForm(u.FormTemplates[0])
 	form.Choice = values[0]
 
 	activeTab := fmt.Sprintf("{{ %s.activeTab }}", p.subcommandTabsId())
@@ -415,7 +415,7 @@ func (u UI) optionInput(p Path, o config.Option) sunmao.BaseComponentBuilder {
 
 func (u UI) headerElements() []sunmao.BaseComponentBuilder {
 	title := u.Arco.NewText().
-		Content(u.CLI.Name).Style("content",
+		Content(u.CLIs[0].Name).Style("content",
 		`
 		font-size: 1.25rem;
 		font-weight: bold;
@@ -447,7 +447,7 @@ func (u UI) helpModal() sunmao.BaseComponentBuilder {
 		overflow: scroll;
 		`).
 		Content(ui.TextDisplayProperties{
-			Text:   u.CLI.Help,
+			Text:   u.CLIs[0].Help,
 			Format: "code",
 		})
 

diff --git a/pkg/ui/session.go b/pkg/ui/session.go
@@ -11,21 +11,29 @@ type session struct {
 	Form        *config.Form
 	Exec        *executor.Executor
 	HeartbeatCh chan struct{}
+	cliIndex    int
 }
 
-func GetOrCreateSession(template config.Form, connId int) *session {
+func GetOrCreateSession(cliIndex int, templates []*config.Form, connId int) *session {
 	s, ok := sessions[connId]
 	if !ok {
-		f := template.Clone()
+		f := templates[cliIndex].Clone()
 		hbCh := make(chan struct{})
 		exec := executor.NewExecutor()
 
 		s = &session{
 			Form:        f,
 			Exec:        &exec,
 			HeartbeatCh: hbCh,
+			cliIndex:    cliIndex,
 		}
 		sessions[connId] = s
 	}
+
+	if cliIndex != s.cliIndex {
+		s.Form = templates[cliIndex].Clone()
+		s.cliIndex = cliIndex
+	}
+
 	return s
 }
diff --git a/pkg/ui/ui.go b/pkg/ui/ui.go
@@ -14,7 +14,7 @@ type UI interface {
 	Run() error
 }
 
-func NewUI(c config.CLI) (*BaseUI, error) {
+func NewUI(c ...config.CLI) (*BaseUI, error) {
 	if client.Error != nil {
 		return nil, errors.New("failed to load prebuilt UI")
 	}
@@ -23,23 +23,29 @@ func NewUI(c config.CLI) (*BaseUI, error) {
 	app := sunmao.NewApp()
 	arco := arco.NewArcoApp(app)
 	c2u := NewCLI2UIApp(app)
-	fTpl := c.Form()
+
+	tpls := []*config.Form{}
+
+	for _, cli := range c {
+		f := cli.Form()
+		tpls = append(tpls, &f)
+	}
 
 	return &BaseUI{
-		Runtime:      r,
-		Arco:         arco,
-		C2U:          c2u,
-		CLI:          &c,
-		FormTemplate: &fTpl,
+		Runtime:       r,
+		Arco:          arco,
+		C2U:           c2u,
+		CLIs:          c,
+		FormTemplates: tpls,
 	}, nil
 }
 
 type BaseUI struct {
-	Runtime      *runtime.Runtime
-	Arco         *arco.ArcoAppBuilder
-	C2U          *CLI2UIAppBuilder
-	CLI          *config.CLI
-	FormTemplate *config.Form
+	Runtime       *runtime.Runtime
+	Arco          *arco.ArcoAppBuilder
+	C2U           *CLI2UIAppBuilder
+	CLIs          []config.CLI
+	FormTemplates []*config.Form
 }
 
 func (BaseUI) Run() error {