X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/b198b22bb985811a4ee2bb45896ada0a8f3eb9ec..c4208f864659a6d5b5d9a2a7e0fe069565033f6b:/hotline/client.go

diff --git a/hotline/client.go b/hotline/client.go
index cfd21ee..24df7c3 100644
--- a/hotline/client.go
+++ b/hotline/client.go
@@ -10,7 +10,7 @@ import (
 	"github.com/rivo/tview"
 	"github.com/stretchr/testify/mock"
 	"go.uber.org/zap"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 	"math/big"
 	"math/rand"
 	"net"
@@ -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 {
@@ -54,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
 	}
@@ -71,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
 
@@ -82,8 +89,7 @@ type Client struct {
 
 	UI *UI
 
-	outbox chan *Transaction
-	Inbox  chan *Transaction
+	Inbox chan *Transaction
 }
 
 func NewClient(cfgPath string, logger *zap.SugaredLogger) *Client {
@@ -97,15 +103,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 +134,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 +190,136 @@ 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 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
+		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) {
@@ -198,14 +329,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
@@ -365,7 +496,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) {
@@ -379,7 +510,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 {
@@ -389,10 +519,7 @@ 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.App.Draw()
+	c.UI.Pages.AddPage("agreement", agreeModal, false, true)
 
 	return res, err
 }
@@ -414,7 +541,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 {
@@ -440,9 +567,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
@@ -466,10 +604,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)
 	}
@@ -480,7 +618,7 @@ func (c *Client) Handshake() error {
 		return err
 	}
 
-	if bytes.Compare(replyBuf, ServerHandshake) == 0 {
+	if bytes.Equal(replyBuf, ServerHandshake) {
 		return nil
 	}
 
@@ -494,8 +632,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}),
 		),
 	)
@@ -505,7 +643,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 {
@@ -514,7 +652,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",
@@ -555,19 +697,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()
 }