expose match information#4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
freggy merged 1 commit into from
Jun 21, 2026
Merged

expose match information #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
444 changes: 264 additions & 180 deletions api/v1alpha1/api.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions api/v1alpha1/api.proto
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,12 +39,18 @@ enum TicketStatus {
NO_PLAYABLE_FLAVOR_VERSION = 2;
}

message Match {
string id = 1;
uint32 player_count = 2;
}

message Ticket {
string id = 1;
string flavor_id = 2;
uint32 player_count = 3;
TicketStatus status = 4;
Assignment assignment = 5;
Match match = 6;
}

message Assignment {
Expand Down
14 changes: 14 additions & 0 deletions api/v1alpha1/api_grpc.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion cmd/server/main.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ func main() {
ctx, cancel = context.WithCancel(context.Background())
logger = slog.New(slog.NewJSONHandler(os.Stdout, nil))
tickets = matchmaking.NewStore[matchmaking.Ticket]()
matches = matchmaking.NewStore[matchmaking.Match]()
)

viper.SetEnvPrefix("MM")
Expand All@@ -46,14 +47,15 @@ func main() {
viper.SetDefault("match_interval", "1s")
viper.SetDefault("allocate_instance_for_pending_match_after", "15s")
viper.SetDefault("remove_inactive_tickets_after", "1m")
viper.SetDefault("remove_deployed_matches_after", "2m")

var cfg server.Config
if err := viper.Unmarshal(&cfg); err != nil {
logger.ErrorContext(ctx, "unable to decode config", "err", err)
os.Exit(1)
}

serv := server.New(logger, cfg, tickets)
serv := server.New(logger, cfg, tickets, matches)

go func() {
c := make(chan os.Signal, 1)
Expand Down
29 changes: 20 additions & 9 deletions internal/matchmaking/matchmaker.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ type FlavorMatchMaker struct {

allocInstanceForPendingMatchAfter time.Duration
removeInactiveTicketsAfter time.Duration
removeDeployedMatchesAfter time.Duration

chunkClient chunkv1alpha1.ChunkServiceClient
insClient instancev1alpha1.InstanceServiceClient
Expand All@@ -60,7 +61,9 @@ func NewFlavorMatchMaker(
matchEvalInterval time.Duration,
allocInstanceForPendingMatchAfter time.Duration,
removeInactiveTicketsAfter time.Duration,
removeDeployedMatchesAfter time.Duration,
tickets *Store[Ticket],
matches *Store[Match],
chunkClient chunkv1alpha1.ChunkServiceClient,
insClient instancev1alpha1.InstanceServiceClient,
) *FlavorMatchMaker {
Expand All@@ -69,10 +72,11 @@ func NewFlavorMatchMaker(
ticker: time.NewTicker(matchEvalInterval),
tickets: tickets,
ticketPools: make(map[string]TicketPool),
matches: NewStore[Match](),
matches: matches,
pendingMatches: make(map[string][]string),
allocInstanceForPendingMatchAfter: allocInstanceForPendingMatchAfter,
removeInactiveTicketsAfter: removeInactiveTicketsAfter,
removeDeployedMatchesAfter: removeDeployedMatchesAfter,
chunkClient: chunkClient,
insClient: insClient,
}
Expand DownExpand Up@@ -157,9 +161,9 @@ func (m FlavorMatchMaker) generateMatches(flavorID string, version *chunkv1alpha
matched = pool.FindTickets(maxPlayers - match.PlayerCount())
)

for _, t := range matched {
t.MatchID = &match.ID
m.tickets.Update(t)
for i := range matched {
matched[i].MatchID = &match.ID
m.tickets.Update(matched[i])
}

pool.RemoveAll(matched)
Expand DownExpand Up@@ -209,9 +213,9 @@ func (m FlavorMatchMaker) generateMatches(flavorID string, version *chunkv1alpha
match.Full = true
}

for _, t := range match.Tickets {
t.MatchID = &match.ID
m.tickets.Update(t)
for i := range match.Tickets {
match.Tickets[i].MatchID = &match.ID
m.tickets.Update(match.Tickets[i])
}

m.matches.Add(match)
Expand All@@ -228,6 +232,12 @@ func (m FlavorMatchMaker) checkAndDeployMatches(ctx context.Context) {

logger.Info("found match")

if time.Now().After(match.CreatedAt.Add(m.removeDeployedMatchesAfter)) {
logger.InfoContext(ctx, "removing deployed match")
m.matches.Delete(match.ID)
continue
}

var (
invalidated []Ticket
valid []Ticket
Expand DownExpand Up@@ -267,7 +277,7 @@ func (m FlavorMatchMaker) checkAndDeployMatches(ctx context.Context) {
continue
}

if time.Now().After(match.CreatedAt.Add(m.allocInstanceForPendingMatchAfter)) {
if time.Now().After(match.CreatedAt.Add(m.allocInstanceForPendingMatchAfter)) && match.InstanceAllocatedAt == nil {
m.logger.Info("pending match created")
if err := m.AllocateInstanceAndAssign(ctx, match); err != nil {
logger.ErrorContext(ctx, "failed to allocate instance", "err", err)
Expand DownExpand Up@@ -308,7 +318,8 @@ func (m FlavorMatchMaker) AllocateInstanceAndAssign(ctx context.Context, match M
return match.ID == matchID
})

m.matches.Delete(match.ID)
match.InstanceAllocatedAt = new(time.Now())
m.matches.Update(match)
return nil
}

Expand Down
15 changes: 8 additions & 7 deletions internal/matchmaking/types.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,13 +53,14 @@ type Assignment struct {
}

type Match struct {
ID string
Tickets TicketList
Full bool
ChunkID string
FlavorID string
FlavorVersion *chunkv1alpha1.FlavorVersion
CreatedAt time.Time
ID string
Tickets TicketList
Full bool
ChunkID string
FlavorID string
FlavorVersion *chunkv1alpha1.FlavorVersion
CreatedAt time.Time
InstanceAllocatedAt *time.Time
}

func (m Match) GetID() string {
Expand Down
25 changes: 17 additions & 8 deletions internal/server/endpoints.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,23 +34,32 @@ func (s Server) GetTicket(
_ context.Context,
req *mmv1alpha1.GetTicketRequest,
) (*mmv1alpha1.GetTicketResponse, error) {
t := s.tickets.Get(req.TicketId)
if t == nil {
ticket := s.tickets.Get(req.TicketId)
if ticket == nil {
return nil, status.Error(codes.NotFound, "ticket not found")
}

ret := &mmv1alpha1.GetTicketResponse{
Ticket: &mmv1alpha1.Ticket{
Id: t.ID,
FlavorId: t.FlavorID,
PlayerCount: t.PlayerCount,
Status: mmv1alpha1.TicketStatus(t.Status),
Id: ticket.ID,
FlavorId: ticket.FlavorID,
PlayerCount: ticket.PlayerCount,
Status: mmv1alpha1.TicketStatus(ticket.Status),
},
}

if t.Assignment != nil {
if ticket.Assignment != nil {
ret.Ticket.Assignment = &mmv1alpha1.Assignment{
InstanceId: t.Assignment.InstanceID,
InstanceId: ticket.Assignment.InstanceID,
}
}

if ticket.MatchID != nil {
if m := s.matches.Get(*ticket.MatchID); m != nil {
ret.Ticket.Match = &mmv1alpha1.Match{
Id: m.ID,
PlayerCount: m.PlayerCount(),
}
}
}

Expand Down
12 changes: 11 additions & 1 deletion internal/server/server.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,13 +44,20 @@ type Server struct {
logger *slog.Logger
cfg Config
tickets *matchmaking.Store[matchmaking.Ticket]
matches *matchmaking.Store[matchmaking.Match]
}

func New(logger *slog.Logger, config Config, tickets *matchmaking.Store[matchmaking.Ticket]) *Server {
func New(
logger *slog.Logger,
config Config,
tickets *matchmaking.Store[matchmaking.Ticket],
matches *matchmaking.Store[matchmaking.Match],
) *Server {
return &Server{
logger: logger,
cfg: config,
tickets: tickets,
matches: matches,
}
}

Expand All@@ -62,6 +69,7 @@ type Config struct {
MatchInterval time.Duration `mapstructure:"match_interval"`
AllocateInstanceForPendingMatchAfter time.Duration `mapstructure:"allocate_instance_for_pending_match_after"`
RemoveInactiveTicketsAfter time.Duration `mapstructure:"remove_inactive_tickets_after"`
RemoveDeployedMatchesAfter time.Duration `mapstructure:"remove_deployed_matches_after"`
}

func (s Server) Run(ctx context.Context) error {
Expand DownExpand Up@@ -118,7 +126,9 @@ func (s Server) Run(ctx context.Context) error {
s.cfg.MatchInterval,
s.cfg.AllocateInstanceForPendingMatchAfter,
s.cfg.RemoveInactiveTicketsAfter,
s.cfg.RemoveDeployedMatchesAfter,
s.tickets,
s.matches,
chunkv1alpha1.NewChunkServiceClient(conn),
instancev1alpha1.NewInstanceServiceClient(conn),
)
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
expose match information#4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

freggy
merged 1 commit into

from

Jun 21, 2026
 Merged


expose match information
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


444 changes: 264 additions & 180 deletions
api/v1alpha1/api.pb.go

View file


Open in desktop


Large diffs are not rendered by default.


6 changes: 6 additions & 0 deletions
api/v1alpha1/api.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,12 +39,18 @@ enum TicketStatus {
 NO_PLAYABLE_FLAVOR_VERSION = 2;
}

message Match {
 string id = 1;
 uint32 player_count = 2;
}

message Ticket {
 string id = 1;
 string flavor_id = 2;
 uint32 player_count = 3;
 TicketStatus status = 4;
 Assignment assignment = 5;
 Match match = 6;
}

message Assignment {
Expand Down

14 changes: 14 additions & 0 deletions
api/v1alpha1/api_grpc.pb.go

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


4 changes: 3 additions & 1 deletion
cmd/server/main.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ func main() {
 ctx, cancel = context.WithCancel(context.Background())
 logger = slog.New(slog.NewJSONHandler(os.Stdout, nil))
 tickets = matchmaking.NewStore[matchmaking.Ticket]()
 matches = matchmaking.NewStore[matchmaking.Match]()
	)

	viper.SetEnvPrefix("MM")
Expand All@@ -46,14 +47,15 @@ func main() {
	viper.SetDefault("match_interval", "1s")
	viper.SetDefault("allocate_instance_for_pending_match_after", "15s")
	viper.SetDefault("remove_inactive_tickets_after", "1m")
	viper.SetDefault("remove_deployed_matches_after", "2m")

	var cfg server.Config
	if err := viper.Unmarshal(&cfg); err != nil {
 logger.ErrorContext(ctx, "unable to decode config", "err", err)
 os.Exit(1)
	}

	serv := server.New(logger, cfg, tickets)
	serv := server.New(logger, cfg, tickets, matches)

	go func() {
 c := make(chan os.Signal, 1)
Expand Down

29 changes: 20 additions & 9 deletions
internal/matchmaking/matchmaker.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ type FlavorMatchMaker struct {

	allocInstanceForPendingMatchAfter time.Duration
	removeInactiveTicketsAfter time.Duration
	removeDeployedMatchesAfter time.Duration

	chunkClient chunkv1alpha1.ChunkServiceClient
	insClient instancev1alpha1.InstanceServiceClient
Expand All@@ -60,7 +61,9 @@ func NewFlavorMatchMaker(
	matchEvalInterval time.Duration,
	allocInstanceForPendingMatchAfter time.Duration,
	removeInactiveTicketsAfter time.Duration,
	removeDeployedMatchesAfter time.Duration,
	tickets *Store[Ticket],
	matches *Store[Match],
	chunkClient chunkv1alpha1.ChunkServiceClient,
	insClient instancev1alpha1.InstanceServiceClient,
) *FlavorMatchMaker {
Expand All@@ -69,10 +72,11 @@ func NewFlavorMatchMaker(
 ticker: time.NewTicker(matchEvalInterval),
 tickets: tickets,
 ticketPools: make(map[string]TicketPool),
 matches: NewStore[Match](),
 matches: matches,
 pendingMatches: make(map[string][]string),
 allocInstanceForPendingMatchAfter: allocInstanceForPendingMatchAfter,
 removeInactiveTicketsAfter: removeInactiveTicketsAfter,
 removeDeployedMatchesAfter: removeDeployedMatchesAfter,
 chunkClient: chunkClient,
 insClient: insClient,
	}
Expand DownExpand Up@@ -157,9 +161,9 @@ func (m FlavorMatchMaker) generateMatches(flavorID string, version *chunkv1alpha
 matched = pool.FindTickets(maxPlayers - match.PlayerCount())
 )

 for _, t := range matched {
t.MatchID = &match.ID
 m.tickets.Update(t)
 for i := range matched {
matched[i].MatchID = &match.ID
 m.tickets.Update(matched[i])
 }

 pool.RemoveAll(matched)
Expand DownExpand Up@@ -209,9 +213,9 @@ func (m FlavorMatchMaker) generateMatches(flavorID string, version *chunkv1alpha
 match.Full = true
	}

	for _, t := range match.Tickets {
t.MatchID = &match.ID
 m.tickets.Update(t)
	for i := range match.Tickets {
match.Tickets[i].MatchID = &match.ID
 m.tickets.Update(match.Tickets[i])
	}

	m.matches.Add(match)
Expand All@@ -228,6 +232,12 @@ func (m FlavorMatchMaker) checkAndDeployMatches(ctx context.Context) {

 logger.Info("found match")

 if time.Now().After(match.CreatedAt.Add(m.removeDeployedMatchesAfter)) {
 logger.InfoContext(ctx, "removing deployed match")
 m.matches.Delete(match.ID)
 continue
 }

 var (
 invalidated []Ticket
 valid []Ticket
Expand DownExpand Up@@ -267,7 +277,7 @@ func (m FlavorMatchMaker) checkAndDeployMatches(ctx context.Context) {
 continue
 }

 if time.Now().After(match.CreatedAt.Add(m.allocInstanceForPendingMatchAfter)) {
 if time.Now().After(match.CreatedAt.Add(m.allocInstanceForPendingMatchAfter)) && match.InstanceAllocatedAt == nil {
 m.logger.Info("pending match created")
 if err := m.AllocateInstanceAndAssign(ctx, match); err != nil {
 logger.ErrorContext(ctx, "failed to allocate instance", "err", err)
Expand DownExpand Up@@ -308,7 +318,8 @@ func (m FlavorMatchMaker) AllocateInstanceAndAssign(ctx context.Context, match M
 return match.ID == matchID
	})

	m.matches.Delete(match.ID)
	match.InstanceAllocatedAt = new(time.Now())
	m.matches.Update(match)
	return nil
}

Expand Down

15 changes: 8 additions & 7 deletions
internal/matchmaking/types.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,13 +53,14 @@ type Assignment struct {
}

type Match struct {
	ID string
	Tickets TicketList
	Full bool
	ChunkID string
	FlavorID string
	FlavorVersion *chunkv1alpha1.FlavorVersion
	CreatedAt time.Time
	ID string
	Tickets TicketList
	Full bool
	ChunkID string
	FlavorID string
	FlavorVersion *chunkv1alpha1.FlavorVersion
	CreatedAt time.Time
	InstanceAllocatedAt *time.Time
}

func (m Match) GetID() string {
Expand Down

25 changes: 17 additions & 8 deletions
internal/server/endpoints.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,23 +34,32 @@ func (s Server) GetTicket(
	_ context.Context,
	req *mmv1alpha1.GetTicketRequest,
) (*mmv1alpha1.GetTicketResponse, error) {
t := s.tickets.Get(req.TicketId)
	if t == nil {
ticket := s.tickets.Get(req.TicketId)
	if ticket == nil {
 return nil, status.Error(codes.NotFound, "ticket not found")
	}

	ret := &mmv1alpha1.GetTicketResponse{
 Ticket: &mmv1alpha1.Ticket{
 Id: t.ID,
 FlavorId: t.FlavorID,
 PlayerCount: t.PlayerCount,
 Status: mmv1alpha1.TicketStatus(t.Status),
 Id: ticket.ID,
 FlavorId: ticket.FlavorID,
 PlayerCount: ticket.PlayerCount,
 Status: mmv1alpha1.TicketStatus(ticket.Status),
 },
	}

	if t.Assignment != nil {
	if ticket.Assignment != nil {
 ret.Ticket.Assignment = &mmv1alpha1.Assignment{
 InstanceId: t.Assignment.InstanceID,
 InstanceId: ticket.Assignment.InstanceID,
 }
	}

	if ticket.MatchID != nil {
 if m := s.matches.Get(*ticket.MatchID); m != nil {
 ret.Ticket.Match = &mmv1alpha1.Match{
 Id: m.ID,
 PlayerCount: m.PlayerCount(),
 }
 }
	}

Expand Down

12 changes: 11 additions & 1 deletion
internal/server/server.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,13 +44,20 @@ type Server struct {
	logger *slog.Logger
	cfg Config
	tickets *matchmaking.Store[matchmaking.Ticket]
	matches *matchmaking.Store[matchmaking.Match]
}

func New(logger *slog.Logger, config Config, tickets *matchmaking.Store[matchmaking.Ticket]) *Server {
func New(
	logger *slog.Logger,
	config Config,
	tickets *matchmaking.Store[matchmaking.Ticket],
	matches *matchmaking.Store[matchmaking.Match],
) *Server {
	return &Server{
 logger: logger,
 cfg: config,
 tickets: tickets,
 matches: matches,
	}
}

Expand All@@ -62,6 +69,7 @@ type Config struct {
	MatchInterval time.Duration `mapstructure:"match_interval"`
	AllocateInstanceForPendingMatchAfter time.Duration `mapstructure:"allocate_instance_for_pending_match_after"`
	RemoveInactiveTicketsAfter time.Duration `mapstructure:"remove_inactive_tickets_after"`
	RemoveDeployedMatchesAfter time.Duration `mapstructure:"remove_deployed_matches_after"`
}

func (s Server) Run(ctx context.Context) error {
Expand DownExpand Up@@ -118,7 +126,9 @@ func (s Server) Run(ctx context.Context) error {
 s.cfg.MatchInterval,
 s.cfg.AllocateInstanceForPendingMatchAfter,
 s.cfg.RemoveInactiveTicketsAfter,
 s.cfg.RemoveDeployedMatchesAfter,
 s.tickets,
 s.matches,
 chunkv1alpha1.NewChunkServiceClient(conn),
 instancev1alpha1.NewInstanceServiceClient(conn),
	)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
expose match information#4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

freggy
merged 1 commit into

from

Jun 21, 2026
 Merged


expose match information
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


444 changes: 264 additions & 180 deletions
api/v1alpha1/api.pb.go

View file


Open in desktop


Large diffs are not rendered by default.


6 changes: 6 additions & 0 deletions
api/v1alpha1/api.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,12 +39,18 @@ enum TicketStatus {
 NO_PLAYABLE_FLAVOR_VERSION = 2;
}

message Match {
 string id = 1;
 uint32 player_count = 2;
}

message Ticket {
 string id = 1;
 string flavor_id = 2;
 uint32 player_count = 3;
 TicketStatus status = 4;
 Assignment assignment = 5;
 Match match = 6;
}

message Assignment {
Expand Down

14 changes: 14 additions & 0 deletions
api/v1alpha1/api_grpc.pb.go

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


4 changes: 3 additions & 1 deletion
cmd/server/main.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ func main() {
 ctx, cancel = context.WithCancel(context.Background())
 logger = slog.New(slog.NewJSONHandler(os.Stdout, nil))
 tickets = matchmaking.NewStore[matchmaking.Ticket]()
 matches = matchmaking.NewStore[matchmaking.Match]()
	)

	viper.SetEnvPrefix("MM")
Expand All@@ -46,14 +47,15 @@ func main() {
	viper.SetDefault("match_interval", "1s")
	viper.SetDefault("allocate_instance_for_pending_match_after", "15s")
	viper.SetDefault("remove_inactive_tickets_after", "1m")
	viper.SetDefault("remove_deployed_matches_after", "2m")

	var cfg server.Config
	if err := viper.Unmarshal(&cfg); err != nil {
 logger.ErrorContext(ctx, "unable to decode config", "err", err)
 os.Exit(1)
	}

	serv := server.New(logger, cfg, tickets)
	serv := server.New(logger, cfg, tickets, matches)

	go func() {
 c := make(chan os.Signal, 1)
Expand Down

29 changes: 20 additions & 9 deletions
internal/matchmaking/matchmaker.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ type FlavorMatchMaker struct {

	allocInstanceForPendingMatchAfter time.Duration
	removeInactiveTicketsAfter time.Duration
	removeDeployedMatchesAfter time.Duration

	chunkClient chunkv1alpha1.ChunkServiceClient
	insClient instancev1alpha1.InstanceServiceClient
Expand All@@ -60,7 +61,9 @@ func NewFlavorMatchMaker(
	matchEvalInterval time.Duration,
	allocInstanceForPendingMatchAfter time.Duration,
	removeInactiveTicketsAfter time.Duration,
	removeDeployedMatchesAfter time.Duration,
	tickets *Store[Ticket],
	matches *Store[Match],
	chunkClient chunkv1alpha1.ChunkServiceClient,
	insClient instancev1alpha1.InstanceServiceClient,
) *FlavorMatchMaker {
Expand All@@ -69,10 +72,11 @@ func NewFlavorMatchMaker(
 ticker: time.NewTicker(matchEvalInterval),
 tickets: tickets,
 ticketPools: make(map[string]TicketPool),
 matches: NewStore[Match](),
 matches: matches,
 pendingMatches: make(map[string][]string),
 allocInstanceForPendingMatchAfter: allocInstanceForPendingMatchAfter,
 removeInactiveTicketsAfter: removeInactiveTicketsAfter,
 removeDeployedMatchesAfter: removeDeployedMatchesAfter,
 chunkClient: chunkClient,
 insClient: insClient,
	}
Expand DownExpand Up@@ -157,9 +161,9 @@ func (m FlavorMatchMaker) generateMatches(flavorID string, version *chunkv1alpha
 matched = pool.FindTickets(maxPlayers - match.PlayerCount())
 )

 for _, t := range matched {
t.MatchID = &match.ID
 m.tickets.Update(t)
 for i := range matched {
matched[i].MatchID = &match.ID
 m.tickets.Update(matched[i])
 }

 pool.RemoveAll(matched)
Expand DownExpand Up@@ -209,9 +213,9 @@ func (m FlavorMatchMaker) generateMatches(flavorID string, version *chunkv1alpha
 match.Full = true
	}

	for _, t := range match.Tickets {
t.MatchID = &match.ID
 m.tickets.Update(t)
	for i := range match.Tickets {
match.Tickets[i].MatchID = &match.ID
 m.tickets.Update(match.Tickets[i])
	}

	m.matches.Add(match)
Expand All@@ -228,6 +232,12 @@ func (m FlavorMatchMaker) checkAndDeployMatches(ctx context.Context) {

 logger.Info("found match")

 if time.Now().After(match.CreatedAt.Add(m.removeDeployedMatchesAfter)) {
 logger.InfoContext(ctx, "removing deployed match")
 m.matches.Delete(match.ID)
 continue
 }

 var (
 invalidated []Ticket
 valid []Ticket
Expand DownExpand Up@@ -267,7 +277,7 @@ func (m FlavorMatchMaker) checkAndDeployMatches(ctx context.Context) {
 continue
 }

 if time.Now().After(match.CreatedAt.Add(m.allocInstanceForPendingMatchAfter)) {
 if time.Now().After(match.CreatedAt.Add(m.allocInstanceForPendingMatchAfter)) && match.InstanceAllocatedAt == nil {
 m.logger.Info("pending match created")
 if err := m.AllocateInstanceAndAssign(ctx, match); err != nil {
 logger.ErrorContext(ctx, "failed to allocate instance", "err", err)
Expand DownExpand Up@@ -308,7 +318,8 @@ func (m FlavorMatchMaker) AllocateInstanceAndAssign(ctx context.Context, match M
 return match.ID == matchID
	})

	m.matches.Delete(match.ID)
	match.InstanceAllocatedAt = new(time.Now())
	m.matches.Update(match)
	return nil
}

Expand Down

15 changes: 8 additions & 7 deletions
internal/matchmaking/types.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,13 +53,14 @@ type Assignment struct {
}

type Match struct {
	ID string
	Tickets TicketList
	Full bool
	ChunkID string
	FlavorID string
	FlavorVersion *chunkv1alpha1.FlavorVersion
	CreatedAt time.Time
	ID string
	Tickets TicketList
	Full bool
	ChunkID string
	FlavorID string
	FlavorVersion *chunkv1alpha1.FlavorVersion
	CreatedAt time.Time
	InstanceAllocatedAt *time.Time
}

func (m Match) GetID() string {
Expand Down

25 changes: 17 additions & 8 deletions
internal/server/endpoints.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,23 +34,32 @@ func (s Server) GetTicket(
	_ context.Context,
	req *mmv1alpha1.GetTicketRequest,
) (*mmv1alpha1.GetTicketResponse, error) {
t := s.tickets.Get(req.TicketId)
	if t == nil {
ticket := s.tickets.Get(req.TicketId)
	if ticket == nil {
 return nil, status.Error(codes.NotFound, "ticket not found")
	}

	ret := &mmv1alpha1.GetTicketResponse{
 Ticket: &mmv1alpha1.Ticket{
 Id: t.ID,
 FlavorId: t.FlavorID,
 PlayerCount: t.PlayerCount,
 Status: mmv1alpha1.TicketStatus(t.Status),
 Id: ticket.ID,
 FlavorId: ticket.FlavorID,
 PlayerCount: ticket.PlayerCount,
 Status: mmv1alpha1.TicketStatus(ticket.Status),
 },
	}

	if t.Assignment != nil {
	if ticket.Assignment != nil {
 ret.Ticket.Assignment = &mmv1alpha1.Assignment{
 InstanceId: t.Assignment.InstanceID,
 InstanceId: ticket.Assignment.InstanceID,
 }
	}

	if ticket.MatchID != nil {
 if m := s.matches.Get(*ticket.MatchID); m != nil {
 ret.Ticket.Match = &mmv1alpha1.Match{
 Id: m.ID,
 PlayerCount: m.PlayerCount(),
 }
 }
	}

Expand Down

12 changes: 11 additions & 1 deletion
internal/server/server.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,13 +44,20 @@ type Server struct {
	logger *slog.Logger
	cfg Config
	tickets *matchmaking.Store[matchmaking.Ticket]
	matches *matchmaking.Store[matchmaking.Match]
}

func New(logger *slog.Logger, config Config, tickets *matchmaking.Store[matchmaking.Ticket]) *Server {
func New(
	logger *slog.Logger,
	config Config,
	tickets *matchmaking.Store[matchmaking.Ticket],
	matches *matchmaking.Store[matchmaking.Match],
) *Server {
	return &Server{
 logger: logger,
 cfg: config,
 tickets: tickets,
 matches: matches,
	}
}

Expand All@@ -62,6 +69,7 @@ type Config struct {
	MatchInterval time.Duration `mapstructure:"match_interval"`
	AllocateInstanceForPendingMatchAfter time.Duration `mapstructure:"allocate_instance_for_pending_match_after"`
	RemoveInactiveTicketsAfter time.Duration `mapstructure:"remove_inactive_tickets_after"`
	RemoveDeployedMatchesAfter time.Duration `mapstructure:"remove_deployed_matches_after"`
}

func (s Server) Run(ctx context.Context) error {
Expand DownExpand Up@@ -118,7 +126,9 @@ func (s Server) Run(ctx context.Context) error {
 s.cfg.MatchInterval,
 s.cfg.AllocateInstanceForPendingMatchAfter,
 s.cfg.RemoveInactiveTicketsAfter,
 s.cfg.RemoveDeployedMatchesAfter,
 s.tickets,
 s.matches,
 chunkv1alpha1.NewChunkServiceClient(conn),
 instancev1alpha1.NewInstanceServiceClient(conn),
	)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
expose match information#4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

freggy
merged 1 commit into

from

Jun 21, 2026
 Merged


expose match information
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


444 changes: 264 additions & 180 deletions
api/v1alpha1/api.pb.go

View file


Open in desktop


Large diffs are not rendered by default.


6 changes: 6 additions & 0 deletions
api/v1alpha1/api.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,12 +39,18 @@ enum TicketStatus {
 NO_PLAYABLE_FLAVOR_VERSION = 2;
}

message Match {
 string id = 1;
 uint32 player_count = 2;
}

message Ticket {
 string id = 1;
 string flavor_id = 2;
 uint32 player_count = 3;
 TicketStatus status = 4;
 Assignment assignment = 5;
 Match match = 6;
}

message Assignment {
Expand Down

14 changes: 14 additions & 0 deletions
api/v1alpha1/api_grpc.pb.go

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


4 changes: 3 additions & 1 deletion
cmd/server/main.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ func main() {
 ctx, cancel = context.WithCancel(context.Background())
 logger = slog.New(slog.NewJSONHandler(os.Stdout, nil))
 tickets = matchmaking.NewStore[matchmaking.Ticket]()
 matches = matchmaking.NewStore[matchmaking.Match]()
	)

	viper.SetEnvPrefix("MM")
Expand All@@ -46,14 +47,15 @@ func main() {
	viper.SetDefault("match_interval", "1s")
	viper.SetDefault("allocate_instance_for_pending_match_after", "15s")
	viper.SetDefault("remove_inactive_tickets_after", "1m")
	viper.SetDefault("remove_deployed_matches_after", "2m")

	var cfg server.Config
	if err := viper.Unmarshal(&cfg); err != nil {
 logger.ErrorContext(ctx, "unable to decode config", "err", err)
 os.Exit(1)
	}

	serv := server.New(logger, cfg, tickets)
	serv := server.New(logger, cfg, tickets, matches)

	go func() {
 c := make(chan os.Signal, 1)
Expand Down

29 changes: 20 additions & 9 deletions
internal/matchmaking/matchmaker.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ type FlavorMatchMaker struct {

	allocInstanceForPendingMatchAfter time.Duration
	removeInactiveTicketsAfter time.Duration
	removeDeployedMatchesAfter time.Duration

	chunkClient chunkv1alpha1.ChunkServiceClient
	insClient instancev1alpha1.InstanceServiceClient
Expand All@@ -60,7 +61,9 @@ func NewFlavorMatchMaker(
	matchEvalInterval time.Duration,
	allocInstanceForPendingMatchAfter time.Duration,
	removeInactiveTicketsAfter time.Duration,
	removeDeployedMatchesAfter time.Duration,
	tickets *Store[Ticket],
	matches *Store[Match],
	chunkClient chunkv1alpha1.ChunkServiceClient,
	insClient instancev1alpha1.InstanceServiceClient,
) *FlavorMatchMaker {
Expand All@@ -69,10 +72,11 @@ func NewFlavorMatchMaker(
 ticker: time.NewTicker(matchEvalInterval),
 tickets: tickets,
 ticketPools: make(map[string]TicketPool),
 matches: NewStore[Match](),
 matches: matches,
 pendingMatches: make(map[string][]string),
 allocInstanceForPendingMatchAfter: allocInstanceForPendingMatchAfter,
 removeInactiveTicketsAfter: removeInactiveTicketsAfter,
 removeDeployedMatchesAfter: removeDeployedMatchesAfter,
 chunkClient: chunkClient,
 insClient: insClient,
	}
Expand DownExpand Up@@ -157,9 +161,9 @@ func (m FlavorMatchMaker) generateMatches(flavorID string, version *chunkv1alpha
 matched = pool.FindTickets(maxPlayers - match.PlayerCount())
 )

 for _, t := range matched {
t.MatchID = &match.ID
 m.tickets.Update(t)
 for i := range matched {
matched[i].MatchID = &match.ID
 m.tickets.Update(matched[i])
 }

 pool.RemoveAll(matched)
Expand DownExpand Up@@ -209,9 +213,9 @@ func (m FlavorMatchMaker) generateMatches(flavorID string, version *chunkv1alpha
 match.Full = true
	}

	for _, t := range match.Tickets {
t.MatchID = &match.ID
 m.tickets.Update(t)
	for i := range match.Tickets {
match.Tickets[i].MatchID = &match.ID
 m.tickets.Update(match.Tickets[i])
	}

	m.matches.Add(match)
Expand All@@ -228,6 +232,12 @@ func (m FlavorMatchMaker) checkAndDeployMatches(ctx context.Context) {

 logger.Info("found match")

 if time.Now().After(match.CreatedAt.Add(m.removeDeployedMatchesAfter)) {
 logger.InfoContext(ctx, "removing deployed match")
 m.matches.Delete(match.ID)
 continue
 }

 var (
 invalidated []Ticket
 valid []Ticket
Expand DownExpand Up@@ -267,7 +277,7 @@ func (m FlavorMatchMaker) checkAndDeployMatches(ctx context.Context) {
 continue
 }

 if time.Now().After(match.CreatedAt.Add(m.allocInstanceForPendingMatchAfter)) {
 if time.Now().After(match.CreatedAt.Add(m.allocInstanceForPendingMatchAfter)) && match.InstanceAllocatedAt == nil {
 m.logger.Info("pending match created")
 if err := m.AllocateInstanceAndAssign(ctx, match); err != nil {
 logger.ErrorContext(ctx, "failed to allocate instance", "err", err)
Expand DownExpand Up@@ -308,7 +318,8 @@ func (m FlavorMatchMaker) AllocateInstanceAndAssign(ctx context.Context, match M
 return match.ID == matchID
	})

	m.matches.Delete(match.ID)
	match.InstanceAllocatedAt = new(time.Now())
	m.matches.Update(match)
	return nil
}

Expand Down

15 changes: 8 additions & 7 deletions
internal/matchmaking/types.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,13 +53,14 @@ type Assignment struct {
}

type Match struct {
	ID string
	Tickets TicketList
	Full bool
	ChunkID string
	FlavorID string
	FlavorVersion *chunkv1alpha1.FlavorVersion
	CreatedAt time.Time
	ID string
	Tickets TicketList
	Full bool
	ChunkID string
	FlavorID string
	FlavorVersion *chunkv1alpha1.FlavorVersion
	CreatedAt time.Time
	InstanceAllocatedAt *time.Time
}

func (m Match) GetID() string {
Expand Down

25 changes: 17 additions & 8 deletions
internal/server/endpoints.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,23 +34,32 @@ func (s Server) GetTicket(
	_ context.Context,
	req *mmv1alpha1.GetTicketRequest,
) (*mmv1alpha1.GetTicketResponse, error) {
t := s.tickets.Get(req.TicketId)
	if t == nil {
ticket := s.tickets.Get(req.TicketId)
	if ticket == nil {
 return nil, status.Error(codes.NotFound, "ticket not found")
	}

	ret := &mmv1alpha1.GetTicketResponse{
 Ticket: &mmv1alpha1.Ticket{
 Id: t.ID,
 FlavorId: t.FlavorID,
 PlayerCount: t.PlayerCount,
 Status: mmv1alpha1.TicketStatus(t.Status),
 Id: ticket.ID,
 FlavorId: ticket.FlavorID,
 PlayerCount: ticket.PlayerCount,
 Status: mmv1alpha1.TicketStatus(ticket.Status),
 },
	}

	if t.Assignment != nil {
	if ticket.Assignment != nil {
 ret.Ticket.Assignment = &mmv1alpha1.Assignment{
 InstanceId: t.Assignment.InstanceID,
 InstanceId: ticket.Assignment.InstanceID,
 }
	}

	if ticket.MatchID != nil {
 if m := s.matches.Get(*ticket.MatchID); m != nil {
 ret.Ticket.Match = &mmv1alpha1.Match{
 Id: m.ID,
 PlayerCount: m.PlayerCount(),
 }
 }
	}

Expand Down

12 changes: 11 additions & 1 deletion
internal/server/server.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,13 +44,20 @@ type Server struct {
	logger *slog.Logger
	cfg Config
	tickets *matchmaking.Store[matchmaking.Ticket]
	matches *matchmaking.Store[matchmaking.Match]
}

func New(logger *slog.Logger, config Config, tickets *matchmaking.Store[matchmaking.Ticket]) *Server {
func New(
	logger *slog.Logger,
	config Config,
	tickets *matchmaking.Store[matchmaking.Ticket],
	matches *matchmaking.Store[matchmaking.Match],
) *Server {
	return &Server{
 logger: logger,
 cfg: config,
 tickets: tickets,
 matches: matches,
	}
}

Expand All@@ -62,6 +69,7 @@ type Config struct {
	MatchInterval time.Duration `mapstructure:"match_interval"`
	AllocateInstanceForPendingMatchAfter time.Duration `mapstructure:"allocate_instance_for_pending_match_after"`
	RemoveInactiveTicketsAfter time.Duration `mapstructure:"remove_inactive_tickets_after"`
	RemoveDeployedMatchesAfter time.Duration `mapstructure:"remove_deployed_matches_after"`
}

func (s Server) Run(ctx context.Context) error {
Expand DownExpand Up@@ -118,7 +126,9 @@ func (s Server) Run(ctx context.Context) error {
 s.cfg.MatchInterval,
 s.cfg.AllocateInstanceForPendingMatchAfter,
 s.cfg.RemoveInactiveTicketsAfter,
 s.cfg.RemoveDeployedMatchesAfter,
 s.tickets,
 s.matches,
 chunkv1alpha1.NewChunkServiceClient(conn),
 instancev1alpha1.NewInstanceServiceClient(conn),
	)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
expose match information#4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

freggy
merged 1 commit into

from

Jun 21, 2026
 Merged


expose match information
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


444 changes: 264 additions & 180 deletions
api/v1alpha1/api.pb.go

View file


Open in desktop


Large diffs are not rendered by default.


6 changes: 6 additions & 0 deletions
api/v1alpha1/api.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,12 +39,18 @@ enum TicketStatus {
 NO_PLAYABLE_FLAVOR_VERSION = 2;
}

message Match {
 string id = 1;
 uint32 player_count = 2;
}

message Ticket {
 string id = 1;
 string flavor_id = 2;
 uint32 player_count = 3;
 TicketStatus status = 4;
 Assignment assignment = 5;
 Match match = 6;
}

message Assignment {
Expand Down

14 changes: 14 additions & 0 deletions
api/v1alpha1/api_grpc.pb.go

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


4 changes: 3 additions & 1 deletion
cmd/server/main.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ func main() {
 ctx, cancel = context.WithCancel(context.Background())
 logger = slog.New(slog.NewJSONHandler(os.Stdout, nil))
 tickets = matchmaking.NewStore[matchmaking.Ticket]()
 matches = matchmaking.NewStore[matchmaking.Match]()
	)

	viper.SetEnvPrefix("MM")
Expand All@@ -46,14 +47,15 @@ func main() {
	viper.SetDefault("match_interval", "1s")
	viper.SetDefault("allocate_instance_for_pending_match_after", "15s")
	viper.SetDefault("remove_inactive_tickets_after", "1m")
	viper.SetDefault("remove_deployed_matches_after", "2m")

	var cfg server.Config
	if err := viper.Unmarshal(&cfg); err != nil {
 logger.ErrorContext(ctx, "unable to decode config", "err", err)
 os.Exit(1)
	}

	serv := server.New(logger, cfg, tickets)
	serv := server.New(logger, cfg, tickets, matches)

	go func() {
 c := make(chan os.Signal, 1)
Expand Down

29 changes: 20 additions & 9 deletions
internal/matchmaking/matchmaker.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ type FlavorMatchMaker struct {

	allocInstanceForPendingMatchAfter time.Duration
	removeInactiveTicketsAfter time.Duration
	removeDeployedMatchesAfter time.Duration

	chunkClient chunkv1alpha1.ChunkServiceClient
	insClient instancev1alpha1.InstanceServiceClient
Expand All@@ -60,7 +61,9 @@ func NewFlavorMatchMaker(
	matchEvalInterval time.Duration,
	allocInstanceForPendingMatchAfter time.Duration,
	removeInactiveTicketsAfter time.Duration,
	removeDeployedMatchesAfter time.Duration,
	tickets *Store[Ticket],
	matches *Store[Match],
	chunkClient chunkv1alpha1.ChunkServiceClient,
	insClient instancev1alpha1.InstanceServiceClient,
) *FlavorMatchMaker {
Expand All@@ -69,10 +72,11 @@ func NewFlavorMatchMaker(
 ticker: time.NewTicker(matchEvalInterval),
 tickets: tickets,
 ticketPools: make(map[string]TicketPool),
 matches: NewStore[Match](),
 matches: matches,
 pendingMatches: make(map[string][]string),
 allocInstanceForPendingMatchAfter: allocInstanceForPendingMatchAfter,
 removeInactiveTicketsAfter: removeInactiveTicketsAfter,
 removeDeployedMatchesAfter: removeDeployedMatchesAfter,
 chunkClient: chunkClient,
 insClient: insClient,
	}
Expand DownExpand Up@@ -157,9 +161,9 @@ func (m FlavorMatchMaker) generateMatches(flavorID string, version *chunkv1alpha
 matched = pool.FindTickets(maxPlayers - match.PlayerCount())
 )

 for _, t := range matched {
t.MatchID = &match.ID
 m.tickets.Update(t)
 for i := range matched {
matched[i].MatchID = &match.ID
 m.tickets.Update(matched[i])
 }

 pool.RemoveAll(matched)
Expand DownExpand Up@@ -209,9 +213,9 @@ func (m FlavorMatchMaker) generateMatches(flavorID string, version *chunkv1alpha
 match.Full = true
	}

	for _, t := range match.Tickets {
t.MatchID = &match.ID
 m.tickets.Update(t)
	for i := range match.Tickets {
match.Tickets[i].MatchID = &match.ID
 m.tickets.Update(match.Tickets[i])
	}

	m.matches.Add(match)
Expand All@@ -228,6 +232,12 @@ func (m FlavorMatchMaker) checkAndDeployMatches(ctx context.Context) {

 logger.Info("found match")

 if time.Now().After(match.CreatedAt.Add(m.removeDeployedMatchesAfter)) {
 logger.InfoContext(ctx, "removing deployed match")
 m.matches.Delete(match.ID)
 continue
 }

 var (
 invalidated []Ticket
 valid []Ticket
Expand DownExpand Up@@ -267,7 +277,7 @@ func (m FlavorMatchMaker) checkAndDeployMatches(ctx context.Context) {
 continue
 }

 if time.Now().After(match.CreatedAt.Add(m.allocInstanceForPendingMatchAfter)) {
 if time.Now().After(match.CreatedAt.Add(m.allocInstanceForPendingMatchAfter)) && match.InstanceAllocatedAt == nil {
 m.logger.Info("pending match created")
 if err := m.AllocateInstanceAndAssign(ctx, match); err != nil {
 logger.ErrorContext(ctx, "failed to allocate instance", "err", err)
Expand DownExpand Up@@ -308,7 +318,8 @@ func (m FlavorMatchMaker) AllocateInstanceAndAssign(ctx context.Context, match M
 return match.ID == matchID
	})

	m.matches.Delete(match.ID)
	match.InstanceAllocatedAt = new(time.Now())
	m.matches.Update(match)
	return nil
}

Expand Down

15 changes: 8 additions & 7 deletions
internal/matchmaking/types.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,13 +53,14 @@ type Assignment struct {
}

type Match struct {
	ID string
	Tickets TicketList
	Full bool
	ChunkID string
	FlavorID string
	FlavorVersion *chunkv1alpha1.FlavorVersion
	CreatedAt time.Time
	ID string
	Tickets TicketList
	Full bool
	ChunkID string
	FlavorID string
	FlavorVersion *chunkv1alpha1.FlavorVersion
	CreatedAt time.Time
	InstanceAllocatedAt *time.Time
}

func (m Match) GetID() string {
Expand Down

25 changes: 17 additions & 8 deletions
internal/server/endpoints.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,23 +34,32 @@ func (s Server) GetTicket(
	_ context.Context,
	req *mmv1alpha1.GetTicketRequest,
) (*mmv1alpha1.GetTicketResponse, error) {
t := s.tickets.Get(req.TicketId)
	if t == nil {
ticket := s.tickets.Get(req.TicketId)
	if ticket == nil {
 return nil, status.Error(codes.NotFound, "ticket not found")
	}

	ret := &mmv1alpha1.GetTicketResponse{
 Ticket: &mmv1alpha1.Ticket{
 Id: t.ID,
 FlavorId: t.FlavorID,
 PlayerCount: t.PlayerCount,
 Status: mmv1alpha1.TicketStatus(t.Status),
 Id: ticket.ID,
 FlavorId: ticket.FlavorID,
 PlayerCount: ticket.PlayerCount,
 Status: mmv1alpha1.TicketStatus(ticket.Status),
 },
	}

	if t.Assignment != nil {
	if ticket.Assignment != nil {
 ret.Ticket.Assignment = &mmv1alpha1.Assignment{
 InstanceId: t.Assignment.InstanceID,
 InstanceId: ticket.Assignment.InstanceID,
 }
	}

	if ticket.MatchID != nil {
 if m := s.matches.Get(*ticket.MatchID); m != nil {
 ret.Ticket.Match = &mmv1alpha1.Match{
 Id: m.ID,
 PlayerCount: m.PlayerCount(),
 }
 }
	}

Expand Down

12 changes: 11 additions & 1 deletion
internal/server/server.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,13 +44,20 @@ type Server struct {
	logger *slog.Logger
	cfg Config
	tickets *matchmaking.Store[matchmaking.Ticket]
	matches *matchmaking.Store[matchmaking.Match]
}

func New(logger *slog.Logger, config Config, tickets *matchmaking.Store[matchmaking.Ticket]) *Server {
func New(
	logger *slog.Logger,
	config Config,
	tickets *matchmaking.Store[matchmaking.Ticket],
	matches *matchmaking.Store[matchmaking.Match],
) *Server {
	return &Server{
 logger: logger,
 cfg: config,
 tickets: tickets,
 matches: matches,
	}
}

Expand All@@ -62,6 +69,7 @@ type Config struct {
	MatchInterval time.Duration `mapstructure:"match_interval"`
	AllocateInstanceForPendingMatchAfter time.Duration `mapstructure:"allocate_instance_for_pending_match_after"`
	RemoveInactiveTicketsAfter time.Duration `mapstructure:"remove_inactive_tickets_after"`
	RemoveDeployedMatchesAfter time.Duration `mapstructure:"remove_deployed_matches_after"`
}

func (s Server) Run(ctx context.Context) error {
Expand DownExpand Up@@ -118,7 +126,9 @@ func (s Server) Run(ctx context.Context) error {
 s.cfg.MatchInterval,
 s.cfg.AllocateInstanceForPendingMatchAfter,
 s.cfg.RemoveInactiveTicketsAfter,
 s.cfg.RemoveDeployedMatchesAfter,
 s.tickets,
 s.matches,
 chunkv1alpha1.NewChunkServiceClient(conn),
 instancev1alpha1.NewInstanceServiceClient(conn),
	)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
expose match information#4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

freggy
merged 1 commit into

from

Jun 21, 2026
 Merged


expose match information
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


444 changes: 264 additions & 180 deletions
api/v1alpha1/api.pb.go

View file


Open in desktop


Large diffs are not rendered by default.


6 changes: 6 additions & 0 deletions
api/v1alpha1/api.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,12 +39,18 @@ enum TicketStatus {
 NO_PLAYABLE_FLAVOR_VERSION = 2;
}

message Match {
 string id = 1;
 uint32 player_count = 2;
}

message Ticket {
 string id = 1;
 string flavor_id = 2;
 uint32 player_count = 3;
 TicketStatus status = 4;
 Assignment assignment = 5;
 Match match = 6;
}

message Assignment {
Expand Down

14 changes: 14 additions & 0 deletions
api/v1alpha1/api_grpc.pb.go

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


4 changes: 3 additions & 1 deletion
cmd/server/main.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ func main() {
 ctx, cancel = context.WithCancel(context.Background())
 logger = slog.New(slog.NewJSONHandler(os.Stdout, nil))
 tickets = matchmaking.NewStore[matchmaking.Ticket]()
 matches = matchmaking.NewStore[matchmaking.Match]()
	)

	viper.SetEnvPrefix("MM")
Expand All@@ -46,14 +47,15 @@ func main() {
	viper.SetDefault("match_interval", "1s")
	viper.SetDefault("allocate_instance_for_pending_match_after", "15s")
	viper.SetDefault("remove_inactive_tickets_after", "1m")
	viper.SetDefault("remove_deployed_matches_after", "2m")

	var cfg server.Config
	if err := viper.Unmarshal(&cfg); err != nil {
 logger.ErrorContext(ctx, "unable to decode config", "err", err)
 os.Exit(1)
	}

	serv := server.New(logger, cfg, tickets)
	serv := server.New(logger, cfg, tickets, matches)

	go func() {
 c := make(chan os.Signal, 1)
Expand Down

29 changes: 20 additions & 9 deletions
internal/matchmaking/matchmaker.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ type FlavorMatchMaker struct {

	allocInstanceForPendingMatchAfter time.Duration
	removeInactiveTicketsAfter time.Duration
	removeDeployedMatchesAfter time.Duration

	chunkClient chunkv1alpha1.ChunkServiceClient
	insClient instancev1alpha1.InstanceServiceClient
Expand All@@ -60,7 +61,9 @@ func NewFlavorMatchMaker(
	matchEvalInterval time.Duration,
	allocInstanceForPendingMatchAfter time.Duration,
	removeInactiveTicketsAfter time.Duration,
	removeDeployedMatchesAfter time.Duration,
	tickets *Store[Ticket],
	matches *Store[Match],
	chunkClient chunkv1alpha1.ChunkServiceClient,
	insClient instancev1alpha1.InstanceServiceClient,
) *FlavorMatchMaker {
Expand All@@ -69,10 +72,11 @@ func NewFlavorMatchMaker(
 ticker: time.NewTicker(matchEvalInterval),
 tickets: tickets,
 ticketPools: make(map[string]TicketPool),
 matches: NewStore[Match](),
 matches: matches,
 pendingMatches: make(map[string][]string),
 allocInstanceForPendingMatchAfter: allocInstanceForPendingMatchAfter,
 removeInactiveTicketsAfter: removeInactiveTicketsAfter,
 removeDeployedMatchesAfter: removeDeployedMatchesAfter,
 chunkClient: chunkClient,
 insClient: insClient,
	}
Expand DownExpand Up@@ -157,9 +161,9 @@ func (m FlavorMatchMaker) generateMatches(flavorID string, version *chunkv1alpha
 matched = pool.FindTickets(maxPlayers - match.PlayerCount())
 )

 for _, t := range matched {
t.MatchID = &match.ID
 m.tickets.Update(t)
 for i := range matched {
matched[i].MatchID = &match.ID
 m.tickets.Update(matched[i])
 }

 pool.RemoveAll(matched)
Expand DownExpand Up@@ -209,9 +213,9 @@ func (m FlavorMatchMaker) generateMatches(flavorID string, version *chunkv1alpha
 match.Full = true
	}

	for _, t := range match.Tickets {
t.MatchID = &match.ID
 m.tickets.Update(t)
	for i := range match.Tickets {
match.Tickets[i].MatchID = &match.ID
 m.tickets.Update(match.Tickets[i])
	}

	m.matches.Add(match)
Expand All@@ -228,6 +232,12 @@ func (m FlavorMatchMaker) checkAndDeployMatches(ctx context.Context) {

 logger.Info("found match")

 if time.Now().After(match.CreatedAt.Add(m.removeDeployedMatchesAfter)) {
 logger.InfoContext(ctx, "removing deployed match")
 m.matches.Delete(match.ID)
 continue
 }

 var (
 invalidated []Ticket
 valid []Ticket
Expand DownExpand Up@@ -267,7 +277,7 @@ func (m FlavorMatchMaker) checkAndDeployMatches(ctx context.Context) {
 continue
 }

 if time.Now().After(match.CreatedAt.Add(m.allocInstanceForPendingMatchAfter)) {
 if time.Now().After(match.CreatedAt.Add(m.allocInstanceForPendingMatchAfter)) && match.InstanceAllocatedAt == nil {
 m.logger.Info("pending match created")
 if err := m.AllocateInstanceAndAssign(ctx, match); err != nil {
 logger.ErrorContext(ctx, "failed to allocate instance", "err", err)
Expand DownExpand Up@@ -308,7 +318,8 @@ func (m FlavorMatchMaker) AllocateInstanceAndAssign(ctx context.Context, match M
 return match.ID == matchID
	})

	m.matches.Delete(match.ID)
	match.InstanceAllocatedAt = new(time.Now())
	m.matches.Update(match)
	return nil
}

Expand Down

15 changes: 8 additions & 7 deletions
internal/matchmaking/types.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,13 +53,14 @@ type Assignment struct {
}

type Match struct {
	ID string
	Tickets TicketList
	Full bool
	ChunkID string
	FlavorID string
	FlavorVersion *chunkv1alpha1.FlavorVersion
	CreatedAt time.Time
	ID string
	Tickets TicketList
	Full bool
	ChunkID string
	FlavorID string
	FlavorVersion *chunkv1alpha1.FlavorVersion
	CreatedAt time.Time
	InstanceAllocatedAt *time.Time
}

func (m Match) GetID() string {
Expand Down

25 changes: 17 additions & 8 deletions
internal/server/endpoints.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,23 +34,32 @@ func (s Server) GetTicket(
	_ context.Context,
	req *mmv1alpha1.GetTicketRequest,
) (*mmv1alpha1.GetTicketResponse, error) {
t := s.tickets.Get(req.TicketId)
	if t == nil {
ticket := s.tickets.Get(req.TicketId)
	if ticket == nil {
 return nil, status.Error(codes.NotFound, "ticket not found")
	}

	ret := &mmv1alpha1.GetTicketResponse{
 Ticket: &mmv1alpha1.Ticket{
 Id: t.ID,
 FlavorId: t.FlavorID,
 PlayerCount: t.PlayerCount,
 Status: mmv1alpha1.TicketStatus(t.Status),
 Id: ticket.ID,
 FlavorId: ticket.FlavorID,
 PlayerCount: ticket.PlayerCount,
 Status: mmv1alpha1.TicketStatus(ticket.Status),
 },
	}

	if t.Assignment != nil {
	if ticket.Assignment != nil {
 ret.Ticket.Assignment = &mmv1alpha1.Assignment{
 InstanceId: t.Assignment.InstanceID,
 InstanceId: ticket.Assignment.InstanceID,
 }
	}

	if ticket.MatchID != nil {
 if m := s.matches.Get(*ticket.MatchID); m != nil {
 ret.Ticket.Match = &mmv1alpha1.Match{
 Id: m.ID,
 PlayerCount: m.PlayerCount(),
 }
 }
	}

Expand Down

12 changes: 11 additions & 1 deletion
internal/server/server.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,13 +44,20 @@ type Server struct {
	logger *slog.Logger
	cfg Config
	tickets *matchmaking.Store[matchmaking.Ticket]
	matches *matchmaking.Store[matchmaking.Match]
}

func New(logger *slog.Logger, config Config, tickets *matchmaking.Store[matchmaking.Ticket]) *Server {
func New(
	logger *slog.Logger,
	config Config,
	tickets *matchmaking.Store[matchmaking.Ticket],
	matches *matchmaking.Store[matchmaking.Match],
) *Server {
	return &Server{
 logger: logger,
 cfg: config,
 tickets: tickets,
 matches: matches,
	}
}

Expand All@@ -62,6 +69,7 @@ type Config struct {
	MatchInterval time.Duration `mapstructure:"match_interval"`
	AllocateInstanceForPendingMatchAfter time.Duration `mapstructure:"allocate_instance_for_pending_match_after"`
	RemoveInactiveTicketsAfter time.Duration `mapstructure:"remove_inactive_tickets_after"`
	RemoveDeployedMatchesAfter time.Duration `mapstructure:"remove_deployed_matches_after"`
}

func (s Server) Run(ctx context.Context) error {
Expand DownExpand Up@@ -118,7 +126,9 @@ func (s Server) Run(ctx context.Context) error {
 s.cfg.MatchInterval,
 s.cfg.AllocateInstanceForPendingMatchAfter,
 s.cfg.RemoveInactiveTicketsAfter,
 s.cfg.RemoveDeployedMatchesAfter,
 s.tickets,
 s.matches,
 chunkv1alpha1.NewChunkServiceClient(conn),
 instancev1alpha1.NewInstanceServiceClient(conn),
	)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
expose match information#4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

freggy
merged 1 commit into

from

Jun 21, 2026
 Merged


expose match information
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


444 changes: 264 additions & 180 deletions
api/v1alpha1/api.pb.go

View file


Open in desktop


Large diffs are not rendered by default.


6 changes: 6 additions & 0 deletions
api/v1alpha1/api.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,12 +39,18 @@ enum TicketStatus {
 NO_PLAYABLE_FLAVOR_VERSION = 2;
}

message Match {
 string id = 1;
 uint32 player_count = 2;
}

message Ticket {
 string id = 1;
 string flavor_id = 2;
 uint32 player_count = 3;
 TicketStatus status = 4;
 Assignment assignment = 5;
 Match match = 6;
}

message Assignment {
Expand Down

14 changes: 14 additions & 0 deletions
api/v1alpha1/api_grpc.pb.go

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


4 changes: 3 additions & 1 deletion
cmd/server/main.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ func main() {
 ctx, cancel = context.WithCancel(context.Background())
 logger = slog.New(slog.NewJSONHandler(os.Stdout, nil))
 tickets = matchmaking.NewStore[matchmaking.Ticket]()
 matches = matchmaking.NewStore[matchmaking.Match]()
	)

	viper.SetEnvPrefix("MM")
Expand All@@ -46,14 +47,15 @@ func main() {
	viper.SetDefault("match_interval", "1s")
	viper.SetDefault("allocate_instance_for_pending_match_after", "15s")
	viper.SetDefault("remove_inactive_tickets_after", "1m")
	viper.SetDefault("remove_deployed_matches_after", "2m")

	var cfg server.Config
	if err := viper.Unmarshal(&cfg); err != nil {
 logger.ErrorContext(ctx, "unable to decode config", "err", err)
 os.Exit(1)
	}

	serv := server.New(logger, cfg, tickets)
	serv := server.New(logger, cfg, tickets, matches)

	go func() {
 c := make(chan os.Signal, 1)
Expand Down

29 changes: 20 additions & 9 deletions
internal/matchmaking/matchmaker.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ type FlavorMatchMaker struct {

	allocInstanceForPendingMatchAfter time.Duration
	removeInactiveTicketsAfter time.Duration
	removeDeployedMatchesAfter time.Duration

	chunkClient chunkv1alpha1.ChunkServiceClient
	insClient instancev1alpha1.InstanceServiceClient
Expand All@@ -60,7 +61,9 @@ func NewFlavorMatchMaker(
	matchEvalInterval time.Duration,
	allocInstanceForPendingMatchAfter time.Duration,
	removeInactiveTicketsAfter time.Duration,
	removeDeployedMatchesAfter time.Duration,
	tickets *Store[Ticket],
	matches *Store[Match],
	chunkClient chunkv1alpha1.ChunkServiceClient,
	insClient instancev1alpha1.InstanceServiceClient,
) *FlavorMatchMaker {
Expand All@@ -69,10 +72,11 @@ func NewFlavorMatchMaker(
 ticker: time.NewTicker(matchEvalInterval),
 tickets: tickets,
 ticketPools: make(map[string]TicketPool),
 matches: NewStore[Match](),
 matches: matches,
 pendingMatches: make(map[string][]string),
 allocInstanceForPendingMatchAfter: allocInstanceForPendingMatchAfter,
 removeInactiveTicketsAfter: removeInactiveTicketsAfter,
 removeDeployedMatchesAfter: removeDeployedMatchesAfter,
 chunkClient: chunkClient,
 insClient: insClient,
	}
Expand DownExpand Up@@ -157,9 +161,9 @@ func (m FlavorMatchMaker) generateMatches(flavorID string, version *chunkv1alpha
 matched = pool.FindTickets(maxPlayers - match.PlayerCount())
 )

 for _, t := range matched {
t.MatchID = &match.ID
 m.tickets.Update(t)
 for i := range matched {
matched[i].MatchID = &match.ID
 m.tickets.Update(matched[i])
 }

 pool.RemoveAll(matched)
Expand DownExpand Up@@ -209,9 +213,9 @@ func (m FlavorMatchMaker) generateMatches(flavorID string, version *chunkv1alpha
 match.Full = true
	}

	for _, t := range match.Tickets {
t.MatchID = &match.ID
 m.tickets.Update(t)
	for i := range match.Tickets {
match.Tickets[i].MatchID = &match.ID
 m.tickets.Update(match.Tickets[i])
	}

	m.matches.Add(match)
Expand All@@ -228,6 +232,12 @@ func (m FlavorMatchMaker) checkAndDeployMatches(ctx context.Context) {

 logger.Info("found match")

 if time.Now().After(match.CreatedAt.Add(m.removeDeployedMatchesAfter)) {
 logger.InfoContext(ctx, "removing deployed match")
 m.matches.Delete(match.ID)
 continue
 }

 var (
 invalidated []Ticket
 valid []Ticket
Expand DownExpand Up@@ -267,7 +277,7 @@ func (m FlavorMatchMaker) checkAndDeployMatches(ctx context.Context) {
 continue
 }

 if time.Now().After(match.CreatedAt.Add(m.allocInstanceForPendingMatchAfter)) {
 if time.Now().After(match.CreatedAt.Add(m.allocInstanceForPendingMatchAfter)) && match.InstanceAllocatedAt == nil {
 m.logger.Info("pending match created")
 if err := m.AllocateInstanceAndAssign(ctx, match); err != nil {
 logger.ErrorContext(ctx, "failed to allocate instance", "err", err)
Expand DownExpand Up@@ -308,7 +318,8 @@ func (m FlavorMatchMaker) AllocateInstanceAndAssign(ctx context.Context, match M
 return match.ID == matchID
	})

	m.matches.Delete(match.ID)
	match.InstanceAllocatedAt = new(time.Now())
	m.matches.Update(match)
	return nil
}

Expand Down

15 changes: 8 additions & 7 deletions
internal/matchmaking/types.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,13 +53,14 @@ type Assignment struct {
}

type Match struct {
	ID string
	Tickets TicketList
	Full bool
	ChunkID string
	FlavorID string
	FlavorVersion *chunkv1alpha1.FlavorVersion
	CreatedAt time.Time
	ID string
	Tickets TicketList
	Full bool
	ChunkID string
	FlavorID string
	FlavorVersion *chunkv1alpha1.FlavorVersion
	CreatedAt time.Time
	InstanceAllocatedAt *time.Time
}

func (m Match) GetID() string {
Expand Down

25 changes: 17 additions & 8 deletions
internal/server/endpoints.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,23 +34,32 @@ func (s Server) GetTicket(
	_ context.Context,
	req *mmv1alpha1.GetTicketRequest,
) (*mmv1alpha1.GetTicketResponse, error) {
t := s.tickets.Get(req.TicketId)
	if t == nil {
ticket := s.tickets.Get(req.TicketId)
	if ticket == nil {
 return nil, status.Error(codes.NotFound, "ticket not found")
	}

	ret := &mmv1alpha1.GetTicketResponse{
 Ticket: &mmv1alpha1.Ticket{
 Id: t.ID,
 FlavorId: t.FlavorID,
 PlayerCount: t.PlayerCount,
 Status: mmv1alpha1.TicketStatus(t.Status),
 Id: ticket.ID,
 FlavorId: ticket.FlavorID,
 PlayerCount: ticket.PlayerCount,
 Status: mmv1alpha1.TicketStatus(ticket.Status),
 },
	}

	if t.Assignment != nil {
	if ticket.Assignment != nil {
 ret.Ticket.Assignment = &mmv1alpha1.Assignment{
 InstanceId: t.Assignment.InstanceID,
 InstanceId: ticket.Assignment.InstanceID,
 }
	}

	if ticket.MatchID != nil {
 if m := s.matches.Get(*ticket.MatchID); m != nil {
 ret.Ticket.Match = &mmv1alpha1.Match{
 Id: m.ID,
 PlayerCount: m.PlayerCount(),
 }
 }
	}

Expand Down

12 changes: 11 additions & 1 deletion
internal/server/server.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,13 +44,20 @@ type Server struct {
	logger *slog.Logger
	cfg Config
	tickets *matchmaking.Store[matchmaking.Ticket]
	matches *matchmaking.Store[matchmaking.Match]
}

func New(logger *slog.Logger, config Config, tickets *matchmaking.Store[matchmaking.Ticket]) *Server {
func New(
	logger *slog.Logger,
	config Config,
	tickets *matchmaking.Store[matchmaking.Ticket],
	matches *matchmaking.Store[matchmaking.Match],
) *Server {
	return &Server{
 logger: logger,
 cfg: config,
 tickets: tickets,
 matches: matches,
	}
}

Expand All@@ -62,6 +69,7 @@ type Config struct {
	MatchInterval time.Duration `mapstructure:"match_interval"`
	AllocateInstanceForPendingMatchAfter time.Duration `mapstructure:"allocate_instance_for_pending_match_after"`
	RemoveInactiveTicketsAfter time.Duration `mapstructure:"remove_inactive_tickets_after"`
	RemoveDeployedMatchesAfter time.Duration `mapstructure:"remove_deployed_matches_after"`
}

func (s Server) Run(ctx context.Context) error {
Expand DownExpand Up@@ -118,7 +126,9 @@ func (s Server) Run(ctx context.Context) error {
 s.cfg.MatchInterval,
 s.cfg.AllocateInstanceForPendingMatchAfter,
 s.cfg.RemoveInactiveTicketsAfter,
 s.cfg.RemoveDeployedMatchesAfter,
 s.tickets,
 s.matches,
 chunkv1alpha1.NewChunkServiceClient(conn),
 instancev1alpha1.NewInstanceServiceClient(conn),
	)
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
expose match information#4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

freggy
merged 1 commit into

from

Jun 21, 2026
 Merged


expose match information
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


444 changes: 264 additions & 180 deletions
api/v1alpha1/api.pb.go

View file


Open in desktop


Large diffs are not rendered by default.


6 changes: 6 additions & 0 deletions
api/v1alpha1/api.proto

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,12 +39,18 @@ enum TicketStatus {
 NO_PLAYABLE_FLAVOR_VERSION = 2;
}

message Match {
 string id = 1;
 uint32 player_count = 2;
}

message Ticket {
 string id = 1;
 string flavor_id = 2;
 uint32 player_count = 3;
 TicketStatus status = 4;
 Assignment assignment = 5;
 Match match = 6;
}

message Assignment {
Expand Down

14 changes: 14 additions & 0 deletions
api/v1alpha1/api_grpc.pb.go

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


4 changes: 3 additions & 1 deletion
cmd/server/main.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ func main() {
 ctx, cancel = context.WithCancel(context.Background())
 logger = slog.New(slog.NewJSONHandler(os.Stdout, nil))
 tickets = matchmaking.NewStore[matchmaking.Ticket]()
 matches = matchmaking.NewStore[matchmaking.Match]()
	)

	viper.SetEnvPrefix("MM")
Expand All@@ -46,14 +47,15 @@ func main() {
	viper.SetDefault("match_interval", "1s")
	viper.SetDefault("allocate_instance_for_pending_match_after", "15s")
	viper.SetDefault("remove_inactive_tickets_after", "1m")
	viper.SetDefault("remove_deployed_matches_after", "2m")

	var cfg server.Config
	if err := viper.Unmarshal(&cfg); err != nil {
 logger.ErrorContext(ctx, "unable to decode config", "err", err)
 os.Exit(1)
	}

	serv := server.New(logger, cfg, tickets)
	serv := server.New(logger, cfg, tickets, matches)

	go func() {
 c := make(chan os.Signal, 1)
Expand Down

29 changes: 20 additions & 9 deletions
internal/matchmaking/matchmaker.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,7 @@ type FlavorMatchMaker struct {

	allocInstanceForPendingMatchAfter time.Duration
	removeInactiveTicketsAfter time.Duration
	removeDeployedMatchesAfter time.Duration

	chunkClient chunkv1alpha1.ChunkServiceClient
	insClient instancev1alpha1.InstanceServiceClient
Expand All@@ -60,7 +61,9 @@ func NewFlavorMatchMaker(
	matchEvalInterval time.Duration,
	allocInstanceForPendingMatchAfter time.Duration,
	removeInactiveTicketsAfter time.Duration,
	removeDeployedMatchesAfter time.Duration,
	tickets *Store[Ticket],
	matches *Store[Match],
	chunkClient chunkv1alpha1.ChunkServiceClient,
	insClient instancev1alpha1.InstanceServiceClient,
) *FlavorMatchMaker {
Expand All@@ -69,10 +72,11 @@ func NewFlavorMatchMaker(
 ticker: time.NewTicker(matchEvalInterval),
 tickets: tickets,
 ticketPools: make(map[string]TicketPool),
 matches: NewStore[Match](),
 matches: matches,
 pendingMatches: make(map[string][]string),
 allocInstanceForPendingMatchAfter: allocInstanceForPendingMatchAfter,
 removeInactiveTicketsAfter: removeInactiveTicketsAfter,
 removeDeployedMatchesAfter: removeDeployedMatchesAfter,
 chunkClient: chunkClient,
 insClient: insClient,
	}
Expand DownExpand Up@@ -157,9 +161,9 @@ func (m FlavorMatchMaker) generateMatches(flavorID string, version *chunkv1alpha
 matched = pool.FindTickets(maxPlayers - match.PlayerCount())
 )

 for _, t := range matched {
t.MatchID = &match.ID
 m.tickets.Update(t)
 for i := range matched {
matched[i].MatchID = &match.ID
 m.tickets.Update(matched[i])
 }

 pool.RemoveAll(matched)
Expand DownExpand Up@@ -209,9 +213,9 @@ func (m FlavorMatchMaker) generateMatches(flavorID string, version *chunkv1alpha
 match.Full = true
	}

	for _, t := range match.Tickets {
t.MatchID = &match.ID
 m.tickets.Update(t)
	for i := range match.Tickets {
match.Tickets[i].MatchID = &match.ID
 m.tickets.Update(match.Tickets[i])
	}

	m.matches.Add(match)
Expand All@@ -228,6 +232,12 @@ func (m FlavorMatchMaker) checkAndDeployMatches(ctx context.Context) {

 logger.Info("found match")

 if time.Now().After(match.CreatedAt.Add(m.removeDeployedMatchesAfter)) {
 logger.InfoContext(ctx, "removing deployed match")
 m.matches.Delete(match.ID)
 continue
 }

 var (
 invalidated []Ticket
 valid []Ticket
Expand DownExpand Up@@ -267,7 +277,7 @@ func (m FlavorMatchMaker) checkAndDeployMatches(ctx context.Context) {
 continue
 }

 if time.Now().After(match.CreatedAt.Add(m.allocInstanceForPendingMatchAfter)) {
 if time.Now().After(match.CreatedAt.Add(m.allocInstanceForPendingMatchAfter)) && match.InstanceAllocatedAt == nil {
 m.logger.Info("pending match created")
 if err := m.AllocateInstanceAndAssign(ctx, match); err != nil {
 logger.ErrorContext(ctx, "failed to allocate instance", "err", err)
Expand DownExpand Up@@ -308,7 +318,8 @@ func (m FlavorMatchMaker) AllocateInstanceAndAssign(ctx context.Context, match M
 return match.ID == matchID
	})

	m.matches.Delete(match.ID)
	match.InstanceAllocatedAt = new(time.Now())
	m.matches.Update(match)
	return nil
}

Expand Down

15 changes: 8 additions & 7 deletions
internal/matchmaking/types.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,13 +53,14 @@ type Assignment struct {
}

type Match struct {
	ID string
	Tickets TicketList
	Full bool
	ChunkID string
	FlavorID string
	FlavorVersion *chunkv1alpha1.FlavorVersion
	CreatedAt time.Time
	ID string
	Tickets TicketList
	Full bool
	ChunkID string
	FlavorID string
	FlavorVersion *chunkv1alpha1.FlavorVersion
	CreatedAt time.Time
	InstanceAllocatedAt *time.Time
}

func (m Match) GetID() string {
Expand Down

25 changes: 17 additions & 8 deletions
internal/server/endpoints.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,23 +34,32 @@ func (s Server) GetTicket(
	_ context.Context,
	req *mmv1alpha1.GetTicketRequest,
) (*mmv1alpha1.GetTicketResponse, error) {
t := s.tickets.Get(req.TicketId)
	if t == nil {
ticket := s.tickets.Get(req.TicketId)
	if ticket == nil {
 return nil, status.Error(codes.NotFound, "ticket not found")
	}

	ret := &mmv1alpha1.GetTicketResponse{
 Ticket: &mmv1alpha1.Ticket{
 Id: t.ID,
 FlavorId: t.FlavorID,
 PlayerCount: t.PlayerCount,
 Status: mmv1alpha1.TicketStatus(t.Status),
 Id: ticket.ID,
 FlavorId: ticket.FlavorID,
 PlayerCount: ticket.PlayerCount,
 Status: mmv1alpha1.TicketStatus(ticket.Status),
 },
	}

	if t.Assignment != nil {
	if ticket.Assignment != nil {
 ret.Ticket.Assignment = &mmv1alpha1.Assignment{
 InstanceId: t.Assignment.InstanceID,
 InstanceId: ticket.Assignment.InstanceID,
 }
	}

	if ticket.MatchID != nil {
 if m := s.matches.Get(*ticket.MatchID); m != nil {
 ret.Ticket.Match = &mmv1alpha1.Match{
 Id: m.ID,
 PlayerCount: m.PlayerCount(),
 }
 }
	}

Expand Down

12 changes: 11 additions & 1 deletion
internal/server/server.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,13 +44,20 @@ type Server struct {
	logger *slog.Logger
	cfg Config
	tickets *matchmaking.Store[matchmaking.Ticket]
	matches *matchmaking.Store[matchmaking.Match]
}

func New(logger *slog.Logger, config Config, tickets *matchmaking.Store[matchmaking.Ticket]) *Server {
func New(
	logger *slog.Logger,
	config Config,
	tickets *matchmaking.Store[matchmaking.Ticket],
	matches *matchmaking.Store[matchmaking.Match],
) *Server {
	return &Server{
 logger: logger,
 cfg: config,
 tickets: tickets,
 matches: matches,
	}
}

Expand All@@ -62,6 +69,7 @@ type Config struct {
	MatchInterval time.Duration `mapstructure:"match_interval"`
	AllocateInstanceForPendingMatchAfter time.Duration `mapstructure:"allocate_instance_for_pending_match_after"`
	RemoveInactiveTicketsAfter time.Duration `mapstructure:"remove_inactive_tickets_after"`
	RemoveDeployedMatchesAfter time.Duration `mapstructure:"remove_deployed_matches_after"`
}

func (s Server) Run(ctx context.Context) error {
Expand DownExpand Up@@ -118,7 +126,9 @@ func (s Server) Run(ctx context.Context) error {
 s.cfg.MatchInterval,
 s.cfg.AllocateInstanceForPendingMatchAfter,
 s.cfg.RemoveInactiveTicketsAfter,
 s.cfg.RemoveDeployedMatchesAfter,
 s.tickets,
 s.matches,
 chunkv1alpha1.NewChunkServiceClient(conn),
 instancev1alpha1.NewInstanceServiceClient(conn),
	)
Expand Down
Loading