Fix GitHub Actions (#1)

Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>

Author: jviotti

.github/workflows/ci.yml

@@ -57,7 +57,7 @@ jobs:
     steps:
       - name: Install dependencies (GNU/Linux)
         if: runner.os == 'linux'
-        run: sudo apt-get install --yes clang-format
+        run: sudo apt-get install --yes clang-format libcurl4-openssl-dev
 
       # See https://github.com/actions/runner-images/issues/8659
       - name: Workaround Clang issue (GNU/Linux)

CMakeLists.txt

@@ -1,4 +1,10 @@
 cmake_minimum_required(VERSION 3.24)
+
+# Needs to happen before the first call to "project()".
+if(WIN32)
+  include(cmake/VCPKG.cmake)
+endif()
+
 project(hydra VERSION 0.0.1 LANGUAGES CXX
   DESCRIPTION "A convenience networking library for modern C++")
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")

cmake/Doxygen.cmake

@@ -1,3 +1,4 @@
+# TODO: Move this to Noa and also pull from JSON Toolkit
 find_package(Doxygen)
 if(DOXYGEN_FOUND)
   set(DOXYGEN_IN "${PROJECT_SOURCE_DIR}/doxygen/Doxyfile.in")

cmake/VCPKG.cmake

@@ -0,0 +1,18 @@
+# TODO: Move this to Noa
+if(DEFINED ENV{VCPKG_ROOT})
+  set(VCPKG_CMAKE_TOOLCHAIN $ENV{VCPKG_ROOT})
+  cmake_path(APPEND VCPKG_CMAKE_TOOLCHAIN scripts buildsystems vcpkg.cmake)
+else()
+  # Attempt to find vcpkg from standard locations
+  # Useful for GitHub Actions, which does not set VCPKG_ROOT
+  find_file(VCPKG_CMAKE_TOOLCHAIN
+    NAMES scripts/buildsystems/vcpkg.cmake
+    PATHS C:/src/vcpkg C:/dev/vcpkg C:/vcpkg
+    NO_DEFAULT_PATH)
+endif()
+if(EXISTS "${VCPKG_CMAKE_TOOLCHAIN}")
+  message(STATUS "Using VCPKG toolchain: ${VCPKG_CMAKE_TOOLCHAIN}")
+  set(CMAKE_TOOLCHAIN_FILE "${VCPKG_CMAKE_TOOLCHAIN}" CACHE STRING "VCPKG toolchain file")
+else()
+  message(FATAL_ERROR "Could NOT find VCPKG")
+endif()

config.cmake.in

@@ -8,5 +8,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
   find_package(Threads REQUIRED)
 endif()
 
+find_package(CURL REQUIRED)
 include("${CMAKE_CURRENT_LIST_DIR}/sourcemeta_hydra_http.cmake")
 check_required_components("@PROJECT_NAME@")

doxygen/index.markdown

@@ -8,8 +8,8 @@ abstracts the gory details of making HTTP requests using
 [`libcurl`](https://curl.se/libcurl/), including streaming.
 
 It targets C++20 and supports the Clang, GCC, and MSVC compilers on macOS,
-GNU/Linux, FreeBSD, Windows, and Unikraft, and it is designed to integrate well
-with other Sourcemeta libraries like [JSON
+GNU/Linux, Windows, and Unikraft, and it is designed to integrate well with
+other Sourcemeta libraries like [JSON
 Toolkit](https://jsontoolkit.sourcemeta.com).
 
 Installation

src/http/CMakeLists.txt

@@ -25,7 +25,7 @@ set_target_properties(sourcemeta_hydra_http PROPERTIES
   EXPORT_NAME hydra::http
   FOLDER "Hydra/HTTP")
 
-target_link_libraries(sourcemeta_hydra_http PRIVATE curl)
+target_link_libraries(sourcemeta_hydra_http PRIVATE CURL::libcurl)
 
 include(GenerateExportHeader)
 generate_export_header(sourcemeta_hydra_http

src/http/include/sourcemeta/hydra/http_error.h

@@ -13,6 +13,13 @@
 
 namespace sourcemeta::hydra::http {
 
+// Exporting symbols that depends on the standard C++ library is considered
+// safe.
+// https://learn.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-2-c4275?view=msvc-170&redirectedfrom=MSDN
+#if defined(_MSC_VER)
+#pragma warning(disable : 4251 4275)
+#endif
+
 class SOURCEMETA_HYDRA_HTTP_EXPORT Error : public std::exception {
 public:
   Error(std::string message) : message_{std::move(message)} {}
@@ -24,6 +31,10 @@ class SOURCEMETA_HYDRA_HTTP_EXPORT Error : public std::exception {
   std::string message_;
 };
 
+#if defined(_MSC_VER)
+#pragma warning(default : 4251 4275)
+#endif
+
 } // namespace sourcemeta::hydra::http
 
 #endif

src/http/include/sourcemeta/hydra/http_request.h

@@ -30,7 +30,16 @@ class SOURCEMETA_HYDRA_HTTP_EXPORT Request {
 
 private:
   Stream stream;
+// Exporting symbols that depends on the standard C++ library is considered
+// safe.
+// https://learn.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-2-c4275?view=msvc-170&redirectedfrom=MSDN
+#if defined(_MSC_VER)
+#pragma warning(disable : 4251)
+#endif
   std::set<std::string> capture_;
+#if defined(_MSC_VER)
+#pragma warning(default : 4251)
+#endif
 };
 
 } // namespace sourcemeta::hydra::http

src/http/include/sourcemeta/hydra/http_response.h

@@ -28,8 +28,17 @@ class SOURCEMETA_HYDRA_HTTP_EXPORT Response {
 
 private:
   Status status_;
+// Exporting symbols that depends on the standard C++ library is considered
+// safe.
+// https://learn.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-2-c4275?view=msvc-170&redirectedfrom=MSDN
+#if defined(_MSC_VER)
+#pragma warning(disable : 4251)
+#endif
   std::map<std::string, std::string> headers_;
   std::istringstream stream_;
+#if defined(_MSC_VER)
+#pragma warning(default : 4251)
+#endif
 };
 
 } // namespace sourcemeta::hydra::http

src/http/include/sourcemeta/hydra/http_status.h

@@ -1,6 +1,12 @@
 #ifndef SOURCEMETA_HYDRA_HTTP_STATUS_H
 #define SOURCEMETA_HYDRA_HTTP_STATUS_H
 
+#if defined(__EMSCRIPTEN__) || defined(__Unikraft__)
+#define SOURCEMETA_HYDRA_HTTP_EXPORT
+#else
+#include "http_export.h"
+#endif
+
 #include <cstdint> // std::uint16_t
 #include <ostream> // std::ostream
 
@@ -81,7 +87,9 @@ enum class Status : std::uint16_t {
   NETWORK_AUTHENTICATION_REQUIRED = 511
 };
 
-auto operator<<(std::ostream &stream, const Status value) -> std::ostream &;
+auto SOURCEMETA_HYDRA_HTTP_EXPORT operator<<(std::ostream &stream,
+                                             const Status value)
+    -> std::ostream &;
 
 } // namespace sourcemeta::hydra::http
 

src/http/include/sourcemeta/hydra/http_stream.h

@@ -50,7 +50,16 @@ class SOURCEMETA_HYDRA_HTTP_EXPORT Stream {
   // No need to make this private, as the contents of `Internal`
   // are already hidden with the PIMPL idiom.
 public:
+// Exporting symbols that depends on the standard C++ library is considered
+// safe.
+// https://learn.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-2-c4275?view=msvc-170&redirectedfrom=MSDN
+#if defined(_MSC_VER)
+#pragma warning(disable : 4251)
+#endif
   std::unique_ptr<Internal> internal;
+#if defined(_MSC_VER)
+#pragma warning(default : 4251)
+#endif
 };
 
 } // namespace sourcemeta::hydra::http

src/http/stream_curl.cc

@@ -223,7 +223,17 @@ auto Stream::send() -> std::future<Status> {
       handle_curl(curl_easy_setopt(this->internal->handle,
                                    CURLOPT_CUSTOMREQUEST, "PUT"));
       break;
+
+      // Can't find it in the docs, but seems like MSVC defines
+      // a DELETE macro that confuses this clause.
+#ifdef WIN32
+#pragma push_macro("DELETE")
+#undef DELETE
+#endif
     case Method::DELETE:
+#ifdef WIN32
+#pragma pop_macro("DELETE")
+#endif
       handle_curl(curl_easy_setopt(this->internal->handle,
                                    CURLOPT_CUSTOMREQUEST, "DELETE"));
       break;
@@ -254,11 +264,6 @@ auto Stream::send() -> std::future<Status> {
   handle_curl(curl_easy_setopt(this->internal->handle, CURLOPT_HTTPHEADER,
                                this->internal->headers));
 
-  // This tells libcurl the maximum time any cached certificate store it has in
-  // memory may be kept and reused for new connections.
-  handle_curl(curl_easy_setopt(this->internal->handle, CURLOPT_CA_CACHE_TIMEOUT,
-                               604800L));
-
   handle_curl(curl_easy_setopt(this->internal->handle, CURLOPT_WRITEFUNCTION,
                                callback_on_body));
   handle_curl(

vcpkg.json

@@ -0,0 +1,3 @@
+{
+  "dependencies": [ "curl" ]
+}