From dc466e7d1da2c4e7eb52ccacd2812a59f5889d41 Mon Sep 17 00:00:00 2001 From: eidheim Date: Tue, 28 Jun 2016 12:49:12 +0200 Subject: [PATCH] Fixes #46: library is now fully asynchronous --- CMakeLists.txt | 2 +- http_examples.cpp | 74 ++++++++++++++++--------------- https_examples.cpp | 74 ++++++++++++++++--------------- server_http.hpp | 106 +++++++++++++++++++++------------------------ 4 files changed, 128 insertions(+), 128 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b44422..a38fb18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ include_directories(.) find_package(Threads REQUIRED) -find_package(Boost 1.54.0 COMPONENTS regex system thread coroutine context filesystem date_time REQUIRED) +find_package(Boost 1.54.0 COMPONENTS regex system thread filesystem date_time REQUIRED) include_directories(SYSTEM ${Boost_INCLUDE_DIR}) if(APPLE) diff --git a/http_examples.cpp b/http_examples.cpp index d1119ca..d82a10b 100644 --- a/http_examples.cpp +++ b/http_examples.cpp @@ -20,12 +20,14 @@ typedef SimpleWeb::Server HttpServer; typedef SimpleWeb::Client HttpClient; int main() { - //HTTP-server at port 8080 using 4 threads - HttpServer server(8080, 4); + //HTTP-server at port 8080 using 1 thread + //Unless you do more heavy non-threaded processing in the resources, + //1 thread is usually faster than several threads + HttpServer server(8080, 1); //Add resources using path-regex and method-string, and an anonymous function //POST-example for the path /string, responds the posted string - server.resource["^/string$"]["POST"]=[](HttpServer::Response& response, shared_ptr request) { + server.resource["^/string$"]["POST"]=[](shared_ptr response, shared_ptr request) { //Retrieve string: auto content=request->content.string(); //request->content.string() is a convenience function for: @@ -33,7 +35,7 @@ int main() { //ss << request->content.rdbuf(); //string content=ss.str(); - response << "HTTP/1.1 200 OK\r\nContent-Length: " << content.length() << "\r\n\r\n" << content; + *response << "HTTP/1.1 200 OK\r\nContent-Length: " << content.length() << "\r\n\r\n" << content; }; //POST-example for the path /json, responds firstName+" "+lastName from the posted json @@ -44,23 +46,23 @@ int main() { // "lastName": "Smith", // "age": 25 //} - server.resource["^/json$"]["POST"]=[](HttpServer::Response& response, shared_ptr request) { + server.resource["^/json$"]["POST"]=[](shared_ptr response, shared_ptr request) { try { ptree pt; read_json(request->content, pt); string name=pt.get("firstName")+" "+pt.get("lastName"); - response << "HTTP/1.1 200 OK\r\nContent-Length: " << name.length() << "\r\n\r\n" << name; + *response << "HTTP/1.1 200 OK\r\nContent-Length: " << name.length() << "\r\n\r\n" << name; } catch(exception& e) { - response << "HTTP/1.1 400 Bad Request\r\nContent-Length: " << strlen(e.what()) << "\r\n\r\n" << e.what(); + *response << "HTTP/1.1 400 Bad Request\r\nContent-Length: " << strlen(e.what()) << "\r\n\r\n" << e.what(); } }; //GET-example for the path /info //Responds with request-information - server.resource["^/info$"]["GET"]=[](HttpServer::Response& response, shared_ptr request) { + server.resource["^/info$"]["GET"]=[](shared_ptr response, shared_ptr request) { stringstream content_stream; content_stream << "

Request from " << request->remote_endpoint_address << " (" << request->remote_endpoint_port << ")

