Change daily seed generation and update schema for recording failed daily runs

api/daily.go

@@ -1,13 +1,11 @@
 package api
 
 import (
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"log"
 	"net/http"
 	"strconv"
-	"time"
 
 	"github.com/Flashfyre/pokerogue-server/db"
 )
@@ -23,12 +21,20 @@ func ScheduleDailyRunRefresh() {
 }
 
 func InitDailyRun() {
-	dailyRunSeed = base64.StdEncoding.EncodeToString(SeedFromTime(time.Now().UTC()))
-	err := db.TryAddDailyRun(dailyRunSeed)
+	var err error
+	dailyRunSeed, err = db.GetDailyRunSeed()
 	if err != nil {
-		log.Print(err.Error())
-	} else {
-		log.Printf("Daily Run Seed: %s", dailyRunSeed)
+		log.Printf("failed to generated daily run seed: %s", err.Error())
+	}
+
+	if dailyRunSeed == "" {
+		dailyRunSeed = RandString(24)
+		err := db.TryAddDailyRun(dailyRunSeed)
+		if err != nil {
+			log.Print(err.Error())
+		} else {
+			log.Printf("Daily Run Seed: %s", dailyRunSeed)
+		}
 	}
 }
 

api/savedata.go

@@ -276,11 +276,22 @@ func (s *Server) HandleSavedataClear(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	sessionCompleted := ValidateSessionCompleted(session)
+	sessionCompleted := session.BattleType == 2 && ValidateSessionCompleted(session)
 	newCompletion := false
 
+	if session.GameMode == 3 {
+		waveCompleted := session.WaveIndex
+		if session.BattleType != 2 {
+			waveCompleted--
+		}
+		err = db.AddOrUpdateAccountDailyRun(uuid, session.Score, waveCompleted)
+		if err != nil {
+			log.Printf("failed to add or update daily run record: %s", err.Error())
+		}
+	}
+
 	if sessionCompleted {
-		newCompletion, err = db.TryAddSeedCompletion(uuid, session.Seed, int(session.GameMode), session.Score)
+		newCompletion, err = db.TryAddSeedCompletion(uuid, session.Seed, int(session.GameMode))
 		if err != nil {
 			log.Printf("failed to mark seed as completed: %s", err.Error())
 		}

api/utils.go

@@ -1,23 +1,20 @@
 package api
 
 import (
-	"crypto/md5"
-	"encoding/binary"
-	"math"
-	"time"
+	"crypto/rand"
 )
 
-var seedKey []byte // 32 bytes
+const randRunes = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"
+const lenRandRunes = len(randRunes)
 
-func SetSeedKey(key []byte) {
-	seedKey = key
-}
+func RandString(length int) string {
+	b := make([]byte, length)
 
-func SeedFromTime(seedTime time.Time) []byte {
-	day := make([]byte, 8)
-	binary.BigEndian.PutUint64(day, uint64(math.Floor(float64(seedTime.Unix())/float64(time.Hour*24))))
+	rand.Read(b)
 
-	sum := md5.Sum(append(seedKey, day...))
+	for i := range b {
+		b[i] = randRunes[int(b[i])%lenRandRunes]
+	}
 
-	return sum[:]
+	return string(b)
 }