oak: Replace cppnetlib with oatpp

Author: cassava

NOTICE.md

@@ -110,5 +110,12 @@ installed with the help of Conan):
   - Website: https://cpp-netlib.org
   - Conan-Package: cpp-netlib
 
+- Oat++
+  - License: Apache-2.0
+  - License-Source: https://github.com/oatpp/oatpp/blob/master/LICENSE
+  - Website: https://oatpp.io/
+  - Source: https://github.com/oatpp/oatpp
+  - Conan-Package: oatpp
+
 Additional third-party content that is used for the web user-interface
 is listed in the `ui/LICENSE-3RD-PARTY.txt` file.

docs/usage/package-hierarchy.excalidraw

@@ -643,7 +643,7 @@
       "versionNonce": 1492357253,
       "isDeleted": false,
       "boundElementIds": null,
-      "text": "libcppnetlib",
+      "text": "oatpp",
       "fontSize": 20,
       "fontFamily": 1,
       "textAlign": "center",

docs/usage/package-hierarchy.svg

@@ -27,7 +27,7 @@ Each of the boxes in the image above represents a single Conan package. The
 set of packages is not exhaustive, as implied by the boxes with ellipsis.
 The arrows define dependencies between packages. For example, ``cloe-engine``
 depends on ``cloe-runtime``. Most plugins depend on ``cloe-models``, which
-in turn depends on ``cloe-runtime``. Some packages, like ``libcppnetlib`` are
+in turn depends on ``cloe-runtime``. Some packages, like ``oatpp`` are
 not developed by us, but packaged into Conan packages by us. Other dependencies
 (not shown) such as Boost, are retrieved from the Conan Center, which contains
 a large collection of Open Source libraries and tools.

docs/usage/understanding-cloe-packages.rst

@@ -10,7 +10,7 @@ set(target cloe-oak)
 set(alias cloe::oak)
 
 find_package(cloe-runtime REQUIRED)
-find_package(cppnetlib REQUIRED)
+find_package(oatpp REQUIRED)
 find_package(Boost COMPONENTS headers REQUIRED)
 
 file(GLOB ${target}_PUBLIC_HEADERS "include/**/*.hpp")
@@ -27,7 +27,7 @@ add_library(${target}
 add_library(${alias} ALIAS ${target})
 set_target_linting(${target})
 set_target_properties(${target} PROPERTIES
-    CXX_STANDARD 14
+    CXX_STANDARD 17
     CXX_STANDARD_REQUIRED ON
 )
 target_include_directories(${target}
@@ -40,7 +40,7 @@ target_include_directories(${target}
 target_link_libraries(${target}
   PUBLIC
     cloe::runtime
-    cppnetlib::cppnetlib
+    oatpp::oatpp
     Boost::headers
 )
 
@@ -56,7 +56,7 @@ if(BUILD_TESTING)
         src/oak/server_test.cpp
     )
     set_target_properties(test-oak PROPERTIES
-        CXX_STANDARD 14
+        CXX_STANDARD 17
         CXX_STANDARD_REQUIRED ON
     )
     target_include_directories(test-oak

oak/CMakeLists.txt

@@ -42,7 +42,7 @@ def set_version(self):
 
     def requirements(self):
         self.requires(f"cloe-runtime/{self.version}@cloe/develop")
-        self.requires("cpp-netlib/0.13.0@cloe/stable")
+        self.requires("oatpp/1.3.0")
 
     def build_requirements(self):
         self.test_requires("gtest/[~1.10]")

oak/conanfile.py

@@ -26,61 +26,13 @@
 #include <string>  // for string
 #include <vector>  // for vector<>
 
-// Requires: cppnetlib
-#include <boost/network/include/http/server.hpp>
-#include <boost/network/utils/thread_pool.hpp>
+#include <oatpp/network/Server.hpp>
 
 #include "oak/registrar.hpp"    // for StaticRegistrar, BufferRegistrar
-#include "oak/route_muxer.hpp"  // for Muxer<>
 
 namespace oak {
 
-// These forward-declarations are a necessary evil:
-class ServerImplHandler;
-using ServerImpl = boost::network::http::server<ServerImplHandler>;
-
-/**
- * ServerImplHandler is the main request handler for the server.
- *
- * It implements an interface defined by boost::network::http::server.
- */
-class ServerImplHandler {
- public:
-  ServerImplHandler();
-
-  /**
-   * Handle every request from the server.
-   *
-   * Every single request that passes through the server has to go through this
-   * handler. If the muxer has an endpoint that matches the request, then it
-   * gets passed through. The muxer has a default endpoint, so the nominal case
-   * is that every request is passed to some handler from the muxer.
-   */
-  void operator()(ServerImpl::request const&, ServerImpl::connection_ptr);
-
-  /**
-   * Log an error from the server.
-   */
-  void log(const ServerImpl::string_type& msg);
-
-  /**
-   * Add a handler for a specific endpoint.
-   */
-  void add(const std::string& key, Handler h);
-
-  /**
-   * Return a list of all registered endpoints.
-   */
-  std::vector<std::string> endpoints() const { return muxer.routes(); }
-
-  /**
-   * Return endpoint data in json format.
-   */
-  cloe::Json endpoints_to_json(const std::vector<std::string>& endpoints) const;
-
- private:
-  Muxer<Handler> muxer;
-};
+class GreedyHandler;
 
 /**
  * A Server accepts and serves endpoints for Handlers.
@@ -169,10 +121,8 @@ class Server {
 
   // State
   bool listening_;
-  ServerImplHandler handler_;
-  std::unique_ptr<ServerImpl::options> options_;
-  std::unique_ptr<ServerImpl> server_;
-  std::unique_ptr<boost::thread> thread_;
+  std::shared_ptr<oatpp::network::Server> server_;
+  std::shared_ptr<GreedyHandler> handler_;
 };
 
 }  // namespace oak