[refactor] use MiniRTC public APIs across clients

apps/desktop/src/gui/application/gui_application.cpp

@@ -87,7 +87,7 @@
 #include "rd_log.h"
 #include "server_window_state.h"
 #include "signal_server_settings.h"
-#include "signal_server_address.h"
+#include <minirtc.h>
 #include "ui/announcement_text.h"
 #include "ui/model_update.h"
 #include "ui/release_notes_text.h"
@@ -3532,11 +3532,11 @@ void GuiApplication::SyncConnectionDialog() {
            : auth.incorrect_password
                ? localization::reinput_password[localization_language_index_]
                : localization::input_password[localization_language_index_];
-  } else if (auth.error == minirtc::JoinFailureKind::Throttled) {
+  } else if (auth.error == MiniRtcJoinFailureKind::Throttled) {
     text = localization::connection_auth_throttled[localization_language_index_];
-  } else if (auth.error == minirtc::JoinFailureKind::Busy) {
+  } else if (auth.error == MiniRtcJoinFailureKind::Busy) {
     text = localization::connection_service_busy[localization_language_index_];
-  } else if (auth.error == minirtc::JoinFailureKind::NotAuthenticated) {
+  } else if (auth.error == MiniRtcJoinFailureKind::NotAuthenticated) {
     text = localization::connection_not_authenticated[localization_language_index_];
   } else {
     text = props->lan_session_ && !props->lan_session_->error.empty()
@@ -4782,20 +4782,20 @@ void GuiApplication::SyncFileTransferNotifications() {
 
 bool GuiApplication::ValidateSelfHostedSettingsFromUi(bool gallery_window) {
   auto& main = ui_->Window(gallery_window);
-  const auto address = minirtc::ParseSignalServerAddress(
-      std::string(main->get_server_host()));
-  if (!address) {
+  const auto input = std::string(main->get_server_host());
+  MiniRtcSignalServerAddress address{};
+  if (ParseMiniRtcSignalServerAddress(input.data(), input.size(), &address) != 0) {
     main->set_self_host_settings_error(UiText(
         localization::self_hosted_address_invalid[localization_language_index_]));
     return false;
   }
-  const auto port = address->port ? address->port : ParsePort(main->get_server_port());
+  const auto port = address.port ? std::optional<int>(address.port) : ParsePort(main->get_server_port());
   if (!port) {
     main->set_self_host_settings_error(UiText(
         localization::self_hosted_port_invalid[localization_language_index_]));
     return false;
   }
-  main->set_server_host(UiText(address->Address()));
+  main->set_server_host(UiText(std::string(address.host) + address.target));
   main->set_server_port(UiText(std::to_string(*port)));
   main->set_self_host_settings_error("");
   return true;

apps/desktop/src/gui/runtime/announcement_inbox.cpp

@@ -8,7 +8,7 @@
 #include <set>
 #include <system_error>
 
-#include "signal_server_address.h"
+#include <minirtc.h>
 
 #ifdef _WIN32
 #include <windows.h>
@@ -53,12 +53,13 @@ void AnnouncementInbox::Configure(std::string host, int port,
   std::lock_guard<std::mutex> lock(mutex_);
   if (directory_.empty() || host.empty() || port <= 0 || device_id.empty())
     return;
-  auto address = minirtc::ParseSignalServerAddress(host);
-  if (!address) return;
-  for (auto& ch : address->host)
+  MiniRtcSignalServerAddress address{};
+  if (ParseMiniRtcSignalServerAddress(host.data(), host.size(), &address) != 0) return;
+  std::string normalized_host(address.host);
+  for (auto& ch : normalized_host)
     if (ch >= 'A' && ch <= 'Z') ch += 'a' - 'A';
-  if (address->host.back() == '.') address->host.pop_back();
-  host = address->Address();
+  if (normalized_host.back() == '.') normalized_host.pop_back();
+  host = normalized_host + address.target;
   const auto scope = json::array({host, port, device_id}).dump();
   if (scope_ == scope) return;
   scope_ = scope;

apps/desktop/src/gui/runtime/connection_auth_state.h

@@ -5,7 +5,8 @@
 #include <mutex>
 #include <string_view>
 
-#include "join_failure.h"
+#include <minirtc.h>
+#include <nlohmann/json.hpp>
 
 namespace crossdesk {
 
@@ -18,7 +19,7 @@ class ConnectionAuthState {
     bool password_required = false;
     bool validating = false;
     bool incorrect_password = false;
-    minirtc::JoinFailureKind error = minirtc::JoinFailureKind::Unknown;
+    MiniRtcJoinFailureKind error = MiniRtcJoinFailureKind::Unknown;
     int retry_after = 0;
   };
 
@@ -34,15 +35,16 @@ class ConnectionAuthState {
 
   void Rejected(const nlohmann::json& reply,
                 Clock::time_point now = Clock::now()) {
-    const auto failure = minirtc::ParseJoinFailure(reply);
+    const auto message = reply.dump();
+    const auto failure = ParseMiniRtcJoinFailure(message.data(), message.size());
     std::lock_guard lock(mutex_);
     state_ = {};
     state_.error = failure.kind;
     state_.incorrect_password =
-        failure.kind == minirtc::JoinFailureKind::AuthenticationFailed;
+        failure.kind == MiniRtcJoinFailureKind::AuthenticationFailed;
     state_.password_required =
         state_.incorrect_password ||
-        failure.kind == minirtc::JoinFailureKind::PasswordRequired;
+        failure.kind == MiniRtcJoinFailureKind::PasswordRequired;
     retry_at_ = now + std::chrono::seconds(failure.retry_after);
   }