Use improved AssingLCG endpoint (#358)

* Start working on interfacing with improved endpoint * Supply version to assignlcg * Pass by ref * Remove lcg-override config

Author: hhvrc

frontend/src/lib/_fbs/open-shock/serialization/configuration/backend-config.ts

@@ -42,16 +42,6 @@ authToken(optionalEncoding?:any):string|Uint8Array|null {
  return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
 }
 
-/**
- * Override the Live-Control-Gateway (LCG) URL
- */
-lcgOverride():string|null
-lcgOverride(optionalEncoding:flatbuffers.Encoding):string|Uint8Array|null
-lcgOverride(optionalEncoding?:any):string|Uint8Array|null {
- const offset = this.bb!.__offset(this.bb_pos, 8);
- return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
-}
-
 static startBackendConfig(builder:flatbuffers.Builder) {
  builder.startObject(3);
 }
@@ -64,20 +54,15 @@ static addAuthToken(builder:flatbuffers.Builder, authTokenOffset:flatbuffers.Off
  builder.addFieldOffset(1, authTokenOffset, 0);
 }
 
-static addLcgOverride(builder:flatbuffers.Builder, lcgOverrideOffset:flatbuffers.Offset) {
- builder.addFieldOffset(2, lcgOverrideOffset, 0);
-}
-
 static endBackendConfig(builder:flatbuffers.Builder):flatbuffers.Offset {
  const offset = builder.endObject();
  return offset;
 }
 
-static createBackendConfig(builder:flatbuffers.Builder, domainOffset:flatbuffers.Offset, authTokenOffset:flatbuffers.Offset, lcgOverrideOffset:flatbuffers.Offset):flatbuffers.Offset {
+static createBackendConfig(builder:flatbuffers.Builder, domainOffset:flatbuffers.Offset, authTokenOffset:flatbuffers.Offset):flatbuffers.Offset {
  BackendConfig.startBackendConfig(builder);
  BackendConfig.addDomain(builder, domainOffset);
  BackendConfig.addAuthToken(builder, authTokenOffset);
- BackendConfig.addLcgOverride(builder, lcgOverrideOffset);
  return BackendConfig.endBackendConfig(builder);
 }
 }

include/GatewayClient.h

@@ -21,7 +21,7 @@ namespace OpenShock {
 
  inline GatewayClientState state() const { return m_state; }
 
- void connect(std::string_view lcgAddress);
+ void connect(const std::string& host, uint16_t port, const std::string& path);
  void disconnect();
 
  bool sendMessageTXT(std::string_view data);

include/config/BackendConfig.h

@@ -8,11 +8,10 @@
 namespace OpenShock::Config {
  struct BackendConfig : public ConfigBase<Serialization::Configuration::BackendConfig> {
  BackendConfig();
- BackendConfig(std::string_view domain, std::string_view authToken, std::string_view lcgOverride);
+ BackendConfig(std::string_view domain, std::string_view authToken);
 
  std::string domain;
  std::string authToken;
- std::string lcgOverride;
 
  void ToDefault() override;
 

include/config/Config.h

@@ -78,10 +78,6 @@ namespace OpenShock::Config {
  bool GetBackendAuthToken(std::string& out);
  bool SetBackendAuthToken(std::string_view token);
  bool ClearBackendAuthToken();
- bool HasBackendLCGOverride();
- bool GetBackendLCGOverride(std::string& out);
- bool SetBackendLCGOverride(std::string_view lcgOverride);
- bool ClearBackendLCGOverride();
 
  bool GetSerialInputConfigEchoEnabled(bool& out);
  bool SetSerialInputConfigEchoEnabled(bool enabled);

include/serial/command_handlers/index.h

@@ -14,7 +14,6 @@ namespace OpenShock::Serial::CommandHandlers {
  OpenShock::Serial::CommandGroup EStopHandler();
  OpenShock::Serial::CommandGroup DomainHandler();
  OpenShock::Serial::CommandGroup AuthTokenHandler();
- OpenShock::Serial::CommandGroup LcgOverrideHandler();
  OpenShock::Serial::CommandGroup HostnameHandler();
  OpenShock::Serial::CommandGroup NetworksHandler();
  OpenShock::Serial::CommandGroup KeepAliveHandler();
@@ -35,7 +34,6 @@ namespace OpenShock::Serial::CommandHandlers {
  EStopHandler(),
  DomainHandler(),
  AuthTokenHandler(),
- LcgOverrideHandler(),
  HostnameHandler(),
  NetworksHandler(),
  KeepAliveHandler(),

include/serialization/JsonAPI.h

@@ -35,7 +35,9 @@ namespace OpenShock::Serialization::JsonAPI {
  std::vector<ShockerInfo> shockers;
  };
  struct AssignLcgResponse {
- std::string fqdn;
+ std::string host;
+ uint16_t port;
+ std::string path;
  std::string country;
  };
 

include/serialization/_fbs/HubConfig_generated.h

@@ -505,8 +505,7 @@ struct BackendConfig FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
  }
  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
  VT_DOMAIN = 4,
- VT_AUTH_TOKEN = 6,
- VT_LCG_OVERRIDE = 8
+ VT_AUTH_TOKEN = 6
  };
  /// Domain name of the backend server, e.g. "api.shocklink.net"
  const ::flatbuffers::String *domain() const {
@@ -516,18 +515,12 @@ struct BackendConfig FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
  const ::flatbuffers::String *auth_token() const {
  return GetPointer<const ::flatbuffers::String *>(VT_AUTH_TOKEN);
  }
- /// Override the Live-Control-Gateway (LCG) URL
- const ::flatbuffers::String *lcg_override() const {
- return GetPointer<const ::flatbuffers::String *>(VT_LCG_OVERRIDE);
- }
  bool Verify(::flatbuffers::Verifier &verifier) const {
  return VerifyTableStart(verifier) &&
  VerifyOffset(verifier, VT_DOMAIN) &&
  verifier.VerifyString(domain()) &&
  VerifyOffset(verifier, VT_AUTH_TOKEN) &&
  verifier.VerifyString(auth_token()) &&
- VerifyOffset(verifier, VT_LCG_OVERRIDE) &&
- verifier.VerifyString(lcg_override()) &&
  verifier.EndTable();
  }
 };
@@ -542,9 +535,6 @@ struct BackendConfigBuilder {
  void add_auth_token(::flatbuffers::Offset<::flatbuffers::String> auth_token) {
  fbb_.AddOffset(BackendConfig::VT_AUTH_TOKEN, auth_token);
  }
- void add_lcg_override(::flatbuffers::Offset<::flatbuffers::String> lcg_override) {
- fbb_.AddOffset(BackendConfig::VT_LCG_OVERRIDE, lcg_override);
- }
  explicit BackendConfigBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
  : fbb_(_fbb) {
  start_ = fbb_.StartTable();
@@ -559,10 +549,8 @@ struct BackendConfigBuilder {
 inline ::flatbuffers::Offset<BackendConfig> CreateBackendConfig(
  ::flatbuffers::FlatBufferBuilder &_fbb,
  ::flatbuffers::Offset<::flatbuffers::String> domain = 0,
- ::flatbuffers::Offset<::flatbuffers::String> auth_token = 0,
- ::flatbuffers::Offset<::flatbuffers::String> lcg_override = 0) {
+ ::flatbuffers::Offset<::flatbuffers::String> auth_token = 0) {
  BackendConfigBuilder builder_(_fbb);
- builder_.add_lcg_override(lcg_override);
  builder_.add_auth_token(auth_token);
  builder_.add_domain(domain);
  return builder_.Finish();
@@ -576,16 +564,13 @@ struct BackendConfig::Traits {
 inline ::flatbuffers::Offset<BackendConfig> CreateBackendConfigDirect(
  ::flatbuffers::FlatBufferBuilder &_fbb,
  const char *domain = nullptr,
- const char *auth_token = nullptr,
- const char *lcg_override = nullptr) {
+ const char *auth_token = nullptr) {
  auto domain__ = domain ? _fbb.CreateString(domain) : 0;
  auto auth_token__ = auth_token ? _fbb.CreateString(auth_token) : 0;
- auto lcg_override__ = lcg_override ? _fbb.CreateString(lcg_override) : 0;
  return OpenShock::Serialization::Configuration::CreateBackendConfig(
  _fbb,
  domain__,
- auth_token__,
- lcg_override__);
+ auth_token__);
 }
 
 struct SerialInputConfig FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {

schemas

@@ -13,71 +13,10 @@ const char* const TAG = "GatewayClient";
 #include "util/CertificateUtils.h"
 #include "VisualStateManager.h"
 
-#include <charconv>
-
 using namespace OpenShock;
 
 static bool s_bootStatusSent = false;
 
-// TODO: THIS IS HORRIBLE!
-static bool parse_supplied_address(std::string_view input, std::string& host, uint16_t& port, std::string& path)
-{
- host.clear();
- path.clear();
- port = 0;
-
- if (input.empty()) return false; // Input cannot be empty
-
- // Remove scheme if present (e.g., "http://")
- if (auto scheme_pos = input.find("://"); scheme_pos != std::string_view::npos) {
- input.remove_prefix(scheme_pos + 3);
- }
-
- // Extract path if present
- if (auto path_pos = input.find('/'); path_pos != std::string_view::npos) {
- path = std::string(input.substr(path_pos));
- path += ("/2/ws/hub" + (path.back() == '/' ? 1 : 0)); // I cant be bothered to do anything else so have a conditional assignment combined with C-style pointer arithmetic :>
- input.remove_suffix(input.size() - path_pos);
- } else {
- path = "/2/ws/hub";
- }
-
- if (input.empty()) return false;
-
- std::string_view port_part;
-
- // Check for IPv6 address (e.g., [::1]:8080)
- if (input.front() == '[') {
- auto closing_bracket = input.find(']');
- if (closing_bracket == std::string_view::npos) return false; // Malformed IPv6
-
- host = std::string(input.substr(1, closing_bracket - 1));
-
- if (closing_bracket + 1 < input.size()) {
- if (input[closing_bracket + 1] != ':') return false; // Expecting ':' after ']'
- port_part = input.substr(closing_bracket + 2); // Skip "]:" for port
- }
- } else {
- // IPv4 or hostname
- if (auto colon_pos = input.rfind(':'); colon_pos != std::string_view::npos) {
- host = std::string(input.substr(0, colon_pos));
- port_part = input.substr(colon_pos + 1);
- } else {
- host = std::string(input);
- }
- }
-
- // Parse port if present
- if (!port_part.empty()) {
- auto result = std::from_chars(port_part.data(), port_part.data() + port_part.size(), port);
- if (result.ec != std::errc()) return false; // Failed to parse port
- } else {
- port = 443;
- }
-
- return true;
-}
-
 GatewayClient::GatewayClient(const std::string& authToken)
  : m_webSocket()
  , m_state(GatewayClientState::Disconnected)
@@ -100,20 +39,12 @@ GatewayClient::~GatewayClient()
  m_webSocket.disconnect();
 }
 
-void GatewayClient::connect(std::string_view lcgAddress)
+void GatewayClient::connect(const std::string& host, uint16_t port, const std::string& path)
 {
  if (m_state != GatewayClientState::Disconnected) {
  return;
  }
 
- std::string host;
- uint16_t port;
- std::string path;
- if (!parse_supplied_address(lcgAddress, host, port, path)) {
- // TODO: Log error
- return;
- }
-
  _setState(GatewayClientState::Connecting);
 
 //

src/GatewayClient.cpp

@@ -232,15 +232,6 @@ bool StartConnectingToLCG()
  }
  s_lastConnectionAttempt = msNow;
 
- if (Config::HasBackendLCGOverride()) {
- std::string lcgOverride;
- Config::GetBackendLCGOverride(lcgOverride);
-
- OS_LOGD(TAG, "Connecting to overridden LCG endpoint %s", lcgOverride.c_str());
- s_wsClient->connect(lcgOverride);
- return true;
- }
-
  if (!Config::HasBackendAuthToken()) {
  OS_LOGD(TAG, "No auth token, can't connect to LCG");
  return false;
@@ -273,8 +264,8 @@ bool StartConnectingToLCG()
  return false;
  }
 
- OS_LOGD(TAG, "Connecting to LCG endpoint %s in country %s", response.data.fqdn.c_str(), response.data.country.c_str());
- s_wsClient->connect(response.data.fqdn);
+ OS_LOGD(TAG, "Connecting to LCG endpoint { host: '%s', port: %hu, path: '%s' } %s in country %s", response.data.host.c_str(), response.data.port, response.data.path.c_str(), response.data.country.c_str());
+ s_wsClient->connect(response.data.host, response.data.port, response.data.path);
 
  return true;
 }