WebSVN – HomeAutomation – Diff – /trunk/PcSoftware/Atom1.5/src/vm/plugin/Socket.cpp

   LOG_DEBUG_ENTER;
   Plugin::InitializeDone();
   this->ImportFunction("Socket_OnNewData");
+  this->ImportFunction("Socket_OnNewClient");
   this->ImportFunction("Socket_OnNewState");
-  net::Manager::Instance()->ConnectSlots(net::Manager::SignalOnNewState::slot_type(&Socket::SlotOnNewState, this, _1, _2, _3).track(this->tracker_), net::Manager::SignalOnNewData::slot_type(&Socket::SlotOnNewData, this, _1, _2, _3).track(this->tracker_));
+  net::Manager::Instance()->ConnectSlots(net::Manager::SignalOnNewState::slot_type(&Socket::SlotOnNewState, this, _1, _2).track(this->tracker_), net::Manager::SignalOnNewClient::slot_type(&Socket::SlotOnNewClient, this, _1, _2).track(this->tracker_), net::Manager::SignalOnNewData::slot_type(&Socket::SlotOnNewData, this, _1, _2).track(this->tracker_));
   LOG_DEBUG_EXIT;
+}
 void Socket::CallOutput(unsigned int request_id, std::string output)
   log::Info(log_module_, output);
   //LOG_DEBUG_EXIT;
