Reapply #22, #37, #50

command.go

@@ -483,7 +483,7 @@ func (cmd *Cmd) readReply(rd *proto.Reader) (err error) {
 }
 
 func (cmd *Cmd) ReadReply(rd *proto.Reader) (err error) {
-	cmd.val, err = rd.ReadReply(sliceParser)
+	cmd.val, err = rd.ReadReply()
 	return err
 }
 

internal/proto/reader.go

@@ -31,6 +31,9 @@ const (
 	RespPush      = '>' // ><len>\r\n... (same as Array)
 )
 
+// StatusString is the read golang type of the RespStatus.
+type StatusString string
+
 // Not used temporarily.
 // Redis has not used these two data types for the time being, and will implement them later.
 // Streamed           = "EOF:"
@@ -159,7 +162,7 @@ func (r *Reader) ReadReply() (interface{}, error) {
 
 	switch line[0] {
 	case RespStatus:
-		return string(line[1:]), nil
+		return StatusString(line[1:]), nil
 	case RespInt:
 		return util.ParseInt(line[1:], 10, 64)
 	case RespFloat:

internal/proto/writer.go

@@ -71,6 +71,8 @@ func (w *Writer) WriteArg(v interface{}) error {
 		return w.string(v)
 	case *string:
 		return w.string(*v)
+	case StatusString:
+		return w.status(v)
 	case []byte:
 		return w.bytes(v)
 	case int:
@@ -166,6 +168,18 @@ func (w *Writer) bytes(b []byte) error {
 	return w.crlf()
 }
 
+func (w *Writer) status(s StatusString) error {
+	if err := w.WriteByte(RespStatus); err != nil {
+		return err
+	}
+
+	if _, err := w.Write([]byte(s)); err != nil {
+		return err
+	}
+
+	return w.crlf()
+}
+
 func (w *Writer) string(s string) error {
 	return w.bytes(util.StringToBytes(s))
 }

internal/proto/writer_test.go

@@ -152,3 +152,30 @@ var _ = Describe("WriteArg", func() {
 		})
 	}
 })
+
+func TestWriteStatus(t *testing.T) {
+	inputStatusBytes := []byte("+status\r\n")
+
+	// Read it.
+	reader := proto.NewReader(bytes.NewReader(inputStatusBytes))
+	readStatus, err := reader.ReadReply()
+	if err != nil {
+		t.Errorf("Failed to ReadReply: %v", err)
+	}
+
+	if readStatus != proto.StatusString("status") {
+		t.Errorf("expect read %v but got %v", "status", readStatus)
+	}
+
+	// Write it.
+	outputStatusBytes := new(bytes.Buffer)
+	writer := proto.NewWriter(outputStatusBytes)
+	err = writer.WriteArg(readStatus)
+	if err != nil {
+		t.Errorf("Failed to WriteArg: %v", err)
+	}
+
+	if string(inputStatusBytes) != outputStatusBytes.String() {
+		t.Errorf("expect written %v but got %v", string(inputStatusBytes), outputStatusBytes.String())
+	}
+}

proto.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"io"
 
-	"github.com/go-redis/redis/v9/internal/proto"
+	"github.com/redis/go-redis/v9/internal/proto"
 )
 
 type Reader = proto.Reader

pubsub.go

@@ -366,6 +366,10 @@ func (p *Pong) String() string {
 
 func (c *PubSub) newMessage(reply interface{}) (interface{}, error) {
 	switch reply := reply.(type) {
+	case proto.StatusString:
+		return &Pong{
+			Payload: string(reply),
+		}, nil
 	case string:
 		return &Pong{
 			Payload: reply,

redis_test.go

@@ -13,6 +13,7 @@ import (
 	. "github.com/bsm/gomega"
 
 	"github.com/redis/go-redis/v9"
+	"github.com/redis/go-redis/v9/internal/proto"
 )
 
 type redisHookError struct{}
@@ -224,7 +225,7 @@ var _ = Describe("Client", func() {
 		Expect(client.Echo(ctx, "hello").Err()).NotTo(HaveOccurred())
 
 		Expect(cmd.Err()).NotTo(HaveOccurred())
-		Expect(cmd.Val()).To(Equal("PONG"))
+		Expect(cmd.Val()).To(Equal(proto.StatusString("PONG")))
 	})
 
 	It("should retry command on network error", func() {