rouggy/FlexDXCluster
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new code for login

Browse Source
This commit is contained in:
Gregory Salaun
2025-06-03 00:15:08 +02:00
parent db41a32a5b
commit ebdf1336a1
2 changed files with 55 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
TCPClient.go
View File

@ -18,6 +18,7 @@ type TCPClient struct {
Password string
Address string
Port string
LoggedIn bool
Timeout time.Duration
LogWriter *bufio.Writer
Reader *bufio.Reader
@ -55,6 +56,7 @@ func (c *TCPClient) setDefaultParams() {
if c.LogWriter == nil {
c.LogWriter = bufio.NewWriter(os.Stdout)
}
c.LoggedIn = false
}
func (c *TCPClient) StartClient() {
@ -72,10 +74,10 @@ func (c *TCPClient) StartClient() {
}
Log.Infof("Connected to DX cluster %s:%s", c.Address, c.Port)
err = c.Conn.SetKeepAlive(true)
if err != nil {
Log.Error("Error while setting keep alive:", err)
}
// err = c.Conn.SetKeepAlive(true)
// if err != nil {
// Log.Error("Error while setting keep alive:", err)
// }
c.Reader = bufio.NewReader(c.Conn)
c.Writer = bufio.NewWriter(c.Conn)
@ -132,34 +134,56 @@ func (c *TCPClient) ReadLine() {
for {
message, err := c.Reader.ReadString('\n')
message, _ = strings.CutSuffix(message, "\n")
message, _ = strings.CutSuffix(message, "\r")
// Need to check data with space first to find login and then use \n
if !c.LoggedIn {
message, err := c.Reader.ReadString(' ')
message, _ = strings.CutSuffix(message, "\n")
message, _ = strings.CutSuffix(message, "\r")
if err != nil {
Log.Errorf("Error reading message: %s", err)
c.Conn.Close()
c.StartClient()
}
if strings.Contains(message, Cfg.Cluster.LoginPrompt) {
Log.Debug("Found login prompt...sending callsign")
c.Write([]byte(c.Login + "\r\n"))
c.SetFilters()
if Cfg.Cluster.Command != "" {
c.WriteString(Cfg.Cluster.Command + "\n\r")
if err != nil {
Log.Errorf("Error reading message: %s", err)
c.Conn.Close()
c.StartClient()
}
if strings.Contains(message, Cfg.Cluster.LoginPrompt) {
Log.Debug("Found login prompt...sending callsign")
c.Write([]byte(c.Login + "\r\n"))
c.SetFilters()
if Cfg.Cluster.Command != "" {
c.WriteString(Cfg.Cluster.Command + "\n\r")
}
Log.Infof("Connected to cluster %s", Cfg.Cluster.Server)
Log.Info("Start receiving spots")
c.LoggedIn = true
}
Log.Info("Start receiving spots")
} else if strings.Contains(message, "Error reading from server: read tcp") {
Log.Error("Disconnected from Telnet Server, reconnecting")
c.Close()
c.StartClient()
} else {
ProcessTelnetSpot(spotRe, message, c.SpotChanToFlex, c.SpotChanToHTTPServer, c.Countries)
}
// Send the spot message to TCP server
c.MsgChan <- message
if c.LoggedIn {
message, err := c.Reader.ReadString('\n')
message, _ = strings.CutSuffix(message, "\n")
message, _ = strings.CutSuffix(message, "\r")
if err != nil {
Log.Errorf("Error reading message: %s", err)
c.Conn.Close()
c.StartClient()
}
if strings.Contains(message, "Error reading from server: read tcp") {
Log.Error("Disconnected from Telnet Server, reconnecting")
c.Close()
c.StartClient()
} else {
if c.LoggedIn && strings.Contains(message, "DX") {
ProcessTelnetSpot(spotRe, message, c.SpotChanToFlex, c.SpotChanToHTTPServer, c.Countries)
}
}
// Send the spot message to TCP server
c.MsgChan <- message
}
}
}