Add curl_multi_getcontent support

PetrShumilov · PetrShumilov · commit ee9f9670a626 · 2025-11-30T21:10:28.000+03:00
Signed-off-by: Petr Shumilov &lt;p.shumilov@vkteam.ru&gt;
diff --git a/builtin-functions/kphp-light/stdlib/curl-functions.txt b/builtin-functions/kphp-light/stdlib/curl-functions.txt
@@ -281,13 +281,14 @@ function curl_multi_setopt ($multi_handle ::: int, $option ::: int, $value ::: i
 /** @kphp-extern-func-info interruptible */
 function curl_multi_exec ($multi_handle ::: int, &$still_running ::: int) ::: int|false;
 
+/** @kphp-extern-func-info interruptible */
+function curl_multi_getcontent ($curl_handle ::: int ) ::: string|false|null;
+
 /** @kphp-extern-func-info interruptible */
 function curl_multi_close ($multi_handle ::: int) ::: void;
 
 // ===== UNSUPPORTED =====
 /** @kphp-extern-func-info stub generation-required */
-function curl_multi_getcontent ($curl_handle ::: int ) ::: string|false|null;
-/** @kphp-extern-func-info stub generation-required */
 function curl_multi_select ($multi_handle ::: int, $timeout ::: float = 1.0) ::: int|false;
 
 /** @kphp-extern-func-info stub */
diff --git a/runtime-light/stdlib/curl/curl-multi-functions.h b/runtime-light/stdlib/curl/curl-multi-functions.h
@@ -19,6 +19,7 @@
 #include "runtime-light/stdlib/web-transfer-lib/defs.h"
 #include "runtime-light/stdlib/web-transfer-lib/details/web-property.h"
 #include "runtime-light/stdlib/web-transfer-lib/web-composite-transfer.h"
+#include "runtime-light/stdlib/web-transfer-lib/web-simple-transfer.h"
 
 inline auto f$curl_multi_init() noexcept -> kphp::coro::task<kphp::web::curl::multi_type> {
   auto open_res{co_await kphp::forks::id_managed(kphp::web::composite_transfer_open(kphp::web::transfer_backend::CURL))};
@@ -139,6 +140,24 @@ inline auto f$curl_multi_exec(kphp::web::curl::multi_type multi_id, int64_t& sti
   co_return multi_ctx.error_code;
 }
 
+inline auto f$curl_multi_getcontent(kphp::web::curl::easy_type easy_id) noexcept -> kphp::coro::task<Optional<string>> {
+  auto& curl_state{CurlInstanceState::get()};
+  if (!curl_state.easy_ctx.has(easy_id)) [[unlikely]] {
+    co_return false;
+  }
+  auto& easy_ctx{curl_state.easy_ctx.get_or_init(easy_id)};
+  if (easy_ctx.return_transfer) {
+    auto res{co_await kphp::forks::id_managed(kphp::web::simple_transfer_get_response(kphp::web::simple_transfer{easy_id}))};
+    if (!res.has_value()) [[unlikely]] {
+      easy_ctx.set_errno(res.error().code, res.error().description);
+      kphp::web::curl::print_error("Could not get response of curl easy handle", std::move(res.error()));
+      co_return false;
+    }
+    co_return (*res).body;
+  }
+  co_return Optional<string>{};
+}
+
 inline auto f$curl_multi_close(kphp::web::curl::multi_type multi_id) noexcept -> kphp::coro::task<void> {
   auto& curl_state{CurlInstanceState::get()};
   if (!curl_state.multi_ctx.has(multi_id)) [[unlikely]] {
diff --git a/runtime-light/stdlib/web-transfer-lib/details/web-response.h b/runtime-light/stdlib/web-transfer-lib/details/web-response.h
@@ -0,0 +1,95 @@
+// Compiler for PHP (aka KPHP)
+// Copyright (c) 2025 LLC «V Kontakte»
+// Distributed under the GPL v3 License, see LICENSE.notice.txt
+
+#pragma once
+
+#include <__expected/expected.h>
+#include <cstddef>
+#include <expected>
+#include <optional>
+#include <span>
+#include <utility>
+#include <variant>
+
+#include "runtime-common/core/runtime-core.h"
+#include "runtime-light/coroutine/task.h"
+#include "runtime-light/stdlib/diagnostics/logs.h"
+#include "runtime-light/stdlib/web-transfer-lib/defs.h"
+#include "runtime-light/stdlib/web-transfer-lib/details/web-error.h"
+#include "runtime-light/stdlib/web-transfer-lib/web-state.h"
+#include "runtime-light/tl/tl-core.h"
+#include "runtime-light/tl/tl-types.h"
+
+namespace kphp::web::details {
+
+inline auto process_simple_response(std::span<const std::byte> request) noexcept -> kphp::coro::task<std::expected<response, error>> {
+  auto& web_state{WebInstanceState::get()};
+
+  auto session{web_state.session_get_or_init()};
+  if (!session.has_value()) [[unlikely]] {
+    kphp::log::error("failed to start or get session with Web component");
+  }
+
+  if ((*session).get() == nullptr) [[unlikely]] {
+    kphp::log::error("session with Web components has been closed");
+  }
+
+  kphp::stl::vector<std::byte, kphp::memory::script_allocator> ok_or_error_buffer{};
+  response resp{};
+  std::optional<error> err{};
+  auto frame_num{0};
+
+  auto response_buffer_provider{[&frame_num, &ok_or_error_buffer, &resp](size_t size) noexcept -> std::span<std::byte> {
+    switch (frame_num) {
+    case 0:
+      ok_or_error_buffer.resize(size);
+      return {ok_or_error_buffer.data(), size};
+    case 1:
+      resp.headers = string{static_cast<string::size_type>(size), false};
+      return {reinterpret_cast<std::byte*>(resp.headers.buffer()), size};
+    case 2:
+      resp.body = string{static_cast<string::size_type>(size), false};
+      return {reinterpret_cast<std::byte*>(resp.body.buffer()), size};
+    default:
+      kphp::log::assertion(false);
+      return {};
+    }
+  }};
+
+  const auto response_handler{[&frame_num, &err, &ok_or_error_buffer](
+                                  [[maybe_unused]] std::span<std::byte> _) noexcept -> kphp::component::inter_component_session::client::response_readiness {
+    switch (frame_num) {
+    case 0: {
+      frame_num += 1;
+      tl::Either<tl::SimpleWebTransferPerformResultOk, tl::WebError> simple_web_transfer_perform_resp{};
+      tl::fetcher tlf{ok_or_error_buffer};
+      if (!simple_web_transfer_perform_resp.fetch(tlf)) [[unlikely]] {
+        kphp::log::error("failed to parse response of Simple descriptor");
+      }
+      if (auto r{simple_web_transfer_perform_resp.value}; std::holds_alternative<tl::WebError>(r)) {
+        err.emplace(details::process_error(std::get<tl::WebError>(r)));
+        return kphp::component::inter_component_session::client::response_readiness::ready;
+      }
+      return kphp::component::inter_component_session::client::response_readiness::pending;
+    }
+    case 1:
+      frame_num += 1;
+      return kphp::component::inter_component_session::client::response_readiness::pending;
+    case 2: // NOLINT
+      return kphp::component::inter_component_session::client::response_readiness::ready;
+    default:
+      return kphp::component::inter_component_session::client::response_readiness::ready;
+    }
+  }};
+
+  if (auto res{co_await (*session).get()->client.query(request, std::move(response_buffer_provider), response_handler)}; !res) [[unlikely]] {
+    kphp::log::error("failed to send request of Simple descriptor processing");
+  }
+  if (err.has_value()) [[unlikely]] {
+    co_return std::unexpected{std::move(*err)};
+  }
+  co_return std::expected<response, error>{std::move(resp)};
+}
+
+} // namespace kphp::web::details
diff --git a/runtime-light/stdlib/web-transfer-lib/web-simple-transfer.h b/runtime-light/stdlib/web-transfer-lib/web-simple-transfer.h
@@ -15,6 +15,7 @@
 #include "runtime-light/stdlib/diagnostics/logs.h"
 #include "runtime-light/stdlib/web-transfer-lib/defs.h"
 #include "runtime-light/stdlib/web-transfer-lib/details/web-error.h"
+#include "runtime-light/stdlib/web-transfer-lib/details/web-response.h"
 #include "runtime-light/stdlib/web-transfer-lib/web-composite-transfer.h"
 #include "runtime-light/stdlib/web-transfer-lib/web-state.h"
 #include "runtime-light/tl/tl-core.h"
@@ -81,15 +82,6 @@ inline auto simple_transfer_perform(simple_transfer st) noexcept -> kphp::coro::
     co_return std::unexpected{error{.code = WEB_INTERNAL_ERROR_CODE, .description = string{"unknown Simple transfer"}}};
   }
 
-  auto session{web_state.session_get_or_init()};
-  if (!session.has_value()) [[unlikely]] {
-    kphp::log::error("failed to start or get session with Web component");
-  }
-
-  if ((*session).get() == nullptr) [[unlikely]] {
-    kphp::log::error("session with Web components has been closed");
-  }
-
   kphp::stl::vector<tl::webProperty, kphp::memory::script_allocator> tl_props{};
   auto& props{simple2config[st.descriptor].properties};
   for (const auto& [id, val] : props) {
@@ -101,61 +93,21 @@ inline auto simple_transfer_perform(simple_transfer st) noexcept -> kphp::coro::
   tl::storer tls{tl_perform.footprint()};
   tl_perform.store(tls);
 
-  kphp::stl::vector<std::byte, kphp::memory::script_allocator> ok_or_error_buffer{};
-  response resp{};
-  std::optional<error> err{};
-  auto frame_num{0};
-
-  auto response_buffer_provider{[&frame_num, &ok_or_error_buffer, &resp](size_t size) noexcept -> std::span<std::byte> {
-    switch (frame_num) {
-    case 0:
-      ok_or_error_buffer.resize(size);
-      return {ok_or_error_buffer.data(), size};
-    case 1:
-      resp.headers = string{static_cast<string::size_type>(size), false};
-      return {reinterpret_cast<std::byte*>(resp.headers.buffer()), size};
-    case 2:
-      resp.body = string{static_cast<string::size_type>(size), false};
-      return {reinterpret_cast<std::byte*>(resp.body.buffer()), size};
-    default:
-      kphp::log::assertion(false);
-      return {};
-    }
-  }};
+  co_return co_await details::process_simple_response(tls.view());
+}
 
-  const auto response_handler{[&frame_num, &err, &ok_or_error_buffer](
-                                  [[maybe_unused]] std::span<std::byte> _) noexcept -> kphp::component::inter_component_session::client::response_readiness {
-    switch (frame_num) {
-    case 0: {
-      frame_num += 1;
-      tl::Either<tl::SimpleWebTransferPerformResultOk, tl::WebError> simple_web_transfer_perform_resp{};
-      tl::fetcher tlf{ok_or_error_buffer};
-      if (!simple_web_transfer_perform_resp.fetch(tlf)) [[unlikely]] {
-        kphp::log::error("failed to parse response of Simple descriptor performing");
-      }
-      if (auto r{simple_web_transfer_perform_resp.value}; std::holds_alternative<tl::WebError>(r)) {
-        err.emplace(details::process_error(std::get<tl::WebError>(r)));
-        return kphp::component::inter_component_session::client::response_readiness::ready;
-      }
-      return kphp::component::inter_component_session::client::response_readiness::pending;
-    }
-    case 1:
-      frame_num += 1;
-      return kphp::component::inter_component_session::client::response_readiness::pending;
-    case 2: // NOLINT
-      return kphp::component::inter_component_session::client::response_readiness::ready;
-    default:
-      return kphp::component::inter_component_session::client::response_readiness::ready;
-    }
-  }};
+inline auto simple_transfer_get_response(simple_transfer st) noexcept -> kphp::coro::task<std::expected<response, error>> {
+  auto& web_state{WebInstanceState::get()};
 
-  if (auto res{co_await (*session).get()->client.query(tls.view(), std::move(response_buffer_provider), response_handler)}; !res) [[unlikely]] {
-    kphp::log::error("failed to send request of Simple descriptor performing");
-  }
-  if (err.has_value()) [[unlikely]] {
-    co_return std::unexpected{std::move(*err)};
+  if (!web_state.simple_transfer2config.contains(st.descriptor)) {
+    co_return std::unexpected{error{.code = WEB_INTERNAL_ERROR_CODE, .description = string{"unknown Simple transfer"}}};
   }
-  co_return std::expected<response, error>{std::move(resp)};
+
+  tl::SimpleWebTransferGetResponse web_transfer_get_resp{.descriptor = tl::u64{st.descriptor}};
+  tl::storer tls{web_transfer_get_resp.footprint()};
+  web_transfer_get_resp.store(tls);
+
+  co_return co_await details::process_simple_response(tls.view());
 }
 
 inline auto simple_transfer_reset(simple_transfer st) noexcept -> kphp::coro::task<std::expected<void, error>> {
diff --git a/runtime-light/tl/tl-functions.h b/runtime-light/tl/tl-functions.h
@@ -453,6 +453,22 @@ class SimpleWebTransferPerform final {
   }
 };
 
+class SimpleWebTransferGetResponse final {
+  static constexpr uint32_t SIMPLE_WEB_TRANSFER_GET_RESPONSE_MAGIC = 0xAADD'FF24;
+
+public:
+  tl::u64 descriptor;
+
+  void store(tl::storer& tls) const noexcept {
+    tl::magic{.value = SIMPLE_WEB_TRANSFER_GET_RESPONSE_MAGIC}.store(tls);
+    descriptor.store(tls);
+  }
+
+  constexpr size_t footprint() const noexcept {
+    return tl::magic{.value = SIMPLE_WEB_TRANSFER_GET_RESPONSE_MAGIC}.footprint() + descriptor.footprint();
+  }
+};
+
 class SimpleWebTransferClose final {
   static constexpr uint32_t SIMPLE_WEB_TRANSFER_CLOSE_MAGIC = 0x36F7'16BB;
 
