优化添加好友流程

Author: c-wind

candy.go

@@ -12,6 +12,7 @@ import (
 	"strconv"
 
 	candy "github.com/dearcode/candy/client"
+	"github.com/dearcode/candy/meta"
 	"github.com/dearcode/candy/util/log"
 )
 
@@ -30,6 +31,7 @@ func notice() {
 11. 根据用户ID获取用户信息
 12. 加载好友列表
 13. 更改用户密码
+13. 确认添加好友
 0. 退出
 -----------------------------------------------`
 	fmt.Println(help)
@@ -220,16 +222,38 @@ func addFriend(c *candy.CandyClient, reader *bufio.Reader) {
 	data, _, _ = reader.ReadLine()
 	msg := string(data)
 
-	confirm, err := c.AddFriend(id, true, msg)
-	if err != nil {
+	if err = c.Friend(id, meta.Relation_ADD, msg); err != nil {
 		e := candy.ErrorParse(err.Error())
 		log.Errorf("addFriend code:%v error:%v", e.Code, e.Msg)
 		return
 	}
 
-	log.Debugf("addFriend confirm:%v, userID:%v", confirm, userID)
+	log.Debugf("addFriend userID:%v", userID)
 }
 
+func confirmFriend(c *candy.CandyClient, reader *bufio.Reader) {
+	fmt.Println("----------------确认添加好友-----------------------")
+	defer endSection()
+
+	fmt.Println("请输入用户ID:")
+	data, _, _ := reader.ReadLine()
+	userID := string(data)
+
+	id, err := strconv.ParseInt(userID, 10, 64)
+	if err != nil {
+		e := candy.ErrorParse(err.Error())
+		log.Errorf("Parse int code:%v error:%v", e.Code, e.Msg)
+		return
+	}
+
+	if err = c.Friend(id, meta.Relation_CONFIRM, ""); err != nil {
+		e := candy.ErrorParse(err.Error())
+		log.Errorf("confirmFriend code:%v error:%v", e.Code, e.Msg)
+		return
+	}
+
+	log.Debugf("confirmFriend userID:%v", userID)
+}
 func newMessage(c *candy.CandyClient, reader *bufio.Reader) {
 	fmt.Println("----------------发送消息-----------------------")
 	defer endSection()
@@ -358,8 +382,8 @@ func updateUserPasswd(c *candy.CandyClient, reader *bufio.Reader) {
 type cmdClient struct{}
 
 // OnRecv 这函数理论上是多线程调用，客户端需要注意下
-func (c *cmdClient) OnRecv(id int64, method int, group int64, from int64, to int64, body string) {
-	log.Debugf("recv msg id:%d method:%d, group:%d, from:%d, to:%d, body:%s\n", id, method, group, from, to, body)
+func (c *cmdClient) OnRecv(event meta.Event, operate meta.Relation, id int64, group int64, from int64, to int64, body string) {
+	log.Debugf("recv msg id:%d event:%v, operate:%v, group:%d, from:%d, to:%d, body:%s\n", id, event, operate, group, from, to, body)
 }
 
 // OnError 连接被服务器断开，或其它错误
@@ -423,6 +447,8 @@ func main() {
 			loadFriendList(c, reader)
 		} else if command == "13" {
 			updateUserPasswd(c, reader)
+		} else if command == "14" {
+			confirmFriend(c, reader)
 		} else {
 			log.Errorf("未知命令")
 		}

client/candy.go

@@ -20,7 +20,7 @@ const (
 // MessageHandler 接收服务器端推送来的消息
 type MessageHandler interface {
 	// OnRecv 这函数理论上是多线程调用，客户端需要注意下
-	OnRecv(id int64, method int, group int64, from int64, to int64, body string)
+	OnRecv(event meta.Event, operate meta.Relation, id int64, group int64, from int64, to int64, body string)
 
 	// OnError 连接被服务器断开，或其它错误
 	OnError(msg string)
@@ -222,15 +222,15 @@ func (c *CandyClient) getUserInfoByID(userID int64) (*UserInfo, error) {
 	return userInfo, resp.Header.Error()
 }
 
-// AddFriend 添加好友
-func (c *CandyClient) AddFriend(userID int64, confirm bool, msg string) (bool, error) {
-	req := &meta.GateAddFriendRequest{UserID: userID, Confirm: confirm, Msg: msg}
-	resp, err := c.api.AddFriend(context.Background(), req)
+// Friend 添加好友
+func (c *CandyClient) Friend(userID int64, operate meta.Relation, msg string) error {
+	req := &meta.GateFriendRequest{UserID: userID, Operate: operate, Msg: msg}
+	resp, err := c.api.Friend(context.Background(), req)
 	if err != nil {
-		return false, err
+		return err
 	}
 
-	return resp.Confirm, resp.Header.Error()
+	return resp.Header.Error()
 }
 
 // LoadFriendList 加载好友列表
@@ -328,7 +328,7 @@ func (c *CandyClient) FileDownload(key string) ([]byte, error) {
 
 // SendMessage 向服务器发送消息.
 func (c *CandyClient) SendMessage(group, to int64, body string) (int64, error) {
-	req := &meta.GateSendMessageRequest{Msg: &meta.Message{Group: group, User: to, Body: body}}
+	req := &meta.GateSendMessageRequest{Msg: &meta.Message{Group: group, To: to, Body: body}}
 	resp, err := c.api.SendMessage(context.Background(), req)
 	if err != nil {
 		return 0, err
@@ -341,15 +341,14 @@ func (c *CandyClient) loopRecvMessage() {
 	log.Debugf("start loopRecvMessage")
 
 	for !c.stop {
-		msg, err := c.stream.Recv()
-		log.Debugf("recv:%v, err:%v", msg, err)
+		pm, err := c.stream.Recv()
 		if err != nil {
 			// 这里不退出会死循环
 			c.handler.OnError(err.Error())
 			break
 		}
 
-		c.handler.OnRecv(msg.ID, int(msg.Method), msg.Group, msg.From, msg.User, msg.Body)
+		c.handler.OnRecv(pm.Event, pm.Operate, pm.Msg.ID, pm.Msg.Group, pm.Msg.From, pm.Msg.To, pm.Msg.Body)
 	}
 }
 

gate/server.go

@@ -291,7 +291,6 @@ func (g *Gate) SendMessage(ctx context.Context, req *meta.GateSendMessageRequest
 
 	//防止乱写
 	req.Msg.From = s.getID()
-	req.Msg.Method = meta.Method_NONE
 
 	if err = g.store.newMessage(req.Msg); err != nil {
 		return &meta.GateSendMessageResponse{Header: &meta.ResponseHeader{Code: util.ErrorNewMessage, Msg: err.Error()}}, nil
@@ -332,8 +331,8 @@ func (g *Gate) Heartbeat(ctx context.Context, req *meta.GateHeartbeatRequest) (*
 	return &meta.GateHeartbeatResponse{}, nil
 }
 
-// Notice recv Notice server Message, and send Message to client.
-func (g *Gate) Notice(ctx context.Context, req *meta.GateNoticeRequest) (*meta.GateNoticeResponse, error) {
+// Push recv Notice server Message, and send Message to client.
+func (g *Gate) Push(ctx context.Context, req *meta.GatePushRequest) (*meta.GatePushResponse, error) {
 	log.Debugf("begin PushID:%v msg:%v", req.ID, req.Msg)
 
 	for _, id := range req.ID {
@@ -342,54 +341,35 @@ func (g *Gate) Notice(ctx context.Context, req *meta.GateNoticeRequest) (*meta.G
 			log.Debugf("User:%d offline", id.User)
 			continue
 		}
-		req.Msg.Before = id.Before
+		req.Msg.Msg.Before = id.Before
 		log.Debugf("will push user:%d, msg:%v", id.User, req.Msg)
 		s.push <- req.Msg
 	}
 
 	log.Debugf("end PushID:%v msg:%v ok", req.ID, req.Msg)
 
-	return &meta.GateNoticeResponse{}, nil
+	return &meta.GatePushResponse{}, nil
 }
 
-// AddFriend 添加好友或确认接受添加.
-func (g *Gate) AddFriend(ctx context.Context, req *meta.GateAddFriendRequest) (*meta.GateAddFriendResponse, error) {
+// Friend 添加好友或确认接受添加.
+func (g *Gate) Friend(ctx context.Context, req *meta.GateFriendRequest) (*meta.GateFriendResponse, error) {
 	s, err := g.getOnlineSession(ctx)
 	if err != nil {
-		return &meta.GateAddFriendResponse{Header: &meta.ResponseHeader{Code: util.ErrorGetOnlineSession, Msg: err.Error()}}, nil
+		return &meta.GateFriendResponse{Header: &meta.ResponseHeader{Code: util.ErrorGetOnlineSession, Msg: err.Error()}}, nil
 	}
 
 	//自己要把自己添加成好友
 	if req.UserID == s.id {
 		log.Infof("%d add friend id:%d", s.id, req.UserID)
-		return &meta.GateAddFriendResponse{Header: &meta.ResponseHeader{Code: util.ErrorFriendSelf, Msg: "Friend ID must not be Self ID"}}, nil
+		return &meta.GateFriendResponse{Header: &meta.ResponseHeader{Code: util.ErrorFriendSelf, Msg: "Friend ID must not be Self ID"}}, nil
 	}
 
-	// 主动添加对方为好友，更新自己本地信息
-	state, err := g.store.addFriend(s.id, req.UserID, meta.FriendRelation_Active, req.Msg)
-	if err != nil {
-		log.Errorf("%d addFriend:%d erorr:%s", s.id, req.UserID, errors.ErrorStack(err))
-		return &meta.GateAddFriendResponse{Header: &meta.ResponseHeader{Code: util.ErrorAddFriend, Msg: err.Error()}}, nil
-	}
-
-	// 被动添加好友，更新对方好友信息
-	if state, err = g.store.addFriend(req.UserID, s.id, meta.FriendRelation_Passive, req.Msg); err != nil {
-		log.Errorf("%d addFriend:%d erorr:%s", s.id, req.UserID, errors.ErrorStack(err))
-		return &meta.GateAddFriendResponse{Header: &meta.ResponseHeader{Code: util.ErrorAddFriend, Msg: err.Error()}}, nil
-	}
-
-	// 如果对方返回FriendRelation_Confirm，说明之前对方添加过自己, 只不过本地信息未更新，要先更新本地信息，再返回FriendRelation_Confirm
-	if state == meta.FriendRelation_Confirm {
-		// 正常流程走不到这里，除非是数据丢失了
-		_, err := g.store.addFriend(s.id, req.UserID, meta.FriendRelation_Confirm, req.Msg)
-		if err != nil {
-			log.Errorf("%d addFriend:%d erorr:%s", s.id, req.UserID, errors.ErrorStack(err))
-			return &meta.GateAddFriendResponse{Header: &meta.ResponseHeader{Code: util.ErrorAddFriend, Msg: err.Error()}}, nil
-		}
-		return &meta.GateAddFriendResponse{Confirm: true}, nil
+	if err = g.store.friend(s.id, req.UserID, req.Operate, req.Msg); err != nil {
+		log.Errorf("%d friend:%d operate:%d erorr:%s", s.id, req.UserID, req.Operate, errors.ErrorStack(err))
+		return &meta.GateFriendResponse{Header: &meta.ResponseHeader{Code: util.ErrorAddFriend, Msg: err.Error()}}, nil
 	}
 
-	return &meta.GateAddFriendResponse{}, nil
+	return &meta.GateFriendResponse{}, nil
 }
 
 // LoadFriendList 加载好友列表

gate/session.go

@@ -17,12 +17,12 @@ type session struct {
 	state int
 	last  int64
 	addr  string
-	push  chan *meta.Message
+	push  chan *meta.PushMessage
 }
 
 func newSession(addr string) *session {
 	log.Debugf("addr:%s", addr)
-	return &session{addr: addr, push: make(chan *meta.Message)}
+	return &session{addr: addr, push: make(chan *meta.PushMessage)}
 }
 
 func (s *session) online(id int64) {

gate/store.go

@@ -102,15 +102,15 @@ func (s *store) findUser(user string) ([]string, error) {
 	return resp.Users, errors.Trace(resp.Header.Error())
 }
 
-func (s *store) addFriend(from, to int64, state meta.FriendRelation, msg string) (meta.FriendRelation, error) {
-	log.Debugf("store addFriend, from:%v to:%v state:%v", from, to, state)
-	req := &meta.StoreAddFriendRequest{From: from, To: to, State: state, Msg: msg}
-	resp, err := s.api.AddFriend(s.ctx, req)
+func (s *store) friend(from, to int64, operate meta.Relation, msg string) error {
+	log.Debugf("store friend, from:%v to:%v operate:%v", from, to, operate)
+	req := &meta.StoreFriendRequest{From: from, To: to, Operate: operate, Msg: msg}
+	resp, err := s.api.Friend(s.ctx, req)
 	if err != nil {
-		return meta.FriendRelation_None, errors.Trace(err)
+		return errors.Trace(err)
 	}
 
-	return resp.State, errors.Trace(resp.Header.Error())
+	return errors.Trace(resp.Header.Error())
 }
 
 func (s *store) loadFriendList(user int64) ([]int64, error) {
@@ -134,7 +134,7 @@ func (s *store) createGroup(userID, groupID int64, name string) error {
 	return errors.Trace(resp.Header.Error())
 }
 
-func (s *store) loadGroupList(userID int64) ([]*meta.Group, error) {
+func (s *store) loadGroupList(userID int64) ([]*meta.GroupInfo, error) {
 	req := &meta.StoreLoadGroupListRequest{User: userID}
 	resp, err := s.api.LoadGroupList(s.ctx, req)
 	if err != nil {
@@ -205,7 +205,7 @@ func (s *store) newMessage(msg *meta.Message) error {
 	return errors.Trace(resp.Header.Error())
 }
 
-func (s *store) loadMessage(userID, id int64, reverse bool) ([]*meta.Message, error) {
+func (s *store) loadMessage(userID, id int64, reverse bool) ([]*meta.PushMessage, error) {
 	log.Debugf("store loadMessage")
 	req := &meta.StoreLoadMessageRequest{User: userID, ID: id, Reverse: reverse}
 	resp, err := s.api.LoadMessage(s.ctx, req)