Merge pull request #137 from 0xProject/marcin/bugfix

fix: run gunzip only otherwise pass through

.github/workflows/golang.yaml

@@ -33,6 +33,9 @@ jobs:
         run: docker-compose up -d
       - name: Run tests
         run: go test -race -shuffle=on -v ./internal/...
+        env:
+          RPC_GATEWAY_NODE_URL_1: ${{ secrets.RPC_GATEWAY_NODE_URL_1 }}
+          RPC_GATEWAY_NODE_URL_2: ${{ secrets.RPC_GATEWAY_NODE_URL_2 }}
       - name: Print out docker containers' logs
         if: always()
         run: docker-compose logs

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21-alpine3.18 AS builder
+FROM golang:1.21-alpine3.19 AS builder
 
 RUN apk add --update-cache \
         git \

internal/proxy/proxy.go

@@ -5,9 +5,11 @@ import (
 	"io"
 	"net/http"
 	"net/http/httputil"
+	"strings"
 	"time"
 
 	"github.com/0xProject/rpc-gateway/internal/middleware"
+	"github.com/go-http-utils/headers"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 )
@@ -113,10 +115,10 @@ func (h *Proxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		pw := NewResponseWriter()
 		r.Body = io.NopCloser(bytes.NewBuffer(body.Bytes()))
 
-		if target.Config.Connection.HTTP.Compression {
-			middleware.Gzip(target.Proxy).ServeHTTP(pw, r)
-		} else {
+		if !target.Config.Connection.HTTP.Compression && strings.Contains(r.Header.Get(headers.ContentEncoding), "gzip") {
 			middleware.Gunzip(target.Proxy).ServeHTTP(pw, r)
+		} else {
+			target.Proxy.ServeHTTP(pw, r)
 		}
 
 		if h.HasNodeProviderFailed(pw.statusCode) {

internal/rpcgateway/rpcgateway_test.go

@@ -118,9 +118,7 @@ func TestRpcGatewayFailover(t *testing.T) {
 		MaxConnsPerHost: 1,
 	}
 
-	t.Logf("gateway serving from: %s", gs.URL)
-
-	req, _ := http.NewRequest("POST", gs.URL, bytes.NewBufferString(``))
+	req, _ := http.NewRequest("POST", gs.URL, bytes.NewBufferString(rpcRequestBody))
 	req.Header.Set("Content-Type", "application/json")
 	req.ContentLength = int64(len(rpcRequestBody))
 
@@ -131,10 +129,8 @@ func TestRpcGatewayFailover(t *testing.T) {
 
 	assert.Equal(t, http.StatusOK, res.StatusCode)
 
-	bodyContent, _ := io.ReadAll(res.Body)
-
-	t.Log("Response from RPC gateway:")
-	t.Logf("%s", bodyContent)
+	_, err = io.ReadAll(res.Body)
+	assert.Nil(t, err)
 
 	err = gateway.Stop(context.TODO())
 	assert.Nil(t, err)