Improvements in the docs.

- Simplifications.
- Refactors read operaitons for useability.
- Better naming.
- Simplification of write operations.
- Adds a push communication channel.

.github/workflows/ci.yml

@@ -0,0 +1,43 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        build-type: ['sanity']
+        runs-on: [ubuntu-22.04]
+        compiler: [g++-11, clang++-11, clang++-13]
+        cxx-std: ['c++20']
+        optim-level: ['-O0']
+    runs-on: ${{ matrix.runs-on }}
+    env:
+      CXX: ${{ matrix.compiler }}
+      CXXFLAGS: -std=${{ matrix.cxx-std }} ${{ matrix.optim-level }} -Wall -Wextra
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+    - name: Install Autotools
+      run: sudo apt install automake
+    - name: Install compiler
+      run: sudo apt-get install -y ${{ matrix.compiler }}
+    - name: Install Redis
+      run: sudo apt-get install -y redis-server
+    - name: Install boost
+      uses: MarkusJx/install-boost@v2.3.0
+      id: install-boost
+      with:
+        boost_version: 1.79.0
+        platform_version: 22.04
+    - name: Configure
+      run: |
+        autoreconf -i
+        ./configure --with-boost=${{ steps.install-boost.outputs.BOOST_ROOT }}
+    - name: Build
+      run: make
+    - name: Check
+      run: make check VERBOSE=1

CHANGELOG.md

@@ -0,0 +1,76 @@
+# Changelog
+
+## v0.3.0
+
+* Adds `experimental::exec` and `receive_event` functions to offer a
+  thread safe and synchronous way of executing requests across
+  threads. See `intro_sync.cpp` and `subscriber_sync.cpp` for
+  examples.
+
+* `connection::async_read_push` was renamed to `async_receive_event`.
+
+* `connection::async_receive_event` is now being used to communicate
+  internal events to the user, such as resolve, connect, push etc. For
+  examples see subscriber.cpp and `connection::event`.
+
+* The `aedis` directory has been moved to `include` to look more
+  similar to Boost libraries. Users should now replace `-I/aedis-path`
+  with `-I/aedis-path/include` in the compiler flags.
+
+* The `AUTH` and `HELLO` commands are now sent automatically. This change was
+  necessary to implement reconnection. The username and password
+  used in `AUTH` should be provided by the user on
+  `connection::config`.
+
+* Adds support for reconnection. See `connection::enable_reconnect`.
+
+* Fixes a bug in the `connection::async_run(host, port)` overload
+  that was causing crashes on reconnection.
+
+* Fixes the executor usage in the connection class. Before theses
+  changes it was imposing `any_io_executor` on users.
+
+* `connection::async_receiver_event` is not cancelled anymore when
+  `connection::async_run` exits. This change makes user code simpler.
+
+* `connection::async_exec` with host and port overload has been
+  removed. Use the other `connection::async_run` overload.
+
+* The host and port parameters from `connection::async_run` have been
+  move to `connection::config` to better support authentication and
+  failover.
+
+* Many simplifications in the `chat_room` example.
+
+* Fixes build in clang the compilers and makes some improvements in
+  the documentation.
+
+## v0.2.1
+
+* Fixes a bug that happens on very high load.
+
+## v0.2.0
+
+* Major rewrite of the high-level API. There is no more need to use the low-level API anymore.
+* No more callbacks: Sending requests follows the ASIO asynchrnous model.
+* Support for reconnection: Pending requests are not canceled when a connection is lost and are re-sent when a new one is established.
+* The library is not sending HELLO-3 on user behalf anymore. This is important to support AUTH properly.
+
+## v0.1.2
+
+* Adds reconnect coroutine in the `echo_server` example.
+* Corrects `client::async_wait_for_data` with `make_parallel_group` to launch operation.
+* Improvements in the documentation.
+* Avoids dynamic memory allocation in the client class after reconnection.
+
+## v0.1.1
+
+* Improves the documentation and adds some features to the high-level client.
+
+## v0.1.0
+
+* Improvements in the design and documentation.
+
+## v0.0.1
+
+* First release to collect design feedback.

CMakeLists.txt

@@ -0,0 +1,2 @@
+# This is ongoing work. At the moment autotools is still the supported
+# build system.

Makefile.am

@@ -6,30 +6,30 @@ DISTCHECK_CONFIGURE_FLAGS = CPPFLAGS="$(BOOST_CPPFLAGS) $(CPPFLAGS)" LDFLAGS="$(
 
 AM_CPPFLAGS =
 AM_CPPFLAGS += $(BOOST_CPPFLAGS)
-#AM_CPPFLAGS += -I$(top_srcdir)/include
+AM_CPPFLAGS += -I$(top_srcdir)/include
 
 AM_LDFLAGS =
 AM_LDFLAGS += -pthread
 
+SUBDIRS = include
+
 check_PROGRAMS =
+check_PROGRAMS += low_level_sync
+check_PROGRAMS += intro
 check_PROGRAMS += intro_sync
-check_PROGRAMS += serialization_sync
-check_PROGRAMS += intro_high_level
-check_PROGRAMS += aggregates_high_level
+check_PROGRAMS += containers
+check_PROGRAMS += serialization
 check_PROGRAMS += test_low_level
-check_PROGRAMS += test_high_level
-if HAVE_CXX20
-check_PROGRAMS += transaction
-check_PROGRAMS += custom_adapter
-endif
+check_PROGRAMS += test_connection
 
 EXTRA_PROGRAMS =
-EXTRA_PROGRAMS += subscriber_high_level
-EXTRA_PROGRAMS += commands
-if HAVE_CXX20
+if HAVE_COROUTINES
 EXTRA_PROGRAMS += subscriber
+EXTRA_PROGRAMS += subscriber_sync
 EXTRA_PROGRAMS += echo_server
+EXTRA_PROGRAMS += echo_server_direct
 EXTRA_PROGRAMS += chat_room
+EXTRA_PROGRAMS += echo_server_client
 endif
 
 CLEANFILES =
@@ -38,54 +38,24 @@ CLEANFILES += $(EXTRA_PROGRAMS)
 .PHONY: all
 all: $(check_PROGRAMS) $(EXTRA_PROGRAMS)
 
-intro_high_level_SOURCES = $(top_srcdir)/examples/intro_high_level.cpp
-aggregates_high_level_SOURCES = $(top_srcdir)/examples/aggregates_high_level.cpp
-intro_sync_SOURCES = $(top_srcdir)/examples/intro_sync.cpp
-serialization_sync_SOURCES = $(top_srcdir)/examples/serialization_sync.cpp
-commands_SOURCES = $(top_srcdir)/tools/commands.cpp
-subscriber_high_level_SOURCES = $(top_srcdir)/examples/subscriber_high_level.cpp
+low_level_sync_SOURCES = $(top_srcdir)/tests/low_level_sync.cpp
 test_low_level_SOURCES = $(top_srcdir)/tests/low_level.cpp
-test_high_level_SOURCES = $(top_srcdir)/tests/high_level.cpp
-if HAVE_CXX20
-transaction_SOURCES = $(top_srcdir)/examples/transaction.cpp
+intro_SOURCES = $(top_srcdir)/examples/intro.cpp
+intro_sync_SOURCES = $(top_srcdir)/examples/intro_sync.cpp
+containers_SOURCES = $(top_srcdir)/examples/containers.cpp
+serialization_SOURCES = $(top_srcdir)/examples/serialization.cpp
+test_connection_SOURCES = $(top_srcdir)/tests/connection.cpp
+subscriber_sync_SOURCES = $(top_srcdir)/examples/subscriber_sync.cpp
+if HAVE_COROUTINES
 subscriber_SOURCES = $(top_srcdir)/examples/subscriber.cpp
-custom_adapter_SOURCES = $(top_srcdir)/examples/custom_adapter.cpp
-echo_server_SOURCES = $(top_srcdir)/examples/echo_server.cpp
 chat_room_SOURCES = $(top_srcdir)/examples/chat_room.cpp
+echo_server_SOURCES = $(top_srcdir)/examples/echo_server.cpp
+echo_server_direct_SOURCES = $(top_srcdir)/benchmarks/cpp/asio/echo_server_direct.cpp
+echo_server_client_SOURCES = $(top_srcdir)/benchmarks/cpp/asio/echo_server_client.cpp
 endif
 
-nobase_include_HEADERS =\
-  $(top_srcdir)/aedis/src.hpp\
-  $(top_srcdir)/aedis/redis/command.hpp\
-  $(top_srcdir)/aedis/generic/client.hpp\
-  $(top_srcdir)/aedis/generic/serializer.hpp\
-  $(top_srcdir)/aedis/generic/error.hpp\
-  $(top_srcdir)/aedis/generic/impl/error.ipp\
-  $(top_srcdir)/aedis/generic/detail/client_ops.hpp\
-  $(top_srcdir)/aedis/sentinel/command.hpp\
-  $(top_srcdir)/aedis/aedis.hpp\
-  $(top_srcdir)/aedis/adapter/detail/adapters.hpp\
-  $(top_srcdir)/aedis/adapter/error.hpp\
-  $(top_srcdir)/aedis/adapter/impl/error.ipp\
-  $(top_srcdir)/aedis/adapter/adapt.hpp\
-  $(top_srcdir)/aedis/adapter/detail/response_traits.hpp\
-  $(top_srcdir)/aedis/resp3/node.hpp\
-  $(top_srcdir)/aedis/resp3/compose.hpp\
-  $(top_srcdir)/aedis/resp3/detail/read_ops.hpp\
-  $(top_srcdir)/aedis/resp3/detail/parser.hpp\
-  $(top_srcdir)/aedis/resp3/error.hpp\
-  $(top_srcdir)/aedis/resp3/impl/error.ipp\
-  $(top_srcdir)/aedis/resp3/type.hpp\
-  $(top_srcdir)/aedis/resp3/read.hpp\
-  $(top_srcdir)/aedis/redis/impl/command.ipp\
-  $(top_srcdir)/aedis/sentinel/impl/command.ipp\
-  $(top_srcdir)/aedis/resp3/detail/impl/parser.ipp\
-  $(top_srcdir)/aedis/resp3/impl/type.ipp
-
 nobase_noinst_HEADERS =\
-  $(top_srcdir)/examples/user_session.hpp\
   $(top_srcdir)/examples/print.hpp\
-  $(top_srcdir)/examples/mystruct.hpp\
   $(top_srcdir)/tests/check.hpp
 
 TESTS = $(check_PROGRAMS)
@@ -96,9 +66,25 @@ EXTRA_DIST += $(top_srcdir)/doc/DoxygenLayout.xml
 EXTRA_DIST += $(top_srcdir)/doc/aedis.css
 EXTRA_DIST += $(top_srcdir)/doc/htmlfooter.html
 EXTRA_DIST += $(top_srcdir)/doc/htmlheader.html
+EXTRA_DIST += $(top_srcdir)/benchmarks/benchmarks.md
+EXTRA_DIST += $(top_srcdir)/benchmarks/benchmarks.tex
+EXTRA_DIST += $(top_srcdir)/benchmarks/c/libuv/echo_server_direct.c
+EXTRA_DIST += $(top_srcdir)/benchmarks/c/libuv/README.md
+EXTRA_DIST += $(top_srcdir)/benchmarks/go/echo_server_direct.go
+EXTRA_DIST += $(top_srcdir)/benchmarks/nodejs/echo_server_direct/echo_server_direct.js
+EXTRA_DIST += $(top_srcdir)/benchmarks/nodejs/echo_server_direct/package.json
+EXTRA_DIST += $(top_srcdir)/benchmarks/nodejs/echo_server_over_redis/echo_server_over_redis.js
+EXTRA_DIST += $(top_srcdir)/benchmarks/nodejs/echo_server_over_redis/package.json
+EXTRA_DIST += $(top_srcdir)/benchmarks/rust/echo_server_direct/Cargo.toml
+EXTRA_DIST += $(top_srcdir)/benchmarks/rust/echo_server_direct/src/main.rs
+EXTRA_DIST += $(top_srcdir)/benchmarks/rust/echo_server_over_redis/Cargo.toml
+EXTRA_DIST += $(top_srcdir)/benchmarks/rust/echo_server_over_redis/src/main.rs
 
 .PHONY: doc
 doc:
-	rm -rf ../aedis-gh-pages/*
 	doxygen doc/Doxyfile
 
+.PHONY: bench
+bench:
+	pdflatex --jobname=echo-f0 benchmarks/benchmarks.tex
+	pdflatex --jobname=echo-f1 benchmarks/benchmarks.tex

README.md

@@ -1 +1,16 @@
-See https://mzimbres.github.io/aedis/
+An async redis client designed for performance and scalability
+
+### License
+
+Distributed under the [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt).
+
+### Build Status
+
+Branch          | GH Actions |
+:-------------: | ---------- |
+[`master`](https://github.com/mzimbres/aedis/tree/master) | [![CI](https://github.com/mzimbres/aedis/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/mzimbres/aedis/actions/workflows/ci.yml)
+
+### More information
+
+* See the official github-pages for documentation: https://mzimbres.github.io/aedis
+

aedis/aedis.hpp

@@ -1,847 +0,0 @@
-/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
- *
- * Distributed under the Boost Software License, Version 1.0. (See
- * accompanying file LICENSE.txt)
- */
-
-#ifndef AEDIS_HPP
-#define AEDIS_HPP
-
-#include <aedis/resp3/read.hpp>
-#include <aedis/adapter/adapt.hpp>
-#include <aedis/adapter/error.hpp>
-#include <aedis/redis/command.hpp>
-#include <aedis/sentinel/command.hpp>
-#include <aedis/generic/error.hpp>
-#include <aedis/generic/client.hpp>
-#include <aedis/generic/serializer.hpp>
-
-/** \mainpage Documentation
-    \tableofcontents
-  
-    \section Overview
-  
-    Aedis is a [Redis](https://redis.io/) client library built on top
-    of [Asio](https://www.boost.org/doc/libs/release/doc/html/boost_asio.html)
-    that provides simple and efficient communication with a Redis
-    server. Some of its distinctive features are
-
-    @li Support for the latest version of the Redis communication protocol [RESP3](https://github.com/redis/redis-specifications/blob/master/protocol/RESP3.md).
-    @li First class support for STL containers and C++ built-in types.
-    @li Serialization and deserialization of your own data types that avoid unnecessary copies.
-    @li Support for Redis [sentinel](https://redis.io/docs/manual/sentinel).
-    @li Sync and async API.
-
-    In addition to that, Aedis provides a high-level client that offers the following functionality
-
-    @li Management of message queues.
-    @li Simplified handling of server pushes.
-    @li Zero asymptotic allocations by means of memory reuse.
-    @li Healthy checks.
-
-    If you are interested in a detailed comparison of Redis clients
-    and the design rationale behind Aedis jump to \ref why-aedis. Now
-    let us have a look at the low-level API.
-
-    \section low-level-api Low-level API
-
-    The low-level API is very useful for tasks that can be performed
-    in short lived connections, for example, assume we want to perform
-    the following steps
-
-    @li Set the value of a Redis key.
-    @li Set the expiration of that key to two seconds.
-    @li Get and return its old value.
-    @li Quit
-
-    The coroutine-based asynchronous implementation of the steps above look like
-
-    @code
-    net::awaitable<std::string> set(net::ip::tcp::endpoint ep)
-    {
-       // To make code less verbose
-       using tcp_socket = net::use_awaitable_t<>::as_default_on_t<net::ip::tcp::socket>;
-
-       tcp_socket socket{co_await net::this_coro::executor};
-       co_await socket.async_connect(ep);
-    
-       std::string buffer, response;
-
-       auto sr = make_serializer(request);
-       sr.push(command::hello, 3);
-       sr.push(command::set, "key", "Value", "EX", "2", "get");
-       sr.push(command::quit);
-       co_await net::async_write(socket, net::buffer(buffer));
-       buffer.clear();
-    
-       auto dbuffer = net::dynamic_buffer(read_buffer);
-       co_await resp3::async_read(socket, dbuffer); // Hello ignored.
-       co_await resp3::async_read(socket, dbuffer, adapt(response)); // Set
-       co_await resp3::async_read(socket, dbuffer); // Quit ignored.
-    
-       co_return response;
-    }
-    @endcode
-
-    The simplicity of the code above makes it self explanatory
-
-    @li Connect to the Redis server.
-    @li Declare a \c std::string to hold the request and add some commands in it with a serializer.
-    @li Write the payload to the socket and read the responses in the same order they were sent.
-    @li Return the response to the user.
-
-    The @c hello command above is always required and must be sent
-    first as it informs we want to communicate over RESP3.
-
-    \subsection requests Requests
-
-    As stated above, requests are created by defining a storage object
-    and a serializer that knows how to convert user data into valid
-    RESP3 wire-format. They are composed of one or more
-    commands (in Redis documentation they are called [pipelines](https://redis.io/topics/pipelining)),
-    which means users can add
-    as many commands to the request as they like, a feature that aids
-    performance.
-
-    The individual commands in a request assume many
-    different forms
-
-    @li With and without keys.
-    @li Variable length arguments.
-    @li Ranges.
-    @li etc.
-
-    To account for all these variations, the \c serializer class
-    offers some member functions, each of them with a couple of
-    overloads, for example
-
-    @code
-    // Some data to send to Redis.
-    std::string value = "some value";
-
-    std::list<std::string> list {"channel1", "channel2", "channel3"};
-
-    std::map<std::string, mystruct> map
-       { {"key1", "value1"}
-       , {"key2", "value2"}
-       , {"key3", "value3"}};
-
-    // Command with no arguments
-    sr.push(command::quit);
-
-    // Command with variable lenght arguments.
-    sr.push(command::set, "key", value, "EX", "2");
-
-    // Sends a container, no key.
-    sr.push_range(command::subscribe, list);
-
-    // Same as above but an iterator range.
-    sr.push_range2(command::subscribe, std::cbegin(list), std::cend(list));
-
-    // Sends a container, with key.
-    sr.push_range(command::hset, "key", map);
-
-    // Same as above but as iterator range.
-    sr.push_range2(command::hset, "key", std::cbegin(map), std::cend(map));
-    @endcode
-
-    Once all commands have been added to the request, we can write it
-    as usual by writing the payload to the socket
-
-    @code
-    co_await net::async_write(socket, buffer(request));
-    @endcode
-
-    \subsubsection requests-serialization Serialization
-
-    The \c send and \c send_range functions above work with integers
-    e.g. \c int and \c std::string out of the box. To send your own
-    data type defined the \c to_bulk function like this
-
-    @code
-    // Example struct.
-    struct mystruct {
-      // ...
-    };
-    
-    void to_bulk(std::string& to, mystruct const& obj)
-    {
-       // Convert to obj string and call to_bulk (see also add_header
-       // and add_separator)
-       auto dummy = "Dummy serializaiton string.";
-       aedis::resp3::to_bulk(to, dummy);
-    }
-
-    std::map<std::string, mystruct> map
-       { {"key1", {...}}
-       , {"key2", {...}}
-       , {"key3", {...}}};
-
-    db.send_range(command::hset, "key", map);
-    @endcode
-
-    It is quite common to store json string in Redis for example.
-
-    \subsection low-level-responses Responses
-
-    To read responses effectively, users must know their RESP3 type,
-    this can be found in the Redis documentation of each command
-    (https://redis.io/commands). For example
-
-    Command  | RESP3 type                          | Documentation
-    ---------|-------------------------------------|--------------
-    lpush    | Number                              | https://redis.io/commands/lpush
-    lrange   | Array                               | https://redis.io/commands/lrange
-    set      | Simple-string, null or blob-string  | https://redis.io/commands/set
-    get      | Blob-string                         | https://redis.io/commands/get
-    smembers | Set                                 | https://redis.io/commands/smembers
-    hgetall  | Map                                 | https://redis.io/commands/hgetall
-
-    Once the RESP3 type of a given response is known we can choose a
-    proper C++ data structure to receive it in. Fortunately, this is a
-    simple task for most types. The table below summarises the options
-
-    RESP3 type     | C++                                                          | Type
-    ---------------|--------------------------------------------------------------|------------------
-    Simple-string  | \c std::string                                             | Simple
-    Simple-error   | \c std::string                                             | Simple
-    Blob-string    | \c std::string, \c std::vector                             | Simple
-    Blob-error     | \c std::string, \c std::vector                             | Simple
-    Number         | `long long`, `int`, `std::size_t`, \c std::string          | Simple
-    Double         | `double`, \c std::string                                   | Simple
-    Null           | `boost::optional<T>`                                       | Simple
-    Array          | \c std::vector, \c std::list, \c std::array, \c std::deque | Aggregate
-    Map            | \c std::vector, \c std::map, \c std::unordered_map         | Aggregate
-    Set            | \c std::vector, \c std::set, \c std::unordered_set         | Aggregate
-    Push           | \c std::vector, \c std::map, \c std::unordered_map         | Aggregate
-
-    Responses that contain nested aggregates or heterogeneous data
-    types will be given special treatment later.  As of this writing,
-    not all RESP3 types are used by the Redis server, which means in
-    practice users will be concerned with a reduced subset of the
-    RESP3 specification. Now let us see some examples
-
-    @code
-    auto dbuffer = dynamic_buffer(buffer);
-
-    // To ignore the response.
-    co_await resp3::async_read(socket, dbuffer, adapt());
-
-    // Read in a std::string e.g. get.
-    std::string str;
-    co_await resp3::async_read(socket, dbuffer, adapt(str));
-
-    // Read in a long long e.g. rpush.
-    long long number;
-    co_await resp3::async_read(socket, dbuffer, adapt(number));
-
-    // Read in a std::set e.g. smembers.
-    std::set<T, U> set;
-    co_await resp3::async_read(socket, dbuffer, adapt(set));
-
-    // Read in a std::map e.g. hgetall.
-    std::map<T, U> set;
-    co_await resp3::async_read(socket, dbuffer, adapt(map));
-
-    // Read in a std::unordered_map e.g. hgetall.
-    std::unordered_map<T, U> umap;
-    co_await resp3::async_read(socket, dbuffer, adapt(umap));
-
-    // Read in a std::vector e.g. lrange.
-    std::vector<T> vec;
-    co_await resp3::async_read(socket, dbuffer, adapt(vec));
-    @endcode
-
-    In other words, it is straightforward, just pass the result of \c
-    adapt to the read function and make sure the response data type is
-    compatible with the data structure you are calling @c adapter(...)
-    with. All standard C++ containers are supported by Aedis.
-
-    \subsubsection Optional
-
-    It is not uncommon for apps to access keys that do not exist or
-    that have already expired in the Redis server, to deal with these
-    cases Aedis provides support for \c boost::optional. To use it,
-    wrap your type around \c boost::optional like this
-
-    @code
-    boost::optional<std::unordered_map<T, U>> umap;
-    co_await resp3::async_read(socket, dynamic_buffer(buffer), adapt(umap));
-    @endcode
-
-    Everything else stays the same, before accessing data, users will
-    have to check or assert the optional contains a value.
-
-    \subsubsection heterogeneous_aggregates Heterogeneous aggregates
-
-    There are cases where Redis returns aggregates that
-    contain heterogeneous data, for example, an array that contains
-    integers, strings nested sets etc. Aedis supports reading such
-    aggregates in a \c std::tuple efficiently as long as the they
-    don't contain 3-order nested aggregates e.g. an array that
-    contains an array of arrays. For example, to read the response to
-    a \c hello command we can use the following response type.
-
-    @code
-    using hello_type = std::tuple<
-       std::string, std::string,
-       std::string, std::string,
-       std::string, int,
-       std::string, int,
-       std::string, std::string,
-       std::string, std::string,
-       std::string, std::vector<std::string>>;
-    @endcode
-
-    Transactions are another example where this feature is useful, for
-    example, the response to the transaction below
-
-    @code
-    db.send(command::multi);
-    db.send(command::get, "key1");
-    db.send(command::lrange, "key2", 0, -1);
-    db.send(command::hgetall, "key3");
-    db.send(command::exec);
-    @endcode
-
-    can be read in the following way
-
-    @code
-    std::tuple<
-       boost::optional<std::string>, // Response to get
-       boost::optional<std::vector<std::string>>, // Response to lrange
-       boost::optional<std::map<std::string, std::string>> // Response to hgetall
-    > trans;
-
-    co_await resp3::async_read(socket, dynamic_buffer(buffer)); // Ignore multi
-    co_await resp3::async_read(socket, dynamic_buffer(buffer)); // Ignore get
-    co_await resp3::async_read(socket, dynamic_buffer(buffer)); // Ignore lrange
-    co_await resp3::async_read(socket, dynamic_buffer(buffer)); // Ignore hgetall
-    co_await resp3::async_read(socket, dynamic_buffer(buffer), adapt(trans));
-    @endcode
-
-    Note that above we are not ignoring the response to the commands
-    themselves but whether they have been successfully queued.  Only
-    after @c exec is received Redis will execute them in sequence and
-    send all responses together in an array.
-
-    \subsubsection Serialization
-
-    As mentioned in \ref requests-serialization, it is common for
-    users to serialized data before sending it to Redis e.g.  json
-    strings, for example
-
-    @code
-    sr.push(command::set, "key", "{"Server": "Redis"}"); // Unquoted for readability.
-    sr.push(command::get, "key")
-    @endcode
-
-    For performance and convenience reasons, we may want to avoid
-    receiving the response to the \c get command above as a string
-    just to convert it later to a e.g. deserialized json. To support
-    this, Aedis calls a user defined \c from_string function while
-    parsing the response. In simple terms, define your type
-
-    @code
-    struct mystruct {
-       // struct fields.
-    };
-    @endcode
-
-    and deserialize it from a string in a function \c from_string with
-    the following signature
-
-    @code
-    void from_string(mystruct& obj, char const* p, std::size_t size, boost::system::error_code& ec)
-    {
-       // Deserializes p into obj.
-    }
-    @endcode
-
-    After that, you can start receiving data efficiently in the desired
-    types e.g. \c mystruct, \c std::map<std::string, mystruct> etc.
-
-    \subsubsection gen-case The general case
-
-    As already mentioned, there are cases where responses to Redis
-    commands won't fit in the model presented above, some examples are
-
-    @li Commands (like \c set) whose response don't have a fixed
-    RESP3 type. Expecting an \c int and receiving a blob-string
-    will result in error.
-    @li RESP3 aggregates that contain nested aggregates can't be read in STL containers.
-    @li Transactions with a dynamic number of commands can't be read in a \c std::tuple.
-
-    To deal with these cases Aedis provides the \c resp3::node
-    type, that is the most general form of an element in a response,
-    be it a simple RESP3 type or an aggregate. It is defined like this
-
-    @code
-    template <class String>
-    struct node {
-       // The RESP3 type of the data in this node.
-       type data_type;
-
-       // The number of elements of an aggregate (or 1 for simple data).
-       std::size_t aggregate_size;
-
-       // The depth of this node in the response tree.
-       std::size_t depth;
-
-       // The actual data. For aggregate types this is always empty.
-       String value;
-    };
-    @endcode
-
-    Any response to a Redis command can be received in a \c
-    std::vector<node<std::string>>.  The vector can be seen as a
-    pre-order view of the response tree
-    (https://en.wikipedia.org/wiki/Tree_traversal#Pre-order,_NLR).
-    Using it is no different that using other types
-
-    @code
-    // Receives any RESP3 simple data type.
-    node<std::string> resp;
-    co_await resp3::async_read(socket, dynamic_buffer(buffer), adapt(resp));
-
-    // Receives any RESP3 simple or aggregate data type.
-    std::vector<node<std::string>> resp;
-    co_await resp3::async_read(socket, dynamic_buffer(buffer), adapt(resp));
-    @endcode
-
-    For example, suppose we want to retrieve a hash data structure
-    from Redis with \c hgetall, some of the options are
-
-    @li \c std::vector<node<std::string>: Works always.
-    @li \c std::vector<std::string>: Efficient and flat, all elements as string.
-    @li \c std::map<std::string, std::string>: Efficient if you need the data as a \c std::map
-    @li \c std::map<U, V>: Efficient if you are storing serialized data. Avoids temporaries and requires \c from_string for \c U and \c V.
-
-    In addition to the above users can also use unordered versions of the containers. The same reasoning also applies to sets e.g. \c smembers.
-
-    \subsubsection low-level-adapters Adapters
-
-    Users that are not satisfied with any of the options above can
-    write their own adapters very easily. For example, the adapter below
-    can be used to print incoming data to the screen.
-
-    @code
-    auto adapter = [](resp3::node<boost::string_view> const& nd, boost::system::error_code&)
-    {
-       std::cout << nd << std::endl;
-    };
-
-    co_await resp3::async_read(socket, dynamic_buffer(buffer), adapter);
-    @endcode
-
-    See more in the \ref examples section.
-
-    \section high-level-api High-level API
-
-    As stated earlier, the low-level API is very useful for tasks that
-    can be performed with short lived connections. Sometimes however,
-    the need for long-lived connections becomes compeling
-
-    @li \b Server \b pushes: Short lived connections can't deal with server pushes, that means no [client side caching](https://redis.io/topics/client-side-caching), [notifications](https://redis.io/topics/notifications) and [pubsub](https://redis.io/topics/pubsub).
-    @li \b Performance: Keep opening and closing connections impact performance serverely.
-    @li \b Pipeline: Code such as shown in \ref low-level-api don't support pipelines well since it can only send a fixed number of commands at time. It misses important optimization opportunities (https://redis.io/topics/pipelining).
-
-    A serious implementation that supports the points listed above is
-    far from trivial and involves many complex asynchronous operations
-
-    @li \c async_resolve: Resolve a hostname.
-    @li \c async_connect: Connect to Redis.
-    @li \c async_read: Performed in a loop as long as the connection lives.
-    @li \c async_write: Performed everytime a new message is added.
-    @li \c async_wait: To timout all operations above if the server becomes unresponsive.
-
-    Notice that many of the operations above will run concurrently with each other and, in addition to that
-
-    @li \c async_write operations require management of the message queue to prevent concurrent writes.
-    @li Healthy checks must be sent periodically by the client to detect a dead or unresponsive server.
-    @li Recovery after a disconnection to avoid loosing enqueued commands.
-
-    Expecting users to implement these points themselves is
-    unrealistic and could result in code that performs poorly and
-    can't handle errors properly.  To avoid all of that, Aedis
-    provides its own implementation. The general form of a program
-    that uses the high-level API looks like this
-
-    @code
-    int main()
-    {
-       net::io_context ioc;
-
-       client_type db(ioc.get_executor());
-       auto recv = std::make_shared<receiver>(db);
-       db.set_receiver(recv);
-
-       db.async_run("127.0.0.1", "6379", [](auto ec){ ... });
-
-       ioc.run();
-    }
-    @endcode
-
-    Users are concerned only with the implementation of the
-    receiver. For example
-
-    @code
-    // Callbacks.
-    struct receiver {
-       void on_resp3(command cmd, node<string_view> const& nd, error_code& ec) { ...  }
-       void on_read(command cmd, std::size_t) { ...  }
-       void on_push(std::size_t n) { }
-       void on_write(std::size_t n) { ... }
-    };
-    @endcode
-
-    The functions in the receiver above are callbacks that will be
-    called when events arrives
-
-    @li \c on_resp3: Called when a new chunk of resp3 data is parsed.
-    @li \c on_read: Called after the response to a command has been successfully read.
-    @li \c on_push: Called when a server push is received.
-    @li \c on_write: Called after a request has been successfully written to the stream.
-
-    The callbacks above are never called on errors, instead the \c
-    async_run function returns. Reconnection is also supported, for
-    example
-
-    @code
-    net::awaitable<void> run(std::shared_ptr<client_type> db)
-    {
-       auto ex = co_await net::this_coro::executor;
-    
-       boost::asio::steady_timer timer{ex};
-    
-       for (error_code ec;;) {
-          co_await db->async_run("127.0.0.1", "6379", redirect_error(use_awaitable, ec));
-
-          // Log the error.
-          std::clog << ec.message() << std::endl;
-    
-          // Wait two seconds and try again.
-          timer.expires_after(std::chrono::seconds{2});
-          co_await timer.async_wait(redirect_error(use_awaitable, ec));
-       }
-    }
-    @endcode
-
-    when reconnecting the client will recover requests that haven't
-    been sent to Redis yet.
-
-    \subsection high-level-sending-cmds Sending commands
-
-    The db object from the example above can be passed around to other
-    objects so that commands can be sent from everywhere in the app.
-    Sending commands is also similar to what has been discussed before
-
-    @code
-    void foo(client<net::ip::tcp::socket>& db)
-    {
-       db.send(command::ping, "O rato roeu a roupa do rei de Roma");
-       db.send(command::incr, "counter");
-       db.send(command::set, "key", "Três pratos de trigo para três tigres");
-       db.send(command::get, "key");
-       ...
-    }
-    @endcode
-
-    The \c send functions in this case will add commands to the output
-    queue and send them only if there is no pending response. This is
-    so because RESP3 is a request/response protocol, which means
-    clients must wait for responses before sending
-    the next request.
-
-    \section examples Examples
-
-    To better fix what has been said above, users should have a look at some simple examples.
-
-    \b Low \b level \b API (sync)
-
-    @li intro_sync.cpp: Synchronous API usage example.
-    @li serialization_sync.cpp: Shows how serialize your own types.
-
-    \b Low \b level \b API (async-coroutine)
-
-    @li subscriber.cpp: Shows how channel subscription works at the low level.
-    @li transaction.cpp: Shows how to read the response to transactions.
-    @li custom_adapter.cpp: Shows how to write a response adapter that prints to the screen, see \ref low-level-adapters.
-
-    \b High \b level \b API (async only)
-
-    @li intro_high_level.cpp: High-level API usage example.
-    @li aggregates_high_level.cpp: Shows how receive RESP3 aggregate data types in a general way or in STL containers.
-    @li subscriber_high_level.cpp: Shows how channel [subscription](https://redis.io/topics/pubsub) works at a high-level.
-
-    \b Asynchronous \b Servers (high-level API)
-
-    @li echo_server.cpp: Shows the basic principles behind asynchronous communication with a database in an asynchronous server.
-    @li chat_room.cpp: Shows how to build a scalable chat room.
-
-    \section using-aedis Using Aedis
-
-    To install and use Aedis you will need
-  
-    - Boost 1.78 or greater.
-    - Unix Shell and Make.
-    - C++14. Some examples require C++20 with coroutine support.
-    - Redis server.
-
-    Some examples will also require interaction with
-  
-    - redis-cli: Used in one example.
-    - Redis Sentinel Server: used in some examples.
-
-    Aedis has been tested with the following compilers
-
-    - Tested with gcc: 7.5.0, 8.4.0, 9.3.0, 10.3.0.
-    - Tested with clang: 11.0.0, 10.0.0, 9.0.1, 8.0.1, 7.0.1.
-  
-    \subsection Installation
-
-    The first thing to do is to download and unpack Aedis
-
-    ```
-    # Download the latest release on github
-    $ wget https://github.com/mzimbres/aedis/releases
-  
-    # Uncompress the tarball and cd into the dir
-    $ tar -xzvf aedis-version.tar.gz
-    ```
-
-    If you can't use \c configure and \c make (e.g. Windows users)
-    you can already add the directory where you unpacked Aedis to the
-    include directories in your project, otherwise run
-  
-    ```
-    # See configure --help for all options.
-    $ ./configure --prefix=/opt/aedis-version --with-boost=/opt/boost_1_78_0
-
-    # Install Aedis in the path specified in --prefix
-    $ sudo make install
-  
-    ```
-  
-    and include the following header 
-  
-    ```cpp
-    #include <aedis/src.hpp>
-
-    ```
-
-    in exactly one source file in your applications. At this point you
-    can start using Aedis. To build the examples and run the tests run
-  
-    ```
-    # Build aedis examples.
-    $ make examples
-  
-    # Test aedis in your machine.
-    $ make check
-    ```
-
-    \subsection Developers
-  
-    To generate the build system run
-  
-    ```
-    $ autoreconf -i
-    ```
-  
-    After that you will have a configure script 
-    that you can run as explained above, for example, to use a
-    compiler other that the system compiler run
-  
-    ```
-    $ CC=/opt/gcc-10.2.0/bin/gcc-10.2.0 CXX=/opt/gcc-10.2.0/bin/g++-10.2.0 CXXFLAGS="-g -Wall -Werror"  ./configure ...
-    $ make distcheck
-    ```
-
-    \section why-aedis Why Aedis
-
-    At the time of this writing there are seventeen Redis clients
-    listed in the [official](https://redis.io/docs/clients/#cpp) list.
-    With so many clients available it is not unlikely that users are
-    asking themselves why yet another one.  In this section I will try
-    to compare Aedis to the most popular clients and why we need
-    Aedis. Notice however that this is ongoing work as comparing
-    client objectively is difficult and time consuming.
-
-    The most popular client at the moment of this writing ranked by
-    github stars is
-
-    @li https://github.com/sewenew/redis-plus-plus
-
-    Before we start it is worth mentioning some of the things it does
-    not support
-
-    @li RESP3. Without RESP3 is impossible to support some important
-    Redis features like client side caching, among other things.
-    @li The Asio asynchronous model.
-    @li Serialization of user data types that avoids temporaries.
-    @li Error handling with error-code and exception overloads.
-    @li Healthy checks.
-    @li Fine control over memory allocation by means of allocators.
-
-    The remaining points will be addressed individually.
-
-    @subsection redis-plus-plus
-
-    Let us first have a look at what sending a command a pipeline and a
-    transaction look like
-
-    @code
-    auto redis = Redis("tcp://127.0.0.1:6379");
-
-    // Send commands
-    redis.set("key", "val");
-    auto val = redis.get("key"); // val is of type OptionalString.
-    if (val)
-        std::cout << *val << std::endl;
-
-    // Sending pipelines
-    auto pipe = redis.pipeline();
-    auto pipe_replies = pipe.set("key", "value")
-                            .get("key")
-                            .rename("key", "new-key")
-                            .rpush("list", {"a", "b", "c"})
-                            .lrange("list", 0, -1)
-                            .exec();
-
-    // Parse reply with reply type and index.
-    auto set_cmd_result = pipe_replies.get<bool>(0);
-    // ...
-
-    // Sending a transaction
-    auto tx = redis.transaction();
-    auto tx_replies = tx.incr("num0")
-                        .incr("num1")
-                        .mget({"num0", "num1"})
-                        .exec();
-
-    auto incr_result0 = tx_replies.get<long long>(0);
-    // ...
-    @endcode
-
-    Some of the problems with this API are
-
-    @li Heterogeneous treatment of commands, pipelines and transaction.
-    @li Having to manually finish the pipeline with \c .exec() is a major source of headache. This is not required by the protocol itself but results from the abstraction used.
-    @li Any Api that sends individual commands has a very restricted scope of usability and should be avoided in anything that needs minimum performance guarantees.
-    @li The API imposes exceptions on users, no error-code overload is provided.
-    @li No control over dynamic allocations.
-    @li No way to reuse the buffer for new calls to e.g. \c redis.get in order to avoid further dynamic memory allocations.
-    @li Error handling of resolve and connection no clear.
-
-    According to the documentation, pipelines in redis-plus-plus have
-    the following characteristics
-
-    > NOTE: By default, creating a Pipeline object is NOT cheap, since
-    > it creates a new connection.
-
-    This is clearly a downside of the API as pipelines should be the
-    default way of communicating and not an exception, paying such a
-    high price for each pipeline imposes a severe cost in performance.
-    Transactions also suffer from the very same problem
-
-    > NOTE: Creating a Transaction object is NOT cheap, since it
-    > creates a new connection.
-
-    In Aedis there is no difference between sending one command, a
-    pipeline or a transaction because creating the request is decoupled
-    from the IO objects, for example
-
-    @code
-    std::string request;
-    auto sr = make_serializer(request);
-    sr.push(command::hello, 3);
-    sr.push(command::multi);
-    sr.push(command::ping, "Some message.");
-    sr.push(command::set, "low-level-key", "some content", "EX", "2");
-    sr.push(command::exec);
-    sr.push(command::ping, "Another message.");
-    net::write(socket, net::buffer(request));
-    @endcode
-
-    The request created above will be sent to Redis in a single
-    pipeline and imposes no restriction on what it contains e.g. the
-    number of commands, transactions etc. The problems mentioned above
-    simply do not exist in Aedis. The way responses are read is
-    also more flexible
-
-    @code
-    std::string buffer;
-    auto dbuffer = net::dynamic_buffer(buffer);
-
-    std::tuple<std::string, boost::optional<std::string>> response;
-    resp3::read(socket, dbuffer); // hellp
-    resp3::read(socket, dbuffer); // multi
-    resp3::read(socket, dbuffer); // ping
-    resp3::read(socket, dbuffer); // set
-    resp3::read(socket, dbuffer, adapt(response));
-    resp3::read(socket, dbuffer); // quit
-    @endcode
-
-    @li The response objects are passed by the caller to the read
-    functions so that he has fine control over memory allocations and
-    object lifetime.
-    @li The user can either use error-code or exceptions.
-    @li Each response can be read individually in the response object
-    avoiding temporaries.
-    @li It is possible to ignore responses.
-
-    This was the blocking API, now let us compare the async interface
-
-    > redis-plus-plus also supports async interface, however, async
-    > support for Transaction and Subscriber is still on the way.
-    > 
-    > The async interface depends on third-party event library, and so
-    > far, only libuv is supported.
-
-    Async code in redis-plus-plus looks like the following
-
-    @code
-    auto async_redis = AsyncRedis(opts, pool_opts);
-    
-    Future<string> ping_res = async_redis.ping();
-    
-    cout << ping_res.get() << endl;
-    @endcode
-
-    As the reader can see, the async interface is based on futures
-    which is also known to have a bad performance.  The biggest
-    problem however with this async design is that it makes it
-    impossible to write asynchronous programs correctly since it
-    starts an async operation on every command sent instead of
-    enqueueing a message and triggering a write. It is also not clear
-    how are pipelines realised with the design (if at all).
-
-    In Aedis the send function looks like this
-
-    @code
-    template <class... Ts>
-    void client::send(Command cmd, Ts const&... args);
-    @endcode
-
-    and the response is delivered through a callback.
-
-    \section Acknowledgement
-
-    Some people that were helpful in the development of Aedis
-
-    @li Richard Hodges ([madmongo1](https://github.com/madmongo1)): For answering pretty much every question I had about Asio and the design of asynchronous programs.
-    @li Vinícius dos Santos Oliveira ([vinipsmaker](https://github.com/vinipsmaker)): For useful discussion about how Aedis consumes buffers in the read operation (among other things).
-
-    \section Reference
-  
-    See \subpage any.
-
- */
-
-/** \defgroup any Reference
- *
- *  This page contains the documentation of all user facing code.
- */
-
-#endif // AEDIS_HPP

aedis/generic/client.hpp

@@ -1,701 +0,0 @@
-/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
- *
- * Distributed under the Boost Software License, Version 1.0. (See
- * accompanying file LICENSE.txt)
- */
-
-#ifndef AEDIS_GENERIC_CLIENT_HPP
-#define AEDIS_GENERIC_CLIENT_HPP
-
-#include <vector>
-#include <limits>
-#include <functional>
-#include <iterator>
-#include <algorithm>
-#include <utility>
-#include <chrono>
-
-#include <boost/asio/ip/tcp.hpp>
-#include <boost/asio/steady_timer.hpp>
-
-#include <aedis/resp3/type.hpp>
-#include <aedis/resp3/node.hpp>
-#include <aedis/redis/command.hpp>
-#include <aedis/generic/detail/client_ops.hpp>
-
-namespace aedis {
-namespace generic {
-
-/** \brief A high level Redis client.
- *  \ingroup any
- *
- *  This class keeps a connection open to the Redis server where
- *  commands can be sent at any time. For more details, please see the
- *  documentation of each individual function.
- */
-template <class AsyncReadWriteStream, class Command>
-class client {
-public:
-   /// Executor type.
-   using executor_type = typename AsyncReadWriteStream::executor_type;
-
-   /// Callback type of read operations.
-   using read_handler_type = std::function<void(Command cmd, std::size_t)>;
-
-   /// Callback type of write operations.
-   using write_handler_type = std::function<void(std::size_t)>;
-
-   /// Callback type of push operations.
-   using push_handler_type = std::function<void(std::size_t)>;
-
-   /// Callback type of resp3 operations.
-   using resp3_handler_type = std::function<void(Command, resp3::node<boost::string_view> const&, boost::system::error_code&)>;
-
-   using default_completion_token_type = boost::asio::default_completion_token_t<executor_type>;
-
-   /** @brief Configuration parameters.
-    */
-   struct config {
-      /// Timeout of the \c async_resolve operation.
-      std::chrono::seconds resolve_timeout = std::chrono::seconds{5};
-
-      /// Timeout of the \c async_connect operation.
-      std::chrono::seconds connect_timeout = std::chrono::seconds{5};
-
-      /// Timeout of the \c async_read operation.
-      std::chrono::seconds read_timeout = std::chrono::seconds{5};
-
-      /// Timeout of the \c async_write operation.
-      std::chrono::seconds write_timeout = std::chrono::seconds{5};
-
-      /// Time after which a connection is considered idle if no data is received.
-      std::chrono::seconds idle_timeout = std::chrono::seconds{10};
-
-      /// The maximum size allwed in a read operation.
-      std::size_t max_read_size = (std::numeric_limits<std::size_t>::max)();
-   };
-
-   /** \brief Constructor.
-    *
-    *  \param ex The executor.
-    *  \param cfg Configuration parameters.
-    */
-   client(boost::asio::any_io_executor ex, config cfg = config{})
-   : resv_{ex}
-   , read_timer_{ex}
-   , write_timer_{ex}
-   , wait_write_timer_{ex}
-   , check_idle_timer_{ex}
-   , cfg_{cfg}
-   , on_read_{[](Command, std::size_t){}}
-   , on_write_{[](std::size_t){}}
-   , on_push_{[](std::size_t){}}
-   , on_resp3_{[](Command, resp3::node<boost::string_view> const&, boost::system::error_code&) {}}
-   , sr_{requests_}
-   , last_data_{std::chrono::time_point<std::chrono::steady_clock>::min()}
-   , type_{resp3::type::invalid}
-   , cmd_info_{std::make_pair<Command>(Command::invalid, 0)}
-   {
-      if (cfg.idle_timeout < std::chrono::seconds{2})
-         cfg.idle_timeout = std::chrono::seconds{2};
-   }
-
-   /// Returns the executor.
-   auto get_executor() {return read_timer_.get_executor();}
-
-   /** @brief Adds a command to the output command queue.
-    *
-    *  Adds a command to the end of the next request and signals the
-    *  writer operation there is a new message awaiting to be sent.
-    *  Otherwise the function is equivalent to serializer::push.  @sa
-    *  serializer.
-    */
-   template <class... Ts>
-   void send(Command cmd, Ts const&... args)
-   {
-      auto const can_write = prepare_next();
-
-      auto const before = requests_.size();
-      sr_.push(cmd, args...);
-      auto const d = requests_.size() - before;
-      BOOST_ASSERT(d != 0);
-      info_.back().size += d;;
-
-      if (!has_push_response(cmd)) {
-         commands_.push_back(std::make_pair(cmd, d));
-         ++info_.back().cmds;
-      }
-
-      if (can_write)
-         wait_write_timer_.cancel_one();
-   }
-
-   /** @brief Adds a command to the output command queue.
-    *
-    *  Adds a command to the end of the next request and signals the
-    *  writer operation there is a new message awaiting to be sent.
-    *  Otherwise the function is equivalent to
-    *  serializer::push_range2.
-    *  @sa serializer.
-    */
-   template <class Key, class ForwardIterator>
-   void send_range2(Command cmd, Key const& key, ForwardIterator begin, ForwardIterator end)
-   {
-      if (begin == end)
-         return;
-
-      auto const can_write = prepare_next();
-
-      auto const before = requests_.size();
-      sr_.push_range2(cmd, key, begin, end);
-      auto const d = requests_.size() - before;
-      BOOST_ASSERT(d != 0);
-      info_.back().size += d;
-
-      if (!has_push_response(cmd)) {
-         commands_.push_back(std::make_pair(cmd, d));
-         ++info_.back().cmds;
-      }
-
-      if (can_write)
-         wait_write_timer_.cancel_one();
-   }
-
-   /** @brief Adds a command to the output command queue.
-    *
-    *  Adds a command to the end of the next request and signals the
-    *  writer operation there is a new message awaiting to be sent.
-    *  Otherwise the function is equivalent to
-    *  serializer::push_range2.
-    *  @sa serializer.
-    */
-   template <class ForwardIterator>
-   void send_range2(Command cmd, ForwardIterator begin, ForwardIterator end)
-   {
-      if (begin == end)
-         return;
-
-      auto const can_write = prepare_next();
-
-      auto const before = requests_.size();
-      sr_.push_range2(cmd, begin, end);
-      auto const d = requests_.size() - before;
-      BOOST_ASSERT(d != 0);
-      info_.back().size += d;
-
-      if (!has_push_response(cmd)) {
-         commands_.push_back(std::make_pair(cmd, d));
-         ++info_.back().cmds;
-      }
-
-      if (can_write)
-         wait_write_timer_.cancel_one();
-   }
-
-   /** @brief Adds a command to the output command queue.
-    *
-    *  Adds a command to the end of the next request and signals the
-    *  writer operation there is a new message awaiting to be sent.
-    *  Otherwise the function is equivalent to
-    *  serializer::push_range.
-    *  @sa serializer.
-    */
-   template <class Key, class Range>
-   void send_range(Command cmd, Key const& key, Range const& range)
-   {
-      using std::begin;
-      using std::end;
-      send_range2(cmd, key, begin(range), end(range));
-   }
-
-   /** @brief Adds a command to the output command queue.
-    *
-    *  Adds a command to the end of the next request and signals the
-    *  writer operation there is a new message awaiting to be sent.
-    *  Otherwise the function is equivalent to
-    *  serializer::push_range.
-    *  @sa serializer.
-    */
-   template <class Range>
-   void send_range(Command cmd, Range const& range)
-   {
-      using std::begin;
-      using std::end;
-      send_range2(cmd, begin(range), end(range));
-   }
-
-   /** @brief Starts communication with the Redis server asynchronously.
-    *
-    *  This function performs the following steps
-    *
-    *  @li Resolves the Redis host as of \c async_resolve with the
-    *  timeout passed in client::config::resolve_timeout.
-    *
-    *  @li Connects to one of the endpoints returned by the resolve
-    *  operation with the timeout passed in client::config::connect_timeout.
-    *
-    *  @li Starts the \c async_read operation that keeps reading incoming
-    *  responses. Each individual read uses the timeout passed on
-    *  client::config::read_timeout. After each successful read it
-    *  will call the read or push callback.
-    *
-    *  @li Starts the \c async_write operation that waits for new commands
-    *  to be sent to Redis. Each individual write uses the timeout
-    *  passed on client::config::write_timeout. After a successful
-    *  write it will call the write callback.
-    *
-    *  @li Starts the check idle operation with the timeout specified
-    *  in client::config::idle_timeout. If no data is received during
-    *  that time interval \c async_run completes with
-    *  generic::error::idle_timeout.
-    *
-    *  @li Starts the healthy check operation that sends
-    *  redis::command::ping to Redis with a frequency equal to
-    *  client::config::idle_timeout / 2.
-    *
-    *  In addition to the callbacks mentioned above, the read
-    *  operations will call the resp3 callback as soon a new chunks of
-    *  data become available to the user.
-    *
-    *  It is safe to call \c async_run after it has returned.  In this
-    *  case, any outstanding commands will be sent after the
-    *  connection is restablished. If a disconnect occurs while the
-    *  response to a request has not been received, the client doesn't
-    *  try to resend it to avoid resubmission.
-    *
-    *  Example:
-    *
-    *  @code
-    *  awaitable<void> run_with_reconnect(std::shared_ptr<client_type> db)
-    *  {
-    *     auto ex = co_await this_coro::executor;
-    *     asio::steady_timer timer{ex};
-    *  
-    *     for (error_code ec;;) {
-    *        co_await db->async_run("127.0.0.1", "6379", redirect_error(use_awaitable, ec));
-    *        timer.expires_after(std::chrono::seconds{2});
-    *        co_await timer.async_wait(redirect_error(use_awaitable, ec));
-    *     }
-    *  }
-    *  @endcode
-    *
-    *  \param host Ip address or name of the Redis server.
-    *  \param port Port where the Redis server is listening.
-    *  \param token The completion token.
-    *
-    *  The completion token must have the following signature
-    *
-    *  @code
-    *  void f(boost::system::error_code);
-    *  @endcode
-    *
-    *  \return This function returns only when there is an error.
-    */
-   template <class CompletionToken = default_completion_token_type>
-   auto
-   async_run(
-      boost::string_view host = "127.0.0.1",
-      boost::string_view port = "6379",
-      CompletionToken token = CompletionToken{})
-   {
-      host_ = host;
-      port_ = port;
-
-      return boost::asio::async_compose
-         < CompletionToken
-         , void(boost::system::error_code)
-         >(detail::run_op<client>{this}, token, read_timer_, write_timer_, wait_write_timer_);
-   }
-
-   /// Set the read handler.
-   void set_read_handler(read_handler_type rh)
-      { on_read_ = std::move(rh); }
-
-   /// Set the write handler.
-   void set_write_handler(write_handler_type wh)
-      { on_write_ = std::move(wh); }
-
-   /// Set the push handler.
-   void set_push_handler(push_handler_type ph)
-      { on_push_ = std::move(ph); }
-
-   /// Set the resp3 handler.
-   void set_resp3_handler(resp3_handler_type rh)
-      { on_resp3_ = std::move(rh); }
-
-   /** @brief Convenience callback setter.
-    *
-    *  Expects a class with the following member functions
-    *
-    *  @code
-    *  struct receiver {
-    *     void on_resp3(Command cmd, resp3::node<boost::string_view> const& nd, boost::system::error_code& ec);
-    *     void on_read(Command cmd, std::size_t);
-    *     void on_write(std::size_t n);
-    *     void on_push(std::size_t n);
-    *  };
-    *  @endcode
-    */
-   template <class Receiver>
-   void set_receiver(std::shared_ptr<Receiver> recv)
-   {
-      on_resp3_ = [recv](Command cmd, resp3::node<boost::string_view> const& nd, boost::system::error_code& ec){recv->on_resp3(cmd, nd, ec);};
-      on_read_ = [recv](Command cmd, std::size_t n){recv->on_read(cmd, n);};
-      on_write_ = [recv](std::size_t n){recv->on_write(n);};
-      on_push_ = [recv](std::size_t n){recv->on_push(n);};
-   }
-
-private:
-   using command_info_type = std::pair<Command, std::size_t>;
-   using time_point_type = std::chrono::time_point<std::chrono::steady_clock>;
-
-   template <class T, class V> friend struct detail::reader_op;
-   template <class T, class V> friend struct detail::ping_after_op;
-   template <class T> friend struct detail::read_op;
-   template <class T> friend struct detail::read_until_op;
-   template <class T> friend struct detail::writer_op;
-   template <class T> friend struct detail::write_op;
-   template <class T> friend struct detail::run_op;
-   template <class T> friend struct detail::connect_op;
-   template <class T> friend struct detail::resolve_op;
-   template <class T> friend struct detail::check_idle_op;
-   template <class T> friend struct detail::init_op;
-   template <class T> friend struct detail::read_write_check_op;
-   template <class T> friend struct detail::wait_for_data_op;
-
-   void on_resolve()
-   {
-      // If we are coming from a connection that was lost we have to
-      // reset the socket to a fresh state.
-      socket_ =
-         std::make_shared<AsyncReadWriteStream>(read_timer_.get_executor());
-   }
-
-   void on_connect()
-   {
-      // When we are reconnecting we can't simply call send(hello)
-      // as that will add the command to the end of the queue, we need
-      // it as the first element.
-      if (info_.empty()) {
-         // Either we are connecting for the first time or there are
-         // no commands that were left unresponded from the last
-         // connection. We can send hello as usual.
-         BOOST_ASSERT(requests_.empty());
-         BOOST_ASSERT(commands_.empty());
-         send(Command::hello, 3);
-         return;
-      }
-
-      if (info_.front().sent) {
-         // There is one request that was left unresponded when we
-         // e.g. lost the connection, since we erase requests right
-         // after writing them to the socket (to avoid resubmission) it
-         // is lost and we have to remove it.
-         
-         // Noop if info_.front().size is already zero, which happens
-         // when the request was successfully writen to the socket.
-         // In the future we may want to avoid erasing but resend (at
-         // the risc of resubmission).
-         requests_.erase(0, info_.front().size);
-
-         // Erases the commands that were lost as well.
-         commands_.erase(
-            std::begin(commands_),
-            std::begin(commands_) + info_.front().cmds);
-
-         info_.front().cmds = 0;
-
-         // Do not erase the info_ front as we will use it below.
-         // info_.erase(std::begin(info_));
-      }
-
-      // Code below will add a hello to the front of the request and
-      // update info_ and commands_ accordingly.
-
-      auto const old_size = requests_.size();
-      sr_.push(Command::hello, 3);
-      auto const hello_size = requests_.size() - old_size;;
-
-      // Now we have to rotate the hello to the front of the request
-      // (Remember it must always be the first command).
-      std::rotate(
-         std::begin(requests_),
-         std::begin(requests_) + old_size,
-         std::end(requests_));
-
-      // Updates info_.
-      info_.front().size += hello_size;
-      info_.front().cmds += 1;
-
-      // Updates commands_
-      commands_.push_back(std::make_pair(Command::hello, hello_size));
-      std::rotate(
-         std::begin(commands_),
-         std::prev(std::end(commands_)),
-         std::end(commands_));
-   }
-
-   // Prepares the back of the queue to receive further commands.  If
-   // true is returned the request in the front of the queue can be
-   // sent to the server.
-   bool prepare_next()
-   {
-      if (info_.empty()) {
-         info_.push_back({});
-         return true;
-      }
-
-      if (info_.front().sent) {
-         // There is a pending response, we can't modify the front of
-         // the vector.
-         BOOST_ASSERT(info_.front().cmds != 0);
-         if (info_.size() == 1)
-            info_.push_back({});
-
-         return false;
-      }
-
-      // When cmds = 0 there are only commands with push response on
-      // the request and we are not waiting for any response.
-      return info_.front().cmds == 0;
-   }
-
-   // Returns true when the next request can be written.
-   bool on_cmd(command_info_type)
-   {
-      BOOST_ASSERT(!info_.empty());
-      BOOST_ASSERT(!commands_.empty());
-
-      commands_.erase(std::begin(commands_));
-
-      if (--info_.front().cmds != 0)
-         return false;
-
-      info_.erase(std::begin(info_));
-
-      return !info_.empty();
-   }
-
-   // Resolves the address passed in async_run and store the results
-   // in endpoints_.
-   template <class CompletionToken = default_completion_token_type>
-   auto
-   async_resolve(CompletionToken&& token = default_completion_token_type{})
-   {
-      return boost::asio::async_compose
-         < CompletionToken
-         , void(boost::system::error_code)
-         >(detail::resolve_op<client>{this}, token, resv_.get_executor());
-   }
-
-   // Connects the socket to one of the endpoints in endpoints_ and
-   // stores the successful endpoint in endpoint_.
-   template <class CompletionToken = default_completion_token_type>
-   auto
-   async_connect(CompletionToken&& token = default_completion_token_type{})
-   {
-      return boost::asio::async_compose
-         < CompletionToken
-         , void(boost::system::error_code)
-         >(detail::connect_op<client>{this}, token, write_timer_.get_executor());
-   }
-
-   template <class CompletionToken = default_completion_token_type>
-   auto
-   async_read_until(CompletionToken&& token = default_completion_token_type{})
-   {
-      return boost::asio::async_compose
-         < CompletionToken
-         , void(boost::system::error_code)
-         >(detail::read_until_op<client>{this}, token, read_timer_.get_executor());
-   }
-
-   // Reads a complete resp3 response from the socket using the
-   // timeout config::read_timeout.  On a successful read calls
-   // on_read_ or on_push_ depending on whether the response is a push
-   // or a response to a command.
-   template <class CompletionToken = default_completion_token_type>
-   auto
-   async_read(CompletionToken&& token = default_completion_token_type{})
-   {
-      return boost::asio::async_compose
-         < CompletionToken
-         , void(boost::system::error_code)
-         >(detail::read_op<client>{this}, token, read_timer_.get_executor());
-   }
-
-   // Loops on async_read described above.
-   template <class CompletionToken = default_completion_token_type>
-   auto
-   reader(CompletionToken&& token = default_completion_token_type{})
-   {
-      return boost::asio::async_compose
-         < CompletionToken
-         , void(boost::system::error_code)
-         >(detail::reader_op<client, Command>{this}, token, read_timer_.get_executor());
-   }
-
-   // Write with a timeout.
-   template <class CompletionToken = default_completion_token_type>
-   auto
-   async_write(
-      CompletionToken&& token = default_completion_token_type{})
-   {
-      return boost::asio::async_compose
-         < CompletionToken
-         , void(boost::system::error_code)
-         >(detail::write_op<client>{this}, token, write_timer_);
-   }
-
-   template <class CompletionToken = default_completion_token_type>
-   auto
-   writer(CompletionToken&& token = default_completion_token_type{})
-   {
-      return boost::asio::async_compose
-         < CompletionToken
-         , void(boost::system::error_code)
-         >(detail::writer_op<client>{this}, token, wait_write_timer_);
-   }
-
-   template <class CompletionToken = default_completion_token_type>
-   auto
-   async_init(CompletionToken&& token = default_completion_token_type{})
-   {
-      return boost::asio::async_compose
-         < CompletionToken
-         , void(boost::system::error_code)
-         >(detail::init_op<client>{this}, token, write_timer_, resv_);
-   }
-
-   template <class CompletionToken = default_completion_token_type>
-   auto
-   async_read_write_check(CompletionToken&& token = default_completion_token_type{})
-   {
-      return boost::asio::async_compose
-         < CompletionToken
-         , void(boost::system::error_code)
-         >(detail::read_write_check_op<client>{this}, token, read_timer_, write_timer_, wait_write_timer_, check_idle_timer_);
-   }
-
-   template <class CompletionToken = default_completion_token_type>
-   auto
-   async_ping_after(CompletionToken&& token = default_completion_token_type{})
-   {
-      return boost::asio::async_compose
-         < CompletionToken
-         , void(boost::system::error_code)
-         >(detail::ping_after_op<client, Command>{this}, token, read_timer_);
-   }
-
-   template <class CompletionToken = default_completion_token_type>
-   auto
-   async_wait_for_data(CompletionToken&& token = default_completion_token_type{})
-   {
-      return boost::asio::async_compose
-         < CompletionToken
-         , void(boost::system::error_code)
-         >(detail::wait_for_data_op<client>{this}, token, read_timer_);
-   }
-
-   template <class CompletionToken = default_completion_token_type>
-   auto
-   async_check_idle(CompletionToken&& token = default_completion_token_type{})
-   {
-      return boost::asio::async_compose
-         < CompletionToken
-         , void(boost::system::error_code)
-         >(detail::check_idle_op<client>{this}, token, check_idle_timer_);
-   }
-
-   void on_reader_exit()
-   {
-      socket_->close();
-      wait_write_timer_.expires_at(std::chrono::steady_clock::now());
-   }
-
-   // Stores information about a request.
-   struct info {
-      // Set to true before calling async_write.
-      bool sent = false;
-
-      // Request size in bytes. After a successful write it is set to
-      // zero.
-      std::size_t size = 0;
-
-      // The number of commands it contains. Commands with push
-      // responses are not counted.
-      std::size_t cmds = 0;
-   };
-
-   // Used to resolve the host on async_resolve.
-   boost::asio::ip::tcp::resolver resv_;
-
-   // The tcp socket.
-   std::shared_ptr<AsyncReadWriteStream> socket_;
-
-   // Timer used with async_read.
-   boost::asio::steady_timer read_timer_;
-
-   // Timer used with async_write.
-   boost::asio::steady_timer write_timer_;
-
-   // Timer that is canceled when a new message is added to the output
-   // queue.
-   boost::asio::steady_timer wait_write_timer_;
-
-   // Check idle timer.
-   boost::asio::steady_timer check_idle_timer_;
-
-   // Configuration parameters.
-   config cfg_;
-
-   // Called when a complete message is read.
-   read_handler_type on_read_;
-
-   // Called when a request has been written to the socket.
-   write_handler_type on_write_;
-
-   // Called when a complete push message is received.
-   push_handler_type on_push_;
-
-   // Called by the parser after each new chunk of resp3 data is
-   // processed.
-   resp3_handler_type on_resp3_;
-
-   // Buffer used by the read operations.
-   std::string read_buffer_;
-
-   // Requests payload and its serializer.
-   std::string requests_;
-   serializer<std::string> sr_;
-
-   // The commands contained in the requests.
-   std::vector<command_info_type> commands_;
-
-   // Info about the requests.
-   std::vector<info> info_;
-
-   // Last time we received data.
-   time_point_type last_data_;
-
-   // Used by the read_op.
-   resp3::type type_;
-
-   // Used by the read_op.
-   command_info_type cmd_info_;
-
-   // See async_connect.
-   boost::asio::ip::tcp::endpoint endpoint_;
-
-   // See async_resolve.
-   boost::asio::ip::tcp::resolver::results_type endpoints_;
-
-   // Host and port passed to async_run.
-   boost::string_view host_;
-   boost::string_view port_;
-};
-
-} // generic
-} // aedis
-
-#endif // AEDIS_GENERIC_CLIENT_HPP

aedis/generic/detail/client_ops.hpp

@@ -1,554 +0,0 @@
-/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
- *
- * Distributed under the Boost Software License, Version 1.0. (See
- * accompanying file LICENSE.txt)
- */
-
-#ifndef AEDIS_GENERIC_CLIENT_OPS_HPP
-#define AEDIS_GENERIC_CLIENT_OPS_HPP
-
-#include <array>
-
-#include <boost/system.hpp>
-#include <boost/asio/write.hpp>
-#include <boost/asio/connect.hpp>
-#include <boost/core/ignore_unused.hpp>
-#include <boost/assert.hpp>
-#include <boost/asio/experimental/parallel_group.hpp>
-
-#include <aedis/resp3/type.hpp>
-#include <aedis/resp3/detail/parser.hpp>
-#include <aedis/resp3/read.hpp>
-#include <aedis/generic/error.hpp>
-
-namespace aedis {
-namespace generic {
-namespace detail {
-
-#include <boost/asio/yield.hpp>
-
-template <class Client, class Command>
-struct ping_after_op {
-   Client* cli;
-   boost::asio::coroutine coro;
-
-   template <class Self>
-   void
-   operator()(Self& self, boost::system::error_code ec = {})
-   {
-      reenter (coro)
-      {
-         BOOST_ASSERT((cli->cfg_.idle_timeout / 2) != std::chrono::seconds{0});
-         cli->read_timer_.expires_after(cli->cfg_.idle_timeout / 2);
-         yield cli->read_timer_.async_wait(std::move(self));
-         if (ec) {
-            self.complete(ec);
-            return;
-         }
-
-         // The timer fired, send the ping.
-         cli->send(Command::ping);
-         self.complete({});
-      }
-   }
-};
-
-template <class Client>
-struct read_until_op {
-   Client* cli;
-   boost::asio::coroutine coro;
-
-   template <class Self>
-   void operator()( Self& self
-                  , boost::system::error_code ec = {}
-                  , std::size_t n = 0)
-   {
-      reenter (coro)
-      {
-         // Waits for incomming data.
-         yield
-         boost::asio::async_read_until(
-            *cli->socket_,
-            boost::asio::dynamic_buffer(cli->read_buffer_, cli->cfg_.max_read_size),
-            "\r\n",
-            std::move(self));
-
-         // Cancels the async_ping_after.
-         cli->read_timer_.cancel();
-         self.complete(ec);
-      }
-   }
-};
-
-template <class Client>
-struct wait_for_data_op {
-   Client* cli;
-   boost::asio::coroutine coro;
-
-   template <class Self>
-   void operator()( Self& self
-                  , std::array<std::size_t, 2> order = {}
-                  , boost::system::error_code ec1 = {}
-                  , boost::system::error_code ec2 = {})
-   {
-      reenter (coro)
-      {
-         yield
-         boost::asio::experimental::make_parallel_group(
-            [this](auto token) { return cli->async_read_until(token);},
-            [this](auto token) { return cli->async_ping_after(token);}
-         ).async_wait(
-            boost::asio::experimental::wait_for_all(),
-            std::move(self));
-
-         // The order of completion is not important.
-         self.complete(ec1);
-      }
-   }
-};
-
-template <class Client>
-struct check_idle_op {
-   Client* cli;
-   boost::asio::coroutine coro;
-
-   template <class Self>
-   void operator()(Self& self, boost::system::error_code ec = {})
-   {
-      reenter (coro) for(;;)
-      {
-         cli->check_idle_timer_.expires_after(cli->cfg_.idle_timeout);
-         yield cli->check_idle_timer_.async_wait(std::move(self));
-         if (ec) {
-            self.complete(ec);
-            return;
-         }
-
-         auto const now = std::chrono::steady_clock::now();
-         if (cli->last_data_ +  cli->cfg_.idle_timeout < now) {
-            cli->on_reader_exit();
-            self.complete(error::idle_timeout);
-            return;
-         }
-
-         cli->last_data_ = now;
-      }
-   }
-};
-
-template <class Client>
-struct resolve_op {
-   Client* cli;
-   boost::asio::coroutine coro;
-
-   template <class Self>
-   void
-   operator()( Self& self
-             , boost::system::error_code ec = {}
-             , boost::asio::ip::tcp::resolver::results_type res = {})
-   {
-      reenter (coro)
-      {
-         yield
-         cli->resv_.async_resolve(cli->host_.data(), cli->port_.data(), std::move(self));
-         if (ec) {
-            self.complete(ec);
-            return;
-         }
-
-         cli->endpoints_ = res;
-         self.complete({});
-      }
-   }
-};
-
-template <class Client>
-struct connect_op {
-   Client* cli;
-   boost::asio::coroutine coro;
-
-   template <class Self>
-   void
-   operator()( Self& self
-             , boost::system::error_code ec = {}
-             , boost::asio::ip::tcp::endpoint const& ep = {})
-   {
-      reenter (coro)
-      {
-         yield
-         boost::asio::async_connect(
-            *cli->socket_,
-            cli->endpoints_,
-            std::move(self));
-
-         if (ec) {
-            self.complete(ec);
-            return;
-         }
-
-         cli->endpoint_ = ep;
-         self.complete({});
-      }
-   }
-};
-
-template <class Client>
-struct init_op {
-   Client* cli;
-   boost::asio::coroutine coro;
-
-   template <class Self>
-   void operator()( Self& self
-                  , std::array<std::size_t, 2> order = {}
-                  , boost::system::error_code ec1 = {}
-                  , boost::system::error_code ec2 = {})
-   {
-      reenter (coro)
-      {
-         // Tries to resolve with a timeout. We can use the writer
-         // timer here as there is no ongoing write operation.
-         cli->write_timer_.expires_after(cli->cfg_.resolve_timeout);
-
-         yield
-         boost::asio::experimental::make_parallel_group(
-            [this](auto token) { return cli->async_resolve(token);},
-            [this](auto token) { return cli->write_timer_.async_wait(token);}
-         ).async_wait(
-            boost::asio::experimental::wait_for_one(),
-            std::move(self));
-
-         switch (order[0]) {
-            case 0:
-            {
-               if (ec1) {
-                  self.complete(ec1);
-                  return;
-               }
-
-               cli->on_resolve();
-            } break;
-
-            case 1:
-            {
-               if (!ec2) {
-                  self.complete(generic::error::resolve_timeout);
-                  return;
-               }
-            } break;
-
-            default: BOOST_ASSERT(false);
-         }
-
-         // Tries a connection with a timeout. We can use the writer
-         // timer here as there is no ongoing write operation.
-         cli->write_timer_.expires_after(cli->cfg_.connect_timeout);
-
-         yield
-         boost::asio::experimental::make_parallel_group(
-            [this](auto token) { return cli->async_connect(token);},
-            [this](auto token) { return cli->write_timer_.async_wait(token);}
-         ).async_wait(
-            boost::asio::experimental::wait_for_one(),
-            std::move(self));
-
-         switch (order[0]) {
-            case 0:
-            {
-               if (ec1) {
-                  self.complete(ec1);
-                  return;
-               }
-
-               cli->on_connect();
-            } break;
-
-            case 1:
-            {
-               if (!ec2) {
-                  self.complete(generic::error::connect_timeout);
-                  return;
-               }
-            } break;
-
-            default: BOOST_ASSERT(false);
-         }
-
-         self.complete({});
-      }
-   }
-};
-
-template <class Client>
-struct read_write_check_op {
-   Client* cli;
-   boost::asio::coroutine coro;
-
-   template <class Self>
-   void operator()( Self& self
-                  , std::array<std::size_t, 3> order = {}
-                  , boost::system::error_code ec1 = {}
-                  , boost::system::error_code ec2 = {}
-                  , boost::system::error_code ec3 = {})
-   {
-      reenter (coro)
-      {
-         // Starts the reader and writer ops.
-         cli->wait_write_timer_.expires_at(std::chrono::steady_clock::time_point::max());
-
-         yield
-         boost::asio::experimental::make_parallel_group(
-            [this](auto token) { return cli->writer(token);},
-            [this](auto token) { return cli->reader(token);},
-            [this](auto token) { return cli->async_check_idle(token);}
-         ).async_wait(
-            boost::asio::experimental::wait_for_one_error(),
-            std::move(self));
-
-         switch (order[0]) {
-           case 0:
-           {
-              BOOST_ASSERT(ec1);
-              self.complete(ec1);
-           } break;
-           case 1:
-           {
-              BOOST_ASSERT(ec2);
-              self.complete(ec2);
-           } break;
-           case 2:
-           {
-              BOOST_ASSERT(ec3);
-              self.complete(ec3);
-           } break;
-           default: BOOST_ASSERT(false);
-         }
-      }
-   }
-};
-
-template <class Client>
-struct run_op {
-   Client* cli;
-   boost::asio::coroutine coro;
-
-   template <class Self>
-   void operator()(Self& self, boost::system::error_code ec = {})
-   {
-      reenter (coro)
-      {
-         yield cli->async_init(std::move(self));
-         if (ec) {
-            self.complete(ec);
-            return;
-         }
-
-         yield cli->async_read_write_check(std::move(self));
-         if (ec) {
-            self.complete(ec);
-            return;
-         }
-
-         BOOST_ASSERT(false);
-      }
-   }
-};
-
-template <class Client>
-struct write_op {
-   Client* cli;
-   boost::asio::coroutine coro;
-
-   template <class Self>
-   void operator()( Self& self
-                  , std::array<std::size_t, 2> order = {}
-                  , boost::system::error_code ec1 = {}
-                  , std::size_t n = 0
-                  , boost::system::error_code ec2 = {})
-   {
-      reenter (coro)
-      {
-         BOOST_ASSERT(!cli->info_.empty());
-         BOOST_ASSERT(cli->info_.front().size != 0);
-         BOOST_ASSERT(!cli->requests_.empty());
-
-         cli->write_timer_.expires_after(cli->cfg_.write_timeout);
-         cli->info_.front().sent = true;
-         yield
-         boost::asio::experimental::make_parallel_group(
-            [this](auto token) { return boost::asio::async_write(*cli->socket_, boost::asio::buffer(cli->requests_.data(), cli->info_.front().size), token);},
-            [this](auto token) { return cli->write_timer_.async_wait(token);}
-         ).async_wait(
-            boost::asio::experimental::wait_for_one(),
-            std::move(self));
-
-         switch (order[0]) {
-            case 0:
-            {
-               if (ec1) {
-                  self.complete(ec1);
-                  return;
-               }
-            } break;
-
-            case 1:
-            {
-               if (!ec2) {
-                  self.complete(generic::error::write_timeout);
-                  return;
-               }
-            } break;
-
-            default: BOOST_ASSERT(false);
-         }
-
-         BOOST_ASSERT(!cli->info_.empty());
-         BOOST_ASSERT(cli->info_.front().size != 0);
-         BOOST_ASSERT(!cli->requests_.empty());
-         BOOST_ASSERT(n == cli->info_.front().size);
-
-         cli->requests_.erase(0, n);
-         cli->info_.front().size = 0;
-         if (cli->info_.front().cmds == 0) 
-            cli->info_.erase(std::begin(cli->info_));
-
-         cli->on_write_(n);
-         self.complete({});
-      }
-   }
-};
-
-template <class Client>
-struct writer_op {
-   Client* cli;
-   boost::asio::coroutine coro;
-
-   template <class Self>
-   void operator()(Self& self , boost::system::error_code ec = {})
-   {
-      reenter (coro) for (;;)
-      {
-         yield cli->async_write(std::move(self));
-         if (ec) {
-            cli->socket_->close();
-            self.complete(ec);
-            return;
-         }
-
-         yield cli->wait_write_timer_.async_wait(std::move(self));
-
-         if (!cli->socket_->is_open()) {
-            self.complete(error::write_stop_requested);
-            return;
-         }
-      }
-   }
-};
-
-template <class Client>
-struct read_op {
-   Client* cli;
-   boost::asio::coroutine coro;
-
-   template <class Self>
-   void operator()( Self& self
-                  , std::array<std::size_t, 2> order = {}
-                  , boost::system::error_code ec1 = {}
-                  , std::size_t n = 0
-                  , boost::system::error_code ec2 = {})
-   {
-      reenter (coro)
-      {
-         cli->read_timer_.expires_after(cli->cfg_.read_timeout);
-
-         yield
-         boost::asio::experimental::make_parallel_group(
-            [this](auto token) { return resp3::async_read(*cli->socket_, boost::asio::dynamic_buffer(cli->read_buffer_, cli->cfg_.max_read_size), [cli_ = cli](resp3::node<boost::string_view> const& nd, boost::system::error_code& ec) mutable {cli_->on_resp3_(cli_->cmd_info_.first, nd, ec);}, token);},
-            [this](auto token) { return cli->read_timer_.async_wait(token);}
-         ).async_wait(
-            boost::asio::experimental::wait_for_one(),
-            std::move(self));
-
-         switch (order[0]) {
-            case 0:
-            {
-               if (ec1) {
-                  self.complete(ec1);
-                  return;
-               }
-            } break;
-
-            case 1:
-            {
-               if (!ec2) {
-                  self.complete(generic::error::read_timeout);
-                  return;
-               }
-            } break;
-
-            default: BOOST_ASSERT(false);
-         }
-
-         if (cli->type_ == resp3::type::push) {
-            cli->on_push_(n);
-         } else {
-            if (cli->on_cmd(cli->cmd_info_))
-               cli->wait_write_timer_.cancel_one();
-
-            cli->on_read_(cli->cmd_info_.first, n);
-         }
-
-         self.complete({});
-      }
-   }
-};
-
-template <class Client, class Command>
-struct reader_op {
-   Client* cli;
-   boost::asio::coroutine coro;
-
-   template <class Self>
-   void operator()( Self& self
-                  , boost::system::error_code ec = {}
-                  , std::size_t n = 0)
-   {
-      boost::ignore_unused(n);
-
-      reenter (coro) for (;;)
-      {
-         if (cli->read_buffer_.empty()) {
-            yield cli->async_wait_for_data(std::move(self));
-            if (ec) {
-               cli->on_reader_exit();
-               self.complete(ec);
-               return;
-            }
-         }
-
-         BOOST_ASSERT(!cli->read_buffer_.empty());
-         cli->type_ = resp3::to_type(cli->read_buffer_.front());
-         cli->cmd_info_ = std::make_pair(Command::invalid, 0);
-         if (cli->type_ != resp3::type::push) {
-            BOOST_ASSERT(!cli->commands_.empty());
-            cli->cmd_info_ = cli->commands_.front();
-         }
-
-         cli->last_data_ = std::chrono::steady_clock::now();
-
-         yield cli->async_read(std::move(self));
-         if (ec) {
-            cli->on_reader_exit();
-            self.complete(ec);
-            return;
-         }
-      }
-   }
-};
-
-#include <boost/asio/unyield.hpp>
-
-} // detail
-} // generic
-} // aedis
-
-#endif // AEDIS_GENERIC_CLIENT_OPS_HPP

aedis/generic/error.hpp

@@ -1,54 +0,0 @@
-/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
- *
- * Distributed under the Boost Software License, Version 1.0. (See
- * accompanying file LICENSE.txt)
- */
-
-#ifndef AEDIS_GENERIC_ERROR_HPP
-#define AEDIS_GENERIC_ERROR_HPP
-
-#include <boost/system/error_code.hpp>
-
-namespace aedis {
-namespace generic {
-
-/** \brief Generic errors.
- *  \ingroup any
- */
-enum class error
-{
-   /// Represents the timeout of the resolve operation.
-   resolve_timeout = 1,
-
-   /// Represents the timeout of the connect operation.
-   connect_timeout,
-
-   /// Represents the timeout of the read operation.
-   read_timeout,
-
-   /// Represents the timeout of the write operation.
-   write_timeout,
-
-   /// Idle timeout.
-   idle_timeout,
-
-   /// Write stop requested.
-   write_stop_requested,
-};
-
-/** \brief Creates a error_code object from an error.
- *  \ingroup any
- */
-boost::system::error_code make_error_code(error e);
-
-} // generic
-} // aedis
-
-namespace std {
-
-template<>
-struct is_error_code_enum<::aedis::generic::error> : std::true_type {};
-
-} // std
-
-#endif // AEDIS_GENERIC_ERROR_HPP

aedis/generic/impl/error.ipp

@@ -1,48 +0,0 @@
-/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
- *
- * Distributed under the Boost Software License, Version 1.0. (See
- * accompanying file LICENSE.txt)
- */
-
-#include <aedis/generic/error.hpp>
-
-namespace aedis {
-namespace generic {
-namespace detail {
-
-struct error_category_impl : boost::system::error_category {
-
-   char const* name() const noexcept override
-   {
-      return "aedis.generic";
-   }
-
-   std::string message(int ev) const override
-   {
-      switch(static_cast<error>(ev)) {
-	 case error::resolve_timeout: return "Resolve operation timeout.";
-	 case error::connect_timeout: return "Connect operation timeout.";
-	 case error::read_timeout: return "Read operation timeout.";
-	 case error::write_timeout: return "Write operation timeout.";
-	 case error::idle_timeout: return "Idle timeout.";
-	 case error::write_stop_requested: return "Write stop requested.";
-	 default: BOOST_ASSERT(false);
-      }
-   }
-};
-
-boost::system::error_category const& category()
-{
-  static error_category_impl instance;
-  return instance;
-}
-
-} // detail
-
-boost::system::error_code make_error_code(error e)
-{
-    return boost::system::error_code{static_cast<int>(e), detail::category()};
-}
-
-} // generic
-} // aedis

aedis/redis/command.hpp

@@ -1,457 +0,0 @@
-/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
- *
- * Distributed under the Boost Software License, Version 1.0. (See
- * accompanying file LICENSE.txt)
- */
-
-#ifndef AEDIS_REDIS_COMMAND_HPP
-#define AEDIS_REDIS_COMMAND_HPP
-
-#include <ostream>
-#include <string>
-
-namespace aedis {
-namespace redis {
-
-/** \brief Redis commands.
- *  \ingroup any
- *
- *  The full list of of commands can be found at
- *  https://redis.io/commands.
- *
- *  \remark This list was created with the help of the \c command
- *  command.
- */
-enum class command {
-   /// https://redis.io/commands/acl
-   acl,
-   /// https://redis.io/commands/append
-   append,
-   /// https://redis.io/commands/asking
-   asking,
-   /// https://redis.io/commands/auth
-   auth,
-   /// https://redis.io/commands/bgrewriteaof
-   bgrewriteaof,
-   /// https://redis.io/commands/bgsave
-   bgsave,
-   /// https://redis.io/commands/bitcount
-   bitcount,
-   /// https://redis.io/commands/bitfield
-   bitfield,
-   /// https://redis.io/commands/bitfield_ro
-   bitfield_ro,
-   /// https://redis.io/commands/bitop
-   bitop,
-   /// https://redis.io/commands/bitpos
-   bitpos,
-   /// https://redis.io/commands/blpop
-   blpop,
-   /// https://redis.io/commands/brpop
-   brpop,
-   /// https://redis.io/commands/brpoplpush
-   brpoplpush,
-   /// https://redis.io/commands/bzpopmax
-   bzpopmax,
-   /// https://redis.io/commands/bzpopmin
-   bzpopmin,
-   /// https://redis.io/commands/client
-   client,
-   /// https://redis.io/commands/cluster
-   cluster,
-   /// https://redis.io/commands/command
-   command,
-   /// https://redis.io/commands/config
-   config,
-   /// https://redis.io/commands/dbsize
-   dbsize,
-   /// https://redis.io/commands/debug
-   debug,
-   /// https://redis.io/commands/decr
-   decr,
-   /// https://redis.io/commands/decrby
-   decrby,
-   /// https://redis.io/commands/del
-   del,
-   /// https://redis.io/commands/discard
-   discard,
-   /// https://redis.io/commands/dump
-   dump,
-   /// https://redis.io/commands/echo
-   echo,
-   /// https://redis.io/commands/eval
-   eval,
-   /// https://redis.io/commands/evalsha
-   evalsha,
-   /// https://redis.io/commands/exec
-   exec,
-   /// https://redis.io/commands/exists
-   exists,
-   /// https://redis.io/commands/expire
-   expire,
-   /// https://redis.io/commands/expireat
-   expireat,
-   /// https://redis.io/commands/flushall
-   flushall,
-   /// https://redis.io/commands/flushdb
-   flushdb,
-   /// https://redis.io/commands/geoadd
-   geoadd,
-   /// https://redis.io/commands/geodist
-   geodist,
-   /// https://redis.io/commands/geohash
-   geohash,
-   /// https://redis.io/commands/geopos
-   geopos,
-   /// https://redis.io/commands/georadius
-   georadius,
-   /// https://redis.io/commands/georadius_ro
-   georadius_ro,
-   /// https://redis.io/commands/georadiusbymember
-   georadiusbymember,
-   /// https://redis.io/commands/georadiusbymember_ro
-   georadiusbymember_ro,
-   /// https://redis.io/commands/get
-   get,
-   /// https://redis.io/commands/getbit
-   getbit,
-   /// https://redis.io/commands/getrange
-   getrange,
-   /// https://redis.io/commands/getset
-   getset,
-   /// https://redis.io/commands/hdel
-   hdel,
-   /// https://redis.io/commands/hello
-   hello,
-   /// https://redis.io/commands/hexists
-   hexists,
-   /// https://redis.io/commands/hget
-   hget,
-   /// https://redis.io/commands/hgetall
-   hgetall,
-   /// https://redis.io/commands/hincrby
-   hincrby,
-   /// https://redis.io/commands/hincrbyfloat
-   hincrbyfloat,
-   /// https://redis.io/commands/hkeys
-   hkeys,
-   /// https://redis.io/commands/hlen
-   hlen,
-   /// https://redis.io/commands/hmget
-   hmget,
-   /// https://redis.io/commands/hmset
-   hmset,
-   /// https://redis.io/commands/hscan
-   hscan,
-   /// https://redis.io/commands/hset
-   hset,
-   /// https://redis.io/commands/hsetnx
-   hsetnx,
-   /// https://redis.io/commands/hstrlen
-   hstrlen,
-   /// https://redis.io/commands/hvals
-   hvals,
-   /// https://redis.io/commands/incr
-   incr,
-   /// https://redis.io/commands/incrby
-   incrby,
-   /// https://redis.io/commands/incrbyfloat
-   incrbyfloat,
-   /// https://redis.io/commands/info
-   info,
-   /// https://redis.io/commands/keys
-   keys,
-   /// https://redis.io/commands/lastsave
-   lastsave,
-   /// https://redis.io/commands/latency
-   latency,
-   /// https://redis.io/commands/lindex
-   lindex,
-   /// https://redis.io/commands/linsert
-   linsert,
-   /// https://redis.io/commands/llen
-   llen,
-   /// https://redis.io/commands/lolwut
-   lolwut,
-   /// https://redis.io/commands/lpop
-   lpop,
-   /// https://redis.io/commands/lpos
-   lpos,
-   /// https://redis.io/commands/lpush
-   lpush,
-   /// https://redis.io/commands/lpushx
-   lpushx,
-   /// https://redis.io/commands/lrange
-   lrange,
-   /// https://redis.io/commands/lrem
-   lrem,
-   /// https://redis.io/commands/lset
-   lset,
-   /// https://redis.io/commands/ltrim
-   ltrim,
-   /// https://redis.io/commands/memory
-   memory,
-   /// https://redis.io/commands/mget
-   mget,
-   /// https://redis.io/commands/migrate
-   migrate,
-   /// https://redis.io/commands/module
-   module,
-   /// https://redis.io/commands/monitor
-   monitor,
-   /// https://redis.io/commands/move
-   move,
-   /// https://redis.io/commands/mset
-   mset,
-   /// https://redis.io/commands/msetnx
-   msetnx,
-   /// https://redis.io/commands/multi
-   multi,
-   /// https://redis.io/commands/object
-   object,
-   /// https://redis.io/commands/persist
-   persist,
-   /// https://redis.io/commands/pexpire
-   pexpire,
-   /// https://redis.io/commands/pexpireat
-   pexpireat,
-   /// https://redis.io/commands/pfadd
-   pfadd,
-   /// https://redis.io/commands/pfcount
-   pfcount,
-   /// https://redis.io/commands/pfdebug
-   pfdebug,
-   /// https://redis.io/commands/pfmerge
-   pfmerge,
-   /// https://redis.io/commands/pfselftest
-   pfselftest,
-   /// https://redis.io/commands/ping
-   ping,
-   /// https://redis.io/commands/post
-   post,
-   /// https://redis.io/commands/psetex
-   psetex,
-   /// https://redis.io/commands/psubscribe
-   psubscribe,
-   /// https://redis.io/commands/psync
-   psync,
-   /// https://redis.io/commands/pttl
-   pttl,
-   /// https://redis.io/commands/publish
-   publish,
-   /// https://redis.io/commands/pubsub
-   pubsub,
-   /// https://redis.io/commands/punsubscribe
-   punsubscribe,
-   /// https://redis.io/commands/randomkey
-   randomkey,
-   /// https://redis.io/commands/readonly
-   readonly,
-   /// https://redis.io/commands/readwrite
-   readwrite,
-   /// https://redis.io/commands/rename
-   rename,
-   /// https://redis.io/commands/renamenx
-   renamenx,
-   /// https://redis.io/commands/replconf
-   replconf,
-   /// https://redis.io/commands/replicaof
-   replicaof,
-   /// https://redis.io/commands/restore
-   restore,
-   /// https://redis.io/commands/role
-   role,
-   /// https://redis.io/commands/rpop
-   rpop,
-   /// https://redis.io/commands/rpoplpush
-   rpoplpush,
-   /// https://redis.io/commands/rpush
-   rpush,
-   /// https://redis.io/commands/rpushx
-   rpushx,
-   /// https://redis.io/commands/sadd
-   sadd,
-   /// https://redis.io/commands/save
-   save,
-   /// https://redis.io/commands/scan
-   scan,
-   /// https://redis.io/commands/scard
-   scard,
-   /// https://redis.io/commands/script
-   script,
-   /// https://redis.io/commands/sdiff
-   sdiff,
-   /// https://redis.io/commands/sdiffstore
-   sdiffstore,
-   /// https://redis.io/commands/select
-   select,
-   /// https://redis.io/commands/set
-   set,
-   /// https://redis.io/commands/setbit
-   setbit,
-   /// https://redis.io/commands/setex
-   setex,
-   /// https://redis.io/commands/setnx
-   setnx,
-   /// https://redis.io/commands/setrange
-   setrange,
-   /// https://redis.io/commands/shutdown
-   shutdown,
-   /// https://redis.io/commands/sinter
-   sinter,
-   /// https://redis.io/commands/sinterstore
-   sinterstore,
-   /// https://redis.io/commands/sismember
-   sismember,
-   /// https://redis.io/commands/slaveof
-   slaveof,
-   /// https://redis.io/commands/slowlog
-   slowlog,
-   /// https://redis.io/commands/smembers
-   smembers,
-   /// https://redis.io/commands/smove
-   smove,
-   /// https://redis.io/commands/sort
-   sort,
-   /// https://redis.io/commands/spop
-   spop,
-   /// https://redis.io/commands/srandmember
-   srandmember,
-   /// https://redis.io/commands/srem
-   srem,
-   /// https://redis.io/commands/sscan
-   sscan,
-   /// https://redis.io/commands/stralgo
-   stralgo,
-   /// https://redis.io/commands/strlen
-   strlen,
-   /// https://redis.io/commands/subscribe
-   subscribe,
-   /// https://redis.io/commands/substr
-   substr,
-   /// https://redis.io/commands/sunion
-   sunion,
-   /// https://redis.io/commands/sunionstore
-   sunionstore,
-   /// https://redis.io/commands/swapdb
-   swapdb,
-   /// https://redis.io/commands/sync
-   sync,
-   /// https://redis.io/commands/time
-   time,
-   /// https://redis.io/commands/touch
-   touch,
-   /// https://redis.io/commands/ttl
-   ttl,
-   /// https://redis.io/commands/type
-   type,
-   /// https://redis.io/commands/unlink
-   unlink,
-   /// https://redis.io/commands/quit
-   quit,
-   /// https://redis.io/commands/unsubscribe
-   unsubscribe,
-   /// https://redis.io/commands/unwatch
-   unwatch,
-   /// https://redis.io/commands/wait
-   wait,
-   /// https://redis.io/commands/watch
-   watch,
-   /// https://redis.io/commands/xack
-   xack,
-   /// https://redis.io/commands/xadd
-   xadd,
-   /// https://redis.io/commands/xclaim
-   xclaim,
-   /// https://redis.io/commands/xdel
-   xdel,
-   /// https://redis.io/commands/xgroup
-   xgroup,
-   /// https://redis.io/commands/xinfo
-   xinfo,
-   /// https://redis.io/commands/xlen
-   xlen,
-   /// https://redis.io/commands/xpending
-   xpending,
-   /// https://redis.io/commands/xrange
-   xrange,
-   /// https://redis.io/commands/xread
-   xread,
-   /// https://redis.io/commands/xreadgroup
-   xreadgroup,
-   /// https://redis.io/commands/xrevrange
-   xrevrange,
-   /// https://redis.io/commands/xsetid
-   xsetid,
-   /// https://redis.io/commands/xtrim
-   xtrim,
-   /// https://redis.io/commands/zadd
-   zadd,
-   /// https://redis.io/commands/zcard
-   zcard,
-   /// https://redis.io/commands/zcount
-   zcount,
-   /// https://redis.io/commands/zincrby
-   zincrby,
-   /// https://redis.io/commands/zinterstore
-   zinterstore,
-   /// https://redis.io/commands/zlexcount
-   zlexcount,
-   /// https://redis.io/commands/zpopmax
-   zpopmax,
-   /// https://redis.io/commands/zpopmin
-   zpopmin,
-   /// https://redis.io/commands/zrange
-   zrange,
-   /// https://redis.io/commands/zrangebylex
-   zrangebylex,
-   /// https://redis.io/commands/zrangebyscore
-   zrangebyscore,
-   /// https://redis.io/commands/zrank
-   zrank,
-   /// https://redis.io/commands/zrem
-   zrem,
-   /// https://redis.io/commands/zremrangebylex
-   zremrangebylex,
-   /// https://redis.io/commands/zremrangebyrank
-   zremrangebyrank,
-   /// https://redis.io/commands/zremrangebyscore
-   zremrangebyscore,
-   /// https://redis.io/commands/zrevrange
-   zrevrange,
-   /// https://redis.io/commands/zrevrangebylex
-   zrevrangebylex,
-   /// https://redis.io/commands/zrevrangebyscore
-   zrevrangebyscore,
-   /// https://redis.io/commands/zrevrank
-   zrevrank,
-   /// https://redis.io/commands/zscan
-   zscan,
-   /// https://redis.io/commands/zscore
-   zscore,
-   /// https://redis.io/commands/zunionstore
-   zunionstore,
-   /// Invalid command.
-   invalid
-};
-
-/** \brief Converts the command to a string.
- *  \ingroup any
- *  \param c The command to convert.
- */
-char const* to_string(command c);
-
-/** \brief Writes the command string to the stream.
- *  \ingroup any
- *  \param os Output stream.
- *  \param c Redis command
- */
-std::ostream& operator<<(std::ostream& os, command c);
-
-// Checks whether a command has push response.
-bool has_push_response(command cmd);
-
-} // redis
-} // aedis
-
-#endif // AEDIS_REDIS_COMMAND_HPP

aedis/redis/impl/command.ipp

@@ -1,245 +0,0 @@
-/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
- *
- * Distributed under the Boost Software License, Version 1.0. (See
- * accompanying file LICENSE.txt)
- */
-
-#include <aedis/redis/command.hpp>
-
-namespace aedis {
-namespace redis {
-
-char const* to_string(command c)
-{
-   static char const* table[] = {
-      "ACL",
-      "APPEND",
-      "ASKING",
-      "AUTH",
-      "BGREWRITEAOF",
-      "BGSAVE",
-      "BITCOUNT",
-      "BITFIELD",
-      "BITFIELD_RO",
-      "BITOP",
-      "BITPOS",
-      "BLPOP",
-      "BRPOP",
-      "BRPOPLPUSH",
-      "BZPOPMAX",
-      "BZPOPMIN",
-      "CLIENT",
-      "CLUSTER",
-      "COMMAND",
-      "CONFIG",
-      "DBSIZE",
-      "DEBUG",
-      "DECR",
-      "DECRBY",
-      "DEL",
-      "DISCARD",
-      "DUMP",
-      "ECHO",
-      "EVAL",
-      "EVALSHA",
-      "EXEC",
-      "EXISTS",
-      "EXPIRE",
-      "EXPIREAT",
-      "FLUSHALL",
-      "FLUSHDB",
-      "GEOADD",
-      "GEODIST",
-      "GEOHASH",
-      "GEOPOS",
-      "GEORADIUS",
-      "GEORADIUS_RO",
-      "GEORADIUSBYMEMBER",
-      "GEORADIUSBYMEMBER_RO",
-      "GET",
-      "GETBIT",
-      "GETRANGE",
-      "GETSET",
-      "HDEL",
-      "HELLO",
-      "HEXISTS",
-      "HGET",
-      "HGETALL",
-      "HINCRBY",
-      "HINCRBYFLOAT",
-      "HKEYS",
-      "HLEN",
-      "HMGET",
-      "HMSET",
-      "HSCAN",
-      "HSET",
-      "HSETNX",
-      "HSTRLEN",
-      "HVALS",
-      "INCR",
-      "INCRBY",
-      "INCRBYFLOAT",
-      "INFO",
-      "KEYS",
-      "LASTSAVE",
-      "LATENCY",
-      "LINDEX",
-      "LINSERT",
-      "LLEN",
-      "LOLWUT",
-      "LPOP",
-      "LPOS",
-      "LPUSH",
-      "LPUSHX",
-      "LRANGE",
-      "LREM",
-      "LSET",
-      "LTRIM",
-      "MEMORY",
-      "MGET",
-      "MIGRATE",
-      "MODULE",
-      "MONITOR",
-      "MOVE",
-      "MSET",
-      "MSETNX",
-      "MULTI",
-      "OBJECT",
-      "PERSIST",
-      "PEXPIRE",
-      "PEXPIREAT",
-      "PFADD",
-      "PFCOUNT",
-      "PFDEBUG",
-      "PFMERGE",
-      "PFSELFTEST",
-      "PING",
-      "POST",
-      "PSETEX",
-      "PSUBSCRIBE",
-      "PSYNC",
-      "PTTL",
-      "PUBLISH",
-      "PUBSUB",
-      "PUNSUBSCRIBE",
-      "RANDOMKEY",
-      "READONLY",
-      "READWRITE",
-      "RENAME",
-      "RENAMENX",
-      "REPLCONF",
-      "REPLICAOF",
-      "RESTORE",
-      "ROLE",
-      "RPOP",
-      "RPOPLPUSH",
-      "RPUSH",
-      "RPUSHX",
-      "SADD",
-      "SAVE",
-      "SCAN",
-      "SCARD",
-      "SCRIPT",
-      "SDIFF",
-      "SDIFFSTORE",
-      "SELECT",
-      "SET",
-      "SETBIT",
-      "SETEX",
-      "SETNX",
-      "SETRANGE",
-      "SHUTDOWN",
-      "SINTER",
-      "SINTERSTORE",
-      "SISMEMBER",
-      "SLAVEOF",
-      "SLOWLOG",
-      "SMEMBERS",
-      "SMOVE",
-      "SORT",
-      "SPOP",
-      "SRANDMEMBER",
-      "SREM",
-      "SSCAN",
-      "STRALGO",
-      "STRLEN",
-      "SUBSCRIBE",
-      "SUBSTR",
-      "SUNION",
-      "SUNIONSTORE",
-      "SWAPDB",
-      "SYNC",
-      "TIME",
-      "TOUCH",
-      "TTL",
-      "TYPE",
-      "UNLINK",
-      "QUIT",
-      "UNSUBSCRIBE",
-      "UNWATCH",
-      "WAIT",
-      "WATCH",
-      "XACK",
-      "XADD",
-      "XCLAIM",
-      "XDEL",
-      "XGROUP",
-      "XINFO",
-      "XLEN",
-      "XPENDING",
-      "XRANGE",
-      "XREAD",
-      "XREADGROUP",
-      "XREVRANGE",
-      "XSETID",
-      "XTRIM",
-      "ZADD",
-      "ZCARD",
-      "ZCOUNT",
-      "ZINCRBY",
-      "ZINTERSTORE",
-      "ZLEXCOUNT",
-      "ZPOPMAX",
-      "ZPOPMIN",
-      "ZRANGE",
-      "ZRANGEBYLEX",
-      "ZRANGEBYSCORE",
-      "ZRANK",
-      "ZREM",
-      "ZREMRANGEBYLEX",
-      "ZREMRANGEBYRANK",
-      "ZREMRANGEBYSCORE",
-      "ZREVRANGE",
-      "ZREVRANGEBYLEX",
-      "ZREVRANGEBYSCORE",
-      "ZREVRANK",
-      "ZSCAN",
-      "ZSCORE",
-      "ZUNIONSTORE",
-      "INVALID",
-   };
-
-   return table[static_cast<int>(c)];
-}
-
-std::ostream& operator<<(std::ostream& os, command c)
-{
-   os << to_string(c);
-   return os;
-}
-
-bool has_push_response(command cmd)
-{
-   switch (cmd) {
-      case command::subscribe:
-      case command::unsubscribe:
-      case command::psubscribe:
-      return true;
-
-      default:
-      return false;
-   }
-}
-
-} // redis
-} // aedis

aedis/resp3/error.hpp

@@ -1,54 +0,0 @@
-/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
- *
- * Distributed under the Boost Software License, Version 1.0. (See
- * accompanying file LICENSE.txt)
- */
-
-#ifndef AEDIS_RESP3_ERROR_HPP
-#define AEDIS_RESP3_ERROR_HPP
-
-#include <boost/system/error_code.hpp>
-
-namespace aedis {
-namespace resp3 {
-
-/** \brief RESP3 errors.
- *  \ingroup any
- */
-enum class error
-{
-   /// Invalid RESP3 type.
-   invalid_type = 1,
-
-   /// Can't parse the string as a number.
-   not_a_number,
-
-   /// Received less bytes than expected.
-   unexpected_read_size,
-
-   /// The maximum depth of a nested response was exceeded.
-   exceeeds_max_nested_depth,
-
-   /// Unexpects bool value.
-   unexpected_bool_value,
-
-   /// Expected field value is empty.
-   empty_field
-};
-
-/** \brief Creates a error_code object from an error.
- *  \ingroup any
- */
-boost::system::error_code make_error_code(error e);
-
-} // resp3
-} // aedis
-
-namespace std {
-
-template<>
-struct is_error_code_enum<::aedis::resp3::error> : std::true_type {};
-
-} // std
-
-#endif // AEDIS_RESP3_ERROR_HPP

aedis/resp3/impl/error.ipp

@@ -1,49 +0,0 @@
-/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
- *
- * Distributed under the Boost Software License, Version 1.0. (See
- * accompanying file LICENSE.txt)
- */
-
-#include <boost/assert.hpp>
-#include <aedis/resp3/error.hpp>
-
-namespace aedis {
-namespace resp3 {
-namespace detail {
-
-struct error_category_impl : boost::system::error_category {
-
-   char const* name() const noexcept override
-   {
-      return "aedis.resp3";
-   }
-
-   std::string message(int ev) const override
-   {
-      switch(static_cast<error>(ev)) {
-	 case error::invalid_type: return "Invalid resp3 type.";
-	 case error::not_a_number: return "Can't convert string to number.";
-	 case error::unexpected_read_size: return "Unexpected read size.";
-	 case error::exceeeds_max_nested_depth: return "Exceeds the maximum number of nested responses.";
-	 case error::unexpected_bool_value: return "Unexpected bool value.";
-	 case error::empty_field: return "Expected field value is empty.";
-	 default: BOOST_ASSERT(false);
-      }
-   }
-};
-
-boost::system::error_category const& category()
-{
-  static error_category_impl instance;
-  return instance;
-}
-
-} // detail
-
-boost::system::error_code make_error_code(error e)
-{
-    return boost::system::error_code{static_cast<int>(e), detail::category()};
-}
-
-} // resp3
-} // aedis

aedis/sentinel/command.hpp

@@ -1,78 +0,0 @@
-/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
- *
- * Distributed under the Boost Software License, Version 1.0. (See
- * accompanying file LICENSE.txt)
- */
-
-#ifndef AEDIS_SENTINEL_COMMAND_HPP
-#define AEDIS_SENTINEL_COMMAND_HPP
-
-#include <ostream>
-
-namespace aedis {
-namespace sentinel {
-
-/** \brief Sentinel commands.
- *  \ingroup any
- *
- *  The full list of Sentinel commands can be found at
- *  https://redis.io/topics/sentinel.
- *
- *  \remark This list was created with the help of the \c command
- *  command.
- */
-enum class command {
-   /// https://redis.io/commands/acl
-   acl,
-   /// https://redis.io/commands/auth
-   auth,
-   /// https://redis.io/commands/client
-   client,
-   /// https://redis.io/commands/command
-   command,
-   /// https://redis.io/commands/hello
-   hello,
-   /// https://redis.io/commands/info
-   info,
-   /// https://redis.io/commands/ping
-   ping,
-   /// https://redis.io/commands/psubscribe
-   psubscribe,
-   /// https://redis.io/commands/publish
-   publish,
-   /// https://redis.io/commands/punsubscribe
-   punsubscribe,
-   /// https://redis.io/commands/role
-   role,
-   /// https://redis.io/topics/sentinel
-   sentinel,
-   /// https://redis.io/commands/shutdown
-   shutdown,
-   /// https://redis.io/commands/subscribe
-   subscribe,
-   /// https://redis.io/commands/unsubscribe
-   unsubscribe,
-   /// Unknown/invalid command.
-   invalid,
-};
-
-/** \brief Converts the command to a string.
- *  \ingroup any
- *  \param c The command to convert.
- */
-char const* to_string(command c);
-
-/** \brief Writes the command string to the stream.
- *  \ingroup any
- *  \param os Output stream.
- *  \param c Sentinel command
- */
-std::ostream& operator<<(std::ostream& os, command c);
-
-// Checks whether a command has push response.
-bool has_push_response(command cmd);
-
-} // sentinel
-} // aedis
-
-#endif // AEDIS_SENTINEL_COMMAND_HPP

aedis/sentinel/impl/command.ipp

@@ -1,55 +0,0 @@
-/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
- *
- * Distributed under the Boost Software License, Version 1.0. (See
- * accompanying file LICENSE.txt)
- */
-
-#include <aedis/sentinel/command.hpp>
-
-namespace aedis {
-namespace sentinel {
-
-char const* to_string(command c)
-{
-   static char const* table[] = {
-      "ACL",
-      "AUTH",
-      "CLIENT",
-      "COMMAND",
-      "HELLO",
-      "INFO",
-      "PING",
-      "PSUBSCRIBE",
-      "PUBLISH",
-      "PUNSUBSCRIBE",
-      "ROLE",
-      "SENTINEL",
-      "SHUTDOWN",
-      "SUBSCRIBE",
-      "UNSUBSCRIBE",
-   };
-
-   return table[static_cast<int>(c)];
-}
-
-std::ostream& operator<<(std::ostream& os, command c)
-{
-   os << to_string(c);
-   return os;
-}
-
-bool has_push_response(command cmd)
-{
-   switch (cmd) {
-      case command::subscribe:
-      case command::unsubscribe:
-      case command::psubscribe:
-      return true;
-
-      default:
-      return false;
-   }
-}
-
-} // sentinel
-} // aedis

benchmarks/benchmarks.md

@@ -0,0 +1,93 @@
+# TCP echo server performance
+
+This document benchmarks the performance of TCP echo servers I
+implemented in different languages using different Redis clients.  The
+main motivations for choosing an echo server are
+
+   * Simple to implement and does not require expertise level in most languages.
+   * I/O bound: Echo servers have very low CPU consumption in general
+     and  therefore are excelent to  measure how a program handles concurrent requests.
+   * It simulates very well a typical backend in regard to concurrency.
+
+I also imposed some constraints on the implementations
+
+   * It should be simple enough and not require writing too much code.
+   * Favor the use standard idioms and avoid optimizations that require expert level.
+   * Avoid the use of complex things like connection and thread pool.
+
+## No Redis
+
+First I tested a pure TCP echo server, i.e. one that sends the messages
+directly to the client without interacting with Redis. The result can
+be seen below
+
+![](https://mzimbres.github.io/aedis/tcp-echo-direct.png)
+
+The tests were performed with a 1000 concurrent TCP connections on the
+localhost where latency is 0.07ms on average on my machine. On higher
+latency networks the difference among libraries is expected to
+decrease. 
+
+### Remarks
+
+   * I expected Libuv to have similar performance to Asio and Tokio.
+   * I did expect nodejs to come a little behind given it is is
+     javascript code. Otherwise I did expect it to have similar
+     performance to libuv since it is the framework behind it.
+   * Go performance did not surprise me: decent and not some much far behind nodejs.
+
+The code used in the benchmarks can be found at
+
+   * [Asio](https://github.com/mzimbres/aedis/blob/3fb018ccc6138d310ac8b73540391cdd8f2fdad6/benchmarks/cpp/asio/echo_server_direct.cpp): A variation of [this](https://github.com/chriskohlhoff/asio/blob/4915cfd8a1653c157a1480162ae5601318553eb8/asio/src/examples/cpp20/coroutines/echo_server.cpp) Asio example.
+   * [Libuv](https://github.com/mzimbres/aedis/tree/835a1decf477b09317f391eddd0727213cdbe12b/benchmarks/c/libuv): Taken from [here](https://github.com/libuv/libuv/blob/06948c6ee502862524f233af4e2c3e4ca876f5f6/docs/code/tcp-echo-server/main.c) Libuv example .
+   * [Tokio](https://github.com/mzimbres/aedis/tree/3fb018ccc6138d310ac8b73540391cdd8f2fdad6/benchmarks/rust/echo_server_direct): Taken from [here](https://docs.rs/tokio/latest/tokio/).
+   * [Nodejs](https://github.com/mzimbres/aedis/tree/3fb018ccc6138d310ac8b73540391cdd8f2fdad6/benchmarks/nodejs/echo_server_direct)
+   * [Go](https://github.com/mzimbres/aedis/blob/3fb018ccc6138d310ac8b73540391cdd8f2fdad6/benchmarks/go/echo_server_direct.go)
+
+## Echo over Redis
+
+This is similar to the echo server described above but messages are
+echoed by Redis and not by the echo-server itself, which acts
+as a proxy between the client and the Redis server. The results
+can be seen below
+
+![](https://mzimbres.github.io/aedis/tcp-echo-over-redis.png)
+
+The tests were performed on a network where latency is 35ms on
+average, otherwise it uses the same number of TCP connections
+as the previous example.
+
+### Remarks
+
+As the reader can see, the Libuv and the Rust test are not depicted
+in the graph, the reasons are
+
+   * [redis-rs](https://github.com/redis-rs/redis-rs): This client
+     comes so far behind that it can't even be represented together
+     with the other benchmarks without making them look insignificant.
+     I don't know for sure why it is so slow, I suppose it has
+     something to do with its lack of proper
+     [pipelining](https://redis.io/docs/manual/pipelining/) support.
+     In fact, the more TCP connections I lauch the worst its
+     performance gets.
+
+   * Libuv: I left it out because it would require too much work to
+     write it and make it have a good performance. More specifically,
+     I would have to use hiredis and implement support for pipelines
+     manually.
+
+The code used in the benchmarks can be found at
+
+   * [Aedis](https://github.com/mzimbres/aedis): [code](https://github.com/mzimbres/aedis/blob/3fb018ccc6138d310ac8b73540391cdd8f2fdad6/examples/echo_server.cpp)
+   * [node-redis](https://github.com/redis/node-redis): [code](https://github.com/mzimbres/aedis/tree/3fb018ccc6138d310ac8b73540391cdd8f2fdad6/benchmarks/nodejs/echo_server_over_redis)
+   * [go-redis](https://github.com/go-redis/redis): [code](https://github.com/mzimbres/aedis/blob/3fb018ccc6138d310ac8b73540391cdd8f2fdad6/benchmarks/go/echo_server_over_redis.go)
+
+## Running the benchmarks
+
+Run one of the echo-server programs in one terminal and the [echo-server-client](https://github.com/mzimbres/aedis/blob/42880e788bec6020dd018194075a211ad9f339e8/benchmarks/cpp/asio/echo_server_client.cpp) in another.
+
+## Contributing
+
+If your spot any performance improvement in any of the example or
+would like to include other clients, please open a PR and I will
+gladly merge it.

benchmarks/benchmarks.tex

@@ -0,0 +1,73 @@
+\documentclass{article}
+\usepackage{pgfplots}
+\pgfrealjobname{echo}
+\pgfplotsset{compat=newest}
+
+\begin{document}
+
+\beginpgfgraphicnamed{echo-f0}
+% time ./echo_server_client 1000 5000
+\begin{tikzpicture}[scale=1.0]
+  \begin{axis}[
+    y dir=reverse,
+    %xbar stacked,
+    xbar, xmin=0,
+    %hide x axis,
+    bar shift=0pt,
+    width=15cm, height=6cm, enlarge y limits=0.5,
+    title={TCP Echo Server Performance},
+    xlabel={Seconds},
+    symbolic y coords={Asio,Tokio,Libuv,Nodejs,Go},
+    ytick=data,
+    %bar width=1cm,
+    nodes near coords,
+    nodes near coords align={horizontal},
+    ]
+    \addplot coordinates {
+       (31.1,Asio)
+       (30.7,Tokio)
+       (43.6,Libuv)
+       (74.2,Nodejs)
+       (81.0,Go)
+    };
+  \end{axis}
+\end{tikzpicture}
+\endpgfgraphicnamed
+
+\beginpgfgraphicnamed{echo-f1}
+%debian2[0]$ time ./echo_server_client 1000 1000
+%Go  (1):   1.000s
+%C++ (1):   0.07s
+\begin{tikzpicture}[scale=1.0]
+  \begin{axis}[
+    y dir=reverse,
+    %xbar stacked,
+    xbar, xmin=0,
+    %hide x axis,
+    bar shift=0pt,
+    width=12cm, height=6cm, enlarge y limits=0.5,
+     title={TCP Echo Server Performance (over Redis)},
+    xlabel={Seconds},
+    symbolic y coords={Aedis,Rust-rs,Libuv,Node-redis,Go-redis},
+    ytick=data,
+    %bar width=1cm,
+    nodes near coords,
+    nodes near coords align={horizontal},
+    ]
+    \addplot coordinates {
+       (12.6,Aedis)
+       (28.8,Node-redis)
+       (352.4,Go-redis)
+    };
+    %\addplot coordinates {
+    %   (30.0,Asio)
+    %   (90.6,Rust-rs)
+    %   (0.0,Libuv)
+    %   (68.9,Nodejs)
+    %   (0.0,Go)
+    %};
+  \end{axis}
+\end{tikzpicture}
+\endpgfgraphicnamed
+
+\end{document}

benchmarks/c/libuv/README.md

@@ -0,0 +1,7 @@
+This example was taken from
+
+   https://github.com/libuv/libuv/tree/v1.x/docs/code/tcp-echo-server
+
+To build it run, for example
+
+   $ gcc echo_server_direct.c -luv -O2 -o echo_server_direct

benchmarks/c/libuv/echo_server_direct.c

@@ -0,0 +1,87 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <uv.h>
+
+#define DEFAULT_PORT 55555
+#define DEFAULT_BACKLOG 1024
+
+uv_loop_t *loop;
+struct sockaddr_in addr;
+
+typedef struct {
+    uv_write_t req;
+    uv_buf_t buf;
+} write_req_t;
+
+void free_write_req(uv_write_t *req) {
+    write_req_t *wr = (write_req_t*) req;
+    free(wr->buf.base);
+    free(wr);
+}
+
+void alloc_buffer(uv_handle_t *handle, size_t suggested_size, uv_buf_t *buf) {
+    buf->base = (char*) malloc(suggested_size);
+    buf->len = suggested_size;
+}
+
+void on_close(uv_handle_t* handle) {
+    free(handle);
+}
+
+void echo_write(uv_write_t *req, int status) {
+    if (status) {
+        fprintf(stderr, "Write error %s\n", uv_strerror(status));
+    }
+    free_write_req(req);
+}
+
+void echo_read(uv_stream_t *client, ssize_t nread, const uv_buf_t *buf) {
+    if (nread > 0) {
+        write_req_t *req = (write_req_t*) malloc(sizeof(write_req_t));
+        req->buf = uv_buf_init(buf->base, nread);
+        uv_write((uv_write_t*) req, client, &req->buf, 1, echo_write);
+        return;
+    }
+    if (nread < 0) {
+        if (nread != UV_EOF)
+            fprintf(stderr, "Read error %s\n", uv_err_name(nread));
+        uv_close((uv_handle_t*) client, on_close);
+    }
+
+    free(buf->base);
+}
+
+void on_new_connection(uv_stream_t *server, int status) {
+    if (status < 0) {
+        fprintf(stderr, "New connection error %s\n", uv_strerror(status));
+        // error!
+        return;
+    }
+
+    uv_tcp_t *client = (uv_tcp_t*) malloc(sizeof(uv_tcp_t));
+    uv_tcp_init(loop, client);
+    if (uv_accept(server, (uv_stream_t*) client) == 0) {
+        uv_read_start((uv_stream_t*) client, alloc_buffer, echo_read);
+    }
+    else {
+        uv_close((uv_handle_t*) client, on_close);
+    }
+}
+
+int main() {
+    loop = uv_default_loop();
+
+    uv_tcp_t server;
+    uv_tcp_init(loop, &server);
+
+    uv_ip4_addr("0.0.0.0", DEFAULT_PORT, &addr);
+
+    uv_tcp_bind(&server, (const struct sockaddr*)&addr, 0);
+    int r = uv_listen((uv_stream_t*) &server, DEFAULT_BACKLOG, on_new_connection);
+    if (r) {
+        fprintf(stderr, "Listen error %s\n", uv_strerror(r));
+        return 1;
+    }
+    return uv_run(loop, UV_RUN_DEFAULT);
+}

benchmarks/cpp/asio/echo_server_client.cpp

@@ -0,0 +1,64 @@
+/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See
+ * accompanying file LICENSE.txt)
+ */
+
+#include <iostream>
+#include <boost/asio.hpp>
+
+namespace net = boost::asio;
+
+using net::ip::tcp;
+using tcp_socket = net::use_awaitable_t<>::as_default_on_t<net::ip::tcp::socket>;
+using timer_type = net::use_awaitable_t<>::as_default_on_t<net::steady_timer>;
+
+net::awaitable<void>
+example(boost::asio::ip::tcp::endpoint ep, std::string msg, int n)
+{
+   try {
+      auto ex = co_await net::this_coro::executor;
+
+      tcp_socket socket{ex};
+      co_await socket.async_connect(ep);
+
+      std::string buffer;
+      auto dbuffer = net::dynamic_buffer(buffer);
+      for (int i = 0; i < n; ++i) {
+         co_await net::async_write(socket, net::buffer(msg));
+         auto n = co_await net::async_read_until(socket, dbuffer, "\n");
+         //std::printf("> %s", buffer.data());
+         dbuffer.consume(n);
+      }
+
+      //std::printf("Ok: %s", msg.data());
+   } catch (std::exception const& e) {
+      std::cerr << "Error: " << e.what() << std::endl;
+   }
+}
+
+int main(int argc, char* argv[])
+{
+   try {
+      int sessions = 1;
+      int msgs = 1;
+
+      if (argc == 3) {
+         sessions = std::stoi(argv[1]);
+         msgs = std::stoi(argv[2]);
+      }
+
+      net::io_context ioc;
+
+      tcp::resolver resv{ioc};
+      auto const res = resv.resolve("127.0.0.1", "55555");
+      auto ep = *std::begin(res);
+
+      for (int i = 0; i < sessions; ++i)
+         net::co_spawn(ioc, example(ep, "Some message\n", msgs), net::detached);
+
+      ioc.run();
+   } catch (std::exception const& e) {
+      std::cerr << e.what() << std::endl;
+   }
+}

benchmarks/cpp/asio/echo_server_direct.cpp

@@ -0,0 +1,58 @@
+//
+// echo_server.cpp
+// ~~~~~~~~~~~~~~~
+//
+// Copyright (c) 2003-2022 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <cstdio>
+#include <boost/asio.hpp>
+
+namespace net = boost::asio;
+namespace this_coro = net::this_coro;
+using net::ip::tcp;
+using net::detached;
+using executor_type = net::io_context::executor_type;
+using socket_type = net::basic_stream_socket<net::ip::tcp, executor_type>;
+using tcp_socket = net::use_awaitable_t<executor_type>::as_default_on_t<socket_type>;
+using acceptor_type = net::basic_socket_acceptor<net::ip::tcp, executor_type>;
+using tcp_acceptor = net::use_awaitable_t<executor_type>::as_default_on_t<acceptor_type>;
+using awaitable_type = net::awaitable<void, executor_type>;
+constexpr net::use_awaitable_t<executor_type> use_awaitable;
+
+awaitable_type echo(tcp_socket socket)
+{
+  try {
+     char data[1024];
+     for (;;) {
+        std::size_t n = co_await socket.async_read_some(net::buffer(data), use_awaitable);
+        co_await async_write(socket, net::buffer(data, n), use_awaitable);
+     }
+  } catch (std::exception const& e) {
+     //std::printf("echo Exception: %s\n", e.what());
+  }
+}
+
+awaitable_type listener()
+{
+  auto ex = co_await this_coro::executor;
+  tcp_acceptor acceptor(ex, {tcp::v4(), 55555});
+  for (;;) {
+     tcp_socket socket = co_await acceptor.async_accept(use_awaitable);
+     co_spawn(ex, echo(std::move(socket)), detached);
+  }
+}
+
+int main()
+{
+  try {
+     net::io_context io_context{BOOST_ASIO_CONCURRENCY_HINT_UNSAFE_IO};
+     co_spawn(io_context, listener(), detached);
+     io_context.run();
+  } catch (std::exception const& e) {
+     std::printf("Exception: %s\n", e.what());
+  }
+}

benchmarks/go/echo_server_direct.go

@@ -0,0 +1,41 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"io"
+	"net"
+	"os"
+)
+
+func echo(conn net.Conn) {
+	r := bufio.NewReader(conn)
+	for {
+		line, err := r.ReadBytes(byte('\n'))
+		switch err {
+		case nil:
+			break
+		case io.EOF:
+		default:
+			fmt.Println("ERROR", err)
+		}
+		conn.Write(line)
+	}
+}
+
+func main() {
+	l, err := net.Listen("tcp", "0.0.0.0:55555")
+	if err != nil {
+		fmt.Println("ERROR", err)
+		os.Exit(1)
+	}
+
+	for {
+		conn, err := l.Accept()
+		if err != nil {
+			fmt.Println("ERROR", err)
+			continue
+		}
+		go echo(conn)
+	}
+}

benchmarks/go/echo_server_over_redis.go

@@ -0,0 +1,54 @@
+package main
+
+import (
+    "context"
+    "github.com/go-redis/redis/v8"
+     "bufio"
+     "fmt"
+     "io"
+     "net"
+     "os"
+)
+
+var ctx = context.Background()
+var rdb = redis.NewClient(&redis.Options{Addr: "db.occase.de:6379", Password: "", DB: 0,})
+
+func echo(conn net.Conn) {
+	r := bufio.NewReader(conn)
+	for {
+		line, err := r.ReadBytes(byte('\n'))
+		switch err {
+		case nil:
+			break
+		case io.EOF:
+		default:
+			fmt.Println("ERROR", err)
+		}
+
+               err2 := rdb.Ping(ctx).Err()
+               if err2 != nil {
+                  fmt.Println("ERROR", err2)
+                  panic(err2)
+               }
+
+	       conn.Write(line)
+	}
+}
+
+func main() {
+	l, err := net.Listen("tcp", "0.0.0.0:55555")
+	if err != nil {
+		fmt.Println("ERROR", err)
+		os.Exit(1)
+	}
+
+	for {
+		conn, err := l.Accept()
+		if err != nil {
+			fmt.Println("ERROR", err)
+			continue
+		}
+
+		go echo(conn)
+	}
+}

benchmarks/java/echo_server_direct/TcpEchoServer.java

@@ -0,0 +1,105 @@
+import java.nio.*;
+import java.nio.channels.*;
+import java.net.*;
+import java.util.*;
+import java.io.IOException;
+
+public class TcpEchoServer {
+
+  public static int DEFAULT_PORT = 55555;
+
+ public static void main(String[] args) {
+int port;
+   try {
+      port = Integer.parseInt(args[0]);
+    }
+
+    catch (Exception ex) {
+      port = DEFAULT_PORT;
+    }
+
+    //System.out.println("Listening for connections on port " + port);
+    ServerSocketChannel serverChannel;
+    Selector selector;
+    try {
+      serverChannel = ServerSocketChannel.open( );
+      ServerSocket ss = serverChannel.socket( );
+      InetSocketAddress address = new InetSocketAddress(port);
+      ss.bind(address);
+      serverChannel.configureBlocking(false);
+      selector = Selector.open( );
+      serverChannel.register(selector, SelectionKey.OP_ACCEPT);
+    }
+    catch (IOException ex) {
+      ex.printStackTrace( );
+      return;
+    }
+   while (true) {
+     try {
+        selector.select( );
+      }
+      catch (IOException ex) {
+        ex.printStackTrace( );
+        break;
+      }
+      Set readyKeys = selector.selectedKeys( );
+      Iterator iterator = readyKeys.iterator( );
+      while (iterator.hasNext( )) {
+       SelectionKey key = (SelectionKey) iterator.next( );
+        iterator.remove( );
+        try {
+          if (key.isAcceptable( )) {
+            ServerSocketChannel server = (ServerSocketChannel ) key.channel( );
+            SocketChannel client = server.accept( );
+            //System.out.println("Accepted connection from " + client);
+            client.configureBlocking(false);
+            SelectionKey clientKey = client.register(
+              selector, SelectionKey.OP_WRITE | SelectionKey.OP_READ);
+            ByteBuffer buffer = ByteBuffer.allocate(100);
+            clientKey.attach(buffer);
+           //System.out.println(buffer.toString());
+
+          }
+
+          if (key.isReadable( )) {
+            SocketChannel client = (SocketChannel) key.channel( );
+            ByteBuffer output = (ByteBuffer) key.attachment( );
+            client.read(output);
+          }
+
+          if (key.isWritable( )) {
+            SocketChannel client = (SocketChannel) key.channel( );
+            ByteBuffer output = (ByteBuffer) key.attachment( );
+            output.flip( );
+            client.write(output);
+            output.compact( );
+
+    }
+
+        }
+
+        catch (IOException ex) {
+          key.cancel( );
+          try {
+            key.channel().close();
+        }
+
+          catch (IOException cex) {}
+
+        }
+
+
+
+      }
+
+
+
+    }
+
+
+
+  }
+
+
+
+}

benchmarks/nodejs/echo_server_direct/echo_server_direct.js

@@ -0,0 +1,7 @@
+var net = require('net');
+
+net.createServer(function(socket){
+    socket.on('data', function(data){
+        socket.write(data.toString())
+    });
+}).listen(55555);

benchmarks/nodejs/echo_server_direct/package.json

@@ -0,0 +1,2 @@
+{
+}

benchmarks/nodejs/echo_server_over_redis/echo_server_over_redis.js

@@ -0,0 +1,13 @@
+import { createClient } from 'redis';
+import * as net from 'net';
+
+const client = createClient({url: 'redis://db.occase.de:6379' });
+client.on('error', (err) => console.log('Redis Client Error', err));
+await client.connect();
+
+net.createServer(function(socket){
+   socket.on('data', async function(data) {
+      const value = await client.ping(data.toString());
+      socket.write(data)
+   });
+}).listen(55555);

benchmarks/nodejs/echo_server_over_redis/package-lock.json

@@ -0,0 +1,169 @@
+{
+   "name": "echo_server_over_redis",
+   "lockfileVersion": 2,
+   "requires": true,
+   "packages": {
+      "": {
+         "dependencies": {
+            "redis": "^4.2.0"
+         }
+      },
+      "node_modules/@redis/bloom": {
+         "version": "1.0.2",
+         "resolved": "https://registry.npmjs.org/@redis/bloom/-/bloom-1.0.2.tgz",
+         "integrity": "sha512-EBw7Ag1hPgFzdznK2PBblc1kdlj5B5Cw3XwI9/oG7tSn85/HKy3X9xHy/8tm/eNXJYHLXHJL/pkwBpFMVVefkw==",
+         "peerDependencies": {
+            "@redis/client": "^1.0.0"
+         }
+      },
+      "node_modules/@redis/client": {
+         "version": "1.2.0",
+         "resolved": "https://registry.npmjs.org/@redis/client/-/client-1.2.0.tgz",
+         "integrity": "sha512-a8Nlw5fv2EIAFJxTDSSDVUT7yfBGpZO96ybZXzQpgkyLg/dxtQ1uiwTc0EGfzg1mrPjZokeBSEGTbGXekqTNOg==",
+         "dependencies": {
+            "cluster-key-slot": "1.1.0",
+            "generic-pool": "3.8.2",
+            "yallist": "4.0.0"
+         },
+         "engines": {
+            "node": ">=14"
+         }
+      },
+      "node_modules/@redis/graph": {
+         "version": "1.0.1",
+         "resolved": "https://registry.npmjs.org/@redis/graph/-/graph-1.0.1.tgz",
+         "integrity": "sha512-oDE4myMCJOCVKYMygEMWuriBgqlS5FqdWerikMoJxzmmTUErnTRRgmIDa2VcgytACZMFqpAOWDzops4DOlnkfQ==",
+         "peerDependencies": {
+            "@redis/client": "^1.0.0"
+         }
+      },
+      "node_modules/@redis/json": {
+         "version": "1.0.3",
+         "resolved": "https://registry.npmjs.org/@redis/json/-/json-1.0.3.tgz",
+         "integrity": "sha512-4X0Qv0BzD9Zlb0edkUoau5c1bInWSICqXAGrpwEltkncUwcxJIGEcVryZhLgb0p/3PkKaLIWkjhHRtLe9yiA7Q==",
+         "peerDependencies": {
+            "@redis/client": "^1.0.0"
+         }
+      },
+      "node_modules/@redis/search": {
+         "version": "1.0.6",
+         "resolved": "https://registry.npmjs.org/@redis/search/-/search-1.0.6.tgz",
+         "integrity": "sha512-pP+ZQRis5P21SD6fjyCeLcQdps+LuTzp2wdUbzxEmNhleighDDTD5ck8+cYof+WLec4csZX7ks+BuoMw0RaZrA==",
+         "peerDependencies": {
+            "@redis/client": "^1.0.0"
+         }
+      },
+      "node_modules/@redis/time-series": {
+         "version": "1.0.3",
+         "resolved": "https://registry.npmjs.org/@redis/time-series/-/time-series-1.0.3.tgz",
+         "integrity": "sha512-OFp0q4SGrTH0Mruf6oFsHGea58u8vS/iI5+NpYdicaM+7BgqBZH8FFvNZ8rYYLrUO/QRqMq72NpXmxLVNcdmjA==",
+         "peerDependencies": {
+            "@redis/client": "^1.0.0"
+         }
+      },
+      "node_modules/cluster-key-slot": {
+         "version": "1.1.0",
+         "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz",
+         "integrity": "sha512-2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw==",
+         "engines": {
+            "node": ">=0.10.0"
+         }
+      },
+      "node_modules/generic-pool": {
+         "version": "3.8.2",
+         "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.8.2.tgz",
+         "integrity": "sha512-nGToKy6p3PAbYQ7p1UlWl6vSPwfwU6TMSWK7TTu+WUY4ZjyZQGniGGt2oNVvyNSpyZYSB43zMXVLcBm08MTMkg==",
+         "engines": {
+            "node": ">= 4"
+         }
+      },
+      "node_modules/redis": {
+         "version": "4.2.0",
+         "resolved": "https://registry.npmjs.org/redis/-/redis-4.2.0.tgz",
+         "integrity": "sha512-bCR0gKVhIXFg8zCQjXEANzgI01DDixtPZgIUZHBCmwqixnu+MK3Tb2yqGjh+HCLASQVVgApiwhNkv+FoedZOGQ==",
+         "dependencies": {
+            "@redis/bloom": "1.0.2",
+            "@redis/client": "1.2.0",
+            "@redis/graph": "1.0.1",
+            "@redis/json": "1.0.3",
+            "@redis/search": "1.0.6",
+            "@redis/time-series": "1.0.3"
+         }
+      },
+      "node_modules/yallist": {
+         "version": "4.0.0",
+         "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+         "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+      }
+   },
+   "dependencies": {
+      "@redis/bloom": {
+         "version": "1.0.2",
+         "resolved": "https://registry.npmjs.org/@redis/bloom/-/bloom-1.0.2.tgz",
+         "integrity": "sha512-EBw7Ag1hPgFzdznK2PBblc1kdlj5B5Cw3XwI9/oG7tSn85/HKy3X9xHy/8tm/eNXJYHLXHJL/pkwBpFMVVefkw==",
+         "requires": {}
+      },
+      "@redis/client": {
+         "version": "1.2.0",
+         "resolved": "https://registry.npmjs.org/@redis/client/-/client-1.2.0.tgz",
+         "integrity": "sha512-a8Nlw5fv2EIAFJxTDSSDVUT7yfBGpZO96ybZXzQpgkyLg/dxtQ1uiwTc0EGfzg1mrPjZokeBSEGTbGXekqTNOg==",
+         "requires": {
+            "cluster-key-slot": "1.1.0",
+            "generic-pool": "3.8.2",
+            "yallist": "4.0.0"
+         }
+      },
+      "@redis/graph": {
+         "version": "1.0.1",
+         "resolved": "https://registry.npmjs.org/@redis/graph/-/graph-1.0.1.tgz",
+         "integrity": "sha512-oDE4myMCJOCVKYMygEMWuriBgqlS5FqdWerikMoJxzmmTUErnTRRgmIDa2VcgytACZMFqpAOWDzops4DOlnkfQ==",
+         "requires": {}
+      },
+      "@redis/json": {
+         "version": "1.0.3",
+         "resolved": "https://registry.npmjs.org/@redis/json/-/json-1.0.3.tgz",
+         "integrity": "sha512-4X0Qv0BzD9Zlb0edkUoau5c1bInWSICqXAGrpwEltkncUwcxJIGEcVryZhLgb0p/3PkKaLIWkjhHRtLe9yiA7Q==",
+         "requires": {}
+      },
+      "@redis/search": {
+         "version": "1.0.6",
+         "resolved": "https://registry.npmjs.org/@redis/search/-/search-1.0.6.tgz",
+         "integrity": "sha512-pP+ZQRis5P21SD6fjyCeLcQdps+LuTzp2wdUbzxEmNhleighDDTD5ck8+cYof+WLec4csZX7ks+BuoMw0RaZrA==",
+         "requires": {}
+      },
+      "@redis/time-series": {
+         "version": "1.0.3",
+         "resolved": "https://registry.npmjs.org/@redis/time-series/-/time-series-1.0.3.tgz",
+         "integrity": "sha512-OFp0q4SGrTH0Mruf6oFsHGea58u8vS/iI5+NpYdicaM+7BgqBZH8FFvNZ8rYYLrUO/QRqMq72NpXmxLVNcdmjA==",
+         "requires": {}
+      },
+      "cluster-key-slot": {
+         "version": "1.1.0",
+         "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz",
+         "integrity": "sha512-2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw=="
+      },
+      "generic-pool": {
+         "version": "3.8.2",
+         "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.8.2.tgz",
+         "integrity": "sha512-nGToKy6p3PAbYQ7p1UlWl6vSPwfwU6TMSWK7TTu+WUY4ZjyZQGniGGt2oNVvyNSpyZYSB43zMXVLcBm08MTMkg=="
+      },
+      "redis": {
+         "version": "4.2.0",
+         "resolved": "https://registry.npmjs.org/redis/-/redis-4.2.0.tgz",
+         "integrity": "sha512-bCR0gKVhIXFg8zCQjXEANzgI01DDixtPZgIUZHBCmwqixnu+MK3Tb2yqGjh+HCLASQVVgApiwhNkv+FoedZOGQ==",
+         "requires": {
+            "@redis/bloom": "1.0.2",
+            "@redis/client": "1.2.0",
+            "@redis/graph": "1.0.1",
+            "@redis/json": "1.0.3",
+            "@redis/search": "1.0.6",
+            "@redis/time-series": "1.0.3"
+         }
+      },
+      "yallist": {
+         "version": "4.0.0",
+         "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+         "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+      }
+   }
+}

benchmarks/nodejs/echo_server_over_redis/package.json

@@ -0,0 +1,6 @@
+{
+   "type": "module",
+   "dependencies": {
+      "redis": "^4.2.0"
+   }
+}

benchmarks/rust/echo_server_direct/Cargo.lock

@@ -0,0 +1,309 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bytes"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "echo_server_direct"
+version = "0.1.0"
+dependencies = [
+ "tokio",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.126"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
+
+[[package]]
+name = "lock_api"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "memchr"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+
+[[package]]
+name = "mio"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
+dependencies = [
+ "libc",
+ "log",
+ "wasi",
+ "windows-sys",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-sys",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f53dc8cf16a769a6f677e09e7ff2cd4be1ea0f48754aac39520536962011de0d"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1"
+
+[[package]]
+name = "socket2"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.98"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tokio"
+version = "1.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57aec3cfa4c296db7255446efb4928a6be304b431a806216105542a67b6ca82e"
+dependencies = [
+ "autocfg",
+ "bytes",
+ "libc",
+ "memchr",
+ "mio",
+ "num_cpus",
+ "once_cell",
+ "parking_lot",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "winapi",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+dependencies = [
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"

benchmarks/rust/echo_server_direct/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "echo_server_direct"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+tokio = { version = "1.0", features = ["full"] }

benchmarks/rust/echo_server_direct/src/main.rs

@@ -0,0 +1,35 @@
+use tokio::net::TcpListener;
+use tokio::io::AsyncReadExt;
+use tokio::io::AsyncWriteExt;
+
+#[tokio::main(flavor = "current_thread")]
+async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    let listener = TcpListener::bind("127.0.0.1:55555").await?;
+
+    loop {
+        let (mut socket, _) = listener.accept().await?;
+
+        tokio::spawn(async move {
+            let mut buf = [0; 1024];
+
+            // In a loop, read data from the socket and write the data back.
+            loop {
+                let n = match socket.read(&mut buf).await {
+                    // socket closed
+                    Ok(n) if n == 0 => return,
+                    Ok(n) => n,
+                    Err(e) => {
+                        eprintln!("failed to read from socket; err = {:?}", e);
+                        return;
+                    }
+                };
+
+                // Write the data back
+                if let Err(e) = socket.write_all(&buf[0..n]).await {
+                    eprintln!("failed to write to socket; err = {:?}", e);
+                    return;
+                }
+            }
+        });
+    }
+}

benchmarks/rust/echo_server_over_redis/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "echo_server_over_redis"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+tokio = { version = "1.16.1", features = ["full"] }
+redis = { version = "0.21.5", features = ["tokio-comp"] }
+futures = "0.3"

benchmarks/rust/echo_server_over_redis/src/main.rs

@@ -0,0 +1,44 @@
+use tokio::net::TcpListener;
+use tokio::io::AsyncReadExt;
+use tokio::io::AsyncWriteExt;
+use tokio::sync::Mutex;
+use std::sync::{Arc};
+
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn std::error::Error>> {
+    let listener = TcpListener::bind("127.0.0.1:55555").await?;
+    let client = redis::Client::open("redis://db.occase.de/").unwrap();
+    let con = Arc::new(Mutex::new(client.get_async_connection().await?));
+
+    loop {
+        let conn = Arc::clone(&con);
+        let (mut socket, _) = listener.accept().await?;
+
+        tokio::spawn(async move {
+            let mut buf = [0; 1024];
+
+            loop {
+                let n = match socket.read(&mut buf).await {
+                    Ok(n) if n == 0 => return,
+                    Ok(n) => n,
+                    Err(e) => {
+                        eprintln!("failed to read from socket; err = {:?}", e);
+                        return;
+                    }
+                };
+
+                let mut local_conn = conn.lock().await;
+
+                let result =
+                    redis::cmd("PING")
+                    .arg(&buf[0..n])
+                    .query_async::<redis::aio::Connection, String>(&mut local_conn).await.unwrap();
+
+                if let Err(e) = socket.write_all(result.as_bytes()).await {
+                    eprintln!("failed to write to socket; err = {:?}", e);
+                    return;
+                }
+            }
+        });
+    }
+}

configure.ac

@@ -1,9 +1,10 @@
 AC_PREREQ([2.69])
-AC_INIT([Aedis], [0.1.2], [mzimbres@gmail.com])
+AC_INIT([Aedis], [0.3.0], [mzimbres@gmail.com])
 AC_CONFIG_MACRO_DIR([m4])
-#AC_CONFIG_SRCDIR([src/aedis.cpp])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_SRCDIR(include/aedis.hpp)
 AM_INIT_AUTOMAKE([-Wall foreign])
+AC_LANG(C++)
 
 # Checks for programs.
 AC_PROG_CXX
@@ -18,10 +19,36 @@ AC_CHECK_HEADER_STDBOOL
 AC_TYPE_UINT64_T
 AC_CHECK_TYPES([ptrdiff_t])
 
-AX_CXX_COMPILE_STDCXX(14, , mandatory)
+AX_CXX_COMPILE_STDCXX(17, , mandatory)
 AX_CXX_COMPILE_STDCXX(20, , optional)
-
 AM_CONDITIONAL(HAVE_CXX20,[test x$HAVE_CXX20 == x1])
 
-AC_CONFIG_FILES([Makefile doc/Doxyfile])
+# This check has been stolen from Asio
+AC_MSG_CHECKING([whether coroutines are enabled])
+AC_COMPILE_IFELSE(
+  [AC_LANG_PROGRAM(
+    [[#if defined(__clang__)]]
+    [[# if (__cplusplus >= 201703) && (__cpp_coroutines >= 201703)]]
+    [[#  if __has_include(<experimental/coroutine>)]]
+    [[#   define AEDIS_HAS_CO_AWAIT 1]]
+    [[#  endif]]
+    [[# endif]]
+    [[#elif defined(__GNUC__)]]
+    [[# if (__cplusplus >= 201709) && (__cpp_impl_coroutine >= 201902)]]
+    [[#  if __has_include(<coroutine>)]]
+    [[#   define AEDIS_HAS_CO_AWAIT 1]]
+    [[#  endif]]
+    [[# endif]]
+    [[#endif]]
+    [[#ifndef AEDIS_HAS_CO_AWAIT]]
+    [[# error coroutines not available]]
+    [[#endif]])],
+  [AC_MSG_RESULT([yes])
+    HAVE_COROUTINES=yes;],
+  [AC_MSG_RESULT([no])
+    HAVE_COROUTINES=no;])
+
+AM_CONDITIONAL(HAVE_COROUTINES,test x$HAVE_COROUTINES = xyes)
+
+AC_CONFIG_FILES([Makefile include/Makefile doc/Doxyfile])
 AC_OUTPUT

doc/Doxyfile.in

@@ -44,7 +44,7 @@ PROJECT_NUMBER         = "@PACKAGE_VERSION@"
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = "Low level Redis client library"
+PROJECT_BRIEF          = "High level Redis client"
 
 # With the PROJECT_LOGO tag one can specify a logo or an icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55
@@ -823,7 +823,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = aedis examples
+INPUT                  = include benchmarks/benchmarks.md CHANGELOG.md examples
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

doc/aedis.css

@@ -26,5 +26,5 @@ div.contents {
 
 code
 {
-    background-color:#f0e9ce;
+    background-color:#fffbeb;
 }

examples/aggregates_high_level.cpp

@@ -1,132 +0,0 @@
-/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
- *
- * Distributed under the Boost Software License, Version 1.0. (See
- * accompanying file LICENSE.txt)
- */
-
-#include <map>
-#include <set>
-#include <vector>
-#include <iostream>
-
-#include <aedis/aedis.hpp>
-#include <aedis/src.hpp>
-
-#include "print.hpp"
-
-namespace net = boost::asio;
-using aedis::resp3::node;
-using aedis::adapter::adapt;
-using aedis::adapter::adapter_t;
-using aedis::redis::command;
-using aedis::generic::client;
-
-using client_type = client<net::ip::tcp::socket, command>;
-
-// Response types we use in this example.
-using T0 = std::vector<node<std::string>>;
-using T1 = std::set<std::string>;
-using T2 = std::map<std::string, std::string>;
-
-// Some containers we will store in Redis as example.
-std::vector<int> vec
-   {1, 2, 3, 4, 5, 6};
-
-std::set<std::string> set
-   {"one", "two", "three", "four"};
-
-std::map<std::string, std::string> map
-   { {"key1", "value1"}
-   , {"key2", "value2"}
-   , {"key3", "value3"}
-   };
-
-struct receiver {
-public:
-   receiver(client_type& db)
-   : adapter0_{adapt(resp0_)}
-   , adapter1_{adapt(resp1_)}
-   , adapter2_{adapt(resp2_)}
-   , db_{&db} {}
-
-   void on_resp3(command cmd, node<boost::string_view> const& nd, boost::system::error_code& ec)
-   {
-      switch (cmd) {
-         case command::lrange:   adapter0_(nd, ec); break;
-         case command::smembers: adapter1_(nd, ec); break;
-         case command::hgetall: adapter2_(nd, ec); break;
-         default:;
-      }
-   }
-
-   void on_read(command cmd, std::size_t n)
-   {
-      std::cout << "on_read: " << cmd << ", " << n << "\n";
-
-      switch (cmd) {
-         case command::hello:
-         {
-            db_->send_range(command::rpush, "rpush-key", vec);
-            db_->send_range(command::sadd, "sadd-key", set);
-            db_->send_range(command::hset, "hset-key", map);
-         } break;
-
-         case command::rpush:
-         db_->send(command::lrange, "rpush-key", 0, -1);
-         break;
-
-         case command::sadd:
-         db_->send(command::smembers, "sadd-key");
-         break;
-
-         case command::hset:
-         db_->send(command::hgetall, "hset-key");
-         db_->send(command::quit);
-         break;
-
-         case command::lrange:
-         print_and_clear_aggregate(resp0_);
-         break;
-
-         case command::smembers:
-         print_and_clear(resp1_);
-         break;
-
-         case command::hgetall:
-         print_and_clear(resp2_);
-         break;
-
-         default:;
-      }
-   }
-
-   void on_write(std::size_t n)
-   { 
-      std::cout << "on_write: " << n << std::endl;
-   }
-
-   void on_push(std::size_t n) { }
-
-private:
-   T0 resp0_;
-   T1 resp1_;
-   T2 resp2_;
-   adapter_t<T0> adapter0_;
-   adapter_t<T1> adapter1_;
-   adapter_t<T2> adapter2_;
-   client_type* db_;
-};
-
-int main()
-{
-   net::io_context ioc;
-   client_type db{ioc.get_executor()};
-
-   auto recv = std::make_shared<receiver>(db);
-   db.set_receiver(recv);
-
-   db.async_run("127.0.0.1", "6379",
-      [](auto ec){ std::cout << ec.message() << std::endl;});
-
-   ioc.run();
-}

examples/chat_room.cpp

@@ -4,97 +4,64 @@
  * accompanying file LICENSE.txt)
  */
 
-#include <vector>
+#include <string>
 #include <iostream>
+#include <boost/asio.hpp>
+#include <aedis.hpp>
+#include "unistd.h"
+#include "print.hpp"
 
-#include <boost/asio/signal_set.hpp>
-
-#include <aedis/aedis.hpp>
+// Include this in no more than one .cpp file.
 #include <aedis/src.hpp>
 
-#include "user_session.hpp"
+#if defined(BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR)
 
 namespace net = boost::asio;
-using aedis::resp3::node;
-using aedis::adapter::adapt;
-using aedis::adapter::adapter_t;
-using aedis::redis::command;
-using aedis::generic::client;
-using aedis::user_session;
-using aedis::user_session_base;
+using aedis::resp3::request;
+using tcp_socket = net::use_awaitable_t<>::as_default_on_t<net::ip::tcp::socket>;
+using tcp_acceptor = net::use_awaitable_t<>::as_default_on_t<net::ip::tcp::acceptor>;
+using connection = aedis::connection<tcp_socket>;
+using response_type = std::vector<aedis::resp3::node<std::string>>;
 
-using client_type = client<net::ip::tcp::socket, command>;
-using response_type = std::vector<node<std::string>>;
+// Chat over redis pubsub. To test, run this program from different
+// terminals and type messages to stdin. You may also want to run
+//
+//    $ redis-cli
+//    > monitor
+//
+// To see the message traffic.
 
-class receiver {
-public:
-   receiver(std::shared_ptr<client_type> db)
-   : adapter_{adapt(resp_)}
-   , db_{db}
-   {}
+net::awaitable<void> subscriber(std::shared_ptr<connection> db)
+{
+   request req;
+   req.push("SUBSCRIBE", "chat-channel");
 
-   void on_resp3(command cmd, node<boost::string_view> const& nd, boost::system::error_code& ec)
-   {
-      adapter_(nd, ec);
-   }
-
-   void on_read(command cmd, std::size_t)
-   {
-      switch (cmd) {
-         case command::hello:
-         db_->send(command::subscribe, "channel");
+   for (response_type resp;;) {
+      auto const ev = co_await db->async_receive_event(aedis::adapt(resp));
+      switch (ev) {
+         case connection::event::push:
+         print_push(resp);
          break;
 
-         case command::incr:
-         std::cout << "Messages so far: " << resp_.front().value << std::endl;
+         case connection::event::hello:
+         co_await db->async_exec(req);
          break;
 
          default:;
       }
-
-      resp_.clear();
+      resp.clear();
    }
-
-   void on_write(std::size_t n)
-   { 
-      std::cout << "Number of bytes written: " << n << std::endl;
-   }
-
-   void on_push(std::size_t)
-   {
-      for (auto& session: sessions_)
-         session->deliver(resp_.at(3).value);
-
-      resp_.clear();
-   }
-
-   auto add(std::shared_ptr<user_session_base> session)
-      { sessions_.push_back(session); }
-
-private:
-   response_type resp_;
-   adapter_t<response_type> adapter_;
-   std::shared_ptr<client_type> db_;
-   std::vector<std::shared_ptr<user_session_base>> sessions_;
-};
+}
 
 net::awaitable<void>
-listener(
-    std::shared_ptr<net::ip::tcp::acceptor> acc,
-    std::shared_ptr<client_type> db,
-    std::shared_ptr<receiver> recv)
+publisher(net::posix::stream_descriptor& in, std::shared_ptr<connection> db)
 {
-   auto on_user_msg = [db](std::string const& msg)
-   {
-      db->send(command::publish, "channel", msg);
-      db->send(command::incr, "message-counter");
-   };
-
-   for (;;) {
-      auto socket = co_await acc->async_accept(net::use_awaitable);
-      auto session = std::make_shared<user_session>(std::move(socket));
-      session->start(on_user_msg);
-      recv->add(session);
+   for (std::string msg;;) {
+      std::size_t n = co_await net::async_read_until(in, net::dynamic_buffer(msg, 1024), "\n", net::use_awaitable);
+      request req;
+      req.push("PUBLISH", "chat-channel", msg);
+      co_await db->async_exec(req);
+      msg.erase(0, n);
    }
 }
 
@@ -102,23 +69,26 @@ int main()
 {
    try {
       net::io_context ioc{1};
+      net::posix::stream_descriptor in{ioc, ::dup(STDIN_FILENO)};
 
-      auto db = std::make_shared<client_type>(ioc.get_executor());
-      auto recv = std::make_shared<receiver>(db);
-      db->set_receiver(recv);
+      auto db = std::make_shared<connection>(ioc);
+      db->get_config().enable_events = true;
 
-      db->async_run("127.0.0.1", "6379",
-          [](auto ec){ std::cout << ec.message() << std::endl;});
+      co_spawn(ioc, publisher(in, db), net::detached);
+      co_spawn(ioc, subscriber(db), net::detached);
+      db->async_run([](auto ec) {
+         std::cout << ec.message() << std::endl;
+      });
 
-      auto endpoint = net::ip::tcp::endpoint{net::ip::tcp::v4(), 55555};
-      auto acc = std::make_shared<net::ip::tcp::acceptor>(ioc.get_executor(), endpoint);
-      co_spawn(ioc, listener(acc, db, recv), net::detached);
-
-      net::signal_set signals(ioc.get_executor(), SIGINT, SIGTERM);
-      signals.async_wait([&] (auto, int) { ioc.stop(); });
+      net::signal_set signals(ioc, SIGINT, SIGTERM);
+      signals.async_wait([&](auto, auto){ ioc.stop(); });
 
       ioc.run();
    } catch (std::exception const& e) {
       std::cerr << e.what() << std::endl;
    }
 }
+
+#else // defined(BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR)
+int main() {}
+#endif // defined(BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR)

examples/containers.cpp

@@ -0,0 +1,58 @@
+/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See
+ * accompanying file LICENSE.txt)
+ */
+
+#include <map>
+#include <vector>
+#include <iostream>
+#include <aedis.hpp>
+#include "print.hpp"
+
+// Include this in no more than one .cpp file.
+#include <aedis/src.hpp>
+
+namespace net = boost::asio;
+using boost::optional;
+using aedis::adapt;
+using aedis::resp3::request;
+using connection = aedis::connection<>;
+
+int main()
+{
+   std::vector<int> vec
+      {1, 2, 3, 4, 5, 6};
+
+   std::map<std::string, int> map
+      {{"key1", 10}, {"key2", 20}, {"key3", 30}};
+
+   request req;
+   req.push_range("RPUSH", "rpush-key", vec);
+   req.push_range("HSET", "hset-key", map);
+   req.push("MULTI");
+   req.push("LRANGE", "rpush-key", 0, -1);
+   req.push("HGETALL", "hset-key");
+   req.push("EXEC");
+   req.push("QUIT");
+
+   std::tuple<
+      aedis::ignore, // rpush
+      aedis::ignore, // hset
+      aedis::ignore, // multi
+      aedis::ignore, // lrange
+      aedis::ignore, // hgetall
+      std::tuple<optional<std::vector<int>>, optional<std::map<std::string, int>>>, // exec
+      aedis::ignore  // quit
+   > resp;
+
+   net::io_context ioc;
+   connection db{ioc};
+   db.async_run(req, aedis::adapt(resp), [](auto ec, auto) {
+      std::cout << ec.message() << std::endl;
+   });
+   ioc.run();
+
+   print(std::get<0>(std::get<5>(resp)).value());
+   print(std::get<1>(std::get<5>(resp)).value());
+}

examples/custom_adapter.cpp

@@ -1,63 +0,0 @@
-/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
- *
- * Distributed under the Boost Software License, Version 1.0. (See
- * accompanying file LICENSE.txt)
- */
-
-#include <iostream>
-
-#include <boost/asio/use_awaitable.hpp>
-#include <boost/asio/detached.hpp>
-#include <boost/asio/co_spawn.hpp>
-
-#include <aedis/aedis.hpp>
-#include <aedis/src.hpp>
-
-namespace net = boost::asio;
-namespace resp3 = aedis::resp3;
-
-using aedis::resp3::node;
-using aedis::redis::command;
-using aedis::generic::make_serializer;
-using net::ip::tcp;
-using tcp_socket = net::use_awaitable_t<>::as_default_on_t<net::ip::tcp::socket>;
-
-net::awaitable<void> example()
-{
-   auto ex = co_await net::this_coro::executor;
-
-   tcp::resolver resv{ex};
-   auto const res = resv.resolve("127.0.0.1", "6379");
-   tcp_socket socket{ex};
-   co_await socket.async_connect(*std::begin(res));
-
-   std::string request, buffer;
-
-   auto sr = make_serializer(request);
-   sr.push(command::hello, 3);
-   sr.push(command::ping, "Some message.");
-   sr.push(command::quit);
-   co_await net::async_write(socket, net::buffer(request));
-
-   auto adapter = [](node<boost::string_view> const& nd, boost::system::error_code&)
-   {
-      std::cout << nd << std::endl;
-   };
-
-   auto dbuffer = net::dynamic_buffer(buffer);
-   co_await resp3::async_read(socket, dbuffer); // hello
-   co_await resp3::async_read(socket, dbuffer, adapter);
-   co_await resp3::async_read(socket, dbuffer); // quit
-}
-
-int main()
-{
-   try {
-      net::io_context ioc;
-      net::co_spawn(ioc, example(), net::detached);
-      ioc.run();
-   } catch (std::exception const& e) {
-      std::cerr << e.what() << std::endl;
-   }
-}
-

examples/echo_server.cpp

@@ -4,136 +4,62 @@
  * accompanying file LICENSE.txt)
  */
 
-#include <iostream>
-#include <queue>
-#include <vector>
 #include <string>
+#include <iostream>
+#include <boost/asio.hpp>
+#include <aedis.hpp>
 
-#include <boost/asio/signal_set.hpp>
-
-#include <aedis/aedis.hpp>
+// Include this in no more than one .cpp file.
 #include <aedis/src.hpp>
 
-#include "user_session.hpp"
-
 namespace net = boost::asio;
-using aedis::resp3::node;
-using aedis::adapter::adapt;
-using aedis::adapter::adapter_t;
-using aedis::redis::command;
-using aedis::generic::client;
-using aedis::user_session;
-using aedis::user_session_base;
-using client_type = client<net::ip::tcp::socket, command>;
-using response_type = std::vector<node<std::string>>;
+using aedis::adapt;
+using aedis::resp3::request;
+using executor_type = net::io_context::executor_type;
+using socket_type = net::basic_stream_socket<net::ip::tcp, executor_type>;
+using tcp_socket = net::use_awaitable_t<executor_type>::as_default_on_t<socket_type>;
+using acceptor_type = net::basic_socket_acceptor<net::ip::tcp, executor_type>;
+using tcp_acceptor = net::use_awaitable_t<executor_type>::as_default_on_t<acceptor_type>;
+using awaitable_type = net::awaitable<void, executor_type>;
+using connection = aedis::connection<tcp_socket>;
 
-class receiver {
-public:
-   receiver(std::shared_ptr<client_type> db)
-   : adapter_{adapt(resp_)}
-   , db_{db}
-   {}
-
-   void on_resp3(command cmd, node<boost::string_view> const& nd, boost::system::error_code& ec)
-   {
-      adapter_(nd, ec);
-   }
-
-   void on_read(command cmd, std::size_t n)
-   {
-      std::cout << "on_read: " << cmd << " " << n << std::endl;
-
-      switch (cmd) {
-         case command::ping:
-         if (resp_.front().value != "PONG") {
-            sessions_.front()->deliver(resp_.front().value);
-            sessions_.pop();
-         }
-         break;
-
-         case command::incr:
-         std::cout << "Echos so far: " << resp_.front().value << std::endl;
-         break;
-
-         default: /* Ignore */;
-      }
-
-      resp_.clear();
-   }
-
-   void on_write(std::size_t n)
-   { 
-      std::cout << "Number of bytes written: " << n << std::endl;
-   }
-
-   void on_push(std::size_t n) { }
-
-   void add_user_session(std::shared_ptr<user_session_base> session)
-      { sessions_.push(session); }
-
-private:
-   response_type resp_;
-   adapter_t<response_type> adapter_;
-   std::shared_ptr<client_type> db_;
-   std::queue<std::shared_ptr<user_session_base>> sessions_;
-};
-
-net::awaitable<void>
-run_with_reconnect(std::shared_ptr<client_type> db)
+awaitable_type echo_loop(tcp_socket socket, std::shared_ptr<connection> db)
 {
-   auto ex = co_await net::this_coro::executor;
+   try {
+      request req;
+      std::tuple<std::string> resp;
+      std::string buffer;
 
-   boost::asio::steady_timer timer{ex};
-
-   for (boost::system::error_code ec;;) {
-      co_await db->async_run("127.0.0.1", "6379",
-            net::redirect_error(net::use_awaitable, ec));
-
-      timer.expires_after(std::chrono::seconds{2});
-      co_await timer.async_wait(net::redirect_error(net::use_awaitable, ec));
+      for (;;) {
+         auto n = co_await net::async_read_until(socket, net::dynamic_buffer(buffer, 1024), "\n");
+         req.push("PING", buffer);
+         co_await db->async_exec(req, adapt(resp));
+         co_await net::async_write(socket, net::buffer(std::get<0>(resp)));
+         std::get<0>(resp).clear();
+         req.clear();
+         buffer.erase(0, n);
+      }
+   } catch (std::exception const& e) {
+      std::cout << e.what() << std::endl;
    }
 }
 
-net::awaitable<void>
-listener(
-    std::shared_ptr<net::ip::tcp::acceptor> acc,
-    std::shared_ptr<client_type> db,
-    std::shared_ptr<receiver> recv)
+awaitable_type listener()
 {
-   for (;;) {
-      auto socket = co_await acc->async_accept(net::use_awaitable);
-      auto session = std::make_shared<user_session>(std::move(socket));
+   auto ex = co_await net::this_coro::executor;
+   auto db = std::make_shared<connection>(ex);
+   db->async_run(net::detached);
 
-      auto on_user_msg = [db, recv, session](std::string const& msg)
-      {
-         if (!msg.empty()) {
-            db->send(command::ping, msg);
-            db->send(command::incr, "echo-counter");
-            recv->add_user_session(session);
-         }
-      };
-
-      session->start(on_user_msg);
-   }
+   tcp_acceptor acc(ex, {net::ip::tcp::v4(), 55555});
+   for (;;)
+      net::co_spawn(ex, echo_loop(co_await acc.async_accept(), db), net::detached);
 }
 
 int main()
 {
    try {
-      net::io_context ioc;
-
-      auto db = std::make_shared<client_type>(ioc.get_executor());
-      auto recv = std::make_shared<receiver>(db);
-      db->set_receiver(recv);
-      co_spawn(ioc, run_with_reconnect(db), net::detached);
-
-      auto endpoint = net::ip::tcp::endpoint{net::ip::tcp::v4(), 55555};
-      auto acc = std::make_shared<net::ip::tcp::acceptor>(ioc.get_executor(), endpoint);
-      co_spawn(ioc, listener(acc, db, recv), net::detached);
-
-      net::signal_set signals(ioc.get_executor(), SIGINT, SIGTERM);
-      signals.async_wait([&] (auto, int) { ioc.stop(); });
-
+      net::io_context ioc{BOOST_ASIO_CONCURRENCY_HINT_UNSAFE_IO};
+      co_spawn(ioc, listener(), net::detached);
       ioc.run();
    } catch (std::exception const& e) {
       std::cerr << e.what() << std::endl;

examples/intro.cpp

@@ -0,0 +1,38 @@
+/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See
+ * accompanying file LICENSE.txt)
+ */
+
+#include <tuple>
+#include <string>
+#include <boost/asio.hpp>
+#include <aedis.hpp>
+
+// Include this in no more than one .cpp file.
+#include <aedis/src.hpp>
+
+namespace net = boost::asio;
+
+using aedis::adapt;
+using aedis::resp3::request;
+using connection = aedis::connection<>;
+
+int main()
+{
+   net::io_context ioc;
+   connection db{ioc};
+
+   request req;
+   req.push("PING");
+   req.push("QUIT");
+
+   std::tuple<std::string, aedis::ignore> resp;
+   db.async_run(req, adapt(resp), [](auto ec, auto) {
+      std::cout << ec.message() << std::endl;
+   });
+
+   ioc.run();
+
+   std::cout << std::get<0>(resp) << std::endl;
+}

examples/intro_high_level.cpp

@@ -1,76 +0,0 @@
-/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
- *
- * Distributed under the Boost Software License, Version 1.0. (See
- * accompanying file LICENSE.txt)
- */
-
-#include <string>
-#include <iostream>
-
-#include <aedis/aedis.hpp>
-#include <aedis/src.hpp>
-
-namespace net = boost::asio;
-using aedis::resp3::node;
-using aedis::adapter::adapter_t;
-using aedis::adapter::adapt;
-using aedis::redis::command;
-using aedis::generic::client;
-
-using client_type = client<net::ip::tcp::socket, command>;
-using response_type = node<std::string>;
-
-struct receiver {
-public:
-   receiver(client_type& db)
-   : adapter_{adapt(resp_)}
-   , db_{&db} {}
-
-   void on_resp3(command cmd, node<boost::string_view> const& nd, boost::system::error_code& ec)
-   {
-      adapter_(nd, ec);
-   }
-
-   void on_read(command cmd, std::size_t)
-   {
-      switch (cmd) {
-         case command::hello:
-         db_->send(command::ping, "O rato roeu a roupa do rei de Roma");
-         db_->send(command::incr, "intro-counter");
-         db_->send(command::set, "intro-key", "Três pratos de trigo para três tigres");
-         db_->send(command::get, "intro-key");
-         db_->send(command::quit);
-         break;
-
-         default:
-         std::cout << resp_.value << std::endl;
-      }
-   }
-
-   void on_write(std::size_t n)
-   { 
-      std::cout << "Number of bytes written: " << n << std::endl;
-   }
-
-   void on_push(std::size_t n) { }
-
-private:
-   response_type resp_;
-   adapter_t<response_type> adapter_;
-   client_type* db_;
-};
-
-int main()
-{
-   net::io_context ioc;
-
-   client_type db(ioc.get_executor());
-   auto recv = std::make_shared<receiver>(db);
-   db.set_receiver(recv);
-
-   db.async_run("127.0.0.1", "6379",
-      [](auto ec){ std::cout << ec.message() << std::endl;});
-
-   ioc.run();
-}
-

examples/intro_sync.cpp

@@ -4,54 +4,42 @@
  * accompanying file LICENSE.txt)
  */
 
+#include <tuple>
 #include <string>
-#include <iostream>
+#include <boost/asio.hpp>
+#include <aedis.hpp>
+#include <aedis/experimental/sync.hpp>
 
-#include <boost/asio/connect.hpp>
-
-#include <aedis/aedis.hpp>
+// Include this in no more than one .cpp file.
 #include <aedis/src.hpp>
 
 namespace net = boost::asio;
-namespace resp3 = aedis::resp3;
-
-using aedis::redis::command;
-using aedis::generic::make_serializer;
-using aedis::adapter::adapt;
-using net::dynamic_buffer;
-using net::ip::tcp;
+using aedis::adapt;
+using aedis::resp3::request;
+using aedis::experimental::exec;
+using connection = aedis::connection<>;
 
 int main()
 {
    try {
-      net::io_context ioc;
-      tcp::resolver resv{ioc};
-      auto const res = resv.resolve("127.0.0.1", "6379");
-      tcp::socket socket{ioc};
-      net::connect(socket, res);
+      net::io_context ioc{1};
+      connection conn{ioc};
 
-      // Creates the request and writes to the socket.
-      std::string buffer;
-      auto sr = make_serializer(buffer);
-      sr.push(command::hello, 3);
-      sr.push(command::ping);
-      sr.push(command::quit);
-      net::write(socket, net::buffer(buffer));
-      buffer.clear();
+      std::thread thread{[&]() {
+         conn.async_run(net::detached);
+         ioc.run();
+      }};
 
-      // Responses
-      std::string resp;
+      request req;
+      req.push("PING");
+      req.push("QUIT");
 
-      // Reads the responses to all commands in the request.
-      auto dbuffer = dynamic_buffer(buffer);
-      resp3::read(socket, dbuffer);
-      resp3::read(socket, dbuffer, adapt(resp));
-      resp3::read(socket, dbuffer);
-
-      std::cout << "Ping: " << resp << std::endl;
+      std::tuple<std::string, aedis::ignore> resp;
+      exec(conn, req, adapt(resp));
+      thread.join();
 
+      std::cout << "Response: " << std::get<0>(resp) << std::endl;
    } catch (std::exception const& e) {
       std::cerr << e.what() << std::endl;
-      exit(EXIT_FAILURE);
    }
 }

examples/mystruct.hpp

@@ -1,53 +0,0 @@
-/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
- *
- * Distributed under the Boost Software License, Version 1.0. (See
- * accompanying file LICENSE.txt)
- */
-
-#include <string>
-#include <iterator>
-#include <cstdint>
-#include <iostream>
-#include <algorithm>
-
-#include <aedis/aedis.hpp>
-
-// Arbitrary struct to de/serialize.
-struct mystruct {
-   std::int32_t x;
-   std::string y;
-};
-
-// Serializes mystruct
-void to_bulk(std::string& to, mystruct const& obj)
-{
-   using aedis::resp3::type;
-   using aedis::resp3::add_header;
-   using aedis::resp3::add_separator;
-
-   auto const size = sizeof obj.x + obj.y.size();
-   add_header(to, type::blob_string, size);
-   auto const* p = reinterpret_cast<char const*>(&obj.x);
-   std::copy(p, p + sizeof obj.x, std::back_inserter(to));
-   std::copy(std::cbegin(obj.y), std::cend(obj.y), std::back_inserter(to));
-   add_separator(to);
-}
-
-// Deserialize the struct.
-void from_string(mystruct& obj, boost::string_view sv, boost::system::error_code& ec)
-{
-   char* p = reinterpret_cast<char*>(&obj.x);
-   std::copy(std::cbegin(sv), std::cbegin(sv) + sizeof obj.x, p);
-   std::copy(std::cbegin(sv) + sizeof obj.x, std::cend(sv), std::back_inserter(obj.y));
-}
-
-std::ostream& operator<<(std::ostream& os, mystruct const& obj)
-{
-   os << "x: " << obj.x << ", y: " << obj.y;
-   return os;
-}
-
-bool operator<(mystruct const& a, mystruct const& b)
-{
-   return std::tie(a.x, a.y) < std::tie(b.x, b.y);
-}

examples/print.hpp

@@ -19,10 +19,8 @@ namespace net = boost::asio;
 using aedis::resp3::node;
 using aedis::adapter::adapt;
 using aedis::adapter::adapter_t;
-using aedis::redis::command;
-using aedis::generic::client;
 
-void print_and_clear_aggregate(std::vector<aedis::resp3::node<std::string>>& v)
+void print_aggr(std::vector<aedis::resp3::node<std::string>>& v)
 {
    auto const m = aedis::resp3::element_multiplicity(v.front().data_type);
    for (auto i = 0lu; i < m * v.front().aggregate_size; ++i)
@@ -31,17 +29,36 @@ void print_and_clear_aggregate(std::vector<aedis::resp3::node<std::string>>& v)
    v.clear();
 }
 
-void print_and_clear(std::set<std::string>& cont)
+template <class T>
+void print(std::vector<T> const& cont)
 {
    for (auto const& e: cont) std::cout << e << " ";
    std::cout << "\n";
-   cont.clear();
 }
 
-void print_and_clear(std::map<std::string, std::string>& cont)
+template <class T>
+void print(std::set<T> const& cont)
+{
+   for (auto const& e: cont) std::cout << e << "\n";
+}
+
+template <class T, class U>
+void print(std::map<T, U> const& cont)
 {
    for (auto const& e: cont)
       std::cout << e.first << ": " << e.second << "\n";
-   cont.clear();
 }
 
+void print(std::string const& e)
+{
+   std::cout << e << std::endl;
+}
+
+void print_push(std::vector<aedis::resp3::node<std::string>>& resp)
+{
+   std::cout
+      << "Push type: "   << resp.at(1).value << "\n"
+      << "Channel: " << resp.at(2).value << "\n"
+      << "Message: " << resp.at(3).value << "\n"
+      << std::endl;
+}

examples/serialization.cpp

@@ -0,0 +1,111 @@
+/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See
+ * accompanying file LICENSE.txt)
+ */
+
+#include <algorithm>
+#include <cstdint>
+#include <iostream>
+#include <set>
+#include <iterator>
+#include <string>
+#include <boost/json.hpp>
+#include <boost/json/src.hpp>
+#include <aedis.hpp>
+#include "print.hpp"
+
+// Include this in no more than one .cpp file.
+#include <aedis/src.hpp>
+
+namespace net = boost::asio;
+using aedis::resp3::request;
+using connection = aedis::connection<>;
+using namespace boost::json;
+
+struct user {
+   std::string name;
+   std::string age;
+   std::string country;
+};
+
+void tag_invoke(value_from_tag, value& jv, user const& u)
+{
+   jv =
+   { {"name", u.name}
+   , {"age", u.age}
+   , {"country", u.country}
+   };
+}
+
+template<class T>
+void extract(object const& obj, T& t, boost::string_view key)
+{
+    t = value_to<T>(obj.at(key));
+}
+
+user tag_invoke(value_to_tag<user>, value const& jv)
+{
+    user u;
+    object const& obj = jv.as_object();
+    extract(obj, u.name, "name");
+    extract(obj, u.age, "age");
+    extract(obj, u.country, "country");
+    return u;
+}
+
+// Serializes
+void to_bulk(std::string& to, user const& u)
+{
+   aedis::resp3::to_bulk(to, serialize(value_from(u)));
+}
+
+// Deserializes
+void from_bulk(user& u, boost::string_view sv, boost::system::error_code&)
+{
+   value jv = parse(sv);
+   u = value_to<user>(jv);
+}
+
+std::ostream& operator<<(std::ostream& os, user const& u)
+{
+   os << "Name: " << u.name << "\n"
+      << "Age: " << u.age << "\n"
+      << "Country: " << u.country;
+
+   return os;
+}
+
+bool operator<(user const& a, user const& b)
+{
+   return std::tie(a.name, a.age, a.country) < std::tie(b.name, b.age, b.country);
+}
+
+int main()
+{
+   net::io_context ioc;
+   connection db{ioc};
+
+   // Request that sends the containers.
+   std::set<user> users
+      { {"Joao", "56", "Brazil"}
+      , {"Serge", "60", "France"}
+      };
+
+   request req;
+   req.push("HELLO", 3);
+   req.push_range("SADD", "sadd-key", users);
+   req.push("SMEMBERS", "sadd-key");
+   req.push("QUIT");
+
+   std::tuple<aedis::ignore, int, std::set<user>, std::string> resp;
+
+   db.async_run(req, aedis::adapt(resp), [](auto ec, auto) {
+      std::cout << ec.message() << std::endl;
+   });
+
+   ioc.run();
+
+   // Print
+   print(std::get<2>(resp));
+}

examples/serialization_sync.cpp

@@ -1,68 +0,0 @@
-/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
- *
- * Distributed under the Boost Software License, Version 1.0. (See
- * accompanying file LICENSE.txt)
- */
-
-#include <string>
-#include <iterator>
-#include <cstdint>
-#include <iostream>
-#include <algorithm>
-
-#include <boost/asio/connect.hpp>
-
-#include <aedis/aedis.hpp>
-#include <aedis/src.hpp>
-
-#include "mystruct.hpp"
-
-namespace net = boost::asio;
-namespace resp3 = aedis::resp3;
-
-using aedis::resp3::type;
-using aedis::redis::command;
-using aedis::generic::make_serializer;
-using aedis::adapter::adapt;
-using net::ip::tcp;
-
-int main()
-{
-   try {
-      net::io_context ioc;
-      tcp::resolver resv{ioc};
-      auto const res = resv.resolve("127.0.0.1", "6379");
-      tcp::socket socket{ioc};
-      net::connect(socket, res);
-
-      // This struct will be serialized and stored on Redis.
-      mystruct in{42, "Some string"};
-
-      // Creates and sends a request to redis.
-      std::string request;
-      auto sr = make_serializer(request);
-      sr.push(command::hello, 3);
-      sr.push(command::set, "key", in);
-      sr.push(command::get, "key");
-      sr.push(command::quit);
-      net::write(socket, net::buffer(request));
-
-      // Object to store the response.
-      mystruct out;
-
-      // Reads the responses to all commands in the request.
-      std::string buffer;
-      auto dbuf = net::dynamic_buffer(buffer);
-      resp3::read(socket, dbuf); // hello
-      resp3::read(socket, dbuf); // set
-      resp3::read(socket, dbuf, adapt(out)); // get
-      resp3::read(socket, dbuf); // quit
-
-      // Should be equal to what has been sent above.
-      std::cout << out << std::endl;
-
-   } catch (std::exception const& e) {
-      std::cerr << e.what() << std::endl;
-      exit(EXIT_FAILURE);
-   }
-}

examples/subscriber.cpp

@@ -4,51 +4,65 @@
  * accompanying file LICENSE.txt)
  */
 
+#include <string>
+#include <vector>
 #include <iostream>
+#include <tuple>
+#include <boost/asio.hpp>
+#include <aedis.hpp>
+#include "print.hpp"
 
-#include <boost/asio/use_awaitable.hpp>
-#include <boost/asio/detached.hpp>
-#include <boost/asio/co_spawn.hpp>
-
-#include <aedis/aedis.hpp>
+// Include this in no more than one .cpp file.
 #include <aedis/src.hpp>
 
+
 namespace net = boost::asio;
-namespace resp3 = aedis::resp3;
-
-using aedis::resp3::node;
-using aedis::redis::command;
-using aedis::adapter::adapt;
-using aedis::generic::make_serializer;
-using net::ip::tcp;
-using net::write;
-using net::buffer;
+using aedis::adapt;
+using aedis::resp3::request;
+using node_type = aedis::resp3::node<std::string>;
 using tcp_socket = net::use_awaitable_t<>::as_default_on_t<net::ip::tcp::socket>;
+using connection = aedis::connection<tcp_socket>;
 
-net::awaitable<void> example()
+/* This example will subscribe and read pushes indefinitely.
+ *
+ * To test send messages with redis-cli
+ *
+ *    $ redis-cli -3
+ *    127.0.0.1:6379> PUBLISH channel1 some-message
+ *    (integer) 3
+ *    127.0.0.1:6379>
+ *
+ * To test reconnection try, for example, to close all clients currently
+ * connected to the Redis instance
+ *
+ * $ redis-cli
+ * > CLIENT kill TYPE pubsub
+ */
+
+net::awaitable<void> receiver(std::shared_ptr<connection> db)
 {
-   auto ex = co_await net::this_coro::executor;
+   request req;
+   req.push("SUBSCRIBE", "channel");
 
-   tcp::resolver resv{ex};
-   auto const res = resv.resolve("127.0.0.1", "6379");
-   tcp_socket socket{ex};
-   co_await socket.async_connect(*std::begin(res));
+   for (std::vector<node_type> resp;;) {
+      auto const ev = co_await db->async_receive_event(aedis::adapt(resp));
 
-   std::string request;
-   auto sr = make_serializer(request);
-   sr.push(command::hello, 3);
-   sr.push(command::subscribe, "channel1", "channel2");
-   co_await net::async_write(socket, buffer(request));
+      std::cout << "Event: " << aedis::to_string<tcp_socket>(ev) << std::endl;
 
-   // Ignores the response to hello.
-   std::string buffer;
-   co_await resp3::async_read(socket, net::dynamic_buffer(buffer));
+      switch (ev) {
+         case connection::event::push:
+         print_push(resp);
+         resp.clear();
+         break;
 
-   for (std::vector<node<std::string>> resp;;) {
-      co_await resp3::async_read(socket, net::dynamic_buffer(buffer), adapt(resp));
-      for (auto const& e: resp)
-         std::cout << e << std::endl;
-      resp.clear();
+         case connection::event::hello:
+         // Subscribes to the channels when a new connection is
+         // stablished.
+         co_await db->async_exec(req);
+         break;
+
+         default:;
+      }
    }
 }
 
@@ -56,10 +70,17 @@ int main()
 {
    try {
       net::io_context ioc;
-      net::co_spawn(ioc, example(), net::detached);
+      auto db = std::make_shared<connection>(ioc);
+
+      db->get_config().enable_events = true;
+      db->get_config().enable_reconnect = true;
+
+      net::co_spawn(ioc, receiver(db), net::detached);
+      db->async_run(net::detached);
+      net::signal_set signals(ioc, SIGINT, SIGTERM);
+      signals.async_wait([&](auto, auto){ ioc.stop(); });
       ioc.run();
    } catch (std::exception const& e) {
-      std::cerr << e.what() << std::endl;
+      std::cerr << "Error: " << e.what() << std::endl;
    }
 }
-

examples/subscriber_high_level.cpp

@@ -1,93 +0,0 @@
-/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
- *
- * Distributed under the Boost Software License, Version 1.0. (See
- * accompanying file LICENSE.txt)
- */
-
-#include <iostream>
-
-#include <aedis/aedis.hpp>
-#include <aedis/src.hpp>
-
-namespace net = boost::asio;
-
-using aedis::resp3::node;
-using aedis::sentinel::command;
-using aedis::generic::client;
-using aedis::adapter::adapt;
-using client_type = client<net::ip::tcp::socket, command>;
-using response_type = std::vector<node<std::string>>;
-using adapter_type = aedis::adapter::adapter_t<response_type>;
-
-/* In this example we send a subscription to a channel and start
- * reading server side messages indefinitely.
- *
- * After starting the example you can test it by sending messages with
- * redis-cli like this
- *
- *    $ redis-cli -3
- *    127.0.0.1:6379> PUBLISH channel1 some-message
- *    (integer) 3
- *    127.0.0.1:6379>
- *
- * The messages will then appear on the terminal you are running the
- * example.
- */
-
-class receiver {
-public:
-   receiver(client_type& db)
-   : adapter_{adapt(resp_)}
-   , db_{&db} {}
-
-   void on_resp3(command cmd, node<boost::string_view> const& nd, boost::system::error_code& ec)
-   {
-      adapter_(nd, ec);
-   }
-
-   void on_read(command cmd, std::size_t)
-   {
-      switch (cmd) {
-         case command::hello:
-         db_->send(command::subscribe, "channel1", "channel2");
-         break;
-         default:;
-      }
-
-      resp_.clear();
-   }
-
-   void on_write(std::size_t n)
-   { 
-      std::cout << "Number of bytes written: " << n << std::endl;
-   }
-
-   void on_push(std::size_t)
-   {
-      std::cout
-         << "Event: " << resp_.at(1).value << "\n"
-         << "Channel: " << resp_.at(2).value << "\n"
-         << "Message: " << resp_.at(3).value << "\n"
-         << std::endl;
-
-      resp_.clear();
-   }
-
-private:
-   response_type resp_;
-   adapter_type adapter_;
-   client_type* db_;
-};
-
-int main()
-{
-   net::io_context ioc;
-   client_type db{ioc.get_executor()};
-   auto recv = std::make_shared<receiver>(db);
-   db.set_receiver(recv);
-
-   db.async_run("127.0.0.1", "6379",
-      [](auto ec){ std::cout << ec.message() << std::endl;});
-
-   ioc.run();
-}

examples/subscriber_sync.cpp

@@ -0,0 +1,71 @@
+/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See
+ * accompanying file LICENSE.txt)
+ */
+
+#include <tuple>
+#include <string>
+#include <boost/asio.hpp>
+#include <aedis.hpp>
+#include <aedis/experimental/sync.hpp>
+#include "print.hpp"
+
+// Include this in no more than one .cpp file.
+#include <aedis/src.hpp>
+
+namespace net = boost::asio;
+using aedis::resp3::request;
+using aedis::experimental::exec;
+using aedis::experimental::receive_event;
+using connection = aedis::connection<>;
+using aedis::resp3::node;
+using event = connection::event;
+
+// See subscriber.cpp for more info about how to run this example.
+
+void subscriber(connection& conn)
+{
+   request req;
+   req.push("SUBSCRIBE", "channel");
+
+   for (std::vector<node<std::string>> resp;;) {
+      auto const ev = receive_event(conn, aedis::adapt(resp));
+      switch (ev) {
+         case connection::event::push:
+         print_push(resp);
+         resp.clear();
+         break;
+
+         case connection::event::hello:
+         // Subscribes to the channels when a new connection is
+         // stablished.
+         exec(conn, req);
+         break;
+
+         default:;
+      }
+   }
+}
+
+int main()
+{
+   try {
+      net::io_context ioc{1};
+      connection conn{ioc};
+
+      conn.get_config().enable_events = true;
+      conn.get_config().enable_reconnect = true;
+
+      std::thread thread{[&]() {
+         conn.async_run(net::detached);
+         ioc.run();
+      }};
+
+      subscriber(conn);
+      thread.join();
+
+   } catch (std::exception const& e) {
+      std::cerr << e.what() << std::endl;
+   }
+}

examples/transaction.cpp

@@ -1,73 +0,0 @@
-/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
- *
- * Distributed under the Boost Software License, Version 1.0. (See
- * accompanying file LICENSE.txt)
- */
-
-#include <iostream>
-
-#include <boost/asio/use_awaitable.hpp>
-#include <boost/asio/detached.hpp>
-#include <boost/asio/co_spawn.hpp>
-
-#include <aedis/aedis.hpp>
-#include <aedis/src.hpp>
-
-namespace net = boost::asio;
-namespace resp3 = aedis::resp3;
-using aedis::redis::command;
-using aedis::adapter::adapt;
-using aedis::generic::make_serializer;
-using net::ip::tcp;
-using tcp_socket = net::use_awaitable_t<>::as_default_on_t<net::ip::tcp::socket>;
-
-net::awaitable<void> example()
-{
-   auto ex = co_await net::this_coro::executor;
-
-   tcp::resolver resv{ex};
-   auto const res = resv.resolve("127.0.0.1", "6379");
-   tcp_socket socket{ex};
-   co_await socket.async_connect(*std::begin(res));
-
-   std::string request;
-   auto sr = make_serializer(request);
-   sr.push(command::hello, 3);
-   sr.push(command::multi);
-   sr.push(command::ping, "Some message.");
-   sr.push(command::set, "low-level-key", "some content", "EX", "2");
-   sr.push(command::exec);
-   sr.push(command::quit);
-   co_await net::async_write(socket, net::buffer(request));
-
-   std::tuple<std::string, boost::optional<std::string>> response;
-
-   std::string buffer;
-   auto dbuffer = net::dynamic_buffer(buffer);
-   co_await resp3::async_read(socket, dbuffer); // hellp
-   co_await resp3::async_read(socket, dbuffer); // multi
-   co_await resp3::async_read(socket, dbuffer); // ping
-   co_await resp3::async_read(socket, dbuffer); // set
-   co_await resp3::async_read(socket, dbuffer, adapt(response));
-   co_await resp3::async_read(socket, dbuffer); // quit
-
-   std::cout
-      << "Ping: " << std::get<0>(response) << "\n"
-      << "Get (has_value): " << std::get<1>(response).has_value()
-      << std::endl;
-
-   if (std::get<1>(response).has_value())
-      std::cout << "Get (value): " << std::get<1>(response).value() << std::endl;
-}
-
-int main()
-{
-   try {
-      net::io_context ioc;
-      net::co_spawn(ioc, example(), net::detached);
-      ioc.run();
-   } catch (std::exception const& e) {
-      std::cerr << e.what() << std::endl;
-   }
-}
-

examples/user_session.hpp

@@ -1,98 +0,0 @@
-/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
- *
- * Distributed under the Boost Software License, Version 1.0. (See
- * accompanying file LICENSE.txt)
- */
-
-#ifndef AEDIS_USER_SESSION_HPP
-#define AEDIS_USER_SESSION_HPP
-
-#include <functional>
-
-#include <boost/asio/awaitable.hpp>
-#include <boost/asio/detached.hpp>
-#include <boost/asio/co_spawn.hpp>
-#include <boost/asio/redirect_error.hpp>
-
-// An example user session.
-
-namespace aedis
-{
-
-// Base class for user sessions.
-struct user_session_base {
-  virtual ~user_session_base() {}
-  virtual void deliver(std::string const& msg) = 0;
-};
-
-class user_session:
-   public user_session_base,
-   public std::enable_shared_from_this<user_session> {
-public:
-   user_session(boost::asio::ip::tcp::socket socket)
-   : socket_(std::move(socket))
-   , timer_(socket_.get_executor())
-      { timer_.expires_at(std::chrono::steady_clock::time_point::max()); }
-
-   void start(std::function<void(std::string const&)> on_msg)
-   {
-      co_spawn(socket_.get_executor(),
-          [self = shared_from_this(), on_msg]{ return self->reader(on_msg); },
-          boost::asio::detached);
-
-      co_spawn(socket_.get_executor(),
-          [self = shared_from_this()]{ return self->writer(); },
-          boost::asio::detached);
-   }
-
-   void deliver(std::string const& msg)
-   {
-      write_msgs_.push_back(msg);
-      timer_.cancel_one();
-   }
-
-private:
-   boost::asio::awaitable<void>
-   reader(std::function<void(std::string const&)> on_msg)
-   {
-      try {
-         for (std::string msg;;) {
-            auto const n = co_await boost::asio::async_read_until(socket_, boost::asio::dynamic_buffer(msg, 1024), "\n", boost::asio::use_awaitable);
-            on_msg(msg);
-            msg.erase(0, n);
-         }
-      } catch (std::exception&) {
-         stop();
-      }
-   }
-
-   boost::asio::awaitable<void> writer()
-   {
-      try {
-         while (socket_.is_open()) {
-            if (write_msgs_.empty()) {
-               boost::system::error_code ec;
-               co_await timer_.async_wait(boost::asio::redirect_error(boost::asio::use_awaitable, ec));
-            } else {
-               co_await boost::asio::async_write(socket_, boost::asio::buffer(write_msgs_.front()), boost::asio::use_awaitable);
-               write_msgs_.pop_front();
-            }
-         }
-      } catch (std::exception&) {
-        stop();
-      }
-   }
-
-   void stop()
-   {
-      socket_.close();
-      timer_.cancel();
-   }
-
-   boost::asio::ip::tcp::socket socket_;
-   boost::asio::steady_timer timer_;
-   std::deque<std::string> write_msgs_;
-};
-
-} // aedis
-#endif // AEDIS_USER_SESSION_HPP

include/Makefile.am

@@ -0,0 +1,26 @@
+
+nobase_include_HEADERS =\
+  $(top_srcdir)/include/aedis/src.hpp\
+  $(top_srcdir)/include/aedis/error.hpp\
+  $(top_srcdir)/include/aedis/impl/error.ipp\
+  $(top_srcdir)/include/aedis/detail/net.hpp\
+  $(top_srcdir)/include/aedis/connection.hpp\
+  $(top_srcdir)/include/aedis/adapt.hpp\
+  $(top_srcdir)/include/aedis/detail/connection_ops.hpp\
+  $(top_srcdir)/include/aedis.hpp\
+  $(top_srcdir)/include/aedis/experimental/sync.hpp\
+  $(top_srcdir)/include/aedis/adapter/detail/adapters.hpp\
+  $(top_srcdir)/include/aedis/adapter/adapt.hpp\
+  $(top_srcdir)/include/aedis/adapter/detail/response_traits.hpp\
+  $(top_srcdir)/include/aedis/resp3/node.hpp\
+  $(top_srcdir)/include/aedis/resp3/compose.hpp\
+  $(top_srcdir)/include/aedis/resp3/detail/read_ops.hpp\
+  $(top_srcdir)/include/aedis/resp3/detail/parser.hpp\
+  $(top_srcdir)/include/aedis/resp3/detail/exec.hpp\
+  $(top_srcdir)/include/aedis/resp3/type.hpp\
+  $(top_srcdir)/include/aedis/resp3/read.hpp\
+  $(top_srcdir)/include/aedis/resp3/write.hpp\
+  $(top_srcdir)/include/aedis/resp3/request.hpp\
+  $(top_srcdir)/include/aedis/resp3/impl/request.ipp\
+  $(top_srcdir)/include/aedis/resp3/detail/impl/parser.ipp\
+  $(top_srcdir)/include/aedis/resp3/impl/type.ipp

include/aedis.hpp

@@ -0,0 +1,648 @@
+/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See
+ * accompanying file LICENSE.txt)
+ */
+
+#ifndef AEDIS_HPP
+#define AEDIS_HPP
+
+#include <aedis/error.hpp>
+#include <aedis/adapt.hpp>
+#include <aedis/connection.hpp>
+#include <aedis/resp3/request.hpp>
+
+/** \mainpage Documentation
+    \tableofcontents
+  
+    Useful links: \subpage any, [Changelog](CHANGELOG.md) and [Benchmarks](benchmarks/benchmarks.md).
+
+    \section Overview
+  
+    Aedis is a high-level [Redis](https://redis.io/) client library
+    built on top of
+    [Asio](https://www.boost.org/doc/libs/release/doc/html/boost_asio.html),
+    some of its distinctive features are
+
+    \li Support for the latest version of the Redis communication protocol [RESP3](https://github.com/redis/redis-specifications/blob/master/protocol/RESP3.md).
+    \li First class support for STL containers and C++ built-in types.
+    \li Serialization and deserialization of your own data types.
+    \li Healthy checks, back pressure and low latency.
+    \li Hides most of the low level asynchronous operations away from the user.
+
+    Let us start with an overview of asynchronous code.
+
+    @subsection Async
+
+    The code below sends a ping command to Redis (see intro.cpp)
+
+    @code
+    int main()
+    {
+       net::io_context ioc;
+       connection db{ioc};
+
+       request req;
+       req.push("PING");
+       req.push("QUIT");
+
+       std::tuple<std::string, aedis::ignore> resp;
+       db.async_run(req, adapt(resp), net::detached);
+
+       ioc.run();
+
+       std::cout << std::get<0>(resp) << std::endl;
+    }
+    @endcode
+
+    The connection class maintains a healthy connection with
+    Redis over which users can execute their commands, without any
+    need of queuing. For example, to execute more than one command
+
+    @code
+    int main()
+    {
+       ...
+       net::io_context ioc;
+       connection db{ioc};
+
+       db.async_exec(req1, adapt(resp1), handler1);
+       db.async_exec(req2, adapt(resp2), handler2);
+       db.async_exec(req3, adapt(resp3), handler3);
+
+       db.async_run(net::detached);
+
+       ioc.run();
+       ...
+    }
+    @endcode
+
+    The `async_exec` functions above can be called from different
+    places in the code without knowing about each other, see for
+    example echo_server.cpp.  Server-side pushes are supported on the
+    same connection where commands are executed, a typical subscriber
+    will look like
+    (see subscriber.cpp)
+
+    @code
+    net::awaitable<void> reader(std::shared_ptr<connection> db)
+    {
+       request req;
+       req.push("SUBSCRIBE", "channel");
+
+       for (std::vector<node_type> resp;;) {
+          auto ev = co_await db->async_receive_event(aedis::adapt(resp));
+
+          switch (ev) {
+             case connection::event::push:
+             // Use resp.
+             resp.clear();
+             break;
+
+             case connection::event::hello:
+             // Subscribes to channels when a new connection is
+             // stablished.
+             co_await db->async_exec(req);
+             break;
+
+             default:;
+          }
+       }
+    }
+    @endcode
+
+    @subsection Sync
+
+    The `connection` class is async-only, many users however need to
+    interact with it synchronously, this is also supported by Aedis as long
+    as this interaction occurs across threads, for example (see
+    intro_sync.cpp)
+
+    @code
+    int main()
+    {
+       try {
+          net::io_context ioc{1};
+          connection conn{ioc};
+    
+          std::thread thread{[&]() {
+             conn.async_run(net::detached);
+             ioc.run();
+          }};
+    
+          request req;
+          req.push("PING");
+          req.push("QUIT");
+    
+          std::tuple<std::string, aedis::ignore> resp;
+          exec(conn, req, adapt(resp));
+          thread.join();
+    
+          std::cout << "Response: " << std::get<0>(resp) << std::endl;
+       } catch (std::exception const& e) {
+          std::cerr << e.what() << std::endl;
+       }
+    }
+    @endcode
+
+    \subsection using-aedis Installation
+
+    To install and use Aedis you will need
+  
+    - Boost 1.78 or greater.
+    - C++17. Some examples require C++20 with coroutine support.
+    - Redis 6 or higher. Optionally also redis-cli and Redis Sentinel.
+
+    For a simple installation run
+
+    ```
+    # Clone the repository and checkout the lastest release tag.
+    $ git clone --branch v0.3.0 https://github.com/mzimbres/aedis.git
+    $ cd aedis
+
+    # Build an example
+    $ g++ -std=c++17 -pthread examples/intro.cpp -I./include -I/path/boost_1_79_0/include/
+    ```
+
+    For a proper full installation on the system run
+
+    ```
+    # Download and unpack the latest release
+    $ wget https://github.com/mzimbres/aedis/releases/download/v0.3.0/aedis-0.2.1.tar.gz
+    $ tar -xzvf aedis-0.2.1.tar.gz
+
+    # Configure, build and install
+    $ ./configure --prefix=/opt/aedis-0.2.1 --with-boost=/opt/boost_1_78_0
+    $ sudo make install
+    ```
+
+    To build examples and tests
+
+    ```
+    $ make
+    ```
+
+    @subsubsection using_aedis Using Aedis
+
+    When writing you own applications include the following header 
+  
+    ```cpp
+    #include <aedis/src.hpp>
+
+    ```
+
+    in no more than one source file in your applications.
+
+    @subsubsection sup-comp Supported compilers
+
+    Aedis has been tested with the following compilers
+
+    - Tested with gcc: 12, 11.
+    - Tested with clang: 14, 13, 11.
+  
+    \subsubsection Developers
+  
+    To generate the build system clone the repository and run
+  
+    ```
+    # git clone https://github.com/mzimbres/aedis.git
+    $ autoreconf -i
+    ```
+  
+    After that you will have a configure script that you can run as
+    explained above, for example, to use a compiler other that the
+    system compiler run
+  
+    ```
+    $ CXX=clang++-14 CXXFLAGS="-g" ./configure --with-boost=...
+    ```
+
+    To generate release tarballs run
+
+    ```
+    $ make distcheck
+    ```
+
+
+    \section requests Requests
+
+    Redis requests are composed of one of more Redis commands (in
+    Redis documentation they are called
+    [pipelines](https://redis.io/topics/pipelining)). For example
+
+    @code
+    request req;
+
+    // Command with variable length of arguments.
+    req.push("SET", "key", "some value", value, "EX", "2");
+
+    // Pushes a list.
+    std::list<std::string> list
+       {"channel1", "channel2", "channel3"};
+    req.push_range("SUBSCRIBE", list);
+
+    // Same as above but as an iterator range.
+    req.push_range2("SUBSCRIBE", std::cbegin(list), std::cend(list));
+
+    // Pushes a map.
+    std::map<std::string, mystruct> map
+       { {"key1", "value1"}
+       , {"key2", "value2"}
+       , {"key3", "value3"}};
+    req.push_range("HSET", "key", map);
+    @endcode
+
+    Sending a request to Redis is then peformed with the following function
+
+    @code
+    co_await db->async_exec(req, adapt(resp));
+    @endcode
+
+    \subsection requests-serialization Serialization
+
+    The \c push and \c push_range functions above work with integers
+    e.g. \c int and \c std::string out of the box. To send your own
+    data type defined a \c to_bulk function like this
+
+    @code
+    struct mystruct {
+       // Example struct.
+    };
+    
+    void to_bulk(std::string& to, mystruct const& obj)
+    {
+       std::string dummy = "Dummy serializaiton string.";
+       aedis::resp3::to_bulk(to, dummy);
+    }
+    @endcode
+
+    Once \c to_bulk is defined and accessible over ADL \c mystruct can
+    be passed to the \c request
+
+    @code
+    request req;
+
+    std::map<std::string, mystruct> map {...};
+
+    req.push_range("HSET", "key", map);
+    @endcode
+
+    Example serialization.cpp shows how store json string in Redis.
+
+    \section low-level-responses Responses
+
+    To read responses effectively, users must know their RESP3 type,
+    this can be found in the Redis documentation for each command
+    (https://redis.io/commands). For example
+
+    Command  | RESP3 type                          | Documentation
+    ---------|-------------------------------------|--------------
+    lpush    | Number                              | https://redis.io/commands/lpush
+    lrange   | Array                               | https://redis.io/commands/lrange
+    set      | Simple-string, null or blob-string  | https://redis.io/commands/set
+    get      | Blob-string                         | https://redis.io/commands/get
+    smembers | Set                                 | https://redis.io/commands/smembers
+    hgetall  | Map                                 | https://redis.io/commands/hgetall
+
+    Once the RESP3 type of a given response is known we can choose a
+    proper C++ data structure to receive it in. Fortunately, this is a
+    simple task for most types. The table below summarises the options
+
+    RESP3 type     | Possible C++ type                                            | Type
+    ---------------|--------------------------------------------------------------|------------------
+    Simple-string  | \c std::string                                             | Simple
+    Simple-error   | \c std::string                                             | Simple
+    Blob-string    | \c std::string, \c std::vector                             | Simple
+    Blob-error     | \c std::string, \c std::vector                             | Simple
+    Number         | `long long`, `int`, `std::size_t`, \c std::string          | Simple
+    Double         | `double`, \c std::string                                   | Simple
+    Null           | `boost::optional<T>`                                       | Simple
+    Array          | \c std::vector, \c std::list, \c std::array, \c std::deque | Aggregate
+    Map            | \c std::vector, \c std::map, \c std::unordered_map         | Aggregate
+    Set            | \c std::vector, \c std::set, \c std::unordered_set         | Aggregate
+    Push           | \c std::vector, \c std::map, \c std::unordered_map         | Aggregate
+
+    For example
+
+    @code
+    request req;
+    req.push("HELLO", 3);
+    req.push_range("RPUSH", "key1", vec);
+    req.push_range("HSET", "key2", map);
+    req.push("LRANGE", "key3", 0, -1);
+    req.push("HGETALL", "key4");
+    req.push("QUIT");
+
+    std::tuple<
+       aedis::ignore,  // hello
+       int,            // rpush
+       int,            // hset
+       std::vector<T>, // lrange
+       std::map<U, V>, // hgetall
+       std::string     // quit
+    > resp;
+
+    co_await db->async_exec(req, adapt(resp));
+    @endcode
+
+    The tag @c aedis::ignore can be used to ignore individual
+    elements in the responses. If the intention is to ignore the
+    response to all commands in the request use @c adapt()
+
+    @code
+    co_await db->async_exec(req, adapt());
+    @endcode
+
+    Responses that contain nested aggregates or heterogeneous data
+    types will be given special treatment later in \ref gen-case.  As
+    of this writing, not all RESP3 types are used by the Redis server,
+    which means in practice users will be concerned with a reduced
+    subset of the RESP3 specification.
+
+    \subsection Optional
+
+    It is not uncommon for apps to access keys that do not exist or
+    that have already expired in the Redis server, to deal with these
+    cases Aedis provides support for \c boost::optional. To use it,
+    wrap your type around \c boost::optional like this
+
+    @code
+    boost::optional<std::unordered_map<T, U>> resp;
+    co_await db->async_exec(req, adapt(resp));
+    @endcode
+
+    Everything else stays the same.
+
+    \subsection transactions Transactions
+
+    To read the response to transactions we have to observe that Redis
+    queues the commands as they arrive and sends the responses back to
+    the user in a single array, in the response to the @c exec command.
+    For example, to read the response to the this request
+
+    @code
+    db.send("MULTI");
+    db.send("GET", "key1");
+    db.send("LRANGE", "key2", 0, -1);
+    db.send("HGETALL", "key3");
+    db.send("EXEC");
+    @endcode
+
+    use the following response type
+
+    @code
+    using aedis::ignore;
+    using boost::optional;
+
+    using tresp_type = 
+       std::tuple<
+          optional<std::string>, // get
+          optional<std::vector<std::string>>, // lrange
+          optional<std::map<std::string, std::string>> // hgetall
+       >;
+
+    std::tuple<
+       ignore,     // multi
+       ignore,     // get
+       ignore,     // lrange
+       ignore,     // hgetall
+       tresp_type, // exec
+    > resp;
+
+    co_await db->async_exec(req, adapt(resp));
+    @endcode
+
+    Note that above we are not ignoring the response to the commands
+    themselves but whether they have been successfully queued. For a
+    complete example see containers.cpp.
+
+    \subsection Deserialization
+
+    As mentioned in \ref requests-serialization, it is common to
+    serialize data before sending it to Redis e.g.  to json strings.
+    For performance and convenience reasons, we may also want to
+    deserialize it directly in its final data structure. Aedis
+    supports this use case by calling a user provided \c from_bulk
+    function while parsing the response. For example
+
+    @code
+    void from_bulk(mystruct& obj, char const* p, std::size_t size, boost::system::error_code& ec)
+    {
+       // Deserializes p into obj.
+    }
+    @endcode
+
+    After that, you can start receiving data efficiently in the desired
+    types e.g. \c mystruct, \c std::map<std::string, mystruct> etc.
+
+    \subsection gen-case The general case
+
+    There are cases where responses to Redis
+    commands won't fit in the model presented above, some examples are
+
+    @li Commands (like \c set) whose response don't have a fixed
+    RESP3 type. Expecting an \c int and receiving a blob-string
+    will result in error.
+    @li RESP3 aggregates that contain nested aggregates can't be read in STL containers.
+    @li Transactions with a dynamic number of commands can't be read in a \c std::tuple.
+
+    To deal with these cases Aedis provides the \c resp3::node
+    type, that is the most general form of an element in a response,
+    be it a simple RESP3 type or an aggregate. It is defined like this
+
+    @code
+    template <class String>
+    struct node {
+       // The RESP3 type of the data in this node.
+       type data_type;
+
+       // The number of elements of an aggregate (or 1 for simple data).
+       std::size_t aggregate_size;
+
+       // The depth of this node in the response tree.
+       std::size_t depth;
+
+       // The actual data. For aggregate types this is always empty.
+       String value;
+    };
+    @endcode
+
+    Any response to a Redis command can be received in a \c
+    std::vector<node<std::string>>.  The vector can be seen as a
+    pre-order view of the response tree
+    (https://en.wikipedia.org/wiki/Tree_traversal#Pre-order,_NLR).
+    Using it is no different than using other types
+
+    @code
+    // Receives any RESP3 simple data type.
+    node<std::string> resp;
+    co_await db->async_exec(req, adapt(resp));
+
+    // Receives any RESP3 simple or aggregate data type.
+    std::vector<node<std::string>> resp;
+    co_await db->async_exec(req, adapt(resp));
+    @endcode
+
+    For example, suppose we want to retrieve a hash data structure
+    from Redis with \c hgetall, some of the options are
+
+    @li \c std::vector<node<std::string>: Works always.
+    @li \c std::vector<std::string>: Efficient and flat, all elements as string.
+    @li \c std::map<std::string, std::string>: Efficient if you need the data as a \c std::map
+    @li \c std::map<U, V>: Efficient if you are storing serialized data. Avoids temporaries and requires \c from_bulk for \c U and \c V.
+
+    In addition to the above users can also use unordered versions of the containers. The same reasoning also applies to sets e.g. \c smembers.
+
+    \section examples Examples
+
+    The examples listed below cover most use cases presented in the documentation above.
+
+    @li intro.cpp: Basic steps with Aedis.
+    @li intro_sync.cpp: Synchronous version of intro.cpp.
+    @li containers.cpp: Shows how to send and receive stl containers.
+    @li serialization.cpp: Shows the \c request support to serialization of user types.
+    @li subscriber.cpp: Shows how to subscribe to a channel and how to reconnect when connection is lost.
+    @li subscriber_sync.cpp: Synchronous version of subscriber.cpp.
+    @li echo_server.cpp: A simple TCP echo server that uses coroutines.
+    @li chat_room.cpp: A simple chat room that uses coroutines.
+
+    \section why-aedis Why Aedis
+
+    At the time of this writing there are seventeen Redis clients
+    listed in the [official](https://redis.io/docs/clients/#cpp) list.
+    With so many clients available it is not unlikely that users are
+    asking themselves why yet another one.  In this section I will try
+    to compare Aedis with the most popular clients and why we need
+    Aedis. Notice however that this is ongoing work as comparing
+    client objectively is difficult and time consuming.
+
+    The most popular client at the moment of this writing ranked by
+    github stars is
+
+    @li https://github.com/sewenew/redis-plus-plus
+
+    Before we start it is worth mentioning some of the things it does
+    not support
+
+    @li RESP3. Without RESP3 is impossible to support some important Redis features like client side caching, among other things.
+    @li Coroutines.
+    @li Reading responses directly in user data structures avoiding temporaries.
+    @li Error handling with error-code and exception overloads.
+    @li Healthy checks.
+
+    The remaining points will be addressed individually.
+
+    @subsection redis-plus-plus
+
+    Let us first have a look at what sending a command a pipeline and a
+    transaction look like
+
+    @code
+    auto redis = Redis("tcp://127.0.0.1:6379");
+
+    // Send commands
+    redis.set("key", "val");
+    auto val = redis.get("key"); // val is of type OptionalString.
+    if (val)
+        std::cout << *val << std::endl;
+
+    // Sending pipelines
+    auto pipe = redis.pipeline();
+    auto pipe_replies = pipe.set("key", "value")
+                            .get("key")
+                            .rename("key", "new-key")
+                            .rpush("list", {"a", "b", "c"})
+                            .lrange("list", 0, -1)
+                            .exec();
+
+    // Parse reply with reply type and index.
+    auto set_cmd_result = pipe_replies.get<bool>(0);
+    // ...
+
+    // Sending a transaction
+    auto tx = redis.transaction();
+    auto tx_replies = tx.incr("num0")
+                        .incr("num1")
+                        .mget({"num0", "num1"})
+                        .exec();
+
+    auto incr_result0 = tx_replies.get<long long>(0);
+    // ...
+    @endcode
+
+    Some of the problems with this API are
+
+    @li Heterogeneous treatment of commands, pipelines and transaction. This makes auto-pipelining impossible.
+    @li Any Api that sends individual commands has a very restricted scope of usability and should be avoided for performance reasons.
+    @li The API imposes exceptions on users, no error-code overload is provided.
+    @li No way to reuse the buffer for new calls to e.g. \c redis.get in order to avoid further dynamic memory allocations.
+    @li Error handling of resolve and connection not clear.
+
+    According to the documentation, pipelines in redis-plus-plus have
+    the following characteristics
+
+    > NOTE: By default, creating a Pipeline object is NOT cheap, since
+    > it creates a new connection.
+
+    This is clearly a downside of the API as pipelines should be the
+    default way of communicating and not an exception, paying such a
+    high price for each pipeline imposes a severe cost in performance.
+    Transactions also suffer from the very same problem.
+
+    > NOTE: Creating a Transaction object is NOT cheap, since it
+    > creates a new connection.
+
+    In Aedis there is no difference between sending one command, a
+    pipeline or a transaction because requests are decoupled
+    from the IO objects.
+
+    > redis-plus-plus also supports async interface, however, async
+    > support for Transaction and Subscriber is still on the way.
+    > 
+    > The async interface depends on third-party event library, and so
+    > far, only libuv is supported.
+
+    Async code in redis-plus-plus looks like the following
+
+    @code
+    auto async_redis = AsyncRedis(opts, pool_opts);
+    
+    Future<string> ping_res = async_redis.ping();
+    
+    cout << ping_res.get() << endl;
+    @endcode
+
+    As the reader can see, the async interface is based on futures
+    which is also known to have a bad performance.  The biggest
+    problem however with this async design is that it makes it
+    impossible to write asynchronous programs correctly since it
+    starts an async operation on every command sent instead of
+    enqueueing a message and triggering a write when it can be sent.
+    It is also not clear how are pipelines realised with the design
+    (if at all).
+
+    \section Acknowledgement
+
+    Some people that were helpful in the development of Aedis
+
+    @li Richard Hodges ([madmongo1](https://github.com/madmongo1)): For helping me with Asio and the design of asynchronous programs in general.
+    @li Vinícius dos Santos Oliveira ([vinipsmaker](https://github.com/vinipsmaker)): For useful discussion about how Aedis consumes buffers in the read operation (among other things).
+    @li Petr Dannhofer ([Eddie-cz](https://github.com/Eddie-cz)): For helping me understand how the `AUTH` and `HELLO` command can influence each other.
+ */
+
+/** \defgroup any Reference
+ *
+ *  This page contains the documentation of all user facing code.
+ */
+
+//  Support sentinel support as described in 
+//
+//  - https://redis.io/docs/manual/sentinel.
+//  - https://redis.io/docs/reference/sentinel-clients.
+//
+//  Avoid conflicts between
+//
+//  - aedis::adapt 
+//  - aedis::resp3::adapt.
+
+#endif // AEDIS_HPP

include/aedis/adapt.hpp

@@ -0,0 +1,156 @@
+/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See
+ * accompanying file LICENSE.txt)
+ */
+
+#ifndef AEDIS_ADAPT_HPP
+#define AEDIS_ADAPT_HPP
+
+#include <tuple>
+
+#include <boost/mp11.hpp>
+#include <boost/variant2.hpp>
+#include <boost/utility/string_view.hpp>
+#include <boost/system.hpp>
+
+#include <aedis/resp3/node.hpp>
+#include <aedis/adapter/adapt.hpp>
+#include <aedis/adapter/detail/response_traits.hpp>
+
+namespace aedis {
+
+/** @brief A type that ignores responses.
+ *
+ *  For example
+ *
+ *  @code
+    std::tuple<aedis::ignore, std::string, aedis::ignore> resp;
+ *  @endcode
+ *
+ *  will cause only the second tuple type to be parsed, the others
+ *  will be ignored.
+ */
+using ignore = adapter::detail::ignore;
+
+namespace detail {
+
+struct ignore_adapter {
+   void
+   operator()(
+      std::size_t,
+      resp3::node<boost::string_view> const&,
+      boost::system::error_code&)
+   {
+   }
+
+   auto supported_response_size() const noexcept { return std::size_t(-1);}
+};
+
+template <class Tuple>
+class static_adapter {
+private:
+   static constexpr auto size = std::tuple_size<Tuple>::value;
+   using adapter_tuple = boost::mp11::mp_transform<adapter::adapter_t, Tuple>;
+   using variant_type = boost::mp11::mp_rename<adapter_tuple, boost::variant2::variant>;
+   using adapters_array_type = std::array<variant_type, size>;
+
+   adapters_array_type adapters_;
+
+public:
+   static_adapter(Tuple& r = nullptr)
+   {
+      adapter::detail::assigner<size - 1>::assign(adapters_, r);
+   }
+
+   auto supported_response_size() const noexcept { return size;}
+
+   void
+   operator()(
+      std::size_t i,
+      resp3::node<boost::string_view> const& nd,
+      boost::system::error_code& ec)
+   {
+      using boost::variant2::visit;
+      BOOST_ASSERT(i < adapters_.size());
+      visit([&](auto& arg){arg(nd, ec);}, adapters_.at(i));
+   }
+};
+
+template <class Vector>
+class vector_adapter {
+private:
+   using adapter_type = typename adapter::detail::response_traits<Vector>::adapter_type;
+   adapter_type adapter_;
+
+public:
+   vector_adapter(Vector& v) : adapter_{adapter::adapt(v)} { }
+
+   auto supported_response_size() const noexcept { return std::size_t(-1);}
+
+   void
+   operator()(
+      std::size_t,
+      resp3::node<boost::string_view> const& nd,
+      boost::system::error_code& ec)
+   {
+      adapter_(nd, ec);
+   }
+};
+
+template <class>
+struct response_traits;
+
+template <>
+struct response_traits<void> {
+   using response_type = void;
+   using adapter_type = detail::ignore_adapter;
+
+   static auto adapt() noexcept
+      { return detail::ignore_adapter{}; }
+};
+
+template <class String, class Allocator>
+struct response_traits<std::vector<resp3::node<String>, Allocator>> {
+   using response_type = std::vector<resp3::node<String>, Allocator>;
+   using adapter_type = vector_adapter<response_type>;
+
+   static auto adapt(response_type& v) noexcept
+      { return adapter_type{v}; }
+};
+
+template <class ...Ts>
+struct response_traits<std::tuple<Ts...>> {
+   using response_type = std::tuple<Ts...>;
+   using adapter_type = static_adapter<response_type>;
+
+   static auto adapt(response_type& r) noexcept
+      { return adapter_type{r}; }
+};
+
+} // detail
+
+/** @brief Creates an adapter that ignores responses.
+ *
+ *  This function can be used to create adapters that ignores
+ *  responses. As a result it can improve performance.
+ */
+auto adapt() noexcept
+{
+   return detail::response_traits<void>::adapt();
+}
+
+/** @brief Adapts a type to be used as a response.
+ *
+ *  The type T can be any STL container, any integer type and
+ *  \c std::string
+ */
+template<class T>
+auto adapt(T& t) noexcept
+{
+   return detail::response_traits<T>::adapt(t);
+}
+
+} // aedis
+
+#endif // AEDIS_ADAPT_HPP

include/aedis/adapter/adapt.hpp

@@ -15,7 +15,8 @@ namespace adapter {
 template <class T>
 using adapter_t = typename detail::adapter_t<T>;
 
-/** \brief Creates a dummy response adapter.
+/** \internal
+    \brief Creates a dummy response adapter.
     \ingroup any
   
     The adapter returned by this function ignores responses. It is
@@ -41,7 +42,8 @@ inline
 auto adapt() noexcept
    { return detail::response_traits<void>::adapt(); }
 
-/** \brief Adapts user data to read operations.
+/** \internal
+ *  \brief Adapts user data to read operations.
  *  \ingroup any
  *
  *  STL containers, \c std::tuple and built-in types are supported and

include/aedis/adapter/detail/adapters.hpp

@@ -24,11 +24,11 @@
 #include <boost/spirit/home/x3.hpp>
 #include <boost/utility/string_view.hpp>
 
+#include <aedis/error.hpp>
 #include <aedis/resp3/type.hpp>
+#include <aedis/resp3/request.hpp>
 #include <aedis/resp3/detail/parser.hpp>
-#include <aedis/generic/serializer.hpp>
 #include <aedis/resp3/node.hpp>
-#include <aedis/adapter/error.hpp>
 
 namespace aedis {
 namespace adapter {
@@ -52,7 +52,7 @@ parse_double(
 
 template <class T>
 typename std::enable_if<std::is_integral<T>::value, void>::type
-from_string(
+from_bulk(
    T& i,
    boost::string_view sv,
    boost::system::error_code& ec)
@@ -60,15 +60,15 @@ from_string(
    i = resp3::detail::parse_uint(sv.data(), sv.size(), ec);
 }
 
-void from_string(
+void from_bulk(
    bool& t,
    boost::string_view sv,
-   boost::system::error_code& ec)
+   boost::system::error_code&)
 {
    t = *sv.data() == 't';
 }
 
-void from_string(
+void from_bulk(
    double& d,
    boost::string_view sv,
    boost::system::error_code& ec)
@@ -78,7 +78,7 @@ void from_string(
 
 template <class CharT, class Traits, class Allocator>
 void
-from_string(
+from_bulk(
    std::basic_string<CharT, Traits, Allocator>& s,
    boost::string_view sv,
    boost::system::error_code&)
@@ -91,9 +91,9 @@ from_string(
 void set_on_resp3_error(resp3::type t, boost::system::error_code& ec)
 {
    switch (t) {
-      case resp3::type::simple_error: ec = adapter::error::simple_error; return;
-      case resp3::type::blob_error: ec = adapter::error::blob_error; return;
-      case resp3::type::null: ec = adapter::error::null; return;
+      case resp3::type::simple_error: ec = error::simple_error; return;
+      case resp3::type::blob_error: ec = error::blob_error; return;
+      case resp3::type::null: ec = error::null; return;
       default: return;
    }
 }
@@ -105,9 +105,10 @@ private:
 
 public:
    general_aggregate(Result* c = nullptr): result_(c) {}
-   void operator()(resp3::node<boost::string_view> const& n, boost::system::error_code&)
+   void operator()(resp3::node<boost::string_view> const& n, boost::system::error_code& ec)
    {
       result_->push_back({n.data_type, n.aggregate_size, n.depth, std::string{std::cbegin(n.value), std::cend(n.value)}});
+      set_on_resp3_error(n.data_type, ec);
    }
 };
 
@@ -119,12 +120,13 @@ private:
 public:
    general_simple(Node* t = nullptr) : result_(t) {}
 
-   void operator()(resp3::node<boost::string_view> const& n, boost::system::error_code&)
+   void operator()(resp3::node<boost::string_view> const& n, boost::system::error_code& ec)
    {
-     result_->data_type = n.data_type;
-     result_->aggregate_size = n.aggregate_size;
-     result_->depth = n.depth;
-     result_->value.assign(n.value.data(), n.value.size());
+      result_->data_type = n.data_type;
+      result_->aggregate_size = n.aggregate_size;
+      result_->depth = n.depth;
+      result_->value.assign(n.value.data(), n.value.size());
+      set_on_resp3_error(n.data_type, ec);
    }
 };
 
@@ -144,11 +146,11 @@ public:
          return;
 
       if (is_aggregate(n.data_type)) {
-         ec = adapter::error::expects_simple_type;
+         ec = error::expects_simple_type;
          return;
       }
 
-      from_string(result, n.value, ec);
+      from_bulk(result, n.value, ec);
    }
 };
 
@@ -180,12 +182,12 @@ public:
       BOOST_ASSERT(nd.aggregate_size == 1);
 
       if (nd.depth < 1) {
-	 ec = adapter::error::expects_set_type;
+	 ec = error::expects_set_type;
 	 return;
       }
 
       typename Result::key_type obj;
-      from_string(obj, nd.value, ec);
+      from_bulk(obj, nd.value, ec);
       hint_ = result.insert(hint_, std::move(obj));
    }
 };
@@ -219,17 +221,17 @@ public:
       BOOST_ASSERT(nd.aggregate_size == 1);
 
       if (nd.depth < 1) {
-	 ec = adapter::error::expects_map_type;
+	 ec = error::expects_map_type;
 	 return;
       }
 
       if (on_key_) {
          typename Result::key_type obj;
-         from_string(obj, nd.value, ec);
+         from_bulk(obj, nd.value, ec);
          current_ = result.insert(current_, {std::move(obj), {}});
       } else {
          typename Result::mapped_type obj;
-         from_string(obj, nd.value, ec);
+         from_bulk(obj, nd.value, ec);
          current_->second = std::move(obj);
       }
 
@@ -257,7 +259,7 @@ public:
          result.reserve(result.size() + m * nd.aggregate_size);
       } else {
          result.push_back({});
-         from_string(result.back(), nd.value, ec);
+         from_bulk(result.back(), nd.value, ec);
       }
    }
 };
@@ -282,7 +284,7 @@ public:
 
       if (is_aggregate(nd.data_type)) {
 	 if (i_ != -1) {
-            ec = adapter::error::nested_aggregate_unsupported;
+            ec = error::nested_aggregate_unsupported;
             return;
          }
 
@@ -292,12 +294,12 @@ public:
          }
       } else {
          if (i_ == -1) {
-            ec = adapter::error::expects_aggregate_type;
+            ec = error::expects_aggregate_type;
             return;
          }
 
          BOOST_ASSERT(nd.aggregate_size == 1);
-         from_string(result.at(i_), nd.value, ec);
+         from_bulk(result.at(i_), nd.value, ec);
       }
 
       ++i_;
@@ -322,12 +324,12 @@ struct list_impl {
       if (!is_aggregate(nd.data_type)) {
         BOOST_ASSERT(nd.aggregate_size == 1);
         if (nd.depth < 1) {
-           ec = adapter::error::expects_aggregate_type;
+           ec = error::expects_aggregate_type;
            return;
         }
 
         result.push_back({});
-        from_string(result.back(), nd.value, ec);
+        from_bulk(result.back(), nd.value, ec);
       }
    }
 };

include/aedis/adapter/detail/response_traits.hpp

@@ -13,23 +13,24 @@
 #include <boost/mp11.hpp>
 #include <boost/variant2.hpp>
 
+#include <aedis/error.hpp>
 #include <aedis/resp3/type.hpp>
 #include <aedis/resp3/read.hpp>
 #include <aedis/adapter/detail/adapters.hpp>
-#include <aedis/adapter/error.hpp>
 
 namespace aedis {
 namespace adapter {
 namespace detail {
 
+struct ignore {};
+
 /* Traits class for response objects.
  *
  * Provides traits for all supported response types i.e. all STL
  * containers and C++ buil-in types.
  */
 template <class ResponseType>
-struct response_traits
-{
+struct response_traits {
    using adapter_type = adapter::detail::wrapper<ResponseType>;
    static auto adapt(ResponseType& r) noexcept { return adapter_type{&r}; }
 };
@@ -37,32 +38,34 @@ struct response_traits
 template <class T>
 using adapter_t = typename response_traits<T>::adapter_type;
 
+template <>
+struct response_traits<ignore> {
+   using response_type = ignore;
+   using adapter_type = resp3::detail::ignore_response;
+   static auto adapt(response_type&) noexcept { return adapter_type{}; }
+};
+
 template <class T>
-struct response_traits<resp3::node<T>>
-{
+struct response_traits<resp3::node<T>> {
    using response_type = resp3::node<T>;
    using adapter_type = adapter::detail::general_simple<response_type>;
    static auto adapt(response_type& v) noexcept { return adapter_type{&v}; }
 };
 
 template <class String, class Allocator>
-struct response_traits<std::vector<resp3::node<String>, Allocator>>
-{
+struct response_traits<std::vector<resp3::node<String>, Allocator>> {
    using response_type = std::vector<resp3::node<String>, Allocator>;
    using adapter_type = adapter::detail::general_aggregate<response_type>;
    static auto adapt(response_type& v) noexcept { return adapter_type{&v}; }
 };
 
 template <>
-struct response_traits<void>
-{
+struct response_traits<void> {
    using response_type = void;
    using adapter_type = resp3::detail::ignore_response;
    static auto adapt() noexcept { return adapter_type{}; }
 };
 
-namespace detail {
-
 // Duplicated here to avoid circular include dependency.
 template<class T>
 auto internal_adapt(T& t) noexcept
@@ -92,11 +95,10 @@ class static_aggregate_adapter {
 private:
    using adapters_array_type = 
       std::array<
-         boost::mp11::mp_unique<
-            boost::mp11::mp_rename<
-               boost::mp11::mp_transform<
-                  adapter_t, Tuple>,
-                  boost::variant2::variant>>,
+         boost::mp11::mp_rename<
+            boost::mp11::mp_transform<
+               adapter_t, Tuple>,
+               boost::variant2::variant>,
          std::tuple_size<Tuple>::value>;
 
    std::size_t i_ = 0;
@@ -144,13 +146,11 @@ public:
    }
 };
 
-} // detail
-
 template <class... Ts>
 struct response_traits<std::tuple<Ts...>>
 {
    using response_type = std::tuple<Ts...>;
-   using adapter_type = detail::static_aggregate_adapter<response_type>;
+   using adapter_type = static_aggregate_adapter<response_type>;
    static auto adapt(response_type& r) noexcept { return adapter_type{&r}; }
 };
 

include/aedis/connection.hpp

@@ -0,0 +1,551 @@
+/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See
+ * accompanying file LICENSE.txt)
+ */
+
+#ifndef AEDIS_CONNECTION_HPP
+#define AEDIS_CONNECTION_HPP
+
+#include <vector>
+#include <queue>
+#include <limits>
+#include <chrono>
+#include <memory>
+#include <type_traits>
+
+#include <boost/assert.hpp>
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/asio/steady_timer.hpp>
+#include <boost/asio/experimental/channel.hpp>
+
+#include <aedis/adapt.hpp>
+#include <aedis/resp3/request.hpp>
+#include <aedis/detail/connection_ops.hpp>
+
+namespace aedis {
+
+/** @brief A high level Redis connection class.
+ *  @ingroup any
+ *
+ *  This class keeps a healthy connection to the Redis instance where
+ *  commands can be sent at any time. For more details, please see the
+ *  documentation of each individual function.
+ *
+ */
+template <class AsyncReadWriteStream = boost::asio::ip::tcp::socket>
+class connection {
+public:
+   /// Executor type.
+   using executor_type = typename AsyncReadWriteStream::executor_type;
+
+   /// Type of the next layer
+   using next_layer_type = AsyncReadWriteStream;
+
+   using default_completion_token_type = boost::asio::default_completion_token_t<executor_type>;
+   using channel_type = boost::asio::experimental::channel<executor_type, void(boost::system::error_code, std::size_t)>;
+   using clock_type = std::chrono::steady_clock;
+   using clock_traits_type = boost::asio::wait_traits<clock_type>;
+   using timer_type = boost::asio::basic_waitable_timer<clock_type, clock_traits_type, executor_type>;
+   using resolver_type = boost::asio::ip::basic_resolver<boost::asio::ip::tcp, executor_type>;
+
+   /** @brief Connection configuration parameters.
+    */
+   struct config {
+      /// The Redis server address.
+      std::string host = "127.0.0.1";
+
+      /// The Redis server port.
+      std::string port = "6379";
+
+      /// Username if authentication is required.
+      std::string username;
+
+      /// Password if authentication is required.
+      std::string password;
+
+      /// Timeout of the resolve operation.
+      std::chrono::milliseconds resolve_timeout = std::chrono::seconds{10};
+
+      /// Timeout of the connect operation.
+      std::chrono::milliseconds connect_timeout = std::chrono::seconds{10};
+
+      /// Time interval ping operations.
+      std::chrono::milliseconds ping_interval = std::chrono::seconds{1};
+
+      /// Time waited before trying a reconnection (see enable reconnect).
+      std::chrono::milliseconds reconnect_interval = std::chrono::seconds{1};
+
+      /// The maximum size allowed on read operations.
+      std::size_t max_read_size = (std::numeric_limits<std::size_t>::max)();
+
+      /// Whether to coalesce requests (see [pipelines](https://redis.io/topics/pipelining)).
+      bool coalesce_requests = true;
+
+      /// Enable events
+      bool enable_events = false;
+
+      /// Enable automatic reconnection (see also reconnect_interval).
+      bool enable_reconnect = false;
+   };
+
+   /// Events communicated through \c async_receive_event.
+   enum class event {
+      /// The address has been successfully resolved.
+      resolve,
+      /// Connected to the Redis server.
+      connect,
+      /// Success sending AUTH and HELLO.
+      hello,
+      /// A push event has been received.
+      push,
+      /// Used internally.
+      invalid
+   };
+
+   /** \brief Construct a connection from an executor.
+    *
+    *  \param ex The executor.
+    *  \param cfg Configuration parameters.
+    */
+   connection(executor_type ex, config cfg = config{})
+   : resv_{ex}
+   , ping_timer_{ex}
+   , check_idle_timer_{ex}
+   , writer_timer_{ex}
+   , read_timer_{ex}
+   , push_channel_{ex}
+   , cfg_{cfg}
+   , last_data_{std::chrono::time_point<std::chrono::steady_clock>::min()}
+   {
+      writer_timer_.expires_at(std::chrono::steady_clock::time_point::max());
+      read_timer_.expires_at(std::chrono::steady_clock::time_point::max());
+   }
+
+   /** \brief Construct a connection from an io_context.
+    *
+    *  \param ioc The executor.
+    *  \param cfg Configuration parameters.
+    */
+   connection(boost::asio::io_context& ioc, config cfg = config{})
+   : connection(ioc.get_executor(), cfg)
+   { }
+
+   /// Returns the executor.
+   auto get_executor() {return resv_.get_executor();}
+
+   /** @brief Starts communication with the Redis server asynchronously.
+    *
+    *  This function performs the following steps
+    *
+    *  \li Resolves the Redis host as of \c async_resolve with the
+    *  timeout passed in connection::config::resolve_timeout.
+    *
+    *  \li Connects to one of the endpoints returned by the resolve
+    *  operation with the timeout passed in connection::config::connect_timeout.
+    *
+    *  \li Starts the idle check operation with the timeout of twice
+    *  the value of connection::config::ping_interval. If no data is
+    *  received during that time interval \c async_run completes with
+    *  error::idle_timeout.
+    *
+    *  \li Starts the healthy check operation that sends command::ping
+    *  to Redis with a frequency equal to
+    *  connection::config::ping_interval.
+    *
+    *  \li Starts reading from the socket and delivering events to the
+    *  request started with \c async_exec and \c async_receive_event.
+    *
+    * For an example see echo_server.cpp.
+    *
+    *  \param token Completion token.
+    *
+    *  The completion token must have the following signature
+    *
+    *  @code
+    *  void f(boost::system::error_code);
+    *  @endcode
+    *
+    *  \return This function returns only when there is an error.
+    */
+   template <class CompletionToken = default_completion_token_type>
+   auto async_run(CompletionToken token = CompletionToken{})
+   {
+      return boost::asio::async_compose
+         < CompletionToken
+         , void(boost::system::error_code)
+         >(detail::run_op<connection>{this}, token, resv_);
+   }
+
+   /** @brief Executes a command on the redis server asynchronously.
+    *
+    *  \param req Request object.
+    *  \param adapter Response adapter.
+    *  \param token Asio completion token.
+    *
+    *  For an example see echo_server.cpp. The completion token must
+    *  have the following signature
+    *
+    *  @code
+    *  void f(boost::system::error_code, std::size_t);
+    *  @endcode
+    *
+    *  Where the second parameter is the size of the response in
+    *  bytes.
+    */
+   template <
+      class Adapter = detail::response_traits<void>::adapter_type,
+      class CompletionToken = default_completion_token_type>
+   auto async_exec(
+      resp3::request const& req,
+      Adapter adapter = adapt(),
+      CompletionToken token = CompletionToken{})
+   {
+      BOOST_ASSERT_MSG(req.size() <= adapter.supported_response_size(), "Request and adapter have incompatible sizes.");
+
+      return boost::asio::async_compose
+         < CompletionToken
+         , void(boost::system::error_code, std::size_t)
+         >(detail::exec_op<connection, Adapter>{this, &req, adapter}, token, resv_);
+   }
+
+   /** @brief Connects and executes a request asynchronously.
+    *
+    *  Combines \c async_run and the other \c async_exec overload in a
+    *  single function. This function is useful for users that want to
+    *  send a single request to the server and close it.
+    *
+    *  \param req Request object.
+    *  \param adapter Response adapter.
+    *  \param token Asio completion token.
+    *
+    *  For an example see intro.cpp. The completion token must have the following signature
+    *
+    *  @code
+    *  void f(boost::system::error_code, std::size_t);
+    *  @endcode
+    *
+    *  Where the second parameter is the size of the response in bytes.
+    */
+   template <
+      class Adapter = detail::response_traits<void>::adapter_type,
+      class CompletionToken = default_completion_token_type>
+   auto async_run(
+      resp3::request const& req,
+      Adapter adapter = adapt(),
+      CompletionToken token = CompletionToken{})
+   {
+      return boost::asio::async_compose
+         < CompletionToken
+         , void(boost::system::error_code, std::size_t)
+         >(detail::runexec_op<connection, Adapter>
+            {this, &req, adapter}, token, resv_);
+   }
+
+   /** @brief Receives unsolicited events asynchronously.
+    *
+    *  Users that expect unsolicited events should call this function
+    *  in a loop. If an unsolicited events comes in and there is no
+    *  reader, the connection will hang and eventually timeout.
+    *
+    *  \param adapter The response adapter.
+    *  \param token The Asio completion token.
+    *
+    *  For an example see subscriber.cpp. The completion token must
+    *  have the following signature
+    *
+    *  @code
+    *  void f(boost::system::error_code, event);
+    *  @endcode
+    *
+    *  Where the second parameter is the size of the response that has
+    *  just been read.
+    */
+   template <
+      class Adapter = detail::response_traits<void>::adapter_type,
+      class CompletionToken = default_completion_token_type>
+   auto async_receive_event(
+      Adapter adapter = adapt(),
+      CompletionToken token = CompletionToken{})
+   {
+      auto f =
+         [adapter]
+         (resp3::node<boost::string_view> const& node, boost::system::error_code& ec) mutable
+      {
+         adapter(std::size_t(-1), node, ec);
+      };
+
+      return boost::asio::async_compose
+         < CompletionToken
+         , void(boost::system::error_code, event)
+         >(detail::receive_op<connection, decltype(f)>{this, f}, token, resv_);
+   }
+
+   /** @brief Cancel all pending request.
+    *
+    * \returns The number of requests that have been canceled.
+    */
+   std::size_t cancel_execs()
+   {
+      for (auto& e: reqs_) {
+         e->stop = true;
+         e->timer.cancel_one();
+      }
+
+      auto const ret = reqs_.size();
+      reqs_ = {};
+      return ret;
+   }
+
+   /** @brief Closes the connection with the database.
+    *
+    *  Calling this function will cause \c async_run to return. It is
+    *  safe to try a reconnect after that, when that happens, all
+    *  pending request will be automatically sent.
+    *
+    *  Calling this function will causes @c async_receive_event to return
+    *  with @c boost::asio::experimental::channel_errc::channel_cancelled.
+    *  
+    *  \remarks
+    *
+    *  The prefered way to close a connection is to send a \c quit
+    *  command if you are actively closing it.  Otherwise an
+    *  unresponsive Redis server will cause the idle-checks to kick in
+    *  and lead to \c async_run returning with idle_timeout.
+    *
+    */
+   void cancel_run()
+   {
+      if (socket_)
+         socket_->close();
+
+      read_timer_.cancel();
+      check_idle_timer_.cancel();
+      writer_timer_.cancel();
+      ping_timer_.cancel();
+
+      // Cancel own pings if there is any waiting.
+      auto point = std::stable_partition(std::begin(reqs_), std::end(reqs_), [](auto const& ptr) {
+         return !ptr->req->close_on_run_completion;
+      });
+
+      std::for_each(point, std::end(reqs_), [](auto const& ptr) {
+         ptr->stop = true;
+         ptr->timer.cancel();
+      });
+
+      reqs_.erase(point, std::end(reqs_));
+   }
+
+   /// Cancels the event receiver.
+   void cancel_event_receiver()
+   {
+      push_channel_.cancel();
+   }
+
+   /// Get the config object.
+   config& get_config() noexcept { return cfg_;}
+
+   /// Gets the config object.
+   config const& get_config() const noexcept { return cfg_;}
+
+private:
+   struct req_info {
+      req_info(executor_type ex) : timer{ex} {}
+      timer_type timer;
+      resp3::request const* req = nullptr;
+      std::size_t cmds = 0;
+      bool stop = false;
+      bool written = false;
+   };
+
+   using time_point_type = std::chrono::time_point<std::chrono::steady_clock>;
+   using reqs_type = std::deque<std::shared_ptr<req_info>>;
+
+   template <class T, class U> friend struct detail::receive_op;
+   template <class T> friend struct detail::reader_op;
+   template <class T> friend struct detail::writer_op;
+   template <class T> friend struct detail::ping_op;
+   template <class T> friend struct detail::run_op;
+   template <class T> friend struct detail::run_one_op;
+   template <class T, class U> friend struct detail::exec_op;
+   template <class T, class U> friend struct detail::exec_read_op;
+   template <class T, class U> friend struct detail::runexec_op;
+   template <class T> friend struct detail::connect_with_timeout_op;
+   template <class T> friend struct detail::resolve_with_timeout_op;
+   template <class T> friend struct detail::check_idle_op;
+   template <class T> friend struct detail::start_op;
+   template <class T> friend struct detail::send_receive_op;
+
+   template <class CompletionToken = default_completion_token_type>
+   auto async_run_one(CompletionToken token = CompletionToken{})
+   {
+      return boost::asio::async_compose
+         < CompletionToken
+         , void(boost::system::error_code)
+         >(detail::run_one_op<connection>{this}, token, resv_);
+   }
+
+   void cancel_push_requests()
+   {
+      auto point = std::stable_partition(std::begin(reqs_), std::end(reqs_), [](auto const& ptr) {
+         return !(ptr->written && ptr->req->size() == 0);
+      });
+
+      std::for_each(point, std::end(reqs_), [](auto const& ptr) {
+         ptr->timer.cancel();
+      });
+
+      reqs_.erase(point, std::end(reqs_));
+   }
+
+   void add_request_info(std::shared_ptr<req_info> const& info)
+   {
+      reqs_.push_back(info);
+      if (socket_ != nullptr && socket_->is_open() && cmds_ == 0 && write_buffer_.empty())
+         writer_timer_.cancel();
+   }
+
+   auto make_dynamic_buffer()
+      { return boost::asio::dynamic_buffer(read_buffer_, cfg_.max_read_size); }
+
+   template <class CompletionToken>
+   auto async_resolve_with_timeout(CompletionToken&& token)
+   {
+      return boost::asio::async_compose
+         < CompletionToken
+         , void(boost::system::error_code)
+         >(detail::resolve_with_timeout_op<connection>{this},
+            token, resv_);
+   }
+
+   template <class CompletionToken>
+   auto async_connect_with_timeout(CompletionToken&& token)
+   {
+      return boost::asio::async_compose
+         < CompletionToken
+         , void(boost::system::error_code)
+         >(detail::connect_with_timeout_op<connection>{this}, token, resv_);
+   }
+
+   template <class CompletionToken>
+   auto reader(CompletionToken&& token)
+   {
+      return boost::asio::async_compose
+         < CompletionToken
+         , void(boost::system::error_code)
+         >(detail::reader_op<connection>{this}, token, resv_.get_executor());
+   }
+
+   template <class CompletionToken>
+   auto writer(CompletionToken&& token)
+   {
+      return boost::asio::async_compose
+         < CompletionToken
+         , void(boost::system::error_code)
+         >(detail::writer_op<connection>{this}, token, resv_.get_executor());
+   }
+
+   template <class CompletionToken>
+   auto
+   async_start(CompletionToken&& token)
+   {
+      return boost::asio::async_compose
+         < CompletionToken
+         , void(boost::system::error_code)
+         >(detail::start_op<connection>{this}, token, resv_);
+   }
+
+   template <class CompletionToken>
+   auto async_ping(CompletionToken&& token)
+   {
+      return boost::asio::async_compose
+         < CompletionToken
+         , void(boost::system::error_code)
+         >(detail::ping_op<connection>{this}, token, resv_);
+   }
+
+   template <class CompletionToken>
+   auto async_check_idle(CompletionToken&& token)
+   {
+      return boost::asio::async_compose
+         < CompletionToken
+         , void(boost::system::error_code)
+         >(detail::check_idle_op<connection>{this}, token, check_idle_timer_);
+   }
+
+   template <class Adapter, class CompletionToken>
+   auto async_exec_read(Adapter adapter, std::size_t cmds, CompletionToken token)
+   {
+      return boost::asio::async_compose
+         < CompletionToken
+         , void(boost::system::error_code, std::size_t)
+         >(detail::exec_read_op<connection, Adapter>{this, adapter, cmds}, token, resv_);
+   }
+
+   void coalesce_requests()
+   {
+      // Coaleces all requests: Copies the request to the variables
+      // that won't be touched while async_write is suspended.
+      BOOST_ASSERT(write_buffer_.empty());
+      BOOST_ASSERT(!reqs_.empty());
+
+      auto const size = cfg_.coalesce_requests ? reqs_.size() : 1;
+      for (auto i = 0UL; i < size; ++i) {
+         write_buffer_ += reqs_.at(i)->req->payload();
+         cmds_ += reqs_.at(i)->req->size();
+         reqs_.at(i)->written = true;
+      }
+   }
+
+   // IO objects
+   resolver_type resv_;
+   std::shared_ptr<AsyncReadWriteStream> socket_;
+   timer_type ping_timer_;
+   timer_type check_idle_timer_;
+   timer_type writer_timer_;
+   timer_type read_timer_;
+   channel_type push_channel_;
+
+   config cfg_;
+   std::string read_buffer_;
+   std::string write_buffer_;
+   std::size_t cmds_ = 0;
+   reqs_type reqs_;
+   event last_event_ = event::invalid;
+
+   // Last time we received data.
+   time_point_type last_data_;
+
+   // The result of async_resolve.
+   boost::asio::ip::tcp::resolver::results_type endpoints_;
+
+   resp3::request req_;
+};
+
+/// Converts a connection event to a string.
+template <class T>
+char const* to_string(typename connection<T>::event e)
+{
+   using event_type = typename connection<T>::event;
+   switch (e) {
+      case event_type::resolve: return "resolve";
+      case event_type::connect: return "connect";
+      case event_type::hello: return "hello";
+      case event_type::push: return "push";
+      case event_type::invalid: return "invalid";
+      default: BOOST_ASSERT_MSG(false, "to_string: unhandled event.");
+   }
+}
+
+/// Writes a connection event to the stream.
+template <class T>
+std::ostream& operator<<(std::ostream& os, typename connection<T>::event e)
+{
+   os << to_string(e);
+   return os;
+}
+
+} // aedis
+
+#endif // AEDIS_CONNECTION_HPP

include/aedis/detail/connection_ops.hpp

@@ -0,0 +1,663 @@
+/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See
+ * accompanying file LICENSE.txt)
+ */
+
+#ifndef AEDIS_CONNECTION_OPS_HPP
+#define AEDIS_CONNECTION_OPS_HPP
+
+#include <array>
+#include <algorithm>
+
+#include <boost/assert.hpp>
+#include <boost/system.hpp>
+#include <boost/asio/write.hpp>
+#include <boost/core/ignore_unused.hpp>
+#include <boost/asio/experimental/parallel_group.hpp>
+
+#include <aedis/adapt.hpp>
+#include <aedis/error.hpp>
+#include <aedis/detail/net.hpp>
+#include <aedis/resp3/type.hpp>
+#include <aedis/resp3/detail/exec.hpp>
+#include <aedis/resp3/detail/parser.hpp>
+#include <aedis/resp3/read.hpp>
+#include <aedis/resp3/write.hpp>
+#include <aedis/resp3/request.hpp>
+
+#define HANDLER_LOCATION \
+  BOOST_ASIO_HANDLER_LOCATION((__FILE__, __LINE__, __func__))
+
+namespace aedis {
+namespace detail {
+
+#include <boost/asio/yield.hpp>
+
+template <class Conn>
+struct connect_with_timeout_op {
+   Conn* conn;
+   boost::asio::coroutine coro{};
+
+   template <class Self>
+   void operator()( Self& self
+                  , boost::system::error_code ec = {}
+                  , boost::asio::ip::tcp::endpoint const& = {})
+   {
+      reenter (coro)
+      {
+         BOOST_ASSERT(conn->socket_ != nullptr);
+         conn->ping_timer_.expires_after(conn->cfg_.connect_timeout);
+         yield aedis::detail::async_connect(*conn->socket_, conn->ping_timer_, conn->endpoints_, std::move(self));
+         self.complete(ec);
+      }
+   }
+};
+
+template <class Conn>
+struct resolve_with_timeout_op {
+   Conn* conn;
+   boost::asio::coroutine coro{};
+
+   template <class Self>
+   void operator()( Self& self
+                  , boost::system::error_code ec = {}
+                  , boost::asio::ip::tcp::resolver::results_type res = {})
+   {
+      reenter (coro)
+      {
+         conn->ping_timer_.expires_after(conn->cfg_.resolve_timeout);
+         yield
+         aedis::detail::async_resolve(
+            conn->resv_, conn->ping_timer_,
+            conn->cfg_.host, conn->cfg_.port, std::move(self));
+         conn->endpoints_ = res;
+         self.complete(ec);
+      }
+   }
+};
+
+template <class Conn, class Adapter>
+struct receive_op {
+   Conn* conn = nullptr;
+   Adapter adapter;
+   std::size_t read_size = 0;
+   boost::asio::coroutine coro{};
+
+   template <class Self>
+   void
+   operator()( Self& self
+             , boost::system::error_code ec = {}
+             , std::size_t n = 0)
+   {
+      reenter (coro)
+      {
+         yield conn->push_channel_.async_receive(std::move(self));
+         if (ec) {
+            self.complete(ec, Conn::event::invalid);
+            return;
+         }
+
+         if (conn->last_event_ == Conn::event::push) {
+            BOOST_ASSERT(conn->socket_ != nullptr);
+            yield resp3::async_read(*conn->socket_, conn->make_dynamic_buffer(), adapter, std::move(self));
+            if (ec) {
+               conn->cancel_run();
+               self.complete(ec, Conn::event::invalid);
+               return;
+            }
+
+            read_size = n;
+         }
+
+         yield conn->push_channel_.async_send({}, 0, std::move(self));
+         self.complete(ec, conn->last_event_);
+         return;
+      }
+   }
+};
+
+template <class Conn, class Adapter>
+struct exec_read_op {
+   Conn* conn;
+   Adapter adapter;
+   std::size_t cmds = 0;
+   std::size_t read_size = 0;
+   std::size_t index = 0;
+   boost::asio::coroutine coro{};
+
+   template <class Self>
+   void
+   operator()( Self& self
+             , boost::system::error_code ec = {}
+             , std::size_t n = 0)
+   {
+      reenter (coro)
+      {
+         // Loop reading the responses to this request.
+         BOOST_ASSERT(!conn->reqs_.empty());
+         while (cmds != 0) {
+            BOOST_ASSERT(conn->cmds_ != 0);
+
+            //-----------------------------------
+            // If we detect a push in the middle of a request we have
+            // to hand it to the push consumer. To do that we need
+            // some data in the read bufer.
+            if (conn->read_buffer_.empty()) {
+               BOOST_ASSERT(conn->socket_ != nullptr);
+               yield boost::asio::async_read_until(*conn->socket_, conn->make_dynamic_buffer(), "\r\n", std::move(self));
+               if (ec) {
+                  conn->cancel_run();
+                  self.complete(ec, 0);
+                  return;
+               }
+            }
+
+            // If the next request is a push we have to handle it to
+            // the receive_op wait for it to be done and continue.
+            if (resp3::to_type(conn->read_buffer_.front()) == resp3::type::push) {
+               conn->last_event_ = Conn::event::push;
+               yield async_send_receive(conn->push_channel_, std::move(self));
+               if (ec) {
+                  // Notice we don't call cancel_run() as that is the
+                  // responsability of the receive_op.
+                  self.complete(ec, 0);
+                  return;
+               }
+
+               continue;
+            }
+            //-----------------------------------
+
+            yield
+            resp3::async_read(*conn->socket_, conn->make_dynamic_buffer(),
+               [i = index, adpt = adapter] (resp3::node<boost::string_view> const& nd, boost::system::error_code& ec) mutable { adpt(i, nd, ec); },
+               std::move(self));
+
+            ++index;
+
+            if (ec) {
+               conn->cancel_run();
+               self.complete(ec, 0);
+               return;
+            }
+
+            read_size += n;
+
+            BOOST_ASSERT(cmds != 0);
+            --cmds;
+
+            BOOST_ASSERT(conn->cmds_ != 0);
+            --conn->cmds_;
+         }
+
+         self.complete({}, read_size);
+      }
+   }
+};
+
+template <class Conn, class Adapter>
+struct exec_op {
+   using req_info_type = typename Conn::req_info;
+
+   Conn* conn = nullptr;
+   resp3::request const* req = nullptr;
+   Adapter adapter{};
+   std::shared_ptr<req_info_type> info = nullptr;
+   std::size_t read_size = 0;
+   boost::asio::coroutine coro{};
+
+   template <class Self>
+   void
+   operator()( Self& self
+             , boost::system::error_code ec = {}
+             , std::size_t n = 0)
+   {
+      reenter (coro)
+      {
+         info = std::allocate_shared<req_info_type>(boost::asio::get_associated_allocator(self), conn->resv_.get_executor());
+         info->timer.expires_at(std::chrono::steady_clock::time_point::max());
+         info->req = req;
+         info->cmds = req->size();
+         info->stop = false;
+
+         conn->add_request_info(info);
+         yield info->timer.async_wait(std::move(self));
+         BOOST_ASSERT(conn->socket_ != nullptr);
+         BOOST_ASSERT(!!ec);
+         if (info->stop) {
+            self.complete(ec, 0);
+            return;
+         }
+
+         BOOST_ASSERT(conn->socket_->is_open());
+          
+         if (req->size() == 0) {
+            self.complete({}, 0);
+            return;
+         }
+
+         BOOST_ASSERT(!conn->reqs_.empty());
+         BOOST_ASSERT(conn->reqs_.front() != nullptr);
+         BOOST_ASSERT(conn->cmds_ != 0);
+         yield conn->async_exec_read(adapter, conn->reqs_.front()->cmds, std::move(self));
+         if (ec) {
+            self.complete(ec, 0);
+            return;
+         }
+
+         read_size = n;
+
+         BOOST_ASSERT(!conn->reqs_.empty());
+         conn->reqs_.pop_front();
+
+         if (conn->cmds_ == 0) {
+            conn->read_timer_.cancel_one();
+            if (!conn->reqs_.empty())
+               conn->writer_timer_.cancel_one();
+         } else {
+            BOOST_ASSERT(!conn->reqs_.empty());
+            conn->reqs_.front()->timer.cancel_one();
+         }
+
+         self.complete({}, read_size);
+      }
+   }
+};
+
+template <class Conn>
+struct ping_op {
+   Conn* conn;
+   boost::asio::coroutine coro{};
+
+   template <class Self>
+   void
+   operator()( Self& self
+             , boost::system::error_code ec = {}
+             , std::size_t = 0)
+   {
+      reenter (coro) for (;;)
+      {
+         conn->ping_timer_.expires_after(conn->cfg_.ping_interval);
+         yield conn->ping_timer_.async_wait(std::move(self));
+         BOOST_ASSERT(conn->socket_ != nullptr);
+         if (ec || !conn->socket_->is_open()) {
+            self.complete(ec);
+            return;
+         }
+
+         conn->req_.clear();
+         conn->req_.push("PING");
+         conn->req_.close_on_run_completion = true;
+         yield conn->async_exec(conn->req_, aedis::adapt(), std::move(self));
+         if (ec) {
+            // Notice we don't report error but let the idle check
+            // timeout. It is enough to finish the op.
+            self.complete({});
+            return;
+         }
+      }
+   }
+};
+
+template <class Conn>
+struct check_idle_op {
+   Conn* conn;
+   boost::asio::coroutine coro{};
+
+   template <class Self>
+   void operator()(Self& self, boost::system::error_code ec = {})
+   {
+      reenter (coro) for (;;)
+      {
+         conn->check_idle_timer_.expires_after(2 * conn->cfg_.ping_interval);
+         yield conn->check_idle_timer_.async_wait(std::move(self));
+         BOOST_ASSERT(conn->socket_ != nullptr);
+         if (ec || !conn->socket_->is_open()) {
+            // Notice this is not an error, it was requested from an
+            // external op.
+            self.complete({});
+            return;
+         }
+
+         auto const now = std::chrono::steady_clock::now();
+         if (conn->last_data_ +  (2 * conn->cfg_.ping_interval) < now) {
+            conn->cancel_run();
+            self.complete(error::idle_timeout);
+            return;
+         }
+
+         conn->last_data_ = now;
+      }
+   }
+};
+
+template <class Conn>
+struct start_op {
+   Conn* conn;
+   boost::asio::coroutine coro{};
+
+   template <class Self>
+   void operator()( Self& self
+                  , std::array<std::size_t, 4> order = {}
+                  , boost::system::error_code ec0 = {}
+                  , boost::system::error_code ec1 = {}
+                  , boost::system::error_code ec2 = {}
+                  , boost::system::error_code ec3 = {})
+   {
+      reenter (coro)
+      {
+         yield
+         boost::asio::experimental::make_parallel_group(
+            [this](auto token) { return conn->reader(token);},
+            [this](auto token) { return conn->writer(token);},
+            [this](auto token) { return conn->async_check_idle(token);},
+            [this](auto token) { return conn->async_ping(token);}
+         ).async_wait(
+            boost::asio::experimental::wait_for_one_error(),
+            std::move(self));
+
+         switch (order[0]) {
+           case 0:
+           {
+              self.complete(ec0);
+           } break;
+           case 1:
+           {
+              self.complete(ec1);
+           } break;
+           case 2:
+           {
+              self.complete(ec2);
+           } break;
+           case 3:
+           {
+              self.complete(ec3);
+           } break;
+           default: BOOST_ASSERT(false);
+         }
+      }
+   }
+};
+
+template <class Conn>
+struct run_one_op {
+   Conn* conn;
+   boost::asio::coroutine coro{};
+
+   template <class Self>
+   void operator()(
+      Self& self,
+      boost::system::error_code ec = {},
+      std::size_t = 0)
+   {
+      reenter (coro)
+      {
+         yield conn->async_resolve_with_timeout(std::move(self));
+         if (ec) {
+            conn->cancel_run();
+            self.complete(ec);
+            return;
+         }
+
+         if (conn->cfg_.enable_events) {
+            conn->last_event_ = Conn::event::resolve;
+            yield async_send_receive(conn->push_channel_, std::move(self));
+            if (ec) {
+               self.complete(ec);
+               return;
+            }
+         }
+
+         conn->socket_ = std::make_shared<typename Conn::next_layer_type>(conn->resv_.get_executor());
+
+         yield conn->async_connect_with_timeout(std::move(self));
+         if (ec) {
+            conn->cancel_run();
+            self.complete(ec);
+            return;
+         }
+
+         if (conn->cfg_.enable_events) {
+            conn->last_event_ = Conn::event::connect;
+            yield async_send_receive(conn->push_channel_, std::move(self));
+            if (ec) {
+               self.complete(ec);
+               return;
+            }
+         }
+
+         conn->req_.clear();
+         if (!std::empty(conn->cfg_.username) && !std::empty(conn->cfg_.password))
+            conn->req_.push("AUTH", conn->cfg_.username, conn->cfg_.password);
+         conn->req_.push("HELLO", "3");
+
+         conn->ping_timer_.expires_after(conn->cfg_.ping_interval);
+
+         yield
+         async_exec(
+            *conn->socket_,
+            conn->ping_timer_,
+            conn->req_,
+            adapter::adapt(),
+            conn->make_dynamic_buffer(),
+            std::move(self)
+         );
+
+         if (ec) {
+            conn->cancel_run();
+            self.complete(ec);
+            return;
+         }
+
+         if (conn->cfg_.enable_events) {
+            conn->last_event_ = Conn::event::hello;
+            yield async_send_receive(conn->push_channel_, std::move(self));
+            if (ec) {
+               self.complete(ec);
+               return;
+            }
+         }
+
+         std::for_each(std::begin(conn->reqs_), std::end(conn->reqs_), [](auto const& ptr) {
+            return ptr->written = false;
+         });
+
+         yield conn->async_start(std::move(self));
+         self.complete(ec);
+      }
+   }
+};
+
+template <class Conn>
+struct run_op {
+   Conn* conn;
+   boost::asio::coroutine coro{};
+
+   template <class Self>
+   void operator()(
+      Self& self,
+      boost::system::error_code ec = {},
+      std::size_t = 0)
+   {
+      reenter (coro) for(;;)
+      {
+         yield conn->async_run_one(std::move(self));
+
+         if (!conn->cfg_.enable_reconnect) {
+            self.complete(ec);
+            return;
+         }
+
+         // Consider communicating the return of async_run_one as an
+         // event here.
+
+         conn->ping_timer_.expires_after(conn->cfg_.reconnect_interval);
+         yield conn->ping_timer_.async_wait(std::move(self)); 
+      }
+   }
+};
+
+
+template <class Conn>
+struct writer_op {
+   Conn* conn;
+   boost::asio::coroutine coro{};
+
+   template <class Self>
+   void operator()( Self& self
+                  , boost::system::error_code ec = {}
+                  , std::size_t n = 0)
+   {
+      boost::ignore_unused(n);
+
+      reenter (coro) for (;;)
+      {
+         while (!conn->reqs_.empty() && conn->cmds_ == 0 && conn->write_buffer_.empty()) {
+            conn->coalesce_requests();
+            yield boost::asio::async_write(*conn->socket_, boost::asio::buffer(conn->write_buffer_), std::move(self));
+            if (ec) {
+               self.complete(ec);
+               return;
+            }
+
+            // We have to clear the payload right after the read op in
+            // order to to use it as a flag that informs there is no
+            // ongoing write.
+            conn->write_buffer_.clear();
+            conn->cancel_push_requests();
+         }
+
+         if (conn->socket_->is_open()) {
+            yield conn->writer_timer_.async_wait(std::move(self));
+            // The timer may be canceled either to stop the write op
+            // or to proceed to the next write, the difference between
+            // the two is that for the former the socket will be
+            // closed first. We check for that below.
+         }
+
+         if (!conn->socket_->is_open()) {
+            // Notice this is not an error of the op, stoping was
+            // requested from the outside, so we complete with
+            // success.
+            self.complete({});
+            return;
+         }
+      }
+   }
+};
+
+template <class Conn>
+struct reader_op {
+   Conn* conn;
+   boost::asio::coroutine coro{};
+
+   template <class Self>
+   void operator()( Self& self
+                  , boost::system::error_code ec = {}
+                  , std::size_t n = 0)
+   {
+      boost::ignore_unused(n);
+
+      reenter (coro) for (;;)
+      {
+         BOOST_ASSERT(conn->socket_->is_open());
+         yield boost::asio::async_read_until(*conn->socket_, conn->make_dynamic_buffer(), "\r\n", std::move(self));
+         if (ec) {
+            conn->cancel_run();
+            self.complete(ec);
+            return;
+         }
+
+         conn->last_data_ = std::chrono::steady_clock::now();
+
+         // We handle unsolicited events in the following way
+         //
+         // 1. Its resp3 type is a push.
+         //
+         // 2. A non-push type is received with an empty requests
+         //    queue. I have noticed this is possible (e.g. -MISCONF).
+         //    I expect them to have type push so we can distinguish
+         //    them from responses to commands, but it is a
+         //    simple-error. If we are lucky enough to receive them
+         //    when the command queue is empty we can treat them as
+         //    server pushes, otherwise it is impossible to handle
+         //    them properly
+         //
+         // 3. The request does not expect any response but we got
+         //    one. This may happen if for example, subscribe with
+         //    wrong syntax.
+         //
+         BOOST_ASSERT(!conn->read_buffer_.empty());
+         if (resp3::to_type(conn->read_buffer_.front()) == resp3::type::push
+             || conn->reqs_.empty()
+             || (!conn->reqs_.empty() && conn->reqs_.front()->cmds == 0)) {
+            conn->last_event_ = Conn::event::push;
+            yield async_send_receive(conn->push_channel_, std::move(self));
+            if (ec) {
+               self.complete(ec);
+               return;
+            }
+         } else {
+            BOOST_ASSERT(conn->cmds_ != 0);
+            BOOST_ASSERT(!conn->reqs_.empty());
+            BOOST_ASSERT(conn->reqs_.front()->cmds != 0);
+            conn->reqs_.front()->timer.cancel_one();
+            yield conn->read_timer_.async_wait(std::move(self));
+            if (!conn->socket_->is_open()) {
+               self.complete({});
+               return;
+            }
+         }
+
+      }
+   }
+};
+
+template <class Conn, class Adapter>
+struct runexec_op {
+   Conn* conn;
+   resp3::request const* req = nullptr;
+   Adapter adapter;
+   boost::asio::coroutine coro{};
+
+   template <class Self>
+   void operator()( Self& self
+                  , std::array<std::size_t, 2> order = {}
+                  , boost::system::error_code ec1 = {}
+                  , boost::system::error_code ec2 = {}
+                  , std::size_t n = 0)
+   {
+      reenter (coro)
+      {
+         req->close_on_run_completion = true;
+
+         yield
+         boost::asio::experimental::make_parallel_group(
+            [this](auto token) { return conn->async_run(token);},
+            [this](auto token) { return conn->async_exec(*req, adapter, token);}
+         ).async_wait(
+            boost::asio::experimental::wait_for_one_error(),
+            std::move(self));
+
+         switch (order[0]) {
+           case 0:
+           {
+              self.complete(ec1, n);
+           } break;
+           case 1:
+           {
+              self.complete(ec2, n);
+           } break;
+           default: BOOST_ASSERT(false);
+         }
+      }
+   }
+};
+
+#include <boost/asio/unyield.hpp>
+
+} // detail
+} // aedis
+
+#endif // AEDIS_CONNECTION_OPS_HPP

include/aedis/detail/net.hpp

@@ -0,0 +1,214 @@
+/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See
+ * accompanying file LICENSE.txt)
+ */
+
+#ifndef AEDIS_NET_HPP
+#define AEDIS_NET_HPP
+
+#include <array>
+
+#include <boost/system.hpp>
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/asio/connect.hpp>
+#include <boost/assert.hpp>
+#include <boost/asio/experimental/parallel_group.hpp>
+
+namespace aedis {
+namespace detail {
+
+template <class Executor>
+using conn_timer_t = boost::asio::basic_waitable_timer<std::chrono::steady_clock, boost::asio::wait_traits<std::chrono::steady_clock>, Executor>;
+
+#include <boost/asio/yield.hpp>
+
+template <
+   class Protocol,
+   class Executor,
+   class EndpointSequence
+   >
+struct connect_op {
+   boost::asio::basic_socket<Protocol, Executor>* socket;
+   conn_timer_t<Executor>* timer;
+   EndpointSequence* endpoints;
+   boost::asio::coroutine coro{};
+
+   template <class Self>
+   void operator()( Self& self
+                  , std::array<std::size_t, 2> order = {}
+                  , boost::system::error_code ec1 = {}
+                  , typename Protocol::endpoint const& ep = {}
+                  , boost::system::error_code ec2 = {})
+   {
+      reenter (coro)
+      {
+         yield
+         boost::asio::experimental::make_parallel_group(
+            [this](auto token)
+            {
+               auto f = [](boost::system::error_code const&, typename Protocol::endpoint const&) { return true; };
+               return boost::asio::async_connect(*socket, *endpoints, f, token);
+            },
+            [this](auto token) { return timer->async_wait(token);}
+         ).async_wait(
+            boost::asio::experimental::wait_for_one(),
+            std::move(self));
+
+         switch (order[0]) {
+            case 0:
+            {
+               if (ec1) {
+                  self.complete(ec1, ep);
+                  return;
+               }
+            } break;
+
+            case 1:
+            {
+               if (!ec2) {
+                  self.complete(error::connect_timeout, ep);
+                  return;
+               }
+            } break;
+
+            default: BOOST_ASSERT(false);
+         }
+
+         self.complete({}, ep);
+      }
+   }
+};
+
+template <class Resolver, class Timer>
+struct resolve_op {
+   Resolver* resv;
+   Timer* timer;
+   boost::string_view host;
+   boost::string_view port;
+   boost::asio::coroutine coro{};
+
+   template <class Self>
+   void operator()( Self& self
+                  , std::array<std::size_t, 2> order = {}
+                  , boost::system::error_code ec1 = {}
+                  , boost::asio::ip::tcp::resolver::results_type res = {}
+                  , boost::system::error_code ec2 = {})
+   {
+      reenter (coro)
+      {
+         yield
+         boost::asio::experimental::make_parallel_group(
+            [this](auto token) { return resv->async_resolve(host.data(), port.data(), token);},
+            [this](auto token) { return timer->async_wait(token);}
+         ).async_wait(
+            boost::asio::experimental::wait_for_one(),
+            std::move(self));
+
+         switch (order[0]) {
+            case 0:
+            {
+               if (ec1) {
+                  self.complete(ec1, {});
+                  return;
+               }
+            } break;
+
+            case 1:
+            {
+               if (!ec2) {
+                  self.complete(error::resolve_timeout, {});
+                  return;
+               }
+            } break;
+
+            default: BOOST_ASSERT(false);
+         }
+
+         self.complete({}, res);
+      }
+   }
+};
+
+template <class Channel>
+struct send_receive_op {
+   Channel* channel;
+   boost::asio::coroutine coro{};
+
+   template <class Self>
+   void operator()( Self& self
+                  , boost::system::error_code ec = {}
+                  , std::size_t = 0)
+   {
+      reenter (coro)
+      {
+         yield channel->async_send(boost::system::error_code{}, 0, std::move(self));
+         if (ec) {
+            self.complete(ec, 0);
+            return;
+         }
+
+         yield channel->async_receive(std::move(self));
+         self.complete(ec, 0);
+      }
+   }
+};
+
+#include <boost/asio/unyield.hpp>
+
+template <
+   class Protocol,
+   class Executor,
+   class EndpointSequence,
+   class CompletionToken = boost::asio::default_completion_token_t<Executor>
+   >
+auto async_connect(
+      boost::asio::basic_socket<Protocol, Executor>& socket,
+      conn_timer_t<Executor>& timer,
+      EndpointSequence ep,
+      CompletionToken&& token = boost::asio::default_completion_token_t<Executor>{})
+{
+   return boost::asio::async_compose
+      < CompletionToken
+      , void(boost::system::error_code, typename Protocol::endpoint const&)
+      >(connect_op<Protocol, Executor, EndpointSequence>
+            {&socket, &timer, &ep}, token, socket, timer);
+}
+
+template <
+   class Resolver,
+   class Timer,
+   class CompletionToken =
+      boost::asio::default_completion_token_t<typename Resolver::executor_type>
+   >
+auto async_resolve(
+      Resolver& resv,
+      Timer& timer,
+      boost::string_view host,
+      boost::string_view port,
+      CompletionToken&& token = CompletionToken{})
+{
+   // TODO: Use static_assert to check Resolver::executor_type and
+   // Timer::executor_type are same.
+   return boost::asio::async_compose
+      < CompletionToken
+      , void(boost::system::error_code, boost::asio::ip::tcp::resolver::results_type)
+      >(resolve_op<Resolver, Timer>{&resv, &timer, host, port}, token, resv, timer);
+}
+
+template <
+   class Channel,
+   class CompletionToken =
+      boost::asio::default_completion_token_t<typename Channel::executor_type>
+   >
+auto async_send_receive(Channel& channel, CompletionToken&& token = CompletionToken{})
+{
+   return boost::asio::async_compose
+      < CompletionToken
+      , void(boost::system::error_code, std::size_t)
+      >(send_receive_op<Channel>{&channel}, token, channel);
+}
+} // detail
+} // aedis
+
+#endif // AEDIS_NET_HPP

include/aedis/error.hpp

@@ -4,21 +4,47 @@
  * accompanying file LICENSE.txt)
  */
 
-#ifndef AEDIS_ADAPTER_ERROR_HPP
-#define AEDIS_ADAPTER_ERROR_HPP
+#ifndef AEDIS_ERROR_HPP
+#define AEDIS_ERROR_HPP
 
-#include <system_error>
+#include <boost/system/error_code.hpp>
 
 namespace aedis {
-namespace adapter {
 
-/** \brief Adapter errors.
+/** \brief Generic errors.
  *  \ingroup any
  */
 enum class error
 {
+   /// Resolve timeout.
+   resolve_timeout = 1,
+
+   /// Connect timeout.
+   connect_timeout,
+
+   /// Idle timeout.
+   idle_timeout,
+
+   /// Invalid RESP3 type.
+   invalid_data_type,
+
+   /// Can't parse the string as a number.
+   not_a_number,
+
+   /// Received less bytes than expected.
+   unexpected_read_size,
+
+   /// The maximum depth of a nested response was exceeded.
+   exceeeds_max_nested_depth,
+
+   /// Got non boolean value.
+   unexpected_bool_value,
+
+   /// Expected field value is empty.
+   empty_field,
+
    /// Expects a simple RESP3 type but got an aggregate.
-   expects_simple_type = 1,
+   expects_simple_type,
 
    /// Expects aggregate type.
    expects_aggregate_type,
@@ -48,19 +74,20 @@ enum class error
    null
 };
 
-/** \brief Creates a error_code object from an error.
+/** \internal
+ *  \brief Creates a error_code object from an error.
+ *  \param e Error code.
  *  \ingroup any
  */
 boost::system::error_code make_error_code(error e);
 
-} // adapter
 } // aedis
 
 namespace std {
 
 template<>
-struct is_error_code_enum<::aedis::adapter::error> : std::true_type {};
+struct is_error_code_enum<::aedis::error> : std::true_type {};
 
 } // std
 
-#endif // AEDIS_ADAPTER_ERROR_HPP
+#endif // AEDIS_ERROR_HPP

include/aedis/experimental/sync.hpp

@@ -0,0 +1,151 @@
+/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See
+ * accompanying file LICENSE.txt)
+ */
+
+#ifndef AEDIS_EXPERIMENTAL_SYNC_HPP
+#define AEDIS_EXPERIMENTAL_SYNC_HPP
+
+#include <aedis/adapt.hpp>
+#include <aedis/connection.hpp>
+#include <aedis/resp3/request.hpp>
+
+namespace aedis {
+namespace experimental {
+namespace detail {
+
+struct sync {
+   std::mutex mutex;
+   std::condition_variable cv;
+   bool ready = false;
+};
+
+} // detail
+
+/** @brief Executes a command.
+ *  @ingroup any
+ *
+ *  This function will block until execution completes.
+ *
+ *  @param conn The connection.
+ *  @param req The request.
+ *  @param adapter The response adapter.
+ *  @param ec Error code in case of error.
+ *  @returns The number of bytes of the response.
+ */
+template <class Connection, class ResponseAdapter>
+std::size_t
+exec(
+   Connection& conn,
+   resp3::request const& req,
+   ResponseAdapter adapter,
+   boost::system::error_code& ec)
+{
+   detail::sync sh;
+   std::size_t res = 0;
+
+   auto f = [&conn, &ec, &res, &sh, &req, adapter]()
+   {
+      conn.async_exec(req, adapter, [&sh, &res, &ec](auto const& ecp, std::size_t n) {
+         std::unique_lock ul(sh.mutex);
+         ec = ecp;
+         res = n;
+         sh.ready = true;
+         ul.unlock();
+         sh.cv.notify_one();
+      });
+   };
+
+   boost::asio::dispatch(boost::asio::bind_executor(conn.get_executor(), f));
+   std::unique_lock lk(sh.mutex);
+   sh.cv.wait(lk, [&sh]{return sh.ready;});
+   return res;
+}
+
+/** @brief Executes a command.
+ *  @ingroup any
+ *
+ *  This function will block until execution completes.
+ *
+ *  @param conn The connection.
+ *  @param req The request.
+ *  @param adapter The response adapter.
+ *  @throws std::system_error in case of error.
+ *  @returns The number of bytes of the response.
+ */
+template <
+   class Connection,
+   class ResponseAdapter = aedis::detail::response_traits<void>::adapter_type>
+std::size_t
+exec(
+   Connection& conn,
+   resp3::request const& req,
+   ResponseAdapter adapter = aedis::adapt())
+{
+   boost::system::error_code ec;
+   auto const res = exec(conn, req, adapter, ec);
+   if (ec)
+      throw std::system_error(ec);
+   return res;
+}
+
+/** @brief Receives server pushes synchronusly.
+ *  @ingroup any
+ *
+ *  This function will block until execution completes.
+ *
+ *  @param conn The connection.
+ *  @param adapter The response adapter.
+ *  @param ec Error code in case of error.
+ *  @returns The number of bytes of the response.
+ */
+template <class Connection, class ResponseAdapter>
+auto receive_event(
+   Connection& conn,
+   ResponseAdapter adapter,
+   boost::system::error_code& ec)
+{
+   using event_type = typename Connection::event;
+   std::mutex mutex;
+   std::condition_variable cv;
+   bool ready = false;
+   event_type ev = event_type::invalid;
+
+   auto f = [&conn, &ec, &ev, &mutex, &cv, &ready, adapter]()
+   {
+      conn.async_receive_event(adapter, [&cv, &mutex, &ready, &ev, &ec](auto const& ecp, event_type evp) {
+         std::unique_lock ul(mutex);
+         ec = ecp;
+         ev = evp;
+         ready = true;
+         ul.unlock();
+         cv.notify_one();
+      });
+   };
+
+   boost::asio::dispatch(boost::asio::bind_executor(conn.get_executor(), f));
+   std::unique_lock lk(mutex);
+   cv.wait(lk, [&ready]{return ready;});
+   return ev;
+}
+
+/// TODO
+template <
+   class Connection,
+   class ResponseAdapter = aedis::detail::response_traits<void>::adapter_type>
+auto receive_event(
+   Connection& conn,
+   ResponseAdapter adapter = aedis::adapt())
+{
+   boost::system::error_code ec;
+   auto const res = receive_event(conn, adapter, ec);
+   if (ec)
+      throw std::system_error(ec);
+   return res;
+}
+
+} // experimental
+} // aedis
+
+#endif // AEDIS_EXPERIMENTAL_SYNC_HPP

include/aedis/impl/error.ipp

@@ -4,23 +4,30 @@
  * accompanying file LICENSE.txt)
  */
 
-#include <system_error>
-#include <boost/assert.hpp>
+#include <aedis/error.hpp>
 
 namespace aedis {
-namespace adapter {
 namespace detail {
 
 struct error_category_impl : boost::system::error_category {
 
    char const* name() const noexcept override
    {
-      return "aedis.adapter";
+      return "aedis";
    }
 
    std::string message(int ev) const override
    {
       switch(static_cast<error>(ev)) {
+	 case error::resolve_timeout: return "Resolve operation timeout.";
+	 case error::connect_timeout: return "Connect operation timeout.";
+	 case error::idle_timeout: return "Idle timeout.";
+	 case error::invalid_data_type: return "Invalid resp3 type.";
+	 case error::not_a_number: return "Can't convert string to number.";
+	 case error::unexpected_read_size: return "Unexpected read size.";
+	 case error::exceeeds_max_nested_depth: return "Exceeds the maximum number of nested responses.";
+	 case error::unexpected_bool_value: return "Unexpected bool value.";
+	 case error::empty_field: return "Expected field value is empty.";
 	 case error::expects_simple_type: return "Expects a simple RESP3 type.";
 	 case error::expects_aggregate_type: return "Expects aggregate type.";
 	 case error::expects_map_type: return "Expects map type.";
@@ -31,7 +38,9 @@ struct error_category_impl : boost::system::error_category {
 	 case error::incompatible_size: return "Aggregate container has incompatible size.";
 	 case error::not_a_double: return "Not a double.";
 	 case error::null: return "Got RESP3 null.";
-	 default: BOOST_ASSERT(false);
+	 default:
+            BOOST_ASSERT(false);
+            return "Aedis error.";
       }
    }
 };
@@ -49,5 +58,4 @@ boost::system::error_code make_error_code(error e)
     return boost::system::error_code{static_cast<int>(e), detail::category()};
 }
 
-} // adapter
 } // aedis

include/aedis/resp3/compose.hpp

@@ -34,6 +34,9 @@ constexpr char separator[] = "\r\n";
  *  }
  *  @endcode
  *
+ *  @param to Storage on which data will be copied into.
+ *  @param data Data that will be serialized and stored in @c to.
+ *
  *  See more in \ref requests-serialization.
  */
 template <class Request>
@@ -97,8 +100,9 @@ struct add_bulk_impl<boost::hana::tuple<Ts...>> {
 
 } // detail
 
-/** @brief Adds a resp3 header to the request.
- *  @ingroup any
+/** \internal
+ *  \brief Adds a resp3 header to the request.
+ *  \ingroup any
  *
  *  See mystruct.hpp for an example.
  */
@@ -142,8 +146,9 @@ void add_blob(Request& to, boost::string_view blob)
    to += separator;
 }
 
-/** @brief Adds a separator to the request.
- *  @ingroup any
+/** \internal
+ *  \brief Adds a separator to the request.
+ *  \ingroup any
  *
  *  See mystruct.hpp for an example.
  */

include/aedis/resp3/detail/exec.hpp

@@ -0,0 +1,184 @@
+/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See
+ * accompanying file LICENSE.txt)
+ */
+
+#ifndef AEDIS_RESP3_EXEC_HPP
+#define AEDIS_RESP3_EXEC_HPP
+
+#include <boost/assert.hpp>
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/asio/read.hpp>
+#include <boost/asio/write.hpp>
+#include <boost/asio/coroutine.hpp>
+#include <boost/asio/compose.hpp>
+#include <boost/asio/steady_timer.hpp>
+#include <boost/asio/experimental/parallel_group.hpp>
+
+#include <aedis/error.hpp>
+#include <aedis/resp3/read.hpp>
+#include <aedis/resp3/request.hpp>
+
+namespace aedis {
+namespace resp3 {
+namespace detail {
+
+#include <boost/asio/yield.hpp>
+
+template <
+   class AsyncStream,
+   class Adapter,
+   class DynamicBuffer
+   >
+struct exec_op {
+   AsyncStream* socket = nullptr;
+   request const* req = nullptr;
+   Adapter adapter;
+   DynamicBuffer dbuf{};
+   std::size_t n_cmds = 0;
+   std::size_t size = 0;
+   boost::asio::coroutine coro{};
+
+   template <class Self>
+   void operator()( Self& self
+                  , boost::system::error_code ec = {}
+                  , std::size_t n = 0)
+   {
+      reenter (coro) for (;;)
+      {
+         if (req) {
+            yield
+            boost::asio::async_write(
+               *socket,
+               boost::asio::buffer(req->payload()),
+               std::move(self));
+
+            if (ec || n_cmds == 0) {
+               self.complete(ec, n);
+               return;
+            }
+
+            req = nullptr;
+         }
+
+         yield resp3::async_read(*socket, dbuf, adapter, std::move(self));
+         if (ec) {
+            self.complete(ec, 0);
+            return;
+         }
+
+         size += n;
+         if (--n_cmds == 0) {
+            self.complete(ec, size);
+            return;
+         }
+      }
+   }
+};
+
+template <
+   class AsyncStream,
+   class Adapter,
+   class DynamicBuffer,
+   class CompletionToken = boost::asio::default_completion_token_t<typename AsyncStream::executor_type>
+   >
+auto async_exec(
+   AsyncStream& socket,
+   request const& req,
+   Adapter adapter,
+   DynamicBuffer dbuf,
+   CompletionToken token = CompletionToken{})
+{
+   return boost::asio::async_compose
+      < CompletionToken
+      , void(boost::system::error_code, std::size_t)
+      >(detail::exec_op<AsyncStream, Adapter, DynamicBuffer>
+         {&socket, &req, adapter, dbuf, req.size()}, token, socket);
+}
+
+template <
+   class AsyncStream,
+   class Timer,
+   class Adapter,
+   class DynamicBuffer
+   >
+struct exec_with_timeout_op {
+   AsyncStream* socket = nullptr;
+   Timer* timer = nullptr;
+   request const* req = nullptr;
+   Adapter adapter;
+   DynamicBuffer dbuf{};
+   boost::asio::coroutine coro{};
+
+   template <class Self>
+   void operator()( Self& self
+                  , std::array<std::size_t, 2> order = {}
+                  , boost::system::error_code ec1 = {}
+                  , std::size_t n = 0
+                  , boost::system::error_code ec2 = {})
+   {
+      reenter (coro)
+      {
+         yield
+         boost::asio::experimental::make_parallel_group(
+            [this](auto token) { return detail::async_exec(*socket, *req, adapter, dbuf, token);},
+            [this](auto token) { return timer->async_wait(token);}
+         ).async_wait(
+            boost::asio::experimental::wait_for_one(),
+            std::move(self));
+
+         switch (order[0]) {
+            case 0:
+            {
+               if (ec1) {
+                  self.complete(ec1, 0);
+                  return;
+               }
+            } break;
+
+            case 1:
+            {
+               if (!ec2) {
+                  self.complete(aedis::error::idle_timeout, 0);
+                  return;
+               }
+            } break;
+
+            default: BOOST_ASSERT(false);
+         }
+
+         self.complete({}, n);
+      }
+   }
+};
+
+#include <boost/asio/unyield.hpp>
+
+template <
+   class AsyncStream,
+   class Timer,
+   class Adapter,
+   class DynamicBuffer,
+   class CompletionToken = boost::asio::default_completion_token_t<typename AsyncStream::executor_type>
+   >
+auto async_exec(
+   AsyncStream& socket,
+   Timer& timer,
+   request const& req,
+   Adapter adapter,
+   DynamicBuffer dbuf,
+   CompletionToken token = CompletionToken{})
+{
+   return boost::asio::async_compose
+      < CompletionToken
+      , void(boost::system::error_code, std::size_t)
+      >(detail::exec_with_timeout_op<AsyncStream, Timer, Adapter, DynamicBuffer>
+         {&socket, &timer, &req, adapter, dbuf}, token, socket, timer);
+}
+
+} // detail
+} // resp3
+} // aedis
+
+#endif // AEDIS_RESP3_EXEC_HPP

include/aedis/resp3/detail/parser.hpp

@@ -13,7 +13,7 @@
 #include <boost/assert.hpp>
 #include <boost/utility/string_view.hpp>
 
-#include <aedis/resp3/error.hpp>
+#include <aedis/error.hpp>
 #include <aedis/resp3/node.hpp>
 
 namespace aedis {
@@ -193,7 +193,7 @@ public:
             } break;
             default:
             {
-	       ec = error::invalid_type;
+	       ec = error::invalid_data_type;
 	       return 0;
             }
          }

include/aedis/resp3/detail/read_ops.hpp

@@ -37,7 +37,7 @@ private:
    parser<ResponseAdapter> parser_;
    std::size_t consumed_;
    std::size_t buffer_size_;
-   boost::asio::coroutine coro_;
+   boost::asio::coroutine coro_{};
 
 public:
    parse_op(AsyncReadStream& stream, DynamicBuffer buf, ResponseAdapter adapter)

include/aedis/resp3/impl/request.ipp

@@ -0,0 +1,23 @@
+/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See
+ * accompanying file LICENSE.txt)
+ */
+
+#include <aedis/resp3/request.hpp>
+
+namespace aedis {
+namespace resp3 {
+namespace detail {
+
+bool has_push_response(boost::string_view cmd)
+{
+   if (cmd == "SUBSCRIBE") return true;
+   if (cmd == "PSUBSCRIBE") return true;
+   if (cmd == "UNSUBSCRIBE") return true;
+   return false;
+}
+
+} // detail
+} // resp3
+} // aedis

include/aedis/resp3/node.hpp

@@ -62,6 +62,9 @@ std::string to_string(node<String> const& in)
 
 /** \brief Compares a node for equality.
  *  \ingroup any
+ *
+ *  @param a Left hand side node object.
+ *  @param b Right hand side node object.
  */
 template <class String>
 bool operator==(node<String> const& a, node<String> const& b)
@@ -75,12 +78,15 @@ bool operator==(node<String> const& a, node<String> const& b)
 /** \brief Writes the node string to the stream.
  *  \ingroup any
  *
- *  NOTE: Binary data is not converted to text.
+ *  @param os Output stream.
+ *  @param node Node object.
+ *
+ *  \remark Binary data is not converted to text.
  */
 template <class String>
-std::ostream& operator<<(std::ostream& os, node<String> const& o)
+std::ostream& operator<<(std::ostream& os, node<String> const& node)
 {
-   os << to_string(o);
+   os << to_string(node);
    return os;
 }
 

include/aedis/resp3/read.hpp

@@ -14,12 +14,12 @@
 #include <boost/asio/read.hpp>
 #include <boost/asio/compose.hpp>
 #include <boost/asio/async_result.hpp>
-#include <boost/asio/yield.hpp>
 
 namespace aedis {
 namespace resp3 {
 
-/** \brief Reads a complete response to a command sychronously.
+/** \internal
+ *  \brief Reads a complete response to a command sychronously.
  *  \ingroup any
  *
  *  This function reads a complete response to a command or a
@@ -103,7 +103,8 @@ read(
    return consumed;
 }
 
-/** \brief Reads a complete response to a command sychronously.
+/** \internal
+ *  \brief Reads a complete response to a command sychronously.
  *  \ingroup any
  *  
  *  Same as the error_code overload but throws on error.
@@ -127,7 +128,8 @@ read(
    return n;
 }
 
-/** @brief Reads a complete response to a Redis command asynchronously.
+/** \internal
+ *  \brief Reads a complete response to a Redis command asynchronously.
  *  \ingroup any
  *
  *  This function reads a complete response to a command or a
@@ -189,6 +191,4 @@ auto async_read(
 } // resp3
 } // aedis
 
-#include <boost/asio/unyield.hpp>
-
 #endif // AEDIS_RESP3_READ_HPP

include/aedis/resp3/request.hpp

@@ -4,11 +4,12 @@
  * accompanying file LICENSE.txt)
  */
 
-#ifndef AEDIS_GENERIC_SERIALIZER_HPP
-#define AEDIS_GENERIC_SERIALIZER_HPP
+#ifndef AEDIS_RESP3_REQUEST_HPP
+#define AEDIS_RESP3_REQUEST_HPP
 
-#include <boost/hana.hpp>
 #include <aedis/resp3/compose.hpp>
+#include <boost/hana.hpp>
+#include <boost/utility/string_view.hpp>
 
 // NOTE: Consider detecting tuples in the type in the parameter pack
 // to calculate the header size correctly.
@@ -17,54 +18,55 @@
 // the value type is a pair.
 
 namespace aedis {
-namespace generic {
+namespace resp3 {
+namespace detail {
 
-/** @brief Creates Redis requests from user data.
+bool has_push_response(boost::string_view cmd);
+
+} // detail
+
+/** @brief Creates Redis requests.
  *  \ingroup any
  *  
- *  A request is composed of one or more redis commands and is
+ *  A request is composed of one or more Redis commands and is
  *  referred to in the redis documentation as a pipeline, see
- *  https://redis.io/topics/pipelining.
- *
- *  Example
+ *  https://redis.io/topics/pipelining. For example
  *
  *  @code
- *  std::string request;
- *  auto sr = make_serializer(request);
- *  sr.push(command::hello, 3);
- *  sr.push(command::flushall);
- *  sr.push(command::ping);
- *  sr.push(command::incr, "key");
- *  sr.push(command::quit);
- *  co_await async_write(socket, buffer(request));
+ *  request r;
+ *  r.push("HELLO", 3);
+ *  r.push("FLUSHALL");
+ *  r.push("PING");
+ *  r.push("PING", "key");
+ *  r.push("QUIT");
+ *  co_await async_write(socket, buffer(r));
  *  @endcode
  *
- *  \tparam Storage The storage type e.g \c std::string.
- *
  *  \remarks  Non-string types will be converted to string by using \c
  *  to_bulk, which must be made available over ADL.
  */
-template <class Storage>
-class serializer {
-private:
-   Storage* request_;
-
+class request {
 public:
-   /** \brief Constructor
-    *  
-    *  \param storage The underlying storage object i.e. where the
-    *  request is to be stored.
-    */
-   serializer(Storage& storage) : request_(&storage) {}
+   //// Returns the number of commands contained in this request.
+   std::size_t size() const noexcept { return commands_;};
+
+   // Returns the request payload.
+   auto const& payload() const noexcept { return payload_;}
+
+   /// Clears the request preserving allocated memory.
+   void clear()
+   {
+      payload_.clear();
+      commands_ = 0;
+   }
 
    /** @brief Appends a new command to the end of the request.
     *
     *  For example
     *
     *  \code
-    *  std::string request;
-    *  auto sr = make_serializer<command>(request);
-    *  sr.push(command::set, "key", "some string", "EX", "2");
+    *  request req;
+    *  req.push("SET", "key", "some string", "EX", "2");
     *  \endcode
     *
     *  will add the \c set command with value "some string" and an
@@ -73,18 +75,20 @@ public:
     *  \param cmd The command e.g redis or sentinel command.
     *  \param args Command arguments.
     */
-   template <class Command, class... Ts>
-   void push(Command cmd, Ts const&... args)
+   template <class... Ts>
+   void push(boost::string_view cmd, Ts const&... args)
    {
       using boost::hana::for_each;
       using boost::hana::make_tuple;
       using resp3::type;
 
       auto constexpr pack_size = sizeof...(Ts);
-      resp3::add_header(*request_, type::array, 1 + pack_size);
+      resp3::add_header(payload_, type::array, 1 + pack_size);
+      resp3::add_bulk(payload_, cmd);
+      resp3::add_bulk(payload_, make_tuple(args...));
 
-      resp3::add_bulk(*request_, to_string(cmd));
-      resp3::add_bulk(*request_, make_tuple(args...));
+      if (!detail::has_push_response(cmd))
+         ++commands_;
    }
 
    /** @brief Appends a new command to the end of the request.
@@ -100,7 +104,7 @@ public:
     *     };
     *
     *  request req;
-    *  req.push_range2(command::hset, "key", std::cbegin(map), std::cend(map));
+    *  req.push_range2("HSET", "key", std::cbegin(map), std::cend(map));
     *  @endcode
     *  
     *  \param cmd The command e.g. Redis or Sentinel command.
@@ -108,8 +112,8 @@ public:
     *  \param begin Iterator to the begin of the range.
     *  \param end Iterator to the end of the range.
     */
-   template <class Command, class Key, class ForwardIterator>
-   void push_range2(Command cmd, Key const& key, ForwardIterator begin, ForwardIterator end)
+   template <class Key, class ForwardIterator>
+   void push_range2(boost::string_view cmd, Key const& key, ForwardIterator begin, ForwardIterator end)
    {
       using value_type = typename std::iterator_traits<ForwardIterator>::value_type;
       using resp3::type;
@@ -119,12 +123,15 @@ public:
 
       auto constexpr size = resp3::bulk_counter<value_type>::size;
       auto const distance = std::distance(begin, end);
-      resp3::add_header(*request_, type::array, 2 + size * distance);
-      resp3::add_bulk(*request_, to_string(cmd));
-      resp3::add_bulk(*request_, key);
+      resp3::add_header(payload_, type::array, 2 + size * distance);
+      resp3::add_bulk(payload_, cmd);
+      resp3::add_bulk(payload_, key);
 
       for (; begin != end; ++begin)
-	 resp3::add_bulk(*request_, *begin);
+	 resp3::add_bulk(payload_, *begin);
+
+      if (!detail::has_push_response(cmd))
+         ++commands_;
    }
 
    /** @brief Appends a new command to the end of the request.
@@ -137,15 +144,15 @@ public:
     *     { "channel1" , "channel2" , "channel3" }
     *
     *  request req;
-    *  req.push(command::subscribe, std::cbegin(channels), std::cedn(channels));
+    *  req.push("SUBSCRIBE", std::cbegin(channels), std::cedn(channels));
     *  \endcode
     *
     *  \param cmd The Redis command
     *  \param begin Iterator to the begin of the range.
     *  \param end Iterator to the end of the range.
     */
-   template <class Command, class ForwardIterator>
-   void push_range2(Command cmd, ForwardIterator begin, ForwardIterator end)
+   template <class ForwardIterator>
+   void push_range2(boost::string_view cmd, ForwardIterator begin, ForwardIterator end)
    {
       using value_type = typename std::iterator_traits<ForwardIterator>::value_type;
       using resp3::type;
@@ -155,19 +162,26 @@ public:
 
       auto constexpr size = resp3::bulk_counter<value_type>::size;
       auto const distance = std::distance(begin, end);
-      resp3::add_header(*request_, type::array, 1 + size * distance);
-      resp3::add_bulk(*request_, to_string(cmd));
+      resp3::add_header(payload_, type::array, 1 + size * distance);
+      resp3::add_bulk(payload_, cmd);
 
       for (; begin != end; ++begin)
-	 resp3::add_bulk(*request_, *begin);
+	 resp3::add_bulk(payload_, *begin);
+
+      if (!detail::has_push_response(cmd))
+         ++commands_;
    }
 
    /** @brief Appends a new command to the end of the request.
     *  
     *  Equivalent to the overload taking a range (i.e. send_range2).
+    *
+    *  \param cmd Redis command.
+    *  \param key Redis key.
+    *  \param range Range to send e.g. and \c std::map.
     */
-   template <class Command, class Key, class Range>
-   void push_range(Command cmd, Key const& key, Range const& range)
+   template <class Key, class Range>
+   void push_range(boost::string_view cmd, Key const& key, Range const& range)
    {
       using std::begin;
       using std::end;
@@ -177,27 +191,26 @@ public:
    /** @brief Appends a new command to the end of the request.
     *
     *  Equivalent to the overload taking a range (i.e. send_range2).
+    *
+    *  \param cmd Redis command.
+    *  \param range Range to send e.g. and \c std::map.
     */
-   template <class Command, class Range>
-   void push_range(Command cmd, Range const& range)
+   template <class Range>
+   void push_range(boost::string_view cmd, Range const& range)
    {
       using std::begin;
       using std::end;
       push_range2(cmd, begin(range), end(range));
    }
+
+   mutable bool close_on_run_completion = false;
+
+private:
+   std::string payload_;
+   std::size_t commands_ = 0;
 };
 
-/** \brief Creates a serializer.
- *  \ingroup any
- *  \param storage The string.
- */
-template <class CharT, class Traits, class Allocator>
-auto make_serializer(std::basic_string<CharT, Traits, Allocator>& storage)
-{
-   return serializer<std::basic_string<CharT, Traits, Allocator>>(storage);
-}
-
-} // generic
+} // resp3
 } // aedis
 
-#endif // AEDIS_GENERIC_SERIALIZER_HPP
+#endif // AEDIS_RESP3_SERIALIZER_HPP

include/aedis/resp3/write.hpp

@@ -0,0 +1,53 @@
+/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See
+ * accompanying file LICENSE.txt)
+ */
+
+#ifndef AEDIS_RESP3_WRITE_HPP
+#define AEDIS_RESP3_WRITE_HPP
+
+#include <boost/asio/write.hpp>
+
+namespace aedis {
+namespace resp3 {
+
+template<
+   class SyncWriteStream,
+   class Request
+   >
+std::size_t write(SyncWriteStream& stream, Request const& req)
+{
+   return boost::asio::write(stream, boost::asio::buffer(req.payload()));
+}
+
+template<
+    class SyncWriteStream,
+    class Request
+    >
+std::size_t write(
+    SyncWriteStream& stream,
+    Request const& req,
+    boost::system::error_code& ec)
+{
+   return boost::asio::write(stream, boost::asio::buffer(req.payload()), ec);
+}
+
+template<
+   class AsyncWriteStream,
+   class Request,
+   class CompletionToken = boost::asio::default_completion_token_t<typename AsyncWriteStream::executor_type>
+   >
+auto async_write(
+   AsyncWriteStream& stream,
+   Request const& req,
+   CompletionToken&& token =
+      boost::asio::default_completion_token_t<typename AsyncWriteStream::executor_type>{})
+{
+   return boost::asio::async_write(stream, boost::asio::buffer(req.payload()), token);
+}
+
+} // resp3
+} // aedis
+
+#endif // AEDIS_RESP3_WRITE_HPP

include/aedis/src.hpp

@@ -4,10 +4,7 @@
  * accompanying file LICENSE.txt)
  */
 
+#include <aedis/impl/error.ipp>
+#include <aedis/resp3/impl/request.ipp>
 #include <aedis/resp3/impl/type.ipp>
 #include <aedis/resp3/detail/impl/parser.ipp>
-#include <aedis/resp3/impl/error.ipp>
-#include <aedis/redis/impl/command.ipp>
-#include <aedis/adapter/impl/error.ipp>
-#include <aedis/sentinel/impl/command.ipp>
-#include <aedis/generic/impl/error.ipp>

tests/check.hpp

@@ -7,11 +7,11 @@
 #include <iostream>
 #include <stdlib.h>
 
-template <class T>
-void expect_eq(T const& a, T const& b, std::string const& msg = "")
+void expect_true(bool a, std::string const& msg = "")
 {
-   if (a == b) {
-     std::cout << "Success: " << msg << std::endl;
+   if (a) {
+      if (!msg.empty())
+         std::cout << "Success: " << msg << std::endl;
    } else {
      std::cout << "Error: " << msg << std::endl;
      exit(EXIT_FAILURE);
@@ -19,17 +19,47 @@ void expect_eq(T const& a, T const& b, std::string const& msg = "")
 }
 
 template <class T>
-void expect_error(boost::system::error_code a, T expected = {})
+void expect_eq(T const& a, T const& b, std::string const& msg = "")
+{
+   if (a == b) {
+      if (!msg.empty())
+         std::cout << "Success: " << msg << std::endl;
+   } else {
+     std::cout << "Error: " << msg << std::endl;
+     exit(EXIT_FAILURE);
+   }
+}
+
+template <class T>
+void expect_neq(T const& a, T const& b, std::string const& msg = "")
+{
+   if (a != b) {
+      if (!msg.empty())
+         std::cout << "Success: " << msg << std::endl;
+   } else {
+     std::cout << "Error: " << msg << std::endl;
+     exit(EXIT_FAILURE);
+   }
+}
+
+template <class T>
+void expect_error(boost::system::error_code a, T expected = {}, std::string const& msg = "")
 {
    if (a == expected) {
       if (a)
-         std::cout << "Success: " << a.message() << " (" << a.category().name() << ")" << std::endl;
+         std::cout << "Success: " << a.message() << " (" << a.category().name() << ") " << msg << std::endl;
    } else {
-      std::cout << "Error: " << a.message() << " (" << a.category().name() << ")" << std::endl;
+      std::cout << "Error: " << a.message() << " (" << a.category().name() << ") " << msg << std::endl;
       exit(EXIT_FAILURE);
    }
 }
 
+inline
+void expect_no_error(boost::system::error_code ec, std::string const& msg)
+{
+   expect_error(ec, boost::system::error_code{}, msg);
+}
+
 template <class T>
 void check_empty(T const& t)
 {

tests/connection.cpp

@@ -0,0 +1,422 @@
+/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See
+ * accompanying file LICENSE.txt)
+ */
+
+// TODO: Avoid usage of co_await to improve tests is compilers that
+// don't support it.
+// TODO: Add reconnect test that kills the server and waits some
+// seconds.
+
+#include <iostream>
+#include <boost/asio.hpp>
+#include <boost/system/errc.hpp>
+#include <boost/asio/experimental/as_tuple.hpp>
+
+#include <aedis.hpp>
+#include <aedis/src.hpp>
+
+#include "check.hpp"
+
+namespace net = boost::asio;
+
+using aedis::resp3::request;
+using connection = aedis::connection<>;
+using error_code = boost::system::error_code;
+using net::experimental::as_tuple;
+
+bool is_host_not_found(boost::system::error_code ec)
+{
+   if (ec == net::error::netdb_errors::host_not_found) return true;
+   if (ec == net::error::netdb_errors::host_not_found_try_again) return true;
+   return false;
+}
+
+//----------------------------------------------------------------
+
+// Tests whether resolve fails with the correct error.
+void test_resolve()
+{
+   connection::config cfg;
+   cfg.host = "Atibaia";
+   cfg.port = "6379";
+   cfg.resolve_timeout = std::chrono::seconds{100};
+
+   net::io_context ioc;
+   connection db{ioc, cfg};
+   db.async_run([](auto ec) {
+      expect_true(is_host_not_found(ec), "test_resolve");
+   });
+
+   ioc.run();
+}
+
+//----------------------------------------------------------------
+
+void test_connect()
+{
+   connection::config cfg;
+   cfg.host = "127.0.0.1";
+   cfg.port = "1";
+   cfg.connect_timeout = std::chrono::seconds{100};
+
+   net::io_context ioc;
+   connection db{ioc, cfg};
+   db.async_run([](auto ec) {
+      expect_error(ec, net::error::basic_errors::connection_refused, "test_connect");
+   });
+   ioc.run();
+}
+
+//----------------------------------------------------------------
+
+// Test if quit causes async_run to exit.
+void test_quit1(connection::config const& cfg)
+{
+   net::io_context ioc;
+   auto db = std::make_shared<connection>(ioc, cfg);
+
+   request req;
+   req.push("QUIT");
+
+   db->async_exec(req, aedis::adapt(), [](auto ec, auto){
+      expect_no_error(ec, "test_quit1");
+   });
+
+   db->async_run([](auto ec){
+      expect_error(ec, net::error::misc_errors::eof, "test_quit1");
+   });
+
+   ioc.run();
+}
+
+void test_quit2(connection::config const& cfg)
+{
+   std::cout << "test_quit2" << std::endl;
+   request req;
+   req.push("QUIT");
+
+   net::io_context ioc;
+   auto db = std::make_shared<connection>(ioc, cfg);
+   db->async_run(req, aedis::adapt(), [](auto ec, auto){
+      expect_no_error(ec, "test_quit2");
+   });
+
+   ioc.run();
+}
+
+void test_quit()
+{
+   connection::config cfg;
+
+   cfg.coalesce_requests = true;
+   test_quit1(cfg);
+
+   cfg.coalesce_requests = false;
+   test_quit1(cfg);
+
+   cfg.coalesce_requests = true;
+   test_quit2(cfg);
+
+   cfg.coalesce_requests = false;
+   test_quit2(cfg);
+}
+
+// Checks whether we get idle timeout when no push reader is set.
+void test_missing_push_reader1(connection::config const& cfg)
+{
+   std::cout << "test_missing_push_reader1" << std::endl;
+   net::io_context ioc;
+   auto db = std::make_shared<connection>(ioc, cfg);
+
+   request req;
+   req.push("SUBSCRIBE", "channel");
+
+   db->async_run(req, aedis::adapt(), [](auto ec, auto){
+      expect_no_error(ec, "test_missing_push_reader1");
+   });
+
+   ioc.run();
+}
+
+void test_missing_push_reader2(connection::config const& cfg)
+{
+   std::cout << "test_missing_push_reader2" << std::endl;
+   net::io_context ioc;
+   auto db = std::make_shared<connection>(ioc, cfg);
+
+   request req; // Wrong command syntax.
+   req.push("SUBSCRIBE");
+
+   db->async_run(req, aedis::adapt(), [](auto ec, auto){
+      expect_no_error(ec, "test_missing_push_reader2");
+   });
+
+   ioc.run();
+}
+
+void test_missing_push_reader3(connection::config const& cfg)
+{
+   std::cout << "test_missing_push_reader3" << std::endl;
+   net::io_context ioc;
+   auto db = std::make_shared<connection>(ioc, cfg);
+
+   request req; // Wrong command synthax.
+   req.push("PING", "Message");
+   req.push("SUBSCRIBE");
+
+   db->async_run(req, aedis::adapt(), [](auto ec, auto){
+      expect_no_error(ec, "test_missing_push_reader3");
+   });
+
+   ioc.run();
+}
+
+void test_idle()
+{
+   std::cout << "test_idle" << std::endl;
+   connection::config cfg;
+   cfg.resolve_timeout = std::chrono::seconds{1};
+   cfg.connect_timeout = std::chrono::seconds{1};
+   cfg.ping_interval = std::chrono::seconds{1};
+
+   net::io_context ioc;
+   auto db = std::make_shared<connection>(ioc, cfg);
+
+   request req;
+   req.push("CLIENT", "PAUSE", 5000);
+
+   db->async_exec(req, aedis::adapt(), [](auto ec, auto){
+      expect_no_error(ec, "test_idle");
+   });
+
+   db->async_run([](auto ec){
+      expect_error(ec, aedis::error::idle_timeout, "test_idle");
+   });
+
+   ioc.run();
+}
+
+#ifdef BOOST_ASIO_HAS_CO_AWAIT
+net::awaitable<void>
+push_consumer1(std::shared_ptr<connection> db, bool& received, char const* msg)
+{
+   {
+      auto [ec, ev] = co_await db->async_receive_event(aedis::adapt(), as_tuple(net::use_awaitable));
+      expect_no_error(ec, msg);
+      received = true;
+   }
+
+   {
+      auto [ec, ev] = co_await db->async_receive_event(aedis::adapt(), as_tuple(net::use_awaitable));
+      expect_error(ec, boost::asio::experimental::channel_errc::channel_cancelled, msg);
+   }
+}
+
+void test_push_is_received1(connection::config const& cfg)
+{
+   std::cout << "test_push_is_received1" << std::endl;
+   net::io_context ioc;
+   auto db = std::make_shared<connection>(ioc, cfg);
+
+   request req;
+   req.push("SUBSCRIBE", "channel");
+   req.push("QUIT");
+
+   db->async_run(req, aedis::adapt(), [db](auto ec, auto){
+      expect_no_error(ec, "test_push_is_received1");
+      db->cancel_event_receiver();
+   });
+
+   bool received = false;
+   net::co_spawn(
+      ioc.get_executor(),
+      push_consumer1(db, received, "test_push_is_received1"),
+      net::detached);
+
+   ioc.run();
+
+   expect_true(received);
+}
+
+void test_push_is_received2(connection::config const& cfg)
+{
+   std::cout << "test_push_is_received2" << std::endl;
+   request req1;
+   req1.push("PING", "Message1");
+
+   request req2;
+   req2.push("SUBSCRIBE", "channel");
+
+   request req3;
+   req3.push("PING", "Message2");
+   req3.push("QUIT");
+
+   net::io_context ioc;
+
+   auto db = std::make_shared<connection>(ioc, cfg);
+
+   auto handler =[](auto ec, auto...)
+      { expect_no_error(ec, "test_push_is_received2"); };
+
+   db->async_exec(req1, aedis::adapt(), handler);
+   db->async_exec(req2, aedis::adapt(), handler);
+   db->async_exec(req3, aedis::adapt(), handler);
+
+   db->async_run([db](auto ec, auto...) {
+      expect_error(ec, net::error::misc_errors::eof, "test_push_is_received2");
+      db->cancel_event_receiver();
+   });
+
+   bool received = false;
+   net::co_spawn(
+      ioc.get_executor(),
+      push_consumer1(db, received, "test_push_is_received2"),
+      net::detached);
+
+   ioc.run();
+   expect_true(received);
+}
+
+net::awaitable<void> test_reconnect_impl(std::shared_ptr<connection> db)
+{
+   request req;
+   req.push("QUIT");
+
+   for (auto i = 0;;) {
+      auto ev = co_await db->async_receive_event(aedis::adapt(), net::use_awaitable);
+      expect_eq(ev, connection::event::resolve, "test_reconnect.");
+
+       ev = co_await db->async_receive_event(aedis::adapt(), net::use_awaitable);
+      expect_eq(ev, connection::event::connect, "test_reconnect.");
+
+      ev = co_await db->async_receive_event(aedis::adapt(), net::use_awaitable);
+      expect_eq(ev, connection::event::hello, "test_reconnect.");
+
+      co_await db->async_exec(req, aedis::adapt(), net::use_awaitable);
+
+      // Test 5 reconnetions and returns.
+
+      ++i;
+      if (i == 5) {
+         db->get_config().enable_reconnect = false;
+         co_return;
+      }
+   }
+
+   co_return;
+}
+
+// Test whether the client works after a reconnect.
+void test_reconnect()
+{
+   std::cout << "Start: test_reconnect" << std::endl;
+   net::io_context ioc;
+   auto db = std::make_shared<connection>(ioc.get_executor());
+   db->get_config().enable_events = true;
+   db->get_config().enable_reconnect = true;
+   db->get_config().reconnect_interval = std::chrono::milliseconds{100};
+
+   net::co_spawn(ioc, test_reconnect_impl(db), net::detached);
+
+   db->async_run([](auto ec) {
+      expect_error(ec, net::error::misc_errors::eof, "test_reconnect.");
+   });
+
+   ioc.run();
+   std::cout << "End: test_reconnect()" << std::endl;
+}
+
+net::awaitable<void>
+push_consumer3(std::shared_ptr<connection> db)
+{
+   for (;;)
+      co_await db->async_receive_event(aedis::adapt(), net::use_awaitable);
+}
+
+// Test many subscribe requests.
+void test_push_many_subscribes(connection::config const& cfg)
+{
+   std::cout << "test_push_many_subscribes" << std::endl;
+   request req0;
+   req0.push("HELLO", 3);
+
+   request req1;
+   req1.push("PING", "Message1");
+
+   request req2;
+   req2.push("SUBSCRIBE", "channel");
+
+   request req3;
+   req3.push("QUIT");
+
+   auto handler =[](auto ec, auto...)
+   {
+      expect_no_error(ec, "test_push_many_subscribes");
+   };
+
+   net::io_context ioc;
+   auto db = std::make_shared<connection>(ioc, cfg);
+   db->async_exec(req0, aedis::adapt(), handler);
+   db->async_exec(req1, aedis::adapt(), handler);
+   db->async_exec(req2, aedis::adapt(), handler);
+   db->async_exec(req2, aedis::adapt(), handler);
+   db->async_exec(req1, aedis::adapt(), handler);
+   db->async_exec(req2, aedis::adapt(), handler);
+   db->async_exec(req1, aedis::adapt(), handler);
+   db->async_exec(req2, aedis::adapt(), handler);
+   db->async_exec(req2, aedis::adapt(), handler);
+   db->async_exec(req1, aedis::adapt(), handler);
+   db->async_exec(req2, aedis::adapt(), handler);
+   db->async_exec(req3, aedis::adapt(), handler);
+
+   db->async_run([db](auto ec, auto...) {
+      expect_error(ec, net::error::misc_errors::eof, "test_push_many_subscribes");
+      db->cancel_event_receiver();
+   });
+
+   net::co_spawn(ioc.get_executor(), push_consumer3(db), net::detached);
+   ioc.run();
+}
+
+#endif
+
+void test_push()
+{
+   connection::config cfg;
+
+   cfg.coalesce_requests = true;
+#ifdef BOOST_ASIO_HAS_CO_AWAIT
+   test_push_is_received1(cfg);
+   test_push_is_received2(cfg);
+   test_push_many_subscribes(cfg);
+#endif
+   test_missing_push_reader1(cfg);
+   test_missing_push_reader3(cfg);
+
+   cfg.coalesce_requests = false;
+#ifdef BOOST_ASIO_HAS_CO_AWAIT
+   test_push_is_received1(cfg);
+   test_push_is_received2(cfg);
+   test_push_many_subscribes(cfg);
+#endif
+   test_missing_push_reader2(cfg);
+   test_missing_push_reader3(cfg);
+}
+
+
+int main()
+{
+   test_resolve();
+   test_connect();
+   test_quit();
+   test_push();
+#ifdef BOOST_ASIO_HAS_CO_AWAIT
+   test_reconnect();
+#endif
+
+   // Must come last as it sends a client pause.
+   test_idle();
+}
+

tests/high_level.cpp

@@ -1,499 +0,0 @@
-/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
- *
- * Distributed under the Boost Software License, Version 1.0. (See
- * accompanying file LICENSE.txt)
- */
-
-#include <iostream>
-#include <map>
-
-#include <boost/asio.hpp>
-#include <boost/system/errc.hpp>
-
-#include <aedis/aedis.hpp>
-#include <aedis/src.hpp>
-
-#include "check.hpp"
-
-namespace net = boost::asio;
-namespace resp3 = aedis::resp3;
-
-using aedis::resp3::node;
-using aedis::redis::command;
-using aedis::generic::make_serializer;
-using aedis::adapter::adapt;
-using aedis::adapter::adapter_t;
-using node_type = aedis::resp3::node<std::string>;
-using tcp = net::ip::tcp;
-using client_type = aedis::generic::client<net::ip::tcp::socket, command>;
-
-auto print_read = [](auto cmd, auto n)
-{
-   std::cout << cmd << ": " << n << std::endl;
-};
-
-void test_resolve_error()
-{
-   auto f = [](auto ec)
-   {
-      expect_error(ec, net::error::netdb_errors::host_not_found);
-   };
-
-   net::io_context ioc;
-   client_type db(ioc.get_executor());
-   db.async_run("Atibaia", "6379", f);
-   ioc.run();
-}
-
-void test_connect_error()
-{
-   auto f = [](auto ec)
-   {
-      expect_error(ec, net::error::basic_errors::connection_refused);
-   };
-
-   net::io_context ioc;
-   client_type db(ioc.get_executor());
-   db.async_run("127.0.0.1", "1", f);
-   ioc.run();
-}
-
-struct receiver1 {
-public:
-   receiver1(client_type& db) : db_{&db} {}
-
-   void on_read(command cmd, std::size_t)
-   {
-      // quit will be sent more than once. It doesn't matter.
-      db_->send(command::quit);
-   }
-
-private:
-   client_type* db_;
-};
-
-// Test if a hello is automatically sent.
-void test_hello()
-{
-   auto f = [](auto ec)
-   {
-      expect_error(ec, net::error::misc_errors::eof);
-   };
-
-   net::io_context ioc;
-   client_type db(ioc.get_executor());
-   receiver1 recv{db};
-   db.set_read_handler([&recv](command cmd, std::size_t n){recv.on_read(cmd, n);});
-   db.async_run("127.0.0.1", "6379", f);
-   ioc.run();
-}
-
-struct receiver2 {
-public:
-   receiver2(client_type& db) : db_{&db} {}
-
-   void on_write(std::size_t)
-   {
-      // Notice this causes a loop, but since quit stops the
-      // connection it is not a problem.
-      db_->send(command::quit);
-   }
-
-private:
-   client_type* db_;
-};
-
-// Test if a hello is automatically sent but this time, uses on_write
-// to send the quit command. Notice quit will be sent twice.
-void test_hello2()
-{
-   auto f = [](auto ec)
-   {
-      expect_error(ec, net::error::misc_errors::eof);
-   };
-
-   net::io_context ioc;
-   client_type db(ioc.get_executor());
-   receiver2 recv{db};
-   //db.set_read_handler(print_read);
-   db.set_write_handler([&recv](std::size_t n){recv.on_write(n);});
-   db.async_run("127.0.0.1", "6379", f);
-   ioc.run();
-}
-
-struct receiver3 {
-public:
-   receiver3(client_type& db) : db_{&db} {}
-
-   void on_write(std::size_t)
-   {
-      // Notice this causes a loop.
-      db_->send(command::subscribe, "channel");
-   }
-
-   void on_push(std::size_t)
-   {
-      db_->send(command::quit);
-   }
-
-private:
-   client_type* db_;
-};
-
-void test_push()
-{
-   auto f = [](auto ec)
-   {
-      expect_error(ec, net::error::misc_errors::eof);
-   };
-
-   net::io_context ioc;
-   client_type db(ioc.get_executor());
-   receiver3 recv{db};
-   db.set_write_handler([&recv](std::size_t n){recv.on_write(n);});
-   db.set_push_handler([&recv](std::size_t n){recv.on_push(n);});
-   db.async_run("127.0.0.1", "6379", f);
-   ioc.run();
-}
-
-struct receiver4 {
-public:
-   receiver4(client_type& db) : db_{&db} {}
-
-   void on_read()
-   {
-      // Notice this causes a loop.
-      db_->send(command::subscribe, "channel");
-   }
-
-   void on_push()
-   {
-      db_->send(command::quit);
-   }
-
-private:
-   client_type* db_;
-};
-
-void test_push2()
-{
-   auto f = [](auto ec)
-   {
-      expect_error(ec, net::error::misc_errors::eof);
-   };
-
-   net::io_context ioc;
-   client_type db(ioc.get_executor());
-   receiver4 recv{db};
-   db.set_read_handler([&recv](auto, auto){recv.on_read();});
-   db.set_push_handler([&recv](auto){recv.on_push();});
-   db.async_run("127.0.0.1", "6379", f);
-   ioc.run();
-}
-
-#include <boost/asio/yield.hpp>
-
-struct receiver5 {
-public:
-   int counter = 0;
-
-   receiver5(client_type& db)
-   : db_{&db}
-   , adapter_{adapt(counter)}
-   {}
-
-   void on_read(command) {}
-
-   void on_write()
-   {
-      if (counter == 0) {
-         // Avoid problems with previous runs.
-         db_->send(command::del, "receiver5-key");
-         db_->send(command::incr, "receiver5-key");
-         db_->send(command::quit);
-      }
-
-      if (counter == 1) {
-         db_->send(command::incr, "receiver5-key");
-         db_->send(command::quit);
-      }
-   }
-
-   void on_resp3(command cmd, node<boost::string_view> const& nd, boost::system::error_code& ec)
-   {
-      if (cmd == command::incr)
-         adapter_(nd, ec);
-   }
-
-private:
-   client_type* db_;
-   adapter_t<int> adapter_;
-};
-
-template <class Receiver>
-struct reconnect {
-   client_type db;
-   Receiver recv;
-   boost::asio::steady_timer timer;
-   net::coroutine coro;
-
-   reconnect(net::any_io_executor ex)
-   : db{ex}
-   , recv{db}
-   , timer{ex}
-   {
-      db.set_read_handler([this](auto cmd, auto){recv.on_read(cmd);});
-      db.set_write_handler([this](auto){recv.on_write();});
-      db.set_resp3_handler([this](auto a, auto b, auto c){recv.on_resp3(a, b, c);});
-   }
-
-   void on_event(boost::system::error_code ec)
-   {
-      reenter (coro) for (;;) {
-         yield db.async_run("127.0.0.1", "6379",  [this](auto ec){ on_event(ec);});
-         expect_error(ec, net::error::misc_errors::eof);
-         expect_eq(recv.counter, 1, "Reconnect counter 1.");
-         yield db.async_run("127.0.0.1", "6379",  [this](auto ec){ on_event(ec);});
-         expect_error(ec, net::error::misc_errors::eof);
-         expect_eq(recv.counter, 2, "Reconnect counter 2.");
-         yield db.async_run("127.0.0.1", "6379",  [this](auto ec){ on_event(ec);});
-         expect_error(ec, net::error::misc_errors::eof);
-         expect_eq(recv.counter, 3, "Reconnect counter 3.");
-         return;
-      }
-   }
-};
-
-#include <boost/asio/unyield.hpp>
-
-void test_reconnect()
-{
-   net::io_context ioc;
-   reconnect<receiver5> rec{ioc.get_executor()};
-   rec.on_event({});
-   ioc.run();
-}
-
-struct receiver6 {
-public:
-   int counter = 0;
-
-   receiver6(client_type& db)
-   : db_{&db}
-   , adapter_{adapt(counter)}
-   {}
-
-   void on_write() {}
-   void on_read(command cmd)
-   {
-      if (cmd == command::hello) {
-         db_->send(command::get, "receiver6-key");
-         if (counter == 0)
-            db_->send(command::del, "receiver6-key");
-         db_->send(command::incr, "receiver6-key");
-         db_->send(command::quit);
-         return;
-      }
-   }
-
-   void on_resp3(command cmd, node<boost::string_view> const& nd, boost::system::error_code& ec)
-   {
-      if (cmd == command::incr)
-         adapter_(nd, ec);
-   }
-
-private:
-   client_type* db_;
-   adapter_t<int> adapter_;
-};
-
-void test_reconnect2()
-{
-   net::io_context ioc;
-   reconnect<receiver6> rec{ioc.get_executor()};
-   rec.on_event({});
-   ioc.run();
-}
-
-struct receiver7 {
-public:
-   int counter = 0;
-
-   receiver7(client_type& db)
-   : db_{&db}
-   , adapter_{adapt(counter)}
-   {}
-
-   void on_resp3(command cmd, node<boost::string_view> const& nd, boost::system::error_code& ec)
-   {
-      if (cmd == command::incr)
-         adapter_(nd, ec);
-   }
-
-   void on_write(std::size_t)
-   {
-      if (!std::exchange(sent_, true)) {
-         db_->send(command::del, "key");
-         db_->send(command::multi);
-         db_->send(command::ping, "aaa");
-         db_->send(command::incr, "key");
-         db_->send(command::ping, "bbb");
-         db_->send(command::discard);
-         db_->send(command::ping, "ccc");
-         db_->send(command::incr, "key");
-         db_->send(command::quit);
-      }
-   }
-
-   void on_read(command cmd, std::size_t)
-   {
-   }
-
-private:
-   bool sent_ = false;
-   client_type* db_;
-   adapter_t<int> adapter_;
-};
-
-void test_discard()
-{
-   auto f = [](auto ec)
-   {
-      expect_error(ec, net::error::misc_errors::eof);
-   };
-
-   net::io_context ioc;
-   client_type db(ioc.get_executor());
-
-   receiver7 recv{db};
-   db.set_read_handler([&recv](auto cmd, std::size_t n){recv.on_read(cmd, n);});
-   db.set_write_handler([&recv](std::size_t n){recv.on_write(n);});
-   db.set_resp3_handler([&recv](auto a, auto b, auto c){recv.on_resp3(a, b, c);});
-
-   db.async_run("127.0.0.1", "6379", f);
-   ioc.run();
-
-   expect_eq(recv.counter, 1, "test_discard.");
-}
-
-struct receiver8 {
-public:
-   receiver8(client_type& db) : db_{&db} {}
-
-   void on_write(std::size_t)
-   {
-      std::cout << "on_write" << std::endl;
-      if (!std::exchange(sent_, true)) {
-         db_->send(command::del, "key");
-         db_->send(command::client, "PAUSE", 5000);
-      }
-   }
-
-private:
-   bool sent_ = false;
-   client_type* db_;
-};
-
-void test_idle()
-{
-   auto f = [](auto ec)
-   {
-      expect_error(ec, aedis::generic::error::idle_timeout);
-   };
-
-   net::io_context ioc;
-   client_type::config cfg;
-   cfg.resolve_timeout = std::chrono::seconds{1};
-   cfg.connect_timeout = std::chrono::seconds{1};
-   cfg.read_timeout = std::chrono::seconds{1};
-   cfg.write_timeout = std::chrono::seconds{1};
-   cfg.idle_timeout = std::chrono::seconds{2};
-   client_type db(ioc.get_executor(), cfg);
-
-   receiver8 recv{db};
-   db.set_write_handler([&recv](std::size_t n){recv.on_write(n);});
-
-   db.async_run("127.0.0.1", "6379", f);
-   ioc.run();
-}
-
-struct receiver9 {
-public:
-   bool ping = false;
-
-   receiver9(client_type& db) : db_{&db} , adapter_{adapt(counter_)} {}
-
-   void on_resp3(command cmd, node<boost::string_view> const& nd, boost::system::error_code& ec)
-   {
-      if (cmd == command::incr)
-         adapter_(nd, ec);
-   }
-
-   void on_push(std::size_t) {}
-
-   void on_write(std::size_t)
-   {
-      if (!std::exchange(sent_, true))
-         db_->send(command::del, "key");
-
-      db_->send(command::incr, "key");
-      db_->send(command::subscribe, "channel");
-   }
-
-   void on_read(command cmd, std::size_t)
-   {
-      db_->send(command::incr, "key");
-      db_->send(command::subscribe, "channel");
-      if (counter_ == 100000) {
-         std::cout << "Success: counter increase." << std::endl;
-         db_->send(command::quit);
-      }
-
-      if (cmd == command::ping)
-         ping = true;
-   }
-
-private:
-   bool sent_ = false;
-   client_type* db_;
-   int counter_ = 0;
-   adapter_t<int> adapter_;
-};
-
-void test_no_ping()
-{
-   auto f = [](auto ec)
-   {
-      expect_error(ec, net::error::misc_errors::eof);
-   };
-
-   net::io_context ioc;
-   client_type::config cfg;
-   cfg.idle_timeout = std::chrono::seconds{2};
-   client_type db(ioc.get_executor(), cfg);
-
-   auto recv = std::make_shared<receiver9>(db);
-   db.set_receiver(recv);
-   db.async_run("127.0.0.1", "6379", f);
-   ioc.run();
-
-   expect_eq(recv->ping, false, "No ping received.");
-}
-
-int main()
-{
-   test_resolve_error();
-   test_connect_error();
-   test_hello();
-   test_hello2();
-   test_push();
-   test_push2();
-   test_reconnect();
-   test_reconnect2();
-   test_discard();
-   test_no_ping();
-
-   // Must come last as it send a client pause.
-   test_idle();
-}
-

tests/low_level.cpp

@@ -16,7 +16,7 @@
 #include <boost/asio/co_spawn.hpp>
 #include <boost/beast/_experimental/test/stream.hpp>
 
-#include <aedis/aedis.hpp>
+#include <aedis.hpp>
 #include <aedis/src.hpp>
 
 #include "check.hpp"
@@ -36,7 +36,7 @@ struct expect {
    std::string in;
    Result expected;
    std::string name;
-   boost::system::error_code ec;
+   boost::system::error_code ec{};
 };
 
 template <class Result>
@@ -74,7 +74,7 @@ public:
    void run()
    {
       auto self = this->shared_from_this();
-      auto f = [self](auto ec, auto n)
+      auto f = [self](auto ec, auto)
       {
          expect_error(ec, self->data_.ec);
          if (self->data_.ec)
@@ -108,12 +108,12 @@ void test_number(net::io_context& ioc)
    auto const in03 = expect<int>{":11\r\n", int{11}, "number.int"};
    auto const in04 = expect<boost::optional<int>>{":11\r\n", ok, "number.optional.int"};
    auto const in05 = expect<std::tuple<int>>{"*1\r\n:11\r\n", std::tuple<int>{11}, "number.tuple.int"};
-   auto const in06 = expect<boost::optional<int>>{"%11\r\n", boost::optional<int>{}, "number.optional.int", aedis::adapter::make_error_code(aedis::adapter::error::expects_simple_type)};
-   auto const in07 = expect<std::set<std::string>>{":11\r\n", std::set<std::string>{}, "number.optional.int", aedis::adapter::make_error_code(aedis::adapter::error::expects_set_type)};
-   auto const in08 = expect<std::unordered_set<std::string>>{":11\r\n", std::unordered_set<std::string>{}, "number.optional.int", aedis::adapter::make_error_code(aedis::adapter::error::expects_set_type)};
-   auto const in09 = expect<std::map<std::string, std::string>>{":11\r\n", std::map<std::string, std::string>{}, "number.optional.int", aedis::adapter::make_error_code(aedis::adapter::error::expects_map_type)};
-   auto const in10 = expect<std::unordered_map<std::string, std::string>>{":11\r\n", std::unordered_map<std::string, std::string>{}, "number.optional.int", aedis::adapter::make_error_code(aedis::adapter::error::expects_map_type)};
-   auto const in11 = expect<std::list<std::string>>{":11\r\n", std::list<std::string>{}, "number.optional.int", aedis::adapter::make_error_code(aedis::adapter::error::expects_aggregate_type)};
+   auto const in06 = expect<boost::optional<int>>{"%11\r\n", boost::optional<int>{}, "number.optional.int", aedis::make_error_code(aedis::error::expects_simple_type)};
+   auto const in07 = expect<std::set<std::string>>{":11\r\n", std::set<std::string>{}, "number.optional.int", aedis::make_error_code(aedis::error::expects_set_type)};
+   auto const in08 = expect<std::unordered_set<std::string>>{":11\r\n", std::unordered_set<std::string>{}, "number.optional.int", aedis::make_error_code(aedis::error::expects_set_type)};
+   auto const in09 = expect<std::map<std::string, std::string>>{":11\r\n", std::map<std::string, std::string>{}, "number.optional.int", aedis::make_error_code(aedis::error::expects_map_type)};
+   auto const in10 = expect<std::unordered_map<std::string, std::string>>{":11\r\n", std::unordered_map<std::string, std::string>{}, "number.optional.int", aedis::make_error_code(aedis::error::expects_map_type)};
+   auto const in11 = expect<std::list<std::string>>{":11\r\n", std::list<std::string>{}, "number.optional.int", aedis::make_error_code(aedis::error::expects_aggregate_type)};
 
    auto ex = ioc.get_executor();
 
@@ -155,11 +155,11 @@ void test_bool(net::io_context& ioc)
    auto const in13 = expect<boost::optional<bool>>{"#t\r\n", ok, "optional.int"};
 
    // Error
-   auto const in01 = expect<boost::optional<bool>>{"#11\r\n", boost::optional<bool>{}, "bool.error", aedis::resp3::make_error_code(aedis::resp3::error::unexpected_bool_value)};
-   auto const in03 = expect<std::set<int>>{"#t\r\n", std::set<int>{}, "bool.error", aedis::adapter::make_error_code(aedis::adapter::error::expects_set_type)};
-   auto const in04 = expect<std::unordered_set<int>>{"#t\r\n", std::unordered_set<int>{}, "bool.error", aedis::adapter::make_error_code(aedis::adapter::error::expects_set_type)};
-   auto const in05 = expect<std::map<int, int>>{"#t\r\n", std::map<int, int>{}, "bool.error", aedis::adapter::make_error_code(aedis::adapter::error::expects_map_type)};
-   auto const in06 = expect<std::unordered_map<int, int>>{"#t\r\n", std::unordered_map<int, int>{}, "bool.error", aedis::adapter::make_error_code(aedis::adapter::error::expects_map_type)};
+   auto const in01 = expect<boost::optional<bool>>{"#11\r\n", boost::optional<bool>{}, "bool.error", aedis::make_error_code(aedis::error::unexpected_bool_value)};
+   auto const in03 = expect<std::set<int>>{"#t\r\n", std::set<int>{}, "bool.error", aedis::make_error_code(aedis::error::expects_set_type)};
+   auto const in04 = expect<std::unordered_set<int>>{"#t\r\n", std::unordered_set<int>{}, "bool.error", aedis::make_error_code(aedis::error::expects_set_type)};
+   auto const in05 = expect<std::map<int, int>>{"#t\r\n", std::map<int, int>{}, "bool.error", aedis::make_error_code(aedis::error::expects_map_type)};
+   auto const in06 = expect<std::unordered_map<int, int>>{"#t\r\n", std::unordered_map<int, int>{}, "bool.error", aedis::make_error_code(aedis::error::expects_map_type)};
 
    auto ex = ioc.get_executor();
 
@@ -319,7 +319,7 @@ void test_map(net::io_context& ioc)
    auto const in07 = expect<op_map_type>{wire, expected_1d, "map.optional.map"};
    auto const in08 = expect<op_vec_type>{wire, expected_1e, "map.optional.vector"};
    auto const in09 = expect<std::tuple<op_map_type>>{"*1\r\n" + wire, std::tuple<op_map_type>{expected_1d}, "map.transaction.optional.map"};
-   auto const in10 = expect<int>{"%11\r\n", int{}, "map.invalid.int", aedis::adapter::make_error_code(aedis::adapter::error::expects_simple_type)};
+   auto const in10 = expect<int>{"%11\r\n", int{}, "map.invalid.int", aedis::make_error_code(aedis::error::expects_simple_type)};
    auto const in11 = expect<tuple_type>{wire, e1f, "map.tuple"};
 
    auto ex = ioc.get_executor();
@@ -488,8 +488,8 @@ void test_set(net::io_context& ioc)
 
 void test_simple_error(net::io_context& ioc)
 {
-   auto const in01 = expect<node_type>{"-Error\r\n", node_type{resp3::type::simple_error, 1UL, 0UL, {"Error"}}, "simple_error.node"};
-   auto const in02 = expect<node_type>{"-\r\n", node_type{resp3::type::simple_error, 1UL, 0UL, {""}}, "simple_error.node.empty"};
+   auto const in01 = expect<node_type>{"-Error\r\n", node_type{resp3::type::simple_error, 1UL, 0UL, {"Error"}}, "simple_error.node", aedis::make_error_code(aedis::error::simple_error)};
+   auto const in02 = expect<node_type>{"-\r\n", node_type{resp3::type::simple_error, 1UL, 0UL, {""}}, "simple_error.node.empty", aedis::make_error_code(aedis::error::simple_error)};
 
    auto ex = ioc.get_executor();
 
@@ -554,8 +554,8 @@ void test_double(net::io_context& ioc)
 
 void test_blob_error(net::io_context& ioc)
 {
-   auto const in01 = expect<node_type>{"!21\r\nSYNTAX invalid syntax\r\n", node_type{resp3::type::blob_error, 1UL, 0UL, {"SYNTAX invalid syntax"}}, "blob_error"};
-   auto const in02 = expect<node_type>{"!0\r\n\r\n", node_type{resp3::type::blob_error, 1UL, 0UL, {}}, "blob_error.empty"};
+   auto const in01 = expect<node_type>{"!21\r\nSYNTAX invalid syntax\r\n", node_type{resp3::type::blob_error, 1UL, 0UL, {"SYNTAX invalid syntax"}}, "blob_error", aedis::make_error_code(aedis::error::blob_error)};
+   auto const in02 = expect<node_type>{"!0\r\n\r\n", node_type{resp3::type::blob_error, 1UL, 0UL, {}}, "blob_error.empty", aedis::make_error_code(aedis::error::blob_error)};
 
    auto ex = ioc.get_executor();
 
@@ -583,7 +583,7 @@ void test_verbatim_string(net::io_context& ioc)
 void test_big_number(net::io_context& ioc)
 {
    auto const in01 = expect<node_type>{"(3492890328409238509324850943850943825024385\r\n", node_type{resp3::type::big_number, 1UL, 0UL, {"3492890328409238509324850943850943825024385"}}, "big_number.node"};
-   auto const in02 = expect<int>{"(\r\n", int{}, "big_number.error (empty field)", aedis::resp3::make_error_code(aedis::resp3::error::empty_field)};
+   auto const in02 = expect<int>{"(\r\n", int{}, "big_number.error (empty field)", aedis::make_error_code(aedis::error::empty_field)};
 
    auto ex = ioc.get_executor();
 
@@ -620,11 +620,11 @@ void test_simple_string(net::io_context& ioc)
 
 void test_resp3(net::io_context& ioc)
 {
-   auto const in01 = expect<int>{"s11\r\n", int{}, "number.error", aedis::resp3::make_error_code(aedis::resp3::error::invalid_type)};
-   auto const in02 = expect<int>{":adf\r\n", int{11}, "number.int", aedis::resp3::make_error_code(aedis::resp3::error::not_a_number)};
-   auto const in03 = expect<int>{":\r\n", int{}, "number.error (empty field)", aedis::resp3::make_error_code(aedis::resp3::error::empty_field)};
-   auto const in04 = expect<boost::optional<bool>>{"#\r\n", boost::optional<bool>{}, "bool.error", aedis::resp3::make_error_code(aedis::resp3::error::empty_field)};
-   auto const in05 = expect<std::string>{",\r\n", std::string{}, "double.error (empty field)", aedis::resp3::make_error_code(aedis::resp3::error::empty_field)};
+   auto const in01 = expect<int>{"s11\r\n", int{}, "number.error", aedis::make_error_code(aedis::error::invalid_data_type)};
+   auto const in02 = expect<int>{":adf\r\n", int{11}, "number.int", aedis::make_error_code(aedis::error::not_a_number)};
+   auto const in03 = expect<int>{":\r\n", int{}, "number.error (empty field)", aedis::make_error_code(aedis::error::empty_field)};
+   auto const in04 = expect<boost::optional<bool>>{"#\r\n", boost::optional<bool>{}, "bool.error", aedis::make_error_code(aedis::error::empty_field)};
+   auto const in05 = expect<std::string>{",\r\n", std::string{}, "double.error (empty field)", aedis::make_error_code(aedis::error::empty_field)};
 
    auto ex = ioc.get_executor();
 

tests/low_level_sync.cpp

@@ -0,0 +1,53 @@
+/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
+ *
+ * Distributed under the Boost Software License, Version 1.0. (See
+ * accompanying file LICENSE.txt)
+ */
+
+#include <string>
+#include <iostream>
+
+#include <boost/asio/connect.hpp>
+
+#include <aedis.hpp>
+#include <aedis/src.hpp>
+
+namespace net = boost::asio;
+namespace resp3 = aedis::resp3;
+
+using aedis::resp3::request;
+using aedis::adapter::adapt;
+using net::ip::tcp;
+
+int main()
+{
+   try {
+      net::io_context ioc;
+      tcp::resolver resv{ioc};
+      auto const res = resv.resolve("127.0.0.1", "6379");
+      tcp::socket socket{ioc};
+      net::connect(socket, res);
+
+      // Creates the request and writes to the socket.
+      request req;
+      req.push("HELLO", 3);
+      req.push("PING");
+      req.push("QUIT");
+      resp3::write(socket, req);
+
+      // Responses
+      std::string buffer, resp;
+
+      // Reads the responses to all commands in the request.
+      auto dbuffer = net::dynamic_buffer(buffer);
+      resp3::read(socket, dbuffer);
+      resp3::read(socket, dbuffer, adapt(resp));
+      resp3::read(socket, dbuffer);
+
+      std::cout << "Ping: " << resp << std::endl;
+
+   } catch (std::exception const& e) {
+      std::cerr << e.what() << std::endl;
+      exit(EXIT_FAILURE);
+   }
+}

tools/commands.cpp

@@ -1,107 +0,0 @@
-/* Copyright (c) 2018-2022 Marcelo Zimbres Silva (mzimbres@gmail.com)
- *
- * Distributed under the Boost Software License, Version 1.0. (See
- * accompanying file LICENSE.txt)
- */
-
-#include <iostream>
-#include <algorithm>
-#include <cctype>
-
-#include <boost/asio/connect.hpp>
-
-#include <aedis/aedis.hpp>
-#include <aedis/src.hpp>
-
-namespace net = boost::asio;
-namespace resp3 = aedis::resp3;
-
-using aedis::redis::command;
-using aedis::generic::make_serializer;
-using aedis::resp3::node;
-using aedis::adapter::adapt;
-using net::ip::tcp;
-using net::write;
-using net::buffer;
-using net::dynamic_buffer;
-
-std::string toupper(std::string s)
-{
-   std::transform(std::begin(s), std::end(s), std::begin(s),
-                  [](unsigned char c){ return std::toupper(c); });
-   return s;
-}
-
-std::vector<std::string>
-get_cmd_names(std::vector<node<std::string>> const& resp)
-{
-   if (resp.empty()) {
-      std::cerr << "Response is empty." << std::endl;
-      return {};
-   }
-
-   std::vector<std::string> ret;
-   for (auto i = 0ULL; i < resp.size(); ++i) {
-      if (resp.at(i).depth == 1)
-         ret.push_back(resp.at(i + 1).value);
-   }
-
-   std::sort(std::begin(ret), std::end(ret));
-   return ret;
-}
-
-void print_cmds_enum(std::vector<std::string> const& cmds)
-{
-   std::cout << "enum class command {\n";
-   for (auto const& cmd : cmds) {
-      std::cout
-         << "   /// https://redis.io/commands/" << cmd << "\n"
-         << "   " << cmd << ",\n";
-   }
-
-   std::cout << "   invalid\n};\n";
-}
-
-void print_cmds_strs(std::vector<std::string> const& cmds)
-{
-   std::cout << "   static char const* table[] = {\n";
-   for (auto const& cmd : cmds) {
-      std::cout << "      \"" << toupper(cmd) << "\",\n";
-   }
-
-   std::cout << "   };\n";
-}
-
-int main()
-{
-   try {
-     net::io_context ioc;
-     tcp::resolver resv{ioc};
-     auto const res = resv.resolve("127.0.0.1", "6379");
-     tcp::socket socket{ioc};
-     net::connect(socket, res);
-
-     std::string request;
-     auto sr = make_serializer(request);
-     sr.push(command::hello, 3);
-     sr.push(command::command);
-     sr.push(command::quit);
-     write(socket, buffer(request));
-
-     std::vector<node<std::string>> resp;
-
-     std::string buffer;
-     resp3::read(socket, dynamic_buffer(buffer));
-     resp3::read(socket, dynamic_buffer(buffer), adapt(resp));
-     resp3::read(socket, dynamic_buffer(buffer));
-
-     auto const cmds = get_cmd_names(resp);
-     print_cmds_enum(cmds);
-     std::cout << "\n";
-     print_cmds_strs(cmds);
-
-   } catch (std::exception const& e) {
-      std::cerr << e.what() << std::endl;
-   }
-}
-