fix emit bug

melode11 · melode11 · commit 079950e0082e · 2015-04-19T07:33:26.000-07:00
diff --git a/examples/QT/SioChatDemo/mainwindow.cpp b/examples/QT/SioChatDemo/mainwindow.cpp
@@ -91,7 +91,7 @@ void MainWindow::showEvent(QShowEvent *event)
 void MainWindow::TypingStop()
 {
     m_timer.reset();
-    _io->socket()->emit("stop typing","");
+    _io->socket()->emit("stop typing");
 }
 
 void MainWindow::TypingChanged()
@@ -102,7 +102,7 @@ void MainWindow::TypingChanged()
     }
     else
     {
-        _io->socket()->emit("typing",nullptr);
+        _io->socket()->emit("typing");
     }
     m_timer.reset(new QTimer(this));
     connect(m_timer.get(),SIGNAL(timeout()),this,SLOT(TypingStop()));
@@ -234,11 +234,6 @@ void MainWindow::OnStopTyping(std::string const& name,message::ptr const& data,b
 
 void MainWindow::OnLogin(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp)
 {
-    message::ptr  array = array_message::create();
-    array->get_vector().push_back(string_message::create("arg1"));
-    array->get_vector().push_back(string_message::create("arg2"));
-    _io->socket()->emit("test va",array);
-
     Q_EMIT RequestToggleInputs(true);
     int numUser = data->get_map()["numUsers"]->get_int();
 
diff --git a/src/sio_message.h b/src/sio_message.h
@@ -293,6 +293,7 @@ namespace sio
             message::ptr arr = array_message::create();
             arr->get_vector().push_back(string_message::create(event_name));
             arr->get_vector().insert(arr->get_vector().end(),m_vector.begin(),m_vector.end());
+            return arr;
         }
 
     private:
diff --git a/src/sio_socket.cpp b/src/sio_socket.cpp
@@ -139,13 +139,13 @@ void set_##__FIELD__(__TYPE__ const& l) \
         
         event_listener get_bind_listener_locked(string const& event);
         
-        void __ack(int msgId,string const& name,message::ptr const& ack_message);
+        void ack(int msgId,string const& name,message::ptr const& ack_message);
         
-        void __timeout_connection(const boost::system::error_code &ec);
+        void timeout_connection(const boost::system::error_code &ec);
         
-        void __send_connect();
+        void send_connect();
         
-        void __send_packet(packet& p);
+        void send_packet(packet& p);
         
         static event_listener s_null_event_listener;
         
@@ -216,7 +216,7 @@ void set_##__FIELD__(__TYPE__ const& l) \
         NULL_GUARD(client);
         if(m_client->opened())
         {
-            __send_connect();
+            send_connect();
         }
     }
     
@@ -231,24 +231,30 @@ void set_##__FIELD__(__TYPE__ const& l) \
     {
         NULL_GUARD(m_client);
         message::ptr msg_ptr = msglist.to_array_message(name);
-        packet p(m_nsp, msg_ptr,s_global_event_id);
+        int pack_id;
         if(ack)
         {
+            pack_id = s_global_event_id++;
             std::lock_guard<std::mutex> guard(m_event_mutex);
-            m_acks[s_global_event_id++] = ack;
+            m_acks[pack_id] = ack;
         }
-        __send_packet(p);
+        else
+        {
+            pack_id = -1;
+        }
+        packet p(m_nsp, msg_ptr,pack_id);
+        send_packet(p);
     }
     
-    void socket::impl::__send_connect()
+    void socket::impl::send_connect()
     {
         NULL_GUARD(m_client);
         packet p(packet::type_connect,m_nsp);
         m_client->send(p);
         m_connection_timer.reset(new boost::asio::deadline_timer(m_client->get_io_service()));
         boost::system::error_code ec;
         m_connection_timer->expires_from_now(boost::posix_time::milliseconds(20000), ec);
-        m_connection_timer->async_wait(std::bind(&socket::impl::__timeout_connection,this, std::placeholders::_1));
+        m_connection_timer->async_wait(std::bind(&socket::impl::timeout_connection,this, std::placeholders::_1));
     }
     
     void socket::impl::close()
