]> git.r.bdr.sh - rbdr/mobius/blobdiff - hotline/client.go
git.r.bdr.sh / rbdr / mobius / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Re-enable some blackbox tests
[rbdr/mobius] / hotline / client.go
diff --git a/hotline/client.go b/hotline/client.go
index 35ec7fb488015c2c4ae00179cfea4468d8d53193..cfd21eee5b860e16fb853a1828a46ffbae48ea28 100644 (file)
--- a/hotline/client.go
+++ b/hotline/client.go
@@ -6,18 +6,15 @@ import (
        "encoding/binary"
        "errors"
        "fmt"
        "encoding/binary"
        "errors"
        "fmt"
-       "github.com/davecgh/go-spew/spew"
        "github.com/gdamore/tcell/v2"
        "github.com/rivo/tview"
        "github.com/stretchr/testify/mock"
        "go.uber.org/zap"
        "gopkg.in/yaml.v2"
        "github.com/gdamore/tcell/v2"
        "github.com/rivo/tview"
        "github.com/stretchr/testify/mock"
        "go.uber.org/zap"
        "gopkg.in/yaml.v2"
-       "io/ioutil"
        "math/big"
        "math/rand"
        "net"
        "os"
        "math/big"
        "math/rand"
        "net"
        "os"
-       "strconv"
        "strings"
        "time"
 )
        "strings"
        "time"
 )
@@ -89,178 +86,26 @@ type Client struct {
        Inbox  chan *Transaction
 }
 
        Inbox  chan *Transaction
 }
 
-type UI struct {
-       chatBox      *tview.TextView
-       chatInput    *tview.InputField
-       App          *tview.Application
-       Pages        *tview.Pages
-       userList     *tview.TextView
-       agreeModal   *tview.Modal
-       trackerList  *tview.List
-       settingsPage *tview.Box
-       HLClient     *Client
-}
-
-func NewUI(c *Client) *UI {
-       app := tview.NewApplication()
-       chatBox := tview.NewTextView().
-               SetScrollable(true).
-               SetDynamicColors(true).
-               SetWordWrap(true).
-               SetChangedFunc(func() {
-                       app.Draw() // TODO: docs say this is bad but it's the only way to show content during initial render??
-               })
-       chatBox.Box.SetBorder(true).SetTitle("Chat")
-
-       chatInput := tview.NewInputField()
-       chatInput.
-               SetLabel("> ").
-               SetFieldBackgroundColor(tcell.ColorDimGray).
-               SetDoneFunc(func(key tcell.Key) {
-                       // skip send if user hit enter with no other text
-                       if len(chatInput.GetText()) == 0 {
-                               return
-                       }
-
-                       c.Send(
-                               *NewTransaction(tranChatSend, nil,
-                                       NewField(fieldData, []byte(chatInput.GetText())),
-                               ),
-                       )
-                       chatInput.SetText("") // clear the input field after chat send
-               })
-
-       chatInput.Box.SetBorder(true).SetTitle("Send")
-
-       userList := tview.
-               NewTextView().
-               SetDynamicColors(true).
-               SetChangedFunc(func() {
-                       app.Draw() // TODO: docs say this is bad but it's the only way to show content during initial render??
-               })
-       userList.Box.SetBorder(true).SetTitle("Users")
-
-       return &UI{
-               App:         app,
-               chatBox:     chatBox,
-               Pages:       tview.NewPages(),
-               chatInput:   chatInput,
-               userList:    userList,
-               trackerList: tview.NewList(),
-               agreeModal:  tview.NewModal(),
-               HLClient:    c,
-       }
-}
-
-func (ui *UI) showBookmarks() *tview.List {
-       list := tview.NewList()
-       list.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
-               if event.Key() == tcell.KeyEsc {
-                       ui.Pages.SwitchToPage("home")
-               }
-               return event
-       })
-       list.Box.SetBorder(true).SetTitle("| Bookmarks |")
-
-       shortcut := 97 // rune for "a"
-       for i, srv := range ui.HLClient.pref.Bookmarks {
-               addr := srv.Addr
-               login := srv.Login
-               pass := srv.Password
-               list.AddItem(srv.Name, srv.Addr, rune(shortcut+i), func() {
-                       ui.Pages.RemovePage("joinServer")
-
-                       newJS := ui.renderJoinServerForm(addr, login, pass, "bookmarks", true, true)
-
-                       ui.Pages.AddPage("joinServer", newJS, true, true)
-               })
+func NewClient(cfgPath string, logger *zap.SugaredLogger) *Client {
+       c := &Client{
+               cfgPath:     cfgPath,
+               Logger:      logger,
+               activeTasks: make(map[uint32]*Transaction),
+               Handlers:    clientHandlers,
        }
        }
+       c.UI = NewUI(c)
 
 
-       return list
-}
-
-func (ui *UI) getTrackerList() *tview.List {
-       listing, err := GetListing(ui.HLClient.pref.Tracker)
+       prefs, err := readConfig(cfgPath)
        if err != nil {
        if err != nil {
-               spew.Dump(err)
-       }
-
-       list := tview.NewList()
-       list.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
-               if event.Key() == tcell.KeyEsc {
-                       ui.Pages.SwitchToPage("home")
-               }
-               return event
-       })
-       list.Box.SetBorder(true).SetTitle("| Servers |")
-
-       shortcut := 97 // rune for "a"
-       for i, srv := range listing {
-               addr := srv.Addr()
-               list.AddItem(string(srv.Name), string(srv.Description), rune(shortcut+i), func() {
-                       ui.Pages.RemovePage("joinServer")
-
-                       newJS := ui.renderJoinServerForm(addr, GuestAccount, "", trackerListPage, false, true)
-
-                       ui.Pages.AddPage("joinServer", newJS, true, true)
-                       ui.Pages.ShowPage("joinServer")
-               })
+               fmt.Printf("unable to read config file")
+               logger.Fatal("unable to read config file", "path", cfgPath)
        }
        }
