Fixing Windows Client

Author: smasherprog

include/internal/DataStructures.h

@@ -110,12 +110,14 @@ namespace SL {
             WSocket(std::shared_ptr<PARENTTYPE>& s, asio::ssl::context& sslcontext) :
                 Parent(s),
                 Socket(s->WSContextImpl_->io_service, sslcontext),
+                ping_deadline(s->WSContextImpl_->io_service),
                 read_deadline(s->WSContextImpl_->io_service),
                 write_deadline(s->WSContextImpl_->io_service),
                 strand(s->WSContextImpl_->io_service) {}
             WSocket(std::shared_ptr<PARENTTYPE>& s) :
                 Parent(s),
                 Socket(s->WSContextImpl_->io_service),
+                ping_deadline(s->WSContextImpl_->io_service),
                 read_deadline(s->WSContextImpl_->io_service),
                 write_deadline(s->WSContextImpl_->io_service),
                 strand(s->WSContextImpl_->io_service) {}
@@ -165,6 +167,8 @@ namespace SL {
                 read_deadline.cancel(ec);
                 ec.clear();
                 write_deadline.cancel(ec);
+                ec.clear();
+                ping_deadline.cancel(ec);
             }
             unsigned char* ReceiveBuffer = nullptr;
             size_t ReceiveBufferSize = 0;
@@ -176,6 +180,7 @@ namespace SL {
             std::shared_ptr<PARENTTYPE> Parent;
             SOCKETTYPE Socket;
 
+            asio::basic_waitable_timer<std::chrono::steady_clock> ping_deadline;
             asio::basic_waitable_timer<std::chrono::steady_clock> read_deadline;
             asio::basic_waitable_timer<std::chrono::steady_clock> write_deadline;
             asio::strand strand;

include/internal/WebSocketProtocol.h

@@ -37,6 +37,30 @@ namespace SL {
                 });
             }
         }
+        template<class PARENTTYPE, class SOCKETTYPE> void start_ping(const PARENTTYPE& parent, const SOCKETTYPE& socket, std::chrono::seconds secs)
+        {
+            std::error_code ec;
+            if (secs.count() == 0) socket->ping_deadline.cancel(ec);
+            socket->ping_deadline.expires_from_now(secs, ec);
+            if (ec) {
+                SL_WS_LITE_LOG(Logging_Levels::ERROR_log_level, ec.message());
+            }
+            else if (secs.count() > 0) {
+                socket->ping_deadline.async_wait([parent, socket, secs](const std::error_code& ec) {
+                    if (ec != asio::error::operation_aborted) {
+                            WSMessage msg;
+                            char p[] = "ping";
+                            msg.Buffer = std::shared_ptr<unsigned char>(new unsigned char[sizeof(p)],[] (unsigned char* ptr) { delete[] ptr; });
+                            memcpy(msg.Buffer.get(), p, sizeof(p));
+                            msg.len = sizeof(p);
+                            msg.code = OpCode::PING;
+                            msg.data = msg.Buffer.get();
+                            sendImpl(parent, socket, msg, false);
+                            start_ping(parent, socket, secs);
+                    }
+                });
+            }
+        }
         template<class PARENTTYPE, class SOCKETTYPE> void writeexpire_from_now(const PARENTTYPE& parent, const SOCKETTYPE& socket, std::chrono::seconds secs)
         {
 

src/internal/ClientImpl.cpp

@@ -4,6 +4,7 @@
 
 #include <fstream>
 #include <string>
+#include <chrono>
 
 namespace SL {
     namespace WS_LITE {
@@ -70,6 +71,7 @@ namespace SL {
                                     socket->CompressionEnabled = true;
                                 }
                                 socket->SocketStatus_ = SocketStatus::CONNECTED;
+                                start_ping(self, socket, std::chrono::seconds(5));
                                 if (self->onConnection) {
                                     self->onConnection(socket, header);
                                 }

src/internal/ListenerImpl.cpp

@@ -31,6 +31,7 @@ namespace SL {
                             if (!ec) {
                                 SL_WS_LITE_LOG(Logging_Levels::INFO_log_level, "Connected: Sent Handshake bytes " << bytes_transferred);
                                 socket->SocketStatus_ = SocketStatus::CONNECTED;
+                                start_ping(listener, socket, std::chrono::seconds(5));
                                 if (listener->onConnection) {
                                     listener->onConnection(socket, handshakecontainer->Header);
                                 }