From 686507642c34e799ef846cc09a64bc7cbbb75920 Mon Sep 17 00:00:00 2001 From: Rodrigo Delduca Date: Mon, 16 Dec 2024 08:59:04 -0300 Subject: [PATCH] Work in progress --- CMakeLists.txt | 2 +- mise.toml | 3 --- src/common.hpp | 1 - src/socket.cpp | 26 +++++++++++++------------- 4 files changed, 14 insertions(+), 18 deletions(-) delete mode 100644 mise.toml diff --git a/CMakeLists.txt b/CMakeLists.txt index bd67207..10edcef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(carimbo LANGUAGES CXX) set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_CXX_EXTENSIONS OFF) +set(CMAKE_CXX_EXTENSIONS ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(SDL2_DIR "${CMAKE_BINARY_DIR}") diff --git a/mise.toml b/mise.toml deleted file mode 100644 index 7805196..0000000 --- a/mise.toml +++ /dev/null @@ -1,3 +0,0 @@ -[tools] -python = '3.13' -node = '22' diff --git a/src/common.hpp b/src/common.hpp index 5cced79..7f4480a 100644 --- a/src/common.hpp +++ b/src/common.hpp @@ -46,7 +46,6 @@ #include #include #include -#include #include #include #include diff --git a/src/socket.cpp b/src/socket.cpp index d6f0c85..d06165e 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -19,7 +19,7 @@ socket::socket() noexcept { emscripten_websocket_set_onopen_callback( _socket, this, - [](int, const EmscriptenWebSocketOpenEvent *event, void *data) noexcept { + [](int, const EmscriptenWebSocketOpenEvent *event, void *data) noexcept -> bool { UNUSED(event); auto *self = static_cast(data); @@ -32,28 +32,28 @@ socket::socket() noexcept { self->invoke("connect"); - return 0; + return false; } ); emscripten_websocket_set_onmessage_callback( _socket, this, - [](int, const EmscriptenWebSocketMessageEvent *event, void *data) noexcept { + [](int, const EmscriptenWebSocketMessageEvent *event, void *data) noexcept -> bool { if (!event->isText) [[unlikely]] { - return 0; + return false; } auto *self = static_cast(data); const auto buffer = std::string(reinterpret_cast(event->data), event->numBytes - 1); const auto j = json::parse(buffer, nullptr, false); if (j.is_discarded()) [[unlikely]] { - return 0; + return false; } if (const auto &command = j.value("command", std::string{}); command == "ping") { self->send(R"({"command": "pong"})"); - return 0; + return false; } if (const auto &event = j.value("event", json::object()); !event.empty()) { @@ -62,7 +62,7 @@ socket::socket() noexcept { event.at("data").dump() ); - return 0; + return false; } if (const auto &rpc = j.value("rpc", json::object()); !rpc.empty() && rpc.contains("response")) { @@ -72,32 +72,32 @@ socket::socket() noexcept { response.at("result").dump() ); - return 0; + return false; } - return 0; + return false; } ); emscripten_websocket_set_onerror_callback( _socket, this, - [](int, const EmscriptenWebSocketErrorEvent *event, void *data) noexcept { + [](int, const EmscriptenWebSocketErrorEvent *event, void *data) noexcept -> bool { UNUSED(event); const auto self = static_cast(data); self->invoke("error", "WebSocket error occurred"); - return 0; + return false; } ); emscripten_websocket_set_onclose_callback( _socket, this, - [](int, const EmscriptenWebSocketCloseEvent *event, void *data) noexcept { + [](int, const EmscriptenWebSocketCloseEvent *event, void *data) noexcept -> bool { UNUSED(event); const auto *self = static_cast(data); self->invoke("disconnect"); - return 0; + return false; } ); }