couchbase 3.0.0.alpha.2-universal-darwin-19 → 3.0.0-universal-darwin-19

data/ext/couchbase/io/mcbp_command.hxx

@@ -0,0 +1,237 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *     Copyright 2020 Couchbase, Inc.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+#pragma once
+
+#include <io/mcbp_session.hxx>
+#include <io/retry_orchestrator.hxx>
+
+#include <protocol/cmd_get_collection_id.hxx>
+#include <functional>
+#include <utility>
+
+namespace couchbase::operations
+{
+
+using mcbp_command_handler = std::function<void(std::error_code, std::optional<io::mcbp_message>)>;
+
+template<typename Manager, typename Request>
+struct mcbp_command : public std::enable_shared_from_this<mcbp_command<Manager, Request>> {
+    using encoded_request_type = typename Request::encoded_request_type;
+    using encoded_response_type = typename Request::encoded_response_type;
+    asio::steady_timer deadline;
+    asio::steady_timer retry_backoff;
+    Request request;
+    encoded_request_type encoded;
+    std::optional<std::uint32_t> opaque_{};
+    std::shared_ptr<io::mcbp_session> session_{};
+    mcbp_command_handler handler_{};
+    std::shared_ptr<Manager> manager_{};
+
+    mcbp_command(asio::io_context& ctx, std::shared_ptr<Manager> manager, Request req)
+      : deadline(ctx)
+      , retry_backoff(ctx)
+      , request(req)
+      , manager_(manager)
+    {
+    }
+
+    void start(mcbp_command_handler&& handler)
+    {
+        handler_ = handler;
+        deadline.expires_after(request.timeout);
+        deadline.async_wait([self = this->shared_from_this()](std::error_code ec) {
+            if (ec == asio::error::operation_aborted) {
+                return;
+            }
+            self->cancel(io::retry_reason::do_not_retry);
+        });
+    }
+
+    void cancel(io::retry_reason reason)
+    {
+        if (opaque_ && session_) {
+            if (session_->cancel(opaque_.value(), asio::error::operation_aborted, reason)) {
+                handler_ = nullptr;
+            }
+        }
+        invoke_handler(std::make_error_code(request.retries.idempotent ? error::common_errc::unambiguous_timeout
+                                                                       : error::common_errc::ambiguous_timeout));
+        retry_backoff.cancel();
+        deadline.cancel();
+    }
+
+    void invoke_handler(std::error_code ec, std::optional<io::mcbp_message> msg = {})
+    {
+        if (handler_) {
+            handler_(ec, std::move(msg));
+        }
+        handler_ = nullptr;
+    }
+
+    void request_collection_id()
+    {
+        protocol::client_request<protocol::get_collection_id_request_body> req;
+        req.opaque(session_->next_opaque());
+        req.body().collection_path(request.id.collection);
+        session_->write_and_subscribe(
+          req.opaque(),
+          req.data(session_->supports_feature(protocol::hello_feature::snappy)),
+          [self = this->shared_from_this()](std::error_code ec, io::retry_reason /* reason */, io::mcbp_message&& msg) mutable {
+              if (ec == asio::error::operation_aborted) {
+                  return self->invoke_handler(std::make_error_code(error::common_errc::ambiguous_timeout));
+              }
+              if (ec == std::make_error_code(error::common_errc::collection_not_found)) {
+                  if (self->request.id.collection_uid) {
+                      return self->handle_unknown_collection();
+                  }
+                  return self->invoke_handler(ec);
+              }
+              if (ec) {
+                  return self->invoke_handler(ec);
+              }
+              protocol::client_response<protocol::get_collection_id_response_body> resp(msg);
+              self->session_->update_collection_uid(self->request.id.collection, resp.body().collection_uid());
+              self->request.id.collection_uid = resp.body().collection_uid();
+              return self->send();
+          });
+    }
+
+    void handle_unknown_collection()
+    {
+        auto backoff = std::chrono::milliseconds(500);
+        auto time_left = deadline.expiry() - std::chrono::steady_clock::now();
+        spdlog::debug("{} unknown collection response for \"{}/{}/{}\", time_left={}ms",
+                      session_->log_prefix(),
+                      request.id.bucket,
+                      request.id.collection,
+                      request.id.key,
+                      std::chrono::duration_cast<std::chrono::milliseconds>(time_left).count());
+        if (time_left < backoff) {
+            return invoke_handler(std::make_error_code(request.retries.idempotent ? error::common_errc::unambiguous_timeout
+                                                                                  : error::common_errc::ambiguous_timeout));
+        }
+        retry_backoff.expires_after(backoff);
+        retry_backoff.async_wait([self = this->shared_from_this()](std::error_code ec) mutable {
+            if (ec == asio::error::operation_aborted) {
+                return;
+            }
+            self->request_collection_id();
+        });
+    }
+
+    void send()
+    {
+        opaque_ = session_->next_opaque();
+        request.opaque = *opaque_;
+        if (!request.id.collection_uid) {
+            if (session_->supports_feature(protocol::hello_feature::collections)) {
+                auto collection_id = session_->get_collection_uid(request.id.collection);
+                if (collection_id) {
+                    request.id.collection_uid = *collection_id;
+                } else {
+                    spdlog::debug("{} no cache entry for collection, resolve collection id for \"{}/{}/{}\", timeout={}ms",
+                                  session_->log_prefix(),
+                                  request.id.bucket,
+                                  request.id.collection,
+                                  request.id.key,
+                                  request.timeout.count());
+                    return request_collection_id();
+                }
+            } else {
+                if (!request.id.collection.empty() && request.id.collection != "_default._default") {
+                    return invoke_handler(std::make_error_code(error::common_errc::unsupported_operation));
+                }
+            }
+        }
+        request.encode_to(encoded);
+
+        session_->write_and_subscribe(
+          request.opaque,
+          encoded.data(session_->supports_feature(protocol::hello_feature::snappy)),
+          [self = this->shared_from_this()](std::error_code ec, io::retry_reason reason, io::mcbp_message&& msg) mutable {
+              self->retry_backoff.cancel();
+              if (ec == asio::error::operation_aborted) {
+                  return self->invoke_handler(std::make_error_code(
+                    self->request.retries.idempotent ? error::common_errc::unambiguous_timeout : error::common_errc::ambiguous_timeout));
+              }
+              if (ec == std::make_error_code(error::common_errc::request_canceled)) {
+                  if (reason == io::retry_reason::do_not_retry) {
+                      return self->invoke_handler(ec);
+                  }
+                  return io::retry_orchestrator::maybe_retry(self->manager_, self, reason, ec);
+              }
+              protocol::status status = protocol::status::invalid;
+              std::optional<error_map::error_info> error_code{};
+              if (protocol::is_valid_status(msg.header.status())) {
+                  status = static_cast<protocol::status>(msg.header.status());
+              } else {
+                  error_code = self->session_->decode_error_code(msg.header.status());
+              }
+              if (status == protocol::status::not_my_vbucket) {
+                  self->session_->handle_not_my_vbucket(std::move(msg));
+                  return io::retry_orchestrator::maybe_retry(self->manager_, self, io::retry_reason::kv_not_my_vbucket, ec);
+              }
+              if (status == protocol::status::unknown_collection) {
+                  return self->handle_unknown_collection();
+              }
+              if (error_code && error_code.value().has_retry_attribute()) {
+                  reason = io::retry_reason::kv_error_map_retry_indicated;
+              } else {
+                  switch (status) {
+                      case protocol::status::locked:
+                          if (encoded_request_type::body_type::opcode != protocol::client_opcode::unlock) {
+                              /**
+                               * special case for unlock command, when it should not be retried, because it does not make sense
+                               * (someone else unlocked the document)
+                               */
+                              reason = io::retry_reason::kv_locked;
+                          }
+                          break;
+                      case protocol::status::temporary_failure:
+                          reason = io::retry_reason::kv_temporary_failure;
+                          break;
+                      case protocol::status::sync_write_in_progress:
+                          reason = io::retry_reason::kv_sync_write_in_progress;
+                          break;
+                      case protocol::status::sync_write_re_commit_in_progress:
+                          reason = io::retry_reason::kv_sync_write_re_commit_in_progress;
+                          break;
+                      default:
+                          break;
+                  }
+              }
+              if (reason == io::retry_reason::do_not_retry) {
+                  self->deadline.cancel();
+                  self->invoke_handler(ec, msg);
+              } else {
+                  io::retry_orchestrator::maybe_retry(self->manager_, self, reason, ec);
+              }
+          });
+    }
+
+    void send_to(std::shared_ptr<io::mcbp_session> session)
+    {
+        if (!handler_) {
+            return;
+        }
+        session_ = std::move(session);
+        send();
+    }
+};
+
+} // namespace couchbase::operations

