read all response body & expire time vs duration.

Author: m1k1o

hlsproxy/cache.go

@@ -28,9 +28,9 @@ func (m *ManagerCtx) getFromCache(key string) (*utils.Cache, bool) {
 	return entry, true
 }
 
-func (m *ManagerCtx) saveToCache(key string, reader io.Reader, duration time.Duration) *utils.Cache {
+func (m *ManagerCtx) saveToCache(key string, reader io.Reader, expires time.Time) *utils.Cache {
 	m.cacheMu.Lock()
-	cache := utils.NewCache(time.Now().Add(duration))
+	cache := utils.NewCache(expires)
 	m.cache[key] = cache
 	m.cacheMu.Unlock()
 

hlsproxy/manager.go

@@ -67,7 +67,8 @@ func (m *ManagerCtx) ServePlaylist(w http.ResponseWriter, r *http.Request) {
 		defer resp.Body.Close()
 
 		if resp.StatusCode < 200 && resp.StatusCode >= 300 {
-			defer resp.Body.Close()
+			// read all response body
+			io.Copy(io.Discard, resp.Body)
 
 			m.logger.Err(err).Int("code", resp.StatusCode).Msg("invalid HTTP response")
 			http.Error(w, http.StatusText(http.StatusBadGateway), http.StatusBadGateway)
@@ -84,7 +85,7 @@ func (m *ManagerCtx) ServePlaylist(w http.ResponseWriter, r *http.Request) {
 		var re = regexp.MustCompile(`(?m:^(https?\:\/\/[^\/]+)?\/)`)
 		text := re.ReplaceAllString(string(buf), m.prefix)
 
-		cache = m.saveToCache(url, strings.NewReader(text), playlistExpiration)
+		cache = m.saveToCache(url, strings.NewReader(data), time.Now().Add(playlistExpiration))
 	}
 
 	w.Header().Set("Content-Type", "application/vnd.apple.mpegurl")
@@ -106,14 +107,16 @@ func (m *ManagerCtx) ServeMedia(w http.ResponseWriter, r *http.Request) {
 		}
 
 		if resp.StatusCode < 200 && resp.StatusCode >= 300 {
-			defer resp.Body.Close()
+			// read all response body
+			io.Copy(io.Discard, resp.Body)
+			resp.Body.Close()
 
 			m.logger.Err(err).Int("code", resp.StatusCode).Msg("invalid HTTP response")
 			http.Error(w, http.StatusText(http.StatusBadGateway), http.StatusBadGateway)
 			return
 		}
 
-		cache = m.saveToCache(url, resp.Body, segmentExpiration)
+		cache = m.saveToCache(url, resp.Body, time.Now().Add(segmentExpiration))
 	}
 
 	w.Header().Set("Content-Type", "video/MP2T")