X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/22c599abc18895f73e96095f35b71cf3357d41b4..6ee35e569bf1e24f09657fe61da0daaa21cd9192:/hotline/client.go?ds=sidebyside

diff --git a/hotline/client.go b/hotline/client.go
index 9bb33e1..83bcfab 100644
--- a/hotline/client.go
+++ b/hotline/client.go
@@ -6,25 +6,22 @@ import (
 	"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"
-	"io/ioutil"
+	"gopkg.in/yaml.v3"
 	"math/big"
 	"math/rand"
 	"net"
 	"os"
-	"strconv"
 	"strings"
 	"time"
 )
 
-const clientConfigPath = "/usr/local/etc/mobius-client-config.yaml"
 const (
 	trackerListPage = "trackerList"
+	serverUIPage    = "serverUI"
 )
 
 //go:embed banners/*.txt
@@ -50,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 {
@@ -58,7 +61,6 @@ func readConfig(cfgPath string) (*ClientPrefs, error) {
 
 	prefs := ClientPrefs{}
 	decoder := yaml.NewDecoder(fh)
-	decoder.SetStrict(true)
 	if err := decoder.Decode(&prefs); err != nil {
 		return nil, err
 	}
@@ -66,6 +68,7 @@ func readConfig(cfgPath string) (*ClientPrefs, error) {
 }
 
 type Client struct {
+	cfgPath     string
 	DebugBuf    *DebugBuffer
 	Connection  net.Conn
 	Login       *[]byte
@@ -74,10 +77,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
 
@@ -85,176 +89,25 @@ type Client struct {
 
 	UI *UI
 
-	outbox 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,
-	}
+	Inbox chan *Transaction
 }
 
-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 {
-		spew.Dump(err)
+		logger.Fatal(fmt.Sprintf("unable to read config file %s\n", cfgPath))
 	}
+	c.pref = prefs
 
-	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")
-		})
-	}
-
-	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
-		_ = ioutil.WriteFile(clientConfigPath, out, 0666)
-		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
@@ -266,308 +119,20 @@ func (db *DebugBuffer) Write(p []byte) (int, error) {
 	return db.TextView.Write(p)
 }
 
-// Sync is a noop function that exists to satisfy the zapcore.WriteSyncer interface
+// Sync is a noop function that dataFile to satisfy the zapcore.WriteSyncer interface
 func (db *DebugBuffer) Sync() error {
 	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())
 
