Changeset 6 in chevmsgr for trunk/msgclnt.h

Timestamp:

08/29/15 02:20:50 (9 years ago)

Author:

cheese

Message:

modify client interface and message protocol

File:

• trunk/msgclnt.h (modified) (2 diffs)

trunk/msgclnt.h

@@ -9 +9 @@
 #include "cf/task.h"
 
-typedef struct SFriend
+typedef struct SConversation
 {
-    std::string id;
-    std::string name;
-} SFriend;
+    // tell and listen
+    std::string sessid;
+    std::string message;
+    int sensitive;
+    bool isError;
 
-// for callback
+    // only for listen
+    std::string from;
+} SConversation;
 
-typedef struct SResultResponse
+class MessageQ
 {
-    bool result;
-    bool isError;
-} SResultResponse;
+private:
+    cf::task::mutex                 mutex;
+    std::vector<Protocol::Message>  messageQ;
 
-typedef struct SReceivedMessage
-{
-    std::string sessid;
-    std::string sender;
-    std::string message;
-    bool isError;
-} SReceivedMessage;
+public:
+    void push(const Protocol::Message & parser);
 
-typedef int (* callback_onResultResponse)(SResultResponse &);
-typedef int (* callback_onReceiveMessage)(SReceivedMessage &);
-
-typedef struct SCallback
-{
-    callback_onResultResponse result;
-    callback_onReceiveMessage message;
-} SCallback;
+    Protocol::Message pop(const std::string & requestType);
+};
 
 class chev
 {
 private:
-    Message::Request    request;
+    Protocol::Request   request;
     std::string         error;
     cf::network::tcp    socket;
     cf::task::thread    listener;
-    SCallback           callback;
+
+    MessageQ            messageQ;
+
+    std::map<std::string, std::string>  sessionMap;
 
 public:
     chev();
+
+    ~chev();
+
+    const std::string & getLastError() const;
 
     bool connect(const std::string & host, unsigned short port);
@@ -64 +64 @@
     std::vector<SFriend> getFriendList();
 
-    bool sendMessage(const std::string & friendid, const std::string & sessionID, const std::string & message);
+    std::string getSessionID(const std::vector<std::string> & idList);
 
-    // call once
-    bool runReceiver(const SCallback & cb);
+    bool tell(const SConversation & conversation);
 
-    const std::string & getLastError();
+    SConversation listen();
 };