interface change, move 'socket#connect(open)/close listener' to client

Author: melode11

examples/Console/main.cpp

@@ -68,12 +68,48 @@ class connection_listener
 
 int participants = -1;
 
+socket::ptr current_socket;
+
+void bind_events(socket::ptr &socket)
+{
+    current_socket->on("new message", [&](string const& name, message::ptr const& data, bool isAck,message::ptr &ack_resp)
+                       {
+                           _lock.lock();
+                           string user = data->get_map()["username"]->get_string();
+                           string message = data->get_map()["message"]->get_string();
+                           EM(user<<":"<<message);
+                           _lock.unlock();
+                       });
+    
+    current_socket->on("user joined", [&](string const& name, message::ptr const& data, bool isAck,message::ptr &ack_resp)
+                       {
+                           _lock.lock();
+                           string user = data->get_map()["username"]->get_string();
+                           participants  = data->get_map()["numUsers"]->get_int();
+                           bool plural = participants !=1;
+                           
+                           //     abc "
+                           HIGHLIGHT(user<<" joined"<<"\nthere"<<(plural?" are ":"'s ")<< participants<<(plural?" participants":" participant"));
+                           _lock.unlock();
+                       });
+    current_socket->on("user left", [&](string const& name, message::ptr const& data, bool isAck,message::ptr &ack_resp)
+                       {
+                           _lock.lock();
+                           string user = data->get_map()["username"]->get_string();
+                           participants  = data->get_map()["numUsers"]->get_int();
+                           bool plural = participants !=1;
+                           HIGHLIGHT(user<<" left"<<"\nthere"<<(plural?" are ":"'s ")<< participants<<(plural?" participants":" participant"));
+                           _lock.unlock();
+                       });
+}
+
 MAIN_FUNC
 {
 
     sio::client h;
     connection_listener l(h);
-    h.set_connect_listener(std::bind(&connection_listener::on_connected, &l));
+    current_socket = h.socket();
+    h.set_open_listener(std::bind(&connection_listener::on_connected, &l));
     h.set_close_listener(std::bind(&connection_listener::on_close, &l,std::placeholders::_1));
     h.set_fail_listener(std::bind(&connection_listener::on_fail, &l));
     h.connect("http://127.0.0.1:3000");
@@ -83,66 +119,62 @@ MAIN_FUNC
         _cond.wait(_lock);
     }
     _lock.unlock();
+Login:
     string nickname;
     while (nickname.length() == 0) {
         HIGHLIGHT("Type your nickname:");
 
         getline(cin, nickname);
     }