data/ext/couchbase/io/mcbp_message.hxx

@@ -19,8 +19,17 @@
 
 #include <cstdint>
 #include <vector>
+#include <array>
 
-namespace couchbase::io
+namespace couchbase
+{
+namespace protocol
+{
+static const size_t header_size = 24;
+using header_buffer = std::array<std::uint8_t, header_size>;
+} // namespace protocol
+
+namespace io
 {
 struct binary_header {
     std::uint8_t magic;
@@ -32,10 +41,23 @@ struct binary_header {
     std::uint32_t bodylen;
     std::uint32_t opaque;
     std::uint64_t cas;
+
+    std::uint16_t status()
+    {
+        return htons(specific);
+    }
 };
 
 struct mcbp_message {
     binary_header header;
     std::vector<std::uint8_t> body;
+
+    protocol::header_buffer header_data()
+    {
+        protocol::header_buffer buf;
+        std::memcpy(buf.data(), &header, sizeof(header));
+        return buf;
+    }
 };
-} // namespace couchbase::io
+} // namespace io
+} // namespace couchbase

data/ext/couchbase/io/mcbp_parser.hxx

@@ -73,6 +73,8 @@ struct mcbp_parser {
             if (success) {
                 std::copy(uncompressed.begin(), uncompressed.end(), std::back_inserter(msg.body));
                 use_raw_value = false;
+                // patch header with new body size
+                msg.header.bodylen = htonl(static_cast<std::uint32_t>(prefix_size + uncompressed.size()));
             }
         }
         if (use_raw_value) {

data/ext/couchbase/io/mcbp_session.hxx

@@ -27,6 +27,10 @@
 
 #include <io/mcbp_message.hxx>
 #include <io/mcbp_parser.hxx>
+#include <io/streams.hxx>
+#include <io/retry_orchestrator.hxx>
+
+#include <timeout_defaults.hxx>
 
 #include <protocol/hello_feature.hxx>
 #include <protocol/client_request.hxx>
@@ -39,7 +43,6 @@
 #include <protocol/cmd_select_bucket.hxx>
 #include <protocol/cmd_get_cluster_config.hxx>
 #include <protocol/cmd_get_error_map.hxx>
-#include <protocol/cmd_get_collections_manifest.hxx>
 #include <protocol/cmd_get.hxx>
 #include <protocol/cmd_cluster_map_change_notification.hxx>
 
@@ -47,6 +50,7 @@
 
 #include <spdlog/fmt/bin_to_hex.h>
 
+#include <origin.hxx>
 #include <errors.hxx>
 #include <version.hxx>
 
@@ -55,6 +59,35 @@ namespace couchbase::io
 
 class mcbp_session : public std::enable_shared_from_this<mcbp_session>
 {
+    class collection_cache
+    {
+      private:
+        std::map<std::string, std::uint32_t> cid_map_{ { "_default._default", 0 } };
+
+      public:
+        [[nodiscard]] std::optional<std::uint32_t> get(const std::string& path)
+        {
+            Expects(!path.empty());
+            auto ptr = cid_map_.find(path);
+            if (ptr != cid_map_.end()) {
+                return ptr->second;
+            }
+            return {};
+        }
+
+        void update(const std::string& path, std::uint32_t id)
+        {
+            Expects(!path.empty());
+            cid_map_[path] = id;
+        }
+
+        void reset()
+        {
+            cid_map_.clear();
+            cid_map_["_default._default"] = 0;
+        }
+    };
+
     class message_handler
     {
       public:
@@ -88,41 +121,47 @@ class mcbp_session : public std::enable_shared_from_this<mcbp_session>
 
         explicit bootstrap_handler(std::shared_ptr<mcbp_session> session)
           : session_(session)
-          , sasl_([this]() -> std::string { return session_->username_; },
-                  [this]() -> std::string { return session_->password_; },
+          , sasl_([origin = session_->origin_]() -> std::string { return origin.username(); },
+                  [origin = session_->origin_]() -> std::string { return origin.password(); },
                   { "SCRAM-SHA512", "SCRAM-SHA256", "SCRAM-SHA1", "PLAIN" })
         {
             tao::json::value user_agent{
-                { "a", fmt::format("ruby_sdk/{}.{}.{}", BACKEND_VERSION_MAJOR, BACKEND_VERSION_MINOR, BACKEND_VERSION_PATCH) },
-                { "i", fmt::format("{}/{}", uuid::to_string(session_->client_id_), uuid::to_string(session_->id_)) }
+                { "a",
+                  fmt::format(
+                    "ruby/{}.{}.{}/{}", BACKEND_VERSION_MAJOR, BACKEND_VERSION_MINOR, BACKEND_VERSION_PATCH, BACKEND_GIT_REVISION) },
+                { "i", fmt::format("{}/{}", session_->client_id_, session_->id_) }
             };
             protocol::client_request<protocol::hello_request_body> hello_req;
             hello_req.opaque(session_->next_opaque());
             hello_req.body().user_agent(tao::json::to_string(user_agent));
+            spdlog::debug("{} user_agent={}, requested_features=[{}]",
+                          session_->log_prefix_,
+                          hello_req.body().user_agent(),
+                          fmt::join(hello_req.body().features(), ", "));
             session_->write(hello_req.data());
 
-            protocol::client_request<protocol::sasl_list_mechs_request_body> list_req;
-            list_req.opaque(session_->next_opaque());
-            session_->write(list_req.data());
-
-            protocol::client_request<protocol::sasl_auth_request_body> auth_req;
-            sasl::error sasl_code;
-            std::string_view sasl_payload;
-            std::tie(sasl_code, sasl_payload) = sasl_.start();
-            auth_req.opaque(session_->next_opaque());
-            auth_req.body().mechanism(sasl_.get_name());
-            auth_req.body().sasl_data(sasl_payload);
-            session_->write(auth_req.data());
+            if (!session->origin_.credentials().uses_certificate()) {
+                protocol::client_request<protocol::sasl_list_mechs_request_body> list_req;
+                list_req.opaque(session_->next_opaque());
+                session_->write(list_req.data());
+
+                protocol::client_request<protocol::sasl_auth_request_body> auth_req;
+                sasl::error sasl_code;
+                std::string_view sasl_payload;
+                std::tie(sasl_code, sasl_payload) = sasl_.start();
+                auth_req.opaque(session_->next_opaque());
+                auth_req.body().mechanism(sasl_.get_name());
+                auth_req.body().sasl_data(sasl_payload);
+                session_->write(auth_req.data());
+            }
 
             session_->flush();
         }
 
         void complete(std::error_code ec)
         {
+            stopped_ = true;
             session_->invoke_bootstrap_handler(ec);
-            if (!ec) {
-                session_->handler_ = std::make_unique<normal_handler>(session_);
-            }
         }
 
         void auth_success()
@@ -138,10 +177,6 @@ class mcbp_session : public std::enable_shared_from_this<mcbp_session>
                 sb_req.opaque(session_->next_opaque());
                 sb_req.body().bucket_name(session_->bucket_name_.value());
                 session_->write(sb_req.data());
-
-                protocol::client_request<protocol::get_collections_manifest_request_body> gcm_req;
-                gcm_req.opaque(session_->next_opaque());
-                session_->write(gcm_req.data());
             }
             protocol::client_request<protocol::get_cluster_config_request_body> cfg_req;
             cfg_req.opaque(session_->next_opaque());
@@ -161,15 +196,20 @@ class mcbp_session : public std::enable_shared_from_this<mcbp_session>
                     protocol::client_response<protocol::hello_response_body> resp(msg);
                     if (resp.status() == protocol::status::success) {
                         session_->supported_features_ = resp.body().supported_features();
+                        spdlog::debug("{} supported_features=[{}]", session_->log_prefix_, fmt::join(session_->supported_features_, ", "));
+                        if (session_->origin_.credentials().uses_certificate()) {
+                            spdlog::debug("{} skip SASL authentication, because TLS certificate was specified", session_->log_prefix_);
+                            return auth_success();
+                        }
                     } else {
-                        spdlog::warn("unexpected message status during bootstrap: {}", resp.error_message());
+                        spdlog::warn("{} unexpected message status during bootstrap: {}", session_->log_prefix_, resp.error_message());
                         return complete(std::make_error_code(error::network_errc::handshake_failure));
                     }
                 } break;
                 case protocol::client_opcode::sasl_list_mechs: {
                     protocol::client_response<protocol::sasl_list_mechs_response_body> resp(msg);
                     if (resp.status() != protocol::status::success) {
-                        spdlog::warn("unexpected message status during bootstrap: {}", resp.error_message());
+                        spdlog::warn("{} unexpected message status during bootstrap: {}", session_->log_prefix_, resp.error_message());
                         return complete(std::make_error_code(error::common_errc::authentication_failure));
                     }
                 } break;
@@ -192,11 +232,14 @@ class mcbp_session : public std::enable_shared_from_this<mcbp_session>
                             req.body().sasl_data(sasl_payload);
                             session_->write_and_flush(req.data());
                         } else {
-                            spdlog::error("unable to authenticate: sasl_code={}", sasl_code);
+                            spdlog::error("{} unable to authenticate: sasl_code={}", session_->log_prefix_, sasl_code);
                             return complete(std::make_error_code(error::common_errc::authentication_failure));
                         }
                     } else {
-                        spdlog::warn("unexpected message status during bootstrap: {} (opcode={})", resp.error_message(), opcode);
+                        spdlog::warn("{} unexpected message status during bootstrap: {} (opcode={})",
+                                     session_->log_prefix_,
+                                     resp.error_message(),
+                                     opcode);
                         return complete(std::make_error_code(error::common_errc::authentication_failure));
                     }
                 } break;
