X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/b198b22bb985811a4ee2bb45896ada0a8f3eb9ec..eabc4b6cacc4749db226af272e71fcff1556f433:/hotline/client.go diff --git a/hotline/client.go b/hotline/client.go index cfd21ee..6aad5a1 100644 --- a/hotline/client.go +++ b/hotline/client.go @@ -21,6 +21,7 @@ import ( const ( trackerListPage = "trackerList" + serverUIPage = "serverUI" ) //go:embed banners/*.txt @@ -46,6 +47,12 @@ func (cp *ClientPrefs) IconBytes() []byte { return iconBytes } +func (cp *ClientPrefs) AddBookmark(name, addr, login, pass string) error { + cp.Bookmarks = append(cp.Bookmarks, Bookmark{Addr: addr, Login: login, Password: pass}) + + return nil +} + func readConfig(cfgPath string) (*ClientPrefs, error) { fh, err := os.Open(cfgPath) if err != nil { @@ -71,10 +78,11 @@ type Client struct { ID *[]byte Version []byte UserAccess []byte - Agreed bool + filePath []string UserList []User Logger *zap.SugaredLogger activeTasks map[uint32]*Transaction + serverName string pref *ClientPrefs @@ -82,7 +90,6 @@ type Client struct { UI *UI - outbox chan *Transaction Inbox chan *Transaction } @@ -97,15 +104,14 @@ func NewClient(cfgPath string, logger *zap.SugaredLogger) *Client { prefs, err := readConfig(cfgPath) if err != nil { - fmt.Printf("unable to read config file") - logger.Fatal("unable to read config file", "path", cfgPath) + fmt.Printf("unable to read config file %s", cfgPath) + os.Exit(1) } c.pref = prefs 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 @@ -129,10 +135,6 @@ func randomBanner() string { return fmt.Sprintf("\n\n\nWelcome to...\n\n[red::b]%s[-:-:-]\n\n", file) } - - - - type clientTransaction struct { Name string Handler func(*Client, *Transaction) ([]Transaction, error) @@ -189,6 +191,127 @@ var clientHandlers = map[uint16]clientTHandler{ Name: "tranNotifyDeleteUser", Handler: handleGetMsgs, }, + tranGetFileNameList: clientTransaction{ + Name: "tranGetFileNameList", + Handler: handleGetFileNameList, + }, + tranServerMsg: clientTransaction{ + Name: "tranServerMsg", + Handler: handleTranServerMsg, + }, +} + +func handleTranServerMsg(c *Client, t *Transaction) (res []Transaction, err error) { + time := time.Now().Format(time.RFC850) + + msg := strings.ReplaceAll(string(t.GetField(fieldData).Data), "\r", "\n") + msg += "\n\nAt " + time + title := fmt.Sprintf("| Private Message From: %s |", t.GetField(fieldUserName).Data) + + msgBox := tview.NewTextView().SetScrollable(true) + msgBox.SetText(msg).SetBackgroundColor(tcell.ColorDarkSlateBlue) + msgBox.SetTitle(title).SetBorder(true) + msgBox.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey { + switch event.Key() { + case tcell.KeyEscape: + c.UI.Pages.RemovePage("serverMsgModal" + time) + } + return event + }) + + centeredFlex := tview.NewFlex(). + AddItem(nil, 0, 1, false). + AddItem(tview.NewFlex().SetDirection(tview.FlexRow). + AddItem(nil, 0, 1, false). + AddItem(msgBox, 0, 2, true). + AddItem(nil, 0, 1, false), 0, 2, true). + AddItem(nil, 0, 1, false) + + c.UI.Pages.AddPage("serverMsgModal"+time, centeredFlex, true, true) + c.UI.App.Draw() // TODO: errModal doesn't render without this. wtf? + + return res, err +} + +func handleGetFileNameList(c *Client, t *Transaction) (res []Transaction, err error) { + fTree := tview.NewTreeView().SetTopLevel(1) + root := tview.NewTreeNode("Root") + fTree.SetRoot(root).SetCurrentNode(root) + fTree.SetBorder(true).SetTitle("| Files |") + fTree.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey { + switch event.Key() { + case tcell.KeyEscape: + c.UI.Pages.RemovePage("files") + c.filePath = []string{} + case tcell.KeyEnter: + selectedNode := fTree.GetCurrentNode() + + if selectedNode.GetText() == "<- Back" { + c.filePath = c.filePath[:len(c.filePath)-1] + f := NewField(fieldFilePath, EncodeFilePath(strings.Join(c.filePath, "/"))) + + if err := c.UI.HLClient.Send(*NewTransaction(tranGetFileNameList, nil, f)); err != nil { + c.UI.HLClient.Logger.Errorw("err", "err", err) + } + return event + } + + entry := selectedNode.GetReference().(*FileNameWithInfo) + + if bytes.Equal(entry.Type, []byte("fldr")) { + c.Logger.Infow("get new directory listing", "name", string(entry.Name)) + + c.filePath = append(c.filePath, string(entry.Name)) + f := NewField(fieldFilePath, EncodeFilePath(strings.Join(c.filePath, "/"))) + + if err := c.UI.HLClient.Send(*NewTransaction(tranGetFileNameList, nil, f)); err != nil { + c.UI.HLClient.Logger.Errorw("err", "err", err) + } + } else { + // TODO: initiate file download + c.Logger.Infow("download file", "name", string(entry.Name)) + } + } + + return event + }) + + if len(c.filePath) > 0 { + node := tview.NewTreeNode("<- Back") + root.AddChild(node) + } + + for _, f := range t.Fields { + var fn FileNameWithInfo + _, _ = fn.Read(f.Data) + + if bytes.Equal(fn.Type, []byte("fldr")) { + node := tview.NewTreeNode(fmt.Sprintf("[blue::]📁 %s[-:-:-]", fn.Name)) + node.SetReference(&fn) + root.AddChild(node) + } else { + size := binary.BigEndian.Uint32(fn.FileSize) / 1024 + + node := tview.NewTreeNode(fmt.Sprintf(" %-40s %10v KB", fn.Name, size)) + node.SetReference(&fn) + root.AddChild(node) + } + + } + + centerFlex := tview.NewFlex(). + AddItem(nil, 0, 1, false). + AddItem(tview.NewFlex(). + SetDirection(tview.FlexRow). + AddItem(nil, 0, 1, false). + AddItem(fTree, 20, 1, true). + AddItem(nil, 0, 1, false), 60, 1, true). + AddItem(nil, 0, 1, false) + + c.UI.Pages.AddPage("files", centerFlex, true, true) + c.UI.App.Draw() + + return res, err } func handleGetMsgs(c *Client, t *Transaction) (res []Transaction, err error) { @@ -198,14 +321,14 @@ func handleGetMsgs(c *Client, t *Transaction) (res []Transaction, err error) { newsTextView := tview.NewTextView(). SetText(newsText). SetDoneFunc(func(key tcell.Key) { - c.UI.Pages.SwitchToPage("serverUI") + c.UI.Pages.SwitchToPage(serverUIPage) c.UI.App.SetFocus(c.UI.chatInput) }) newsTextView.SetBorder(true).SetTitle("News") c.UI.Pages.AddPage("news", newsTextView, true, true) - c.UI.Pages.SwitchToPage("news") - c.UI.App.SetFocus(newsTextView) + //c.UI.Pages.SwitchToPage("news") + //c.UI.App.SetFocus(newsTextView) c.UI.App.Draw() return res, err @@ -379,7 +502,6 @@ func handleClientTranShowAgreement(c *Client, t *Transaction) (res []Transaction NewField(fieldOptions, []byte{0x00, 0x00}), ), ) - c.Agreed = true c.UI.Pages.HidePage("agreement") c.UI.App.SetFocus(c.UI.chatInput) } else { @@ -414,7 +536,7 @@ func handleClientTranLogin(c *Client, t *Transaction) (res []Transaction, err er c.Logger.Error(string(t.GetField(fieldError).Data)) return nil, errors.New("login error: " + string(t.GetField(fieldError).Data)) } - c.UI.Pages.AddAndSwitchToPage("serverUI", c.UI.renderServerUI(), true) + c.UI.Pages.AddAndSwitchToPage(serverUIPage, c.UI.renderServerUI(), true) c.UI.App.SetFocus(c.UI.chatInput) if err := c.Send(*NewTransaction(tranGetUserNameList, nil)); err != nil { @@ -494,8 +616,8 @@ func (c *Client) LogIn(login string, password string) error { tranLogin, nil, NewField(fieldUserName, []byte(c.pref.Username)), NewField(fieldUserIconID, c.pref.IconBytes()), - NewField(fieldUserLogin, []byte(NegatedUserString([]byte(login)))), - NewField(fieldUserPassword, []byte(NegatedUserString([]byte(password)))), + NewField(fieldUserLogin, negateString([]byte(login))), + NewField(fieldUserPassword, negateString([]byte(password))), NewField(fieldVersion, []byte{0, 2}), ), ) @@ -556,7 +678,6 @@ func (c *Client) HandleTransaction(t *Transaction) error { } func (c *Client) Connected() bool { - fmt.Printf("Agreed: %v UserAccess: %v\n", c.Agreed, c.UserAccess) // c.Agreed == true && if c.UserAccess != nil { return true