more work

Author: hhvrc

include/http/HTTPClientState.h

@@ -28,7 +28,7 @@ namespace OpenShock::HTTP {
     }
 
     struct [[nodiscard]] StartRequestResult {
-      int statusCode;
+      uint32_t statusCode;
       bool isChunked;
       uint32_t contentLength;
     };

include/http/HTTPResponse.h

@@ -36,10 +36,10 @@ namespace OpenShock::HTTP {
       , m_contentLength(0)
     {
     }
-    
+
     inline bool Ok() const { return m_error == HTTPError::None && !m_state.expired(); }
     inline HTTPError Error() const { return m_error; }
-    inline int StatusCode() const { return m_statusCode; }
+    inline uint32_t StatusCode() const { return m_statusCode; }
     inline uint32_t ContentLength() const { return m_contentLength; }
 
     inline ReadResult<uint32_t> ReadStream(DownloadCallback downloadCallback) {
@@ -67,7 +67,7 @@ namespace OpenShock::HTTP {
   private:
     std::weak_ptr<HTTPClientState> m_state;
     HTTPError m_error;
-    int m_statusCode;
+    uint32_t m_statusCode;
     uint32_t m_contentLength;
   };
 } // namespace OpenShock::HTTP

src/http/HTTPClientState.cpp

@@ -64,8 +64,9 @@ std::variant<HTTP::HTTPClientState::StartRequestResult, HTTP::HTTPError> HTTP::H
   }
 
   int code = esp_http_client_get_status_code(m_handle);
+  if (code < 0) code = 0;
 
-  return StartRequestResult {code, isChunked, static_cast<uint32_t>(contentLength)};
+  return StartRequestResult {static_cast<uint32_t>(code), isChunked, static_cast<uint32_t>(contentLength)};
 }
 
 HTTP::ReadResult<uint32_t> HTTP::HTTPClientState::ReadStreamImpl(DownloadCallback cb)

src/serial/command_handlers/domain.cpp

@@ -1,7 +1,8 @@
 #include "serial/command_handlers/common.h"
 
 #include "config/Config.h"
-#include "serialization/JsonAPI.h"
+#include "http/HTTPClient.h"
+#include "http/JsonAPI.h"
 
 #include <esp_system.h>
 
