Fix some Windows compatibility issues

[rbdr/mobius] / hotline / client.go

diff --git a/hotline/client.go b/hotline/client.go
index 33ec511341878cd7d98c97a64567f48c05f40766..3a6584af9384c5239efeae6d1246ee0c0923f71b 100644 (file)
--- 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"
        "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"
        "math/big"
        "math/rand"
        "net"


@@ -61,7 +61,6 @@ func readConfig(cfgPath string) (*ClientPrefs, error) {
 
        prefs := ClientPrefs{}
        decoder := yaml.NewDecoder(fh)
 
        prefs := ClientPrefs{}
        decoder := yaml.NewDecoder(fh)

-       decoder.SetStrict(true)

        if err := decoder.Decode(&prefs); err != nil {
                return nil, err
        }
        if err := decoder.Decode(&prefs); err != nil {
                return nil, err
        }


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

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

        }
        c.pref = prefs
 
        }
        c.pref = prefs
 


@@ -121,7 +119,7 @@ func (db *DebugBuffer) Write(p []byte) (int, error) {
        return db.TextView.Write(p)
 }
 
        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 (db *DebugBuffer) Sync() error {
        return nil
 }


@@ -336,8 +334,8 @@ func handleGetMsgs(c *Client, t *Transaction) (res []Transaction, err error) {
        newsTextView.SetBorder(true).SetTitle("News")
 
        c.UI.Pages.AddPage("news", newsTextView, true, true)
        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
        c.UI.App.Draw()
 
        return res, err


@@ -605,10 +603,10 @@ var ServerHandshake = []byte{
 }
 
 func (c *Client) Handshake() error {
 }
 
 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)
        }
        if _, err := c.Connection.Write(ClientHandshake); err != nil {
                return fmt.Errorf("handshake write err: %s", err)
        }


@@ -635,7 +633,6 @@ func (c *Client) LogIn(login string, password string) error {
                        NewField(fieldUserIconID, c.pref.IconBytes()),
                        NewField(fieldUserLogin, negateString([]byte(login))),
                        NewField(fieldUserPassword, negateString([]byte(password))),
                        NewField(fieldUserIconID, c.pref.IconBytes()),
                        NewField(fieldUserLogin, negateString([]byte(login))),
                        NewField(fieldUserPassword, negateString([]byte(password))),

-                       NewField(fieldVersion, []byte{0, 2}),

                ),
        )
 }
                ),
        )
 }


@@ -644,7 +641,7 @@ func (c *Client) Send(t Transaction) error {
        requestNum := binary.BigEndian.Uint16(t.Type)
        tID := binary.BigEndian.Uint32(t.ID)
 
        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 {
 
        // if transaction is NOT reply, add it to the list to transactions we're expecting a response for
        if t.IsReply == 0 {