Add intermediate session base class.

Author: evoskuil

Makefile.am

@@ -185,6 +185,7 @@ include_bitcoin_server_protocols_HEADERS = \
 
 include_bitcoin_server_sessionsdir = ${includedir}/bitcoin/server/sessions
 include_bitcoin_server_sessions_HEADERS = \
+    include/bitcoin/server/sessions/session.hpp \
     include/bitcoin/server/sessions/session_handshake.hpp \
     include/bitcoin/server/sessions/session_server.hpp \
     include/bitcoin/server/sessions/sessions.hpp

builds/msvc/vs2022/libbitcoin-server/libbitcoin-server.vcxproj

@@ -180,6 +180,7 @@
     <ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_stratum_v2.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocols.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\server\server_node.hpp" />
+    <ClInclude Include="..\..\..\..\include\bitcoin\server\sessions\session.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\server\sessions\session_handshake.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\server\sessions\session_server.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\server\sessions\sessions.hpp" />

builds/msvc/vs2022/libbitcoin-server/libbitcoin-server.vcxproj.filters

@@ -224,6 +224,9 @@
     <ClInclude Include="..\..\..\..\include\bitcoin\server\server_node.hpp">
       <Filter>include\bitcoin\server</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\include\bitcoin\server\sessions\session.hpp">
+      <Filter>include\bitcoin\server\sessions</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\include\bitcoin\server\sessions\session_handshake.hpp">
       <Filter>include\bitcoin\server\sessions</Filter>
     </ClInclude>

include/bitcoin/server.hpp

@@ -56,6 +56,7 @@
 #include <bitcoin/server/protocols/protocol_stratum_v1.hpp>
 #include <bitcoin/server/protocols/protocol_stratum_v2.hpp>
 #include <bitcoin/server/protocols/protocols.hpp>
+#include <bitcoin/server/sessions/session.hpp>
 #include <bitcoin/server/sessions/session_handshake.hpp>
 #include <bitcoin/server/sessions/session_server.hpp>
 #include <bitcoin/server/sessions/sessions.hpp>

include/bitcoin/server/sessions/session.hpp

@@ -0,0 +1,67 @@
+/**
+ * Copyright (c) 2011-2025 libbitcoin developers (see AUTHORS)
+ *
+ * This file is part of libbitcoin.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef LIBBITCOIN_SERVER_SESSIONS_SESSION_HPP
+#define LIBBITCOIN_SERVER_SESSIONS_SESSION_HPP
+
+#include <memory>
+#include <bitcoin/server/configuration.hpp>
+#include <bitcoin/server/define.hpp>
+#include <bitcoin/server/settings.hpp>
+
+namespace libbitcoin {
+namespace server {
+
+class server_node;
+
+/// Intermediate base class for future server injection.
+class session
+  : public node::session,
+    protected network::tracker<session>
+{
+public:
+    typedef std::shared_ptr<session> ptr;
+
+    /// Construct an instance (network should be started).
+    inline session(server_node& node, const configuration& config) NOEXCEPT
+      : node::session((node::full_node&)node), config_(config),
+        network::tracker<session>((network::net&)node)
+    {
+    }
+
+    /// Configuration settings for all server libraries.
+    inline const configuration& server_config() const NOEXCEPT
+    {
+        return config_;
+    }
+
+    /// Server config settings.
+    inline const settings& server_settings() const NOEXCEPT
+    {
+        return server_config().server;
+    }
+
+private:
+    // This is thread safe.
+    const configuration& config_;
+};
+
+} // namespace server
+} // namespace libbitcoin
+
+#endif

include/bitcoin/server/sessions/session_server.hpp

@@ -23,6 +23,7 @@
 #include <utility>
 #include <bitcoin/server/configuration.hpp>
 #include <bitcoin/server/define.hpp>
+#include <bitcoin/server/sessions/session.hpp>
 
 namespace libbitcoin {
 namespace server {
@@ -40,7 +41,7 @@ class server_node;
 /// other protocols.
 template <typename ...Protocols>
 class session_server
-  : public node::session,
+  : public server::session,
     public network::session_server,
     protected network::tracker<session_server<Protocols...>>
 {
@@ -59,25 +60,13 @@ class session_server
     /// Construct an instance (network should be started).
     inline session_server(server_node& node, uint64_t identifier,
         const configuration& config, const options_t& options) NOEXCEPT
-      : node::session((node::full_node&)node),
+      : server::session(node, config),
         network::session_server((network::net&)node, identifier, options),
-        config_(config), options_(options),
+        options_(options),
         network::tracker<session_server<Protocols...>>(node)
     {
     }
 
-    /// Configuration settings for all server libraries.
-    inline const configuration& server_config() const NOEXCEPT
-    {
-        return config_;
-    }
-
-    /// Server config settings.
-    inline const settings& server_settings() const NOEXCEPT
-    {
-        return server_config().server;
-    }
-
 protected:
     using socket_ptr = network::socket::ptr;
     using channel_ptr = network::channel::ptr;
@@ -124,8 +113,7 @@ class session_server
     }
 
 protected:
-    // These are thread safe.
-    const configuration& config_;
+    // This is thread safe.
     const options_t& options_;
 };
 

include/bitcoin/server/sessions/sessions.hpp

@@ -19,6 +19,7 @@
 #ifndef LIBBITCOIN_SERVER_SESSIONS_SESSIONS_HPP
 #define LIBBITCOIN_SERVER_SESSIONS_SESSIONS_HPP
 
+#include <bitcoin/server/sessions/session.hpp>
 #include <bitcoin/server/sessions/session_handshake.hpp>
 #include <bitcoin/server/sessions/session_server.hpp>