Tweak curl http client so it works with roku

MatthewColvin · MatthewColvin · commit dfa25bc4ab0f · 2025-11-24T21:11:22.000-06:00
diff --git a/Platformio/lib/Device/Custom/RokuHttp.cpp b/Platformio/lib/Device/Custom/RokuHttp.cpp
@@ -108,10 +108,17 @@ void RokuHttp::sendKeyPress(const std::string &keyName) {
   }
 
   std::string url = buildRokuUrl("/keypress/" + keyName);
-  mHttpClient->postAsync(url, "")->onError([](const HttpResponse &err) {
-    // TODO: Handle Error Somehow
-    // Handle error silently for now
-  });
+
+  HttpRequest request(HttpRequest::Method::POST, url);
+  // TODO Try and add the other headers from postman here
+  // request.headers["Content-Type"] = "application/x-www-form-urlencoded";
+  request.headers["Expect"] = "";
+  request.headers["Content-Type"] = "application/x-www-form-urlencoded";
+  request.headers["Accept"] = "*/*";
+  request.timeout_ms = 2000;
+
+  mHttpClient->executeAsync(request)
+      ->onReturnCode(200, [](const HttpResponse &sSuccess) {});
 }
 
 void RokuHttp::launchApp(const std::string &appId) {
@@ -121,7 +128,5 @@ void RokuHttp::launchApp(const std::string &appId) {
 
   std::string url = buildRokuUrl("/launch/app");
   std::string body = appId;
-  mHttpClient->postAsync(url, body)->onError([](const HttpResponse &err) {
-    // Handle error silently for now
-  });
+  mHttpClient->postAsync(url, body)->onReturnCode(200, [](const HttpResponse &sSuccess) {});
 }
diff --git a/Platformio/lib/HAL/Hardware/wifi/http/HttpTypes.cpp b/Platformio/lib/HAL/Hardware/wifi/http/HttpTypes.cpp
@@ -21,14 +21,10 @@ HttpRequest::HttpRequest(Method aMethod, const std::string &aUrl, const std::str
 // HttpFuture implementation
 HttpFuture::HttpFuture(std::future<HttpResponse> aFuture)
     : mFuture(std::move(aFuture)),
-      mResponseCallback(nullptr),
-      mErrorCallback(nullptr),
-      mIsBlocking(false),
       mReturnCodeDefaultCallback(nullptr) {}
 
 std::shared_ptr<HttpFuture> HttpFuture::onReturnCode(int aCode, ResponseCallback aCallback) {
   mReturnCodeCallbacks[aCode] = aCallback;
-  checkAndInvoke();
   return shared_from_this();
 }
 
@@ -37,88 +33,14 @@ std::shared_ptr<HttpFuture> HttpFuture::onReturnCode(const std::vector<int> &aCo
   for (int aCode : aCodes) {
     mReturnCodeCallbacks[aCode] = aCallback;
   }
-  checkAndInvoke();
   return shared_from_this();
 }
 
 std::shared_ptr<HttpFuture> HttpFuture::onOtherReturnCode(ResponseCallback aCallback) {
   mReturnCodeDefaultCallback = aCallback;
-  checkAndInvoke();
   return shared_from_this();
 }
 
-std::shared_ptr<HttpFuture> HttpFuture::onResponse(ResponseCallback aCallback) {
-  mResponseCallback = aCallback;
-  checkAndInvoke();
-  return shared_from_this();
-}
-
-std::shared_ptr<HttpFuture> HttpFuture::onError(ErrorCallback aCallback) {
-  mErrorCallback = aCallback;
-  checkAndInvoke();
-  return shared_from_this();
-}
-
-std::shared_ptr<HttpFuture> HttpFuture::then(ResponseCallback aOnResponse, ErrorCallback aOnError) {
-  mResponseCallback = aOnResponse;
-  mErrorCallback = aOnError;
-  checkAndInvoke();
-  return shared_from_this();
-}
-
-std::shared_ptr<HttpFuture> HttpFuture::flatMap(TransformCallback aTransform) {
-  // If future is ready, transform immediately
-  if (mFuture.valid() &&
-      mFuture.wait_for(std::chrono::seconds(0)) == std::future_status::ready) {
-    // Note: exceptions are not used here. If the transform callable throws
-    // and exceptions are disabled, the program will terminate. Callers
-    // should avoid throwing from transform when building without
-    // exceptions (ESP builds).
-    HttpResponse aResp = mFuture.get();
-    return aTransform(aResp);
-  }
-
-  // Otherwise, chain the transformation
-  std::shared_ptr<HttpFuture> aSelf = shared_from_this();
-  onResponse([aSelf, aTransform](const HttpResponse &aResp) {
-    auto aNextFuture = aTransform(aResp);
-    if (aNextFuture) {
-      // Propagate callbacks to next future if needed
-      // (callbacks are already set on the returned future)
-    }
-  });
-
-  return shared_from_this();
-}
-
-std::shared_ptr<HttpFuture> HttpFuture::map(
-    std::function<HttpResponse(const HttpResponse &)> aTransform) {
-  if (mFuture.valid() &&
-      mFuture.wait_for(std::chrono::seconds(0)) == std::future_status::ready) {
-    // Note: do not throw in transform when building without exceptions.
-    HttpResponse aResp = mFuture.get();
-    HttpResponse aTransformed = aTransform(aResp);
-    auto aNewFuture = std::make_shared<HttpFuture>(
-        std::async(std::launch::deferred, [aTransformed]() { return aTransformed; }));
-    return aNewFuture;
-  }
-
-  std::shared_ptr<HttpFuture> aSelf = shared_from_this();
-  auto aMappedPromise = std::make_shared<std::promise<HttpResponse>>();
-
-  onResponse([aSelf, aTransform, aMappedPromise](const HttpResponse &aResp) {
-    // If transform throws and exceptions are disabled the program will
-    // terminate. Prefer not to throw in callbacks when building for ESP.
-    HttpResponse aTransformed = aTransform(aResp);
-    aMappedPromise->set_value(aTransformed);
-  });
-
-  onError([aMappedPromise](const HttpResponse &aErr) { aMappedPromise->set_value(aErr); });
-
-  auto aNewFuture = std::make_shared<HttpFuture>(aMappedPromise->get_future());
-  return aNewFuture;
-}
-
 HttpResponse HttpFuture::get() {
   if (mFuture.valid()) {
     return mFuture.get();
@@ -130,72 +52,31 @@ HttpResponse HttpFuture::get() {
   return aError;
 }
 
-bool HttpFuture::ready() const {
+bool HttpFuture::IsReady() const {
   if (!mFuture.valid())
     return false;
   return mFuture.wait_for(std::chrono::seconds(0)) == std::future_status::ready;
 }
 
-std::shared_ptr<HttpFuture> HttpFuture::always(std::function<void(const HttpResponse &)> aCallback) {
-  auto aCb = [aCallback](const HttpResponse &aResp) { aCallback(aResp); };
-
-  // Register for both success and error
-  if (!mResponseCallback) {
-    mResponseCallback = aCb;
-  } else {
-    auto aExisting = mResponseCallback;
-    mResponseCallback = [aExisting, aCb](const HttpResponse &aResp) {
-      aExisting(aResp);
-      aCb(aResp);
-    };
+void HttpFuture::checkAndInvoke() {
+  if (!IsReady()) {
+    return;
   }
 
-  if (!mErrorCallback) {
-    mErrorCallback = aCb;
-  } else {
-    auto aExisting = mErrorCallback;
-    mErrorCallback = [aExisting, aCb](const HttpResponse &aResp) {
-      aExisting(aResp);
-      aCb(aResp);
-    };
-  }
+  HttpResponse aResponse = mFuture.get();
 
-  checkAndInvoke();
-  return shared_from_this();
-}
+  std::lock_guard<std::mutex> aLock(mCallbackMutex);
 
-void HttpFuture::checkAndInvoke() {
-  if (!mFuture.valid())
+  // Check for specific return code handler
+  auto aIt = mReturnCodeCallbacks.find(aResponse.status_code);
+  if (aIt != mReturnCodeCallbacks.end()) {
+    aIt->second(aResponse);
     return;
+  }
 
-  if (mFuture.wait_for(std::chrono::seconds(0)) == std::future_status::ready) {
-    // Note: avoid throwing inside futures/callbacks when building without
-    // exceptions. mFuture.get() should return a valid HttpResponse value
-    // (implementations should set an error HttpResponse instead of
-    // throwing). If an exception does escape and exceptions are disabled,
-    // the program will terminate.
-    HttpResponse aResponse = mFuture.get();
-
-    std::lock_guard<std::mutex> aLock(mCallbackMutex);
-
-    // Check for specific return code handler
-    auto aIt = mReturnCodeCallbacks.find(aResponse.status_code);
-    if (aIt != mReturnCodeCallbacks.end()) {
-      aIt->second(aResponse);
-      return;
-    }
-
-    // Check for default return code handler
-    if (mReturnCodeDefaultCallback) {
-      mReturnCodeDefaultCallback(aResponse);
-      return;
-    }
-
-    // Fall back to success/error handlers
-    if (aResponse.success && mResponseCallback) {
-      mResponseCallback(aResponse);
-    } else if (!aResponse.success && mErrorCallback) {
-      mErrorCallback(aResponse);
-    }
+  // Check for default return code handler
+  if (mReturnCodeDefaultCallback) {
+    mReturnCodeDefaultCallback(aResponse);
+    return;
   }
 }
diff --git a/Platformio/lib/HAL/Hardware/wifi/http/HttpTypes.hpp b/Platformio/lib/HAL/Hardware/wifi/http/HttpTypes.hpp
@@ -51,8 +51,6 @@ struct HttpRequest {
 class HttpFuture : public std::enable_shared_from_this<HttpFuture> {
 public:
   using ResponseCallback = std::function<void(const HttpResponse &)>;
-  using ErrorCallback = std::function<void(const HttpResponse &)>;
-  using TransformCallback = std::function<std::shared_ptr<HttpFuture>(const HttpResponse &)>;
 
   explicit HttpFuture(std::future<HttpResponse> aFuture);
 
@@ -109,55 +107,6 @@ class HttpFuture : public std::enable_shared_from_this<HttpFuture> {
    */
   std::shared_ptr<HttpFuture> onOtherReturnCode(ResponseCallback aCallback);
 
-  /**
-   * @brief Register a callback to be invoked on successful response (status 200-299)
-   *
-   * @param aCallback Function to call with the response
-   * @return Shared pointer to this HttpFuture for chaining
-   */
-  std::shared_ptr<HttpFuture> onResponse(ResponseCallback aCallback);
-
-  /**
-   * @brief Register a callback to be invoked on error (non-2xx status or network error)
-   *
-   * @param aCallback Function to call with the error response
-   * @return Shared pointer to this HttpFuture for chaining
-   */
-  std::shared_ptr<HttpFuture> onError(ErrorCallback aCallback);
-
-  /**
-   * @brief Register callbacks for both success and error cases
-   *
-   * @param aOnResponse Callback for successful responses
-   * @param aOnError Callback for errors
-   * @return Shared pointer to this HttpFuture for chaining
-   */
-  std::shared_ptr<HttpFuture> then(ResponseCallback aOnResponse, ErrorCallback aOnError);
-
-  /**
-   * @brief Transform the response into another HttpFuture (monadic bind)
-   *
-   * Allows chaining HTTP requests: first request result feeds into second request
-   * @example
-   * httpclient->getAsync("https://api.example.com/user/1")
-   *     ->flatMap([httpclient](const HttpResponse& resp) {
-   *         // Parse resp and make another request
-   *         return httpclient->getAsync("https://api.example.com/user/1/posts");
-   *     })
-   *     ->onResponse([](const HttpResponse& resp) {
-   *         std::cout << resp.body << std::endl;
-   *     });
-   */
-  std::shared_ptr<HttpFuture> flatMap(TransformCallback aTransform);
-
-  /**
-   * @brief Map/transform the response into a new value
-   *
-   * @param aTransform Function to transform the response
-   * @return Shared pointer to a new HttpFuture containing the transformed result
-   */
-  std::shared_ptr<HttpFuture> map(std::function<HttpResponse(const HttpResponse &)> aTransform);
-
   /**
    * @brief Block and get the response (synchronous)
    *
@@ -183,7 +132,7 @@ class HttpFuture : public std::enable_shared_from_this<HttpFuture> {
    *
    * @return true if response is ready
    */
-  bool ready() const;
+  bool IsReady() const;
 
   /**
    * @brief Register a callback to invoke when response is ready (regardless of success/error)
@@ -195,9 +144,7 @@ class HttpFuture : public std::enable_shared_from_this<HttpFuture> {
 
 private:
   std::future<HttpResponse> mFuture;
-  ResponseCallback mResponseCallback;
-  ErrorCallback mErrorCallback;
-  bool mIsBlocking;
+
   mutable std::mutex mCallbackMutex;
   std::map<int, ResponseCallback> mReturnCodeCallbacks;
   ResponseCallback mReturnCodeDefaultCallback;
@@ -206,7 +153,4 @@ class HttpFuture : public std::enable_shared_from_this<HttpFuture> {
    * @brief Check if future is ready and invoke appropriate callback
    */
   void checkAndInvoke();
-};
-
-// Convenience type aliases
-using HttpFuturePtr = std::shared_ptr<HttpFuture>;
+};
diff --git a/Platformio/lib/JsonConfigUI/screen/JsonHomeScreen.cpp b/Platformio/lib/JsonConfigUI/screen/JsonHomeScreen.cpp
@@ -102,6 +102,10 @@ JsonHomeScreen::JsonHomeScreen(DeviceFactory &aFactory)
                                      auto jsonDevices = mFactory.getJsonDevices();
                                      return std::make_unique<UI::Page::AddDevice>(mFactory.getActiveDevices(), jsonDevices);
                                    }});
+  mStatusBar->AddDebugSettingItem({"Add Compile Time Device", LV_SYMBOL_EDIT, [this] {
+                                     auto compiledDevices = mFactory.getCompileTimeDevices();
+                                     return std::make_unique<UI::Page::AddDevice>(mFactory.getActiveDevices(), compiledDevices);
+                                   }});
 }
 
 bool JsonHomeScreen::checkSceneForEntryExit(const std::string &aFileName) {
diff --git a/Platformio/lib/SimulatorHalImpl/wifiHandlerSim/CurlHttpClient.cpp b/Platformio/lib/SimulatorHalImpl/wifiHandlerSim/CurlHttpClient.cpp
diff --git a/Platformio/lib/SimulatorHalImpl/wifiHandlerSim/CurlHttpClient.hpp b/Platformio/lib/SimulatorHalImpl/wifiHandlerSim/CurlHttpClient.hpp