@@ -210,39 +253,28 @@ class mcbp_session : public std::enable_shared_from_this<mcbp_session>
                 case protocol::client_opcode::get_error_map: {
                     protocol::client_response<protocol::get_error_map_response_body> resp(msg);
                     if (resp.status() == protocol::status::success) {
-                        session_->errmap_.emplace(resp.body().errmap());
+                        session_->error_map_.emplace(resp.body().errmap());
                     } else {
-                        spdlog::warn("unexpected message status during bootstrap: {} (opcode={})", resp.error_message(), opcode);
-                        return complete(std::make_error_code(error::network_errc::protocol_error));
-                    }
-                } break;
-                case protocol::client_opcode::get_collections_manifest: {
-                    protocol::client_response<protocol::get_collections_manifest_response_body> resp(msg);
-                    if (resp.status() == protocol::status::success) {
-                        session_->manifest_.emplace(resp.body().manifest());
-                        spdlog::trace(
-                          "collections manifest for bucket \"{}\": {}", session_->bucket_name_.value_or(""), *session_->manifest_);
-                    } else if (resp.status() == protocol::status::no_collections_manifest) {
-                        spdlog::trace("collection manifest is not available for bucket \"{}\": {}",
-                                      session_->bucket_name_.value_or(""),
-                                      resp.error_message());
-                    } else {
-                        spdlog::warn("unexpected message status during bootstrap: {} (opcode={})", resp.error_message(), opcode);
+                        spdlog::warn("{} unexpected message status during bootstrap: {} (opcode={})",
+                                     session_->log_prefix_,
+                                     resp.error_message(),
+                                     opcode);
                         return complete(std::make_error_code(error::network_errc::protocol_error));
                     }
                 } break;
                 case protocol::client_opcode::select_bucket: {
                     protocol::client_response<protocol::select_bucket_response_body> resp(msg);
                     if (resp.status() == protocol::status::success) {
-                        spdlog::trace("selected bucket: {}", session_->bucket_name_.value_or(""));
+                        spdlog::debug("{} selected bucket: {}", session_->log_prefix_, session_->bucket_name_.value_or(""));
                         session_->bucket_selected_ = true;
                     } else if (resp.status() == protocol::status::no_access) {
-                        spdlog::trace("unable to select bucket: {}, probably the bucket does not exist",
+                        spdlog::debug("{} unable to select bucket: {}, probably the bucket does not exist",
+                                      session_->log_prefix_,
                                       session_->bucket_name_.value_or(""));
                         session_->bucket_selected_ = false;
                         return complete(std::make_error_code(error::common_errc::bucket_not_found));
                     } else {
-                        spdlog::warn("unexpected message status during bootstrap: {}", resp.error_message());
+                        spdlog::warn("{} unexpected message status during bootstrap: {}", session_->log_prefix_, resp.error_message());
                         return complete(std::make_error_code(error::common_errc::bucket_not_found));
                     }
                 } break;
@@ -254,17 +286,21 @@ class mcbp_session : public std::enable_shared_from_this<mcbp_session>
                     } else if (resp.status() == protocol::status::no_bucket && !session_->bucket_name_) {
                         // bucket-less session, but the server wants bucket
                         session_->supports_gcccp_ = false;
-                        spdlog::warn("this server does not support GCCCP, open bucket before making any cluster-level command");
+                        spdlog::warn("{} this server does not support GCCCP, open bucket before making any cluster-level command",
+                                     session_->log_prefix_);
                         session_->update_configuration(
-                          make_blank_configuration(session_->endpoint_.address().to_string(), session_->endpoint_.port(), 0));
+                          make_blank_configuration(session_->endpoint_address_, session_->endpoint_.port(), 0));
                         complete({});
                     } else {
-                        spdlog::warn("unexpected message status during bootstrap: {} (opcode={})", resp.error_message(), opcode);
+                        spdlog::warn("{} unexpected message status during bootstrap: {} (opcode={})",
+                                     session_->log_prefix_,
+                                     resp.error_message(),
+                                     opcode);
                         return complete(std::make_error_code(error::network_errc::protocol_error));
                     }
                 } break;
                 default:
