Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Server: refactor server code for readability and maintainability #6

Merged
merged 2 commits into from
Dec 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/build-server.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
name: Build Server
on: [push, pull_request, workflow_dispatch]
env:
CGO_LDFLAGS: -Wl,--no-as-needed
jobs:
build:
runs-on: ${{matrix.os}}
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,6 @@ build/*
.vscode/*
out/*
.vs/*
tools/steamtwice/build/*
tools/steamtwice/build/*
tools/steamtwice/CMakeFiles
tools/steamtwice/CMakeCache*
11 changes: 0 additions & 11 deletions server/automatamp/Client.go

This file was deleted.

19 changes: 10 additions & 9 deletions server/automatamp/MockClient.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"math/rand"
"time"

core "github.com/praydog/AutomataMP/server/automatamp/core"
nier "github.com/praydog/AutomataMP/server/automatamp/nier"

"github.com/codecat/go-enet"
Expand All @@ -30,11 +31,11 @@ type MockClient struct {
}

func (mock *MockClient) sendPing(peer enet.Peer) {
peer.SendBytes(makeEmptyPacketBytes(nier.PacketTypeID_PING), 0, enet.PacketFlagReliable)
peer.SendBytes(core.MakeEmptyPacketBytes(nier.PacketTypeID_PING), 0, enet.PacketFlagReliable)
}

func (mock *MockClient) sendHello(peer enet.Peer, name string, password string) {
helloBytes := builderSurround(func(builder *flatbuffers.Builder) flatbuffers.UOffsetT {
helloBytes := core.BuilderSurround(func(builder *flatbuffers.Builder) flatbuffers.UOffsetT {
name_pkt := builder.CreateString(name)
pwd_pkt := builder.CreateString(password)
nier.HelloStart(builder)
Expand All @@ -48,7 +49,7 @@ func (mock *MockClient) sendHello(peer enet.Peer, name string, password string)
return nier.HelloEnd(builder)
})

pkt := makePacketBytes(nier.PacketTypeID_HELLO, helloBytes)
pkt := core.MakePacketBytes(nier.PacketTypeID_HELLO, helloBytes)
peer.SendBytes(pkt, 0, enet.PacketFlagReliable)
}

Expand All @@ -64,7 +65,7 @@ func (mock *MockClient) getNextPacket(ev enet.Event) *nier.Packet {

data := nier.GetRootAsPacket(packetBytes, 0)

if !checkValidPacket(data) {
if !core.CheckValidPacket(data) {
return nil
}

Expand Down Expand Up @@ -190,11 +191,11 @@ func (mock *MockClient) Run() {
if ev.GetType() == enet.EventNone {
if once_test {
log.Info("Sending animation start")
animationStartBytes := builderSurround(func(builder *flatbuffers.Builder) flatbuffers.UOffsetT {
animationStartBytes := core.BuilderSurround(func(builder *flatbuffers.Builder) flatbuffers.UOffsetT {
return nier.CreateAnimationStart(builder, 1, 2, 3, 4)
})

animationData := makePacketBytes(nier.PacketTypeID_ANIMATION_START, animationStartBytes)
animationData := core.MakePacketBytes(nier.PacketTypeID_ANIMATION_START, animationStartBytes)
peer.SendBytes(animationData, 0, enet.PacketFlagReliable)

once_test = false
Expand All @@ -211,11 +212,11 @@ func (mock *MockClient) Run() {
if now.Sub(sendUpdateTime) >= (time.Second / 60) {
//log.Info("Sending update")

playerDataBytes := builderSurround(func(builder *flatbuffers.Builder) flatbuffers.UOffsetT {
playerDataBytes := core.BuilderSurround(func(builder *flatbuffers.Builder) flatbuffers.UOffsetT {
return nier.CreatePlayerData(builder, true, 0.1, 0.5, 0.25, 1, 0, 0, rand.Float32(), rand.Float32(), 250.0)
})

packetData := makePacketBytes(nier.PacketTypeID_PLAYER_DATA, playerDataBytes)
packetData := core.MakePacketBytes(nier.PacketTypeID_PLAYER_DATA, playerDataBytes)
peer.SendBytes(packetData, 0, enet.PacketFlagReliable)
sendUpdateTime = now
continue
Expand All @@ -240,7 +241,7 @@ func (mock *MockClient) Run() {

data := nier.GetRootAsPacket(packetBytes, 0)

if !checkValidPacket(data) {
if !core.CheckValidPacket(data) {
continue
}

Expand Down
Loading
Loading