Merge pull request #23 from usermicrodevices/develop

fix ConfigManager

Author: usermicrodevices

build.sh

@@ -47,13 +47,15 @@ else
 fi
 
 #rm -rf build
-#rm -f CMakeCache.txt Makefile cmake_install.cmake
-#rm -rf CMakeFiles
+rm -f CMakeCache.txt Makefile cmake_install.cmake
+rm -rf CMakeFiles
 
 # Build
-#mkdir -p build
+mkdir -p build
+cp -fr config build/config
 cd build
-cmake .. -B . -DUSE_CITUS=${USE_CITUS:-OFF} -DCMAKE_BUILD_TYPE=Release
+#cmake .. -B . -DUSE_CITUS=${USE_CITUS:-OFF} -DCMAKE_BUILD_TYPE=Release
+cmake .. -B . -DUSE_CITUS=${USE_CITUS:-OFF} -DCMAKE_BUILD_TYPE=Debug
 make -j$(nproc)
 
 if [ -f "gameserver" ]; then

config/config.json config/core.jsonconfig/config.json renamed to config/core.json

@@ -4,6 +4,7 @@
     "receive_timeout_ms": 1000
   },
   "server": {
+    "host": "127.0.0.1",
     "port": 8080,
     "maxConnections": 1000,
     "processCount": 4,
@@ -107,5 +108,9 @@
     "enabled": true,
     "scriptDirectory": "scripts",
     "hotReload": true
+  },
+
+  "game": {
+    "max_players_per_session": 1
   }
-}
+}

include/config/ConfigManager.hpp

@@ -1,11 +1,20 @@
 #pragma once
 
-#include <nlohmann/json.hpp>
-#include <string>
-#include <memory>
-#include <vector>
+#include <algorithm>
 #include <cstdint>
+#include <filesystem>
+#include <fstream>
+#include <map>
+#include <memory>
 #include <mutex>
+#include <sstream>
+#include <string>
+#include <stdexcept>
+#include <vector>
+
+#include <nlohmann/json.hpp>
+
+#include "logging/Logger.hpp"
 
 class ConfigManager {
 public:

include/logging/Logger.hpp

@@ -10,10 +10,14 @@
 #include <spdlog/sinks/rotating_file_sink.h>
 #include <spdlog/sinks/stdout_color_sinks.h>
 
+#include "config/ConfigManager.hpp"
+
 class Logger {
 public:
-    static void Initialize(const std::string& configPath = "");
+    static void Initialize();
+    static void InitializeDefaults();
     static void InitializeWithWorkerId(int workerId);
+
     static std::shared_ptr<spdlog::logger> GetLogger(const std::string& name = "GameServer");
 
     template<typename... Args>
@@ -48,7 +52,6 @@ class Logger {
 
 private:
     static std::shared_ptr<spdlog::logger> logger_;
-    static std::string configPath_;
-    
+
     static void SetupLogger(const std::string& loggerName = "GameServer");
 };

include/network/NetworkQualityMonitor.hpp

@@ -1,11 +1,16 @@
 #pragma once
 
-#include <deque>
+#include <algorithm>
+#include <atomic>
 #include <chrono>
+#include <cmath>
+#include <deque>
+#include <iomanip>
 #include <mutex>
-#include <atomic>
 #include <vector>
-#include <algorithm>
+#include <sstream>
+
+#include "logging/Logger.hpp"
 
 struct NetworkMetrics {
     uint64_t average_latency_ms{0};
@@ -127,4 +132,4 @@ class NetworkQualityMonitor {
     static constexpr float PACKET_LOSS_GOOD = 0.03f;       // 3%
     static constexpr float PACKET_LOSS_FAIR = 0.05f;       // 5%
     static constexpr float PACKET_LOSS_POOR = 0.10f;       // 10%
-};
+};