@@ -257,7 +263,7 @@ void set_##__FIELD__(__TYPE__ const& l) \
         if(m_connected)
         {
             packet p(packet::type_disconnect,m_nsp);
-            __send_packet(p);
+            send_packet(p);
             
             if(!m_connection_timer)
             {
@@ -306,7 +312,7 @@ void set_##__FIELD__(__TYPE__ const& l) \
     
     void socket::impl::on_open()
     {
-        __send_connect();
+        send_connect();
     }
     
     void socket::impl::on_disconnect()
@@ -408,14 +414,14 @@ void set_##__FIELD__(__TYPE__ const& l) \
         if(func)func(ev);
         if(needAck)
         {
-            this->__ack(msgId, name, ev.get_ack_message());
+            this->ack(msgId, name, ev.get_ack_message());
         }
     }
     
-    void socket::impl::__ack(int msgId, const string &name, const message::ptr &ack_message)
+    void socket::impl::ack(int msgId, const string &name, const message::ptr &ack_message)
     {
         packet p(m_nsp, make_message(name, ack_message),msgId,true);
-        __send_packet(p);
+        send_packet(p);
     }
     
     void socket::impl::on_socketio_ack(int msgId, message::ptr const& message)
@@ -438,7 +444,7 @@ void set_##__FIELD__(__TYPE__ const& l) \
         if(m_error_listener)m_error_listener(err_message);
     }
     
-    void socket::impl::__timeout_connection(const boost::system::error_code &ec)
+    void socket::impl::timeout_connection(const boost::system::error_code &ec)
     {
         NULL_GUARD(m_client);
         if(ec)
@@ -450,7 +456,7 @@ void set_##__FIELD__(__TYPE__ const& l) \
         this->on_disconnect();
     }
     
