Client initial commit.

This commit is contained in:
2024-12-10 18:55:23 -05:00
commit ca681f08cd
20 changed files with 870 additions and 0 deletions

15
server/.vscode/launch.json vendored Normal file
View File

@@ -0,0 +1,15 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Launch Package",
"type": "go",
"request": "launch",
"mode": "auto",
"program": "main.go"
}
]
}

8
server/client/client.go Normal file
View File

@@ -0,0 +1,8 @@
package client
import "net"
type Client struct {
Name string
Connection net.Conn
}

204
server/clientdata.pb.go Normal file
View File

@@ -0,0 +1,204 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.35.2
// protoc v5.29.1
// source: clientdata.proto
package __
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 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 *ClientData_Coordinates `protobuf:"bytes,4,opt,name=coordinates,proto3" json:"coordinates,omitempty"`
}
func (x *ClientData) Reset() {
*x = ClientData{}
mi := &file_clientdata_proto_msgTypes[0]
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[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 ClientData.ProtoReflect.Descriptor instead.
func (*ClientData) Descriptor() ([]byte, []int) {
return file_clientdata_proto_rawDescGZIP(), []int{0}
}
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() *ClientData_Coordinates {
if x != nil {
return x.Coordinates
}
return nil
}
type ClientData_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 *ClientData_Coordinates) Reset() {
*x = ClientData_Coordinates{}
mi := &file_clientdata_proto_msgTypes[1]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
func (x *ClientData_Coordinates) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*ClientData_Coordinates) ProtoMessage() {}
func (x *ClientData_Coordinates) 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_Coordinates.ProtoReflect.Descriptor instead.
func (*ClientData_Coordinates) Descriptor() ([]byte, []int) {
return file_clientdata_proto_rawDescGZIP(), []int{0, 0}
}
func (x *ClientData_Coordinates) GetX() float64 {
if x != nil {
return x.X
}
return 0
}
func (x *ClientData_Coordinates) GetY() float64 {
if x != nil {
return x.Y
}
return 0
}
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, 0xa5, 0x01, 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, 0x3e, 0x0a, 0x0b, 0x63, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e,
0x61, 0x74, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x6d, 0x61, 0x69,
0x6e, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x44, 0x61, 0x74, 0x61, 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, 0x1a, 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,
0x42, 0x04, 0x5a, 0x02, 0x2e, 0x2f, 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, 2)
var file_clientdata_proto_goTypes = []any{
(*ClientData)(nil), // 0: main.ClientData
(*ClientData_Coordinates)(nil), // 1: main.ClientData.Coordinates
}
var file_clientdata_proto_depIdxs = []int32{
1, // 0: main.ClientData.coordinates:type_name -> main.ClientData.Coordinates
1, // [1:1] is the sub-list for method output_type
1, // [1:1] is the sub-list for method input_type
1, // [1:1] is the sub-list for extension type_name
1, // [1:1] is the sub-list for extension extendee
0, // [0:1] 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: 2,
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
}

15
server/clientdata.proto Normal file
View File

@@ -0,0 +1,15 @@
syntax="proto3";
package main;
option go_package = "./";
message ClientData {
string Address = 1;
string Name = 2;
message Coordinates {
double X=1;
double Y=2;
}
Coordinates coordinates = 4;
}

View File

@@ -0,0 +1,4 @@
package commands
type Command struct {
}

View File

@@ -0,0 +1,6 @@
package gamedata
type Coordinates struct {
X float64
Y float64
}

8
server/go.mod Normal file
View File

@@ -0,0 +1,8 @@
module server
go 1.21.6
require (
github.com/golang/protobuf v1.5.4 // indirect
google.golang.org/protobuf v1.33.0 // indirect
)

13
server/main.go Normal file
View File

@@ -0,0 +1,13 @@
package main
import (
"fmt"
"server/server"
)
func main() {
fmt.Println("Server v0.04")
server := server.NewServer()
server.Start(501)
}

