Fix CI config

[rbdr/mobius] / hotline / server.go

diff --git a/hotline/server.go b/hotline/server.go
index 392c8f31ac47364f356f77614585753d260d048d..ec835228607d8f3052d858b24a2c9b8b1320a914 100644 (file)
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -18,7 +18,6 @@ import (
        "net"
        "os"
        "path/filepath"
        "net"
        "os"
        "path/filepath"

-       "runtime/debug"

        "strings"
        "sync"
        "time"
        "strings"
        "sync"
        "time"


@@ -34,12 +33,6 @@ type requestCtx struct {
        name       string
 }
 
        name       string
 }
 

-const (
-       userIdleSeconds        = 300 // time in seconds before an inactive user is marked idle
-       idleCheckInterval      = 10  // time in seconds to check for idle users
-       trackerUpdateFrequency = 300 // time in seconds between tracker re-registration
-)
-

 var nostalgiaVersion = []byte{0, 0, 2, 0x2c} // version ID used by the Nostalgia client
 
 type Server struct {
 var nostalgiaVersion = []byte{0, 0, 2, 0x2c} // version ID used by the Nostalgia client
 
 type Server struct {


@@ -49,13 +42,18 @@ type Server struct {
        Clients       map[uint16]*ClientConn
        fileTransfers map[[4]byte]*FileTransfer
 
        Clients       map[uint16]*ClientConn
        fileTransfers map[[4]byte]*FileTransfer
 

-       Config        *Config
-       ConfigDir     string
-       Logger        *zap.SugaredLogger
-       PrivateChats  map[uint32]*PrivateChat
+       Config    *Config
+       ConfigDir string
+       Logger    *zap.SugaredLogger
+
+       PrivateChatsMu sync.Mutex
+       PrivateChats   map[uint32]*PrivateChat
+

        NextGuestID   *uint16
        TrackerPassID [4]byte
        NextGuestID   *uint16
        TrackerPassID [4]byte

-       Stats         *Stats
+
+       StatsMu sync.Mutex
+       Stats   *Stats

 
        FS FileStore // Storage backend to use for File storage
 
 
        FS FileStore // Storage backend to use for File storage
 


@@ -72,6 +70,16 @@ type Server struct {
        banList   map[string]*time.Time
 }
 
        banList   map[string]*time.Time
 }
 

+func (s *Server) CurrentStats() Stats {
+       s.StatsMu.Lock()
+       defer s.StatsMu.Unlock()
+
+       stats := s.Stats
+       stats.CurrentlyConnected = len(s.Clients)
+
+       return *stats
+}
+

 type PrivateChat struct {
        Subject    string
        ClientConn map[uint16]*ClientConn
 type PrivateChat struct {
        Subject    string
        ClientConn map[uint16]*ClientConn


@@ -217,7 +225,7 @@ func NewServer(configDir string, netPort int, logger *zap.SugaredLogger, FS File
                Logger:        logger,
                NextGuestID:   new(uint16),
                outbox:        make(chan Transaction),
                Logger:        logger,
                NextGuestID:   new(uint16),
                outbox:        make(chan Transaction),

-               Stats:         &Stats{StartTime: time.Now()},
+               Stats:         &Stats{Since: time.Now()},

                ThreadedNews:  &ThreadedNews{},
                FS:            FS,
                banList:       make(map[string]*time.Time),
                ThreadedNews:  &ThreadedNews{},
                FS:            FS,
                banList:       make(map[string]*time.Time),


@@ -278,7 +286,7 @@ func NewServer(configDir string, netPort int, logger *zap.SugaredLogger, FS File
                                        if err := register(t, tr); err != nil {
                                                server.Logger.Errorw("unable to register with tracker %v", "error", err)
                                        }
                                        if err := register(t, tr); err != nil {
                                                server.Logger.Errorw("unable to register with tracker %v", "error", err)
                                        }

-                                       server.Logger.Infow("Sent Tracker registration", "data", tr)
+                                       server.Logger.Debugw("Sent Tracker registration", "addr", t)

                                }
 
                                time.Sleep(trackerUpdateFrequency * time.Second)
                                }
 
                                time.Sleep(trackerUpdateFrequency * time.Second)


@@ -542,14 +550,6 @@ func (s *Server) loadConfig(path string) error {
        return nil
 }
 
        return nil
 }
 

-// dontPanic logs panics instead of crashing
-func dontPanic(logger *zap.SugaredLogger) {
-       if r := recover(); r != nil {
-               fmt.Println("stacktrace from panic: \n" + string(debug.Stack()))
-               logger.Errorw("PANIC", "err", r, "trace", string(debug.Stack()))
-       }
-}
-

 // handleNewConnection takes a new net.Conn and performs the initial login sequence
 func (s *Server) handleNewConnection(ctx context.Context, rwc io.ReadWriteCloser, remoteAddr string) error {
        defer dontPanic(s.Logger)
 // handleNewConnection takes a new net.Conn and performs the initial login sequence
 func (s *Server) handleNewConnection(ctx context.Context, rwc io.ReadWriteCloser, remoteAddr string) error {
        defer dontPanic(s.Logger)


@@ -564,9 +564,9 @@ func (s *Server) handleNewConnection(ctx context.Context, rwc io.ReadWriteCloser
 
        scanner.Scan()
 
 
        scanner.Scan()
 

-       clientLogin, _, err := ReadTransaction(scanner.Bytes())
-       if err != nil {
-               panic(err)
+       var clientLogin Transaction
+       if _, err := clientLogin.Write(scanner.Bytes()); err != nil {
+               return err

        }
 
        c := s.NewClientConn(rwc, remoteAddr)
        }
 
        c := s.NewClientConn(rwc, remoteAddr)


@@ -613,7 +613,7 @@ func (s *Server) handleNewConnection(ctx context.Context, rwc io.ReadWriteCloser
 
        // If authentication fails, send error reply and close connection
        if !c.Authenticate(login, encodedPassword) {
 
        // If authentication fails, send error reply and close connection
        if !c.Authenticate(login, encodedPassword) {

-               t := c.NewErrReply(clientLogin, "Incorrect login.")
+               t := c.NewErrReply(&clientLogin, "Incorrect login.")

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


@@ -645,7 +645,7 @@ func (s *Server) handleNewConnection(ctx context.Context, rwc io.ReadWriteCloser
                c.Flags = []byte{0, 2}
        }
 
                c.Flags = []byte{0, 2}
        }
 

-       s.outbox <- c.NewReply(clientLogin,
+       s.outbox <- c.NewReply(&clientLogin,

                NewField(fieldVersion, []byte{0x00, 0xbe}),
                NewField(fieldCommunityBannerID, []byte{0, 0}),
                NewField(fieldServerName, []byte(s.Config.Name)),
                NewField(fieldVersion, []byte{0x00, 0xbe}),
                NewField(fieldCommunityBannerID, []byte{0, 0}),
                NewField(fieldServerName, []byte(s.Config.Name)),


@@ -685,7 +685,10 @@ func (s *Server) handleNewConnection(ctx context.Context, rwc io.ReadWriteCloser
                }
        }
 
                }
        }
 

-       c.Server.Stats.LoginCount += 1
+       c.Server.Stats.ConnectionCounter += 1
+       if len(s.Clients) > c.Server.Stats.ConnectionPeak {
+               c.Server.Stats.ConnectionPeak = len(s.Clients)
+       }

 
        // Scan for new transactions and handle them as they come in.
        for scanner.Scan() {
 
        // Scan for new transactions and handle them as they come in.
        for scanner.Scan() {


@@ -694,11 +697,12 @@ func (s *Server) handleNewConnection(ctx context.Context, rwc io.ReadWriteCloser
                buf := make([]byte, len(scanner.Bytes()))
                copy(buf, scanner.Bytes())
 
                buf := make([]byte, len(scanner.Bytes()))
                copy(buf, scanner.Bytes())
 

-               t, _, err := ReadTransaction(buf)
-               if err != nil {
-                       panic(err)
+               var t Transaction
+               if _, err := t.Write(buf); err != nil {
+                       return err

                }
                }

-               if err := c.handleTransaction(*t); err != nil {
+
+               if err := c.handleTransaction(t); err != nil {

                        c.logger.Errorw("Error handling transaction", "err", err)
                }
        }
                        c.logger.Errorw("Error handling transaction", "err", err)
                }
        }


@@ -706,15 +710,14 @@ func (s *Server) handleNewConnection(ctx context.Context, rwc io.ReadWriteCloser
 }
 
 func (s *Server) NewPrivateChat(cc *ClientConn) []byte {
 }
 
 func (s *Server) NewPrivateChat(cc *ClientConn) []byte {

-       s.mux.Lock()
-       defer s.mux.Unlock()
+       s.PrivateChatsMu.Lock()
+       defer s.PrivateChatsMu.Unlock()

 
        randID := make([]byte, 4)
        rand.Read(randID)
        data := binary.BigEndian.Uint32(randID[:])
 
        s.PrivateChats[data] = &PrivateChat{
 
        randID := make([]byte, 4)
        rand.Read(randID)
        data := binary.BigEndian.Uint32(randID[:])
 
        s.PrivateChats[data] = &PrivateChat{

-               Subject:    "",

                ClientConn: make(map[uint16]*ClientConn),
        }
        s.PrivateChats[data].ClientConn[cc.uint16ID()] = cc
                ClientConn: make(map[uint16]*ClientConn),
        }
        s.PrivateChats[data].ClientConn[cc.uint16ID()] = cc


@@ -774,11 +777,12 @@ func (s *Server) handleFileTransfer(ctx context.Context, rwc io.ReadWriter) erro
        switch fileTransfer.Type {
        case bannerDownload:
                if err := s.bannerDownload(rwc); err != nil {
        switch fileTransfer.Type {
        case bannerDownload:
                if err := s.bannerDownload(rwc); err != nil {

-                       panic(err)

                        return err
                }
        case FileDownload:
                s.Stats.DownloadCounter += 1
                        return err
                }
        case FileDownload:
                s.Stats.DownloadCounter += 1

+               s.Stats.DownloadsInProgress += 1
+               defer func() { s.Stats.DownloadsInProgress -= 1 }()

 
                var dataOffset int64
                if fileTransfer.fileResumeData != nil {
 
                var dataOffset int64
                if fileTransfer.fileResumeData != nil {


@@ -833,6 +837,8 @@ func (s *Server) handleFileTransfer(ctx context.Context, rwc io.ReadWriter) erro
 
        case FileUpload:
                s.Stats.UploadCounter += 1
 
        case FileUpload:
                s.Stats.UploadCounter += 1

+               s.Stats.UploadsInProgress += 1
+               defer func() { s.Stats.UploadsInProgress -= 1 }()

 
                var file *os.File
 
 
                var file *os.File
 


@@ -889,7 +895,12 @@ func (s *Server) handleFileTransfer(ctx context.Context, rwc io.ReadWriter) erro
                }
 
                rLogger.Infow("File upload complete", "dstFile", fullPath)
                }
 
                rLogger.Infow("File upload complete", "dstFile", fullPath)

+

        case FolderDownload:
        case FolderDownload:

+               s.Stats.DownloadCounter += 1
+               s.Stats.DownloadsInProgress += 1
+               defer func() { s.Stats.DownloadsInProgress -= 1 }()
+

                // Folder Download flow:
                // 1. Get filePath from the transfer
                // 2. Iterate over files
                // Folder Download flow:
                // 1. Get filePath from the transfer
                // 2. Iterate over files


@@ -1053,6 +1064,9 @@ func (s *Server) handleFileTransfer(ctx context.Context, rwc io.ReadWriter) erro
                }
 
        case FolderUpload:
                }
 
        case FolderUpload:

+               s.Stats.UploadCounter += 1
+               s.Stats.UploadsInProgress += 1
+               defer func() { s.Stats.UploadsInProgress -= 1 }()

                rLogger.Infow(
                        "Folder upload started",
                        "dstPath", fullPath,
                rLogger.Infow(
                        "Folder upload started",
                        "dstPath", fullPath,