mirror
/
rogueserver
mirror of https://github.com/pagefaultgames/rogueserver
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Serve game content and API"

Browse Source 
This reverts commit 6bd7deb3de.
pull/4/head
maru 8 months ago
parent 6bd7deb3de
commit 0fec7cb4c3
No known key found for this signature in database
GPG Key ID: 37689350E9CD0F0D
4 changed files with 255 additions and 225 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape Escape View File

@ -3,4 +3,3 @@
pokerogue-server*
userdata/*
secret.key
www/

24
api/common.go
Unescape Escape View File

@ -10,31 +10,9 @@ import (
"github.com/pagefaultgames/pokerogue-server/db"
)
func Init(mux *http.ServeMux) {
func Init() {
scheduleStatRefresh()
daily.Init()
// account
mux.HandleFunc("GET /api/account/info", handleAccountInfo)
mux.HandleFunc("POST /api/account/register", handleAccountRegister)
mux.HandleFunc("POST /api/account/login", handleAccountLogin)
mux.HandleFunc("GET /api/account/logout", handleAccountLogout)
// game
mux.HandleFunc("GET /api/game/playercount", handleGamePlayerCount)
mux.HandleFunc("GET /api/game/titlestats", handleGameTitleStats)
mux.HandleFunc("GET /api/game/classicsessioncount", handleGameClassicSessionCount)
// savedata
mux.HandleFunc("GET /api/savedata/get", handleSaveData)
mux.HandleFunc("POST /api/savedata/update", handleSaveData)
mux.HandleFunc("GET /api/savedata/delete", handleSaveData)
mux.HandleFunc("POST /api/savedata/clear", handleSaveData)
// daily
mux.HandleFunc("GET /api/daily/seed", handleDailySeed)
mux.HandleFunc("GET /api/daily/rankings", handleDailyRankings)
mux.HandleFunc("GET /api/daily/rankingpagecount", handleDailyRankingPageCount)
}
func getUsernameFromRequest(r *http.Request) (string, error) {

81
api/endpoints.go
Unescape Escape View File

@ -7,6 +7,7 @@ import (
"log"
"net/http"
"strconv"
"sync"
"github.com/pagefaultgames/pokerogue-server/api/account"
"github.com/pagefaultgames/pokerogue-server/api/daily"
@ -14,13 +15,36 @@ import (
"github.com/pagefaultgames/pokerogue-server/defs"
)
type Server struct {
Debug bool
Exit *sync.RWMutex
}
/*
The caller of endpoint handler functions are responsible for extracting the necessary data from the request.
Handler functions are responsible for checking the validity of this data and returning a result or error.
Handlers should not return serialized JSON, instead return the struct itself.
*/
func handleAccountInfo(w http.ResponseWriter, r *http.Request) {
func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
// kind of misusing the RWMutex but it doesn't matter
s.Exit.RLock()
defer s.Exit.RUnlock()
if s.Debug {
w.Header().Set("Access-Control-Allow-Headers", "*")
w.Header().Set("Access-Control-Allow-Methods", "*")
w.Header().Set("Access-Control-Allow-Origin", "*")
if r.Method == "OPTIONS" {
w.WriteHeader(http.StatusOK)
return
}
}
switch r.URL.Path {
// /account
case "/account/info":
username, err := getUsernameFromRequest(r)
if err != nil {
httpError(w, r, err, http.StatusBadRequest)
@ -44,9 +68,7 @@ func handleAccountInfo(w http.ResponseWriter, r *http.Request) {
httpError(w, r, fmt.Errorf("failed to encode response json: %s", err), http.StatusInternalServerError)
return
}
}
func handleAccountRegister(w http.ResponseWriter, r *http.Request) {
case "/account/register":
err := r.ParseForm()
if err != nil {
httpError(w, r, fmt.Errorf("failed to parse request form: %s", err), http.StatusBadRequest)
@ -60,9 +82,7 @@ func handleAccountRegister(w http.ResponseWriter, r *http.Request) {
}
w.WriteHeader(http.StatusOK)
}
func handleAccountLogin(w http.ResponseWriter, r *http.Request) {
case "/account/login":
err := r.ParseForm()
if err != nil {
httpError(w, r, fmt.Errorf("failed to parse request form: %s", err), http.StatusBadRequest)
@ -80,9 +100,7 @@ func handleAccountLogin(w http.ResponseWriter, r *http.Request) {
httpError(w, r, fmt.Errorf("failed to encode response json: %s", err), http.StatusInternalServerError)
return
}
}
func handleAccountLogout(w http.ResponseWriter, r *http.Request) {
case "/account/logout":
token, err := base64.StdEncoding.DecodeString(r.Header.Get("Authorization"))
if err != nil {
httpError(w, r, fmt.Errorf("failed to decode token: %s", err), http.StatusBadRequest)
@ -96,13 +114,11 @@ func handleAccountLogout(w http.ResponseWriter, r *http.Request) {
}
w.WriteHeader(http.StatusOK)
}
func handleGamePlayerCount(w http.ResponseWriter, r *http.Request) {
// /game
case "/game/playercount":
w.Write([]byte(strconv.Itoa(playerCount)))
}
func handleGameTitleStats(w http.ResponseWriter, r *http.Request) {
case "/game/titlestats":
err := json.NewEncoder(w).Encode(defs.TitleStats{
PlayerCount: playerCount,
BattleCount: battleCount,
@ -111,13 +127,11 @@ func handleGameTitleStats(w http.ResponseWriter, r *http.Request) {
httpError(w, r, fmt.Errorf("failed to encode response json: %s", err), http.StatusInternalServerError)
return
}
}
func handleGameClassicSessionCount(w http.ResponseWriter, r *http.Request) {
case "/game/classicsessioncount":
w.Write([]byte(strconv.Itoa(classicSessionCount)))
}
func handleSaveData(w http.ResponseWriter, r *http.Request) {
// /savedata
case "/savedata/get", "/savedata/update", "/savedata/delete", "/savedata/clear":
uuid, err := getUUIDFromRequest(r)
if err != nil {
httpError(w, r, err, http.StatusBadRequest)
@ -144,7 +158,7 @@ func handleSaveData(w http.ResponseWriter, r *http.Request) {
var save any
// /savedata/get and /savedata/delete specify datatype, but don't expect data in body
if r.URL.Path != "/api/savedata/get" && r.URL.Path != "/api/savedata/delete" {
if r.URL.Path != "/savedata/get" && r.URL.Path != "/savedata/delete" {
if datatype == 0 {
var system defs.SystemSaveData
err = json.NewDecoder(r.Body).Decode(&system)
@ -155,7 +169,7 @@ func handleSaveData(w http.ResponseWriter, r *http.Request) {
save = system
// /savedata/clear doesn't specify datatype, it is assumed to be 1 (session)
} else if datatype == 1 || r.URL.Path == "/api/savedata/clear" {
} else if datatype == 1 || r.URL.Path == "/savedata/clear" {
var session defs.SessionSaveData
err = json.NewDecoder(r.Body).Decode(&session)
if err != nil {
@ -168,13 +182,13 @@ func handleSaveData(w http.ResponseWriter, r *http.Request) {
}
switch r.URL.Path {
case "/api/savedata/get":
case "/savedata/get":
save, err = savedata.Get(uuid, datatype, slot)
case "/api/savedata/update":
case "/savedata/update":
err = savedata.Update(uuid, slot, save)
case "/api/savedata/delete":
case "/savedata/delete":
err = savedata.Delete(uuid, datatype, slot)
case "/api/savedata/clear":
case "/savedata/clear":
s, ok := save.(defs.SessionSaveData)
if !ok {
httpError(w, r, fmt.Errorf("save data is not type SessionSaveData"), http.StatusBadRequest)
@ -189,7 +203,7 @@ func handleSaveData(w http.ResponseWriter, r *http.Request) {
return
}
if save == nil || r.URL.Path == "/api/savedata/update" {
if save == nil || r.URL.Path == "/savedata/update" {
w.WriteHeader(http.StatusOK)
return
}
@ -199,13 +213,11 @@ func handleSaveData(w http.ResponseWriter, r *http.Request) {
httpError(w, r, fmt.Errorf("failed to encode response json: %s", err), http.StatusInternalServerError)
return
}
}
func handleDailySeed(w http.ResponseWriter, r *http.Request) {
// /daily
case "/daily/seed":
w.Write([]byte(daily.Seed()))
}
func handleDailyRankings(w http.ResponseWriter, r *http.Request) {
case "/daily/rankings":
uuid, err := getUUIDFromRequest(r)
if err != nil {
httpError(w, r, err, http.StatusBadRequest)
@ -241,9 +253,7 @@ func handleDailyRankings(w http.ResponseWriter, r *http.Request) {
httpError(w, r, fmt.Errorf("failed to encode response json: %s", err), http.StatusInternalServerError)
return
}
}
func handleDailyRankingPageCount(w http.ResponseWriter, r *http.Request) {
case "/daily/rankingpagecount":
var category int
if r.URL.Query().Has("category") {
var err error
@ -260,6 +270,7 @@ func handleDailyRankingPageCount(w http.ResponseWriter, r *http.Request) {
}
w.Write([]byte(strconv.Itoa(count)))
}
}
func httpError(w http.ResponseWriter, r *http.Request, err error, code int) {

68
pokerogue-server.go
Unescape Escape View File

@ -4,7 +4,12 @@ import (
"encoding/gob"
"flag"
"log"
"net"
"net/http"
"os"
"os/signal"
"sync"
"syscall"
"github.com/pagefaultgames/pokerogue-server/api"
"github.com/pagefaultgames/pokerogue-server/db"
@ -12,10 +17,10 @@ import (
func main() {
// flag stuff
addr := flag.String("addr", "0.0.0.0:80", "network address for api to listen on")
wwwpath := flag.String("wwwpath", "www", "path to static content to serve")
tlscert := flag.String("tlscert", "", "path to tls certificate to use for https")
tlskey := flag.String("tlskey", "", "path to tls private key to use for https")
debug := flag.Bool("debug", false, "debug mode")
proto := flag.String("proto", "tcp", "protocol for api to use (tcp, unix)")
addr := flag.String("addr", "0.0.0.0", "network address for api to listen on")
dbuser := flag.String("dbuser", "pokerogue", "database username")
dbpass := flag.String("dbpass", "", "database password")
@ -25,6 +30,7 @@ func main() {
flag.Parse()
// register gob types
gob.Register([]interface{}{})
gob.Register(map[string]interface{}{})
@ -35,19 +41,55 @@ func main() {
log.Fatalf("failed to initialize database: %s", err)
}
// start web server
mux := http.NewServeMux()
// create listener
listener, err := createListener(*proto, *addr)
if err != nil {
log.Fatalf("failed to create net listener: %s", err)
}
api.Init(mux)
// create exit handler
var exit sync.RWMutex
createExitHandler(&exit)
mux.Handle("/", http.FileServer(http.Dir(*wwwpath)))
// init api
api.Init()
if *tlscert != "" && *tlskey != "" {
err = http.ListenAndServeTLS(*addr, *tlscert, *tlskey, mux)
} else {
err = http.ListenAndServe(*addr, mux)
}
// start web server
err = http.Serve(listener, &api.Server{Debug: *debug, Exit: &exit})
if err != nil {
log.Fatalf("failed to create http server or server errored: %s", err)
}
}
func createListener(proto, addr string) (net.Listener, error) {
if proto == "unix" {
os.Remove(addr)
}
listener, err := net.Listen(proto, addr)
if err != nil {
return nil, err
}
if proto == "unix" {
os.Chmod(addr, 0777)
}
return listener, nil
}
func createExitHandler(mtx *sync.RWMutex) {
s := make(chan os.Signal, 1)
signal.Notify(s, syscall.SIGINT, syscall.SIGTERM)
go func() {
// wait for exit signal of some kind
<-s
// block new requests and wait for existing ones to finish
mtx.Lock()
// bail
os.Exit(0)
}()
}

Write Preview
Loading…
Cancel
Save