-                    spdlog::warn("unexpected message during bootstrap: {}", opcode);
+                    spdlog::warn("{} unexpected message during bootstrap: {}", session_->log_prefix_, opcode);
                     return complete(std::make_error_code(error::network_errc::protocol_error));
             }
         }
@@ -317,9 +353,10 @@ class mcbp_session : public std::enable_shared_from_this<mcbp_session>
                                     session_->update_configuration(resp.body().config());
                                 }
                             } else {
-                                spdlog::warn("unexpected message status: {}", resp.error_message());
+                                spdlog::warn("{} unexpected message status: {}", session_->log_prefix_, resp.error_message());
                             }
                         } break;
+                        case protocol::client_opcode::get_collection_id:
                         case protocol::client_opcode::get:
                         case protocol::client_opcode::get_and_lock:
                         case protocol::client_opcode::get_and_touch:
@@ -338,14 +375,24 @@ class mcbp_session : public std::enable_shared_from_this<mcbp_session>
                             std::uint16_t status = ntohs(msg.header.specific);
                             auto handler = session_->command_handlers_.find(opaque);
                             if (handler != session_->command_handlers_.end()) {
-                                handler->second(session_->map_status_code(opcode, status), std::move(msg));
+                                auto ec = session_->map_status_code(opcode, status);
+                                spdlog::trace("{} MCBP invoke operation handler: opaque={}, status={}, ec={}",
+                                              session_->log_prefix_,
+                                              opaque,
+                                              protocol::status_to_string(status),
+                                              ec.message());
+                                auto fun = handler->second;
                                 session_->command_handlers_.erase(handler);
+                                fun(ec, retry_reason::do_not_retry, std::move(msg));
                             } else {
-                                spdlog::debug("unexpected orphan response opcode={}, opaque={}", msg.header.opcode, msg.header.opaque);
+                                spdlog::debug("{} unexpected orphan response: opcode={}, opaque={}",
+                                              session_->log_prefix_,
+                                              msg.header.opcode,
+                                              msg.header.opaque);
                             }
                         } break;
                         default:
-                            spdlog::warn("unexpected client response: {}", opcode);
+                            spdlog::warn("{} unexpected client response: {}", session_->log_prefix_, opcode);
                     }
                     break;
                 case protocol::magic::server_request:
@@ -362,23 +409,21 @@ class mcbp_session : public std::enable_shared_from_this<mcbp_session>
                             }
                         } break;
                         default:
-                            spdlog::warn("unexpected server request: {}", opcode);
+                            spdlog::warn("{} unexpected server request: {}", session_->log_prefix_, opcode);
                     }
                     break;
                 case protocol::magic::client_request:
                 case protocol::magic::alt_client_request:
                 case protocol::magic::server_response:
