websocket server: closed connection threads are joined properly

.clang-format

@@ -1,46 +0,0 @@
-# https://releases.llvm.org/7.0.0/tools/clang/docs/ClangFormatStyleOptions.html
-
----
-Language: Cpp
-
-BasedOnStyle: WebKit
-
-AlignAfterOpenBracket: Align
-AlignOperands: true
-AlignTrailingComments: true
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: true
-AllowShortFunctionsOnASingleLine: InlineOnly
-AllowShortIfStatementsOnASingleLine: true
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakTemplateDeclarations: true
-BinPackArguments: false
-BinPackParameters: false
-BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Allman
-BreakConstructorInitializersBeforeComma: true
-ColumnLimit: 100
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-Cpp11BracedListStyle: true
-FixNamespaceComments: true
-IncludeBlocks:   Regroup
-IncludeCategories:
-  - Regex:           '^["<](stdafx|pch)\.h[">]$'
-    Priority:        -1
-  - Regex:           '^<Windows\.h>$'
-    Priority:        3
-  - Regex:           '^<(WinIoCtl|winhttp|Shellapi)\.h>$'
-    Priority:        4
-  - Regex:           '.*'
-    Priority:        2
-IndentCaseLabels: true
-IndentWidth: 4
-KeepEmptyLinesAtTheStartOfBlocks: false
-MaxEmptyLinesToKeep: 2
-NamespaceIndentation: All
-PenaltyReturnTypeOnItsOwnLine: 1000
-PointerAlignment: Left
-SpaceAfterTemplateKeyword: false
-Standard: Cpp11
-UseTab: Never

.dockerignore

@@ -1,4 +1 @@
 build
-CMakeCache.txt
-ws/CMakeCache.txt
-test/build

.gitignore

@@ -1,2 +1 @@
 build
-*.pyc

.travis.yml

@@ -1,41 +1,17 @@
-language: bash
+language: cpp
+dist: xenial
 
-# See https://github.com/amaiorano/vectrexy/blob/master/.travis.yml
-# for ideas on installing vcpkg
+compiler:
+  - gcc
+  - clang
+os:
+  - linux
+  - osx
 
 matrix:
-  include:
-    # macOS
-    - os: osx
-      compiler: clang
-      script:
-        - python test/run.py
-        - make ws
+  exclude:
+    # GCC fails on recent Travis OSX images.
+    - compiler: gcc
+      os: osx
 
-    # Linux
-    - os: linux
-      dist: xenial
-      script: 
-        - python test/run.py
-        - make ws
-      env:
-        - CC=gcc
-        - CXX=g++
-
-    # Clang + Linux disabled for now
-    # - os: linux
-    #   dist: xenial
-    #   script: python test/run.py
-    #   env:
-    #     - CC=clang 
-    #     - CXX=clang++
-
-    # Windows
-    # - os: windows
-    #   env:
-    #     - CMAKE_PATH="/c/Program Files/CMake/bin"
-    #   script: 
-    #     - export PATH=$CMAKE_PATH:$PATH
-    #     #  - cmake -DUSE_TLS=1 -DUSE_WS=1 -DUSE_MBED_TLS=1 -DUSE_VENDORED_THIRD_PARTY=1 .
-    #     #  - cmake --build --parallel .
-    #     - python test/run.py
+script: python test/run.py

CHANGELOG.md

@@ -1,32 +0,0 @@
-# Changelog
-All notable changes to this project will be documented in this file.
-
-## [unreleased] - 2019-06-09
-### Changed
-- cobra_to_sentry / backtraces are reversed and line number is not extracted correctly
-- mbedtls and zlib are searched with find_package, and we use the vendored version if nothing is found
-- travis CI uses g++ on Linux
-
-## [4.0.0] - 2019-06-09
-### Changed
-- WebSocket::send() sends message in TEXT mode by default
-- WebSocketMessage sets a new binary field, which tells whether the received incoming message is binary or text
-- WebSocket::send takes a third arg, binary which default to true (can be text too)
-- WebSocket callback only take one object, a const ix::WebSocketMessagePtr& msg
-- Add explicit WebSocket::sendBinary method
-- New headers + WebSocketMessage class to hold message data, still not used across the board
-- Add test/compatibility folder with small servers and clients written in different languages and different libraries to test compatibility.
-- ws echo_server has a -g option to print a greeting message on connect
-- IXSocketMbedTLS: better error handling in close and connect
-
-## [3.1.2] - 2019-06-06
-### Added
-- ws connect has a -x option to disable per message deflate
-- Add WebSocket::disablePerMessageDeflate() option.
-
-## [3.0.0] - 2019-06-xx
-### Changed
-- TLS, aka SSL works on Windows (websocket and http clients)
-- ws command line tool build on Windows
-- Async API for HttpClient
-- HttpClient API changed to use shared_ptr for response and request

CMake/FindMbedTLS.cmake

@@ -1,13 +0,0 @@
-find_path(MBEDTLS_INCLUDE_DIRS mbedtls/ssl.h)
-
-find_library(MBEDTLS_LIBRARY mbedtls)
-find_library(MBEDX509_LIBRARY mbedx509)
-find_library(MBEDCRYPTO_LIBRARY mbedcrypto)
-
-set(MBEDTLS_LIBRARIES "${MBEDTLS_LIBRARY}" "${MBEDX509_LIBRARY}" "${MBEDCRYPTO_LIBRARY}")
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(MBEDTLS DEFAULT_MSG
-    MBEDTLS_INCLUDE_DIRS MBEDTLS_LIBRARY MBEDX509_LIBRARY MBEDCRYPTO_LIBRARY)
-
-mark_as_advanced(MBEDTLS_INCLUDE_DIRS MBEDTLS_LIBRARY MBEDX509_LIBRARY MBEDCRYPTO_LIBRARY)

CMakeLists.txt

@@ -4,8 +4,6 @@
 #
 
 cmake_minimum_required(VERSION 3.4.1)
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake;${CMAKE_MODULE_PATH}")
-
 project(ixwebsocket C CXX)
 
 set (CMAKE_CXX_STANDARD 14)
@@ -22,64 +20,52 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
 endif()
 
 set( IXWEBSOCKET_SOURCES
-    ixwebsocket/IXCancellationRequest.cpp
-    ixwebsocket/IXConnectionState.cpp
-    ixwebsocket/IXDNSLookup.cpp
-    ixwebsocket/IXHttpClient.cpp
-    ixwebsocket/IXNetSystem.cpp
-    ixwebsocket/IXSelectInterrupt.cpp
-    ixwebsocket/IXSelectInterruptFactory.cpp
     ixwebsocket/IXSocket.cpp
+    ixwebsocket/IXSocketServer.cpp
     ixwebsocket/IXSocketConnect.cpp
     ixwebsocket/IXSocketFactory.cpp
-    ixwebsocket/IXSocketServer.cpp
-    ixwebsocket/IXUrlParser.cpp
+    ixwebsocket/IXDNSLookup.cpp
+    ixwebsocket/IXCancellationRequest.cpp
     ixwebsocket/IXWebSocket.cpp
-    ixwebsocket/IXWebSocketCloseConstants.cpp
+    ixwebsocket/IXWebSocketServer.cpp
+    ixwebsocket/IXWebSocketTransport.cpp
     ixwebsocket/IXWebSocketHandshake.cpp
-    ixwebsocket/IXWebSocketHttpHeaders.cpp
-    ixwebsocket/IXWebSocketMessageQueue.cpp
     ixwebsocket/IXWebSocketPerMessageDeflate.cpp
     ixwebsocket/IXWebSocketPerMessageDeflateCodec.cpp
     ixwebsocket/IXWebSocketPerMessageDeflateOptions.cpp
-    ixwebsocket/IXWebSocketServer.cpp
-    ixwebsocket/IXWebSocketTransport.cpp
-    ixwebsocket/LUrlParser.cpp
+    ixwebsocket/IXWebSocketHttpHeaders.cpp
+    ixwebsocket/IXHttpClient.cpp
+    ixwebsocket/IXUrlParser.cpp
+    ixwebsocket/IXSelectInterrupt.cpp
+    ixwebsocket/IXSelectInterruptFactory.cpp
+    ixwebsocket/IXConnectionState.cpp
 )
 
 set( IXWEBSOCKET_HEADERS
-    ixwebsocket/IXCancellationRequest.h
-    ixwebsocket/IXConnectionState.h
-    ixwebsocket/IXDNSLookup.h
-    ixwebsocket/IXHttpClient.h
-    ixwebsocket/IXNetSystem.h
-    ixwebsocket/IXProgressCallback.h
-    ixwebsocket/IXSelectInterrupt.h
-    ixwebsocket/IXSelectInterruptFactory.h
-    ixwebsocket/IXSetThreadName.h
     ixwebsocket/IXSocket.h
+    ixwebsocket/IXSocketServer.h
     ixwebsocket/IXSocketConnect.h
     ixwebsocket/IXSocketFactory.h
-    ixwebsocket/IXSocketServer.h
-    ixwebsocket/IXUrlParser.h
+    ixwebsocket/IXSetThreadName.h
+    ixwebsocket/IXDNSLookup.h
+    ixwebsocket/IXCancellationRequest.h
+    ixwebsocket/IXProgressCallback.h
     ixwebsocket/IXWebSocket.h
-    ixwebsocket/IXWebSocketCloseConstants.h
-    ixwebsocket/IXWebSocketCloseInfo.h
-    ixwebsocket/IXWebSocketErrorInfo.h
+    ixwebsocket/IXWebSocketServer.h
+    ixwebsocket/IXWebSocketTransport.h
     ixwebsocket/IXWebSocketHandshake.h
-    ixwebsocket/IXWebSocketHttpHeaders.h
-    ixwebsocket/IXWebSocketMessage.h
-    ixwebsocket/IXWebSocketMessageQueue.h
-    ixwebsocket/IXWebSocketMessageType.h
-    ixwebsocket/IXWebSocketOpenInfo.h
+    ixwebsocket/IXWebSocketSendInfo.h
+    ixwebsocket/IXWebSocketErrorInfo.h
     ixwebsocket/IXWebSocketPerMessageDeflate.h
     ixwebsocket/IXWebSocketPerMessageDeflateCodec.h
     ixwebsocket/IXWebSocketPerMessageDeflateOptions.h
-    ixwebsocket/IXWebSocketSendInfo.h
-    ixwebsocket/IXWebSocketServer.h
-    ixwebsocket/IXWebSocketTransport.h
-    ixwebsocket/LUrlParser.h
+    ixwebsocket/IXWebSocketHttpHeaders.h
     ixwebsocket/libwshandshake.hpp
+    ixwebsocket/IXHttpClient.h
+    ixwebsocket/IXUrlParser.h
+    ixwebsocket/IXSelectInterrupt.h
+    ixwebsocket/IXSelectInterruptFactory.h
+    ixwebsocket/IXConnectionState.h
 )
 
 if (UNIX)
@@ -99,26 +85,17 @@ else()
     list( APPEND IXWEBSOCKET_HEADERS ixwebsocket/IXSelectInterruptEventFd.h)
 endif()
 
-if (WIN32)
-  set(USE_MBED_TLS TRUE)
-endif()
-
 set(USE_OPEN_SSL FALSE)
 if (USE_TLS)
     add_definitions(-DIXWEBSOCKET_USE_TLS)
 
-    if (USE_MBED_TLS)
-        add_definitions(-DIXWEBSOCKET_USE_MBED_TLS)
-        list( APPEND IXWEBSOCKET_HEADERS ixwebsocket/IXSocketMbedTLS.h)
-        list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/IXSocketMbedTLS.cpp)
-    elseif (APPLE)
+    if (APPLE)
         list( APPEND IXWEBSOCKET_HEADERS ixwebsocket/IXSocketAppleSSL.h)
         list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/IXSocketAppleSSL.cpp)
     elseif (WIN32)
         list( APPEND IXWEBSOCKET_HEADERS ixwebsocket/IXSocketSChannel.h)
         list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/IXSocketSChannel.cpp)
     else()
-        add_definitions(-DIXWEBSOCKET_USE_OPEN_SSL)
         set(USE_OPEN_SSL TRUE)
         list( APPEND IXWEBSOCKET_HEADERS ixwebsocket/IXSocketOpenSSL.h)
         list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/IXSocketOpenSSL.cpp)
@@ -130,16 +107,11 @@ add_library( ixwebsocket STATIC
     ${IXWEBSOCKET_HEADERS}
 )
 
-if (APPLE AND USE_TLS AND NOT USE_MBED_TLS)
+if (APPLE AND USE_TLS)
   target_link_libraries(ixwebsocket "-framework foundation" "-framework security")
 endif()
 
-if (UNIX)
-  find_package(Threads)
-  target_link_libraries(ixwebsocket ${CMAKE_THREAD_LIBS_INIT})
-endif()
-
-if (USE_OPEN_SSL)
+if(USE_OPEN_SSL)
   find_package(OpenSSL REQUIRED)
   add_definitions(${OPENSSL_DEFINITIONS})
   message(STATUS "OpenSSL: " ${OPENSSL_VERSION})
@@ -147,49 +119,33 @@ if (USE_OPEN_SSL)
   target_link_libraries(ixwebsocket ${OPENSSL_LIBRARIES})
 endif()
 
-if (USE_MBED_TLS)
-  if (USE_VENDORED_THIRD_PARTY)
-    set (ENABLE_PROGRAMS OFF)
-    add_subdirectory(third_party/mbedtls)
-    include_directories(third_party/mbedtls/include)
+if (WIN32)
+  get_filename_component(libz_path
+    ${PROJECT_SOURCE_DIR}/third_party/ZLIB-Windows/zlib-1.2.11_deploy_v140/release_dynamic/x64/lib/zlib.lib
+    ABSOLUTE)
+  add_library(libz STATIC IMPORTED)
+  set_target_properties(libz PROPERTIES IMPORTED_LOCATION
+    ${libz_path})
 
-    target_link_libraries(ixwebsocket mbedtls)
-  else()
-    find_package(MbedTLS REQUIRED)
-    include_directories(${MBEDTLS_INCLUDE_DIRS})
-    target_link_libraries(ixwebsocket ${MBEDTLS_LIBRARIES})
-  endif()
-endif()
+  include_directories(${PROJECT_SOURCE_DIR}/third_party/ZLIB-Windows/zlib-1.2.11_deploy_v140/include)
 
-find_package(ZLIB REQUIRED)
-if (ZLIB_FOUND)
-  include_directories(${ZLIB_INCLUDE_DIRS})
-  target_link_libraries(ixwebsocket ${ZLIB_LIBRARIES})
-else()
-  add_subdirectory(third_party/zlib)
-  include_directories(third_party/zlib ${CMAKE_CURRENT_BINARY_DIR}/third_party/zlib)
-  target_link_libraries(ixwebsocket zlibstatic wsock32 ws2_32)
+  target_link_libraries(ixwebsocket libz wsock32 ws2_32)
   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+
+else()
+  # gcc/Linux needs -pthread
+  find_package(Threads)
+
+  target_link_libraries(ixwebsocket 
+    z ${CMAKE_THREAD_LIBS_INIT})
 endif()
 
 set( IXWEBSOCKET_INCLUDE_DIRS
     .
 )
 
-if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-    # Build with Multiple Processes
-    target_compile_options(ixwebsocket PRIVATE /MP)
-endif()
+target_include_directories( ixwebsocket PUBLIC ${IXWEBSOCKET_INCLUDE_DIRS} )
 
-target_include_directories(ixwebsocket PUBLIC ${IXWEBSOCKET_INCLUDE_DIRS})
-
-set_target_properties(ixwebsocket PROPERTIES PUBLIC_HEADER "${IXWEBSOCKET_HEADERS}")
-
-install(TARGETS ixwebsocket
-        ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
-        PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ixwebsocket/
-)
-
-if (USE_WS)
+if (NOT WIN32)
     add_subdirectory(ws)
 endif()

DOCKER_VERSION

@@ -1 +1 @@
-4.0.4
+1.4.0

Dockerfile

@@ -1 +0,0 @@
-docker/Dockerfile.alpine

Dockerfile

@@ -0,0 +1,47 @@
+# Build time
+FROM debian:buster as build
+
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update 
+RUN apt-get -y install wget 
+RUN mkdir -p /tmp/cmake
+WORKDIR /tmp/cmake
+RUN wget https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0-Linux-x86_64.tar.gz 
+RUN tar zxf cmake-3.14.0-Linux-x86_64.tar.gz
+
+RUN apt-get -y install g++ 
+RUN apt-get -y install libssl-dev
+RUN apt-get -y install libz-dev
+RUN apt-get -y install make
+
+COPY . .
+
+ARG CMAKE_BIN_PATH=/tmp/cmake/cmake-3.14.0-Linux-x86_64/bin
+ENV PATH="${CMAKE_BIN_PATH}:${PATH}"
+
+RUN ["make"]
+
+# Runtime
+FROM debian:buster as runtime
+
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update 
+# Runtime 
+RUN apt-get install -y libssl1.1 
+
+# Debugging
+RUN apt-get install -y strace
+RUN apt-get install -y gdb
+RUN apt-get install -y procps
+RUN apt-get install -y htop
+
+RUN adduser --disabled-password --gecos '' app
+COPY --chown=app:app --from=build /usr/local/bin/ws /usr/local/bin/ws
+RUN chmod +x /usr/local/bin/ws
+RUN ldd /usr/local/bin/ws
+
+# Now run in usermode
+USER app
+WORKDIR /home/app
+
+CMD ["ws"]

README.md

@@ -10,7 +10,8 @@
 * iOS
 * Linux
 * Android
-* Windows
+
+The code was made to compile once on Windows but support is currently broken on this platform.
 
 ## Examples
 
@@ -28,27 +29,29 @@ webSocket.setUrl(url);
 // to make sure that load balancers do not kill an idle connection.
 webSocket.setHeartBeatPeriod(45);
 
-// Per message deflate connection is enabled by default. You can tweak its parameters or disable it
-webSocket.disablePerMessageDeflate();
-
 // Setup a callback to be fired when a message or an event (open, close, error) is received
 webSocket.setOnMessageCallback(
-    [](const ix::WebSocketMessagePtr& msg)
+    [](ix::WebSocketMessageType messageType,
+       const std::string& str,
+       size_t wireSize,
+       const ix::WebSocketErrorInfo& error,
+       const ix::WebSocketCloseInfo& closeInfo,
+       const ix::WebSocketHttpHeaders& headers)
     {
-        if (msg->type == ix::WebSocketMessageType::Message)
+        if (messageType == ix::WebSocket_MessageType_Message)
         {
-            std::cout << msg->str << std::endl;
+            std::cout << str << std::endl;
         }
 });
 
 // Now that our callback is setup, we can start our background thread and receive messages
 webSocket.start();
 
-// Send a message to the server (default to TEXT mode)
+// Send a message to the server (default to BINARY mode)
 webSocket.send("hello world");
 
-// The message can be sent in BINARY mode (useful if you send MsgPack data for example)
-webSocket.sendBinary("some serialized binary data");
+// The message can be sent in TEXT mode
+webSocket.sendText("hello again");
 
 // ... finally ...
 
