diego/networkzero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated read/writes, fully using buffers now.

Browse Source
This commit is contained in:
iegod
2024-12-10 20:30:51 -05:00
parent ca681f08cd
commit cc9edb7825
8 changed files with 906 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
client/client/client.go
View File

@@ -1,9 +1,13 @@
package client
import (
"bufio"
"client/pb"
"encoding/binary"
"fmt"
"io"
"net"
"github.com/golang/protobuf/proto"
)
type Client struct {
@@ -28,6 +32,33 @@ func NewClient() *Client {
return c
}
func (c *Client) SendProtoData(coords *pb.ClientCoordinates) {
data, err := proto.Marshal(coords)
if err != nil {
fmt.Println("We fucked the serialization. ", err)
return
}
// Add length prefix
length := uint32(len(data))
buf := make([]byte, 4+len(data))
binary.BigEndian.PutUint32(buf[:4], length)
copy(buf[4:], data)
// Ensure complete write
totalWritten := 0
for totalWritten < len(buf) {
n, err := c.conn.Write(buf[totalWritten:])
if err != nil {
fmt.Printf("Error writing to connection: %v\n", err)
return
}
totalWritten += n
}
}
func (c *Client) SendData(msg string) {
// Send input to the server
//fmt.Fprintf(c.conn, msg)
@@ -38,18 +69,49 @@ func (c *Client) SendData(msg string) {
}
}
func (c *Client) ReadData(callback func(string)) {
func (c *Client) ReadData(callback func(*pb.AllClients)) {
/*
for {
message, err := bufio.NewReader(c.conn).ReadString('\n')
if err != nil {
fmt.Println("Error reading from server:", err)
return
}
if callback != nil {
callback(message)
}
}*/
for {
message, err := bufio.NewReader(c.conn).ReadString('\n')
lengthBuf := make([]byte, 4)
_, err := io.ReadFull(c.conn, lengthBuf)
if err != nil {
fmt.Println("Error reading from server:", err)
fmt.Println("failed to read length prefix: ", err)
return
}
length := binary.BigEndian.Uint32(lengthBuf)
data := make([]byte, length)
_, err = io.ReadFull(c.conn, data)
if err != nil {
fmt.Println("failed to read data: ", err)
return
}
var allclients pb.AllClients
err = proto.Unmarshal(data, &allclients)
if err != nil {
fmt.Println("Error deserializing: ", err)
return
}
if callback != nil {
callback(message)
callback(&allclients)
}
}
}

107
client/game/game.go
View File

@@ -5,10 +5,8 @@ import (
"client/elements"
"client/fonts"
"client/gamedata"
"fmt"
"client/pb"
"maps"
"strconv"
"strings"
"sync"
"time"
@@ -73,7 +71,23 @@ func (g *Game) Update() error {
//broadcast our position
if g.cycle%2 == 0 {
if g.gameclient.IsConnected() {
g.gameclient.SendData(fmt.Sprintf("%s,%.0f,%.0f\n", g.name, g.position.X, g.position.Y))
//g.gameclient.SendData(fmt.Sprintf("%s,%.0f,%.0f\n", g.name, g.position.X, g.position.Y))
cd := &pb.ClientCoordinates{
Name: g.name,
Coordinates: &pb.Coordinates{
X: g.position.X,
Y: g.position.Y,
},
}
g.gameclient.SendProtoData(cd)
/*
cd := *client.ClientData{
Name: g.name,
Address: g.
}*/
}
}
@@ -126,44 +140,63 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (screenwidth, screenheigh
return screenWidth, screenHeight
}
func (g *Game) HandleServerData(data string) {
//log.Println(data)
func (g *Game) HandleServerData(allclients *pb.AllClients) {
raw := data[1 : len(data)-1]
clientinfo := strings.Split(raw, ";")
for _, info := range clientinfo {
subdata := strings.Split(info, ",")
for _, client := range allclients.Clients {
//fmt.Println(client.Coordinates.X)
if len(subdata) == 4 {
if g.gameclient.GetLocalAddr() != subdata[0] {
x, err := strconv.Atoi(subdata[2])
if err != nil {
x = 0
}
y, err := strconv.Atoi(subdata[3])
if err != nil {
y = 0
}
update := ClientData{
Address: subdata[0],
Name: subdata[1],
Position: gamedata.Coordinates{
X: float64(x),
Y: float64(y),
},
}
g.mu.Lock()
g.clients[update.Address] = update
g.mu.Unlock()
}
update := ClientData{
Address: client.Address,
Name: client.Name,
Position: gamedata.Coordinates{
X: client.Coordinates.X,
Y: client.Coordinates.Y,
},
}
g.mu.Lock()
g.clients[update.Address] = update
g.mu.Unlock()
}
//log.Println(data)
/*
raw := data[1 : len(data)-1]
clientinfo := strings.Split(raw, ";")
for _, info := range clientinfo {
subdata := strings.Split(info, ",")
if len(subdata) == 4 {
if g.gameclient.GetLocalAddr() != subdata[0] {
x, err := strconv.Atoi(subdata[2])
if err != nil {
x = 0
}
y, err := strconv.Atoi(subdata[3])
if err != nil {
y = 0
}
update := ClientData{
Address: subdata[0],
Name: subdata[1],
Position: gamedata.Coordinates{
X: float64(x),
Y: float64(y),
},
}
g.mu.Lock()
g.clients[update.Address] = update
g.mu.Unlock()
}
}
}
*/
}
func (g *Game) CleanupClients() {

2
client/go.mod
View File

@@ -5,9 +5,11 @@ go 1.22.0
toolchain go1.22.10
require (
github.com/golang/protobuf v1.5.4
github.com/hajimehoshi/ebiten/v2 v2.8.5
golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d
golang.org/x/image v0.20.0
google.golang.org/protobuf v1.35.2
)
require (

315
client/pb/clientdata.pb.go Normal file
View File

@@ -0,0 +1,315 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.35.2
// protoc v5.29.1
// source: clientdata.proto
package pb
import (
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
sync "sync"
)
const (
// Verify that this generated code is sufficiently up-to-date.
_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
// Verify that runtime/protoimpl is sufficiently up-to-date.
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
type Coordinates struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
X float64 `protobuf:"fixed64,1,opt,name=X,proto3" json:"X,omitempty"`
Y float64 `protobuf:"fixed64,2,opt,name=Y,proto3" json:"Y,omitempty"`
}
func (x *Coordinates) Reset() {
*x = Coordinates{}
mi := &file_clientdata_proto_msgTypes[0]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
func (x *Coordinates) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*Coordinates) ProtoMessage() {}
func (x *Coordinates) ProtoReflect() protoreflect.Message {
mi := &file_clientdata_proto_msgTypes[0]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use Coordinates.ProtoReflect.Descriptor instead.
func (*Coordinates) Descriptor() ([]byte, []int) {
return file_clientdata_proto_rawDescGZIP(), []int{0}
}
func (x *Coordinates) GetX() float64 {
if x != nil {
return x.X
}
return 0
}
func (x *Coordinates) GetY() float64 {
if x != nil {
return x.Y
}
return 0
}
type ClientData struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Address string `protobuf:"bytes,1,opt,name=Address,proto3" json:"Address,omitempty"`
Name string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
Coordinates *Coordinates `protobuf:"bytes,3,opt,name=coordinates,proto3" json:"coordinates,omitempty"`
}
func (x *ClientData) Reset() {
*x = ClientData{}
mi := &file_clientdata_proto_msgTypes[1]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
func (x *ClientData) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*ClientData) ProtoMessage() {}
func (x *ClientData) ProtoReflect() protoreflect.Message {
mi := &file_clientdata_proto_msgTypes[1]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use ClientData.ProtoReflect.Descriptor instead.
func (*ClientData) Descriptor() ([]byte, []int) {
return file_clientdata_proto_rawDescGZIP(), []int{1}
}
func (x *ClientData) GetAddress() string {
if x != nil {
return x.Address
}
return ""
}
func (x *ClientData) GetName() string {
if x != nil {
return x.Name
}
return ""
}
func (x *ClientData) GetCoordinates() *Coordinates {
if x != nil {
return x.Coordinates
}
return nil
}
type ClientCoordinates struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Name string `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
Coordinates *Coordinates `protobuf:"bytes,2,opt,name=coordinates,proto3" json:"coordinates,omitempty"`
}
func (x *ClientCoordinates) Reset() {
*x = ClientCoordinates{}
mi := &file_clientdata_proto_msgTypes[2]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
func (x *ClientCoordinates) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*ClientCoordinates) ProtoMessage() {}
func (x *ClientCoordinates) ProtoReflect() protoreflect.Message {
mi := &file_clientdata_proto_msgTypes[2]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use ClientCoordinates.ProtoReflect.Descriptor instead.
func (*ClientCoordinates) Descriptor() ([]byte, []int) {
return file_clientdata_proto_rawDescGZIP(), []int{2}
}
func (x *ClientCoordinates) GetName() string {
if x != nil {
return x.Name
}
return ""
}
func (x *ClientCoordinates) GetCoordinates() *Coordinates {
if x != nil {
return x.Coordinates
}
return nil
}
type AllClients struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Clients []*ClientData `protobuf:"bytes,1,rep,name=Clients,proto3" json:"Clients,omitempty"`
}
func (x *AllClients) Reset() {
*x = AllClients{}
mi := &file_clientdata_proto_msgTypes[3]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
func (x *AllClients) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*AllClients) ProtoMessage() {}
func (x *AllClients) ProtoReflect() protoreflect.Message {
mi := &file_clientdata_proto_msgTypes[3]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use AllClients.ProtoReflect.Descriptor instead.
func (*AllClients) Descriptor() ([]byte, []int) {
return file_clientdata_proto_rawDescGZIP(), []int{3}
}
func (x *AllClients) GetClients() []*ClientData {
if x != nil {
return x.Clients
}
return nil
}
var File_clientdata_proto protoreflect.FileDescriptor
var file_clientdata_proto_rawDesc = []byte{
0x0a, 0x10, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x12, 0x04, 0x6d, 0x61, 0x69, 0x6e, 0x22, 0x29, 0x0a, 0x0b, 0x43, 0x6f, 0x6f, 0x72,
0x64, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x73, 0x12, 0x0c, 0x0a, 0x01, 0x58, 0x18, 0x01, 0x20, 0x01,
0x28, 0x01, 0x52, 0x01, 0x58, 0x12, 0x0c, 0x0a, 0x01, 0x59, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01,
0x52, 0x01, 0x59, 0x22, 0x6f, 0x0a, 0x0a, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x44, 0x61, 0x74,
0x61, 0x12, 0x18, 0x0a, 0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01,
0x28, 0x09, 0x52, 0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x4e,
0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12,
0x33, 0x0a, 0x0b, 0x63, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x73, 0x18, 0x03,
0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x43, 0x6f, 0x6f, 0x72,
0x64, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x73, 0x52, 0x0b, 0x63, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e,
0x61, 0x74, 0x65, 0x73, 0x22, 0x5c, 0x0a, 0x11, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43, 0x6f,
0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d,
0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x33, 0x0a,
0x0b, 0x63, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01,
0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x43, 0x6f, 0x6f, 0x72, 0x64, 0x69,
0x6e, 0x61, 0x74, 0x65, 0x73, 0x52, 0x0b, 0x63, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74,
0x65, 0x73, 0x22, 0x38, 0x0a, 0x0a, 0x41, 0x6c, 0x6c, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73,
0x12, 0x2a, 0x0a, 0x07, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
0x0b, 0x32, 0x10, 0x2e, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x44,
0x61, 0x74, 0x61, 0x52, 0x07, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73, 0x42, 0x06, 0x5a, 0x04,
0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
file_clientdata_proto_rawDescOnce sync.Once
file_clientdata_proto_rawDescData = file_clientdata_proto_rawDesc
)
func file_clientdata_proto_rawDescGZIP() []byte {
file_clientdata_proto_rawDescOnce.Do(func() {
file_clientdata_proto_rawDescData = protoimpl.X.CompressGZIP(file_clientdata_proto_rawDescData)
})
return file_clientdata_proto_rawDescData
}
var file_clientdata_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
var file_clientdata_proto_goTypes = []any{
(*Coordinates)(nil), // 0: main.Coordinates
(*ClientData)(nil), // 1: main.ClientData
(*ClientCoordinates)(nil), // 2: main.ClientCoordinates
(*AllClients)(nil), // 3: main.AllClients
}
var file_clientdata_proto_depIdxs = []int32{
0, // 0: main.ClientData.coordinates:type_name -> main.Coordinates
0, // 1: main.ClientCoordinates.coordinates:type_name -> main.Coordinates
1, // 2: main.AllClients.Clients:type_name -> main.ClientData
3, // [3:3] is the sub-list for method output_type
3, // [3:3] is the sub-list for method input_type
3, // [3:3] is the sub-list for extension type_name
3, // [3:3] is the sub-list for extension extendee
0, // [0:3] is the sub-list for field type_name
}
func init() { file_clientdata_proto_init() }
func file_clientdata_proto_init() {
if File_clientdata_proto != nil {
return
}
type x struct{}
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_clientdata_proto_rawDesc,
NumEnums: 0,
NumMessages: 4,
NumExtensions: 0,
NumServices: 0,
},
GoTypes: file_clientdata_proto_goTypes,
DependencyIndexes: file_clientdata_proto_depIdxs,
MessageInfos: file_clientdata_proto_msgTypes,
}.Build()
File_clientdata_proto = out.File
file_clientdata_proto_rawDesc = nil
file_clientdata_proto_goTypes = nil
file_clientdata_proto_depIdxs = nil
}