diff --git a/cmd/demo-signal-client/main.go b/cmd/demo-signal-client/main.go index 783aef6..d80b795 100644 --- a/cmd/demo-signal-client/main.go +++ b/cmd/demo-signal-client/main.go @@ -5,12 +5,15 @@ import ( "context" "encoding/json" "flag" + "fmt" "io" - "log" "strings" - "time" proto "git.jeffthecoder.xyz/guochao/meow-signaling.jeffthecoder.xyz/pkg/proto/signal-server" + "github.com/charmbracelet/bubbles/textarea" + "github.com/charmbracelet/bubbles/viewport" + tea "github.com/charmbracelet/bubbletea" + "github.com/charmbracelet/lipgloss" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" @@ -18,33 +21,184 @@ import ( "github.com/pion/webrtc/v3" ) -func main() { - flag.Parse() +type errMsg error - if flag.NArg() != 2 { - panic("invalid usage") +type peerMsg struct { + Peer string + Message string +} + +type systemMsg string + +type SignalClientUI struct { + viewport viewport.Model + textarea textarea.Model +} + +var ( + StyleSender = lipgloss.NewStyle() + StyleSenderBold = StyleSender.Bold(true) + StyleError = lipgloss.NewStyle().Foreground(lipgloss.Color("red")) + StylePeer = lipgloss.NewStyle() + StylePeerSelected = lipgloss.NewStyle().Background(lipgloss.Color("gray")) +) + +type SignalClient struct { + UI SignalClientUI + Program *tea.Program + + Room string + Name string + + Messages []string + Error error + + Ready bool + + MessageIsValid bool + Message string + Receiver string + + PeerConns map[string]*webrtc.PeerConnection + Channels map[string]*webrtc.DataChannel +} + +func New(room, name string) *SignalClient { + ta := textarea.New() + ta.Prompt = "Send a message" + ta.Focus() + + ta.Prompt = " | " + ta.ShowLineNumbers = false + ta.SetHeight(1) + + ta.FocusedStyle.CursorLine = lipgloss.NewStyle() + + vp := viewport.New(30, 5) + vp.SetContent(`Welcome to the chat room! +Type a message and press Enter to send.`) + + ta.KeyMap.InsertNewline.SetEnabled(false) + + client := &SignalClient{ + UI: SignalClientUI{ + viewport: vp, + textarea: ta, + }, + + Room: room, + Name: name, + + PeerConns: make(map[string]*webrtc.PeerConnection), + Channels: make(map[string]*webrtc.DataChannel), } - room := flag.Arg(0) - clientId := flag.Arg(1) + return client +} - log.Println("dialing...") +func (client *SignalClient) Init() tea.Cmd { + go client.ConnectServer(context.Background()) + return textarea.Blink +} - client, err := grpc.Dial("127.0.0.1:4444", grpc.WithTransportCredentials(insecure.NewCredentials())) +func (client *SignalClient) Update(msg tea.Msg) (tea.Model, tea.Cmd) { + var ( + tiCmd tea.Cmd + vpCmd tea.Cmd + ) + + client.UI.textarea, tiCmd = client.UI.textarea.Update(msg) + client.UI.viewport, vpCmd = client.UI.viewport.Update(msg) + + switch msg := msg.(type) { + case tea.KeyMsg: + switch msg.Type { + case tea.KeyCtrlC, tea.KeyEsc, tea.KeyCtrlD: + fmt.Println() + return client, tea.Quit + case tea.KeyEnter: + if client.MessageIsValid { + client.Channels[client.Receiver].SendText(client.Message) + + client.Messages = append(client.Messages, StyleSenderBold.Render("You -> "+client.Receiver+": ")+client.Message) + client.UI.viewport.SetContent(strings.Join(client.Messages, "\n")) + client.UI.textarea.Reset() + client.UI.viewport.GotoBottom() + } + } + case tea.WindowSizeMsg: + client.UI.textarea.SetWidth(msg.Width) + client.UI.viewport.Width = msg.Width + client.UI.viewport.Height = msg.Height - 1 + + // We handle errors just like any other message + case errMsg: + client.Error = msg + return client, nil + case peerMsg: + client.Messages = append(client.Messages, StyleSenderBold.Render(msg.Peer+" -> You: ")+msg.Message) + client.UI.viewport.SetContent(strings.Join(client.Messages, "\n")) + client.UI.viewport.GotoBottom() + case systemMsg: + client.Messages = append(client.Messages, string(msg)) + client.UI.viewport.SetContent(strings.Join(client.Messages, "\n")) + client.UI.viewport.GotoBottom() + } + + if selected, message, ok := strings.Cut(client.UI.textarea.Value(), ">"); ok { + selected = strings.TrimSpace(selected) + message = strings.TrimLeft(message, " \t") + if _, ok := client.PeerConns[selected]; ok { + client.MessageIsValid = true + client.Message = message + client.Receiver = selected + } else { + client.MessageIsValid = false + } + } else { + client.MessageIsValid = false + } + + if client.MessageIsValid { + client.UI.textarea.Prompt = " | " + } else { + client.UI.textarea.Prompt = " ? " + } + + return client, tea.Batch(tiCmd, vpCmd) +} + +func (client *SignalClient) View() string { + return fmt.Sprint( + client.UI.viewport.View()+"\n", + StyleError.String()+client.UI.textarea.View()+"\n", + ) +} + +func (client *SignalClient) ConnectServer(ctx context.Context) { + client.Program.Send(systemMsg("Dialing to server...")) + grpcClient, err := grpc.Dial("127.0.0.1:4444", grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { panic(err) } - defer client.Close() - log.Println("connecting...client id: ", clientId) - - signal_server := proto.NewSignalingClient(client) + client.Program.Send(systemMsg("Connecting to room...")) + signal_server := proto.NewSignalingClient(grpcClient) stream, err := signal_server.Connect(context.Background()) if err != nil { panic(err) } + client.Program.Send(systemMsg("Connected.")) - log.Println("connected. discovering ", clientId, " -> ", room) + go client.HandleConnection(ctx, grpcClient, stream) +} + +func (client *SignalClient) HandleConnection(ctx context.Context, grpcClient *grpc.ClientConn, stream proto.Signaling_ConnectClient) { + defer grpcClient.Close() + room := client.Room + clientId := client.Name + + client.Program.Send(systemMsg("Waiting for server to be bootstrapped.")) stream.Send(&proto.SignalingMessage{ Room: room, @@ -52,6 +206,8 @@ func main() { Message: &proto.SignalingMessage_Bootstrap{}, }) + client.Program.Send(systemMsg("Bootstrapped.")) + webrtcConfig := webrtc.Configuration{ ICEServers: []webrtc.ICEServer{ { @@ -59,8 +215,6 @@ func main() { }, }, } - connections := make(map[string]*webrtc.PeerConnection) - channels := make(map[string]*webrtc.DataChannel) for { msg, err := stream.Recv() @@ -75,8 +229,6 @@ func main() { Message: &proto.SignalingMessage_DiscoverRequest{}, }) case *proto.SignalingMessage_DiscoverRequest: - time.Sleep(time.Second * 3) - log.Println("received discover request from ", msg.Sender, ", responding") stream.Send(&proto.SignalingMessage{ Room: room, Sender: clientId, @@ -84,53 +236,49 @@ func main() { Message: &proto.SignalingMessage_DiscoverResponse{}, }) case *proto.SignalingMessage_DiscoverResponse: - log.Println("received discover response from ", msg.Sender, ", offering") - peerConnection, ok := connections[msg.Sender] + peerConnection, ok := client.PeerConns[msg.Sender] if !ok { pc, err := webrtc.NewPeerConnection(webrtcConfig) if err != nil { - log.Println("failed to create peer connection: ", err) continue } - pc.OnConnectionStateChange(func(pcs webrtc.PeerConnectionState) { - log.Printf("Peer Connection(%v) State has changed: %s\n", msg.Sender, pcs) - }) - pc.OnICEConnectionStateChange(func(is webrtc.ICEConnectionState) { - log.Printf("ICE Connection(%v) State has changed: %s\n", msg.Sender, is) - }) - pc.OnICECandidate(func(i *webrtc.ICECandidate) { - log.Printf("ICE Candidate for %v: %s\n", msg.Sender, i) - }) dataChannel, err := pc.CreateDataChannel("chan", nil) if err != nil { - log.Println("failed to create answer: ", err) + client.Program.Send(systemMsg(fmt.Sprint("failed to create answer: ", err))) continue } - channels[msg.Sender] = dataChannel + client.Channels[msg.Sender] = dataChannel dataChannel.OnOpen(func() { - log.Println("data channel opened") + client.Program.Send(systemMsg(fmt.Sprint("Connected to client: ", msg.Sender))) + }) + dataChannel.OnMessage(func(dcMsg webrtc.DataChannelMessage) { + if dcMsg.IsString { + client.Program.Send(peerMsg{ + Peer: msg.Sender, + Message: string(dcMsg.Data), + }) + } }) peerConnection = pc } sdp, err := peerConnection.CreateOffer(&webrtc.OfferOptions{}) if err != nil { - log.Println("failed to create offer: ", err) + client.Program.Send(systemMsg(fmt.Sprint("Failed to create offer for peer "+msg.Sender+": ", err))) peerConnection.Close() continue } - log.Print("set local: ", sdp) peerConnection.SetLocalDescription(sdp) buffer := &bytes.Buffer{} if err := json.NewEncoder(buffer).Encode(sdp); err != nil { - log.Println("failed to encode offer: ", err) + client.Program.Send(systemMsg(fmt.Sprint("Failed to encode offer for peer "+msg.Sender+": ", err))) peerConnection.Close() continue } - connections[msg.Sender] = peerConnection + client.PeerConns[msg.Sender] = peerConnection stream.Send(&proto.SignalingMessage{ Room: room, @@ -147,47 +295,45 @@ func main() { defer peerConnection.Close() case *proto.SignalingMessage_SessionOffer: - log.Println("received session offer: ", inner.SessionOffer.SDP) - peerConnection, ok := connections[msg.Sender] + peerConnection, ok := client.PeerConns[msg.Sender] if !ok { pc, err := webrtc.NewPeerConnection(webrtcConfig) if err != nil { - log.Println("failed to create peer connection: ", err) + client.Program.Send(systemMsg(fmt.Sprint("Failed to create peer connection for peer "+msg.Sender+": ", err))) continue } - pc.OnConnectionStateChange(func(pcs webrtc.PeerConnectionState) { - log.Printf("Peer Connection(%v) State has changed: %s\n", msg.Sender, pcs) - }) - pc.OnICEConnectionStateChange(func(is webrtc.ICEConnectionState) { - log.Printf("ICE Connection(%v) State has changed: %s\n", msg.Sender, is) - }) - pc.OnICECandidate(func(i *webrtc.ICECandidate) { - log.Printf("ICE Candidate for %v: %s\n", msg.Sender, i) - }) pc.OnDataChannel(func(dc *webrtc.DataChannel) { - log.Println("DataChannel ", dc.Label()) - channels[msg.Sender] = dc + client.Program.Send(systemMsg(fmt.Sprint("Connected to peer " + msg.Sender + ": " + dc.Label()))) + client.Channels[msg.Sender] = dc + + dc.OnMessage(func(dcMsg webrtc.DataChannelMessage) { + if dcMsg.IsString { + client.Program.Send(peerMsg{ + Peer: msg.Sender, + Message: string(dcMsg.Data), + }) + } + }) }) - connections[msg.Sender] = pc + client.PeerConns[msg.Sender] = pc peerConnection = pc } var offer webrtc.SessionDescription if err := json.NewDecoder(strings.NewReader(inner.SessionOffer.SDP)).Decode(&offer); err != nil { - log.Println("failed to decode offer: ", err) + + client.Program.Send(systemMsg(fmt.Sprint("Failed to decode offer for peer"+msg.Sender+": ", err))) continue } - log.Println("set remote: ", offer) peerConnection.SetRemoteDescription(offer) sdp, err := peerConnection.CreateAnswer(nil) if err != nil { - log.Println("failed to create answer: ", err) + client.Program.Send(systemMsg(fmt.Sprint("Failed to create answer for peer "+msg.Sender+": ", err))) continue } - log.Println("set local: ", sdp) peerConnection.SetLocalDescription(sdp) gatherComplete := webrtc.GatheringCompletePromise(peerConnection) @@ -195,11 +341,10 @@ func main() { buffer := &bytes.Buffer{} if err := json.NewEncoder(buffer).Encode(peerConnection.LocalDescription()); err != nil { - log.Println("failed to encode answer: ", err) + client.Program.Send(systemMsg(fmt.Sprint("Failed to encode answer for peer"+msg.Sender+": ", err))) continue } - log.Println("answering: ", buffer.String()) stream.Send(&proto.SignalingMessage{ Room: room, Sender: clientId, @@ -213,24 +358,264 @@ func main() { }, }) case *proto.SignalingMessage_SessionAnswer: - log.Println("received session anser: ", inner.SessionAnswer.SDP) - peerConnection, ok := connections[msg.Sender] + peerConnection, ok := client.PeerConns[msg.Sender] if !ok { - log.Println("no connection found. there might be some mistakes") continue } var answer webrtc.SessionDescription if err := json.NewDecoder(strings.NewReader(inner.SessionAnswer.SDP)).Decode(&answer); err != nil { - log.Println("failed to decode answer: ", err) + client.Program.Send(systemMsg(fmt.Sprint("Failed to decode answer for peer"+msg.Sender+": ", err))) continue } - log.Println("set remote: ", answer) peerConnection.SetRemoteDescription(answer) gatherComplete := webrtc.GatheringCompletePromise(peerConnection) <-gatherComplete - } } +} + +func (client *SignalClient) OnBootstrapReady(ctx context.Context) error { + panic("not implemented") +} + +func (client *SignalClient) OnDiscoverRequest(ctx context.Context, sender string) error { + panic("not implemented") +} + +func (client *SignalClient) OnDiscoverResponse(ctx context.Context, sender string) error { + panic("not implemented") +} + +func (client *SignalClient) OnOffer(ctx context.Context, sender, sdp string) error { + panic("not implemented") +} + +func (client *SignalClient) OnAnswer(ctx context.Context, sender, sdp string) error { + panic("not implemented") +} + +func main() { + flag.Parse() + + if flag.NArg() != 2 { + panic("invalid usage") + } + + signalClient := New(flag.Arg(0), flag.Arg(1)) + + signalClient.Program = tea.NewProgram(signalClient) + + if _, err := signalClient.Program.Run(); err != nil { + panic("err") + } + + // room := flag.Arg(0) + // clientId := flag.Arg(1) + + // log.Println("dialing...") + + // client, err := grpc.Dial("127.0.0.1:4444", grpc.WithTransportCredentials(insecure.NewCredentials())) + // if err != nil { + // panic(err) + // } + // defer client.Close() + + // log.Println("connecting...client id: ", clientId) + + // signal_server := proto.NewSignalingClient(client) + // stream, err := signal_server.Connect(context.Background()) + // if err != nil { + // panic(err) + // } + + // log.Println("connected. discovering ", clientId, " -> ", room) + + // stream.Send(&proto.SignalingMessage{ + // Room: room, + // Sender: clientId, + // Message: &proto.SignalingMessage_Bootstrap{}, + // }) + + // webrtcConfig := webrtc.Configuration{ + // ICEServers: []webrtc.ICEServer{ + // { + // URLs: []string{"stun:nhz.jeffthecoder.xyz:3478", "stun:nhz.jeffthecoder.xyz:3479"}, + // }, + // }, + // } + // connections := make(map[string]*webrtc.PeerConnection) + // channels := make(map[string]*webrtc.DataChannel) + + // for { + // msg, err := stream.Recv() + // if err == io.EOF { + // break + // } + // switch inner := msg.Message.(type) { + // case *proto.SignalingMessage_Bootstrap: + // stream.Send(&proto.SignalingMessage{ + // Room: room, + // Sender: clientId, + // Message: &proto.SignalingMessage_DiscoverRequest{}, + // }) + // case *proto.SignalingMessage_DiscoverRequest: + // time.Sleep(time.Second * 3) + // log.Println("received discover request from ", msg.Sender, ", responding") + // stream.Send(&proto.SignalingMessage{ + // Room: room, + // Sender: clientId, + // Receiver: &msg.Sender, + // Message: &proto.SignalingMessage_DiscoverResponse{}, + // }) + // case *proto.SignalingMessage_DiscoverResponse: + // log.Println("received discover response from ", msg.Sender, ", offering") + // peerConnection, ok := connections[msg.Sender] + // if !ok { + // pc, err := webrtc.NewPeerConnection(webrtcConfig) + // if err != nil { + // log.Println("failed to create peer connection: ", err) + // continue + // } + // pc.OnConnectionStateChange(func(pcs webrtc.PeerConnectionState) { + // log.Printf("Peer Connection(%v) State has changed: %s\n", msg.Sender, pcs) + // }) + // pc.OnICEConnectionStateChange(func(is webrtc.ICEConnectionState) { + // log.Printf("ICE Connection(%v) State has changed: %s\n", msg.Sender, is) + // }) + // pc.OnICECandidate(func(i *webrtc.ICECandidate) { + // log.Printf("ICE Candidate for %v: %s\n", msg.Sender, i) + // }) + // dataChannel, err := pc.CreateDataChannel("chan", nil) + // if err != nil { + // log.Println("failed to create answer: ", err) + // continue + // } + // channels[msg.Sender] = dataChannel + + // dataChannel.OnOpen(func() { + // log.Println("data channel opened") + // }) + // peerConnection = pc + // } + + // sdp, err := peerConnection.CreateOffer(&webrtc.OfferOptions{}) + // if err != nil { + // log.Println("failed to create offer: ", err) + // peerConnection.Close() + // continue + // } + // log.Print("set local: ", sdp) + // peerConnection.SetLocalDescription(sdp) + + // buffer := &bytes.Buffer{} + // if err := json.NewEncoder(buffer).Encode(sdp); err != nil { + // log.Println("failed to encode offer: ", err) + // peerConnection.Close() + // continue + // } + + // connections[msg.Sender] = peerConnection + + // stream.Send(&proto.SignalingMessage{ + // Room: room, + // Sender: clientId, + // Receiver: &msg.Sender, + // Message: &proto.SignalingMessage_SessionOffer{ + // SessionOffer: &proto.SDPMessage{ + // SDP: buffer.String(), + // Type: proto.SDPMessageType_Data, + // Sender: clientId, + // }, + // }, + // }) + + // defer peerConnection.Close() + // case *proto.SignalingMessage_SessionOffer: + // log.Println("received session offer: ", inner.SessionOffer.SDP) + // peerConnection, ok := connections[msg.Sender] + // if !ok { + // pc, err := webrtc.NewPeerConnection(webrtcConfig) + // if err != nil { + // log.Println("failed to create peer connection: ", err) + // continue + // } + // pc.OnConnectionStateChange(func(pcs webrtc.PeerConnectionState) { + // log.Printf("Peer Connection(%v) State has changed: %s\n", msg.Sender, pcs) + // }) + // pc.OnICEConnectionStateChange(func(is webrtc.ICEConnectionState) { + // log.Printf("ICE Connection(%v) State has changed: %s\n", msg.Sender, is) + // }) + // pc.OnICECandidate(func(i *webrtc.ICECandidate) { + // log.Printf("ICE Candidate for %v: %s\n", msg.Sender, i) + // }) + + // pc.OnDataChannel(func(dc *webrtc.DataChannel) { + // log.Println("DataChannel ", dc.Label()) + // channels[msg.Sender] = dc + // }) + + // connections[msg.Sender] = pc + // peerConnection = pc + // } + + // var offer webrtc.SessionDescription + // if err := json.NewDecoder(strings.NewReader(inner.SessionOffer.SDP)).Decode(&offer); err != nil { + // log.Println("failed to decode offer: ", err) + // continue + // } + // log.Println("set remote: ", offer) + // peerConnection.SetRemoteDescription(offer) + + // sdp, err := peerConnection.CreateAnswer(nil) + // if err != nil { + // log.Println("failed to create answer: ", err) + // continue + // } + // log.Println("set local: ", sdp) + // peerConnection.SetLocalDescription(sdp) + + // gatherComplete := webrtc.GatheringCompletePromise(peerConnection) + // <-gatherComplete + + // buffer := &bytes.Buffer{} + // if err := json.NewEncoder(buffer).Encode(peerConnection.LocalDescription()); err != nil { + // log.Println("failed to encode answer: ", err) + // continue + // } + + // log.Println("answering: ", buffer.String()) + // stream.Send(&proto.SignalingMessage{ + // Room: room, + // Sender: clientId, + // Receiver: &msg.Sender, + // Message: &proto.SignalingMessage_SessionAnswer{ + // SessionAnswer: &proto.SDPMessage{ + // SDP: buffer.String(), + // Type: proto.SDPMessageType_Data, + // Sender: clientId, + // }, + // }, + // }) + // case *proto.SignalingMessage_SessionAnswer: + // log.Println("received session anser: ", inner.SessionAnswer.SDP) + // peerConnection, ok := connections[msg.Sender] + // if !ok { + // log.Println("no connection found. there might be some mistakes") + // continue + // } + // var answer webrtc.SessionDescription + // if err := json.NewDecoder(strings.NewReader(inner.SessionAnswer.SDP)).Decode(&answer); err != nil { + // log.Println("failed to decode answer: ", err) + // continue + // } + // log.Println("set remote: ", answer) + // peerConnection.SetRemoteDescription(answer) + + // gatherComplete := webrtc.GatheringCompletePromise(peerConnection) + // <-gatherComplete + + // } + // } } diff --git a/go.mod b/go.mod index 4f2c2ef..a08a3da 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,9 @@ module git.jeffthecoder.xyz/guochao/meow-signaling.jeffthecoder.xyz go 1.20 require ( + github.com/charmbracelet/bubbles v0.15.0 + github.com/charmbracelet/bubbletea v0.23.1 + github.com/charmbracelet/lipgloss v0.6.0 github.com/pion/webrtc/v3 v3.1.56 github.com/redis/go-redis/v9 v9.0.2 golang.org/x/sync v0.1.0 @@ -11,10 +14,21 @@ require ( ) require ( + github.com/atotto/clipboard v0.1.4 // indirect + github.com/aymanbagabas/go-osc52 v1.0.3 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/containerd/console v1.0.3 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/google/uuid v1.3.0 // indirect + github.com/lucasb-eyer/go-colorful v1.2.0 // indirect + github.com/mattn/go-isatty v0.0.16 // indirect + github.com/mattn/go-localereader v0.0.1 // indirect + github.com/mattn/go-runewidth v0.0.14 // indirect + github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect + github.com/muesli/cancelreader v0.2.2 // indirect + github.com/muesli/reflow v0.3.0 // indirect + github.com/muesli/termenv v0.13.0 // indirect github.com/pion/datachannel v1.5.5 // indirect github.com/pion/dtls/v2 v2.2.6 // indirect github.com/pion/ice/v2 v2.3.1 // indirect @@ -31,9 +45,11 @@ require ( github.com/pion/transport/v2 v2.0.2 // indirect github.com/pion/turn/v2 v2.1.0 // indirect github.com/pion/udp/v2 v2.0.1 // indirect + github.com/rivo/uniseg v0.2.0 // indirect golang.org/x/crypto v0.6.0 // indirect golang.org/x/net v0.7.0 // indirect golang.org/x/sys v0.5.0 // indirect + golang.org/x/term v0.5.0 // indirect golang.org/x/text v0.7.0 // indirect google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect ) diff --git a/go.sum b/go.sum index c558eed..5b96c80 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,20 @@ +github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4= +github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= +github.com/aymanbagabas/go-osc52 v1.0.3 h1:DTwqENW7X9arYimJrPeGZcV0ln14sGMt3pHZspWD+Mg= +github.com/aymanbagabas/go-osc52 v1.0.3/go.mod h1:zT8H+Rk4VSabYN90pWyugflM3ZhpTZNC7cASDfUCdT4= github.com/bsm/ginkgo/v2 v2.5.0 h1:aOAnND1T40wEdAtkGSkvSICWeQ8L3UASX7YVCqQx+eQ= github.com/bsm/gomega v1.20.0 h1:JhAwLmtRzXFTx2AkALSLa8ijZafntmhSoU63Ok18Uq8= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/charmbracelet/bubbles v0.15.0 h1:c5vZ3woHV5W2b8YZI1q7v4ZNQaPetfHuoHzx+56Z6TI= +github.com/charmbracelet/bubbles v0.15.0/go.mod h1:Y7gSFbBzlMpUDR/XM9MhZI374Q+1p1kluf1uLl8iK74= +github.com/charmbracelet/bubbletea v0.23.1 h1:CYdteX1wCiCzKNUlwm25ZHBIc1GXlYFyUIte8WPvhck= +github.com/charmbracelet/bubbletea v0.23.1/go.mod h1:JAfGK/3/pPKHTnAS8JIE2u9f61BjWTQY57RbT25aMXU= +github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao= +github.com/charmbracelet/lipgloss v0.6.0 h1:1StyZB9vBSOyuZxQUcUwGr17JmojPNm87inij9N3wJY= +github.com/charmbracelet/lipgloss v0.6.0/go.mod h1:tHh2wr34xcHjC2HCXIlGSG1jaDF0S0atAUvBMP6Ppuk= +github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= +github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -31,6 +44,29 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= +github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4= +github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88= +github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= +github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= +github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU= +github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b h1:1XF24mVaiu7u+CFywTdcDo2ie1pzzhwjt6RHqzpMU34= +github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b/go.mod h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho= +github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA= +github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo= +github.com/muesli/reflow v0.2.1-0.20210115123740-9e1d0d53df68/go.mod h1:Xk+z4oIWdQqJzsxyjgl3P22oYZnHdZ8FFTHAQQt5BMQ= +github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s= +github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8= +github.com/muesli/termenv v0.11.1-0.20220204035834-5ac8409525e0/go.mod h1:Bd5NYQ7pd+SrtBSrSNoBBmXlcY8+Xj4BMJgh8qcZrvs= +github.com/muesli/termenv v0.13.0 h1:wK20DRpJdDX8b7Ek2QfhvqhRQFZ237RGRO0RQ/Iqdy0= +github.com/muesli/termenv v0.13.0/go.mod h1:sP1+uffeLaEYpyOTb8pLCUctGcGLnoFjSn4YJK5e2bc= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -82,6 +118,10 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/redis/go-redis/v9 v9.0.2 h1:BA426Zqe/7r56kCcvxYLWe1mkaz71LKF77GwgFzSxfE= github.com/redis/go-redis/v9 v9.0.2/go.mod h1:/xDTe9EF1LM61hek62Poq2nzQSGj0xSrEtEHbBQevps= +github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/sahilm/fuzzy v0.1.0/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= @@ -111,7 +151,6 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= @@ -132,13 +171,16 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/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/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 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.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -146,13 +188,13 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= +golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= 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.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k= golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=