-                    spdlog::warn("unexpected magic: {}, opcode={}, opaque={}", magic, msg.header.opcode, msg.header.opaque);
+                    spdlog::warn(
+                      "{} unexpected magic: {}, opcode={}, opaque={}", session_->log_prefix_, magic, msg.header.opcode, msg.header.opaque);
                     break;
             }
         }
 
         void fetch_config(std::error_code ec)
         {
-            if (ec == asio::error::operation_aborted) {
-                return;
-            }
-            if (stopped_ || !session_) {
+            if (ec == asio::error::operation_aborted || stopped_ || !session_) {
                 return;
             }
             protocol::client_request<protocol::get_cluster_config_request_body> req;
@@ -390,55 +435,149 @@ class mcbp_session : public std::enable_shared_from_this<mcbp_session>
     };
 
   public:
-    mcbp_session(uuid::uuid_t client_id, asio::io_context& ctx, std::optional<std::string> bucket_name = {})
+    mcbp_session() = delete;
+    mcbp_session(const std::string& client_id,
+                 asio::io_context& ctx,
+                 const couchbase::origin& origin,
+                 std::optional<std::string> bucket_name = {},
+                 std::vector<protocol::hello_feature> known_features = {})
+      : client_id_(client_id)
+      , id_(uuid::to_string(uuid::random()))
+      , ctx_(ctx)
+      , resolver_(ctx_)
+      , stream_(std::make_unique<plain_stream_impl>(ctx_))
+      , bootstrap_deadline_(ctx_)
+      , connection_deadline_(ctx_)
+      , retry_backoff_(ctx_)
+      , origin_(origin)
+      , bucket_name_(std::move(bucket_name))
+      , supported_features_(known_features)
+    {
+        log_prefix_ = fmt::format("[{}/{}/{}/{}]", stream_->log_prefix(), client_id_, id_, bucket_name_.value_or("-"));
+    }
+
+    mcbp_session(const std::string& client_id,
+                 asio::io_context& ctx,
+                 asio::ssl::context& tls,
+                 const couchbase::origin& origin,
+                 std::optional<std::string> bucket_name = {},
+                 std::vector<protocol::hello_feature> known_features = {})
       : client_id_(client_id)
-      , id_(uuid::random())
+      , id_(uuid::to_string(uuid::random()))
       , ctx_(ctx)
       , resolver_(ctx_)
-      , strand_(asio::make_strand(ctx_))
-      , socket_(strand_)
-      , deadline_timer_(ctx_)
+      , stream_(std::make_unique<tls_stream_impl>(ctx_, tls))
+      , bootstrap_deadline_(ctx_)
+      , connection_deadline_(ctx_)
+      , retry_backoff_(ctx_)
+      , origin_(origin)
       , bucket_name_(std::move(bucket_name))
+      , supported_features_(known_features)
     {
+        log_prefix_ = fmt::format("[{}/{}/{}/{}]", stream_->log_prefix(), client_id_, id_, bucket_name_.value_or("-"));
     }
 
     ~mcbp_session()
     {
-        stop();
+        stop(retry_reason::do_not_retry);
     }
 
-    void bootstrap(const std::string& hostname,
-                   const std::string& service,
-                   const std::string& username,
-                   const std::string& password,
-                   std::function<void(std::error_code, configuration)>&& handler)
+    [[nodiscard]] const std::string& log_prefix() const
     {
-        username_ = username;
-        password_ = password;
+        return log_prefix_;
+    }
+
+    void bootstrap(std::function<void(std::error_code, configuration)>&& handler, bool retry_on_bucket_not_found = false)
+    {
+        retry_bootstrap_on_bucket_not_found_ = retry_on_bucket_not_found;
         bootstrap_handler_ = std::move(handler);
-        resolver_.async_resolve(
-          hostname, service, std::bind(&mcbp_session::on_resolve, this, std::placeholders::_1, std::placeholders::_2));
+        bootstrap_deadline_.expires_after(timeout_defaults::bootstrap_timeout);
+        bootstrap_deadline_.async_wait([self = shared_from_this()](std::error_code ec) {
+            if (ec == asio::error::operation_aborted || self->stopped_) {
+                return;
+            }
+            spdlog::warn("{} unable to bootstrap in time", self->log_prefix_);
+            self->bootstrap_handler_(std::make_error_code(error::common_errc::unambiguous_timeout), {});
+            self->bootstrap_handler_ = nullptr;
+            self->stop(retry_reason::socket_closed_while_in_flight);
+        });
+        initiate_bootstrap();
     }
 
-    [[nodiscard]] std::string id()
+    void initiate_bootstrap()
     {
-        return uuid::to_string(id_);
+        if (stopped_) {
+            return;
+        }
+        if (origin_.exhausted()) {
+            auto backoff = std::chrono::milliseconds(500);
+            spdlog::debug("{} reached the end of list of bootstrap nodes, waiting for {}ms before restart", log_prefix_, backoff.count());
+            retry_backoff_.expires_after(backoff);
+            retry_backoff_.async_wait([self = shared_from_this()](std::error_code ec) mutable {
+                if (ec == asio::error::operation_aborted || self->stopped_) {
+                    return;
+                }
+                self->origin_.restart();
+                self->initiate_bootstrap();
+            });
+            return;
+        }
+        std::tie(bootstrap_hostname_, bootstrap_port_) = origin_.next_address();
+        log_prefix_ = fmt::format("[{}/{}/{}/{}] <{}:{}>",
+                                  stream_->log_prefix(),
+                                  client_id_,
+                                  id_,
+                                  bucket_name_.value_or("-"),
+                                  bootstrap_hostname_,
+                                  bootstrap_port_);
+        spdlog::debug("{} attempt to establish MCBP connection", log_prefix_);
+        resolver_.async_resolve(bootstrap_hostname_,
+                                bootstrap_port_,
+                                std::bind(&mcbp_session::on_resolve, shared_from_this(), std::placeholders::_1, std::placeholders::_2));
+    }
+
+    [[nodiscard]] const std::string& id() const
+    {
+        return id_;
+    }
+
+    void on_stop(std::function<void(io::retry_reason)> handler)
+    {
+        on_stop_handler_ = std::move(handler);
     }
 
-    void stop()
+    void stop(retry_reason reason)
     {
         if (stopped_) {
             return;
         }
+        spdlog::debug("{} stop MCBP connection, reason={}", log_prefix_, reason);
         stopped_ = true;
-        deadline_timer_.cancel();
+        bootstrap_deadline_.cancel();
+        connection_deadline_.cancel();
+        retry_backoff_.cancel();
         resolver_.cancel();
-        if (socket_.is_open()) {
-            socket_.close();
+        if (stream_->is_open()) {
+            stream_->close();
+        }
+        auto ec = std::make_error_code(error::common_errc::request_canceled);
+        if (!bootstrapped_ && bootstrap_handler_) {
+            bootstrap_handler_(ec, {});
+            bootstrap_handler_ = nullptr;
         }
         if (handler_) {
             handler_->stop();
         }
+        for (auto& handler : command_handlers_) {
+            spdlog::debug("{} MCBP cancel operation during session close, opaque={}, ec={}", log_prefix_, handler.first, ec.message());
+            handler.second(ec, reason, {});
+        }
+        command_handlers_.clear();
+        config_listeners_.clear();
+        if (on_stop_handler_) {
+            on_stop_handler_(reason);
+        }
+        on_stop_handler_ = nullptr;
     }
 
     void write(const std::vector<uint8_t>& buf)
@@ -446,6 +585,11 @@ class mcbp_session : public std::enable_shared_from_this<mcbp_session>
         if (stopped_) {
             return;
         }
+        std::uint32_t opaque{ 0 };
+        std::memcpy(&opaque, buf.data() + 12, sizeof(opaque));
+        spdlog::trace("{} MCBP send, opaque={}, {:n}", log_prefix_, opaque, spdlog::to_hex(buf.begin(), buf.begin() + 24));
+        SPDLOG_TRACE("{} MCBP send, opaque={}{:a}", log_prefix_, opaque, spdlog::to_hex(data));
+        std::scoped_lock lock(output_buffer_mutex_);
         output_buffer_.push_back(buf);
     }
 
@@ -468,30 +612,49 @@ class mcbp_session : public std::enable_shared_from_this<mcbp_session>
 
     void write_and_subscribe(uint32_t opaque,
                              std::vector<std::uint8_t>& data,
-                             std::function<void(std::error_code, io::mcbp_message&&)> handler)
+                             std::function<void(std::error_code, retry_reason, io::mcbp_message&&)> handler)
     {
         if (stopped_) {
+            spdlog::warn("{} MCBP cancel operation, while trying to write to closed session, opaque={}", log_prefix_, opaque);
+            handler(std::make_error_code(error::common_errc::request_canceled), retry_reason::socket_closed_while_in_flight, {});
             return;
         }
         command_handlers_.emplace(opaque, std::move(handler));
-        if (bootstrapped_ && socket_.is_open()) {
+        if (bootstrapped_ && stream_->is_open()) {
             write_and_flush(data);
         } else {
+            spdlog::debug("{} the stream is not ready yet, put the message into pending buffer, opaque={}", log_prefix_, opaque);
+            std::scoped_lock lock(pending_buffer_mutex_);
             pending_buffer_.push_back(data);
         }
     }
 
-    [[nodiscard]] std::optional<collections_manifest> manifest()
+    [[nodiscard]] bool cancel(uint32_t opaque, std::error_code ec, retry_reason reason)
     {
-        return manifest_;
+        if (stopped_) {
+            return false;
+        }
+        auto handler = command_handlers_.find(opaque);
+        if (handler != command_handlers_.end()) {
+            spdlog::debug("{} MCBP cancel operation, opaque={}, ec={}", log_prefix_, opaque, ec.message());
+            handler->second(ec, reason, {});
+            command_handlers_.erase(handler);
+            return true;
+        }
+        return false;
     }
 
-    bool supports_feature(protocol::hello_feature feature)
+    [[nodiscard]] bool supports_feature(protocol::hello_feature feature)
     {
         return std::find(supported_features_.begin(), supported_features_.end(), feature) != supported_features_.end();
     }
 
-    bool supports_gcccp()
+    [[nodiscard]] std::vector<protocol::hello_feature> supported_features() const
+    {
+        return supported_features_;
+    }
+
+    [[nodiscard]] bool supports_gcccp()
     {
         return supports_gcccp_;
     }
@@ -512,6 +675,16 @@ class mcbp_session : public std::enable_shared_from_this<mcbp_session>
         return config_->index_for_this_node();
     }
 
