mirror/rogueserver
1
0
Fork 0
mirror of https://github.com/pagefaultgames/rogueserver.git synced 2025-04-03 03:27:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clean up session handlers

Browse Source
This commit is contained in:
Pancakes 2024-06-07 22:38:24 -04:00
parent 16340858bb
commit f6743743fa
No known key found for this signature in database
GPG Key ID: 5792877BFA27DC8F
3 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/common.go
View File

@ -53,8 +53,8 @@ func Init(mux *http.ServeMux) error {
// savedata // savedata
mux.HandleFunc("POST /savedata/update", legacyHandleSaveData) // DEPRECATED: use PUT method mux.HandleFunc("POST /savedata/update", legacyHandleSaveData) // DEPRECATED: use PUT method
mux.HandleFunc("GET /savedata/delete", legacyHandleSaveData) // DEPRECATED: use DELETE method mux.HandleFunc("GET /savedata/delete", legacyHandleSaveData) // DEPRECATED: use DELETE method
mux.HandleFunc("POST /savedata/clear", legacyHandleSaveData) // TODO: use clearSessionData mux.HandleFunc("POST /savedata/clear", legacyHandleSaveData) // TODO: use clearSessionData
mux.HandleFunc("GET /savedata/newclear", legacyHandleNewClear) mux.HandleFunc("GET /savedata/newclear", legacyHandleNewClear)
// new session // new session

25
api/endpoints.go
View File

@ -153,13 +153,14 @@ func handleSession(w http.ResponseWriter, r *http.Request) {
return return
} }
var slot int slot, err := strconv.Atoi(r.URL.Query().Get("slot"))
if r.URL.Query().Has("slot") { if err != nil {
slot, err = strconv.Atoi(r.URL.Query().Get("slot")) httpError(w, r, err, http.StatusBadRequest)
if err != nil { return
httpError(w, r, err, http.StatusBadRequest) }
return
} if slot < 0 || slot >= defs.SessionSlotCount {
httpError(w, r, fmt.Errorf("slot id %d out of range", slot), http.StatusBadRequest)
} }
if !r.URL.Query().Has("clientSessionId") { if !r.URL.Query().Has("clientSessionId") {
@ -180,12 +181,12 @@ func handleSession(w http.ResponseWriter, r *http.Request) {
http.Error(w, err.Error(), http.StatusNotFound) http.Error(w, err.Error(), http.StatusNotFound)
return return
} }
if err != nil { if err != nil {
httpError(w, r, err, http.StatusInternalServerError) httpError(w, r, err, http.StatusInternalServerError)
return return
} }
writeJSON(w, r, save) writeJSON(w, r, save)
case "PUT": case "PUT":
var session defs.SessionSaveData var session defs.SessionSaveData
@ -606,12 +607,12 @@ func handleSystem(w http.ResponseWriter, r *http.Request) {
} else { } else {
httpError(w, r, err, http.StatusInternalServerError) httpError(w, r, err, http.StatusInternalServerError)
} }
return return
} }
// TODO: apply vouchers // TODO: apply vouchers
writeJSON(w, r, save) writeJSON(w, r, save)
case "PUT": case "PUT":
var system defs.SystemSaveData var system defs.SystemSaveData

19
api/savedata/session.go
View File

@ -1,21 +1,12 @@
package savedata package savedata
import ( import (
"fmt"
"github.com/pagefaultgames/rogueserver/db" "github.com/pagefaultgames/rogueserver/db"
"github.com/pagefaultgames/rogueserver/defs" "github.com/pagefaultgames/rogueserver/defs"
) )
func GetSession(uuid []byte, slot int) (defs.SessionSaveData, error) { func GetSession(uuid []byte, slot int) (defs.SessionSaveData, error) {
var session defs.SessionSaveData session, err := db.ReadSessionSaveData(uuid, slot)
if slot < 0 || slot >= defs.SessionSlotCount {
return session, fmt.Errorf("slot id %d out of range", slot)
}
var err error
session, err = db.ReadSessionSaveData(uuid, slot)
if err != nil { if err != nil {
return session, err return session, err
} }
@ -24,10 +15,6 @@ func GetSession(uuid []byte, slot int) (defs.SessionSaveData, error) {
} }
func PutSession(uuid []byte, slot int, data defs.SessionSaveData) error { func PutSession(uuid []byte, slot int, data defs.SessionSaveData) error {
if slot < 0 || slot >= defs.SessionSlotCount {
return fmt.Errorf("slot id %d out of range", slot)
}
err := db.StoreSessionSaveData(uuid, data, slot) err := db.StoreSessionSaveData(uuid, data, slot)
if err != nil { if err != nil {
return err return err
@ -37,10 +24,6 @@ func PutSession(uuid []byte, slot int, data defs.SessionSaveData) error {
} }
func DeleteSession(uuid []byte, slot int) error { func DeleteSession(uuid []byte, slot int) error {
if slot < 0 || slot >= defs.SessionSlotCount {
return fmt.Errorf("slot id %d out of range", slot)
}
err := db.DeleteSessionSaveData(uuid, slot) err := db.DeleteSessionSaveData(uuid, slot)
if err != nil { if err != nil {
return err return err