From 87151341836b5fc97ae12d2665fffbb77aca8078 Mon Sep 17 00:00:00 2001
From: Harvey Fong <harvey@oomer.org>
Date: Sat, 1 Mar 2025 19:12:15 -0700
Subject: [PATCH] changed serverAddress switch, made vcpkg relative, alma
 dependencies

---
 README.md        | 19 ++++++++++++++-----
 bellatui.cpp     |  5 +++--
 bellatui.vcxproj |  6 +++---
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 91a268b..0132283 100644
--- a/README.md
+++ b/README.md
@@ -77,6 +77,19 @@ apt install libgnutls28-dev
 apt install pkg-config 
 ```
 
+```
+dnf groupinstall -y "Development Tools"
+dnf install -y libX11-devel
+dnf install -y mesa-libGL-devel
+dnf install -y libtool
+dnf install -y libsodium-devel
+dnf install -y cmake
+dnf install -y gnutls-devel
+dnf install -y pkg-config
+```
+
+
+
 ### libzmq
 ```
 git clone https://github.com/zeromq/libzmq
@@ -96,13 +109,9 @@ cd cppzmq
 mkdir build
 cd build
 cmake .. 
-
-g++ bellatui.cpp -o server -lzmq -Wl,-rpath,.
 ```
 
-```
-
-### bellatui
+## bellatui
 ```
 cd ../..
 git clone https://github.com/oomer/bellatui.git
diff --git a/bellatui.cpp b/bellatui.cpp
index e7f85ab..df1dc4d 100644
--- a/bellatui.cpp
+++ b/bellatui.cpp
@@ -115,6 +115,7 @@ void heartbeat_thread(  std::string server_pkey, //CLIENT
         std::string url = "tcp://*:" + std::to_string(heartbeat_port);
         heartbeat_sock.bind(url);
         while(true) {
+            std::cout << "HT" << std::endl;
             //Start polling heartbeats once client connects
             if (connection_state == true) {
                 zmq::pollitem_t response_item = { heartbeat_sock, 0, ZMQ_POLLIN, 0 };
@@ -153,7 +154,7 @@ void heartbeat_thread(  std::string server_pkey, //CLIENT
                 heartbeat_sock.send(zmq::message_t("ACK"), zmq::send_flags::none);
                 // Wait for response (poll for ZMQ_POLLIN)
                 zmq::pollitem_t response_item = { heartbeat_sock, 0, ZMQ_POLLIN, 0 };
-                zmq::poll(&response_item, 1, 100); // Wait for response with timeout
+                zmq::poll(&response_item, 1, 5000); // Wait for response with timeout
                 if (response_item.revents & ZMQ_POLLIN) {
                     zmq::message_t msg_response;
                     heartbeat_sock.recv(msg_response, zmq::recv_flags::none);
@@ -187,7 +188,7 @@ int DL_main(Args& args)
         bellaSdkBuildDate()
    );*/
 
-    args.add("ip",  "serverAddress", "",   "Bella render server ip address");
+    args.add("sa",  "serverAddress", "",   "Bella render server ip address");
     args.add("cp",  "commandPort",   "",   "tcp port for zmq server socket for commands");
     args.add("hp",  "heartbeatPort",   "",   "tcp port for zmq server socket for heartbeats");
     args.add("pp",  "publickeyPort",   "",   "tcp port for zmq server socket for server pubkey");
diff --git a/bellatui.vcxproj b/bellatui.vcxproj
index 9fca9c6..d0e7cdd 100644
--- a/bellatui.vcxproj
+++ b/bellatui.vcxproj
@@ -72,7 +72,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>lib</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories>~/vcpkg/installed/x64-windows/lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../vcpkg/installed/x64-windows/lib</AdditionalLibraryDirectories>
       <AdditionalLibraryDirectories>../bella_engine_sdk/lib</AdditionalLibraryDirectories>
       <AdditionalDependencies>libzmq-mt-4_3_5.lib;bella_engine_sdk.lib;Shlwapi.lib;vulkan-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <DelayLoadDLLs>vulkan-1.dll</DelayLoadDLLs>
@@ -98,9 +98,9 @@
       echo dl_core.dll copied &amp; 
       copy "$(ProjectDir)..\bella_engine_sdk\lib\dl_oidn_core.dll" "$(TargetDir)" &amp; 
       echo dl_oidn_core.dll copied &amp; 
-      copy "$(ProjectDir)..\..\vcpkg\installed\x64-windows\bin\libzmq-mt-4_3_5.dll" "$(TargetDir)" &amp;
+      copy "$(ProjectDir)..\vcpkg\installed\x64-windows\bin\libzmq-mt-4_3_5.dll" "$(TargetDir)" &amp;
       echo libzmq-mt-4_3_5.dll copied &amp; 
-      copy "$(ProjectDir)..\..\vcpkg\installed\x64-windows\bin\libsodium.dll" "$(TargetDir)" &amp; 
+      copy "$(ProjectDir)..\vcpkg\installed\x64-windows\bin\libsodium.dll" "$(TargetDir)" &amp; 
       echo libsodium.dll copied &amp; 
       echo Post-build event finished</Command>