Adding buffered data bytes

Author: smasherprog

.appveyor.yml

@@ -15,7 +15,7 @@ install:
   - ps: If ($env:Platform -Match "x86"){ $env:CMAKE_ARCH="" } Else { $env:CMAKE_ARCH=" Win64"}
   - mkdir C:\projects\deps
   - cd C:\projects\deps
-  - set CMAKE_URL="https://cmake.org/files/v3.9/cmake-3.9.3-win64-x64.zip"
+  - set CMAKE_URL="https://cmake.org/files/v3.9/cmake-3.9.4-win64-x64.zip"
   - appveyor DownloadFile %CMAKE_URL% -FileName cmake.zip
   - 7z x cmake.zip -oC:\projects\deps > nul
   - move C:\projects\deps\cmake-* C:\projects\deps\cmake # Move to a version-agnostic directory

include/WS_Lite.h

@@ -170,6 +170,7 @@ namespace WS_LITE {
         virtual bool is_v4() const = 0;
         virtual bool is_v6() const = 0;
         virtual bool is_loopback() const = 0;
+        virtual size_t BufferedBytes() const = 0;
         virtual void send(const WSMessage &msg, CompressionOptions compressmessage) = 0;
         // send a close message and close the socket
         virtual void close(unsigned short code = 1000, const std::string &msg = "") = 0;

include/internal/DataStructures.h

@@ -139,13 +139,14 @@ namespace WS_LITE {
                 free(ReceiveBuffer);
             }
         }
-        virtual SocketStatus is_open() const { return SocketStatus_; }
-        virtual std::string get_address() const { return SL::WS_LITE::get_address(Socket); }
-        virtual unsigned short get_port() const { return SL::WS_LITE::get_port(Socket); }
-        virtual bool is_v4() const { return SL::WS_LITE::is_v4(Socket); }
-        virtual bool is_v6() const { return SL::WS_LITE::is_v6(Socket); }
-        virtual bool is_loopback() const { return SL::WS_LITE::is_loopback(Socket); }
-        virtual void send(const WSMessage &msg, CompressionOptions compressmessage)
+        virtual SocketStatus is_open() const override { return SocketStatus_; }
+        virtual std::string get_address() const override { return SL::WS_LITE::get_address(Socket); }
+        virtual unsigned short get_port() const override { return SL::WS_LITE::get_port(Socket); }
+        virtual bool is_v4() const override { return SL::WS_LITE::is_v4(Socket); }
+        virtual bool is_v6() const override { return SL::WS_LITE::is_v6(Socket); }
+        virtual size_t BufferedBytes() const override { return Bytes_PendingFlush; }
+        virtual bool is_loopback() const override { return SL::WS_LITE::is_loopback(Socket); }
+        virtual void send(const WSMessage &msg, CompressionOptions compressmessage) override
         {
             if (SocketStatus_ == SocketStatus::CONNECTED) { // only send to a conected socket
                 auto self(std::static_pointer_cast<WSocket<isServer, SOCKETTYPE>>(shared_from_this()));
@@ -156,7 +157,7 @@ namespace WS_LITE {
             }
         }
         // send a close message and close the socket
-        virtual void close(unsigned short code, const std::string &msg)
+        virtual void close(unsigned short code, const std::string &msg) override
         {
             if (SocketStatus_ == SocketStatus::CONNECTED) { // only send a close to an open socket
                 auto self(std::static_pointer_cast<WSocket<isServer, SOCKETTYPE>>(shared_from_this()));
@@ -184,6 +185,7 @@ namespace WS_LITE {
         OpCode LastOpCode = OpCode::INVALID;
         std::shared_ptr<WSContextImpl> Parent;
         SOCKETTYPE Socket;
+        size_t Bytes_PendingFlush = 0;
 
         asio::basic_waitable_timer<std::chrono::steady_clock> ping_deadline;
         asio::basic_waitable_timer<std::chrono::steady_clock> read_deadline;

include/internal/WebSocketProtocol.h

@@ -203,6 +203,7 @@ namespace WS_LITE {
                 if (msg.code == OpCode::CLOSE) {
                     socket->SocketStatus_ = SocketStatus::CLOSING;
                 }
+                socket->Bytes_PendingFlush += msg.len;
                 socket->SendMessageQueue.emplace_back(SendQueueItem{msg, compressmessage});
                 SL::WS_LITE::startwrite<isServer>(parent, socket);
             }
@@ -248,6 +249,10 @@ namespace WS_LITE {
                           socket->strand.wrap([parent, socket, msg](const std::error_code &ec, size_t bytes_transferred) {
                               socket->Writing = false;
                               UNUSED(bytes_transferred);
+
+                              socket->Bytes_PendingFlush -= msg.len;
+
+                              SL_WS_LITE_LOG(Logging_Levels::INFO_log_level, "socket->Bytes_PendingFlush: " << socket->Bytes_PendingFlush);
                               if (msg.code == OpCode::CLOSE) {
                                   // final close.. get out and dont come back mm kay?
                                   return handleclose(parent, socket, 1000, "");