Rename http_backend to http_server.

matt-42 · Oct 18, 2020 · 28e261b · 28e261b
1 parent 2838495
commit 28e261b
Show file tree

Hide file tree

Showing 52 changed files with 90 additions and 76 deletions.
diff --git a/libraries/http_backend/http_backend/http_backend.hh b/libraries/http_backend/http_backend/http_backend.hh
diff --git a/libraries/http_backend/CMakeLists.txt → libraries/http_server/CMakeLists.txt b/libraries/http_backend/CMakeLists.txt → libraries/http_server/CMakeLists.txt
diff --git a/libraries/http_backend/README.md → libraries/http_server/README.md b/libraries/http_backend/README.md → libraries/http_server/README.md
@@ -1,4 +1,4 @@
-li::http_backend: Coroutine based, Asynchronous, Low Latency and High Throughput HTTP Server
+li::http_server: Coroutine based, Asynchronous, Low Latency and High Throughput HTTP Server
 =================================
 
 This library goal is to ease the development of HTTP APIs without
@@ -31,15 +31,15 @@ Only linux is supported (epoll).
 
 The quickest way to start developing an api is to use the single header distribution:
 ```sh
-wget https://raw.githubusercontent.com/matt-42/lithium/master/single_headers/lithium_http_backend.hh
+wget https://raw.githubusercontent.com/matt-42/lithium/master/single_headers/lithium_http_server.hh
 ```
 
 More info here: https://github.com/matt-42/lithium/tree/master/INSTALL.md
 
 Write an api:
 ```c++
 // hello_lithium.cc
-#include "lithium_http_backend.hh"
+#include "lithium_http_server.hh"
 
 using namespace li;
 
@@ -107,7 +107,7 @@ else
 
 ## Error handling
 
-`li::http_backend` uses exceptions to report HTTP errors.
+`li::http_server` uses exceptions to report HTTP errors.
 
 ```c++
 http_api api;
@@ -221,7 +221,7 @@ Note that when using it, ORM callbacks must take `http_request& request, http_re
 as additional arguments.
 
 Check the code for more info:
-https://github.com/matt-42/lithium/blob/master/libraries/http_backend/http_backend/sql_crud_api.hh
+https://github.com/matt-42/lithium/blob/master/libraries/http_server/http_server/sql_crud_api.hh
 
 
 ## Sessions
@@ -303,7 +303,7 @@ my_api.post("/auth_test") = [&] (http_request& request, http_response& response)
 ```
 
 Check the code for more info:
-https://github.com/matt-42/lithium/blob/master/libraries/http_backend/http_backend/http_authentication.hh
+https://github.com/matt-42/lithium/blob/master/libraries/http_server/http_server/http_authentication.hh
 
 
 # Testing
@@ -323,7 +323,7 @@ assert(r.body == "expected response body");
 # A complete blog API
 
 Checkout the code here:
-https://github.com/matt-42/lithium/blob/master/libraries/http_backend/examples/blog.cc
+https://github.com/matt-42/lithium/blob/master/libraries/http_server/examples/blog.cc
 
 # What is the s:: namespace ?
 

diff --git a/...es/http_backend/benchmarks/CMakeLists.txt → ...ies/http_server/benchmarks/CMakeLists.txt b/...es/http_backend/benchmarks/CMakeLists.txt → ...ies/http_server/benchmarks/CMakeLists.txt
diff --git a/libraries/http_backend/benchmarks/bench.cc → libraries/http_server/benchmarks/bench.cc b/libraries/http_backend/benchmarks/bench.cc → libraries/http_server/benchmarks/bench.cc
diff --git a/...p_backend/benchmarks/mysql_async_bench.cc → ...tp_server/benchmarks/mysql_async_bench.cc b/...p_backend/benchmarks/mysql_async_bench.cc → ...tp_server/benchmarks/mysql_async_bench.cc
diff --git a/...es/http_backend/benchmarks/pipelining.lua → ...ies/http_server/benchmarks/pipelining.lua b/...es/http_backend/benchmarks/pipelining.lua → ...ies/http_server/benchmarks/pipelining.lua
diff --git a/libraries/http_backend/benchmarks/symbols.hh → libraries/http_server/benchmarks/symbols.hh b/libraries/http_backend/benchmarks/symbols.hh → libraries/http_server/benchmarks/symbols.hh
diff --git a/...ries/http_backend/examples/CMakeLists.txt → ...aries/http_server/examples/CMakeLists.txt b/...ries/http_backend/examples/CMakeLists.txt → ...aries/http_server/examples/CMakeLists.txt
diff --git a/libraries/http_backend/examples/blog.cc → libraries/http_server/examples/blog.cc b/libraries/http_backend/examples/blog.cc → libraries/http_server/examples/blog.cc
diff --git a/libraries/http_backend/examples/symbols.hh → libraries/http_server/examples/symbols.hh b/libraries/http_backend/examples/symbols.hh → libraries/http_server/examples/symbols.hh
diff --git a/libraries/http_backend/http_backend/api.hh → libraries/http_server/http_server/api.hh b/libraries/http_backend/http_backend/api.hh → libraries/http_server/http_server/api.hh
@@ -2,9 +2,9 @@
 
 #include <functional>
 #include <iostream>
