Move html settings from network.

Author: evoskuil

include/bitcoin/node/configuration.hpp

@@ -60,6 +60,7 @@ class BCN_API configuration
 
     /// Settings.
     log::settings log;
+    server::settings server;
     node::settings node;
     network::settings network;
     database::settings database;

include/bitcoin/node/protocols/protocol_html.hpp

@@ -22,6 +22,7 @@
 #include <bitcoin/node/channels/channels.hpp>
 #include <bitcoin/node/define.hpp>
 #include <bitcoin/node/protocols/protocol.hpp>
+#include <bitcoin/node/settings.hpp>
 
 namespace libbitcoin {
 namespace node {
@@ -33,7 +34,7 @@ class BCN_API protocol_html
 {
 public:
     /// http channel, but html settings.
-    using options_t = network::settings::html_server;
+    using options_t = server::settings::html_server;
     using channel_t = node::channel_http;
 
 protected:

include/bitcoin/node/settings.hpp

@@ -96,6 +96,62 @@ class BCN_API settings
 };
 
 } // namespace node
+
+namespace server {
+
+/// [server] settings.
+class BCN_API settings
+{
+public:
+    /// html (http/s) document server settings (has directory/default).
+    /// This is for web servers that expose a local file system directory.
+    struct html_server
+      : public network::settings::http_server
+    {
+        /// Directory to serve.
+        std::filesystem::path path{};
+
+        /// Default page for default URL (recommended).
+        std::string default_{ "index.html" };
+
+        /// Validated against origins if configured (recommended).
+        network::config::endpoints origins{};
+
+        /// Normalized origins.
+        system::string_list origin_names() const NOEXCEPT;
+
+        /// !path.empty() && http_server::enabled() [hidden, not virtual]
+        bool enabled() const NOEXCEPT;
+    };
+
+    DEFAULT_COPY_MOVE_DESTRUCT(settings);
+
+    settings() NOEXCEPT {};
+    settings(system::chain::selection) NOEXCEPT {};
+
+    /// native admin web interface, isolated (http/s, stateless html)
+    server::settings::html_server web{ "web" };
+
+    /// native RESTful block explorer (http/s, stateless html/json)
+    server::settings::html_server explore{ "explore" };
+
+    /// native websocket query interface (http/s->tcp/s, json, handshake)
+    network::settings::webs_server websocket{ "websocket" };
+
+    /// bitcoind compat interface (http/s, stateless json-rpc-v2)
+    network::settings::http_server bitcoind{ "bitcoind" };
+
+    /// electrum compat interface (tcp/s, json-rpc-v2)
+    network::settings::tcp_server electrum{ "electrum" };
+
+    /// stratum v1 compat interface (tcp/s, json-rpc-v1, auth handshake)
+    network::settings::tcp_server stratum_v1{ "stratum_v1" };
+
+    /// stratum v2 compat interface (tcp[/s], binary, auth/privacy handshake)
+    network::settings::tcp_server stratum_v2{ "stratum_v2" };
+};
+
+} // namespace server
 } // namespace libbitcoin
 
 #endif

src/full_node.cpp

@@ -538,37 +538,37 @@ network::session_outbound::ptr full_node::attach_outbound_session() NOEXCEPT
 
 session_web::ptr full_node::attach_web_session() NOEXCEPT
 {
-    return net::attach<session_web>(*this, config_.network.web);
+    return net::attach<session_web>(*this, config_.server.web);
 }
 
 session_explore::ptr full_node::attach_explore_session() NOEXCEPT
 {
-    return net::attach<session_explore>(*this, config_.network.explore);
+    return net::attach<session_explore>(*this, config_.server.explore);
 }
 
 session_websocket::ptr full_node::attach_websocket_session() NOEXCEPT
 {
-    return net::attach<session_websocket>(*this, config_.network.websocket);
+    return net::attach<session_websocket>(*this, config_.server.websocket);
 }
 
 session_bitcoind::ptr full_node::attach_bitcoind_session() NOEXCEPT
 {
-    return net::attach<session_bitcoind>(*this, config_.network.bitcoind);
+    return net::attach<session_bitcoind>(*this, config_.server.bitcoind);
 }
 
 session_electrum::ptr full_node::attach_electrum_session() NOEXCEPT
 {
-    return net::attach<session_electrum>(*this, config_.network.electrum);
+    return net::attach<session_electrum>(*this, config_.server.electrum);
 }
 
 session_stratum_v1::ptr full_node::attach_stratum_v1_session() NOEXCEPT
 {
-    return net::attach<session_stratum_v1>(*this, config_.network.stratum_v1);
+    return net::attach<session_stratum_v1>(*this, config_.server.stratum_v1);
 }
 
 session_stratum_v2::ptr full_node::attach_stratum_v2_session() NOEXCEPT
 {
-    return net::attach<session_stratum_v2>(*this, config_.network.stratum_v2);
+    return net::attach<session_stratum_v2>(*this, config_.server.stratum_v2);
 }
 
 BC_POP_WARNING()