fix: interface {} is nil, not *cache.Client

Author: RoyXiang

handler/cache.go

@@ -8,15 +8,10 @@ import (
 
 func CacheMiddleware(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		cacheClient := r.Context().Value(cacheClientCtxKey).(*cache.Client)
-		rangeInHeader := r.Header.Get(headerRange)
-		if cacheClient != nil && rangeInHeader == "" {
-			mu.RLock()
-			defer mu.RUnlock()
+		mu.RLock()
+		defer mu.RUnlock()
 
-			cacheClient.Middleware(next).ServeHTTP(w, r)
-		} else {
-			next.ServeHTTP(w, r)
-		}
+		cacheClient := r.Context().Value(cacheClientCtxKey).(*cache.Client)
+		cacheClient.Middleware(next).ServeHTTP(w, r)
 	})
 }

handler/dynamic.go

@@ -7,13 +7,19 @@ import (
 
 func DynamicMiddleware(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if dynamicCacheClient != nil {
+		for dynamicCacheClient != nil {
+			if rangeInHeader := r.Header.Get(headerRange); rangeInHeader != "" {
+				break
+			}
 			if token := r.Header.Get(headerToken); token != "" {
 				ctx := context.WithValue(context.Background(), cacheClientCtxKey, dynamicCacheClient)
 				r = r.Clone(ctx)
 				r.URL.Query().Set(headerToken, token)
+				CacheMiddleware(next).ServeHTTP(w, r)
+				return
 			}
+			break
 		}
-		CacheMiddleware(next).ServeHTTP(w, r)
+		next.ServeHTTP(w, r)
 	})
 }

handler/static.go

@@ -10,7 +10,9 @@ func StaticMiddleware(next http.Handler) http.Handler {
 		if staticCacheClient != nil {
 			ctx := context.WithValue(context.Background(), cacheClientCtxKey, staticCacheClient)
 			r = r.Clone(ctx)
+			CacheMiddleware(next).ServeHTTP(w, r)
+			return
 		}
-		CacheMiddleware(next).ServeHTTP(w, r)
+		next.ServeHTTP(w, r)
 	})
 }

handler/user.go

@@ -12,8 +12,10 @@ func UserMiddleware(next http.Handler) http.Handler {
 				ctx := context.WithValue(context.Background(), cacheClientCtxKey, userCacheClient)
 				r = r.Clone(ctx)
 				r.URL.Query().Set(headerToken, token)
+				CacheMiddleware(next).ServeHTTP(w, r)
+				return
 			}
 		}
-		CacheMiddleware(next).ServeHTTP(w, r)
+		next.ServeHTTP(w, r)
 	})
 }