@@ -68,9 +71,14 @@ server.setOnConnectionCallback(
               std::shared_ptr<ConnectionState> connectionState)
     {
         webSocket->setOnMessageCallback(
-            [webSocket, connectionState, &server](const ix::WebSocketMessagePtr msg)
+            [webSocket, connectionState, &server](ix::WebSocketMessageType messageType,
+               const std::string& str,
+               size_t wireSize,
+               const ix::WebSocketErrorInfo& error,
+               const ix::WebSocketOpenInfo& openInfo,
+               const ix::WebSocketCloseInfo& closeInfo)
             {
-                if (msg->type == ix::WebSocketMessageType::Open)
+                if (messageType == ix::WebSocket_MessageType_Open)
                 {
                     std::cerr << "New connection" << std::endl;
 
@@ -81,21 +89,19 @@ server.setOnConnectionCallback(
                     std::cerr << "id: " << connectionState->getId() << std::endl;
 
                     // The uri the client did connect to.
-                    std::cerr << "Uri: " << msg->openInfo.uri << std::endl;
+                    std::cerr << "Uri: " << openInfo.uri << std::endl;
 
                     std::cerr << "Headers:" << std::endl;
-                    for (auto it : msg->openInfo.headers)
+                    for (auto it : openInfo.headers)
                     {
                         std::cerr << it.first << ": " << it.second << std::endl;
                     }
                 }
-                else if (msg->type == ix::WebSocketMessageType::Message)
+                else if (messageType == ix::WebSocket_MessageType_Message)
                 {
                     // For an echo server, we just send back to the client whatever was received by the server
                     // All connected clients are available in an std::set. See the broadcast cpp example.
-                    // Second parameter tells whether we are sending the message in binary or text mode.
-                    // Here we send it in the same mode as it was received.
-                    webSocket->send(msg->str, msg->binary);
+                    webSocket->send(str);
                 }
             }
         );
@@ -124,33 +130,33 @@ Here is what the HTTP client API looks like. Note that HTTP client support is ve
 // Preparation
 //
 HttpClient httpClient;
-HttpRequestArgsPtr args = httpClient.createRequest();
+HttpRequestArgs args;
 
 // Custom headers can be set
 WebSocketHttpHeaders headers;
 headers["Foo"] = "bar";
-args->extraHeaders = headers;
+args.extraHeaders = headers;
 
 // Timeout options
-args->connectTimeout = connectTimeout;
-args->transferTimeout = transferTimeout;
+args.connectTimeout = connectTimeout;
+args.transferTimeout = transferTimeout;
 
 // Redirect options
-args->followRedirects = followRedirects;
-args->maxRedirects = maxRedirects;
+args.followRedirects = followRedirects;
+args.maxRedirects = maxRedirects;
 
 // Misc
-args->compress = compress; // Enable gzip compression
-args->verbose = verbose;
-args->logger = [](const std::string& msg)
+args.compress = compress; // Enable gzip compression
+args.verbose = verbose;
+args.logger = [](const std::string& msg)
 {
     std::cout << msg;
 };
 
 //
-// Synchronous Request
+// Request
 //
-HttpResponsePtr out;
+HttpResponse out;
 std::string url = "https://www.google.com";
 
 // HEAD request
@@ -170,64 +176,22 @@ out = httpClient.post(url, std::string("foo=bar"), args);
 //
 // Result
 //
-auto errorCode = response->errorCode; // Can be HttpErrorCode::Ok, HttpErrorCode::UrlMalformed, etc...
-auto errorCode = response->errorCode; // 200, 404, etc...
-auto responseHeaders = response->headers; // All the headers in a special case-insensitive unordered_map of (string, string)
-auto payload = response->payload; // All the bytes from the response as an std::string
-auto errorMsg = response->errorMsg; // Descriptive error message in case of failure
-auto uploadSize = response->uploadSize; // Byte count of uploaded data
-auto downloadSize = response->downloadSize; // Byte count of downloaded data
-
-//
-// Asynchronous Request
-//
-bool async = true;
-HttpClient httpClient(async);
-auto args = httpClient.createRequest(url, HttpClient::kGet);
-
-// Push the request to a queue,
-bool ok = httpClient.performRequest(args, [](const HttpResponsePtr& response)
-    {
-        // This callback execute in a background thread. Make sure you uses appropriate protection such as mutex
-        auto statusCode = response->statusCode; // acess results
-    }
-);
-
-// ok will be false if your httpClient is not async
+auto statusCode = std::get<0>(out);
+auto errorCode = std::get<1>(out);
+auto responseHeaders = std::get<2>(out);
+auto payload = std::get<3>(out);
+auto errorMsg = std::get<4>(out);
+auto uploadSize = std::get<5>(out);
+auto downloadSize = std::get<6>(out);
 ```
 
 ## Build
 
-CMakefiles for the library and the examples are available. This library has few dependencies, so it is possible to just add the source files into your project. Otherwise the usual way will suffice.
+CMakefiles for the library and the examples are available. This library has few dependencies, so it is possible to just add the source files into your project.
 
-```
-mkdir build # make a build dir so that you can build out of tree.
-cd build
-cmake ..
-make -j
-make install # will install to /usr/local on Unix, on macOS it is a good idea to sudo chown -R `whoami`:staff /usr/local
-```
+There is a Dockerfile for running some code on Linux, and a unittest which can be executed by typing `make test`.
 
-Headers and a static library will be installed to the target dir.
-
-A [conan](https://conan.io/) file is available at [conan-IXWebSocket](https://github.com/Zinnion/conan-IXWebSocket).
-
-There is a unittest which can be executed by typing `make test`.
-
-There is a Dockerfile for running some code on Linux. To use docker-compose you must make a docker container first.
-
-```
-$ make docker
-...
-$ docker compose up &
-...
-$ docker exec -it ixwebsocket_ws_1 bash
-app@ca2340eb9106:~$ ws --help
-ws is a websocket tool
-...
-```
-
-Finally you can build and install the `ws command line tool` with Homebrew. The homebrew version might be slightly out of date.
+You can build and install the ws command line tool with Homebrew.
 
 ```
 brew tap bsergean/IXWebSocket
@@ -242,7 +206,7 @@ The per message deflate compression option is supported. It can lead to very nic
 
 ### TLS/SSL
 
-Connections can be optionally secured and encrypted with TLS/SSL when using a wss:// endpoint, or using normal un-encrypted socket with ws:// endpoints. AppleSSL is used on iOS and macOS, OpenSSL is used on Android and Linux, mbedTLS is used on Windows.
+Connections can be optionally secured and encrypted with TLS/SSL when using a wss:// endpoint, or using normal un-encrypted socket with ws:// endpoints. AppleSSL is used on iOS and macOS, and OpenSSL is used on Android and Linux.
 
 ### Polling and background thread work
 
@@ -250,7 +214,7 @@ No manual polling to fetch data is required. Data is sent and received instantly
 
 ### Automatic reconnection
 
-If the remote end (server) breaks the connection, the code will try to perpetually reconnect, by using an exponential backoff strategy, capped at one retry every 10 seconds. This behavior can be disabled.
+If the remote end (server) breaks the connection, the code will try to perpetually reconnect, by using an exponential backoff strategy, capped at one retry every 10 seconds.
 
 ### Large messages
 
@@ -258,8 +222,6 @@ Large frames are broken up into smaller chunks or messages to avoid filling up t
 
 ## Limitations
 
-* On Windows TLS is not setup yet to validate certificates.
-* There is no convenient way to embed a ca cert.
 * No utf-8 validation is made when sending TEXT message with sendText()
 * Automatic reconnection works at the TCP socket level, and will detect remote end disconnects. However, if the device/computer network become unreachable (by turning off wifi), it is quite hard to reliably and timely detect it at the socket level using `recv` and `send` error codes. [Here](https://stackoverflow.com/questions/14782143/linux-socket-how-to-detect-disconnected-network-in-a-client-program) is a good discussion on the subject. This behavior is consistent with other runtimes such as node.js. One way to detect a disconnected device with low level C code is to do a name resolution with DNS but this can be expensive. Mobile devices have good and reliable API to do that.
 * The server code is using select to detect incoming data, and creates one OS thread per connection. This is not as scalable as strategies using epoll or kqueue.
@@ -315,10 +277,10 @@ If the connection was closed and sending failed, the return value will be set to
 
 `getReadyState()` returns the state of the connection. There are 4 possible states.
 
-1. ReadyState::Connecting - The connection is not yet open.
-2. ReadyState::Open       - The connection is open and ready to communicate.
-3. ReadyState::Closing    - The connection is in the process of closing.
-4. ReadyState::Closed     - The connection is closed or could not be opened.
+1. WebSocket_ReadyState_Connecting - The connection is not yet open.
+2. WebSocket_ReadyState_Open       - The connection is open and ready to communicate.
+3. WebSocket_ReadyState_Closing    - The connection is in the process of closing.
+4. WebSocket_MessageType_Close     - The connection is closed or could not be opened.
 
 ### Open and Close notifications
 
@@ -326,27 +288,32 @@ The onMessage event will be fired when the connection is opened or closed. This
 
 ```
 webSocket.setOnMessageCallback(
-    [](const ix::WebSocketMessagePtr& msg)
+    [](ix::WebSocketMessageType messageType,
+       const std::string& str,
+       size_t wireSize,
+       const ix::WebSocketErrorInfo& error,
+       const ix::WebSocketCloseInfo& closeInfo,
+       const ix::WebSocketHttpHeaders& headers)
     {
-        if (msg->type == ix::WebSocketMessageType::Open)
+        if (messageType == ix::WebSocket_MessageType_Open)
         {
             std::cout << "send greetings" << std::endl;
 
             // Headers can be inspected (pairs of string/string)
             std::cout << "Handshake Headers:" << std::endl;
-            for (auto it : msg->headers)
+            for (auto it : headers)
             {
                 std::cout << it.first << ": " << it.second << std::endl;
             }
         }
-        else if (msg->type == ix::WebSocketMessageType::Close)
+        else if (messageType == ix::WebSocket_MessageType_Close)
         {
             std::cout << "disconnected" << std::endl;
 
             // The server can send an explicit code and reason for closing.
             // This data can be accessed through the closeInfo object.
-            std::cout << msg->closeInfo.code << std::endl;
-            std::cout << msg->closeInfo.reason << std::endl;
+            std::cout << closeInfo.code << std::endl;
+            std::cout << closeInfo.reason << std::endl;
         }
     }
 );
@@ -354,19 +321,24 @@ webSocket.setOnMessageCallback(
 
 ### Error notification
 
-A message will be fired when there is an error with the connection. The message type will be `ix::WebSocketMessageType::Error`. Multiple fields will be available on the event to describe the error.
+A message will be fired when there is an error with the connection. The message type will be `ix::WebSocket_MessageType_Error`. Multiple fields will be available on the event to describe the error.
 
 ```
 webSocket.setOnMessageCallback(
-    [](const ix::WebSocketMessagePtr& msg)
+    [](ix::WebSocketMessageType messageType,
+       const std::string& str,
+       size_t wireSize,
+       const ix::WebSocketErrorInfo& error,
+       const ix::WebSocketCloseInfo& closeInfo,
+       const ix::WebSocketHttpHeaders& headers)
     {
-        if (msg->type == ix::WebSocketMessageType::Error)
+        if (messageType == ix::WebSocket_MessageType_Error)
         {
             std::stringstream ss;
-            ss << "Error: "         << msg->errorInfo.reason      << std::endl;
-            ss << "#retries: "      << msg->eventInfo.retries     << std::endl;
-            ss << "Wait time(ms): " << msg->eventInfo.wait_time   << std::endl;
-            ss << "HTTP Status: "   << msg->eventInfo.http_status << std::endl;
+            ss << "Error: "         << error.reason      << std::endl;
+            ss << "#retries: "      << event.retries     << std::endl;
+            ss << "Wait time(ms): " << event.wait_time   << std::endl;
+            ss << "HTTP Status: "   << event.http_status << std::endl;
             std::cout << ss.str() << std::endl;
         }
     }
@@ -393,12 +365,17 @@ Ping/pong messages are used to implement keep-alive. 2 message types exists to i
 
 ```
 webSocket.setOnMessageCallback(
-    [](const ix::WebSocketMessagePtr& msg)
+    [](ix::WebSocketMessageType messageType,
+       const std::string& str,
+       size_t wireSize,
+       const ix::WebSocketErrorInfo& error,
+       const ix::WebSocketCloseInfo& closeInfo,
+       const ix::WebSocketHttpHeaders& headers)
     {
-        if (msg->type == ix::WebSocketMessageType::Ping ||
-            msg->type == ix::WebSocketMessageType::Pong)
+        if (messageType == ix::WebSocket_MessageType_Ping ||
+            messageType == ix::WebSocket_MessageType_Pong)
         {
-            std::cout << "pong data: " << msg->str << std::endl;
+            std::cout << "pong data: " << str << std::endl;
         }
     }
 );

appveyor.yml

@@ -1,14 +1,10 @@
 image:
 - Visual Studio 2017
+- Ubuntu
 
 install:
 - ls -al
 - cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
-- cd test
-- mkdir build
-- cd build
-- cmake -G"NMake Makefiles" ..
-- nmake
-- ixwebsocket_unittest.exe
+- python test/run.py
 
 build: off

docker-compose.yml

@@ -1,23 +1,11 @@
 version: "3"
 services:
-  snake:
-    image: bsergean/ws:build
-    entrypoint: ws snake --port 8765 --host 0.0.0.0 --redis_hosts redis1
-    ports:
-      - "8765:8765"
-    networks:
-      - ws-net
-    depends_on:
-      - redis1
-
   ws:
-    security_opt:
-    - seccomp:unconfined
-    cap_add:
-    - SYS_PTRACE
     stdin_open: true
     tty: true
     image: bsergean/ws:build
+    ports:
+      - "8765:8765"
     entrypoint: bash
     networks:
       - ws-net
@@ -29,15 +17,5 @@ services:
     networks:
       - ws-net
 
-  statsd:
-    image: jaconel/statsd
-    ports:
-      - "8125:8125"
-    environment:
-      - STATSD_DUMP_MSG=true
-      - GRAPHITE_HOST=127.0.0.1
-    networks:
-      - ws-net
-
 networks:
   ws-net:

docker/Dockerfile.alpine

@@ -1,33 +0,0 @@
-FROM alpine as build
-
-RUN apk add --no-cache gcc g++ musl-dev linux-headers cmake openssl-dev 
-RUN apk add --no-cache make
-RUN apk add --no-cache zlib-dev
-
-RUN addgroup -S app && adduser -S -G app app 
-RUN chown -R app:app /opt
-RUN chown -R app:app /usr/local
-
-# There is a bug in CMake where we cannot build from the root top folder
-# So we build from /opt
-COPY --chown=app:app . /opt
-WORKDIR /opt
-
-USER app
-RUN [ "make" ]
-
-FROM alpine as runtime
-
-RUN apk add --no-cache libstdc++
-
-RUN addgroup -S app && adduser -S -G app app 
-COPY --chown=app:app --from=build /usr/local/bin/ws /usr/local/bin/ws
-RUN chmod +x /usr/local/bin/ws
-RUN ldd /usr/local/bin/ws
-
-# Now run in usermode
-USER app
-WORKDIR /home/app
-
-ENTRYPOINT ["ws"]
-CMD ["--help"]

docker/Dockerfile.debian

@@ -1,52 +0,0 @@
-# Build time
-FROM debian:buster as build
-
-ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update 
-RUN apt-get -y install wget 
-RUN mkdir -p /tmp/cmake
-WORKDIR /tmp/cmake
-RUN wget https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0-Linux-x86_64.tar.gz 
-RUN tar zxf cmake-3.14.0-Linux-x86_64.tar.gz
-
-RUN apt-get -y install g++ 
-RUN apt-get -y install libssl-dev
-RUN apt-get -y install libz-dev
-RUN apt-get -y install make
-
-COPY . .
-
-ARG CMAKE_BIN_PATH=/tmp/cmake/cmake-3.14.0-Linux-x86_64/bin
-ENV PATH="${CMAKE_BIN_PATH}:${PATH}"
-
-RUN ["make"]
-
-# Runtime
-FROM debian:buster as runtime
-
-ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update 
-# Runtime 
-RUN apt-get install -y libssl1.1 
-RUN apt-get install -y ca-certificates
-RUN ["update-ca-certificates"]
-
-# Debugging
-RUN apt-get install -y strace
-RUN apt-get install -y procps
-RUN apt-get install -y htop
-
-RUN adduser --disabled-password --gecos '' app
-COPY --chown=app:app --from=build /usr/local/bin/ws /usr/local/bin/ws
-RUN chmod +x /usr/local/bin/ws
-RUN ldd /usr/local/bin/ws
-
-# Now run in usermode
-USER app
-WORKDIR /home/app
-
-COPY --chown=app:app ws/snake/appsConfig.json .
-COPY --chown=app:app ws/cobraMetricsSample.json .
-
-ENTRYPOINT ["ws"]
-CMD ["--help"]

docker/Dockerfile.fedora

@@ -1,43 +0,0 @@
-FROM fedora:30 as build
-
-RUN yum install -y gcc-g++
-RUN yum install -y cmake
-RUN yum install -y make
-RUN yum install -y openssl-devel
-
-RUN yum install -y wget
-RUN mkdir -p /tmp/cmake
-WORKDIR /tmp/cmake
-RUN wget https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0-Linux-x86_64.tar.gz 
-RUN tar zxf cmake-3.14.0-Linux-x86_64.tar.gz
-
-ARG CMAKE_BIN_PATH=/tmp/cmake/cmake-3.14.0-Linux-x86_64/bin
-ENV PATH="${CMAKE_BIN_PATH}:${PATH}"
-
-RUN yum install -y python
-RUN yum install -y libtsan
-RUN yum install -y zlib-devel
-
-COPY . .
-# RUN ["make", "test"]
-RUN ["make"]
-
-# Runtime
-FROM fedora:30 as runtime
-
-RUN yum install -y libtsan
-
-RUN groupadd app && useradd -g app app 
-COPY --chown=app:app --from=build /usr/local/bin/ws /usr/local/bin/ws
-RUN chmod +x /usr/local/bin/ws
-RUN ldd /usr/local/bin/ws
-
-# Now run in usermode
-USER app
-WORKDIR /home/app
-
-COPY --chown=app:app ws/snake/appsConfig.json .
-COPY --chown=app:app ws/cobraMetricsSample.json .
-
-ENTRYPOINT ["ws"]
-CMD ["--help"]

docker/Dockerfile.ubuntu_bionic

@@ -1,23 +0,0 @@
-# Build time
-FROM ubuntu:bionic as build
-
-ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update 
-RUN apt-get -y install wget 
-RUN mkdir -p /tmp/cmake
-WORKDIR /tmp/cmake
-RUN wget https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0-Linux-x86_64.tar.gz 
-RUN tar zxf cmake-3.14.0-Linux-x86_64.tar.gz
-
-RUN apt-get -y install g++ 
-RUN apt-get -y install libssl-dev
-RUN apt-get -y install libz-dev
-RUN apt-get -y install make
-RUN apt-get -y install python
-
-COPY . .
-
-ARG CMAKE_BIN_PATH=/tmp/cmake/cmake-3.14.0-Linux-x86_64/bin
-ENV PATH="${CMAKE_BIN_PATH}:${PATH}"
-
-RUN ["make", "ws"]

docker/Dockerfile.ubuntu_xenial

@@ -1,24 +0,0 @@
-# Build time
-FROM ubuntu:xenial as build
-
-ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update 
-RUN apt-get -y install wget 
-RUN mkdir -p /tmp/cmake
-WORKDIR /tmp/cmake
-RUN wget https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0-Linux-x86_64.tar.gz 
-RUN tar zxf cmake-3.14.0-Linux-x86_64.tar.gz
-
-RUN apt-get -y install g++ 
-RUN apt-get -y install libssl-dev
-RUN apt-get -y install libz-dev
-RUN apt-get -y install make
-RUN apt-get -y install python
-
-COPY . .
-
-ARG CMAKE_BIN_PATH=/tmp/cmake/cmake-3.14.0-Linux-x86_64/bin
-ENV PATH="${CMAKE_BIN_PATH}:${PATH}"
-
-# RUN ["make"]
-RUN ["make", "test"]

ixwebsocket/IXCancellationRequest.h

@@ -6,13 +6,14 @@
 
 #pragma once
 
-#include <atomic>
 #include <functional>
+#include <atomic>
 
 namespace ix
 {
     using CancellationRequest = std::function<bool()>;
 
-    CancellationRequest makeCancellationRequestWithTimeout(
-        int seconds, std::atomic<bool>& requestInitCancellation);
-} // namespace ix
+    CancellationRequest makeCancellationRequestWithTimeout(int seconds,
+                                                           std::atomic<bool>& requestInitCancellation);
+}
+

ixwebsocket/IXConnectionState.cpp

@@ -35,7 +35,7 @@ namespace ix
         return _terminated;
     }
 
-    void ConnectionState::setTerminated()
+    bool ConnectionState::setTerminated()
     {
         _terminated = true;
     }

ixwebsocket/IXConnectionState.h

@@ -6,15 +6,14 @@
 
 #pragma once
 
-#include <atomic>
-#include <memory>
 #include <stdint.h>
 #include <string>
+#include <atomic>
+#include <memory>
 
 namespace ix
 {
-    class ConnectionState
-    {
+    class ConnectionState {
     public:
         ConnectionState();
         virtual ~ConnectionState() = default;
@@ -22,7 +21,7 @@ namespace ix
         virtual void computeId();
         virtual const std::string& getId() const;
 
-        void setTerminated();
+        bool setTerminated();
         bool isTerminated() const;
 
         static std::shared_ptr<ConnectionState> createConnectionState();
@@ -33,4 +32,6 @@ namespace ix
 
         static std::atomic<uint64_t> _globalId;
     };
-} // namespace ix
+}
+
+

ixwebsocket/IXDNSLookup.cpp

@@ -19,19 +19,20 @@ namespace ix
     std::mutex DNSLookup::_activeJobsMutex;
 
     DNSLookup::DNSLookup(const std::string& hostname, int port, int64_t wait) :
+        _hostname(hostname),
         _port(port),
         _wait(wait),
         _res(nullptr),
         _done(false),
         _id(_nextId++)
     {
-        setHostname(hostname);
+
     }
 
     DNSLookup::~DNSLookup()
     {
         // Remove this job from the active jobs list
-        std::lock_guard<std::mutex> lock(_activeJobsMutex);
+        std::unique_lock<std::mutex> lock(_activeJobsMutex);
         _activeJobs.erase(_id);
     }
 
@@ -78,7 +79,7 @@ namespace ix
             return nullptr;
         }
 
-        return getAddrInfo(getHostname(), _port, errMsg);
+        return getAddrInfo(_hostname, _port, errMsg);
     }
 
     struct addrinfo* DNSLookup::resolveAsync(std::string& errMsg,
@@ -96,7 +97,7 @@ namespace ix
 
         // Record job in the active Job set
         {
-            std::lock_guard<std::mutex> lock(_activeJobsMutex);
+            std::unique_lock<std::mutex> lock(_activeJobsMutex);
             _activeJobs.insert(_id);
         }
 
@@ -104,7 +105,7 @@ namespace ix
         // Good resource on thread forced termination
         // https://www.bo-yang.net/2017/11/19/cpp-kill-detached-thread
         //
-        _thread = std::thread(&DNSLookup::run, this, _id, getHostname(), _port);
+        _thread = std::thread(&DNSLookup::run, this, _id, _hostname, _port);
         _thread.detach();
 
         std::unique_lock<std::mutex> lock(_conditionVariableMutex);
@@ -134,8 +135,7 @@ namespace ix
             return nullptr;
         }
 
-        errMsg = getErrMsg();
-        return getRes();
+        return _res;
     }
 
     void DNSLookup::run(uint64_t id, const std::string& hostname, int port) // thread runner
@@ -147,55 +147,18 @@ namespace ix
         struct addrinfo* res = getAddrInfo(hostname, port, errMsg);
 
         // if this isn't an active job, and the control thread is gone
-        // there is nothing to do, and we don't want to touch the defunct
+        // there is not thing to do, and we don't want to touch the defunct
         // object data structure such as _errMsg or _condition
-        std::lock_guard<std::mutex> lock(_activeJobsMutex);
+        std::unique_lock<std::mutex> lock(_activeJobsMutex);
         if (_activeJobs.count(id) == 0)
         {
             return;
         }
 
         // Copy result into the member variables
-        setRes(res);
-        setErrMsg(errMsg);
-
+        _res = res;
+        _errMsg = errMsg;
         _condition.notify_one();
         _done = true;
     }
-
-    void DNSLookup::setHostname(const std::string& hostname)
-    {
-        std::lock_guard<std::mutex> lock(_hostnameMutex);
-        _hostname = hostname;
-    }
-
-    const std::string& DNSLookup::getHostname()
-    {
-        std::lock_guard<std::mutex> lock(_hostnameMutex);
-        return _hostname;
-    }
-
-    void DNSLookup::setErrMsg(const std::string& errMsg)
-    {
-        std::lock_guard<std::mutex> lock(_errMsgMutex);
-        _errMsg = errMsg;
-    }
-
-    const std::string& DNSLookup::getErrMsg()
-    {
-        std::lock_guard<std::mutex> lock(_errMsgMutex);
-        return _errMsg;
-    }
-
-    void DNSLookup::setRes(struct addrinfo* addr)
-    {
-        std::lock_guard<std::mutex> lock(_resMutex);
-        _res = addr;
-    }
-
-    struct addrinfo* DNSLookup::getRes()
-    {
-        std::lock_guard<std::mutex> lock(_resMutex);
-        return _res;
-    }
 }

ixwebsocket/IXDNSLookup.h

@@ -11,20 +11,22 @@
 #pragma once
 
 #include "IXCancellationRequest.h"
+
+#include <string>
+#include <thread>
 #include <atomic>
 #include <condition_variable>
 #include <set>
-#include <string>
-#include <thread>
 
 struct addrinfo;
 
 namespace ix
 {
-    class DNSLookup
-    {
+    class DNSLookup {
     public:
-        DNSLookup(const std::string& hostname, int port, int64_t wait = DNSLookup::kDefaultWait);
+        DNSLookup(const std::string& hostname,
+                  int port,
+                  int64_t wait = DNSLookup::kDefaultWait);
         ~DNSLookup();
 
         struct addrinfo* resolve(std::string& errMsg,
@@ -43,26 +45,11 @@ namespace ix
 
         void run(uint64_t id, const std::string& hostname, int port); // thread runner
 
-        void setHostname(const std::string& hostname);
-        const std::string& getHostname();
-
-        void setErrMsg(const std::string& errMsg);
-        const std::string& getErrMsg();
-
-        void setRes(struct addrinfo* addr);
-        struct addrinfo* getRes();
-
         std::string _hostname;
-        std::mutex _hostnameMutex;
         int _port;
-
         int64_t _wait;
-
-        struct addrinfo* _res;
-        std::mutex _resMutex;
-
         std::string _errMsg;
-        std::mutex _errMsgMutex;
+        struct addrinfo* _res;
 
         std::atomic<bool> _done;
         std::thread _thread;
@@ -76,4 +63,4 @@ namespace ix
 
         const static int64_t kDefaultWait;
     };
-} // namespace ix
+}

ixwebsocket/IXHttpClient.cpp

@@ -21,98 +21,24 @@ namespace ix
     const std::string HttpClient::kPost = "POST";
     const std::string HttpClient::kGet = "GET";
     const std::string HttpClient::kHead = "HEAD";
-    const std::string HttpClient::kDel = "DEL";
-    const std::string HttpClient::kPut = "PUT";
 
-    HttpClient::HttpClient(bool async) : _async(async), _stop(false)
+    HttpClient::HttpClient()
     {
-        if (!_async) return;
 
-        _thread = std::thread(&HttpClient::run, this);
     }
 
     HttpClient::~HttpClient()
     {
-        if (!_thread.joinable()) return;
 
-        _stop = true;
-        _condition.notify_one();
-        _thread.join();
     }
 
-    HttpRequestArgsPtr HttpClient::createRequest(const std::string& url,
-                                                 const std::string& verb)
-    {
-        auto request = std::make_shared<HttpRequestArgs>();
-        request->url = url;
-        request->verb = verb;
-        return request;
-    }
-
-    bool HttpClient::performRequest(HttpRequestArgsPtr args,
-                                    const OnResponseCallback& onResponseCallback)
-    {
-        if (!_async) return false;
-
-        // Enqueue the task
-        {
-            // acquire lock
-            std::unique_lock<std::mutex> lock(_queueMutex);
-
-            // add the task
-            _queue.push(std::make_pair(args, onResponseCallback));
-        } // release lock
-
-        // wake up one thread
-        _condition.notify_one();
-
-        return true;
-    }
-
-    void HttpClient::run()
-    {
-        while (true)
-        {
-            HttpRequestArgsPtr args;
-            OnResponseCallback onResponseCallback;
-
-            {
-                std::unique_lock<std::mutex> lock(_queueMutex);
-
-                while (!_stop && _queue.empty())
-                {
-                    _condition.wait(lock);
-                }
-
-                if (_stop) return;
-
-                auto p = _queue.front();
-                _queue.pop();
-
-                args = p.first;
-                onResponseCallback = p.second;
-            }
-
-            if (_stop) return;
-
-            HttpResponsePtr response = request(args->url, args->verb, args->body, args);
-            onResponseCallback(response);
-
-            if (_stop) return;
-        }
-    }
-
-    HttpResponsePtr HttpClient::request(
+    HttpResponse HttpClient::request(
         const std::string& url,
         const std::string& verb,
         const std::string& body,
-        HttpRequestArgsPtr args,
+        const HttpRequestArgs& args,
         int redirects)
     {
-        // We only have one socket connection, so we cannot
-        // make multiple requests concurrently.
-        std::lock_guard<std::mutex> lock(_mutex);
-
         uint64_t uploadSize = 0;
         uint64_t downloadSize = 0;
         int code = 0;
@@ -121,14 +47,15 @@ namespace ix
 
         std::string protocol, host, path, query;
         int port;
+        bool websocket = false;
 
-        if (!UrlParser::parse(url, protocol, host, path, query, port))
+        if (!UrlParser::parse(url, protocol, host, path, query, port, websocket))
         {
             std::stringstream ss;
             ss << "Cannot parse url: " << url;
-            return std::make_shared<HttpResponse>(code, HttpErrorCode::UrlMalformed,
-                                headers, payload, ss.str(),
-                                uploadSize, downloadSize);
+            return std::make_tuple(code, HttpErrorCode_UrlMalformed,
+                                   headers, payload, ss.str(),
+                                   uploadSize, downloadSize);
         }
 
         bool tls = protocol == "https";
@@ -137,45 +64,35 @@ namespace ix
 
         if (!_socket)
         {
-            return std::make_shared<HttpResponse>(code, HttpErrorCode::CannotCreateSocket,
-                                headers, payload, errorMsg,
-                                uploadSize, downloadSize);
+            return std::make_tuple(code, HttpErrorCode_CannotCreateSocket,
+                                   headers, payload, errorMsg,
+                                   uploadSize, downloadSize);
         }
 
         // Build request string
         std::stringstream ss;
         ss << verb << " " << path << " HTTP/1.1\r\n";
         ss << "Host: " << host << "\r\n";
+        ss << "User-Agent: ixwebsocket/1.0.0" << "\r\n";
+        ss << "Accept: */*" << "\r\n";
 
-        if (args->compress)
+        if (args.compress)
         {
             ss << "Accept-Encoding: gzip" << "\r\n";
         }
 
         // Append extra headers
-        for (auto&& it : args->extraHeaders)
+        for (auto&& it : args.extraHeaders)
         {
             ss << it.first << ": " << it.second << "\r\n";
         }
 
-        // Set a default Accept header if none is present
-        if (headers.find("Accept") == headers.end())
-        {
-            ss << "Accept: */*" << "\r\n";
-        }
-
-        // Set a default User agent if none is present
-        if (headers.find("User-Agent") == headers.end())
-        {
-            ss << "User-Agent: ixwebsocket" << "\r\n";
-        }
-
-        if (verb == kPost || verb == kPut)
+        if (verb == kPost)
         {
             ss << "Content-Length: " << body.size() << "\r\n";
 
             // Set default Content-Type if unspecified
-            if (args->extraHeaders.find("Content-Type") == args->extraHeaders.end())
+            if (args.extraHeaders.find("Content-Type") == args.extraHeaders.end())
             {
                 ss << "Content-Type: application/x-www-form-urlencoded" << "\r\n";
             }
@@ -193,23 +110,23 @@ namespace ix
 
         // Make a cancellation object dealing with connection timeout
         auto isCancellationRequested =
-            makeCancellationRequestWithTimeout(args->connectTimeout, requestInitCancellation);
+            makeCancellationRequestWithTimeout(args.connectTimeout, requestInitCancellation);
 
         bool success = _socket->connect(host, port, errMsg, isCancellationRequested);
         if (!success)
         {
             std::stringstream ss;
-            ss << "Cannot connect to url: " << url << " / error : " << errMsg;
-            return std::make_shared<HttpResponse>(code, HttpErrorCode::CannotConnect,
-                                                  headers, payload, ss.str(),
-                                                  uploadSize, downloadSize);
+            ss << "Cannot connect to url: " << url;
+            return std::make_tuple(code, HttpErrorCode_CannotConnect,
+                                   headers, payload, ss.str(),
+                                   uploadSize, downloadSize);
         }
 
         // Make a new cancellation object dealing with transfer timeout
         isCancellationRequested =
-            makeCancellationRequestWithTimeout(args->transferTimeout, requestInitCancellation);
+            makeCancellationRequestWithTimeout(args.transferTimeout, requestInitCancellation);
 
-        if (args->verbose)
+        if (args.verbose)
         {
             std::stringstream ss;
             ss << "Sending " << verb << " request "
@@ -226,9 +143,9 @@ namespace ix
         if (!_socket->writeBytes(req, isCancellationRequested))
         {
             std::string errorMsg("Cannot send request");
-            return std::make_shared<HttpResponse>(code, HttpErrorCode::SendError,
-                                                  headers, payload, errorMsg,
-                                                  uploadSize, downloadSize);
+            return std::make_tuple(code, HttpErrorCode_SendError,
+                                   headers, payload, errorMsg,
+                                   uploadSize, downloadSize);
         }
 
         uploadSize = req.size();
@@ -240,12 +157,12 @@ namespace ix
         if (!lineValid)
         {
             std::string errorMsg("Cannot retrieve status line");
-            return std::make_shared<HttpResponse>(code, HttpErrorCode::CannotReadStatusLine,
-                                                  headers, payload, errorMsg,
-                                                  uploadSize, downloadSize);
+            return std::make_tuple(code, HttpErrorCode_CannotReadStatusLine,
+                                   headers, payload, errorMsg,
+                                   uploadSize, downloadSize);
         }
 
-        if (args->verbose)
+        if (args.verbose)
         {
             std::stringstream ss;
             ss << "Status line " << line;
@@ -255,9 +172,9 @@ namespace ix
         if (sscanf(line.c_str(), "HTTP/1.1 %d", &code) != 1)
         {
             std::string errorMsg("Cannot parse response code from status line");
-            return std::make_shared<HttpResponse>(code, HttpErrorCode::MissingStatus,
-                                                  headers, payload, errorMsg,
-                                                  uploadSize, downloadSize);
+            return std::make_tuple(code, HttpErrorCode_MissingStatus,
+                                   headers, payload, errorMsg,
+                                   uploadSize, downloadSize);
         }
 
         auto result = parseHttpHeaders(_socket, isCancellationRequested);
@@ -267,29 +184,29 @@ namespace ix
         if (!headersValid)
         {
             std::string errorMsg("Cannot parse http headers");
-            return std::make_shared<HttpResponse>(code, HttpErrorCode::HeaderParsingError,
-                                                  headers, payload, errorMsg,
-                                                  uploadSize, downloadSize);
+            return std::make_tuple(code, HttpErrorCode_HeaderParsingError,
+                                   headers, payload, errorMsg,
+                                   uploadSize, downloadSize);
         }
 
         // Redirect ?
-        if ((code >= 301 && code <= 308) && args->followRedirects)
+        if ((code >= 301 && code <= 308) && args.followRedirects)
         {
             if (headers.find("Location") == headers.end())
             {
                 std::string errorMsg("Missing location header for redirect");
-                return std::make_shared<HttpResponse>(code, HttpErrorCode::MissingLocation,
-                                                      headers, payload, errorMsg,
-                                                      uploadSize, downloadSize);
+                return std::make_tuple(code, HttpErrorCode_MissingLocation,
+                                       headers, payload, errorMsg,
+                                       uploadSize, downloadSize);
             }
 
-            if (redirects >= args->maxRedirects)
+            if (redirects >= args.maxRedirects)
             {
                 std::stringstream ss;
                 ss << "Too many redirects: " << redirects;
-                return std::make_shared<HttpResponse>(code, HttpErrorCode::TooManyRedirects,
-                                                      headers, payload, ss.str(),
-                                                      uploadSize, downloadSize);
+                return std::make_tuple(code, HttpErrorCode_TooManyRedirects,
+                                       headers, payload, ss.str(),
+                                       uploadSize, downloadSize);
             }
 
             // Recurse
@@ -299,9 +216,9 @@ namespace ix
 
         if (verb == "HEAD")
         {
-            return std::make_shared<HttpResponse>(code, HttpErrorCode::Ok,
-                                                  headers, payload, std::string(),
-                                                  uploadSize, downloadSize);
+            return std::make_tuple(code, HttpErrorCode_Ok,
+                                   headers, payload, std::string(),
+                                   uploadSize, downloadSize);
         }
 
         // Parse response:
@@ -315,14 +232,14 @@ namespace ix
             payload.reserve(contentLength);
 
             auto chunkResult = _socket->readBytes(contentLength,
-                                                  args->onProgressCallback,
+                                                  args.onProgressCallback,
                                                   isCancellationRequested);
             if (!chunkResult.first)
             {
                 errorMsg = "Cannot read chunk";
-                return std::make_shared<HttpResponse>(code, HttpErrorCode::ChunkReadError,
-                                                      headers, payload, errorMsg,
-                                                      uploadSize, downloadSize);
+                return std::make_tuple(code, HttpErrorCode_ChunkReadError,
+                                       headers, payload, errorMsg,
+                                       uploadSize, downloadSize);
             }
             payload += chunkResult.second;
         }
@@ -338,9 +255,9 @@ namespace ix
 
                 if (!lineResult.first)
                 {
-                    return std::make_shared<HttpResponse>(code, HttpErrorCode::ChunkReadError,
-                                                          headers, payload, errorMsg,
-                                                          uploadSize, downloadSize);
+                    return std::make_tuple(code, HttpErrorCode_ChunkReadError,
+                                           headers, payload, errorMsg,
+                                           uploadSize, downloadSize);
                 }
 
                 uint64_t chunkSize;
@@ -348,7 +265,7 @@ namespace ix
                 ss << std::hex << line;
                 ss >> chunkSize;
 
-                if (args->verbose)
+                if (args.verbose)
                 {
                     std::stringstream oss;
                     oss << "Reading " << chunkSize << " bytes"
@@ -356,18 +273,18 @@ namespace ix
                     log(oss.str(), args);
                 }
 
-                payload.reserve(payload.size() + (size_t) chunkSize);
+                payload.reserve(payload.size() + chunkSize);
 
                 // Read a chunk
-                auto chunkResult = _socket->readBytes((size_t) chunkSize,
-                                                      args->onProgressCallback,
+                auto chunkResult = _socket->readBytes(chunkSize,
+                                                      args.onProgressCallback,
                                                       isCancellationRequested);
                 if (!chunkResult.first)
                 {
                     errorMsg = "Cannot read chunk";
-                    return std::make_shared<HttpResponse>(code, HttpErrorCode::ChunkReadError,
-                                                          headers, payload, errorMsg,
-                                                          uploadSize, downloadSize);
+                    return std::make_tuple(code, HttpErrorCode_ChunkReadError,
+                                           headers, payload, errorMsg,
+                                           uploadSize, downloadSize);
                 }
                 payload += chunkResult.second;
 
@@ -376,9 +293,9 @@ namespace ix
 
                 if (!lineResult.first)
                 {
-                    return std::make_shared<HttpResponse>(code, HttpErrorCode::ChunkReadError,
-                                                          headers, payload, errorMsg,
-                                                          uploadSize, downloadSize);
+                    return std::make_tuple(code, HttpErrorCode_ChunkReadError,
+                                           headers, payload, errorMsg,
+                                           uploadSize, downloadSize);
                 }
 
                 if (chunkSize == 0) break;
@@ -391,9 +308,9 @@ namespace ix
         else
         {
             std::string errorMsg("Cannot read http body");
-            return std::make_shared<HttpResponse>(code, HttpErrorCode::CannotReadBody,
-                                                  headers, payload, errorMsg,
-                                                  uploadSize, downloadSize);
+            return std::make_tuple(code, HttpErrorCode_CannotReadBody,
+                                   headers, payload, errorMsg,
+                                   uploadSize, downloadSize);
         }
 
         downloadSize = payload.size();
@@ -405,64 +322,44 @@ namespace ix
             if (!gzipInflate(payload, decompressedPayload))
             {
                 std::string errorMsg("Error decompressing payload");
-                return std::make_shared<HttpResponse>(code, HttpErrorCode::Gzip,
-                                                      headers, payload, errorMsg,
-                                                      uploadSize, downloadSize);
+                return std::make_tuple(code, HttpErrorCode_Gzip,
+                                       headers, payload, errorMsg,
+                                       uploadSize, downloadSize);
             }
             payload = decompressedPayload;
         }
 
-        return std::make_shared<HttpResponse>(code, HttpErrorCode::Ok,
-                                              headers, payload, std::string(),
-                                              uploadSize, downloadSize);
+        return std::make_tuple(code, HttpErrorCode_Ok,
+                               headers, payload, std::string(),
+                               uploadSize, downloadSize);
     }
 
-    HttpResponsePtr HttpClient::get(const std::string& url,
-                                    HttpRequestArgsPtr args)
+    HttpResponse HttpClient::get(const std::string& url,
+                                 const HttpRequestArgs& args)
     {
         return request(url, kGet, std::string(), args);
     }
 
-    HttpResponsePtr HttpClient::head(const std::string& url,
-                                     HttpRequestArgsPtr args)
+    HttpResponse HttpClient::head(const std::string& url,
+                                  const HttpRequestArgs& args)
     {
         return request(url, kHead, std::string(), args);
     }
 
-    HttpResponsePtr HttpClient::del(const std::string& url,
-                                    HttpRequestArgsPtr args)
-    {
-        return request(url, kDel, std::string(), args);
-    }
-
-    HttpResponsePtr HttpClient::post(const std::string& url,
-                                     const HttpParameters& httpParameters,
-                                     HttpRequestArgsPtr args)
+    HttpResponse HttpClient::post(const std::string& url,
+                                  const HttpParameters& httpParameters,
+                                  const HttpRequestArgs& args)
     {
         return request(url, kPost, serializeHttpParameters(httpParameters), args);
     }
 
-    HttpResponsePtr HttpClient::post(const std::string& url,
-                                     const std::string& body,
-                                     HttpRequestArgsPtr args)
+    HttpResponse HttpClient::post(const std::string& url,
+                                  const std::string& body,
+                                  const HttpRequestArgs& args)
     {
         return request(url, kPost, body, args);
     }
 
-    HttpResponsePtr HttpClient::put(const std::string& url,
-                                    const HttpParameters& httpParameters,
-                                    HttpRequestArgsPtr args)
-    {
-        return request(url, kPut, serializeHttpParameters(httpParameters), args);
-    }
-
-    HttpResponsePtr HttpClient::put(const std::string& url,
-                                    const std::string& body,
-                                    const HttpRequestArgsPtr args)
-    {
-        return request(url, kPut, body, args);
-    }
-
     std::string HttpClient::urlEncode(const std::string& value)
     {
         std::ostringstream escaped;
@@ -560,11 +457,11 @@ namespace ix
     }
 
     void HttpClient::log(const std::string& msg,
-                         HttpRequestArgsPtr args)
+                         const HttpRequestArgs& args)
     {
-        if (args->logger)
+        if (args.logger)
         {
-            args->logger(msg);
+            args.logger(msg);
         }
     }
 }

ixwebsocket/IXHttpClient.h

@@ -6,78 +6,52 @@
 
 #pragma once
 
+#include <algorithm>
+#include <functional>
+#include <mutex>
+#include <atomic>
+#include <tuple>
+#include <memory>
+#include <map>
+
 #include "IXSocket.h"
 #include "IXWebSocketHttpHeaders.h"
-#include <algorithm>
-#include <atomic>
-#include <condition_variable>
-#include <functional>
-#include <map>
-#include <memory>
-#include <mutex>
-#include <queue>
-#include <thread>
 
 namespace ix
 {
-    enum class HttpErrorCode : int
+    enum HttpErrorCode
     {
-        Ok = 0,
-        CannotConnect = 1,
-        Timeout = 2,
-        Gzip = 3,
-        UrlMalformed = 4,
-        CannotCreateSocket = 5,
-        SendError = 6,
-        ReadError = 7,
-        CannotReadStatusLine = 8,
-        MissingStatus = 9,
-        HeaderParsingError = 10,
-        MissingLocation = 11,
-        TooManyRedirects = 12,
-        ChunkReadError = 13,
-        CannotReadBody = 14,
-        Invalid = 100
+        HttpErrorCode_Ok = 0,
+        HttpErrorCode_CannotConnect = 1,
+        HttpErrorCode_Timeout = 2,
+        HttpErrorCode_Gzip = 3,
+        HttpErrorCode_UrlMalformed = 4,
+        HttpErrorCode_CannotCreateSocket = 5,
+        HttpErrorCode_SendError = 6,
+        HttpErrorCode_ReadError = 7,
+        HttpErrorCode_CannotReadStatusLine = 8,
+        HttpErrorCode_MissingStatus = 9,
+        HttpErrorCode_HeaderParsingError = 10,
+        HttpErrorCode_MissingLocation = 11,
+        HttpErrorCode_TooManyRedirects = 12,
+        HttpErrorCode_ChunkReadError = 13,
+        HttpErrorCode_CannotReadBody = 14
     };
 
-    struct HttpResponse
-    {
-        int statusCode;
-        HttpErrorCode errorCode;
-        WebSocketHttpHeaders headers;
-        std::string payload;
-        std::string errorMsg;
-        uint64_t uploadSize;
-        uint64_t downloadSize;
+    using HttpResponse = std::tuple<int, // status
+                                    HttpErrorCode, // error code
+                                    WebSocketHttpHeaders,
+                                    std::string, // payload
+                                    std::string, // error msg
+                                    uint64_t,    // upload size
+                                    uint64_t>;   // download size
 
-        HttpResponse(int s = 0,
-                     const HttpErrorCode& c = HttpErrorCode::Ok,
-                     const WebSocketHttpHeaders& h = WebSocketHttpHeaders(),
-                     const std::string& p = std::string(),
-                     const std::string& e = std::string(),
-                     uint64_t u = 0,
-                     uint64_t d = 0)
-            : statusCode(s)
-            , errorCode(c)
-            , headers(h)
-            , payload(p)
-            , errorMsg(e)
-            , uploadSize(u)
-            , downloadSize(d)
-        {
-            ;
-        }
-    };
-
-    using HttpResponsePtr = std::shared_ptr<HttpResponse>;
     using HttpParameters = std::map<std::string, std::string>;
     using Logger = std::function<void(const std::string&)>;
-    using OnResponseCallback = std::function<void(const HttpResponsePtr&)>;
 
     struct HttpRequestArgs
     {
         std::string url;
-        std::string verb;
         WebSocketHttpHeaders extraHeaders;
         std::string body;
         int connectTimeout;
@@ -90,72 +64,44 @@ namespace ix
         OnProgressCallback onProgressCallback;
     };
 
-    using HttpRequestArgsPtr = std::shared_ptr<HttpRequestArgs>;
-
-    class HttpClient
-    {
+    class HttpClient {
     public:
-        HttpClient(bool async = false);
+        HttpClient();
         ~HttpClient();
 
-        HttpResponsePtr get(const std::string& url, HttpRequestArgsPtr args);
-        HttpResponsePtr head(const std::string& url, HttpRequestArgsPtr args);
-        HttpResponsePtr del(const std::string& url, HttpRequestArgsPtr args);
+        HttpResponse get(const std::string& url,
+                         const HttpRequestArgs& args);
+        HttpResponse head(const std::string& url,
+                          const HttpRequestArgs& args);
 
-        HttpResponsePtr post(const std::string& url,
-                             const HttpParameters& httpParameters,
-                             HttpRequestArgsPtr args);
-        HttpResponsePtr post(const std::string& url,
+        HttpResponse post(const std::string& url,
+                          const HttpParameters& httpParameters,
+                          const HttpRequestArgs& args);
+        HttpResponse post(const std::string& url,
+                          const std::string& body,
+                          const HttpRequestArgs& args);
+
+    private:
+        HttpResponse request(const std::string& url,
+                             const std::string& verb,
                              const std::string& body,
-                             HttpRequestArgsPtr args);
-
-        HttpResponsePtr put(const std::string& url,
-                            const HttpParameters& httpParameters,
-                            HttpRequestArgsPtr args);
-        HttpResponsePtr put(const std::string& url,
-                            const std::string& body,
-                            HttpRequestArgsPtr args);
-
-        HttpResponsePtr request(const std::string& url,
-                                const std::string& verb,
-                                const std::string& body,
-                                HttpRequestArgsPtr args,
-                                int redirects = 0);
-
-        // Async API
-        HttpRequestArgsPtr createRequest(const std::string& url = std::string(),
-                                         const std::string& verb = HttpClient::kGet);
-
-        bool performRequest(HttpRequestArgsPtr request,
-                            const OnResponseCallback& onResponseCallback);
+                             const HttpRequestArgs& args,
+                             int redirects = 0);
 
         std::string serializeHttpParameters(const HttpParameters& httpParameters);
 
         std::string urlEncode(const std::string& value);
 
+        void log(const std::string& msg, const HttpRequestArgs& args);
+
+        bool gzipInflate(
+            const std::string& in,
+            std::string& out);
+
+        std::shared_ptr<Socket> _socket;
+
         const static std::string kPost;
         const static std::string kGet;
         const static std::string kHead;
-        const static std::string kDel;
-        const static std::string kPut;
-
-    private:
-        void log(const std::string& msg, HttpRequestArgsPtr args);
-
-        bool gzipInflate(const std::string& in, std::string& out);
-
-        // Async API background thread runner
-        void run();
-
-        // Async API
-        bool _async;
-        std::queue<std::pair<HttpRequestArgsPtr, OnResponseCallback>> _queue;
-        mutable std::mutex _queueMutex;
-        std::condition_variable _condition;
-        std::atomic<bool> _stop;
-        std::thread _thread;
-
-        std::shared_ptr<Socket> _socket;
-        std::mutex _mutex; // to protect accessing the _socket (only one socket per client)
     };
-} // namespace ix
+}

ixwebsocket/IXNetSystem.cpp

@@ -1,39 +0,0 @@
-/*
- *  IXNetSystem.cpp
- *  Author: Korchynskyi Dmytro
- *  Copyright (c) 2019 Machine Zone. All rights reserved.
- */
-
-#include "IXNetSystem.h"
-
-namespace ix
-{
-    bool initNetSystem()
-    {
-#ifdef _WIN32
-        WORD wVersionRequested;
-        WSADATA wsaData;
-        int err;
-
-        /* Use the MAKEWORD(lowbyte, highbyte) macro declared in Windef.h */
-        wVersionRequested = MAKEWORD(2, 2);
-
-        err = WSAStartup(wVersionRequested, &wsaData);
-
-        return err == 0;
-#else
-        return true;
-#endif
-    }
-
-    bool uninitNetSystem()
-    {
-#ifdef _WIN32
-        int err = WSACleanup();
-
-        return err == 0;
-#else
-        return true;
-#endif
-    }
-}

ixwebsocket/IXNetSystem.h

@@ -7,25 +7,19 @@
 #pragma once
 
 #ifdef _WIN32
-#include <WS2tcpip.h>
-#include <WinSock2.h>
-#include <basetsd.h>
-#include <io.h>
-#include <ws2def.h>
+# include <WS2tcpip.h>
+# include <WinSock2.h>
+# include <basetsd.h>
+# include <io.h>
+# include <ws2def.h>
 #else
-#include <arpa/inet.h>
-#include <errno.h>
-#include <netdb.h>
-#include <netinet/tcp.h>
-#include <sys/select.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <unistd.h>
+# include <arpa/inet.h>
+# include <errno.h>
+# include <netdb.h>
+# include <netinet/tcp.h>
+# include <sys/select.h>
+# include <sys/socket.h>
+# include <sys/stat.h>
+# include <sys/time.h>
+# include <unistd.h>
 #endif
-
-namespace ix
-{
-    bool initNetSystem();
-    bool uninitNetSystem();
-} // namespace ix

ixwebsocket/IXSelectInterrupt.h

@@ -11,8 +11,7 @@
 
 namespace ix
 {
-    class SelectInterrupt
-    {
+    class SelectInterrupt {
     public:
         SelectInterrupt();
         virtual ~SelectInterrupt();
@@ -24,4 +23,6 @@ namespace ix
         virtual uint64_t read();
         virtual int getFd() const;
     };
-} // namespace ix
+}
+
+

ixwebsocket/IXSelectInterruptEventFd.h

@@ -7,13 +7,13 @@
 #pragma once
 
 #include "IXSelectInterrupt.h"
+
 #include <stdint.h>
 #include <string>
 
 namespace ix
 {
-    class SelectInterruptEventFd final : public SelectInterrupt
-    {
+    class SelectInterruptEventFd : public SelectInterrupt {
     public:
         SelectInterruptEventFd();
         virtual ~SelectInterruptEventFd();
@@ -28,4 +28,5 @@ namespace ix
     private:
         int _eventfd;
     };
-} // namespace ix
+}
+

ixwebsocket/IXSelectInterruptFactory.h

@@ -12,4 +12,4 @@ namespace ix
 {
     class SelectInterrupt;
     std::shared_ptr<SelectInterrupt> createSelectInterrupt();
-} // namespace ix
+}

ixwebsocket/IXSelectInterruptPipe.cpp

@@ -40,8 +40,6 @@ namespace ix
 
     bool SelectInterruptPipe::init(std::string& errorMsg)
     {
-        std::lock_guard<std::mutex> lock(_fildesMutex);
-
         // calling init twice is a programming error
         assert(_fildes[kPipeReadIndex] == -1);
         assert(_fildes[kPipeWriteIndex] == -1);
@@ -110,8 +108,6 @@ namespace ix
 
     bool SelectInterruptPipe::notify(uint64_t value)
     {
-        std::lock_guard<std::mutex> lock(_fildesMutex);
-
         int fd = _fildes[kPipeWriteIndex];
         if (fd == -1) return false;
 
@@ -122,8 +118,6 @@ namespace ix
     // TODO: return max uint64_t for errors ?
     uint64_t SelectInterruptPipe::read()
     {
-        std::lock_guard<std::mutex> lock(_fildesMutex);
-
         int fd = _fildes[kPipeReadIndex];
 
         uint64_t value = 0;
@@ -139,8 +133,6 @@ namespace ix
 
     int SelectInterruptPipe::getFd() const
     {
-        std::lock_guard<std::mutex> lock(_fildesMutex);
-
         return _fildes[kPipeReadIndex];
     }
 }

ixwebsocket/IXSelectInterruptPipe.h

@@ -7,14 +7,13 @@
 #pragma once
 
 #include "IXSelectInterrupt.h"
-#include <mutex>
+
 #include <stdint.h>
 #include <string>
 
 namespace ix
 {
-    class SelectInterruptPipe final : public SelectInterrupt
-    {
+    class SelectInterruptPipe : public SelectInterrupt {
     public:
         SelectInterruptPipe();
         virtual ~SelectInterruptPipe();
@@ -31,10 +30,10 @@ namespace ix
         // happens between a control thread and a background thread, which is
         // blocked on select.
         int _fildes[2];
-        mutable std::mutex _fildesMutex;
 
         // Used to identify the read/write idx
         static const int kPipeReadIndex;
         static const int kPipeWriteIndex;
     };
-} // namespace ix
+}
+

ixwebsocket/IXSetThreadName.h

@@ -10,3 +10,4 @@ namespace ix
 {
     void setThreadName(const std::string& name);
 }
+

ixwebsocket/IXSocket.cpp

@@ -19,6 +19,7 @@
 #include <sys/types.h>
 
 #include <algorithm>
+#include <iostream>
 
 #ifdef min
 #undef min
@@ -44,9 +45,17 @@ namespace ix
         close();
     }
 
-    PollResultType Socket::poll(int timeoutMs)
+    void Socket::poll(const OnPollCallback& onPollCallback, int timeoutSecs)
     {
-        return isReadyToRead(timeoutMs);
+        if (_sockfd == -1)
+        {
+            if (onPollCallback) onPollCallback(PollResultType::Error);
+            return;
+        }
+
+        PollResultType pollResult = isReadyToRead(1000 * timeoutSecs);
+
+        if (onPollCallback) onPollCallback(pollResult);
     }
 
     PollResultType Socket::select(bool readyToRead, int timeoutMs)
@@ -57,10 +66,7 @@ namespace ix
         FD_ZERO(&wfds);
 
         fd_set* fds = (readyToRead) ? &rfds : & wfds;
-        if (_sockfd != -1)
-        {
-            FD_SET(_sockfd, fds);
-        }
+        FD_SET(_sockfd, fds);
 
         // File descriptor used to interrupt select when needed
         int interruptFd = _selectInterrupt->getFd();
@@ -71,7 +77,7 @@ namespace ix
 
         struct timeval timeout;
         timeout.tv_sec = timeoutMs / 1000;
-        timeout.tv_usec = 1000 * (timeoutMs % 1000);
+        timeout.tv_usec = (timeoutMs < 1000) ? 0 : 1000 * (timeoutMs % 1000);
 
         // Compute the highest fd.
         int sockfd = _sockfd;
@@ -116,28 +122,18 @@ namespace ix
 
     PollResultType Socket::isReadyToRead(int timeoutMs)
     {
-        if (_sockfd == -1)
-        {
-            return PollResultType::Error;
-        }
-
         bool readyToRead = true;
         return select(readyToRead, timeoutMs);
     }
 
     PollResultType Socket::isReadyToWrite(int timeoutMs)
     {
-        if (_sockfd == -1)
-        {
-            return PollResultType::Error;
-        }
-
         bool readyToRead = false;
         return select(readyToRead, timeoutMs);
     }
 
     // Wake up from poll/select by writing to the pipe which is watched by select
-    bool Socket::wakeUpFromPoll(uint64_t wakeUpCode)
+    bool Socket::wakeUpFromPoll(uint8_t wakeUpCode)
     {
         return _selectInterrupt->notify(wakeUpCode);
     }
@@ -192,27 +188,11 @@ namespace ix
 
     int Socket::getErrno()
     {
-        int err;
-
 #ifdef _WIN32
-        err = WSAGetLastError();
+        return WSAGetLastError();
 #else
-        err = errno;
+        return errno;
 #endif
-
-        return err;
-    }
-
-    bool Socket::isWaitNeeded()
-    {
-        int err = getErrno();
-
-        if (err == EWOULDBLOCK || err == EAGAIN || err == EINPROGRESS)
-        {
-            return true;
-        }
-
-        return false;
     }
 
     void Socket::closeSocket(int fd)
@@ -247,7 +227,8 @@ namespace ix
                 return ret == len;
             }
             // There is possibly something to be writen, try again
-            else if (ret < 0 && Socket::isWaitNeeded())
+            else if (ret < 0 && (getErrno() == EWOULDBLOCK ||
+                                 getErrno() == EAGAIN))
             {
                 continue;
             }
@@ -275,7 +256,8 @@ namespace ix
                 return true;
             }
             // There is possibly something to be read, try again
-            else if (ret < 0 && Socket::isWaitNeeded())
+            else if (ret < 0 && (getErrno() == EWOULDBLOCK ||
+                                 getErrno() == EAGAIN))
             {
                 // Wait with a 1ms timeout until the socket is ready to read.
                 // This way we are not busy looping
@@ -334,12 +316,13 @@ namespace ix
             size_t size = std::min(kChunkSize, length - output.size());
             ssize_t ret = recv((char*)&_readBuffer[0], size);
 
-            if (ret <= 0 && !Socket::isWaitNeeded())
+            if (ret <= 0 && (getErrno() != EWOULDBLOCK &&
+                             getErrno() != EAGAIN))
             {
                 // Error
                 return std::make_pair(false, std::string());
             }
-            else
+            else if (ret > 0)
             {
                 output.insert(output.end(),
                               _readBuffer.begin(),

ixwebsocket/IXSocket.h

@@ -6,30 +6,16 @@
 
 #pragma once
 
-#include <atomic>
-#include <functional>
-#include <memory>
-#include <mutex>
 #include <string>
+#include <functional>
+#include <mutex>
+#include <atomic>
 #include <vector>
+#include <memory>
 
 #ifdef _WIN32
 #include <BaseTsd.h>
 typedef SSIZE_T ssize_t;
-
-#undef EWOULDBLOCK
-#undef EAGAIN
-#undef EINPROGRESS
-#undef EBADF
-#undef EINVAL
-
-// map to WSA error codes
-#define EWOULDBLOCK WSAEWOULDBLOCK
-#define EAGAIN WSATRY_AGAIN
-#define EINPROGRESS WSAEINPROGRESS
-#define EBADF WSAEBADF
-#define EINVAL WSAEINVAL
-
 #endif
 
 #include "IXCancellationRequest.h"
@@ -49,16 +35,20 @@ namespace ix
         CloseRequest = 5
     };
 
-    class Socket
-    {
+    class Socket {
     public:
+        using OnPollCallback = std::function<void(PollResultType)>;
+
         Socket(int fd = -1);
         virtual ~Socket();
         bool init(std::string& errorMsg);
 
+        void configure();
+
         // Functions to check whether there is activity on the socket
-        PollResultType poll(int timeoutMs = kDefaultPollTimeout);
-        bool wakeUpFromPoll(uint64_t wakeUpCode);
+        void poll(const OnPollCallback& onPollCallback,
+                  int timeoutSecs = kDefaultPollTimeout);
+        bool wakeUpFromPoll(uint8_t wakeUpCode);
 
         PollResultType isReadyToWrite(int timeoutMs);
         PollResultType isReadyToRead(int timeoutMs);
@@ -76,23 +66,27 @@ namespace ix
 
         // Blocking and cancellable versions, working with socket that can be set
         // to non blocking mode. Used during HTTP upgrade.
-        bool readByte(void* buffer, const CancellationRequest& isCancellationRequested);
-        bool writeBytes(const std::string& str, const CancellationRequest& isCancellationRequested);
+        bool readByte(void* buffer,
+                      const CancellationRequest& isCancellationRequested);
+        bool writeBytes(const std::string& str,
+                        const CancellationRequest& isCancellationRequested);
 
-        std::pair<bool, std::string> readLine(const CancellationRequest& isCancellationRequested);
-        std::pair<bool, std::string> readBytes(size_t length,
-                                               const OnProgressCallback& onProgressCallback,
-                                               const CancellationRequest& isCancellationRequested);
+        std::pair<bool, std::string> readLine(
+            const CancellationRequest& isCancellationRequested);
+        std::pair<bool, std::string> readBytes(
+            size_t length,
+            const OnProgressCallback& onProgressCallback,
+            const CancellationRequest& isCancellationRequested);
 
         static int getErrno();
-        static bool isWaitNeeded();
-        static void closeSocket(int fd);
 
         // Used as special codes for pipe communication
         static const uint64_t kSendRequest;
         static const uint64_t kCloseRequest;
 
     protected:
+        void closeSocket(int fd);
+
         std::atomic<int> _sockfd;
         std::mutex _socketMutex;
 
@@ -108,4 +102,4 @@ namespace ix
 
         std::shared_ptr<SelectInterrupt> _selectInterrupt;
     };
-} // namespace ix
+}

ixwebsocket/IXSocketAppleSSL.cpp

@@ -20,6 +20,8 @@
 #include <unistd.h>
 #include <stdint.h>
 
+#include <iostream>
+
 #include <errno.h>
 #define socketerrno errno
 

ixwebsocket/IXSocketAppleSSL.h

@@ -6,15 +6,17 @@
 
 #pragma once
 
-#include "IXCancellationRequest.h"
 #include "IXSocket.h"
-#include <Security/SecureTransport.h>
+#include "IXCancellationRequest.h"
+
 #include <Security/Security.h>
+#include <Security/SecureTransport.h>
+
 #include <mutex>
 
 namespace ix
 {
-    class SocketAppleSSL final : public Socket
+    class SocketAppleSSL : public Socket
     {
     public:
         SocketAppleSSL(int fd = -1);
@@ -32,7 +34,7 @@ namespace ix
 
     private:
         SSLContextRef _sslContext;
-        mutable std::mutex _mutex; // AppleSSL routines are not thread-safe
+        mutable std::mutex _mutex;  // AppleSSL routines are not thread-safe
     };
 
-} // namespace ix
+}

ixwebsocket/IXSocketConnect.cpp

@@ -7,7 +7,6 @@
 #include "IXSocketConnect.h"
 #include "IXDNSLookup.h"
 #include "IXNetSystem.h"
-#include "IXSocket.h"
 
 #include <string.h>
 #include <fcntl.h>
@@ -19,6 +18,18 @@
 # include <linux/tcp.h>
 #endif
 
+namespace
+{
+    void closeSocket(int fd)
+    {
+#ifdef _WIN32
+        closesocket(fd);
+#else
+        ::close(fd);
+#endif
+    }
+}
+
 namespace ix
 {
     //
@@ -45,12 +56,11 @@ namespace ix
         // block us for too long
         SocketConnect::configure(fd);
 
-        int res = ::connect(fd, address->ai_addr, address->ai_addrlen);
-
-        if (res == -1 && !Socket::isWaitNeeded())
+        if (::connect(fd, address->ai_addr, address->ai_addrlen) == -1
+            && errno != EINPROGRESS)
         {
-            errMsg = strerror(Socket::getErrno());
-            Socket::closeSocket(fd);
+            closeSocket(fd);
+            errMsg = strerror(errno);
             return -1;
         }
 
@@ -58,17 +68,15 @@ namespace ix
         {
             if (isCancellationRequested && isCancellationRequested()) // Must handle timeout as well
             {
-                Socket::closeSocket(fd);
+                closeSocket(fd);
                 errMsg = "Cancelled";
                 return -1;
             }
 
-            // On Linux the timeout needs to be re-initialized everytime
-            // http://man7.org/linux/man-pages/man2/select.2.html
+            // Use select to check the status of the new connection
             struct timeval timeout;
             timeout.tv_sec = 0;
             timeout.tv_usec = 10 * 1000; // 10ms timeout
-
             fd_set wfds;
             fd_set efds;
 
@@ -77,13 +85,11 @@ namespace ix
             FD_ZERO(&efds);
             FD_SET(fd, &efds);
 
-            // Use select to check the status of the new connection
-            res = select(fd + 1, nullptr, &wfds, &efds, &timeout);
-
-            if (res < 0 && (Socket::getErrno() == EBADF || Socket::getErrno() == EINVAL))
+            if (select(fd + 1, nullptr, &wfds, &efds, &timeout) < 0 &&
+                (errno == EBADF || errno == EINVAL))
             {
-                Socket::closeSocket(fd);
-                errMsg = std::string("Connect error, select error: ") + strerror(Socket::getErrno());
+                closeSocket(fd);
+                errMsg = std::string("Connect error, select error: ") + strerror(errno);
                 return -1;
             }
 
@@ -104,7 +110,7 @@ namespace ix
                 optval != 0)
 #endif
             {
-                Socket::closeSocket(fd);
+                closeSocket(fd);
                 errMsg = strerror(optval);
                 return -1;
             }
@@ -115,7 +121,7 @@ namespace ix
             }
         }
 
-        Socket::closeSocket(fd);
+        closeSocket(fd);
         errMsg = "connect timed out after 60 seconds";
         return -1;
     }

ixwebsocket/IXSocketConnect.h

@@ -7,14 +7,14 @@
 #pragma once
 
 #include "IXCancellationRequest.h"
+
 #include <string>
 
 struct addrinfo;
 
 namespace ix
 {
-    class SocketConnect
-    {
+    class SocketConnect {
     public:
         static int connect(const std::string& hostname,
                            int port,
@@ -24,8 +24,9 @@ namespace ix
         static void configure(int sockfd);
 
     private:
-        static int connectToAddress(const struct addrinfo* address,
+        static int connectToAddress(const struct addrinfo *address,
                                     std::string& errMsg,
                                     const CancellationRequest& isCancellationRequested);
     };
-} // namespace ix
+}
+

ixwebsocket/IXSocketFactory.cpp

@@ -8,13 +8,11 @@
 
 #ifdef IXWEBSOCKET_USE_TLS
 
-# ifdef IXWEBSOCKET_USE_MBED_TLS
-#  include <ixwebsocket/IXSocketMbedTLS.h>
-# elif __APPLE__
+# ifdef __APPLE__
 #  include <ixwebsocket/IXSocketAppleSSL.h>
 # elif defined(_WIN32)
 #  include <ixwebsocket/IXSocketSChannel.h>
-# elif defined(IXWEBSOCKET_USE_OPEN_SSL)
+# else
 #  include <ixwebsocket/IXSocketOpenSSL.h>
 # endif
 
@@ -39,9 +37,7 @@ namespace ix
         else
         {
 #ifdef IXWEBSOCKET_USE_TLS
-# if defined(IXWEBSOCKET_USE_MBED_TLS)
-            socket = std::make_shared<SocketMbedTLS>();
-# elif defined(__APPLE__)
+# ifdef __APPLE__
             socket = std::make_shared<SocketAppleSSL>();
 # elif defined(_WIN32)
             socket = std::make_shared<SocketSChannel>();

ixwebsocket/IXSocketFactory.h

@@ -13,7 +13,9 @@
 namespace ix
 {
     class Socket;
-    std::shared_ptr<Socket> createSocket(bool tls, std::string& errorMsg);
+    std::shared_ptr<Socket> createSocket(bool tls,
+                                         std::string& errorMsg);
 
-    std::shared_ptr<Socket> createSocket(int fd, std::string& errorMsg);
-} // namespace ix
+    std::shared_ptr<Socket> createSocket(int fd,
+                                         std::string& errorMsg);
+}

ixwebsocket/IXSocketMbedTLS.cpp

@@ -1,178 +0,0 @@
-/*
- *  IXSocketMbedTLS.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- *
- *  Some code taken from
- *  https://github.com/rottor12/WsClientLib/blob/master/lib/src/WsClientLib.cpp
- *  and mini_client.c example from mbedtls
- */
-
-#include "IXSocketMbedTLS.h"
-#include "IXSocketConnect.h"
-#include "IXNetSystem.h"
-#include "IXSocket.h"
-
-#include <string.h>
-
-namespace ix
-{
-    SocketMbedTLS::~SocketMbedTLS()
-    {
-        close();
-    }
-
-    bool SocketMbedTLS::init(const std::string& host, std::string& errMsg)
-    {
-        std::lock_guard<std::mutex> lock(_mutex);
-
-        mbedtls_ssl_init(&_ssl);
-        mbedtls_ssl_config_init(&_conf);
-        mbedtls_ctr_drbg_init(&_ctr_drbg);
-
-        const char *pers = "IXSocketMbedTLS";
-
-        mbedtls_entropy_init(&_entropy);
-        if (mbedtls_ctr_drbg_seed(&_ctr_drbg,
-                                  mbedtls_entropy_func,
-                                  &_entropy,
-                                  (const unsigned char *) pers,
-                                  strlen(pers)) != 0)
-        {
-            errMsg = "Setting entropy seed failed";
-            return false;
-        }
-
-        if (mbedtls_ssl_config_defaults(&_conf,
-                                        MBEDTLS_SSL_IS_CLIENT,
-                                        MBEDTLS_SSL_TRANSPORT_STREAM,
-                                        MBEDTLS_SSL_PRESET_DEFAULT ) != 0)
-        {
-            errMsg = "Setting config default failed";
-            return false;
-        }
-
-        mbedtls_ssl_conf_rng(&_conf, mbedtls_ctr_drbg_random, &_ctr_drbg);
-
-        // FIXME: cert verification is disabled
-        mbedtls_ssl_conf_authmode(&_conf, MBEDTLS_SSL_VERIFY_NONE);
-
-        if (mbedtls_ssl_setup(&_ssl, &_conf) != 0)
-        {
-            errMsg = "SSL setup failed";
-            return false;
-        }
-
-        if (mbedtls_ssl_set_hostname(&_ssl, host.c_str()) != 0)
-        {
-            errMsg = "SNI setup failed";
-            return false;
-        }
-
-        return true;
-    }
-
-    bool SocketMbedTLS::connect(const std::string& host,
-                                int port,
-                                std::string& errMsg,
-                                const CancellationRequest& isCancellationRequested)
-    {
-        {
-            std::lock_guard<std::mutex> lock(_mutex);
-            _sockfd = SocketConnect::connect(host, port, errMsg, isCancellationRequested);
-            if (_sockfd == -1) return false;
-        }
-
-        if (!init(host, errMsg))
-        {
-            close();
-            return false;
-        }
-
-        mbedtls_ssl_set_bio(&_ssl, &_sockfd, mbedtls_net_send, mbedtls_net_recv, NULL);
-
-        int res;
-        do
-        {
-            std::lock_guard<std::mutex> lock(_mutex);
-            res = mbedtls_ssl_handshake(&_ssl);
-        }
-        while (res == MBEDTLS_ERR_SSL_WANT_READ || res == MBEDTLS_ERR_SSL_WANT_WRITE);
-
-        if (res != 0)
-        {
-            char buf[256];
-            mbedtls_strerror(res, buf, sizeof(buf));
-
-            errMsg = "error in handshake : ";
-            errMsg += buf;
-
-            close();
-            return false;
-        }
-
-        return true;
-    }
-
-    void SocketMbedTLS::close()
-    {
-        std::lock_guard<std::mutex> lock(_mutex);
-
-        mbedtls_ssl_free(&_ssl);
-        mbedtls_ssl_config_free(&_conf);
-        mbedtls_ctr_drbg_free(&_ctr_drbg);
-        mbedtls_entropy_free(&_entropy);
-
-        Socket::close();
-    }
-
-    ssize_t SocketMbedTLS::send(char* buf, size_t nbyte)
-    {
-        ssize_t sent = 0;
-
-        while (nbyte > 0)
-        {
-            std::lock_guard<std::mutex> lock(_mutex);
-
-            ssize_t res = mbedtls_ssl_write(&_ssl, (unsigned char*) buf, nbyte);
-
-            if (res > 0) {
-                nbyte -= res;
-                sent += res;
-            } else if (res == MBEDTLS_ERR_SSL_WANT_READ || res == MBEDTLS_ERR_SSL_WANT_WRITE) {
-                errno = EWOULDBLOCK;
-                return -1;
-            } else {
-                return -1;
-            }
-        }
-        return sent;
-    }
-
-    ssize_t SocketMbedTLS::send(const std::string& buffer)
-    {
-        return send((char*)&buffer[0], buffer.size());
-    }
-
-    ssize_t SocketMbedTLS::recv(void* buf, size_t nbyte)
-    {
-        while (true)
-        {
-            std::lock_guard<std::mutex> lock(_mutex);
-
-            ssize_t res = mbedtls_ssl_read(&_ssl, (unsigned char*) buf, (int) nbyte);
-
-            if (res > 0)
-            {
-                return res;
-            }
-
-            if (res == MBEDTLS_ERR_SSL_WANT_READ || res == MBEDTLS_ERR_SSL_WANT_WRITE)
-            {
-                errno = EWOULDBLOCK;
-            }
-            return -1;
-        }
-    }
-
-}

ixwebsocket/IXSocketMbedTLS.h

@@ -1,47 +0,0 @@
-/*
- *  IXSocketMbedTLS.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include "IXSocket.h"
-#include <mbedtls/ctr_drbg.h>
-#include <mbedtls/debug.h>
-#include <mbedtls/entropy.h>
-#include <mbedtls/error.h>
-#include <mbedtls/net.h>
-#include <mbedtls/platform.h>
-#include <mutex>
-
-namespace ix
-{
-    class SocketMbedTLS final : public Socket
-    {
-    public:
-        SocketMbedTLS() = default;
-        ~SocketMbedTLS();
-
-        virtual bool connect(const std::string& host,
-                             int port,
-                             std::string& errMsg,
-                             const CancellationRequest& isCancellationRequested) final;
-        virtual void close() final;
-
-        virtual ssize_t send(char* buffer, size_t length) final;
-        virtual ssize_t send(const std::string& buffer) final;
-        virtual ssize_t recv(void* buffer, size_t length) final;
-
-    private:
-        mbedtls_ssl_context _ssl;
-        mbedtls_ssl_config _conf;
-        mbedtls_entropy_context _entropy;
-        mbedtls_ctr_drbg_context _ctr_drbg;
-
-        std::mutex _mutex;
-
-        bool init(const std::string& host, std::string& errMsg);
-    };
-
-} // namespace ix

ixwebsocket/IXSocketOpenSSL.cpp

@@ -10,6 +10,7 @@
 #include "IXSocketConnect.h"
 
 #include <cassert>
+#include <iostream>
 
 #include <openssl/x509v3.h>
 
@@ -240,6 +241,7 @@ namespace ix
         }
     }
 
+    // No wait support
     bool SocketOpenSSL::connect(const std::string& host,
                                 int port,
                                 std::string& errMsg,
@@ -340,7 +342,7 @@ namespace ix
 
             ERR_clear_error();
             ssize_t write_result = SSL_write(_ssl_connection, buf + sent, (int) nbyte);
-            int reason = SSL_get_error(_ssl_connection, (int) write_result);
+            int reason = SSL_get_error(_ssl_connection, write_result);
 
             if (reason == SSL_ERROR_NONE) {
                 nbyte -= write_result;
@@ -360,6 +362,7 @@ namespace ix
         return send((char*)&buffer[0], buffer.size());
     }
 
+    // No wait support
     ssize_t SocketOpenSSL::recv(void* buf, size_t nbyte)
     {
         while (true)
@@ -379,7 +382,7 @@ namespace ix
                 return read_result;
             }
 
-            int reason = SSL_get_error(_ssl_connection, (int) read_result);
+            int reason = SSL_get_error(_ssl_connection, read_result);
 
             if (reason == SSL_ERROR_WANT_READ || reason == SSL_ERROR_WANT_WRITE)
             {

ixwebsocket/IXSocketOpenSSL.h

@@ -6,18 +6,20 @@
 
 #pragma once
 
-#include "IXCancellationRequest.h"
 #include "IXSocket.h"
-#include <mutex>
+#include "IXCancellationRequest.h"
+
 #include <openssl/bio.h>
+#include <openssl/hmac.h>
 #include <openssl/conf.h>
 #include <openssl/err.h>
-#include <openssl/hmac.h>
 #include <openssl/ssl.h>
 
+#include <mutex>
+
 namespace ix
 {
-    class SocketOpenSSL final : public Socket
+    class SocketOpenSSL : public Socket
     {
     public:
         SocketOpenSSL(int fd = -1);
@@ -38,16 +40,18 @@ namespace ix
         std::string getSSLError(int ret);
         SSL_CTX* openSSLCreateContext(std::string& errMsg);
         bool openSSLHandshake(const std::string& hostname, std::string& errMsg);
-        bool openSSLCheckServerCert(SSL* ssl, const std::string& hostname, std::string& errMsg);
-        bool checkHost(const std::string& host, const char* pattern);
+        bool openSSLCheckServerCert(SSL *ssl,
+                                    const std::string& hostname,
+                                    std::string& errMsg);
+        bool checkHost(const std::string& host, const char *pattern);
 
         SSL* _ssl_connection;
         SSL_CTX* _ssl_context;
         const SSL_METHOD* _ssl_method;
-        mutable std::mutex _mutex; // OpenSSL routines are not thread-safe
+        mutable std::mutex _mutex;  // OpenSSL routines are not thread-safe
 
         static std::once_flag _openSSLInitFlag;
         static std::atomic<bool> _openSSLInitializationSuccessful;
     };
 
-} // namespace ix
+}

ixwebsocket/IXSocketSChannel.cpp

@@ -18,6 +18,7 @@
 # include <ws2def.h>
 # include <WS2tcpip.h>
 # include <schannel.h>
+//# include <sslsock.h>
 # include <io.h>
 
 #define WIN32_LEAN_AND_MEAN

ixwebsocket/IXSocketSChannel.h

@@ -10,13 +10,15 @@
 
 namespace ix
 {
-    class SocketSChannel final : public Socket
+    class SocketSChannel : public Socket
     {
     public:
         SocketSChannel();
         ~SocketSChannel();
 
-        virtual bool connect(const std::string& host, int port, std::string& errMsg) final;
+        virtual bool connect(const std::string& host,
+                             int port,
+                             std::string& errMsg) final;
         virtual void close() final;
 
         // The important override
@@ -29,4 +31,4 @@ namespace ix
     private:
     };
 
-} // namespace ix
+}

ixwebsocket/IXSocketServer.cpp

@@ -13,7 +13,6 @@
 #include <sstream>
 #include <future>
 #include <string.h>
-#include <assert.h>
 
 namespace ix
 {
@@ -30,9 +29,7 @@ namespace ix
         _host(host),
         _backlog(backlog),
         _maxConnections(maxConnections),
-        _serverFd(-1),
         _stop(false),
-        _stopGc(false),
         _connectionStateFactory(&ConnectionState::createConnectionState)
     {
 
@@ -79,7 +76,7 @@ namespace ix
                << "at address " << _host << ":" << _port
                << " : " << strerror(Socket::getErrno());
 
-            Socket::closeSocket(_serverFd);
+            ::close(_serverFd);
             return std::make_pair(false, ss.str());
         }
 
@@ -103,7 +100,7 @@ namespace ix
                << "at address " << _host << ":" << _port
                << " : " << strerror(Socket::getErrno());
 
-            Socket::closeSocket(_serverFd);
+            ::close(_serverFd);
             return std::make_pair(false, ss.str());
         }
 
@@ -117,7 +114,7 @@ namespace ix
                << "at address " << _host << ":" << _port
                << " : " << strerror(Socket::getErrno());
 
-            Socket::closeSocket(_serverFd);
+            ::close(_serverFd);
             return std::make_pair(false, ss.str());
         }
 
@@ -126,15 +123,9 @@ namespace ix
 
     void SocketServer::start()
     {
-        if (!_thread.joinable())
-        {
-            _thread = std::thread(&SocketServer::run, this);
-        }
+        if (_thread.joinable()) return; // we've already been started
 
-        if (!_gcThread.joinable())
-        {
-            _gcThread = std::thread(&SocketServer::runGC, this);
-        }
+        _thread = std::thread(&SocketServer::run, this);
     }
 
     void SocketServer::wait()
@@ -143,31 +134,19 @@ namespace ix
         _conditionVariable.wait(lock);
     }
 
-    void SocketServer::stopAcceptingConnections()
-    {
-        _stop = true;
-    }
-
     void SocketServer::stop()
     {
-        // Stop accepting connections, and close the 'accept' thread
-        if (_thread.joinable())
-        {
-            _stop = true;
-            _thread.join();
-            _stop = false;
-        }
+        closeTerminatedThreads();
+        assert(_connectionsThreads.empty());
 
-        // Join all threads and make sure that all connections are terminated
-        if (_gcThread.joinable())
-        {
-            _stopGc = true;
-            _gcThread.join();
-            _stopGc = false;
-        }
+        if (!_thread.joinable()) return; // nothing to do
+
+        _stop = true;
+        _thread.join();
+        _stop = false;
 
         _conditionVariable.notify_one();
-        Socket::closeSocket(_serverFd);
+        ::close(_serverFd);
     }
 
     void SocketServer::setConnectionStateFactory(
@@ -176,16 +155,9 @@ namespace ix
         _connectionStateFactory = connectionStateFactory;
     }
 
-    //
     // join the threads for connections that have been closed
-    //
-    // When a connection is closed by a client, the connection state terminated
-    // field becomes true, and we can use that to know that we can join that thread
-    // and remove it from our _connectionsThreads data structure (a list).
-    //
     void SocketServer::closeTerminatedThreads()
     {
-        std::lock_guard<std::mutex> lock(_connectionsThreadsMutex);
         auto it = _connectionsThreads.begin();
         auto itEnd  = _connectionsThreads.end();
 
@@ -194,13 +166,14 @@ namespace ix
             auto& connectionState = it->first;
             auto& thread = it->second;
 
-            if (!connectionState->isTerminated())
+            if (!connectionState->isTerminated() ||
+                !thread.joinable())
             {
                 ++it;
                 continue;
             }
 
-            if (thread.joinable()) thread.join();
+            thread.join();
             it = _connectionsThreads.erase(it);
         }
     }
@@ -214,6 +187,12 @@ namespace ix
         {
             if (_stop) return;
 
+            // Garbage collection to shutdown/join threads for closed connections.
+            // We could run this in its own thread, so that we dont need to accept 
+            // a new connection to close a thread.
+            // We could also use a condition variable to be notify when we need to do this
+            closeTerminatedThreads();
+
             // Use select to check whether a new connection is in progress
             fd_set rfds;
             struct timeval timeout;
@@ -242,18 +221,17 @@ namespace ix
             // Accept a connection.
             struct sockaddr_in client; // client address information
             int clientFd;              // socket connected to client
-            socklen_t addressLen = sizeof(client);
+            socklen_t addressLen = sizeof(socklen_t);
             memset(&client, 0, sizeof(client));
 
             if ((clientFd = accept(_serverFd, (struct sockaddr *)&client, &addressLen)) < 0)
             {
-                if (!Socket::isWaitNeeded())
+                if (Socket::getErrno() != EWOULDBLOCK)
                 {
                     // FIXME: that error should be propagated
-                    int err = Socket::getErrno();
                     std::stringstream ss;
                     ss << "SocketServer::run() error accepting connection: "
-                       << err << ", " << strerror(err);
+                       << strerror(Socket::getErrno());
                     logError(ss.str());
                 }
                 continue;
@@ -267,7 +245,7 @@ namespace ix
                    << "Not accepting connection";
                 logError(ss.str());
 
-                Socket::closeSocket(clientFd);
+                ::close(clientFd);
 
                 continue;
             }
@@ -278,10 +256,7 @@ namespace ix
                 connectionState = _connectionStateFactory();
             }
 
-            if (_stop) return;
-
             // Launch the handleConnection work asynchronously in its own thread.
-            std::lock_guard<std::mutex> lock(_connectionsThreadsMutex);
             _connectionsThreads.push_back(std::make_pair(
                     connectionState,
                     std::thread(&SocketServer::handleConnection,
@@ -290,30 +265,5 @@ namespace ix
                                 connectionState)));
         }
     }
-
-    size_t SocketServer::getConnectionsThreadsCount()
-    {
-        std::lock_guard<std::mutex> lock(_connectionsThreadsMutex);
-        return _connectionsThreads.size();
-    }
-
-    void SocketServer::runGC()
-    {
-        for (;;)
-        {
-            // Garbage collection to shutdown/join threads for closed connections.
-            closeTerminatedThreads();
-
-            // We quit this thread if all connections are closed and we received
-            // a stop request by setting _stopGc to true.
-            if (_stopGc && getConnectionsThreadsCount() == 0)
-            {
-                break;
-            }
-
-            // Sleep a little bit then keep cleaning up
-            std::this_thread::sleep_for(std::chrono::milliseconds(10));
-        }
-    }
 }
 

ixwebsocket/IXSocketServer.h

@@ -7,28 +7,27 @@
 #pragma once
 
 #include "IXConnectionState.h"
+
+#include <utility> // pair
+#include <string>
+#include <set>
+#include <thread>
+#include <list>
+#include <mutex>
+#include <functional>
+#include <memory>
 #include <atomic>
 #include <condition_variable>
-#include <functional>
-#include <list>
-#include <memory>
-#include <mutex>
-#include <set>
-#include <string>
-#include <thread>
-#include <utility> // pair
 
 namespace ix
 {
-    class SocketServer
-    {
+    class SocketServer {
     public:
         using ConnectionStateFactory = std::function<std::shared_ptr<ConnectionState>()>;
 
-        // Each connection is handled by its own worker thread.
         // We use a list as we only care about remove and append operations.
-        using ConnectionThreads =
-            std::list<std::pair<std::shared_ptr<ConnectionState>, std::thread>>;
+        using ConnectionThreads = std::list<std::pair<std::shared_ptr<ConnectionState>,
+                                                      std::thread>>;
 
         SocketServer(int port = SocketServer::kDefaultPort,
                      const std::string& host = SocketServer::kDefaultHost,
@@ -37,9 +36,6 @@ namespace ix
         virtual ~SocketServer();
         virtual void stop();
 
-        // It is possible to override ConnectionState through inheritance
-        // this method allows user to change the factory by returning an object
-        // that inherits from ConnectionState but has its own methods.
         void setConnectionStateFactory(const ConnectionStateFactory& connectionStateFactory);
 
         const static int kDefaultPort;
@@ -52,12 +48,11 @@ namespace ix
         void wait();
 
     protected:
+
         // Logging
         void logError(const std::string& str);
         void logInfo(const std::string& str);
 
-        void stopAcceptingConnections();
-
     private:
         // Member variables
         int _port;
@@ -70,33 +65,23 @@ namespace ix
 
         std::mutex _logMutex;
 
-        // background thread to wait for incoming connections
         std::atomic<bool> _stop;
         std::thread _thread;
-        void run();
 
-        // background thread to cleanup (join) terminated threads
-        std::atomic<bool> _stopGc;
-        std::thread _gcThread;
-        void runGC();
-
-        // the list of (connectionState, threads) for each connections
         ConnectionThreads _connectionsThreads;
-        std::mutex _connectionsThreadsMutex;
 
-        // used to have the main control thread for a server
-        // wait for a 'terminate' notification without busy polling
         std::condition_variable _conditionVariable;
         std::mutex _conditionVariableMutex;
 
-        // the factory to create ConnectionState objects
+        //
         ConnectionStateFactory _connectionStateFactory;
 
-        virtual void handleConnection(int fd, std::shared_ptr<ConnectionState> connectionState) = 0;
+        // Methods
+        void run();
+        virtual void handleConnection(int fd,
+                                      std::shared_ptr<ConnectionState> connectionState) = 0;
         virtual size_t getConnectedClientsCount() = 0;
 
-        // Returns true if all connection threads are joined
         void closeTerminatedThreads();
-        size_t getConnectionsThreadsCount();
     };
-} // namespace ix
+}

ixwebsocket/IXUrlParser.cpp

@@ -5,30 +5,43 @@
  */
 
 #include "IXUrlParser.h"
-#include "LUrlParser.h"
+
+#include <iostream>
+#include <sstream>
+
 
 namespace ix
 {
+    //
+    // The only difference between those 2 regex is the protocol
+    //
+    std::regex UrlParser::_httpRegex("(http|https)://([^/ :]+):?([^/ ]*)(/?[^ #?]*)\\x3f?([^ #]*)#?([^ ]*)");
+    std::regex UrlParser::_webSocketRegex("(ws|wss)://([^/ :]+):?([^/ ]*)(/?[^ #?]*)\\x3f?([^ #]*)#?([^ ]*)");
+
     bool UrlParser::parse(const std::string& url,
                           std::string& protocol,
                           std::string& host,
                           std::string& path,
                           std::string& query,
-                          int& port)
+                          int& port,
+                          bool websocket)
     {
-        LUrlParser::clParseURL res = LUrlParser::clParseURL::ParseURL(url);
-
-        if (!res.IsValid())
+        std::cmatch what;
+        if (!regex_match(url.c_str(), what,
+                         websocket ? _webSocketRegex : _httpRegex))
         {
             return false;
         }
 
-        protocol = res.m_Scheme;
-        host     = res.m_Host;
-        path     = res.m_Path;
-        query    = res.m_Query;
+        std::string portStr;
 
-        if (!res.GetPort(&port))
+        protocol = std::string(what[1].first, what[1].second);
+        host     = std::string(what[2].first, what[2].second);
+        portStr  = std::string(what[3].first, what[3].second);
+        path     = std::string(what[4].first, what[4].second);
+        query    = std::string(what[5].first, what[5].second);
+
+        if (portStr.empty())
         {
             if (protocol == "ws" || protocol == "http")
             {
@@ -45,6 +58,12 @@ namespace ix
                 return false;
             }
         }
+        else
+        {
+            std::stringstream ss;
+            ss << portStr;
+            ss >> port;
+        }
 
         if (path.empty())
         {
@@ -64,4 +83,22 @@ namespace ix
         return true;
     }
 
+    void UrlParser::printUrl(const std::string& url, bool websocket)
+    {
+        std::string protocol, host, path, query;
+        int port {0};
+
+        if (!parse(url, protocol, host, path, query, port, websocket))
+        {
+            return;
+        }
+
+        std::cout << "[" << url << "]" << std::endl;
+        std::cout << protocol << std::endl;
+        std::cout << host << std::endl;
+        std::cout << port << std::endl;
+        std::cout << path << std::endl;
+        std::cout << query << std::endl;
+        std::cout << "-------------------------------" << std::endl;
+    }
 }

ixwebsocket/IXUrlParser.h

@@ -7,6 +7,7 @@
 #pragma once
 
 #include <string>
+#include <regex>
 
 namespace ix
 {
@@ -18,6 +19,13 @@ namespace ix
                           std::string& host,
                           std::string& path,
                           std::string& query,
-                          int& port);
+                          int& port,
+                          bool websocket);
+
+        static void printUrl(const std::string& url, bool websocket);
+
+    private:
+        static std::regex _httpRegex;
+        static std::regex _webSocketRegex;
     };
-} // namespace ix
+}

ixwebsocket/IXWebSocket.cpp

@@ -8,26 +8,22 @@
 #include "IXSetThreadName.h"
 #include "IXWebSocketHandshake.h"
 
+#include <iostream>
 #include <cmath>
 #include <cassert>
 
 namespace
 {
-    uint64_t calculateRetryWaitMilliseconds(uint32_t retry_count)
+    uint64_t calculateRetryWaitMilliseconds(uint64_t retry_count)
     {
-        uint64_t wait_time;
+        // This will overflow quite fast for large value of retry_count
+        // and will become 0, in which case the wait time will be none
+        // and we'll be constantly retrying to connect.
+        uint64_t wait_time = ((uint64_t) std::pow(2, retry_count) * 100L);
 
-        if (retry_count <= 6)
-        {
-            // max wait_time is 6400 ms (2 ^ 6 = 64)
-            wait_time = ((uint64_t)std::pow(2, retry_count) * 100L);
-        }
-        else
-        {
-            wait_time = 10 * 1000; // 10 sec
-        }
-
-        return wait_time;
+        // cap the wait time to 10s, or to retry_count == 10 for which wait_time > 10s
+        uint64_t tenSeconds = 10 * 1000;
+        return (wait_time > tenSeconds || retry_count > 10) ? tenSeconds : wait_time;
     }
 }
 
@@ -35,27 +31,21 @@ namespace ix
 {
     OnTrafficTrackerCallback WebSocket::_onTrafficTrackerCallback = nullptr;
     const int WebSocket::kDefaultHandShakeTimeoutSecs(60);
-    const int WebSocket::kDefaultPingIntervalSecs(-1);
-    const int WebSocket::kDefaultPingTimeoutSecs(-1);
-    const bool WebSocket::kDefaultEnablePong(true);
+    const int WebSocket::kDefaultHeartBeatPeriod(-1);
 
     WebSocket::WebSocket() :
         _onMessageCallback(OnMessageCallback()),
         _stop(false),
         _automaticReconnection(true),
         _handshakeTimeoutSecs(kDefaultHandShakeTimeoutSecs),
-        _enablePong(kDefaultEnablePong),
-        _pingIntervalSecs(kDefaultPingIntervalSecs),
-        _pingTimeoutSecs(kDefaultPingTimeoutSecs)
+        _heartBeatPeriod(kDefaultHeartBeatPeriod)
     {
         _ws.setOnCloseCallback(
-            [this](uint16_t code, const std::string& reason, size_t wireSize, bool remote)
+            [this](uint16_t code, const std::string& reason, size_t wireSize)
             {
-                _onMessageCallback(
-                    std::make_shared<WebSocketMessage>(
-                        WebSocketMessageType::Close, "", wireSize,
-                        WebSocketErrorInfo(), WebSocketOpenInfo(),
-                        WebSocketCloseInfo(code, reason, remote)));
+                _onMessageCallback(WebSocket_MessageType_Close, "", wireSize,
+                                   WebSocketErrorInfo(), WebSocketOpenInfo(),
+                                   WebSocketCloseInfo(code, reason));
             }
         );
     }
@@ -89,59 +79,16 @@ namespace ix
         return _perMessageDeflateOptions;
     }
 
-    void WebSocket::setHeartBeatPeriod(int heartBeatPeriodSecs)
+    void WebSocket::setHeartBeatPeriod(int heartBeatPeriod)
     {
         std::lock_guard<std::mutex> lock(_configMutex);
-        _pingIntervalSecs = heartBeatPeriodSecs;
+        _heartBeatPeriod = heartBeatPeriod;
     }
 
     int WebSocket::getHeartBeatPeriod() const
     {
         std::lock_guard<std::mutex> lock(_configMutex);
-        return _pingIntervalSecs;
-    }
-
-    void WebSocket::setPingInterval(int pingIntervalSecs)
-    {
-        std::lock_guard<std::mutex> lock(_configMutex);
-        _pingIntervalSecs = pingIntervalSecs;
-    }
-
-    int WebSocket::getPingInterval() const
-    {
-        std::lock_guard<std::mutex> lock(_configMutex);
-        return _pingIntervalSecs;
-    }
-
-    void WebSocket::setPingTimeout(int pingTimeoutSecs)
-    {
-        std::lock_guard<std::mutex> lock(_configMutex);
-        _pingTimeoutSecs = pingTimeoutSecs;
-    }
-
-    int WebSocket::getPingTimeout() const
-    {
-        std::lock_guard<std::mutex> lock(_configMutex);
-        return _pingTimeoutSecs;
-    }
-
-    void WebSocket::enablePong()
-    {
-        std::lock_guard<std::mutex> lock(_configMutex);
-        _enablePong = true;
-    }
-
-    void WebSocket::disablePong()
-    {
-        std::lock_guard<std::mutex> lock(_configMutex);
-        _enablePong = false;
-    }
-
-    void WebSocket::disablePerMessageDeflate()
-    {
-        std::lock_guard<std::mutex> lock(_configMutex);
-        WebSocketPerMessageDeflateOptions perMessageDeflateOptions(false);
-        _perMessageDeflateOptions = perMessageDeflateOptions;
+        return _heartBeatPeriod;
     }
 
     void WebSocket::start()
@@ -151,19 +98,26 @@ namespace ix
         _thread = std::thread(&WebSocket::run, this);
     }
 
-    void WebSocket::stop(uint16_t code,
-                         const std::string& reason)
+    void WebSocket::stop()
     {
-        close(code, reason);
+        bool automaticReconnection = _automaticReconnection;
 
-        if (_thread.joinable())
+        // This value needs to be forced when shutting down, it is restored later
+        _automaticReconnection = false;
+
+        close();
+
+        if (!_thread.joinable())
         {
-            // wait until working thread will exit
-            // it will exit after close operation is finished
-            _stop = true;
-            _thread.join();
-            _stop = false;
+            _automaticReconnection = automaticReconnection;
+            return;
         }
+
+        _stop = true;
+        _thread.join();
+        _stop = false;
+
+        _automaticReconnection = automaticReconnection;
     }
 
     WebSocketInitResult WebSocket::connect(int timeoutSecs)
@@ -171,9 +125,7 @@ namespace ix
         {
             std::lock_guard<std::mutex> lock(_configMutex);
             _ws.configure(_perMessageDeflateOptions,
-                          _enablePong,
-                          _pingIntervalSecs,
-                          _pingTimeoutSecs);
+                          _heartBeatPeriod);
         }
 
         WebSocketInitResult status = _ws.connectToUrl(_url, timeoutSecs);
@@ -182,12 +134,10 @@ namespace ix
             return status;
         }
 
-        _onMessageCallback(
-            std::make_shared<WebSocketMessage>(
-                WebSocketMessageType::Open, "", 0,
-                WebSocketErrorInfo(),
-                WebSocketOpenInfo(status.uri, status.headers),
-                WebSocketCloseInfo()));
+        _onMessageCallback(WebSocket_MessageType_Open, "", 0,
+                           WebSocketErrorInfo(),
+                           WebSocketOpenInfo(status.uri, status.headers),
+                           WebSocketCloseInfo());
         return status;
     }
 
@@ -195,10 +145,7 @@ namespace ix
     {
         {
             std::lock_guard<std::mutex> lock(_configMutex);
-            _ws.configure(_perMessageDeflateOptions,
-                          _enablePong,
-                          _pingIntervalSecs,
-                          _pingTimeoutSecs);
+            _ws.configure(_perMessageDeflateOptions, _heartBeatPeriod);
         }
 
         WebSocketInitResult status = _ws.connectToSocket(fd, timeoutSecs);
@@ -207,116 +154,82 @@ namespace ix
             return status;
         }
 
-        _onMessageCallback(
-                std::make_shared<WebSocketMessage>(
-                    WebSocketMessageType::Open, "", 0,
-                    WebSocketErrorInfo(),
-                    WebSocketOpenInfo(status.uri, status.headers),
-                    WebSocketCloseInfo()));
+        _onMessageCallback(WebSocket_MessageType_Open, "", 0,
+                           WebSocketErrorInfo(),
+                           WebSocketOpenInfo(status.uri, status.headers),
+                           WebSocketCloseInfo());
         return status;
     }
 
     bool WebSocket::isConnected() const
     {
-        return getReadyState() == ReadyState::Open;
+        return getReadyState() == WebSocket_ReadyState_Open;
     }
 
     bool WebSocket::isClosing() const
     {
-        return getReadyState() == ReadyState::Closing;
+        return getReadyState() == WebSocket_ReadyState_Closing;
     }
 
-    void WebSocket::close(uint16_t code,
-                          const std::string& reason)
+    void WebSocket::close()
     {
-        _ws.close(code, reason);
+        _ws.close();
     }
 
-    void WebSocket::checkConnection(bool firstConnectionAttempt)
+    void WebSocket::reconnectPerpetuallyIfDisconnected()
     {
+        uint64_t retries = 0;
+        WebSocketErrorInfo connectErr;
+        ix::WebSocketInitResult status;
         using millis = std::chrono::duration<double, std::milli>;
+        millis duration;
 
-        uint32_t retries = 0;
-        millis duration(0);
-
-        // Try to connect perpertually
         while (true)
         {
-            if (isConnected() || isClosing() || _stop)
+            if (isConnected() || isClosing() || _stop || !_automaticReconnection)
             {
                 break;
             }
 
-            if (!firstConnectionAttempt && !_automaticReconnection)
+            status = connect(_handshakeTimeoutSecs);
+
+            if (!status.success && !_stop)
             {
-                // Do not attempt to reconnect
-                break;
-            }
+                duration = millis(calculateRetryWaitMilliseconds(retries++));
 
-            firstConnectionAttempt = false;
-
-            // Only sleep if we are retrying
-            if (duration.count() > 0)
-            {
-                // to do: make sleeping conditional
-                std::this_thread::sleep_for(duration);
-            }
-
-            // Try to connect synchronously
-            ix::WebSocketInitResult status = connect(_handshakeTimeoutSecs);
-
-            if (!status.success)
-            {
-                WebSocketErrorInfo connectErr;
-
-                if (_automaticReconnection)
-                {
-                    duration = millis(calculateRetryWaitMilliseconds(retries++));
-
-                    connectErr.wait_time = duration.count();
-                    connectErr.retries = retries;
-                }
-
-                connectErr.reason      = status.errorStr;
+                connectErr.retries = retries;
+                connectErr.wait_time = duration.count();
+                connectErr.reason = status.errorStr;
                 connectErr.http_status = status.http_status;
+                _onMessageCallback(WebSocket_MessageType_Error, "", 0,
+                                   connectErr, WebSocketOpenInfo(),
+                                   WebSocketCloseInfo());
 
-                _onMessageCallback(
-                     std::make_shared<WebSocketMessage>(
-                        WebSocketMessageType::Error, "", 0,
-                        connectErr, WebSocketOpenInfo(),
-                        WebSocketCloseInfo()));
+                std::this_thread::sleep_for(duration);
             }
         }
     }
 
     void WebSocket::run()
     {
-        setThreadName(getUrl());
-
-        bool firstConnectionAttempt = true;
+        setThreadName(_url);
 
         while (true)
         {
+            if (_stop) return;
+
             // 1. Make sure we are always connected
-            checkConnection(firstConnectionAttempt);
+            reconnectPerpetuallyIfDisconnected();
 
-            firstConnectionAttempt = false;
-
-            // if here we are closed then checkConnection was not able to connect
-            if (getReadyState() == ReadyState::Closed)
-            {
-                break;
-            }
-
-            // We can avoid to poll if we want to stop and are not closing
-            if (_stop && !isClosing()) break;
+            if (_stop) return;
 
             // 2. Poll to see if there's any new data available
-            WebSocketTransport::PollResult pollResult = _ws.poll();
+            _ws.poll();
+
+            if (_stop) return;
 
             // 3. Dispatch the incoming messages
             _ws.dispatch(
-                pollResult,
                 [this](const std::string& msg,
                        size_t wireSize,
                        bool decompressionError,
@@ -325,41 +238,41 @@ namespace ix
                     WebSocketMessageType webSocketMessageType;
                     switch (messageKind)
                     {
-                        case WebSocketTransport::MessageKind::MSG_TEXT:
-                        case WebSocketTransport::MessageKind::MSG_BINARY:
+                        case WebSocketTransport::MSG:
                         {
-                            webSocketMessageType = WebSocketMessageType::Message;
+                            webSocketMessageType = WebSocket_MessageType_Message;
                         } break;
 
-                        case WebSocketTransport::MessageKind::PING:
+                        case WebSocketTransport::PING:
                         {
-                            webSocketMessageType = WebSocketMessageType::Ping;
+                            webSocketMessageType = WebSocket_MessageType_Ping;
                         } break;
 
-                        case WebSocketTransport::MessageKind::PONG:
+                        case WebSocketTransport::PONG:
                         {
-                            webSocketMessageType = WebSocketMessageType::Pong;
+                            webSocketMessageType = WebSocket_MessageType_Pong;
                         } break;
 
-                        case WebSocketTransport::MessageKind::FRAGMENT:
+                        case WebSocketTransport::FRAGMENT:
                         {
-                            webSocketMessageType = WebSocketMessageType::Fragment;
+                            webSocketMessageType = WebSocket_MessageType_Fragment;
                         } break;
                     }
 
                     WebSocketErrorInfo webSocketErrorInfo;
                     webSocketErrorInfo.decompressionError = decompressionError;
 
-                    bool binary = messageKind == WebSocketTransport::MessageKind::MSG_BINARY;
-
-                    _onMessageCallback(
-                         std::make_shared<WebSocketMessage>(
-                            webSocketMessageType, msg, wireSize,
-                            webSocketErrorInfo, WebSocketOpenInfo(),
-                            WebSocketCloseInfo(), binary));
+                    _onMessageCallback(webSocketMessageType, msg, wireSize,
+                                       webSocketErrorInfo, WebSocketOpenInfo(),
+                                       WebSocketCloseInfo());
 
                     WebSocket::invokeTrafficTrackerCallback(msg.size(), true);
                 });
+
+            // 4. In blocking mode, getting out of this function is triggered by
+            //    an explicit disconnection from the callback, or by the remote end
+            //    closing the connection, ie isConnected() == false.
+            if (!_thread.joinable() && !isConnected() && !_automaticReconnection) return;
         }
     }
 
@@ -386,17 +299,8 @@ namespace ix
         }
     }
 
-    WebSocketSendInfo WebSocket::send(const std::string& data,
-                                      bool binary,
+    WebSocketSendInfo WebSocket::send(const std::string& text,
                                       const OnProgressCallback& onProgressCallback)
-    {
-        return sendMessage(data,
-                           (binary) ? SendMessageKind::Binary: SendMessageKind::Text,
-                           onProgressCallback);
-    }
-
-    WebSocketSendInfo WebSocket::sendBinary(const std::string& text,
-                                            const OnProgressCallback& onProgressCallback)
     {
         return sendMessage(text, SendMessageKind::Binary, onProgressCallback);
     }
@@ -461,11 +365,11 @@ namespace ix
     {
         switch (_ws.getReadyState())
         {
-            case ix::WebSocketTransport::ReadyState::OPEN      : return ReadyState::Open;
-            case ix::WebSocketTransport::ReadyState::CONNECTING: return ReadyState::Connecting;
-            case ix::WebSocketTransport::ReadyState::CLOSING   : return ReadyState::Closing;
-            case ix::WebSocketTransport::ReadyState::CLOSED    : return ReadyState::Closed;
-            default: return ReadyState::Closed;
+            case ix::WebSocketTransport::OPEN: return WebSocket_ReadyState_Open;
+            case ix::WebSocketTransport::CONNECTING: return WebSocket_ReadyState_Connecting;
+            case ix::WebSocketTransport::CLOSING: return WebSocket_ReadyState_Closing;
+            case ix::WebSocketTransport::CLOSED: return WebSocket_ReadyState_Closed;
+            default: return WebSocket_ReadyState_Closed;
         }
     }
 
@@ -473,11 +377,11 @@ namespace ix
     {
         switch (readyState)
         {
-            case ReadyState::Open      : return "OPEN";
-            case ReadyState::Connecting: return "CONNECTING";
-            case ReadyState::Closing   : return "CLOSING";
-            case ReadyState::Closed    : return "CLOSED";
-            default: return "UNKNOWN";
+            case WebSocket_ReadyState_Open: return "OPEN";
+            case WebSocket_ReadyState_Connecting: return "CONNECTING";
+            case WebSocket_ReadyState_Closing: return "CLOSING";
+            case WebSocket_ReadyState_Closed: return "CLOSED";
+            default: return "CLOSED";
         }
     }
 
@@ -491,11 +395,6 @@ namespace ix
         _automaticReconnection = false;
     }
 
-    bool WebSocket::isAutomaticReconnectionEnabled() const
-    {
-        return _automaticReconnection;
-    }
-
     size_t WebSocket::bufferedAmount() const
     {
         return _ws.bufferedAmount();

ixwebsocket/IXWebSocket.h

@@ -9,31 +9,74 @@
 
 #pragma once
 
-#include "IXProgressCallback.h"
-#include "IXWebSocketCloseConstants.h"
-#include "IXWebSocketErrorInfo.h"
-#include "IXWebSocketHttpHeaders.h"
-#include "IXWebSocketMessage.h"
-#include "IXWebSocketPerMessageDeflateOptions.h"
-#include "IXWebSocketSendInfo.h"
-#include "IXWebSocketTransport.h"
-#include <atomic>
-#include <mutex>
 #include <string>
 #include <thread>
+#include <mutex>
+#include <atomic>
+
+#include "IXWebSocketTransport.h"
+#include "IXWebSocketErrorInfo.h"
+#include "IXWebSocketSendInfo.h"
+#include "IXWebSocketPerMessageDeflateOptions.h"
+#include "IXWebSocketHttpHeaders.h"
+#include "IXProgressCallback.h"
 
 namespace ix
 {
     // https://developer.mozilla.org/en-US/docs/Web/API/WebSocket#Ready_state_constants
-    enum class ReadyState
+    enum ReadyState
     {
-        Connecting = 0,
-        Open = 1,
-        Closing = 2,
-        Closed = 3
+        WebSocket_ReadyState_Connecting = 0,
+        WebSocket_ReadyState_Open = 1,
+        WebSocket_ReadyState_Closing = 2,
+        WebSocket_ReadyState_Closed = 3
     };
 
-    using OnMessageCallback = std::function<void(const WebSocketMessagePtr&)>;
+    enum WebSocketMessageType
+    {
+        WebSocket_MessageType_Message = 0,
+        WebSocket_MessageType_Open = 1,
+        WebSocket_MessageType_Close = 2,
+        WebSocket_MessageType_Error = 3,
+        WebSocket_MessageType_Ping = 4,
+        WebSocket_MessageType_Pong = 5,
+        WebSocket_MessageType_Fragment = 6
+    };
+
+    struct WebSocketOpenInfo
+    {
+        std::string uri;
+        WebSocketHttpHeaders headers;
+
+        WebSocketOpenInfo(const std::string& u = std::string(),
+                          const WebSocketHttpHeaders& h = WebSocketHttpHeaders())
+            : uri(u)
+            , headers(h)
+        {
+            ;
+        }
+    };
+
+    struct WebSocketCloseInfo
+    {
+        uint16_t code;
+        std::string reason;
+
+        WebSocketCloseInfo(uint16_t c = 0,
+                           const std::string& r = std::string())
+            : code(c)
+            , reason(r)
+        {
+            ;
+        }
+    };
+
+    using OnMessageCallback = std::function<void(WebSocketMessageType,
+                                                 const std::string&,
+                                                 size_t wireSize,
+                                                 const WebSocketErrorInfo&,
+                                                 const WebSocketOpenInfo&,
+                                                 const WebSocketCloseInfo&)>;
 
     using OnTrafficTrackerCallback = std::function<void(size_t size, bool incoming)>;
 
@@ -44,68 +87,52 @@ namespace ix
         ~WebSocket();
 
         void setUrl(const std::string& url);
-        void setPerMessageDeflateOptions(
-            const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions);
-        void setHeartBeatPeriod(int heartBeatPeriodSecs);
-        void setPingInterval(int pingIntervalSecs); // alias of setHeartBeatPeriod
-        void setPingTimeout(int pingTimeoutSecs);
-        void enablePong();
-        void disablePong();
-        void disablePerMessageDeflate();
+        void setPerMessageDeflateOptions(const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions);
+        void setHandshakeTimeout(int handshakeTimeoutSecs);
+        void setHeartBeatPeriod(int heartBeatPeriod);
 
         // Run asynchronously, by calling start and stop.
         void start();
-
-        // stop is synchronous
-        void stop(uint16_t code = WebSocketCloseConstants::kNormalClosureCode,
-                  const std::string& reason = WebSocketCloseConstants::kNormalClosureMessage);
+        void stop();
 
         // Run in blocking mode, by connecting first manually, and then calling run.
         WebSocketInitResult connect(int timeoutSecs);
         void run();
 
-        // send is in binary mode by default
-        WebSocketSendInfo send(const std::string& data,
-                               bool binary = false,
+        WebSocketSendInfo send(const std::string& text,
                                const OnProgressCallback& onProgressCallback = nullptr);
-        WebSocketSendInfo sendBinary(const std::string& text,
-                                     const OnProgressCallback& onProgressCallback = nullptr);
         WebSocketSendInfo sendText(const std::string& text,
                                    const OnProgressCallback& onProgressCallback = nullptr);
         WebSocketSendInfo ping(const std::string& text);
-
-        void close(uint16_t code = WebSocketCloseConstants::kNormalClosureCode,
-                   const std::string& reason = WebSocketCloseConstants::kNormalClosureMessage);
+        void close();
 
         void setOnMessageCallback(const OnMessageCallback& callback);
         static void setTrafficTrackerCallback(const OnTrafficTrackerCallback& callback);
         static void resetTrafficTrackerCallback();
 
         ReadyState getReadyState() const;
-        static std::string readyStateToString(ReadyState readyState);
-
         const std::string& getUrl() const;
         const WebSocketPerMessageDeflateOptions& getPerMessageDeflateOptions() const;
         int getHeartBeatPeriod() const;
-        int getPingInterval() const;
-        int getPingTimeout() const;
         size_t bufferedAmount() const;
 
         void enableAutomaticReconnection();
         void disableAutomaticReconnection();
-        bool isAutomaticReconnectionEnabled() const;
 
     private:
+
         WebSocketSendInfo sendMessage(const std::string& text,
                                       SendMessageKind sendMessageKind,
                                       const OnProgressCallback& callback = nullptr);
 
         bool isConnected() const;
         bool isClosing() const;
-        void checkConnection(bool firstConnectionAttempt);
+        void reconnectPerpetuallyIfDisconnected();
+        std::string readyStateToString(ReadyState readyState);
         static void invokeTrafficTrackerCallback(size_t size, bool incoming);
 
         // Server
+        void setSocketFileDescriptor(int fd);
         WebSocketInitResult connectToSocket(int fd, int timeoutSecs);
 
         WebSocketTransport _ws;
@@ -125,16 +152,10 @@ namespace ix
         std::atomic<int> _handshakeTimeoutSecs;
         static const int kDefaultHandShakeTimeoutSecs;
 
-        // enable or disable PONG frame response to received PING frame
-        bool _enablePong;
-        static const bool kDefaultEnablePong;
-
-        // Optional ping and pong timeout
-        int _pingIntervalSecs;
-        int _pingTimeoutSecs;
-        static const int kDefaultPingIntervalSecs;
-        static const int kDefaultPingTimeoutSecs;
+        // Optional Heartbeat
+        int _heartBeatPeriod;
+        static const int kDefaultHeartBeatPeriod;
 
         friend class WebSocketServer;
     };
-} // namespace ix
+}

ixwebsocket/IXWebSocketCloseConstants.cpp

@@ -1,23 +0,0 @@
-/*
- *  IXWebSocketCloseConstants.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXWebSocketCloseConstants.h"
-
-namespace ix
-{
-    const uint16_t WebSocketCloseConstants::kNormalClosureCode(1000);
-    const uint16_t WebSocketCloseConstants::kInternalErrorCode(1011);
-    const uint16_t WebSocketCloseConstants::kAbnormalCloseCode(1006);
-    const uint16_t WebSocketCloseConstants::kProtocolErrorCode(1002);
-    const uint16_t WebSocketCloseConstants::kNoStatusCodeErrorCode(1005);
-
-    const std::string WebSocketCloseConstants::kNormalClosureMessage("Normal closure");
-    const std::string WebSocketCloseConstants::kInternalErrorMessage("Internal error");
-    const std::string WebSocketCloseConstants::kAbnormalCloseMessage("Abnormal closure");
-    const std::string WebSocketCloseConstants::kPingTimeoutMessage("Ping timeout");
-    const std::string WebSocketCloseConstants::kProtocolErrorMessage("Protocol error");
-    const std::string WebSocketCloseConstants::kNoStatusCodeErrorMessage("No status code");
-}

ixwebsocket/IXWebSocketCloseConstants.h

@@ -1,29 +0,0 @@
-/*
- *  IXWebSocketCloseConstants.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include <cstdint>
-#include <string>
-
-namespace ix
-{
-    struct WebSocketCloseConstants
-    {
-        static const uint16_t kNormalClosureCode;
-        static const uint16_t kInternalErrorCode;
-        static const uint16_t kAbnormalCloseCode;
-        static const uint16_t kProtocolErrorCode;
-        static const uint16_t kNoStatusCodeErrorCode;
-
-        static const std::string kNormalClosureMessage;
-        static const std::string kInternalErrorMessage;
-        static const std::string kAbnormalCloseMessage;
-        static const std::string kPingTimeoutMessage;
-        static const std::string kProtocolErrorMessage;
-        static const std::string kNoStatusCodeErrorMessage;
-    };
-} // namespace ix

ixwebsocket/IXWebSocketCloseInfo.h

@@ -1,25 +0,0 @@
-/*
- *  IXWebSocketCloseInfo.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2017-2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-namespace ix
-{
-    struct WebSocketCloseInfo
-    {
-        uint16_t code;
-        std::string reason;
-        bool remote;
-
-        WebSocketCloseInfo(uint16_t c = 0, const std::string& r = std::string(), bool rem = false)
-            : code(c)
-            , reason(r)
-            , remote(rem)
-        {
-            ;
-        }
-    };
-} // namespace ix

ixwebsocket/IXWebSocketErrorInfo.h

@@ -12,10 +12,10 @@ namespace ix
 {
     struct WebSocketErrorInfo
     {
-        uint32_t retries = 0;
-        double wait_time = 0;
-        int http_status = 0;
+        uint64_t retries;
+        double wait_time;
+        int http_status;
         std::string reason;
-        bool decompressionError = false;
+        bool decompressionError;
     };
-} // namespace ix
+}

ixwebsocket/IXWebSocketHandshake.cpp

@@ -10,7 +10,9 @@
 
 #include "libwshandshake.hpp"
 
+#include <iostream>
 #include <sstream>
+#include <regex>
 #include <random>
 #include <algorithm>
 
@@ -242,7 +244,7 @@ namespace ix
         }
 
         char output[29] = {};
-        WebSocketHandshakeKeyGen::generate(secWebSocketKey, output);
+        WebSocketHandshakeKeyGen::generate(secWebSocketKey.c_str(), output);
         if (std::string(output) != headers["sec-websocket-accept"])
         {
             std::string errorMsg("Invalid Sec-WebSocket-Accept value");
@@ -348,7 +350,7 @@ namespace ix
         }
 
         char output[29] = {};
-        WebSocketHandshakeKeyGen::generate(headers["sec-websocket-key"], output);
+        WebSocketHandshakeKeyGen::generate(headers["sec-websocket-key"].c_str(), output);
 
         std::stringstream ss;
         ss << "HTTP/1.1 101 Switching Protocols\r\n";

ixwebsocket/IXWebSocketHandshake.h

@@ -7,14 +7,15 @@
 #pragma once
 
 #include "IXCancellationRequest.h"
-#include "IXSocket.h"
 #include "IXWebSocketHttpHeaders.h"
 #include "IXWebSocketPerMessageDeflate.h"
 #include "IXWebSocketPerMessageDeflateOptions.h"
+#include "IXSocket.h"
+
+#include <string>
 #include <atomic>
 #include <chrono>
 #include <memory>
-#include <string>
 #include <tuple>
 
 namespace ix
@@ -41,8 +42,7 @@ namespace ix
         }
     };
 
-    class WebSocketHandshake
-    {
+    class WebSocketHandshake {
     public:
         WebSocketHandshake(std::atomic<bool>& requestInitCancellation,
                            std::shared_ptr<Socket> _socket,
@@ -56,7 +56,8 @@ namespace ix
                                             int port,
                                             int timeoutSecs);
 
-        WebSocketInitResult serverHandshake(int fd, int timeoutSecs);
+        WebSocketInitResult serverHandshake(int fd,
+                                            int timeoutSecs);
 
     private:
         std::string genRandomString(const int len);
@@ -74,4 +75,4 @@ namespace ix
         WebSocketPerMessageDeflateOptions& _perMessageDeflateOptions;
         std::atomic<bool>& _enablePerMessageDeflate;
     };
-} // namespace ix
+}

ixwebsocket/IXWebSocketHttpHeaders.h

@@ -7,9 +7,10 @@
 #pragma once
 
 #include "IXCancellationRequest.h"
+
+#include <string>
 #include <map>
 #include <memory>
-#include <string>
 
 namespace ix
 {
@@ -20,14 +21,15 @@ namespace ix
         // Case Insensitive compare_less binary function
         struct NocaseCompare
         {
-            bool operator()(const unsigned char& c1, const unsigned char& c2) const;
+            bool operator() (const unsigned char& c1, const unsigned char& c2) const;
         };
 
-        bool operator()(const std::string& s1, const std::string& s2) const;
+        bool operator() (const std::string & s1, const std::string & s2) const;
     };
 
     using WebSocketHttpHeaders = std::map<std::string, std::string, CaseInsensitiveLess>;
 
     std::pair<bool, WebSocketHttpHeaders> parseHttpHeaders(
-        std::shared_ptr<Socket> socket, const CancellationRequest& isCancellationRequested);
-} // namespace ix
+        std::shared_ptr<Socket> socket,
+        const CancellationRequest& isCancellationRequested);
+}

ixwebsocket/IXWebSocketMessage.h

@@ -1,49 +0,0 @@
-/*
- *  IXWebSocketMessage.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2017-2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include "IXWebSocketCloseInfo.h"
-#include "IXWebSocketErrorInfo.h"
-#include "IXWebSocketMessageType.h"
-#include "IXWebSocketOpenInfo.h"
-#include <memory>
-#include <string>
-#include <thread>
-
-namespace ix
-{
-    struct WebSocketMessage
-    {
-        WebSocketMessageType type;
-        std::string str;
-        size_t wireSize;
-        WebSocketErrorInfo errorInfo;
-        WebSocketOpenInfo openInfo;
-        WebSocketCloseInfo closeInfo;
-        bool binary;
-
-        WebSocketMessage(WebSocketMessageType t,
-                         const std::string& s,
-                         size_t w,
-                         WebSocketErrorInfo e,
-                         WebSocketOpenInfo o,
-                         WebSocketCloseInfo c,
-                         bool b = false)
-            : type(t)
-            , str(std::move(s))
-            , wireSize(w)
-            , errorInfo(e)
-            , openInfo(o)
-            , closeInfo(c)
-            , binary(b)
-        {
-            ;
-        }
-    };
-
-    using WebSocketMessagePtr = std::shared_ptr<WebSocketMessage>;
-} // namespace ix

ixwebsocket/IXWebSocketMessageQueue.cpp

@@ -1,89 +0,0 @@
-/*
- *  IXWebSocketMessageQueue.cpp
- *  Author: Korchynskyi Dmytro
- *  Copyright (c) 2017-2019 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXWebSocketMessageQueue.h"
-
-namespace ix
-{
-
-    WebSocketMessageQueue::WebSocketMessageQueue(WebSocket* websocket)
-    {
-        bindWebsocket(websocket);
-    }
-
-    WebSocketMessageQueue::~WebSocketMessageQueue()
-    {
-        if (!_messages.empty())
-        {
-            // not handled all messages
-        }
-
-        bindWebsocket(nullptr);
-    }
-
-    void WebSocketMessageQueue::bindWebsocket(WebSocket * websocket)
-    {
-        if (_websocket == websocket) return;
-
-        // unbind old
-        if (_websocket)
-        {
-            // set dummy callback just to avoid crash
-            _websocket->setOnMessageCallback([](const WebSocketMessagePtr&) {});
-        }
-
-        _websocket = websocket;
-
-        // bind new
-        if (_websocket)
-        {
-            _websocket->setOnMessageCallback([this](const WebSocketMessagePtr& msg)
-            {
-                std::lock_guard<std::mutex> lock(_messagesMutex);
-                _messages.emplace_back(std::move(msg));
-            });
-        }
-    }
-
-    void WebSocketMessageQueue::setOnMessageCallback(const OnMessageCallback& callback)
-    {
-        _onMessageUserCallback = callback;
-    }
-
-    void WebSocketMessageQueue::setOnMessageCallback(OnMessageCallback&& callback)
-    {
-        _onMessageUserCallback = std::move(callback);
-    }
-
-    WebSocketMessagePtr WebSocketMessageQueue::popMessage()
-    {
-        WebSocketMessagePtr message;
-        std::lock_guard<std::mutex> lock(_messagesMutex);
-
-        if (!_messages.empty())
-        {
-            message = std::move(_messages.front());
-            _messages.pop_front();
-        }
-
-        return message;
-    }
-
-    void WebSocketMessageQueue::poll(int count)
-    {
-        if (!_onMessageUserCallback)
-            return;
-
-        WebSocketMessagePtr message;
-
-        while (count > 0 && (message = popMessage()))
-        {
-            _onMessageUserCallback(message);
-            --count;
-        }
-    }
-
-}

ixwebsocket/IXWebSocketMessageQueue.h

@@ -1,41 +0,0 @@
-/*
- *  IXWebSocketMessageQueue.h
- *  Author: Korchynskyi Dmytro
- *  Copyright (c) 2017-2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include "IXWebSocket.h"
-#include <list>
-#include <memory>
-#include <thread>
-
-namespace ix
-{
-    //
-    // A helper class to dispatch websocket message callbacks in your thread.
-    //
-    class WebSocketMessageQueue
-    {
-    public:
-        WebSocketMessageQueue(WebSocket* websocket = nullptr);
-        ~WebSocketMessageQueue();
-
-        void bindWebsocket(WebSocket* websocket);
-
-        void setOnMessageCallback(const OnMessageCallback& callback);
-        void setOnMessageCallback(OnMessageCallback&& callback);
-
-        void poll(int count = 512);
-
-    protected:
-        WebSocketMessagePtr popMessage();
-
-    private:
-        WebSocket* _websocket = nullptr;
-        OnMessageCallback _onMessageUserCallback;
-        std::mutex _messagesMutex;
-        std::list<WebSocketMessagePtr> _messages;
-    };
-} // namespace ix

ixwebsocket/IXWebSocketMessageType.h

@@ -1,21 +0,0 @@
-/*
- *  IXWebSocketMessageType.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2017-2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-namespace ix
-{
-    enum class WebSocketMessageType
-    {
-        Message = 0,
-        Open = 1,
-        Close = 2,
-        Error = 3,
-        Ping = 4,
-        Pong = 5,
-        Fragment = 6
-    };
-}

ixwebsocket/IXWebSocketOpenInfo.h

@@ -1,24 +0,0 @@
-/*
- *  IXWebSocketOpenInfo.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2017-2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-namespace ix
-{
-    struct WebSocketOpenInfo
-    {
-        std::string uri;
-        WebSocketHttpHeaders headers;
-
-        WebSocketOpenInfo(const std::string& u = std::string(),
-                          const WebSocketHttpHeaders& h = WebSocketHttpHeaders())
-            : uri(u)
-            , headers(h)
-        {
-            ;
-        }
-    };
-} // namespace ix

ixwebsocket/IXWebSocketPerMessageDeflate.h

@@ -34,8 +34,8 @@
 
 #pragma once
 
-#include <memory>
 #include <string>
+#include <memory>
 
 namespace ix
 {
@@ -57,4 +57,4 @@ namespace ix
         std::unique_ptr<WebSocketPerMessageDeflateCompressor> _compressor;
         std::unique_ptr<WebSocketPerMessageDeflateDecompressor> _decompressor;
     };
-} // namespace ix
+}

ixwebsocket/IXWebSocketPerMessageDeflateCodec.cpp

@@ -7,6 +7,7 @@
 #include "IXWebSocketPerMessageDeflateCodec.h"
 #include "IXWebSocketPerMessageDeflateOptions.h"
 
+#include <iostream>
 #include <cassert>
 #include <string.h>
 

ixwebsocket/IXWebSocketPerMessageDeflateCodec.h

@@ -7,8 +7,8 @@
 #pragma once
 
 #include "zlib.h"
-#include <memory>
 #include <string>
+#include <memory>
 
 namespace ix
 {
@@ -46,4 +46,5 @@ namespace ix
         z_stream _inflateState;
     };
 
-} // namespace ix
+}
+

ixwebsocket/IXWebSocketPerMessageDeflateOptions.cpp

@@ -7,6 +7,7 @@
 #include "IXWebSocketPerMessageDeflateOptions.h"
 
 #include <sstream>
+#include <iostream>
 #include <algorithm>
 #include <cctype>
 

ixwebsocket/IXWebSocketPerMessageDeflateOptions.h

@@ -23,6 +23,7 @@ namespace ix
         WebSocketPerMessageDeflateOptions(std::string extension);
 
         std::string generateHeader();
+        std::string parseHeader();
         bool enabled() const;
         bool getClientNoContextTakeover() const;
         bool getServerNoContextTakeover() const;
@@ -42,4 +43,4 @@ namespace ix
         int _clientMaxWindowBits;
         int _serverMaxWindowBits;
     };
-} // namespace ix
+}

ixwebsocket/IXWebSocketSendInfo.h

@@ -6,6 +6,9 @@
 
 #pragma once
 
+#include <string>
+#include <iostream>
+
 namespace ix
 {
     struct WebSocketSendInfo
@@ -15,7 +18,8 @@ namespace ix
         size_t payloadSize;
         size_t wireSize;
 
-        WebSocketSendInfo(bool s = false, bool c = false, size_t p = 0, size_t w = 0)
+        WebSocketSendInfo(bool s = false, bool c = false,
+                          size_t p = 0, size_t w = 0)
             : success(s)
             , compressionError(c)
             , payloadSize(p)
@@ -24,4 +28,4 @@ namespace ix
             ;
         }
     };
-} // namespace ix
+}

ixwebsocket/IXWebSocketServer.cpp

@@ -17,15 +17,13 @@
 namespace ix
 {
     const int WebSocketServer::kDefaultHandShakeTimeoutSecs(3); // 3 seconds
-    const bool WebSocketServer::kDefaultEnablePong(true);
 
     WebSocketServer::WebSocketServer(int port,
                                      const std::string& host,
                                      int backlog,
                                      size_t maxConnections,
                                      int handshakeTimeoutSecs) : SocketServer(port, host, backlog, maxConnections),
-        _handshakeTimeoutSecs(handshakeTimeoutSecs),
-        _enablePong(kDefaultEnablePong)
+        _handshakeTimeoutSecs(handshakeTimeoutSecs)
     {
 
     }
@@ -37,8 +35,6 @@ namespace ix
 
     void WebSocketServer::stop()
     {
-        stopAcceptingConnections();
-
         auto clients = getClients();
         for (auto client : clients)
         {
@@ -48,16 +44,6 @@ namespace ix
         SocketServer::stop();
     }
 
-    void WebSocketServer::enablePong()
-    {
-        _enablePong = true;
-    }
-
-    void WebSocketServer::disablePong()
-    {
-        _enablePong = false;
-    }
-
     void WebSocketServer::setOnConnectionCallback(const OnConnectionCallback& callback)
     {
         _onConnectionCallback = callback;
@@ -72,11 +58,6 @@ namespace ix
 
         webSocket->disableAutomaticReconnection();
 
-        if (_enablePong)
-            webSocket->enablePong();
-        else
-            webSocket->disablePong();
-
         // Add this client to our client set
         {
             std::lock_guard<std::mutex> lock(_clientsMutex);

ixwebsocket/IXWebSocketServer.h

@@ -6,24 +6,24 @@
 
 #pragma once
 
-#include "IXSocketServer.h"
-#include "IXWebSocket.h"
-#include <condition_variable>
+#include <utility> // pair
+#include <string>
+#include <set>
+#include <thread>
+#include <mutex>
 #include <functional>
 #include <memory>
-#include <mutex>
-#include <set>
-#include <string>
-#include <thread>
-#include <utility> // pair
+#include <condition_variable>
+
+#include "IXWebSocket.h"
+#include "IXSocketServer.h"
 
 namespace ix
 {
-    using OnConnectionCallback =
-        std::function<void(std::shared_ptr<WebSocket>, std::shared_ptr<ConnectionState>)>;
+    using OnConnectionCallback = std::function<void(std::shared_ptr<WebSocket>,
+                                                    std::shared_ptr<ConnectionState>)>;
 
-    class WebSocketServer final : public SocketServer
-    {
+    class WebSocketServer : public SocketServer {
     public:
         WebSocketServer(int port = SocketServer::kDefaultPort,
                         const std::string& host = SocketServer::kDefaultHost,
@@ -33,9 +33,6 @@ namespace ix
         virtual ~WebSocketServer();
         virtual void stop() final;
 
-        void enablePong();
-        void disablePong();
-
         void setOnConnectionCallback(const OnConnectionCallback& callback);
 
         // Get all the connected clients
@@ -44,7 +41,6 @@ namespace ix
     private:
         // Member variables
         int _handshakeTimeoutSecs;
-        bool _enablePong;
 
         OnConnectionCallback _onConnectionCallback;
 
@@ -52,11 +48,10 @@ namespace ix
         std::set<std::shared_ptr<WebSocket>> _clients;
 
         const static int kDefaultHandShakeTimeoutSecs;
-        const static bool kDefaultEnablePong;
 
         // Methods
         virtual void handleConnection(int fd,
                                       std::shared_ptr<ConnectionState> connectionState) final;
         virtual size_t getConnectedClientsCount() final;
     };
-} // namespace ix
+}

ixwebsocket/IXWebSocketTransport.cpp

@@ -45,52 +45,27 @@
 #include <vector>
 #include <string>
 #include <cstdarg>
+#include <iostream>
 #include <sstream>
 #include <chrono>
 #include <thread>
 
 
-namespace
-{
-    int greatestCommonDivisor(int a, int b)
-    {
-        while (b != 0)
-        {
-            int t = b;
-            b = a % b;
-            a = t;
-        }
-
-        return a;
-    }
-}
-
 namespace ix
 {
-    const std::string WebSocketTransport::kPingMessage("ixwebsocket::heartbeat");
-    const int WebSocketTransport::kDefaultPingIntervalSecs(-1);
-    const int WebSocketTransport::kDefaultPingTimeoutSecs(-1);
-    const bool WebSocketTransport::kDefaultEnablePong(true);
-    const int WebSocketTransport::kClosingMaximumWaitingDelayInMs(300);
+    const std::string WebSocketTransport::kHeartBeatPingMessage("ixwebsocket::heartbeat");
+    const int WebSocketTransport::kDefaultHeartBeatPeriod(-1);
     constexpr size_t WebSocketTransport::kChunkSize;
 
     WebSocketTransport::WebSocketTransport() :
         _useMask(true),
-        _readyState(ReadyState::CLOSED),
-        _closeCode(WebSocketCloseConstants::kInternalErrorCode),
-        _closeReason(WebSocketCloseConstants::kInternalErrorMessage),
+        _readyState(CLOSED),
+        _closeCode(0),
         _closeWireSize(0),
-        _closeRemote(false),
         _enablePerMessageDeflate(false),
         _requestInitCancellation(false),
-        _closingTimePoint(std::chrono::steady_clock::now()),
-        _enablePong(kDefaultEnablePong),
-        _pingIntervalSecs(kDefaultPingIntervalSecs),
-        _pingTimeoutSecs(kDefaultPingTimeoutSecs),
-        _pingIntervalOrTimeoutGCDSecs(-1),
-        _nextGCDTimePoint(std::chrono::steady_clock::now()),
-        _lastSendPingTimePoint(std::chrono::steady_clock::now()),
-        _lastReceivePongTimePoint(std::chrono::steady_clock::now())
+        _heartBeatPeriod(kDefaultHeartBeatPeriod),
+        _lastSendTimePoint(std::chrono::steady_clock::now())
     {
         _readbuf.resize(kChunkSize);
     }
@@ -101,48 +76,29 @@ namespace ix
     }
 
     void WebSocketTransport::configure(const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions,
-                                       bool enablePong,
-                                       int pingIntervalSecs,
-                                       int pingTimeoutSecs)
+                                       int heartBeatPeriod)
     {
         _perMessageDeflateOptions = perMessageDeflateOptions;
         _enablePerMessageDeflate = _perMessageDeflateOptions.enabled();
-        _enablePong = enablePong;
-        _pingIntervalSecs = pingIntervalSecs;
-        _pingTimeoutSecs = pingTimeoutSecs;
-
-        if (pingIntervalSecs > 0 && pingTimeoutSecs > 0)
-        {
-            _pingIntervalOrTimeoutGCDSecs = greatestCommonDivisor(pingIntervalSecs,
-                                                                  pingTimeoutSecs);
-        }
-        else if (_pingTimeoutSecs > 0)
-        {
-            _pingIntervalOrTimeoutGCDSecs = pingTimeoutSecs;
-        }
-        else
-        {
-            _pingIntervalOrTimeoutGCDSecs = pingIntervalSecs;
-        }
+        _heartBeatPeriod = heartBeatPeriod;
     }
 
     // Client
     WebSocketInitResult WebSocketTransport::connectToUrl(const std::string& url,
                                                          int timeoutSecs)
     {
-        std::lock_guard<std::mutex> lock(_socketMutex);
-
         std::string protocol, host, path, query;
         int port;
+        bool websocket = true;
 
-        if (!UrlParser::parse(url, protocol, host, path, query, port))
+        if (!UrlParser::parse(url, protocol, host, path, query, port, websocket))
         {
             return WebSocketInitResult(false, 0,
                                        std::string("Could not parse URL ") + url);
         }
 
-        std::string errorMsg;
         bool tls = protocol == "wss";
+        std::string errorMsg;
         _socket = createSocket(tls, errorMsg);
 
         if (!_socket)
@@ -160,7 +116,7 @@ namespace ix
                                                          timeoutSecs);
         if (result.success)
         {
-            setReadyState(ReadyState::OPEN);
+            setReadyState(OPEN);
         }
         return result;
     }
@@ -168,8 +124,6 @@ namespace ix
     // Server
     WebSocketInitResult WebSocketTransport::connectToSocket(int fd, int timeoutSecs)
     {
-        std::lock_guard<std::mutex> lock(_socketMutex);
-
         // Server should not mask the data it sends to the client
         _useMask = false;
 
@@ -190,36 +144,31 @@ namespace ix
         auto result = webSocketHandshake.serverHandshake(fd, timeoutSecs);
         if (result.success)
         {
-            setReadyState(ReadyState::OPEN);
+            setReadyState(OPEN);
         }
         return result;
     }
 
-    WebSocketTransport::ReadyState WebSocketTransport::getReadyState() const
+    WebSocketTransport::ReadyStateValues WebSocketTransport::getReadyState() const
     {
         return _readyState;
     }
 
-    void WebSocketTransport::setReadyState(ReadyState readyState)
+    void WebSocketTransport::setReadyState(ReadyStateValues readyStateValue)
     {
         // No state change, return
-        if (_readyState == readyState) return;
+        if (_readyState == readyStateValue) return;
 
-        if (readyState == ReadyState::CLOSED)
+        if (readyStateValue == CLOSED)
         {
             std::lock_guard<std::mutex> lock(_closeDataMutex);
-            _onCloseCallback(_closeCode, _closeReason, _closeWireSize, _closeRemote);
-            _closeCode = WebSocketCloseConstants::kInternalErrorCode;
-            _closeReason = WebSocketCloseConstants::kInternalErrorMessage;
+            _onCloseCallback(_closeCode, _closeReason, _closeWireSize);
+            _closeCode = 0;
+            _closeReason = std::string();
             _closeWireSize = 0;
-            _closeRemote = false;
-        }
-        else if (readyState == ReadyState::OPEN)
-        {
-            initTimePointsAndGCDAfterConnect();
         }
 
-        _readyState = readyState;
+        _readyState = readyStateValue;
     }
 
     void WebSocketTransport::setOnCloseCallback(const OnCloseCallback& onCloseCallback)
@@ -227,178 +176,95 @@ namespace ix
         _onCloseCallback = onCloseCallback;
     }
 
-    void WebSocketTransport::initTimePointsAndGCDAfterConnect()
+    // Only consider send time points for that computation.
+    // The receive time points is taken into account in Socket::poll (second parameter).
+    bool WebSocketTransport::heartBeatPeriodExceeded()
     {
-        {
-            std::lock_guard<std::mutex> lock(_lastSendPingTimePointMutex);
-            _lastSendPingTimePoint = std::chrono::steady_clock::now();
-        }
-        {
-            std::lock_guard<std::mutex> lock(_lastReceivePongTimePointMutex);
-            _lastReceivePongTimePoint = std::chrono::steady_clock::now();
-        }
-
-        if (_pingIntervalOrTimeoutGCDSecs > 0)
-        {
-            _nextGCDTimePoint = std::chrono::steady_clock::now() + std::chrono::seconds(_pingIntervalOrTimeoutGCDSecs);
-        }
-    }
-
-    // Only consider send PING time points for that computation.
-    bool WebSocketTransport::pingIntervalExceeded()
-    {
-        if (_pingIntervalSecs <= 0)
-            return false;
-
-        std::lock_guard<std::mutex> lock(_lastSendPingTimePointMutex);
+        std::lock_guard<std::mutex> lock(_lastSendTimePointMutex);
         auto now = std::chrono::steady_clock::now();
-        return now - _lastSendPingTimePoint > std::chrono::seconds(_pingIntervalSecs);
+        return now - _lastSendTimePoint > std::chrono::seconds(_heartBeatPeriod);
     }
 
-    bool WebSocketTransport::pingTimeoutExceeded()
+    void WebSocketTransport::poll()
     {
-        if (_pingTimeoutSecs <= 0)
-            return false;
-
-        std::lock_guard<std::mutex> lock(_lastReceivePongTimePointMutex);
-        auto now = std::chrono::steady_clock::now();
-        return now - _lastReceivePongTimePoint > std::chrono::seconds(_pingTimeoutSecs);
-    }
-
-    bool WebSocketTransport::closingDelayExceeded()
-    {
-        std::lock_guard<std::mutex> lock(_closingTimePointMutex);
-        auto now = std::chrono::steady_clock::now();
-        return now - _closingTimePoint > std::chrono::milliseconds(kClosingMaximumWaitingDelayInMs);
-    }
-
-    WebSocketTransport::PollResult WebSocketTransport::poll()
-    {
-        if (_readyState == ReadyState::OPEN)
-        {
-            // if (1) ping timeout is enabled and (2) duration since last received
-            // ping response (PONG) exceeds the maximum delay, then close the connection
-            if (pingTimeoutExceeded())
+        _socket->poll(
+            [this](PollResultType pollResult)
             {
-                close(WebSocketCloseConstants::kInternalErrorCode,
-                      WebSocketCloseConstants::kPingTimeoutMessage);
-            }
-            // If ping is enabled and no ping has been sent for a duration
-            // exceeding our ping interval, send a ping to the server.
-            else if (pingIntervalExceeded())
-            {
-                std::stringstream ss;
-                ss << kPingMessage << "::" << _pingIntervalSecs << "s";
-                sendPing(ss.str());
-            }
-        }
-
-        // No timeout if state is not OPEN, otherwise computed
-        // pingIntervalOrTimeoutGCD (equals to -1 if no ping and no ping timeout are set)
-        int lastingTimeoutDelayInMs = (_readyState != ReadyState::OPEN) ? 0 : _pingIntervalOrTimeoutGCDSecs;
-
-        if (_pingIntervalOrTimeoutGCDSecs > 0)
-        {
-            // compute lasting delay to wait for next ping / timeout, if at least one set
-            auto now = std::chrono::steady_clock::now();
-
-            if (now >= _nextGCDTimePoint)
-            {
-                _nextGCDTimePoint = now + std::chrono::seconds(_pingIntervalOrTimeoutGCDSecs);
-
-                lastingTimeoutDelayInMs = _pingIntervalOrTimeoutGCDSecs * 1000;
-            }
-            else
-            {
-                lastingTimeoutDelayInMs = (int)std::chrono::duration_cast<std::chrono::milliseconds>(_nextGCDTimePoint - now).count();
-            }
-        }
-
-#ifdef _WIN32
-        // Windows does not have select interrupt capabilities, so wait with a small timeout
-        if (lastingTimeoutDelayInMs <= 0)
-        {
-            lastingTimeoutDelayInMs = 20;
-        }
-#endif
-
-        // If we are requesting a cancellation, pass in a positive and small timeout
-        // to never poll forever without a timeout.
-        if (_requestInitCancellation)
-        {
-            lastingTimeoutDelayInMs = 100;
-        }
-
-        // poll the socket
-        PollResultType pollResult = _socket->poll(lastingTimeoutDelayInMs);
-
-        // Make sure we send all the buffered data
-        // there can be a lot of it for large messages.
-        if (pollResult == PollResultType::SendRequest)
-        {
-            while (!isSendBufferEmpty() && !_requestInitCancellation)
-            {
-                // Wait with a 10ms timeout until the socket is ready to write.
-                // This way we are not busy looping
-                PollResultType result = _socket->isReadyToWrite(10);
-
-                if (result == PollResultType::Error)
+                // If (1) heartbeat is enabled, and (2) no data was received or
+                // send for a duration exceeding our heart-beat period, send a
+                // ping to the server.
+                if (pollResult == PollResultType::Timeout &&
+                    heartBeatPeriodExceeded())
                 {
-                    closeSocket();
-                    setReadyState(ReadyState::CLOSED);
-                    break;
+                    std::stringstream ss;
+                    ss << kHeartBeatPingMessage << "::" << _heartBeatPeriod << "s";
+                    sendPing(ss.str());
                 }
-                else if (result == PollResultType::ReadyForWrite)
+                // Make sure we send all the buffered data
+                // there can be a lot of it for large messages.
+                else if (pollResult == PollResultType::SendRequest)
                 {
-                    sendOnSocket();
-                }
-            }
-        }
-        else if (pollResult == PollResultType::ReadyForRead)
-        {
-            while (true)
-            {
-                ssize_t ret = _socket->recv((char*)&_readbuf[0], _readbuf.size());
+                    while (!isSendBufferEmpty() && !_requestInitCancellation)
+                    {
+                        // Wait with a 10ms timeout until the socket is ready to write.
+                        // This way we are not busy looping
+                        PollResultType result = _socket->isReadyToWrite(10);
 
-                if (ret < 0 && Socket::isWaitNeeded())
+                        if (result == PollResultType::Error)
+                        {
+                            _socket->close();
+                            setReadyState(CLOSED);
+                            break;
+                        }
+                        else if (result == PollResultType::ReadyForWrite)
+                        {
+                            sendOnSocket();
+                        }
+                    }
+                }
+                else if (pollResult == PollResultType::ReadyForRead)
                 {
-                    break;
+                    while (true)
+                    {
+                        ssize_t ret = _socket->recv((char*)&_readbuf[0], _readbuf.size());
+
+                        if (ret < 0 && (_socket->getErrno() == EWOULDBLOCK ||
+                                        _socket->getErrno() == EAGAIN))
+                        {
+                            break;
+                        }
+                        else if (ret <= 0)
+                        {
+                            _rxbuf.clear();
+                            _socket->close();
+                            setReadyState(CLOSED);
+                            break;
+                        }
+                        else
+                        {
+                            _rxbuf.insert(_rxbuf.end(),
+                                          _readbuf.begin(),
+                                          _readbuf.begin() + ret);
+                        }
+                    }
                 }
-                else if (ret <= 0)
+                else if (pollResult == PollResultType::Error)
                 {
-                    // if there are received data pending to be processed, then delay the abnormal closure
-                    // to after dispatch (other close code/reason could be read from the buffer)
-
-                    closeSocket();
-
-                    return PollResult::AbnormalClose;
+                    _socket->close();
                 }
-                else
+                else if (pollResult == PollResultType::CloseRequest)
                 {
-                    _rxbuf.insert(_rxbuf.end(),
-                                  _readbuf.begin(),
-                                  _readbuf.begin() + ret);
+                    _socket->close();
                 }
-            }
-        }
-        else if (pollResult == PollResultType::Error)
-        {
-            closeSocket();
-        }
-        else if (pollResult == PollResultType::CloseRequest)
-        {
-            closeSocket();
-        }
 
-        if (_readyState == ReadyState::CLOSING && closingDelayExceeded())
-        {
-            _rxbuf.clear();
-            // close code and reason were set when calling close()
-            closeSocket();
-            setReadyState(ReadyState::CLOSED);
-        }
-
-        return PollResult::Succeeded;
+                // Avoid a race condition where we get stuck in select
+                // while closing.
+                if (_readyState == CLOSING)
+                {
+                    _socket->close();
+                }
+            },
+            _heartBeatPeriod);
     }
 
     bool WebSocketTransport::isSendBufferEmpty() const
@@ -460,13 +326,12 @@ namespace ix
     // |                     Payload Data continued ...                |
     // +---------------------------------------------------------------+
     //
-    void WebSocketTransport::dispatch(WebSocketTransport::PollResult pollResult,
-                                      const OnMessageCallback& onMessageCallback)
+    void WebSocketTransport::dispatch(const OnMessageCallback& onMessageCallback)
     {
         while (true)
         {
             wsheader_type ws;
-            if (_rxbuf.size() < 2) break; /* Need at least 2 */
+            if (_rxbuf.size() < 2) return; /* Need at least 2 */
             const uint8_t * data = (uint8_t *) &_rxbuf[0]; // peek, but don't consume
             ws.fin = (data[0] & 0x80) == 0x80;
             ws.rsv1 = (data[0] & 0x40) == 0x40;
@@ -474,7 +339,7 @@ namespace ix
             ws.mask = (data[1] & 0x80) == 0x80;
             ws.N0 = (data[1] & 0x7f);
             ws.header_size = 2 + (ws.N0 == 126? 2 : 0) + (ws.N0 == 127? 8 : 0) + (ws.mask? 4 : 0);
-            if (_rxbuf.size() < ws.header_size) break; /* Need: ws.header_size - _rxbuf.size() */
+            if (_rxbuf.size() < ws.header_size) return; /* Need: ws.header_size - _rxbuf.size() */
 
             //
             // Calculate payload length:
@@ -542,17 +407,12 @@ namespace ix
             ) {
                 unmaskReceiveBuffer(ws);
 
-                MessageKind messageKind = 
-                    (ws.opcode == wsheader_type::TEXT_FRAME)
-                    ? MessageKind::MSG_TEXT
-                    : MessageKind::MSG_BINARY;
-
                 //
                 // Usual case. Small unfragmented messages
                 //
                 if (ws.fin && _chunks.empty())
                 {
-                    emitMessage(messageKind,
+                    emitMessage(MSG,
                                 std::string(_rxbuf.begin()+ws.header_size,
                                             _rxbuf.begin()+ws.header_size+(size_t) ws.N),
                                 ws,
@@ -572,30 +432,26 @@ namespace ix
                                              _rxbuf.begin()+ws.header_size+(size_t)ws.N));
                     if (ws.fin)
                     {
-                        emitMessage(messageKind, getMergedChunks(), ws, onMessageCallback);
+                        emitMessage(MSG, getMergedChunks(), ws, onMessageCallback);
                         _chunks.clear();
                     }
                     else
                     {
-                        emitMessage(MessageKind::FRAGMENT, std::string(), ws, onMessageCallback);
+                        emitMessage(FRAGMENT, std::string(), ws, onMessageCallback);
                     }
                 }
             }
             else if (ws.opcode == wsheader_type::PING)
             {
                 unmaskReceiveBuffer(ws);
-
                 std::string pingData(_rxbuf.begin()+ws.header_size,
                                      _rxbuf.begin()+ws.header_size + (size_t) ws.N);
 
-                if (_enablePong)
-                {
-                    // Reply back right away
-                    bool compress = false;
-                    sendData(wsheader_type::PONG, pingData, compress);
-                }
+                // Reply back right away
+                bool compress = false;
+                sendData(wsheader_type::PONG, pingData, compress);
 
-                emitMessage(MessageKind::PING, pingData, ws, onMessageCallback);
+                emitMessage(PING, pingData, ws, onMessageCallback);
             }
             else if (ws.opcode == wsheader_type::PONG)
             {
@@ -603,99 +459,33 @@ namespace ix
                 std::string pongData(_rxbuf.begin()+ws.header_size,
                                      _rxbuf.begin()+ws.header_size + (size_t) ws.N);
 
-                std::lock_guard<std::mutex> lck(_lastReceivePongTimePointMutex);
-                _lastReceivePongTimePoint = std::chrono::steady_clock::now();
-
-                emitMessage(MessageKind::PONG, pongData, ws, onMessageCallback);
+                emitMessage(PONG, pongData, ws, onMessageCallback);
             }
             else if (ws.opcode == wsheader_type::CLOSE)
             {
-                std::string reason;
-                uint16_t code = 0;
-
                 unmaskReceiveBuffer(ws);
 
-                if (ws.N >= 2)
-                {
-                    // Extract the close code first, available as the first 2 bytes
-                    code |= ((uint64_t) _rxbuf[ws.header_size])   << 8;
-                    code |= ((uint64_t) _rxbuf[ws.header_size+1]) << 0;
+                // Extract the close code first, available as the first 2 bytes
+                uint16_t code = 0;
+                code |= ((uint64_t) _rxbuf[ws.header_size])   << 8;
+                code |= ((uint64_t) _rxbuf[ws.header_size+1]) << 0;
 
-                    // Get the reason.
-                    if (ws.N > 2)
-                    {
-                        reason.assign(_rxbuf.begin()+ws.header_size + 2,
-                                      _rxbuf.begin()+ws.header_size + (size_t) ws.N);
-                    }
-                }
-                else
-                {
-                    // no close code received
-                    code = WebSocketCloseConstants::kNoStatusCodeErrorCode;
-                    reason = WebSocketCloseConstants::kNoStatusCodeErrorMessage;
-                }
+                // Get the reason.
+                std::string reason(_rxbuf.begin()+ws.header_size + 2,
+                                   _rxbuf.begin()+ws.header_size + 2 + (size_t) ws.N);
 
-                // We receive a CLOSE frame from remote and are NOT the ones who triggered the close
-                if (_readyState != ReadyState::CLOSING)
-                {
-                    // send back the CLOSE frame
-                    sendCloseFrame(code, reason);
 
-                    _socket->wakeUpFromPoll(Socket::kCloseRequest);
-
-                    bool remote = true;
-                    closeSocketAndSwitchToClosedState(code, reason, _rxbuf.size(), remote);
-                }
-                else
-                {
-                    // we got the CLOSE frame answer from our close, so we can close the connection if
-                    // the code/reason are the same
-                    bool identicalReason;
-                    {
-                        std::lock_guard<std::mutex> lock(_closeDataMutex);
-                        identicalReason = _closeCode == code && _closeReason == reason;
-                    }
-
-                    if (identicalReason)
-                    {
-                        bool remote = false;
-                        closeSocketAndSwitchToClosedState(code, reason, _rxbuf.size(), remote);
-                    }
-                }
+                close(code, reason, _rxbuf.size());
             }
             else
             {
-                // Unexpected frame type
-                close(WebSocketCloseConstants::kProtocolErrorCode,
-                      WebSocketCloseConstants::kProtocolErrorMessage,
-                      _rxbuf.size());
+                close();
             }
 
             // Erase the message that has been processed from the input/read buffer
             _rxbuf.erase(_rxbuf.begin(),
                          _rxbuf.begin() + ws.header_size + (size_t) ws.N);
         }
-
-        // if an abnormal closure was raised in poll, and nothing else triggered a CLOSED state in
-        // the received and processed data then close the connection
-        if (pollResult == PollResult::AbnormalClose)
-        {
-            _rxbuf.clear();
-
-            // if we previously closed the connection (CLOSING state), then set state to CLOSED (code/reason were set before)
-            if (_readyState == ReadyState::CLOSING)
-            {
-                closeSocket();
-                setReadyState(ReadyState::CLOSED);
-            }
-            // if we weren't closing, then close using abnormal close code and message
-            else if (_readyState != ReadyState::CLOSED)
-            {
-                closeSocketAndSwitchToClosedState(WebSocketCloseConstants::kAbnormalCloseCode,
-                                                  WebSocketCloseConstants::kAbnormalCloseMessage,
-                                                  0, false);
-            }
-        }
     }
 
     std::string WebSocketTransport::getMergedChunks() const
@@ -726,7 +516,7 @@ namespace ix
         size_t wireSize = message.size();
 
         // When the RSV1 bit is 1 it means the message is compressed
-        if (_enablePerMessageDeflate && ws.rsv1 && messageKind != MessageKind::FRAGMENT)
+        if (_enablePerMessageDeflate && ws.rsv1 && messageKind != FRAGMENT)
         {
             std::string decompressedMessage;
             bool success = _perMessageDeflate.decompress(message, decompressedMessage);
@@ -753,7 +543,7 @@ namespace ix
         bool compress,
         const OnProgressCallback& onProgressCallback)
     {
-        if (_readyState != ReadyState::OPEN && _readyState != ReadyState::CLOSING)
+        if (_readyState == CLOSING || _readyState == CLOSED)
         {
             return WebSocketSendInfo();
         }
@@ -934,15 +724,7 @@ namespace ix
     WebSocketSendInfo WebSocketTransport::sendPing(const std::string& message)
     {
         bool compress = false;
-        WebSocketSendInfo info = sendData(wsheader_type::PING, message, compress);
-
-        if (info.success)
-        {
-            std::lock_guard<std::mutex> lck(_lastSendPingTimePointMutex);
-            _lastSendPingTimePoint = std::chrono::steady_clock::now();
-        }
-
-        return info;
+        return sendData(wsheader_type::PING, message, compress);
     }
 
     WebSocketSendInfo WebSocketTransport::sendBinary(
@@ -963,28 +745,24 @@ namespace ix
                         _enablePerMessageDeflate, onProgressCallback);
     }
 
-    ssize_t WebSocketTransport::send()
-    {
-        std::lock_guard<std::mutex> lock(_socketMutex);
-        return _socket->send((char*)&_txbuf[0], _txbuf.size());
-    }
-
     void WebSocketTransport::sendOnSocket()
     {
         std::lock_guard<std::mutex> lock(_txbufMutex);
 
         while (_txbuf.size())
         {
-            ssize_t ret = send();
+            ssize_t ret = _socket->send((char*)&_txbuf[0], _txbuf.size());
 
-            if (ret < 0 && Socket::isWaitNeeded())
+            if (ret < 0 && (_socket->getErrno() == EWOULDBLOCK ||
+                            _socket->getErrno() == EAGAIN))
             {
                 break;
             }
             else if (ret <= 0)
             {
-                closeSocket();
-                setReadyState(ReadyState::CLOSED);
+                _socket->close();
+
+                setReadyState(CLOSED);
                 break;
             }
             else
@@ -992,77 +770,36 @@ namespace ix
                 _txbuf.erase(_txbuf.begin(), _txbuf.begin() + ret);
             }
         }
+
+        std::lock_guard<std::mutex> lck(_lastSendTimePointMutex);
+        _lastSendTimePoint = std::chrono::steady_clock::now();
     }
 
-    void WebSocketTransport::sendCloseFrame(uint16_t code, const std::string& reason)
-    {
-        bool compress = false;
-
-        // if a status is set/was read
-        if (code != WebSocketCloseConstants::kNoStatusCodeErrorCode)
-        {
-            // See list of close events here:
-            // https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent
-            std::string closure{(char)(code >> 8), (char)(code & 0xff)};
-
-            // copy reason after code
-            closure.append(reason);
-
-            sendData(wsheader_type::CLOSE, closure, compress);
-        }
-        else
-        {
-            // no close code/reason set
-            sendData(wsheader_type::CLOSE, "", compress);
-        }
-    }
-
-    void WebSocketTransport::closeSocket()
-    {
-        std::lock_guard<std::mutex> lock(_socketMutex);
-        _socket->close();
-    }
-
-    void WebSocketTransport::closeSocketAndSwitchToClosedState(
-        uint16_t code, const std::string& reason, size_t closeWireSize, bool remote)
-    {
-        closeSocket();
-
-        {
-            std::lock_guard<std::mutex> lock(_closeDataMutex);
-            _closeCode = code;
-            _closeReason = reason;
-            _closeWireSize = closeWireSize;
-            _closeRemote = remote;
-        }
-
-        setReadyState(ReadyState::CLOSED);
-        _requestInitCancellation = false;
-    }
-
-    void WebSocketTransport::close(
-        uint16_t code, const std::string& reason, size_t closeWireSize, bool remote)
+    void WebSocketTransport::close(uint16_t code, const std::string& reason, size_t closeWireSize)
     {
         _requestInitCancellation = true;
 
-        if (_readyState == ReadyState::CLOSING || _readyState == ReadyState::CLOSED) return;
+        if (_readyState == CLOSING || _readyState == CLOSED) return;
+
+        // See list of close events here:
+        // https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent
+        const std::string closure{(char)(code >> 8), (char)(code & 0xff)};
+
+        bool compress = false;
+        sendData(wsheader_type::CLOSE, closure, compress);
+        setReadyState(CLOSING);
+
+        _socket->wakeUpFromPoll(Socket::kCloseRequest);
+        _socket->close();
 
         {
             std::lock_guard<std::mutex> lock(_closeDataMutex);
             _closeCode = code;
             _closeReason = reason;
             _closeWireSize = closeWireSize;
-            _closeRemote = remote;
         }
-        {
-            std::lock_guard<std::mutex> lock(_closingTimePointMutex);
-            _closingTimePoint = std::chrono::steady_clock::now();
-        }
-        setReadyState(ReadyState::CLOSING);
-
-        sendCloseFrame(code, reason);
-        // wake up the poll, but do not close yet
-        _socket->wakeUpFromPoll(Socket::kSendRequest);
+        
+        setReadyState(CLOSED);
     }
 
     size_t WebSocketTransport::bufferedAmount() const

ixwebsocket/IXWebSocketTransport.h

@@ -10,21 +10,21 @@
 // Adapted from https://github.com/dhbaird/easywsclient
 //
 
-#include "IXCancellationRequest.h"
-#include "IXProgressCallback.h"
-#include "IXWebSocketCloseConstants.h"
-#include "IXWebSocketHandshake.h"
-#include "IXWebSocketHttpHeaders.h"
-#include "IXWebSocketPerMessageDeflate.h"
-#include "IXWebSocketPerMessageDeflateOptions.h"
-#include "IXWebSocketSendInfo.h"
-#include <atomic>
-#include <functional>
-#include <list>
-#include <memory>
-#include <mutex>
 #include <string>
 #include <vector>
+#include <functional>
+#include <memory>
+#include <mutex>
+#include <atomic>
+#include <list>
+
+#include "IXWebSocketSendInfo.h"
+#include "IXWebSocketPerMessageDeflate.h"
+#include "IXWebSocketPerMessageDeflateOptions.h"
+#include "IXWebSocketHttpHeaders.h"
+#include "IXCancellationRequest.h"
+#include "IXWebSocketHandshake.h"
+#include "IXProgressCallback.h"
 
 namespace ix
 {
@@ -40,7 +40,7 @@ namespace ix
     class WebSocketTransport
     {
     public:
-        enum class ReadyState
+        enum ReadyStateValues
         {
             CLOSING,
             CLOSED,
@@ -48,70 +48,59 @@ namespace ix
             OPEN
         };
 
-        enum class MessageKind
+        enum MessageKind
         {
-            MSG_TEXT,
-            MSG_BINARY,
+            MSG,
             PING,
             PONG,
             FRAGMENT
         };
 
-        enum class PollResult
-        {
-            Succeeded,
-            AbnormalClose
-        };
-
-        using OnMessageCallback =
-            std::function<void(const std::string&, size_t, bool, MessageKind)>;
-        using OnCloseCallback = std::function<void(uint16_t, const std::string&, size_t, bool)>;
+        using OnMessageCallback = std::function<void(const std::string&,
+                                                     size_t,
+                                                     bool,
+                                                     MessageKind)>;
+        using OnCloseCallback = std::function<void(uint16_t,
+                                                   const std::string&,
+                                                   size_t)>;
 
         WebSocketTransport();
         ~WebSocketTransport();
 
         void configure(const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions,
-                       bool enablePong,
-                       int pingIntervalSecs,
-                       int pingTimeoutSecs);
+                       int heartBeatPeriod);
 
         WebSocketInitResult connectToUrl(const std::string& url, // Client
                                          int timeoutSecs);
-        WebSocketInitResult connectToSocket(int fd, // Server
+        WebSocketInitResult connectToSocket(int fd,              // Server
                                             int timeoutSecs);
 
-        PollResult poll();
+        void poll();
         WebSocketSendInfo sendBinary(const std::string& message,
                                      const OnProgressCallback& onProgressCallback);
         WebSocketSendInfo sendText(const std::string& message,
                                    const OnProgressCallback& onProgressCallback);
         WebSocketSendInfo sendPing(const std::string& message);
 
-        void close(uint16_t code = WebSocketCloseConstants::kNormalClosureCode,
-                   const std::string& reason = WebSocketCloseConstants::kNormalClosureMessage,
-                   size_t closeWireSize = 0,
-                   bool remote = false);
+        void close(uint16_t code = 1000,
+                   const std::string& reason = "Normal closure",
+                   size_t closeWireSize = 0);
 
-        void closeSocket();
-        ssize_t send();
-
-        ReadyState getReadyState() const;
-        void setReadyState(ReadyState readyState);
+        ReadyStateValues getReadyState() const;
+        void setReadyState(ReadyStateValues readyStateValue);
         void setOnCloseCallback(const OnCloseCallback& onCloseCallback);
-        void dispatch(PollResult pollResult, const OnMessageCallback& onMessageCallback);
+        void dispatch(const OnMessageCallback& onMessageCallback);
         size_t bufferedAmount() const;
 
     private:
         std::string _url;
 
-        struct wsheader_type
-        {
+        struct wsheader_type {
             unsigned header_size;
             bool fin;
             bool rsv1;
             bool mask;
-            enum opcode_type
-            {
+            enum opcode_type {
                 CONTINUATION = 0x0,
                 TEXT_FRAME = 0x1,
                 BINARY_FRAME = 0x2,
@@ -126,7 +115,7 @@ namespace ix
 
         // Tells whether we should mask the data we send.
         // client should mask but server should not
-        std::atomic<bool> _useMask;
+        bool _useMask;
 
         // Buffer for reading from our socket. That buffer is never resized.
         std::vector<uint8_t> _readbuf;
@@ -151,16 +140,14 @@ namespace ix
 
         // Underlying TCP socket
         std::shared_ptr<Socket> _socket;
-        std::mutex _socketMutex;
 
         // Hold the state of the connection (OPEN, CLOSED, etc...)
-        std::atomic<ReadyState> _readyState;
+        std::atomic<ReadyStateValues> _readyState;
 
         OnCloseCallback _onCloseCallback;
         uint16_t _closeCode;
         std::string _closeReason;
         size_t _closeWireSize;
-        bool _closeRemote;
         mutable std::mutex _closeDataMutex;
 
         // Data used for Per Message Deflate compression (with zlib)
@@ -171,54 +158,15 @@ namespace ix
         // Used to cancel dns lookup + socket connect + http upgrade
         std::atomic<bool> _requestInitCancellation;
 
-        mutable std::mutex _closingTimePointMutex;
-        std::chrono::time_point<std::chrono::steady_clock> _closingTimePoint;
-        static const int kClosingMaximumWaitingDelayInMs;
+        // Optional Heartbeat
+        int _heartBeatPeriod;
+        static const int kDefaultHeartBeatPeriod;
+        const static std::string kHeartBeatPingMessage;
+        mutable std::mutex _lastSendTimePointMutex;
+        std::chrono::time_point<std::chrono::steady_clock> _lastSendTimePoint;
 
-        // enable auto response to ping
-        std::atomic<bool> _enablePong;
-        static const bool kDefaultEnablePong;
-
-        // Optional ping and pong timeout
-        // if both ping interval and timeout are set (> 0),
-        // then use GCD of these value to wait for the lowest time
-        int _pingIntervalSecs;
-        int _pingTimeoutSecs;
-        int _pingIntervalOrTimeoutGCDSecs;
-
-        static const int kDefaultPingIntervalSecs;
-        static const int kDefaultPingTimeoutSecs;
-        static const std::string kPingMessage;
-
-        // Record time step for ping/ ping timeout to ensure we wait for the right left duration
-        std::chrono::time_point<std::chrono::steady_clock> _nextGCDTimePoint;
-
-        // We record when ping are being sent so that we can know when to send the next one
-        // We also record when pong are being sent as a reply to pings, to close the connections
-        // if no pong were received sufficiently fast.
-        mutable std::mutex _lastSendPingTimePointMutex;
-        mutable std::mutex _lastReceivePongTimePointMutex;
-        std::chrono::time_point<std::chrono::steady_clock> _lastSendPingTimePoint;
-        std::chrono::time_point<std::chrono::steady_clock> _lastReceivePongTimePoint;
-
-        // If this function returns true, it is time to send a new ping
-        bool pingIntervalExceeded();
-
-        // No PONG data was received through the socket for longer than ping timeout delay
-        bool pingTimeoutExceeded();
-
-        // after calling close(), if no CLOSE frame answer is received back from the remote, we
-        // should close the connexion
-        bool closingDelayExceeded();
-
-        void initTimePointsAndGCDAfterConnect();
-
-        void sendCloseFrame(uint16_t code, const std::string& reason);
-
-        void closeSocketAndSwitchToClosedState(uint16_t code,
-                                               const std::string& reason,
-                                               size_t closeWireSize,
-                                               bool remote);
+        // No data was send through the socket for longer than the heartbeat period
+        bool heartBeatPeriodExceeded();
 
         void sendOnSocket();
         WebSocketSendInfo sendData(wsheader_type::opcode_type type,
@@ -249,4 +197,4 @@ namespace ix
 
         std::string getMergedChunks() const;
     };
-} // namespace ix
+}

ixwebsocket/LUrlParser.cpp

@@ -1,263 +0,0 @@
-/*
- * Lightweight URL & URI parser (RFC 1738, RFC 3986)
- * https://github.com/corporateshark/LUrlParser
- *
- * The MIT License (MIT)
- *
- * Copyright (C) 2015 Sergey Kosarevsky (sk@linderdaum.com)
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include "LUrlParser.h"
-
-#include <algorithm>
-#include <cstring>
-#include <stdlib.h>
-
-// check if the scheme name is valid
-static bool IsSchemeValid( const std::string& SchemeName )
-{
-	for ( auto c : SchemeName  )
-	{
-		if ( !isalpha( c ) && c != '+' && c != '-' && c != '.' ) return false;
-	}
-
-	return true;
-}
-
-bool LUrlParser::clParseURL::GetPort( int* OutPort ) const
-{
-	if ( !IsValid() ) { return false; }
-
-	int Port = atoi( m_Port.c_str() );
-
-	if ( Port <= 0 || Port > 65535 ) { return false; }
-
-	if ( OutPort ) { *OutPort = Port; }
-
-	return true;
-}
-
-// based on RFC 1738 and RFC 3986
-LUrlParser::clParseURL LUrlParser::clParseURL::ParseURL( const std::string& URL )
-{
-	LUrlParser::clParseURL Result;
-
-	const char* CurrentString = URL.c_str();
-
-	/*
-	 *	<scheme>:<scheme-specific-part>
-	 *	<scheme> := [a-z\+\-\.]+
-	 *	For resiliency, programs interpreting URLs should treat upper case letters as equivalent to lower case in scheme names
-	 */
-
-	// try to read scheme
-	{
-		const char* LocalString = strchr( CurrentString, ':' );
-
-		if ( !LocalString )
-		{
-			return clParseURL( LUrlParserError_NoUrlCharacter );
-		}
-
-		// save the scheme name
-		Result.m_Scheme = std::string( CurrentString, LocalString - CurrentString );
-
-		if ( !IsSchemeValid( Result.m_Scheme ) )
-		{
-			return clParseURL( LUrlParserError_InvalidSchemeName );
-		}
-
-		// scheme should be lowercase
-		std::transform( Result.m_Scheme.begin(), Result.m_Scheme.end(), Result.m_Scheme.begin(), ::tolower );
-
-		// skip ':'
-		CurrentString = LocalString+1;
-	}
-
-	/*
-	 *	//<user>:<password>@<host>:<port>/<url-path>
-	 *	any ":", "@" and "/" must be normalized
-	 */
-
-	// skip "//"
-	if ( *CurrentString++ != '/' ) return clParseURL( LUrlParserError_NoDoubleSlash );
-	if ( *CurrentString++ != '/' ) return clParseURL( LUrlParserError_NoDoubleSlash );
-
-	// check if the user name and password are specified
-	bool bHasUserName = false;
-
-	const char* LocalString = CurrentString;
-
-	while ( *LocalString )
-	{
-		if ( *LocalString == '@' )
-		{
-			// user name and password are specified
-			bHasUserName = true;
-			break;
-		}
-		else if ( *LocalString == '/' )
-		{
-			// end of <host>:<port> specification
-			bHasUserName = false;
-			break;
-		}
-
-		LocalString++;
-	}
-
-	// user name and password
-	LocalString = CurrentString;
-
-	if ( bHasUserName )
-	{
-		// read user name
-		while ( *LocalString && *LocalString != ':' && *LocalString != '@' ) LocalString++;
-
-		Result.m_UserName = std::string( CurrentString, LocalString - CurrentString );
-
-		// proceed with the current pointer
-		CurrentString = LocalString;
-
-		if ( *CurrentString == ':' )
-		{
-			// skip ':'
-			CurrentString++;
-
-			// read password
-			LocalString = CurrentString;
-
-			while ( *LocalString && *LocalString != '@' ) LocalString++;
-
-			Result.m_Password = std::string( CurrentString, LocalString - CurrentString );
-
-			CurrentString = LocalString;
-		}
-
-		// skip '@'
-		if ( *CurrentString != '@' )
-		{
-			return clParseURL( LUrlParserError_NoAtSign );
-		}
-
-		CurrentString++;
-	}
-
-	bool bHasBracket = ( *CurrentString == '[' );
-
-	// go ahead, read the host name
-	LocalString = CurrentString;
-
-	while ( *LocalString )
-	{
-		if ( bHasBracket && *LocalString == ']' )
-		{
-			// end of IPv6 address
-			LocalString++;
-			break;
-		}
-		else if ( !bHasBracket && ( *LocalString == ':' || *LocalString == '/' ) )
-		{
-			// port number is specified
-			break;
-		}
-
-		LocalString++;
-	}
-
-	Result.m_Host = std::string( CurrentString, LocalString - CurrentString );
-
-	CurrentString = LocalString;
-
-	// is port number specified?
-	if ( *CurrentString == ':' )
-	{
-		CurrentString++;
-
-		// read port number
-		LocalString = CurrentString;
-
-		while ( *LocalString && *LocalString != '/' ) LocalString++;
-
-		Result.m_Port = std::string( CurrentString, LocalString - CurrentString );
-
-		CurrentString = LocalString;
-	}
-
-	// end of string
-	if ( !*CurrentString )
-	{
-		Result.m_ErrorCode = LUrlParserError_Ok;
-
-		return Result;
-	}
-
-	// skip '/'
-	if ( *CurrentString != '/' )
-	{
-		return clParseURL( LUrlParserError_NoSlash );
-	}
-
-	CurrentString++;
-
-	// parse the path
-	LocalString = CurrentString;
-
-	while ( *LocalString && *LocalString != '#' && *LocalString != '?' ) LocalString++;
-
-	Result.m_Path = std::string( CurrentString, LocalString - CurrentString );
-
-	CurrentString = LocalString;
-
-	// check for query
-	if ( *CurrentString == '?' )
-	{
-		// skip '?'
-		CurrentString++;
-
-		// read query
-		LocalString = CurrentString;
-
-		while ( *LocalString && *LocalString != '#' ) LocalString++;
-
-		Result.m_Query = std::string( CurrentString, LocalString - CurrentString );
-
-		CurrentString = LocalString;
-	}
-
-	// check for fragment
-	if ( *CurrentString == '#' )
-	{
-		// skip '#'
-		CurrentString++;
-
-		// read fragment
-		LocalString = CurrentString;
-
-		while ( *LocalString ) LocalString++;
-
-		Result.m_Fragment = std::string( CurrentString, LocalString - CurrentString );
-	}
-
-	Result.m_ErrorCode = LUrlParserError_Ok;
-
-	return Result;
-}

ixwebsocket/LUrlParser.h

@@ -1,81 +0,0 @@
-/*
- * Lightweight URL & URI parser (RFC 1738, RFC 3986)
- * https://github.com/corporateshark/LUrlParser
- *
- * The MIT License (MIT)
- *
- * Copyright (C) 2015 Sergey Kosarevsky (sk@linderdaum.com)
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#pragma once
-
-#include <string>
-
-namespace LUrlParser
-{
-    enum LUrlParserError
-    {
-        LUrlParserError_Ok = 0,
-        LUrlParserError_Uninitialized = 1,
-        LUrlParserError_NoUrlCharacter = 2,
-        LUrlParserError_InvalidSchemeName = 3,
-        LUrlParserError_NoDoubleSlash = 4,
-        LUrlParserError_NoAtSign = 5,
-        LUrlParserError_UnexpectedEndOfLine = 6,
-        LUrlParserError_NoSlash = 7,
-    };
-
-    class clParseURL
-    {
-    public:
-        LUrlParserError m_ErrorCode;
-        std::string m_Scheme;
-        std::string m_Host;
-        std::string m_Port;
-        std::string m_Path;
-        std::string m_Query;
-        std::string m_Fragment;
-        std::string m_UserName;
-        std::string m_Password;
-
-        clParseURL()
-            : m_ErrorCode(LUrlParserError_Uninitialized)
-        {
-        }
-
-        /// return 'true' if the parsing was successful
-        bool IsValid() const { return m_ErrorCode == LUrlParserError_Ok; }
-
-        /// helper to convert the port number to int, return 'true' if the port is valid (within the
-        /// 0..65535 range)
-        bool GetPort(int* OutPort) const;
-
-        /// parse the URL
-        static clParseURL ParseURL(const std::string& URL);
-
-    private:
-        explicit clParseURL(LUrlParserError ErrorCode)
-            : m_ErrorCode(ErrorCode)
-        {
-        }
-    };
-
-} // namespace LUrlParser

ixwebsocket/libwshandshake.hpp

@@ -20,8 +20,6 @@
 
 #include <cstdint>
 #include <cstddef>
-#include <string>
-#include <string.h>
 
 class WebSocketHandshakeKeyGen {
     template <int N, typename T>
@@ -102,12 +100,7 @@ class WebSocketHandshakeKeyGen {
     }
 
 public:
-    static inline void generate(const std::string& inputStr, char output[28]) {
-
-        char input[25] = {};
-        strncpy(input, inputStr.c_str(), 25 - 1);
-        input[25 - 1] = '\0';
-
+    static inline void generate(const char input[24], char output[28]) {
         uint32_t b_output[5] = {
             0x67452301, 0xefcdab89, 0x98badcfe, 0x10325476, 0xc3d2e1f0
         };

ixwebsocket/windows/IXSetThreadName_windows.cpp

@@ -4,41 +4,13 @@
  *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
  */
 #include "../IXSetThreadName.h"
-#include <Windows.h>
+#include <iostream>
 
 namespace ix
 {
-    const DWORD MS_VC_EXCEPTION = 0x406D1388;
-
-#pragma pack(push,8)
-    typedef struct tagTHREADNAME_INFO
-    {
-        DWORD dwType;     // Must be 0x1000.
-        LPCSTR szName;    // Pointer to name (in user addr space).
-        DWORD dwThreadID; // Thread ID (-1=caller thread).
-        DWORD dwFlags;    // Reserved for future use, must be zero.
-    } THREADNAME_INFO;
-#pragma pack(pop)
-
-    void SetThreadName(DWORD dwThreadID, const char* threadName)
-    {
-        THREADNAME_INFO info;
-        info.dwType = 0x1000;
-        info.szName = threadName;
-        info.dwThreadID = dwThreadID;
-        info.dwFlags = 0;
-
-        __try
-        {
-            RaiseException(MS_VC_EXCEPTION, 0, sizeof(info) / sizeof(ULONG_PTR), (ULONG_PTR*)& info);
-        }
-        __except (EXCEPTION_EXECUTE_HANDLER)
-        {
-        }
-    }
-
     void setThreadName(const std::string& name)
     {
-        SetThreadName(-1, name.c_str());
+        // FIXME
+        std::cerr << "setThreadName not implemented on Windows yet" << std::endl;
     }
 }

makefile

@@ -5,17 +5,8 @@ all: brew
 
 install: brew
 
-# Use -DCMAKE_INSTALL_PREFIX= to install into another location
-# on osx it is good practice to make /usr/local user writable
-# sudo chown -R `whoami`/staff /usr/local
 brew:
-	mkdir -p build && (cd build ; cmake -DUSE_TLS=1 -DUSE_WS=1 .. ; make -j install)
-
-ws:
-	mkdir -p build && (cd build ; cmake -DUSE_TLS=1 -DUSE_WS=1 -DUSE_MBED_TLS=1 -DUSE_VENDORED_THIRD_PARTY=1 .. ; make -j)
-
-uninstall:
-	xargs rm -fv < build/install_manifest.txt
+	mkdir -p build && (cd build ; cmake .. ; make -j install)
 
 .PHONY: docker
 
@@ -25,9 +16,6 @@ IMG    := ${NAME}:${TAG}
 LATEST := ${NAME}:latest
 BUILD  := ${NAME}:build
 
-docker_test:
-	docker build -f docker/Dockerfile.debian -t bsergean/ixwebsocket_test:build .
-
 docker:
 	docker build -t ${IMG} .
 	docker tag ${IMG} ${BUILD}
@@ -37,14 +25,19 @@ docker_push:
 	docker push ${LATEST}
 
 run:
-	docker run --cap-add sys_ptrace --entrypoint=sh -it bsergean/ws:build
+	docker run --cap-add sys_ptrace -it ws:latest
 
 # this is helpful to remove trailing whitespaces
 trail:
 	sh third_party/remote_trailing_whitespaces.sh
 
-format:
-	find test ixwebsocket ws -name '*.cpp' -o -name '*.h' -exec clang-format -i {} \;
+build:
+	(cd examples/satori_publisher ; mkdir -p build ; cd build ; cmake .. ; make)
+	(cd examples/chat ; mkdir -p build ; cd build ; cmake .. ; make)
+	(cd examples/ping_pong ; mkdir -p build ; cd build ; cmake .. ; make)
+	(cd examples/ws_connect ; mkdir -p build ; cd build ; cmake .. ; make)
+	(cd examples/echo_server ; mkdir -p build ; cd build ; cmake .. ; make)
+	(cd examples/broadcast_server ; mkdir -p build ; cd build ; cmake .. ; make)
 
 # That target is used to start a node server, but isn't required as we have 
 # a builtin C++ server started in the unittest now
@@ -55,10 +48,10 @@ test_server:
 # env TEST=Websocket_chat make test
 # env TEST=heartbeat make test
 test:
-	python2.7 test/run.py
+	(cd test ; python2.7 run.py)
 
-ws_test: ws
-	(cd ws ; env DEBUG=1 PATH=../ws/build:$$PATH bash test_ws.sh)
+ws_test: all
+	(cd ws ; bash test_ws.sh)
 
 # For the fork that is configured with appveyor
 rebase_upstream:
@@ -69,8 +62,7 @@ rebase_upstream:
 
 install_cmake_for_linux:
 	mkdir -p /tmp/cmake
-	(cd /tmp/cmake ; curl -L -O https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0-Linux-x86_64.tar.gz ; tar zxf cmake-3.14.0-Linux-x86_64.tar.gz)
+	(cd /tmp/cmake ; curl -L -O https://github.com/Kitware/CMake/releases/download/v3.14.0-rc4/cmake-3.14.0-rc4-Linux-x86_64.tar.gz ; tar zxf cmake-3.14.0-rc4-Linux-x86_64.tar.gz)
 
 .PHONY: test
 .PHONY: build
-.PHONY: ws

test/.gitignore

@@ -1,10 +1,9 @@
 CMakeCache.txt
 package-lock.json
-CMakeFiles
-ixwebsocket_unittest
-cmake_install.cmake
+CMakeFiles		
+ixwebsocket_unittest	
+cmake_install.cmake	
 node_modules
 ixwebsocket
 Makefile
 build
-ixwebsocket_unittest.xml

test/CMakeLists.txt

@@ -5,13 +5,12 @@
 cmake_minimum_required (VERSION 3.4.1)
 project (ixwebsocket_unittest)
 
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../third_party/sanitizers-cmake/cmake" ${CMAKE_MODULE_PATH})
+find_package(Sanitizers)
+
 set (CMAKE_CXX_STANDARD 14)
 
 if (NOT WIN32)
-  set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/../third_party/sanitizers-cmake/cmake" ${CMAKE_MODULE_PATH})
-  find_package(Sanitizers)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=thread")
-  set(CMAKE_LD_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=thread")
   option(USE_TLS "Add TLS support" ON)
 endif()
 
@@ -20,8 +19,6 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/.. ixwebsocket)
 include_directories(
   ${PROJECT_SOURCE_DIR}/Catch2/single_include
   ../third_party/msgpack11
-  ../third_party/spdlog/include
-  ../ws
 )
 
 # Shared sources
@@ -29,44 +26,24 @@ set (SOURCES
   test_runner.cpp
   IXTest.cpp
   ../third_party/msgpack11/msgpack11.cpp
-  ../ws/ixcore/utils/IXCoreLogger.cpp
 
+  IXDNSLookupTest.cpp
   IXSocketTest.cpp
   IXSocketConnectTest.cpp
-  IXWebSocketServerTest.cpp
-  IXWebSocketTestConnectionDisconnection.cpp
-  IXUrlParserTest.cpp
-  IXWebSocketServerTest.cpp
-  IXHttpClientTest.cpp
 )
 
 # Some unittest don't work on windows yet
-if (UNIX)
-  list(APPEND SOURCES
-    IXDNSLookupTest.cpp
+if (NOT WIN32)
+  list(APPEND SOURCES 
+    IXWebSocketServerTest.cpp
+    IXWebSocketHeartBeatTest.cpp
     cmd_websocket_chat.cpp
-    IXWebSocketCloseTest.cpp
+    IXWebSocketTestConnectionDisconnection.cpp
   )
 endif()
 
-# Some unittest fail for dubious reason on Ubuntu Xenial with TSAN
-if (MAC OR WIN32)
-  list(APPEND SOURCES
-    IXWebSocketMessageQTest.cpp
-  )
-endif()
-
-# Ping test fails intermittently, disabling them for now
-# IXWebSocketPingTest.cpp
-# IXWebSocketPingTimeoutTest.cpp
-
-# Disable tests for now that are failing or not reliable
-
 add_executable(ixwebsocket_unittest ${SOURCES})
-
-if (NOT WIN32)
-  add_sanitizers(ixwebsocket_unittest)
-endif()
+add_sanitizers(ixwebsocket_unittest)
 
 if (APPLE AND USE_TLS)
     target_link_libraries(ixwebsocket_unittest "-framework foundation" "-framework security")

test/IXHttpClientTest.cpp

@@ -1,233 +0,0 @@
-/*
- *  IXSocketTest.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone. All rights reserved.
- */
-
-#include <iostream>
-#include <ixwebsocket/IXHttpClient.h>
-
-#include "catch.hpp"
-
-using namespace ix;
-
-TEST_CASE("http client", "[http]")
-{
-    SECTION("Connect to a remote HTTP server")
-    {
-        HttpClient httpClient;
-        WebSocketHttpHeaders headers;
-
-        std::string url("http://httpbin.org/");
-        auto args = httpClient.createRequest(url);
-
-        args->extraHeaders = headers;
-        args->connectTimeout = 60;
-        args->transferTimeout = 60;
-        args->followRedirects = true;
-        args->maxRedirects = 10;
-        args->verbose = true;
-        args->compress = true;
-        args->logger = [](const std::string& msg)
-        {
-            std::cout << msg;
-        };
-        args->onProgressCallback = [](int current, int total) -> bool
-        {
-            std::cerr << "\r" << "Downloaded "
-                      << current << " bytes out of " << total;
-            return true;
-        };
-
-        auto response = httpClient.get(url, args);
-
-        for (auto it : response->headers)
-        {
-            std::cerr << it.first << ": " << it.second << std::endl;
-        }
-
-        std::cerr << "Upload size: " << response->uploadSize << std::endl;
-        std::cerr << "Download size: " << response->downloadSize << std::endl;
-        std::cerr << "Status: " << response->statusCode << std::endl;
-        std::cerr << "Error message: " << response->errorMsg << std::endl;
-
-        REQUIRE(response->errorCode == HttpErrorCode::Ok);
-        REQUIRE(response->statusCode == 200);
-    }
-
-    SECTION("Connect to a remote HTTPS server")
-    {
-        HttpClient httpClient;
-        WebSocketHttpHeaders headers;
-
-        std::string url("https://httpbin.org/");
-        auto args = httpClient.createRequest(url);
-
-        args->extraHeaders = headers;
-        args->connectTimeout = 60;
-        args->transferTimeout = 60;
-        args->followRedirects = true;
-        args->maxRedirects = 10;
-        args->verbose = true;
-        args->compress = true;
-        args->logger = [](const std::string& msg)
-        {
-            std::cout << msg;
-        };
-        args->onProgressCallback = [](int current, int total) -> bool
-        {
-            std::cerr << "\r" << "Downloaded "
-                      << current << " bytes out of " << total;
-            return true;
-        };
-
-        auto response = httpClient.get(url, args);
-
-        for (auto it : response->headers)
-        {
-            std::cerr << it.first << ": " << it.second << std::endl;
-        }
-
-        std::cerr << "Upload size: " << response->uploadSize << std::endl;
-        std::cerr << "Download size: " << response->downloadSize << std::endl;
-        std::cerr << "Status: " << response->statusCode << std::endl;
-        std::cerr << "Error message: " << response->errorMsg << std::endl;
-
-        REQUIRE(response->errorCode == HttpErrorCode::Ok);
-        REQUIRE(response->statusCode == 200);
-    }
-
-    SECTION("Async API, one call")
-    {
-        bool async = true;
-        HttpClient httpClient(async);
-        WebSocketHttpHeaders headers;
-
-        std::string url("https://httpbin.org/");
-        auto args = httpClient.createRequest(url);
-
-        args->extraHeaders = headers;
-        args->connectTimeout = 60;
-        args->transferTimeout = 60;
-        args->followRedirects = true;
-        args->maxRedirects = 10;
-        args->verbose = true;
-        args->compress = true;
-        args->logger = [](const std::string& msg)
-        {
-            std::cout << msg;
-        };
-        args->onProgressCallback = [](int current, int total) -> bool
-        {
-            std::cerr << "\r" << "Downloaded "
-                      << current << " bytes out of " << total;
-            return true;
-        };
-
-        std::atomic<bool> requestCompleted(false);
-        std::atomic<int> statusCode(0);
-
-        httpClient.performRequest(args, [&requestCompleted, &statusCode]
-            (const HttpResponsePtr& response)
-            {
-                std::cerr << "Upload size: " << response->uploadSize << std::endl;
-                std::cerr << "Download size: " << response->downloadSize << std::endl;
-                std::cerr << "Status: " << response->statusCode << std::endl;
-                std::cerr << "Error message: " << response->errorMsg << std::endl;
-
-                // In case of failure, print response->errorMsg
-                statusCode = response->statusCode;
-                requestCompleted = true;
-            }
-        );
-
-        int wait = 0;
-        while (wait < 5000)
-        {
-            if (requestCompleted) break;
-
-            std::chrono::duration<double, std::milli> duration(10);
-            std::this_thread::sleep_for(duration);
-            wait += 10;
-        }
-
-        std::cerr << "Done" << std::endl;
-        REQUIRE(statusCode == 200);
-    }
-
-    SECTION("Async API, multiple calls")
-    {
-        bool async = true;
-        HttpClient httpClient(async);
-        WebSocketHttpHeaders headers;
-
-        std::string url("http://httpbin.org/");
-        auto args = httpClient.createRequest(url);
-
-        args->extraHeaders = headers;
-        args->connectTimeout = 60;
-        args->transferTimeout = 60;
-        args->followRedirects = true;
-        args->maxRedirects = 10;
-        args->verbose = true;
-        args->compress = true;
-        args->logger = [](const std::string& msg)
-        {
-            std::cout << msg;
-        };
-        args->onProgressCallback = [](int current, int total) -> bool
-        {
-            std::cerr << "\r" << "Downloaded "
-                      << current << " bytes out of " << total;
-            return true;
-        };
-
-        std::atomic<bool> requestCompleted(false);
-        std::atomic<int> statusCode0(0);
-        std::atomic<int> statusCode1(0);
-        std::atomic<int> statusCode2(0);
-
-        for (int i = 0; i < 3; ++i)
-        {
-            httpClient.performRequest(args, [i, &requestCompleted, &statusCode0, &statusCode1, &statusCode2]
-                (const HttpResponsePtr& response)
-                {
-                    std::cerr << "Upload size: " << response->uploadSize << std::endl;
-                    std::cerr << "Download size: " << response->downloadSize << std::endl;
-                    std::cerr << "Status: " << response->statusCode << std::endl;
-                    std::cerr << "Error message: " << response->errorMsg << std::endl;
-
-                    // In case of failure, print response->errorMsg
-                    if (i == 0)
-                    {
-                        statusCode0 = response->statusCode;
-                    }
-                    else if (i == 1)
-                    {
-                        statusCode1 = response->statusCode;
-                    }
-                    else if (i == 2)
-                    {
-                        statusCode2 = response->statusCode;
-                        requestCompleted = true;
-                    }
-                }
-            );
-        }
-
-        int wait = 0;
-        while (wait < 10000)
-        {
-            if (requestCompleted) break;
-
-            std::chrono::duration<double, std::milli> duration(10);
-            std::this_thread::sleep_for(duration);
-            wait += 10;
-        }
-
-        std::cerr << "Done" << std::endl;
-        REQUIRE(statusCode0 == 200);
-        REQUIRE(statusCode1 == 200);
-        REQUIRE(statusCode2 == 200);
-    }
-}

test/IXSocketConnectTest.cpp

@@ -17,12 +17,8 @@ TEST_CASE("socket_connect", "[net]")
 {
     SECTION("Test connecting to a known hostname")
     {
-        int port = getFreePort();
-        ix::WebSocketServer server(port);
-        REQUIRE(startWebSocketEchoServer(server));
-
         std::string errMsg;
-        int fd = SocketConnect::connect("127.0.0.1", port, errMsg, [] { return false; });
+        int fd = SocketConnect::connect("www.google.com", 80, errMsg, [] { return false; });
         std::cerr << "Error message: " << errMsg << std::endl;
         REQUIRE(fd != -1);
     }
@@ -38,13 +34,9 @@ TEST_CASE("socket_connect", "[net]")
 
     SECTION("Test connecting to a good hostname, with cancellation")
     {
-        int port = getFreePort();
-        ix::WebSocketServer server(port);
-        REQUIRE(startWebSocketEchoServer(server));
-
         std::string errMsg;
         // The callback returning true means we are requesting cancellation
-        int fd = SocketConnect::connect("127.0.0.1", port, errMsg, [] { return true; });
+        int fd = SocketConnect::connect("www.google.com", 80, errMsg, [] { return true; });
         std::cerr << "Error message: " << errMsg << std::endl;
         REQUIRE(fd == -1);
     }

test/IXSocketTest.cpp

@@ -53,17 +53,13 @@ namespace ix
 
 TEST_CASE("socket", "[socket]")
 {
-    SECTION("Connect to a local websocket server over a free port. Send GET request without header. Should return 400")
+    SECTION("Connect to google HTTP server. Send GET request without header. Should return 200")
     {
-        // Start a server first which we'll hit with our socket code
-        int port = getFreePort();
-        ix::WebSocketServer server(port);
-        REQUIRE(startWebSocketEchoServer(server));
-
         std::string errMsg;
         bool tls = false;
         std::shared_ptr<Socket> socket = createSocket(tls, errMsg);
-        std::string host("127.0.0.1");
+        std::string host("www.google.com");
+        int port = 80;
 
         std::stringstream ss;
         ss << "GET / HTTP/1.1\r\n";
@@ -71,14 +67,14 @@ TEST_CASE("socket", "[socket]")
         ss << "\r\n";
         std::string request(ss.str());
 
-        int expectedStatus = 400;
+        int expectedStatus = 200;
         int timeoutSecs = 3;
 
         testSocket(host, port, request, socket, expectedStatus, timeoutSecs);
     }
 
-#if defined(IXWEBSOCKET_USE_TLS)
-    SECTION("Connect to google HTTPS server over port 443. Send GET request without header. Should return 200")
+#if defined(__APPLE__) || defined(__linux__)
+    SECTION("Connect to google HTTPS server. Send GET request without header. Should return 200")
     {
         std::string errMsg;
         bool tls = true;

test/IXTest.cpp

@@ -17,8 +17,6 @@
 #include <stdlib.h>
 #include <stack>
 #include <iomanip>
-#include <random>
-
 
 namespace ix
 {
@@ -72,12 +70,10 @@ namespace ix
         Logger() << msg;
     }
 
-    int getAnyFreePortRandom()
+    int getAnyFreePortSimple()
     {
-        std::random_device rd;
-        std::uniform_int_distribution<int> dist(1024 + 1, 65535);
-
-        return dist(rd);
+        static int defaultPort = 8090;
+        return defaultPort++;
     }
 
     int getAnyFreePort()
@@ -87,7 +83,7 @@ namespace ix
         if ((sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
         {
             log("Cannot compute a free port. socket error.");
-            return getAnyFreePortRandom();
+            return defaultPort;
         }
 
         int enable = 1;
@@ -95,7 +91,7 @@ namespace ix
                        (char*) &enable, sizeof(enable)) < 0)
         {
             log("Cannot compute a free port. setsockopt error.");
-            return getAnyFreePortRandom();
+            return defaultPort;
         }
 
         // Bind to port 0. This is the standard way to get a free port.
@@ -108,22 +104,22 @@ namespace ix
         {
             log("Cannot compute a free port. bind error.");
 
-            Socket::closeSocket(sockfd);
-            return getAnyFreePortRandom();
+            ::close(sockfd);
+            return defaultPort;
         }
 
         struct sockaddr_in sa; // server address information
-        socklen_t len = sizeof(sa);
+        socklen_t len;
         if (getsockname(sockfd, (struct sockaddr *) &sa, &len) < 0)
         {
             log("Cannot compute a free port. getsockname error.");
 
-            Socket::closeSocket(sockfd);
-            return getAnyFreePortRandom();
+            ::close(sockfd);
+            return defaultPort;
         }
 
         int port = ntohs(sa.sin_port);
-        Socket::closeSocket(sockfd);
+        ::close(sockfd);
 
         return port;
     }
@@ -134,7 +130,7 @@ namespace ix
         {
 #if defined(__has_feature)
 # if __has_feature(address_sanitizer)
-            int port = getAnyFreePortRandom();
+            int port = getAnyFreePortSimple();
 # else
             int port = getAnyFreePort();
 # endif
@@ -170,53 +166,4 @@ namespace ix
 
         std::cout << prefix << ": " << s << " => " << ss.str() << std::endl;
     }
-
-    bool startWebSocketEchoServer(ix::WebSocketServer& server)
-    {
-        server.setOnConnectionCallback(
-            [&server](std::shared_ptr<ix::WebSocket> webSocket,
-                      std::shared_ptr<ConnectionState> connectionState)
-            {
-                webSocket->setOnMessageCallback(
-                    [webSocket, connectionState, &server](const ix::WebSocketMessagePtr& msg)
-                    {
-                        if (msg->type == ix::WebSocketMessageType::Open)
-                        {
-                            Logger() << "New connection";
-                            Logger() << "Uri: " << msg->openInfo.uri;
-                            Logger() << "Headers:";
-                            for (auto it : msg->openInfo.headers)
-                            {
-                                Logger() << it.first << ": " << it.second;
-                            }
-                        }
-                        else if (msg->type == ix::WebSocketMessageType::Close)
-                        {
-                            Logger() << "Closed connection";
-                        }
-                        else if (msg->type == ix::WebSocketMessageType::Message)
-                        {
-                            for (auto&& client : server.getClients())
-                            {
-                                if (client != webSocket)
-                                {
-                                    client->send(msg->str, msg->binary);
-                                }
-                            }
-                        }
-                    }
-                );
-            }
-        );
-
-        auto res = server.listen();
-        if (!res.first)
-        {
-            Logger() << res.second;
-            return false;
-        }
-
-        server.start();
-        return true;
-    }
 }

test/IXTest.h

@@ -6,13 +6,11 @@
 
 #pragma once
 
-#include <iostream>
-#include <ixwebsocket/IXWebSocketServer.h>
-#include <mutex>
-#include <spdlog/spdlog.h>
-#include <sstream>
 #include <string>
 #include <vector>
+#include <sstream>
+#include <iostream>
+#include <mutex>
 
 namespace ix
 {
@@ -28,25 +26,32 @@ namespace ix
 
     struct Logger
     {
-    public:
-        template<typename T>
-        Logger& operator<<(T const& obj)
-        {
-            std::lock_guard<std::mutex> lock(_mutex);
+        public:
+            Logger& operator<<(const std::string& msg)
+            {
+                std::lock_guard<std::mutex> lock(_mutex);
 
-            std::stringstream ss;
-            ss << obj;
-            spdlog::info(ss.str());
-            return *this;
-        }
+                std::cerr << msg;
+                std::cerr << std::endl;
+                return *this;
+            }
 
-    private:
-        static std::mutex _mutex;
+            template <typename T>
+            Logger& operator<<(T const& obj)
+            {
+                std::lock_guard<std::mutex> lock(_mutex);
+
+                std::cerr << obj;
+                std::cerr << std::endl;
+                return *this;
+            }
+
+        private:
+            static std::mutex _mutex;
     };
 
     void log(const std::string& msg);
 
+    bool computeFreePorts(int count);
     int getFreePort();
-
-    bool startWebSocketEchoServer(ix::WebSocketServer& server);
-} // namespace ix
+}

test/IXUrlParserTest.cpp

@@ -1,108 +0,0 @@
-/*
- *  IXSocketTest.cpp
- *  Author: Korchynskyi Dmytro
- *  Copyright (c) 2019 Machine Zone. All rights reserved.
- */
-
-#include <iostream>
-#include <ixwebsocket/IXUrlParser.h>
-
-#include "IXTest.h"
-#include "catch.hpp"
-#include <string.h>
-
-using namespace ix;
-
-namespace ix
-{
-
-TEST_CASE("urlParser", "[urlParser]")
-{
-    SECTION("http://google.com")
-    {
-        std::string url = "http://google.com";
-        std::string protocol, host, path, query;
-        int port;
-        bool res;
-
-        res = UrlParser::parse(url, protocol, host, path, query, port);
-
-        REQUIRE(res);
-        REQUIRE(protocol == "http");
-        REQUIRE(host == "google.com");
-        REQUIRE(path == "/");
-        REQUIRE(query == "");
-        REQUIRE(port == 80); // default port for http
-    }
-
-    SECTION("https://google.com")
-    {
-        std::string url = "https://google.com";
-        std::string protocol, host, path, query;
-        int port;
-        bool res;
-
-        res = UrlParser::parse(url, protocol, host, path, query, port);
-
-        REQUIRE(res);
-        REQUIRE(protocol == "https");
-        REQUIRE(host == "google.com");
-        REQUIRE(path == "/");
-        REQUIRE(query == "");
-        REQUIRE(port == 443); // default port for https
-    }
-
-    SECTION("ws://google.com")
-    {
-        std::string url = "ws://google.com";
-        std::string protocol, host, path, query;
-        int port;
-        bool res;
-
-        res = UrlParser::parse(url, protocol, host, path, query, port);
-
-        REQUIRE(res);
-        REQUIRE(protocol == "ws");
-        REQUIRE(host == "google.com");
-        REQUIRE(path == "/");
-        REQUIRE(query == "");
-        REQUIRE(port == 80); // default port for ws
-    }
-
-    SECTION("wss://google.com/ws?arg=value")
-    {
-        std::string url = "wss://google.com/ws?arg=value&arg2=value2";
-        std::string protocol, host, path, query;
-        int port;
-        bool res;
-
-        res = UrlParser::parse(url, protocol, host, path, query, port);
-
-        REQUIRE(res);
-        REQUIRE(protocol == "wss");
-        REQUIRE(host == "google.com");
-        REQUIRE(path == "/ws?arg=value&arg2=value2");
-        REQUIRE(query == "arg=value&arg2=value2");
-        REQUIRE(port == 443); // default port for wss
-    }
-
-    SECTION("real test")
-    {
-        std::string url = "ws://127.0.0.1:7350/ws?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1NTcxNzAwNzIsInVpZCI6ImMwZmZjOGE1LTk4OTktNDAwYi1hNGU5LTJjNWM3NjFmNWQxZiIsInVzbiI6InN2YmhOdlNJSmEifQ.5L8BUbpTA4XAHlSrdwhIVlrlIpRtjExepim7Yh5eEO4&status=true&format=protobuf";
-        std::string protocol, host, path, query;
-        int port;
-        bool res;
-
-        res = UrlParser::parse(url, protocol, host, path, query, port);
-
-        REQUIRE(res);
-        REQUIRE(protocol == "ws");
-        REQUIRE(host == "127.0.0.1");
-        REQUIRE(path == "/ws?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1NTcxNzAwNzIsInVpZCI6ImMwZmZjOGE1LTk4OTktNDAwYi1hNGU5LTJjNWM3NjFmNWQxZiIsInVzbiI6InN2YmhOdlNJSmEifQ.5L8BUbpTA4XAHlSrdwhIVlrlIpRtjExepim7Yh5eEO4&status=true&format=protobuf");
-        REQUIRE(query == "token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1NTcxNzAwNzIsInVpZCI6ImMwZmZjOGE1LTk4OTktNDAwYi1hNGU5LTJjNWM3NjFmNWQxZiIsInVzbiI6InN2YmhOdlNJSmEifQ.5L8BUbpTA4XAHlSrdwhIVlrlIpRtjExepim7Yh5eEO4&status=true&format=protobuf");
-        REQUIRE(port == 7350);
-    }
-
-}
-
-}

test/IXWebSocketCloseTest.cpp

@@ -1,446 +0,0 @@
-/*
- *  IXWebSocketCloseTest.cpp
- *  Author: Alexandre Konieczny
- *  Copyright (c) 2019 Machine Zone. All rights reserved.
- */
-
-#include <iostream>
-#include <sstream>
-#include <queue>
-#include <ixwebsocket/IXWebSocket.h>
-#include <ixwebsocket/IXWebSocketServer.h>
-
-#include "IXTest.h"
-
-#include "catch.hpp"
-
-using namespace ix;
-
-namespace
-{
-    class WebSocketClient
-    {
-        public:
-            WebSocketClient(int port);
-
-            void subscribe(const std::string& channel);
-            void start();
-            void stop();
-            void stop(uint16_t code, const std::string& reason);
-            bool isReady() const;
-            void sendMessage(const std::string& text);
-
-            uint16_t getCloseCode();
-            const std::string& getCloseReason();
-            bool getCloseRemote();
-
-        private:
-            ix::WebSocket _webSocket;
-            int _port;
-
-            mutable std::mutex _mutexCloseData;
-            uint16_t _closeCode;
-            std::string _closeReason;
-            bool _closeRemote;
-    };
-
-    WebSocketClient::WebSocketClient(int port)
-        : _port(port)
-        , _closeCode(0)
-        , _closeReason(std::string(""))
-        , _closeRemote(false)
-    {
-        ;
-    }
-
-    bool WebSocketClient::isReady() const
-    {
-        return _webSocket.getReadyState() == ix::ReadyState::Open;
-    }
-
-    uint16_t WebSocketClient::getCloseCode()
-    {
-        std::lock_guard<std::mutex> lck(_mutexCloseData);
-
-        return _closeCode;
-    }
-
-    const std::string& WebSocketClient::getCloseReason()
-    {
-        std::lock_guard<std::mutex> lck(_mutexCloseData);
-
-        return _closeReason;
-    }
-
-    bool WebSocketClient::getCloseRemote()
-    {
-        std::lock_guard<std::mutex> lck(_mutexCloseData);
-
-        return _closeRemote;
-    }
-
-    void WebSocketClient::stop()
-    {
-        _webSocket.stop();
-    }
-
-    void WebSocketClient::stop(uint16_t code, const std::string& reason)
-    {
-        _webSocket.stop(code, reason);
-    }
-
-    void WebSocketClient::start()
-    {
-        std::string url;
-        {
-            std::stringstream ss;
-            ss << "ws://localhost:"
-               << _port
-               << "/";
-
-            url = ss.str();
-        }
-
-        _webSocket.setUrl(url);
-        _webSocket.disableAutomaticReconnection();
-
-        std::stringstream ss;
-        log(std::string("Connecting to url: ") + url);
-
-        _webSocket.setOnMessageCallback(
-            [this](const ix::WebSocketMessagePtr& msg)
-            {
-                std::stringstream ss;
-                if (msg->type == ix::WebSocketMessageType::Open)
-                {
-                    log("client connected");
-                }
-                else if (msg->type == ix::WebSocketMessageType::Close)
-                {
-                    std::stringstream ss;
-                    ss << "client disconnected("
-                       << msg->closeInfo.code
-                       << ","
-                       << msg->closeInfo.reason
-                       << ")";
-                    log(ss.str());
-
-                    std::lock_guard<std::mutex> lck(_mutexCloseData);
-
-                    _closeCode = msg->closeInfo.code;
-                    _closeReason = std::string(msg->closeInfo.reason);
-                    _closeRemote = msg->closeInfo.remote;
-                }
-                else if (msg->type == ix::WebSocketMessageType::Error)
-                {
-                    ss << "Error ! " << msg->errorInfo.reason;
-                    log(ss.str());
-                }
-                else if (msg->type == ix::WebSocketMessageType::Pong)
-                {
-                    ss << "Received pong message " << msg->str;
-                    log(ss.str());
-                }
-                else if (msg->type == ix::WebSocketMessageType::Ping)
-                {
-                    ss << "Received ping message " << msg->str;
-                    log(ss.str());
-                }
-                else if (msg->type == ix::WebSocketMessageType::Message)
-                {
-                    ss << "Received message " << msg->str;
-                    log(ss.str());
-                }
-                else
-                {
-                    ss << "Invalid ix::WebSocketMessageType";
-                    log(ss.str());
-                }
-            });
-
-        _webSocket.start();
-    }
-
-    void WebSocketClient::sendMessage(const std::string& text)
-    {
-        _webSocket.send(text);
-    }
-
-    bool startServer(ix::WebSocketServer& server,
-                     uint16_t& receivedCloseCode,
-                     std::string& receivedCloseReason,
-                     bool& receivedCloseRemote,
-                     std::mutex& mutexWrite)
-    {
-        // A dev/null server
-        server.setOnConnectionCallback(
-            [&server, &receivedCloseCode, &receivedCloseReason, &receivedCloseRemote, &mutexWrite](std::shared_ptr<ix::WebSocket> webSocket,
-                                             std::shared_ptr<ConnectionState> connectionState)
-            {
-                webSocket->setOnMessageCallback(
-                    [webSocket, connectionState, &server, &receivedCloseCode, &receivedCloseReason, &receivedCloseRemote, &mutexWrite](const ix::WebSocketMessagePtr& msg)
-                    {
-                        if (msg->type == ix::WebSocketMessageType::Open)
-                        {
-                            Logger() << "New server connection";
-                            Logger() << "id: " << connectionState->getId();
-                            Logger() << "Uri: " << msg->openInfo.uri;
-                            Logger() << "Headers:";
-                            for (auto it : msg->openInfo.headers)
-                            {
-                                Logger() << it.first << ": " << it.second;
-                            }
-                        }
-                        else if (msg->type == ix::WebSocketMessageType::Close)
-                        {
-                            std::stringstream ss;
-                            ss << "Server closed connection("
-                               << msg->closeInfo.code
-                               << ","
-                               << msg->closeInfo.reason
-                               << ")";
-                            log(ss.str());
-
-                            std::lock_guard<std::mutex> lck(mutexWrite);
-
-                            receivedCloseCode = msg->closeInfo.code;
-                            receivedCloseReason = std::string(msg->closeInfo.reason);
-                            receivedCloseRemote = msg->closeInfo.remote;
-                        }
-                    }
-                );
-            }
-        );
-
-        auto res = server.listen();
-        if (!res.first)
-        {
-            log(res.second);
-            return false;
-        }
-
-        server.start();
-        return true;
-    }
-}
-
-TEST_CASE("Websocket_client_close_default", "[close]")
-{
-    SECTION("Make sure that close code and reason was used and sent to server.")
-    {
-        ix::setupWebSocketTrafficTrackerCallback();
-
-        int port = getFreePort();
-        ix::WebSocketServer server(port);
-
-        uint16_t serverReceivedCloseCode(0);
-        bool serverReceivedCloseRemote(false);
-        std::string serverReceivedCloseReason("");
-        std::mutex mutexWrite;
-
-        REQUIRE(startServer(server, serverReceivedCloseCode, serverReceivedCloseReason, serverReceivedCloseRemote, mutexWrite));
-
-        std::string session = ix::generateSessionId();
-        WebSocketClient webSocketClient(port);
-
-        webSocketClient.start();
-
-        // Wait for all chat instance to be ready
-        while (true)
-        {
-            if (webSocketClient.isReady()) break;
-            ix::msleep(10);
-        }
-
-        REQUIRE(server.getClients().size() == 1);
-
-        ix::msleep(500);
-
-        webSocketClient.stop();
-
-        ix::msleep(500);
-
-        // ensure client close is the same as values given
-        REQUIRE(webSocketClient.getCloseCode() == 1000);
-        REQUIRE(webSocketClient.getCloseReason() == "Normal closure");
-        REQUIRE(webSocketClient.getCloseRemote() == false);
-
-        {
-            std::lock_guard<std::mutex> lck(mutexWrite);
-
-            // Here we read the code/reason received by the server, and ensure that remote is true
-            REQUIRE(serverReceivedCloseCode == 1000);
-            REQUIRE(serverReceivedCloseReason == "Normal closure");
-            REQUIRE(serverReceivedCloseRemote == true);
-        }
-
-        // Give us 1000ms for the server to notice that clients went away
-        ix::msleep(1000);
-        REQUIRE(server.getClients().size() == 0);
-
-        ix::reportWebSocketTraffic();
-    }
-}
-
-TEST_CASE("Websocket_client_close_params_given", "[close]")
-{
-    SECTION("Make sure that close code and reason was used and sent to server.")
-    {
-        ix::setupWebSocketTrafficTrackerCallback();
-
-        int port = getFreePort();
-        ix::WebSocketServer server(port);
-
-        uint16_t serverReceivedCloseCode(0);
-        bool serverReceivedCloseRemote(false);
-        std::string serverReceivedCloseReason("");
-        std::mutex mutexWrite;
-
-        REQUIRE(startServer(server, serverReceivedCloseCode, serverReceivedCloseReason, serverReceivedCloseRemote, mutexWrite));
-
-        std::string session = ix::generateSessionId();
-        WebSocketClient webSocketClient(port);
-
-        webSocketClient.start();
-
-        // Wait for all chat instance to be ready
-        while (true)
-        {
-            if (webSocketClient.isReady()) break;
-            ix::msleep(10);
-        }
-
-        REQUIRE(server.getClients().size() == 1);
-
-        ix::msleep(500);
-
-        webSocketClient.stop(4000, "My reason");
-
-        ix::msleep(500);
-
-        // ensure client close is the same as values given
-        REQUIRE(webSocketClient.getCloseCode() == 4000);
-        REQUIRE(webSocketClient.getCloseReason() == "My reason");
-        REQUIRE(webSocketClient.getCloseRemote() == false);
-
-        {
-            std::lock_guard<std::mutex> lck(mutexWrite);
-
-            // Here we read the code/reason received by the server, and ensure that remote is true
-            REQUIRE(serverReceivedCloseCode == 4000);
-            REQUIRE(serverReceivedCloseReason == "My reason");
-            REQUIRE(serverReceivedCloseRemote == true);
-        }
-
-        // Give us 1000ms for the server to notice that clients went away
-        ix::msleep(1000);
-        REQUIRE(server.getClients().size() == 0);
-
-        ix::reportWebSocketTraffic();
-    }
-}
-
-TEST_CASE("Websocket_server_close", "[close]")
-{
-    SECTION("Make sure that close code and reason was read from server.")
-    {
-        ix::setupWebSocketTrafficTrackerCallback();
-
-        int port = getFreePort();
-        ix::WebSocketServer server(port);
-
-        uint16_t serverReceivedCloseCode(0);
-        bool serverReceivedCloseRemote(false);
-        std::string serverReceivedCloseReason("");
-        std::mutex mutexWrite;
-
-        REQUIRE(startServer(server, serverReceivedCloseCode, serverReceivedCloseReason, serverReceivedCloseRemote, mutexWrite));
-
-        std::string session = ix::generateSessionId();
-        WebSocketClient webSocketClient(port);
-
-        webSocketClient.start();
-
-        // Wait for all chat instance to be ready
-        while (true)
-        {
-            if (webSocketClient.isReady()) break;
-            ix::msleep(10);
-        }
-
-        REQUIRE(server.getClients().size() == 1);
-
-        ix::msleep(500);
-
-        server.stop();
-
-        ix::msleep(500);
-
-        // ensure client close is the same as values given
-        REQUIRE(webSocketClient.getCloseCode() == 1000);
-        REQUIRE(webSocketClient.getCloseReason() == "Normal closure");
-        REQUIRE(webSocketClient.getCloseRemote() == true);
-
-        {
-            std::lock_guard<std::mutex> lck(mutexWrite);
-
-            // Here we read the code/reason received by the server, and ensure that remote is true
-            REQUIRE(serverReceivedCloseCode == 1000);
-            REQUIRE(serverReceivedCloseReason == "Normal closure");
-            REQUIRE(serverReceivedCloseRemote == false);
-        }
-
-        // Give us 1000ms for the server to notice that clients went away
-        ix::msleep(1000);
-        REQUIRE(server.getClients().size() == 0);
-
-        ix::reportWebSocketTraffic();
-    }
-}
-
-TEST_CASE("Websocket_server_close_immediatly", "[close]")
-{
-    SECTION("Make sure that close code and reason was read from server.")
-    {
-        ix::setupWebSocketTrafficTrackerCallback();
-
-        int port = getFreePort();
-        ix::WebSocketServer server(port);
-
-        uint16_t serverReceivedCloseCode(0);
-        bool serverReceivedCloseRemote(false);
-        std::string serverReceivedCloseReason("");
-        std::mutex mutexWrite;
-
-        REQUIRE(startServer(server, serverReceivedCloseCode, serverReceivedCloseReason, serverReceivedCloseRemote, mutexWrite));
-
-        std::string session = ix::generateSessionId();
-        WebSocketClient webSocketClient(port);
-
-        webSocketClient.start();
-
-        server.stop();
-
-        ix::msleep(500);
-
-        // ensure client close hasn't been called
-        REQUIRE(webSocketClient.getCloseCode() == 0);
-        REQUIRE(webSocketClient.getCloseReason() == "");
-        REQUIRE(webSocketClient.getCloseRemote() == false);
-
-        {
-            std::lock_guard<std::mutex> lck(mutexWrite);
-
-            // Here we ensure that the code/reason wasn't received by the server
-            REQUIRE(serverReceivedCloseCode == 0);
-            REQUIRE(serverReceivedCloseReason == "");
-            REQUIRE(serverReceivedCloseRemote == false);
-        }
-
-        // Give us 1000ms for the server to notice that clients went away
-        ix::msleep(1000);
-        REQUIRE(server.getClients().size() == 0);
-
-        ix::reportWebSocketTraffic();
-    }
-}

test/IXWebSocketHeartBeatTest.cpp

@@ -0,0 +1,228 @@
+/*
+ *  IXWebSocketHeartBeatTest.cpp
+ *  Author: Benjamin Sergeant
+ *  Copyright (c) 2019 Machine Zone. All rights reserved.
+ */
+
+#include <iostream>
+#include <sstream>
+#include <queue>
+#include <ixwebsocket/IXWebSocket.h>
+#include <ixwebsocket/IXWebSocketServer.h>
+
+#include "IXTest.h"
+
+#include "catch.hpp"
+
+using namespace ix;
+
+namespace
+{
+    class WebSocketClient
+    {
+        public:
+            WebSocketClient(int port);
+
+            void subscribe(const std::string& channel);
+            void start();
+            void stop();
+            bool isReady() const;
+            void sendMessage(const std::string& text);
+
+        private:
+            ix::WebSocket _webSocket;
+            int _port;
+    };
+
+    WebSocketClient::WebSocketClient(int port)
+        : _port(port)
+    {
+        ;
+    }
+
+    bool WebSocketClient::isReady() const
+    {
+        return _webSocket.getReadyState() == ix::WebSocket_ReadyState_Open;
+    }
+
+    void WebSocketClient::stop()
+    {
+        _webSocket.stop();
+    }
+
+    void WebSocketClient::start()
+    {
+        std::string url;
+        {
+            std::stringstream ss;
+            ss << "ws://localhost:"
+               << _port
+               << "/";
+
+            url = ss.str();
+        }
+
+        _webSocket.setUrl(url);
+
+        // The important bit for this test.
+        // Set a 1 second heartbeat ; if no traffic is present on the connection for 1 second
+        // a ping message will be sent by the client.
+        _webSocket.setHeartBeatPeriod(1);
+
+        std::stringstream ss;
+        log(std::string("Connecting to url: ") + url);
+
+        _webSocket.setOnMessageCallback(
+            [](ix::WebSocketMessageType messageType,
+               const std::string& str,
+               size_t wireSize,
+               const ix::WebSocketErrorInfo& error,
+               const ix::WebSocketOpenInfo& openInfo,
+                   const ix::WebSocketCloseInfo& closeInfo)
+            {
+                std::stringstream ss;
+                if (messageType == ix::WebSocket_MessageType_Open)
+                {
+                    log("client connected");
+                }
+                else if (messageType == ix::WebSocket_MessageType_Close)
+                {
+                    log("client disconnected");
+                }
+                else if (messageType == ix::WebSocket_MessageType_Error)
+                {
+                    ss << "Error ! " << error.reason;
+                    log(ss.str());
+                }
+                else if (messageType == ix::WebSocket_MessageType_Pong)
+                {
+                    ss << "Received pong message " << str;
+                    log(ss.str());
+                }
+                else if (messageType == ix::WebSocket_MessageType_Ping)
+                {
+                    ss << "Received ping message " << str;
+                    log(ss.str());
+                }
+                else if (messageType == ix::WebSocket_MessageType_Message)
+                {
+                    ss << "Received message " << str;
+                    log(ss.str());
+                }
+                else
+                {
+                    ss << "Invalid ix::WebSocketMessageType";
+                    log(ss.str());
+                }
+            });
+
+        _webSocket.start();
+    }
+
+    void WebSocketClient::sendMessage(const std::string& text)
+    {
+        _webSocket.send(text);
+    }
+
+    bool startServer(ix::WebSocketServer& server, std::atomic<int>& receivedPingMessages)
+    {
+        // A dev/null server
+        server.setOnConnectionCallback(
+            [&server, &receivedPingMessages](std::shared_ptr<ix::WebSocket> webSocket,
+                                             std::shared_ptr<ConnectionState> connectionState)
+            {
+                webSocket->setOnMessageCallback(
+                    [webSocket, connectionState, &server, &receivedPingMessages](ix::WebSocketMessageType messageType,
+                       const std::string& str,
+                       size_t wireSize,
+                       const ix::WebSocketErrorInfo& error,
+                       const ix::WebSocketOpenInfo& openInfo,
+                       const ix::WebSocketCloseInfo& closeInfo)
+                    {
+                        if (messageType == ix::WebSocket_MessageType_Open)
+                        {
+                            Logger() << "New server connection";
+                            Logger() << "id: " << connectionState->getId();
+                            Logger() << "Uri: " << openInfo.uri;
+                            Logger() << "Headers:";
+                            for (auto it : openInfo.headers)
+                            {
+                                Logger() << it.first << ": " << it.second;
+                            }
+                        }
+                        else if (messageType == ix::WebSocket_MessageType_Close)
+                        {
+                            log("Server closed connection");
+                        }
+                        else if (messageType == ix::WebSocket_MessageType_Ping)
+                        {
+                            log("Server received a ping");
+                            receivedPingMessages++;
+                        }
+                    }
+                );
+            }
+        );
+
+        auto res = server.listen();
+        if (!res.first)
+        {
+            log(res.second);
+            return false;
+        }
+
+        server.start();
+        return true;
+    }
+}
+
+TEST_CASE("Websocket_heartbeat", "[heartbeat]")
+{
+    SECTION("Make sure that ping messages are sent during heartbeat.")
+    {
+        ix::setupWebSocketTrafficTrackerCallback();
+
+        int port = getFreePort();
+        ix::WebSocketServer server(port);
+        std::atomic<int> serverReceivedPingMessages(0);
+        REQUIRE(startServer(server, serverReceivedPingMessages));
+
+        std::string session = ix::generateSessionId();
+        WebSocketClient webSocketClientA(port);
+        WebSocketClient webSocketClientB(port);
+
+        webSocketClientA.start();
+        webSocketClientB.start();
+
+        // Wait for all chat instance to be ready
+        while (true)
+        {
+            if (webSocketClientA.isReady() && webSocketClientB.isReady()) break;
+            ix::msleep(10);
+        }
+
+        REQUIRE(server.getClients().size() == 2);
+
+        ix::msleep(900);
+        webSocketClientB.sendMessage("hello world");
+        ix::msleep(900);
+        webSocketClientB.sendMessage("hello world");
+        ix::msleep(900);
+
+        webSocketClientA.stop();
+        webSocketClientB.stop();
+
+
+        // Here we test heart beat period exceeded for clientA
+        // but it should not be exceeded for clientB which has sent data.
+        // -> expected ping messages == 2, but add a small buffer to make this more reliable.
+        REQUIRE(serverReceivedPingMessages >= 2);
+        REQUIRE(serverReceivedPingMessages <= 4);
+
+        // Give us 500ms for the server to notice that clients went away
+        ix::msleep(500);
+        REQUIRE(server.getClients().size() == 0);
+
+        ix::reportWebSocketTraffic();
+    }
+}

test/IXWebSocketMessageQTest.cpp

@@ -1,182 +0,0 @@
-/*
- *  IXWebSocketMessageQTest.cpp
- *  Author: Korchynskyi Dmytro
- *  Copyright (c) 2019 Machine Zone. All rights reserved.
- */
-
-#include <ixwebsocket/IXWebSocket.h>
-#include <ixwebsocket/IXWebSocketServer.h>
-#include <ixwebsocket/IXWebSocketMessageQueue.h>
-
-#include "IXTest.h"
-#include "catch.hpp"
-#include <thread>
-
-using namespace ix;
-
-namespace
-{
-    bool startServer(ix::WebSocketServer& server)
-    {
-        server.setOnConnectionCallback(
-            [&server](std::shared_ptr<ix::WebSocket> webSocket,
-                      std::shared_ptr<ConnectionState> connectionState)
-        {
-            webSocket->setOnMessageCallback(
-                [connectionState, &server](const WebSocketMessagePtr& msg)
-            {
-                if (msg->type == ix::WebSocketMessageType::Open)
-                {
-                    Logger() << "New connection";
-                    connectionState->computeId();
-                    Logger() << "id: " << connectionState->getId();
-                    Logger() << "Uri: " << msg->openInfo.uri;
-                    Logger() << "Headers:";
-                    for (auto&& it : msg->openInfo.headers)
-                    {
-                        Logger() << it.first << ": " << it.second;
-                    }
-                }
-                else if (msg->type == ix::WebSocketMessageType::Close)
-                {
-                    Logger() << "Closed connection";
-                }
-                else if (msg->type == ix::WebSocketMessageType::Message)
-                {
-                    Logger() << "Message received: " << msg->str;
-
-                    for (auto&& client : server.getClients())
-                    {
-                        client->send(msg->str);
-                    }
-                }
-            }
-            );
-        }
-        );
-
-        auto res = server.listen();
-        if (!res.first)
-        {
-            Logger() << res.second;
-            return false;
-        }
-
-        server.start();
-        return true;
-    }
-
-    class MsgQTestClient
-    {
-    public:
-        MsgQTestClient()
-        {
-            msgQ.bindWebsocket(&ws);
-
-            msgQ.setOnMessageCallback([this](const WebSocketMessagePtr& msg)
-            {
-                REQUIRE(mainThreadId == std::this_thread::get_id());
-
-                std::stringstream ss;
-                if (msg->type == WebSocketMessageType::Open)
-                {
-                    log("client connected");
-                    sendNextMessage();
-                }
-                else if (msg->type == WebSocketMessageType::Close)
-                {
-                    log("client disconnected");
-                }
-                else if (msg->type == WebSocketMessageType::Error)
-                {
-                    ss << "Error ! " << msg->errorInfo.reason;
-                    log(ss.str());
-                    testDone = true;
-                }
-                else if (msg->type == WebSocketMessageType::Pong)
-                {
-                    ss << "Received pong message " << msg->str;
-                    log(ss.str());
-                }
-                else if (msg->type == WebSocketMessageType::Ping)
-                {
-                    ss << "Received ping message " << msg->str;
-                    log(ss.str());
-                }
-                else if (msg->type == WebSocketMessageType::Message)
-                {
-                    REQUIRE(msg->str.compare("Hey dude!") == 0);
-                    ++receivedCount;
-                    ss << "Received message " << msg->str;
-                    log(ss.str());
-                    sendNextMessage();
-                }
-                else
-                {
-                    ss << "Invalid WebSocketMessageType";
-                    log(ss.str());
-                    testDone = true;
-                }
-            });
-        }
-
-        void sendNextMessage()
-        {
-            if (receivedCount >= 3)
-            {
-                testDone = true;
-                succeeded = true;
-            }
-            else
-            {
-                auto info = ws.sendText("Hey dude!");
-                if (info.success)
-                    log("sent message");
-                else
-                    log("send failed");
-            }
-        }
-
-        void run(const std::string& url)
-        {
-            mainThreadId = std::this_thread::get_id();
-            testDone = false;
-            receivedCount = 0;
-
-            ws.setUrl(url);
-            ws.start();
-
-            while (!testDone)
-            {
-                msgQ.poll();
-                msleep(50);
-            }
-        }
-
-        bool isSucceeded() const { return succeeded; }
-
-    private:
-        WebSocket ws;
-        WebSocketMessageQueue msgQ;
-        bool testDone = false;
-        uint32_t receivedCount = 0;
-        std::thread::id mainThreadId;
-        bool succeeded = false;
-    };
-}
-
-TEST_CASE("Websocket_message_queue", "[websocket_message_q]")
-{
-    SECTION("Send several messages")
-    {
-        int port = getFreePort();
-        WebSocketServer server(port);
-        REQUIRE(startServer(server));
-
-        MsgQTestClient testClient;
-        testClient.run("ws://127.0.0.1:" + std::to_string(port));
-        REQUIRE(testClient.isSucceeded());
-
-        server.stop();
-    }
-}

test/IXWebSocketPingTest.cpp

@@ -1,483 +0,0 @@
-/*
- *  IXWebSocketPingTest.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone. All rights reserved.
- */
-
-#include <iostream>
-#include <sstream>
-#include <queue>
-#include <ixwebsocket/IXWebSocket.h>
-#include <ixwebsocket/IXWebSocketServer.h>
-
-#include "IXTest.h"
-
-#include "catch.hpp"
-
-using namespace ix;
-
-namespace
-{
-    class WebSocketClient
-    {
-        public:
-            WebSocketClient(int port, bool useHeartBeatMethod);
-
-            void start();
-            void stop();
-            bool isReady() const;
-            void sendMessage(const std::string& text);
-
-        private:
-            ix::WebSocket _webSocket;
-            int _port;
-            bool _useHeartBeatMethod;
-    };
-
-    WebSocketClient::WebSocketClient(int port, bool useHeartBeatMethod)
-        : _port(port),
-          _useHeartBeatMethod(useHeartBeatMethod)
-    {
-        ;
-    }
-
-    bool WebSocketClient::isReady() const
-    {
-        return _webSocket.getReadyState() == ix::ReadyState::Open;
-    }
-
-    void WebSocketClient::stop()
-    {
-        _webSocket.stop();
-    }
-
-    void WebSocketClient::start()
-    {
-        std::string url;
-        {
-            std::stringstream ss;
-            ss << "ws://127.0.0.1:"
-               << _port
-               << "/";
-
-            url = ss.str();
-        }
-
-        _webSocket.setUrl(url);
-
-        // The important bit for this test.
-        // Set a 1 second heartbeat with the setter method to test
-        if (_useHeartBeatMethod)
-        {
-            _webSocket.setHeartBeatPeriod(1);
-        }
-        else
-        {
-            _webSocket.setPingInterval(1);
-        }
-
-        std::stringstream ss;
-        log(std::string("Connecting to url: ") + url);
-
-        _webSocket.setOnMessageCallback(
-            [](ix::WebSocketMessageType messageType,
-               const std::string& str,
-               size_t wireSize,
-               const ix::WebSocketErrorInfo& error,
-               const ix::WebSocketOpenInfo& openInfo,
-                   const ix::WebSocketCloseInfo& closeInfo)
-            {
-                std::stringstream ss;
-                if (messageType == ix::WebSocketMessageType::Open)
-                {
-                    log("client connected");
-                }
-                else if (messageType == ix::WebSocketMessageType::Close)
-                {
-                    log("client disconnected");
-                }
-                else if (messageType == ix::WebSocketMessageType::Error)
-                {
-                    ss << "Error ! " << error.reason;
-                    log(ss.str());
-                }
-                else if (messageType == ix::WebSocketMessageType::Pong)
-                {
-                    ss << "Received pong message " << str;
-                    log(ss.str());
-                }
-                else if (messageType == ix::WebSocketMessageType::Ping)
-                {
-                    ss << "Received ping message " << str;
-                    log(ss.str());
-                }
-                else if (messageType == ix::WebSocketMessageType::Message)
-                {
-                    // too many messages to log
-                }
-                else
-                {
-                    ss << "Invalid ix::WebSocketMessageType";
-                    log(ss.str());
-                }
-            });
-
-        _webSocket.start();
-    }
-
-    void WebSocketClient::sendMessage(const std::string& text)
-    {
-        _webSocket.send(text);
-    }
-
-    bool startServer(ix::WebSocketServer& server, std::atomic<int>& receivedPingMessages)
-    {
-        // A dev/null server
-        server.setOnConnectionCallback(
-            [&server, &receivedPingMessages](std::shared_ptr<ix::WebSocket> webSocket,
-                                             std::shared_ptr<ConnectionState> connectionState)
-            {
-                webSocket->setOnMessageCallback(
-                    [webSocket, connectionState, &server, &receivedPingMessages](ix::WebSocketMessageType messageType,
-                       const std::string& str,
-                       size_t wireSize,
-                       const ix::WebSocketErrorInfo& error,
-                       const ix::WebSocketOpenInfo& openInfo,
-                       const ix::WebSocketCloseInfo& closeInfo)
-                    {
-                        if (messageType == ix::WebSocketMessageType::Open)
-                        {
-                            Logger() << "New server connection";
-                            Logger() << "id: " << connectionState->getId();
-                            Logger() << "Uri: " << openInfo.uri;
-                            Logger() << "Headers:";
-                            for (auto it : openInfo.headers)
-                            {
-                                Logger() << it.first << ": " << it.second;
-                            }
-                        }
-                        else if (messageType == ix::WebSocketMessageType::Close)
-                        {
-                            log("Server closed connection");
-                        }
-                        else if (messageType == ix::WebSocketMessageType::Ping)
-                        {
-                            log("Server received a ping");
-                            receivedPingMessages++;
-                        }
-                        else if (messageType == ix::WebSocketMessageType::Message)
-                        {
-                            // to many messages to log
-                            for(auto client: server.getClients())
-                            {
-                                client->sendText("reply");
-                            }
-                        }
-                    }
-                );
-            }
-        );
-
-        auto res = server.listen();
-        if (!res.first)
-        {
-            log(res.second);
-            return false;
-        }
-
-        server.start();
-        return true;
-    }
-}
-
-TEST_CASE("Websocket_ping_no_data_sent_setPingInterval", "[setPingInterval]")
-{
-    SECTION("Make sure that ping messages are sent when no other data are sent.")
-    {
-        ix::setupWebSocketTrafficTrackerCallback();
-
-        int port = getFreePort();
-        ix::WebSocketServer server(port);
-        std::atomic<int> serverReceivedPingMessages(0);
-        REQUIRE(startServer(server, serverReceivedPingMessages));
-
-        std::string session = ix::generateSessionId();
-        bool useSetHeartBeatPeriodMethod = false; // so use setPingInterval
-        WebSocketClient webSocketClient(port, useSetHeartBeatPeriodMethod);
-
-        webSocketClient.start();
-
-        // Wait for all chat instance to be ready
-        while (true)
-        {
-            if (webSocketClient.isReady()) break;
-            ix::msleep(10);
-        }
-
-        REQUIRE(server.getClients().size() == 1);
-
-        ix::msleep(2100);
-
-        webSocketClient.stop();
-
-
-        // Here we test ping interval
-        // -> expected ping messages == 2 as 2100 seconds, 1 ping sent every second
-        REQUIRE(serverReceivedPingMessages == 2);
-
-        // Give us 1000ms for the server to notice that clients went away
-        ix::msleep(1000);
-        REQUIRE(server.getClients().size() == 0);
-
-        ix::reportWebSocketTraffic();
-    }
-}
-
-TEST_CASE("Websocket_ping_data_sent_setPingInterval", "[setPingInterval]")
-{
-    SECTION("Make sure that ping messages are sent, even if other messages are sent")
-    {
-        ix::setupWebSocketTrafficTrackerCallback();
-
-        int port = getFreePort();
-        ix::WebSocketServer server(port);
-        std::atomic<int> serverReceivedPingMessages(0);
-        REQUIRE(startServer(server, serverReceivedPingMessages));
-
-        std::string session = ix::generateSessionId();
-        bool useSetHeartBeatPeriodMethod = false; // so use setPingInterval
-        WebSocketClient webSocketClient(port, useSetHeartBeatPeriodMethod);
-
-        webSocketClient.start();
-
-        // Wait for all chat instance to be ready
-        while (true)
-        {
-            if (webSocketClient.isReady()) break;
-            ix::msleep(10);
-        }
-
-        REQUIRE(server.getClients().size() == 1);
-
-        ix::msleep(900);
-        webSocketClient.sendMessage("hello world");
-        ix::msleep(900);
-        webSocketClient.sendMessage("hello world");
-        ix::msleep(1300);
-
-        webSocketClient.stop();
-
-        // Here we test ping interval
-        // client has sent data, but ping should have been sent no matter what
-        // -> expected ping messages == 3 as 900+900+1300 = 3100 seconds, 1 ping sent every second
-        REQUIRE(serverReceivedPingMessages == 3);
-
-        // Give us 1000ms for the server to notice that clients went away
-        ix::msleep(1000);
-        REQUIRE(server.getClients().size() == 0);
-
-        ix::reportWebSocketTraffic();
-    }
-}
-
-TEST_CASE("Websocket_ping_data_sent_setPingInterval_half_full", "[setPingInterval]")
-{
-    SECTION("Make sure that ping messages are sent, even if other messages are sent continuously during a given time")
-    {
-        ix::setupWebSocketTrafficTrackerCallback();
-
-        int port = getFreePort();
-        ix::WebSocketServer server(port);
-        std::atomic<int> serverReceivedPingMessages(0);
-        REQUIRE(startServer(server, serverReceivedPingMessages));
-
-        std::string session = ix::generateSessionId();
-        bool useSetHeartBeatPeriodMethod = false; // so use setPingInterval
-        WebSocketClient webSocketClient(port, useSetHeartBeatPeriodMethod);
-
-        webSocketClient.start();
-
-        // Wait for all chat instance to be ready
-        while (true)
-        {
-            if (webSocketClient.isReady()) break;
-            ix::msleep(10);
-        }
-
-        REQUIRE(server.getClients().size() == 1);
-
-        // send continuously for 1100ms
-        auto now = std::chrono::steady_clock::now();
-
-        while(std::chrono::steady_clock::now() - now <= std::chrono::milliseconds(900))
-        {
-            webSocketClient.sendMessage("message");
-            ix::msleep(1);
-        }
-        ix::msleep(150);
-
-        // Here we test ping interval
-        // client has sent data, but ping should have been sent no matter what
-        // -> expected ping messages == 1, as 900+150 = 1050ms, 1 ping sent every second
-        REQUIRE(serverReceivedPingMessages == 1);
-
-        ix::msleep(100);
-
-        webSocketClient.stop();
-
-        // Give us 1000ms for the server to notice that clients went away
-        ix::msleep(1000);
-        REQUIRE(server.getClients().size() == 0);
-
-        ix::reportWebSocketTraffic();
-    }
-}
-
-TEST_CASE("Websocket_ping_data_sent_setPingInterval_full", "[setPingInterval]")
-{
-    SECTION("Make sure that ping messages are sent, even if other messages are sent continuously for longer than ping interval")
-    {
-        ix::setupWebSocketTrafficTrackerCallback();
-
-        int port = getFreePort();
-        ix::WebSocketServer server(port);
-        std::atomic<int> serverReceivedPingMessages(0);
-        REQUIRE(startServer(server, serverReceivedPingMessages));
-
-        std::string session = ix::generateSessionId();
-        bool useSetHeartBeatPeriodMethod = false; // so use setPingInterval
-        WebSocketClient webSocketClient(port, useSetHeartBeatPeriodMethod);
-
-        webSocketClient.start();
-
-        // Wait for all chat instance to be ready
-        while (true)
-        {
-            if (webSocketClient.isReady()) break;
-            ix::msleep(1);
-        }
-
-        REQUIRE(server.getClients().size() == 1);
-
-        // send continuously for 1100ms
-        auto now = std::chrono::steady_clock::now();
-
-        while(std::chrono::steady_clock::now() - now <= std::chrono::milliseconds(1100))
-        {
-            webSocketClient.sendMessage("message");
-            ix::msleep(1);
-        }
-
-        // Here we test ping interval
-        // client has sent data, but ping should have been sent no matter what
-        // -> expected ping messages == 1, 1 ping sent every second
-        REQUIRE(serverReceivedPingMessages == 1);
-
-        ix::msleep(100);
-
-        webSocketClient.stop();
-
-        // Give us 1000ms for the server to notice that clients went away
-        ix::msleep(1000);
-        REQUIRE(server.getClients().size() == 0);
-
-        ix::reportWebSocketTraffic();
-    }
-}
-
-// Using setHeartBeatPeriod
-
-TEST_CASE("Websocket_ping_no_data_sent_setHeartBeatPeriod", "[setHeartBeatPeriod]")
-{
-    SECTION("Make sure that ping messages are sent when no other data are sent.")
-    {
-        ix::setupWebSocketTrafficTrackerCallback();
-
-        int port = getFreePort();
-        ix::WebSocketServer server(port);
-        std::atomic<int> serverReceivedPingMessages(0);
-        REQUIRE(startServer(server, serverReceivedPingMessages));
-
-        std::string session = ix::generateSessionId();
-        bool useSetHeartBeatPeriodMethod = true;
-        WebSocketClient webSocketClient(port, useSetHeartBeatPeriodMethod);
-
-        webSocketClient.start();
-
-        // Wait for all chat instance to be ready
-        while (true)
-        {
-            if (webSocketClient.isReady()) break;
-            ix::msleep(1);
-        }
-
-        REQUIRE(server.getClients().size() == 1);
-
-        ix::msleep(1900);
-
-        webSocketClient.stop();
-
-
-        // Here we test ping interval
-        // -> expected ping messages == 1 as 1900 seconds, 1 ping sent every second
-        REQUIRE(serverReceivedPingMessages == 1);
-
-        // Give us 1000ms for the server to notice that clients went away
-        ix::msleep(1000);
-        REQUIRE(server.getClients().size() == 0);
-
-        ix::reportWebSocketTraffic();
-        server.stop();
-    }
-}
-
-TEST_CASE("Websocket_ping_data_sent_setHeartBeatPeriod", "[setHeartBeatPeriod]")
-{
-    SECTION("Make sure that ping messages are sent, even if other messages are sent")
-    {
-        ix::setupWebSocketTrafficTrackerCallback();
-
-        int port = getFreePort();
-        ix::WebSocketServer server(port);
-        std::atomic<int> serverReceivedPingMessages(0);
-        REQUIRE(startServer(server, serverReceivedPingMessages));
-
-        std::string session = ix::generateSessionId();
-        bool useSetHeartBeatPeriodMethod = true;
-        WebSocketClient webSocketClient(port, useSetHeartBeatPeriodMethod);
-
-        webSocketClient.start();
-
-        // Wait for all chat instance to be ready
-        while (true)
-        {
-            if (webSocketClient.isReady()) break;
-            ix::msleep(1);
-        }
-
-        REQUIRE(server.getClients().size() == 1);
-
-        ix::msleep(900);
-        webSocketClient.sendMessage("hello world");
-        ix::msleep(900);
-        webSocketClient.sendMessage("hello world");
-        ix::msleep(1100);
-
-        webSocketClient.stop();
-
-        // without this sleep test fails on Windows
-        ix::msleep(100);
-
-        // Here we test ping interval
-        // client has sent data, but ping should have been sent no matter what
-        // -> expected ping messages == 2 as 900+900+1100 = 2900 seconds, 1 ping sent every second
-        REQUIRE(serverReceivedPingMessages == 2);
-
-        // Give us 1000ms for the server to notice that clients went away
-        ix::msleep(1000);
-        REQUIRE(server.getClients().size() == 0);
-
-        ix::reportWebSocketTraffic();
-        server.stop();
-    }
-}

test/IXWebSocketPingTimeoutTest.cpp

@@ -1,485 +0,0 @@
-/*
- *  IXWebSocketHeartBeatNoResponseAutoDisconnectTest.cpp
- *  Author: Alexandre Konieczny
- *  Copyright (c) 2019 Machine Zone. All rights reserved.
- */
-
-#include <iostream>
-#include <sstream>
-#include <queue>
-#include <ixwebsocket/IXWebSocket.h>
-#include <ixwebsocket/IXWebSocketServer.h>
-
-#include "IXTest.h"
-
-#include "catch.hpp"
-
-using namespace ix;
-
-namespace
-{
-    class WebSocketClient
-    {
-        public:
-            WebSocketClient(int port, int pingInterval, int pingTimeout);
-
-            void start();
-            void stop();
-            bool isReady() const;
-            bool isClosed() const;
-            void sendMessage(const std::string& text);
-            int getReceivedPongMessages();
-            bool closedDueToPingTimeout();
-
-        private:
-            ix::WebSocket _webSocket;
-            int _port;
-            int _pingInterval;
-            int _pingTimeout;
-            std::atomic<int> _receivedPongMessages;
-            std::atomic<bool> _closedDueToPingTimeout;
-    };
-
-    WebSocketClient::WebSocketClient(int port, int pingInterval, int pingTimeout)
-        : _port(port),
-         _receivedPongMessages(0),
-         _closedDueToPingTimeout(false),
-         _pingInterval(pingInterval),
-         _pingTimeout(pingTimeout)
-    {
-        ;
-    }
-
-    bool WebSocketClient::isReady() const
-    {
-        return _webSocket.getReadyState() == ix::ReadyState::Open;
-    }
-
-    bool WebSocketClient::isClosed() const
-    {
-        return _webSocket.getReadyState() == ix::ReadyState::Closed;
-    }
-
-    void WebSocketClient::stop()
-    {
-        _webSocket.stop();
-    }
-
-    void WebSocketClient::start()
-    {
-        std::string url;
-        {
-            std::stringstream ss;
-            ss << "ws://127.0.0.1:"
-               << _port
-               << "/";
-
-            url = ss.str();
-        }
-
-        _webSocket.setUrl(url);
-        _webSocket.disableAutomaticReconnection();
-
-        // The important bit for this test.
-        // Set a ping interval, and a ping timeout
-        _webSocket.setPingInterval(_pingInterval);
-        _webSocket.setPingTimeout(_pingTimeout);
-
-        std::stringstream ss;
-        log(std::string("Connecting to url: ") + url);
-
-        _webSocket.setOnMessageCallback(
-            [this](ix::WebSocketMessageType messageType,
-               const std::string& str,
-               size_t wireSize,
-               const ix::WebSocketErrorInfo& error,
-               const ix::WebSocketOpenInfo& openInfo,
-                   const ix::WebSocketCloseInfo& closeInfo)
-            {
-                std::stringstream ss;
-                if (messageType == ix::WebSocketMessageType::Open)
-                {
-                    log("client connected");
-
-                }
-                else if (messageType == ix::WebSocketMessageType::Close)
-                {
-                    log("client disconnected");
-
-                    if (msg->closeInfo.code == 1011)
-                    {
-                        _closedDueToPingTimeout = true;
-                    }
-
-                }
-                else if (messageType == ix::WebSocketMessageType::Error)
-                {
-                    ss << "Error ! " << error.reason;
-                    log(ss.str());
-                }
-                else if (messageType == ix::WebSocketMessageType::Pong)
-                {
-                    _receivedPongMessages++;
-
-                    ss << "Received pong message " << str;
-                    log(ss.str());
-                }
-                else if (messageType == ix::WebSocketMessageType::Ping)
-                {
-                    ss << "Received ping message " << str;
-                    log(ss.str());
-                }
-                else if (messageType == ix::WebSocketMessageType::Message)
-                {
-                    ss << "Received message " << str;
-                    log(ss.str());
-                }
-                else
-                {
-                    ss << "Invalid ix::WebSocketMessageType";
-                    log(ss.str());
-                }
-            });
-
-        _webSocket.start();
-    }
-
-    void WebSocketClient::sendMessage(const std::string& text)
-    {
-        _webSocket.send(text);
-    }
-
-    int WebSocketClient::getReceivedPongMessages()
-    {
-        return _receivedPongMessages;
-    }
-
-    bool WebSocketClient::closedDueToPingTimeout()
-    {
-        return _closedDueToPingTimeout;
-    }
-
-    bool startServer(ix::WebSocketServer& server, std::atomic<int>& receivedPingMessages, bool enablePong)
-    {
-        // A dev/null server
-        server.setOnConnectionCallback(
-            [&server, &receivedPingMessages](std::shared_ptr<ix::WebSocket> webSocket,
-                                             std::shared_ptr<ConnectionState> connectionState)
-            {
-                webSocket->setOnMessageCallback(
-                    [webSocket, connectionState, &server, &receivedPingMessages](ix::WebSocketMessageType messageType,
-                       const std::string& str,
-                       size_t wireSize,
-                       const ix::WebSocketErrorInfo& error,
-                       const ix::WebSocketOpenInfo& openInfo,
-                       const ix::WebSocketCloseInfo& closeInfo)
-                    {
-                        if (messageType == ix::WebSocketMessageType::Open)
-                        {
-                            Logger() << "New server connection";
-                            Logger() << "id: " << connectionState->getId();
-                            Logger() << "Uri: " << openInfo.uri;
-                            Logger() << "Headers:";
-                            for (auto it : openInfo.headers)
-                            {
-                                Logger() << it.first << ": " << it.second;
-                            }
-                        }
-                        else if (messageType == ix::WebSocketMessageType::Close)
-                        {
-                            log("Server closed connection");
-                        }
-                        else if (messageType == ix::WebSocketMessageType::Ping)
-                        {
-                            log("Server received a ping");
-                            receivedPingMessages++;
-                        }
-                    }
-                );
-            }
-        );
-
-        if (!enablePong)
-        {
-            // USE this to prevent a pong answer, so the ping timeout is raised on client
-            server.disablePong();
-        }
-
-        auto res = server.listen();
-        if (!res.first)
-        {
-            log(res.second);
-            return false;
-        }
-
-        server.start();
-        return true;
-    }
-}
-
-TEST_CASE("Websocket_ping_timeout_not_checked", "[setPingTimeout]")
-{
-    SECTION("Make sure that ping messages have a response (PONG).")
-    {
-        ix::setupWebSocketTrafficTrackerCallback();
-
-        int port = getFreePort();
-        ix::WebSocketServer server(port);
-        std::atomic<int> serverReceivedPingMessages(0);
-        bool enablePong = false; // Pong is disabled on Server
-        REQUIRE(startServer(server, serverReceivedPingMessages, enablePong));
-
-        std::string session = ix::generateSessionId();
-        int pingIntervalSecs = 1;
-        int pingTimeoutSecs = -1; // ping timeout not checked
-        WebSocketClient webSocketClient(port, pingIntervalSecs, pingTimeoutSecs);
-
-        webSocketClient.start();
-
-        // Wait for all chat instance to be ready
-        while (true)
-        {
-            if (webSocketClient.isReady()) break;
-            ix::msleep(10);
-        }
-
-        REQUIRE(server.getClients().size() == 1);
-
-        ix::msleep(1100);
-
-        // Here we test ping timeout, no timeout
-        REQUIRE(serverReceivedPingMessages == 1);
-        REQUIRE(webSocketClient.getReceivedPongMessages() == 0);
-
-        ix::msleep(1000);
-
-        // Here we test ping timeout, no timeout
-        REQUIRE(serverReceivedPingMessages == 2);
-        REQUIRE(webSocketClient.getReceivedPongMessages() == 0);
-
-        webSocketClient.stop();
-
-        // Give us 1000ms for the server to notice that clients went away
-        ix::msleep(1000);
-        REQUIRE(server.getClients().size() == 0);
-
-        // Ensure client close was not by ping timeout
-        REQUIRE(webSocketClient.closedDueToPingTimeout() == false);
-
-        ix::reportWebSocketTraffic();
-    }
-}
-
-TEST_CASE("Websocket_ping_no_timeout", "[setPingTimeout]")
-{
-    SECTION("Make sure that ping messages have a response (PONG).")
-    {
-        ix::setupWebSocketTrafficTrackerCallback();
-
-        int port = getFreePort();
-        ix::WebSocketServer server(port);
-        std::atomic<int> serverReceivedPingMessages(0);
-        bool enablePong = true; // Pong is enabled on Server
-        REQUIRE(startServer(server, serverReceivedPingMessages, enablePong));
-
-        std::string session = ix::generateSessionId();
-        int pingIntervalSecs = 1;
-        int pingTimeoutSecs = 2;
-        WebSocketClient webSocketClient(port, pingIntervalSecs, pingTimeoutSecs);
-
-        webSocketClient.start();
-
-        // Wait for all chat instance to be ready
-        while (true)
-        {
-            if (webSocketClient.isReady()) break;
-            ix::msleep(10);
-        }
-
-        REQUIRE(server.getClients().size() == 1);
-
-        ix::msleep(1200);
-
-        // Here we test ping timeout, no timeout
-        REQUIRE(serverReceivedPingMessages == 1);
-        REQUIRE(webSocketClient.getReceivedPongMessages() == 1);
-
-        ix::msleep(1000);
-
-        // Here we test ping timeout, no timeout
-        REQUIRE(serverReceivedPingMessages == 2);
-        REQUIRE(webSocketClient.getReceivedPongMessages() == 2);
-
-        webSocketClient.stop();
-
-        // Give us 1000ms for the server to notice that clients went away
-        ix::msleep(1000);
-        REQUIRE(server.getClients().size() == 0);
-
-        // Ensure client close was not by ping timeout
-        REQUIRE(webSocketClient.closedDueToPingTimeout() == false);
-
-        ix::reportWebSocketTraffic();
-    }
-}
-
-TEST_CASE("Websocket_no_ping_but_timeout", "[setPingTimeout]")
-{
-    SECTION("Make sure that ping messages don't have responses (no PONG).")
-    {
-        ix::setupWebSocketTrafficTrackerCallback();
-
-        int port = getFreePort();
-        ix::WebSocketServer server(port);
-        std::atomic<int> serverReceivedPingMessages(0);
-        bool enablePong = false; // Pong is disabled on Server
-        REQUIRE(startServer(server, serverReceivedPingMessages, enablePong));
-
-        std::string session = ix::generateSessionId();
-        int pingIntervalSecs = -1;  // no ping set
-        int pingTimeoutSecs = 3;
-        WebSocketClient webSocketClient(port, pingIntervalSecs, pingTimeoutSecs);
-        webSocketClient.start();
-
-        // Wait for all chat instance to be ready
-        while (true)
-        {
-            if (webSocketClient.isReady()) break;
-            ix::msleep(10);
-        }
-
-        REQUIRE(server.getClients().size() == 1);
-
-        ix::msleep(2900);
-
-        // Here we test ping timeout, no timeout yet
-        REQUIRE(serverReceivedPingMessages == 0);
-        REQUIRE(webSocketClient.getReceivedPongMessages() == 0);
-
-        REQUIRE(webSocketClient.isClosed() == false);
-        REQUIRE(webSocketClient.closedDueToPingTimeout() == false);
-
-        ix::msleep(300);
-
-        // Here we test ping timeout, timeout
-        REQUIRE(serverReceivedPingMessages == 0);
-        REQUIRE(webSocketClient.getReceivedPongMessages() == 0);
-        // Ensure client close was by ping timeout
-        ix::msleep(1000);
-        REQUIRE(webSocketClient.isClosed() == true);
-        REQUIRE(webSocketClient.closedDueToPingTimeout() == true);
-
-        webSocketClient.stop();
-
-        REQUIRE(server.getClients().size() == 0);
-
-        ix::reportWebSocketTraffic();
-    }
-}
-
-TEST_CASE("Websocket_ping_timeout", "[setPingTimeout]")
-{
-    SECTION("Make sure that ping messages don't have responses (no PONG).")
-    {
-        ix::setupWebSocketTrafficTrackerCallback();
-
-        int port = getFreePort();
-        ix::WebSocketServer server(port);
-        std::atomic<int> serverReceivedPingMessages(0);
-        bool enablePong = false; // Pong is disabled on Server
-        REQUIRE(startServer(server, serverReceivedPingMessages, enablePong));
-
-        std::string session = ix::generateSessionId();
-        int pingIntervalSecs = 1;
-        int pingTimeoutSecs = 2;
-        WebSocketClient webSocketClient(port, pingIntervalSecs, pingTimeoutSecs);
-
-        webSocketClient.start();
-
-        // Wait for all chat instance to be ready
-        while (true)
-        {
-            if (webSocketClient.isReady()) break;
-            ix::msleep(10);
-        }
-
-        REQUIRE(server.getClients().size() == 1);
-
-        ix::msleep(1100);
-
-        // Here we test ping timeout, no timeout yet
-        REQUIRE(serverReceivedPingMessages == 1);
-        REQUIRE(webSocketClient.getReceivedPongMessages() == 0);
-
-        ix::msleep(1100);
-
-        // Here we test ping timeout, timeout
-        REQUIRE(serverReceivedPingMessages == 1);
-        REQUIRE(webSocketClient.getReceivedPongMessages() == 0);
-        // Ensure client close was by ping timeout
-        ix::msleep(1000);
-        REQUIRE(webSocketClient.isClosed() == true);
-        REQUIRE(webSocketClient.closedDueToPingTimeout() == true);
-
-        webSocketClient.stop();
-
-        REQUIRE(server.getClients().size() == 0);
-
-        ix::reportWebSocketTraffic();
-    }
-}
-
-TEST_CASE("Websocket_ping_long_timeout", "[setPingTimeout]")
-{
-    SECTION("Make sure that ping messages don't have responses (no PONG).")
-    {
-        ix::setupWebSocketTrafficTrackerCallback();
-
-        int port = getFreePort();
-        ix::WebSocketServer server(port);
-        std::atomic<int> serverReceivedPingMessages(0);
-        bool enablePong = false; // Pong is disabled on Server
-        REQUIRE(startServer(server, serverReceivedPingMessages, enablePong));
-
-        std::string session = ix::generateSessionId();
-        int pingIntervalSecs = 2;
-        int pingTimeoutSecs = 6;
-        WebSocketClient webSocketClient(port, pingIntervalSecs, pingTimeoutSecs);
-
-        webSocketClient.start();
-
-        // Wait for all chat instance to be ready
-        while (true)
-        {
-            if (webSocketClient.isReady()) break;
-            ix::msleep(10);
-        }
-
-        REQUIRE(server.getClients().size() == 1);
-
-        ix::msleep(5800);
-
-        // Here we test ping timeout, no timeout yet (2 ping sent at 2s and 4s)
-        REQUIRE(serverReceivedPingMessages == 2);
-        REQUIRE(webSocketClient.getReceivedPongMessages() == 0);
-
-        // Ensure client not closed
-        REQUIRE(webSocketClient.isClosed() == false);
-        REQUIRE(webSocketClient.closedDueToPingTimeout() == false);
-
-        ix::msleep(600);
-
-        // Here we test ping timeout, timeout (at 6 seconds)
-        REQUIRE(serverReceivedPingMessages == 2);
-        REQUIRE(webSocketClient.getReceivedPongMessages() == 0);
-        // Ensure client close was not by ping timeout
-        REQUIRE(webSocketClient.isClosed() == true);
-        REQUIRE(webSocketClient.closedDueToPingTimeout() == true);
-
-        webSocketClient.stop();
-
-        REQUIRE(server.getClients().size() == 0);
-
-        ix::reportWebSocketTraffic();
-    }
-}

test/IXWebSocketServerTest.cpp

@@ -39,37 +39,42 @@ namespace ix
 
         server.setOnConnectionCallback(
             [&server, &connectionId](std::shared_ptr<ix::WebSocket> webSocket,
-                                     std::shared_ptr<ConnectionState> connectionState)
+                      std::shared_ptr<ConnectionState> connectionState)
             {
                 webSocket->setOnMessageCallback(
                     [webSocket, connectionState,
-                     &connectionId, &server](const ix::WebSocketMessagePtr& msg)
+                     &connectionId, &server](ix::WebSocketMessageType messageType,
+                       const std::string& str,
+                       size_t wireSize,
+                       const ix::WebSocketErrorInfo& error,
+                       const ix::WebSocketOpenInfo& openInfo,
+                       const ix::WebSocketCloseInfo& closeInfo)
                     {
-                        if (msg->type == ix::WebSocketMessageType::Open)
+                        if (messageType == ix::WebSocket_MessageType_Open)
                         {
                             Logger() << "New connection";
                             connectionState->computeId();
                             Logger() << "id: " << connectionState->getId();
-                            Logger() << "Uri: " << msg->openInfo.uri;
+                            Logger() << "Uri: " << openInfo.uri;
                             Logger() << "Headers:";
-                            for (auto it : msg->openInfo.headers)
+                            for (auto it : openInfo.headers)
                             {
                                 Logger() << it.first << ": " << it.second;
                             }
 
                             connectionId = connectionState->getId();
                         }
-                        else if (msg->type == ix::WebSocketMessageType::Close)
+                        else if (messageType == ix::WebSocket_MessageType_Close)
                         {
                             Logger() << "Closed connection";
                         }
-                        else if (msg->type == ix::WebSocketMessageType::Message)
+                        else if (messageType == ix::WebSocket_MessageType_Message)
                         {
                             for (auto&& client : server.getClients())
                             {
                                 if (client != webSocket)
                                 {
-                                    client->send(msg->str);
+                                    client->send(str);
                                 }
                             }
                         }
@@ -102,7 +107,7 @@ TEST_CASE("Websocket_server", "[websocket_server]")
         std::string errMsg;
         bool tls = false;
         std::shared_ptr<Socket> socket = createSocket(tls, errMsg);
-        std::string host("127.0.0.1");
+        std::string host("localhost");
         auto isCancellationRequested = []() -> bool
         {
             return false;
@@ -136,7 +141,7 @@ TEST_CASE("Websocket_server", "[websocket_server]")
         std::string errMsg;
         bool tls = false;
         std::shared_ptr<Socket> socket = createSocket(tls, errMsg);
-        std::string host("127.0.0.1");
+        std::string host("localhost");
         auto isCancellationRequested = []() -> bool
         {
             return false;
@@ -173,7 +178,7 @@ TEST_CASE("Websocket_server", "[websocket_server]")
         std::string errMsg;
         bool tls = false;
         std::shared_ptr<Socket> socket = createSocket(tls, errMsg);
-        std::string host("127.0.0.1");
+        std::string host("localhost");
         auto isCancellationRequested = []() -> bool
         {
             return false;
@@ -199,8 +204,9 @@ TEST_CASE("Websocket_server", "[websocket_server]")
         // Give us 500ms for the server to notice that clients went away
         ix::msleep(500);
 
-        server.stop();
         REQUIRE(connectionId == "foobarConnectionId");
+
+        server.stop();
         REQUIRE(server.getClients().size() == 0);
     }
 }

test/IXWebSocketTestConnectionDisconnection.cpp

@@ -52,38 +52,37 @@ namespace
         log(std::string("Connecting to url: ") + url);
 
         _webSocket.setOnMessageCallback(
-            [](const ix::WebSocketMessagePtr& msg)
+            [](ix::WebSocketMessageType messageType,
+               const std::string& str,
+               size_t wireSize,
+               const ix::WebSocketErrorInfo& error,
+               const ix::WebSocketOpenInfo& openInfo,
+               const ix::WebSocketCloseInfo& closeInfo)
             {
                 std::stringstream ss;
-                if (msg->type == ix::WebSocketMessageType::Open)
+                if (messageType == ix::WebSocket_MessageType_Open)
                 {
-                    log("TestConnectionDisconnection: connected !");
+                    log("cmd_websocket_satori_chat: connected !");
                 }
-                else if (msg->type == ix::WebSocketMessageType::Close)
+                else if (messageType == ix::WebSocket_MessageType_Close)
                 {
-                    log("TestConnectionDisconnection: disconnected !");
+                    log("cmd_websocket_satori_chat: disconnected !");
                 }
-                else if (msg->type == ix::WebSocketMessageType::Error)
+                else if (messageType == ix::WebSocket_MessageType_Error)
                 {
-                    ss << "TestConnectionDisconnection: Error! ";
-                    ss << msg->errorInfo.reason;
-                    log(ss.str());
+                    log("cmd_websocket_satori_chat: Error!");
                 }
-                else if (msg->type == ix::WebSocketMessageType::Message)
+                else if (messageType == ix::WebSocket_MessageType_Message)
                 {
-                    log("TestConnectionDisconnection: received message.!");
+                    log("cmd_websocket_satori_chat: received message.!");
                 }
-                else if (msg->type == ix::WebSocketMessageType::Ping)
+                else if (messageType == ix::WebSocket_MessageType_Ping)
                 {
-                    log("TestConnectionDisconnection: received ping message.!");
+                    log("cmd_websocket_satori_chat: received ping message.!");
                 }
-                else if (msg->type == ix::WebSocketMessageType::Pong)
+                else if (messageType == ix::WebSocket_MessageType_Pong)
                 {
-                    log("TestConnectionDisconnection: received pong message.!");
-                }
-                else if (msg->type == ix::WebSocketMessageType::Fragment)
-                {
-                    log("TestConnectionDisconnection: received fragment.!");
+                    log("cmd_websocket_satori_chat: received pong message.!");
                 }
                 else
                 {
@@ -91,12 +90,6 @@ namespace
                 }
             });
 
-        _webSocket.enableAutomaticReconnection();
-        REQUIRE(_webSocket.isAutomaticReconnectionEnabled() == true);
-
-        _webSocket.disableAutomaticReconnection();
-        REQUIRE(_webSocket.isAutomaticReconnectionEnabled() == false);
-
         // Start the connection
         _webSocket.start();
     }
@@ -110,52 +103,26 @@ TEST_CASE("websocket_connections", "[websocket]")
 {
     SECTION("Try to connect to invalid servers.")
     {
-        IXWebSocketTestConnectionDisconnection test;
+        IXWebSocketTestConnectionDisconnection chatA;
 
-        test.start(GOOGLE_URL);
+        chatA.start(GOOGLE_URL);
         ix::msleep(1000);
-        test.stop();
+        chatA.stop();
 
-        test.start(UNKNOWN_URL);
+        chatA.start(UNKNOWN_URL);
         ix::msleep(1000);
-        test.stop();
+        chatA.stop();
     }
 
-    SECTION("Try to connect and disconnect with different timing, not enough time to succesfully connect")
+    SECTION("Try to connect and disconnect with different timing.")
     {
-        IXWebSocketTestConnectionDisconnection test;
-        log(std::string("50 Runs"));
-
+        IXWebSocketTestConnectionDisconnection chatA;
         for (int i = 0; i < 50; ++i)
         {
             log(std::string("Run: ") + std::to_string(i));
-            test.start(WEBSOCKET_DOT_ORG_URL);
-
-            log(std::string("Sleeping"));
+            chatA.start(WEBSOCKET_DOT_ORG_URL);
             ix::msleep(i);
-
-            log(std::string("Stopping"));
-            test.stop();
-        }
-    }
-
-    // This test breaks on travis CI - Ubuntu Xenial + gcc + tsan
-    // We should fix this.
-    SECTION("Try to connect and disconnect with different timing, from not enough time to successfull connect")
-    {
-        IXWebSocketTestConnectionDisconnection test;
-        log(std::string("20 Runs"));
-
-        for (int i = 0; i < 20; ++i)
-        {
-            log(std::string("Run: ") + std::to_string(i));
-            test.start(WEBSOCKET_DOT_ORG_URL);
-
-            log(std::string("Sleeping"));
-            ix::msleep(i*50);
-
-            log(std::string("Stopping"));
-            test.stop();
+            chatA.stop();
         }
     }
 }

test/cmd_websocket_chat.cpp

@@ -87,7 +87,7 @@ namespace
 
     bool WebSocketChat::isReady() const
     {
-        return _webSocket.getReadyState() == ix::ReadyState::Open;
+        return _webSocket.getReadyState() == ix::WebSocket_ReadyState_Open;
     }
 
     void WebSocketChat::stop()
@@ -100,7 +100,7 @@ namespace
         std::string url;
         {
             std::stringstream ss;
-            ss << "ws://127.0.0.1:"
+            ss << "ws://localhost:"
                << _port
                << "/"
                << _user;
@@ -114,26 +114,31 @@ namespace
         log(std::string("Connecting to url: ") + url);
 
         _webSocket.setOnMessageCallback(
-            [this](const ix::WebSocketMessagePtr& msg)
+            [this](ix::WebSocketMessageType messageType,
+                   const std::string& str,
+                   size_t wireSize,
+                   const ix::WebSocketErrorInfo& error,
+                   const ix::WebSocketOpenInfo& openInfo,
+                   const ix::WebSocketCloseInfo& closeInfo)
             {
                 std::stringstream ss;
-                if (msg->type == ix::WebSocketMessageType::Open)
+                if (messageType == ix::WebSocket_MessageType_Open)
                 {
                     ss << "cmd_websocket_chat: user "
                        << _user
                        << " Connected !";
                     log(ss.str());
                 }
-                else if (msg->type == ix::WebSocketMessageType::Close)
+                else if (messageType == ix::WebSocket_MessageType_Close)
                 {
                     ss << "cmd_websocket_chat: user "
                        << _user
                        << " disconnected !";
                     log(ss.str());
                 }
-                else if (msg->type == ix::WebSocketMessageType::Message)
+                else if (messageType == ix::WebSocket_MessageType_Message)
                 {
-                    auto result = decodeMessage(msg->str);
+                    auto result = decodeMessage(str);
 
                     // Our "chat" / "broacast" node.js server does not send us
                     // the messages we send, so we don't need to have a msg_user != user
@@ -154,20 +159,20 @@ namespace
                        << _user << " > ";
                     log(ss.str());
                 }
-                else if (msg->type == ix::WebSocketMessageType::Error)
+                else if (messageType == ix::WebSocket_MessageType_Error)
                 {
-                    ss << "cmd_websocket_chat: Error ! " << msg->errorInfo.reason;
+                    ss << "cmd_websocket_chat: Error ! " << error.reason;
                     log(ss.str());
                 }
-                else if (msg->type == ix::WebSocketMessageType::Ping)
+                else if (messageType == ix::WebSocket_MessageType_Ping)
                 {
                     log("cmd_websocket_chat: received ping message");
                 }
-                else if (msg->type == ix::WebSocketMessageType::Pong)
+                else if (messageType == ix::WebSocket_MessageType_Pong)
                 {
                     log("cmd_websocket_chat: received pong message");
                 }
-                else if (msg->type == ix::WebSocketMessageType::Fragment)
+                else if (messageType == ix::WebSocket_MessageType_Fragment)
                 {
                     log("cmd_websocket_chat: received message fragment");
                 }
@@ -216,30 +221,35 @@ namespace
                       std::shared_ptr<ConnectionState> connectionState)
             {
                 webSocket->setOnMessageCallback(
-                    [webSocket, connectionState, &server](const ix::WebSocketMessagePtr& msg)
+                    [webSocket, connectionState, &server](ix::WebSocketMessageType messageType,
+                       const std::string& str,
+                       size_t wireSize,
+                       const ix::WebSocketErrorInfo& error,
+                       const ix::WebSocketOpenInfo& openInfo,
+                       const ix::WebSocketCloseInfo& closeInfo)
                     {
-                        if (msg->type == ix::WebSocketMessageType::Open)
+                        if (messageType == ix::WebSocket_MessageType_Open)
                         {
                             Logger() << "New connection";
                             Logger() << "id: " << connectionState->getId();
-                            Logger() << "Uri: " << msg->openInfo.uri;
+                            Logger() << "Uri: " << openInfo.uri;
                             Logger() << "Headers:";
-                            for (auto it : msg->openInfo.headers)
+                            for (auto it : openInfo.headers)
                             {
                                 Logger() << it.first << ": " << it.second;
                             }
                         }
-                        else if (msg->type == ix::WebSocketMessageType::Close)
+                        else if (messageType == ix::WebSocket_MessageType_Close)
                         {
                             log("Closed connection");
                         }
-                        else if (msg->type == ix::WebSocketMessageType::Message)
+                        else if (messageType == ix::WebSocket_MessageType_Message)
                         {
                             for (auto&& client : server.getClients())
                             {
                                 if (client != webSocket)
                                 {
-                                    client->send(msg->str);
+                                    client->send(str);
                                 }
                             }
                         }
@@ -326,8 +336,8 @@ TEST_CASE("Websocket_chat", "[websocket_chat]")
         REQUIRE(chatA.getReceivedMessages()[1] == "from B2");
         REQUIRE(chatA.getReceivedMessages()[2].size() == bigMessage.size());
 
-        // Give us 1000ms for the server to notice that clients went away
-        ix::msleep(1000);
+        // Give us 500ms for the server to notice that clients went away
+        ix::msleep(500);
         REQUIRE(server.getClients().size() == 0);
 
         ix::reportWebSocketTraffic();

test/compatibility/python/websockets/README.md

@@ -1,30 +0,0 @@
-# Clients
-
-## ws
-
-```
-$ ws connect ws://127.0.0.1:8765
-Type Ctrl-D to exit prompt...
-Connecting to url: ws://127.0.0.1:8765
-> ws_connect: connected
-Uri: /
-Handshake Headers:
-Connection: Upgrade
-Date: Sat, 08 Jun 2019 16:43:29 GMT
-Sec-WebSocket-Accept: kPCNwGa97y+7NWdAvHi/7/rA8AE=
-Sec-WebSocket-Extensions: permessage-deflate; server_max_window_bits=15; client_max_window_bits=15
-Server: Python/3.7 websockets/7.0
-Upgrade: websocket
-Received 13 bytes
-ws_connect: received message: > Welcome !
-ws_connect: connection closed: code 1006 reason Abnormal closure
-```
-
-## wscat
-
-```
-$ ./node_modules/.bin/wscat -c ws://127.0.0.1:8765
-connected (press CTRL+C to quit)
-< > Welcome !
-disconnected (code: 1006)
-```

test/compatibility/python/websockets/echo_server.py

@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-
-# WS server example
-
-import asyncio
-import websockets
-
-async def hello(websocket, path):
-    await websocket.send(f"> Welcome !")
-
-    name = await websocket.recv()
-    print(f"< {name}")
-
-    greeting = f"Hello {name}!"
-
-    await websocket.send(greeting)
-    print(f"> {greeting}")
-
-start_server = websockets.serve(hello, 'localhost', 8765)
-
-asyncio.get_event_loop().run_until_complete(start_server)
-asyncio.get_event_loop().run_forever()

test/run.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python2.7
+'''
+'''
 
 from __future__ import print_function
 
@@ -22,9 +24,9 @@ try:
 except ImportError:
     hasClick = False
 
-BUILD_TYPE = 'Debug'
-XML_OUTPUT_FILE = 'ixwebsocket_unittest.xml'
-TEST_EXE_PATH = None
+
+DEFAULT_EXE = 'ixwebsocket_unittest'
+
 
 class Command(object):
     """Run system commands with timeout
@@ -59,7 +61,7 @@ class Command(object):
             return True, self.process.returncode
 
 
-def runCommand(cmd, abortOnFailure=True, timeout=None):
+def runCommand(cmd, assertOnFailure=True, timeout=None):
     '''Small wrapper to run a command and make sure it succeed'''
 
     if timeout is None:
@@ -67,13 +69,16 @@ def runCommand(cmd, abortOnFailure=True, timeout=None):
 
     print('\nRunning', cmd)
     command = Command(cmd)
-    succeed, ret = command.run(timeout)
+    timedout, ret = command.run(timeout)
 
-    if not succeed or ret != 0:
-        msg = 'cmd {}\nfailed with error code {}'.format(cmd, ret)
+    if timedout:
+        print('Unittest timed out')
+
+    msg = 'cmd {} failed with error code {}'.format(cmd, ret)
+    if ret != 0:
         print(msg)
-        if abortOnFailure:
-            sys.exit(-1)
+        if assertOnFailure:
+            assert False
 
 
 def runCMake(sanitizer, buildDir):
@@ -82,39 +87,32 @@ def runCMake(sanitizer, buildDir):
     (remove build sub-folder).
     '''
 
+    # CMake installed via Self Service ends up here.
+    cmake_executable = '/Applications/CMake.app/Contents/bin/cmake'
+
+    if not os.path.exists(cmake_executable):
+        cmake_executable = 'cmake'
+
     sanitizersFlags = {
         'asan': '-DSANITIZE_ADDRESS=On',
         'ubsan': '-DSANITIZE_UNDEFINED=On',
         'tsan': '-DSANITIZE_THREAD=On',
         'none': ''
     }
-    sanitizerFlag = sanitizersFlags.get(sanitizer, '')
+    sanitizerFlag = sanitizersFlags[sanitizer]
 
     # CMake installed via Self Service ends up here.
     cmakeExecutable = '/Applications/CMake.app/Contents/bin/cmake'
     if not os.path.exists(cmakeExecutable):
         cmakeExecutable = 'cmake'
 
-    if platform.system() == 'Windows':
-        #generator = '"NMake Makefiles"'
-        #generator = '"Visual Studio 16 2019"'
-        generator = '"Visual Studio 15 2017"'
-        USE_VENDORED_THIRD_PARTY = 'ON'
-    else:
-        generator = '"Unix Makefiles"'
-        USE_VENDORED_THIRD_PARTY = 'OFF'
-
-    CMAKE_BUILD_TYPE = BUILD_TYPE
-
-    fmt = '{cmakeExecutable} -H. \
+    fmt = '''
+{cmakeExecutable} -H. \
     {sanitizerFlag} \
-    -B"{buildDir}" \
-    -DCMAKE_BUILD_TYPE={CMAKE_BUILD_TYPE} \
-    -DUSE_TLS=1 \
+    -B{buildDir} \
+    -DCMAKE_BUILD_TYPE=Debug \
     -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-    -DUSE_VENDORED_THIRD_PARTY={USE_VENDORED_THIRD_PARTY} \
-    -G{generator}'
-
+'''
     cmakeCmd = fmt.format(**locals())
     runCommand(cmakeCmd)
 
@@ -125,10 +123,10 @@ def runTest(args, buildDir, xmlOutput, testRunName):
     if args is None:
         args = ''
 
-    testCommand = '{} -o {} -n "{}" -r junit "{}"'.format(TEST_EXE_PATH, xmlOutput, testRunName, args)
-
+    fmt = '{buildDir}/{DEFAULT_EXE} -o {xmlOutput} -n "{testRunName}" -r junit "{args}"'
+    testCommand = fmt.format(**locals())
     runCommand(testCommand,
-               abortOnFailure=False)
+               assertOnFailure=False)
 
 
 def validateTestSuite(xmlOutput):
@@ -241,7 +239,6 @@ def executeJob(job):
     start = time.time()
 
     sys.stderr.write('.')
-    # print('Executing ' + job['cmd'] + '...')
 
     # 2 minutes of timeout for a single test
     timeout = 2 * 60
@@ -272,12 +269,12 @@ def executeJob(job):
     return job
 
 
-def executeJobs(jobs, cpuCount):
+def executeJobs(jobs):
     '''Execute a list of job concurrently on multiple CPU/cores'''
 
-    print('Using {} cores to execute the unittest'.format(cpuCount))
+    poolSize = multiprocessing.cpu_count()
 
-    pool = multiprocessing.Pool(cpuCount)
+    pool = multiprocessing.Pool(poolSize)
     results = pool.map(executeJob, jobs)
     pool.close()
     pool.join()
@@ -288,7 +285,8 @@ def executeJobs(jobs, cpuCount):
 def computeAllTestNames(buildDir):
     '''Compute all test case names, by executing the unittest in a custom mode'''
 
-    cmd = '"{}" --list-test-names-only'.format(TEST_EXE_PATH)
+    executable = os.path.join(buildDir, DEFAULT_EXE)
+    cmd = '"{}" --list-test-names-only'.format(executable)
     names = os.popen(cmd).read().splitlines()
     names.sort()  # Sort test names for execution determinism
     return names
@@ -335,7 +333,7 @@ def generateXmlOutput(results, xmlOutput, testRunName, runTime):
         })
 
         systemOut = ET.Element('system-out')
-        systemOut.text = result['output'].decode('utf-8', 'ignore')
+        systemOut.text = result['output'].decode('utf-8')
         testCase.append(systemOut)
 
         if not result['success']:
@@ -349,22 +347,11 @@ def generateXmlOutput(results, xmlOutput, testRunName, runTime):
         f.write(content.encode('utf-8'))
 
 
-def run(testName, buildDir, sanitizer, xmlOutput,
-        testRunName, buildOnly, useLLDB, cpuCount):
+def run(testName, buildDir, sanitizer, xmlOutput, testRunName, buildOnly, useLLDB):
     '''Main driver. Run cmake, compiles, execute and validate the testsuite.'''
 
-    # gen build files with CMake
     runCMake(sanitizer, buildDir)
-
-    if platform.system() == 'Linux':
-        # build with make -j
-        runCommand('make -C {} -j 2'.format(buildDir))
-    elif platform.system() == 'Darwin':
-        # build with make
-        runCommand('make -C {} -j 8'.format(buildDir))
-    else:
-        # build with cmake on recent
-        runCommand('cmake --build --parallel {}'.format(buildDir))
+    runCommand('make -C {} -j8'.format(buildDir))
 
     if buildOnly:
         return
@@ -399,7 +386,9 @@ def run(testName, buildDir, sanitizer, xmlOutput,
             continue
 
         # testName can contains spaces, so we enclose them in double quotes
-        cmd = '{} "{}" "{}" > "{}" 2>&1'.format(lldb, TEST_EXE_PATH, testName, outputPath)
+        executable = os.path.join(buildDir, DEFAULT_EXE)
+
+        cmd = '{} "{}" "{}" >& "{}"'.format(lldb, executable, testName, outputPath)
 
         jobs.append({
             'name': testName,
@@ -409,7 +398,7 @@ def run(testName, buildDir, sanitizer, xmlOutput,
         })
 
     start = time.time()
-    results = executeJobs(jobs, cpuCount)
+    results = executeJobs(jobs)
     runTime = time.time() - start
     generateXmlOutput(results, xmlOutput, testRunName, runTime)
 
@@ -432,13 +421,12 @@ def run(testName, buildDir, sanitizer, xmlOutput,
 
 
 def main():
-    root = os.path.dirname(os.path.realpath(__file__))
-    os.chdir(root)
-
-    buildDir = os.path.join(root, 'build', platform.system())
+    buildDir = 'build/' + platform.system()
     if not os.path.exists(buildDir):
         os.makedirs(buildDir)
 
+    defaultOutput = DEFAULT_EXE + '.xml'
+
     parser = argparse.ArgumentParser(description='Build and Run the engine unittest')
 
     sanitizers = ['tsan', 'asan', 'ubsan', 'none']
@@ -459,41 +447,19 @@ def main():
                         help='Run the test through lldb.')
     parser.add_argument('--run_name', '-n',
                         help='Name of the test run.')
-    parser.add_argument('--cpu_count', '-j', type=int, default=multiprocessing.cpu_count(),
-                        help='Number of cpus to use for running the tests.')
 
     args = parser.parse_args()
 
-    # Windows does not play nice with multiple files opened by different processes
-    # "The process cannot access the file because it is being used by another process"
-    if platform.system() == 'Windows':
-        args.cpu_count = 1
-
     # Default sanitizer is tsan
     sanitizer = args.sanitizer
-
-    if args.no_sanitizer:
-        sanitizer = 'none'
-    elif args.sanitizer is None:
+    if args.sanitizer is None:
         sanitizer = 'tsan'
 
-    # Sanitizers display lots of strange errors on Linux on CI,
-    # which looks like false positives
-    if platform.system() != 'Darwin':
-        sanitizer = 'none'
-
     defaultRunName = 'ixengine_{}_{}'.format(platform.system(), sanitizer)
 
-    xmlOutput = args.output or XML_OUTPUT_FILE
+    xmlOutput = args.output or defaultOutput
     testRunName = args.run_name or os.getenv('IXENGINE_TEST_RUN_NAME') or defaultRunName
 
-    global TEST_EXE_PATH
-
-    if platform.system() == 'Windows':
-        TEST_EXE_PATH = os.path.join(buildDir, BUILD_TYPE, 'ixwebsocket_unittest.exe')
-    else:
-        TEST_EXE_PATH = os.path.join(buildDir, 'ixwebsocket_unittest')
-
     if args.list:
         # catch2 exit with a different error code when requesting the list of files
         try:
@@ -511,7 +477,7 @@ def main():
         args.lldb = False
 
     return run(args.test, buildDir, sanitizer, xmlOutput, 
-               testRunName, args.build_only, args.lldb, args.cpu_count)
+               testRunName, args.build_only, args.lldb)
 
 
 if __name__ == '__main__':