Replace deprecated boost call to timer expires_from_now().

.github/workflows/ci.yml

@@ -578,17 +578,6 @@ jobs:
             platform: "x64"
             version: "vs2022"
             tests: "*"
-          - image: windows-2025-vs2026
-            configuration: "StaticRelease"
-            platform: "x64"
-            version: "vs2026"
-            tests: "*"
-
-          - image: windows-2025-vs2026
-            configuration: "StaticDebug"
-            platform: "x64"
-            version: "vs2026"
-            tests: "*"
 
     runs-on: ${{ matrix.image }}
 

Makefile.am

@@ -45,7 +45,6 @@ src_libbitcoin_network_la_SOURCES = \
     src/channels/channel.cpp \
     src/channels/channel_http.cpp \
     src/channels/channel_peer.cpp \
-    src/channels/channel_ws.cpp \
     src/config/address.cpp \
     src/config/authority.cpp \
     src/config/endpoint.cpp \
@@ -222,7 +221,6 @@ test_libbitcoin_network_test_SOURCES = \
     test/channels/channel_http.cpp \
     test/channels/channel_peer.cpp \
     test/channels/channel_rpc.cpp \
-    test/channels/channel_ws.cpp \
     test/config/address.cpp \
     test/config/authority.cpp \
     test/config/endpoint.cpp \
@@ -513,7 +511,6 @@ include_bitcoin_network_channels_HEADERS = \
     include/bitcoin/network/channels/channel_http.hpp \
     include/bitcoin/network/channels/channel_peer.hpp \
     include/bitcoin/network/channels/channel_rpc.hpp \
-    include/bitcoin/network/channels/channel_ws.hpp \
     include/bitcoin/network/channels/channels.hpp
 
 include_bitcoin_network_configdir = ${includedir}/bitcoin/network/config
@@ -693,7 +690,6 @@ include_bitcoin_network_protocols_HEADERS = \
     include/bitcoin/network/protocols/protocol_version_70001.hpp \
     include/bitcoin/network/protocols/protocol_version_70002.hpp \
     include/bitcoin/network/protocols/protocol_version_70016.hpp \
-    include/bitcoin/network/protocols/protocol_ws.hpp \
     include/bitcoin/network/protocols/protocols.hpp
 
 include_bitcoin_network_sessionsdir = ${includedir}/bitcoin/network/sessions

builds/msvc/vs2022/libbitcoin-network-test/libbitcoin-network-test.vcxproj

@@ -134,7 +134,6 @@
     <ClCompile Include="..\..\..\..\test\channels\channel_http.cpp" />
     <ClCompile Include="..\..\..\..\test\channels\channel_peer.cpp" />
     <ClCompile Include="..\..\..\..\test\channels\channel_rpc.cpp" />
-    <ClCompile Include="..\..\..\..\test\channels\channel_ws.cpp" />
     <ClCompile Include="..\..\..\..\test\config\address.cpp">
       <ObjectFileName>$(IntDir)test_config_address.obj</ObjectFileName>
     </ClCompile>

builds/msvc/vs2022/libbitcoin-network-test/libbitcoin-network-test.vcxproj.filters

@@ -153,9 +153,6 @@
     <ClCompile Include="..\..\..\..\test\channels\channel_rpc.cpp">
       <Filter>src\channels</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\test\channels\channel_ws.cpp">
-      <Filter>src\channels</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\test\config\address.cpp">
       <Filter>src\config</Filter>
     </ClCompile>

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

@@ -128,7 +128,6 @@
     <ClCompile Include="..\..\..\..\src\channels\channel.cpp" />
     <ClCompile Include="..\..\..\..\src\channels\channel_http.cpp" />
     <ClCompile Include="..\..\..\..\src\channels\channel_peer.cpp" />
-    <ClCompile Include="..\..\..\..\src\channels\channel_ws.cpp" />
     <ClCompile Include="..\..\..\..\src\config\address.cpp">
       <ObjectFileName>$(IntDir)src_config_address.obj</ObjectFileName>
     </ClCompile>