"; content_stream << request->method << " " << request->path << " HTTP/" << request->http_version << "
"; @@ -71,21 +73,21 @@ int main() { //find length of content_stream (length received using content_stream.tellp()) content_stream.seekp(0, ios::end); - response << "HTTP/1.1 200 OK\r\nContent-Length: " << content_stream.tellp() << "\r\n\r\n" << content_stream.rdbuf(); + *response << "HTTP/1.1 200 OK\r\nContent-Length: " << content_stream.tellp() << "\r\n\r\n" << content_stream.rdbuf(); }; //GET-example for the path /match/[number], responds with the matched string in path (number) //For instance a request GET /match/123 will receive: 123 - server.resource["^/match/([0-9]+)$"]["GET"]=[](HttpServer::Response& response, shared_ptr request) { + server.resource["^/match/([0-9]+)$"]["GET"]=[&server](shared_ptr response, shared_ptr request) { string number=request->path_match[1]; - response << "HTTP/1.1 200 OK\r\nContent-Length: " << number.length() << "\r\n\r\n" << number; + *response << "HTTP/1.1 200 OK\r\nContent-Length: " << number.length() << "\r\n\r\n" << number; }; //Default GET-example. If no other matches, this anonymous function will be called. //Will respond with content in the web/-directory, and its subdirectories. //Default file: index.html //Can for instance be used to retrieve an HTML 5 client that uses REST-resources on this server - server.default_resource["GET"]=[](HttpServer::Response& response, shared_ptr request) { + server.default_resource["GET"]=[&server](shared_ptr response, shared_ptr request) { const auto web_root_path=boost::filesystem::canonical("web"); boost::filesystem::path path=web_root_path; path/=request->path; @@ -97,39 +99,41 @@ int main() { if(boost::filesystem::is_directory(path)) path/="index.html"; if(boost::filesystem::exists(path) && boost::filesystem::is_regular_file(path)) { - ifstream ifs; - ifs.open(path.string(), ifstream::in | ios::binary); + auto ifs=make_shared(); + ifs->open(path.string(), ifstream::in | ios::binary); if(ifs) { - ifs.seekg(0, ios::end); - auto length=ifs.tellg(); - - ifs.seekg(0, ios::beg); - - response << "HTTP/1.1 200 OK\r\nContent-Length: " << length << "\r\n\r\n"; - //read and send 128 KB at a time - const size_t buffer_size=131072; - vector buffer(buffer_size); - streamsize read_length; - try { - while((read_length=ifs.read(&buffer[0], buffer_size).gcount())>0) { - response.write(&buffer[0], read_length); - response.flush(); + size_t buffer_size=131072; + auto buffer=make_shared>(buffer_size); + + auto send_callback=make_shared >(nullptr); + *send_callback=[&server, response, ifs, buffer, buffer_size, send_callback](const boost::system::error_code &ec) { + if(!ec) { + streamsize read_length; + if((read_length=ifs->read(&(*buffer)[0], buffer_size).gcount())>0) { + response->write(&(*buffer)[0], read_length); + server.send(response, *send_callback); + } } - } - catch(const exception &) { - cerr << "Connection interrupted, closing file" << endl; - } - - ifs.close(); + else + cerr << "Connection interrupted" << endl; + }; + + ifs->seekg(0, ios::end); + auto length=ifs->tellg(); + + ifs->seekg(0, ios::beg); + + *response << "HTTP/1.1 200 OK\r\nContent-Length: " << length << "\r\n\r\n"; + server.send(response, *send_callback); return; } } } } string content="Could not open path "+request->path; - response << "HTTP/1.1 400 Bad Request\r\nContent-Length: " << content.length() << "\r\n\r\n" << content; + *response << "HTTP/1.1 400 Bad Request\r\nContent-Length: " << content.length() << "\r\n\r\n" << content; }; thread server_thread([&server](){ diff --git a/https_examples.cpp b/https_examples.cpp index 2e9d8b5..d4d4588 100644 --- a/https_examples.cpp +++ b/https_examples.cpp @@ -20,12 +20,14 @@ typedef SimpleWeb::Server HttpsServer; typedef SimpleWeb::Client HttpsClient; int main() { - //HTTPS-server at port 8080 using 4 threads - HttpsServer server(8080, 4, "server.crt", "server.key"); + //HTTPS-server at port 8080 using 1 thread + //Unless you do more heavy non-threaded processing in the resources, + //1 thread is usually faster than several threads + HttpsServer server(8080, 1, "server.crt", "server.key"); //Add resources using path-regex and method-string, and an anonymous function //POST-example for the path /string, responds the posted string - server.resource["^/string$"]["POST"]=[](HttpsServer::Response& response, shared_ptr request) { + server.resource["^/string$"]["POST"]=[](shared_ptr response, shared_ptr request) { //Retrieve string: auto content=request->content.string(); //request->content.string() is a convenience function for: @@ -33,7 +35,7 @@ int main() { //ss << request->content.rdbuf(); //string content=ss.str(); - response << "HTTP/1.1 200 OK\r\nContent-Length: " << content.length() << "\r\n\r\n" << content; + *response << "HTTP/1.1 200 OK\r\nContent-Length: " << content.length() << "\r\n\r\n" << content; }; //POST-example for the path /json, responds firstName+" "+lastName from the posted json @@ -44,23 +46,23 @@ int main() { // "lastName": "Smith", // "age": 25 //} - server.resource["^/json$"]["POST"]=[](HttpsServer::Response& response, shared_ptr request) { + server.resource["^/json$"]["POST"]=[](shared_ptr response, shared_ptr request) { try { ptree pt; read_json(request->content, pt); string name=pt.get("firstName")+" "+pt.get("lastName"); - response << "HTTP/1.1 200 OK\r\nContent-Length: " << name.length() << "\r\n\r\n" << name; + *response << "HTTP/1.1 200 OK\r\nContent-Length: " << name.length() << "\r\n\r\n" << name; } catch(exception& e) { - response << "HTTP/1.1 400 Bad Request\r\nContent-Length: " << strlen(e.what()) << "\r\n\r\n" << e.what(); + *response << "HTTP/1.1 400 Bad Request\r\nContent-Length: " << strlen(e.what()) << "\r\n\r\n" << e.what(); } }; //GET-example for the path /info //Responds with request-information - server.resource["^/info$"]["GET"]=[](HttpsServer::Response& response, shared_ptr request) { + server.resource["^/info$"]["GET"]=[](shared_ptr response, shared_ptr request) { stringstream content_stream; content_stream << "