+       c.pref = prefs
 
 
-       return list
-}
-
-func (ui *UI) renderSettingsForm() *tview.Flex {
-       iconStr := strconv.Itoa(ui.HLClient.pref.IconID)
-       settingsForm := tview.NewForm()
-       settingsForm.AddInputField("Your Name", ui.HLClient.pref.Username, 0, nil, nil)
-       settingsForm.AddInputField("IconID", iconStr, 0, func(idStr string, _ rune) bool {
-               _, err := strconv.Atoi(idStr)
-               return err == nil
-       }, nil)
-       settingsForm.AddInputField("Tracker", ui.HLClient.pref.Tracker, 0, nil, nil)
-       settingsForm.AddButton("Save", func() {
-               usernameInput := settingsForm.GetFormItem(0).(*tview.InputField).GetText()
-               if len(usernameInput) == 0 {
-                       usernameInput = "unnamed"
-               }
-               ui.HLClient.pref.Username = usernameInput
-               iconStr = settingsForm.GetFormItem(1).(*tview.InputField).GetText()
-               ui.HLClient.pref.IconID, _ = strconv.Atoi(iconStr)
-               ui.HLClient.pref.Tracker = settingsForm.GetFormItem(2).(*tview.InputField).GetText()
-
-               out, err := yaml.Marshal(&ui.HLClient.pref)
-               if err != nil {
-                       // TODO: handle err
-               }
-               // TODO: handle err
-               err = ioutil.WriteFile(ui.HLClient.cfgPath, out, 0666)
-               if err != nil {
-                       println(ui.HLClient.cfgPath)
-                       panic(err)
-               }
-               ui.Pages.RemovePage("settings")
-       })
-       settingsForm.SetBorder(true)
-       settingsForm.SetCancelFunc(func() {
-               ui.Pages.RemovePage("settings")
-       })
-       settingsPage := tview.NewFlex().SetDirection(tview.FlexRow)
-       settingsPage.Box.SetBorder(true).SetTitle("Settings")
-       settingsPage.AddItem(settingsForm, 0, 1, true)
-
-       centerFlex := tview.NewFlex().
-               AddItem(nil, 0, 1, false).
-               AddItem(tview.NewFlex().
-                       SetDirection(tview.FlexRow).
-                       AddItem(nil, 0, 1, false).
-                       AddItem(settingsForm, 15, 1, true).
-                       AddItem(nil, 0, 1, false), 40, 1, true).
-               AddItem(nil, 0, 1, false)
-
-       return centerFlex
+       return c
 }
 
 }
 