+}
-void Socket::SlotOnNewData(net::SocketId socket_id, net::SocketId server_id, common::Byteset data)
+void Socket::SlotOnNewData(net::SocketId id, common::Byteset data)
+{
   LOG_DEBUG_ENTER;
-  this->io_service_.post(boost::bind(&Socket::SlotOnNewDataHandler, this, socket_id, server_id, data));
+  this->io_service_.post(boost::bind(&Socket::SlotOnNewDataHandler, this, id, data));
   LOG_DEBUG_EXIT;
+}
-void Socket::SlotOnNewState(net::SocketId socket_id, net::SocketId server_id, net::ClientState client_state)
+void Socket::SlotOnNewClient(net::SocketId id, net::SocketId server_id)
+{
   LOG_DEBUG_ENTER;
-  this->io_service_.post(boost::bind(&Socket::SlotOnNewStateHandler, this, socket_id, server_id, client_state));
+  this->io_service_.post(boost::bind(&Socket::SlotOnNewClientHandler, this, id, server_id));
   LOG_DEBUG_EXIT;
+}
-void Socket::SlotOnNewDataHandler(net::SocketId socket_id, net::SocketId server_id, common::Byteset data)
+void Socket::SlotOnNewState(net::SocketId id, net::ClientState client_state)
+{
   LOG_DEBUG_ENTER;
+  this->io_service_.post(boost::bind(&Socket::SlotOnNewStateHandler, this, id, client_state));
+  LOG_DEBUG_EXIT;
+}
+void Socket::SlotOnNewDataHandler(net::SocketId id, common::Byteset data)
+{
+  LOG_DEBUG_ENTER;
   ATOM_VM_PLUGIN_SCOPE;
   try
   {
     ArgumentListPointer arguments = ArgumentListPointer(new ArgumentList);
     if (data.GetSize() == 0)
     {
         atom::log::Error(log_module_, "Got empty data!");
         return;
+    }
-    arguments->push_back(v8::Integer::New(boost::lexical_cast<unsigned int>(socket_id)));
+    arguments->push_back(v8::Integer::New(boost::lexical_cast<unsigned int>(id)));
+    arguments->push_back(v8::String::New(data.ToCharString().c_str()));
+    if (!this->Call(id, "Socket_OnNewData", arguments))
+    {
+      atom::log::Error(log_module_, "%s failed!", __FUNCTION__);
+    }
+  }
+  catch (std::exception& exception)
+  {
+    atom::log::Exception(log_module_, exception);
+  }
+  LOG_DEBUG_EXIT;
+}
+void Socket::SlotOnNewClientHandler(net::SocketId id, net::SocketId server_id)
+{
+  LOG_DEBUG_ENTER;
+  ATOM_VM_PLUGIN_SCOPE;
+  try
+  {
+    ArgumentListPointer arguments = ArgumentListPointer(new ArgumentList);
-    arguments->push_back(v8::Integer::New(boost::lexical_cast<unsigned int>(server_id)));
+    arguments->push_back(v8::Integer::New(boost::lexical_cast<unsigned int>(id)));
-    arguments->push_back(v8::String::New(data.ToCharString().c_str()));
+    arguments->push_back(v8::Integer::New(boost::lexical_cast<unsigned int>(server_id)));
-    if (!this->Call(socket_id, "Socket_OnNewData", arguments))
+    if (!this->Call(id, "Socket_OnNewClient", arguments))
     {
       atom::log::Error(log_module_, "%s failed!", __FUNCTION__);
     }
   }
   catch (std::exception& exception)
   {
     atom::log::Exception(log_module_, exception);
   }
   LOG_DEBUG_EXIT;
+}
-void Socket::SlotOnNewStateHandler(net::SocketId socket_id, net::SocketId server_id, net::ClientState client_state)
+void Socket::SlotOnNewStateHandler(net::SocketId id, net::ClientState client_state)
+{
   LOG_DEBUG_ENTER;
   ATOM_VM_PLUGIN_SCOPE;
   try
+  {
     ArgumentListPointer arguments = ArgumentListPointer(new ArgumentList);
-    arguments->push_back(v8::Integer::New(boost::lexical_cast<unsigned int>(socket_id)));
-    arguments->push_back(v8::Integer::New(boost::lexical_cast<unsigned int>(server_id)));
+    arguments->push_back(v8::Integer::New(boost::lexical_cast<unsigned int>(id)));
     arguments->push_back(v8::Uint32::New((unsigned int)client_state));
-    if (!this->Call(socket_id, "Socket_OnNewState", arguments))
+    if (!this->Call(id, "Socket_OnNewState", arguments))
+    {
       atom::log::Error(log_module_, "%s failed!", __FUNCTION__);
+    }
+  }
   catch (std::exception& exception)
-  {
-    atom::log::Exception(log_module_, exception);
-  }
-  LOG_DEBUG_EXIT;
-}
-Value Socket::Export_StartServer(const v8::Arguments& args)
-{
-  LOG_DEBUG_ENTER
-  ATOM_VM_PLUGIN_SCOPE;
-  net::SocketId socket_id = 0;
-  try
-  {
-    ArgumentListPointer arguments = ArgumentListPointer(new ArgumentList);
-    if (args.Length() < 1)
+  {
+    atom::log::Exception(log_module_, exception);
+  }
+  LOG_DEBUG_EXIT;
+}
+Value Socket::Export_StartServer(const v8::Arguments& args)
+{
+  LOG_DEBUG_ENTER
+  ATOM_VM_PLUGIN_SCOPE;
+  net::SocketId socket_id = 0;
+  try
+  {
+    ArgumentListPointer arguments = ArgumentListPointer(new ArgumentList);
+    if (args.Length() < 1)
+    {
       throw atom::exception::missing_in_param();
+    }
     socket_id = net::Manager::Instance()->StartServer(net::PROTOCOL_TCP, args[0]->Uint32Value());
+  }
   catch (std::exception& exception)
   LOG_DEBUG_ENTER;
   ATOM_VM_PLUGIN_SCOPE;
   net::SocketId socket_id = 0;
   try
   {
     ArgumentListPointer arguments = ArgumentListPointer(new ArgumentList);
     if (args.Length() < 2)
+    {
       throw atom::exception::missing_in_param();
     }
     v8::String::AsciiValue address(args[0]);
     socket_id = net::Manager::Instance()->Connect(net::PROTOCOL_TCP, std::string(*address), args[1]->Uint32Value());
+  }
   catch (std::exception& exception)
+  {
     atom::log::Exception(log_module_, exception);
     return handle_scope.Close(v8::Boolean::New(false));
   }
   LOG_DEBUG_EXIT;
   return handle_scope.Close(v8::Integer::New(socket_id));
+}
 Value Socket::Export_StopServer(const v8::Arguments& args)
 {
   LOG_DEBUG_EXIT;
   ATOM_VM_PLUGIN_SCOPE;
   try
   {
     ArgumentListPointer arguments = ArgumentListPointer(new ArgumentList);
     if (args.Length() < 1)
     {
       throw atom::exception::missing_in_param();
     }
     net::Manager::Instance()->StopServer(args[0]->Uint32Value());
   }
   catch (std::exception& exception)
   {
     atom::log::Exception(log_module_, exception);
     return handle_scope.Close(v8::Boolean::New(false));
   }
   LOG_DEBUG_EXIT;
   return handle_scope.Close(v8::Boolean::New(true));
+}
 Value Socket::Export_Disconnect(const v8::Arguments& args)
+{
   LOG_DEBUG_EXIT;
+    {
       throw atom::exception::missing_in_param();
+    }
     v8::String::AsciiValue data(args[1]);
+    atom::log::Debug(log_module_, "Socket %u send %s", args[0]->Uint32Value(), *data);
     net::Manager::Instance()->SendTo(args[0]->Uint32Value(), std::string(*data));
+  }
   catch (std::exception& exception)
+  {

Subversion Repositories HomeAutomation

(root)/trunk/PcSoftware/Atom1.5/src/vm/plugin/Socket.cpp – Rev 1962 → 1986