TMP Commit

service/cachemdw/cache.go

@@ -23,7 +23,7 @@ type ServiceCache struct {
 	cacheTTL                 time.Duration
 	decodedRequestContextKey any
 
-	logger *logging.ServiceLogger
+	*logging.ServiceLogger
 }
 
 func NewServiceCache(
@@ -38,7 +38,7 @@ func NewServiceCache(
 		evmClient:                evmClient,
 		cacheTTL:                 cacheTTL,
 		decodedRequestContextKey: decodedRequestContextKey,
-		logger:                   logger,
+		ServiceLogger:            logger,
 	}
 }
 

service/cachemdw/middleware.go

@@ -2,6 +2,7 @@ package cachemdw
 
 import (
 	"context"
+	"fmt"
 	"net/http"
 	"net/http/httptest"
 	"strings"
@@ -13,10 +14,6 @@ type cacheContextKey string
 
 const (
 	CachedContextKey cacheContextKey = "X-KAVA-PROXY-CACHED"
-
-	//CacheHeaderKey       = "X-Cache"
-	//CacheHitHeaderValue  = "HIT"
-	//CacheMissHeaderValue = "MISS"
 )
 
 func (c *ServiceCache) Middleware(
@@ -33,8 +30,7 @@ func (c *ServiceCache) Middleware(
 		}
 
 		cachedQueryResponse, err := c.GetCachedQueryResponse(r.Context(), decodedReq, r.Host)
-		found := err == nil // TODO: refactor
-		if found {
+		if err == nil {
 			c.respond(next, w, r, cachedQueryResponse)
 			return
 		}
@@ -55,9 +51,11 @@ func (c *ServiceCache) respond(
 	r *http.Request,
 	cachedQueryResponse []byte,
 ) {
-	//w.Header().Add(CacheHeaderKey, CacheHitHeaderValue)
 	w.Header().Add("Content-Type", "application/json")
-	w.Write(cachedQueryResponse)
+	_, err := w.Write(cachedQueryResponse)
+	if err != nil {
+		c.Logger.Error().Msg(fmt.Sprintf("can't write cached response: %v", err))
+	}
 
 	cachedContext := context.WithValue(r.Context(), CachedContextKey, true)
 	next.ServeHTTP(w, r.WithContext(cachedContext))
@@ -70,29 +68,30 @@ func (c *ServiceCache) respondAndCache(
 	r *http.Request,
 	decodedReq *decode.EVMRPCRequestEnvelope,
 ) {
-	//w.Header().Add(CacheHeaderKey, CacheMissHeaderValue)
-
-	rec := httptest.NewRecorder()
-	next.ServeHTTP(rec, r.WithContext(uncachedContext))
-	result := rec.Result()
+	recorder := httptest.NewRecorder()
+	next.ServeHTTP(recorder, r.WithContext(uncachedContext))
+	result := recorder.Result()
 
 	if result.StatusCode != http.StatusOK {
 		return
 	}
 
-	body := rec.Body.Bytes()
+	body := recorder.Body.Bytes()
 	for k, v := range result.Header {
 		w.Header().Set(k, strings.Join(v, ","))
 	}
 	w.WriteHeader(result.StatusCode)
-	w.Write(body)
+	_, err := w.Write(body)
+	if err != nil {
+		c.Logger.Error().Msg(fmt.Sprintf("can't write response: %v", err))
+	}
 
 	if err := c.ValidateAndCacheQueryResponse(
 		r.Context(),
 		decodedReq,
 		r.Host,
 		body,
 	); err != nil {
-		// TODO
+		c.Logger.Error().Msg(fmt.Sprintf("can't validate and cache response: %v", err))
 	}
 }