fix/move unmarshal in doRequest block (#17)

anilibria · Jul 18, 2024 · 3c9810b · 3c9810b
2 parents 46e4780 + 808b20f
commit 3c9810b
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/internal/proxy/proxy.go b/internal/proxy/proxy.go
@@ -53,14 +53,6 @@ func (m *Proxy) ProxyFiberRequest(c *fiber.Ctx) (e error) {
 		return
 	}
 
-	var ok bool
-	if ok, e = m.unmarshalApiResponse(c, rsp); e != nil {
-		rlog(c).Warn().Msg(e.Error())
-		m.bypassCache(c)
-	} else if !ok {
-		m.bypassCache(c)
-	}
-
 	if !m.IsCacheBypass(c) {
 		return m.cacheAndRespond(c, rsp)
 	}
@@ -108,6 +100,15 @@ func (m *Proxy) doRequest(c *fiber.Ctx, req *fasthttp.Request, rsp *fasthttp.Res
 
 	if len(body) == 0 {
 		e = errors.New("proxy server respond with nil body")
+		return
+	}
+
+	var ok bool
+	if ok, e = m.unmarshalApiResponse(c, rsp); e != nil {
+		rlog(c).Warn().Msg(e.Error())
+		m.bypassCache(c)
+	} else if !ok {
+		m.bypassCache(c)
 	}
 
 	return