mats/go-cart-actor
1
0
Fork 0
Code Issues Pull Requests 1 Actions 3 Packages Projects Releases Wiki Activity

test it
All checks were successful
Build and Publish / BuildAndDeploy (push) Successful in 1m51s
Details

Browse Source
This commit is contained in:
matst80
2024-11-10 20:30:12 +01:00
parent 8f0e062817
commit 113ecaccad
5 changed files with 42 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cart-packet-queue.go
View File

@@ -18,22 +18,22 @@ type CartPacketWithData struct {
} }
type CartPacketQueue struct { type CartPacketQueue struct {
mu sync.RWMutex mu sync.RWMutex
Packets []CartPacketWithData Packets []CartPacketWithData
connection net.Conn //connection net.Conn
} }
func NewCartPacketQueue(connection net.Conn) *CartPacketQueue { func NewCartPacketQueue(connection net.Conn) *CartPacketQueue {
queue := &CartPacketQueue{ queue := &CartPacketQueue{
Packets: make([]CartPacketWithData, 0), Packets: make([]CartPacketWithData, 0),
connection: connection, //connection: connection,
} }
go func() { go func() {
defer connection.Close() defer connection.Close()
var packet CartPacket var packet CartPacket
for { for {
err := ReadPacket(queue.connection, &packet) err := ReadPacket(connection, &packet)
ts := time.Now() ts := time.Now()
if err != nil { if err != nil {
@@ -44,7 +44,7 @@ func NewCartPacketQueue(connection net.Conn) *CartPacketQueue {
//return //return
} }
data, err := GetPacketData(queue.connection, int(packet.DataLength)) data, err := GetPacketData(connection, int(packet.DataLength))
if err != nil { if err != nil {
log.Printf("Error receiving packet data: %v\n", err) log.Printf("Error receiving packet data: %v\n", err)
return return

15
packet-queue.go
View File

@@ -17,22 +17,22 @@ type PacketWithData struct {
} }
type PacketQueue struct { type PacketQueue struct {
mu sync.RWMutex mu sync.RWMutex
Packets []PacketWithData Packets []PacketWithData
connection net.Conn //connection net.Conn
} }
func NewPacketQueue(connection net.Conn) *PacketQueue { func NewPacketQueue(connection net.Conn) *PacketQueue {
queue := &PacketQueue{ queue := &PacketQueue{
Packets: make([]PacketWithData, 0), Packets: make([]PacketWithData, 0),
connection: connection, //connection: connection,
} }
go func() { go func() {
defer connection.Close() defer connection.Close()
var packet Packet var packet Packet
for { for {
err := ReadPacket(queue.connection, &packet) err := ReadPacket(connection, &packet)
ts := time.Now() ts := time.Now()
if err != nil { if err != nil {
@@ -42,10 +42,9 @@ func NewPacketQueue(connection net.Conn) *PacketQueue {
log.Printf("Error receiving packet: %v\n", err) log.Printf("Error receiving packet: %v\n", err)
//return //return
} }
data, err := GetPacketData(queue.connection, int(packet.DataLength)) data, err := GetPacketData(connection, int(packet.DataLength))
if err != nil { if err != nil {
log.Printf("Error receiving packet data: %v\n", err) log.Printf("Error receiving packet data: %v\n", err)
return
} }
queue.mu.Lock() queue.mu.Lock()

23
synced-pool.go
View File

@@ -21,7 +21,7 @@ type RemoteHost struct {
*Client *Client
Host string Host string
MissedPings int MissedPings int
Pool *RemoteGrainPool //Pool *RemoteGrainPool
} }
type SyncedPool struct { type SyncedPool struct {
@@ -358,33 +358,38 @@ func (p *SyncedPool) addRemoteHost(address string, remote *RemoteHost) error {
return nil return nil
} }
func (p *SyncedPool) AddRemote(address string) error { func (p *SyncedPool) AddRemote(host string) error {
if address == "" || p.IsKnown(address) { if host == "" || p.IsKnown(host) {
return nil return nil
} }
client, err := Dial(fmt.Sprintf("%s:1338", address)) client, err := Dial(fmt.Sprintf("%s:1338", host))
if err != nil {
log.Printf("Error connecting to remote %s: %v\n", host, err)
}
_, err = client.Call(Ping, Pong, nil)
if err != nil { if err != nil {
log.Printf("Error connecting to remote %s: %v\n", address, err) log.Printf("Error pinging remote %s: %v\n", host, err)
return err return err
} }
pool := NewRemoteGrainPool(address) //pool := NewRemoteGrainPool(host)
remote := RemoteHost{ remote := RemoteHost{
Client: client, Client: client,
Pool: pool, // Pool: pool,
Host: address, Host: host,
} }
go func() { go func() {
for range client.Errors { for range client.Errors {
if client.ErrorCount > 3 { if client.ErrorCount > 3 {
log.Printf("Error count exceeded, removing remote %s\n", host)
p.RemoveHost(&remote) p.RemoveHost(&remote)
} }
} }
}() }()
return p.addRemoteHost(address, &remote) return p.addRemoteHost(host, &remote)
} }
func (p *SyncedPool) getGrain(id CartId) (Grain, error) { func (p *SyncedPool) getGrain(id CartId) (Grain, error) {

15
tcp-cart-client.go
View File

@@ -2,7 +2,6 @@ package main
import ( import (
"encoding/binary" "encoding/binary"
"io"
"net" "net"
"time" "time"
) )
@@ -83,13 +82,13 @@ func (m *CartTCPClient) SendPacket(messageType uint16, id CartId, data []byte) e
return err return err
} }
func (m *CartTCPClient) SendPacketFn(messageType uint16, id CartId, datafn func(w io.Writer) error) error { // func (m *CartTCPClient) SendPacketFn(messageType uint16, id CartId, datafn func(w io.Writer) error) error {
data, err := GetData(datafn) // data, err := GetData(datafn)
if err != nil { // if err != nil {
return err // return err
} // }
return m.SendPacket(messageType, id, data) // return m.SendPacket(messageType, id, data)
} // }
func (m *CartTCPClient) Call(messageType uint16, id CartId, responseType uint16, data []byte) ([]byte, error) { func (m *CartTCPClient) Call(messageType uint16, id CartId, responseType uint16, data []byte) ([]byte, error) {
err := m.SendPacket(messageType, id, data) err := m.SendPacket(messageType, id, data)

15
tcp-client.go
View File

@@ -2,7 +2,6 @@ package main
import ( import (
"encoding/binary" "encoding/binary"
"io"
"net" "net"
"time" "time"
) )
@@ -82,13 +81,13 @@ func (m *TCPClient) SendPacket(messageType uint16, data []byte) error {
return err return err
} }
func (m *TCPClient) SendPacketFn(messageType uint16, datafn func(w io.Writer) error) error { // func (m *TCPClient) SendPacketFn(messageType uint16, datafn func(w io.Writer) error) error {
data, err := GetData(datafn) // data, err := GetData(datafn)
if err != nil { // if err != nil {
return err // return err
} // }
return m.SendPacket(messageType, data) // return m.SendPacket(messageType, data)
} // }
func (m *TCPClient) Call(messageType uint16, responseType uint16, data []byte) ([]byte, error) { func (m *TCPClient) Call(messageType uint16, responseType uint16, data []byte) ([]byte, error) {
err := m.SendPacket(messageType, data) err := m.SendPacket(messageType, data)