Add keepalive to Client

[rbdr/mobius] / hotline / client.go

diff --git a/hotline/client.go b/hotline/client.go
index d656db5eb73910c1962af7af6d854533e1955a4c..493d59e9473af71e53ab1bb8b49300d5141ffd14 100644 (file)
--- a/hotline/client.go
+++ b/hotline/client.go
@@ -21,6 +21,7 @@ import (
 
 const (
        trackerListPage = "trackerList"
+       serverUIPage    = "serverUI"
 )
 
 //go:embed banners/*.txt
@@ -81,6 +82,7 @@ type Client struct {
        UserList    []User
        Logger      *zap.SugaredLogger
        activeTasks map[uint32]*Transaction
+       serverName  string
 
        pref *ClientPrefs
 
@@ -88,7 +90,6 @@ type Client struct {
 
        UI *UI
 
-       outbox chan *Transaction
        Inbox  chan *Transaction
 }
 
@@ -198,6 +199,12 @@ var clientHandlers = map[uint16]clientTHandler{
                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) {
@@ -280,11 +287,9 @@ func handleGetFileNameList(c *Client, t *Transaction) (res []Transaction, err er
                root.AddChild(node)
        }
 
-       var fileList []FileNameWithInfo
        for _, f := range t.Fields {
                var fn FileNameWithInfo
                _, _ = fn.Read(f.Data)
-               fileList = append(fileList, fn)
 
                if bytes.Equal(fn.Type, []byte("fldr")) {
                        node := tview.NewTreeNode(fmt.Sprintf("[blue::]📁 %s[-:-:-]", fn.Name))
@@ -322,7 +327,7 @@ 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")
@@ -537,7 +542,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 {
@@ -563,9 +568,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