jcreek/CosmicClash
1
0
Fork 0
mirror of https://github.com/jcreek/CosmicClash.git synced 2026-09-11 08:23:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: enable guarded ranked matcher role

Browse Source
This commit is contained in:
Josh Creek
2026-09-01 10:14:22 +01:00
parent d882469c79
commit 2d750cbcab
5 changed files with 80 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/cmd/matcher/main.go
+24 -5
View File
@@ -22,9 +22,10 @@ import (
func main() {
dsn := flag.String("dsn", os.Getenv("COSMIC_CLASH_POSTGRES_DSN"), "PostgreSQL connection string")
migrationDir := flag.String("migrations", "migrations", "directory containing numbered SQL migrations")
playlist := flag.String("playlist", string(domain.Casual), "playlist to match; ranked requires a provider-enabled role")
playlist := flag.String("playlist", string(domain.Casual), "playlist to match")
size := flag.Int("size", 4, "players per match")
interval := flag.Duration("interval", time.Second, "poll interval")
rankedRandomArena := flag.Bool("ranked-random-arena", false, "enable ranked matching only when the selected arena is random and non-elevated")
redisAddr := flag.String("redis-addr", os.Getenv("COSMIC_CLASH_REDIS_ADDR"), "optional Redis candidate projection address")
redisPrefix := flag.String("redis-prefix", envOrDefault("COSMIC_CLASH_REDIS_PREFIX", "cosmic-clash"), "Redis key prefix")
redisTTL := flag.Duration("redis-ttl", 60*time.Second, "TTL for transient candidate projection entries")
@@ -32,8 +33,15 @@ func main() {
if *dsn == "" {
fatalf("--dsn or COSMIC_CLASH_POSTGRES_DSN is required")
}
if *playlist != string(domain.Casual) {
fatalf("unsupported playlist %q; only casual is currently enabled", *playlist)
if *playlist != string(domain.Casual) && *playlist != string(domain.Ranked) {
fatalf("unsupported playlist %q", *playlist)
}
selectedPlaylist := domain.Playlist(*playlist)
if selectedPlaylist == domain.Ranked && *size != 6 {
fatalf("ranked matching requires --size=6")
}
if selectedPlaylist == domain.Casual && *size < 2 || selectedPlaylist == domain.Casual && *size > 6 {
fatalf("casual matching requires --size between 2 and 6")
}
if *redisTTL <= 0 {
fatalf("--redis-ttl must be positive")
@@ -60,7 +68,7 @@ func main() {
candidateProjection := store.CandidateProjection{
Index: store.RedisCandidateIndex{Client: redisClient, Prefix: *redisPrefix, TTL: *redisTTL},
Source: func(ctx context.Context, at time.Time) ([]domain.Candidate, error) {
return store.ListQueuedCandidates(ctx, db, domain.Casual, at, 1000)
return store.ListQueuedCandidates(ctx, db, selectedPlaylist, at, 1000)
},
}
projection = &candidateProjection
@@ -88,9 +96,20 @@ func main() {
Creator: matcher.ProposalCreatorFunc(func(ctx context.Context, proposal domain.Proposal, ticketIDs map[string]string, at time.Time) error {
return store.CreateProposal(ctx, db, proposal, ticketIDs, at)
}),
Playlist: domain.Casual, Size: *size, Now: now,
Playlist: selectedPlaylist, Size: *size, Now: now,
NextID: func() string { return fmt.Sprintf("proposal-%d", time.Now().UnixNano()) },
Prepare: func(id string, playlist domain.Playlist, formation domain.MatchFormation, at time.Time) (domain.PreparedProposal, error) {
if playlist == domain.Ranked {
playerIDs := make([]string, 0, len(formation.Selection.Players))
for _, player := range formation.Selection.Players {
playerIDs = append(playerIDs, player.PlayerID)
}
participants, err := store.LoadRankedParticipants(context.Background(), db, playerIDs)
if err != nil {
return domain.PreparedProposal{}, err
}
return domain.PrepareProposal(id, playlist, formation, participants, domain.RankedArena{RandomEnabled: *rankedRandomArena}, at)
}
return domain.PrepareProposal(id, playlist, formation, nil, domain.RankedArena{}, at)
},
}