Revert D88975026: Create MOQTSetupParameters

Differential Revision:
D88975026

Original commit changeset: 66a15e09c57a

Original Phabricator Diff: D88975026

fbshipit-source-id: 8614eeecf86cc369dadda556ec7f6a4e838b884b

Author: Rayner Kristanto

moxygen/mlog/MLogTypes.cpp

@@ -37,36 +37,32 @@ folly::dynamic MOQTControlMessageParsed::toDynamic() const {
 folly::dynamic MOQTClientSetupMessage::toDynamic() const {
   folly::dynamic clientSetupObj = folly::dynamic::object;
   clientSetupObj["type"] = type;
-  clientSetupObj["number_of_supported_versions"] = numberOfSupportedVersions;
-  clientSetupObj["supported_versions"] =
+  clientSetupObj["numberOfSupportedVersions"] = numberOfSupportedVersions;
+  clientSetupObj["supportedVersions"] =
       folly::dynamic::array(supportedVersions.begin(), supportedVersions.end());
-  clientSetupObj["number_of_parameters"] = numberOfParameters;
+  clientSetupObj["numberOfParameters"] = numberOfParameters;
 
-  if (!setupParameters.empty()) {
-    std::vector<folly::dynamic> paramObjects;
-    paramObjects.reserve(setupParameters.size());
-    for (const auto& param : setupParameters) {
-      paramObjects.push_back(setupParameterToDynamic(param));
-    }
-    clientSetupObj["setup_parameters"] = folly::dynamic::array(paramObjects);
+  std::vector<folly::dynamic> paramObjects;
+  paramObjects.reserve(setupParameters.size());
+  for (auto& param : setupParameters) {
+    paramObjects.push_back(param.toDynamic());
   }
+  clientSetupObj["setupParameters"] = folly::dynamic::array(paramObjects);
   return clientSetupObj;
 }
 
 folly::dynamic MOQTServerSetupMessage::toDynamic() const {
   folly::dynamic serverSetupObj = folly::dynamic::object;
   serverSetupObj["type"] = type;
-  serverSetupObj["selected_version"] = selectedVersion;
-  serverSetupObj["number_of_parameters"] = numberOfParameters;
+  serverSetupObj["selectedVersion"] = selectedVersion;
+  serverSetupObj["numberOfParameters"] = numberOfParameters;
 
-  if (!setupParameters.empty()) {
-    std::vector<folly::dynamic> paramObjects;
-    paramObjects.reserve(setupParameters.size());
-    for (const auto& param : setupParameters) {
-      paramObjects.push_back(setupParameterToDynamic(param));
-    }
-    serverSetupObj["setup_parameters"] = folly::dynamic::array(paramObjects);
+  std::vector<folly::dynamic> paramObjects;
+  paramObjects.reserve(setupParameters.size());
+  for (auto& param : setupParameters) {
+    paramObjects.push_back(param.toDynamic());
   }
+  serverSetupObj["setupParameters"] = folly::dynamic::array(paramObjects);
   return serverSetupObj;
 }
 
@@ -85,100 +81,6 @@ folly::dynamic MOQTParameter::toDynamic() const {
   return obj;
 }
 
-// Setup Parameter toDynamic implementations
-folly::dynamic MOQTAuthoritySetupParameter::toDynamic() const {
-  folly::dynamic obj = folly::dynamic::object;
-  obj["name"] = name;
-  obj["value"] = value;
-  return obj;
-}
-
-folly::dynamic MOQTAuthorizationTokenSetupParameter::toDynamic() const {
-  folly::dynamic obj = folly::dynamic::object;
-  obj["name"] = name;
-
-  std::string aliasTypeStr;
-  switch (aliasType) {
-    case MOQTAliasType::DELETE:
-      aliasTypeStr = "delete";
-      break;
-    case MOQTAliasType::REGISTER:
-      aliasTypeStr = "register";
-      break;
-    case MOQTAliasType::USE_ALIAS:
-      aliasTypeStr = "use_alias";
-      break;
-    case MOQTAliasType::USE_VALUE:
-      aliasTypeStr = "use_value";
-      break;
-  }
-  obj["alias_type"] = aliasTypeStr;
-
-  if (tokenAlias.hasValue()) {
-    obj["token_alias"] = tokenAlias.value();
-  }
-  if (tokenType.hasValue()) {
-    obj["token_type"] = tokenType.value();
-  }
-  if (tokenValue) {
-    obj["token_value"] = std::string(
-        reinterpret_cast<const char*>(tokenValue->data()),
-        tokenValue->length());
-  }
-  return obj;
-}
-
-folly::dynamic MOQTPathSetupParameter::toDynamic() const {
-  folly::dynamic obj = folly::dynamic::object;
-  obj["name"] = name;
-  obj["value"] = value;
-  return obj;
-}
-
-folly::dynamic MOQTMaxRequestIdSetupParameter::toDynamic() const {
-  folly::dynamic obj = folly::dynamic::object;
-  obj["name"] = name;
-  obj["value"] = value;
-  return obj;
-}
-
-folly::dynamic MOQTMaxAuthTokenCacheSizeSetupParameter::toDynamic() const {
-  folly::dynamic obj = folly::dynamic::object;
-  obj["name"] = name;
-  obj["value"] = value;
-  return obj;
-}
-
-folly::dynamic MOQTImplementationSetupParameter::toDynamic() const {
-  folly::dynamic obj = folly::dynamic::object;
-  obj["name"] = name;
-  obj["value"] = value;
-  return obj;
-}
-
-folly::dynamic MOQTUnknownSetupParameter::toDynamic() const {
-  folly::dynamic obj = folly::dynamic::object;
-  obj["name"] = name;
-  obj["name_bytes"] = nameBytes;
-  if (length.hasValue()) {
-    obj["length"] = length.value();
-  }
-  if (value.hasValue()) {
-    obj["value"] = value.value();
-  }
-  if (valueBytes) {
-    obj["value_bytes"] = std::string(
-        reinterpret_cast<const char*>(valueBytes->data()),
-        valueBytes->length());
-  }
-  return obj;
-}
-
-folly::dynamic setupParameterToDynamic(const MOQTSetupParameter& param) {
-  return std::visit(
-      [](const auto& p) -> folly::dynamic { return p.toDynamic(); }, param);
-}
-
 folly::dynamic MOQTLocation::toDynamic() const {
   folly::dynamic obj = folly::dynamic::object;
   obj["group"] = group;

moxygen/mlog/MLogTypes.h

@@ -10,7 +10,6 @@
 
 #include <cstdint>
 #include <string>
-#include <variant>
 #include <vector>
 #include "folly/Optional.h"
 #include "folly/io/IOBuf.h"
@@ -64,76 +63,6 @@ class MOQTParameter {
   folly::dynamic toDynamic() const;
 };
 
-// Setup Parameter Types (Section 5.2 of the mLog spec)
-enum MOQTAliasType { DELETE, REGISTER, USE_ALIAS, USE_VALUE };
-
-struct MOQTAuthoritySetupParameter {
-  std::string name = "authority";
-  std::string value;
-
-  folly::dynamic toDynamic() const;
-};
-
-struct MOQTAuthorizationTokenSetupParameter {
-  std::string name = "authorization_token";
-  MOQTAliasType aliasType;
-  folly::Optional<uint64_t> tokenAlias;
-  folly::Optional<uint64_t> tokenType;
-  std::unique_ptr<folly::IOBuf> tokenValue;
-
-  folly::dynamic toDynamic() const;
-};
-
-struct MOQTPathSetupParameter {
-  std::string name = "path";
-  std::string value;
-
-  folly::dynamic toDynamic() const;
-};
-
-struct MOQTMaxRequestIdSetupParameter {
-  std::string name = "max_request_id";
-  uint64_t value{0};
-
-  folly::dynamic toDynamic() const;
-};
-
-struct MOQTMaxAuthTokenCacheSizeSetupParameter {
-  std::string name = "max_auth_token_cache_size";
-  uint64_t value{0};
-
-  folly::dynamic toDynamic() const;
-};
-
-struct MOQTImplementationSetupParameter {
-  std::string name = "implementation";
-  std::string value;
-
-  folly::dynamic toDynamic() const;
-};
-
-struct MOQTUnknownSetupParameter {
-  std::string name = "unknown";
-  uint64_t nameBytes{0};
-  folly::Optional<uint64_t> length;
-  folly::Optional<uint64_t> value;
-  std::unique_ptr<folly::IOBuf> valueBytes;
-
-  folly::dynamic toDynamic() const;
-};
-
-using MOQTSetupParameter = std::variant<
-    MOQTAuthoritySetupParameter,
-    MOQTAuthorizationTokenSetupParameter,
-    MOQTPathSetupParameter,
-    MOQTMaxRequestIdSetupParameter,
-    MOQTMaxAuthTokenCacheSizeSetupParameter,
-    MOQTImplementationSetupParameter,
-    MOQTUnknownSetupParameter>;
-
-// Helper to convert variant to dynamic
-folly::dynamic setupParameterToDynamic(const MOQTSetupParameter& param);
-
 enum MOQTByteStringType { STRING_VALUE, VALUE_BYTES, UNKNOWN_VALUE };
 struct MOQTByteString {
   std::string value;
@@ -176,7 +105,7 @@ class MOQTClientSetupMessage : public MOQTBaseControlMessage {
   uint64_t numberOfSupportedVersions{0};
   std::vector<uint64_t> supportedVersions;
   uint64_t numberOfParameters{0};
-  std::vector<MOQTSetupParameter> setupParameters;
+  std::vector<MOQTParameter> setupParameters;
 };
 
 class MOQTServerSetupMessage : public MOQTBaseControlMessage {
@@ -187,7 +116,7 @@ class MOQTServerSetupMessage : public MOQTBaseControlMessage {
   folly::dynamic toDynamic() const override;
   uint64_t selectedVersion{0};
   uint64_t numberOfParameters{0};
-  std::vector<MOQTSetupParameter> setupParameters;
+  std::vector<MOQTParameter> setupParameters;
 };
 
 class MOQTGoaway : public MOQTBaseControlMessage {

moxygen/mlog/MLogger.cpp

@@ -98,7 +98,7 @@ MOQTClientSetupMessage MLogger::createClientSetupControlMessage(
     uint64_t numberOfSupportedVersions,
     std::vector<uint64_t> supportedVersions,
     uint64_t numberOfParameters,
-    std::vector<MOQTSetupParameter> params) {
+    std::vector<MOQTParameter> params) {
   MOQTClientSetupMessage client;
   client.numberOfSupportedVersions = numberOfSupportedVersions;
   client.supportedVersions = std::move(supportedVersions);
@@ -110,7 +110,7 @@ MOQTClientSetupMessage MLogger::createClientSetupControlMessage(
 MOQTServerSetupMessage MLogger::createServerSetupControlMessage(
     uint64_t selectedVersion,
     uint64_t number_of_parameters,
-    std::vector<MOQTSetupParameter> params) {
+    std::vector<MOQTParameter> params) {
   MOQTServerSetupMessage server;
   server.selectedVersion = selectedVersion;
   server.numberOfParameters = number_of_parameters;
@@ -189,15 +189,12 @@ void MLogger::logClientSetup(
   std::vector<uint64_t> versions = setup.supportedVersions;
 
   // Add Params to params vector
-  std::vector<MOQTSetupParameter> params =
-      convertSetupParamsToMoQTSetupParams(setup.params);
-
-  auto msg = std::make_unique<MOQTClientSetupMessage>();
-  msg->numberOfSupportedVersions = versions.size();
-  msg->supportedVersions = std::move(versions);
-  msg->numberOfParameters = params.size();
-  msg->setupParameters = std::move(params);
+  std::vector<MOQTParameter> params =
+      convertSetupParamsToMoQTParams(setup.params);
 
+  std::unique_ptr<MOQTBaseControlMessage> msg =
+      std::make_unique<MOQTClientSetupMessage>(createClientSetupControlMessage(
+          versions.size(), versions, params.size(), params));
   logControlMessage(
       controlType, kFirstBidiStreamId, folly::none, std::move(msg));
 }
@@ -206,14 +203,11 @@ void MLogger::logServerSetup(
     const ServerSetup& setup,
     ControlMessageType controlType) {
   // Add Params to params vector
-  std::vector<MOQTSetupParameter> params =
-      convertSetupParamsToMoQTSetupParams(setup.params);
-
-  auto msg = std::make_unique<MOQTServerSetupMessage>();
-  msg->selectedVersion = setup.selectedVersion;
-  msg->numberOfParameters = params.size();
-  msg->setupParameters = std::move(params);
-
+  std::vector<MOQTParameter> params =
+      convertSetupParamsToMoQTParams(setup.params);
+  std::unique_ptr<MOQTBaseControlMessage> msg =
+      std::make_unique<MOQTServerSetupMessage>(createServerSetupControlMessage(
+          setup.selectedVersion, params.size(), params));
   logControlMessage(
       controlType, kFirstBidiStreamId, folly::none, std::move(msg));
 }
@@ -772,68 +766,6 @@ std::vector<MOQTParameter> MLogger::convertSetupParamsToMoQTParams(
   return moqParams;
 }
 
-std::vector<MOQTSetupParameter> MLogger::convertSetupParamsToMoQTSetupParams(
-    const SetupParameters& params) {
-  std::vector<MOQTSetupParameter> moqSetupParams;
-
-  for (const auto& param : params) {
-    switch (param.key) {
-      case folly::to_underlying(SetupKey::PATH): {
-        MOQTPathSetupParameter p;
-        p.value = param.asString;
-        moqSetupParams.emplace_back(std::move(p));
-        break;
-      }
-      case folly::to_underlying(SetupKey::MAX_REQUEST_ID): {
-        MOQTMaxRequestIdSetupParameter p;
-        p.value = param.asUint64;
-        moqSetupParams.emplace_back(std::move(p));
-        break;
-      }
-      case folly::to_underlying(SetupKey::MAX_AUTH_TOKEN_CACHE_SIZE): {
-        MOQTMaxAuthTokenCacheSizeSetupParameter p;
-        p.value = param.asUint64;
-        moqSetupParams.emplace_back(std::move(p));
-        break;
-      }
-      case folly::to_underlying(SetupKey::AUTHORITY): {
-        MOQTAuthoritySetupParameter p;
-        p.value = param.asString;
-        moqSetupParams.emplace_back(std::move(p));
-        break;
-      }
-      case folly::to_underlying(SetupKey::MOQT_IMPLEMENTATION): {
-        MOQTImplementationSetupParameter p;
-        p.value = param.asString;
-        moqSetupParams.emplace_back(std::move(p));
-        break;
-      }
-      case folly::to_underlying(SetupKey::AUTHORIZATION_TOKEN): {
-        // AUTHORIZATION_TOKEN is more complex, using unknown for now
-        // TODO: properly parse authorization token
-        MOQTUnknownSetupParameter p;
-        p.nameBytes = param.key;
-        moqSetupParams.emplace_back(std::move(p));
-        break;
-      }
-      default: {
-        MOQTUnknownSetupParameter p;
-        p.nameBytes = param.key;
-        // Check if string value is initialized (odd keys are strings per MoQ
-        // spec)
-        if (param.key % 2) {
-          p.valueBytes = folly::IOBuf::copyBuffer(param.asString);
-        } else {
-          p.value = param.asUint64;
-        }
-        moqSetupParams.emplace_back(std::move(p));
-        break;
-      }
-    }
-  }
-  return moqSetupParams;
-}
-
 std::vector<MOQTParameter> MLogger::convertTrackParamsToMoQTParams(
     const TrackRequestParameters& params) {
   std::vector<MOQTParameter> moqParams;