Merge pull request #10 from metalice/fix-websocket

Fix websocket

Author: metalice

handlers/handlers.go

@@ -42,40 +42,42 @@ func RequestHandler(c *gin.Context) {
 	c.Request.Header.Set("Origin", ORIGIN)
 	c.Request.Header.Set("Accept-Encoding", "*")
 	defer c.Request.Body.Close()
+
 	if c.IsWebsocket() {
+
 		proxy.ServeHTTP(c.Writer, c.Request)
-		return
-	}
 
-	tr := &http.Transport{
-		TLSClientConfig: tlsConf, // TODO: add a check for PROD / DEV mode
-	}
+	} else {
 
-	cr := func(req *http.Request, via []*http.Request) error {
-		return http.ErrUseLastResponse
-	}
+		tr := &http.Transport{
+			TLSClientConfig: tlsConf, // TODO: add a check for PROD / DEV mode
+		}
 
-	httpClient := http.Client{Transport: tr, CheckRedirect: cr}
+		cr := func(req *http.Request, via []*http.Request) error {
+			return http.ErrUseLastResponse
+		}
 
-	c.Request.RequestURI = ""
-	resp, err := httpClient.Do(c.Request)
-	if err != nil {
-		log.Println("Failed to initiate call to kube api server: ", err.Error())
-	}
+		httpClient := http.Client{Transport: tr, CheckRedirect: cr}
 
-	bodyBytes, err := io.ReadAll(resp.Body)
+		c.Request.RequestURI = ""
+		resp, err := httpClient.Do(c.Request)
+		if err != nil {
+			log.Println("Failed to initiate call to kube api server: ", err.Error())
+		}
 
-	if err != nil {
-		log.Println("Failed to read response body: ", err.Error())
-	}
+		bodyBytes, err := io.ReadAll(resp.Body)
 
-	defer resp.Body.Close()
-	filteredJson := util.FilterResponseQuery(bodyBytes, c.Request.URL.Query())
+		if err != nil {
+			log.Println("Failed to read response body: ", err.Error())
+		}
 
-	if err != nil {
-		log.Println("Unable to transform response body to json) ", err.Error())
-	}
+		defer resp.Body.Close()
+		filteredJson := util.FilterResponseQuery(bodyBytes, c.Request.URL.Query())
 
-	c.JSON(http.StatusOK, filteredJson)
+		if err != nil {
+			log.Println("Unable to transform response body to json) ", err.Error())
+		}
 
+		c.JSON(http.StatusOK, filteredJson)
+	}
 }

main.go

@@ -25,7 +25,7 @@ func main() {
 
 	err := server.RunTLS(":8080", "./cert/tls.crt", "./cert/tls.key") // listen and serve on 0.0.0.0:8080
 
-	log.Printf("listening for server 8080 - v0.0.5 - API cache time: %v", API_CACHE_TIME)
+	log.Printf("listening for server 8080 - v0.0.6 - API cache time: %v", API_CACHE_TIME)
 
 	if err != nil {
 		log.Println("Failed to start server: ", err.Error())