print error message

Author: tangzx

emmy_core/emmy_facade.cpp

@@ -37,13 +37,36 @@ EmmyFacade::~EmmyFacade() {
 	delete transporter;
 }
 
+int LuaError(lua_State* L) {
+	std::string msg = lua_tostring(L, 1);
+	msg = "[Emmy]" + msg;
+	lua_getglobal(L, "error");
+	lua_pushstring(L, msg.c_str());
+	lua_call(L, 1, 0);
+	return 0;
+}
+
+int LuaPrint(lua_State* L) {
+	std::string msg = lua_tostring(L, 1);
+	msg = "[Emmy]" + msg;
+	lua_getglobal(L, "print");
+	lua_pushstring(L, msg.c_str());
+	lua_call(L, 1, 0);
+	return 0;
+}
+
 bool EmmyFacade::TcpListen(lua_State* L, const std::string& host, int port, std::string& err) {
 	Destroy();
 	this->L = L;
 	const auto s = new SocketServerTransporter();
 	transporter = s;
 	s->SetHandler(this);
 	const auto suc = s->Listen(host, port, err);
+	if (!suc) {
+		lua_pushcfunction(L, LuaError);
+		lua_pushstring(L, err.c_str());
+		lua_call(L, 1, 0);
+	}
 	return suc;
 }
 
@@ -56,6 +79,10 @@ bool EmmyFacade::TcpConnect(lua_State* L, const std::string& host, int port, std
 	const auto suc = c->Connect(host, port, err);
 	if (suc) {
 		WaitIDE(true);
+	} else {
+		lua_pushcfunction(L, LuaError);
+		lua_pushstring(L, err.c_str());
+		lua_call(L, 1, 0);
 	}
 	return suc;
 }

emmy_core/proto/socket_client_transporter.cpp

@@ -38,7 +38,8 @@ static void after_read(uv_stream_t* handle,
 SocketClientTransporter::SocketClientTransporter():
 	Transporter(false),
 	uvClient({}),
-	connect_req({}) {
+	connect_req({}),
+	connectionStatus(0) {
 }
 
 SocketClientTransporter::~SocketClientTransporter() {
@@ -68,10 +69,14 @@ bool SocketClientTransporter::Connect(const std::string& host, int port, std::st
 	StartEventLoop();
 	std::unique_lock<std::mutex> lock(mutex);
 	cv.wait(lock);
+	if (this->connectionStatus < 0) {
+		err = uv_strerror(this->connectionStatus);
+	}
 	return IsConnected();
 }
 
 void SocketClientTransporter::OnConnection(uv_connect_t* req, int status) {
+	this->connectionStatus = status;
 	if (status >= 0) {
 		OnConnect(true);
 		uv_read_start((uv_stream_t*)&uvClient, echo_alloc, after_read);

emmy_core/proto/socket_client_transporter.h

@@ -24,6 +24,7 @@ class SocketClientTransporter : public Transporter {
 	uv_connect_t connect_req;
 	std::mutex mutex;
 	std::condition_variable cv;
+	int connectionStatus;
 public:
 	SocketClientTransporter();
 	~SocketClientTransporter();