ws_cobra_to_sentry improvements

.travis.yml

@@ -7,50 +7,35 @@ matrix:
   include:
     # macOS
     - os: osx
-      env:
-        - HOMEBREW_NO_AUTO_UPDATE=1
       compiler: clang
       script:
-        - brew install mbedtls
         - python test/run.py
         - make ws
 
-    # Linux
-    - os: linux
-      dist: bionic
-      before_install:
-        - sudo apt-get install -y libmbedtls-dev
-      script: 
-        - python test/run.py
-        - make ws
-      env:
-        - CC=gcc
-        - CXX=g++
-
-    # Clang + Linux disabled for now
+    # # Linux
     # - os: linux
     #   dist: xenial
-    #   script: python test/run.py
+    #   script: 
+    #     - python test/run.py
+    #     - make ws
     #   env:
-    #     - CC=clang 
-    #     - CXX=clang++
+    #     - 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: 
-    #     - cd third_party/zlib
-    #     - cmake .
-    #     - cmake --build . --target install
-    #     - cd ../..
-    #     # - cd third_party/mbedtls
-    #     # - cmake .
-    #     # - cmake --build . --target install
-    #     # - cd ../..
-    #     - export PATH=$CMAKE_PATH:$PATH
-    #     - cd test
-    #     - cmake .
-    #     - cmake --build --parallel .
-    #     - ixwebsocket_unittest.exe
-    #     # - python test/run.py
+    - 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 .
+        - cmake --build --parallel .
+        - python test/run.py

CHANGELOG.md

@@ -1,52 +0,0 @@
-# Changelog
-All notable changes to this project will be documented in this file.
-
-## [5.0.5] - 2019-08-22
-- Windows: use select instead of WSAPoll, through a poll wrapper
-
-## [5.0.4] - 2019-08-20
-- Windows build fixes (there was a problem with the use of ::poll that has a different name on Windows (WSAPoll))
-
-## [5.0.3] - 2019-08-14
-- CobraMetricThreadedPublisher _enable flag is an atomic, and CobraMetricsPublisher is enabled by default
-
-## [5.0.2] - 2019-08-01
-- ws cobra_subscribe has a new -q (quiet) option
-- ws cobra_subscribe knows to and display msg stats (count and # of messages received per second)
-- ws cobra_subscribe, cobra_to_statsd and cobra_to_sentry commands have a new option, --filter to restrict the events they want to receive
-
-## [5.0.1] - 2019-07-25
-- ws connect command has a new option to send in binary mode (still default to text)
-- ws connect command has readline history thanks to libnoise-cpp. Now ws connect one can use using arrows to lookup previous sent messages and edit them
-
-## [5.0.0] - 2019-06-23
-### Changed
-- New HTTP server / still very early. ws gained a new command, httpd can run a simple webserver serving local files.
-- IXDNSLookup. Uses weak pointer + smart_ptr + shared_from_this instead of static sets + mutex to handle object going away before dns lookup has resolved
-- 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,68 +20,60 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
 endif()
 
 set( IXWEBSOCKET_SOURCES
-    ixwebsocket/IXCancellationRequest.cpp
-    ixwebsocket/IXConnectionState.cpp
-    ixwebsocket/IXDNSLookup.cpp
-    ixwebsocket/IXHttp.cpp
-    ixwebsocket/IXHttpClient.cpp
-    ixwebsocket/IXHttpServer.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/IXNetSystem.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/IXWebSocketHttpHeaders.cpp
+    ixwebsocket/IXHttpClient.cpp
+    ixwebsocket/IXUrlParser.cpp
     ixwebsocket/LUrlParser.cpp
+    ixwebsocket/IXSelectInterrupt.cpp
+    ixwebsocket/IXSelectInterruptFactory.cpp
+    ixwebsocket/IXConnectionState.cpp
+    ixwebsocket/IXWebSocketCloseConstants.cpp
+    ixwebsocket/IXWebSocketMessageQueue.cpp
 )
 
 set( IXWEBSOCKET_HEADERS
-    ixwebsocket/IXCancellationRequest.h
-    ixwebsocket/IXConnectionState.h
-    ixwebsocket/IXDNSLookup.h
-    ixwebsocket/IXHttp.h
-    ixwebsocket/IXHttpClient.h
-    ixwebsocket/IXHttpServer.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/IXNetSystem.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/LUrlParser.h
+    ixwebsocket/IXSelectInterrupt.h
+    ixwebsocket/IXSelectInterruptFactory.h
+    ixwebsocket/IXConnectionState.h
+    ixwebsocket/IXWebSocketCloseConstants.h
+    ixwebsocket/IXWebSocketMessageQueue.h
 )
 
 if (UNIX)
@@ -138,12 +128,7 @@ if (APPLE AND USE_TLS AND NOT USE_MBED_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_TLS AND USE_OPEN_SSL)
+if (USE_OPEN_SSL)
   find_package(OpenSSL REQUIRED)
   add_definitions(${OPENSSL_DEFINITIONS})
   message(STATUS "OpenSSL: " ${OPENSSL_VERSION})
@@ -151,29 +136,26 @@ if (USE_TLS AND USE_OPEN_SSL)
   target_link_libraries(ixwebsocket ${OPENSSL_LIBRARIES})
 endif()
 
-if (USE_TLS AND USE_MBED_TLS)
-  if (USE_VENDORED_THIRD_PARTY)
-    set (ENABLE_PROGRAMS OFF)
-    add_subdirectory(third_party/mbedtls)
-    include_directories(third_party/mbedtls/include)
+if (USE_MBED_TLS)
+  set (ENABLE_PROGRAMS OFF)
+  add_subdirectory(third_party/mbedtls)
+  include_directories(third_party/mbedtls/include)
 
-    target_link_libraries(ixwebsocket mbedtls)
-  else()
-    find_package(MbedTLS REQUIRED)
-    include_directories(${MBEDTLS_INCLUDE_DIRS})
-    target_link_libraries(ixwebsocket ${MBEDTLS_LIBRARIES})
-  endif()
+  target_link_libraries(ixwebsocket mbedtls)
 endif()
 
-find_package(ZLIB REQUIRED)
-if (ZLIB_FOUND)
-  include_directories(${ZLIB_INCLUDE_DIRS})
-  target_link_libraries(ixwebsocket ${ZLIB_LIBRARIES})
-else()
+if (WIN32)
   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)
   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
@@ -185,7 +167,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
     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}")
 

DOCKER_VERSION

@@ -1 +1 @@
-5.0.4
+2.2.1

Dockerfile

@@ -1 +1 @@
-docker/Dockerfile.alpine
+docker/Dockerfile.ubuntu_artful

README.md

@@ -4,7 +4,7 @@
 
 ## Introduction
 