165
server/server/server.go Normal file
View File

@@ -0,0 +1,165 @@
package server
import (
"bufio"
"fmt"
"log"
"net"
"server/gamedata"
"strconv"
"strings"
"sync"
"time"
)
type ClientData struct {
Address string
Name string
Position gamedata.Coordinates
}
type Server struct {
//clientlist map[net.Conn]string
clientlist map[net.Conn]ClientData
mu sync.Mutex
}
func NewServer() *Server {
s := &Server{
//clientlist: make(map[net.Conn]string),
clientlist: make(map[net.Conn]ClientData),
}
return s
}
func (s *Server) Start(port int) {
log.Println("Listening for new connections")
listener, err := net.Listen("tcp", ":"+fmt.Sprintf("%d", port))
if err != nil {
log.Fatal(err)
}
defer listener.Close()
go s.ManageBroadcast()
for {
conn, err := listener.Accept()
if err != nil {
log.Println("Error accepting connection: ", err)
continue
}
log.Println("New connection " + conn.RemoteAddr().String())
go s.HandleClient(conn)
}
}
func (s *Server) HandleClient(conn net.Conn) {
//remove client from list upon disconnection
defer func() {
log.Println("Disconnecting client " + conn.RemoteAddr().String())
s.mu.Lock()
delete(s.clientlist, conn)
s.mu.Unlock()
conn.Close()
}()
//create the outline of client data, so far we know only
//their addr, then add it to our client list
clientdata := ClientData{
Address: conn.RemoteAddr().String(),
}
s.mu.Lock()
//s.clientlist[conn] = conn.RemoteAddr().String()
s.clientlist[conn] = clientdata
s.mu.Unlock()
for {
// Read data from the client
data, err := bufio.NewReader(conn).ReadString('\n')
if err != nil {
return // Exit the Goroutine when the client disconnects
}
fmt.Println("Received:", string(data))
data = data[:len(data)-1]
//s.BroadcastMessage(conn, string(data))
//now we update our information with their data:
serverinfo := strings.Split(string(data), ",")
if len(serverinfo) == 3 {
x, err := strconv.Atoi(serverinfo[1])
if err != nil {
x = 0
}
y, err := strconv.Atoi(serverinfo[2])
if err != nil {
y = 0
}
cd := ClientData{
Address: conn.RemoteAddr().String(),
Name: serverinfo[0],
Position: gamedata.Coordinates{X: float64(x), Y: float64(y)},
}
s.mu.Lock()
s.clientlist[conn] = cd
s.mu.Unlock()
}
}
}
func (s *Server) BroadcastMessage(sender net.Conn, message string) {
s.mu.Lock()
defer s.mu.Unlock()
for client, addr := range s.clientlist {
if client != sender {
//_, err := client.Write([]byte("From " + sender.RemoteAddr().String() + ": " + message + "\n"))
_, err := client.Write([]byte(message))
if err != nil {
fmt.Println("Error sending message to", addr, ":", err)
}
}
}
}
func (s *Server) ManageBroadcast() {
for {
broadcastmsg := s.BuildBroadcastMessage()
s.mu.Lock()
for client, data := range s.clientlist {
_, err := client.Write([]byte(broadcastmsg))
if err != nil {
fmt.Println("Error sending message to ", data.Address, ": ", err)
}
}
s.mu.Unlock()
//fmt.Println("Broadcasting:: ", broadcastmsg)
time.Sleep(time.Millisecond * 30)
}
}
func (s *Server) BuildBroadcastMessage() string {
msg := "{"
s.mu.Lock()
for _, data := range s.clientlist {
msg = msg + fmt.Sprintf("%s,%s,%.0f,%.0f;", data.Address, data.Name, data.Position.X, data.Position.Y)
}
s.mu.Unlock()
msg = msg + "}\n"
return msg
}
func (s *Server) Disconnect() {
}