Refactor server to use corosio instead of asio

- Remove obsolete asio-based types (body_read_stream, body_write_stream, read, write, etc.)
- Replace router_asio/route_handler_asio with router_corosio/route_handler_corosio
- Remove obsolete test stream types
- Delete workers.cpp (implementation now fully inline in header)
- Update http_server to use corosio io_context
- Clean up examples to use new corosio-based API

Author: vinniefalco

CMakeLists.txt

@@ -55,7 +55,7 @@ set(BOOST_SRC_DIR ${DEFAULT_BOOST_SRC_DIR} CACHE STRING "Boost source dir to use
 #-------------------------------------------------
 # The boost super-project requires one explicit dependency per-line.
 set(BOOST_BEAST2_DEPENDENCIES
-    Boost::asio
+    Boost::corosio
     Boost::assert
     Boost::capy
     Boost::config
@@ -123,7 +123,7 @@ if (BOOST_BEAST2_IS_ROOT)
         set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${BOOST_SRC_DIR}/tools/cmake/include")
     else ()
         # From Boost Package
-        find_package(Boost REQUIRED COMPONENTS capy http json program_options scope system url)
+        find_package(Boost REQUIRED COMPONENTS capy corosio http json program_options scope system url)
         foreach (BOOST_INCLUDE_LIBRARY ${BOOST_INCLUDE_LIBRARIES})
             if (NOT TARGET Boost::${BOOST_INCLUDE_LIBRARY})
                 add_library(Boost::${BOOST_INCLUDE_LIBRARY} ALIAS Boost::headers)

build/Jamfile

@@ -28,15 +28,6 @@ project boost/beast2
       <link>shared:<define>BOOST_BEAST2_DYN_LINK=1
       <link>static:<define>BOOST_BEAST2_STATIC_LINK=1
       <toolset>clang-win:<cxxflags>"-Wno-unused-private-field"
-
-      #TODO: Remove the following defines once asio headers are no longer included in source files
-      <target-os>windows:<define>_WIN32_WINNT=0x0601
-      <target-os>windows,<toolset>gcc:<library>ws2_32
-      <target-os>windows,<toolset>gcc:<library>mswsock
-      <target-os>windows,<toolset>gcc-cygwin:<define>__USE_W32_SOCKETS
-      <toolset>msvc:<define>_SILENCE_CXX17_ALLOCATOR_VOID_DEPRECATION_WARNING
-      <toolset>msvc:<define>_SILENCE_CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING
-      <toolset>msvc:<define>_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING
     : source-location $(BEAST2_ROOT)
     ;
 
@@ -47,10 +38,12 @@ explicit beast2_sources ;
 lib boost_beast2
    : beast2_sources
    : requirements
+     <library>/boost//corosio
      <library>/boost//http
      <include>../
      <define>BOOST_BEAST2_SOURCE
    : usage-requirements
+     <library>/boost//corosio
      <library>/boost//http
    ;
 

example/CMakeLists.txt

@@ -8,5 +8,5 @@
 # Official repository: https://github.com/cppalliance/beast2
 #
 
-add_subdirectory(client)
+# add_subdirectory(client) # disabled for now
 add_subdirectory(server)

example/server/CMakeLists.txt

@@ -15,9 +15,6 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX "" FILES ${PFILES})
 
 add_executable(beast2_server_example ${PFILES})
 
-target_compile_definitions(beast2_server_example
-    PRIVATE BOOST_ASIO_NO_DEPRECATED)
-
 set_property(TARGET beast2_server_example
     PROPERTY FOLDER "examples")
 

example/server/main.cpp

@@ -7,9 +7,7 @@
 // Official repository: https://github.com/cppalliance/beast2
 //
 
-#include "serve_detached.hpp"
 #include "serve_log_admin.hpp"
-#include <boost/beast2/asio_io_context.hpp>
 #include <boost/beast2/server/http_server.hpp>
 #include <boost/beast2/server/router.hpp>
 #include <boost/beast2/server/serve_static.hpp>
@@ -203,7 +201,7 @@ int server_main( int argc, char* argv[] )
         srv.wwwroot.use("/", serve_static( argv[3] ));
 
         app.start();
-        srv.attach();
+        srv.run();
     }
     catch( std::exception const& e )
     {

example/server/serve_detached.hpp

@@ -10,34 +10,29 @@
 #ifndef BOOST_BEAST2_HPP
 #define BOOST_BEAST2_HPP
 
+// Server components
 #include <boost/beast2/server/any_lambda.hpp>
-#include <boost/beast2/server/call_mf.hpp>
 #include <boost/beast2/server/fixed_array.hpp>
 #include <boost/beast2/server/http_server.hpp>
 #include <boost/beast2/server/http_stream.hpp>
-#include <boost/beast2/server/plain_worker.hpp>
-#include <boost/beast2/server/route_handler_asio.hpp>
+#include <boost/beast2/server/route_handler_corosio.hpp>
 #include <boost/beast2/server/router.hpp>
-#include <boost/beast2/server/router_asio.hpp>
+#include <boost/beast2/server/router_corosio.hpp>
 #include <boost/beast2/server/serve_redirect.hpp>
 #include <boost/beast2/server/serve_static.hpp>
 #include <boost/beast2/server/workers.hpp>
+
+// Test utilities
 #include <boost/beast2/test/error.hpp>
 #include <boost/beast2/test/fail_count.hpp>
-#include <boost/beast2/test/stream.hpp>
-#include <boost/beast2/test/tcp.hpp>
-#include <boost/beast2/asio_io_context.hpp>
-#include <boost/beast2/body_read_stream.hpp>
+
+// Core utilities
 #include <boost/beast2/buffer.hpp>
 #include <boost/beast2/client.hpp>
 #include <boost/beast2/endpoint.hpp>
 #include <boost/beast2/error.hpp>
-#include <boost/beast2/wrap_executor.hpp>
 #include <boost/beast2/format.hpp>
 #include <boost/beast2/log_service.hpp>
 #include <boost/beast2/logger.hpp>
-#include <boost/beast2/body_read_stream.hpp>
-#include <boost/beast2/read.hpp>
-#include <boost/beast2/write.hpp>
 
 #endif