X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/b198b22bb985811a4ee2bb45896ada0a8f3eb9ec..2b7fabb5a1ff6092dd3ea62bd882dd0c02951b81:/hotline/client.go?ds=sidebyside diff --git a/hotline/client.go b/hotline/client.go index cfd21ee..35a7086 100644 --- a/hotline/client.go +++ b/hotline/client.go @@ -1,16 +1,17 @@ package hotline import ( + "bufio" "bytes" + "context" "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.v2" + "gopkg.in/yaml.v3" + "log/slog" "math/big" "math/rand" "net" @@ -21,6 +22,7 @@ import ( const ( trackerListPage = "trackerList" + serverUIPage = "serverUI" ) //go:embed banners/*.txt @@ -34,10 +36,11 @@ type Bookmark struct { } type ClientPrefs struct { - Username string `yaml:"Username"` - IconID int `yaml:"IconID"` - Bookmarks []Bookmark `yaml:"Bookmarks"` - Tracker string `yaml:"Tracker"` + Username string `yaml:"Username"` + IconID int `yaml:"IconID"` + Bookmarks []Bookmark `yaml:"Bookmarks"` + Tracker string `yaml:"Tracker"` + EnableBell bool `yaml:"EnableBell"` } func (cp *ClientPrefs) IconBytes() []byte { @@ -46,6 +49,10 @@ func (cp *ClientPrefs) IconBytes() []byte { return iconBytes } +func (cp *ClientPrefs) AddBookmark(name, addr, login, pass string) { + cp.Bookmarks = append(cp.Bookmarks, Bookmark{Addr: addr, Login: login, Password: pass}) +} + 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 } @@ -65,28 +71,40 @@ type Client struct { cfgPath string DebugBuf *DebugBuffer Connection net.Conn - Login *[]byte - Password *[]byte - Flags *[]byte - ID *[]byte - Version []byte UserAccess []byte - Agreed bool + filePath []string UserList []User - Logger *zap.SugaredLogger + Logger *slog.Logger activeTasks map[uint32]*Transaction + serverName string - pref *ClientPrefs + Pref *ClientPrefs - Handlers map[uint16]clientTHandler + Handlers map[uint16]ClientHandler UI *UI - outbox chan *Transaction - Inbox chan *Transaction + Inbox chan *Transaction +} + +type ClientHandler func(context.Context, *Client, *Transaction) ([]Transaction, error) + +func (c *Client) HandleFunc(transactionID uint16, handler ClientHandler) { + c.Handlers[transactionID] = handler +} + +func NewClient(username string, logger *slog.Logger) *Client { + c := &Client{ + Logger: logger, + activeTasks: make(map[uint32]*Transaction), + Handlers: make(map[uint16]ClientHandler), + } + c.Pref = &ClientPrefs{Username: username} + + return c } -func NewClient(cfgPath string, logger *zap.SugaredLogger) *Client { +func NewUIClient(cfgPath string, logger *slog.Logger) *Client { c := &Client{ cfgPath: cfgPath, Logger: logger, @@ -97,15 +115,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) + logger.Error(fmt.Sprintf("unable to read config file %s\n", cfgPath)) + os.Exit(1) } - c.pref = prefs + 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 @@ -115,7 +132,7 @@ 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 } @@ -129,94 +146,209 @@ func randomBanner() string { return fmt.Sprintf("\n\n\nWelcome to...\n\n[red::b]%s[-:-:-]\n\n", file) } - - - - -type clientTransaction struct { +type ClientTransaction struct { Name string Handler func(*Client, *Transaction) ([]Transaction, error) } -func (ch clientTransaction) Handle(cc *Client, t *Transaction) ([]Transaction, error) { +func (ch ClientTransaction) Handle(cc *Client, t *Transaction) ([]Transaction, error) { return ch.Handler(cc, t) } -type clientTHandler interface { +type ClientTHandler interface { Handle(*Client, *Transaction) ([]Transaction, error) } -type mockClientHandler struct { - mock.Mock +var clientHandlers = map[uint16]ClientHandler{ + TranChatMsg: handleClientChatMsg, + TranLogin: handleClientTranLogin, + TranShowAgreement: handleClientTranShowAgreement, + TranUserAccess: handleClientTranUserAccess, + TranGetUserNameList: handleClientGetUserNameList, + TranNotifyChangeUser: handleNotifyChangeUser, + TranNotifyDeleteUser: handleNotifyDeleteUser, + TranGetMsgs: handleGetMsgs, + TranGetFileNameList: handleGetFileNameList, + TranServerMsg: handleTranServerMsg, + TranKeepAlive: func(ctx context.Context, client *Client, transaction *Transaction) (t []Transaction, err error) { + return t, err + }, } -func (mh *mockClientHandler) Handle(cc *Client, t *Transaction) ([]Transaction, error) { - args := mh.Called(cc, t) - return args.Get(0).([]Transaction), args.Error(1) +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 += "\n\nAt " + now + 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" + now) + } + 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"+now, centeredFlex, true, true) + c.UI.App.Draw() // TODO: errModal doesn't render without this. wtf? + + return res, err } -var clientHandlers = map[uint16]clientTHandler{ - // Server initiated - tranChatMsg: clientTransaction{ - Name: "tranChatMsg", - Handler: handleClientChatMsg, - }, - tranLogin: clientTransaction{ - Name: "tranLogin", - Handler: handleClientTranLogin, - }, - tranShowAgreement: clientTransaction{ - Name: "tranShowAgreement", - Handler: handleClientTranShowAgreement, - }, - tranUserAccess: clientTransaction{ - Name: "tranUserAccess", - Handler: handleClientTranUserAccess, - }, - tranGetUserNameList: clientTransaction{ - Name: "tranGetUserNameList", - Handler: handleClientGetUserNameList, - }, - tranNotifyChangeUser: clientTransaction{ - Name: "tranNotifyChangeUser", - Handler: handleNotifyChangeUser, - }, - tranNotifyDeleteUser: clientTransaction{ - Name: "tranNotifyDeleteUser", - Handler: handleNotifyDeleteUser, - }, - tranGetMsgs: clientTransaction{ - Name: "tranNotifyDeleteUser", - Handler: handleGetMsgs, - }, +func (c *Client) showErrMsg(msg string) { + t := 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" + t) + } + 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"+t, centeredFlex, true, true) + c.UI.App.Draw() // TODO: errModal doesn't render without this. wtf? } -func handleGetMsgs(c *Client, t *Transaction) (res []Transaction, err error) { - newsText := string(t.GetField(fieldData).Data) +func handleGetFileNameList(ctx context.Context, c *Client, t *Transaction) (res []Transaction, err error) { + if t.IsError() { + c.showErrMsg(string(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.Error("err", "err", err) + } + return event + } + + entry := selectedNode.GetReference().(*FileNameWithInfo) + + if bytes.Equal(entry.Type[:], []byte("fldr")) { + 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.UI.HLClient.Logger.Error("err", "err", err) + } + } else { + // TODO: initiate file download + c.Logger.Info("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(ctx context.Context, c *Client, t *Transaction) (res []Transaction, err error) { + newsText := string(t.GetField(FieldData).Data) newsText = strings.ReplaceAll(newsText, "\r", "\n") 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 } -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), - Icon: t.GetField(fieldUserIconID).Data, - Flags: t.GetField(fieldUserFlags).Data, + ID: t.GetField(FieldUserID).Data, + Name: string(t.GetField(FieldUserName).Data), + Icon: t.GetField(FieldUserIconID).Data, + Flags: t.GetField(FieldUserFlags).Data, } // Possible cases: @@ -227,7 +359,6 @@ func handleNotifyChangeUser(c *Client, t *Transaction) (res []Transaction, err e 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 @@ -250,8 +381,8 @@ func handleNotifyChangeUser(c *Client, t *Transaction) (res []Transaction, err e return res, err } -func handleNotifyDeleteUser(c *Client, t *Transaction) (res []Transaction, err error) { - exitUser := t.GetField(fieldUserID).Data +func handleNotifyDeleteUser(ctx context.Context, c *Client, t *Transaction) (res []Transaction, err error) { + exitUser := t.GetField(FieldUserID).Data var newUserList []User for _, u := range c.UserList { @@ -267,59 +398,11 @@ 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) { +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) - // fields, but shxd sneaks in fieldChatSubject (115) so it's important to filter explicitly for the expected + // The Hotline protocol docs say that ClientGetUserNameList should only return FieldUsernameWithInfo (300) + // fields, but shxd sneaks in FieldChatSubject (115) so it's important to filter explicitly for the expected // field type. Probably a good idea to do everywhere. if bytes.Equal(field.ID, []byte{0x01, 0x2c}) { u, err := ReadUser(field.Data) @@ -340,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))) - 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) @@ -349,37 +432,40 @@ func (c *Client) renderUserList() { } } -func handleClientChatMsg(c *Client, t *Transaction) (res []Transaction, err error) { - _, _ = fmt.Fprintf(c.UI.chatBox, "%s \n", t.GetField(fieldData).Data) +func handleClientChatMsg(ctx context.Context, c *Client, t *Transaction) (res []Transaction, err error) { + if c.Pref.EnableBell { + fmt.Println("\a") + } + + _, _ = fmt.Fprintf(c.UI.chatBox, "%s \n", t.GetField(FieldData).Data) return res, err } -func handleClientTranUserAccess(c *Client, t *Transaction) (res []Transaction, err error) { - c.UserAccess = t.GetField(fieldUserAccess).Data +func handleClientTranUserAccess(ctx context.Context, c *Client, t *Transaction) (res []Transaction, err error) { + c.UserAccess = t.GetField(FieldUserAccess).Data return res, err } -func handleClientTranShowAgreement(c *Client, t *Transaction) (res []Transaction, err error) { - agreement := string(t.GetField(fieldData).Data) +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") - c.UI.agreeModal = tview.NewModal(). + agreeModal := tview.NewModal(). SetText(agreement). AddButtons([]string{"Agree", "Disagree"}). SetDoneFunc(func(buttonIndex int, buttonLabel string) { if buttonIndex == 0 { res = append(res, *NewTransaction( - tranAgreed, nil, - NewField(fieldUserName, []byte(c.pref.Username)), - NewField(fieldUserIconID, c.pref.IconBytes()), - NewField(fieldUserFlags, []byte{0x00, 0x00}), - NewField(fieldOptions, []byte{0x00, 0x00}), + TranAgreed, nil, + NewField(FieldUserName, []byte(c.Pref.Username)), + NewField(FieldUserIconID, c.Pref.IconBytes()), + NewField(FieldUserFlags, []byte{0x00, 0x00}), + NewField(FieldOptions, []byte{0x00, 0x00}), ), ) - c.Agreed = true c.UI.Pages.HidePage("agreement") c.UI.App.SetFocus(c.UI.chatInput) } else { @@ -389,17 +475,14 @@ 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 } -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) + errMsg := string(t.GetField(FieldError).Data) errModal := tview.NewModal() errModal.SetText(errMsg) errModal.AddButtons([]string{"Oh no"}) @@ -411,22 +494,23 @@ func handleClientTranLogin(c *Client, t *Transaction) (res []Transaction, err er c.UI.App.Draw() // TODO: errModal doesn't render without this. wtf? - c.Logger.Error(string(t.GetField(fieldError).Data)) - return nil, errors.New("login error: " + string(t.GetField(fieldError).Data)) + 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 { - c.Logger.Errorw("err", "err", err) + if err := c.Send(*NewTransaction(TranGetUserNameList, nil)); err != nil { + c.Logger.Error("err", "err", err) } return res, err } // JoinServer connects to a Hotline server and completes the login flow -func (c *Client) JoinServer(address, login, passwd string) error { +func (c *Client) Connect(address, login, passwd string) (err error) { // Establish TCP connection to server - if err := c.connect(address); err != nil { + c.Connection, err = net.DialTimeout("tcp", address, 5*time.Second) + if err != nil { return err } @@ -435,22 +519,24 @@ func (c *Client) JoinServer(address, login, passwd string) error { return err } - // Authenticate (send tranLogin 107) + // Authenticate (send TranLogin 107) if err := c.LogIn(login, passwd); err != nil { return err } + // start keepalive go routine + go func() { _ = c.keepalive() }() + return nil } -// connect establishes a connection with a Server by sending handshake sequence -func (c *Client) connect(address string) error { - var err error - c.Connection, err = net.DialTimeout("tcp", address, 5*time.Second) - if err != nil { - return err +const keepaliveInterval = 300 * time.Second + +func (c *Client) keepalive() error { + for { + time.Sleep(keepaliveInterval) + _ = c.Send(*NewTransaction(TranKeepAlive, nil)) } - return nil } var ClientHandshake = []byte{ @@ -466,10 +552,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 +566,7 @@ func (c *Client) Handshake() error { return err } - if bytes.Compare(replyBuf, ServerHandshake) == 0 { + if bytes.Equal(replyBuf, ServerHandshake) { return nil } @@ -491,33 +577,33 @@ func (c *Client) Handshake() error { func (c *Client) LogIn(login string, password string) error { return c.Send( *NewTransaction( - 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}), + TranLogin, nil, + NewField(FieldUserName, []byte(c.Pref.Username)), + NewField(FieldUserIconID, c.Pref.IconBytes()), + NewField(FieldUserLogin, encodeString([]byte(login))), + NewField(FieldUserPassword, encodeString([]byte(password))), ), ) } 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 { - c.activeTasks[tID] = &t + c.activeTasks[binary.BigEndian.Uint32(t.ID)] = &t + } + + b, err := t.MarshalBinary() + if err != nil { + return err } var n int - var err error - if n, err = c.Connection.Write(t.Payload()); err != nil { + 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, @@ -525,7 +611,7 @@ func (c *Client) Send(t Transaction) error { 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) @@ -533,41 +619,62 @@ func (c *Client) HandleTransaction(t *Transaction) error { t.Type = origT.Type } - requestNum := binary.BigEndian.Uint16(t.Type) - c.Logger.Infow( - "Received Transaction", - "RequestType", requestNum, - ) - - if handler, ok := c.Handlers[requestNum]; ok { - outT, _ := handler.Handle(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, err := handler(ctx, c, t) + if err != nil { + c.Logger.Error("error handling transaction", "err", err) + } for _, t := range outT { - c.Send(t) + if err := c.Send(t); err != nil { + return err + } } } else { - c.Logger.Errorw( - "Unimplemented transaction type received", - "RequestID", requestNum, - "TransactionID", t.ID, + c.Logger.Debug( + "Unimplemented transaction type", + "IsReply", t.IsReply, + "type", binary.BigEndian.Uint16(t.Type), ) } 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 { + return c.Connection.Close() } -func (c *Client) Disconnect() error { - err := c.Connection.Close() - if err != nil { - return err + +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) + + // Scan for new transactions and handle them as they come in. + for scanner.Scan() { + // Make a new []byte slice and copy the scanner bytes to it. This is critical to avoid a data race as the + // scanner re-uses the buffer for subsequent scans. + buf := make([]byte, len(scanner.Bytes())) + copy(buf, scanner.Bytes()) + + var t Transaction + _, err := t.Write(buf) + if err != nil { + break + } + + if err := c.HandleTransaction(ctx, &t); err != nil { + c.Logger.Error("Error handling transaction", "err", err) + } + } + + if scanner.Err() == nil { + return scanner.Err() } return nil }