Bump CI Golang version

[rbdr/mobius] / hotline / client.go

diff --git a/hotline/client.go b/hotline/client.go
index 12e3167f9b8ccb8c300bcccd9cccbb6fa44c7833..e812d1dfa36a8ad013a375bd7673e0091170989f 100644 (file)
--- a/hotline/client.go
+++ b/hotline/client.go
@@ -3,15 +3,15 @@ package hotline
 import (
        "bufio"
        "bytes"
 import (
        "bufio"
        "bytes"

+       "context"

        "embed"
        "encoding/binary"
        "errors"
        "fmt"
        "github.com/gdamore/tcell/v2"
        "github.com/rivo/tview"
        "embed"
        "encoding/binary"
        "errors"
        "fmt"
        "github.com/gdamore/tcell/v2"
        "github.com/rivo/tview"

-       "github.com/stretchr/testify/mock"
-       "go.uber.org/zap"

        "gopkg.in/yaml.v3"
        "gopkg.in/yaml.v3"

+       "log/slog"

        "math/big"
        "math/rand"
        "net"
        "math/big"
        "math/rand"
        "net"


@@ -49,10 +49,8 @@ func (cp *ClientPrefs) IconBytes() []byte {
        return iconBytes
 }
 
        return iconBytes
 }
 

-func (cp *ClientPrefs) AddBookmark(name, addr, login, pass string) error {
+func (cp *ClientPrefs) AddBookmark(name, addr, login, pass string) {

        cp.Bookmarks = append(cp.Bookmarks, Bookmark{Addr: addr, Login: login, Password: pass})
        cp.Bookmarks = append(cp.Bookmarks, Bookmark{Addr: addr, Login: login, Password: pass})

-
-       return nil

 }
 
 func readConfig(cfgPath string) (*ClientPrefs, error) {
 }
 
 func readConfig(cfgPath string) (*ClientPrefs, error) {


@@ -76,7 +74,7 @@ type Client struct {
        UserAccess  []byte
        filePath    []string
        UserList    []User
        UserAccess  []byte
        filePath    []string
        UserList    []User

-       Logger      *zap.SugaredLogger
+       Logger      *slog.Logger

        activeTasks map[uint32]*Transaction
        serverName  string
 
        activeTasks map[uint32]*Transaction
        serverName  string
 


@@ -89,13 +87,13 @@ type Client struct {
        Inbox chan *Transaction
 }
 
        Inbox chan *Transaction
 }
 

-type ClientHandler func(*Client, *Transaction) ([]Transaction, error)
+type ClientHandler func(context.Context, *Client, *Transaction) ([]Transaction, error)

 
 func (c *Client) HandleFunc(transactionID uint16, handler ClientHandler) {
        c.Handlers[transactionID] = handler
 }
 
 
 func (c *Client) HandleFunc(transactionID uint16, handler ClientHandler) {
        c.Handlers[transactionID] = handler
 }
 

-func NewClient(username string, logger *zap.SugaredLogger) *Client {
+func NewClient(username string, logger *slog.Logger) *Client {

        c := &Client{
                Logger:      logger,
                activeTasks: make(map[uint32]*Transaction),
        c := &Client{
                Logger:      logger,
                activeTasks: make(map[uint32]*Transaction),


@@ -106,7 +104,7 @@ func NewClient(username string, logger *zap.SugaredLogger) *Client {
        return c
 }
 
        return c
 }
 

-func NewUIClient(cfgPath string, logger *zap.SugaredLogger) *Client {
+func NewUIClient(cfgPath string, logger *slog.Logger) *Client {

        c := &Client{
                cfgPath:     cfgPath,
                Logger:      logger,
        c := &Client{
                cfgPath:     cfgPath,
                Logger:      logger,


@@ -117,7 +115,8 @@ func NewUIClient(cfgPath string, logger *zap.SugaredLogger) *Client {
 
        prefs, err := readConfig(cfgPath)
        if err != nil {
 
        prefs, err := readConfig(cfgPath)
        if err != nil {

-               logger.Fatal(fmt.Sprintf("unable to read config file %s\n", cfgPath))
+               logger.Error(fmt.Sprintf("unable to read config file %s\n", cfgPath))
+               os.Exit(1)

        }
        c.Pref = prefs
 
        }
        c.Pref = prefs
 


@@ -160,15 +159,6 @@ type ClientTHandler interface {
        Handle(*Client, *Transaction) ([]Transaction, error)
 }
 
        Handle(*Client, *Transaction) ([]Transaction, error)
 }
 

-type mockClientHandler struct {
-       mock.Mock
-}
-
-func (mh *mockClientHandler) Handle(cc *Client, t *Transaction) ([]Transaction, error) {
-       args := mh.Called(cc, t)
-       return args.Get(0).([]Transaction), args.Error(1)
-}
-

 var clientHandlers = map[uint16]ClientHandler{
        TranChatMsg:          handleClientChatMsg,
        TranLogin:            handleClientTranLogin,
 var clientHandlers = map[uint16]ClientHandler{
        TranChatMsg:          handleClientChatMsg,
        TranLogin:            handleClientTranLogin,


@@ -180,16 +170,16 @@ var clientHandlers = map[uint16]ClientHandler{
        TranGetMsgs:          handleGetMsgs,
        TranGetFileNameList:  handleGetFileNameList,
        TranServerMsg:        handleTranServerMsg,
        TranGetMsgs:          handleGetMsgs,
        TranGetFileNameList:  handleGetFileNameList,
        TranServerMsg:        handleTranServerMsg,

-       TranKeepAlive: func(client *Client, transaction *Transaction) (t []Transaction, err error) {
+       TranKeepAlive: func(ctx context.Context, client *Client, transaction *Transaction) (t []Transaction, err error) {

                return t, err
        },
 }
 
                return t, err
        },
 }
 

-func handleTranServerMsg(c *Client, t *Transaction) (res []Transaction, err error) {
-       time := time.Now().Format(time.RFC850)
+func handleTranServerMsg(ctx context.Context, c *Client, t *Transaction) (res []Transaction, err error) {
+       now := time.Now().Format(time.RFC850)

 
        msg := strings.ReplaceAll(string(t.GetField(FieldData).Data), "\r", "\n")
 
        msg := strings.ReplaceAll(string(t.GetField(FieldData).Data), "\r", "\n")

-       msg += "\n\nAt " + time
+       msg += "\n\nAt " + now

        title := fmt.Sprintf("| Private Message From:   %s |", t.GetField(FieldUserName).Data)
 
        msgBox := tview.NewTextView().SetScrollable(true)
        title := fmt.Sprintf("| Private Message From:   %s |", t.GetField(FieldUserName).Data)
 
        msgBox := tview.NewTextView().SetScrollable(true)


@@ -198,7 +188,7 @@ func handleTranServerMsg(c *Client, t *Transaction) (res []Transaction, err erro
        msgBox.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
                switch event.Key() {
                case tcell.KeyEscape:
        msgBox.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
                switch event.Key() {
                case tcell.KeyEscape:

-                       c.UI.Pages.RemovePage("serverMsgModal" + time)
+                       c.UI.Pages.RemovePage("serverMsgModal" + now)

                }
                return event
        })
                }
                return event
        })


@@ -211,14 +201,14 @@ func handleTranServerMsg(c *Client, t *Transaction) (res []Transaction, err erro
                        AddItem(nil, 0, 1, false), 0, 2, true).
                AddItem(nil, 0, 1, false)
 
                        AddItem(nil, 0, 1, false), 0, 2, true).
                AddItem(nil, 0, 1, false)
 

-       c.UI.Pages.AddPage("serverMsgModal"+time, centeredFlex, true, true)
+       c.UI.Pages.AddPage("serverMsgModal"+now, centeredFlex, true, true)

        c.UI.App.Draw() // TODO: errModal doesn't render without this.  wtf?
 
        return res, err
 }
 
 func (c *Client) showErrMsg(msg string) {
        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)
+       t := time.Now().Format(time.RFC850)

 
        title := "| Error |"
 
 
        title := "| Error |"
 


@@ -228,7 +218,7 @@ func (c *Client) showErrMsg(msg string) {
        msgBox.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
                switch event.Key() {
                case tcell.KeyEscape:
        msgBox.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
                switch event.Key() {
                case tcell.KeyEscape:

-                       c.UI.Pages.RemovePage("serverMsgModal" + time)
+                       c.UI.Pages.RemovePage("serverMsgModal" + t)

                }
                return event
        })
                }
                return event
        })


@@ -241,14 +231,13 @@ func (c *Client) showErrMsg(msg string) {
                        AddItem(nil, 0, 1, false), 0, 2, true).
                AddItem(nil, 0, 1, false)
 
                        AddItem(nil, 0, 1, false), 0, 2, true).
                AddItem(nil, 0, 1, false)
 

-       c.UI.Pages.AddPage("serverMsgModal"+time, centeredFlex, true, true)
+       c.UI.Pages.AddPage("serverMsgModal"+t, centeredFlex, true, true)

        c.UI.App.Draw() // TODO: errModal doesn't render without this.  wtf?
 }
 
        c.UI.App.Draw() // TODO: errModal doesn't render without this.  wtf?
 }
 

-func handleGetFileNameList(c *Client, t *Transaction) (res []Transaction, err error) {
+func handleGetFileNameList(ctx context.Context, c *Client, t *Transaction) (res []Transaction, err error) {

        if t.IsError() {
                c.showErrMsg(string(t.GetField(FieldError).Data))
        if t.IsError() {
                c.showErrMsg(string(t.GetField(FieldError).Data))

-               c.Logger.Infof("Error: %s", t.GetField(FieldError).Data)

                return res, err
        }
 
                return res, err
        }
 


@@ -269,7 +258,7 @@ func handleGetFileNameList(c *Client, t *Transaction) (res []Transaction, err er
                                f := NewField(FieldFilePath, EncodeFilePath(strings.Join(c.filePath, "/")))
 
                                if err := c.UI.HLClient.Send(*NewTransaction(TranGetFileNameList, nil, f)); err != nil {
                                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)
+                                       c.UI.HLClient.Logger.Error("err", "err", err)

                                }
                                return event
                        }
                                }
                                return event
                        }


@@ -277,17 +266,17 @@ func handleGetFileNameList(c *Client, t *Transaction) (res []Transaction, err er
                        entry := selectedNode.GetReference().(*FileNameWithInfo)
 
                        if bytes.Equal(entry.Type[:], []byte("fldr")) {
                        entry := selectedNode.GetReference().(*FileNameWithInfo)
 
                        if bytes.Equal(entry.Type[:], []byte("fldr")) {

-                               c.Logger.Infow("get new directory listing", "name", string(entry.name))
+                               c.Logger.Info("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.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)
+                                       c.UI.HLClient.Logger.Error("err", "err", err)

                                }
                        } else {
                                // TODO: initiate file download
                                }
                        } else {
                                // TODO: initiate file download

-                               c.Logger.Infow("download file", "name", string(entry.name))
+                               c.Logger.Info("download file", "name", string(entry.name))

                        }
                }
 
                        }
                }
 


