Server improvements

linux/server/CMakeLists.txt

@@ -11,6 +11,11 @@ target_link_libraries(netremote-server-linux
         netremote-server
 )
 
+set_target_properties(netremote-server-linux
+    PROPERTIES
+        OUTPUT_NAME netremote-server
+)
+
 install(
     TARGETS netremote-server-linux
     EXPORT netremote

linux/server/Main.cxx

@@ -8,8 +8,7 @@
 
 using namespace Microsoft::Net::Remote;
 
-int
-main(int argc, char* argv[])
+int main(int argc, char* argv[])
 {
     const auto configuration = NetRemoteServerConfiguration::FromCommandLineArguments(argc, argv);
 
@@ -28,6 +27,10 @@ main(int argc, char* argv[])
             throw std::runtime_error(what);
         }
     }
+    else
+    {
+        server.GetGrpcServer()->Wait();
+    }
 
     return 0;
 }

src/server/include/microsoft/net/remote/NetRemoteServerConfiguration.hxx

@@ -45,7 +45,7 @@ struct NetRemoteServerConfiguration
     /**
      * @brief Run the service in the background.
      */
-    bool RunInBackground{ true };
+    bool RunInBackground{ false };
 };
 
 } // namespace Microsoft::Net::Remote

tests/unit/TestNetRemoteServiceClient.cxx

@@ -1,31 +1,44 @@
 
 #include <array>
+#include <chrono>
 #include <cstdint>
 #include <format>
 #include <iostream>
 
 #include <catch2/catch_test_macros.hpp>
-#include <grpc/grpc.h>
 #include <grpcpp/create_channel.h>
 #include <magic_enum.hpp>
 #include <microsoft/net/remote/NetRemoteService.hxx>
 #include <NetRemoteService.grpc.pb.h>
 
+using namespace std::chrono_literals;
+
 namespace detail
 {
 constexpr auto RemoteServiceAddressHttp = "localhost:5047";
 [[maybe_unused]] constexpr auto RemoteServiceAddressHttps = "localhost:7073";
+constexpr auto RemoteServiceConnectionTimeout = 3s;
 } // namespace detail
 
 TEST_CASE("net remote service can be reached", "[basic][rpc][client][remote]")
+{
+    using namespace Microsoft::Net::Remote::Service;
+
+    auto channel = grpc::CreateChannel(detail::RemoteServiceAddressHttp, grpc::InsecureChannelCredentials());
+    auto client = NetRemote::NewStub(channel);
+
+    REQUIRE(channel->WaitForConnected(std::chrono::system_clock::now() + detail::RemoteServiceConnectionTimeout));
+}
+
+TEST_CASE("WifiConfigureAccessPoint API can be called", "[basic][rpc][client][remote]")
 {
     using namespace Microsoft::Net::Remote;
     using namespace Microsoft::Net::Remote::Service;
 
     auto channel = grpc::CreateChannel(detail::RemoteServiceAddressHttp, grpc::InsecureChannelCredentials());
     auto client = NetRemote::NewStub(channel);
 
-    SECTION("WifiConfigureAccessPoint can be called")
+    SECTION("Can be called")
     {
         for (const auto& band : magic_enum::enum_values<Microsoft::Net::Wifi::RadioBand>())
         {

windows/server/CMakeLists.txt

@@ -11,6 +11,11 @@ target_link_libraries(netremote-server-windows
         netremote-server
 )
 
+set_target_properties(netremote-server-windows
+    PROPERTIES
+        OUTPUT_NAME netremote-server
+)
+
 install(
     TARGETS netremote-server-windows
     EXPORT netremote