Add explicit port handling in RESP connection callbacks

Introduced a new function, explicitPortCallbacks, to customize logging behavior based on the connection port. The NewFromAddr function now determines the appropriate callbacks to use depending on whether the default Redis port (6379) is used or a different one. This enhances the logging for commands and values sent over the connection.

Author: andy1li

internal/instrumented_resp_connection/instrumented_resp_connection.go

@@ -2,12 +2,15 @@ package instrumented_resp_connection
 
 import (
 	"net"
+	"strconv"
 
 	resp_connection "github.com/codecrafters-io/redis-tester/internal/resp/connection"
 	resp_value "github.com/codecrafters-io/redis-tester/internal/resp/value"
 	"github.com/codecrafters-io/tester-utils/logger"
 )
 
+const REDIS_DEFAULT_PORT = "6379"
+
 type InstrumentedRespConnection struct {
 	*resp_connection.RespConnection
 
@@ -43,10 +46,48 @@ func defaultCallbacks(logger *logger.Logger) resp_connection.RespConnectionCallb
 	}
 }
 
+func explicitPortCallbacks(logger *logger.Logger, port string) resp_connection.RespConnectionCallbacks {
+	return resp_connection.RespConnectionCallbacks{
+		BeforeSendCommand: func(reusedConnection bool, command string, args ...string) {
+			var commandPrefix string
+			if reusedConnection {
+				commandPrefix = ">"
+			} else {
+				commandPrefix = "$ redis-cli -p " + port
+			}
+
+			commandWithArgs := append([]string{command}, args...)
+			logger.Infof("%s %s", commandPrefix, quoteCLICommand(commandWithArgs))
+		},
+		BeforeSendValue: func(value resp_value.Value) {
+			logger.Infof("Sent %s", value.FormattedString())
+		},
+		BeforeSendBytes: func(bytes []byte) {
+			logger.Debugf("Sent bytes: %q", string(bytes))
+		},
+		AfterBytesReceived: func(bytes []byte) {
+			logger.Debugf("Received bytes: %q", string(bytes))
+		},
+		AfterReadValue: func(value resp_value.Value) {
+			logger.Debugf("Received RESP %s: %s", value.Type, value.FormattedString())
+		},
+	}
+}
+
 func NewFromAddr(baseLogger *logger.Logger, addr string, connIdentifier string) (*InstrumentedRespConnection, error) {
 	logger := baseLogger.Clone()
 	logger.PushSecondaryPrefix(connIdentifier)
-	c, err := resp_connection.NewRespConnectionFromAddr(addr, defaultCallbacks(logger))
+
+	var callbacks resp_connection.RespConnectionCallbacks
+	tcpAddr, _ := net.ResolveTCPAddr("tcp", addr)
+	port := strconv.Itoa(tcpAddr.Port)
+	if port == REDIS_DEFAULT_PORT {
+		callbacks = defaultCallbacks(logger)
+	} else {
+		callbacks = explicitPortCallbacks(logger, port)
+	}
+
+	c, err := resp_connection.NewRespConnectionFromAddr(addr, callbacks)
 	if err != nil {
 		return nil, err
 	}
@@ -83,7 +124,14 @@ func (c *InstrumentedRespConnection) UpdateBaseLogger(l *logger.Logger) {
 	newLogger := l.Clone()
 	newLogger.PushSecondaryPrefix(c.GetIdentifier())
 	c.logger = newLogger
-	c.UpdateCallBacks(defaultCallbacks(c.logger))
+
+	tcpAddr, _ := c.Conn.RemoteAddr().(*net.TCPAddr)
+	port := strconv.Itoa(tcpAddr.Port)
+	if port == REDIS_DEFAULT_PORT {
+		c.UpdateCallBacks(defaultCallbacks(c.logger))
+	} else {
+		c.UpdateCallBacks(explicitPortCallbacks(c.logger, port))
+	}
 }
 
 func (c *InstrumentedRespConnection) SetReadValueInterceptor(transformer func(value resp_value.Value) resp_value.Value) {