clean up more csgo stuff + ParseBroadcast funcs

Author: markus-wa

examples/entities/entities.go

@@ -23,13 +23,13 @@ func main() {
 	p.RegisterEventHandler(func(events.DataTablesParsed) {
 		p.ServerClasses().FindByName("CWeaponAWP").OnEntityCreated(func(ent st.Entity) {
 			ent.Property("m_hOwnerEntity").OnUpdate(func(val st.PropertyValue) {
-				x := p.GameState().Participants().FindByHandle64(val.S2UInt64())
+				x := p.GameState().Participants().FindByHandle64(val.UInt64())
 				if x != nil {
 					var prev string
-					prevHandle := ent.Property("m_hPrevOwner").Value().S2UInt64()
+					prevHandle := ent.Property("m_hPrevOwner").Value().UInt64()
 					prevPlayer := p.GameState().Participants().FindByHandle64(prevHandle)
 					if prevPlayer != nil {
-						if prevHandle != val.S2UInt64() {
+						if prevHandle != val.UInt64() {
 							prev = prevPlayer.Name + "'s"
 						} else {
 							prev = "his dropped"

pkg/demoinfocs/common/entity_util.go

@@ -15,7 +15,7 @@ func getUInt64(entity st.Entity, propName string) uint64 {
 		return 0
 	}
 
-	return entity.PropertyValueMust(propName).S2UInt64()
+	return entity.PropertyValueMust(propName).UInt64()
 }
 
 func getFloat(entity st.Entity, propName string) float32 {

pkg/demoinfocs/common/equipment.go

@@ -356,7 +356,7 @@ func (e *Equipment) AmmoInMagazine() int {
 			return -1
 		}
 
-		return int(ammo.S2UInt32() - 1)
+		return int(ammo.UInt32() - 1)
 	}
 }
 
@@ -400,18 +400,9 @@ func (e *Equipment) AmmoReserve() int {
 		return 0
 	}
 
-	s2Prop := e.Entity.Property("m_pReserveAmmo.0000")
-	if s2Prop != nil && s2Prop.Value().Any != nil {
-		return s2Prop.Value().Int()
-	}
-
-	if e.Class() == EqClassGrenade {
-		if e.Owner != nil {
-			// minus one for 'InMagazine'
-			return e.Owner.AmmoLeft[e.AmmoType()] - 1
-		}
-
-		return 0
+	prop := e.Entity.Property("m_pReserveAmmo.0000")
+	if prop != nil && prop.Value().Any != nil {
+		return prop.Value().Int()
 	}
 
 	if e.Class() == EqClassEquipment {

pkg/demoinfocs/common/player.go

@@ -18,7 +18,6 @@ type Player struct {
 	UserID        int                // Mostly used in game-events to address this player
 	Name          string             // Steam / in-game user name
 	Inventory     map[int]*Equipment // All weapons / equipment the player is currently carrying. See also Weapons().
-	AmmoLeft      [32]int            // Ammo left for special weapons (e.g. grenades), index corresponds Equipment.AmmoType
 	EntityID      int                // Usually the same as Entity.ID() but may be different between player death and re-spawn.
 	Entity        st.Entity          // May be nil between player-death and re-spawn
 	FlashDuration float32            // Blindness duration from the flashbang currently affecting the player (seconds)
@@ -52,7 +51,7 @@ func (p *Player) PlayerPawnEntity() st.Entity {
 }
 
 func (p *Player) GetTeam() Team {
-	return Team(p.PlayerPawnEntity().PropertyValueMust("m_iTeamNum").S2UInt64())
+	return Team(p.PlayerPawnEntity().PropertyValueMust("m_iTeamNum").UInt64())
 }
 
 func (p *Player) GetFlashDuration() float32 {
@@ -83,7 +82,7 @@ func (p *Player) IsAlive() bool {
 
 	pawnEntity := p.PlayerPawnEntity()
 	if pawnEntity != nil {
-		return pawnEntity.PropertyValueMust("m_lifeState").S2UInt64() == 0
+		return pawnEntity.PropertyValueMust("m_lifeState").UInt64() == 0
 	}
 
 	return getBool(p.Entity, "m_bPawnIsAlive")
@@ -153,7 +152,7 @@ This isn't very conclusive but it looks like IsFlashed isn't super reliable curr
 // ActiveWeaponID is used internally to set the active weapon, see ActiveWeapon()
 func (p *Player) ActiveWeaponID() int {
 	if pawnEntity := p.PlayerPawnEntity(); pawnEntity != nil {
-		return int(pawnEntity.PropertyValueMust("m_pWeaponServices.m_hActiveWeapon").S2UInt64() & constants.EntityHandleIndexMaskSource2)
+		return int(pawnEntity.PropertyValueMust("m_pWeaponServices.m_hActiveWeapon").UInt64() & constants.EntityHandleIndexMaskSource2)
 	}
 
 	return 0
@@ -196,7 +195,7 @@ func (p *Player) IsSpottedBy(other *Player) bool {
 		mask = p.PlayerPawnEntity().Property("m_bSpottedByMask.0001")
 	}
 
-	return (mask.Value().S2UInt64() & (1 << bit)) != 0
+	return (mask.Value().UInt64() & (1 << bit)) != 0
 }
 
 // HasSpotted returns true if the player has spotted the other player.
@@ -289,7 +288,7 @@ func (p *Player) ControlledBot() *Player {
 		return nil
 	}
 
-	controllerHandler := p.Entity.Property("m_hOriginalControllerOfCurrentPawn").Value().S2UInt64()
+	controllerHandler := p.Entity.Property("m_hOriginalControllerOfCurrentPawn").Value().UInt64()
 
 	return p.demoInfoProvider.FindPlayerByHandle(controllerHandler)
 }

pkg/demoinfocs/datatables.go

@@ -396,7 +396,7 @@ func (p *parser) bindNewPlayerController(controllerEntity st.Entity) {
 
 	controllerEntity.Property("m_iConnected").OnUpdate(func(val st.PropertyValue) {
 		pl := p.getOrCreatePlayerFromControllerEntity(controllerEntity)
-		state := val.S2UInt32()
+		state := val.UInt32()
 		wasConnected := pl.IsConnected
 		pl.IsConnected = state == 0
 
@@ -425,7 +425,7 @@ func (p *parser) bindNewPlayerController(controllerEntity st.Entity) {
 	})
 
 	controllerEntity.Property("m_iTeamNum").OnUpdate(func(val st.PropertyValue) {
-		pl.Team = common.Team(val.S2UInt64())
+		pl.Team = common.Team(val.UInt64())
 		pl.TeamState = p.gameState.Team(pl.Team)
 	})
 
@@ -531,7 +531,7 @@ func (p *parser) bindPlayerWeapons(pawnEntity st.Entity, pl *common.Player) {
 	playerInventory := make(map[int]eq)
 
 	getWep := func(wepSlotPropertyValue st.PropertyValue) (uint64, *common.Equipment) {
-		entityID := wepSlotPropertyValue.S2UInt64() & constants.EntityHandleIndexMaskSource2
+		entityID := wepSlotPropertyValue.UInt64() & constants.EntityHandleIndexMaskSource2
 		wep := p.gameState.weapons[int(entityID)]
 
 		if wep == nil {
@@ -560,7 +560,7 @@ func (p *parser) bindPlayerWeapons(pawnEntity st.Entity, pl *common.Player) {
 	}
 
 	pawnEntity.Property("m_pWeaponServices.m_hMyWeapons").OnUpdate(func(pv st.PropertyValue) {
-		inventorySize = len(pv.S2Array())
+		inventorySize = len(pv.Array())
 		setPlayerInventory()
 	})
 
@@ -657,7 +657,7 @@ func (p *parser) bindGrenadeProjectiles(entity st.Entity) {
 		modelVal := entity.PropertyValueMust("CBodyComponent.m_hModel")
 
 		if modelVal.Any != nil {
-			model := modelVal.S2UInt64()
+			model := modelVal.UInt64()
 			weaponType, exists := p.equipmentTypePerModel[model]
 			if exists {
 				wep = weaponType
@@ -815,7 +815,7 @@ func (p *parser) bindWeaponS2(entity st.Entity) {
 		return
 	}
 
-	itemIndex := itemIndexVal.S2UInt64()
+	itemIndex := itemIndexVal.UInt64()
 	wepType := common.EquipmentIndexMapping[itemIndex]
 
 	if wepType == common.EqUnknown {
@@ -826,7 +826,7 @@ func (p *parser) bindWeaponS2(entity st.Entity) {
 			Type:    events.WarnTypeUnknownEquipmentIndex,
 		})
 	} else {
-		model := entity.PropertyValueMust("CBodyComponent.m_hModel").S2UInt64()
+		model := entity.PropertyValueMust("CBodyComponent.m_hModel").UInt64()
 		p.equipmentTypePerModel[model] = wepType
 	}
 

pkg/demoinfocs/parser.go

@@ -379,13 +379,13 @@ func NewCSTVBroadcastParserWithConfig(baseUrl string, config ParserConfig) (Pars
 	return NewParserWithConfig(r, config), nil
 }
 
-type ConfigureParserCallback func(Parser) error
+type ParserCallback func(Parser) error
 
 // ParseWithConfig parses a demo from the given io.Reader with a custom configuration.
 // The handler is called with the Parser instance.
 //
 // Returns an error if the parser encounters an error.
-func ParseWithConfig(r io.Reader, config ParserConfig, configure ConfigureParserCallback) error {
+func ParseWithConfig(r io.Reader, config ParserConfig, configure ParserCallback) error {
 	p := NewParserWithConfig(r, config)
 	defer p.Close()
 
@@ -406,15 +406,15 @@ func ParseWithConfig(r io.Reader, config ParserConfig, configure ConfigureParser
 // The handler is called with the Parser instance.
 //
 // Returns an error if the parser encounters an error.
-func Parse(r io.Reader, configure ConfigureParserCallback) error {
+func Parse(r io.Reader, configure ParserCallback) error {
 	return ParseWithConfig(r, DefaultParserConfig, configure)
 }
 
 // ParseFileWithConfig parses a demo file at the given path with a custom configuration.
 // The handler is called with the Parser instance.
 //
 // Returns an error if the file can't be opened or if the parser encounters an error.
-func ParseFileWithConfig(path string, config ParserConfig, configure ConfigureParserCallback) error {
+func ParseFileWithConfig(path string, config ParserConfig, configure ParserCallback) error {
 	f, err := os.Open(path)
 	if err != nil {
 		return fmt.Errorf("failed to open file: %w", err)
@@ -429,10 +429,45 @@ func ParseFileWithConfig(path string, config ParserConfig, configure ConfigurePa
 // The handler is called with the Parser instance.
 //
 // Returns an error if the file can't be opened or if the parser encounters an error.
-func ParseFile(path string, configure ConfigureParserCallback) error {
+func ParseFile(path string, configure ParserCallback) error {
 	return ParseFileWithConfig(path, DefaultParserConfig, configure)
 }
 
+// ParseCSTVBroadcastWithConfig parses a live CSTV broadcast from the given base URL with a custom configuration.
+// The handler is called with the Parser instance.
+// The baseUrl is the base URL of the CSTV broadcast, e.g. "http://localhost:8080/s85568392932860274t1733091777".
+// Returns an error if the CSTV reader can't be created or if the parser encounters an error.
+// Note that the CSTV broadcast is a live stream and will not end until the broadcast ends.
+func ParseCSTVBroadcastWithConfig(baseUrl string, config ParserConfig, configure ParserCallback) error {
+	p, err := NewCSTVBroadcastParserWithConfig(baseUrl, config)
+	if err != nil {
+		return fmt.Errorf("failed to create CSTV broadcast parser: %w", err)
+	}
+
+	defer p.Close()
+
+	err = configure(p)
+	if err != nil {
+		return fmt.Errorf("failed to configure parser: %w", err)
+	}
+
+	err = p.ParseToEnd()
+	if err != nil {
+		return fmt.Errorf("failed to parse CSTV broadcast: %w", err)
+	}
+
+	return nil
+}
+
+// ParseCSTVBroadcast parses a live CSTV broadcast from the given base URL.
+// The handler is called with the Parser instance.
+// The baseUrl is the base URL of the CSTV broadcast, e.g. "http://localhost:8080/s85568392932860274t1733091777".
+// Returns an error if the CSTV reader can't be created or if the parser encounters an error.
+// Note that the CSTV broadcast is a live stream and will not end until the broadcast ends.
+func ParseCSTVBroadcast(baseUrl string, configure ParserCallback) error {
+	return ParseCSTVBroadcastWithConfig(baseUrl, DefaultParserConfig, configure)
+}
+
 // ParserConfig contains the configuration for creating a new Parser.
 type ParserConfig struct {
 	// MsgQueueBufferSize defines the size of the internal net-message queue.

pkg/demoinfocs/sendtables/sendtables.go

@@ -61,20 +61,20 @@ func (v PropertyValue) Int64() int64 {
 	return v.Any.(int64)
 }
 
-func (v PropertyValue) S2UInt64() uint64 {
+func (v PropertyValue) UInt64() uint64 {
 	return v.Any.(uint64)
 }
 
-func (v PropertyValue) S2Array() []any {
+func (v PropertyValue) Array() []any {
 	return v.Any.([]any)
 }
 
-func (v PropertyValue) S2UInt32() uint32 {
+func (v PropertyValue) UInt32() uint32 {
 	return v.Any.(uint32)
 }
 
 func (v PropertyValue) Handle() uint64 {
-	return v.S2UInt64()
+	return v.UInt64()
 }
 
 func (v PropertyValue) Float() float32 {

pkg/demoinfocs/sendtables/sendtablescs2/entity.go

@@ -92,7 +92,7 @@ var bindFactoryByType = map[st.PropertyValueType]bindFactory{
 	},
 	st.ValTypeArray: func(variable any) st.PropertyUpdateHandler {
 		return func(v st.PropertyValue) {
-			*variable.(*[]any) = v.S2Array()
+			*variable.(*[]any) = v.Array()
 		}
 	},
 	st.ValTypeString: func(variable any) st.PropertyUpdateHandler {
@@ -203,9 +203,9 @@ func (e *Entity) Position() r3.Vector {
 		return r3.Vector{} // CS2 POV demos
 	}
 
-	cellX := cellXVal.S2UInt64()
-	cellY := cellYVal.S2UInt64()
-	cellZ := cellZVal.S2UInt64()
+	cellX := cellXVal.UInt64()
+	cellY := cellYVal.UInt64()
+	cellZ := cellZVal.UInt64()
 	offsetX := offsetXVal.Float()
 	offsetY := offsetYVal.Float()
 	offsetZ := offsetZVal.Float()