update go.mod

add signal control for password input
bug fix
6 changed files with 286 additions and 23 deletions
--- a/go.mod
+++ b/go.mod
@ -2,4 +2,4 @@ module b612.me/stario

 go 1.16

-require golang.org/x/crypto v0.0.0-20220313003712-b769efc7c000
+require golang.org/x/crypto v0.21.0
--- a/go.sum
+++ b/go.sum
@ -1,11 +1,45 @@
-golang.org/x/crypto v0.0.0-20220313003712-b769efc7c000 h1:SL+8VVnkqyshUSz5iNnXtrBQzvFF2SkROm6t5RczFAE=
-golang.org/x/crypto v0.0.0-20220313003712-b769efc7c000/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
+golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+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/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
+golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
+golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
--- a/io.go
+++ b/io.go
@ -3,24 +3,33 @@ package stario
 import (
 	"bufio"
 	"fmt"
+	"golang.org/x/crypto/ssh/terminal"
 	"os"
+	"runtime"
 	"strconv"
 	"strings"
-
-	"golang.org/x/crypto/ssh/terminal"
 )

 type InputMsg struct {
-	msg string
-	err error
+	msg             string
+	err             error
+	skipSliceSigErr bool
 }

 func Passwd(hint string, defaultVal string) InputMsg {
-	return passwd(hint, defaultVal, "")
+	return passwd(hint, defaultVal, "", false)
 }

 func PasswdWithMask(hint string, defaultVal string, mask string) InputMsg {
-	return passwd(hint, defaultVal, mask)
+	return passwd(hint, defaultVal, mask, false)
+}
+
+func PasswdResponseSignal(hint string, defaultVal string) InputMsg {
+	return passwd(hint, defaultVal, "", true)
+}
+
+func PasswdResponseSignalWithMask(hint string, defaultVal string, mask string) InputMsg {
+	return passwd(hint, defaultVal, mask, true)
 }

 func MessageBoxRaw(hint string, defaultVal string) InputMsg {
@ -38,7 +47,7 @@ func messageBox(hint string, defaultVal string) InputMsg {
 	fd := int(os.Stdin.Fd())
 	state, err := terminal.MakeRaw(fd)
 	if err != nil {
-		return InputMsg{"", err}
+		return InputMsg{msg: "", err: err}
 	}
 	defer fmt.Println()
 	defer terminal.Restore(fd, state)
@ -46,14 +55,14 @@ func messageBox(hint string, defaultVal string) InputMsg {
 	for {
 		b, _, err := inputReader.ReadRune()
 		if err != nil {
-			return InputMsg{"", err}
+			return InputMsg{msg: "", err: err}
 		}
 		if b == 0x0d {
 			strValue := strings.TrimSpace(string(ioBuf))
 			if len(strValue) == 0 {
 				strValue = defaultVal
 			}
-			return InputMsg{strValue, nil}
+			return InputMsg{msg: strValue, err: err}
 		}
 		if b == 0x08 || b == 0x7F {
 			if len(ioBuf) > 0 {
@ -74,7 +83,16 @@ func messageBox(hint string, defaultVal string) InputMsg {
 	}
 }

-func passwd(hint string, defaultVal string, mask string) InputMsg {
+func isSiganl(s rune) bool {
+	switch s {
+	case 0x03, 0x1a, 0x1c:
+		return true
+	default:
+		return false
+	}
+}
+
+func passwd(hint string, defaultVal string, mask string, handleSignal bool) InputMsg {
 	var ioBuf []rune
 	if hint != "" {
 		fmt.Print(hint)
@ -85,7 +103,7 @@ func passwd(hint string, defaultVal string, mask string) InputMsg {
 	fd := int(os.Stdin.Fd())
 	state, err := terminal.MakeRaw(fd)
 	if err != nil {
-		return InputMsg{"", err}
+		return InputMsg{msg: "", err: err}
 	}
 	defer fmt.Println()
 	defer terminal.Restore(fd, state)
@ -93,14 +111,25 @@ func passwd(hint string, defaultVal string, mask string) InputMsg {
 	for {
 		b, _, err := inputReader.ReadRune()
 		if err != nil {
-			return InputMsg{"", err}
+			return InputMsg{msg: "", err: err}
+		}
+		if handleSignal && isSiganl(b) {
+			if runtime.GOOS != "windows" {
+				terminal.Restore(fd, state)
+			}
+			if err := signal(b); err != nil {
+				return InputMsg{
+					msg: "",
+					err: err,
+				}
+			}
 		}
 		if b == 0x0d {
 			strValue := strings.TrimSpace(string(ioBuf))
 			if len(strValue) == 0 {
 				strValue = defaultVal
 			}
-			return InputMsg{strValue, nil}
+			return InputMsg{msg: strValue, err: err}
 		}
 		if b == 0x08 || b == 0x7F {
 			if len(ioBuf) > 0 {
@ -130,13 +159,18 @@ func MessageBox(hint string, defaultVal string) InputMsg {
 	inputReader := bufio.NewReader(os.Stdin)
 	str, err := inputReader.ReadString('\n')
 	if err != nil {
-		return InputMsg{"", err}
+		return InputMsg{msg: str, err: err}
 	}
 	str = strings.TrimSpace(str)
 	if len(str) == 0 {
 		str = defaultVal
 	}
-	return InputMsg{str, nil}
+	return InputMsg{msg: str, err: err}
+}
+
+func (im InputMsg) IgnoreSliceParseError(i bool) InputMsg {
+	im.skipSliceSigErr = i
+	return im
 }

 func (im InputMsg) String() (string, error) {
@ -151,6 +185,35 @@ func (im InputMsg) MustString() string {
 	return res
 }

+func (im InputMsg) SliceString(sep string) ([]string, error) {
+	if im.err != nil {
+		return nil, im.err
+	}
+	return strings.Split(im.msg, sep), nil
+}
+
+func (im InputMsg) MustSliceString(sep string) []string {
+	res, _ := im.SliceString(sep)
+	return res
+}
+
+func (im InputMsg) sliceFn(sep string, fn func(string) (interface{}, error)) ([]interface{}, error) {
+	var res []interface{}
+	data, err := im.SliceString(sep)
+	if err != nil {
+		return res, err
+	}
+	for _, v := range data {
+		code, err := fn(v)
+		if err != nil && !im.skipSliceSigErr {
+			return nil, err
+		} else if err == nil {
+			res = append(res, code)
+		}
+	}
+	return res, nil
+}
+
 func (im InputMsg) Int() (int, error) {
 	if im.err != nil {
 		return 0, im.err
@ -158,6 +221,22 @@ func (im InputMsg) Int() (int, error) {
 	return strconv.Atoi(im.msg)
 }

+func (im InputMsg) SliceInt(sep string) ([]int, error) {
+	data, err := im.sliceFn(sep, func(v string) (interface{}, error) {
+		return strconv.Atoi(v)
+	})
+	var res []int
+	for _, v := range data {
+		res = append(res, v.(int))
+	}
+	return res, err
+}
+
+func (im InputMsg) MustSliceInt(sep string) []int {
+	res, _ := im.SliceInt(sep)
+	return res
+}
+
 func (im InputMsg) MustInt() int {
 	res, _ := im.Int()
 	return res
@ -175,6 +254,22 @@ func (im InputMsg) MustInt64() int64 {
 	return res
 }

+func (im InputMsg) SliceInt64(sep string) ([]int64, error) {
+	data, err := im.sliceFn(sep, func(v string) (interface{}, error) {
+		return strconv.ParseInt(v, 10, 64)
+	})
+	var res []int64
+	for _, v := range data {
+		res = append(res, v.(int64))
+	}
+	return res, err
+}
+
+func (im InputMsg) MustSliceInt64(sep string) []int64 {
+	res, _ := im.SliceInt64(sep)
+	return res
+}
+
 func (im InputMsg) Uint64() (uint64, error) {
 	if im.err != nil {
 		return 0, im.err
@ -186,6 +281,21 @@ func (im InputMsg) MustUint64() uint64 {
 	res, _ := im.Uint64()
 	return res
 }
+func (im InputMsg) SliceUint64(sep string) ([]uint64, error) {
+	data, err := im.sliceFn(sep, func(v string) (interface{}, error) {
+		return strconv.ParseUint(v, 10, 64)
+	})
+	var res []uint64
+	for _, v := range data {
+		res = append(res, v.(uint64))
+	}
+	return res, err
+}
+
+func (im InputMsg) MustSliceUint64(sep string) []uint64 {
+	res, _ := im.SliceUint64(sep)
+	return res
+}

 func (im InputMsg) Bool() (bool, error) {
 	if im.err != nil {
@ -199,6 +309,22 @@ func (im InputMsg) MustBool() bool {
 	return res
 }

+func (im InputMsg) SliceBool(sep string) ([]bool, error) {
+	data, err := im.sliceFn(sep, func(v string) (interface{}, error) {
+		return strconv.ParseBool(v)
+	})
+	var res []bool
+	for _, v := range data {
+		res = append(res, v.(bool))
+	}
+	return res, err
+}
+
+func (im InputMsg) MustSliceBool(sep string) []bool {
+	res, _ := im.SliceBool(sep)
+	return res
+}
+
 func (im InputMsg) Float64() (float64, error) {
 	if im.err != nil {
 		return 0, im.err
@ -211,6 +337,22 @@ func (im InputMsg) MustFloat64() float64 {
 	return res
 }

+func (im InputMsg) SliceFloat64(sep string) ([]float64, error) {
+	data, err := im.sliceFn(sep, func(v string) (interface{}, error) {
+		return strconv.ParseFloat(v, 64)
+	})
+	var res []float64
+	for _, v := range data {
+		res = append(res, v.(float64))
+	}
+	return res, err
+}
+
+func (im InputMsg) MustSliceFloat64(sep string) []float64 {
+	res, _ := im.SliceFloat64(sep)
+	return res
+}
+
 func (im InputMsg) Float32() (float32, error) {
 	if im.err != nil {
 		return 0, im.err
@ -224,6 +366,22 @@ func (im InputMsg) MustFloat32() float32 {
 	return res
 }

+func (im InputMsg) SliceFloat32(sep string) ([]float32, error) {
+	data, err := im.sliceFn(sep, func(v string) (interface{}, error) {
+		return strconv.ParseFloat(v, 32)
+	})
+	var res []float32
+	for _, v := range data {
+		res = append(res, v.(float32))
+	}
+	return res, err
+}
+
+func (im InputMsg) MustSliceFloat32(sep string) []float32 {
+	res, _ := im.SliceFloat32(sep)
+	return res
+}
+
 func YesNo(hint string, defaults bool) bool {
 	for {
 		res := strings.ToUpper(MessageBox(hint, "").MustString())
--- a/io_test.go
+++ b/io_test.go
@ -0,0 +1,23 @@
+package stario
+
+import (
+	"fmt"
+	"testing"
+)
+
+func Test_Slice(t *testing.T) {
+	var data = InputMsg{
+		msg:             "true,false,true,true,false,0,1,hello",
+		err:             nil,
+		skipSliceSigErr: false,
+	}
+	res, err := data.IgnoreSliceParseError(true).SliceBool(",")
+	if err != nil {
+		fmt.Println(res)
+		t.Fatal(err)
+	}
+	if len(res) == 0 {
+		t.Fatal(res)
+	}
+	fmt.Println(res)
+}
--- a/signal_windows.go
+++ b/signal_windows.go
@ -0,0 +1,22 @@
+//go:build windows
+// +build windows
+
+package stario
+
+import (
+	"errors"
+)
+
+func signal(sigtype rune) error {
+	//todo: use win32api call signal
+	switch sigtype {
+	case 0x03:
+		return errors.New("SIGNAL SIGINT RECIVED")
+	case 0x1a:
+		return errors.New("SIGNAL SIGSTOP RECIVED")
+	case 0x1c:
+		return errors.New("SIGNAL SIGQUIT RECIVED")
+	default:
+		return nil
+	}
+}
--- a/singal_other.go
+++ b/singal_other.go
@ -0,0 +1,26 @@
+//go:build !windows
+// +build !windows
+
+package stario
+
+import (
+	"errors"
+	"os"
+	"syscall"
+)
+
+func signal(sigtype rune) error {
+	switch sigtype {
+	case 0x03:
+		syscall.Kill(os.Getpid(), syscall.SIGINT)
+		return errors.New("SIGNAL SIGINT RECIVED")
+	case 0x1a:
+		syscall.Kill(os.Getpid(), syscall.SIGSTOP)
+		return errors.New("SIGNAL SIGSTOP RECIVED")
+	case 0x1c:
+		syscall.Kill(os.Getpid(), syscall.SIGQUIT)
+		return errors.New("SIGNAL SIGQUIT RECIVED")
+	default:
+		return nil
+	}
+}
Author	SHA1	Message	Date
兔子	8e09b7eec0	update go.mod	2 months ago
兔子	609bdf7079	add signal control for password input	1 year ago
兔子	95503ec65a	bug fix	2 years ago
兔子	538445a201	add InputMsg slice support	2 years ago