+    [[nodiscard]] const std::string& bootstrap_hostname() const
+    {
+        return bootstrap_hostname_;
+    }
+
+    [[nodiscard]] const std::string& bootstrap_port() const
+    {
+        return bootstrap_port_;
+    }
+
     [[nodiscard]] uint32_t next_opaque()
     {
         return ++opaque_;
@@ -531,16 +704,17 @@ class mcbp_session : public std::enable_shared_from_this<mcbp_session>
                 return std::make_error_code(error::key_value_errc::document_not_found);
 
             case protocol::status::exists:
-                if (opcode == protocol::client_opcode::replace || opcode == protocol::client_opcode::remove) {
-                    return std::make_error_code(error::common_errc::cas_mismatch);
+                if (opcode == protocol::client_opcode::insert) {
+                    return std::make_error_code(error::key_value_errc::document_exists);
                 }
-                return std::make_error_code(error::key_value_errc::document_exists);
+                return std::make_error_code(error::common_errc::cas_mismatch);
 
             case protocol::status::too_big:
                 return std::make_error_code(error::key_value_errc::value_too_large);
 
             case protocol::status::invalid:
             case protocol::status::xattr_invalid:
+            case protocol::status::subdoc_invalid_combo:
                 return std::make_error_code(error::common_errc::invalid_argument);
 
             case protocol::status::delta_bad_value:
@@ -565,7 +739,7 @@ class mcbp_session : public std::enable_shared_from_this<mcbp_session>
                 return std::make_error_code(error::common_errc::internal_server_failure);
 
             case protocol::status::busy:
-            case protocol::status::temp_failure:
+            case protocol::status::temporary_failure:
             case protocol::status::no_memory:
             case protocol::status::not_initialized:
                 return std::make_error_code(error::common_errc::temporary_failure);
@@ -624,7 +798,6 @@ class mcbp_session : public std::enable_shared_from_this<mcbp_session>
             case protocol::status::subdoc_value_too_deep:
                 return std::make_error_code(error::key_value_errc::value_too_deep);
 
-            case protocol::status::subdoc_invalid_combo:
             case protocol::status::subdoc_xattr_invalid_flag_combo:
             case protocol::status::subdoc_xattr_invalid_key_combo:
                 return std::make_error_code(error::key_value_errc::xattr_invalid_key_combo);
@@ -651,29 +824,107 @@ class mcbp_session : public std::enable_shared_from_this<mcbp_session>
                 break;
         }
         // FIXME: use error map here
-        spdlog::warn("unknown status code: {} (opcode={})", status, opcode);
+        spdlog::warn("{} unknown status code: {} (opcode={})", log_prefix_, protocol::status_to_string(status), opcode);
         return std::make_error_code(error::network_errc::protocol_error);
     }
 
+    std::optional<error_map::error_info> decode_error_code(std::uint16_t code)
+    {
+        if (error_map_) {
+            auto info = error_map_->errors.find(code);
+            if (info != error_map_->errors.end()) {
+                return info->second;
+            }
+        }
+        return {};
+    }
+
+    void on_configuration_update(std::function<void(const configuration&)> handler)
+    {
+        config_listeners_.emplace_back(std::move(handler));
+    }
+
     void update_configuration(configuration&& config)
     {
+        if (stopped_) {
+            return;
+        }
         if (!config_ || config.rev > config_->rev) {
+            for (auto& node : config.nodes) {
+                if (node.hostname.empty()) {
+                    node.hostname = bootstrap_hostname_;
+                }
+            }
             config_.emplace(config);
-            spdlog::trace("received new configuration: {}", config_.value());
+            spdlog::debug("{} received new configuration: {}", log_prefix_, config_.value());
+            for (auto& listener : config_listeners_) {
+                listener(*config_);
+            }
         }
     }
 
