Merge branch 'master' into master

Author: markus-wa

README.md

@@ -2,8 +2,6 @@
 
 A blazing fast, feature complete and production ready Go library for parsing and analysing of Counter-Strike 2 and Counter-Strike: Global Offensive (CS:GO) demos (aka replays).
 
-[![Stand With Ukraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/badges/StandWithUkraine.svg)](https://vshymanskyy.github.io/StandWithUkraine)
-
 [![go.dev reference](https://img.shields.io/badge/go.dev-reference-007d9c?logo=go&logoColor=white&style=flat-square)](https://pkg.go.dev/github.com/markus-wa/demoinfocs-golang/v4/pkg/demoinfocs?tab=doc)
 [![Build Status](https://img.shields.io/github/actions/workflow/status/markus-wa/demoinfocs-golang/ci.yml?branch=master&style=flat-square)](https://github.com/markus-wa/demoinfocs-golang/actions)
 [![codecov](https://img.shields.io/codecov/c/github/markus-wa/demoinfocs-golang?style=flat-square)](https://codecov.io/gh/markus-wa/demoinfocs-golang)

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/samber/lo v1.38.1
 	github.com/stretchr/testify v1.8.4
 	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63
-	google.golang.org/protobuf v1.31.0
+	google.golang.org/protobuf v1.34.1
 )
 
 require (

go.sum

@@ -7,10 +7,8 @@ github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGw
 github.com/golang/geo v0.0.0-20180826223333-635502111454/go.mod h1:vgWZ7cu0fq0KY3PpEHsocXOWJpRtkcbKemU4IUw0M60=
 github.com/golang/geo v0.0.0-20230421003525-6adc56603217 h1:HKlyj6in2JV6wVkmQ4XmG/EIm+SCYlPZ+V4GWit7Z+I=
 github.com/golang/geo v0.0.0-20230421003525-6adc56603217/go.mod h1:8wI0hitZ3a1IxZfeH3/5I97CI8i5cLGsYe7xNhQGs9U=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/llgcode/draw2d v0.0.0-20230723155556-e595d7c7e75e h1:hqFckor7F0B63l6cV/PoAsuQUOmDji/1oVF0+24EMUI=
@@ -84,10 +82,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
+google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

pkg/demoinfocs/common/hostage.go

@@ -3,6 +3,7 @@ package common
 import (
 	"github.com/golang/geo/r3"
 
+	"github.com/markus-wa/demoinfocs-golang/v4/pkg/demoinfocs/constants"
 	st "github.com/markus-wa/demoinfocs-golang/v4/pkg/demoinfocs/sendtables"
 )
 
@@ -54,7 +55,12 @@ func (hostage *Hostage) Health() int {
 // Returns nil if the hostage is not following a player.
 func (hostage *Hostage) Leader() *Player {
 	if hostage.demoInfoProvider.IsSource2() {
-		return hostage.demoInfoProvider.FindPlayerByPawnHandle(getUInt64(hostage.Entity, "m_leader"))
+		leaderHandle := getUInt64(hostage.Entity, "m_leader")
+		if leaderHandle != constants.InvalidEntityHandleSource2 {
+			return hostage.demoInfoProvider.FindPlayerByPawnHandle(leaderHandle)
+		}
+
+		return hostage.demoInfoProvider.FindPlayerByPawnHandle(getUInt64(hostage.Entity, "m_hHostageGrabber"))
 	}
 
 	return hostage.demoInfoProvider.FindPlayerByHandle(uint64(getInt(hostage.Entity, "m_leader")))

pkg/demoinfocs/common/hostage_test.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
+	"github.com/markus-wa/demoinfocs-golang/v4/pkg/demoinfocs/constants"
 	st "github.com/markus-wa/demoinfocs-golang/v4/pkg/demoinfocs/sendtables"
 )
 
@@ -19,6 +20,29 @@ func TestHostage_Leader(t *testing.T) {
 	assert.Equal(t, player, hostage.Leader())
 }
 
+func TestHostage_LeaderWithInvalidHandleS2(t *testing.T) {
+	player := new(Player)
+	player.EntityID = 10
+	provider := demoInfoProviderMock{
+		playersByHandle: map[uint64]*Player{10: player},
+		isSource2:       true,
+	}
+	hostage := hostageWithProperties([]fakeProp{
+		{
+			propName: "m_leader",
+			value:    st.PropertyValue{Any: uint64(constants.InvalidEntityHandleSource2)},
+			isNil:    false,
+		},
+		{
+			propName: "m_hHostageGrabber",
+			value:    st.PropertyValue{Any: uint64(10)},
+			isNil:    false,
+		},
+	}, provider)
+
+	assert.Equal(t, player, hostage.Leader())
+}
+
 func TestHostage_State(t *testing.T) {
 	hostage := hostageWithProperty("m_nHostageState", st.PropertyValue{IntVal: int(HostageStateFollowingPlayer)}, demoInfoProviderMock{})
 
@@ -34,3 +58,7 @@ func TestHostage_Health(t *testing.T) {
 func hostageWithProperty(propName string, value st.PropertyValue, provider demoInfoProviderMock) *Hostage {
 	return &Hostage{Entity: entityWithProperty(propName, value), demoInfoProvider: provider}
 }
+
+func hostageWithProperties(properties []fakeProp, provider demoInfoProviderMock) *Hostage {
+	return &Hostage{Entity: entityWithProperties(properties), demoInfoProvider: provider}
+}

pkg/demoinfocs/demoinfocs_test.go

@@ -549,6 +549,10 @@ func testDemoSet(t *testing.T, path string) {
 						t.Log("expected known issue with missing item definition index occurred:", warn.Message)
 						return
 
+					case events.WarnTypeStringTableParsingFailure:
+						t.Log("expected known issue with stringtables parsing occurred:", warn.Message)
+						return
+
 					case events.WarnTypeGameEventBeforeDescriptors:
 						if strings.Contains(name, "POV-orbit-skytten-vs-cloud9-gfinity15sm1-nuke.dem") {
 							t.Log("expected known issue for POV demos occurred:", warn.Message)

pkg/demoinfocs/events/events.go

@@ -203,7 +203,7 @@ type GrenadeEvent struct {
 	GrenadeType     common.EquipmentType
 	Grenade         *common.Equipment // Maybe nil for InfernoStart & InfernoExpired since we don't know the thrower (at least in old demos)
 	Position        r3.Vector
-	Thrower         *common.Player // May be nil if the demo is partially corrupt (player is 'unconnected', see #156 and #172).
+	Thrower         *common.Player // May be nil with POV demos or if the demo is partially corrupt (player is 'unconnected', see #156 and #172).
 	GrenadeEntityID int
 }
 
@@ -308,7 +308,7 @@ const (
 // BombEvent contains the common attributes of bomb events. Dont register
 // handlers on this tho, you want BombEventIf for that.
 type BombEvent struct {
-	Player *common.Player
+	Player *common.Player // Can be nil with POV demos
 	Site   Bombsite
 }
 
@@ -421,7 +421,7 @@ const (
 
 // PlayerHurt signals that a player has been damaged.
 type PlayerHurt struct {
-	Player            *common.Player // May be nil if the demo is partially corrupt (player is 'unconnected', see #156 and #172).
+	Player            *common.Player // May be nil with POV demos or if the demo is partially corrupt (player is 'unconnected', see #156 and #172).
 	Attacker          *common.Player // May be nil if the player is taking world damage (e.g. fall damage) or if the demo is partially corrupt (player is 'unconnected', see #156 and #172).
 	Health            int
 	Armor             int
@@ -590,6 +590,7 @@ const (
 
 	WarnTypeUnknownEquipmentIndex
 	WarnTypeMissingItemDefinitionIndex
+	WarnTypeStringTableParsingFailure // Should happen only with CS2 POV demos
 )
 
 // ParserWarn signals that a non-fatal problem occurred during parsing.

pkg/demoinfocs/game_events.go

@@ -2,6 +2,7 @@ package demoinfocs
 
 import (
 	"fmt"
+	"math"
 	"time"
 
 	"github.com/golang/geo/r3"
@@ -501,13 +502,12 @@ func (geh gameEventHandler) playerHurt(data map[string]*msg.CSVCMsg_GameEventKey
 		armorDamageTaken = 100
 	}
 
-	if player != nil && (!geh.parser.isSource2() || (player.PlayerPawnEntity() != nil)) {
-		// m_iHealth & m_ArmorValue check for CS2 POV demos
-		if health == 0 && (!geh.parser.isSource2() || player.PlayerPawnEntity().Property("m_iHealth") != nil) {
+	if player != nil {
+		if health == 0 {
 			healthDamageTaken = player.Health()
 		}
 
-		if armor == 0 && (!geh.parser.isSource2() || player.PlayerPawnEntity().Property("m_ArmorValue") != nil) {
+		if armor == 0 {
 			armorDamageTaken = player.Armor()
 		}
 	}
@@ -650,10 +650,6 @@ func (geh gameEventHandler) HostageRescuedAll(map[string]*msg.CSVCMsg_GameEventK
 }
 
 func (geh gameEventHandler) playerConnect(data map[string]*msg.CSVCMsg_GameEventKeyT) {
-	if geh.parser.isSource2() {
-		return
-	}
-
 	pl := common.PlayerInfo{
 		UserID:       int(data["userid"].GetValShort()),
 		Name:         data["name"].GetValString(),
@@ -671,7 +667,17 @@ func (geh gameEventHandler) playerConnect(data map[string]*msg.CSVCMsg_GameEvent
 		}
 	}
 
-	geh.parser.setRawPlayer(int(data["index"].GetValByte()), pl)
+	var playerIndex int
+	if geh.parser.isSource2() {
+		playerIndex = pl.UserID
+		if !pl.IsFakePlayer && !pl.IsHltv && pl.XUID > 0 && pl.UserID <= math.MaxUint8 {
+			pl.UserID |= math.MaxUint8 << 8
+		}
+	} else {
+		playerIndex = int(data["index"].GetValByte())
+	}
+
+	geh.parser.setRawPlayer(playerIndex, pl)
 }
 
 func (geh gameEventHandler) playerDisconnect(data map[string]*msg.CSVCMsg_GameEventKeyT) {

pkg/demoinfocs/stringtables.go

@@ -294,7 +294,9 @@ const (
 )
 
 // Parse a string table data blob, returning a list of item updates.
-func parseStringTable(
+//
+//nolint:funlen,gocognit
+func (p *parser) parseStringTable(
 	buf []byte,
 	numUpdates int32,
 	name string,
@@ -308,6 +310,16 @@ func parseStringTable(
 		return items
 	}
 
+	defer func() {
+		err := recover()
+		if err != nil {
+			p.eventDispatcher.Dispatch(events.ParserWarn{
+				Type:    events.WarnTypeStringTableParsingFailure,
+				Message: "failed to parse stringtable properly",
+			})
+		}
+	}()
+
 	// Create a reader for the buffer
 	r := bit.NewSmallBitReader(bytes.NewReader(buf))
 
@@ -372,41 +384,42 @@ func parseStringTable(
 			if len(keys) > stringtableKeyHistorySize {
 				keys = keys[1:]
 			}
+		}
 
-			// Some entries have a value.
-			hasValue := r.ReadBit()
-			if hasValue {
-				bitSize := uint(0)
-				isCompressed := false
+		// Some entries have a value.
+		hasValue := r.ReadBit()
+		//nolint:nestif
+		if hasValue {
+			bitSize := uint(0)
+			isCompressed := false
 
-				if userDataFixed {
-					bitSize = uint(userDataSize)
-				} else {
-					if (flags & 0x1) != 0 {
-						isCompressed = r.ReadBit()
-					}
-
-					if variantBitCount {
-						bitSize = r.ReadUBitInt() * 8
-					} else {
-						bitSize = r.ReadInt(17) * 8
-					}
+			if userDataFixed {
+				bitSize = uint(userDataSize)
+			} else {
+				if (flags & 0x1) != 0 {
+					isCompressed = r.ReadBit()
 				}
 
-				value = r.ReadBits(int(bitSize))
+				if variantBitCount {
+					bitSize = r.ReadUBitInt() * 8
+				} else {
+					bitSize = r.ReadInt(17) * 8
+				}
+			}
 
-				if isCompressed {
-					tmp, err := snappy.Decode(nil, value)
-					if err != nil {
-						panic(fmt.Sprintf("unable to decode snappy compressed stringtable item (%s, %d, %s): %s", name, index, key, err))
-					}
+			value = r.ReadBits(int(bitSize))
 
-					value = tmp
+			if isCompressed {
+				tmp, err := snappy.Decode(nil, value)
+				if err != nil {
+					panic(fmt.Sprintf("unable to decode snappy compressed stringtable item (%s, %d, %s): %s", name, index, key, err))
 				}
-			}
 
-			items = append(items, &stringTableItem{index, key, value})
+				value = tmp
+			}
 		}
+
+		items = append(items, &stringTableItem{index, key, value})
 	}
 
 	return items
@@ -415,7 +428,7 @@ func parseStringTable(
 var instanceBaselineKeyRegex = regexp.MustCompile(`^\d+:\d+$`)
 
 func (p *parser) processStringTableS2(tab createStringTable) {
-	items := parseStringTable(tab.StringData, tab.GetNumEntries(), tab.GetName(), tab.GetUserDataFixedSize(), tab.GetUserDataSize(), tab.GetFlags(), tab.GetUsingVarintBitcounts())
+	items := p.parseStringTable(tab.StringData, tab.GetNumEntries(), tab.GetName(), tab.GetUserDataFixedSize(), tab.GetUserDataSize(), tab.GetFlags(), tab.GetUsingVarintBitcounts())
 
 	for _, item := range items {
 		switch tab.GetName() {