+
 // DebugBuffer wraps a *tview.TextView and adds a Sync() method to make it available as a Zap logger
 type DebugBuffer struct {
        TextView *tview.TextView
 // DebugBuffer wraps a *tview.TextView and adds a Sync() method to make it available as a Zap logger
 type DebugBuffer struct {
        TextView *tview.TextView
@@ -275,80 +120,6 @@ func (db *DebugBuffer) Sync() error {
        return nil
 }
 
        return nil
 }
 
-func (ui *UI) joinServer(addr, login, password string) error {
-       if err := ui.HLClient.JoinServer(addr, login, password); err != nil {
-               return errors.New(fmt.Sprintf("Error joining server: %v\n", err))
-       }
-
-       go func() {
-               err := ui.HLClient.ReadLoop()
-               if err != nil {
-                       ui.HLClient.Logger.Errorw("read error", "err", err)
-               }
-       }()
-       return nil
-}
-
-func (ui *UI) renderJoinServerForm(server, login, password, backPage string, save, defaultConnect bool) *tview.Flex {
-       joinServerForm := tview.NewForm()
-       joinServerForm.
-               AddInputField("Server", server, 0, nil, nil).
-               AddInputField("Login", login, 0, nil, nil).
-               AddPasswordField("Password", password, 0, '*', nil).
-               AddCheckbox("Save", save, func(checked bool) {
-                       // TODO: Implement bookmark saving
-               }).
-               AddButton("Cancel", func() {
-                       ui.Pages.SwitchToPage(backPage)
-               }).
-               AddButton("Connect", func() {
-                       err := ui.joinServer(
-                               joinServerForm.GetFormItem(0).(*tview.InputField).GetText(),
-                               joinServerForm.GetFormItem(1).(*tview.InputField).GetText(),
-                               joinServerForm.GetFormItem(2).(*tview.InputField).GetText(),
-                       )
-                       if err != nil {
-                               ui.HLClient.Logger.Errorw("login error", "err", err)
-                               loginErrModal := tview.NewModal().
-                                       AddButtons([]string{"Oh no"}).
-                                       SetText(err.Error()).
-                                       SetDoneFunc(func(buttonIndex int, buttonLabel string) {
-                                               ui.Pages.SwitchToPage(backPage)
-                                       })
-
-                               ui.Pages.AddPage("loginErr", loginErrModal, false, true)
-                       }
-
-                       // Save checkbox
-                       if joinServerForm.GetFormItem(3).(*tview.Checkbox).IsChecked() {
-                               // TODO: implement bookmark saving
-                       }
-               })
-
-       joinServerForm.Box.SetBorder(true).SetTitle("| Connect |")
-       joinServerForm.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
-               if event.Key() == tcell.KeyEscape {
-                       ui.Pages.SwitchToPage(backPage)
-               }
-               return event
-       })
-
-       if defaultConnect {
-               joinServerForm.SetFocus(5)
-       }
-
-       joinServerPage := tview.NewFlex().
-               AddItem(nil, 0, 1, false).
-               AddItem(tview.NewFlex().
-                       SetDirection(tview.FlexRow).
-                       AddItem(nil, 0, 1, false).
-                       AddItem(joinServerForm, 14, 1, true).
-                       AddItem(nil, 0, 1, false), 40, 1, true).
-               AddItem(nil, 0, 1, false)
-
-       return joinServerPage
-}
-
 func randomBanner() string {
        rand.Seed(time.Now().UnixNano())
 
 func randomBanner() string {
        rand.Seed(time.Now().UnixNano())
 
@@ -358,221 +129,9 @@ func randomBanner() string {
        return fmt.Sprintf("\n\n\nWelcome to...\n\n[red::b]%s[-:-:-]\n\n", file)
 }
 
        return fmt.Sprintf("\n\n\nWelcome to...\n\n[red::b]%s[-:-:-]\n\n", file)
 }
 
-func (ui *UI) renderServerUI() *tview.Flex {
-       commandList := tview.NewTextView().SetDynamicColors(true)
-       commandList.
-               SetText("[yellow]^n[-::]: Read News   [yellow]^p[-::]: Post News\n[yellow]^l[-::]: View Logs\n").
-               SetBorder(true).
-               SetTitle("Keyboard Shortcuts")
-
-       modal := tview.NewModal().
-               SetText("Disconnect from the server?").
-               AddButtons([]string{"Cancel", "Exit"}).
-               SetFocus(1)
-       modal.SetDoneFunc(func(buttonIndex int, buttonLabel string) {
-               if buttonIndex == 1 {
-                       _ = ui.HLClient.Disconnect()
-                       ui.Pages.SwitchToPage("home")
-               } else {
-                       ui.Pages.HidePage("modal")
-               }
-       })
-
-       serverUI := tview.NewFlex().
-               AddItem(tview.NewFlex().
-                       SetDirection(tview.FlexRow).
-                       AddItem(commandList, 4, 0, false).
-                       AddItem(ui.chatBox, 0, 8, false).
-                       AddItem(ui.chatInput, 3, 0, true), 0, 1, true).
-               AddItem(ui.userList, 25, 1, false)
-       serverUI.SetBorder(true).SetTitle("| Mobius - Connected to " + "TODO" + " |").SetTitleAlign(tview.AlignLeft)
-       serverUI.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
-               if event.Key() == tcell.KeyEscape {
-                       ui.Pages.AddPage("modal", modal, false, true)
-               }
 
 
-               // Show News
-               if event.Key() == tcell.KeyCtrlN {
-                       if err := ui.HLClient.Send(*NewTransaction(tranGetMsgs, nil)); err != nil {
-                               ui.HLClient.Logger.Errorw("err", "err", err)
-                       }
-               }
 
 
-               // Post news
-               if event.Key() == tcell.KeyCtrlP {
-
-                       newsFlex := tview.NewFlex()
-
-                       newsPostTextArea := tview.NewTextView()
-                       newsPostTextArea.SetBackgroundColor(tcell.ColorDimGray)
-                       newsPostTextArea.SetChangedFunc(func() {
-                               ui.App.Draw() // TODO: docs say this is bad but it's the only way to show content during initial render??
-                       })
-                       //newsPostTextArea.SetBorderPadding(0, 0, 1, 1)
-
-                       newsPostForm := tview.NewForm().
-                               SetButtonsAlign(tview.AlignRight).
-                               AddButton("Post", nil)
-                       newsPostForm.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
-                               switch event.Key() {
-                               case tcell.KeyTab:
-                                       ui.App.SetFocus(newsPostTextArea)
-                               case tcell.KeyEnter:
-                                       newsText := strings.ReplaceAll(newsPostTextArea.GetText(true), "\n", "\r")
-                                       err := ui.HLClient.Send(
-                                               *NewTransaction(tranOldPostNews, nil,
-                                                       NewField(fieldData, []byte(newsText)),
-                                               ),
-                                       )
-                                       if err != nil {
-                                               ui.HLClient.Logger.Errorw("Error posting news", "err", err)
-                                               // TODO: display errModal to user
-                                       }
-                                       //newsInput.SetText("") // clear the input field after chat send
-                                       ui.Pages.RemovePage("newsInput")
-                               }
-
-                               return event
-                       })
-
-                       newsFlex.
-                               SetDirection(tview.FlexRow).
-                               SetBorder(true).
-                               SetTitle("News Post")
-
-                       newsPostTextArea.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
-                               ui.HLClient.Logger.Infow("key", "key", event.Key(), "rune", event.Rune())
-                               switch event.Key() {
-                               case tcell.KeyEscape:
-                                       ui.Pages.RemovePage("newsInput")
-                               case tcell.KeyTab:
-                                       ui.App.SetFocus(newsPostForm)
-                               case tcell.KeyEnter:
-                                       fmt.Fprintf(newsPostTextArea, "\n")
-                               default:
-                                       switch event.Rune() {
-                                       case 127: // backspace
-                                               curTxt := newsPostTextArea.GetText(true)
-                                               if len(curTxt) > 0 {
-                                                       curTxt = curTxt[:len(curTxt)-1]
-                                                       newsPostTextArea.SetText(curTxt)
-                                               }
-                                       default:
-                                               fmt.Fprintf(newsPostTextArea, string(event.Rune()))
-                                       }
-                               }
-
-                               return event
-                       })
-
-                       newsFlex.AddItem(newsPostTextArea, 10, 0, true)
-                       newsFlex.AddItem(newsPostForm, 3, 0, false)
-
-                       newsPostPage := tview.NewFlex().
-                               AddItem(nil, 0, 1, false).
-                               AddItem(tview.NewFlex().
-                                       SetDirection(tview.FlexRow).
-                                       AddItem(nil, 0, 1, false).
-                                       AddItem(newsFlex, 15, 1, true).
-                                       //AddItem(newsPostForm, 3, 0, false).
-                                       AddItem(nil, 0, 1, false), 40, 1, false).
-                               AddItem(nil, 0, 1, false)
-
-                       ui.Pages.AddPage("newsInput", newsPostPage, true, true)
-                       ui.App.SetFocus(newsPostTextArea)
-               }
 
 
-               return event
-       })
-       return serverUI
-}
-
-func (ui *UI) Start() {
-       home := tview.NewFlex().SetDirection(tview.FlexRow)
-       home.Box.SetBorder(true).SetTitle("| Mobius v" + VERSION + " |").SetTitleAlign(tview.AlignLeft)
-       mainMenu := tview.NewList()
-
-       bannerItem := tview.NewTextView().
-               SetText(randomBanner()).
-               SetDynamicColors(true).
-               SetTextAlign(tview.AlignCenter)
-
-       home.AddItem(
-               tview.NewFlex().AddItem(bannerItem, 0, 1, false),
-               14, 1, false)
-       home.AddItem(tview.NewFlex().
-               AddItem(nil, 0, 1, false).
-               AddItem(mainMenu, 0, 1, true).
-               AddItem(nil, 0, 1, false),
-               0, 1, true,
-       )
-
-       mainMenu.AddItem("Join Server", "", 'j', func() {
-               joinServerPage := ui.renderJoinServerForm("", GuestAccount, "", "home", false, false)
-               ui.Pages.AddPage("joinServer", joinServerPage, true, true)
-       }).
-               AddItem("Bookmarks", "", 'b', func() {
-                       ui.Pages.AddAndSwitchToPage("bookmarks", ui.showBookmarks(), true)
-               }).
-               AddItem("Browse Tracker", "", 't', func() {
-                       ui.trackerList = ui.getTrackerList()
-                       ui.Pages.AddAndSwitchToPage("trackerList", ui.trackerList, true)
-               }).
-               AddItem("Settings", "", 's', func() {
-                       ui.Pages.AddPage("settings", ui.renderSettingsForm(), true, true)
-               }).
-               AddItem("Quit", "", 'q', func() {
-                       ui.App.Stop()
-               })
-
-       ui.Pages.AddPage("home", home, true, true)
-
-       // App level input capture
-       ui.App.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
-               if event.Key() == tcell.KeyCtrlC {
-                       ui.HLClient.Logger.Infow("Exiting")
-                       ui.App.Stop()
-                       os.Exit(0)
-               }
-               // Show Logs
-               if event.Key() == tcell.KeyCtrlL {
-                       ui.HLClient.DebugBuf.TextView.ScrollToEnd()
-                       ui.HLClient.DebugBuf.TextView.SetBorder(true).SetTitle("Logs")
-                       ui.HLClient.DebugBuf.TextView.SetDoneFunc(func(key tcell.Key) {
-                               if key == tcell.KeyEscape {
-                                       ui.Pages.RemovePage("logs")
-                               }
-                       })
-
-                       ui.Pages.AddAndSwitchToPage("logs", ui.HLClient.DebugBuf.TextView, true)
-               }
-               return event
-       })
-
-       if err := ui.App.SetRoot(ui.Pages, true).SetFocus(ui.Pages).Run(); err != nil {
-               ui.App.Stop()
-               os.Exit(1)
-       }
-}
-
-func NewClient(cfgPath string, logger *zap.SugaredLogger) *Client {
-       c := &Client{
-               cfgPath:     cfgPath,
-               Logger:      logger,
-               activeTasks: make(map[uint32]*Transaction),
-               Handlers:    clientHandlers,
-       }
-       c.UI = NewUI(c)
-
-       prefs, err := readConfig(cfgPath)
-       if err != nil {
-               fmt.Printf("unable to read config file")
-               logger.Fatal("unable to read config file", "path", cfgPath)
-       }
-       c.pref = prefs
-
-       return c
-}
 
 type clientTransaction struct {
        Name    string
 
 type clientTransaction struct {
        Name    string
@@ -647,7 +206,6 @@ func handleGetMsgs(c *Client, t *Transaction) (res []Transaction, err error) {
        c.UI.Pages.AddPage("news", newsTextView, true, true)
        c.UI.Pages.SwitchToPage("news")
        c.UI.App.SetFocus(newsTextView)
        c.UI.Pages.AddPage("news", newsTextView, true, true)
        c.UI.Pages.SwitchToPage("news")
        c.UI.App.SetFocus(newsTextView)
-
        c.UI.App.Draw()
 
        return res, err
        c.UI.App.Draw()
 
        return res, err
@@ -787,6 +345,7 @@ func (c *Client) renderUserList() {
                } else {
                        _, _ = fmt.Fprintf(c.UI.userList, "%s\n", u.Name)
                }
                } else {
                        _, _ = fmt.Fprintf(c.UI.userList, "%s\n", u.Name)
                }
+               // TODO: fade if user is away
        }
 }
 
        }
 }
 
