httplib: Implement via FetchContent for tighter integration and easier updates

CMakeLists.txt

@@ -93,6 +93,9 @@ SET(SPDLOG_BUILD_BENCH OFF CACHE BOOL "" FORCE)
 set(SPDLOG_BUILD_SHARED OFF CACHE BOOL "" FORCE)
 SET(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
 
+SET(HTTPLIB_USE_NON_BLOCKING_GETADDRINFO OFF CACHE BOOL "" FORCE)
+SET(HTTPLIB_REQUIRE_ZLIB ON CACHE BOOL "" FORCE)
+
 FetchContent_Declare(
         spdlog
         GIT_REPOSITORY https://github.com/gabime/spdlog.git
@@ -139,7 +142,13 @@ FetchContent_Declare(
         EXCLUDE_FROM_ALL
 )
 
-FetchContent_MakeAvailable(pistache_http zstd sls_detector_package catch2 hdf5 spdlog)
+FetchContent_Declare(
+        httplib
+        GIT_REPOSITORY https://github.com/yhirose/cpp-httplib.git
+        GIT_TAG v0.38.0
+)
+
+FetchContent_MakeAvailable(pistache_http zstd sls_detector_package catch2 hdf5 spdlog httplib)
 
 ADD_SUBDIRECTORY(jungfrau)
 ADD_SUBDIRECTORY(compression)

detector_control/CMakeLists.txt

@@ -1,9 +1,9 @@
 ADD_LIBRARY(JFJochDetector STATIC SLSDetectorWrapper.cpp SLSDetectorWrapper.h
         DectrisSimplonClient.cpp
         DectrisSimplonClient.h
-        ../include/httplib/httplib.h
         ../include/base64/Base64.h
         DetectorWrapper.h
         DectrisDetectorWrapper.cpp
         DectrisDetectorWrapper.h)
-TARGET_LINK_LIBRARIES(JFJochDetector JFJochCommon slsDetectorStatic slsSupportStatic)
+TARGET_LINK_LIBRARIES(JFJochDetector JFJochCommon slsDetectorStatic slsSupportStatic
+        httplib::httplib)

detector_control/DectrisSimplonClient.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include <base64/Base64.h>
-#include <httplib/httplib.h>
+#include <httplib.h>
 
 #include "DectrisSimplonClient.h"
 

frontend/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "jungfraujoch-frontend",
-  "version": "1.0.0-rc.131",
+  "version": "1.0.0-rc.132",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "jungfraujoch-frontend",
-      "version": "1.0.0-rc.131",
+      "version": "1.0.0-rc.132",
       "license": "GPL-3.0",
       "dependencies": {
         "@emotion/react": "^11.10.4",

include/httplib/LICENSE

@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2017 yhirose
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-

reader/CMakeLists.txt

@@ -10,4 +10,5 @@ ADD_LIBRARY(JFJochReader STATIC
         JFJochHttpReader.h
 )
 
-TARGET_LINK_LIBRARIES(JFJochReader JFJochImageAnalysis JFJochAPI JFJochCommon JFJochZMQ JFJochLogger JFJochHDF5Wrappers CBORStream2FrameSerialize)
+TARGET_LINK_LIBRARIES(JFJochReader JFJochImageAnalysis JFJochAPI JFJochCommon JFJochZMQ JFJochLogger JFJochHDF5Wrappers CBORStream2FrameSerialize
+                      httplib::httplib)

reader/JFJochHttpReader.cpp

@@ -3,7 +3,7 @@
 
 #include "JFJochHttpReader.h"
 
-#include <httplib/httplib.h>
+#include <httplib.h>
 #include <nlohmann/json.hpp>
 #include "../frame_serialize/CBORStream2Deserializer.h"
 #include "../broker/gen/model/Image_buffer_status.h"

update_version.sh

@@ -38,6 +38,7 @@ git rm broker/gen/model/*.cpp broker/gen/model/*.h frontend/src/openapi/models/*
 
 java -jar openapi-generator-cli.jar generate -i broker/jfjoch_api.yaml -o python-client/ -g python --git-host=git.psi.ch --git-repo-id jungfraujoch --git-user-id jungfraujoch --additional-properties=packageName=jfjoch_client,packageVersion=$VERSION
 java -jar openapi-generator-cli.jar generate -i broker/jfjoch_api.yaml -o broker/gen -g cpp-pistache-server
+java -jar openapi-generator-cli.jar generate -i broker/jfjoch_api.yaml -o broker/httplib-server -g cpp-httplib-server
 
 cd frontend
 sed -i s/\".*\"/\"$VERSION\"/g src/version.ts