+    void handle_not_my_vbucket(io::mcbp_message&& msg)
+    {
+        if (stopped_) {
+            return;
+        }
+        Expects(msg.header.magic == static_cast<std::uint8_t>(protocol::magic::alt_client_response) ||
+                msg.header.magic == static_cast<std::uint8_t>(protocol::magic::client_response));
+        if (protocol::has_json_datatype(msg.header.datatype)) {
+            auto magic = static_cast<protocol::magic>(msg.header.magic);
+            uint8_t extras_size = msg.header.extlen;
+            uint8_t framing_extras_size = 0;
+            uint16_t key_size = htons(msg.header.keylen);
+            if (magic == protocol::magic::alt_client_response) {
+                framing_extras_size = static_cast<std::uint8_t>(msg.header.keylen >> 8U);
+                key_size = msg.header.keylen & 0xffU;
+            }
+
+            std::vector<uint8_t>::difference_type offset = framing_extras_size + key_size + extras_size;
+            if (ntohl(msg.header.bodylen) - offset > 0) {
+                auto config = protocol::parse_config(msg.body.begin() + offset, msg.body.end());
+                spdlog::debug("{} received not_my_vbucket status for {}, opaque={} with config rev={} in the payload",
+                              log_prefix_,
+                              static_cast<protocol::client_opcode>(msg.header.opcode),
+                              msg.header.opaque,
+                              config.rev);
+                update_configuration(std::move(config));
+            }
+        }
+    }
+
+    std::optional<std::uint32_t> get_collection_uid(const std::string& collection_path)
+    {
+        return collection_cache_.get(collection_path);
+    }
+
+    void update_collection_uid(const std::string& path, std::uint32_t uid)
+    {
+        if (stopped_) {
+            return;
+        }
+        collection_cache_.update(path, uid);
+    }
+
   private:
     void invoke_bootstrap_handler(std::error_code ec)
     {
+        if (retry_bootstrap_on_bucket_not_found_ && ec == std::make_error_code(error::common_errc::bucket_not_found)) {
+            spdlog::debug(R"({} server returned {}, it must be transient condition, retrying)", log_prefix_, ec.message());
+            return initiate_bootstrap();
+        }
+
         if (!bootstrapped_ && bootstrap_handler_) {
+            bootstrap_deadline_.cancel();
             bootstrap_handler_(ec, config_.value_or(configuration{}));
             bootstrap_handler_ = nullptr;
         }
-        bootstrapped_ = true;
         if (ec) {
-            stop();
+            return stop(retry_reason::node_not_available);
         }
+        bootstrapped_ = true;
+        handler_ = std::make_unique<normal_handler>(shared_from_this());
+        std::scoped_lock lock(pending_buffer_mutex_);
         if (!pending_buffer_.empty()) {
             for (const auto& buf : pending_buffer_) {
                 write(buf);
@@ -689,12 +940,13 @@ class mcbp_session : public std::enable_shared_from_this<mcbp_session>
             return;
         }
         if (ec) {
-            spdlog::error("error on resolve: {}", ec.message());
-            return invoke_bootstrap_handler(std::make_error_code(error::network_errc::resolve_failure));
+            spdlog::error("{} error on resolve: {}", log_prefix_, ec.message());
+            return initiate_bootstrap();
         }
         endpoints_ = endpoints;
         do_connect(endpoints_.begin());
-        deadline_timer_.async_wait(std::bind(&mcbp_session::check_deadline, this, std::placeholders::_1));
+        connection_deadline_.expires_after(timeout_defaults::connect_timeout);
+        connection_deadline_.async_wait(std::bind(&mcbp_session::check_deadline, shared_from_this(), std::placeholders::_1));
     }
 
     void do_connect(asio::ip::tcp::resolver::results_type::iterator it)
@@ -703,13 +955,12 @@ class mcbp_session : public std::enable_shared_from_this<mcbp_session>
             return;
         }
         if (it != endpoints_.end()) {
-            spdlog::trace("connecting to {}:{}", it->endpoint().address().to_string(), it->endpoint().port());
-            deadline_timer_.expires_after(std::chrono::seconds(10));
-            socket_.async_connect(it->endpoint(), std::bind(&mcbp_session::on_connect, this, std::placeholders::_1, it));
+            spdlog::debug("{} connecting to {}:{}", log_prefix_, it->endpoint().address().to_string(), it->endpoint().port());
+            connection_deadline_.expires_after(timeout_defaults::connect_timeout);
+            stream_->async_connect(it->endpoint(), std::bind(&mcbp_session::on_connect, shared_from_this(), std::placeholders::_1, it));
         } else {
-            spdlog::error("no more endpoints left to connect");
-            invoke_bootstrap_handler(std::make_error_code(error::network_errc::no_endpoints_left));
-            stop();
+            spdlog::error("{} no more endpoints left to connect, will try another address", log_prefix_);
+            return initiate_bootstrap();
         }
     }
 
@@ -718,32 +969,39 @@ class mcbp_session : public std::enable_shared_from_this<mcbp_session>
         if (stopped_) {
             return;
         }
-        if (!socket_.is_open() || ec) {
+        if (!stream_->is_open() || ec) {
+            spdlog::warn(
+              "{} unable to connect to {}:{}: {}", log_prefix_, it->endpoint().address().to_string(), it->endpoint().port(), ec.message());
             do_connect(++it);
         } else {
-            socket_.set_option(asio::ip::tcp::no_delay{ true });
-            socket_.set_option(asio::socket_base::keep_alive{ true });
+            stream_->set_options();
             endpoint_ = it->endpoint();
-            spdlog::trace("connected to {}:{}", endpoint_.address().to_string(), it->endpoint().port());
+            endpoint_address_ = endpoint_.address().to_string();
+            spdlog::debug("{} connected to {}:{}", log_prefix_, endpoint_address_, it->endpoint().port());
+            log_prefix_ = fmt::format("[{}/{}/{}/{}] <{}/{}:{}>",
+                                      stream_->log_prefix(),
+                                      client_id_,
+                                      id_,
+                                      bucket_name_.value_or("-"),
+                                      bootstrap_hostname_,
+                                      endpoint_address_,
+                                      endpoint_.port());
             handler_ = std::make_unique<bootstrap_handler>(shared_from_this());
-            deadline_timer_.expires_at(asio::steady_timer::time_point::max());
-            deadline_timer_.cancel();
+            connection_deadline_.expires_at(asio::steady_timer::time_point::max());
+            connection_deadline_.cancel();
         }
     }
 
     void check_deadline(std::error_code ec)
     {
-        if (ec == asio::error::operation_aborted) {
+        if (ec == asio::error::operation_aborted || stopped_) {
             return;
         }
-        if (stopped_) {
-            return;
+        if (connection_deadline_.expiry() <= asio::steady_timer::clock_type::now()) {
+            stream_->close();
+            connection_deadline_.expires_at(asio::steady_timer::time_point::max());
         }
-        if (deadline_timer_.expiry() <= asio::steady_timer::clock_type::now()) {
-            socket_.close();
-            deadline_timer_.expires_at(asio::steady_timer::time_point::max());
-        }
-        deadline_timer_.async_wait(std::bind(&mcbp_session::check_deadline, this, std::placeholders::_1));
+        connection_deadline_.async_wait(std::bind(&mcbp_session::check_deadline, shared_from_this(), std::placeholders::_1));
     }
 
     void do_read()
@@ -755,35 +1013,47 @@ class mcbp_session : public std::enable_shared_from_this<mcbp_session>
             return;
         }
         reading_ = true;
-        socket_.async_read_some(asio::buffer(input_buffer_),
-                                [self = shared_from_this()](std::error_code ec, std::size_t bytes_transferred) {
-                                    if (ec == asio::error::operation_aborted || self->stopped_) {
-                                        return;
-                                    }
-                                    if (ec) {
-                                        spdlog::error("[{}] [{}] IO error while reading from the socket: {}",
-                                                      uuid::to_string(self->id_),
-                                                      self->endpoint_.address().to_string(),
-                                                      ec.message());
-                                        return self->stop();
-                                    }
-                                    self->parser_.feed(self->input_buffer_.data(), self->input_buffer_.data() + ssize_t(bytes_transferred));
-
-                                    for (;;) {
-                                        mcbp_message msg{};
-                                        switch (self->parser_.next(msg)) {
-                                            case mcbp_parser::ok:
-                                                self->handler_->handle(std::move(msg));
-                                                break;
-                                            case mcbp_parser::need_data:
-                                                self->reading_ = false;
-                                                return self->do_read();
-                                            case mcbp_parser::failure:
-                                                ec = std::make_error_code(error::common_errc::parsing_failure);
-                                                return self->stop();
-                                        }
-                                    }
-                                });
+        stream_->async_read_some(
+          asio::buffer(input_buffer_), [self = shared_from_this()](std::error_code ec, std::size_t bytes_transferred) {
+              if (ec == asio::error::operation_aborted || self->stopped_) {
+                  return;
+              }
+              if (ec) {
+                  spdlog::error("{} IO error while reading from the socket: {}, pending_handlers={}",
+                                self->log_prefix_,
+                                ec.message(),
+                                self->command_handlers_.size());
+                  return self->stop(retry_reason::socket_closed_while_in_flight);
+              }
+              self->parser_.feed(self->input_buffer_.data(), self->input_buffer_.data() + ssize_t(bytes_transferred));
+
+              for (;;) {
+                  mcbp_message msg{};
+                  switch (self->parser_.next(msg)) {
+                      case mcbp_parser::ok:
+                          spdlog::trace(
+                            "{} MCBP recv, opaque={}, {:n}", self->log_prefix_, msg.header.opaque, spdlog::to_hex(msg.header_data()));
+                          SPDLOG_TRACE("{} MCBP recv, opaque={}{:a}{:a}",
+                                       self->log_prefix_,
+                                       msg.header.opaque,
+                                       spdlog::to_hex(msg.header_data()),
+                                       spdlog::to_hex(msg.body));
+                          self->handler_->handle(std::move(msg));
+                          if (self->stopped_) {
+                              return;
+                          }
+                          break;
+                      case mcbp_parser::need_data:
+                          self->reading_ = false;
+                          if (!self->stopped_) {
+                              self->do_read();
+                          }
+                          return;
+                      case mcbp_parser::failure:
+                          return self->stop(retry_reason::kv_temporary_failure);
+                  }
+              }
+          });
     }
 
     void do_write()
