change some socket behavior, make more reasonable

Author: melode11

examples/iOS/SioChatDemo/SioChatDemo/CRViewController.mm

@@ -181,7 +181,8 @@ - (void)viewDidLoad
 
 -(void)viewWillAppear:(BOOL)animated
 {
-    
+    _io->set_close_listener(std::bind(&OnClose, (__bridge CFTypeRef)self, std::placeholders::_1));
+    _io->set_fail_listener(std::bind(&OnFailed, (__bridge CFTypeRef)self));
 }
 
 -(void)keyboardWillShow:(NSNotification*)notification
@@ -401,7 +402,6 @@ -(BOOL)textFieldShouldReturn:(UITextField *)textField
             using std::placeholders::_4;
             socket::ptr socket = _io->socket();
             socket->set_connect_listener(std::bind(&OnConnected, (__bridge CFTypeRef)self));
-            socket->set_close_listener(std::bind(&OnFailed, (__bridge CFTypeRef)self));
 
             socket->on("new message", std::bind(&OnNewMessage, (__bridge CFTypeRef)self, _1,_2,_3,_4));
             socket->on("typing", std::bind(&OnTyping, (__bridge CFTypeRef)self, _1,_2,_3,_4));

src/internal/sio_client_impl.cpp

@@ -50,6 +50,7 @@ namespace sio {
 
     client_impl::~client_impl()
     {
+        this->sockets_invoke_void(&sio::socket::on_close);
         sync_close();
     }
 
@@ -58,12 +59,11 @@ namespace sio {
     {
         m_con.reset();
         m_con_state = con_closed;
-        this->sockets_invoke_void(&sio::socket::on_close);
+        this->sockets_invoke_void(&sio::socket::on_disconnect);
         LOG("Connection failed." << std::endl);
         if(m_fail_listener)m_fail_listener();
     }
 
-    
     void client_impl::on_pong()
     {
         if(m_ping_timeout_timer)
@@ -147,12 +147,12 @@ namespace sio {
         client::close_reason reason;
         if(code == close::status::normal)
         {
-            this->sockets_invoke_void(&sio::socket::on_close);
+            this->sockets_invoke_void(&sio::socket::on_disconnect);
             reason = client::close_reason_normal;
         }
         else
         {
-            this->sockets_invoke_void(&sio::socket::on_close);
+            this->sockets_invoke_void(&sio::socket::on_disconnect);
             reason = client::close_reason_drop;
         }
 

src/sio_socket.cpp

@@ -124,6 +124,7 @@ void set_##__FIELD__(__TYPE__ const& l) \
         SYNTHESIS_SETTER(error_listener, error_listener) //socket io errors
 
         SYNTHESIS_SETTER(con_listener, close_listener) //socket io errors
+        
 #undef SYNTHESIS_SETTER
 
         void clear_listeners()
@@ -158,6 +159,8 @@ void set_##__FIELD__(__TYPE__ const& l) \
 
         void on_message_packet(packet const& packet);
 
+        void on_disconnect();
+        
     private:
 
         // Message Parsing callbacks.
@@ -282,6 +285,14 @@ void set_##__FIELD__(__TYPE__ const& l) \
         {
             packet p(packet::type_disconnect,m_nsp);
             __send_packet(p);
+            
+            if(!m_connection_timer)
+            {
+                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(3000), ec);
+            m_connection_timer->async_wait(lib::bind(&socket::impl::on_close, this));
         }
     }
 
@@ -331,6 +342,18 @@ void set_##__FIELD__(__TYPE__ const& l) \
         __send_connect();
     }
 
+    void socket::impl::on_disconnect()
+    {
+        NULL_GUARD(m_client);
+        if(m_connected)
+        {
+            m_connected = false;
+            while (!m_packet_queue.empty()) {
+                m_packet_queue.pop();
+            }
+        }
+    }
+    
     void socket::impl::on_message_packet(packet const& p)
     {
         NULL_GUARD(m_client);
@@ -455,7 +478,7 @@ void set_##__FIELD__(__TYPE__ const& l) \
         }
         m_connection_timer.reset();
         LOG("Connection timeout"<<std::endl);
-        this->on_close();
+        this->on_disconnect();
     }
 
     void socket::impl::__send_packet(sio::packet &p)
@@ -583,6 +606,11 @@ void set_##__FIELD__(__TYPE__ const& l) \
     {
         m_impl->on_message_packet(p);
     }
+    
+    void socket::on_disconnect()
+    {
+        m_impl->on_disconnect();
+    }
 }
 
 

src/sio_socket.h

@@ -65,6 +65,7 @@ namespace sio
         void close();
 
         void set_connect_listener(con_listener const& l);
+        
         void set_close_listener(con_listener const& l);
 
         void set_error_listener(error_listener const& l);
@@ -94,6 +95,8 @@ namespace sio
 
         void on_open();
 
+        void on_disconnect();
+        
         void on_message_packet(packet const& p);
 
         friend class client_impl;