Changeset 6 in chevmsgr for trunk/msgclnt.cpp

Timestamp:

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

Author:

cheese

Message:

modify client interface and message protocol

File:

• trunk/msgclnt.cpp (modified) (9 diffs)

trunk/msgclnt.cpp

@@ -10 +10 @@
 {
     cf::network::tcp * socket;
-    SCallback * callback;
+    MessageQ * messageQ;
 } SWorkerArg;
 
@@ -17 +17 @@
     SWorkerArg * inst = (SWorkerArg *) arg;
 
-    bool isError = false;
-    Message::Parser parser;
+    Protocol::Message parser;
     cf::bin raw;
 
@@ -27 +26 @@
             raw = inst->socket->receive();
             parser.parse(raw.toString());
-
-            isError = false;
         }
         catch (cf::exception & e)
@@ -37 +34 @@
             if (raw.size() == 0)
                 break;
-
-            isError = true;
-        }
-
-        if (parser.type() == "result")
-        {
-            SResultResponse recv;
-
-            recv.result  = parser.get<bool>("result");
-            recv.isError = isError;
-
-            inst->callback->result(recv);
-        }
-        else if (parser.type() == "chat")
-        {
-            SReceivedMessage recv;
-
-            recv.sessid  = parser.get<std::string>("sess-id");
-            recv.sender  = parser.get<std::string>("from");
-            recv.message = parser.get<std::string>("message");
-            recv.isError = isError;
-
-            inst->callback->message(recv);
-        }
-    }
-
-    free(arg);
+        }
+
+        inst->messageQ->push(parser);
+    }
+
+    free(inst);
 
     return 0;
+}
+
+// --------------------------------------------------------------
+
+void MessageQ::push(const Protocol::Message & parser)
+{
+    SYNCHRONIZED(mutex)
+    {
+        messageQ.push_back(parser);
+    }
+}
+
+Protocol::Message MessageQ::pop(const std::string & requestType)
+{
+    while (true)
+    {
+        SYNCHRONIZED(mutex)
+        {
+            Protocol::Message parser = messageQ.front();
+
+            if (parser.type() == requestType)
+            {
+                messageQ.erase(messageQ.begin());
+
+                return parser;
+            }
+        }
+    }
 }
 
@@ -75 +79 @@
 }
 
+chev::~chev()
+{
+    socket.close();
+}
+
+const std::string & chev::getLastError() const
+{
+    return error;
+}
+
 bool chev::connect(const std::string & host, const unsigned short port)
 {
@@ -81 +95 @@
         socket.connect(host, port);
 
+        SWorkerArg * arg = (SWorkerArg *)malloc(sizeof(SWorkerArg));
+        if (!arg)
+            return false;
+
+        arg->socket = &socket;
+        arg->messageQ = &messageQ;
+
+        listener.start(arg);
+
         return true;
     }
@@ -97 +120 @@
         socket.send(request.join(id, pw, sms));
 
-        std::string response = socket.receive().toString();
-        Message::Parser parser;
-        parser.parse(response);
-
-        return parser.get<bool>("result");
+        return messageQ.pop(ProtocolType::JOIN).get<bool>(ProtocolType::RESULT);
     }
     catch (cf::exception & e)
@@ -119 +138 @@
         socket.send(request.login(pw));
 
-        std::string response = socket.receive().toString();
-        Message::Parser parser;
-        parser.parse(response);
-
-        return parser.get<bool>("result");
+        return messageQ.pop(ProtocolType::LOGIN).get<bool>(ProtocolType::RESULT);
     }
     catch (cf::exception & e)
@@ -139 +154 @@
         socket.send(request.sms(phone));
 
-        std::string response = socket.receive().toString();
-        Message::Parser parser;
-        parser.parse(response);
-
-        return parser.get<bool>("result");
-    }
-    catch (cf::exception & e)
-    {
-        LOG(e.what());
-
-        return false;
-    }
-}
-
-bool chev::runReceiver(const SCallback & cb)
-{
-    if (listener.isRunning())
-        return true;
-
-    callback = cb;
-
-    SWorkerArg * arg = (SWorkerArg *)malloc(sizeof(SWorkerArg));
-    if (!arg)
-        return false;
-
-    arg->socket = &socket;
-    arg->callback = &callback;
-
-    listener.start(arg);
-
-    return true;
-}
-
-bool chev::sendMessage(const std::string & friendid, const std::string & sessid, const std::string & message)
-{
-    try
-    {
-        socket.send(request.chat(friendid, sessid, message));
-
-        std::string response = socket.receive().toString();
-        Message::Parser parser;
-        parser.parse(response);
-
-        return parser.get<bool>("result");
-    }
-    catch (cf::exception & e)
-    {
-        LOG(e.what());
-
-        return false;
-    }
-}
+        return messageQ.pop(ProtocolType::SMS).get<bool>(ProtocolType::RESULT);
+    }
+    catch (cf::exception & e)
+    {
+        LOG(e.what());
+
+        return false;
+    }
+}
+
+bool chev::addFriend(const std::string & id)
+{
+    try
+    {
+        socket.send(request.addFriend(id));
+
+        return messageQ.pop(ProtocolType::ADD_FRIEND).get<bool>(ProtocolType::RESULT);
+    }
+    catch (cf::exception & e)
+    {
+        LOG(e.what());
+
+        return false;
+    }
+}
+
+std::vector<SFriend> chev::getFriendList()
+{
+    try
+    {
+        socket.send(request.getFriendList());
+    }
+    catch (cf::exception & e)
+    {
+        LOG(e.what());
+    }
+    return std::vector<SFriend>();
+}
+
+std::string chev::getSessionID(const std::vector<std::string> & idList)
+{
+    try
+    {
+        std::string concat = idList[0];
+
+        for (int iter = 1 ; iter < idList.size() ; iter++)
+            concat += "," + idList[iter];
+
+        if (sessionMap.find(concat) == sessionMap.end())
+        {
+            socket.send(request.openSession(concat));
+
+            std::string response = socket.receive().toString();
+            Protocol::Message parser;
+            parser.parse(response);
+
+            if (!parser.get<bool>("result"))
+                THROW_EXCEPTION("failed to open session id");
+
+            sessionMap[concat] = parser.get<std::string>("sess-id");
+        }
+
+        return sessionMap[concat];
+    }
+    catch (cf::exception & e)
+    {
+        LOG(e.what());
+
+        return "";
+    }
+}
+
+bool chev::tell(const SConversation & conversation)
+{
+    try
+    {
+        const SConversation & c = conversation;
+
+        socket.send(request.chat(c.sessid, c.message, c.sensitive));
+
+        return messageQ.pop(ProtocolType::CHAT).get<bool>(ProtocolType::RESULT);
+    }
+    catch (cf::exception & e)
+    {
+        LOG(e.what());
+
+        return false;
+    }
+}
+
+SConversation chev::listen()
+{
+    SConversation c;
+    Protocol::Message parser = messageQ.pop(ProtocolType::CHAT);
+
+    c.sessid    = parser.get<std::string>(ProtocolType::SESSION_ID);
+    c.message   = parser.get<std::string>(ProtocolType::MESSAGE);
+    c.sensitive = parser.get<int>(ProtocolType::SENSITIVE);
+    c.isError   = parser.get<bool>(ProtocolType::RESULT);
+
+    c.from      = parser.get<std::string>(ProtocolType::FROM);
+
+    return c;
+}