Http Client, added URI class, various memory leak fixes. (#15)

Http Bindings, various bug fixes.
awslabs · Mar 30, 2019 · 57d5691 · 57d5691
1 parent e0de5f7
commit 57d5691
Show file tree

Hide file tree

Showing 20 changed files with 92,087 additions and 46 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+tests/resources/* text=auto eol=lf
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -111,6 +111,10 @@ file(GLOB AWS_CRT_MQTT_HEADERS
         "include/aws/crt/mqtt/*.h"
 )
 
+file(GLOB AWS_CRT_HTTP_HEADERS
+        "include/aws/crt/http/*.h"
+)
+
 file(GLOB AWS_CRT_EXTERNAL_HEADERS
         "include/aws/crt/external/*.h"
 )
@@ -120,6 +124,8 @@ file(GLOB AWS_CRT_CPP_HEADERS
         ${AWS_CRT_CRYPTO_HEADERS}
         ${AWS_CRT_IO_HEADERS}
         ${AWS_CRT_MQTT_HEADERS}
+        ${AWS_CRT_HTTP_HEADERS}
+        ${AWS_CRT_EXTERNAL_HEADERS}
 )
 
 file(GLOB AWS_CRT_SRC 
@@ -138,6 +144,10 @@ file (GLOB AWS_CRT_MQTT_SRC
        "source/mqtt/*.cpp"
 )
 
+file (GLOB AWS_CRT_HTTP_SRC
+        "source/http/*.cpp"
+)
+
 file(GLOB AWS_CRT_EXTERNAL_CRC
         "source/external/*.cpp"
 )
@@ -147,6 +157,7 @@ file(GLOB AWS_CRT_CPP_SRC
         ${AWS_CRT_CRYPTO_SRC}
         ${AWS_CRT_IO_SRC}
         ${AWS_CRT_MQTT_SRC}
+        ${AWS_CRT_HTTP_SRC}
         ${AWS_CRT_EXTERNAL_CRC}
 )
 
@@ -156,12 +167,14 @@ if (WIN32)
         source_group("Header Files\\aws\\crt\\crypto" FILES ${AWS_CRT_CRYPTO_HEADERS})
         source_group("Header Files\\aws\\crt\\io" FILES ${AWS_CRT_IO_HEADERS})
         source_group("Header Files\\aws\\crt\\mqtt" FILES ${AWS_CRT_MQTT_HEADERS})
+        source_group("Header Files\\aws\\crt\\http" FILES ${AWS_CRT_HTTP_HEADERS})
         source_group("Header Files\\aws\\crt\\external" FILES ${AWS_CRT_EXTERNAL_HEADERS})
 
         source_group("Source Files" FILES ${AWS_CRT_SRC})
         source_group("Source Files\\crypto" FILES ${AWS_CRT_CRYPTO_SRC})
         source_group("Source Files\\io" FILES ${AWS_CRT_IO_SRC})
         source_group("Source Files\\mqtt" FILES ${AWS_CRT_MQTT_SRC})
+        source_group("Source Files\\http" FILES ${AWS_CRT_HTTP_SRC})
         source_group("Source Files\\external" FILES ${AWS_CRT_EXTERNAL_SRC})
     endif ()
 endif()
@@ -193,14 +206,16 @@ target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
         $<INSTALL_INTERFACE:include>)
 
+find_package(aws-c-http REQUIRED)
 find_package(aws-c-mqtt REQUIRED)
 find_package(aws-c-cal REQUIRED)
-target_link_libraries(${CMAKE_PROJECT_NAME} AWS::aws-c-cal AWS::aws-c-mqtt)
+target_link_libraries(${CMAKE_PROJECT_NAME} AWS::aws-c-cal AWS::aws-c-http AWS::aws-c-mqtt)
 
 install(FILES ${AWS_CRT_HEADERS} DESTINATION "include/aws/crt" COMPONENT Development)
 install(FILES ${AWS_CRT_CRYPTO_HEADERS} DESTINATION "include/aws/crt/crypto" COMPONENT Development)
 install(FILES ${AWS_CRT_IO_HEADERS} DESTINATION "include/aws/crt/io" COMPONENT Development)
 install(FILES ${AWS_CRT_MQTT_HEADERS} DESTINATION "include/aws/crt/mqtt" COMPONENT Development)
+install(FILES ${AWS_CRT_HTTP_HEADERS} DESTINATION "include/aws/crt/http" COMPONENT Development)
 install(FILES ${AWS_CRT_EXTERNAL_HEADERS} DESTINATION "include/aws/crt/external" COMPONENT Development)
 
 install(

diff --git a/aws-common-runtime/CMakeLists.txt b/aws-common-runtime/CMakeLists.txt
@@ -27,9 +27,13 @@ if (UNIX AND NOT APPLE)
 endif()
 
 set(AWS_C_IO_URL "https://github.com/awslabs/aws-c-io.git")
-set(AWS_C_IO_SHA "v0.2.4")
+set(AWS_C_IO_SHA "v0.2.5")
 include(BuildAwsCIO)
 
+set(AWS_C_HTTP_URL "https://github.com/awslabs/aws-c-http.git")
+set(AWS_C_HTTP_SHA "v0.1.0")
+include(BuildAwsCHttp)
+
 set(AWS_C_MQTT_URL "https://github.com/awslabs/aws-c-mqtt.git")
 set(AWS_C_MQTT_SHA "v0.3.2")
 include(BuildAwsCMqtt)
@@ -39,6 +43,7 @@ set(AWS_C_CAL_SHA "v0.1.4")
 include(BuildAwsCCal)
 
 add_dependencies(AwsCMqtt AwsCIO)
+add_dependencies(AwsCHttp AwsCIO)
 add_dependencies(AwsCCal AwsCCommon)
 
 if (UNIX AND NOT APPLE)

diff --git a/aws-common-runtime/cmake/BuildAwsCHttp.cmake b/aws-common-runtime/cmake/BuildAwsCHttp.cmake
@@ -0,0 +1,56 @@
+if("${TARGET_ARCH}" STREQUAL ANDROID)
+    ExternalProject_Add(AwsCHttp
+            PREFIX ${AWS_DEPS_BUILD_DIR}
+            GIT_REPOSITORY ${AWS_C_HTTP_URL}
+            GIT_TAG ${AWS_C_HTTP_SHA}
+            BUILD_IN_SOURCE 0
+            UPDATE_COMMAND ""
+            CMAKE_ARGS
+            -DCMAKE_PREFIX_PATH=${AWS_DEPS_INSTALL_DIR}
+            -DCMAKE_INSTALL_PREFIX=${AWS_DEPS_INSTALL_DIR}
+            -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
+            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+            -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+            -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+            -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL}
+            -DANDROID_ABI=${ANDROID_ABI}
+            -DANDROID_TOOLCHAIN_NAME=${ANDROID_TOOLCHAIN_NAME}
+            -DANDROID_STANDALONE_TOOLCHAIN=${ANDROID_STANDALONE_TOOLCHAIN}
+            -DANDROID_STL=${ANDROID_STL}
+            -DENABLE_HW_OPTIMIZATION=OFF
+            -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+            )
+elseif(MSVC)
+    ExternalProject_Add(AwsCHttp
+            PREFIX ${AWS_DEPS_BUILD_DIR}
+            GIT_REPOSITORY ${AWS_C_HTTP_URL}
+            GIT_TAG ${AWS_C_HTTP_SHA}
+            BUILD_IN_SOURCE 0
+            UPDATE_COMMAND ""
+            CMAKE_ARGS
+            -DCMAKE_PREFIX_PATH=${AWS_DEPS_INSTALL_DIR}
+            -DCMAKE_INSTALL_PREFIX=${AWS_DEPS_INSTALL_DIR}
+            -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
+            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+            -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+            -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+            -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+            -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+            )
+else()
+    ExternalProject_Add(AwsCHttp
+            PREFIX ${AWS_DEPS_BUILD_DIR}
+            GIT_REPOSITORY ${AWS_C_HTTP_URL}
+            GIT_TAG ${AWS_C_HTTP_SHA}
+            BUILD_IN_SOURCE 0
+            UPDATE_COMMAND ""
+            CMAKE_ARGS
+            -DCMAKE_PREFIX_PATH=${AWS_DEPS_INSTALL_DIR}
+            -DCMAKE_INSTALL_PREFIX=${AWS_DEPS_INSTALL_DIR}
+            -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
+            -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+            -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+            -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+            -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+            )
+endif()
diff --git a/cmake/aws-crt-cpp-config.cmake b/cmake/aws-crt-cpp-config.cmake
@@ -1,5 +1,6 @@
 include(CMakeFindDependencyMacro)
 
+find_dependency(aws-c-http)
 find_dependency(aws-c-mqtt)
 find_dependency(aws-c-cal)
 

diff --git a/codebuild/common-posix.sh b/codebuild/common-posix.sh
@@ -7,6 +7,6 @@ cd build
 
 cmake -DBUILD_DEPS=ON $@ ../
 make
-make test
+ctest -V
 
 cd ..
diff --git a/include/aws/crt/Types.h b/include/aws/crt/Types.h
@@ -25,6 +25,7 @@
 #include <sstream>
 #include <string>
 #include <unordered_map>
+#include <utility>
 #include <vector>
 
 struct aws_allocator;
@@ -68,8 +69,26 @@ namespace Aws
         AWS_CRT_CPP_API ByteBuf ByteBufNewCopy(Allocator *alloc, const uint8_t *array, size_t len);
         AWS_CRT_CPP_API void ByteBufDelete(ByteBuf &);
 
+        AWS_CRT_CPP_API ByteCursor ByteCursorFromCString(const char *str) noexcept;
+        AWS_CRT_CPP_API ByteCursor ByteCursorFromByteBuf(const ByteBuf &) noexcept;
+        AWS_CRT_CPP_API ByteCursor ByteCursorFromArray(const uint8_t *array, size_t len) noexcept;
+
         AWS_CRT_CPP_API Vector<uint8_t> Base64Decode(const String &decode);
         AWS_CRT_CPP_API String Base64Encode(const Vector<uint8_t> &encode);
 
+        template <typename T> void Delete(T *t, Allocator *allocator)
+        {
+            t->~T();
+            aws_mem_release(allocator, t);
+        }
+
+        template <typename T, typename... Args> T *New(Allocator *allocator, Args &&... args)
+        {
+            T *t = reinterpret_cast<T *>(aws_mem_acquire(allocator, sizeof(T)));
+            if (!t)
+                return nullptr;
+            return new (t) T(std::forward<Args>(args)...);
+        }
+
     } // namespace Crt
 } // namespace Aws