Merge branch 'main' of https://github.com/devlup-labs/spok

go.mod

@@ -15,6 +15,7 @@ require (
 	github.com/zitadel/oidc/v2 v2.11.0
 	golang.org/x/crypto v0.21.0
 	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225
+	golang.org/x/sys v0.22.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
@@ -37,7 +38,6 @@ require (
 	github.com/segmentio/asm v1.2.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	golang.org/x/oauth2 v0.13.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/protobuf v1.33.0 // indirect

go.sum

@@ -108,8 +108,8 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
+golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=

internal/pkg/selector/selector.go → internal/pkg/selector/selector_unix.go

@@ -1,3 +1,6 @@
+//go:build !windows
+// +build !windows
+
 package selector
 
 import (
@@ -81,7 +84,9 @@ func (m *Menu) Display() string {
 			return ""
 		} else if keyCode == enter {
 			menuItem := m.MenuItems[m.CursorPos]
+
 			fmt.Println("\r")
+
 			return menuItem.ID
 		} else if keyCode == up {
 			m.CursorPos = (m.CursorPos + len(m.MenuItems) - 1) % len(m.MenuItems)
@@ -109,9 +114,8 @@ func getInput() byte {
 		log.Fatal(err)
 	}
 
-	var read int
 	readBytes := make([]byte, 3)
-	read, err = t.Read(readBytes)
+	read, err := t.Read(readBytes)
 
 	t.Restore()
 	t.Close()

internal/pkg/selector/selector_windows.go

@@ -0,0 +1,153 @@
+//go:build windows
+// +build windows
+
+package selector
+
+import (
+	"fmt"
+	"log"
+	"os"
+
+	"github.com/buger/goterm"
+	"golang.org/x/sys/windows"
+)
+
+type Menu struct {
+	Prompt    string
+	CursorPos int
+	MenuItems []*MenuItem
+}
+
+type MenuItem struct {
+	Text string
+	ID   string
+}
+
+var up byte = 65
+var down byte = 66
+var escape byte = 27
+var enter byte = 13
+var ctrl_c byte = 3
+
+var keys = map[byte]bool{
+	up:   true,
+	down: true,
+}
+
+func (m *Menu) AddItem(option string, id string) *Menu {
+	menuItem := &MenuItem{
+		Text: option,
+		ID:   id,
+	}
+
+	m.MenuItems = append(m.MenuItems, menuItem)
+
+	return m
+}
+
+func (m *Menu) renderMenuItems(redraw bool) {
+	if redraw {
+		fmt.Printf("\033[%dA", len(m.MenuItems)-1)
+	}
+
+	for index, menuItem := range m.MenuItems {
+		var newline = "\n"
+
+		if index == len(m.MenuItems)-1 {
+			newline = ""
+		}
+
+		menuItemText := menuItem.Text
+		cursor := "  "
+		if index == m.CursorPos {
+			cursor = goterm.Color("> ", goterm.YELLOW)
+			menuItemText = goterm.Color(menuItemText, goterm.YELLOW)
+		}
+
+		fmt.Printf("\r%s %s%s", cursor, menuItemText, newline)
+	}
+}
+
+func (m *Menu) Display() string {
+	defer func() {
+		fmt.Printf("\033[?25h")
+	}()
+
+	fmt.Printf("%s\n", goterm.Color(goterm.Bold(m.Prompt)+":", goterm.CYAN))
+
+	m.renderMenuItems(false)
+
+	fmt.Printf("\033[?25l")
+
+	for {
+		keyCode := getInput()
+		if keyCode == escape {
+			return ""
+		} else if keyCode == enter {
+			menuItem := m.MenuItems[m.CursorPos]
+
+			fmt.Println("\r")
+
+			return menuItem.ID
+		} else if keyCode == up {
+			m.CursorPos = (m.CursorPos + len(m.MenuItems) - 1) % len(m.MenuItems)
+			m.renderMenuItems(true)
+		} else if keyCode == down {
+			m.CursorPos = (m.CursorPos + 1) % len(m.MenuItems)
+			m.renderMenuItems(true)
+		} else if keyCode == ctrl_c {
+			return ""
+		}
+	}
+}
+
+func (m *Menu) Clear() {
+	for i := 0; i < (len(m.MenuItems) + 1); i++ {
+		fmt.Print("\033[F\033[K")
+	}
+}
+
+func getInput() byte {
+	hConsole := windows.Handle(os.Stdin.Fd())
+
+	var originalMode uint32
+
+	err := windows.GetConsoleMode(hConsole, &originalMode)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	rawMode := originalMode &^ (windows.ENABLE_ECHO_INPUT | windows.ENABLE_LINE_INPUT | windows.ENABLE_PROCESSED_INPUT)
+
+	err = windows.SetConsoleMode(hConsole, rawMode)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	defer func() {
+		windows.SetConsoleMode(hConsole, originalMode)
+	}()
+
+	readBytes := make([]byte, 3)
+	read, err := os.Stdin.Read(readBytes)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	if read == 3 {
+		if _, ok := keys[readBytes[2]]; ok {
+			return readBytes[2]
+		}
+	} else {
+		return readBytes[0]
+	}
+
+	return 0
+}
+
+func NewMenu(prompt string) *Menu {
+	return &Menu{
+		Prompt:    prompt,
+		MenuItems: make([]*MenuItem, 0),
+	}
+}