wip

Author: lukepolo

cmd/server/http.go

@@ -70,7 +70,8 @@ func handleParse(w http.ResponseWriter, r *http.Request) {
 	if logPrefix == "" {
 		logPrefix = "<no-id>"
 	}
-	log.Printf("[%s] fetching demo", logPrefix)
+	log.Printf("[%s] fetching demo %s", logPrefix, req.DemoURL)
+	fetchStart := time.Now()
 
 	demoResp, err := http.Get(req.DemoURL)
 	if err != nil {
@@ -85,12 +86,18 @@ func handleParse(w http.ResponseWriter, r *http.Request) {
 		)
 		return
 	}
+	log.Printf("[%s] fetched demo in %s (Content-Length=%s)",
+		logPrefix,
+		time.Since(fetchStart),
+		demoResp.Header.Get("Content-Length"),
+	)
 
 	body, err := sniffDemoStream(demoResp.Body, logPrefix)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusUnprocessableEntity)
 		return
 	}
+	log.Printf("[%s] parsing demo", logPrefix)
 	parseAndRespond(w, body, logPrefix)
 }
 

internal/parser/grenades.go

@@ -181,3 +181,29 @@ func (s *state) onFireGrenadeStart(e events.FireGrenadeStart) {
 	}
 	s.emitDetonate(e.GrenadeEvent, "Molotov")
 }
+
+// onPlayerFlashed fires once per blinded player per flash. We capture
+// the attacker (thrower), the victim, and the resulting blind duration
+// so player_flashes aggregates (enemies_flashed / team_flashed /
+// avg_blind_time) work for imported demos.
+func (s *state) onPlayerFlashed(e events.PlayerFlashed) {
+	if !s.matchStarted {
+		return
+	}
+	if e.Player == nil || e.Attacker == nil {
+		return
+	}
+	attackerTeam := teamCode(e.Attacker.Team)
+	victimTeam := teamCode(e.Player.Team)
+	ev := EventFlash{
+		Tick:            s.parser.GameState().IngameTick(),
+		Round:           s.currentRound,
+		AttackerSteamID: steamIDStr(e.Attacker),
+		AttackerTeam:    attackerTeam,
+		VictimSteamID:   steamIDStr(e.Player),
+		VictimTeam:      victimTeam,
+		Duration:        e.Player.FlashDurationTime().Seconds(),
+		TeamFlash:       attackerTeam != "" && attackerTeam == victimTeam,
+	}
+	s.res.Flashes = append(s.res.Flashes, ev)
+}

internal/parser/parser.go

@@ -140,6 +140,7 @@ func (s *state) registerHandlers() {
 	s.parser.RegisterEventHandler(s.onFlashExplode)
 	s.parser.RegisterEventHandler(s.onSmokeStart)
 	s.parser.RegisterEventHandler(s.onFireGrenadeStart)
+	s.parser.RegisterEventHandler(s.onPlayerFlashed)
 }
 
 // finalize resolves header-equivalent fields from the live parser

internal/parser/types.go

@@ -118,6 +118,17 @@ type EventPosition struct {
 	HasDefuser bool `json:"has_defuser,omitempty"`
 }
 
+type EventFlash struct {
+	Tick            int     `json:"tick"`
+	Round           int     `json:"round,omitempty"`
+	AttackerSteamID string  `json:"attacker,omitempty"`
+	AttackerTeam    string  `json:"attacker_team,omitempty"`
+	VictimSteamID   string  `json:"victim,omitempty"`
+	VictimTeam      string  `json:"victim_team,omitempty"`
+	Duration        float64 `json:"duration,omitempty"`
+	TeamFlash       bool    `json:"team_flash,omitempty"`
+}
+
 type EventRoundInventory struct {
 	Round           int    `json:"round,omitempty"`
 	AttackerSteamID string `json:"attacker,omitempty"`
@@ -205,6 +216,7 @@ type Result struct {
 	Spotted            []EventSpotted         `json:"spotted,omitempty"`
 	GrenadeThrows      []EventGrenadeThrow    `json:"grenade_throws,omitempty"`
 	GrenadeDetonations []EventGrenadeDetonate `json:"grenade_detonations,omitempty"`
+	Flashes            []EventFlash           `json:"flashes,omitempty"`
 	RoundInventory     []EventRoundInventory  `json:"round_inventory,omitempty"`
 	Positions          []EventPosition        `json:"positions,omitempty"`
 	KitDrops           []EventKitDrop         `json:"kit_drops,omitempty"`