@@ -317,7 +306,6 @@ func handleGetFileNameList(c *Client, t *Transaction) (res []Transaction, err er
                        node.SetReference(&fn)
                        root.AddChild(node)
                }
                        node.SetReference(&fn)
                        root.AddChild(node)
                }

-

        }
 
        centerFlex := tview.NewFlex().
        }
 
        centerFlex := tview.NewFlex().


@@ -335,7 +323,7 @@ func handleGetFileNameList(c *Client, t *Transaction) (res []Transaction, err er
        return res, err
 }
 
        return res, err
 }
 

-func handleGetMsgs(c *Client, t *Transaction) (res []Transaction, err error) {
+func handleGetMsgs(ctx context.Context, c *Client, t *Transaction) (res []Transaction, err error) {

        newsText := string(t.GetField(FieldData).Data)
        newsText = strings.ReplaceAll(newsText, "\r", "\n")
 
        newsText := string(t.GetField(FieldData).Data)
        newsText = strings.ReplaceAll(newsText, "\r", "\n")
 


@@ -355,7 +343,7 @@ func handleGetMsgs(c *Client, t *Transaction) (res []Transaction, err error) {
        return res, err
 }
 
        return res, err
 }
 

-func handleNotifyChangeUser(c *Client, t *Transaction) (res []Transaction, err error) {
+func handleNotifyChangeUser(ctx context.Context, c *Client, t *Transaction) (res []Transaction, err error) {

        newUser := User{
                ID:    t.GetField(FieldUserID).Data,
                Name:  string(t.GetField(FieldUserName).Data),
        newUser := User{
                ID:    t.GetField(FieldUserID).Data,
                Name:  string(t.GetField(FieldUserName).Data),


@@ -371,7 +359,6 @@ func handleNotifyChangeUser(c *Client, t *Transaction) (res []Transaction, err e
        var newUserList []User
        updatedUser := false
        for _, u := range c.UserList {
        var newUserList []User
        updatedUser := false
        for _, u := range c.UserList {

-               c.Logger.Debugw("Comparing Users", "userToUpdate", newUser.ID, "myID", u.ID, "userToUpdateName", newUser.Name, "myname", u.Name)

                if bytes.Equal(newUser.ID, u.ID) {
                        oldName = u.Name
                        u.Name = newUser.Name
                if bytes.Equal(newUser.ID, u.ID) {
                        oldName = u.Name
                        u.Name = newUser.Name


@@ -394,7 +381,7 @@ func handleNotifyChangeUser(c *Client, t *Transaction) (res []Transaction, err e
        return res, err
 }
 
        return res, err
 }
 

-func handleNotifyDeleteUser(c *Client, t *Transaction) (res []Transaction, err error) {
+func handleNotifyDeleteUser(ctx context.Context, c *Client, t *Transaction) (res []Transaction, err error) {

        exitUser := t.GetField(FieldUserID).Data
 
        var newUserList []User
        exitUser := t.GetField(FieldUserID).Data
 
        var newUserList []User


@@ -411,7 +398,7 @@ func handleNotifyDeleteUser(c *Client, t *Transaction) (res []Transaction, err e
        return res, err
 }
 
        return res, err
 }
 

-func handleClientGetUserNameList(c *Client, t *Transaction) (res []Transaction, err error) {
+func handleClientGetUserNameList(ctx context.Context, c *Client, t *Transaction) (res []Transaction, err error) {

        var users []User
        for _, field := range t.Fields {
                // The Hotline protocol docs say that ClientGetUserNameList should only return FieldUsernameWithInfo (300)
        var users []User
        for _, field := range t.Fields {
                // The Hotline protocol docs say that ClientGetUserNameList should only return FieldUsernameWithInfo (300)


@@ -436,7 +423,7 @@ func (c *Client) renderUserList() {
        c.UI.userList.Clear()
        for _, u := range c.UserList {
                flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(u.Flags)))
        c.UI.userList.Clear()
        for _, u := range c.UserList {
                flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(u.Flags)))

-               if flagBitmap.Bit(userFlagAdmin) == 1 {
+               if flagBitmap.Bit(UserFlagAdmin) == 1 {

                        _, _ = fmt.Fprintf(c.UI.userList, "[red::b]%s[-:-:-]\n", u.Name)
                } else {
                        _, _ = fmt.Fprintf(c.UI.userList, "%s\n", u.Name)
                        _, _ = fmt.Fprintf(c.UI.userList, "[red::b]%s[-:-:-]\n", u.Name)
                } else {
                        _, _ = fmt.Fprintf(c.UI.userList, "%s\n", u.Name)


@@ -445,7 +432,7 @@ func (c *Client) renderUserList() {
        }
 }
 
        }
 }
 

-func handleClientChatMsg(c *Client, t *Transaction) (res []Transaction, err error) {
+func handleClientChatMsg(ctx context.Context, c *Client, t *Transaction) (res []Transaction, err error) {

        if c.Pref.EnableBell {
                fmt.Println("\a")
        }
        if c.Pref.EnableBell {
                fmt.Println("\a")
        }


@@ -455,13 +442,13 @@ func handleClientChatMsg(c *Client, t *Transaction) (res []Transaction, err erro
        return res, err
 }
 
        return res, err
 }
 

-func handleClientTranUserAccess(c *Client, t *Transaction) (res []Transaction, err error) {
+func handleClientTranUserAccess(ctx context.Context, c *Client, t *Transaction) (res []Transaction, err error) {

        c.UserAccess = t.GetField(FieldUserAccess).Data
 
        return res, err
 }
 
        c.UserAccess = t.GetField(FieldUserAccess).Data
 
        return res, err
 }
 

-func handleClientTranShowAgreement(c *Client, t *Transaction) (res []Transaction, err error) {
+func handleClientTranShowAgreement(ctx context.Context, c *Client, t *Transaction) (res []Transaction, err error) {

        agreement := string(t.GetField(FieldData).Data)
        agreement = strings.ReplaceAll(agreement, "\r", "\n")
 
        agreement := string(t.GetField(FieldData).Data)
        agreement = strings.ReplaceAll(agreement, "\r", "\n")
 


@@ -493,7 +480,7 @@ func handleClientTranShowAgreement(c *Client, t *Transaction) (res []Transaction
        return res, err
 }
 
        return res, err
 }
 

-func handleClientTranLogin(c *Client, t *Transaction) (res []Transaction, err error) {
+func handleClientTranLogin(ctx context.Context, c *Client, t *Transaction) (res []Transaction, err error) {

        if !bytes.Equal(t.ErrorCode, []byte{0, 0, 0, 0}) {
                errMsg := string(t.GetField(FieldError).Data)
                errModal := tview.NewModal()
        if !bytes.Equal(t.ErrorCode, []byte{0, 0, 0, 0}) {
                errMsg := string(t.GetField(FieldError).Data)
                errModal := tview.NewModal()


@@ -514,7 +501,7 @@ func handleClientTranLogin(c *Client, t *Transaction) (res []Transaction, err er
        c.UI.App.SetFocus(c.UI.chatInput)
 
        if err := c.Send(*NewTransaction(TranGetUserNameList, nil)); err != nil {
        c.UI.App.SetFocus(c.UI.chatInput)
 
        if err := c.Send(*NewTransaction(TranGetUserNameList, nil)); err != nil {

-               c.Logger.Errorw("err", "err", err)
+               c.Logger.Error("err", "err", err)

        }
        return res, err
 }
        }
        return res, err
 }


@@ -549,7 +536,6 @@ func (c *Client) keepalive() error {
        for {
                time.Sleep(keepaliveInterval)
                _ = c.Send(*NewTransaction(TranKeepAlive, nil))
        for {
                time.Sleep(keepaliveInterval)
                _ = c.Send(*NewTransaction(TranKeepAlive, nil))

-               c.Logger.Infow("Sent keepalive ping")

        }
 }
 
        }
 }
 


@@ -602,25 +588,22 @@ func (c *Client) LogIn(login string, password string) error {
 
 func (c *Client) Send(t Transaction) error {
        requestNum := binary.BigEndian.Uint16(t.Type)
 
 func (c *Client) Send(t Transaction) error {
        requestNum := binary.BigEndian.Uint16(t.Type)

-       tID := binary.BigEndian.Uint32(t.ID)
-
-       // 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 {
 
        // if transaction is NOT reply, add it to the list to transactions we're expecting a response for
        if t.IsReply == 0 {

-               c.activeTasks[tID] = &t
+               c.activeTasks[binary.BigEndian.Uint32(t.ID)] = &t

        }
 
        }
 

-       var n int
-       var err error

        b, err := t.MarshalBinary()
        if err != nil {
                return err
        }
        b, err := t.MarshalBinary()
        if err != nil {
                return err
        }

+
+       var n int

        if n, err = c.Connection.Write(b); err != nil {
                return err
        }
        if n, err = c.Connection.Write(b); err != nil {
                return err
        }

-       c.Logger.Debugw("Sent Transaction",
+       c.Logger.Debug("Sent Transaction",

                "IsReply", t.IsReply,
                "type", requestNum,
                "sentBytes", n,
                "IsReply", t.IsReply,
                "type", requestNum,
                "sentBytes", n,


@@ -628,7 +611,7 @@ func (c *Client) Send(t Transaction) error {
        return nil
 }
 
        return nil
 }
 

-func (c *Client) HandleTransaction(t *Transaction) error {
+func (c *Client) HandleTransaction(ctx context.Context, t *Transaction) error {

        var origT Transaction
        if t.IsReply == 1 {
                requestID := binary.BigEndian.Uint32(t.ID)
        var origT Transaction
        if t.IsReply == 1 {
                requestID := binary.BigEndian.Uint32(t.ID)


@@ -636,19 +619,23 @@ func (c *Client) HandleTransaction(t *Transaction) error {
                t.Type = origT.Type
        }
 
                t.Type = origT.Type
        }
 

-       requestNum := binary.BigEndian.Uint16(t.Type)
-       c.Logger.Debugw("Received Transaction", "RequestType", requestNum)
-
-       if handler, ok := c.Handlers[requestNum]; ok {
-               outT, _ := handler(c, t)
+       if handler, ok := c.Handlers[binary.BigEndian.Uint16(t.Type)]; ok {
+               c.Logger.Debug(
+                       "Received transaction",
+                       "IsReply", t.IsReply,
+                       "type", binary.BigEndian.Uint16(t.Type),
+               )
+               outT, _ := handler(ctx, c, t)

                for _, t := range outT {
                for _, t := range outT {

-                       c.Send(t)
+                       if err := c.Send(t); err != nil {
+                               return err
+                       }

                }
        } else {
                }
        } else {

-               c.Logger.Debugw(
-                       "Unimplemented transaction type received",
-                       "RequestID", requestNum,
-                       "TransactionID", t.ID,
+               c.Logger.Debug(
+                       "Unimplemented transaction type",
+                       "IsReply", t.IsReply,
+                       "type", binary.BigEndian.Uint16(t.Type),

                )
        }
 
                )
        }
 


@@ -659,7 +646,8 @@ func (c *Client) Disconnect() error {
        return c.Connection.Close()
 }
 
        return c.Connection.Close()
 }
 

-func (c *Client) HandleTransactions() error {
+
+func (c *Client) HandleTransactions(ctx context.Context) error {

        // Create a new scanner for parsing incoming bytes into transaction tokens
        scanner := bufio.NewScanner(c.Connection)
        scanner.Split(transactionScanner)
        // Create a new scanner for parsing incoming bytes into transaction tokens
        scanner := bufio.NewScanner(c.Connection)
        scanner.Split(transactionScanner)


@@ -676,8 +664,9 @@ func (c *Client) HandleTransactions() error {
                if err != nil {
                        break
                }
                if err != nil {
                        break
                }

-               if err := c.HandleTransaction(&t); err != nil {
-                       c.Logger.Errorw("Error handling transaction", "err", err)
+
+               if err := c.HandleTransaction(ctx, &t); err != nil {
+                       c.Logger.Error("Error handling transaction", "err", err)

                }
        }
 
                }
        }