fixup! fixup! ...

base.go

@@ -2,6 +2,7 @@ package gql
 
 import (
 	"crypto/tls"
+	"fmt"
 	"time"
 
 	"github.com/allegro/bigcache"
@@ -103,6 +104,13 @@ func (b *BaseClient) enableCache() {
 	var err error
 	b.cache.client, err = bigcache.NewBigCache(bigcache.DefaultConfig(time.Duration(b.cache.ttl) * time.Second))
 	if err != nil {
-		b.Logger.Error(b, "Error while creating cache client;", "error", err.Error())
+		fmt.Println(">> Error while creating cache client;", "error", err.Error())
+		panic(err)
 	}
 }
+
+func (b *BaseClient) disableCache() {
+	b.Logger.Debug(b, "Disabling cache")
+	b.cache.enabled = false
+	b.cache.client = nil
+}

query.go

@@ -3,7 +3,6 @@ package gql
 import (
 	"context"
 	"fmt"
-	"reflect"
 	"strconv"
 
 	"github.com/lukaszraczylo/go-simple-graphql/utils/helpers"
@@ -73,58 +72,65 @@ func (c *BaseClient) Query(queryContent string, queryVariables interface{}, quer
 	var queryHash string
 	var cachedResponse []byte
 
-	cbc := reflect.ValueOf(*c).Interface().(BaseClient)
+	query := c.NewQuery(queryContent, queryVariables)
-	cacheBaseClient := &cbc
 
-	query := cacheBaseClient.NewQuery(queryContent, queryVariables)
+	localClientlocal := *c
+	localClient := &localClientlocal
 
 	// Check for library specific headers
 	if len(queryHeaders) > 0 {
-		queryHeadersModified := cacheBaseClient.parseQueryHeaders(queryHeaders)
+		queryHeadersModified, cache_enabled, headers_modified := c.parseQueryHeaders(queryHeaders)
-		// compare if there are any changes
 
-		if !reflect.DeepEqual(queryHeadersModified, queryHeaders) {
+		if headers_modified {
-			if cacheBaseClient.cache.enabled != c.cache.enabled && cacheBaseClient.cache.enabled {
+			queryHeaders = queryHeadersModified
-				cacheBaseClient.Logger.Debug(cacheBaseClient, "Switching cache on as per single-request header")
+			c.Logger.Debug(c, fmt.Sprintf("Switching cache %s as per single-request header", strconv.FormatBool(cache_enabled)))
-				cacheBaseClient.enableCache()
+			if cache_enabled {
+
+				// this doesn't make sense - cache is created but its ttl is longer than query execution so it'll be disappeared before it's used
+				localClient.enableCache()
+			} else {
+				localClient.disableCache()
 			}
 		}
 	}
 
-	if cacheBaseClient.cache.enabled {
+	if localClient.cache.enabled {
 		queryHash = strutil.Md5(fmt.Sprintf("%s-%+v", query.compiledQuery, queryHeaders))
-		cacheBaseClient.Logger.Debug(cacheBaseClient, "Hash calculated;", "hash:", queryHash)
+		c.Logger.Debug(c, "Hash calculated;", "hash:", queryHash)
 
 		cachedResponse = c.cacheLookup(queryHash)
 		if cachedResponse != nil {
-			cacheBaseClient.Logger.Debug(cacheBaseClient, "Found cached response")
+			c.Logger.Debug(c, "Found cached response")
-			return cacheBaseClient.decodeResponse(cachedResponse), nil
+			return c.decodeResponse(cachedResponse), nil
 		} else {
-			cacheBaseClient.Logger.Debug(cacheBaseClient, "No cached response found")
+			c.Logger.Debug(c, "No cached response found")
 		}
 	}
 
-	response, err := cacheBaseClient.executeQuery(query.compiledQuery, queryHeaders)
+	response, err := localClient.executeQuery(query.compiledQuery, queryHeaders)
 	if err != nil {
-		cacheBaseClient.Logger.Error(cacheBaseClient, "Error while executing query;", "error", err.Error())
+		c.Logger.Error(c, "Error while executing query;", "error", err.Error())
 		return nil, err
 	}
 
 	jsonData, err := json.Marshal(response)
 	if err != nil {
-		cacheBaseClient.Logger.Error(cacheBaseClient, "Error while converting to json;", "error", err.Error())
+		c.Logger.Error(c, "Error while converting to json;", "error", err.Error())
 		return nil, err
 	}
 
-	if cacheBaseClient.cache.enabled && jsonData != nil && queryHash != "" {
+	if localClient.cache.enabled && c.cache.client != nil && jsonData != nil && queryHash != "" {
-		c.cache.client.Set(queryHash, jsonData)
+		err = c.cache.client.Set(queryHash, jsonData)
-	} else if jsonData == nil {
+		if err != nil {
-		cacheBaseClient.Logger.Warn(cacheBaseClient, "Response is empty")
+			c.Logger.Error(c, "Error while setting cache key;", "error", err.Error())
-	} else if queryHash == "" {
+		}
-		cacheBaseClient.Logger.Warn(cacheBaseClient, "Query hash is empty")
+	} else if localClient.cache.enabled && c.cache.enabled && jsonData == nil {
+		c.Logger.Warn(c, "Response is empty")
+	} else if localClient.cache.enabled && c.cache.enabled && queryHash == "" {
+		c.Logger.Warn(c, "Query hash is empty")
 	}
 
-	return cacheBaseClient.decodeResponse(jsonData), err
+	return c.decodeResponse(jsonData), err
 }
 
 func (c *BaseClient) decodeResponse(jsonData []byte) any {
@@ -147,11 +153,12 @@ func (c *BaseClient) decodeResponse(jsonData []byte) any {
 	}
 }
 
-func (c *BaseClient) parseQueryHeaders(queryHeaders map[string]interface{}) (returnHeaders map[string]interface{}) {
+func (c *BaseClient) parseQueryHeaders(queryHeaders map[string]interface{}) (returnHeaders map[string]interface{}, cache_enabled bool, headers_modified bool) {
 	returnHeaders = make(map[string]interface{})
 	for k, v := range queryHeaders {
 		if k == "gqlcache" {
-			c.cache.enabled, _ = strconv.ParseBool(fmt.Sprintf("%v", v))
+			cache_enabled, _ = strconv.ParseBool(fmt.Sprintf("%v", v))
+			headers_modified = true
 			continue
 		}
 		if k == "gqlretries" {
@@ -160,5 +167,5 @@ func (c *BaseClient) parseQueryHeaders(queryHeaders map[string]interface{}) (ret
 		}
 		returnHeaders[k] = v
 	}
-	return returnHeaders
+	return returnHeaders, cache_enabled, headers_modified
 }

query_test.go

@@ -334,7 +334,7 @@ func TestBaseClient_parseQueryHeaders(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			c := NewConnection()
-			if gotReturnHeaders := c.parseQueryHeaders(tt.args.queryHeaders); !reflect.DeepEqual(gotReturnHeaders, tt.wantReturnHeaders) {
+			if gotReturnHeaders, _, _ := c.parseQueryHeaders(tt.args.queryHeaders); !reflect.DeepEqual(gotReturnHeaders, tt.wantReturnHeaders) {
 				t.Errorf("BaseClient.parseQueryHeaders() = %v, want %v", gotReturnHeaders, tt.wantReturnHeaders)
 			}
 		})