From e0e865fd5603f0d4bb7ea122a4f46a92b9dbd23f Mon Sep 17 00:00:00 2001
From: Kelvin Clement Mwinuka <kelvinmwinuka@hotmail.co.uk>
Date: Mon, 26 Jun 2023 19:41:38 +0800
Subject: [PATCH] Return PONG response from server

---
 serialization/decode.go | 31 ++++++++++++++++---------------
 serialization/encode.go |  4 ++++
 server/main.go          | 37 +++++++++++++++++++++++++++++--------
 3 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/serialization/decode.go b/serialization/decode.go
index 3286107..13c0151 100644
--- a/serialization/decode.go
+++ b/serialization/decode.go
@@ -3,30 +3,31 @@ package serialization
 import (
 	"bytes"
 	"fmt"
-	"io"
 
 	"github.com/tidwall/resp"
 )
 
-func Decode(raw string) {
+func Decode(raw string) ([]string, error) {
 	rd := resp.NewReader(bytes.NewBufferString(raw))
 
-	for {
-		v, _, err := rd.ReadValue()
+	v, _, err := rd.ReadValue()
 
-		if err == io.EOF {
-			break
-		}
+	if err != nil {
+		return nil, err
+	}
 
-		if err != nil {
-			fmt.Println(err)
-		}
+	res := []string{}
 
-		fmt.Println(v)
-		if v.Type().String() == "Array" {
-			for _, elem := range v.Array() {
-				fmt.Printf("%s: %v\n", elem.Type().String(), elem)
-			}
+	if v.Type().String() == "SimpleString" {
+		return []string{v.String()}, nil
+	}
+
+	if v.Type().String() == "Array" {
+		for _, elem := range v.Array() {
+			res = append(res, elem.String())
 		}
 	}
+
+	fmt.Println(res)
+	return res, nil
 }
diff --git a/serialization/encode.go b/serialization/encode.go
index e5a035f..31328db 100644
--- a/serialization/encode.go
+++ b/serialization/encode.go
@@ -24,6 +24,10 @@ func tokenize(comm string) ([]string, error) {
 	return r.Read()
 }
 
+func EncodeSimpleString(wr *resp.Writer, token string) error {
+	return wr.WriteSimpleString(token)
+}
+
 func encodePingPong(wr *resp.Writer, tokens []string) error {
 	switch len(tokens) {
 	default:
diff --git a/server/main.go b/server/main.go
index 9db11e7..ae020c9 100644
--- a/server/main.go
+++ b/server/main.go
@@ -12,15 +12,13 @@ import (
 	"net/http"
 	"os"
 	"path"
+	"sync"
 
 	"github.com/kelvinmwinuka/memstore/serialization"
+	"github.com/tidwall/resp"
 	"gopkg.in/yaml.v3"
 )
 
-type Listener interface {
-	Accept() (net.Conn, error)
-}
-
 type Config struct {
 	TLS  bool   `json:"tls" yaml:"tls"`
 	Key  string `json:"key" yaml:"key"`
@@ -29,18 +27,24 @@ type Config struct {
 	Port uint16 `json:"port" yaml:"port"`
 }
 
+type Data struct {
+	mu   sync.Mutex
+	data map[string]interface{}
+}
+
 type Server struct {
 	config Config
+	data   Data
 }
 
 func (server *Server) hanndleConnection(conn net.Conn) {
-	rw := bufio.NewReadWriter(bufio.NewReader(conn), bufio.NewWriter(conn))
-	// sw := bufio.NewWriter(os.Stdout)
+	connRW := bufio.NewReadWriter(bufio.NewReader(conn), bufio.NewWriter(conn))
+	respWriter := resp.NewWriter(connRW)
 
 	var line [][]byte
 
 	for {
-		b, _, err := rw.ReadLine()
+		b, _, err := connRW.ReadLine()
 
 		if err != nil && err == io.EOF {
 			fmt.Println(err)
@@ -54,7 +58,24 @@ func (server *Server) hanndleConnection(conn net.Conn) {
 			// sw.Write(bytes.Join(line, []byte("\\r\\n")))
 			// sw.Flush()
 
-			serialization.Decode(string(bytes.Join(line, []byte("\r\n"))))
+			if cmd, err := serialization.Decode(string(bytes.Join(line, []byte("\r\n")))); err != nil {
+				fmt.Println(err)
+				// Return error to client
+				continue
+			} else {
+				// Return encoded message to client
+
+				if len(cmd) == 1 && cmd[0] == "PING" {
+					serialization.EncodeSimpleString(respWriter, "PONG")
+					connRW.Flush()
+				}
+
+				if len(cmd) == 2 && cmd[0] == "PING" {
+					fmt.Println(cmd)
+					serialization.EncodeSimpleString(respWriter, cmd[1])
+					connRW.Flush()
+				}
+			}
 
 			line = [][]byte{}
 		}