core: don't suppress ConsumerCodePanic in recoverFromPanic

Author: markus-wa

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/llgcode/ps v0.0.0-20150911083025-f1443b32eedb // indirect
 	github.com/markus-wa/go-unassert v0.1.1
 	github.com/markus-wa/gobitread v0.2.2
-	github.com/markus-wa/godispatch v1.1.0
+	github.com/markus-wa/godispatch v1.2.1
 	github.com/markus-wa/quickhull-go/v2 v2.1.0
 	github.com/stretchr/objx v0.1.1 // indirect
 	github.com/stretchr/testify v1.5.1

go.sum

@@ -25,6 +25,10 @@ github.com/markus-wa/gobitread v0.2.2 h1:4Z4oJ8Bf1XnOy6JZ2/9AdFKVAoxdq7awRjrb+j2
 github.com/markus-wa/gobitread v0.2.2/go.mod h1:PcWXMH4gx7o2CKslbkFkLyJB/aHW7JVRG3MRZe3PINg=
 github.com/markus-wa/godispatch v1.1.0 h1:J8O+hRkOCexDUQevaSKWDtKeZ3+HcmbEUKY1uYraAjY=
 github.com/markus-wa/godispatch v1.1.0/go.mod h1:6o18u24oo58yseMXYD0zQFI6LbSkjJSSBQ4YyDqFX5c=
+github.com/markus-wa/godispatch v1.2.0 h1:aB6epOoTbrsH3oaTE21L8/c+xiYSKOrsSDzl6YD0Xuw=
+github.com/markus-wa/godispatch v1.2.0/go.mod h1:GNzV7xdnZ9+VBi0z+hma9oUQrJmtqRrqyAuGKTTTcKY=
+github.com/markus-wa/godispatch v1.2.1 h1:Bj6blK4xJ/72pDi0rprVYluOGW9CV55FUDFPApyw91Q=
+github.com/markus-wa/godispatch v1.2.1/go.mod h1:GNzV7xdnZ9+VBi0z+hma9oUQrJmtqRrqyAuGKTTTcKY=
 github.com/markus-wa/quickhull-go/v2 v2.1.0 h1:DA2pzEzH0k5CEnlUsouRqNdD+jzNFb4DBhrX4Hpa5So=
 github.com/markus-wa/quickhull-go/v2 v2.1.0/go.mod h1:bOlBUpIzGSMMhHX0f9N8CQs0VZD4nnPeta0OocH7m4o=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

parser.go

@@ -212,11 +212,13 @@ func (p *Parser) error() (err error) {
 }
 
 func (p *Parser) setError(err error) {
-	if err != nil {
-		p.errLock.Lock()
-		p.err = err
-		p.errLock.Unlock()
+	if err == nil || p.err != nil {
+		return
 	}
+
+	p.errLock.Lock()
+	p.err = err
+	p.errLock.Unlock()
 }
 
 // NewParser creates a new Parser with the default configuration.

parser_test.go

@@ -2,6 +2,7 @@ package demoinfocs
 
 import (
 	"errors"
+	"fmt"
 	"io"
 	"math"
 	"testing"
@@ -76,3 +77,41 @@ func TestRecoverFromPanic(t *testing.T) {
 	assert.Equal(t, "test", recoverFromPanic("test").Error())
 	assert.Equal(t, "unexpected error: 1", recoverFromPanic(1).Error())
 }
+
+type consumerCodePanicMock struct {
+	value interface{}
+}
+
+func (ucp consumerCodePanicMock) String() string {
+	return fmt.Sprint(ucp.value)
+}
+
+func (ucp consumerCodePanicMock) Value() interface{} {
+	return ucp.value
+}
+
+func TestRecoverFromPanic_ConsumerCodePanic(t *testing.T) {
+	assert.PanicsWithValue(t, 1, func() {
+		err := recoverFromPanic(consumerCodePanicMock{value: 1})
+		assert.Nil(t, err)
+	})
+}
+
+func TestParser_SetError(t *testing.T) {
+	err := errors.New("test")
+
+	p := new(Parser)
+	p.setError(err)
+
+	assert.Same(t, err, p.error())
+}
+
+func TestParser_SetError_Multiple(t *testing.T) {
+	err := errors.New("test")
+
+	p := new(Parser)
+	p.setError(err)
+	p.setError(errors.New("second error"))
+
+	assert.Same(t, err, p.error())
+}

parsing.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 	"github.com/markus-wa/go-unassert"
+	dispatch "github.com/markus-wa/godispatch"
 
 	"github.com/markus-wa/demoinfocs-golang/common"
 	"github.com/markus-wa/demoinfocs-golang/events"
@@ -122,6 +123,8 @@ func recoverFromPanic(r interface{}) error {
 	}
 
 	switch err := r.(type) {
+	case dispatch.ConsumerCodePanic:
+		panic(err.Value())
 	case error:
 		return err
 	case string: