Skip to content

Commit

Permalink
add more interface (qicosmos#553)
Browse files Browse the repository at this point in the history
  • Loading branch information
@qicosmos
qicosmos authored Apr 18, 2024
1 parent 0fefe18 commit a49976b
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 31 deletions.
3 changes: 1 addition & 2 deletions example/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,7 @@ async_simple::coro::Lazy<void> use_websocket() {
assert(!result.net_err);
auto data = co_await client.read_websocket();
assert(data.resp_body == "hello websocket");
result =
co_await client.write_websocket("test again", /*need_mask = */ false);
result = co_await client.write_websocket("test again");
assert(!result.net_err);
data = co_await client.read_websocket();
assert(data.resp_body == "test again");
Expand Down
35 changes: 23 additions & 12 deletions include/cinatra/coro_http_client.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,24 +339,36 @@ class coro_http_client : public std::enable_shared_from_this<coro_http_client> {
}

async_simple::coro::Lazy<resp_data> write_websocket(
const char *data, bool need_mask = true, opcode op = opcode::text) {
const char *data, opcode op = opcode::text) {
std::string str(data);
co_return co_await write_websocket(std::span<char>(str), need_mask, op);
co_return co_await write_websocket(str, op);
}

async_simple::coro::Lazy<resp_data> write_websocket(
std::string &data, bool need_mask = true, opcode op = opcode::text) {
co_return co_await write_websocket(std::span<char>(data), need_mask, op);
const char *data, size_t size, opcode op = opcode::text) {
std::string str(data, size);
co_return co_await write_websocket(str, op);
}

async_simple::coro::Lazy<resp_data> write_websocket(
std::string &&data, bool need_mask = true, opcode op = opcode::text) {
co_return co_await write_websocket(std::span<char>(data), need_mask, op);
std::string_view data, opcode op = opcode::text) {
std::string str(data);
co_return co_await write_websocket(str, op);
}

async_simple::coro::Lazy<resp_data> write_websocket(
std::string &data, opcode op = opcode::text) {
co_return co_await write_websocket(std::span<char>(data), op);
}

async_simple::coro::Lazy<resp_data> write_websocket(
std::string &&data, opcode op = opcode::text) {
co_return co_await write_websocket(std::span<char>(data), op);
}

template <typename Source>
async_simple::coro::Lazy<resp_data> write_websocket(
Source source, bool need_mask = true, opcode op = opcode::text) {
Source source, opcode op = opcode::text) {
resp_data data{};

websocket ws{};
Expand All @@ -370,7 +382,7 @@ class coro_http_client : public std::enable_shared_from_this<coro_http_client> {
}

if constexpr (is_span_v<Source>) {
std::string encode_header = ws.encode_frame(source, op, need_mask);
std::string encode_header = ws.encode_frame(source, op, true);
std::vector<asio::const_buffer> buffers{
asio::buffer(encode_header.data(), encode_header.size()),
asio::buffer(source.data(), source.size())};
Expand All @@ -386,8 +398,7 @@ class coro_http_client : public std::enable_shared_from_this<coro_http_client> {
auto result = co_await source();

std::span<char> msg(result.buf.data(), result.buf.size());
std::string encode_header =
ws.encode_frame(msg, op, need_mask, result.eof);
std::string encode_header = ws.encode_frame(msg, op, result.eof);
std::vector<asio::const_buffer> buffers{
asio::buffer(encode_header.data(), encode_header.size()),
asio::buffer(msg.data(), msg.size())};
Expand All @@ -410,7 +421,7 @@ class coro_http_client : public std::enable_shared_from_this<coro_http_client> {

async_simple::coro::Lazy<resp_data> write_websocket_close(
std::string msg = "") {
co_return co_await write_websocket(std::move(msg), false, opcode::close);
co_return co_await write_websocket(std::move(msg), opcode::close);
}

#ifdef BENCHMARK_TEST
Expand Down Expand Up @@ -1839,7 +1850,7 @@ class coro_http_client : public std::enable_shared_from_this<coro_http_client> {
auto close_str = ws.format_close_payload(close_code::normal,
reason.data(), reason.size());
auto span = std::span<char>(close_str);
std::string encode_header = ws.encode_frame(span, opcode::close, false);
std::string encode_header = ws.encode_frame(span, opcode::close, true);
std::vector<asio::const_buffer> buffers{asio::buffer(encode_header),
asio::buffer(reason)};

Expand Down
11 changes: 4 additions & 7 deletions include/cinatra/websocket.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,7 @@ class websocket {
return {msg_header_, header_length};
}

std::string encode_frame(std::span<char> &data, opcode op, bool need_mask,
bool eof = true) {
std::string encode_frame(std::span<char> &data, opcode op, bool eof) {
std::string header;
/// Base header.
frame_header hdr{};
Expand Down Expand Up @@ -173,11 +172,9 @@ class websocket {

/// The mask is a 32-bit value.
uint8_t mask[4] = {};
if (need_mask) {
header[1] |= 0x80;
uint32_t random = (uint32_t)rand();
memcpy(mask, &random, 4);
}
header[1] |= 0x80;
uint32_t random = (uint32_t)rand();
memcpy(mask, &random, 4);

size_t size = header.size();
header.resize(size + 4);
Expand Down
6 changes: 3 additions & 3 deletions tests/test_cinatra_websocket.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,7 @@ async_simple::coro::Lazy<void> test_websocket(coro_http_client &client) {
auto result = co_await client.write_websocket("hello websocket");
auto data = co_await client.read_websocket();
CHECK(data.resp_body == "hello websocket");
co_await client.write_websocket("test again", /*need_mask = */
false);
co_await client.write_websocket("test again");
data = co_await client.read_websocket();
CHECK(data.resp_body == "test again");
co_await client.write_websocket_close("ws close");
Expand Down Expand Up @@ -243,7 +242,8 @@ async_simple::coro::Lazy<void> test_websocket() {
co_return;
}

co_await client.write_websocket("test2fdsaf", true, opcode::binary);
co_await client.write_websocket(std::string_view("test2fdsaf"),
opcode::binary);
auto data = co_await client.read_websocket();
CHECK(data.resp_body == "test2fdsaf");

Expand Down
17 changes: 10 additions & 7 deletions tests/test_coro_http_server.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -802,6 +802,8 @@ TEST_CASE("test websocket with chunked") {
break;
}

std::cout << result.data.size() << "\n";

if (result.data.size() < ws_chunk_size) {
CHECK(result.data.size() == 24);
CHECK(result.eof);
Expand Down Expand Up @@ -841,7 +843,7 @@ TEST_CASE("test websocket with chunked") {
};

async_simple::coro::syncAwait(
client.write_websocket(std::move(source_fn), true, opcode::binary));
client.write_websocket(std::move(source_fn), opcode::binary));

auto data = async_simple::coro::syncAwait(client.read_websocket());
if (data.net_err) {
Expand Down Expand Up @@ -912,16 +914,17 @@ TEST_CASE("test websocket") {
auto lazy = []() -> async_simple::coro::Lazy<void> {
coro_http_client client{};
co_await client.connect("ws://127.0.0.1:9001/ws_echo");
co_await client.write_websocket("test2fdsaf", true, opcode::binary);
co_await client.write_websocket(std::string_view("test2fdsaf"),
opcode::binary);
auto data = co_await client.read_websocket();
CHECK(data.resp_body == "test2fdsaf");
co_await client.write_websocket("test_ws");
data = co_await client.read_websocket();
CHECK(data.resp_body == "test_ws");
co_await client.write_websocket("PING", false, opcode::ping);
co_await client.write_websocket("PING", opcode::ping);
data = co_await client.read_websocket();
CHECK(data.resp_body == "pong");
co_await client.write_websocket("PONG", false, opcode::pong);
co_await client.write_websocket("PONG", opcode::pong);
data = co_await client.read_websocket();
CHECK(data.resp_body == "ping");
co_await client.write_websocket_close("normal close");
Expand Down Expand Up @@ -1031,23 +1034,23 @@ TEST_CASE("test websocket binary data") {

std::string short_str(127, 'A');
async_simple::coro::syncAwait(
client1->write_websocket(std::move(short_str), true, opcode::binary));
client1->write_websocket(std::move(short_str), opcode::binary));

auto client2 = std::make_shared<coro_http_client>();
async_simple::coro::syncAwait(
client2->connect("ws://127.0.0.1:9001/medium_binary"));

std::string medium_str(65535, 'A');
async_simple::coro::syncAwait(
client2->write_websocket(std::move(medium_str), true, opcode::binary));
client2->write_websocket(std::move(medium_str), opcode::binary));

auto client3 = std::make_shared<coro_http_client>();
async_simple::coro::syncAwait(
client3->connect("ws://127.0.0.1:9001/long_binary"));

std::string long_str(65536, 'A');
async_simple::coro::syncAwait(
client3->write_websocket(std::move(long_str), true, opcode::binary));
client3->write_websocket(std::move(long_str), opcode::binary));

async_simple::coro::syncAwait(client1->write_websocket_close());
async_simple::coro::syncAwait(client2->write_websocket_close());
Expand Down

0 comments on commit a49976b

Please sign in to comment.