Changeset 6 in chevmsgr for trunk/msg.cpp

Timestamp:

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

Author:

cheese

Message:

modify client interface and message protocol

File:

• trunk/msg.cpp (modified) (5 diffs)

trunk/msg.cpp

@@ -5 +5 @@
     makeTemplate(_obj, _type);                  \
 
-namespace Message
+#define DELIMITER   "$"
+
+namespace Protocol
 {
     // parser
-    void Parser::parse(const std::string & message)
+    void Message::parse(const std::string & message)
     {
         mObject = json::Deserialize(message);
     }
 
-    std::string Parser::type() const
+    std::string Message::type() const
     {
         return get<std::string>("type");
@@ -31 +33 @@
     void Request::makeTemplate(json::Object & obj, const std::string & type) const
     {
-        obj["id"] = mID;
-        obj["type"] = type;
-    }
-
-    std::string Request::command(const std::string & cmd) const
-    {
-        DECLARE_TEMPLATE_OBJECT(obj, "command");
-
-        obj["command"] = cmd;
-
-        return json::Serialize(obj);
+        obj[ProtocolType::ID  ] = mID;
+        obj[ProtocolType::TYPE] = type;
     }
 
     std::string Request::sms(const std::string & phone) const
     {
-        DECLARE_TEMPLATE_OBJECT(obj, "sms");
+        DECLARE_TEMPLATE_OBJECT(obj, ProtocolType::SMS);
 
-        obj["phone"] = phone;
+        obj[ProtocolType::PHONE] = phone;
 
         return json::Serialize(obj);
@@ -55 +48 @@
     std::string Request::join(const std::string & id, const std::string & pw, const std::string & sms)
     {
-        DECLARE_TEMPLATE_OBJECT(obj, "join");
+        DECLARE_TEMPLATE_OBJECT(obj, ProtocolType::JOIN);
 
-        obj["id" ] = id;
-        obj["pw" ] = pw;
-        obj["sms"] = sms;
+        obj[ProtocolType::ID ] = id;
+        obj[ProtocolType::PW ] = pw;
+        obj[ProtocolType::SMS] = sms;
 
         return json::Serialize(obj);
@@ -66 +59 @@
     std::string Request::login(const std::string & pw) const
     {
-        DECLARE_TEMPLATE_OBJECT(obj, "login");
+        DECLARE_TEMPLATE_OBJECT(obj, ProtocolType::LOGIN);
 
-        obj["pw"] = mID + "$" + pw;
+        obj[ProtocolType::PW] = mID + DELIMITER + pw;
 
         return json::Serialize(obj);
     }
 
-    std::string Request::chat(const std::string & to, const std::string & sessid, const std::string & message) const
+    std::string Request::addFriend(const std::string & id) const
     {
-        DECLARE_TEMPLATE_OBJECT(obj, "chat");
+        DECLARE_TEMPLATE_OBJECT(obj, ProtocolType::ADD_FRIEND);
 
-        obj["from"   ] = mID;
-        obj["to"     ] = to;
-        obj["sess-id"] = sessid;
-        obj["message"] = message;
+        obj[ProtocolType::ID] = id;
 
         return json::Serialize(obj);
     }
 
-    std::string Request::friendList() const
+    std::string Request::openSession(const std::string & to) const
     {
-        DECLARE_TEMPLATE_OBJECT(obj, "friend-list");
+        DECLARE_TEMPLATE_OBJECT(obj, ProtocolType::OPEN_SESSION);
+
+        obj[ProtocolType::TO] = to;
+
+        return json::Serialize(obj);
+    }
+
+    std::string Request::chat(const std::string & sessid, const std::string & message, const int sensitive) const
+    {
+        DECLARE_TEMPLATE_OBJECT(obj, ProtocolType::CHAT);
+
+        obj[ProtocolType::FROM      ] = mID;
+        obj[ProtocolType::SESSION_ID] = sessid;
+        obj[ProtocolType::MESSAGE   ] = message;
+        obj[ProtocolType::SENSITIVE ] = sensitive;
+
+        return json::Serialize(obj);
+    }
+
+    std::string Request::getFriendList() const
+    {
+        DECLARE_TEMPLATE_OBJECT(obj, ProtocolType::GET_FRIEND_LIST);
 
         return json::Serialize(obj);
@@ -95 +106 @@
     void Response::makeTemplate(json::Object & obj, const std::string & type) const
     {
-        obj["type"] = type;
+        obj[ProtocolType::TYPE] = type;
     }
 
-    std::string Response::result(const bool status) const
+    std::string Response::result(const std::string & requestType, const bool status) const
     {
-        DECLARE_TEMPLATE_OBJECT(obj, "result");
+        DECLARE_TEMPLATE_OBJECT(obj, ProtocolType::RESULT);
 
-        obj["result"] = status;
+        obj[ProtocolType::RESULT] = status;
 
         return json::Serialize(obj);