-	bannerFiles, _ := bannerDir.ReadDir("client/banners")
-	file, _ := bannerDir.ReadFile("client/banners/" + bannerFiles[rand.Intn(len(bannerFiles))].Name())
+	bannerFiles, _ := bannerDir.ReadDir("banners")
+	file, _ := bannerDir.ReadFile("banners/" + bannerFiles[rand.Intn(len(bannerFiles))].Name())
 
 	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(username string, logger *zap.SugaredLogger) *Client {
-	c := &Client{
-		Logger:      logger,
-		activeTasks: make(map[uint32]*Transaction),
-		Handlers:    clientHandlers,
-	}
-	c.UI = NewUI(c)
-
-	prefs, err := readConfig(clientConfigPath)
-	if err != nil {
-		return c
-	}
-	c.pref = prefs
-
-	return c
-}
-
 type clientTransaction struct {
 	Name    string
 	Handler func(*Client, *Transaction) ([]Transaction, error)
@@ -624,6 +189,170 @@ var clientHandlers = map[uint16]clientTHandler{
 		Name:    "tranNotifyDeleteUser",
 		Handler: handleGetMsgs,
 	},
+	tranGetFileNameList: clientTransaction{
+		Name:    "tranGetFileNameList",
+		Handler: handleGetFileNameList,
+	},
+	tranServerMsg: clientTransaction{
+		Name:    "tranServerMsg",
+		Handler: handleTranServerMsg,
+	},
+	tranKeepAlive: clientTransaction{
+		Name: "tranKeepAlive",
+		Handler: func(client *Client, transaction *Transaction) (t []Transaction, err error) {
+			return t, err
+		},
+	},
+}
+
+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 (c *Client) showErrMsg(msg string) {
+	time := time.Now().Format(time.RFC850)
+
+	title := "| Error |"
+
+	msgBox := tview.NewTextView().SetScrollable(true)
+	msgBox.SetText(msg).SetBackgroundColor(tcell.ColorDarkRed)
+	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?
+}
+
+func handleGetFileNameList(c *Client, t *Transaction) (res []Transaction, err error) {
+	if t.IsError() {
+		c.showErrMsg(string(t.GetField(fieldError).Data))
+		c.Logger.Infof("Error: %s", t.GetField(fieldError).Data)
+		return res, err
+	}
+
+	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
+		err = fn.UnmarshalBinary(f.Data)
+		if err != nil {
+			return nil, nil
+		}
+
+		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) {
@@ -633,15 +362,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
@@ -703,54 +431,6 @@ func handleNotifyDeleteUser(c *Client, t *Transaction) (res []Transaction, err e
 	return res, err
 }
 
-const readBuffSize = 1024000 // 1KB - TODO: what should this be?
-
-func (c *Client) ReadLoop() error {
-	tranBuff := make([]byte, 0)
-	tReadlen := 0
-	// Infinite loop where take action on incoming client requests until the connection is closed
-	for {
-		buf := make([]byte, readBuffSize)
-		tranBuff = tranBuff[tReadlen:]
-
-		readLen, err := c.Connection.Read(buf)
-		if err != nil {
-			return err
-		}
-		tranBuff = append(tranBuff, buf[:readLen]...)
-
-		// We may have read multiple requests worth of bytes from Connection.Read.  readTransactions splits them
-		// into a slice of transactions
-		var transactions []Transaction
-		if transactions, tReadlen, err = readTransactions(tranBuff); err != nil {
-			c.Logger.Errorw("Error handling transaction", "err", err)
-		}
-
-		// iterate over all of the transactions that were parsed from the byte slice and handle them
-		for _, t := range transactions {
-			if err := c.HandleTransaction(&t); err != nil {
-				c.Logger.Errorw("Error handling transaction", "err", err)
-			}
-		}
-	}
-}
-
-func (c *Client) GetTransactions() error {
-	tranBuff := make([]byte, 0)
-	tReadlen := 0
-
-	buf := make([]byte, readBuffSize)
-	tranBuff = tranBuff[tReadlen:]
-
-	readLen, err := c.Connection.Read(buf)
-	if err != nil {
-		return err
-	}
-	tranBuff = append(tranBuff, buf[:readLen]...)
-
-	return nil
-}
-
 func handleClientGetUserNameList(c *Client, t *Transaction) (res []Transaction, err error) {
 	var users []User
 	for _, field := range t.Fields {
@@ -781,6 +461,7 @@ func (c *Client) renderUserList() {
 		} else {
 			_, _ = fmt.Fprintf(c.UI.userList, "%s\n", u.Name)
 		}
+		// TODO: fade if user is away
 	}
 }
 
@@ -800,7 +481,7 @@ func handleClientTranShowAgreement(c *Client, t *Transaction) (res []Transaction
 	agreement := string(t.GetField(fieldData).Data)
 	agreement = strings.ReplaceAll(agreement, "\r", "\n")
 
-	c.UI.agreeModal = tview.NewModal().
+	agreeModal := tview.NewModal().
 		SetText(agreement).
 		AddButtons([]string{"Agree", "Disagree"}).
 		SetDoneFunc(func(buttonIndex int, buttonLabel string) {
@@ -814,7 +495,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 {
@@ -824,12 +504,8 @@ 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.UI.Pages.ShowPage("agreement ")
+	c.UI.Pages.AddPage("agreement", agreeModal, false, true)
 
-	c.UI.App.Draw()
 	return res, err
 }
 
@@ -850,7 +526,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 {
@@ -876,9 +552,20 @@ func (c *Client) JoinServer(address, login, passwd string) error {
 		return err
 	}
 
+	// start keepalive go routine
+	go func() { _ = c.keepalive() }()
+
 	return nil
 }
 
+func (c *Client) keepalive() error {
+	for {
+		time.Sleep(300 * time.Second)
+		_ = c.Send(*NewTransaction(tranKeepAlive, nil))
+		c.Logger.Infow("Sent keepalive ping")
+	}
+}
+
 // connect establishes a connection with a Server by sending handshake sequence
 func (c *Client) connect(address string) error {
 	var err error
@@ -902,10 +589,10 @@ var ServerHandshake = []byte{
 }
 
 func (c *Client) Handshake() error {
-	//Protocol ID	4	‘TRTP’	0x54 52 54 50
-	//Sub-protocol ID	4		User defined
-	//Version	2	1	Currently 1
-	//Sub-version	2		User defined
+	// Protocol ID	4	‘TRTP’	0x54 52 54 50
+	// Sub-protocol ID	4		User defined
+	// Version	2	1	Currently 1
+	// Sub-version	2		User defined
 	if _, err := c.Connection.Write(ClientHandshake); err != nil {
 		return fmt.Errorf("handshake write err: %s", err)
 	}
@@ -916,12 +603,11 @@ func (c *Client) Handshake() error {
 		return err
 	}
 
-	//spew.Dump(replyBuf)
-	if bytes.Compare(replyBuf, ServerHandshake) == 0 {
+	if bytes.Equal(replyBuf, ServerHandshake) {
 		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)
 }
 
@@ -931,9 +617,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(fieldVersion, []byte{0, 2}),
+			NewField(fieldUserLogin, negateString([]byte(login))),
+			NewField(fieldUserPassword, negateString([]byte(password))),
 		),
 	)
 }
@@ -942,7 +627,7 @@ func (c *Client) Send(t Transaction) error {
 	requestNum := binary.BigEndian.Uint16(t.Type)
 	tID := binary.BigEndian.Uint32(t.ID)
 
-	//handler := TransactionHandlers[requestNum]
+	// handler := TransactionHandlers[requestNum]
 
 	// if transaction is NOT reply, add it to the list to transactions we're expecting a response for
 	if t.IsReply == 0 {
@@ -951,7 +636,11 @@ func (c *Client) Send(t Transaction) error {
 
 	var n int
 	var err error
-	if n, err = c.Connection.Write(t.Payload()); err != nil {
+	b, err := t.MarshalBinary()
+	if err != nil {
+		return err
+	}
+	if n, err = c.Connection.Write(b); err != nil {
 		return err
 	}
 	c.Logger.Debugw("Sent Transaction",
@@ -971,10 +660,7 @@ func (c *Client) HandleTransaction(t *Transaction) error {
 	}
 
 	requestNum := binary.BigEndian.Uint16(t.Type)
-	c.Logger.Infow(
-		"Received Transaction",
-		"RequestType", requestNum,
-	)
+	c.Logger.Debugw("Received Transaction", "RequestType", requestNum)
 
 	if handler, ok := c.Handlers[requestNum]; ok {
 		outT, _ := handler.Handle(c, t)
@@ -992,19 +678,6 @@ func (c *Client) HandleTransaction(t *Transaction) error {
 	return nil
 }
 
-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
-	}
-	return false
-}
-
 func (c *Client) Disconnect() error {
-	err := c.Connection.Close()
-	if err != nil {
-		return err
-	}
-	return nil
+	return c.Connection.Close()
 }