-    void socket::impl::__send_packet(sio::packet &p)
+    void socket::impl::send_packet(sio::packet &p)
     {
         NULL_GUARD(m_client);
         if(m_connected)
diff --git a/src/sio_socket.h b/src/sio_socket.h
@@ -67,7 +67,7 @@ namespace sio
         
         void off_error();
 
-        void emit(std::string const& name, message::list const& msglist, std::function<void (message::ptr const&)> const& ack = nullptr);
+        void emit(std::string const& name, message::list const& msglist = nullptr, std::function<void (message::ptr const&)> const& ack = nullptr);
         
         std::string const& get_namespace() const;
         
diff --git a/test/sio_test.cpp b/test/sio_test.cpp
@@ -67,13 +67,16 @@ BOOST_AUTO_TEST_CASE( test_packet_accept_2 )
 
 BOOST_AUTO_TEST_CASE( test_packet_accept_3 )
 {
-    packet p("/nsp",string_message::create("test"),1001,true);
+    message::ptr array = array_message::create();
+    array->get_vector().push_back(string_message::create("event"));
+    array->get_vector().push_back(string_message::create("text"));
+    packet p("/nsp",array,1001,true);
     std::string payload;
     std::vector<std::shared_ptr<const std::string> > buffers;
     p.accept(payload,buffers);
     BOOST_CHECK(p.get_type() == packet::type_ack);
     BOOST_CHECK(buffers.size() == 0);
-    BOOST_CHECK_MESSAGE(payload == "43/nsp,1001\"test\"",std::string("outputing payload:")+payload);
+    BOOST_CHECK_MESSAGE(payload == "43/nsp,1001[\"event\",\"text\"]",std::string("outputing payload:")+payload);
 }
 
 BOOST_AUTO_TEST_CASE( test_packet_accept_4 )

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ void MainWindow::showEvent(QShowEvent *event)`
`91`	`91`	`void MainWindow::TypingStop()`
`92`	`92`	`{`
`93`	`93`	`m_timer.reset();`
`94`		`- _io->socket()->emit("stop typing","");`
	`94`	`+ _io->socket()->emit("stop typing");`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`void MainWindow::TypingChanged()`
`@@ -102,7 +102,7 @@ void MainWindow::TypingChanged()`
`102`	`102`	`}`
`103`	`103`	`else`
`104`	`104`	`{`
`105`		`- _io->socket()->emit("typing",nullptr);`
	`105`	`+ _io->socket()->emit("typing");`
`106`	`106`	`}`
`107`	`107`	`m_timer.reset(new QTimer(this));`
`108`	`108`	`connect(m_timer.get(),SIGNAL(timeout()),this,SLOT(TypingStop()));`
`@@ -234,11 +234,6 @@ void MainWindow::OnStopTyping(std::string const& name,message::ptr const& data,b`
`234`	`234`
`235`	`235`	`void MainWindow::OnLogin(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp)`
`236`	`236`	`{`
`237`		`- message::ptr array = array_message::create();`
`238`		`- array->get_vector().push_back(string_message::create("arg1"));`
`239`		`- array->get_vector().push_back(string_message::create("arg2"));`
`240`		`- _io->socket()->emit("test va",array);`
`241`		`-`
`242`	`237`	`Q_EMIT RequestToggleInputs(true);`
`243`	`238`	`int numUser = data->get_map()["numUsers"]->get_int();`
`244`	`239`
Original file line number	Diff line number	Diff line change
`@@ -293,6 +293,7 @@ namespace sio`
`293`	`293`	`message::ptr arr = array_message::create();`
`294`	`294`	`arr->get_vector().push_back(string_message::create(event_name));`
`295`	`295`	`arr->get_vector().insert(arr->get_vector().end(),m_vector.begin(),m_vector.end());`
	`296`	`+ return arr;`
`296`	`297`	`}`
`297`	`298`
`298`	`299`	`private:`
Original file line number	Diff line number	Diff line change
`@@ -139,13 +139,13 @@ void set_##__FIELD__(__TYPE__ const& l) \`
`139`	`139`
`140`	`140`	`event_listener get_bind_listener_locked(string const& event);`
`141`	`141`
`142`		`- void __ack(int msgId,string const& name,message::ptr const& ack_message);`
	`142`	`+ void ack(int msgId,string const& name,message::ptr const& ack_message);`
`143`	`143`
`144`		`- void __timeout_connection(const boost::system::error_code &ec);`
	`144`	`+ void timeout_connection(const boost::system::error_code &ec);`
`145`	`145`
`146`		`- void __send_connect();`
	`146`	`+ void send_connect();`
`147`	`147`
`148`		`- void __send_packet(packet& p);`
	`148`	`+ void send_packet(packet& p);`
`149`	`149`
`150`	`150`	`static event_listener s_null_event_listener;`
`151`	`151`
`@@ -216,7 +216,7 @@ void set_##__FIELD__(__TYPE__ const& l) \`
`216`	`216`	`NULL_GUARD(client);`
`217`	`217`	`if(m_client->opened())`
`218`	`218`	`{`
`219`		`- __send_connect();`
	`219`	`+ send_connect();`
`220`	`220`	`}`
`221`	`221`	`}`
`222`	`222`
`@@ -231,24 +231,30 @@ void set_##__FIELD__(__TYPE__ const& l) \`
`231`	`231`	`{`
`232`	`232`	`NULL_GUARD(m_client);`
`233`	`233`	`message::ptr msg_ptr = msglist.to_array_message(name);`
`234`		`- packet p(m_nsp, msg_ptr,s_global_event_id);`
	`234`	`+ int pack_id;`
`235`	`235`	`if(ack)`
`236`	`236`	`{`
	`237`	`+ pack_id = s_global_event_id++;`
`237`	`238`	`std::lock_guard<std::mutex> guard(m_event_mutex);`
`238`		`- m_acks[s_global_event_id++] = ack;`
	`239`	`+ m_acks[pack_id] = ack;`
`239`	`240`	`}`
`240`		`- __send_packet(p);`
	`241`	`+ else`
	`242`	`+ {`
	`243`	`+ pack_id = -1;`
	`244`	`+ }`
	`245`	`+ packet p(m_nsp, msg_ptr,pack_id);`
	`246`	`+ send_packet(p);`
`241`	`247`	`}`
`242`	`248`
`243`		`- void socket::impl::__send_connect()`
	`249`	`+ void socket::impl::send_connect()`
`244`	`250`	`{`
`245`	`251`	`NULL_GUARD(m_client);`
`246`	`252`	`packet p(packet::type_connect,m_nsp);`
`247`	`253`	`m_client->send(p);`
`248`	`254`	`m_connection_timer.reset(new boost::asio::deadline_timer(m_client->get_io_service()));`
`249`	`255`	`boost::system::error_code ec;`
`250`	`256`	`m_connection_timer->expires_from_now(boost::posix_time::milliseconds(20000), ec);`
`251`		`- m_connection_timer->async_wait(std::bind(&socket::impl::__timeout_connection,this, std::placeholders::_1));`
	`257`	`+ m_connection_timer->async_wait(std::bind(&socket::impl::timeout_connection,this, std::placeholders::_1));`
`252`	`258`	`}`
`253`	`259`
`254`	`260`	`void socket::impl::close()`
`@@ -257,7 +263,7 @@ void set_##__FIELD__(__TYPE__ const& l) \`
`257`	`263`	`if(m_connected)`
`258`	`264`	`{`
`259`	`265`	`packet p(packet::type_disconnect,m_nsp);`
`260`		`- __send_packet(p);`
	`266`	`+ send_packet(p);`
`261`	`267`
`262`	`268`	`if(!m_connection_timer)`
`263`	`269`	`{`
`@@ -306,7 +312,7 @@ void set_##__FIELD__(__TYPE__ const& l) \`
`306`	`312`
`307`	`313`	`void socket::impl::on_open()`
`308`	`314`	`{`
`309`		`- __send_connect();`
	`315`	`+ send_connect();`
`310`	`316`	`}`
`311`	`317`
`312`	`318`	`void socket::impl::on_disconnect()`
`@@ -408,14 +414,14 @@ void set_##__FIELD__(__TYPE__ const& l) \`
`408`	`414`	`if(func)func(ev);`
`409`	`415`	`if(needAck)`
`410`	`416`	`{`
`411`		`- this->__ack(msgId, name, ev.get_ack_message());`
	`417`	`+ this->ack(msgId, name, ev.get_ack_message());`
`412`	`418`	`}`
`413`	`419`	`}`
`414`	`420`
`415`		`- void socket::impl::__ack(int msgId, const string &name, const message::ptr &ack_message)`
	`421`	`+ void socket::impl::ack(int msgId, const string &name, const message::ptr &ack_message)`
`416`	`422`	`{`
`417`	`423`	`packet p(m_nsp, make_message(name, ack_message),msgId,true);`
`418`		`- __send_packet(p);`
	`424`	`+ send_packet(p);`
`419`	`425`	`}`
`420`	`426`
`421`	`427`	`void socket::impl::on_socketio_ack(int msgId, message::ptr const& message)`
`@@ -438,7 +444,7 @@ void set_##__FIELD__(__TYPE__ const& l) \`
`438`	`444`	`if(m_error_listener)m_error_listener(err_message);`
`439`	`445`	`}`
`440`	`446`
`441`		`- void socket::impl::__timeout_connection(const boost::system::error_code &ec)`
	`447`	`+ void socket::impl::timeout_connection(const boost::system::error_code &ec)`
`442`	`448`	`{`
`443`	`449`	`NULL_GUARD(m_client);`
`444`	`450`	`if(ec)`
`@@ -450,7 +456,7 @@ void set_##__FIELD__(__TYPE__ const& l) \`
`450`	`456`	`this->on_disconnect();`
`451`	`457`	`}`
`452`	`458`
`453`		`- void socket::impl::__send_packet(sio::packet &p)`
	`459`	`+ void socket::impl::send_packet(sio::packet &p)`
`454`	`460`	`{`
`455`	`461`	`NULL_GUARD(m_client);`
`456`	`462`	`if(m_connected)`