-[*WebSocket*](https://en.wikipedia.org/wiki/WebSocket) is a computer communications protocol, providing full-duplex and bi-directionnal communication channels over a single TCP connection. *IXWebSocket* is a C++ library for client and server Websocket communication, and for client and server HTTP communication. The code is derived from [easywsclient](https://github.com/dhbaird/easywsclient) and from the [Satori C SDK](https://github.com/satori-com/satori-rtm-sdk-c). It has been tested on the following platforms.
+[*WebSocket*](https://en.wikipedia.org/wiki/WebSocket) is a computer communications protocol, providing full-duplex and bi-directionnal communication channels over a single TCP connection. *IXWebSocket* is a C++ library for client and server Websocket communication, and for client HTTP communication. The code is derived from [easywsclient](https://github.com/dhbaird/easywsclient) and from the [Satori C SDK](https://github.com/satori-com/satori-rtm-sdk-c). It has been tested on the following platforms.
 
 * macOS
 * iOS
@@ -16,32 +16,9 @@
 
 The [*ws*](https://github.com/machinezone/IXWebSocket/tree/master/ws) folder countains many interactive programs for chat, [file transfers](https://github.com/machinezone/IXWebSocket/blob/master/ws/ws_send.cpp), [curl like](https://github.com/machinezone/IXWebSocket/blob/master/ws/ws_http_client.cpp) http clients, demonstrating client and server usage.
 
-### Windows note
-
-To use the network system on Windows, you need to initialize it once with *WSAStartup()* and clean it up with *WSACleanup()*. We have helpers for that which you can use, see below. This init would typically take place in your main function.
+Here is what the client API looks like.
 
 ```
-#include <ixwebsocket/IXNetSystem.h>
-
-int main()
-{
-    ix::initNetSystem();
-
-    ...
-
-    ix::uninitNetSystem();
-    return 0;
-}
-```
-
-### WebSocket client API
-
-```
-#include <ixwebsocket/IXWebSocket.h>
-
-...
-
-# Our websocket object
 ix::WebSocket webSocket;
 
 std::string url("ws://localhost:8080/");
@@ -51,27 +28,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)
+webSocket.setOnMessageCallback(
+    [](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::Message)
+        if (messageType == ix::WebSocketMessageType::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 ...
 
@@ -79,13 +58,9 @@ webSocket.sendBinary("some serialized binary data");
 webSocket.stop()
 ```
 
-### WebSocket server API
+Here is what the server API looks like. Note that server support is very recent and subject to changes.
 
 ```
-#include <ixwebsocket/IXWebSocketServer.h>
-
-...
-
 // Run a server on localhost at a given port.
 // Bound host name, max connections and listen backlog can also be passed in as parameters.
 ix::WebSocketServer server(port);
@@ -95,9 +70,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::WebSocketMessageType::Open)
                 {
                     std::cerr << "New connection" << std::endl;
 
@@ -108,21 +88,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::WebSocketMessageType::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);
                 }
             }
         );
@@ -144,13 +122,9 @@ server.wait();
 
 ```
 
-### HTTP client API
+Here is what the HTTP client API looks like. Note that HTTP client support is very recent and subject to changes.
 
 ```
-#include <ixwebsocket/IXHttpClient.h>
-
-...
-
 //
 // Preparation
 //
@@ -201,7 +175,7 @@ out = httpClient.post(url, std::string("foo=bar"), args);
 //
 // Result
 //
-auto statusCode = response->statusCode; // Can be HttpErrorCode::Ok, HttpErrorCode::UrlMalformed, etc...
+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
@@ -227,94 +201,25 @@ bool ok = httpClient.performRequest(args, [](const HttpResponsePtr& response)
 // ok will be false if your httpClient is not async
 ```
 
-### HTTP server API
-
-```
-#include <ixwebsocket/IXHttpServer.h>
-
-ix::HttpServer server(port, hostname);
-
-auto res = server.listen();
-if (!res.first)
-{
-    std::cerr << res.second << std::endl;
-    return 1;
-}
-
-server.start();
-server.wait();
-```
-
-If you want to handle how requests are processed, implement the setOnConnectionCallback callback, which takes an HttpRequestPtr as input, and returns an HttpResponsePtr. You can look at HttpServer::setDefaultConnectionCallback for a slightly more advanced callback example.
-
-```
-setOnConnectionCallback(
-    [this](HttpRequestPtr request,
-           std::shared_ptr<ConnectionState> /*connectionState*/) -> HttpResponsePtr
-    {
-        // Build a string for the response
-        std::stringstream ss;
-        ss << request->method
-           << " "
-           << request->uri;
-
-        std::string content = ss.str();
-
-        return std::make_shared<HttpResponse>(200, "OK",
-                                              HttpErrorCode::Ok,
-                                              WebSocketHttpHeaders(),
-                                              content);
-}
-```
-
 ## Build
 
-### CMake
-
 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.
 
 ```
 mkdir build # make a build dir so that you can build out of tree.
 cd build
-cmake -DUSE_TLS=1 ..
+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
 ```
 
 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`.
 
-Options for building:
-
-* `-DUSE_TLS=1` will enable TLS support
-* `-DUSE_MBED_TLS=1` will use [mbedlts](https://tls.mbed.org/) for the TLS support (default on Windows)
-* `-DUSE_WS=1` will build the ws interactive command line tool
-
-### vcpkg
-
-It is possible to get IXWebSocket through Microsoft [vcpkg](https://github.com/microsoft/vcpkg).
-
-```
-vcpkg install ixwebsocket
-```
-
-### Conan
-
-Support for building with conan was contributed by Olivia Zoe (thanks !). The package name to reference is `IXWebSocket/5.0.0@LunarWatcher/stable`. The package is in the process to be published to the official conan package repo, but in the meantime, it can be accessed by adding a new remote 
-
-```
-conan remote add remote_name_here https://api.bintray.com/conan/oliviazoe0/conan-packages
-```
-
-### Docker
-
-There is a Dockerfile for running the unittest on Linux, and to run the `ws` tool. It is also available on the docker registry.
-
-```
-docker run bsergean/ws
-```
-
-To use docker-compose you must make a docker container first.
+There is a Dockerfile for running some code on Linux. To use docker-compose you must make a docker container first.
 
 ```
 $ make docker
@@ -327,6 +232,12 @@ 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.
+
+```
+brew tap bsergean/IXWebSocket
+brew install IXWebSocket
+```
 
 ## Implementation details
 
@@ -344,7 +255,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
 
@@ -419,27 +330,33 @@ If the connection was closed and sending failed, the return value will be set to
 The onMessage event will be fired when the connection is opened or closed. This is similar to the [Javascript browser API](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket), which has `open` and `close` events notification that can be registered with the browser `addEventListener`.
 
 ```
-webSocket.setOnMessageCallback([](const ix::WebSocketMessagePtr& msg)
+webSocket.setOnMessageCallback(
+    [](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::WebSocketMessageType::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::WebSocketMessageType::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;
         }
     }
 );
@@ -450,15 +367,21 @@ webSocket.setOnMessageCallback([](const ix::WebSocketMessagePtr& msg)
 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.
 
 ```
-webSocket.setOnMessageCallback([](const ix::WebSocketMessagePtr& msg)
+webSocket.setOnMessageCallback(
+    [](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::Error)
+        if (messageType == ix::WebSocketMessageType::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;
         }
     }
@@ -484,12 +407,18 @@ websocket.configure(url);
 Ping/pong messages are used to implement keep-alive. 2 message types exists to identify ping and pong messages. Note that when a ping message is received, a pong is instantly send back as requested by the WebSocket spec.
 
 ```
-webSocket.setOnMessageCallback([](const ix::WebSocketMessagePtr& msg)
+webSocket.setOnMessageCallback(
+    [](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::Ping ||
-            msg->type == ix::WebSocketMessageType::Pong)
+        if (messageType == ix::WebSocketMessageType::Ping ||
+            messageType == ix::WebSocketMessageType::Pong)
         {
-            std::cout << "pong data: " << msg->str << std::endl;
+            std::cout << "pong data: " << str << std::endl;
         }
     }
 );

docker/Dockerfile.ubuntu_disco

@@ -1,23 +0,0 @@
-# Build time
-FROM ubuntu:disco 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", "test"]

ixwebsocket/IXDNSLookup.cpp

@@ -9,20 +9,30 @@
 
 #include <string.h>
 #include <chrono>
-#include <thread>
 
 namespace ix
 {
-    const int64_t DNSLookup::kDefaultWait = 1; // ms
+    const int64_t DNSLookup::kDefaultWait = 10; // ms
+
+    std::atomic<uint64_t> DNSLookup::_nextId(0);
+    std::set<uint64_t> DNSLookup::_activeJobs;
+    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)
+        _done(false),
+        _id(_nextId++)
     {
-        ;
+        setHostname(hostname);
+    }
+
+    DNSLookup::~DNSLookup()
+    {
+        // Remove this job from the active jobs list
+        std::lock_guard<std::mutex> lock(_activeJobsMutex);
+        _activeJobs.erase(_id);
     }
 
     struct addrinfo* DNSLookup::getAddrInfo(const std::string& hostname,
@@ -50,14 +60,14 @@ namespace ix
 
     struct addrinfo* DNSLookup::resolve(std::string& errMsg,
                                         const CancellationRequest& isCancellationRequested,
-                                        bool cancellable)
+                                        bool blocking)
     {
-        return cancellable ? resolveCancellable(errMsg, isCancellationRequested)
-                           : resolveUnCancellable(errMsg, isCancellationRequested);
+        return blocking ? resolveBlocking(errMsg, isCancellationRequested)
+                        : resolveAsync(errMsg, isCancellationRequested);
     }
 
-    struct addrinfo* DNSLookup::resolveUnCancellable(std::string& errMsg,
-                                                     const CancellationRequest& isCancellationRequested)
+    struct addrinfo* DNSLookup::resolveBlocking(std::string& errMsg,
+                                                const CancellationRequest& isCancellationRequested)
     {
         errMsg = "no error";
 
@@ -68,11 +78,11 @@ namespace ix
             return nullptr;
         }
 
-        return getAddrInfo(_hostname, _port, errMsg);
+        return getAddrInfo(getHostname(), _port, errMsg);
     }
 
-    struct addrinfo* DNSLookup::resolveCancellable(std::string& errMsg,
-                                                   const CancellationRequest& isCancellationRequested)
+    struct addrinfo* DNSLookup::resolveAsync(std::string& errMsg,
+                                             const CancellationRequest& isCancellationRequested)
     {
         errMsg = "no error";
 
@@ -84,28 +94,30 @@ namespace ix
                             // if you need a second lookup.
         }
 
+        // Record job in the active Job set
+        {
+            std::lock_guard<std::mutex> lock(_activeJobsMutex);
+            _activeJobs.insert(_id);
+        }
+
         //
         // Good resource on thread forced termination
         // https://www.bo-yang.net/2017/11/19/cpp-kill-detached-thread
         //
-        auto ptr = shared_from_this();
-        std::weak_ptr<DNSLookup> self(ptr);
+        _thread = std::thread(&DNSLookup::run, this, _id, getHostname(), _port);
+        _thread.detach();
 
-        int port = _port;
-        std::string hostname(_hostname);
-
-        // We make the background thread doing the work a shared pointer 
-        // instead of a member variable, because it can keep running when
-        // this object goes out of scope, in case of cancellation
-        auto t = std::make_shared<std::thread>(&DNSLookup::run, this, self, hostname, port);
-        t->detach();
+        std::unique_lock<std::mutex> lock(_conditionVariableMutex);
 
         while (!_done)
         {
-            // Wait for 1 milliseconds, to see if the bg thread has terminated.
-            // We do not use a condition variable to wait, as destroying this one
-            // if the bg thread is alive can cause undefined behavior.
-            std::this_thread::sleep_for(std::chrono::milliseconds(_wait));
+            // Wait for 10 milliseconds on the condition variable, to see
+            // if the bg thread has terminated.
+            if (_condition.wait_for(lock, std::chrono::milliseconds(_wait)) == std::cv_status::no_timeout)
+            {
+                // Background thread has terminated, so we can break of this loop
+                break;
+            }
 
             // Were we cancelled ?
             if (isCancellationRequested && isCancellationRequested())
@@ -126,7 +138,7 @@ namespace ix
         return getRes();
     }
 
-    void DNSLookup::run(std::weak_ptr<DNSLookup> self, std::string hostname, int port) // thread runner
+    void DNSLookup::run(uint64_t id, const std::string& hostname, int port) // thread runner
     {
         // We don't want to read or write into members variables of an object that could be
         // gone, so we use temporary variables (res) or we pass in by copy everything that
@@ -134,14 +146,33 @@ namespace ix
         std::string errMsg;
         struct addrinfo* res = getAddrInfo(hostname, port, errMsg);
 
-        if (self.lock())
+        // 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
+        // object data structure such as _errMsg or _condition
+        std::lock_guard<std::mutex> lock(_activeJobsMutex);
+        if (_activeJobs.count(id) == 0)
         {
-            // Copy result into the member variables
-            setRes(res);
-            setErrMsg(errMsg);
-
-            _done = true;
+            return;
         }
+
+        // Copy result into the member variables
+        setRes(res);
+        setErrMsg(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)

ixwebsocket/IXDNSLookup.h

@@ -12,36 +12,39 @@
 
 #include "IXCancellationRequest.h"
 #include <atomic>
-#include <memory>
-#include <mutex>
+#include <condition_variable>
 #include <set>
 #include <string>
+#include <thread>
 
 struct addrinfo;
 
 namespace ix
 {
-    class DNSLookup : public std::enable_shared_from_this<DNSLookup>
+    class DNSLookup
     {
     public:
         DNSLookup(const std::string& hostname, int port, int64_t wait = DNSLookup::kDefaultWait);
-        ~DNSLookup() = default;
+        ~DNSLookup();
 
         struct addrinfo* resolve(std::string& errMsg,
                                  const CancellationRequest& isCancellationRequested,
-                                 bool cancellable = true);
+                                 bool blocking = false);
 
     private:
-        struct addrinfo* resolveCancellable(std::string& errMsg,
-                                            const CancellationRequest& isCancellationRequested);
-        struct addrinfo* resolveUnCancellable(std::string& errMsg,
-                                              const CancellationRequest& isCancellationRequested);
+        struct addrinfo* resolveAsync(std::string& errMsg,
+                                      const CancellationRequest& isCancellationRequested);
+        struct addrinfo* resolveBlocking(std::string& errMsg,
+                                         const CancellationRequest& isCancellationRequested);
 
         static struct addrinfo* getAddrInfo(const std::string& hostname,
                                             int port,
                                             std::string& errMsg);
 
-        void run(std::weak_ptr<DNSLookup> self, std::string hostname, int port); // thread runner
+        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();
@@ -50,9 +53,10 @@ namespace ix
         struct addrinfo* getRes();
 
         std::string _hostname;
+        std::mutex _hostnameMutex;
         int _port;
+
         int64_t _wait;
-        const static int64_t kDefaultWait;
 
         struct addrinfo* _res;
         std::mutex _resMutex;
@@ -61,5 +65,15 @@ namespace ix
         std::mutex _errMsgMutex;
 
         std::atomic<bool> _done;
+        std::thread _thread;
+        std::condition_variable _condition;
+        std::mutex _conditionVariableMutex;
+
+        uint64_t _id;
+        static std::atomic<uint64_t> _nextId;
+        static std::set<uint64_t> _activeJobs;
+        static std::mutex _activeJobsMutex;
+
+        const static int64_t kDefaultWait;
     };
 } // namespace ix

ixwebsocket/IXHttp.cpp

@@ -1,138 +0,0 @@
-/*
- *  IXHttp.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXHttp.h"
-#include "IXCancellationRequest.h"
-#include "IXSocket.h"
-
-#include <sstream>
-#include <vector>
-
-namespace ix
-{
-    std::string Http::trim(const std::string& str)
-    {
-        std::string out;
-        for (auto c : str)
-        {
-            if (c != ' ' && c != '\n' && c != '\r')
-            {
-                out += c;
-            }
-        }
-
-        return out;
-    }
-
-    std::tuple<std::string, std::string, std::string> Http::parseRequestLine(const std::string& line)
-    {
-        // Request-Line   = Method SP Request-URI SP HTTP-Version CRLF
-        std::string token;
-        std::stringstream tokenStream(line);
-        std::vector<std::string> tokens;
-
-        // Split by ' '
-        while (std::getline(tokenStream, token, ' '))
-        {
-            tokens.push_back(token);
-        }
-
-        std::string method;
-        if (tokens.size() >= 1)
-        {
-            method = trim(tokens[0]);
-        }
-
-        std::string requestUri;
-        if (tokens.size() >= 2)
-        {
-            requestUri = trim(tokens[1]);
-        }
-
-        std::string httpVersion;
-        if (tokens.size() >= 3)
-        {
-            httpVersion = trim(tokens[2]);
-        }
-
-        return std::make_tuple(method, requestUri, httpVersion);
-    }
-
-    std::tuple<bool, std::string, HttpRequestPtr> Http::parseRequest(std::shared_ptr<Socket> socket)
-    {
-        HttpRequestPtr httpRequest;
-
-        std::atomic<bool> requestInitCancellation(false);
-
-        int timeoutSecs = 5; // FIXME
-
-        auto isCancellationRequested =
-            makeCancellationRequestWithTimeout(timeoutSecs, requestInitCancellation);
-
-        // Read first line
-        auto lineResult = socket->readLine(isCancellationRequested);
-        auto lineValid = lineResult.first;
-        auto line = lineResult.second;
-
-        if (!lineValid)
-        {
-            return std::make_tuple(false, "Error reading HTTP request line", httpRequest);
-        }
-
-        // Parse request line (GET /foo HTTP/1.1\r\n)
-        auto requestLine = Http::parseRequestLine(line);
-        auto method      = std::get<0>(requestLine);
-        auto uri         = std::get<1>(requestLine);
-        auto httpVersion = std::get<2>(requestLine);
-
-        // Retrieve and validate HTTP headers
-        auto result = parseHttpHeaders(socket, isCancellationRequested);
-        auto headersValid = result.first;
-        auto headers = result.second;
-
-        if (!headersValid)
-        {
-            return std::make_tuple(false, "Error parsing HTTP headers", httpRequest);
-        }
-
-        httpRequest = std::make_shared<HttpRequest>(uri, method, httpVersion, headers);
-        return std::make_tuple(true, "", httpRequest);
-    }
-
-    bool Http::sendResponse(HttpResponsePtr response, std::shared_ptr<Socket> socket)
-    {
-        // Write the response to the socket
-        std::stringstream ss;
-        ss << "HTTP/1.1 ";
-        ss << response->statusCode;
-        ss << " ";
-        ss << response->description;
-        ss << "\r\n";
-
-        if (!socket->writeBytes(ss.str(), nullptr))
-        {
-            return false;
-        }
-
-        // Write headers
-        ss.str("");
-        ss << "Content-Length: " << response->payload.size() << "\r\n";
-        for (auto&& it : response->headers)
-        {
-            ss << it.first << ": " << it.second << "\r\n";
-        }
-        ss << "\r\n";
-
-        if (!socket->writeBytes(ss.str(), nullptr))
-        {
-            return false;
-        }
-
-        return response->payload.empty()
-            ? true
-            : socket->writeBytes(response->payload, nullptr);
-    }
-}

ixwebsocket/IXHttp.h

@@ -1,122 +0,0 @@
-/*
- *  IXHttp.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include "IXProgressCallback.h"
-#include "IXWebSocketHttpHeaders.h"
-#include <tuple>
-
-namespace ix
-{
-    enum class HttpErrorCode : int
-    {
-        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
-    };
-
-    struct HttpResponse
-    {
-        int statusCode;
-        std::string description;
-        HttpErrorCode errorCode;
-        WebSocketHttpHeaders headers;
-        std::string payload;
-        std::string errorMsg;
-        uint64_t uploadSize;
-        uint64_t downloadSize;
-
-        HttpResponse(int s = 0,
-                     const std::string& des = std::string(),
-                     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)
-            , description(des)
-            , 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;
-        int transferTimeout;
-        bool followRedirects;
-        int maxRedirects;
-        bool verbose;
-        bool compress;
-        Logger logger;
-        OnProgressCallback onProgressCallback;
-    };
-
-    using HttpRequestArgsPtr = std::shared_ptr<HttpRequestArgs>;
-
-    struct HttpRequest
-    {
-        std::string uri;
-        std::string method;
-        std::string version;
-        WebSocketHttpHeaders headers;
-
-        HttpRequest(const std::string& u,
-                    const std::string& m,
-                    const std::string& v,
-                    const WebSocketHttpHeaders& h = WebSocketHttpHeaders())
-            : uri(u)
-            , method(m)
-            , version(v)
-            , headers(h)
-        {
-        }
-    };
-
-    using HttpRequestPtr = std::shared_ptr<HttpRequest>;
-
-    class Http
-    {
-    public:
-        static std::tuple<bool, std::string, HttpRequestPtr> parseRequest(
-            std::shared_ptr<Socket> socket);
-        static bool sendResponse(HttpResponsePtr response, std::shared_ptr<Socket> socket);
-
-        static std::tuple<std::string, std::string, std::string> parseRequestLine(
-            const std::string& line);
-        static std::string trim(const std::string& str);
-    };
-} // namespace ix

ixwebsocket/IXHttpClient.cpp

@@ -14,7 +14,6 @@
 #include <vector>
 #include <cstring>
 
-#include <assert.h>
 #include <zlib.h>
 
 namespace ix
@@ -53,8 +52,6 @@ namespace ix
     bool HttpClient::performRequest(HttpRequestArgsPtr args,
                                     const OnResponseCallback& onResponseCallback)
     {
-        assert(_async && "HttpClient needs its async parameter set to true "
-                         "in order to call performRequest");
         if (!_async) return false;
 
         // Enqueue the task
@@ -112,7 +109,7 @@ namespace ix
         HttpRequestArgsPtr args,
         int redirects)
     {
-        // We only have one socket connection, so we cannot
+        // We only have one socket connection, so we cannot 
         // make multiple requests concurrently.
         std::lock_guard<std::mutex> lock(_mutex);
 
@@ -121,7 +118,6 @@ namespace ix
         int code = 0;
         WebSocketHttpHeaders headers;
         std::string payload;
-        std::string description;
 
         std::string protocol, host, path, query;
         int port;
@@ -130,9 +126,9 @@ namespace ix
         {
             std::stringstream ss;
             ss << "Cannot parse url: " << url;
-            return std::make_shared<HttpResponse>(code, description, HttpErrorCode::UrlMalformed,
-                                                  headers, payload, ss.str(),
-                                                  uploadSize, downloadSize);
+            return std::make_shared<HttpResponse>(code, HttpErrorCode::UrlMalformed,
+                                headers, payload, ss.str(),
+                                uploadSize, downloadSize);
         }
 
         bool tls = protocol == "https";
@@ -141,9 +137,9 @@ namespace ix
 
         if (!_socket)
         {
-            return std::make_shared<HttpResponse>(code, description, HttpErrorCode::CannotCreateSocket,
-                                                  headers, payload, errorMsg,
-                                                  uploadSize, downloadSize);
+            return std::make_shared<HttpResponse>(code, HttpErrorCode::CannotCreateSocket,
+                                headers, payload, errorMsg,
+                                uploadSize, downloadSize);
         }
 
         // Build request string
@@ -204,7 +200,7 @@ namespace ix
         {
             std::stringstream ss;
             ss << "Cannot connect to url: " << url << " / error : " << errMsg;
-            return std::make_shared<HttpResponse>(code, description, HttpErrorCode::CannotConnect,
+            return std::make_shared<HttpResponse>(code, HttpErrorCode::CannotConnect,
                                                   headers, payload, ss.str(),
                                                   uploadSize, downloadSize);
         }
@@ -230,7 +226,7 @@ namespace ix
         if (!_socket->writeBytes(req, isCancellationRequested))
         {
             std::string errorMsg("Cannot send request");
-            return std::make_shared<HttpResponse>(code, description, HttpErrorCode::SendError,
+            return std::make_shared<HttpResponse>(code, HttpErrorCode::SendError,
                                                   headers, payload, errorMsg,
                                                   uploadSize, downloadSize);
         }
@@ -244,7 +240,7 @@ namespace ix
         if (!lineValid)
         {
             std::string errorMsg("Cannot retrieve status line");
-            return std::make_shared<HttpResponse>(code, description, HttpErrorCode::CannotReadStatusLine,
+            return std::make_shared<HttpResponse>(code, HttpErrorCode::CannotReadStatusLine,
                                                   headers, payload, errorMsg,
                                                   uploadSize, downloadSize);
         }
@@ -259,7 +255,7 @@ 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, description, HttpErrorCode::MissingStatus,
+            return std::make_shared<HttpResponse>(code, HttpErrorCode::MissingStatus,
                                                   headers, payload, errorMsg,
                                                   uploadSize, downloadSize);
         }
@@ -271,7 +267,7 @@ namespace ix
         if (!headersValid)
         {
             std::string errorMsg("Cannot parse http headers");
-            return std::make_shared<HttpResponse>(code, description, HttpErrorCode::HeaderParsingError,
+            return std::make_shared<HttpResponse>(code, HttpErrorCode::HeaderParsingError,
                                                   headers, payload, errorMsg,
                                                   uploadSize, downloadSize);
         }
@@ -282,7 +278,7 @@ namespace ix
             if (headers.find("Location") == headers.end())
             {
                 std::string errorMsg("Missing location header for redirect");
-                return std::make_shared<HttpResponse>(code, description, HttpErrorCode::MissingLocation,
+                return std::make_shared<HttpResponse>(code, HttpErrorCode::MissingLocation,
                                                       headers, payload, errorMsg,
                                                       uploadSize, downloadSize);
             }
@@ -291,7 +287,7 @@ namespace ix
             {
                 std::stringstream ss;
                 ss << "Too many redirects: " << redirects;
-                return std::make_shared<HttpResponse>(code, description, HttpErrorCode::TooManyRedirects,
+                return std::make_shared<HttpResponse>(code, HttpErrorCode::TooManyRedirects,
                                                       headers, payload, ss.str(),
                                                       uploadSize, downloadSize);
             }
@@ -303,7 +299,7 @@ namespace ix
 
         if (verb == "HEAD")
         {
-            return std::make_shared<HttpResponse>(code, description, HttpErrorCode::Ok,
+            return std::make_shared<HttpResponse>(code, HttpErrorCode::Ok,
                                                   headers, payload, std::string(),
                                                   uploadSize, downloadSize);
         }
@@ -324,7 +320,7 @@ namespace ix
             if (!chunkResult.first)
             {
                 errorMsg = "Cannot read chunk";
-                return std::make_shared<HttpResponse>(code, description, HttpErrorCode::ChunkReadError,
+                return std::make_shared<HttpResponse>(code, HttpErrorCode::ChunkReadError,
                                                       headers, payload, errorMsg,
                                                       uploadSize, downloadSize);
             }
@@ -342,7 +338,7 @@ namespace ix
 
                 if (!lineResult.first)
                 {
-                    return std::make_shared<HttpResponse>(code, description, HttpErrorCode::ChunkReadError,
+                    return std::make_shared<HttpResponse>(code, HttpErrorCode::ChunkReadError,
                                                           headers, payload, errorMsg,
                                                           uploadSize, downloadSize);
                 }
@@ -369,7 +365,7 @@ namespace ix
                 if (!chunkResult.first)
                 {
                     errorMsg = "Cannot read chunk";
-                    return std::make_shared<HttpResponse>(code, description, HttpErrorCode::ChunkReadError,
+                    return std::make_shared<HttpResponse>(code, HttpErrorCode::ChunkReadError,
                                                           headers, payload, errorMsg,
                                                           uploadSize, downloadSize);
                 }
@@ -380,7 +376,7 @@ namespace ix
 
                 if (!lineResult.first)
                 {
-                    return std::make_shared<HttpResponse>(code, description, HttpErrorCode::ChunkReadError,
+                    return std::make_shared<HttpResponse>(code, HttpErrorCode::ChunkReadError,
                                                           headers, payload, errorMsg,
                                                           uploadSize, downloadSize);
                 }
@@ -395,7 +391,7 @@ namespace ix
         else
         {
             std::string errorMsg("Cannot read http body");
-            return std::make_shared<HttpResponse>(code, description, HttpErrorCode::CannotReadBody,
+            return std::make_shared<HttpResponse>(code, HttpErrorCode::CannotReadBody,
                                                   headers, payload, errorMsg,
                                                   uploadSize, downloadSize);
         }
@@ -409,14 +405,14 @@ namespace ix
             if (!gzipInflate(payload, decompressedPayload))
             {
                 std::string errorMsg("Error decompressing payload");
-                return std::make_shared<HttpResponse>(code, description, HttpErrorCode::Gzip,
+                return std::make_shared<HttpResponse>(code, HttpErrorCode::Gzip,
                                                       headers, payload, errorMsg,
                                                       uploadSize, downloadSize);
             }
             payload = decompressedPayload;
         }
 
-        return std::make_shared<HttpResponse>(code, description, HttpErrorCode::Ok,
+        return std::make_shared<HttpResponse>(code, HttpErrorCode::Ok,
                                               headers, payload, std::string(),
                                               uploadSize, downloadSize);
     }

ixwebsocket/IXHttpClient.h

@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include "IXHttp.h"
 #include "IXSocket.h"
 #include "IXWebSocketHttpHeaders.h"
 #include <algorithm>
@@ -21,6 +20,78 @@
 
 namespace ix
 {
+    enum class HttpErrorCode : int
+    {
+        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
+    };
+
+    struct HttpResponse
+    {
+        int statusCode;
+        HttpErrorCode errorCode;
+        WebSocketHttpHeaders headers;
+        std::string payload;
+        std::string errorMsg;
+        uint64_t uploadSize;
+        uint64_t downloadSize;
+
+        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;
+        int transferTimeout;
+        bool followRedirects;
+        int maxRedirects;
+        bool verbose;
+        bool compress;
+        Logger logger;
+        OnProgressCallback onProgressCallback;
+    };
+
+    using HttpRequestArgsPtr = std::shared_ptr<HttpRequestArgs>;
+
     class HttpClient
     {
     public:

ixwebsocket/IXHttpServer.cpp

@@ -1,158 +0,0 @@
-/*
- *  IXHttpServer.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXHttpServer.h"
-#include "IXSocketConnect.h"
-#include "IXSocketFactory.h"
-#include "IXNetSystem.h"
-
-#include <iostream>
-#include <sstream>
-#include <fstream>
-#include <vector>
-
-namespace
-{
-    std::pair<bool, std::vector<uint8_t>> load(const std::string& path)
-    {
-        std::vector<uint8_t> memblock;
-
-        std::ifstream file(path);
-        if (!file.is_open()) return std::make_pair(false, memblock);
-
-        file.seekg(0, file.end);
-        std::streamoff size = file.tellg();
-        file.seekg(0, file.beg);
-
-        memblock.resize((size_t) size);
-        file.read((char*)&memblock.front(), static_cast<std::streamsize>(size));
-
-        return std::make_pair(true, memblock);
-    }
-
-    std::pair<bool, std::string> readAsString(const std::string& path)
-    {
-        auto res = load(path);
-        auto vec = res.second;
-        return std::make_pair(res.first, std::string(vec.begin(), vec.end()));
-    }
-}
-
-namespace ix
-{
-    HttpServer::HttpServer(int port,
-                           const std::string& host,
-                           int backlog,
-                           size_t maxConnections) : SocketServer(port, host, backlog, maxConnections),
-        _connectedClientsCount(0)
-    {
-        setDefaultConnectionCallback();
-    }
-
-    HttpServer::~HttpServer()
-    {
-        stop();
-    }
-
-    void HttpServer::stop()
-    {
-        stopAcceptingConnections();
-
-        // FIXME: cancelling / closing active clients ...
-
-        SocketServer::stop();
-    }
-
-    void HttpServer::setOnConnectionCallback(const OnConnectionCallback& callback)
-    {
-        _onConnectionCallback = callback;
-    }
-
-    void HttpServer::handleConnection(
-        int fd,
-        std::shared_ptr<ConnectionState> connectionState)
-    {
-        _connectedClientsCount++;
-
-        std::string errorMsg;
-        auto socket = createSocket(fd, errorMsg);
-
-        // Set the socket to non blocking mode + other tweaks
-        SocketConnect::configure(fd);
-
-        auto ret = Http::parseRequest(socket);
-        // FIXME: handle errors in parseRequest
-
-        if (std::get<0>(ret))
-        {
-            auto response = _onConnectionCallback(std::get<2>(ret), connectionState);
-            if (!Http::sendResponse(response, socket))
-            {
-                logError("Cannot send response");
-            }
-        }
-        connectionState->setTerminated();
-
-        _connectedClientsCount--;
-    }
-
-    size_t HttpServer::getConnectedClientsCount()
-    {
-        return _connectedClientsCount;
-    }
-
-    void HttpServer::setDefaultConnectionCallback()
-    {
-        setOnConnectionCallback(
-            [this](HttpRequestPtr request,
-                   std::shared_ptr<ConnectionState> /*connectionState*/) -> HttpResponsePtr
-            {
-                std::string uri(request->uri);
-                if (uri.empty() || uri == "/")
-                {
-                    uri = "/index.html";
-                }
-
-                std::string path("." + uri);
-                auto res = readAsString(path);
-                bool found = res.first;
-                if (!found)
-                {
-                    return std::make_shared<HttpResponse>(404, "Not Found",
-                                                          HttpErrorCode::Ok,
-                                                          WebSocketHttpHeaders(),
-                                                          std::string());
-                }
-
-                std::string content = res.second;
-
-                // Log request
-                std::stringstream ss;
-                ss << request->method
-                   << " "
-                   << request->uri
-                   << " "
-                   << content.size();
-                logInfo(ss.str());
-
-                WebSocketHttpHeaders headers;
-                // FIXME: check extensions to set the content type
-                // headers["Content-Type"] = "application/octet-stream";
-                headers["Accept-Ranges"] = "none";
-
-                for (auto&& it : request->headers)
-                {
-                    headers[it.first] = it.second;
-                }
-
-                return std::make_shared<HttpResponse>(200, "OK",
-                                                      HttpErrorCode::Ok,
-                                                      headers,
-                                                      content);
-            }
-        );
-    }
-}

ixwebsocket/IXHttpServer.h

@@ -1,49 +0,0 @@
-/*
- *  IXHttpServer.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include "IXHttp.h"
-#include "IXSocketServer.h"
-#include "IXWebSocket.h"
-#include <functional>
-#include <memory>
-#include <mutex>
-#include <set>
-#include <string>
-#include <thread>
-#include <utility> // pair
-
-namespace ix
-{
-    class HttpServer final : public SocketServer
-    {
-    public:
-        using OnConnectionCallback =
-            std::function<HttpResponsePtr(HttpRequestPtr, std::shared_ptr<ConnectionState>)>;
-
-        HttpServer(int port = SocketServer::kDefaultPort,
-                   const std::string& host = SocketServer::kDefaultHost,
-                   int backlog = SocketServer::kDefaultTcpBacklog,
-                   size_t maxConnections = SocketServer::kDefaultMaxConnections);
-        virtual ~HttpServer();
-        virtual void stop() final;
-
-        void setOnConnectionCallback(const OnConnectionCallback& callback);
-
-    private:
-        // Member variables
-        OnConnectionCallback _onConnectionCallback;
-        std::atomic<int> _connectedClientsCount;
-
-        // Methods
-        virtual void handleConnection(int fd,
-                                      std::shared_ptr<ConnectionState> connectionState) final;
-        virtual size_t getConnectedClientsCount() final;
-
-        void setDefaultConnectionCallback();
-    };
-} // namespace ix

ixwebsocket/IXNetSystem.cpp

@@ -15,8 +15,9 @@ namespace ix
         WSADATA wsaData;
         int err;
 
-        // Use the MAKEWORD(lowbyte, highbyte) macro declared in Windef.h
+        /* Use the MAKEWORD(lowbyte, highbyte) macro declared in Windef.h */
         wVersionRequested = MAKEWORD(2, 2);
+
         err = WSAStartup(wVersionRequested, &wsaData);
 
         return err == 0;
@@ -29,82 +30,10 @@ namespace ix
     {
 #ifdef _WIN32
         int err = WSACleanup();
+
         return err == 0;
 #else
         return true;
 #endif
     }
-
-#ifdef _WIN32
-    //
-    // That function could 'return WSAPoll(pfd, nfds, timeout);'
-    // but WSAPoll is said to have weird behaviors on the internet
-    // (the curl folks have had problems with it).
-    //
-    // So we make it a select wrapper
-    //
-    int poll(struct pollfd *fds, nfds_t nfds, int timeout)
-    {
-        int maxfd = 0;
-        fd_set readfds, writefds, errorfds;
-        FD_ZERO(&readfds);
-        FD_ZERO(&writefds);
-        FD_ZERO(&errorfds);
-
-        for (nfds_t i = 0; i < nfds; ++i)
-        {
-            struct pollfd *fd = &fds[i];
-
-            if (fd->fd > maxfd)
-            {
-                maxfd = fd->fd;
-            }
-            if ((fd->events & POLLIN))
-            {
-                FD_SET(fd->fd, &readfds);
-            }
-            if ((fd->events & POLLOUT))
-            {
-                FD_SET(fd->fd, &writefds);
-            }
-            if ((fd->events & POLLERR))
-            {
-                FD_SET(fd->fd, &errorfds);
-            }
-        }
-
-        struct timeval tv;
-        tv.tv_sec = timeout / 1000;
-        tv.tv_usec = (timeout % 1000) * 1000;
-
-        int ret = select(maxfd + 1, &readfds, &writefds, &errorfds,
-                         timeout != -1 ? &tv : NULL);
-
-        if (ret < 0) 
-        {
-            return ret;
-        }
-
-        for (nfds_t i = 0; i < nfds; ++i)
-        {
-            struct pollfd *fd = &fds[i];
-            fd->revents = 0;
-
-            if (FD_ISSET(fd->fd, &readfds))
-            {
-                fd->revents |= POLLIN;
-            }
-            if (FD_ISSET(fd->fd, &writefds))
-            {
-                fd->revents |= POLLOUT;
-            }
-            if (FD_ISSET(fd->fd, &errorfds))
-            {
-                fd->revents |= POLLERR;
-            }
-        }
-
-        return ret;
-    }
-#endif
 }

ixwebsocket/IXNetSystem.h

@@ -12,18 +12,11 @@
 #include <basetsd.h>
 #include <io.h>
 #include <ws2def.h>
-
-// Define our own poll on Windows
-typedef unsigned long int nfds_t;
-
-int poll(struct pollfd* fds, nfds_t nfds, int timeout);
-
 #else
 #include <arpa/inet.h>
 #include <errno.h>
 #include <netdb.h>
 #include <netinet/tcp.h>
-#include <poll.h>
 #include <sys/select.h>
 #include <sys/socket.h>
 #include <sys/stat.h>

ixwebsocket/IXSocket.cpp

@@ -44,42 +44,41 @@ namespace ix
         close();
     }
 
-    PollResultType Socket::poll(bool readyToRead,
-                                int timeoutMs,
-                                int sockfd,
-                                std::shared_ptr<SelectInterrupt> selectInterrupt)
+    PollResultType Socket::poll(int timeoutMs)
     {
-        //
-        // We used to use ::select to poll but on Android 9 we get large fds out of ::connect
-        // which crash in FD_SET as they are larger than FD_SETSIZE.
-        // Switching to ::poll does fix that.
-        //
-        // However poll isn't as portable as select and has bugs on Windows, so we should write a 
-        // shim to fallback to select on those platforms.
-        // See https://github.com/mpv-player/mpv/pull/5203/files for such a select wrapper.
-        //
-        nfds_t nfds = 1;
-        struct pollfd fds[2];
+        return isReadyToRead(timeoutMs);
+    }
 
-        fds[0].fd = sockfd;
-        fds[0].events = (readyToRead) ? POLLIN : POLLOUT;
-        fds[0].events |= POLLERR;
+    PollResultType Socket::select(bool readyToRead, int timeoutMs)
+    {
+        fd_set rfds;
+        fd_set wfds;
+        FD_ZERO(&rfds);
+        FD_ZERO(&wfds);
 
-        // File descriptor used to interrupt select when needed
-        int interruptFd = -1;
-        if (selectInterrupt)
+        fd_set* fds = (readyToRead) ? &rfds : & wfds;
+        if (_sockfd != -1)
         {
-            interruptFd = selectInterrupt->getFd();
-
-            if (interruptFd != -1)
-            {
-                nfds = 2;
-                fds[1].fd = interruptFd;
-                fds[1].events = POLLIN;
-            }
+            FD_SET(_sockfd, fds);
         }
 
-        int ret = ::poll(fds, nfds, timeoutMs);
+        // File descriptor used to interrupt select when needed
+        int interruptFd = _selectInterrupt->getFd();
+        if (interruptFd != -1)
+        {
+            FD_SET(interruptFd, fds);
+        }
+
+        struct timeval timeout;
+        timeout.tv_sec = timeoutMs / 1000;
+        timeout.tv_usec = 1000 * (timeoutMs % 1000);
+
+        // Compute the highest fd.
+        int sockfd = _sockfd;
+        int nfds = (std::max)(sockfd, interruptFd);
+
+        int ret = ::select(nfds + 1, &rfds, &wfds, nullptr,
+                           (timeoutMs < 0) ? nullptr : &timeout);
 
         PollResultType pollResult = PollResultType::ReadyForRead;
         if (ret < 0)
@@ -90,9 +89,9 @@ namespace ix
         {
             pollResult = PollResultType::Timeout;
         }
-        else if (interruptFd != -1 && fds[1].revents & POLLIN)
+        else if (interruptFd != -1 && FD_ISSET(interruptFd, &rfds))
         {
-            uint64_t value = selectInterrupt->read();
+            uint64_t value = _selectInterrupt->read();
 
             if (value == kSendRequest)
             {
@@ -103,36 +102,13 @@ namespace ix
                 pollResult = PollResultType::CloseRequest;
             }
         }
-        else if (sockfd != -1 && readyToRead && fds[0].revents & POLLIN)
+        else if (sockfd != -1 && readyToRead && FD_ISSET(sockfd, &rfds))
         {
             pollResult = PollResultType::ReadyForRead;
         }
-        else if (sockfd != -1 && !readyToRead && fds[0].revents & POLLOUT)
+        else if (sockfd != -1 && !readyToRead && FD_ISSET(sockfd, &wfds))
         {
             pollResult = PollResultType::ReadyForWrite;
-
-#ifdef _WIN32
-            // On connect error, in async mode, windows will write to the exceptions fds
-            if (fds[0].revents & POLLERR)
-            {
-                pollResult = PollResultType::Error;
-            }
-#else
-            int optval = -1;
-            socklen_t optlen = sizeof(optval);
-
-            // getsockopt() puts the errno value for connect into optval so 0
-            // means no-error.
-            if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &optval, &optlen) == -1 ||
-                optval != 0)
-            {
-                pollResult = PollResultType::Error;
-
-                // set errno to optval so that external callers can have an
-                // appropriate error description when calling strerror
-                errno = optval;
-            }
-#endif
         }
 
         return pollResult;
@@ -146,7 +122,7 @@ namespace ix
         }
 
         bool readyToRead = true;
-        return poll(readyToRead, timeoutMs, _sockfd, _selectInterrupt);
+        return select(readyToRead, timeoutMs);
     }
 
     PollResultType Socket::isReadyToWrite(int timeoutMs)
@@ -157,7 +133,7 @@ namespace ix
         }
 
         bool readyToRead = false;
-        return poll(readyToRead, timeoutMs, _sockfd, _selectInterrupt);
+        return select(readyToRead, timeoutMs);
     }
 
     // Wake up from poll/select by writing to the pipe which is watched by select
@@ -256,28 +232,19 @@ namespace ix
     bool Socket::writeBytes(const std::string& str,
                             const CancellationRequest& isCancellationRequested)
     {
-        int offset = 0;
-        int len = (int) str.size();
-
         while (true)
         {
             if (isCancellationRequested && isCancellationRequested()) return false;
 
-            ssize_t ret = send((char*)&str[offset], len);
+            char* buffer = const_cast<char*>(str.c_str());
+            int len = (int) str.size();
+
+            ssize_t ret = send(buffer, len);
 
             // We wrote some bytes, as needed, all good.
             if (ret > 0)
             {
-                if (ret == len)
-                {
-                    return true;
-                }
-                else
-                {
-                    offset += ret;
-                    len -= ret;
-                    continue;
-                }
+                return ret == len;
             }
             // There is possibly something to be writen, try again
             else if (ret < 0 && Socket::isWaitNeeded())

ixwebsocket/IXSocket.h

@@ -88,12 +88,6 @@ namespace ix
         static bool isWaitNeeded();
         static void closeSocket(int fd);
 
-        static PollResultType poll(bool readyToRead,
-                                   int timeoutMs,
-                                   int sockfd,
-                                   std::shared_ptr<SelectInterrupt> selectInterrupt = nullptr);
-
-
         // Used as special codes for pipe communication
         static const uint64_t kSendRequest;
         static const uint64_t kCloseRequest;
@@ -103,6 +97,8 @@ namespace ix
         std::mutex _socketMutex;
 
     private:
+        PollResultType select(bool readyToRead, int timeoutMs);
+
         static const int kDefaultPollTimeout;
         static const int kDefaultPollNoTimeout;
 

ixwebsocket/IXSocketConnect.cpp

@@ -63,31 +63,55 @@ namespace ix
                 return -1;
             }
 
-            int timeoutMs = 10;
-            bool readyToRead = false;
-            PollResultType pollResult = Socket::poll(readyToRead, timeoutMs, fd);
+            // On Linux the timeout needs to be re-initialized everytime
+            // http://man7.org/linux/man-pages/man2/select.2.html
+            struct timeval timeout;
+            timeout.tv_sec = 0;
+            timeout.tv_usec = 10 * 1000; // 10ms timeout
 
-            if (pollResult == PollResultType::Timeout)
-            {
-                continue;
-            }
-            else if (pollResult == PollResultType::Error)
+            fd_set wfds;
+            fd_set efds;
+
+            FD_ZERO(&wfds);
+            FD_SET(fd, &wfds);
+            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))
             {
                 Socket::closeSocket(fd);
-                errMsg = std::string("Connect error: ") +
-                            strerror(Socket::getErrno());
+                errMsg = std::string("Connect error, select error: ") + strerror(Socket::getErrno());
                 return -1;
             }
-            else if (pollResult == PollResultType::ReadyForWrite)
+
+            // Nothing was written to the socket, wait again.
+            if (!FD_ISSET(fd, &wfds)) continue;
+
+            // Something was written to the socket. Check for errors.
+            int optval = -1;
+            socklen_t optlen = sizeof(optval);
+
+#ifdef _WIN32
+            // On connect error, in async mode, windows will write to the exceptions fds
+            if (FD_ISSET(fd, &efds))
+#else
+            // getsockopt() puts the errno value for connect into optval so 0
+            // means no-error.
+            if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &optval, &optlen) == -1 ||
+                optval != 0)
+#endif
             {
-                return fd;
+                Socket::closeSocket(fd);
+                errMsg = strerror(optval);
+                return -1;
             }
             else
             {
-                Socket::closeSocket(fd);
-                errMsg = std::string("Connect error: ") +
-                            strerror(Socket::getErrno());
-                return -1;
+                // Success !
+                return fd;
             }
         }
 
@@ -104,8 +128,8 @@ namespace ix
         //
         // First do DNS resolution
         //
-        auto dnsLookup = std::make_shared<DNSLookup>(hostname, port);
-        struct addrinfo *res = dnsLookup->resolve(errMsg, isCancellationRequested);
+        DNSLookup dnsLookup(hostname, port);
+        struct addrinfo *res = dnsLookup.resolve(errMsg, isCancellationRequested);
         if (res == nullptr)
         {
             return -1;

ixwebsocket/IXSocketMbedTLS.cpp

@@ -24,8 +24,6 @@ namespace ix
 
     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);
@@ -77,24 +75,15 @@ namespace ix
                                 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;
-        }
+        _sockfd = SocketConnect::connect(host, port, errMsg, isCancellationRequested);
+        if (_sockfd == -1) return false;
+        if (!init(host, errMsg)) 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);
@@ -106,8 +95,6 @@ namespace ix
 
             errMsg = "error in handshake : ";
             errMsg += buf;
-
-            close();
             return false;
         }
 
@@ -116,14 +103,10 @@ namespace ix
 
     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)

ixwebsocket/IXSocketServer.cpp

@@ -11,6 +11,7 @@
 
 #include <iostream>
 #include <sstream>
+#include <future>
 #include <string.h>
 #include <assert.h>
 
@@ -213,12 +214,17 @@ namespace ix
         {
             if (_stop) return;
 
-            // Use poll to check whether a new connection is in progress
-            int timeoutMs = 10;
-            bool readyToRead = true;
-            PollResultType pollResult = Socket::poll(readyToRead, timeoutMs, _serverFd);
+            // Use select to check whether a new connection is in progress
+            fd_set rfds;
+            struct timeval timeout;
+            timeout.tv_sec = 0;
+            timeout.tv_usec = 10 * 1000; // 10ms timeout
 
-            if (pollResult == PollResultType::Error)
+            FD_ZERO(&rfds);
+            FD_SET(_serverFd, &rfds);
+
+            if (select(_serverFd + 1, &rfds, nullptr, nullptr, &timeout) < 0 &&
+                (errno == EBADF || errno == EINVAL))
             {
                 std::stringstream ss;
                 ss << "SocketServer::run() error in select: "
@@ -227,8 +233,9 @@ namespace ix
                 continue;
             }
 
-            if (pollResult != PollResultType::ReadyForRead)
+            if (!FD_ISSET(_serverFd, &rfds))
             {
+                // We reached the select timeout, and no new connections are pending
                 continue;
             }
 

ixwebsocket/IXWebSocket.cpp

@@ -51,11 +51,9 @@ namespace ix
         _ws.setOnCloseCallback(
             [this](uint16_t code, const std::string& reason, size_t wireSize, bool remote)
             {
-                _onMessageCallback(
-                    std::make_shared<WebSocketMessage>(
-                        WebSocketMessageType::Close, "", wireSize,
-                        WebSocketErrorInfo(), WebSocketOpenInfo(),
-                        WebSocketCloseInfo(code, reason, remote)));
+                _onMessageCallback(WebSocketMessageType::Close, "", wireSize,
+                                   WebSocketErrorInfo(), WebSocketOpenInfo(),
+                                   WebSocketCloseInfo(code, reason, remote));
             }
         );
     }
@@ -137,13 +135,6 @@ namespace ix
         _enablePong = false;
     }
 
-    void WebSocket::disablePerMessageDeflate()
-    {
-        std::lock_guard<std::mutex> lock(_configMutex);
-        WebSocketPerMessageDeflateOptions perMessageDeflateOptions(false);
-        _perMessageDeflateOptions = perMessageDeflateOptions;
-    }
-
     void WebSocket::start()
     {
         if (_thread.joinable()) return; // we've already been started
@@ -182,12 +173,10 @@ namespace ix
             return status;
         }
 
-        _onMessageCallback(
-            std::make_shared<WebSocketMessage>(
-                WebSocketMessageType::Open, "", 0,
-                WebSocketErrorInfo(),
-                WebSocketOpenInfo(status.uri, status.headers),
-                WebSocketCloseInfo()));
+        _onMessageCallback(WebSocketMessageType::Open, "", 0,
+                           WebSocketErrorInfo(),
+                           WebSocketOpenInfo(status.uri, status.headers),
+                           WebSocketCloseInfo());
         return status;
     }
 
@@ -207,12 +196,10 @@ namespace ix
             return status;
         }
 
-        _onMessageCallback(
-                std::make_shared<WebSocketMessage>(
-                    WebSocketMessageType::Open, "", 0,
-                    WebSocketErrorInfo(),
-                    WebSocketOpenInfo(status.uri, status.headers),
-                    WebSocketCloseInfo()));
+        _onMessageCallback(WebSocketMessageType::Open, "", 0,
+                           WebSocketErrorInfo(),
+                           WebSocketOpenInfo(status.uri, status.headers),
+                           WebSocketCloseInfo());
         return status;
     }
 
@@ -280,11 +267,9 @@ namespace ix
                 connectErr.reason      = status.errorStr;
                 connectErr.http_status = status.http_status;
 
-                _onMessageCallback(
-                     std::make_shared<WebSocketMessage>(
-                        WebSocketMessageType::Error, "", 0,
-                        connectErr, WebSocketOpenInfo(),
-                        WebSocketCloseInfo()));
+                _onMessageCallback(WebSocketMessageType::Error, "", 0,
+                                   connectErr, WebSocketOpenInfo(),
+                                   WebSocketCloseInfo());
             }
         }
     }
@@ -325,8 +310,8 @@ namespace ix
                     WebSocketMessageType webSocketMessageType;
                     switch (messageKind)
                     {
-                        case WebSocketTransport::MessageKind::MSG_TEXT:
-                        case WebSocketTransport::MessageKind::MSG_BINARY:
+                        default:
+                        case WebSocketTransport::MessageKind::MSG:
                         {
                             webSocketMessageType = WebSocketMessageType::Message;
                         } break;
@@ -350,13 +335,9 @@ namespace ix
                     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);
                 });
@@ -387,18 +368,9 @@ namespace ix
     }
 
     WebSocketSendInfo WebSocket::send(const std::string& data,
-                                      bool binary,
                                       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);
+        return sendMessage(data, SendMessageKind::Binary, onProgressCallback);
     }
 
     WebSocketSendInfo WebSocket::sendText(const std::string& text,

ixwebsocket/IXWebSocket.h

@@ -13,7 +13,6 @@
 #include "IXWebSocketCloseConstants.h"
 #include "IXWebSocketErrorInfo.h"
 #include "IXWebSocketHttpHeaders.h"
-#include "IXWebSocketMessage.h"
 #include "IXWebSocketPerMessageDeflateOptions.h"
 #include "IXWebSocketSendInfo.h"
 #include "IXWebSocketTransport.h"
@@ -33,7 +32,52 @@ namespace ix
         Closed = 3
     };
 
-    using OnMessageCallback = std::function<void(const WebSocketMessagePtr&)>;
+    enum class WebSocketMessageType
+    {
+        Message = 0,
+        Open = 1,
+        Close = 2,
+        Error = 3,
+        Ping = 4,
+        Pong = 5,
+        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;
+        bool remote;
+
+        WebSocketCloseInfo(uint16_t c = 0, const std::string& r = std::string(), bool rem = false)
+            : code(c)
+            , reason(r)
+            , remote(rem)
+        {
+            ;
+        }
+    };
+
+    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)>;
 
@@ -51,7 +95,6 @@ namespace ix
         void setPingTimeout(int pingTimeoutSecs);
         void enablePong();
         void disablePong();
-        void disablePerMessageDeflate();
 
         // Run asynchronously, by calling start and stop.
         void start();
@@ -64,18 +107,14 @@ namespace ix
         WebSocketInitResult connect(int timeoutSecs);
         void run();
 
-        // send is in binary mode by default
+        // send binary data
         WebSocketSendInfo send(const std::string& data,
-                               bool binary = false,
                                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(uint16_t code = 1000, const std::string& reason = "Normal closure");
 
         void setOnMessageCallback(const OnMessageCallback& callback);
         static void setTrafficTrackerCallback(const OnTrafficTrackerCallback& callback);
@@ -129,7 +168,7 @@ namespace ix
         bool _enablePong;
         static const bool kDefaultEnablePong;
 
-        // Optional ping and pong timeout
+        // Optional ping and ping timeout
         int _pingIntervalSecs;
         int _pingTimeoutSecs;
         static const int kDefaultPingIntervalSecs;

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/IXWebSocketHandshake.cpp

@@ -7,7 +7,6 @@
 #include "IXWebSocketHandshake.h"
 #include "IXSocketConnect.h"
 #include "IXUrlParser.h"
-#include "IXHttp.h"
 
 #include "libwshandshake.hpp"
 
@@ -32,6 +31,15 @@ namespace ix
 
     }
 
+    std::string WebSocketHandshake::trim(const std::string& str)
+    {
+        std::string out(str);
+        out.erase(std::remove(out.begin(), out.end(), ' '), out.end());
+        out.erase(std::remove(out.begin(), out.end(), '\r'), out.end());
+        out.erase(std::remove(out.begin(), out.end(), '\n'), out.end());
+        return out;
+    }
+
     bool WebSocketHandshake::insensitiveStringCompare(const std::string& a, const std::string& b)
     {
         return std::equal(a.begin(), a.end(),
@@ -42,6 +50,40 @@ namespace ix
                           });
     }
 
+    std::tuple<std::string, std::string, std::string> WebSocketHandshake::parseRequestLine(const std::string& line)
+    {
+        // Request-Line   = Method SP Request-URI SP HTTP-Version CRLF
+        std::string token;
+        std::stringstream tokenStream(line);
+        std::vector<std::string> tokens;
+
+        // Split by ' '
+        while (std::getline(tokenStream, token, ' '))
+        {
+            tokens.push_back(token);
+        }
+
+        std::string method;
+        if (tokens.size() >= 1)
+        {
+            method = trim(tokens[0]);
+        }
+
+        std::string requestUri;
+        if (tokens.size() >= 2)
+        {
+            requestUri = trim(tokens[1]);
+        }
+
+        std::string httpVersion;
+        if (tokens.size() >= 3)
+        {
+            httpVersion = trim(tokens[2]);
+        }
+
+        return std::make_tuple(method, requestUri, httpVersion);
+    }
+
     std::string WebSocketHandshake::genRandomString(const int len)
     {
         std::string alphanum =
@@ -252,7 +294,7 @@ namespace ix
         }
 
         // Validate request line (GET /foo HTTP/1.1\r\n)
-        auto requestLine = Http::parseRequestLine(line);
+        auto requestLine = parseRequestLine(line);
         auto method      = std::get<0>(requestLine);
         auto uri         = std::get<1>(requestLine);
         auto httpVersion = std::get<2>(requestLine);

ixwebsocket/IXWebSocketHandshake.h

@@ -64,6 +64,8 @@ namespace ix
         // Parse HTTP headers
         WebSocketInitResult sendErrorResponse(int code, const std::string& reason);
 
+        std::tuple<std::string, std::string, std::string> parseRequestLine(const std::string& line);
+        std::string trim(const std::string& str);
         bool insensitiveStringCompare(const std::string& a, const std::string& b);
 
         std::atomic<bool>& _requestInitCancellation;

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

@@ -32,7 +32,14 @@ namespace ix
         if (_websocket)
         {
             // set dummy callback just to avoid crash
-            _websocket->setOnMessageCallback([](const WebSocketMessagePtr&) {});
+            _websocket->setOnMessageCallback([](
+                WebSocketMessageType,
+                const std::string&,
+                size_t,
+                const WebSocketErrorInfo&,
+                const WebSocketOpenInfo&,
+                const WebSocketCloseInfo&)
+            {});
         }
 
         _websocket = websocket;
@@ -40,10 +47,27 @@ namespace ix
         // bind new
         if (_websocket)
         {
-            _websocket->setOnMessageCallback([this](const WebSocketMessagePtr& msg)
+            _websocket->setOnMessageCallback([this](
+                WebSocketMessageType type,
+                const std::string& str,
+                size_t wireSize,
+                const WebSocketErrorInfo& errorInfo,
+                const WebSocketOpenInfo& openInfo,
+                const WebSocketCloseInfo& closeInfo)
             {
-                std::lock_guard<std::mutex> lock(_messagesMutex);
-                _messages.emplace_back(std::move(msg));
+                MessagePtr message(new Message());
+
+                message->type      = type;
+                message->str       = str;
+                message->wireSize  = wireSize;
+                message->errorInfo = errorInfo;
+                message->openInfo  = openInfo;
+                message->closeInfo = closeInfo;
+
+                {
+                    std::lock_guard<std::mutex> lock(_messagesMutex);
+                    _messages.emplace_back(std::move(message));
+                }
             });
         }
     }
@@ -58,9 +82,9 @@ namespace ix
         _onMessageUserCallback = std::move(callback);
     }
 
-    WebSocketMessagePtr WebSocketMessageQueue::popMessage()
+    WebSocketMessageQueue::MessagePtr WebSocketMessageQueue::popMessage()
     {
-        WebSocketMessagePtr message;
+        MessagePtr message;
         std::lock_guard<std::mutex> lock(_messagesMutex);
 
         if (!_messages.empty())
@@ -77,11 +101,19 @@ namespace ix
         if (!_onMessageUserCallback)
             return;
 
-        WebSocketMessagePtr message;
+        MessagePtr message;
 
         while (count > 0 && (message = popMessage()))
         {
-            _onMessageUserCallback(message);
+            _onMessageUserCallback(
+                message->type,
+                message->str,
+                message->wireSize,
+                message->errorInfo,
+                message->openInfo,
+                message->closeInfo
+            );
+
             --count;
         }
     }

ixwebsocket/IXWebSocketMessageQueue.h

@@ -30,12 +30,24 @@ namespace ix
         void poll(int count = 512);
 
     protected:
-        WebSocketMessagePtr popMessage();
+        struct Message
+        {
+            WebSocketMessageType type;
+            std::string str;
+            size_t wireSize;
+            WebSocketErrorInfo errorInfo;
+            WebSocketOpenInfo openInfo;
+            WebSocketCloseInfo closeInfo;
+        };
+
+        using MessagePtr = std::shared_ptr<Message>;
+
+        MessagePtr popMessage();
 
     private:
         WebSocket* _websocket = nullptr;
         OnMessageCallback _onMessageUserCallback;
         std::mutex _messagesMutex;
-        std::list<WebSocketMessagePtr> _messages;
+        std::list<MessagePtr> _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/IXWebSocketServer.h

@@ -19,12 +19,12 @@
 
 namespace ix
 {
+    using OnConnectionCallback =
+        std::function<void(std::shared_ptr<WebSocket>, std::shared_ptr<ConnectionState>)>;
+
     class WebSocketServer final : public SocketServer
     {
     public:
-        using OnConnectionCallback =
-            std::function<void(std::shared_ptr<WebSocket>, std::shared_ptr<ConnectionState>)>;
-
         WebSocketServer(int port = SocketServer::kDefaultPort,
                         const std::string& host = SocketServer::kDefaultHost,
                         int backlog = SocketServer::kDefaultTcpBacklog,

ixwebsocket/IXWebSocketTransport.cpp

@@ -330,7 +330,7 @@ namespace ix
         }
 
         // poll the socket
-        PollResultType pollResult = _socket->isReadyToRead(lastingTimeoutDelayInMs);
+        PollResultType pollResult = _socket->poll(lastingTimeoutDelayInMs);
 
         // Make sure we send all the buffered data
         // there can be a lot of it for large messages.
@@ -542,17 +542,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(MessageKind::MSG,
                                 std::string(_rxbuf.begin()+ws.header_size,
                                             _rxbuf.begin()+ws.header_size+(size_t) ws.N),
                                 ws,
@@ -572,7 +567,7 @@ namespace ix
                                              _rxbuf.begin()+ws.header_size+(size_t)ws.N));
                     if (ws.fin)
                     {
-                        emitMessage(messageKind, getMergedChunks(), ws, onMessageCallback);
+                        emitMessage(MessageKind::MSG, getMergedChunks(), ws, onMessageCallback);
                         _chunks.clear();
                     }
                     else
@@ -755,7 +750,7 @@ namespace ix
     {
         if (_readyState != ReadyState::OPEN && _readyState != ReadyState::CLOSING)
         {
-            return WebSocketSendInfo(false);
+            return WebSocketSendInfo();
         }
 
         size_t payloadSize = message.size();

ixwebsocket/IXWebSocketTransport.h

@@ -50,8 +50,7 @@ namespace ix
 
         enum class MessageKind
         {
-            MSG_TEXT,
-            MSG_BINARY,
+            MSG,
             PING,
             PONG,
             FRAGMENT

makefile

@@ -9,17 +9,14 @@ install: brew
 # 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 -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 .. ; make -j install)
+	mkdir -p build && (cd build ; cmake -DUSE_TLS=1 -DUSE_WS=1 -DUSE_MBED_TLS=1 .. ; make -j install)
 
 ws:
-	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 -DUSE_MBED_TLS=1 .. ; make -j)
+	mkdir -p build && (cd build ; cmake -DUSE_TLS=1 -DUSE_WS=1 -DUSE_MBED_TLS=1 .. ; make -j)
 
 uninstall:
 	xargs rm -fv < build/install_manifest.txt
 
-tag:
-	git tag v"`cat DOCKER_VERSION`"
-
 .PHONY: docker
 
 NAME   := bsergean/ws
@@ -47,7 +44,7 @@ trail:
 	sh third_party/remote_trailing_whitespaces.sh
 
 format:
-	find test ixwebsocket ws -name '*.cpp' -o -name '*.h' -exec clang-format -i {} \;
+	find ixwebsocket ws -name '*.cpp' -o -name '*.h' -exec clang-format -i {} \;
 
 # 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

test/CMakeLists.txt

@@ -7,7 +7,7 @@ project (ixwebsocket_unittest)
 
 set (CMAKE_CXX_STANDARD 14)
 
-if (MAC)
+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")
@@ -28,7 +28,6 @@ include_directories(
 set (SOURCES 
   test_runner.cpp
   IXTest.cpp
-  IXGetFreePort.cpp
   ../third_party/msgpack11/msgpack11.cpp
   ../ws/ixcore/utils/IXCoreLogger.cpp
 
@@ -39,8 +38,6 @@ set (SOURCES
   IXUrlParserTest.cpp
   IXWebSocketServerTest.cpp
   IXHttpClientTest.cpp
-  IXHttpServerTest.cpp
-  IXUnityBuildsTest.cpp
 )
 
 # Some unittest don't work on windows yet
@@ -67,7 +64,7 @@ endif()
 
 add_executable(ixwebsocket_unittest ${SOURCES})
 
-if (MAC)
+if (NOT WIN32)
   add_sanitizers(ixwebsocket_unittest)
 endif()
 

test/IXDNSLookupTest.cpp

@@ -17,33 +17,33 @@ TEST_CASE("dns", "[net]")
 {
     SECTION("Test resolving a known hostname")
     {
-        auto dnsLookup = std::make_shared<DNSLookup>("www.google.com", 80);
+        DNSLookup dnsLookup("www.google.com", 80);
 
         std::string errMsg;
         struct addrinfo* res;
 
-        res = dnsLookup->resolve(errMsg, [] { return false; });
+        res = dnsLookup.resolve(errMsg, [] { return false; });
         std::cerr << "Error message: " << errMsg << std::endl;
         REQUIRE(res != nullptr);
     }
 
     SECTION("Test resolving a non-existing hostname")
     {
-        auto dnsLookup = std::make_shared<DNSLookup>("wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww", 80);
+        DNSLookup dnsLookup("wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww", 80);
 
         std::string errMsg;
-        struct addrinfo* res = dnsLookup->resolve(errMsg, [] { return false; });
+        struct addrinfo* res = dnsLookup.resolve(errMsg, [] { return false; });
         std::cerr << "Error message: " << errMsg << std::endl;
         REQUIRE(res == nullptr);
     }
 
     SECTION("Test resolving a good hostname, with cancellation")
     {
-        auto dnsLookup = std::make_shared<DNSLookup>("www.google.com", 80, 1);
+        DNSLookup dnsLookup("www.google.com", 80, 1);
 
         std::string errMsg;
         // The callback returning true means we are requesting cancellation
-        struct addrinfo* res = dnsLookup->resolve(errMsg, [] { return true; });
+        struct addrinfo* res = dnsLookup.resolve(errMsg, [] { return true; });
         std::cerr << "Error message: " << errMsg << std::endl;
         REQUIRE(res == nullptr);
     }

test/IXGetFreePort.cpp

@@ -1,93 +0,0 @@
-/*
- *  IXGetFreePort.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone. All rights reserved.
- */
-
-#include "IXGetFreePort.h"
-#include <ixwebsocket/IXNetSystem.h>
-#include <ixwebsocket/IXSocket.h>
-
-#include <string>
-#include <random>
-
-namespace ix
-{
-    int getAnyFreePortRandom()
-    {
-        std::random_device rd;
-        std::uniform_int_distribution<int> dist(1024 + 1, 65535);
-
-        return dist(rd);
-    }
-
-    int getAnyFreePort()
-    {
-        int defaultPort = 8090;
-        int sockfd;
-        if ((sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-        {
-            return getAnyFreePortRandom();
-        }
-
-        int enable = 1;
-        if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR,
-                       (char*) &enable, sizeof(enable)) < 0)
-        {
-            return getAnyFreePortRandom();
-        }
-
-        // Bind to port 0. This is the standard way to get a free port.
-        struct sockaddr_in server; // server address information
-        server.sin_family = AF_INET;
-        server.sin_port   = htons(0);
-        server.sin_addr.s_addr = inet_addr("127.0.0.1");
-
-        if (bind(sockfd, (struct sockaddr *)&server, sizeof(server)) < 0)
-        {
-            Socket::closeSocket(sockfd);
-            return getAnyFreePortRandom();
-        }
-
-        struct sockaddr_in sa; // server address information
-        socklen_t len = sizeof(sa);
-        if (getsockname(sockfd, (struct sockaddr *) &sa, &len) < 0)
-        {
-            Socket::closeSocket(sockfd);
-            return getAnyFreePortRandom();
-        }
-
-        int port = ntohs(sa.sin_port);
-        Socket::closeSocket(sockfd);
-
-        return port;
-    }
-
-    int getFreePort()
-    {
-        while (true)
-        {
-#if defined(__has_feature)
-# if __has_feature(address_sanitizer)
-            int port = getAnyFreePortRandom();
-# else
-            int port = getAnyFreePort();
-# endif
-#else
-            int port = getAnyFreePort();
-#endif
-            //
-            // Only port above 1024 can be used by non root users, but for some
-            // reason I got port 7 returned with macOS when binding on port 0...
-            //
-            if (port > 1024)
-            {
-                return port;
-            }
-        }
-
-        return -1;
-    }
-} // namespace ix
-
-

test/IXGetFreePort.h

@@ -1,12 +0,0 @@
-/*
- *  IXGetFreePort.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone. All rights reserved.
- */
-
-#pragma once
-
-namespace ix
-{
-    int getFreePort();
-} // namespace ix

test/IXHttpServerTest.cpp

@@ -1,70 +0,0 @@
-/*
- *  IXSocketTest.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone. All rights reserved.
- */
-
-#include <iostream>
-#include <ixwebsocket/IXHttpClient.h>
-#include <ixwebsocket/IXHttpServer.h>
-#include "IXGetFreePort.h"
-
-#include "catch.hpp"
-
-using namespace ix;
-
-TEST_CASE("http server", "[httpd]")
-{
-    SECTION("Connect to a local HTTP server")
-    {
-        int port = getFreePort();
-        ix::HttpServer server(port, "127.0.0.1");
-
-        auto res = server.listen();
-        REQUIRE(res.first);
-        server.start();
-
-        HttpClient httpClient;
-        WebSocketHttpHeaders headers;
-
-        std::string url("http://127.0.0.1:");
-        url += std::to_string(port);
-        url += "/data/foo.txt";
-        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);
-
-        server.stop();
-    }
-}

test/IXTest.cpp

@@ -72,6 +72,88 @@ namespace ix
         Logger() << msg;
     }
 
+    int getAnyFreePortRandom()
+    {
+        std::random_device rd;
+        std::uniform_int_distribution<int> dist(1024 + 1, 65535);
+
+        return dist(rd);
+    }
+
+    int getAnyFreePort()
+    {
+        int defaultPort = 8090;
+        int sockfd;
+        if ((sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
+        {
+            log("Cannot compute a free port. socket error.");
+            return getAnyFreePortRandom();
+        }
+
+        int enable = 1;
+        if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR,
+                       (char*) &enable, sizeof(enable)) < 0)
+        {
+            log("Cannot compute a free port. setsockopt error.");
+            return getAnyFreePortRandom();
+        }
+
+        // Bind to port 0. This is the standard way to get a free port.
+        struct sockaddr_in server; // server address information
+        server.sin_family = AF_INET;
+        server.sin_port   = htons(0);
+        server.sin_addr.s_addr = inet_addr("127.0.0.1");
+
+        if (bind(sockfd, (struct sockaddr *)&server, sizeof(server)) < 0)
+        {
+            log("Cannot compute a free port. bind error.");
+
+            Socket::closeSocket(sockfd);
+            return getAnyFreePortRandom();
+        }
+
+        struct sockaddr_in sa; // server address information
+        socklen_t len = sizeof(sa);
+        if (getsockname(sockfd, (struct sockaddr *) &sa, &len) < 0)
+        {
+            log("Cannot compute a free port. getsockname error.");
+
+            Socket::closeSocket(sockfd);
+            return getAnyFreePortRandom();
+        }
+
+        int port = ntohs(sa.sin_port);
+        Socket::closeSocket(sockfd);
+
+        return port;
+    }
+
+    int getFreePort()
+    {
+        while (true)
+        {
+#if defined(__has_feature)
+# if __has_feature(address_sanitizer)
+            int port = getAnyFreePortRandom();
+# else
+            int port = getAnyFreePort();
+# endif
+#else
+            int port = getAnyFreePort();
+#endif
+            //
+            // Only port above 1024 can be used by non root users, but for some
+            // reason I got port 7 returned with macOS when binding on port 0...
+            //
+            if (port > 1024)
+            {
+                return port;
+            }
+        }
+
+        return -1;
+    }
+
     void hexDump(const std::string& prefix,
                  const std::string& s)
     {
@@ -96,29 +178,34 @@ namespace ix
                       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::WebSocketMessageType::Open)
                         {
                             Logger() << "New connection";
-                            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::WebSocketMessageType::Close)
                         {
                             Logger() << "Closed connection";
                         }
-                        else if (msg->type == ix::WebSocketMessageType::Message)
+                        else if (messageType == ix::WebSocketMessageType::Message)
                         {
                             for (auto&& client : server.getClients())
                             {
                                 if (client != webSocket)
                                 {
-                                    client->send(msg->str, msg->binary);
+                                    client->send(str);
                                 }
                             }
                         }

test/IXTest.h

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

test/IXUnityBuildsTest.cpp

@@ -1,52 +0,0 @@
-/*
- *  IXUnityBuildsTest.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone. All rights reserved.
- */
-
-#include <ixwebsocket/IXCancellationRequest.h>
-#include <ixwebsocket/IXConnectionState.h>
-#include <ixwebsocket/IXDNSLookup.h>
-#include <ixwebsocket/IXHttp.h>
-#include <ixwebsocket/IXHttpClient.h>
-#include <ixwebsocket/IXHttpServer.h>
-#include <ixwebsocket/IXNetSystem.h>
-#include <ixwebsocket/IXProgressCallback.h>
-#include <ixwebsocket/IXSelectInterrupt.h>
-#include <ixwebsocket/IXSelectInterruptFactory.h>
-#include <ixwebsocket/IXSetThreadName.h>
-#include <ixwebsocket/IXSocket.h>
-#include <ixwebsocket/IXSocketConnect.h>
-#include <ixwebsocket/IXSocketFactory.h>
-#include <ixwebsocket/IXSocketServer.h>
-#include <ixwebsocket/IXUrlParser.h>
-#include <ixwebsocket/IXWebSocket.h>
-#include <ixwebsocket/IXWebSocketCloseConstants.h>
-#include <ixwebsocket/IXWebSocketCloseInfo.h>
-#include <ixwebsocket/IXWebSocketErrorInfo.h>
-#include <ixwebsocket/IXWebSocketHandshake.h>
-#include <ixwebsocket/IXWebSocketHttpHeaders.h>
-#include <ixwebsocket/IXWebSocketMessage.h>
-#include <ixwebsocket/IXWebSocketMessageQueue.h>
-#include <ixwebsocket/IXWebSocketMessageType.h>
-#include <ixwebsocket/IXWebSocketOpenInfo.h>
-#include <ixwebsocket/IXWebSocketPerMessageDeflate.h>
-#include <ixwebsocket/IXWebSocketPerMessageDeflateCodec.h>
-#include <ixwebsocket/IXWebSocketPerMessageDeflateOptions.h>
-#include <ixwebsocket/IXWebSocketSendInfo.h>
-#include <ixwebsocket/IXWebSocketServer.h>
-#include <ixwebsocket/IXWebSocketTransport.h>
-#include <ixwebsocket/LUrlParser.h>
-#include <ixwebsocket/libwshandshake.hpp>
-
-#include "catch.hpp"
-
-using namespace ix;
-
-TEST_CASE("unity build", "[unity_build]")
-{
-    SECTION("dummy test")
-    {
-        REQUIRE(true);
-    }
-}

test/IXWebSocketCloseTest.cpp

@@ -34,8 +34,6 @@ namespace
             const std::string& getCloseReason();
             bool getCloseRemote();
 
-            bool hasConnectionError() const;
-
         private:
             ix::WebSocket _webSocket;
             int _port;
@@ -44,7 +42,6 @@ namespace
             uint16_t _closeCode;
             std::string _closeReason;
             bool _closeRemote;
-            std::atomic<bool> _connectionError;
     };
 
     WebSocketClient::WebSocketClient(int port)
@@ -52,16 +49,10 @@ namespace
         , _closeCode(0)
         , _closeReason(std::string(""))
         , _closeRemote(false)
-        , _connectionError(false)
     {
         ;
     }
 
-    bool WebSocketClient::hasConnectionError() const
-    {
-        return _connectionError;
-    }
-
     bool WebSocketClient::isReady() const
     {
         return _webSocket.getReadyState() == ix::ReadyState::Open;
@@ -117,48 +108,52 @@ 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::WebSocketMessageType::Open)
                 {
                     log("client connected");
                 }
-                else if (msg->type == ix::WebSocketMessageType::Close)
+                else if (messageType == ix::WebSocketMessageType::Close)
                 {
                     std::stringstream ss;
                     ss << "client disconnected("
-                       << msg->closeInfo.code
+                       << closeInfo.code
                        << ","
-                       << msg->closeInfo.reason
+                       << 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;
+                    _closeCode = closeInfo.code;
+                    _closeReason = std::string(closeInfo.reason);
+                    _closeRemote = closeInfo.remote;
                 }
-                else if (msg->type == ix::WebSocketMessageType::Error)
+                else if (messageType == ix::WebSocketMessageType::Error)
                 {
-                    _connectionError = true;
-                    ss << "Error ! " << msg->errorInfo.reason;
+                    ss << "Error ! " << error.reason;
                     log(ss.str());
                 }
-                else if (msg->type == ix::WebSocketMessageType::Pong)
+                else if (messageType == ix::WebSocketMessageType::Pong)
                 {
-                    ss << "Received pong message " << msg->str;
+                    ss << "Received pong message " << str;
                     log(ss.str());
                 }
-                else if (msg->type == ix::WebSocketMessageType::Ping)
+                else if (messageType == ix::WebSocketMessageType::Ping)
                 {
-                    ss << "Received ping message " << msg->str;
+                    ss << "Received ping message " << str;
                     log(ss.str());
                 }
-                else if (msg->type == ix::WebSocketMessageType::Message)
+                else if (messageType == ix::WebSocketMessageType::Message)
                 {
-                    ss << "Received message " << msg->str;
+                    ss << "Received message " << str;
                     log(ss.str());
                 }
                 else
@@ -188,34 +183,39 @@ namespace
                                              std::shared_ptr<ConnectionState> connectionState)
             {
                 webSocket->setOnMessageCallback(
-                    [webSocket, connectionState, &server, &receivedCloseCode, &receivedCloseReason, &receivedCloseRemote, &mutexWrite](const ix::WebSocketMessagePtr& msg)
+                    [webSocket, connectionState, &server, &receivedCloseCode, &receivedCloseReason, &receivedCloseRemote, &mutexWrite](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::WebSocketMessageType::Open)
                         {
                             Logger() << "New server 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::WebSocketMessageType::Close)
                         {
                             std::stringstream ss;
                             ss << "Server closed connection("
-                               << msg->closeInfo.code
+                               << closeInfo.code
                                << ","
-                               << msg->closeInfo.reason
+                               << 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;
+                            receivedCloseCode = closeInfo.code;
+                            receivedCloseReason = std::string(closeInfo.reason);
+                            receivedCloseRemote = closeInfo.remote;
                         }
                     }
                 );
@@ -258,7 +258,6 @@ TEST_CASE("Websocket_client_close_default", "[close]")
         // Wait for all chat instance to be ready
         while (true)
         {
-            REQUIRE(!webSocketClient.hasConnectionError());
             if (webSocketClient.isReady()) break;
             ix::msleep(10);
         }

test/IXWebSocketMessageQTest.cpp

@@ -20,34 +20,39 @@ namespace
     {
         server.setOnConnectionCallback(
             [&server](std::shared_ptr<ix::WebSocket> webSocket,
-                      std::shared_ptr<ConnectionState> connectionState)
+                std::shared_ptr<ConnectionState> connectionState)
         {
             webSocket->setOnMessageCallback(
-                [connectionState, &server](const WebSocketMessagePtr& msg)
+                [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::WebSocketMessageType::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;
                     }
                 }
-                else if (msg->type == ix::WebSocketMessageType::Close)
+                else if (messageType == ix::WebSocketMessageType::Close)
                 {
                     Logger() << "Closed connection";
                 }
-                else if (msg->type == ix::WebSocketMessageType::Message)
+                else if (messageType == ix::WebSocketMessageType::Message)
                 {
-                    Logger() << "Message received: " << msg->str;
+                    Logger() << "Message received: " << str;
 
                     for (auto&& client : server.getClients())
                     {
-                        client->send(msg->str);
+                        client->send(str);
                     }
                 }
             }
@@ -73,41 +78,46 @@ namespace
         {
             msgQ.bindWebsocket(&ws);
 
-            msgQ.setOnMessageCallback([this](const WebSocketMessagePtr& msg)
+            msgQ.setOnMessageCallback([this](WebSocketMessageType messageType,
+                const std::string & str,
+                size_t wireSize,
+                const WebSocketErrorInfo & error,
+                const WebSocketOpenInfo & openInfo,
+                const WebSocketCloseInfo & closeInfo)
             {
                 REQUIRE(mainThreadId == std::this_thread::get_id());
 
                 std::stringstream ss;
-                if (msg->type == WebSocketMessageType::Open)
+                if (messageType == WebSocketMessageType::Open)
                 {
                     log("client connected");
                     sendNextMessage();
                 }
-                else if (msg->type == WebSocketMessageType::Close)
+                else if (messageType == WebSocketMessageType::Close)
                 {
                     log("client disconnected");
                 }
-                else if (msg->type == WebSocketMessageType::Error)
+                else if (messageType == WebSocketMessageType::Error)
                 {
-                    ss << "Error ! " << msg->errorInfo.reason;
+                    ss << "Error ! " << error.reason;
                     log(ss.str());
                     testDone = true;
                 }
-                else if (msg->type == WebSocketMessageType::Pong)
+                else if (messageType == WebSocketMessageType::Pong)
                 {
-                    ss << "Received pong message " << msg->str;
+                    ss << "Received pong message " << str;
                     log(ss.str());
                 }
-                else if (msg->type == WebSocketMessageType::Ping)
+                else if (messageType == WebSocketMessageType::Ping)
                 {
-                    ss << "Received ping message " << msg->str;
+                    ss << "Received ping message " << str;
                     log(ss.str());
                 }
-                else if (msg->type == WebSocketMessageType::Message)
+                else if (messageType == WebSocketMessageType::Message)
                 {
-                    REQUIRE(msg->str.compare("Hey dude!") == 0);
+                    REQUIRE(str.compare("Hey dude!") == 0);
                     ++receivedCount;
-                    ss << "Received message " << msg->str;
+                    ss << "Received message " << str;
                     log(ss.str());
                     sendNextMessage();
                 }
@@ -179,4 +189,5 @@ TEST_CASE("Websocket_message_queue", "[websocket_message_q]")
 
         server.stop();
     }
+
 }

test/IXWebSocketPingTimeoutTest.cpp

@@ -106,7 +106,7 @@ namespace
                 {
                     log("client disconnected");
 
-                    if (msg->closeInfo.code == 1011)
+                    if (closeInfo.code == 1011)
                     {
                         _closedDueToPingTimeout = true;
                     }

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::WebSocketMessageType::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::WebSocketMessageType::Close)
                         {
                             Logger() << "Closed connection";
                         }
-                        else if (msg->type == ix::WebSocketMessageType::Message)
+                        else if (messageType == ix::WebSocketMessageType::Message)
                         {
                             for (auto&& client : server.getClients())
                             {
                                 if (client != webSocket)
                                 {
-                                    client->send(msg->str);
+                                    client->send(str);
                                 }
                             }
                         }

test/IXWebSocketTestConnectionDisconnection.cpp

@@ -52,36 +52,41 @@ 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::WebSocketMessageType::Open)
                 {
                     log("TestConnectionDisconnection: connected !");
                 }
-                else if (msg->type == ix::WebSocketMessageType::Close)
+                else if (messageType == ix::WebSocketMessageType::Close)
                 {
                     log("TestConnectionDisconnection: disconnected !");
                 }
-                else if (msg->type == ix::WebSocketMessageType::Error)
+                else if (messageType == ix::WebSocketMessageType::Error)
                 {
                     ss << "TestConnectionDisconnection: Error! ";
-                    ss << msg->errorInfo.reason;
+                    ss << error.reason;
                     log(ss.str());
                 }
-                else if (msg->type == ix::WebSocketMessageType::Message)
+                else if (messageType == ix::WebSocketMessageType::Message)
                 {
                     log("TestConnectionDisconnection: received message.!");
                 }
-                else if (msg->type == ix::WebSocketMessageType::Ping)
+                else if (messageType == ix::WebSocketMessageType::Ping)
                 {
                     log("TestConnectionDisconnection: received ping message.!");
                 }
-                else if (msg->type == ix::WebSocketMessageType::Pong)
+                else if (messageType == ix::WebSocketMessageType::Pong)
                 {
                     log("TestConnectionDisconnection: received pong message.!");
                 }
-                else if (msg->type == ix::WebSocketMessageType::Fragment)
+                else if (messageType == ix::WebSocketMessageType::Fragment)
                 {
                     log("TestConnectionDisconnection: received fragment.!");
                 }

test/cmd_websocket_chat.cpp

@@ -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::WebSocketMessageType::Open)
                 {
                     ss << "cmd_websocket_chat: user "
                        << _user
                        << " Connected !";
                     log(ss.str());
                 }
-                else if (msg->type == ix::WebSocketMessageType::Close)
+                else if (messageType == ix::WebSocketMessageType::Close)
                 {
                     ss << "cmd_websocket_chat: user "
                        << _user
                        << " disconnected !";
                     log(ss.str());
                 }
-                else if (msg->type == ix::WebSocketMessageType::Message)
+                else if (messageType == ix::WebSocketMessageType::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::WebSocketMessageType::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::WebSocketMessageType::Ping)
                 {
                     log("cmd_websocket_chat: received ping message");
                 }
-                else if (msg->type == ix::WebSocketMessageType::Pong)
+                else if (messageType == ix::WebSocketMessageType::Pong)
                 {
                     log("cmd_websocket_chat: received pong message");
                 }
-                else if (msg->type == ix::WebSocketMessageType::Fragment)
+                else if (messageType == ix::WebSocketMessageType::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::WebSocketMessageType::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::WebSocketMessageType::Close)
                         {
                             log("Closed connection");
                         }
-                        else if (msg->type == ix::WebSocketMessageType::Message)
+                        else if (messageType == ix::WebSocketMessageType::Message)
                         {
                             for (auto&& client : server.getClients())
                             {
                                 if (client != webSocket)
                                 {
-                                    client->send(msg->str);
+                                    client->send(str);
                                 }
                             }
                         }

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/data/foo.txt

@@ -1 +0,0 @@
-Hello world

test/run.py

@@ -99,10 +99,8 @@ def runCMake(sanitizer, buildDir):
         #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 = 'ON'
 
     CMAKE_BUILD_TYPE = BUILD_TYPE
 
@@ -112,7 +110,6 @@ def runCMake(sanitizer, buildDir):
     -DCMAKE_BUILD_TYPE={CMAKE_BUILD_TYPE} \
     -DUSE_TLS=1 \
     -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-    -DUSE_VENDORED_THIRD_PARTY={USE_VENDORED_THIRD_PARTY} \
     -G{generator}'
 
     cmakeCmd = fmt.format(**locals())

third_party/cpp-linenoise/.gitignore

@@ -1,44 +0,0 @@
-# Compiled Object files
-*.slo
-*.lo
-*.o
-*.obj
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Compiled Dynamic libraries
-*.so
-*.dylib
-*.dll
-
-# Fortran module files
-*.mod
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-*.lib
-
-# Executables
-*.exe
-*.out
-*.app
-
-# Others
-*.dSYM
-*.swp
-Debug
-Release
-*.suo
-*.sdf
-*.user
-xcuserdata
-*.xcworkspace
-Makefile
-CMakeFiles
-CMakeCache.txt
-*.cmake
-history.txt

third_party/cpp-linenoise/LICENSE

@@ -1,22 +0,0 @@
-Copyright (c) 2015 yhirose
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

third_party/cpp-linenoise/README.md

@@ -1,95 +0,0 @@
-cpp-linenoise
-=============
-
-Multi-platfrom (Unix, Windows) C++ header-only linenoise-based readline library.
-
-This library gathered code from following excellent libraries, clean it up, and put it into a C++ header file for convenience.
-
- * `linenoise.h` and `linenose.c` ([antirez/linenoise](https://github.com/antirez/linenoise))
- * `ANSI.c` ([adoxa/ansicon](https://github.com/adoxa/ansicon))
- * `Win32_ANSI.h` and `Win32_ANSI.c` ([MSOpenTech/redis](https://github.com/MSOpenTech/redis))
-
-The licenses for the libraries are included in `linenoise.hpp`.
-
-Usage
------
-
-```c++
-#include "linenoise.hpp"
-
-...
-
-const auto path = "history.txt";
-
-// Setup completion words every time when a user types
-linenoise::SetCompletionCallback([](const char* editBuffer, std::vector<std::string>& completions) {
-    if (editBuffer[0] == 'h') {
-        completions.push_back("hello");
-        completions.push_back("hello there");
-    }
-});
-
-// Enable the multi-line mode
-linenoise::SetMultiLine(true);
-
-// Set max length of the history
-linenoise::SetHistoryMaxLen(4);
-
-// Load history
-linenoise::LoadHistory(path);
-
-while (true) {
-    // Read line
-    std::string line;
-    auto quit = linenoise::Readline("hello> ", line);
-
-    if (quit) {
-        break;
-    }
-
-    cout <<  "echo: '" << line << "'" << endl;
-
-    // Add text to history
-    linenoise::AddHistory(line.c_str());
-}
-
-// Save history
-linenoise::SaveHistory(path);
-```
-
-API
----
-
-```c++
-namespace linenoise;
-
-std::string Readline(const char* prompt);
-
-void SetMultiLine(bool multiLineMode);
-
-typedef std::function<void (const char* editBuffer, std::vector<std::string>& completions)> CompletionCallback;
-
-void SetCompletionCallback(CompletionCallback fn);
-
-bool SetHistoryMaxLen(size_t len);
-
-bool LoadHistory(const char* path);
-
-bool SaveHistory(const char* path);
-
-bool AddHistory(const char* line);
-
-const std::vector<std::string>& GetHistory();
-```
-
-Tested compilers
-----------------
-
-  * Visual Studio 2015
-  * Clang 3.5
-  * GCC 6.3.1
-
-License
--------
-
-BSD license (© 2015 Yuji Hirose)

third_party/cpp-linenoise/example/CMakeLists.txt

@@ -1,5 +0,0 @@
-cmake_minimum_required(VERSION 3.0)
-include_directories(.)
-add_definitions("-std=c++1y")
-
-add_executable(example example.cpp)

third_party/cpp-linenoise/example/example.cpp

@@ -1,54 +0,0 @@
-#include <iostream>
-#include "../linenoise.hpp"
-
-using namespace std;
-
-int main(int argc, const char** argv)
-{
-    const auto path = "history.txt";
-
-    // Enable the multi-line mode
-    linenoise::SetMultiLine(true);
-
-    // Set max length of the history
-    linenoise::SetHistoryMaxLen(4);
-
-    // Setup completion words every time when a user types
-    linenoise::SetCompletionCallback([](const char* editBuffer, std::vector<std::string>& completions) {
-        if (editBuffer[0] == 'h') {
-#ifdef _WIN32
-            completions.push_back("hello こんにちは");
-            completions.push_back("hello こんにちは there");
-#else
-            completions.push_back("hello");
-            completions.push_back("hello there");
-#endif
-        }
-    });
-
-    // Load history
-    linenoise::LoadHistory(path);
-
-    while (true) {
-        std::string line;
-#ifdef _WIN32
-        auto quit = linenoise::Readline("hello> ", line);
-#else
-        auto quit = linenoise::Readline("\033[32mこんにちは\x1b[0m> ", line);
-#endif
-
-        if (quit) {
-            break;
-        }
-
-        cout <<  "echo: '" << line << "'" << endl;
-
-        // Add line to history
-        linenoise::AddHistory(line.c_str());
-
-        // Save history
-        linenoise::SaveHistory(path);
-    }
-
-    return 0;
-}

third_party/cpp-linenoise/example/example.sln

@@ -1,28 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example", "example.vcxproj", "{563BF990-4217-439F-92A4-F8A285052772}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{563BF990-4217-439F-92A4-F8A285052772}.Debug|x64.ActiveCfg = Debug|x64
-		{563BF990-4217-439F-92A4-F8A285052772}.Debug|x64.Build.0 = Debug|x64
-		{563BF990-4217-439F-92A4-F8A285052772}.Debug|x86.ActiveCfg = Debug|Win32
-		{563BF990-4217-439F-92A4-F8A285052772}.Debug|x86.Build.0 = Debug|Win32
-		{563BF990-4217-439F-92A4-F8A285052772}.Release|x64.ActiveCfg = Release|x64
-		{563BF990-4217-439F-92A4-F8A285052772}.Release|x64.Build.0 = Release|x64
-		{563BF990-4217-439F-92A4-F8A285052772}.Release|x86.ActiveCfg = Release|Win32
-		{563BF990-4217-439F-92A4-F8A285052772}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

third_party/cpp-linenoise/example/example.vcxproj

@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{563BF990-4217-439F-92A4-F8A285052772}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>example</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="example.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\linenoise.hpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

ws/CMakeLists.txt

@@ -23,7 +23,6 @@ include_directories(ws ..)
 include_directories(ws ../third_party)
 include_directories(ws ../third_party/statsd-client-cpp/src)
 include_directories(ws ../third_party/spdlog/include)
-include_directories(ws ../third_party/cpp-linenoise)
 include_directories(ws snake)
 
 if (UNIX)
@@ -69,7 +68,6 @@ add_executable(ws
   ws_cobra_to_statsd.cpp
   ws_cobra_to_sentry.cpp
   ws_snake.cpp
-  ws_httpd.cpp
   ws.cpp)
 
 target_link_libraries(ws ixwebsocket)

ws/IXSentryClient.cpp

@@ -72,6 +72,7 @@ namespace ix
         std::string line;
         std::stringstream tokenStream(stack);
 
+        std::stringstream ss;
         std::smatch group;
 
         while (std::getline(tokenStream, line))
@@ -83,7 +84,6 @@ namespace ix
                 const auto linenoStr = group.str(2);
                 const auto function = group.str(3);
 
-                std::stringstream ss;
                 ss << linenoStr;
                 uint64_t lineno;
                 ss >> lineno;
@@ -97,8 +97,6 @@ namespace ix
             }
         }
 
-        std::reverse(frames.begin(), frames.end());
-
         return frames;
     }
 
@@ -145,7 +143,7 @@ namespace ix
         //     "b"
         //   ],
         //  ]
-        //
+        // 
         Json::Value tags;
 
         Json::Value gameTag;
@@ -171,15 +169,18 @@ namespace ix
     std::pair<HttpResponsePtr, std::string> SentryClient::send(const Json::Value& msg,
                                                                bool verbose)
     {
+        std::string log;
+
         auto args = _httpClient.createRequest();
         args->extraHeaders["X-Sentry-Auth"] = SentryClient::computeAuthHeader();
         args->connectTimeout = 60;
         args->transferTimeout = 5 * 60;
         args->followRedirects = true;
         args->verbose = verbose;
-        args->logger = [](const std::string& msg)
+        args->logger = [&log](const std::string& msg)
         {
-            spdlog::info("request logger: {}", msg);
+            log += msg;
+            std::cout << msg;
         };
 
         std::string body = computePayload(msg);
@@ -195,7 +196,7 @@ namespace ix
             spdlog::info("Upload size: {}", response->uploadSize);
             spdlog::info("Download size: {}", response->downloadSize);
 
-            spdlog::info("Status: {}", response->statusCode);
+            std::cerr << "Status: " << response->statusCode << std::endl;
             if (response->errorCode != HttpErrorCode::Ok)
             {
                 spdlog::info("error message: {}", response->errorMsg);
@@ -207,6 +208,6 @@ namespace ix
             }
         }
 
-        return std::make_pair(response, body);
+        return std::make_pair(response, log);
     }
 } // namespace ix

ws/IXSentryClient.h

@@ -6,10 +6,10 @@
 
 #pragma once
 
-#include <algorithm>
 #include <ixwebsocket/IXHttpClient.h>
 #include <jsoncpp/json/json.h>
 #include <regex>
+#include <algorithm>
 
 namespace ix
 {

ws/ixcobra/IXCobraConnection.cpp

@@ -90,41 +90,46 @@ namespace ix
     void CobraConnection::initWebSocketOnMessageCallback()
     {
         _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)
             {
-                CobraConnection::invokeTrafficTrackerCallback(msg->wireSize, true);
+                CobraConnection::invokeTrafficTrackerCallback(wireSize, true);
 
                 std::stringstream ss;
-                if (msg->type == ix::WebSocketMessageType::Open)
+                if (messageType == ix::WebSocketMessageType::Open)
                 {
                     invokeEventCallback(ix::CobraConnection_EventType_Open,
                                         std::string(),
-                                        msg->openInfo.headers);
+                                        openInfo.headers);
                     sendHandshakeMessage();
                 }
-                else if (msg->type == ix::WebSocketMessageType::Close)
+                else if (messageType == ix::WebSocketMessageType::Close)
                 {
                     _authenticated = false;
 
                     std::stringstream ss;
-                    ss << "Close code " << msg->closeInfo.code;
-                    ss << " reason " << msg->closeInfo.reason;
+                    ss << "Close code " << closeInfo.code;
+                    ss << " reason " << closeInfo.reason;
                     invokeEventCallback(ix::CobraConnection_EventType_Closed,
                                         ss.str());
                 }
-                else if (msg->type == ix::WebSocketMessageType::Message)
+                else if (messageType == ix::WebSocketMessageType::Message)
                 {
                     Json::Value data;
                     Json::Reader reader;
-                    if (!reader.parse(msg->str, data))
+                    if (!reader.parse(str, data))
                     {
-                        invokeErrorCallback("Invalid json", msg->str);
+                        invokeErrorCallback("Invalid json", str);
                         return;
                     }
 
                     if (!data.isMember("action"))
                     {
-                        invokeErrorCallback("Missing action", msg->str);
+                        invokeErrorCallback("Missing action", str);
                         return;
                     }
 
@@ -134,12 +139,12 @@ namespace ix
                     {
                         if (!handleHandshakeResponse(data))
                         {
-                            invokeErrorCallback("Error extracting nonce from handshake response", msg->str);
+                            invokeErrorCallback("Error extracting nonce from handshake response", str);
                         }
                     }
                     else if (action == "auth/handshake/error")
                     {
-                        invokeErrorCallback("Handshake error", msg->str);
+                        invokeErrorCallback("Handshake error", str);
                     }
                     else if (action == "auth/authenticate/ok")
                     {
@@ -149,7 +154,7 @@ namespace ix
                     }
                     else if (action == "auth/authenticate/error")
                     {
-                        invokeErrorCallback("Authentication error", msg->str);
+                        invokeErrorCallback("Authentication error", str);
                     }
                     else if (action == "rtm/subscription/data")
                     {
@@ -159,36 +164,36 @@ namespace ix
                     {
                         if (!handleSubscriptionResponse(data))
                         {
-                            invokeErrorCallback("Error processing subscribe response", msg->str);
+                            invokeErrorCallback("Error processing subscribe response", str);
                         }
                     }
                     else if (action == "rtm/subscribe/error")
                     {
-                        invokeErrorCallback("Subscription error", msg->str);
+                        invokeErrorCallback("Subscription error", str);
                     }
                     else if (action == "rtm/unsubscribe/ok")
                     {
                         if (!handleUnsubscriptionResponse(data))
                         {
-                            invokeErrorCallback("Error processing subscribe response", msg->str);
+                            invokeErrorCallback("Error processing subscribe response", str);
                         }
                     }
                     else if (action == "rtm/unsubscribe/error")
                     {
-                        invokeErrorCallback("Unsubscription error", msg->str);
+                        invokeErrorCallback("Unsubscription error", str);
                     }
                     else
                     {
-                        invokeErrorCallback("Un-handled message type", msg->str);
+                        invokeErrorCallback("Un-handled message type", str);
                     }
                 }
-                else if (msg->type == ix::WebSocketMessageType::Error)
+                else if (messageType == ix::WebSocketMessageType::Error)
                 {
                     std::stringstream ss;
-                    ss << "Connection error: " << msg->errorInfo.reason      << std::endl;
-                    ss << "#retries: "         << msg->errorInfo.retries     << std::endl;
-                    ss << "Wait time(ms): "    << msg->errorInfo.wait_time   << std::endl;
-                    ss << "HTTP Status: "      << msg->errorInfo.http_status << std::endl;
+                    ss << "Connection error: " << error.reason      << std::endl;
+                    ss << "#retries: "         << error.retries     << std::endl;
+                    ss << "Wait time(ms): "    << error.wait_time   << std::endl;
+                    ss << "HTTP Status: "      << error.http_status << std::endl;
                     invokeErrorCallback(ss.str(), std::string());
                 }
         });
@@ -429,18 +434,12 @@ namespace ix
     }
 
     void CobraConnection::subscribe(const std::string& channel,
-                                    const std::string& filter,
-                                    SubscriptionCallback cb)
+                                     SubscriptionCallback cb)
     {
         // Create and send a subscribe pdu
         Json::Value body;
         body["channel"] = channel;
 
-        if (!filter.empty())
-        {
-            body["filter"] = filter;
-        }
-
         Json::Value pdu;
         pdu["action"] = "rtm/subscribe";
         pdu["body"] = body;

ws/ixcobra/IXCobraConnection.h

@@ -75,9 +75,7 @@ namespace ix
 
         // Subscribe to a channel, and execute a callback when an incoming
         // message arrives.
-        void subscribe(const std::string& channel,
-                       const std::string& filter = std::string(),
-                       SubscriptionCallback cb = nullptr);
+        void subscribe(const std::string& channel, SubscriptionCallback cb);
 
         /// Unsubscribe from a channel
         void unsubscribe(const std::string& channel);

ws/ixcobra/IXCobraMetricsPublisher.cpp

@@ -17,7 +17,7 @@ namespace ix
     const std::string CobraMetricsPublisher::kSetBlacklistId = "sms_set_blacklist_id";
 
     CobraMetricsPublisher::CobraMetricsPublisher() :
-        _enabled(true)
+        _enabled(false)
     {
     }
 

ws/ixcobra/IXCobraMetricsPublisher.h

@@ -7,7 +7,6 @@
 #pragma once
 
 #include "IXCobraMetricsThreadedPublisher.h"
-#include <atomic>
 #include <chrono>
 #include <jsoncpp/json/json.h>
 #include <string>
@@ -133,8 +132,8 @@ namespace ix
         CobraMetricsThreadedPublisher _cobra_metrics_theaded_publisher;
 
         /// A boolean to enable or disable this system
-        /// push becomes a no-op when _enabled is false
-        std::atomic<bool> _enabled;
+        /// push becomes a no-op when _enabled is true
+        bool _enabled;
 
         /// A uuid used to uniquely identify a session
         std::string _session;

ws/ixcrypto/IXHMac.cpp

@@ -10,6 +10,7 @@
 #if defined(IXWEBSOCKET_USE_MBED_TLS)
 # include <mbedtls/md.h>
 #elif defined(__APPLE__)
+#  include <ixwebsocket/IXSocketMbedTLS.h>
 # include <CommonCrypto/CommonHMAC.h>
 #else
 # include <openssl/hmac.h>

ws/snake/IXSnakeServer.cpp

@@ -58,20 +58,25 @@ namespace snake
                 auto state = std::dynamic_pointer_cast<SnakeConnectionState>(connectionState);
 
                 webSocket->setOnMessageCallback(
-                    [this, webSocket, state](const ix::WebSocketMessagePtr& msg)
+                    [this, webSocket, state](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::WebSocketMessageType::Open)
                         {
                             std::cerr << "New connection" << std::endl;
                             std::cerr << "id: " << state->getId() << std::endl;
-                            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;
                             }
 
-                            std::string appkey = parseAppKey(msg->openInfo.uri);
+                            std::string appkey = parseAppKey(openInfo.uri);
                             state->setAppkey(appkey);
 
                             // Connect to redis first
@@ -81,29 +86,29 @@ namespace snake
                                 std::cerr << "Cannot connect to redis host" << std::endl;
                             }
                         }
-                        else if (msg->type == ix::WebSocketMessageType::Close)
+                        else if (messageType == ix::WebSocketMessageType::Close)
                         {
                             std::cerr << "Closed connection"
-                                      << " code " << msg->closeInfo.code
-                                      << " reason " << msg->closeInfo.reason << std::endl;
+                                      << " code " << closeInfo.code
+                                      << " reason " << closeInfo.reason << std::endl;
                         }
-                        else if (msg->type == ix::WebSocketMessageType::Error)
+                        else if (messageType == ix::WebSocketMessageType::Error)
                         {
                             std::stringstream ss;
-                            ss << "Connection error: " << msg->errorInfo.reason      << std::endl;
-                            ss << "#retries: "         << msg->errorInfo.retries     << std::endl;
-                            ss << "Wait time(ms): "    << msg->errorInfo.wait_time   << std::endl;
-                            ss << "HTTP Status: "      << msg->errorInfo.http_status << std::endl;
+                            ss << "Connection error: " << error.reason      << std::endl;
+                            ss << "#retries: "         << error.retries     << std::endl;
+                            ss << "Wait time(ms): "    << error.wait_time   << std::endl;
+                            ss << "HTTP Status: "      << error.http_status << std::endl;
                             std::cerr << ss.str();
                         }
-                        else if (msg->type == ix::WebSocketMessageType::Fragment)
+                        else if (messageType == ix::WebSocketMessageType::Fragment)
                         {
                             std::cerr << "Received message fragment" << std::endl;
                         }
-                        else if (msg->type == ix::WebSocketMessageType::Message)
+                        else if (messageType == ix::WebSocketMessageType::Message)
                         {
-                            std::cerr << "Received " << msg->wireSize << " bytes" << std::endl;
-                            processCobraMessage(state, webSocket, _appConfig, msg->str);
+                            std::cerr << "Received " << wireSize << " bytes" << std::endl;
+                            processCobraMessage(state, webSocket, _appConfig, str);
                         }
                     }
                 );

ws/ws.cpp

@@ -9,10 +9,15 @@
 //
 #include "ws.h"
 
+//
+// Main drive for websocket utilities
+//
+
 #include <string>
 #include <sstream>
 #include <iostream>
 #include <fstream>
+// #include <unistd.h>
 
 #include <cli11/CLI11.hpp>
 #include <spdlog/spdlog.h>
@@ -55,7 +60,6 @@ int main(int argc, char** argv)
     std::string hostname("127.0.0.1");
     std::string pidfile;
     std::string channel;
-    std::string filter;
     std::string message;
     std::string password;
     std::string appkey;
@@ -72,14 +76,10 @@ int main(int argc, char** argv)
     bool followRedirects = false;
     bool verbose = false;
     bool save = false;
-    bool quiet = false;
     bool compress = false;
     bool strict = false;
     bool stress = false;
     bool disableAutomaticReconnection = false;
-    bool disablePerMessageDeflate = false;
-    bool greetings = false;
-    bool binaryMode = false;
     int port = 8008;
     int redisPort = 6379;
     int statsdPort = 8125;
@@ -110,8 +110,6 @@ int main(int argc, char** argv)
     CLI::App* connectApp = app.add_subcommand("connect", "Connect to a remote server");
     connectApp->add_option("url", url, "Connection url")->required();
     connectApp->add_flag("-d", disableAutomaticReconnection, "Disable Automatic Reconnection");
-    connectApp->add_flag("-x", disablePerMessageDeflate, "Disable per message deflate");
-    connectApp->add_flag("-b", binaryMode, "Send in binary mode");
 
     CLI::App* chatApp = app.add_subcommand("chat", "Group chat");
     chatApp->add_option("url", url, "Connection url")->required();
@@ -120,7 +118,6 @@ int main(int argc, char** argv)
     CLI::App* echoServerApp = app.add_subcommand("echo_server", "Echo server");
     echoServerApp->add_option("--port", port, "Port");
     echoServerApp->add_option("--host", hostname, "Hostname");
-    echoServerApp->add_flag("-g", greetings, "Verbose");
 
     CLI::App* broadcastServerApp = app.add_subcommand("broadcast_server", "Broadcasting server");
     broadcastServerApp->add_option("--port", port, "Port");
@@ -167,8 +164,6 @@ int main(int argc, char** argv)
     cobraSubscribeApp->add_option("--rolesecret", rolesecret, "Role secret");
     cobraSubscribeApp->add_option("channel", channel, "Channel")->required();
     cobraSubscribeApp->add_option("--pidfile", pidfile, "Pid file");
-    cobraSubscribeApp->add_option("--filter", filter, "Stream SQL Filter");
-    cobraSubscribeApp->add_flag("-q", quiet, "Quiet / only display stats");
 
     CLI::App* cobraPublish = app.add_subcommand("cobra_publish", "Cobra publisher");
     cobraPublish->add_option("--appkey", appkey, "Appkey");
@@ -193,7 +188,6 @@ int main(int argc, char** argv)
     cobra2statsd->add_option("channel", channel, "Channel")->required();
     cobra2statsd->add_flag("-v", verbose, "Verbose");
     cobra2statsd->add_option("--pidfile", pidfile, "Pid file");
-    cobra2statsd->add_option("--filter", filter, "Stream SQL Filter");
 
     CLI::App* cobra2sentry = app.add_subcommand("cobra_to_sentry", "Cobra to sentry");
     cobra2sentry->add_option("--appkey", appkey, "Appkey");
@@ -206,7 +200,6 @@ int main(int argc, char** argv)
     cobra2sentry->add_flag("-v", verbose, "Verbose");
     cobra2sentry->add_flag("-s", strict, "Strict mode. Error out when sending to sentry fails");
     cobra2sentry->add_option("--pidfile", pidfile, "Pid file");
-    cobra2sentry->add_option("--filter", filter, "Stream SQL Filter");
 
     CLI::App* runApp = app.add_subcommand("snake", "Snake server");
     runApp->add_option("--port", port, "Connection url");
@@ -219,10 +212,6 @@ int main(int argc, char** argv)
         ->check(CLI::ExistingPath);
     runApp->add_flag("-v", verbose, "Verbose");
 
-    CLI::App* httpServerApp = app.add_subcommand("httpd", "HTTP server");
-    httpServerApp->add_option("--port", port, "Port");
-    httpServerApp->add_option("--host", hostname, "Hostname");
-
     CLI11_PARSE(app, argc, argv);
 
     // pid file handling
@@ -252,8 +241,7 @@ int main(int argc, char** argv)
     }
     else if (app.got_subcommand("connect"))
     {
-        ret = ix::ws_connect_main(url, disableAutomaticReconnection,
-                                  disablePerMessageDeflate, binaryMode);
+        ret = ix::ws_connect_main(url, disableAutomaticReconnection);
     }
     else if (app.got_subcommand("chat"))
     {
@@ -261,7 +249,7 @@ int main(int argc, char** argv)
     }
     else if (app.got_subcommand("echo_server"))
     {
-        ret = ix::ws_echo_server_main(port, greetings, hostname);
+        ret = ix::ws_echo_server_main(port, hostname);
     }
     else if (app.got_subcommand("broadcast_server"))
     {
@@ -291,7 +279,7 @@ int main(int argc, char** argv)
     {
         ret = ix::ws_cobra_subscribe_main(appkey, endpoint,
                                           rolename, rolesecret,
-                                          channel, filter, quiet);
+                                          channel);
     }
     else if (app.got_subcommand("cobra_publish"))
     {
@@ -303,14 +291,14 @@ int main(int argc, char** argv)
     {
         ret = ix::ws_cobra_to_statsd_main(appkey, endpoint,
                                           rolename, rolesecret,
-                                          channel, filter, hostname, statsdPort,
+                                          channel, hostname, statsdPort,
                                           prefix, fields, verbose);
     }
     else if (app.got_subcommand("cobra_to_sentry"))
     {
         ret = ix::ws_cobra_to_sentry_main(appkey, endpoint,
                                           rolename, rolesecret,
-                                          channel, filter, dsn,
+                                          channel, dsn,
                                           verbose, strict, jobs);
     }
     else if (app.got_subcommand("snake"))
@@ -320,10 +308,6 @@ int main(int argc, char** argv)
                                 redisPassword, verbose,
                                 appsConfigPath);
     }
-    else if (app.got_subcommand("httpd"))
-    {
-        ret = ix::ws_httpd_main(port, hostname);
-    }
 
     ix::uninitNetSystem();
     return ret;

ws/ws.h

@@ -24,16 +24,13 @@ namespace ix
 
     int ws_ping_pong_main(const std::string& url);
 
-    int ws_echo_server_main(int port, bool greetings, const std::string& hostname);
+    int ws_echo_server_main(int port, const std::string& hostname);
     int ws_broadcast_server_main(int port, const std::string& hostname);
     int ws_transfer_main(int port, const std::string& hostname);
 
     int ws_chat_main(const std::string& url, const std::string& user);
 
-    int ws_connect_main(const std::string& url,
-                        bool disableAutomaticReconnection,
-                        bool disablePerMessageDeflate,
-                        bool binaryMode);
+    int ws_connect_main(const std::string& url, bool disableAutomaticReconnection);
 
     int ws_receive_main(const std::string& url, bool enablePerMessageDeflate, int delayMs);
 
@@ -56,9 +53,7 @@ namespace ix
                                 const std::string& endpoint,
                                 const std::string& rolename,
                                 const std::string& rolesecret,
-                                const std::string& channel,
-                                const std::string& filter,
-                                bool quiet);
+                                const std::string& channel);
 
     int ws_cobra_publish_main(const std::string& appkey,
                               const std::string& endpoint,
@@ -73,7 +68,6 @@ namespace ix
                                 const std::string& rolename,
                                 const std::string& rolesecret,
                                 const std::string& channel,
-                                const std::string& filter,
                                 const std::string& host,
                                 int port,
                                 const std::string& prefix,
@@ -85,7 +79,6 @@ namespace ix
                                 const std::string& rolename,
                                 const std::string& rolesecret,
                                 const std::string& channel,
-                                const std::string& filter,
                                 const std::string& dsn,
                                 bool verbose,
                                 bool strict,
@@ -98,6 +91,4 @@ namespace ix
                       const std::string& redisPassword,
                       bool verbose,
                       const std::string& appsConfigPath);
-
-    int ws_httpd_main(int port, const std::string& hostname);
 } // namespace ix

ws/ws_broadcast_server.cpp

@@ -21,48 +21,52 @@ namespace ix
                       std::shared_ptr<ConnectionState> connectionState)
             {
                 webSocket->setOnMessageCallback(
-                    [webSocket, connectionState, &server](const 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::WebSocketMessageType::Open)
                         {
                             std::cerr << "New connection" << std::endl;
                             std::cerr << "id: " << connectionState->getId() << std::endl;
-                            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::Close)
+                        else if (messageType == ix::WebSocketMessageType::Close)
                         {
                             std::cerr << "Closed connection"
-                                      << " code " << msg->closeInfo.code
-                                      << " reason " << msg->closeInfo.reason << std::endl;
+                                      << " code " << closeInfo.code
+                                      << " reason " << closeInfo.reason << std::endl;
                         }
-                        else if (msg->type == ix::WebSocketMessageType::Error)
+                        else if (messageType == ix::WebSocketMessageType::Error)
                         {
                             std::stringstream ss;
-                            ss << "Connection error: " << msg->errorInfo.reason      << std::endl;
-                            ss << "#retries: "         << msg->errorInfo.retries     << std::endl;
-                            ss << "Wait time(ms): "    << msg->errorInfo.wait_time   << std::endl;
-                            ss << "HTTP Status: "      << msg->errorInfo.http_status << std::endl;
+                            ss << "Connection error: " << error.reason      << std::endl;
+                            ss << "#retries: "         << error.retries     << std::endl;
+                            ss << "Wait time(ms): "    << error.wait_time   << std::endl;
+                            ss << "HTTP Status: "      << error.http_status << std::endl;
                             std::cerr << ss.str();
                         }
-                        else if (msg->type == ix::WebSocketMessageType::Fragment)
+                        else if (messageType == ix::WebSocketMessageType::Fragment)
                         {
                             std::cerr << "Received message fragment" << std::endl;
                         }
-                        else if (msg->type == ix::WebSocketMessageType::Message)
+                        else if (messageType == ix::WebSocketMessageType::Message)
                         {
-                            std::cerr << "Received " << msg->wireSize << " bytes" << std::endl;
+                            std::cerr << "Received " << wireSize << " bytes" << std::endl;
 
                             for (auto&& client : server.getClients())
                             {
                                 if (client != webSocket)
                                 {
-                                    client->send(msg->str,
-                                                 msg->binary,
+                                    client->send(str,
                                                  [](int current, int total) -> bool
                                     {
                                         std::cerr << "Step " << current

ws/ws_chat.cpp

@@ -84,15 +84,20 @@ namespace ix
         log(std::string("Connecting to url: ") + _url);
 
         _webSocket.setOnMessageCallback(
-            [this](const 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::WebSocketMessageType::Open)
                 {
                     log("ws chat: connected");
-                    std::cout << "Uri: " << msg->openInfo.uri << std::endl;
+                    std::cout << "Uri: " << openInfo.uri << std::endl;
                     std::cout << "Handshake Headers:" << std::endl;
-                    for (auto it : msg->openInfo.headers)
+                    for (auto it : openInfo.headers)
                     {
                         std::cout << it.first << ": " << it.second << std::endl;
                     }
@@ -102,18 +107,18 @@ namespace ix
                        << " Connected !";
                        log(ss.str());
                 }
-                else if (msg->type == ix::WebSocketMessageType::Close)
+                else if (messageType == ix::WebSocketMessageType::Close)
                 {
                     ss << "ws chat: user "
                        << _user
                        << " disconnected !"
-                       << " code " << msg->closeInfo.code
-                       << " reason " << msg->closeInfo.reason;
+                       << " code " << closeInfo.code
+                       << " reason " << closeInfo.reason;
                        log(ss.str());
                 }
-                else if (msg->type == ix::WebSocketMessageType::Message)
+                else if (messageType == ix::WebSocketMessageType::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 have to filter it out.
@@ -122,17 +127,17 @@ namespace ix
                     _receivedQueue.push(result.second);
 
                     ss << std::endl
-                       << result.first << "(" << msg->wireSize << " bytes)" << " > " << result.second
+                       << result.first << "(" << wireSize << " bytes)" << " > " << result.second
                        << std::endl
                        << _user << " > ";
                     log(ss.str());
                 }
-                else if (msg->type == ix::WebSocketMessageType::Error)
+                else if (messageType == ix::WebSocketMessageType::Error)
                 {
-                    ss << "Connection error: " << msg->errorInfo.reason      << std::endl;
-                    ss << "#retries: "         << msg->errorInfo.retries     << std::endl;
-                    ss << "Wait time(ms): "    << msg->errorInfo.wait_time   << std::endl;
-                    ss << "HTTP Status: "      << msg->errorInfo.http_status << std::endl;
+                    ss << "Connection error: " << error.reason      << std::endl;
+                    ss << "#retries: "         << error.retries     << std::endl;
+                    ss << "Wait time(ms): "    << error.wait_time   << std::endl;
+                    ss << "HTTP Status: "      << error.http_status << std::endl;
                     log(ss.str());
                 }
                 else
@@ -167,7 +172,7 @@ namespace ix
 
     void WebSocketChat::sendMessage(const std::string& text)
     {
-        _webSocket.sendText(encodeMessage(text));
+        _webSocket.send(encodeMessage(text));
     }
 
     int ws_chat_main(const std::string& url,

ws/ws_cobra_subscribe.cpp

@@ -11,17 +11,13 @@
 #include <atomic>
 #include <ixcobra/IXCobraConnection.h>
 
-#include <spdlog/spdlog.h>
-
 namespace ix
 {
     int ws_cobra_subscribe_main(const std::string& appkey,
                                 const std::string& endpoint,
                                 const std::string& rolename,
                                 const std::string& rolesecret,
-                                const std::string& channel,
-                                const std::string& filter,
-                                bool quiet)
+                                const std::string& channel)
     {
 
         ix::CobraConnection conn;
@@ -32,28 +28,8 @@ namespace ix
 
         Json::FastWriter jsonWriter;
 
-        // Display incoming messages
-        std::atomic<int> msgPerSeconds(0);
-        std::atomic<int> msgCount(0);
-        
-        auto timer = [&msgPerSeconds, &msgCount]
-        {
-            while (true)
-            {
-                std::cout << "#messages " << msgCount << " "
-                          << "msg/s " << msgPerSeconds
-                          << std::endl;
-
-                msgPerSeconds = 0;
-                auto duration = std::chrono::seconds(1);
-                std::this_thread::sleep_for(duration);
-            }
-        };
-
-        std::thread t(timer);
-
         conn.setEventCallback(
-            [&conn, &channel, &jsonWriter, &filter, &msgCount, &msgPerSeconds, &quiet]
+            [&conn, &channel, &jsonWriter]
             (ix::CobraConnectionEventType eventType,
              const std::string& errMsg,
              const ix::WebSocketHttpHeaders& headers,
@@ -61,40 +37,33 @@ namespace ix
             {
                 if (eventType == ix::CobraConnection_EventType_Open)
                 {
-                    spdlog::info("Subscriber connected");
+                    std::cout << "Subscriber: connected" << std::endl;
 
                     for (auto it : headers)
                     {
-                        spdlog::info("{}: {}", it.first, it.second);
+                        std::cerr << it.first << ": " << it.second << std::endl;
                     }
                 }
                 else if (eventType == ix::CobraConnection_EventType_Authenticated)
                 {
-                    spdlog::info("Subscriber authenticated");
-                    conn.subscribe(channel, filter,
-                                   [&jsonWriter, &quiet,
-                                    &msgPerSeconds, &msgCount](const Json::Value& msg)
+                    std::cout << "Subscriber authenticated" << std::endl;
+                    conn.subscribe(channel,
+                                   [&jsonWriter](const Json::Value& msg)
                                    {
-                                       if (!quiet)
-                                       {
-                                           std::cout << jsonWriter.write(msg) << std::endl;
-                                       }
-
-                                       msgPerSeconds++;
-                                       msgCount++;
+                                       std::cout << jsonWriter.write(msg) << std::endl;
                                    });
                 }
                 else if (eventType == ix::CobraConnection_EventType_Subscribed)
                 {
-                    spdlog::info("Subscriber: subscribed to channel {}", subscriptionId);
+                    std::cout << "Subscriber: subscribed to channel " << subscriptionId << std::endl;
                 }
                 else if (eventType == ix::CobraConnection_EventType_UnSubscribed)
                 {
-                    spdlog::info("Subscriber: unsubscribed from channel {}", subscriptionId);
+                    std::cout << "Subscriber: unsubscribed from channel " << subscriptionId << std::endl;
                 }
                 else if (eventType == ix::CobraConnection_EventType_Error)
                 {
-                    spdlog::error("Subscriber: error {}", errMsg);
+                    std::cout << "Subscriber: error" << errMsg << std::endl;
                 }
             }
         );

ws/ws_cobra_to_sentry.cpp

@@ -25,7 +25,6 @@ namespace ix
                                 const std::string& rolename,
                                 const std::string& rolesecret,
                                 const std::string& channel,
-                                const std::string& filter,
                                 const std::string& dsn,
                                 bool verbose,
                                 bool strict,
@@ -48,12 +47,12 @@ namespace ix
         std::condition_variable progressCondition;
         std::queue<Json::Value> queue;
 
+        SentryClient sentryClient(dsn);
+
         auto sentrySender = [&condition, &progressCondition, &conditionVariableMutex,
                              &queue, verbose, &errorSending, &sentCount,
-                             &stop, &dsn]
+                             &stop, &sentryClient]
         {
-            SentryClient sentryClient(dsn);
-
             while (true)
             {
                 Json::Value msg;
@@ -71,8 +70,8 @@ namespace ix
                 if (response->statusCode != 200)
                 {
                     spdlog::error("Error sending data to sentry: {}", response->statusCode);
-                    spdlog::error("Body: {}", ret.second);
                     spdlog::error("Response: {}", response->payload);
+                    spdlog::error("Log: {}", ret.second);
                     errorSending = true;
                 }
                 else
@@ -95,7 +94,7 @@ namespace ix
         }
 
         conn.setEventCallback(
-            [&conn, &channel, &filter, &jsonWriter,
+            [&conn, &channel, &jsonWriter,
              verbose, &receivedCount, &sentCount,
              &condition, &conditionVariableMutex,
              &progressCondition, &queue]
@@ -120,7 +119,7 @@ namespace ix
                 else if (eventType == ix::CobraConnection_EventType_Authenticated)
                 {
                     std::cerr << "Subscriber authenticated" << std::endl;
-                    conn.subscribe(channel, filter,
+                    conn.subscribe(channel,
                                    [&jsonWriter, verbose,
                                     &sentCount, &receivedCount,
                                     &condition, &conditionVariableMutex,
@@ -193,6 +192,6 @@ namespace ix
             pool[i].join();
         }
 
-        return (strict && errorSending) ? 1 : 0;
+        return 0;
     }
 }

ws/ws_cobra_to_statsd.cpp

@@ -63,7 +63,6 @@ namespace ix
                                 const std::string& rolename,
                                 const std::string& rolesecret,
                                 const std::string& channel,
-                                const std::string& filter,
                                 const std::string& host,
                                 int port,
                                 const std::string& prefix,
@@ -91,7 +90,7 @@ namespace ix
         uint64_t msgCount = 0;
 
         conn.setEventCallback(
-            [&conn, &channel, &filter, &jsonWriter, &statsdClient, verbose, &tokens, &prefix, &msgCount]
+            [&conn, &channel, &jsonWriter, &statsdClient, verbose, &tokens, &prefix, &msgCount]
             (ix::CobraConnectionEventType eventType,
              const std::string& errMsg,
              const ix::WebSocketHttpHeaders& headers,
@@ -113,7 +112,7 @@ namespace ix
                 else if (eventType == ix::CobraConnection_EventType_Authenticated)
                 {
                     spdlog::info("Subscriber authenticated");
-                    conn.subscribe(channel, filter,
+                    conn.subscribe(channel,
                                    [&jsonWriter, &statsdClient,
                                     verbose, &tokens, &prefix, &msgCount]
                                    (const Json::Value& msg)

ws/ws_connect.cpp

@@ -9,18 +9,13 @@
 #include <ixwebsocket/IXWebSocket.h>
 #include <ixwebsocket/IXSocket.h>
 
-#include "linenoise.hpp"
-
-
 namespace ix
 {
     class WebSocketConnect
     {
         public:
             WebSocketConnect(const std::string& _url,
-                             bool disableAutomaticReconnection,
-                             bool disablePerMessageDeflate,
-                             bool binaryMode);
+                             bool disableAutomaticReconnection);
 
             void subscribe(const std::string& channel);
             void start();
@@ -31,19 +26,13 @@ namespace ix
         private:
             std::string _url;
             ix::WebSocket _webSocket;
-            bool _disablePerMessageDeflate;
-            bool _binaryMode;
 
             void log(const std::string& msg);
     };
 
     WebSocketConnect::WebSocketConnect(const std::string& url,
-                                       bool disableAutomaticReconnection,
-                                       bool disablePerMessageDeflate,
-                                       bool binaryMode) :
-        _url(url),
-        _disablePerMessageDeflate(disablePerMessageDeflate),
-        _binaryMode(binaryMode)
+                                       bool disableAutomaticReconnection) :
+        _url(url)
     {
         if (disableAutomaticReconnection)
         {
@@ -65,66 +54,64 @@ namespace ix
     {
         _webSocket.setUrl(_url);
 
-        if (_disablePerMessageDeflate)
-        {
-            _webSocket.disablePerMessageDeflate();
-        }
-        else
-        {
-            ix::WebSocketPerMessageDeflateOptions webSocketPerMessageDeflateOptions(
-                true, false, false, 15, 15);
-            _webSocket.setPerMessageDeflateOptions(webSocketPerMessageDeflateOptions);
-        }
+        ix::WebSocketPerMessageDeflateOptions webSocketPerMessageDeflateOptions(
+            true, false, false, 15, 15);
+        _webSocket.setPerMessageDeflateOptions(webSocketPerMessageDeflateOptions);
 
         std::stringstream ss;
         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::WebSocketMessageType::Open)
                 {
                     log("ws_connect: connected");
-                    std::cout << "Uri: " << msg->openInfo.uri << std::endl;
+                    std::cout << "Uri: " << openInfo.uri << std::endl;
                     std::cout << "Handshake Headers:" << std::endl;
-                    for (auto it : msg->openInfo.headers)
+                    for (auto it : openInfo.headers)
                     {
                         std::cout << it.first << ": " << it.second << std::endl;
                     }
                 }
-                else if (msg->type == ix::WebSocketMessageType::Close)
+                else if (messageType == ix::WebSocketMessageType::Close)
                 {
                     ss << "ws_connect: connection closed:";
-                    ss << " code " << msg->closeInfo.code;
-                    ss << " reason " << msg->closeInfo.reason << std::endl;
+                    ss << " code " << closeInfo.code;
+                    ss << " reason " << closeInfo.reason << std::endl;
                     log(ss.str());
                 }
-                else if (msg->type == ix::WebSocketMessageType::Message)
+                else if (messageType == ix::WebSocketMessageType::Message)
                 {
-                    std::cerr << "Received " << msg->wireSize << " bytes" << std::endl;
+                    std::cerr << "Received " << wireSize << " bytes" << std::endl;
 
                     ss << "ws_connect: received message: "
-                       << msg->str;
+                       << str;
                     log(ss.str());
                 }
-                else if (msg->type == ix::WebSocketMessageType::Error)
+                else if (messageType == ix::WebSocketMessageType::Error)
                 {
-                    ss << "Connection error: " << msg->errorInfo.reason      << std::endl;
-                    ss << "#retries: "         << msg->errorInfo.retries     << std::endl;
-                    ss << "Wait time(ms): "    << msg->errorInfo.wait_time   << std::endl;
-                    ss << "HTTP Status: "      << msg->errorInfo.http_status << std::endl;
+                    ss << "Connection error: " << error.reason      << std::endl;
+                    ss << "#retries: "         << error.retries     << std::endl;
+                    ss << "Wait time(ms): "    << error.wait_time   << std::endl;
+                    ss << "HTTP Status: "      << error.http_status << std::endl;
                     log(ss.str());
                 }
-                else if (msg->type == ix::WebSocketMessageType::Fragment)
+                else if (messageType == ix::WebSocketMessageType::Fragment)
                 {
                     std::cerr << "Received message fragment" << std::endl;
                 }
-                else if (msg->type == ix::WebSocketMessageType::Ping)
+                else if (messageType == ix::WebSocketMessageType::Ping)
                 {
                     std::cerr << "Received ping" << std::endl;
                 }
-                else if (msg->type == ix::WebSocketMessageType::Pong)
+                else if (messageType == ix::WebSocketMessageType::Pong)
                 {
                     std::cerr << "Received pong" << std::endl;
                 }
@@ -140,57 +127,41 @@ namespace ix
 
     void WebSocketConnect::sendMessage(const std::string& text)
     {
-        if (_binaryMode)
-        {
-            _webSocket.sendBinary(text);
-        }
-        else
-        {
-            _webSocket.sendText(text);
-        }
+        _webSocket.send(text);
     }
 
-    int ws_connect_main(const std::string& url,
-                        bool disableAutomaticReconnection,
-                        bool disablePerMessageDeflate,
-                        bool binaryMode)
+    int ws_connect_main(const std::string& url, bool disableAutomaticReconnection)
     {
         std::cout << "Type Ctrl-D to exit prompt..." << std::endl;
-        WebSocketConnect webSocketChat(url,
-                                       disableAutomaticReconnection,
-                                       disablePerMessageDeflate,
-                                       binaryMode);
+        WebSocketConnect webSocketChat(url, disableAutomaticReconnection);
         webSocketChat.start();
 
         while (true)
         {
-            // Read line
-            std::string line;
-            auto quit = linenoise::Readline("> ", line);
+            std::string text;
+            std::cout << "> " << std::flush;
+            std::getline(std::cin, text);
 
-            if (quit)
-            {
-                break;
-            }
-
-            if (line == "/stop")
+            if (text == "/stop")
             {
                 std::cout << "Stopping connection..." << std::endl;
                 webSocketChat.stop();
                 continue;
             }
 
-            if (line == "/start")
+            if (text == "/start")
             {
                 std::cout << "Starting connection..." << std::endl;
                 webSocketChat.start();
                 continue;
             }
 
-            webSocketChat.sendMessage(line);
+            if (!std::cin)
+            {
+                break;
+            }
 
-            // Add text to history
-            linenoise::AddHistory(line.c_str());
+            webSocketChat.sendMessage(text);
         }
 
         std::cout << std::endl;

ws/ws_echo_server.cpp

@@ -10,56 +10,56 @@
 
 namespace ix
 {
-    int ws_echo_server_main(int port, bool greetings, const std::string& hostname)
+    int ws_echo_server_main(int port, const std::string& hostname)
     {
         std::cout << "Listening on " << hostname << ":" << port << std::endl;
 
         ix::WebSocketServer server(port, hostname);
 
         server.setOnConnectionCallback(
-            [greetings](std::shared_ptr<ix::WebSocket> webSocket,
-                        std::shared_ptr<ConnectionState> connectionState)
+            [](std::shared_ptr<ix::WebSocket> webSocket,
+               std::shared_ptr<ConnectionState> connectionState)
             {
                 webSocket->setOnMessageCallback(
-                    [webSocket, connectionState, greetings](const WebSocketMessagePtr& msg)
+                    [webSocket, connectionState](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::WebSocketMessageType::Open)
                         {
                             std::cerr << "New connection" << std::endl;
                             std::cerr << "id: " << connectionState->getId() << std::endl;
-                            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;
                             }
-
-                            if (greetings)
-                            {
-                                webSocket->sendText("Welcome !");
-                            }
                         }
-                        else if (msg->type == ix::WebSocketMessageType::Close)
+                        else if (messageType == ix::WebSocketMessageType::Close)
                         {
                             std::cerr << "Closed connection"
-                                      << " code " << msg->closeInfo.code
-                                      << " reason " << msg->closeInfo.reason << std::endl;
+                                      << " code " << closeInfo.code
+                                      << " reason " << closeInfo.reason << std::endl;
                         }
-                        else if (msg->type == ix::WebSocketMessageType::Error)
+                        else if (messageType == ix::WebSocketMessageType::Error)
                         {
                             std::stringstream ss;
-                            ss << "Connection error: " << msg->errorInfo.reason      << std::endl;
-                            ss << "#retries: "         << msg->errorInfo.retries     << std::endl;
-                            ss << "Wait time(ms): "    << msg->errorInfo.wait_time   << std::endl;
-                            ss << "HTTP Status: "      << msg->errorInfo.http_status << std::endl;
+                            ss << "Connection error: " << error.reason      << std::endl;
+                            ss << "#retries: "         << error.retries     << std::endl;
+                            ss << "Wait time(ms): "    << error.wait_time   << std::endl;
+                            ss << "HTTP Status: "      << error.http_status << std::endl;
                             std::cerr << ss.str();
                         }
-                        else if (msg->type == ix::WebSocketMessageType::Message)
+                        else if (messageType == ix::WebSocketMessageType::Message)
                         {
                             std::cerr << "Received "
-                                      << msg->wireSize << " bytes"
+                                      << wireSize << " bytes"
                                       << std::endl;
-                            webSocket->send(msg->str, msg->binary);
+                            webSocket->send(str);
                         }
                     }
                 );

ws/ws_httpd.cpp

@@ -1,34 +0,0 @@
-/*
- *  ws_httpd.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
- */
-
-#include <iostream>
-#include <vector>
-#include <fstream>
-#include <sstream>
-#include <ixwebsocket/IXHttpServer.h>
-#include <spdlog/spdlog.h>
-
-namespace ix
-{
-    int ws_httpd_main(int port, const std::string& hostname)
-    {
-        spdlog::info("Listening on {}:{}", hostname, port);
-
-        ix::HttpServer server(port, hostname);
-
-        auto res = server.listen();
-        if (!res.first)
-        {
-            std::cerr << res.second << std::endl;
-            return 1;
-        }
-
-        server.start();
-        server.wait();
-
-        return 0;
-    }
-}

ws/ws_ping_pong.cpp

@@ -54,54 +54,59 @@ namespace ix
         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::cerr << "Received " << msg->wireSize << " bytes" << std::endl;
+                std::cerr << "Received " << wireSize << " bytes" << std::endl;
 
                 std::stringstream ss;
-                if (msg->type == ix::WebSocketMessageType::Open)
+                if (messageType == ix::WebSocketMessageType::Open)
                 {
                     log("ping_pong: connected");
 
-                    std::cout << "Uri: " << msg->openInfo.uri << std::endl;
+                    std::cout << "Uri: " << openInfo.uri << std::endl;
                     std::cout << "Handshake Headers:" << std::endl;
-                    for (auto it : msg->openInfo.headers)
+                    for (auto it : openInfo.headers)
                     {
                         std::cout << it.first << ": " << it.second << std::endl;
                     }
                 }
-                else if (msg->type == ix::WebSocketMessageType::Close)
+                else if (messageType == ix::WebSocketMessageType::Close)
                 {
                     ss << "ping_pong: disconnected:"
-                       << " code " << msg->closeInfo.code
-                       << " reason " << msg->closeInfo.reason
-                       << msg->str;
+                       << " code " << closeInfo.code
+                       << " reason " << closeInfo.reason
+                       << str;
                     log(ss.str());
                 }
-                else if (msg->type == ix::WebSocketMessageType::Message)
+                else if (messageType == ix::WebSocketMessageType::Message)
                 {
                     ss << "ping_pong: received message: "
-                       << msg->str;
+                       << str;
                     log(ss.str());
                 }
-                else if (msg->type == ix::WebSocketMessageType::Ping)
+                else if (messageType == ix::WebSocketMessageType::Ping)
                 {
                     ss << "ping_pong: received ping message: "
-                       << msg->str;
+                       << str;
                     log(ss.str());
                 }
-                else if (msg->type == ix::WebSocketMessageType::Pong)
+                else if (messageType == ix::WebSocketMessageType::Pong)
                 {
                     ss << "ping_pong: received pong message: "
-                       << msg->str;
+                       << str;
                     log(ss.str());
                 }
-                else if (msg->type == ix::WebSocketMessageType::Error)
+                else if (messageType == ix::WebSocketMessageType::Error)
                 {
-                    ss << "Connection error: " << msg->errorInfo.reason      << std::endl;
-                    ss << "#retries: "         << msg->errorInfo.retries     << std::endl;
-                    ss << "Wait time(ms): "    << msg->errorInfo.wait_time   << std::endl;
-                    ss << "HTTP Status: "      << msg->errorInfo.http_status << std::endl;
+                    ss << "Connection error: " << error.reason      << std::endl;
+                    ss << "#retries: "         << error.retries     << std::endl;
+                    ss << "Wait time(ms): "    << error.wait_time   << std::endl;
+                    ss << "HTTP Status: "      << error.http_status << std::endl;
                     log(ss.str());
                 }
                 else

ws/ws_receive.cpp

@@ -183,36 +183,41 @@ namespace ix
         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::WebSocketMessageType::Open)
                 {
                     _condition.notify_one();
 
                     log("ws_receive: connected");
-                    std::cout << "Uri: " << msg->openInfo.uri << std::endl;
+                    std::cout << "Uri: " << openInfo.uri << std::endl;
                     std::cout << "Handshake Headers:" << std::endl;
-                    for (auto it : msg->openInfo.headers)
+                    for (auto it : openInfo.headers)
                     {
                         std::cout << it.first << ": " << it.second << std::endl;
                     }
                 }
-                else if (msg->type == ix::WebSocketMessageType::Close)
+                else if (messageType == ix::WebSocketMessageType::Close)
                 {
                     ss << "ws_receive: connection closed:";
-                    ss << " code " << msg->closeInfo.code;
-                    ss << " reason " << msg->closeInfo.reason << std::endl;
+                    ss << " code " << closeInfo.code;
+                    ss << " reason " << closeInfo.reason << std::endl;
                     log(ss.str());
                 }
-                else if (msg->type == ix::WebSocketMessageType::Message)
+                else if (messageType == ix::WebSocketMessageType::Message)
                 {
-                    ss << "ws_receive: transfered " << msg->wireSize << " bytes";
+                    ss << "ws_receive: transfered " << wireSize << " bytes";
                     log(ss.str());
-                    handleMessage(msg->str);
+                    handleMessage(str);
                     _condition.notify_one();
                 }
-                else if (msg->type == ix::WebSocketMessageType::Fragment)
+                else if (messageType == ix::WebSocketMessageType::Fragment)
                 {
                     ss << "ws_receive: received fragment " << _receivedFragmentCounter++;
                     log(ss.str());
@@ -224,13 +229,13 @@ namespace ix
                         std::this_thread::sleep_for(duration);
                     }
                 }
-                else if (msg->type == ix::WebSocketMessageType::Error)
+                else if (messageType == ix::WebSocketMessageType::Error)
                 {
                     ss << "ws_receive ";
-                    ss << "Connection error: " << msg->errorInfo.reason      << std::endl;
-                    ss << "#retries: "         << msg->errorInfo.retries     << std::endl;
-                    ss << "Wait time(ms): "    << msg->errorInfo.wait_time   << std::endl;
-                    ss << "HTTP Status: "      << msg->errorInfo.http_status << std::endl;
+                    ss << "Connection error: " << error.reason      << std::endl;
+                    ss << "#retries: "         << error.retries     << std::endl;
+                    ss << "Wait time(ms): "    << error.wait_time   << std::endl;
+                    ss << "HTTP Status: "      << error.http_status << std::endl;
                     log(ss.str());
                 }
                 else

ws/ws_send.cpp

@@ -112,37 +112,42 @@ namespace ix
         log(std::string("Connecting to url: ") + _url);
 
         _webSocket.setOnMessageCallback(
-            [this](const 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::WebSocketMessageType::Open)
                 {
                     _condition.notify_one();
 
                     log("ws_send: connected");
-                    std::cout << "Uri: " << msg->openInfo.uri << std::endl;
+                    std::cout << "Uri: " << openInfo.uri << std::endl;
                     std::cout << "Handshake Headers:" << std::endl;
-                    for (auto it : msg->openInfo.headers)
+                    for (auto it : openInfo.headers)
                     {
                         std::cout << it.first << ": " << it.second << std::endl;
                     }
                 }
-                else if (msg->type == ix::WebSocketMessageType::Close)
+                else if (messageType == ix::WebSocketMessageType::Close)
                 {
                     ss << "ws_send: connection closed:";
-                    ss << " code " << msg->closeInfo.code;
-                    ss << " reason " << msg->closeInfo.reason << std::endl;
+                    ss << " code " << closeInfo.code;
+                    ss << " reason " << closeInfo.reason << std::endl;
                     log(ss.str());
                 }
-                else if (msg->type == ix::WebSocketMessageType::Message)
+                else if (messageType == ix::WebSocketMessageType::Message)
                 {
                     _condition.notify_one();
 
-                    ss << "ws_send: received message (" << msg->wireSize << " bytes)";
+                    ss << "ws_send: received message (" << wireSize << " bytes)";
                     log(ss.str());
 
                     std::string errMsg;
-                    MsgPack data = MsgPack::parse(msg->str, errMsg);
+                    MsgPack data = MsgPack::parse(str, errMsg);
                     if (!errMsg.empty())
                     {
                         std::cerr << "Invalid MsgPack response" << std::endl;
@@ -155,13 +160,13 @@ namespace ix
                         std::cerr << "Invalid id" << std::endl;
                     }
                 }
-                else if (msg->type == ix::WebSocketMessageType::Error)
+                else if (messageType == ix::WebSocketMessageType::Error)
                 {
                     ss << "ws_send ";
-                    ss << "Connection error: " << msg->errorInfo.reason      << std::endl;
-                    ss << "#retries: "         << msg->errorInfo.retries     << std::endl;
-                    ss << "Wait time(ms): "    << msg->errorInfo.wait_time   << std::endl;
-                    ss << "HTTP Status: "      << msg->errorInfo.http_status << std::endl;
+                    ss << "Connection error: " << error.reason      << std::endl;
+                    ss << "#retries: "         << error.retries     << std::endl;
+                    ss << "Wait time(ms): "    << error.wait_time   << std::endl;
+                    ss << "HTTP Status: "      << error.http_status << std::endl;
                     log(ss.str());
                 }
                 else
@@ -239,8 +244,8 @@ namespace ix
         MsgPack msg(pdu);
 
         Bench bench("Sending file through websocket");
-        _webSocket.sendBinary(msg.dump(),
-                              [throttle](int current, int total) -> bool
+        _webSocket.send(msg.dump(),
+                        [throttle](int current, int total) -> bool
         {
             std::cout << "ws_send: Step " << current << " out of " << total << std::endl;
 

ws/ws_transfer.cpp

@@ -21,48 +21,52 @@ namespace ix
                       std::shared_ptr<ConnectionState> connectionState)
             {
                 webSocket->setOnMessageCallback(
-                    [webSocket, connectionState, &server](const 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::WebSocketMessageType::Open)
                         {
                             std::cerr << "New connection" << std::endl;
                             std::cerr << "id: " << connectionState->getId() << std::endl;
-                            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::Close)
+                        else if (messageType == ix::WebSocketMessageType::Close)
                         {
                             std::cerr << "Closed connection"
-                                      << " code " << msg->closeInfo.code
-                                      << " reason " << msg->closeInfo.reason << std::endl;
+                                      << " code " << closeInfo.code
+                                      << " reason " << closeInfo.reason << std::endl;
                         }
-                        else if (msg->type == ix::WebSocketMessageType::Error)
+                        else if (messageType == ix::WebSocketMessageType::Error)
                         {
                             std::stringstream ss;
-                            ss << "Connection error: " << msg->errorInfo.reason      << std::endl;
-                            ss << "#retries: "         << msg->errorInfo.retries     << std::endl;
-                            ss << "Wait time(ms): "    << msg->errorInfo.wait_time   << std::endl;
-                            ss << "HTTP Status: "      << msg->errorInfo.http_status << std::endl;
+                            ss << "Connection error: " << error.reason      << std::endl;
+                            ss << "#retries: "         << error.retries     << std::endl;
+                            ss << "Wait time(ms): "    << error.wait_time   << std::endl;
+                            ss << "HTTP Status: "      << error.http_status << std::endl;
                             std::cerr << ss.str();
                         }
-                        else if (msg->type == ix::WebSocketMessageType::Fragment)
+                        else if (messageType == ix::WebSocketMessageType::Fragment)
                         {
                             std::cerr << "Received message fragment "
                                       << std::endl;
                         }
-                        else if (msg->type == ix::WebSocketMessageType::Message)
+                        else if (messageType == ix::WebSocketMessageType::Message)
                         {
-                            std::cerr << "Received " << msg->wireSize << " bytes" << std::endl;
+                            std::cerr << "Received " << wireSize << " bytes" << std::endl;
                             for (auto&& client : server.getClients())
                             {
                                 if (client != webSocket)
                                 {
-                                    client->send(msg->str,
-                                                 msg->binary,
+                                    client->send(str,
                                                  [](int current, int total) -> bool
                                     {
                                         std::cerr << "ws_transfer: Step " << current