@@ -312,7 +311,6 @@
     <ClInclude Include="..\..\..\..\include\bitcoin\network\channels\channel_http.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\network\channels\channel_peer.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\network\channels\channel_rpc.hpp" />
-    <ClInclude Include="..\..\..\..\include\bitcoin\network\channels\channel_ws.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\network\channels\channels.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\network\config\address.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\network\config\authority.hpp" />
@@ -427,7 +425,6 @@
     <ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocol_version_70001.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocol_version_70002.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocol_version_70016.hpp" />
-    <ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocol_ws.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocols.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\network\sessions\session.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\network\sessions\session_inbound.hpp" />

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

@@ -189,9 +189,6 @@
     <ClCompile Include="..\..\..\..\src\channels\channel_peer.cpp">
       <Filter>src\channels</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\channels\channel_ws.cpp">
-      <Filter>src\channels</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\config\address.cpp">
       <Filter>src\config</Filter>
     </ClCompile>
@@ -701,9 +698,6 @@
     <ClInclude Include="..\..\..\..\include\bitcoin\network\channels\channel_rpc.hpp">
       <Filter>include\bitcoin\network\channels</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\include\bitcoin\network\channels\channel_ws.hpp">
-      <Filter>include\bitcoin\network\channels</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\include\bitcoin\network\channels\channels.hpp">
       <Filter>include\bitcoin\network\channels</Filter>
     </ClInclude>
@@ -1046,9 +1040,6 @@
     <ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocol_version_70016.hpp">
       <Filter>include\bitcoin\network\protocols</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocol_ws.hpp">
-      <Filter>include\bitcoin\network\protocols</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocols.hpp">
       <Filter>include\bitcoin\network\protocols</Filter>
     </ClInclude>

include/bitcoin/network.hpp

@@ -45,7 +45,6 @@
 #include <bitcoin/network/channels/channel_http.hpp>
 #include <bitcoin/network/channels/channel_peer.hpp>
 #include <bitcoin/network/channels/channel_rpc.hpp>
-#include <bitcoin/network/channels/channel_ws.hpp>
 #include <bitcoin/network/channels/channels.hpp>
 #include <bitcoin/network/config/address.hpp>
 #include <bitcoin/network/config/authority.hpp>
@@ -154,7 +153,6 @@
 #include <bitcoin/network/protocols/protocol_version_70001.hpp>
 #include <bitcoin/network/protocols/protocol_version_70002.hpp>
 #include <bitcoin/network/protocols/protocol_version_70016.hpp>
-#include <bitcoin/network/protocols/protocol_ws.hpp>
 #include <bitcoin/network/protocols/protocols.hpp>
 #include <bitcoin/network/sessions/session.hpp>
 #include <bitcoin/network/sessions/session_inbound.hpp>

include/bitcoin/network/channels/channel_rpc.hpp

@@ -26,39 +26,19 @@
 #include <bitcoin/network/messages/messages.hpp>
 #include <bitcoin/network/net/net.hpp>
 
