major refactor

rpc-server.go

@@ -6,7 +6,7 @@ import (
 )
 
 type GrainHandler struct {
-	*CartServer
+	*GenericListener
 	pool *GrainLocalPool
 }
 
@@ -20,13 +20,14 @@ func (h *GrainHandler) GetState(id CartId, reply *Grain) error {
 }
 
 func NewGrainHandler(pool *GrainLocalPool, listen string) (*GrainHandler, error) {
-	server, err := CartListen(listen)
+	conn := NewConnection(listen)
+	server, err := conn.Listen()
 	handler := &GrainHandler{
-		CartServer: server,
-		pool:       pool,
+		GenericListener: server,
+		pool:            pool,
 	}
-	server.HandleCall(RemoteHandleMutation, handler.RemoteHandleMessageHandler)
-	server.HandleCall(RemoteGetState, handler.RemoteGetStateHandler)
+	server.AddHandler(RemoteHandleMutation, handler.RemoteHandleMessageHandler)
+	server.AddHandler(RemoteGetState, handler.RemoteGetStateHandler)
 	return handler, err
 }
 
@@ -34,29 +35,36 @@ func (h *GrainHandler) IsHealthy() bool {
 	return len(h.pool.grains) < h.pool.PoolSize
 }
 
-func (h *GrainHandler) RemoteHandleMessageHandler(id CartId, data []byte) (CartMessage, []byte, error) {
+func (h *GrainHandler) RemoteHandleMessageHandler(data *FrameWithPayload, resultChan chan<- FrameWithPayload) error {
+	cartData, err := GetCartFrame(data.Payload)
+	if err != nil {
+		return err
+	}
 	var msg Message
-	err := ReadMessage(bytes.NewReader(data), &msg)
+	err = ReadMessage(bytes.NewReader(cartData.Data), &msg)
 	if err != nil {
 		fmt.Println("Error reading message:", err)
-		return RemoteHandleMutationReply, nil, err
+		return err
 	}
 
-	replyData, err := h.pool.Process(id, msg)
+	replyData, err := h.pool.Process(cartData.Id, msg)
 
 	if err != nil {
 		fmt.Println("Error handling message:", err)
 	}
-	if err != nil {
-		return RemoteHandleMutationReply, nil, err
-	}
-	return RemoteHandleMutationReply, replyData, nil
+	resultChan <- *replyData
+	return nil
 }
 
-func (h *GrainHandler) RemoteGetStateHandler(id CartId, data []byte) (CartMessage, []byte, error) {
-	reply, err := h.pool.Get(id)
+func (h *GrainHandler) RemoteGetStateHandler(data *FrameWithPayload, resultChan chan<- FrameWithPayload) error {
+	cartData, err := GetCartFrame(data.Payload)
 	if err != nil {
-		return RemoteGetStateReply, nil, err
+		return err
 	}
-	return RemoteGetStateReply, reply, nil
+	reply, err := h.pool.Get(cartData.Id)
+	if err != nil {
+		return err
+	}
+	resultChan <- *reply
+	return nil
 }