-    h.bind_event("login", [&](string const& name, message::ptr const& data, bool isAck,message::ptr &ack_resp){
+    current_socket->on("login", [&](string const& name, message::ptr const& data, bool isAck,message::ptr &ack_resp){
         _lock.lock();
         participants = data->get_map()["numUsers"]->get_int();
         bool plural = participants !=1;
         HIGHLIGHT("Welcome to Socket.IO Chat-\nthere"<<(plural?" are ":"'s ")<< participants<<(plural?" participants":" participant"));
         _cond.notify_all();
         _lock.unlock();
-        h.unbind_event("login");
+        current_socket->off("login");
     });
-    h.emit("add user", nickname);
+    current_socket->emit("add user", nickname);
     _lock.lock();
     if (participants<0) {
         _cond.wait(_lock);
     }
     _lock.unlock();
- 
-    h.bind_event("new message", [&](string const& name, message::ptr const& data, bool isAck,message::ptr &ack_resp)
-                 {
-                     _lock.lock();
-                     string user = data->get_map()["username"]->get_string();
-                     string message = data->get_map()["message"]->get_string();
-                     EM(user<<":"<<message);
-                     _lock.unlock();
-                 });
+    bind_events(current_socket);
 
-    h.bind_event("user joined", [&](string const& name, message::ptr const& data, bool isAck,message::ptr &ack_resp)
-                 {
-                     _lock.lock();
-                     string user = data->get_map()["username"]->get_string();
-                     participants  = data->get_map()["numUsers"]->get_int();
-                     bool plural = participants !=1;
-                     
-                     //     abc "
-                     HIGHLIGHT(user<<" joined"<<"\nthere"<<(plural?" are ":"'s ")<< participants<<(plural?" participants":" participant"));
-                     _lock.unlock();
-                 });
-    h.bind_event("user left", [&](string const& name, message::ptr const& data, bool isAck,message::ptr &ack_resp)
-                 {
-                     _lock.lock();
-                     string user = data->get_map()["username"]->get_string();
-                     participants  = data->get_map()["numUsers"]->get_int();
-                     bool plural = participants !=1;
-                     HIGHLIGHT(user<<" left"<<"\nthere"<<(plural?" are ":"'s ")<< participants<<(plural?" participants":" participant"));
-                     _lock.unlock();
-                 });
-    HIGHLIGHT("Start to chat, type '$exit' to exit");
+    HIGHLIGHT("Start to chat,commands:\n'$exit' : exit chat\n'$nsp <namespace>' : change namespace");
     for (std::string line; std::getline(std::cin, line);) {
         if(line.length()>0)
         {
             if(line == "$exit")
             {
                 break;
             }
-            h.emit("new message", line);
+            else if(line.length() > 5&&line.substr(0,5) == "$nsp ")
+            {
+                string new_nsp = line.substr(5);
+                if(new_nsp == current_socket->get_namespace())
+                {
+                    continue;
+                }
+                current_socket->off_all();
+                current_socket->off_error();
+                //per socket.io, default nsp should never been closed.
+                if(current_socket->get_namespace() != "/")
+                {
+                    current_socket->close();
+                }
+                current_socket = h.socket(new_nsp);
+                //if change to default nsp, we do not need to bind events again.
+                if(current_socket->get_namespace() == "/")
+                {
+                    continue;
+                }
+                bind_events(current_socket);
+                goto Login;
+            }
+            current_socket->emit("new message", line);
             _lock.lock();
             EM("\t\t\t"<<line<<":"<<"You");
             _lock.unlock();

src/internal/sio_client_impl.cpp

@@ -303,6 +303,16 @@ namespace sio {
         return m_client.get_io_service();
     }
 
+    void client_impl::on_socket_closed(std::string const& nsp)
+    {
+        if(m_socket_close_listener)m_socket_close_listener(nsp);
+    }
+    
+    void client_impl::on_socket_opened(std::string const& nsp)
+    {
+        if(m_socket_open_listener)m_socket_open_listener(nsp);
+    }
+    
     void client_impl::__send(std::shared_ptr<const std::string> const& payload_ptr,frame::opcode::value opcode)
     {
         if(m_con_state == con_opened)
@@ -314,7 +324,12 @@ namespace sio {
                 m_ping_timer->expires_from_now(milliseconds(m_ping_interval),timeout_ec);
                 m_ping_timer->async_wait(lib::bind(&client_impl::__ping,this,lib::placeholders::_1));
             }
-            m_client.send(m_con,*payload_ptr,opcode);
+            lib::error_code ec;
+            m_client.send(m_con,*payload_ptr,opcode,ec);
+            if(ec)
+            {
+                std::cerr<<"Send failed,reason:"<< ec.message()<<std::endl;
+            }
         }
     }
 
@@ -420,11 +435,20 @@ namespace sio {
     socket::ptr const& client_impl::socket(std::string const& nsp)
     {
         std::lock_guard<std::mutex> guard(m_socket_mutex);
-        std::string aux = nsp;
-        if(aux == "")
+        std::string aux;
+        if(nsp == "")
         {
             aux = "/";
         }
+        else if( nsp[0] != '/')
+        {
+            aux.append("/",1);
+            aux.append(nsp);
+        }
+        else
+        {
+            aux = nsp;
+        }
 
         auto it = m_sockets.find(aux);
         if(it!= m_sockets.end())

src/internal/sio_client_impl.h

@@ -59,6 +59,10 @@ void set_##__FIELD__(__TYPE__ const& l) \
 
         SYNTHESIS_SETTER(client::close_listener,close_listener)
 
+        SYNTHESIS_SETTER(client::socket_listener,socket_open_listener)
+        
+        SYNTHESIS_SETTER(client::socket_listener,socket_close_listener)
+        
 #undef SYNTHESIS_SETTER
 
 
@@ -69,6 +73,12 @@ void set_##__FIELD__(__TYPE__ const& l) \
             m_fail_listener = nullptr;
         }
 
+        void clear_socket_listeners()
+        {
+            m_socket_open_listener = nullptr;
+            m_socket_close_listener = nullptr;
+        }
+        
         // Client Functions - such as send, etc.
         void connect(const std::string& uri);
 
@@ -93,6 +103,10 @@ void set_##__FIELD__(__TYPE__ const& l) \
 
         boost::asio::io_service& get_io_service();
 
+        void on_socket_closed(std::string const& nsp);
+        
+        void on_socket_opened(std::string const& nsp);
+        
     private:
         void __close(close::status::value const& code,std::string const& reason);
 
@@ -152,6 +166,9 @@ void set_##__FIELD__(__TYPE__ const& l) \
         client::con_listener m_fail_listener;
         client::close_listener m_close_listener;
 
+        client::socket_listener m_socket_open_listener;
+        client::socket_listener m_socket_close_listener;
+        
         std::map<const std::string,socket::ptr> m_sockets;
 
         std::mutex m_socket_mutex;

src/sio_client.cpp

@@ -39,11 +39,27 @@ namespace sio
         m_impl->set_close_listener(l);
     }
 
+    
+    void client::set_socket_open_listener(socket_listener const& l)
+    {
+        m_impl->set_socket_open_listener(l);
+    }
+    
+    void client::set_socket_close_listener(socket_listener const& l)
+    {
+        m_impl->set_socket_close_listener(l);
+    }
+    
     void client::clear_con_listeners()
     {
         m_impl->clear_con_listeners();
     }
 
+    void client::clear_socket_listeners()
+    {
+        m_impl->clear_socket_listeners();
+    }
+    
     void client::connect(const std::string& uri)
     {
         m_impl->connect(uri);

src/sio_client.h

@@ -27,6 +27,8 @@ namespace sio {
 
         typedef std::function<void(close_reason const& reason)> close_listener;
 
+        typedef std::function<void(std::string const& nsp)> socket_listener;
+        
         client();
         ~client();
 
@@ -37,8 +39,14 @@ namespace sio {
 
         void set_close_listener(close_listener const& l);
 
+        void set_socket_open_listener(socket_listener const& l);
+        
+        void set_socket_close_listener(socket_listener const& l);
+        
         void clear_con_listeners();
 
+        void clear_socket_listeners();
+        
         // Client Functions - such as send, etc.
         void connect(const std::string& uri);