backup/showbridge-go
1
0
Fork 0
mirror of https://github.com/jwetzell/showbridge-go.git synced 2026-04-27 05:15:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup TCP client connection handling

Browse Source
This commit is contained in:
Joel Wetzell
2025-12-03 23:03:02 -06:00
parent cb7504922e
commit ba2fead834
1 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
tcp-client.go
View File

@@ -11,11 +11,10 @@ import (
type TCPClient struct { type TCPClient struct {
config ModuleConfig config ModuleConfig
Host string
Port uint16
framer framing.Framer framer framing.Framer
conn net.Conn conn net.Conn
router *Router router *Router
Addr *net.TCPAddr
} }
func init() { func init() {
@@ -46,6 +45,11 @@ func init() {
return nil, fmt.Errorf("net.tcp.client port must be uint16") return nil, fmt.Errorf("net.tcp.client port must be uint16")
} }
addr, err := net.ResolveTCPAddr("tcp", fmt.Sprintf("%s:%d", hostString, uint16(portNum)))
if err != nil {
return nil, err
}
framingMethod, ok := params["framing"] framingMethod, ok := params["framing"]
if !ok { if !ok {
return nil, fmt.Errorf("net.tcp.client requires a framing method") return nil, fmt.Errorf("net.tcp.client requires a framing method")
@@ -72,7 +76,7 @@ func init() {
return nil, fmt.Errorf("unknown framing method: %s", framingMethodString) return nil, fmt.Errorf("unknown framing method: %s", framingMethodString)
} }
return &TCPClient{framer: framer, Host: hostString, Port: uint16(portNum), config: config}, nil return &TCPClient{framer: framer, Addr: addr, config: config}, nil
}, },
}) })
} }
@@ -90,10 +94,6 @@ func (tc *TCPClient) RegisterRouter(router *Router) {
} }
func (tc *TCPClient) Run() error { func (tc *TCPClient) Run() error {
addr, err := net.ResolveTCPAddr("tcp", fmt.Sprintf("%s:%d", tc.Host, tc.Port))
if err != nil {
return err
}
// TODO(jwetzell): shutdown with router.Context properly // TODO(jwetzell): shutdown with router.Context properly
go func() { go func() {
@@ -105,7 +105,7 @@ func (tc *TCPClient) Run() error {
}() }()
for { for {
client, err := net.DialTCP("tcp", nil, addr) err := tc.SetupConn()
if err != nil { if err != nil {
if tc.router.Context.Err() != nil { if tc.router.Context.Err() != nil {
slog.Debug("router context done in module", "id", tc.config.Id) slog.Debug("router context done in module", "id", tc.config.Id)
@@ -116,8 +116,6 @@ func (tc *TCPClient) Run() error {
continue continue
} }
tc.conn = client
buffer := make([]byte, 1024) buffer := make([]byte, 1024)
select { select {
case <-tc.router.Context.Done(): case <-tc.router.Context.Done():
@@ -131,7 +129,7 @@ func (tc *TCPClient) Run() error {
slog.Debug("router context done in module", "id", tc.config.Id) slog.Debug("router context done in module", "id", tc.config.Id)
return nil return nil
default: default:
byteCount, err := client.Read(buffer) byteCount, err := tc.conn.Read(buffer)
if err != nil { if err != nil {
tc.framer.Clear() tc.framer.Clear()
@@ -151,22 +149,29 @@ func (tc *TCPClient) Run() error {
} }
} }
} }
} }
} }
} }
}
func (tc *TCPClient) SetupConn() error {
client, err := net.DialTCP("tcp", nil, tc.Addr)
tc.conn = client
return err
} }
func (tc *TCPClient) Output(payload any) error { func (tc *TCPClient) Output(payload any) error {
if tc.conn != nil { // NOTE(jwetzell): not sure how this would occur but
if tc.conn == nil {
err := tc.SetupConn()
if err != nil {
return err
}
}
payloadBytes, ok := payload.([]byte) payloadBytes, ok := payload.([]byte)
if !ok { if !ok {
return fmt.Errorf("net.tcp.client is only able to output bytes") return fmt.Errorf("net.tcp.client is only able to output bytes")
} }
_, err := tc.conn.Write(tc.framer.Encode(payloadBytes)) _, err := tc.conn.Write(tc.framer.Encode(payloadBytes))
return err return err
}
return nil
} }