Network

.github/workflows/appimage.yml

@@ -23,7 +23,8 @@ jobs:
       - name: install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y build-essential libglfw3-dev libglfw3 libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev cmake squashfs-tools
+          sudo apt-get install -y build-essential libglfw3-dev libglfw3 libglew-dev \
+            libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev libcurl4-openssl-dev cmake squashfs-tools
           # fix luajit paths
           sudo ln -s /usr/lib/x86_64-linux-gnu/libluajit-5.1.a /usr/lib/x86_64-linux-gnu/liblua5.1.a
           sudo ln -s /usr/include/luajit-2.1 /usr/include/lua

.github/workflows/cmake.yml

@@ -39,7 +39,7 @@ jobs:
     #   make && make install INSTALL_INC=/usr/include/lua
       run: |
           sudo apt-get update
-          sudo apt-get install libglfw3-dev libglfw3 libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev libgtest-dev
+          sudo apt-get install libglfw3-dev libglfw3 libglew-dev libglm-dev libpng-dev libopenal-dev libluajit-5.1-dev libvorbis-dev libgtest-dev libcurl4-openssl-dev
           # fix luajit paths
           sudo ln -s /usr/lib/x86_64-linux-gnu/libluajit-5.1.a /usr/lib/x86_64-linux-gnu/liblua-5.1.a
           sudo ln -s /usr/include/luajit-2.1 /usr/include/lua

res/scripts/classes.lua

@@ -34,3 +34,31 @@ cameras.get = function(name)
     wrappers[name] = wrapper
     return wrapper
 end
+
+
+local Socket = {__index={
+    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)
+    local socket = setmetatable({id=0}, Socket)
+    socket.id = network.__connect(address, port, function(id)
+        callback(socket)
+    end)
+    return socket
+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)
+    return setmetatable({id=network.__open(port, function(id)
+        handler(setmetatable({id=id}, Socket))
+    end)}, ServerSocket)
+end

src/CMakeLists.txt

@@ -15,6 +15,7 @@ find_package(GLEW REQUIRED)
 find_package(OpenAL REQUIRED)
 find_package(ZLIB REQUIRED)
 find_package(PNG REQUIRED)
+find_package(CURL REQUIRED)
 if (NOT APPLE)
     find_package(EnTT REQUIRED)
 endif()
@@ -61,5 +62,6 @@ if(UNIX)
 endif()
 
 include_directories(${LUA_INCLUDE_DIR})
+include_directories(${CURL_INCLUDE_DIR})
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries(${PROJECT_NAME} ${LIBS} glfw OpenGL::GL ${OPENAL_LIBRARY} GLEW::GLEW ZLIB::ZLIB PNG::PNG ${VORBISLIB} ${LUA_LIBRARIES} ${CMAKE_DL_LIBS})
+target_link_libraries(${PROJECT_NAME} ${LIBS} glfw OpenGL::GL ${OPENAL_LIBRARY} GLEW::GLEW ZLIB::ZLIB PNG::PNG CURL::libcurl ${VORBISLIB} ${LUA_LIBRARIES} ${CMAKE_DL_LIBS})

src/coders/json.cpp

@@ -73,7 +73,7 @@ void stringifyValue(
             break;
         }
         case value_type::string:
-            ss << util::escape(value.asString());
+            ss << util::escape(value.asString(), !nice);
             break;
         case value_type::number:
             ss << std::setprecision(15) << value.asNumber();
@@ -241,6 +241,8 @@ dv::value Parser::parseValue() {
             return INFINITY;
         } else if (literal == "nan") {
             return NAN;
+        } else if (literal == "null") {
+            return nullptr;
         }
         throw error("invalid keyword " + literal);
     }

src/engine.cpp

@@ -30,6 +30,7 @@
 #include "logic/EngineController.hpp"
 #include "logic/CommandsInterpreter.hpp"
 #include "logic/scripting/scripting.hpp"
+#include "network/Network.hpp"
 #include "util/listutil.hpp"
 #include "util/platform.hpp"
 #include "window/Camera.hpp"