-#include <li/http_backend/dynamic_routing_table.hh>
-#include <li/http_backend/error.hh>
-#include <li/http_backend/symbols.hh>
+#include <li/http_server/dynamic_routing_table.hh>
+#include <li/http_server/error.hh>
+#include <li/http_server/symbols.hh>
 #include <string_view>
 
 namespace li {

diff --git a/...end/http_backend/dynamic_routing_table.hh → ...rver/http_server/dynamic_routing_table.hh b/...end/http_backend/dynamic_routing_table.hh → ...rver/http_server/dynamic_routing_table.hh
diff --git a/libraries/http_backend/http_backend/error.hh → libraries/http_server/http_server/error.hh b/libraries/http_backend/http_backend/error.hh → libraries/http_server/http_server/error.hh
diff --git a/...end/http_backend/growing_output_buffer.hh → ...rver/http_server/growing_output_buffer.hh b/...end/http_backend/growing_output_buffer.hh → ...rver/http_server/growing_output_buffer.hh
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <li/http_backend/output_buffer.hh>
+#include <li/http_server/output_buffer.hh>
 
 namespace li {
 

diff --git a/...kend/http_backend/hashmap_http_session.hh → ...erver/http_server/hashmap_http_session.hh b/...kend/http_backend/hashmap_http_session.hh → ...erver/http_server/hashmap_http_session.hh
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <li/http_backend/random_cookie.hh>
+#include <li/http_server/random_cookie.hh>
 #include <mutex>
 
 namespace li {

diff --git a/...ckend/http_backend/http_authentication.hh → ...server/http_server/http_authentication.hh b/...ckend/http_backend/http_authentication.hh → ...server/http_server/http_authentication.hh
@@ -2,8 +2,8 @@
 
 #include <optional>
 
-#include <li/http_backend/api.hh>
-#include <li/http_backend/sql_http_session.hh>
+#include <li/http_server/api.hh>
+#include <li/http_server/sql_http_session.hh>
 
 namespace li {
 

diff --git a/...tp_backend/http_backend/http_benchmark.hh → ...http_server/http_server/http_benchmark.hh b/...tp_backend/http_backend/http_benchmark.hh → ...http_server/http_server/http_benchmark.hh
diff --git a/...s/http_backend/http_backend/http_serve.hh → ...ies/http_server/http_server/http_serve.hh b/...s/http_backend/http_backend/http_serve.hh → ...ies/http_server/http_server/http_serve.hh
@@ -14,12 +14,12 @@
 
 #include <boost/lexical_cast.hpp>
 
-#include <li/http_backend/output_buffer.hh>
-#include <li/http_backend/input_buffer.hh>
-#include <li/http_backend/error.hh>
-#include <li/http_backend/symbols.hh>
-#include <li/http_backend/tcp_server.hh>
-#include <li/http_backend/url_unescape.hh>
+#include <li/http_server/output_buffer.hh>
+#include <li/http_server/input_buffer.hh>
+#include <li/http_server/error.hh>
+#include <li/http_server/symbols.hh>
+#include <li/http_server/tcp_server.hh>
+#include <li/http_server/url_unescape.hh>
 
 namespace li {
 
@@ -609,8 +609,8 @@ template <typename F> auto make_http_processor(F handler) {
 } // namespace http_async_impl
 } // namespace li
 
-#include <li/http_backend/request.hh>
-#include <li/http_backend/response.hh>
+#include <li/http_server/request.hh>
+#include <li/http_server/response.hh>
 
 namespace li {
 
@@ -657,7 +657,7 @@ auto http_serve(api<http_request, http_response> api, int port, O... opts) {
   });
 
   auto server_thread = std::make_shared<std::thread>([=]() {
-    std::cout << "Starting lithium::http_backend on port " << port << std::endl;
+    std::cout << "Starting lithium::http_server on port " << port << std::endl;
 
     if constexpr (has_key(options, s::ssl_key))
     {

diff --git a/libraries/http_server/http_server/http_server.hh b/libraries/http_server/http_server/http_server.hh
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <li/json/json.hh>
+#include <li/sql/sql_common.hh>
+#include <li/sql/sql_orm.hh>
+
+#include <li/http_server/api.hh>
+#include <li/http_server/http_serve.hh>
+#include <li/http_server/request.hh>
+#include <li/http_server/response.hh>
+
+namespace li {
+using http_api = api<http_request, http_response>;
+}
+
+#include <li/http_server/hashmap_http_session.hh>
+#include <li/http_server/http_authentication.hh>
+//#include <li/http_server/mhd.hh>
+#include <li/http_server/serve_directory.hh>
+#include <li/http_server/sql_crud_api.hh>
+#include <li/http_server/sql_http_session.hh>
+#include <li/http_server/symbols.hh>
+#include <li/http_server/growing_output_buffer.hh>
+
+#if __linux__
+#include <li/http_server/http_benchmark.hh>
+#endif
+
+#include <li/http_server/lru_cache.hh>
diff --git a/...http_backend/http_backend/input_buffer.hh → ...s/http_server/http_server/input_buffer.hh b/...http_backend/http_backend/input_buffer.hh → ...s/http_server/http_server/input_buffer.hh
diff --git a/...es/http_backend/http_backend/lru_cache.hh → ...ries/http_server/http_server/lru_cache.hh b/...es/http_backend/http_backend/lru_cache.hh → ...ries/http_server/http_server/lru_cache.hh
diff --git a/libraries/http_backend/http_backend/mhd.hh → libraries/http_server/http_server/mhd.hh b/libraries/http_backend/http_backend/mhd.hh → libraries/http_server/http_server/mhd.hh
@@ -36,12 +36,12 @@ void usleep(__int64 usec) {
 
 #include <li/json/json.hh>
 
-//#include <li/http_backend/file.hh>
-#include <li/http_backend/error.hh>
-#include <li/http_backend/request.hh>
-#include <li/http_backend/response.hh>
-#include <li/http_backend/symbols.hh>
-//#include <li/http_backend/url_decode.hh>
+//#include <li/http_server/file.hh>
+#include <li/http_server/error.hh>
+#include <li/http_server/request.hh>
+#include <li/http_server/response.hh>
+#include <li/http_server/symbols.hh>
+//#include <li/http_server/url_decode.hh>
 
 namespace li {
 using namespace li;

diff --git a/...es/http_backend/http_backend/moustique.hh → ...ries/http_server/http_server/moustique.hh b/...es/http_backend/http_backend/moustique.hh → ...ries/http_server/http_server/moustique.hh
diff --git a/...ttp_backend/http_backend/output_buffer.hh → .../http_server/http_server/output_buffer.hh b/...ttp_backend/http_backend/output_buffer.hh → .../http_server/http_server/output_buffer.hh
diff --git a/...ttp_backend/http_backend/random_cookie.hh → .../http_server/http_server/random_cookie.hh b/...ttp_backend/http_backend/random_cookie.hh → .../http_server/http_server/random_cookie.hh
@@ -2,8 +2,8 @@
 
 #include <random>
 #include <sstream>
-#include <li/http_backend/response.hh>
-#include <li/http_backend/request.hh>
+#include <li/http_server/response.hh>
+#include <li/http_server/request.hh>
 
 namespace li {
 

diff --git a/...ries/http_backend/http_backend/request.hh → libraries/http_server/http_server/request.hh b/...ries/http_backend/http_backend/request.hh → libraries/http_server/http_server/request.hh
@@ -10,8 +10,8 @@
 #include <vector>
 
 
-#include <li/http_backend/error.hh>
-#include <li/http_backend/url_decode.hh>
+#include <li/http_server/error.hh>
+#include <li/http_server/url_decode.hh>
 
 #include <li/metamap/metamap.hh>
 

diff --git a/...ies/http_backend/http_backend/response.hh → ...aries/http_server/http_server/response.hh b/...ies/http_backend/http_backend/response.hh → ...aries/http_server/http_server/response.hh
diff --git a/...p_backend/http_backend/serve_directory.hh → ...ttp_server/http_server/serve_directory.hh b/...p_backend/http_backend/serve_directory.hh → ...ttp_server/http_server/serve_directory.hh
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <li/http_backend/response.hh>
+#include <li/http_server/response.hh>
 #include <string>
 
 namespace li {

diff --git a/...http_backend/http_backend/sql_crud_api.hh → ...s/http_server/http_server/sql_crud_api.hh b/...http_backend/http_backend/sql_crud_api.hh → ...s/http_server/http_server/sql_crud_api.hh
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <li/http_backend/error.hh>
+#include <li/http_server/error.hh>
 #include <li/json/json.hh>
 #include <li/sql/sql_orm.hh>
 

diff --git a/..._backend/http_backend/sql_http_session.hh → ...tp_server/http_server/sql_http_session.hh b/..._backend/http_backend/sql_http_session.hh → ...tp_server/http_server/sql_http_session.hh
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <li/http_backend/random_cookie.hh>
+#include <li/http_server/random_cookie.hh>
 #include <li/sql/sql_orm.hh>
 #include <li/sql/sql_common.hh>
 

diff --git a/.../http_backend/http_backend/ssl_context.hh → ...es/http_server/http_server/ssl_context.hh b/.../http_backend/http_backend/ssl_context.hh → ...es/http_server/http_server/ssl_context.hh
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <li/http_backend/tcp_server.hh>
+#include <li/http_server/tcp_server.hh>
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 

diff --git a/...ries/http_backend/http_backend/symbols.hh → libraries/http_server/http_server/symbols.hh b/...ries/http_backend/http_backend/symbols.hh → libraries/http_server/http_server/symbols.hh
diff --git a/...s/http_backend/http_backend/tcp_server.hh → ...ies/http_server/http_server/tcp_server.hh b/...s/http_backend/http_backend/tcp_server.hh → ...ies/http_server/http_server/tcp_server.hh
@@ -26,7 +26,7 @@
 
 #include <boost/context/continuation.hpp>
 
-#include <li/http_backend/ssl_context.hh>
+#include <li/http_server/ssl_context.hh>
 
 namespace li {
 

diff --git a/...http_backend/http_backend/type_hashmap.hh → ...s/http_server/http_server/type_hashmap.hh b/...http_backend/http_backend/type_hashmap.hh → ...s/http_server/http_server/type_hashmap.hh
diff --git a/...s/http_backend/http_backend/url_decode.hh → ...ies/http_server/http_server/url_decode.hh b/...s/http_backend/http_backend/url_decode.hh → ...ies/http_server/http_server/url_decode.hh
@@ -10,8 +10,8 @@
 #endif
 
 #include <boost/lexical_cast.hpp>
-#include <li/http_backend/error.hh>
-#include <li/http_backend/symbols.hh>
+#include <li/http_server/error.hh>
+#include <li/http_server/symbols.hh>
 #include <li/metamap/metamap.hh>
 
 namespace li {

diff --git a/...http_backend/http_backend/url_unescape.hh → ...s/http_server/http_server/url_unescape.hh b/...http_backend/http_backend/url_unescape.hh → ...s/http_server/http_server/url_unescape.hh
diff --git a/libraries/http_backend/tests/CMakeLists.txt → libraries/http_server/tests/CMakeLists.txt b/libraries/http_backend/tests/CMakeLists.txt → libraries/http_server/tests/CMakeLists.txt
diff --git a/libraries/http_backend/tests/crud.cc → libraries/http_server/tests/crud.cc b/libraries/http_backend/tests/crud.cc → libraries/http_server/tests/crud.cc
diff --git a/...ttp_backend/tests/hashmap_http_session.cc → ...http_server/tests/hashmap_http_session.cc b/...ttp_backend/tests/hashmap_http_session.cc → ...http_server/tests/hashmap_http_session.cc
diff --git a/libraries/http_backend/tests/hello_world.cc → libraries/http_server/tests/hello_world.cc b/libraries/http_backend/tests/hello_world.cc → libraries/http_server/tests/hello_world.cc
@@ -1,4 +1,4 @@
-#include <lithium_http_backend.hh>
+#include <lithium_http_server.hh>
 #include <lithium_http_client.hh>
 #include "symbols.hh"
 

diff --git a/...http_backend/tests/http_authentication.cc → .../http_server/tests/http_authentication.cc b/...http_backend/tests/http_authentication.cc → .../http_server/tests/http_authentication.cc
diff --git a/libraries/http_backend/tests/https.cc → libraries/http_server/tests/https.cc b/libraries/http_backend/tests/https.cc → libraries/http_server/tests/https.cc
@@ -1,4 +1,4 @@
-#include <lithium_http_backend.hh>
+#include <lithium_http_server.hh>
 #include <lithium_http_client.hh>
 #include "symbols.hh"
 

diff --git a/libraries/http_backend/tests/lru_cache.cc → libraries/http_server/tests/lru_cache.cc b/libraries/http_backend/tests/lru_cache.cc → libraries/http_server/tests/lru_cache.cc
@@ -1,4 +1,4 @@
-#include <lithium_http_backend.hh>
+#include <lithium_http_server.hh>
 #include "symbols.hh"
 
 using namespace li;

diff --git a/libraries/http_server/tests/reactor.cc b/libraries/http_server/tests/reactor.cc
@@ -0,0 +1,14 @@
+
+
+enum status {
+  READ,
+  WRITE,
+  EOF
+};
+
+event_loop([] (int fd, status s, auto event_queue) {
+
+  event_queue.add(new_fd, RW);
+  event_queue.mod(new_fd, RW);
+  event_queue.del(new_fd, RW);
+});
diff --git a/.../http_backend/tests/request_parameters.cc → ...s/http_server/tests/request_parameters.cc b/.../http_backend/tests/request_parameters.cc → ...s/http_server/tests/request_parameters.cc
@@ -1,5 +1,5 @@
 #include "test.hh"
-#include <lithium_http_backend.hh>
+#include <lithium_http_server.hh>
 
 #include <sched.h>
 #include <sys/resource.h>

diff --git a/...ies/http_backend/tests/serve_directory.cc → ...ries/http_server/tests/serve_directory.cc b/...ies/http_backend/tests/serve_directory.cc → ...ries/http_server/tests/serve_directory.cc
@@ -2,7 +2,7 @@
 #include "test.hh"
 #include <filesystem>
 #include <fstream>
-#include <lithium_http_backend.hh>
+#include <lithium_http_server.hh>
 
 
 using namespace li;

diff --git a/.../http_backend/tests/sql_authentication.cc → ...s/http_server/tests/sql_authentication.cc b/.../http_backend/tests/sql_authentication.cc → ...s/http_server/tests/sql_authentication.cc
diff --git a/libraries/http_backend/tests/symbols.hh → libraries/http_server/tests/symbols.hh b/libraries/http_backend/tests/symbols.hh → libraries/http_server/tests/symbols.hh
diff --git a/libraries/http_backend/tests/test.hh → libraries/http_server/tests/test.hh b/libraries/http_backend/tests/test.hh → libraries/http_server/tests/test.hh
diff --git a/libraries/http_backend/tests/url_decode.cc → libraries/http_server/tests/url_decode.cc b/libraries/http_backend/tests/url_decode.cc → libraries/http_server/tests/url_decode.cc
@@ -1,6 +1,6 @@
 #include "symbols.hh"
 #include <iostream>
-#include <lithium_http_backend.hh>
+#include <lithium_http_server.hh>
 
 
 using namespace li;

diff --git a/...aries/http_backend/tests/url_parameter.cc → libraries/http_server/tests/url_parameter.cc b/...aries/http_backend/tests/url_parameter.cc → libraries/http_server/tests/url_parameter.cc
@@ -1,5 +1,5 @@
 #include "test.hh"
-#include <lithium_http_backend.hh>
+#include <lithium_http_server.hh>
 
 
 #include "symbols.hh"