+// TODO: This template can be re-based on channel_http giving it the ability to
+// TODO: support RPC over both tcp and http/ws. In that case the settings type
+// TODO: can be templatized and reader/writer configured at compile. Without an
+// TODO: http reader the socket cannot be upgraded to ws and thus operates as a
+// TODO: simple TCP socket, and TLS remains possible with all protocols. Http
+// TODO: methods are dispatched from channel to base protocol and re-dispatched
+// TODO: to subscribers. TCP/WS are dispatched to protocol as a custom method.
+// TODO: this allows the base protocol to differentiate these as non-http for
+// TODO: selection of the proper response path. As http is half duplex, notify
+// TODO: is only provided to a TCP or upgraded (WS) socket.
+
 namespace libbitcoin {
 namespace network {
-
-// TODO: Interface argument provides templated dispatch for rpc protocols.
-// TODO: transport independent sender methods in each are duck typed for rpc protocol.
-// TODO: network::channel_trpc<Interface> : network::channel
-// TODO: network::channel_wrpc<Interface> : network::channel_ws
-//                                        : network::channel_http
-//                                        : network::channel
-//
-// TODO: reused channel state unique to electrum/bitcoind.
-// TODO: server::channel_electrum_base
-// TODO: server::channel_bitcoind_base
-//
-// TODO: aliases.
-// TODO: server::channel_electrum_tcp : channel_electrum_base, network::channel_trpc<electrum>
-// TODO: server::channel_electrum_web : channel_electrum_base, network::channel_wrpc<electrum>
-// TODO: server::channel_bitcoind_tcp : channel_bitcoind_base, network::channel_trpc<bitcoind>
-// TODO: server::channel_bitcoind_web : channel_bitcoind_base, network::channel_wrpc<bitcoind>
-//
-// TODO: base sender methods for passthrough to channel senders.
-// TODO: these could be implemented in the two protocols to reduce compile time.
-// TODO: network::protocol_rpc<Channel> : network::protocol
-//
-// TODO: reused protocol logic unique to electrum/bitcoind.
-// TODO: server::protocol_electrum<Channel> : network::protocol_rpc<Channel>
-// TODO: server::protocol_bitcoind<Channel> : network::protocol_rpc<Channel>
-//
-// TODO: aliases.
-// TODO: server::protocol_electrum_tcp : network::protocol_electrum<channel_electrum_tcp>
-// TODO: server::protocol_electrum_web : network::protocol_electrum<channel_electrum_web> 
-// TODO: server::protocol_bitcoind_tcp : network::protocol_bitcoind<channel_bitcoind_tcp>
-// TODO: server::protocol_bitcoind_web : network::protocol_bitcoind<channel_bitcoind_web>
 
 /// Read rpc-request and send rpc-response, dispatch to Interface.
 template <typename Interface>

include/bitcoin/network/channels/channels.hpp

@@ -23,6 +23,5 @@
 #include <bitcoin/network/channels/channel_http.hpp>
 #include <bitcoin/network/channels/channel_peer.hpp>
 #include <bitcoin/network/channels/channel_rpc.hpp>
-#include <bitcoin/network/channels/channel_ws.hpp>
 
 #endif

include/bitcoin/network/net/proxy.hpp

@@ -132,10 +132,10 @@ class BCT_API proxy
 
     /// Binary or text mode applies to websockets (no-op for tcp).
     /// Write the provided buffer to socket, handler posted to socket strand.
-    virtual void write(const asio::const_buffer& in,
-        count_handler&& handler, bool binary) NOEXCEPT;
+    virtual void write(const asio::const_buffer& in, bool binary,
+        count_handler&& handler) NOEXCEPT;
 
-    ///  P2P (generic, fixed size).
+    ///  P2P (generic, fixed size, WS: always binary).
     /// -----------------------------------------------------------------------
 
     /// Read fixed-size TCP message from the remote endpoint into buffer.

include/bitcoin/network/net/socket.hpp

@@ -120,8 +120,8 @@ class BCT_API socket
 
     /// Binary or text mode applies to websockets (no-op for tcp).
     /// Write the provided buffer to socket, handler posted to socket strand.
-    virtual void raw_write(const asio::const_buffer& in,
-        count_handler&& handler, bool binary=true) NOEXCEPT;
+    virtual void raw_write(const asio::const_buffer& in, bool binary,
+        count_handler&& handler) NOEXCEPT;
 
     /// P2P (generic, fixed size).
     /// -----------------------------------------------------------------------

include/bitcoin/network/protocols/protocols.hpp

@@ -38,6 +38,5 @@
 // server
 #include <bitcoin/network/protocols/protocol_http.hpp>
 #include <bitcoin/network/protocols/protocol_rpc.hpp>
-#include <bitcoin/network/protocols/protocol_ws.hpp>
 
 #endif