From 951d2fd1f8d163c30f0148a12a794c6f140472bf Mon Sep 17 00:00:00 2001 From: MihailRis Date: Wed, 27 Nov 2024 17:46:09 +0300 Subject: [PATCH] add socket:is_alive, :is_connected, serversocket:is_open --- res/scripts/classes.lua | 7 +++-- src/logic/scripting/lua/libs/libnetwork.cpp | 31 +++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/res/scripts/classes.lua b/res/scripts/classes.lua index 430f27f1..255594c4 100644 --- a/res/scripts/classes.lua +++ b/res/scripts/classes.lua @@ -37,9 +37,11 @@ end local Socket = {__index={ - send=function(self, bytes) return network.__send(self.id, bytes) end, - recv=function(self, len, usetable) return network.__recv(self.id, len, usetable) end, + send=function(self, ...) return network.__send(self.id, ...) end, + recv=function(self, ...) return network.__recv(self.id, ...) end, close=function(self) return network.__close(self.id) end, + is_alive=function(self) return network.__is_alive(self.id) end, + is_connected=function(self) return network.__is_connected(self.id) end, }} network.tcp_connect = function(address, port, callback) @@ -52,6 +54,7 @@ end local ServerSocket = {__index={ close=function(self) return network.__closeserver(self.id) end, + is_open=function(self) return network.__is_serveropen(self.id) end, }} network.tcp_open = function(port, handler) diff --git a/src/logic/scripting/lua/libs/libnetwork.cpp b/src/logic/scripting/lua/libs/libnetwork.cpp index 6a6c5e69..a2b49cc1 100644 --- a/src/logic/scripting/lua/libs/libnetwork.cpp +++ b/src/logic/scripting/lua/libs/libnetwork.cpp @@ -131,6 +131,34 @@ static int l_open(lua::State* L) { return lua::pushinteger(L, id); } +static int l_is_alive(lua::State* L) { + u64id_t id = lua::tointeger(L, 1); + if (auto connection = engine->getNetwork().getConnection(id)) { + return lua::pushboolean( + L, connection->getState() != network::ConnectionState::CLOSED + ); + } + return lua::pushboolean(L, false); +} + +static int l_is_connected(lua::State* L) { + u64id_t id = lua::tointeger(L, 1); + if (auto connection = engine->getNetwork().getConnection(id)) { + return lua::pushboolean( + L, connection->getState() == network::ConnectionState::CONNECTED + ); + } + return lua::pushboolean(L, false); +} + +static int l_is_serveropen(lua::State* L) { + u64id_t id = lua::tointeger(L, 1); + if (auto server = engine->getNetwork().getServer(id)) { + return lua::pushboolean(L, server->isOpen()); + } + return lua::pushboolean(L, false); +} + const luaL_Reg networklib[] = { {"get", lua::wrap}, {"get_binary", lua::wrap}, @@ -140,5 +168,8 @@ const luaL_Reg networklib[] = { {"__close", lua::wrap}, {"__send", lua::wrap}, {"__recv", lua::wrap}, + {"__is_alive", lua::wrap}, + {"__is_connected", lua::wrap}, + {"__is_serveropen", lua::wrap}, {NULL, NULL} };