@@ -32,21 +33,19 @@ void _handleDomainCommand(std::string_view arg, bool isAutomated) {
   char uri[OPENSHOCK_URI_BUFFER_SIZE];
   sprintf(uri, "https://%.*s/1", arg.length(), arg.data());
 
-  auto resp = OpenShock::HTTP::GetJSON<OpenShock::Serialization::JsonAPI::BackendVersionResponse>(
-    uri,
-    {
-      {"Accept", "application/json"}
-  },
-    OpenShock::Serialization::JsonAPI::ParseBackendVersionJsonResponse,
-    std::array<uint16_t, 2> {200}
-  );
-
-  if (resp.result != OpenShock::HTTP::RequestResult::Success) {
-    SERPR_ERROR("Tried to connect to \"%.*s\", but failed with status [%d] (%s), refusing to save domain to config", arg.length(), arg.data(), resp.code, resp.ResultToString());
+  OpenShock::HTTP::HTTPClient client;
+  auto response = client.GetJson<OpenShock::Serialization::JsonAPI::BackendVersionResponse>(uri, OpenShock::Serialization::JsonAPI::ParseBackendVersionJsonResponse);
+  if (!response.Ok() || response.StatusCode() != 200) {
+    SERPR_ERROR("Tried to connect to \"%.*s\", but failed with status [%d] (%s), refusing to save domain to config", arg.length(), arg.data(), response.StatusCode(), OpenShock::HTTP::HTTPErrorToString(response.Error()));
     return;
   }
 
-  OS_LOGI(TAG, "Successfully connected to \"%.*s\", version: %s, commit: %s, current time: %s", arg.length(), arg.data(), resp.data.version.c_str(), resp.data.commit.c_str(), resp.data.currentTime.c_str());
+  auto content = response.ReadJson();
+  if (content.error != OpenShock::HTTP::HTTPError::None) {
+    #error TODO: Handle this
+  }
+
+  OS_LOGI(TAG, "Successfully connected to \"%.*s\", version: %s, commit: %s, current time: %s", arg.length(), arg.data(), content.data.version.c_str(), content.data.commit.c_str(), content.data.currentTime.c_str());
 
   bool result = OpenShock::Config::SetBackendDomain(std::string(arg));
 

src/util/ParitionUtils.cpp

@@ -4,6 +4,7 @@ const char* const TAG = "PartitionUtils";
 
 #include "Core.h"
 #include "Hashing.h"
+#include "http/HTTPClient.h"
 #include "Logging.h"
 #include "util/HexUtils.h"
 
@@ -34,25 +35,6 @@ bool OpenShock::FlashPartitionFromUrl(const esp_partition_t* partition, const ch
   std::size_t contentWritten = 0;
   int64_t lastProgress       = 0;
 
-  auto sizeValidator = [partition, &contentLength, progressCallback, &lastProgress](std::size_t size) -> bool {
-    if (size > partition->size) {
-      OS_LOGE(TAG, "Remote partition binary is too large");
-      return false;
-    }
-
-    // Erase app partition.
-    if (esp_partition_erase_range(partition, 0, partition->size) != ESP_OK) {
-      OS_LOGE(TAG, "Failed to erase partition in preparation for update");
-      return false;
-    }
-
-    contentLength = size;
-
-    lastProgress = OpenShock::millis();
-    progressCallback(0, contentLength, 0.0f);
-
-    return true;
-  };
   auto dataWriter = [partition, &sha256, &contentLength, &contentWritten, progressCallback, &lastProgress](std::size_t offset, const uint8_t* data, std::size_t length) -> bool {
     if (esp_partition_write(partition, offset, data, length) != ESP_OK) {
       OS_LOGE(TAG, "Failed to write to partition");
@@ -76,23 +58,33 @@ bool OpenShock::FlashPartitionFromUrl(const esp_partition_t* partition, const ch
   };
 
   // Start streaming binary to app partition.
-  auto appBinaryResponse = OpenShock::HTTP::Download(
-    remoteUrl,
-    {
-      {"Accept", "application/octet-stream"}
-  },
-    sizeValidator,
-    dataWriter,
-    std::array<uint16_t, 2> {200, 304},
-    180'000
-  );  // 3 minutes
-  if (appBinaryResponse.result != OpenShock::HTTP::RequestResult::Success) {
-    OS_LOGE(TAG, "Failed to download remote partition binary: [%u]", appBinaryResponse.code);
+  OpenShock::HTTP::HTTPClient client(180'000); // 3 minutes timeout
+  auto response = client.Get(remoteUrl);
+  if (!response.Ok() || response.StatusCode() != 200 || response.StatusCode() != 304) {
+    OS_LOGE(TAG, "Failed to download remote partition binary: [%u]", response.StatusCode());
     return false;
   }
 
+  if (response.ContentLength() > partition->size) {
+    OS_LOGE(TAG, "Remote partition binary is too large");
+    return false;
+  }
+
+  // Erase app partition.
+  if (esp_partition_erase_range(partition, 0, partition->size) != ESP_OK) {
+    OS_LOGE(TAG, "Failed to erase partition in preparation for update");
+    return false;
+  }
+
+  contentLength = response.ContentLength();
+
+  lastProgress = OpenShock::millis();
+  progressCallback(0, contentLength, 0.0f);
+
+  contentLength = response.ReadStream(dataWriter);
+
   progressCallback(contentLength, contentLength, 1.0f);
-  OS_LOGD(TAG, "Wrote %u bytes to partition", appBinaryResponse.data);
+  OS_LOGD(TAG, "Wrote %u bytes to partition", contentLength);
 
   std::array<uint8_t, 32> localHash;
   if (!sha256.finish(localHash)) {