@@ -72,7 +73,8 @@ static std::unique_ptr<ImageData> load_icon(const fs::path& resdir) {
 
 Engine::Engine(EngineSettings& settings, SettingsHandler& settingsHandler, EnginePaths* paths) 
     : settings(settings), settingsHandler(settingsHandler), paths(paths),
-      interpreter(std::make_unique<cmd::CommandsInterpreter>())
+      interpreter(std::make_unique<cmd::CommandsInterpreter>()),
+      network(network::Network::create(settings.network))
 {
     paths->prepare();
     loadSettings();
@@ -191,6 +193,7 @@ void Engine::mainloop() {
                 : settings.display.framerate.get()
         );
 
+        network->update();
         processPostRunnables();
 
         Window::swapBuffers();
@@ -235,6 +238,7 @@ Engine::~Engine() {
     gui.reset();
     logger.info() << "gui finished";
     audio::close();
+    network.reset();
     scripting::close();
     logger.info() << "scripting finished";
     Window::terminate();
@@ -485,3 +489,7 @@ void Engine::postRunnable(const runnable& callback) {
 SettingsHandler& Engine::getSettingsHandler() {
     return settingsHandler;
 }
+
+network::Network& Engine::getNetwork() {
+    return *network;
+}

src/engine.hpp

@@ -36,6 +36,10 @@ namespace cmd {
     class CommandsInterpreter;
 }
 
+namespace network {
+    class Network;
+}
+
 class initialize_error : public std::runtime_error {
 public:
     initialize_error(const std::string& message) : std::runtime_error(message) {}
@@ -55,6 +59,7 @@ class Engine : public util::ObjectsKeeper {
     std::recursive_mutex postRunnablesMutex;
     std::unique_ptr<EngineController> controller;
     std::unique_ptr<cmd::CommandsInterpreter> interpreter;
+    std::unique_ptr<network::Network> network;
     std::vector<std::string> basePacks;
 
     uint64_t frame = 0;
@@ -147,4 +152,6 @@ class Engine : public util::ObjectsKeeper {
     PacksManager createPacksManager(const fs::path& worldFolder);
 
     SettingsHandler& getSettingsHandler();
+
+    network::Network& getNetwork();
 };

src/logic/scripting/lua/libs/api_lua.hpp

@@ -32,6 +32,7 @@ extern const luaL_Reg inventorylib[];
 extern const luaL_Reg itemlib[];
 extern const luaL_Reg jsonlib[];
 extern const luaL_Reg mat4lib[];
+extern const luaL_Reg networklib[];
 extern const luaL_Reg packlib[];
 extern const luaL_Reg particleslib[]; // gfx.particles
 extern const luaL_Reg playerlib[];

src/logic/scripting/lua/libs/libfile.cpp

@@ -149,24 +149,24 @@ static int l_read_bytes(lua::State* L) {
     );
 }
 
-static int read_bytes_from_table(
+static void read_bytes_from_table(
     lua::State* L, int tableIndex, std::vector<ubyte>& bytes
 ) {
     if (!lua::istable(L, tableIndex)) {
         throw std::runtime_error("table expected");
     } else {
-        lua::pushnil(L);
-        while (lua::next(L, tableIndex - 1) != 0) {
+        size_t size = lua::objlen(L, tableIndex);
+        for (size_t i = 0; i < size; i++) {
+            lua::rawgeti(L, i + 1, tableIndex);
             const int byte = lua::tointeger(L, -1);
+            lua::pop(L);
             if (byte < 0 || byte > 255) {
                 throw std::runtime_error(
                     "invalid byte '" + std::to_string(byte) + "'"
                 );
             }
             bytes.push_back(byte);
-            lua::pop(L);
         }
-        return 1;
     }
 }
 
@@ -181,14 +181,10 @@ static int l_write_bytes(lua::State* L) {
     }
 
     std::vector<ubyte> bytes;
-    int result = read_bytes_from_table(L, -1, bytes);
-    if (result != 1) {
-        return result;
-    } else {
-        return lua::pushboolean(
-            L, files::write_bytes(path, bytes.data(), bytes.size())
-        );
-    }
+    read_bytes_from_table(L, 2, bytes);
+    return lua::pushboolean(
+        L, files::write_bytes(path, bytes.data(), bytes.size())
+    );
 }
 
 static int l_list_all_res(lua::State* L, const std::string& path) {
@@ -227,39 +223,29 @@ static int l_list(lua::State* L) {
 static int l_gzip_compress(lua::State* L) {
     std::vector<ubyte> bytes;
 
-    int result = read_bytes_from_table(L, -1, bytes);
-
-    if (result != 1) {
-        return result;
-    } else {
-        auto compressed_bytes = gzip::compress(bytes.data(), bytes.size());
-        int newTable = lua::gettop(L);
+    read_bytes_from_table(L, 1, bytes);
+    auto compressed_bytes = gzip::compress(bytes.data(), bytes.size());
+    int newTable = lua::gettop(L);
 
-        for (size_t i = 0; i < compressed_bytes.size(); i++) {
-            lua::pushinteger(L, compressed_bytes.data()[i]);
-            lua::rawseti(L, i + 1, newTable);
-        }
-        return 1;
+    for (size_t i = 0; i < compressed_bytes.size(); i++) {
+        lua::pushinteger(L, compressed_bytes.data()[i]);
+        lua::rawseti(L, i + 1, newTable);
     }
+    return 1;
 }
 
 static int l_gzip_decompress(lua::State* L) {
     std::vector<ubyte> bytes;
 
-    int result = read_bytes_from_table(L, -1, bytes);
+    read_bytes_from_table(L, 1, bytes);
+    auto decompressed_bytes = gzip::decompress(bytes.data(), bytes.size());
+    int newTable = lua::gettop(L);
 
-    if (result != 1) {
-        return result;
-    } else {
-        auto decompressed_bytes = gzip::decompress(bytes.data(), bytes.size());
-        int newTable = lua::gettop(L);
-
-        for (size_t i = 0; i < decompressed_bytes.size(); i++) {
-            lua::pushinteger(L, decompressed_bytes.data()[i]);
-            lua::rawseti(L, i + 1, newTable);
-        }
-        return 1;
+    for (size_t i = 0; i < decompressed_bytes.size(); i++) {
+        lua::pushinteger(L, decompressed_bytes.data()[i]);
+        lua::rawseti(L, i + 1, newTable);
     }
+    return 1;
 }
 
 static int l_read_combined_list(lua::State* L) {