Merge pull request socketio#59 from macq-vraman/ack_javascript_compliant

melode11 · melode11 · commit 3aee49c55372 · 2015-09-10T15:34:07.000+08:00
Changed ack from message::ptr to message::list
diff --git a/examples/Console/main.cpp b/examples/Console/main.cpp
@@ -71,7 +71,7 @@ socket::ptr current_socket;
 
 void bind_events(socket::ptr &socket)
 {
-	current_socket->on("new message", sio::socket::event_listener_aux([&](string const& name, message::ptr const& data, bool isAck,message::ptr &ack_resp)
+	current_socket->on("new message", sio::socket::event_listener_aux([&](string const& name, message::ptr const& data, bool isAck,message::list &ack_resp)
                        {
                            _lock.lock();
                            string user = data->get_map()["username"]->get_string();
@@ -80,7 +80,7 @@ void bind_events(socket::ptr &socket)
                            _lock.unlock();
                        }));
     
-    current_socket->on("user joined",sio::socket::event_listener_aux([&](string const& name, message::ptr const& data, bool isAck,message::ptr &ack_resp)
+    current_socket->on("user joined",sio::socket::event_listener_aux([&](string const& name, message::ptr const& data, bool isAck,message::list &ack_resp)
                        {
                            _lock.lock();
                            string user = data->get_map()["username"]->get_string();
@@ -91,7 +91,7 @@ void bind_events(socket::ptr &socket)
                            HIGHLIGHT(user<<" joined"<<"\nthere"<<(plural?" are ":"'s ")<< participants<<(plural?" participants":" participant"));
                            _lock.unlock();
                        }));
-    current_socket->on("user left", sio::socket::event_listener_aux([&](string const& name, message::ptr const& data, bool isAck,message::ptr &ack_resp)
+    current_socket->on("user left", sio::socket::event_listener_aux([&](string const& name, message::ptr const& data, bool isAck,message::list &ack_resp)
                        {
                            _lock.lock();
                            string user = data->get_map()["username"]->get_string();
@@ -126,7 +126,7 @@ MAIN_FUNC
         
         getline(cin, nickname);
     }
-	current_socket->on("login", sio::socket::event_listener_aux([&](string const& name, message::ptr const& data, bool isAck,message::ptr &ack_resp){
+	current_socket->on("login", sio::socket::event_listener_aux([&](string const& name, message::ptr const& data, bool isAck,message::list &ack_resp){
         _lock.lock();
         participants = data->get_map()["numUsers"]->get_int();
         bool plural = participants !=1;
diff --git a/examples/QT/SioChatDemo/mainwindow.cpp b/examples/QT/SioChatDemo/mainwindow.cpp
@@ -137,7 +137,7 @@ void MainWindow::RemoveListItem(QListWidgetItem* item)
 }
 
 
-void MainWindow::OnNewMessage(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp)
+void MainWindow::OnNewMessage(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp)
 {
 
     if(data->get_flag() == message::flag_object)
@@ -152,7 +152,7 @@ void MainWindow::OnNewMessage(std::string const& name,message::ptr const& data,b
     }
 }
 
-void MainWindow::OnUserJoined(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp)
+void MainWindow::OnUserJoined(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp)
 {
     if(data->get_flag() == message::flag_object)
     {
@@ -181,7 +181,7 @@ void MainWindow::OnUserJoined(std::string const& name,message::ptr const& data,b
 
 }
 
-void MainWindow::OnUserLeft(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp)
+void MainWindow::OnUserLeft(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp)
 {
     if(data->get_flag() == message::flag_object)
     {
@@ -209,7 +209,7 @@ void MainWindow::OnUserLeft(std::string const& name,message::ptr const& data,boo
     }
 }
 
-void MainWindow::OnTyping(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp)
+void MainWindow::OnTyping(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp)
 {
     if(m_typingItem == NULL)
     {
@@ -223,7 +223,7 @@ void MainWindow::OnTyping(std::string const& name,message::ptr const& data,bool
     }
 }
 
-void MainWindow::OnStopTyping(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp)
+void MainWindow::OnStopTyping(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp)
 {
     if(m_typingItem != NULL)
     {
@@ -232,7 +232,7 @@ 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)
+void MainWindow::OnLogin(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp)
 {
     Q_EMIT RequestToggleInputs(true);
     int numUser = data->get_map()["numUsers"]->get_int();
diff --git a/examples/QT/SioChatDemo/mainwindow.h b/examples/QT/SioChatDemo/mainwindow.h
@@ -41,12 +41,12 @@ private Q_SLOTS:
     void NicknameAccept();
     void NicknameCancelled();
 private:
-    void OnNewMessage(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp);
-    void OnUserJoined(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp);
-    void OnUserLeft(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp);
-    void OnTyping(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp);
-    void OnStopTyping(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp);
-    void OnLogin(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp);
+    void OnNewMessage(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp);
+    void OnUserJoined(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp);
+    void OnUserLeft(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp);
+    void OnTyping(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp);
+    void OnStopTyping(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp);
+    void OnLogin(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp);
     void OnConnected(std::string const& nsp);
     void OnClosed(client::close_reason const& reason);
     void OnFailed();
diff --git a/examples/iOS/SioChatDemo/SioChatDemo/CRViewController.mm b/examples/iOS/SioChatDemo/SioChatDemo/CRViewController.mm
@@ -69,7 +69,7 @@ -(void) updateUser:(NSString*)user count:(NSInteger) num joinOrLeft:(BOOL) isJoi
 
 using namespace sio;
 
-void OnNewMessage(CFTypeRef ctrl,string const& name,sio::message::ptr const& data,bool needACK,sio::message::ptr ackResp)
+void OnNewMessage(CFTypeRef ctrl,string const& name,sio::message::ptr const& data,bool needACK,sio::message::list ackResp)
 {
     if(data->get_flag() == message::flag_object)
     {
@@ -82,7 +82,7 @@ void OnNewMessage(CFTypeRef ctrl,string const& name,sio::message::ptr const& dat
    
 }
 
-void OnTyping(CFTypeRef ctrl,string const& name,sio::message::ptr const& data,bool needACK,sio::message::ptr ackResp)
+void OnTyping(CFTypeRef ctrl,string const& name,sio::message::ptr const& data,bool needACK,sio::message::list ackResp)
 {
     if(data->get_flag() == message::flag_object)
     {
@@ -93,7 +93,7 @@ void OnTyping(CFTypeRef ctrl,string const& name,sio::message::ptr const& data,bo
     }
 }
 
-void OnStopTyping(CFTypeRef ctrl,string const& name,sio::message::ptr const& data,bool needACK,sio::message::ptr ackResp)
+void OnStopTyping(CFTypeRef ctrl,string const& name,sio::message::ptr const& data,bool needACK,sio::message::list ackResp)
 {
     if(data->get_flag() == message::flag_object)
     {
@@ -104,7 +104,7 @@ void OnStopTyping(CFTypeRef ctrl,string const& name,sio::message::ptr const& dat
     }
 }
 
-void OnUserJoined(CFTypeRef ctrl, string const& name, sio::message::ptr const& data, bool needACK, sio::message::ptr ackResp)
+void OnUserJoined(CFTypeRef ctrl, string const& name, sio::message::ptr const& data, bool needACK, sio::message::list ackResp)
 {
     if(data->get_flag() == message::flag_object)
     {
@@ -116,7 +116,7 @@ void OnUserJoined(CFTypeRef ctrl, string const& name, sio::message::ptr const& d
     }
 }
 
-void OnUserLeft(CFTypeRef ctrl, string const& name, sio::message::ptr const& data, bool needACK, sio::message::ptr ackResp)
+void OnUserLeft(CFTypeRef ctrl, string const& name, sio::message::ptr const& data, bool needACK, sio::message::list ackResp)
 {
     if(data->get_flag() == message::flag_object)
     {
@@ -129,7 +129,7 @@ void OnUserLeft(CFTypeRef ctrl, string const& name, sio::message::ptr const& dat
 }
 
 
-void OnLogin(CFTypeRef ctrl, string const& name, sio::message::ptr const& data, bool needACK, sio::message::ptr ackResp)
+void OnLogin(CFTypeRef ctrl, string const& name, sio::message::ptr const& data, bool needACK, sio::message::list ackResp)
 {
     if(data->get_flag() == message::flag_object)
     {
diff --git a/src/sio_message.h b/src/sio_message.h
@@ -291,6 +291,12 @@ namespace sio
             m_vector(std::move(rhs.m_vector))
         {
 
+        }
+
+        list & operator= (const message::list && rhs)
+        {
+            m_vector = std::move(rhs.m_vector);
+            return *this;
         }
 
 		template <typename T>
@@ -369,6 +375,13 @@ namespace sio
             return arr;
         }
 
+        message::ptr to_array_message() const
+        {
+            message::ptr arr = array_message::create();
+            arr->get_vector().insert(arr->get_vector().end(),m_vector.begin(),m_vector.end());
+            return arr;
+        }
+
     private:
         vector<message::ptr> m_vector;
     };
diff --git a/src/sio_socket.cpp b/src/sio_socket.cpp
@@ -67,10 +67,10 @@ namespace sio
         return m_need_ack;
     }
     
-    void event::put_ack_message(message::ptr const& ack_message)
+    void event::put_ack_message(message::list const& ack_message)
     {
         if(m_need_ack)
-            m_ack_message = ack_message;
+            m_ack_message = std::move(ack_message);
     }
     
     inline
@@ -91,13 +91,13 @@ namespace sio
     {
     }
     
-    message::ptr const& event::get_ack_message() const
+    message::list const& event::get_ack_message() const
     {
         return m_ack_message;
     }
     
     inline
-    message::ptr& event::get_ack_message_impl()
+    message::list& event::get_ack_message_impl()
     {
         return m_ack_message;
     }
@@ -155,7 +155,7 @@ namespace sio
         
         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::list const& ack_message);
         
         void timeout_connection(const boost::system::error_code &ec);
         
@@ -449,10 +449,9 @@ namespace sio
         }
     }
     
-    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::list &ack_message)
     {
-        message::list li(ack_message);
-        packet p(m_nsp, li.to_array_message(name),msgId,true);
+        packet p(m_nsp, ack_message.to_array_message(),msgId,true);
         send_packet(p);
     }
     
diff --git a/src/sio_socket.h b/src/sio_socket.h
@@ -19,22 +19,22 @@ namespace sio
         
         bool need_ack() const;
         
-        void put_ack_message(message::ptr const& ack_message);
+        void put_ack_message(message::list const& ack_message);
         
-        message::ptr const& get_ack_message() const;
+        message::list const& get_ack_message() const;
         
     protected:
         event(std::string const& nsp,std::string const& name,message::list const& messages,bool need_ack);
         event(std::string const& nsp,std::string const& name,message::list&& messages,bool need_ack);
 
-        message::ptr& get_ack_message_impl();
+        message::list& get_ack_message_impl();
         
     private:
         const std::string m_nsp;
         const std::string m_name;
         const message::list m_messages;
         const bool m_need_ack;
-        message::ptr m_ack_message;
+        message::list m_ack_message;
         
         friend class event_adapter;
     };
@@ -46,7 +46,7 @@ namespace sio
     class socket
     {
     public:
-        typedef std::function<void(const std::string& name,message::ptr const& message,bool need_ack, message::ptr& ack_message)> event_listener_aux;
+        typedef std::function<void(const std::string& name,message::ptr const& message,bool need_ack, message::list& ack_message)> event_listener_aux;
         
         typedef std::function<void(event& event)> event_listener;
         

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ void MainWindow::RemoveListItem(QListWidgetItem* item)`
`137`	`137`	`}`
`138`	`138`
`139`	`139`
`140`		`-void MainWindow::OnNewMessage(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp)`
	`140`	`+void MainWindow::OnNewMessage(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp)`
`141`	`141`	`{`
`142`	`142`
`143`	`143`	`if(data->get_flag() == message::flag_object)`
`@@ -152,7 +152,7 @@ void MainWindow::OnNewMessage(std::string const& name,message::ptr const& data,b`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`
`155`		`-void MainWindow::OnUserJoined(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp)`
	`155`	`+void MainWindow::OnUserJoined(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp)`
`156`	`156`	`{`
`157`	`157`	`if(data->get_flag() == message::flag_object)`
`158`	`158`	`{`
`@@ -181,7 +181,7 @@ void MainWindow::OnUserJoined(std::string const& name,message::ptr const& data,b`
`181`	`181`
`182`	`182`	`}`
`183`	`183`
`184`		`-void MainWindow::OnUserLeft(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp)`
	`184`	`+void MainWindow::OnUserLeft(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp)`
`185`	`185`	`{`
`186`	`186`	`if(data->get_flag() == message::flag_object)`
`187`	`187`	`{`
`@@ -209,7 +209,7 @@ void MainWindow::OnUserLeft(std::string const& name,message::ptr const& data,boo`
`209`	`209`	`}`
`210`	`210`	`}`
`211`	`211`
`212`		`-void MainWindow::OnTyping(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp)`
	`212`	`+void MainWindow::OnTyping(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp)`
`213`	`213`	`{`
`214`	`214`	`if(m_typingItem == NULL)`
`215`	`215`	`{`
`@@ -223,7 +223,7 @@ void MainWindow::OnTyping(std::string const& name,message::ptr const& data,bool`
`223`	`223`	`}`
`224`	`224`	`}`
`225`	`225`
`226`		`-void MainWindow::OnStopTyping(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp)`
	`226`	`+void MainWindow::OnStopTyping(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp)`
`227`	`227`	`{`
`228`	`228`	`if(m_typingItem != NULL)`
`229`	`229`	`{`
`@@ -232,7 +232,7 @@ void MainWindow::OnStopTyping(std::string const& name,message::ptr const& data,b`
`232`	`232`	`}`
`233`	`233`	`}`
`234`	`234`
`235`		`-void MainWindow::OnLogin(std::string const& name,message::ptr const& data,bool hasAck,message::ptr &ack_resp)`
	`235`	`+void MainWindow::OnLogin(std::string const& name,message::ptr const& data,bool hasAck,message::list &ack_resp)`
`236`	`236`	`{`
`237`	`237`	`Q_EMIT RequestToggleInputs(true);`
`238`	`238`	`int numUser = data->get_map()["numUsers"]->get_int();`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ -(void) updateUser:(NSString*)user count:(NSInteger) num joinOrLeft:(BOOL) isJoi`
`69`	`69`
`70`	`70`	`using namespace sio;`
`71`	`71`
`72`		`-void OnNewMessage(CFTypeRef ctrl,string const& name,sio::message::ptr const& data,bool needACK,sio::message::ptr ackResp)`
	`72`	`+void OnNewMessage(CFTypeRef ctrl,string const& name,sio::message::ptr const& data,bool needACK,sio::message::list ackResp)`
`73`	`73`	`{`
`74`	`74`	`if(data->get_flag() == message::flag_object)`
`75`	`75`	`{`
`@@ -82,7 +82,7 @@ void OnNewMessage(CFTypeRef ctrl,string const& name,sio::message::ptr const& dat`
`82`	`82`
`83`	`83`	`}`
`84`	`84`
`85`		`-void OnTyping(CFTypeRef ctrl,string const& name,sio::message::ptr const& data,bool needACK,sio::message::ptr ackResp)`
	`85`	`+void OnTyping(CFTypeRef ctrl,string const& name,sio::message::ptr const& data,bool needACK,sio::message::list ackResp)`
`86`	`86`	`{`
`87`	`87`	`if(data->get_flag() == message::flag_object)`
`88`	`88`	`{`
`@@ -93,7 +93,7 @@ void OnTyping(CFTypeRef ctrl,string const& name,sio::message::ptr const& data,bo`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
`96`		`-void OnStopTyping(CFTypeRef ctrl,string const& name,sio::message::ptr const& data,bool needACK,sio::message::ptr ackResp)`
	`96`	`+void OnStopTyping(CFTypeRef ctrl,string const& name,sio::message::ptr const& data,bool needACK,sio::message::list ackResp)`
`97`	`97`	`{`
`98`	`98`	`if(data->get_flag() == message::flag_object)`
`99`	`99`	`{`
`@@ -104,7 +104,7 @@ void OnStopTyping(CFTypeRef ctrl,string const& name,sio::message::ptr const& dat`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`
`107`		`-void OnUserJoined(CFTypeRef ctrl, string const& name, sio::message::ptr const& data, bool needACK, sio::message::ptr ackResp)`
	`107`	`+void OnUserJoined(CFTypeRef ctrl, string const& name, sio::message::ptr const& data, bool needACK, sio::message::list ackResp)`
`108`	`108`	`{`
`109`	`109`	`if(data->get_flag() == message::flag_object)`
`110`	`110`	`{`
`@@ -116,7 +116,7 @@ void OnUserJoined(CFTypeRef ctrl, string const& name, sio::message::ptr const& d`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`
`119`		`-void OnUserLeft(CFTypeRef ctrl, string const& name, sio::message::ptr const& data, bool needACK, sio::message::ptr ackResp)`
	`119`	`+void OnUserLeft(CFTypeRef ctrl, string const& name, sio::message::ptr const& data, bool needACK, sio::message::list ackResp)`
`120`	`120`	`{`
`121`	`121`	`if(data->get_flag() == message::flag_object)`
`122`	`122`	`{`
`@@ -129,7 +129,7 @@ void OnUserLeft(CFTypeRef ctrl, string const& name, sio::message::ptr const& dat`
`129`	`129`	`}`
`130`	`130`
`131`	`131`
`132`		`-void OnLogin(CFTypeRef ctrl, string const& name, sio::message::ptr const& data, bool needACK, sio::message::ptr ackResp)`
	`132`	`+void OnLogin(CFTypeRef ctrl, string const& name, sio::message::ptr const& data, bool needACK, sio::message::list ackResp)`
`133`	`133`	`{`
`134`	`134`	`if(data->get_flag() == message::flag_object)`
`135`	`135`	`{`
Original file line number	Diff line number	Diff line change
`@@ -67,10 +67,10 @@ namespace sio`
`67`	`67`	`return m_need_ack;`
`68`	`68`	`}`
`69`	`69`
`70`		`- void event::put_ack_message(message::ptr const& ack_message)`
	`70`	`+ void event::put_ack_message(message::list const& ack_message)`
`71`	`71`	`{`
`72`	`72`	`if(m_need_ack)`
`73`		`- m_ack_message = ack_message;`
	`73`	`+ m_ack_message = std::move(ack_message);`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`inline`
`@@ -91,13 +91,13 @@ namespace sio`
`91`	`91`	`{`
`92`	`92`	`}`
`93`	`93`
`94`		`- message::ptr const& event::get_ack_message() const`
	`94`	`+ message::list const& event::get_ack_message() const`
`95`	`95`	`{`
`96`	`96`	`return m_ack_message;`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`inline`
`100`		`- message::ptr& event::get_ack_message_impl()`
	`100`	`+ message::list& event::get_ack_message_impl()`
`101`	`101`	`{`
`102`	`102`	`return m_ack_message;`
`103`	`103`	`}`
`@@ -155,7 +155,7 @@ namespace sio`
`155`	`155`
`156`	`156`	`event_listener get_bind_listener_locked(string const& event);`
`157`	`157`
`158`		`- void ack(int msgId,string const& name,message::ptr const& ack_message);`
	`158`	`+ void ack(int msgId,string const& name,message::list const& ack_message);`
`159`	`159`
`160`	`160`	`void timeout_connection(const boost::system::error_code &ec);`
`161`	`161`
`@@ -449,10 +449,9 @@ namespace sio`
`449`	`449`	`}`
`450`	`450`	`}`
`451`	`451`
`452`		`- void socket::impl::ack(int msgId, const string &name, const message::ptr &ack_message)`
	`452`	`+ void socket::impl::ack(int msgId, const string &name, const message::list &ack_message)`
`453`	`453`	`{`
`454`		`- message::list li(ack_message);`
`455`		`- packet p(m_nsp, li.to_array_message(name),msgId,true);`
	`454`	`+ packet p(m_nsp, ack_message.to_array_message(),msgId,true);`
`456`	`455`	`send_packet(p);`
`457`	`456`	`}`
`458`	`457`