wip(surrogate): invalidate

pkg/api/souin.go

@@ -95,10 +95,12 @@ func (s *SouinAPI) BulkDelete(key string, purge bool) {
 		}
 
 		if purge {
+			fmt.Println("PURGE the key", core.MappingKeyPrefix+key)
 			current.Delete(core.MappingKeyPrefix + key)
 		}
 	}
 
+	fmt.Println("PURGE the key", key)
 	s.Delete(key)
 }
 

pkg/storage/defaultProvider.go

@@ -2,6 +2,7 @@ package storage
 
 import (
 	"bytes"
+	"fmt"
 	"net/http"
 	"regexp"
 	"strings"
@@ -56,6 +57,8 @@ func (provider *Default) MapKeys(prefix string) map[string]string {
 
 				return true
 			}
+
+			keys[key.(string)] = fmt.Sprint(value)
 			if v, ok := value.(*core.StorageMapper); ok {
 				for _, v := range v.Mapping {
 					if v.StaleTime.AsTime().After(now) {

pkg/surrogate/providers/common.go

@@ -74,8 +74,11 @@ func uniqueTag(values []string) []string {
 		}
 		if _, found := tmp[item]; !found {
 			tmp[item] = true
-			i, _ := url.QueryUnescape(item)
-			list = append(list, i)
+
+			if strings.Contains(item, "%3B") || strings.Contains(item, "%3A") {
+				item, _ = url.QueryUnescape(item)
+			}
+			list = append(list, item)
 		}
 	}
 
@@ -237,6 +240,7 @@ func (s *baseStorage) Store(response *http.Response, cacheKey, uri, basekey stri
 
 	urlRegexp = regexp.MustCompile("(^|" + regexp.QuoteMeta(souinStorageSeparator) + ")" + regexp.QuoteMeta(basekey) + "(" + regexp.QuoteMeta(souinStorageSeparator) + "|$)")
 	s.storeTag(uri, basekey, urlRegexp)
+	s.storeTag(uri, cacheKey, urlRegexp)
 
 	return nil
 }
@@ -266,7 +270,7 @@ func (s *baseStorage) Invalidate(method string, headers http.Header) {
 
 // List returns the stored keys associated to resources
 func (s *baseStorage) List() map[string]string {
-	return s.Storage.MapKeys(surrogatePrefix)
+	return s.Storage.MapKeys("")
 }
 
 // Destruct method will shutdown properly the provider