From 20000ea1f36f99562ba293b7c646357c4213a3e4 Mon Sep 17 00:00:00 2001
From: Ashish Tiwari <ashishjaitiwari15112000@gmail.com>
Date: Thu, 2 Oct 2025 21:48:47 +0530
Subject: [PATCH] fix: panic on failed upstream connection

---
 pkg/proxy/reverseproxy.go | 23 +++++++++++++----------
 pkg/utils/utils.go        |  7 ++++++-
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/pkg/proxy/reverseproxy.go b/pkg/proxy/reverseproxy.go
index 568ed89..c6ec4d9 100644
--- a/pkg/proxy/reverseproxy.go
+++ b/pkg/proxy/reverseproxy.go
@@ -16,7 +16,7 @@ import (
 
 const bufferSize = 32 * 1024
 
-// Service remains the same
+// Service holds resources shared across multiple reverse proxy instances
 type Service struct {
 	buf *utils.Pool[[]byte]
 	log *logger.Logger
@@ -33,25 +33,28 @@ func NewService(log *logger.Logger) *Service {
 
 type UpgradeHandler func(http.ResponseWriter, *http.Request, net.Conn, *http.Response)
 
-type ConnPool struct {
+type connPool struct {
 	target *url.URL
 	pool   *utils.Pool[net.Conn]
 	logger *logger.Logger
 }
 
-func NewConnPool(target *url.URL, logger *logger.Logger) *ConnPool {
-	return &ConnPool{
+func newconnPool(target *url.URL, logger *logger.Logger) *connPool {
+	return &connPool{
 		target: target,
 		pool: utils.NewPool(func() net.Conn {
-			//TODO: Is it a good idea to ignore error here?
-			conn, _ := net.Dial("tcp", target.Host)
+			conn, err := net.Dial("tcp", target.Host)
+			if err != nil {
+				logger.Errorf("Failed to create connection to %s: %v", target.Host, err)
+				return nil
+			}
 			return conn
 		}),
 		logger: logger.WithComponent("conn_pool"),
 	}
 }
 
-func (p *ConnPool) Get() (net.Conn, error) {
+func (p *connPool) Get() (net.Conn, error) {
 	conn := p.pool.Get()
 	if conn == nil {
 		return nil, fmt.Errorf("failed to create connection to %s", p.target.Host)
@@ -59,14 +62,14 @@ func (p *ConnPool) Get() (net.Conn, error) {
 	return conn, nil
 }
 
-func (p *ConnPool) Put(conn net.Conn) {
+func (p *connPool) Put(conn net.Conn) {
 	p.pool.Put(conn)
 }
 
 type ReverseProxy struct {
 	logger    *logger.Logger
 	service   *Service
-	connPool  *ConnPool
+	connPool  *connPool
 	targetURL *url.URL
 }
 
@@ -74,7 +77,7 @@ func NewReverseProxy(logger *logger.Logger, service *Service, targetURL *url.URL
 	return &ReverseProxy{
 		logger:    logger.WithComponent("reverse_proxy"),
 		service:   service,
-		connPool:  NewConnPool(targetURL, logger),
+		connPool:  newconnPool(targetURL, logger),
 		targetURL: targetURL,
 	}
 }
diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
index 726134b..eec48ea 100644
--- a/pkg/utils/utils.go
+++ b/pkg/utils/utils.go
@@ -19,7 +19,12 @@ func NewPool[T any](newFunc func() T) *Pool[T] {
 func (p *Pool[T]) Get() T {
 	item := p.pool.Get()
 	if item == nil {
-		item = p.pool.New().(T)
+		it := p.pool.New()
+		if it == nil {
+			var zero T
+			return zero
+		}
+		item = it.(T)
 	}
 	return item.(T)
 }