Mirror/Crow
1
0
Fork 0
mirror of https://github.com/CrowCpp/Crow.git synced 2024-06-07 21:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #359 from CrowCpp/run_async

Browse Source 
added run_async method
This commit is contained in:
Farook Al-Sammarraie 2022-03-16 23:01:44 +03:00 committed by GitHub
commit a970167205
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 62 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/crow/app.h
View File

@ -304,6 +304,14 @@ namespace crow
} }
} }
/// Non-blocking version of \ref run()
std::future<void> run_async()
{
return std::async(std::launch::async, [&] {
this->run();
});
}
/// Stop the server /// Stop the server
void stop() void stop()
{ {

112
tests/unittest.cpp
View File

@ -463,10 +463,7 @@ TEST_CASE("server_handling_error_request")
}); });
// Server<SimpleApp> server(&app, LOCALHOST_ADDRESS, 45451); // Server<SimpleApp> server(&app, LOCALHOST_ADDRESS, 45451);
// auto _ = async(launch::async, [&]{server.run();}); // auto _ = async(launch::async, [&]{server.run();});
auto _ = async(launch::async, auto _ = app.bindaddr(LOCALHOST_ADDRESS).port(45451).run_async();
[&] {
app.bindaddr(LOCALHOST_ADDRESS).port(45451).run();
});
app.wait_for_server_start(); app.wait_for_server_start();
std::string sendmsg = "POX"; std::string sendmsg = "POX";
asio::io_service is; asio::io_service is;
@ -498,10 +495,7 @@ TEST_CASE("server_handling_error_request_http_version")
([] { ([] {
return "A"; return "A";
}); });
auto _ = async(launch::async, auto _ = app.bindaddr(LOCALHOST_ADDRESS).port(45451).run_async();
[&] {
app.bindaddr(LOCALHOST_ADDRESS).port(45451).run();
});
app.wait_for_server_start(); app.wait_for_server_start();
std::string sendmsg = "POST /\r\nContent-Length:3\r\nX-HeaderTest: 123\r\n\r\nA=B\r\n"; std::string sendmsg = "POST /\r\nContent-Length:3\r\nX-HeaderTest: 123\r\n\r\nA=B\r\n";
asio::io_service is; asio::io_service is;
@ -538,14 +532,8 @@ TEST_CASE("multi_server")
return "B"; return "B";
}); });
auto _ = async(launch::async, auto _ = app1.bindaddr(LOCALHOST_ADDRESS).port(45451).run_async();
[&] { auto _2 = app2.bindaddr(LOCALHOST_ADDRESS).port(45452).run_async();
app1.bindaddr(LOCALHOST_ADDRESS).port(45451).run();
});
auto _2 = async(launch::async,
[&] {
app2.bindaddr(LOCALHOST_ADDRESS).port(45452).run();
});
app1.wait_for_server_start(); app1.wait_for_server_start();
app2.wait_for_server_start(); app2.wait_for_server_start();
@ -1354,10 +1342,7 @@ TEST_CASE("middleware_context")
return ""; return "";
}); });
auto _ = async(launch::async, auto _ = app.bindaddr(LOCALHOST_ADDRESS).port(45451).run_async();
[&] {
app.bindaddr(LOCALHOST_ADDRESS).port(45451).run();
});
app.wait_for_server_start(); app.wait_for_server_start();
std::string sendmsg = "GET /\r\n\r\n"; std::string sendmsg = "GET /\r\n\r\n";
asio::io_service is; asio::io_service is;
@ -1438,10 +1423,7 @@ TEST_CASE("local_middleware")
app.validate(); app.validate();
auto _ = async(launch::async, auto _ = app.bindaddr(LOCALHOST_ADDRESS).port(45451).run_async();
[&] {
app.bindaddr(LOCALHOST_ADDRESS).port(45451).run();
});
app.wait_for_server_start(); app.wait_for_server_start();
asio::io_service is; asio::io_service is;
@ -1494,10 +1476,7 @@ TEST_CASE("middleware_cookieparser")
return ""; return "";
}); });
auto _ = async(launch::async, auto _ = app.bindaddr(LOCALHOST_ADDRESS).port(45451).run_async();
[&] {
app.bindaddr(LOCALHOST_ADDRESS).port(45451).run();
});
app.wait_for_server_start(); app.wait_for_server_start();
std::string sendmsg = std::string sendmsg =
"GET /\r\nCookie: key1=value1; key2=\"val=ue2\"; key3=\"val\"ue3\"; " "GET /\r\nCookie: key1=value1; key2=\"val=ue2\"; key3=\"val\"ue3\"; "
@ -1614,10 +1593,7 @@ TEST_CASE("bug_quick_repeated_request")
return "hello"; return "hello";
}); });
auto _ = async(launch::async, auto _ = app.bindaddr(LOCALHOST_ADDRESS).port(45451).run_async();
[&] {
app.bindaddr(LOCALHOST_ADDRESS).port(45451).run();
});
app.wait_for_server_start(); app.wait_for_server_start();
std::string sendmsg = "GET / HTTP/1.1\r\nHost: localhost\r\n\r\n"; std::string sendmsg = "GET / HTTP/1.1\r\nHost: localhost\r\n\r\n";
asio::io_service is; asio::io_service is;
@ -1660,10 +1636,7 @@ TEST_CASE("simple_url_params")
/// params?h=1&foo=bar&lol&count[]=1&count[]=4&pew=5.2 /// params?h=1&foo=bar&lol&count[]=1&count[]=4&pew=5.2
auto _ = async(launch::async, auto _ = app.bindaddr(LOCALHOST_ADDRESS).port(45451).run_async();
[&] {
app.bindaddr(LOCALHOST_ADDRESS).port(45451).run();
});
app.wait_for_server_start(); app.wait_for_server_start();
asio::io_service is; asio::io_service is;
std::string sendmsg; std::string sendmsg;
@ -1886,6 +1859,24 @@ TEST_CASE("route_dynamic")
TEST_CASE("multipart") TEST_CASE("multipart")
{ {
//
//--CROW-BOUNDARY
//Content-Disposition: form-data; name=\"hello\"
//
//world
//--CROW-BOUNDARY
//Content-Disposition: form-data; name=\"world\"
//
//hello
//--CROW-BOUNDARY
//Content-Disposition: form-data; name=\"multiline\"
//
//text
//text
//text
//--CROW-BOUNDARY--
//
std::string test_string = "--CROW-BOUNDARY\r\nContent-Disposition: form-data; name=\"hello\"\r\n\r\nworld\r\n--CROW-BOUNDARY\r\nContent-Disposition: form-data; name=\"world\"\r\n\r\nhello\r\n--CROW-BOUNDARY\r\nContent-Disposition: form-data; name=\"multiline\"\r\n\r\ntext\ntext\ntext\r\n--CROW-BOUNDARY--\r\n"; std::string test_string = "--CROW-BOUNDARY\r\nContent-Disposition: form-data; name=\"hello\"\r\n\r\nworld\r\n--CROW-BOUNDARY\r\nContent-Disposition: form-data; name=\"world\"\r\n\r\nhello\r\n--CROW-BOUNDARY\r\nContent-Disposition: form-data; name=\"multiline\"\r\n\r\ntext\ntext\ntext\r\n--CROW-BOUNDARY--\r\n";
SimpleApp app; SimpleApp app;
@ -1893,7 +1884,6 @@ TEST_CASE("multipart")
CROW_ROUTE(app, "/multipart") CROW_ROUTE(app, "/multipart")
([](const crow::request& req, crow::response& res) { ([](const crow::request& req, crow::response& res) {
multipart::message msg(req); multipart::message msg(req);
res.add_header("Content-Type", "multipart/form-data; boundary=CROW-BOUNDARY");
res.body = msg.dump(); res.body = msg.dump();
res.end(); res.end();
}); });
@ -1911,6 +1901,25 @@ TEST_CASE("multipart")
app.handle(req, res); app.handle(req, res);
CHECK(test_string == res.body); CHECK(test_string == res.body);
multipart::message msg(req);
CHECK("hello" == msg.get_part_by_name("world").body);
CHECK("form-data" == msg.get_part_by_name("hello").get_header_object("Content-Disposition").value);
}
// Check with `"` encapsulating the boundary (.NET clients do this)
{
request req;
response res;
req.url = "/multipart";
req.add_header("Content-Type", "multipart/form-data; boundary=\"CROW-BOUNDARY\"");
req.body = test_string;
app.handle(req, res);
CHECK(test_string == res.body);
} }
} // multipart } // multipart
@ -1988,12 +1997,9 @@ TEST_CASE("stream_response")
app.validate(); app.validate();
//running the test on a separate thread to allow the client to sleep // running the test on a separate thread to allow the client to sleep
std::thread runTest([&app, &key_response, key_response_size]() { std::thread runTest([&app, &key_response, key_response_size]() {
auto _ = async(launch::async, auto _ = app.bindaddr(LOCALHOST_ADDRESS).port(45451).run_async();
[&] {
app.bindaddr(LOCALHOST_ADDRESS).port(45451).run();
});
app.wait_for_server_start(); app.wait_for_server_start();
asio::io_service is; asio::io_service is;
std::string sendmsg; std::string sendmsg;
@ -2069,10 +2075,7 @@ TEST_CASE("websocket")
app.validate(); app.validate();
auto _ = async(launch::async, auto _ = app.bindaddr(LOCALHOST_ADDRESS).port(45451).run_async();
[&] {
app.bindaddr(LOCALHOST_ADDRESS).port(45451).run();
});
app.wait_for_server_start(); app.wait_for_server_start();
asio::io_service is; asio::io_service is;
@ -2244,12 +2247,8 @@ TEST_CASE("zlib_compression")
res.end(); res.end();
}); });
auto t1 = async(launch::async, [&] { auto t1 = app_deflate.bindaddr(LOCALHOST_ADDRESS).port(45451).use_compression(compression::algorithm::DEFLATE).run_async();
app_deflate.bindaddr(LOCALHOST_ADDRESS).port(45451).use_compression(compression::algorithm::DEFLATE).run(); auto t2 = app_gzip.bindaddr(LOCALHOST_ADDRESS).port(45452).use_compression(compression::algorithm::GZIP).run_async();
});
auto t2 = async(launch::async, [&] {
app_gzip.bindaddr(LOCALHOST_ADDRESS).port(45452).use_compression(compression::algorithm::GZIP).run();
});
app_deflate.wait_for_server_start(); app_deflate.wait_for_server_start();
app_gzip.wait_for_server_start(); app_gzip.wait_for_server_start();
@ -2668,9 +2667,7 @@ TEST_CASE("get_port")
const std::uint16_t port = 12345; const std::uint16_t port = 12345;
auto _ = async(launch::async, [&] { auto _ = app.port(port).run_async();
app.port(port).run();
});
app.wait_for_server_start(); app.wait_for_server_start();
CHECK(app.port() == port); CHECK(app.port() == port);
@ -2690,9 +2687,8 @@ TEST_CASE("timeout")
return "hello"; return "hello";
}); });
auto _ = async(launch::async, [&] { auto _ = app.bindaddr(LOCALHOST_ADDRESS).timeout(timeout).port(45451).run_async();
app.bindaddr(LOCALHOST_ADDRESS).timeout(timeout).port(45451).run();
});
app.wait_for_server_start(); app.wait_for_server_start();
asio::io_service is; asio::io_service is;
std::string sendmsg = "GET /\r\n\r\n"; std::string sendmsg = "GET /\r\n\r\n";