Request from " << request->remote_endpoint_address << " (" << request->remote_endpoint_port << ")

"; content_stream << request->method << " " << request->path << " HTTP/" << request->http_version << "
"; @@ -71,21 +73,21 @@ int main() { //find length of content_stream (length received using content_stream.tellp()) content_stream.seekp(0, ios::end); - response << "HTTP/1.1 200 OK\r\nContent-Length: " << content_stream.tellp() << "\r\n\r\n" << content_stream.rdbuf(); + *response << "HTTP/1.1 200 OK\r\nContent-Length: " << content_stream.tellp() << "\r\n\r\n" << content_stream.rdbuf(); }; //GET-example for the path /match/[number], responds with the matched string in path (number) //For instance a request GET /match/123 will receive: 123 - server.resource["^/match/([0-9]+)$"]["GET"]=[](HttpsServer::Response& response, shared_ptr request) { + server.resource["^/match/([0-9]+)$"]["GET"]=[&server](shared_ptr response, shared_ptr request) { string number=request->path_match[1]; - response << "HTTP/1.1 200 OK\r\nContent-Length: " << number.length() << "\r\n\r\n" << number; + *response << "HTTP/1.1 200 OK\r\nContent-Length: " << number.length() << "\r\n\r\n" << number; }; //Default GET-example. If no other matches, this anonymous function will be called. //Will respond with content in the web/-directory, and its subdirectories. //Default file: index.html //Can for instance be used to retrieve an HTML 5 client that uses REST-resources on this server - server.default_resource["GET"]=[](HttpsServer::Response& response, shared_ptr request) { + server.default_resource["GET"]=[&server](shared_ptr response, shared_ptr request) { const auto web_root_path=boost::filesystem::canonical("web"); boost::filesystem::path path=web_root_path; path/=request->path; @@ -97,39 +99,41 @@ int main() { if(boost::filesystem::is_directory(path)) path/="index.html"; if(boost::filesystem::exists(path) && boost::filesystem::is_regular_file(path)) { - ifstream ifs; - ifs.open(path.string(), ifstream::in | ios::binary); + auto ifs=make_shared(); + ifs->open(path.string(), ifstream::in | ios::binary); if(ifs) { - ifs.seekg(0, ios::end); - auto length=ifs.tellg(); - - ifs.seekg(0, ios::beg); - - response << "HTTP/1.1 200 OK\r\nContent-Length: " << length << "\r\n\r\n"; - //read and send 128 KB at a time - const size_t buffer_size=131072; - vector buffer(buffer_size); - streamsize read_length; - try { - while((read_length=ifs.read(&buffer[0], buffer_size).gcount())>0) { - response.write(&buffer[0], read_length); - response.flush(); + size_t buffer_size=131072; + auto buffer=make_shared>(buffer_size); + + auto send_callback=make_shared >(nullptr); + *send_callback=[&server, response, ifs, buffer, buffer_size, send_callback](const boost::system::error_code &ec) { + if(!ec) { + streamsize read_length; + if((read_length=ifs->read(&(*buffer)[0], buffer_size).gcount())>0) { + response->write(&(*buffer)[0], read_length); + server.send(response, *send_callback); + } } - } - catch(const exception &) { - cerr << "Connection interrupted, closing file" << endl; - } - - ifs.close(); + else + cerr << "Connection interrupted" << endl; + }; + + ifs->seekg(0, ios::end); + auto length=ifs->tellg(); + + ifs->seekg(0, ios::beg); + + *response << "HTTP/1.1 200 OK\r\nContent-Length: " << length << "\r\n\r\n"; + server.send(response, *send_callback); return; } } } } string content="Could not open path "+request->path; - response << "HTTP/1.1 400 Bad Request\r\nContent-Length: " << content.length() << "\r\n\r\n" << content; + *response << "HTTP/1.1 400 Bad Request\r\nContent-Length: " << content.length() << "\r\n\r\n" << content; }; thread server_thread([&server](){ diff --git a/server_http.hpp b/server_http.hpp index 557c219..7ea09db 100644 --- a/server_http.hpp +++ b/server_http.hpp @@ -2,7 +2,6 @@ #define SERVER_HTTP_HPP #include -#include #include #include #include @@ -21,27 +20,17 @@ namespace SimpleWeb { class Response : public std::ostream { friend class ServerBase; - private: - boost::asio::yield_context& yield; - + boost::asio::streambuf streambuf; - socket_type &socket; - - Response(socket_type &socket, boost::asio::yield_context& yield): - std::ostream(&streambuf), yield(yield), socket(socket) {} - + std::shared_ptr socket; + + Response(std::shared_ptr socket): std::ostream(&streambuf), socket(socket) {} + public: size_t size() { return streambuf.size(); } - void flush() { - boost::system::error_code ec; - boost::asio::async_write(socket, streambuf, yield[ec]); - - if(ec) - throw std::runtime_error(ec.message()); - } }; class Content : public std::istream { @@ -109,11 +98,11 @@ namespace SimpleWeb { class Config { friend class ServerBase; - private: - Config(unsigned short port, size_t num_threads): port(port), num_threads(num_threads), reuse_address(true) {} - unsigned short port; + + Config(unsigned short port, size_t num_threads): num_threads(num_threads), port(port), reuse_address(true) {} size_t num_threads; public: + unsigned short port; ///IPv4 address in dotted decimal form or IPv6 address in hexadecimal notation. ///If empty, the address will be any address. std::string address; @@ -124,14 +113,14 @@ namespace SimpleWeb { Config config; std::unordered_map::Response&, std::shared_ptr::Request>)> > > resource; + std::function::Response>, std::shared_ptr::Request>)> > > resource; std::unordered_map::Response&, std::shared_ptr::Request>)> > default_resource; + std::function::Response>, std::shared_ptr::Request>)> > default_resource; private: std::vector::Response&, std::shared_ptr::Request>)> > > > > opt_resource; + std::function::Response>, std::shared_ptr::Request>)> > > > > opt_resource; public: void start() { @@ -191,6 +180,13 @@ namespace SimpleWeb { acceptor.close(); io_service.stop(); } + + void send(std::shared_ptr response, const std::function& callback=nullptr) { + boost::asio::async_write(*response->socket, response->streambuf, [this, response, callback](const boost::system::error_code& ec, size_t /*bytes_transferred*/) { + if(callback) + callback(ec); + }); + } protected: boost::asio::io_service io_service; @@ -357,48 +353,44 @@ namespace SimpleWeb { } void write_response(std::shared_ptr socket, std::shared_ptr request, - std::function::Response&, std::shared_ptr::Request>)>& resource_function) { + std::function::Response>, + std::shared_ptr::Request>)>& resource_function) { //Set timeout on the following boost::asio::async-read or write function std::shared_ptr timer; if(timeout_content>0) timer=set_timeout_on_socket(socket, request, timeout_content); - boost::asio::spawn(request->strand, [this, &resource_function, socket, request, timer](boost::asio::yield_context yield) { - Response response(*socket, yield); - - try { - resource_function(response, request); - } - catch(const std::exception&) { - return; - } - - if(response.size()>0) { - try { - response.flush(); + auto response=std::shared_ptr(new Response(socket), [this, request, timer](Response *response_ptr) { + auto response=std::shared_ptr(response_ptr); + send(response, [this, response, request, timer](const boost::system::error_code& ec) { + if(!ec) { + if(timeout_content>0) + timer->cancel(); + float http_version; + try { + http_version=stof(request->http_version); + } + catch(const std::exception &) { + return; + } + + auto range=request->header.equal_range("Connection"); + for(auto it=range.first;it!=range.second;it++) { + if(boost::iequals(it->second, "close")) + return; + } + if(http_version>1.05) + read_request_and_content(response->socket); } - catch(const std::exception &) { - return; - } - } - if(timeout_content>0) - timer->cancel(); - float http_version; - try { - http_version=stof(request->http_version); - } - catch(const std::exception &) { - return; - } - - auto range=request->header.equal_range("Connection"); - for(auto it=range.first;it!=range.second;it++) { - if(boost::iequals(it->second, "close")) - return; - } - if(http_version>1.05) - read_request_and_content(socket); + }); }); + + try { + resource_function(response, request); + } + catch(const std::exception&) { + return; + } } };