@@ -791,7 +1061,8 @@ class mcbp_session : public std::enable_shared_from_this<mcbp_session>
         if (stopped_) {
             return;
         }
-        if (!writing_buffer_.empty()) {
+        std::scoped_lock lock(writing_buffer_mutex_, output_buffer_mutex_);
+        if (!writing_buffer_.empty() || output_buffer_.empty()) {
             return;
         }
         std::swap(writing_buffer_, output_buffer_);
@@ -800,60 +1071,71 @@ class mcbp_session : public std::enable_shared_from_this<mcbp_session>
         for (auto& buf : writing_buffer_) {
             buffers.emplace_back(asio::buffer(buf));
         }
-        asio::async_write(socket_, buffers, [self = shared_from_this()](std::error_code ec, std::size_t /*unused*/) {
-            if (self->stopped_) {
+        stream_->async_write(buffers, [self = shared_from_this()](std::error_code ec, std::size_t /*unused*/) {
+            if (ec == asio::error::operation_aborted || self->stopped_) {
                 return;
             }
             if (ec) {
-                spdlog::error("[{}] [{}] IO error while writing to the socket: {}",
-                              uuid::to_string(self->id_),
-                              self->endpoint_.address().to_string(),
-                              ec.message());
-                return self->stop();
+                spdlog::error("{} IO error while writing to the socket: {}, pending_handlers={}",
+                              self->log_prefix_,
+                              ec.message(),
+                              self->command_handlers_.size());
+                return self->stop(retry_reason::socket_closed_while_in_flight);
             }
-            self->writing_buffer_.clear();
-            if (!self->output_buffer_.empty()) {
-                self->do_write();
+            {
+                std::scoped_lock inner_lock(self->writing_buffer_mutex_);
+                self->writing_buffer_.clear();
             }
+            self->do_write();
             self->do_read();
         });
     }
 
-    uuid::uuid_t client_id_;
-    uuid::uuid_t id_;
+    std::string client_id_;
+    std::string id_;
     asio::io_context& ctx_;
     asio::ip::tcp::resolver resolver_;
-    asio::strand<asio::io_context::executor_type> strand_;
-    asio::ip::tcp::socket socket_;
-    asio::steady_timer deadline_timer_;
+    std::unique_ptr<stream_impl> stream_;
+    asio::steady_timer bootstrap_deadline_;
+    asio::steady_timer connection_deadline_;
+    asio::steady_timer retry_backoff_;
+    couchbase::origin origin_;
     std::optional<std::string> bucket_name_;
     mcbp_parser parser_;
     std::unique_ptr<message_handler> handler_;
-    std::function<void(std::error_code, configuration)> bootstrap_handler_;
-    std::map<uint32_t, std::function<void(std::error_code, io::mcbp_message&&)>> command_handlers_{};
+    std::function<void(std::error_code, const configuration&)> bootstrap_handler_{};
+    std::map<uint32_t, std::function<void(std::error_code, retry_reason, io::mcbp_message&&)>> command_handlers_{};
+    std::vector<std::function<void(const configuration&)>> config_listeners_{};
+    std::function<void(io::retry_reason)> on_stop_handler_{};
 
     bool bootstrapped_{ false };
     std::atomic_bool stopped_{ false };
     bool authenticated_{ false };
     bool bucket_selected_{ false };
     bool supports_gcccp_{ true };
+    bool retry_bootstrap_on_bucket_not_found_{ false };
 
     std::atomic<std::uint32_t> opaque_{ 0 };
 
-    std::string username_;
-    std::string password_;
-
     std::array<std::uint8_t, 16384> input_buffer_{};
     std::vector<std::vector<std::uint8_t>> output_buffer_{};
     std::vector<std::vector<std::uint8_t>> pending_buffer_{};
     std::vector<std::vector<std::uint8_t>> writing_buffer_{};
+    std::mutex output_buffer_mutex_{};
+    std::mutex pending_buffer_mutex_{};
+    std::mutex writing_buffer_mutex_{};
+    std::string bootstrap_hostname_{};
+    std::string bootstrap_port_{};
     asio::ip::tcp::endpoint endpoint_{}; // connected endpoint
+    std::string endpoint_address_{};     // cached string with endpoint address
     asio::ip::tcp::resolver::results_type endpoints_;
     std::vector<protocol::hello_feature> supported_features_;
     std::optional<configuration> config_;
-    std::optional<error_map> errmap_;
-    std::optional<collections_manifest> manifest_;
+    std::optional<error_map> error_map_;
+    collection_cache collection_cache_;
 
     std::atomic_bool reading_{ false };
+
+    std::string log_prefix_{};
 };
 } // namespace couchbase::io