From 0ead2da2da9d4aab9f85b3c547e66e808ee4a0b5 Mon Sep 17 00:00:00 2001 From: maru Date: Wed, 8 May 2024 15:47:56 -0400 Subject: [PATCH 01/13] Remove unused endpoint game/playercount --- api/common.go | 1 - api/endpoints.go | 4 ---- 2 files changed, 5 deletions(-) diff --git a/api/common.go b/api/common.go index 62ef843..920d41e 100644 --- a/api/common.go +++ b/api/common.go @@ -40,7 +40,6 @@ func Init(mux *http.ServeMux) { mux.HandleFunc("GET /account/logout", handleAccountLogout) // game - mux.HandleFunc("GET /game/playercount", handleGamePlayerCount) mux.HandleFunc("GET /game/titlestats", handleGameTitleStats) mux.HandleFunc("GET /game/classicsessioncount", handleGameClassicSessionCount) diff --git a/api/endpoints.go b/api/endpoints.go index fb41047..ee4f76d 100644 --- a/api/endpoints.go +++ b/api/endpoints.go @@ -144,10 +144,6 @@ func handleAccountLogout(w http.ResponseWriter, r *http.Request) { // game -func handleGamePlayerCount(w http.ResponseWriter, r *http.Request) { - w.Write([]byte(strconv.Itoa(playerCount))) -} - func handleGameTitleStats(w http.ResponseWriter, r *http.Request) { err := json.NewEncoder(w).Encode(defs.TitleStats{ PlayerCount: playerCount, From 7dbcb18ebf36ff738472be995f88a26ea41cb4c5 Mon Sep 17 00:00:00 2001 From: maru Date: Wed, 8 May 2024 17:23:07 -0400 Subject: [PATCH 02/13] Use INSERT instead of REPLACE for savedata storage functions --- db/savedata.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/savedata.go b/db/savedata.go index 881345f..dc2c860 100644 --- a/db/savedata.go +++ b/db/savedata.go @@ -65,7 +65,7 @@ func StoreSystemSaveData(uuid []byte, data defs.SystemSaveData) error { return err } - _, err = handle.Exec("REPLACE INTO systemSaveData (uuid, data, timestamp) VALUES (?, ?, UTC_TIMESTAMP())", uuid, buf.Bytes()) + _, err = handle.Exec("INSERT INTO systemSaveData (uuid, data, timestamp) VALUES (?, ?, UTC_TIMESTAMP()) ON DUPLICATE KEY UPDATE data = ?, timestamp = UTC_TIMESTAMP()", uuid, buf.Bytes(), buf.Bytes()) if err != nil { return err } @@ -116,7 +116,7 @@ func StoreSessionSaveData(uuid []byte, data defs.SessionSaveData, slot int) erro return err } - _, err = handle.Exec("REPLACE INTO sessionSaveData (uuid, slot, data, timestamp) VALUES (?, ?, ?, UTC_TIMESTAMP())", uuid, slot, buf.Bytes()) + _, err = handle.Exec("INSERT INTO sessionSaveData (uuid, slot, data, timestamp) VALUES (?, ?, ?, UTC_TIMESTAMP()) ON DUPLICATE KEY UPDATE data = ?, timestamp = UTC_TIMESTAMP()", uuid, slot, buf.Bytes(), buf.Bytes()) if err != nil { return err } From 192b777ac3e0c7b7c603f621637423de0467384a Mon Sep 17 00:00:00 2001 From: maru Date: Wed, 8 May 2024 20:08:10 -0400 Subject: [PATCH 03/13] Set ArgonMaxInstances to number of cores --- api/account/common.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/api/account/common.go b/api/account/common.go index 9102f4e..8e8c0ff 100644 --- a/api/account/common.go +++ b/api/account/common.go @@ -19,6 +19,7 @@ package account import ( "regexp" + "runtime" "golang.org/x/crypto/argon2" ) @@ -34,13 +35,13 @@ const ( ArgonKeySize = 32 ArgonSaltSize = 16 - ArgonMaxInstances = 16 - UUIDSize = 16 TokenSize = 32 ) var ( + ArgonMaxInstances = runtime.NumCPU() + isValidUsername = regexp.MustCompile(`^\w{1,16}$`).MatchString semaphore = make(chan bool, ArgonMaxInstances) ) From 4971ad9d42c7f9ad908d287f9abd7facf2f70e18 Mon Sep 17 00:00:00 2001 From: maru Date: Wed, 8 May 2024 20:19:33 -0400 Subject: [PATCH 04/13] Add new database limits --- db/db.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/db/db.go b/db/db.go index 05e92c4..31ad9a8 100644 --- a/db/db.go +++ b/db/db.go @@ -21,9 +21,11 @@ import ( "database/sql" "encoding/hex" "fmt" - _ "github.com/go-sql-driver/mysql" "log" "os" + "time" + + _ "github.com/go-sql-driver/mysql" ) var handle *sql.DB @@ -36,7 +38,10 @@ func Init(username, password, protocol, address, database string) error { return fmt.Errorf("failed to open database connection: %s", err) } - handle.SetMaxOpenConns(1000) + handle.SetMaxIdleConns(256) + handle.SetMaxOpenConns(256) + handle.SetConnMaxIdleTime(time.Second * 30) + handle.SetConnMaxLifetime(time.Minute) tx, err := handle.Begin() if err != nil { From 59ea469fb68182b1ab1c3135e88f2e4aca4efb20 Mon Sep 17 00:00:00 2001 From: maru Date: Thu, 9 May 2024 05:59:48 -0400 Subject: [PATCH 05/13] Don't import legacy saves if system exists in database --- db/db.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/db/db.go b/db/db.go index 31ad9a8..e84f031 100644 --- a/db/db.go +++ b/db/db.go @@ -73,6 +73,12 @@ func Init(username, password, protocol, address, database string) error { continue } + var count int + err = handle.QueryRow("SELECT COUNT(*) FROM systemSaveData WHERE uuid = ?", uuid).Scan(&count) + if err != nil || count != 0 { + continue + } + // store new system data systemData, err := LegacyReadSystemSaveData(uuid) if err != nil { From de0bd74dc258f380284c75723b4a4f49fccfc068 Mon Sep 17 00:00:00 2001 From: maru Date: Thu, 9 May 2024 14:13:19 -0400 Subject: [PATCH 06/13] Update database limits --- db/db.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/db/db.go b/db/db.go index e84f031..3ab8c87 100644 --- a/db/db.go +++ b/db/db.go @@ -38,8 +38,12 @@ func Init(username, password, protocol, address, database string) error { return fmt.Errorf("failed to open database connection: %s", err) } - handle.SetMaxIdleConns(256) - handle.SetMaxOpenConns(256) + if protocol == "unix" { + handle.SetMaxOpenConns(1000) + } else { + handle.SetMaxOpenConns(200) + } + handle.SetConnMaxIdleTime(time.Second * 30) handle.SetConnMaxLifetime(time.Minute) From e4de7c2391885426ee60cb4e76a466128a38d7dd Mon Sep 17 00:00:00 2001 From: maru Date: Thu, 9 May 2024 14:22:20 -0400 Subject: [PATCH 07/13] Update database limiting code more --- db/db.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/db/db.go b/db/db.go index 3ab8c87..d927377 100644 --- a/db/db.go +++ b/db/db.go @@ -37,15 +37,16 @@ func Init(username, password, protocol, address, database string) error { if err != nil { return fmt.Errorf("failed to open database connection: %s", err) } - - if protocol == "unix" { - handle.SetMaxOpenConns(1000) - } else { - handle.SetMaxOpenConns(200) + + conns := 1024 + if protocol != "unix" { + conns = 256 } - handle.SetConnMaxIdleTime(time.Second * 30) - handle.SetConnMaxLifetime(time.Minute) + handle.SetMaxOpenConns(conns) + handle.SetMaxIdleConns(conns/4) + + handle.SetConnMaxIdleTime(time.Second * 10) tx, err := handle.Begin() if err != nil { From fadd10602afbcc451f830cde7099e7fc23c56b17 Mon Sep 17 00:00:00 2001 From: maru Date: Thu, 9 May 2024 14:26:54 -0400 Subject: [PATCH 08/13] Don't log ErrNoRows in savedata --- api/endpoints.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/api/endpoints.go b/api/endpoints.go index ee4f76d..3515f4f 100644 --- a/api/endpoints.go +++ b/api/endpoints.go @@ -18,6 +18,7 @@ package api import ( + "database/sql" "encoding/json" "fmt" "net/http" @@ -280,6 +281,10 @@ func handleSaveData(w http.ResponseWriter, r *http.Request) { switch r.URL.Path { case "/savedata/get": save, err = savedata.Get(uuid, datatype, slot) + if err == sql.ErrNoRows { + http.Error(w, err.Error(), http.StatusNotFound) + return + } case "/savedata/update": err = savedata.Update(uuid, slot, save) case "/savedata/delete": From 633142eb293a4fff81f2d5e27466654060bd0e70 Mon Sep 17 00:00:00 2001 From: maru Date: Fri, 10 May 2024 13:16:35 -0400 Subject: [PATCH 09/13] Allow serving HTTPS --- rogueserver.go | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/rogueserver.go b/rogueserver.go index f86185f..5659cae 100644 --- a/rogueserver.go +++ b/rogueserver.go @@ -42,6 +42,9 @@ func main() { dbaddr := flag.String("dbaddr", "localhost", "database address") dbname := flag.String("dbname", "pokeroguedb", "database name") + tlscert := flag.String("tlscert", "", "tls certificate path") + tlskey := flag.String("tlskey", "", "tls key path") + flag.Parse() // register gob types @@ -66,10 +69,15 @@ func main() { api.Init(mux) // start web server + handler := prodHandler(mux) if *debug { - err = http.Serve(listener, debugHandler(mux)) + handler = debugHandler(mux) + } + + if *tlscert == "" { + err = http.Serve(listener, handler) } else { - err = http.Serve(listener, mux) + err = http.ServeTLS(listener, handler, *tlscert, *tlskey) } if err != nil { log.Fatalf("failed to create http server or server errored: %s", err) @@ -107,3 +115,19 @@ func debugHandler(router *http.ServeMux) http.Handler { router.ServeHTTP(w, r) }) } + + +func prodHandler(router *http.ServeMux) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Access-Control-Allow-Headers", "Authorization, Content-Type") + w.Header().Set("Access-Control-Allow-Methods", "OPTIONS, GET, POST") + w.Header().Set("Access-Control-Allow-Origin", "https://pokerogue.net") + + if r.Method == "OPTIONS" { + w.WriteHeader(http.StatusOK) + return + } + + router.ServeHTTP(w, r) + }) +} From 8a32efeaa3985df9cdc7176ba6888e02146ae32e Mon Sep 17 00:00:00 2001 From: maru Date: Fri, 10 May 2024 13:40:00 -0400 Subject: [PATCH 10/13] Clean up rogueserver.go --- rogueserver.go | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/rogueserver.go b/rogueserver.go index 5659cae..42f2d7d 100644 --- a/rogueserver.go +++ b/rogueserver.go @@ -101,6 +101,21 @@ func createListener(proto, addr string) (net.Listener, error) { return listener, nil } +func prodHandler(router *http.ServeMux) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Access-Control-Allow-Headers", "Authorization, Content-Type") + w.Header().Set("Access-Control-Allow-Methods", "OPTIONS, GET, POST") + w.Header().Set("Access-Control-Allow-Origin", "https://pokerogue.net") + + if r.Method == "OPTIONS" { + w.WriteHeader(http.StatusOK) + return + } + + router.ServeHTTP(w, r) + }) +} + func debugHandler(router *http.ServeMux) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { w.Header().Set("Access-Control-Allow-Headers", "*") @@ -116,18 +131,3 @@ func debugHandler(router *http.ServeMux) http.Handler { }) } - -func prodHandler(router *http.ServeMux) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - w.Header().Set("Access-Control-Allow-Headers", "Authorization, Content-Type") - w.Header().Set("Access-Control-Allow-Methods", "OPTIONS, GET, POST") - w.Header().Set("Access-Control-Allow-Origin", "https://pokerogue.net") - - if r.Method == "OPTIONS" { - w.WriteHeader(http.StatusOK) - return - } - - router.ServeHTTP(w, r) - }) -} From 3ed5f41d58840f8d6eafcf171eecc4e3dc087da4 Mon Sep 17 00:00:00 2001 From: Up <10714589+UpcraftLP@users.noreply.github.com> Date: Fri, 10 May 2024 21:30:47 +0200 Subject: [PATCH 11/13] make server automatically create DB schema if not exists (#5) * add default values for CLI args * add development docker compose file * prevent crash if userdata dir does not exist * accounts, acccountStats * account stats and create db indices * compensations and daily runs * ensure uniqueness of daily seed * start on port 8001 by default for client parity * make generated schema match production * sort imports --- .gitignore | 6 +++++- api/daily/common.go | 22 ++++++++++---------- api/endpoints.go | 25 +++++++++++++++++++++-- db/daily.go | 20 ++++++++++++++---- db/db.go | 37 ++++++++++++++++++++++++++++++++++ docker-compose.Development.yml | 14 +++++++++++++ rogueserver.go | 4 ++-- 7 files changed, 108 insertions(+), 20 deletions(-) create mode 100644 docker-compose.Development.yml diff --git a/.gitignore b/.gitignore index d61e22d..003f051 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,13 @@ # no extension on linux, .exe on windows rogueserver* -userdata/* +!/rogueserver/* +/userdata/* secret.key +# local testing +/.data/ + # Jetbrains IDEs /.idea/ *.iml diff --git a/api/daily/common.go b/api/daily/common.go index a1247b5..678e0fd 100644 --- a/api/daily/common.go +++ b/api/daily/common.go @@ -61,22 +61,27 @@ func Init() error { secret = newSecret } - err = recordNewDaily() + seed, err := recordNewDaily() if err != nil { log.Print(err) } - log.Printf("Daily Run Seed: %s", Seed()) + log.Printf("Daily Run Seed: %s", seed) - scheduler.AddFunc("@daily", func() { + _, err = scheduler.AddFunc("@daily", func() { time.Sleep(time.Second) - err := recordNewDaily() + seed, err = recordNewDaily() + log.Printf("Daily Run Seed: %s", seed) if err != nil { log.Printf("error while recording new daily: %s", err) } }) + if err != nil { + return err + } + scheduler.Start() return nil @@ -95,11 +100,6 @@ func deriveSeed(seedTime time.Time) []byte { return hashedSeed[:] } -func recordNewDaily() error { - err := db.TryAddDailyRun(Seed()) - if err != nil { - return err - } - - return nil +func recordNewDaily() (string, error) { + return db.TryAddDailyRun(Seed()) } diff --git a/api/endpoints.go b/api/endpoints.go index 3515f4f..a24da22 100644 --- a/api/endpoints.go +++ b/api/endpoints.go @@ -19,6 +19,7 @@ package api import ( "database/sql" + "encoding/base64" "encoding/json" "fmt" "net/http" @@ -303,7 +304,13 @@ func handleSaveData(w http.ResponseWriter, r *http.Request) { } // doesn't return a save, but it works - save, err = savedata.Clear(uuid, slot, daily.Seed(), s) + var seed string + seed, err = db.GetDailyRunSeed() + if err != nil { + httpError(w, r, err, http.StatusInternalServerError) + return + } + save, err = savedata.Clear(uuid, slot, seed, s) } if err != nil { httpError(w, r, err, http.StatusInternalServerError) @@ -327,7 +334,21 @@ func handleSaveData(w http.ResponseWriter, r *http.Request) { // daily func handleDailySeed(w http.ResponseWriter, r *http.Request) { - w.Write([]byte(daily.Seed())) + seed, err := db.GetDailyRunSeed() + if err != nil { + httpError(w, r, err, http.StatusInternalServerError) + return + } + bytes, err := base64.StdEncoding.DecodeString(seed) + if err != nil { + httpError(w, r, err, http.StatusInternalServerError) + return + } + _, err = w.Write(bytes) + if err != nil { + httpError(w, r, err, http.StatusInternalServerError) + return + } } func handleDailyRankings(w http.ResponseWriter, r *http.Request) { diff --git a/db/daily.go b/db/daily.go index 55eb04e..4b0f953 100644 --- a/db/daily.go +++ b/db/daily.go @@ -23,13 +23,25 @@ import ( "github.com/pagefaultgames/rogueserver/defs" ) -func TryAddDailyRun(seed string) error { - _, err := handle.Exec("INSERT INTO dailyRuns (seed, date) VALUES (?, UTC_DATE()) ON DUPLICATE KEY UPDATE date = date", seed) +func TryAddDailyRun(seed string) (string, error) { + var actualSeed string + err := handle.QueryRow("INSERT INTO dailyRuns (seed, date) VALUES (?, UTC_DATE()) ON DUPLICATE KEY UPDATE date = date RETURNING seed", seed).Scan(&actualSeed) if err != nil { - return err + return "INVALID", err } - return nil + return actualSeed, nil +} + +func GetDailyRunSeed() (string, error) { + var seed string + err := handle.QueryRow("SELECT seed FROM dailyRuns WHERE date = UTC_DATE()").Scan(&seed) + if err != nil { + return "INVALID", err + } + + return seed, nil + } func AddOrUpdateAccountDailyRun(uuid []byte, score int, wave int) error { diff --git a/db/db.go b/db/db.go index d927377..f246267 100644 --- a/db/db.go +++ b/db/db.go @@ -52,14 +52,51 @@ func Init(username, password, protocol, address, database string) error { if err != nil { panic(err) } + + // accounts + tx.Exec("CREATE TABLE IF NOT EXISTS accounts (uuid BINARY(16) NOT NULL PRIMARY KEY, username VARCHAR(16) UNIQUE NOT NULL, hash BINARY(32) NOT NULL, salt BINARY(16) NOT NULL, registered TIMESTAMP NOT NULL, lastLoggedIn TIMESTAMP DEFAULT NULL, lastActivity TIMESTAMP DEFAULT NULL, banned TINYINT(1) NOT NULL DEFAULT 0, trainerId SMALLINT(5) UNSIGNED DEFAULT 0, secretId SMALLINT(5) UNSIGNED DEFAULT 0)") + + // sessions + tx.Exec("CREATE TABLE IF NOT EXISTS sessions (token BINARY(32) NOT NULL PRIMARY KEY, uuid BINARY(16) NOT NULL, active TINYINT(1) NOT NULL DEFAULT 0, expire TIMESTAMP DEFAULT NULL, CONSTRAINT sessions_ibfk_1 FOREIGN KEY (uuid) REFERENCES accounts (uuid) ON DELETE CASCADE ON UPDATE CASCADE)") + tx.Exec("CREATE INDEX IF NOT EXISTS sessionsByUuid ON sessions (uuid)") + + // stats + tx.Exec("CREATE TABLE IF NOT EXISTS accountStats (uuid BINARY(16) NOT NULL PRIMARY KEY, playTime INT(11) NOT NULL DEFAULT 0, battles INT(11) NOT NULL DEFAULT 0, classicSessionsPlayed INT(11) NOT NULL DEFAULT 0, sessionsWon INT(11) NOT NULL DEFAULT 0, highestEndlessWave INT(11) NOT NULL DEFAULT 0, highestLevel INT(11) NOT NULL DEFAULT 0, pokemonSeen INT(11) NOT NULL DEFAULT 0, pokemonDefeated INT(11) NOT NULL DEFAULT 0, pokemonCaught INT(11) NOT NULL DEFAULT 0, pokemonHatched INT(11) NOT NULL DEFAULT 0, eggsPulled INT(11) NOT NULL DEFAULT 0, regularVouchers INT(11) NOT NULL DEFAULT 0, plusVouchers INT(11) NOT NULL DEFAULT 0, premiumVouchers INT(11) NOT NULL DEFAULT 0, goldenVouchers INT(11) NOT NULL DEFAULT 0, CONSTRAINT accountStats_ibfk_1 FOREIGN KEY (uuid) REFERENCES accounts (uuid) ON DELETE CASCADE ON UPDATE CASCADE)") + + // compensations + tx.Exec("CREATE TABLE IF NOT EXISTS accountCompensations (id INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY, uuid BINARY(16) NOT NULL, voucherType INT(11) NOT NULL, count INT(11) NOT NULL DEFAULT 1, claimed BIT(1) NOT NULL DEFAULT b'0', CONSTRAINT accountCompensations_ibfk_1 FOREIGN KEY (uuid) REFERENCES accounts (uuid) ON DELETE CASCADE ON UPDATE CASCADE)") + tx.Exec("CREATE INDEX IF NOT EXISTS accountCompensationsByUuid ON accountCompensations (uuid)") + + // daily runs + tx.Exec("CREATE TABLE IF NOT EXISTS dailyRuns (date DATE NOT NULL PRIMARY KEY, seed CHAR(24) CHARACTER SET ascii COLLATE ascii_bin NOT NULL)") + tx.Exec("CREATE INDEX IF NOT EXISTS dailyRunsByDateAndSeed ON dailyRuns (date, seed)") + + tx.Exec("CREATE TABLE IF NOT EXISTS dailyRunCompletions (uuid BINARY(16) NOT NULL, seed CHAR(24) CHARACTER SET ascii COLLATE ascii_bin NOT NULL, mode INT(11) NOT NULL DEFAULT 0, score INT(11) NOT NULL DEFAULT 0, timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (uuid, seed), CONSTRAINT dailyRunCompletions_ibfk_1 FOREIGN KEY (uuid) REFERENCES accounts (uuid) ON DELETE CASCADE ON UPDATE CASCADE)") + tx.Exec("CREATE INDEX IF NOT EXISTS dailyRunCompletionsByUuidAndSeed ON dailyRunCompletions (uuid, seed)") + + tx.Exec("CREATE TABLE IF NOT EXISTS accountDailyRuns (uuid BINARY(16) NOT NULL, date DATE NOT NULL, score INT(11) NOT NULL DEFAULT 0, wave INT(11) NOT NULL DEFAULT 0, timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (uuid, date), CONSTRAINT accountDailyRuns_ibfk_1 FOREIGN KEY (uuid) REFERENCES accounts (uuid) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT accountDailyRuns_ibfk_2 FOREIGN KEY (date) REFERENCES dailyRuns (date) ON DELETE NO ACTION ON UPDATE NO ACTION)") + tx.Exec("CREATE INDEX IF NOT EXISTS accountDailyRunsByDate ON accountDailyRuns (date)") + + // save data tx.Exec("CREATE TABLE IF NOT EXISTS systemSaveData (uuid BINARY(16) PRIMARY KEY, data LONGBLOB, timestamp TIMESTAMP)") tx.Exec("CREATE TABLE IF NOT EXISTS sessionSaveData (uuid BINARY(16), slot TINYINT, data LONGBLOB, timestamp TIMESTAMP, PRIMARY KEY (uuid, slot))") + err = tx.Commit() if err != nil { panic(err) } // TODO temp code + _, err = os.Stat("userdata") + if err != nil { + if os.IsNotExist(err) { // not found, do not migrate + return nil + } else { + log.Fatalf("failed to stat userdata directory: %s", err) + return err + } + } + entries, err := os.ReadDir("userdata") if err != nil { log.Fatalln(err) diff --git a/docker-compose.Development.yml b/docker-compose.Development.yml new file mode 100644 index 0000000..84fd1d8 --- /dev/null +++ b/docker-compose.Development.yml @@ -0,0 +1,14 @@ +services: + db: + image: mariadb:11 + container_name: pokerogue-db-local + restart: on-failure + environment: + MYSQL_ROOT_PASSWORD: admin + MYSQL_DATABASE: pokeroguedb + MYSQL_USER: pokerogue + MYSQL_PASSWORD: pokerogue + ports: + - "3306:3306" + volumes: + - ./.data/db:/var/lib/mysql diff --git a/rogueserver.go b/rogueserver.go index 42f2d7d..91aa1a2 100644 --- a/rogueserver.go +++ b/rogueserver.go @@ -34,10 +34,10 @@ func main() { debug := flag.Bool("debug", false, "use 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") + addr := flag.String("addr", "0.0.0.0:8001", "network address for api to listen on") dbuser := flag.String("dbuser", "pokerogue", "database username") - dbpass := flag.String("dbpass", "", "database password") + dbpass := flag.String("dbpass", "pokerogue", "database password") dbproto := flag.String("dbproto", "tcp", "protocol for database connection") dbaddr := flag.String("dbaddr", "localhost", "database address") dbname := flag.String("dbname", "pokeroguedb", "database name") From b91c169b16b6f727f17e86dd829e38e12f8756d8 Mon Sep 17 00:00:00 2001 From: maru Date: Fri, 10 May 2024 15:33:37 -0400 Subject: [PATCH 12/13] endpoints.go consistency --- api/endpoints.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/api/endpoints.go b/api/endpoints.go index a24da22..9087d67 100644 --- a/api/endpoints.go +++ b/api/endpoints.go @@ -339,16 +339,14 @@ func handleDailySeed(w http.ResponseWriter, r *http.Request) { httpError(w, r, err, http.StatusInternalServerError) return } + bytes, err := base64.StdEncoding.DecodeString(seed) if err != nil { httpError(w, r, err, http.StatusInternalServerError) return } - _, err = w.Write(bytes) - if err != nil { - httpError(w, r, err, http.StatusInternalServerError) - return - } + + w.Write(bytes) } func handleDailyRankings(w http.ResponseWriter, r *http.Request) { From 17294e517996a971de5fbeba3084f1bfb69c2816 Mon Sep 17 00:00:00 2001 From: maru Date: Fri, 10 May 2024 15:37:24 -0400 Subject: [PATCH 13/13] Fix handleDailySeed --- api/endpoints.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/api/endpoints.go b/api/endpoints.go index 9087d67..2227fa6 100644 --- a/api/endpoints.go +++ b/api/endpoints.go @@ -19,7 +19,6 @@ package api import ( "database/sql" - "encoding/base64" "encoding/json" "fmt" "net/http" @@ -340,13 +339,7 @@ func handleDailySeed(w http.ResponseWriter, r *http.Request) { return } - bytes, err := base64.StdEncoding.DecodeString(seed) - if err != nil { - httpError(w, r, err, http.StatusInternalServerError) - return - } - - w.Write(bytes) + w.Write([]byte(seed)) } func handleDailyRankings(w http.ResponseWriter, r *http.Request) {