v4: Support Counter-Strike 2

go.mod

@@ -2,6 +2,7 @@ module github.com/markus-wa/demoinfocs-golang/v3
 
 require (
 	github.com/golang/geo v0.0.0-20210211234256-740aa86cb551
+	github.com/golang/snappy v0.0.4
 	github.com/llgcode/draw2d v0.0.0-20210904075650-80aa0a2a901d
 	github.com/markus-wa/go-heatmap/v2 v2.0.0
 	github.com/markus-wa/go-unassert v0.1.3

go.sum

@@ -10,6 +10,8 @@ github.com/golang/geo v0.0.0-20180826223333-635502111454/go.mod h1:vgWZ7cu0fq0KY
 github.com/golang/geo v0.0.0-20210211234256-740aa86cb551 h1:gtexQ/VGyN+VVFRXSFiguSNcXmS6rkKT+X7FdIrTtfo=
 github.com/golang/geo v0.0.0-20210211234256-740aa86cb551/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
 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/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=

pkg/demoinfocs/common/common.go

@@ -217,6 +217,10 @@ func NewTeamState(team Team, membersCallback func(Team) []*Player) TeamState {
 // ConvertSteamIDTxtTo32 converts a Steam-ID in text format to a 32-bit variant.
 // See https://developer.valvesoftware.com/wiki/SteamID
 func ConvertSteamIDTxtTo32(steamID string) (uint32, error) {
+	if strings.HasSuffix(steamID, "]") {
+		steamID = strings.TrimSuffix(steamID, "]") // Source 2 has [U:1:397560266] instead of STEAM_0:1:198780133
+	}
+
 	arr := strings.Split(steamID, ":")
 
 	if len(arr) != 3 {

pkg/demoinfocs/demoinfocs_test.go

@@ -194,6 +194,41 @@ func TestDemoInfoCs(t *testing.T) {
 	assertGolden(t, assertions, "default", actual.Bytes())
 }
 
+var s2Dem = flag.String("s2dem", "", "source 2 demo to parse")
+
+func TestS2(t *testing.T) {
+	t.Parallel()
+
+	if testing.Short() {
+		t.Skip("skipping test due to -short flag")
+	}
+
+	s2DemPath := *s2Dem
+
+	f, err := os.Open(s2DemPath)
+	assertions := assert.New(t)
+	assertions.NoError(err, "error opening demo %q", s2DemPath)
+
+	defer mustClose(t, f)
+
+	cfg := demoinfocs.DefaultParserConfig
+	cfg.MsgQueueBufferSize = 0
+
+	p := demoinfocs.NewParserWithConfig(f, cfg)
+
+	t.Log("Parsing header")
+	_, err = p.ParseHeader()
+	assertions.NoError(err, "error returned by Parser.ParseHeader()")
+
+	p.RegisterEventHandler(func(event events.GenericGameEvent) {
+		fmt.Println(event.Name, event)
+	})
+
+	t.Log("Parsing to end")
+	err = p.ParseToEnd()
+	assertions.NoError(err, "error occurred in ParseToEnd()")
+}
+
 func TestEncryptedNetMessages(t *testing.T) {
 	t.Parallel()
 

pkg/demoinfocs/game_events.go

@@ -10,6 +10,7 @@ import (
 	common "github.com/markus-wa/demoinfocs-golang/v3/pkg/demoinfocs/common"
 	events "github.com/markus-wa/demoinfocs-golang/v3/pkg/demoinfocs/events"
 	msg "github.com/markus-wa/demoinfocs-golang/v3/pkg/demoinfocs/msg"
+	"github.com/markus-wa/demoinfocs-golang/v3/pkg/demoinfocs/msgs2"
 )
 
 func (p *parser) handleGameEventList(gel *msg.CSVCMsg_GameEventList) {
@@ -19,6 +20,31 @@ func (p *parser) handleGameEventList(gel *msg.CSVCMsg_GameEventList) {
 	}
 }
 
+func (p *parser) handleGameEventListS2(gel *msgs2.CMsgSource1LegacyGameEventList) {
+	s1desc := make([]*msg.CSVCMsg_GameEventListDescriptorT, 0, len(gel.GetDescriptors()))
+
+	for _, d := range gel.GetDescriptors() {
+		s1keys := make([]*msg.CSVCMsg_GameEventListKeyT, 0, len(d.Keys))
+
+		for _, k := range d.Keys {
+			s1keys = append(s1keys, &msg.CSVCMsg_GameEventListKeyT{
+				Type: k.Type,
+				Name: k.Name,
+			})
+		}
+
+		s1desc = append(s1desc, &msg.CSVCMsg_GameEventListDescriptorT{
+			Eventid: d.Eventid,
+			Name:    d.Name,
+			Keys:    s1keys,
+		})
+	}
+
+	p.handleGameEventList(&msg.CSVCMsg_GameEventList{
+		Descriptors: s1desc,
+	})
+}
+
 func (p *parser) handleGameEvent(ge *msg.CSVCMsg_GameEvent) {
 	if p.gameEventDescs == nil {
 		p.eventDispatcher.Dispatch(events.ParserWarn{
@@ -52,6 +78,30 @@ func (p *parser) handleGameEvent(ge *msg.CSVCMsg_GameEvent) {
 	})
 }
 
+func (p *parser) handleGameEventS2(ge *msgs2.CMsgSource1LegacyGameEvent) {
+	keys := make([]*msg.CSVCMsg_GameEventKeyT, 0, len(ge.Keys))
+
+	for _, k := range ge.Keys {
+		keys = append(keys, &msg.CSVCMsg_GameEventKeyT{
+			Type:      k.Type,
+			ValString: k.ValString,
+			ValFloat:  k.ValFloat,
+			ValLong:   k.ValLong,
+			ValShort:  k.ValShort,
+			ValByte:   k.ValByte,
+			ValBool:   k.ValBool,
+			ValUint64: k.ValUint64,
+		})
+	}
+
+	p.handleGameEvent(&msg.CSVCMsg_GameEvent{
+		EventName:   ge.EventName,
+		Eventid:     ge.Eventid,
+		Keys:        keys,
+		Passthrough: ge.Passthrough,
+	})
+}
+
 type gameEventHandler struct {
 	parser                      *parser
 	gameEventNameToHandler      map[string]gameEventHandlerFunc