@@ -832,10 +391,9 @@ func handleClientTranShowAgreement(c *Client, t *Transaction) (res []Transaction
 
        c.Logger.Debug("show agreement page")
        c.UI.Pages.AddPage("agreement", c.UI.agreeModal, false, true)
 
        c.Logger.Debug("show agreement page")
        c.UI.Pages.AddPage("agreement", c.UI.agreeModal, false, true)
-
        c.UI.Pages.ShowPage("agreement ")
        c.UI.Pages.ShowPage("agreement ")
-
        c.UI.App.Draw()
        c.UI.App.Draw()
+
        return res, err
 }
 
        return res, err
 }
 
@@ -922,12 +480,11 @@ func (c *Client) Handshake() error {
                return err
        }
 
                return err
        }
 
-       //spew.Dump(replyBuf)
        if bytes.Compare(replyBuf, ServerHandshake) == 0 {
                return nil
        }
        if bytes.Compare(replyBuf, ServerHandshake) == 0 {
                return nil
        }
-       // In the case of an error, client and server close the connection.
 
 
+       // In the case of an error, client and server close the connection.
        return fmt.Errorf("handshake response err: %s", err)
 }
 
        return fmt.Errorf("handshake response err: %s", err)
 }
 
Friendship Quest remix of mobius, a hotline server in go #cli