-
Notifications
You must be signed in to change notification settings - Fork 185
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
#267 Restructured server architecture
- Loading branch information
1 parent
fc5adf2
commit 8ad33a2
Showing
10 changed files
with
302 additions
and
256 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,110 +1,16 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "github.com/lxgr-linux/pokete/server/config" | ||
| "github.com/lxgr-linux/pokete/server/responses" | ||
| "github.com/lxgr-linux/pokete/server/status" | ||
| "github.com/lxgr-linux/pokete/server/user_repository" | ||
| "github.com/lxgr-linux/pokete/server/config" | ||
| "github.com/lxgr-linux/pokete/server/server" | ||
| "log" | ||
| "net" | ||
| "os" | ||
|
|
||
| "github.com/lxgr-linux/pokete/server/map_repository" | ||
| "github.com/lxgr-linux/pokete/server/requests" | ||
| ) | ||
|
|
||
| func main() { | ||
| config.Init() | ||
| user_repository.Init() | ||
| err := map_repository.Read() | ||
| if err != nil { | ||
| panic(err.Error()) | ||
| } | ||
| log.Print("Server Running...") | ||
| server, err := net.Listen(config.Get().ServerType, config.Get().ServerHost+":"+config.Get().ServerPort) | ||
| if err != nil { | ||
| log.Print("Error listening:", err.Error()) | ||
| os.Exit(1) | ||
| } | ||
| defer server.Close() | ||
| go status.HandleRequests() | ||
| log.Print("Listening on " + config.Get().ServerHost + ":" + config.Get().ServerPort) | ||
| log.Print("Waiting for client...") | ||
| for { | ||
| connection, err := server.Accept() | ||
| if err != nil { | ||
| log.Print("Error accepting: ", err.Error()) | ||
| os.Exit(1) | ||
| } | ||
| log.Print("client connected") | ||
| go processClient(connection) | ||
| } | ||
| } | ||
|
|
||
| func unmarshallRequest[T requests.RequestBody](res []byte, genericResponseObject *requests.Request[requests.RequestBody]) error { | ||
| responseObject := requests.Request[T]{} | ||
| err := json.Unmarshal(res, &responseObject) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| genericResponseObject.Body = responseObject.Body | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func handleRequests(res []byte, connection *net.Conn) error { | ||
| genericResponseObject := requests.Request[requests.RequestBody]{} | ||
| err := json.Unmarshal(res, &genericResponseObject) | ||
|
|
||
| switch genericResponseObject.Type { | ||
| case requests.RequestType_POSITION_UPDATE: | ||
| err = unmarshallRequest[requests.RequestPosition](res, &genericResponseObject) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| case requests.RequestType_HANDSHAKE: | ||
| err = unmarshallRequest[requests.RequestHandshake](res, &genericResponseObject) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } | ||
|
|
||
| log.Printf("%#v\n", genericResponseObject) | ||
| err = genericResponseObject.Body.Handle(connection) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func removeUser(connection *net.Conn) error { | ||
| thisUser, err := user_repository.GetByConn(connection) | ||
| err = user_repository.RemoveByConn(connection) | ||
| for _, user := range user_repository.GetAllUsers() { | ||
| err = responses.WriteUserRemovedResponse(user.Conn, thisUser.Name) | ||
| } | ||
| err = (*connection).Close() | ||
| return err | ||
| } | ||
|
|
||
| func processClient(connection net.Conn) { | ||
| for { | ||
| buffer := make([]byte, 1024) | ||
| mLen, err := connection.Read(buffer) | ||
| if err != nil { | ||
| log.Print("Error reading:", err) | ||
| break | ||
| } | ||
| err = handleRequests(buffer[:mLen], &connection) | ||
| if err != nil { | ||
| log.Print("Error handeling:", err) | ||
| break | ||
| } | ||
| } | ||
| err := removeUser(&connection) | ||
| pokete, err := server.NewServer(config.NewConfiFromEnv()) | ||
| if err != nil { | ||
| log.Print("Error closing:", err) | ||
| log.Fatal(err) | ||
| } | ||
|
|
||
| pokete.Start() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package provider | ||
|
|
||
| import ( | ||
| "github.com/lxgr-linux/pokete/server/config" | ||
| "github.com/lxgr-linux/pokete/server/map_repository" | ||
| "github.com/lxgr-linux/pokete/server/user_repository" | ||
| ) | ||
|
|
||
| type Provider struct { | ||
| Config config.Config | ||
| MapRepo map_repository.MapRepo | ||
| UserRepo user_repository.UserRepo | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| package handler | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
|
|
||
| "github.com/lxgr-linux/pokete/server/requests" | ||
| ) | ||
|
|
||
| func unmarshallRequest[T requests.RequestBody](res []byte, genericResponseObject *requests.Request[requests.RequestBody]) error { | ||
| responseObject := requests.Request[T]{} | ||
| err := json.Unmarshal(res, &responseObject) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| genericResponseObject.Body = responseObject.Body | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func Handle(res []byte) (genericResponseObject requests.Request[requests.RequestBody], err error) { | ||
| err = json.Unmarshal(res, &genericResponseObject) | ||
|
|
||
| switch genericResponseObject.Type { | ||
| case requests.RequestType_POSITION_UPDATE: | ||
| err = unmarshallRequest[requests.RequestPosition](res, &genericResponseObject) | ||
| if err != nil { | ||
| return | ||
| } | ||
| case requests.RequestType_HANDSHAKE: | ||
| err = unmarshallRequest[requests.RequestHandshake](res, &genericResponseObject) | ||
| if err != nil { | ||
| return | ||
| } | ||
| } | ||
| return | ||
| } |
Oops, something went wrong.