feat: use gjson for response parsing

Author: skynet2

Makefile

@@ -14,4 +14,12 @@ build-githubmonkey:
 
 .PHONY: azure-githubmonkey
 azure-githubmonkey: build-githubmonkey
-	@cd cmd/server/githubmonkey/.azure && cp -a . ../dist/
+	@cd cmd/server/githubmonkey/.azure && cp -a . ../dist/
+
+.PHONY: tidy-modules
+tidy-modules:
+	@find . -type d \( -name build -prune \) -o -name go.mod -print | while read -r gomod_path; do \
+		dir_path=$$(dirname "$$gomod_path"); \
+		echo "Executing 'go mod tidy' in directory: $$dir_path"; \
+		(cd "$$dir_path" && GOPROXY=$(GOPROXY) go mod tidy) || exit 1; \
+	done

cmd/client/apimonkey/instance.go

@@ -12,7 +12,7 @@ import (
 	"github.com/imroc/req/v3"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
-	"github.com/valyala/fastjson"
+	"github.com/tidwall/gjson"
 	"meow.tf/streamdeck/sdk"
 )
 
@@ -82,36 +82,36 @@ func (i *Instance) Run() {
 			}
 
 			lg.Debug().Msgf("got raw response %v", resp.String())
-			parsed, err := fastjson.ParseBytes(resp.Bytes())
 			if err != nil {
 				sdk.ShowAlert(i.contextApp)
 				lg.Err(errors.Wrap(err, "error parsing request")).Send()
 				return
 			}
 
-			value := parsed.String()
+			value := resp.String()
 			if i.cfg.ResponseJSONSelector != "" {
-				selectorVal := parsed.Get(i.cfg.ResponseJSONSelector)
-				if selectorVal == nil || selectorVal.Type() == fastjson.TypeNull {
+				selectorVal := gjson.Get(resp.String(), i.cfg.ResponseJSONSelector)
+
+				if selectorVal.Type == gjson.Null {
 					sdk.ShowAlert(i.contextApp)
 					lg.Err(errors.New("no data found by ResponseJSONSelector")).Send()
 					return
 				}
 
-				if selectorVal.Type() == fastjson.TypeString {
-					if s, errSBytes := selectorVal.StringBytes(); errSBytes != nil {
+				if selectorVal.Type == gjson.String {
+					if str := selectorVal.String(); str != "" {
 						sdk.ShowAlert(i.contextApp)
 						lg.Err(errors.Wrap(err, "error parsing StringBytes")).Send()
 						return
 					} else {
-						value = string(s)
+						value = str
 					}
 				} else {
 					value = selectorVal.String()
 				}
 			}
 
-			lg.Debug().Msgf("got raw value %v", string(value))
+			lg.Debug().Msgf("got raw value %v", value)
 
 			i.handleResponse(value)
 		}()

cmd/client/apimonkey/main.go

@@ -16,9 +16,6 @@ var lg zerolog.Logger
 var instances = map[string]*Instance{}
 var mut sync.Mutex
 
-//var contextApp string
-//var globalConfig *config
-
 func setSettingsFromPayload(payload *fastjson.Value, ctxId string, instance *Instance) {
 	if instance == nil {
 		lg.Warn().Msgf("instance %v not found", ctxId)
@@ -39,7 +36,7 @@ func setSettingsFromPayload(payload *fastjson.Value, ctxId string, instance *Ins
 func main() {
 	logFile := &lumberjack.Logger{
 		Filename:   "logs/log.log",
-		MaxSize:    100,
+		MaxSize:    30,
 		MaxBackups: 3,
 		MaxAge:     10,
 		Compress:   false,

go.mod

@@ -1,59 +1,54 @@
 module github.com/ft-t/streamdeck
 
-go 1.19
+go 1.21
 
 require (
-	github.com/gofiber/fiber/v2 v2.44.0
+	github.com/gofiber/fiber/v2 v2.52.2
 	github.com/google/go-github/v38 v38.1.0
-	github.com/imroc/req/v3 v3.34.0
+	github.com/imroc/req/v3 v3.43.1
 	github.com/pkg/errors v0.9.1
-	github.com/rs/zerolog v1.29.1
-	github.com/stretchr/testify v1.8.2
-	github.com/valyala/fastjson v1.6.3
-	golang.org/x/oauth2 v0.7.0
+	github.com/rs/zerolog v1.32.0
+	github.com/tidwall/gjson v1.17.1
+	github.com/valyala/fastjson v1.6.4
+	golang.org/x/oauth2 v0.18.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	meow.tf/streamdeck/sdk v0.0.0-20221205105203-dab3b98dc3bd
 )
 
 require (
-	github.com/andybalholm/brotli v1.0.5 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/andybalholm/brotli v1.1.0 // indirect
+	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
-	github.com/golang/mock v1.6.0 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/google/go-querystring v1.0.0 // indirect
-	github.com/google/pprof v0.0.0-20230426061923-93006964c1fc // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/gorilla/websocket v1.5.0 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/google/go-querystring v1.1.0 // indirect
+	github.com/google/pprof v0.0.0-20240320155624-b11c3daa6f07 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/gorilla/websocket v1.5.1 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/klauspost/compress v1.16.3 // indirect
-	github.com/kr/pretty v0.3.1 // indirect
+	github.com/klauspost/compress v1.17.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.18 // indirect
-	github.com/mattn/go-runewidth v0.0.14 // indirect
-	github.com/onsi/ginkgo/v2 v2.9.2 // indirect
-	github.com/philhofer/fwd v1.1.2 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-runewidth v0.0.15 // indirect
+	github.com/onsi/ginkgo/v2 v2.17.1 // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
-	github.com/quic-go/qtls-go1-19 v0.3.2 // indirect
-	github.com/quic-go/qtls-go1-20 v0.2.2 // indirect
-	github.com/quic-go/quic-go v0.34.0 // indirect
-	github.com/rivo/uniseg v0.2.0 // indirect
-	github.com/savsgio/dictpool v0.0.0-20221023140959-7bf2e61cea94 // indirect
-	github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee // indirect
-	github.com/tinylib/msgp v1.1.8 // indirect
+	github.com/quic-go/quic-go v0.42.0 // indirect
+	github.com/refraction-networking/utls v1.6.3 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
+	github.com/stretchr/testify v1.8.2 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
+	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	github.com/valyala/fasthttp v1.45.0 // indirect
+	github.com/valyala/fasthttp v1.52.0 // indirect
 	github.com/valyala/tcplisten v1.0.0 // indirect
-	golang.org/x/crypto v0.8.0 // indirect
-	golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53 // indirect
-	golang.org/x/mod v0.10.0 // indirect
-	golang.org/x/net v0.9.0 // indirect
-	golang.org/x/sys v0.7.0 // indirect
-	golang.org/x/text v0.9.0 // indirect
-	golang.org/x/tools v0.8.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.28.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	go.uber.org/mock v0.4.0 // indirect
+	golang.org/x/crypto v0.21.0 // indirect
+	golang.org/x/exp v0.0.0-20240318143956-a85f2c67cd81 // indirect
+	golang.org/x/mod v0.16.0 // indirect
+	golang.org/x/net v0.22.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/tools v0.19.0 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 )