chore: use http_proto

Author: vinniefalco

example/server/main.cpp

@@ -73,11 +73,11 @@ int server_main( int argc, char* argv[] )
         //srv.wwwroot.use("/detach", serve_detached());
         srv.wwwroot.use(post_work());
         srv.wwwroot.use(
-            []( Request& req,
-                Response& res) ->
-                    route_result
+            []( http_proto::Request& req,
+                http_proto::Response& res) ->
+                    http_proto::route_result
             {
-                return route::next;
+                return http_proto::route::next;
             });
         srv.wwwroot.use("/", serve_static( argv[3] ));
 

example/server/post_work.cpp

@@ -48,23 +48,23 @@ struct task
     std::size_t i = 10;
 
     void
-    operator()(resumer resume)
+    operator()(http_proto::resumer resume)
     {
         if(i--)
             return;
-        resume(route::next);
+        resume(http_proto::route::next);
     }
 };
 
 } // (anon)
 
 //------------------------------------------------
 
-route_result
+http_proto::route_result
 post_work::
 operator()(
-    Request&,
-    Response& res) const
+    http_proto::Request&,
+    http_proto::Response& res) const
 {
     return res.post(task());
 }

example/server/post_work.hpp

@@ -11,7 +11,7 @@
 #define BOOST_BEAST2_SERVER_POST_WORK_HPP
 
 #include <boost/beast2/detail/config.hpp>
-#include <boost/beast2/server/route_handler.hpp>
+#include <boost/http_proto/server/route_handler.hpp>
 
 namespace boost {
 namespace beast2 {
@@ -20,8 +20,8 @@ struct post_work
 {
     system::error_code
     operator()(
-        Request&,
-        Response& res) const;
+        http_proto::Request&,
+        http_proto::Response& res) const;
 };
 
 } // beast2

example/server/serve_detached.hpp

@@ -12,7 +12,7 @@
 
 #include <boost/beast2/detail/config.hpp>
 #include <boost/beast2/error.hpp>
-#include <boost/beast2/server/route_handler.hpp>
+#include <boost/http_proto/server/route_handler.hpp>
 #include <boost/asio/post.hpp>
 #include <boost/asio/thread_pool.hpp>
 #include <memory>
@@ -39,11 +39,11 @@ class serve_detached
 
     system::error_code
     operator()(
-        Request&,
-        Response& res) const
+        http_proto::Request&,
+        http_proto::Response& res) const
     {
         return res.detach(
-            [&](resumer resume)
+            [&](http_proto::resumer resume)
             {
                 asio::post(*tp_,
                     [&, resume]()
@@ -52,7 +52,7 @@ class serve_detached
                         std::this_thread::sleep_for(std::chrono::seconds(1));
                         res.status(http_proto::status::ok);
                         res.set_body("Hello from serve_detached!\n");
-                        resume(route::send);
+                        resume(http_proto::route::send);
                         // resume( res.send("Hello from serve_detached!\n") );
                     });
             });

example/server/serve_log_admin.cpp

@@ -30,8 +30,8 @@ class serve_log_page
 
     system::error_code
     operator()(
-        Request&,
-        Response& res) const
+        http_proto::Request&,
+        http_proto::Response& res) const
     {
         auto const v = ls_.get_sections();
         std::string s;
@@ -75,7 +75,7 @@ class serve_log_page
         res.status(http_proto::status::ok);
         res.message.set(http_proto::field::content_type, "text/html; charset=UTF-8");
         res.set_body(std::move(s));
-        return error::success;
+        return http_proto::route::send;
     }
 
 private:
@@ -97,13 +97,13 @@ class handle_submit
 
     system::error_code
     operator()(
-        Request&,
-        Response& res) const
+        http_proto::Request&,
+        http_proto::Response& res) const
     {
         res.status(http_proto::status::ok);
         res.message.set(http_proto::field::content_type, "plain/text; charset=UTF-8");
         res.set_body("submit");
-        return error::success;
+        return http_proto::route::send;
     }
 
 private:

include/boost/beast2.hpp

@@ -11,18 +11,15 @@
 #define BOOST_BEAST2_HPP
 
 #include <boost/beast2/server/any_lambda.hpp>
-#include <boost/beast2/server/basic_router.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/https_server.hpp>
 #include <boost/beast2/server/plain_worker.hpp>
-#include <boost/beast2/server/route_handler.hpp>
 #include <boost/beast2/server/route_handler_asio.hpp>
 #include <boost/beast2/server/router.hpp>
 #include <boost/beast2/server/router_asio.hpp>
-#include <boost/beast2/server/router_types.hpp>
 #include <boost/beast2/server/serve_redirect.hpp>
 #include <boost/beast2/server/serve_static.hpp>
 //#include <boost/beast2/server/worker_ssl.hpp>