Update http-client-lite library and fix some founded errors

Author: biaks

3rdpatry/http-client-lite/include/jdl/httpclientlite.h

@@ -188,14 +188,14 @@ namespace jdl {
 
   struct HTTPClient {
     typedef enum {
-      OPTIONS = 0,
-      GET,
-      HEAD,
-      POST,
-      PUT,
-      DELETE,
-      TRACE,
-      CONNECT
+      m_options = 0,
+      m_get,
+      m_head,
+      m_post,
+      m_put,
+      m_delete,
+      m_trace,
+      m_connect
     } HTTPMethod;
 
     inline static const char *method2string(HTTPMethod method) {
@@ -204,7 +204,7 @@ namespace jdl {
       return methods[method];
     }
 
-    inline static int connectToURI(const URI& uri) {
+    inline static socktype_t connectToURI(const URI& uri) {
       struct addrinfo hints, *result, *rp;
 
       memset(&hints, 0, sizeof(addrinfo));
@@ -228,7 +228,7 @@ namespace jdl {
           continue;
         }
 
-        int connect_result = connect(fd, rp->ai_addr, rp->ai_addrlen);
+        int connect_result = connect(fd, rp->ai_addr, static_cast<socklen_t>(rp->ai_addrlen));
 
         if (connect_result == -1) {
           // successfully created a socket, but connection failed. close it!
@@ -245,16 +245,16 @@ namespace jdl {
       return fd;
     }
 
-    inline static std::string bufferedRead(int fd) {
+    inline static std::string bufferedRead(socktype_t fd) {
       size_t initial_factor = 4, buffer_increment_size = 8192, buffer_size = 0,
              bytes_read = 0;
       std::string buffer;
 
       buffer.resize(initial_factor * buffer_increment_size);
 
   //    do {
-        bytes_read = recv(fd, ((char *)buffer.c_str()) + buffer_size,
-                          buffer.size() - buffer_size, 0);
+        bytes_read = recv(fd, ((char*)buffer.c_str()) + buffer_size,
+                          static_cast<socklen_t>(buffer.size() - buffer_size), 0);
 
         buffer_size += bytes_read;
 
@@ -274,7 +274,7 @@ namespace jdl {
 
     inline static HTTPResponse request(HTTPMethod method, const URI& uri, const std::string& body = "") {
 
-      int fd = connectToURI(uri);
+      socktype_t fd = connectToURI(uri);
       if (fd < 0)
         return HTTPResponse::fail();
 
@@ -293,11 +293,11 @@ namespace jdl {
                             "Content-Length: " + std::to_string(body.size()) + HTTP_NEWLINE + HTTP_NEWLINE +
                             body;
 
-      /*int bytes_written = */send(fd, request.c_str(), request.size(), 0);
+      /*int bytes_written = */send(fd, request.c_str(), static_cast<socklen_t>(request.size()), 0);
 
       std::string buffer = bufferedRead(fd);
 
-      close(fd);
+      closesocket(fd);
 
       HTTPResponse result;
 

core/include/prometheus/gateway.h

@@ -120,7 +120,7 @@ namespace prometheus {
        * additional library of HTTP requests. */
 
       jdl::URI uri(uri_str);
-      jdl::HTTPResponse response = jdl::HTTPClient::request(jdl::HTTPClient::POST, uri, body);
+      jdl::HTTPResponse response = jdl::HTTPClient::request(jdl::HTTPClient::m_post, uri, body);
 
       return std::stoi(response.response);
     }

core/include/prometheus/push_to_server.h

@@ -25,7 +25,7 @@ namespace prometheus {
           TextSerializer::Serialize(body_strm, registry_ptr->Collect());
 
           std::string body = body_strm.str();
-          jdl::HTTPResponse response = jdl::HTTPClient::request(jdl::HTTPClient::POST, jdl::URI(uri), body);
+          jdl::HTTPResponse response = jdl::HTTPClient::request(jdl::HTTPClient::m_post, jdl::URI(uri), body);
         }
       }
     }

simpleapi/CMakeLists.txt

@@ -5,4 +5,4 @@ cmake_minimum_required(VERSION 3.2)
 add_library               (${PROJECT_NAME} STATIC "./src/simpleapi.cpp" )
 target_sources            (${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include/prometheus/simpleapi.h")
 target_include_directories(${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
-target_link_libraries     (${PROJECT_NAME} INTERFACE prometheus-cpp-lite-core)
+target_link_libraries     (${PROJECT_NAME} PUBLIC prometheus-cpp-lite-core)

simpleapi/include/prometheus/simpleapi.h

@@ -7,8 +7,8 @@
 #include <prometheus/gauge.h>
 #include <prometheus/benchmark.h>
 
-#include "prometheus/registry.h"
-#include "prometheus/save_to_file.h"
+#include <prometheus/registry.h>
+#include <prometheus/save_to_file.h>
 
 #include <thread>
 #include <iostream>

simpleapi/src/simpleapi.cpp

@@ -1,8 +1,5 @@
 #include "prometheus/simpleapi.h"
 
-#include "prometheus/registry.h"
-#include "prometheus/save_to_file.h"
-
 #include <memory>
 
 namespace prometheus {