Update tests and improve the Storing

plugins/base.go

@@ -127,9 +127,9 @@ func DefaultSouinPluginCallback(
 		if r != nil {
 			rh := r.Header
 			if stale {
-				rfc.HitStaleCache(&rh, retriever.GetMatchedURL().TTL.Duration)
+				rfc.HitStaleCache(&rh)
 			} else {
-				rfc.HitCache(&rh, retriever.GetMatchedURL().TTL.Duration)
+				rfc.HitCache(&rh)
 				prometheus.Increment(prometheus.CachedResponseCounter)
 			}
 			sendAnyCachedResponse(rh, r, res)

plugins/caddy/httpcache_test.go

@@ -33,6 +33,12 @@ func TestMaxAge(t *testing.T) {
 	if resp2.Header.Get("Cache-Status") != "Souin; hit; ttl=59" {
 		t.Errorf("unexpected Cache-Status header %v", resp2.Header.Get("Cache-Status"))
 	}
+
+	time.Sleep(2 * time.Second)
+	resp3, _ := tester.AssertGetResponse(`http://localhost:9080/cache-max-age`, 200, "Hello, max-age!")
+	if resp3.Header.Get("Cache-Status") != "Souin; hit; ttl=57" {
+		t.Errorf("unexpected Cache-Status header %v", resp2.Header.Get("Cache-Status"))
+	}
 }
 
 func TestSMaxAge(t *testing.T) {

plugins/traefik/base.go

@@ -124,9 +124,9 @@ func DefaultSouinPluginCallback(
 		if r != nil {
 			rh := r.Header
 			if stale {
-				rfc.HitStaleCache(&rh, retriever.GetMatchedURL().TTL.Duration)
+				rfc.HitStaleCache(&rh)
 			} else {
-				rfc.HitCache(&rh, retriever.GetMatchedURL().TTL.Duration)
+				rfc.HitCache(&rh)
 			}
 			sendAnyCachedResponse(rh, r, res)
 

plugins/tyk/main.go

@@ -63,7 +63,7 @@ func SouinResponseHandler(rw http.ResponseWriter, res *http.Response, _ *http.Re
 
 	if r != nil {
 		rh := r.Header
-		rfc.HitCache(&rh, retriever.GetMatchedURL().TTL.Duration)
+		rfc.HitCache(&rh)
 		r.Header = rh
 		for _, v := range []string{"Age", "Cache-Status"} {
 			h := r.Header.Get(v)

rfc/cacheStatus.go

@@ -50,17 +50,17 @@ func ValidateCacheControl(r *http.Response) bool {
 }
 
 // HitCache set hit and manage age header too
-func HitCache(h *http.Header, ttl time.Duration) {
-	manageAge(h, ttl)
+func HitCache(h *http.Header) {
+	manageAge(h)
 }
 
 // HitStaleCache set hit and manage age header too
-func HitStaleCache(h *http.Header, ttl time.Duration) {
-	manageAge(h, ttl)
+func HitStaleCache(h *http.Header) {
+	manageAge(h)
 	h.Set("Cache-Status", h.Get("Cache-Status")+"; fwd=stale")
 }
 
-func manageAge(h *http.Header, ttl time.Duration) {
+func manageAge(h *http.Header) {
 	utc1 := time.Now().UTC()
 	dh := h.Get("Date")
 	if dh == "" {
@@ -76,14 +76,13 @@ func manageAge(h *http.Header, ttl time.Duration) {
 	}
 
 	if h.Get(storedTTLHeader) != "" {
-		ttl, _ = time.ParseDuration(h.Get(storedTTLHeader))
+		ttl, _ := time.ParseDuration(h.Get(storedTTLHeader))
 		h.Del(storedTTLHeader)
+		cage := correctedInitialAge(utc1, utc2)
+		h.Set("Age", strconv.Itoa(cage))
+		ttlValue := strconv.Itoa(int(ttl.Seconds()) - cage)
+		h.Set("Cache-Status", "Souin; hit; ttl="+ttlValue)
 	}
-	cage := correctedInitialAge(utc1, utc2)
-	age := strconv.Itoa(cage)
-	h.Set("Age", age)
-	ttlValue := strconv.Itoa(int(ttl.Seconds()) - cage)
-	h.Set("Cache-Status", "Souin; hit; ttl="+ttlValue)
 }
 
 func setMalformedHeader(headers *http.Header, header string) {
@@ -94,7 +93,7 @@ func setMalformedHeader(headers *http.Header, header string) {
 func SetCacheStatusEventually(resp *http.Response) *http.Response {
 	h := resp.Header
 	validateEmptyHeaders(&h)
-	manageAge(&h, 0)
+	manageAge(&h)
 
 	resp.Header = h
 	return resp

rfc/transport.go

@@ -78,9 +78,8 @@ func (t *VaryTransport) SetCache(key string, resp *http.Response) {
 	}
 	if ma > t.ConfigurationURL.TTL.Duration {
 		ma = t.ConfigurationURL.TTL.Duration
-	} else {
-		resp.Header.Set(storedTTLHeader, ma.String())
 	}
+	resp.Header.Set(storedTTLHeader, ma.String())
 	if respBytes, err := httputil.DumpResponse(resp, true); e == nil && err == nil {
 		t.Provider.Set(key, respBytes, t.ConfigurationURL, ma)
 	}