ping / pong support / fix bug in dispatching received message type

.clang-format

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

.dockerignore

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

.gitignore

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

.travis.yml

@@ -1,71 +0,0 @@
-language: bash
-
-# See https://github.com/amaiorano/vectrexy/blob/master/.travis.yml
-# for ideas on installing vcpkg
-
-matrix:
-  include:
-    # macOS
-    - os: osx
-      compiler: clang
-      script:
-        - python test/run.py
-        - make ws
-
-    # Linux
-    - os: linux
-      dist: xenial
-      script: 
-        - python test/run.py
-        - make ws
-      env:
-        - CC=gcc
-        - CXX=g++
-
-    # Clang + Linux disabled for now
-    # - os: linux
-    #   dist: xenial
-    #   script: python test/run.py
-    #   env:
-    #     - CC=clang 
-    #     - CXX=clang++
-
-    # Windows
-    - os: windows
-      env:
-        - CMAKE_PATH="/c/Program Files/CMake/bin"
-      script: 
-        - export PATH=$CMAKE_PATH:$PATH
-        - cmake -DUSE_TLS=1 -DUSE_WS=1 -DUSE_MBED_TLS=1 -DUSE_VENDORED_THIRD_PARTY=1 .
-        - cmake --build --parallel .
-        - python test/run.py
-
-install:
-  # HACK: gcc 8.0.1 is missing movdirintrin.h so just download it. We need this for GLM and Vectrexy to build.
-  - sudo wget https://raw.githubusercontent.com/gcc-mirror/gcc/gcc-8-branch/gcc/config/i386/movdirintrin.h -P /usr/lib/gcc/x86_64-linux-gnu/8/include/
-
-  # Create deps dir
-  - mkdir -p ${DEPS_DIR}
-
-  # Set compiler vars
-  - export CC=${CC_COMPILER}
-  - export CXX=${CXX_COMPILER}
-
-  # Install vcpkg and dependencies
-  - |
-    set -e
-    mkdir -p ${DEPS_DIR}/vcpkg
-    pushd ${DEPS_DIR}/vcpkg
-    git init
-    git remote add origin https://github.com/Microsoft/vcpkg.git
-    git fetch origin master
-    git checkout -b master origin/master
-    ./bootstrap-vcpkg.sh
-    # Only build release libs to save time. We inject a new line first since some cmake files don't end with one.
-    echo -e '\nset(VCPKG_BUILD_TYPE release)' >> ./triplets/${VCPKG_TRIPLET}.cmake
-    ./vcpkg install sdl2 sdl2-net glew glm stb imgui
-    popd
-
-cache:
-  directories:
-- ${DEPS_DIR}/vcpkg/installed

CHANGELOG.md

@@ -1,31 +0,0 @@
-# Changelog
-All notable changes to this project will be documented in this file.
-
-## [unreleased] - 2019-06-09
-### Changed
-- 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

@@ -1,125 +1,38 @@
 #
+# cmd_websocket_chat.cpp
 # Author: Benjamin Sergeant
 # Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
 #
 
 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)
+set (CMAKE_CXX_STANDARD 11)
 set (CXX_STANDARD_REQUIRED ON)
 set (CMAKE_CXX_EXTENSIONS OFF)
 
-# -Wshorten-64-to-32 does not work with clang
-if (NOT WIN32)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic")
-endif()
-
-if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshorten-64-to-32")
-endif()
-
 set( IXWEBSOCKET_SOURCES
-    ixwebsocket/IXCancellationRequest.cpp
-    ixwebsocket/IXConnectionState.cpp
-    ixwebsocket/IXDNSLookup.cpp
-    ixwebsocket/IXHttpClient.cpp
-    ixwebsocket/IXNetSystem.cpp
-    ixwebsocket/IXSelectInterrupt.cpp
-    ixwebsocket/IXSelectInterruptFactory.cpp
     ixwebsocket/IXSocket.cpp
-    ixwebsocket/IXSocketConnect.cpp
-    ixwebsocket/IXSocketFactory.cpp
-    ixwebsocket/IXSocketServer.cpp
-    ixwebsocket/IXUrlParser.cpp
     ixwebsocket/IXWebSocket.cpp
-    ixwebsocket/IXWebSocketCloseConstants.cpp
-    ixwebsocket/IXWebSocketHandshake.cpp
-    ixwebsocket/IXWebSocketHttpHeaders.cpp
-    ixwebsocket/IXWebSocketMessageQueue.cpp
-    ixwebsocket/IXWebSocketPerMessageDeflate.cpp
-    ixwebsocket/IXWebSocketPerMessageDeflateCodec.cpp
-    ixwebsocket/IXWebSocketPerMessageDeflateOptions.cpp
-    ixwebsocket/IXWebSocketServer.cpp
     ixwebsocket/IXWebSocketTransport.cpp
-    ixwebsocket/LUrlParser.cpp
 )
 
 set( IXWEBSOCKET_HEADERS
-    ixwebsocket/IXCancellationRequest.h
-    ixwebsocket/IXConnectionState.h
-    ixwebsocket/IXDNSLookup.h
-    ixwebsocket/IXHttpClient.h
-    ixwebsocket/IXNetSystem.h
-    ixwebsocket/IXProgressCallback.h
-    ixwebsocket/IXSelectInterrupt.h
-    ixwebsocket/IXSelectInterruptFactory.h
-    ixwebsocket/IXSetThreadName.h
     ixwebsocket/IXSocket.h
-    ixwebsocket/IXSocketConnect.h
-    ixwebsocket/IXSocketFactory.h
-    ixwebsocket/IXSocketServer.h
-    ixwebsocket/IXUrlParser.h
     ixwebsocket/IXWebSocket.h
-    ixwebsocket/IXWebSocketCloseConstants.h
-    ixwebsocket/IXWebSocketCloseInfo.h
-    ixwebsocket/IXWebSocketErrorInfo.h
-    ixwebsocket/IXWebSocketHandshake.h
-    ixwebsocket/IXWebSocketHttpHeaders.h
-    ixwebsocket/IXWebSocketMessage.h
-    ixwebsocket/IXWebSocketMessageQueue.h
-    ixwebsocket/IXWebSocketMessageType.h
-    ixwebsocket/IXWebSocketOpenInfo.h
-    ixwebsocket/IXWebSocketPerMessageDeflate.h
-    ixwebsocket/IXWebSocketPerMessageDeflateCodec.h
-    ixwebsocket/IXWebSocketPerMessageDeflateOptions.h
-    ixwebsocket/IXWebSocketSendInfo.h
-    ixwebsocket/IXWebSocketServer.h
     ixwebsocket/IXWebSocketTransport.h
-    ixwebsocket/LUrlParser.h
-    ixwebsocket/libwshandshake.hpp
 )
 
-if (UNIX)
-    # Linux, Mac, iOS, Android
-    list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/IXSelectInterruptPipe.cpp )
-    list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/IXSelectInterruptPipe.h )
-endif()
-
-# Platform specific code
-if (APPLE)
-    list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/apple/IXSetThreadName_apple.cpp)
-elseif (WIN32)
-    list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/windows/IXSetThreadName_windows.cpp)
-else()
-    list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/linux/IXSetThreadName_linux.cpp)
-    list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/IXSelectInterruptEventFd.cpp)
-    list( APPEND IXWEBSOCKET_HEADERS ixwebsocket/IXSelectInterruptEventFd.h)
-endif()
-
-if (WIN32)
-  set(USE_MBED_TLS TRUE)
-endif()
-
-set(USE_OPEN_SSL FALSE)
 if (USE_TLS)
     add_definitions(-DIXWEBSOCKET_USE_TLS)
 
-    if (USE_MBED_TLS)
-        add_definitions(-DIXWEBSOCKET_USE_MBED_TLS)
-        list( APPEND IXWEBSOCKET_HEADERS ixwebsocket/IXSocketMbedTLS.h)
-        list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/IXSocketMbedTLS.cpp)
-    elseif (APPLE)
+    if (APPLE)
         list( APPEND IXWEBSOCKET_HEADERS ixwebsocket/IXSocketAppleSSL.h)
         list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/IXSocketAppleSSL.cpp)
     elseif (WIN32)
         list( APPEND IXWEBSOCKET_HEADERS ixwebsocket/IXSocketSChannel.h)
         list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/IXSocketSChannel.cpp)
     else()
-        add_definitions(-DIXWEBSOCKET_USE_OPEN_SSL)
-        set(USE_OPEN_SSL TRUE)
         list( APPEND IXWEBSOCKET_HEADERS ixwebsocket/IXSocketOpenSSL.h)
         list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/IXSocketOpenSSL.cpp)
     endif()
@@ -130,61 +43,7 @@ add_library( ixwebsocket STATIC
     ${IXWEBSOCKET_HEADERS}
 )
 
-if (APPLE AND USE_TLS AND NOT USE_MBED_TLS)
-  target_link_libraries(ixwebsocket "-framework foundation" "-framework security")
-endif()
-
-if (USE_OPEN_SSL)
-  find_package(OpenSSL REQUIRED)
-  add_definitions(${OPENSSL_DEFINITIONS})
-  message(STATUS "OpenSSL: " ${OPENSSL_VERSION})
-  include_directories(${OPENSSL_INCLUDE_DIR})
-  target_link_libraries(ixwebsocket ${OPENSSL_LIBRARIES})
-endif()
-
-if (USE_MBED_TLS)
-  if (USE_VENDORED_THIRD_PARTY)
-    set (ENABLE_PROGRAMS OFF)
-    add_subdirectory(third_party/mbedtls)
-    include_directories(third_party/mbedtls/include)
-
-    target_link_libraries(ixwebsocket mbedtls)
-  else()
-    find_package(MbedTLS REQUIRED)
-    include_directories(${MBEDTLS_INCLUDE_DIRS})
-    target_link_libraries(ixwebsocket ${MBEDTLS_LIBRARIES})
-  endif()
-endif()
-
-find_package(ZLIB REQUIRED)
-if (ZLIB_FOUND)
-  include_directories(${ZLIB_INCLUDE_DIRS})
-  target_link_libraries(ixwebsocket ${ZLIB_LIBRARIES})
-else()
-  add_subdirectory(third_party/zlib)
-  include_directories(third_party/zlib ${CMAKE_CURRENT_BINARY_DIR}/third_party/zlib)
-  target_link_libraries(ixwebsocket zlibstatic wsock32 ws2_32)
-  add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-endif()
-
 set( IXWEBSOCKET_INCLUDE_DIRS
     .
-)
-
-if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-    # Build with Multiple Processes
-    target_compile_options(ixwebsocket PRIVATE /MP)
-endif()
-
-target_include_directories(ixwebsocket PUBLIC ${IXWEBSOCKET_INCLUDE_DIRS})
-
-set_target_properties(ixwebsocket PROPERTIES PUBLIC_HEADER "${IXWEBSOCKET_HEADERS}")
-
-install(TARGETS ixwebsocket
-        ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
-        PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ixwebsocket/
-)
-
-if (USE_WS)
-    add_subdirectory(ws)
-endif()
+    ../../shared/OpenSSL/include)
+target_include_directories( ixwebsocket PUBLIC ${IXWEBSOCKET_INCLUDE_DIRS} )

DOCKER_VERSION

@@ -1 +0,0 @@
-4.0.0

Dockerfile

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

README.md

@@ -1,248 +1,53 @@
 # General
 
-![Alt text](https://travis-ci.org/machinezone/IXWebSocket.svg?branch=master)
-
 ## 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 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
-* Linux
-* Android
-* Windows
+[*WebSocket*](https://en.wikipedia.org/wiki/WebSocket) is a computer communications protocol, providing full-duplex
+communication channels over a single TCP connection. This library provides a C++ library for Websocket communication. The code is derived from [easywsclient](https://github.com/dhbaird/easywsclient).
 
 ## Examples
 
-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.
+The examples folder countains a simple chat program, using a node.js broadcast server.
 
-Here is what the client API looks like.
+Here is what the API looks like.
 
 ```
 ix::WebSocket webSocket;
 
 std::string url("ws://localhost:8080/");
-webSocket.setUrl(url);
-
-// Optional heart beat, sent every 45 seconds when there is not any traffic
-// 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();
+webSocket.configure(url);
 
 // Setup a callback to be fired when a message or an event (open, close, error) is received
 webSocket.setOnMessageCallback(
-    [](const ix::WebSocketMessagePtr& msg)
+    [](ix::WebSocketMessageType messageType, const std::string& str, ix::WebSocketErrorInfo error)
     {
-        if (msg->type == ix::WebSocketMessageType::Message)
+        if (messageType == ix::WebSocket_MessageType_Message)
         {
-            std::cout << msg->str << std::endl;
+            std::cout << str << std::endl;
         }
 });
 
 // Now that our callback is setup, we can start our background thread and receive messages
 webSocket.start();
 
-// Send a message to the server (default to TEXT mode)
+// Send a message to the server
 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");
-
 // ... finally ...
 
 // Stop the connection
 webSocket.stop()
 ```
 
-Here is what the server API looks like. Note that server support is very recent and subject to changes.
-
-```
-// 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);
-
-server.setOnConnectionCallback(
-    [&server](std::shared_ptr<WebSocket> webSocket,
-              std::shared_ptr<ConnectionState> connectionState)
-    {
-        webSocket->setOnMessageCallback(
-            [webSocket, connectionState, &server](const ix::WebSocketMessagePtr msg)
-            {
-                if (msg->type == ix::WebSocketMessageType::Open)
-                {
-                    std::cerr << "New connection" << std::endl;
-
-                    // A connection state object is available, and has a default id
-                    // You can subclass ConnectionState and pass an alternate factory
-                    // to override it. It is useful if you want to store custom
-                    // attributes per connection (authenticated bool flag, attributes, etc...)
-                    std::cerr << "id: " << connectionState->getId() << std::endl;
-
-                    // The uri the client did connect to.
-                    std::cerr << "Uri: " << msg->openInfo.uri << std::endl;
-
-                    std::cerr << "Headers:" << std::endl;
-                    for (auto it : msg->openInfo.headers)
-                    {
-                        std::cerr << it.first << ": " << it.second << std::endl;
-                    }
-                }
-                else if (msg->type == 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);
-                }
-            }
-        );
-    }
-);
-
-auto res = server.listen();
-if (!res.first)
-{
-    // Error handling
-    return 1;
-}
-
-// Run the server in the background. Server can be stoped by calling server.stop()
-server.start();
-
-// Block until server.stop() is called.
-server.wait();
-
-```
-
-Here is what the HTTP client API looks like. Note that HTTP client support is very recent and subject to changes.
-
-```
-//
-// Preparation
-//
-HttpClient httpClient;
-HttpRequestArgsPtr args = httpClient.createRequest();
-
-// Custom headers can be set
-WebSocketHttpHeaders headers;
-headers["Foo"] = "bar";
-args->extraHeaders = headers;
-
-// Timeout options
-args->connectTimeout = connectTimeout;
-args->transferTimeout = transferTimeout;
-
-// Redirect options
-args->followRedirects = followRedirects;
-args->maxRedirects = maxRedirects;
-
-// Misc
-args->compress = compress; // Enable gzip compression
-args->verbose = verbose;
-args->logger = [](const std::string& msg)
-{
-    std::cout << msg;
-};
-
-//
-// Synchronous Request
-//
-HttpResponsePtr out;
-std::string url = "https://www.google.com";
-
-// HEAD request
-out = httpClient.head(url, args);
-
-// GET request
-out = httpClient.get(url, args);
-
-// POST request with parameters
-HttpParameters httpParameters;
-httpParameters["foo"] = "bar";
-out = httpClient.post(url, httpParameters, args);
-
-// POST request with a body
-out = httpClient.post(url, std::string("foo=bar"), args);
-
-//
-// Result
-//
-auto errorCode = response->errorCode; // Can be HttpErrorCode::Ok, HttpErrorCode::UrlMalformed, etc...
-auto errorCode = response->errorCode; // 200, 404, etc...
-auto responseHeaders = response->headers; // All the headers in a special case-insensitive unordered_map of (string, string)
-auto payload = response->payload; // All the bytes from the response as an std::string
-auto errorMsg = response->errorMsg; // Descriptive error message in case of failure
-auto uploadSize = response->uploadSize; // Byte count of uploaded data
-auto downloadSize = response->downloadSize; // Byte count of downloaded data
-
-//
-// Asynchronous Request
-//
-bool async = true;
-HttpClient httpClient(async);
-auto args = httpClient.createRequest(url, HttpClient::kGet);
-
-// Push the request to a queue,
-bool ok = httpClient.performRequest(args, [](const HttpResponsePtr& response)
-    {
-        // This callback execute in a background thread. Make sure you uses appropriate protection such as mutex
-        auto statusCode = response->statusCode; // acess results
-    }
-);
-
-// ok will be false if your httpClient is not async
-```
-
 ## Build
 
-CMakefiles for the library and the examples are available. This library has few dependencies, so it is possible to just add the source files into your project. Otherwise the usual way will suffice.
-
-```
-mkdir build # make a build dir so that you can build out of tree.
-cd build
-cmake ..
-make -j
-make install # will install to /usr/local on Unix, on macOS it is a good idea to sudo chown -R `whoami`:staff /usr/local
-```
-
-Headers and a static library will be installed to the target dir.
-
-A [conan](https://conan.io/) file is available at [conan-IXWebSocket](https://github.com/Zinnion/conan-IXWebSocket).
-
-There is a unittest which can be executed by typing `make test`.
-
-There is a Dockerfile for running some code on Linux. To use docker-compose you must make a docker container first.
-
-```
-$ make docker
-...
-$ docker compose up &
-...
-$ docker exec -it ixwebsocket_ws_1 bash
-app@ca2340eb9106:~$ ws --help
-ws is a websocket tool
-...
-```
-
-Finally you can build and install the `ws command line tool` with Homebrew. The homebrew version might be slightly out of date.
-
-```
-brew tap bsergean/IXWebSocket
-brew install IXWebSocket
-```
+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.
 
 ## Implementation details
 
-### Per Message Deflate compression.
-
-The per message deflate compression option is supported. It can lead to very nice bandbwith savings (20x !) if your messages are similar, which is often the case for example for chat applications. All features of the spec should be supported.
-
 ### TLS/SSL
 
-Connections can be optionally secured and encrypted with TLS/SSL when using a wss:// endpoint, or using normal un-encrypted socket with ws:// endpoints. AppleSSL is used on iOS and macOS, OpenSSL is used on Android and Linux, mbedTLS is used on Windows.
+Connections can be optionally secured and encrypted with TLS/SSL when using a wss:// endpoint, or using normal un-encrypted socket with ws:// endpoints. AppleSSL is used on iOS and macOS, and OpenSSL is used on Android and Linux.
 
 ### Polling and background thread work
 
@@ -250,57 +55,44 @@ 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.
-
-### Large messages
-
-Large frames are broken up into smaller chunks or messages to avoid filling up the os tcp buffers, which is permitted thanks to WebSocket [fragmentation](https://tools.ietf.org/html/rfc6455#section-5.4). Messages up to 1G were sent and received succesfully.
+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.
 
 ## Limitations
 
-* On Windows TLS is not setup yet to validate certificates.
-* There is no convenient way to embed a ca cert.
-* No utf-8 validation is made when sending TEXT message with sendText()
+* There is no per message compression support. That could be useful for retrieving large messages, but could also be implemented at the application level.
+* There is no text support for sending data, only the binary protocol is supported. Sending json or text over the binary protocol works well.
 * Automatic reconnection works at the TCP socket level, and will detect remote end disconnects. However, if the device/computer network become unreachable (by turning off wifi), it is quite hard to reliably and timely detect it at the socket level using `recv` and `send` error codes. [Here](https://stackoverflow.com/questions/14782143/linux-socket-how-to-detect-disconnected-network-in-a-client-program) is a good discussion on the subject. This behavior is consistent with other runtimes such as node.js. One way to detect a disconnected device with low level C code is to do a name resolution with DNS but this can be expensive. Mobile devices have good and reliable API to do that.
-* The server code is using select to detect incoming data, and creates one OS thread per connection. This is not as scalable as strategies using epoll or kqueue.
+
+## Examples
+
+1. Bring up a terminal and jump to the examples folder.
+2. Compile the example C++ code. `sh build.sh`
+3. Install node.js from [here](https://nodejs.org/en/download/).
+4. Type `npm install` to install the node.js dependencies. Then `node broadcast-server.js` to run the server.
+5. Bring up a second terminal. `./cmd_websocket_chat bob`
+6. Bring up a third terminal. `./cmd_websocket_chat bill`
+7. Start typing things in any of those terminals. Hopefully you should see your message being received on the other end.
 
 ## C++ code organization
 
-Here is a simplistic diagram which explains how the code is structured in term of class/modules.
+Here's a simplistic diagram which explains how the code is structured in term of class/modules.
 
 ```
-+-----------------------+ --- Public
++-----------------------+
 |                       | Start the receiving Background thread. Auto reconnection. Simple websocket Ping.
 |  IXWebSocket          | Interface used by C++ test clients. No IX dependencies.
-|                       |
+|                       | 
 +-----------------------+
 |                       |
-|  IXWebSocketServer    | Run a server and give each connections its own WebSocket object.
-|                       | Each connection is handled in a new OS thread.
-|                       |
-+-----------------------+ --- Private
-|                       |
 |  IXWebSocketTransport | Low level websocket code, framing, managing raw socket. Adapted from easywsclient.
 |                       |
 +-----------------------+
 |                       |
-|  IXWebSocketHandshake | Establish the connection between client and server.
-|                       |
-+-----------------------+
-|                       |
 |  IXWebSocket          | ws://  Unencrypted Socket handler
 |  IXWebSocketAppleSSL  | wss:// TLS encrypted Socket AppleSSL handler. Used on iOS and macOS
 |  IXWebSocketOpenSSL   | wss:// TLS encrypted Socket OpenSSL handler.  Used on Android and Linux
 |                       |                                               Can be used on macOS too.
 +-----------------------+
-|                       |
-|  IXSocketConnect      | Connect to the remote host (client).
-|                       |
-+-----------------------+
-|                       |
-|  IXDNSLookup          | Does DNS resolution asynchronously so that it can be interrupted.
-|                       |
-+-----------------------+
 ```
 
 ## API
@@ -315,10 +107,10 @@ If the connection was closed and sending failed, the return value will be set to
 
 `getReadyState()` returns the state of the connection. There are 4 possible states.
 
-1. ReadyState::Connecting - The connection is not yet open.
-2. ReadyState::Open       - The connection is open and ready to communicate.
-3. ReadyState::Closing    - The connection is in the process of closing.
-4. ReadyState::Closed     - The connection is closed or could not be opened.
+1. WebSocket_ReadyState_Connecting - The connection is not yet open.
+2. WebSocket_ReadyState_Open       - The connection is open and ready to communicate.
+3. WebSocket_ReadyState_Closing    - The connection is in the process of closing.
+4. WebSocket_MessageType_Close     - The connection is closed or couldn't be opened.
 
 ### Open and Close notifications
 
@@ -326,27 +118,15 @@ The onMessage event will be fired when the connection is opened or closed. This
 
 ```
 webSocket.setOnMessageCallback(
-    [](const ix::WebSocketMessagePtr& msg)
+    [this](ix::WebSocketMessageType messageType, const std::string& str, ix::WebSocketErrorInfo error)
     {
-        if (msg->type == ix::WebSocketMessageType::Open)
+        if (messageType == ix::WebSocket_MessageType_Open)
         {
-            std::cout << "send greetings" << std::endl;
-
-            // Headers can be inspected (pairs of string/string)
-            std::cout << "Handshake Headers:" << std::endl;
-            for (auto it : msg->headers)
-            {
-                std::cout << it.first << ": " << it.second << std::endl;
-            }
+            puts("send greetings");
         }
-        else if (msg->type == ix::WebSocketMessageType::Close)
+        else if (messageType == ix::WebSocket_MessageType_Close)
         {
-            std::cout << "disconnected" << std::endl;
-
-            // The server can send an explicit code and reason for closing.
-            // This data can be accessed through the closeInfo object.
-            std::cout << msg->closeInfo.code << std::endl;
-            std::cout << msg->closeInfo.reason << std::endl;
+            puts("disconnected");
         }
     }
 );
@@ -354,19 +134,19 @@ webSocket.setOnMessageCallback(
 
 ### Error notification
 
-A message will be fired when there is an error with the connection. The message type will be `ix::WebSocketMessageType::Error`. Multiple fields will be available on the event to describe the error.
+A message will be fired when there is an error with the connection. The message type will be `ix::WebSocket_MessageType_Error`. Multiple fields will be available on the event to describe the error.
 
 ```
 webSocket.setOnMessageCallback(
-    [](const ix::WebSocketMessagePtr& msg)
+    [this](ix::WebSocketMessageType messageType, const std::string& str, ix::WebSocketErrorInfo error)
     {
-        if (msg->type == ix::WebSocketMessageType::Error)
+        if (messageType == ix::WebSocket_MessageType_Error)
         {
             std::stringstream ss;
-            ss << "Error: "         << msg->errorInfo.reason      << std::endl;
-            ss << "#retries: "      << msg->eventInfo.retries     << std::endl;
-            ss << "Wait time(ms): " << msg->eventInfo.wait_time   << std::endl;
-            ss << "HTTP Status: "   << msg->eventInfo.http_status << std::endl;
+            ss << "Error: "         << error.reason      << std::endl;
+            ss << "#retries: "      << event.retries     << std::endl;
+            ss << "Wait time(ms): " << event.wait_time   << std::endl;
+            ss << "HTTP Status: "   << event.http_status << std::endl;
             std::cout << ss.str() << std::endl;
         }
     }
@@ -386,36 +166,3 @@ The url can be set and queried after a websocket object has been created. You wi
 std::string url("wss://example.com");
 websocket.configure(url);
 ```
-
-### Ping/Pong support
-
-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)
-    {
-        if (msg->type == ix::WebSocketMessageType::Ping ||
-            msg->type == ix::WebSocketMessageType::Pong)
-        {
-            std::cout << "pong data: " << msg->str << std::endl;
-        }
-    }
-);
-```
-
-A ping message can be sent to the server, with an optional data string.
-
-```
-websocket.ping("ping data, optional (empty string is ok): limited to 125 bytes long");
-```
-
-### Heartbeat.
-
-You can configure an optional heart beat / keep-alive, sent every 45 seconds
-when there is no any traffic to make sure that load balancers do not kill an
-idle connection.
-
-```
-webSocket.setHeartBeatPeriod(45);
-```

appveyor.yml

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

docker-compose.yml

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

docker/Dockerfile.alpine

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

docker/Dockerfile.debian

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

docker/Dockerfile.fedora

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

docker/Dockerfile.ubuntu_bionic

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

docker/Dockerfile.ubuntu_xenial

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

examples/chat/CMakeLists.txt

@@ -0,0 +1,28 @@
+#
+# cmd_websocket_chat.cpp
+# Author: Benjamin Sergeant
+# Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
+#
+
+cmake_minimum_required (VERSION 3.4.1)
+project (cmd_websocket_chat)
+
+set (CMAKE_CXX_STANDARD 11)
+
+option(USE_TLS "Add TLS support" ON)
+
+add_subdirectory(${PROJECT_SOURCE_DIR}/../.. ixwebsocket)
+
+add_executable(cmd_websocket_chat cmd_websocket_chat.cpp)
+
+if (APPLE AND USE_TLS)
+    target_link_libraries(cmd_websocket_chat "-framework foundation" "-framework security")
+endif()
+
+if (WIN32)
+    target_link_libraries(cmd_websocket_chat wsock32 ws2_32)
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+endif()
+
+target_link_libraries(cmd_websocket_chat ixwebsocket)
+install(TARGETS cmd_websocket_chat DESTINATION bin)

examples/chat/README.md

@@ -0,0 +1,39 @@
+# Building
+
+1. cmake -G .
+2. make
+
+## Disable TLS
+
+chat$ cmake -DUSE_TLS=OFF .
+-- Configuring done
+-- Generating done
+-- Build files have been written to: /Users/bsergeant/src/foss/ixwebsocket/examples/chat
+chat$ make
+Scanning dependencies of target ixwebsocket
+[ 16%] Building CXX object ixwebsocket/CMakeFiles/ixwebsocket.dir/ixwebsocket/IXSocket.cpp.o
+[ 33%] Building CXX object ixwebsocket/CMakeFiles/ixwebsocket.dir/ixwebsocket/IXWebSocket.cpp.o
+[ 50%] Building CXX object ixwebsocket/CMakeFiles/ixwebsocket.dir/ixwebsocket/IXWebSocketTransport.cpp.o
+[ 66%] Linking CXX static library libixwebsocket.a
+[ 66%] Built target ixwebsocket
+[ 83%] Linking CXX executable cmd_websocket_chat
+[100%] Built target cmd_websocket_chat
+
+## Enable TLS (default)
+
+```
+chat$ cmake -DUSE_TLS=ON .
+-- Configuring done
+-- Generating done
+-- Build files have been written to: /Users/bsergeant/src/foss/ixwebsocket/examples/chat
+(venv) chat$ make
+Scanning dependencies of target ixwebsocket
+[ 14%] Building CXX object ixwebsocket/CMakeFiles/ixwebsocket.dir/ixwebsocket/IXSocket.cpp.o
+[ 28%] Building CXX object ixwebsocket/CMakeFiles/ixwebsocket.dir/ixwebsocket/IXWebSocket.cpp.o
+[ 42%] Building CXX object ixwebsocket/CMakeFiles/ixwebsocket.dir/ixwebsocket/IXWebSocketTransport.cpp.o
+[ 57%] Building CXX object ixwebsocket/CMakeFiles/ixwebsocket.dir/ixwebsocket/IXSocketAppleSSL.cpp.o
+[ 71%] Linking CXX static library libixwebsocket.a
+[ 71%] Built target ixwebsocket
+[ 85%] Linking CXX executable cmd_websocket_chat
+[100%] Built target cmd_websocket_chat
+```

examples/chat/broadcast-server.js

@@ -1,11 +1,11 @@
 /*
- *  broadcast-server.js
+ *  cmd_websocket_chat.cpp
  *  Author: Benjamin Sergeant
  *  Copyright (c) 2017-2018 Machine Zone, Inc. All rights reserved.
  */
 const WebSocket = require('ws');
 
-const wss = new WebSocket.Server({ port: 8080, perMessageDeflate: true });
+const wss = new WebSocket.Server({ port: 8080 });
 
 // Broadcast to all.
 wss.broadcast = function broadcast(data) {

examples/chat/build_macos.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+# Author: Benjamin Sergeant
+# Copyright (c) 2017-2018 Machine Zone, Inc. All rights reserved.
+#
+
+# 'manual' way of building. You can also use cmake.
+
+clang++ --std=c++11 --stdlib=libc++ \
+    ../../ixwebsocket/IXSocket.cpp	\
+    ../../ixwebsocket/IXWebSocketTransport.cpp \
+    ../../ixwebsocket/IXSocketAppleSSL.cpp	\
+    ../../ixwebsocket/IXWebSocket.cpp \
+    cmd_websocket_chat.cpp \
+    -o cmd_websocket_chat \
+    -framework Security \
+    -framework Foundation

examples/chat/cmd_websocket_chat.cpp

@@ -1,12 +1,12 @@
 /*
- *  ws_chat.cpp
+ *  cmd_websocket_chat.cpp
  *  Author: Benjamin Sergeant
- *  Copyright (c) 2017-2019 Machine Zone, Inc. All rights reserved.
+ *  Copyright (c) 2017-2018 Machine Zone, Inc. All rights reserved.
  */
 
 //
-// Simple chat program that talks to a broadcast server
-// Broadcast server can be ran with `ws broadcast_server`
+// Simple chat program that talks to the node.js server at
+// websocket_chat_server/broacast-server.js
 //
 
 #include <iostream>
@@ -20,13 +20,19 @@
 // for convenience
 using json = nlohmann::json;
 
-namespace ix
+using namespace ix;
+
+namespace
 {
+    void log(const std::string& msg)
+    {
+        std::cout << msg << std::endl;
+    }
+
     class WebSocketChat
     {
         public:
-            WebSocketChat(const std::string& url,
-                          const std::string& user);
+            WebSocketChat(const std::string& user);
 
             void subscribe(const std::string& channel);
             void start();
@@ -40,27 +46,19 @@ namespace ix
             std::pair<std::string, std::string> decodeMessage(const std::string& str);
 
         private:
-            std::string _url;
             std::string _user;
-            ix::WebSocket _webSocket;
-            std::queue<std::string> _receivedQueue;
 
-            void log(const std::string& msg);
+            ix::WebSocket _webSocket;
+
+            std::queue<std::string> _receivedQueue;
     };
 
-    WebSocketChat::WebSocketChat(const std::string& url,
-                                 const std::string& user) :
-        _url(url),
+    WebSocketChat::WebSocketChat(const std::string& user) :
         _user(user)
     {
         ;
     }
 
-    void WebSocketChat::log(const std::string& msg)
-    {
-        std::cout << msg << std::endl;
-    }
-
     size_t WebSocketChat::getReceivedMessagesCount() const
     {
         return _receivedQueue.size();
@@ -68,7 +66,7 @@ namespace ix
 
     bool WebSocketChat::isReady() const
     {
-        return _webSocket.getReadyState() == ix::ReadyState::Open;
+        return _webSocket.getReadyState() == ix::WebSocket_ReadyState_Open;
     }
 
     void WebSocketChat::stop()
@@ -78,42 +76,33 @@ namespace ix
 
     void WebSocketChat::start()
     {
-        _webSocket.setUrl(_url);
+        std::string url("ws://localhost:8080/");
+        _webSocket.configure(url);
 
         std::stringstream ss;
-        log(std::string("Connecting to url: ") + _url);
+        log(std::string("Connecting to url: ") + url);
 
         _webSocket.setOnMessageCallback(
-            [this](const WebSocketMessagePtr& msg)
+            [this](ix::WebSocketMessageType messageType, const std::string& str, ix::WebSocketErrorInfo error)
             {
                 std::stringstream ss;
-                if (msg->type == ix::WebSocketMessageType::Open)
+                if (messageType == ix::WebSocket_MessageType_Open)
                 {
-                    log("ws chat: connected");
-                    std::cout << "Uri: " << msg->openInfo.uri << std::endl;
-                    std::cout << "Handshake Headers:" << std::endl;
-                    for (auto it : msg->openInfo.headers)
-                    {
-                        std::cout << it.first << ": " << it.second << std::endl;
-                    }
-
-                    ss << "ws chat: user "
+                    ss << "cmd_websocket_chat: user "
                        << _user
                        << " Connected !";
                        log(ss.str());
                 }
-                else if (msg->type == ix::WebSocketMessageType::Close)
+                else if (messageType == ix::WebSocket_MessageType_Close)
                 {
-                    ss << "ws chat: user "
+                    ss << "cmd_websocket_chat: user "
                        << _user
-                       << " disconnected !"
-                       << " code " << msg->closeInfo.code
-                       << " reason " << msg->closeInfo.reason;
+                       << " disconnected !";
                        log(ss.str());
                 }
-                else if (msg->type == ix::WebSocketMessageType::Message)
+                else if (messageType == ix::WebSocket_MessageType_Message)
                 {
-                    auto result = decodeMessage(msg->str);
+                    auto result = decodeMessage(str);
 
                     // Our "chat" / "broacast" node.js server does not send us
                     // the messages we send, so we don't have to filter it out.
@@ -121,18 +110,18 @@ namespace ix
                     // store text
                     _receivedQueue.push(result.second);
 
-                    ss << std::endl
-                       << result.first << "(" << msg->wireSize << " bytes)" << " > " << result.second
+                    ss << std::endl 
+                       << result.first << " > " << result.second
                        << std::endl
                        << _user << " > ";
                     log(ss.str());
                 }
-                else if (msg->type == ix::WebSocketMessageType::Error)
+                else if (messageType == ix::WebSocket_MessageType_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,14 +156,13 @@ 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,
-                     const std::string& user)
+    void interactiveMain(const std::string& user)
     {
         std::cout << "Type Ctrl-D to exit prompt..." << std::endl;
-        WebSocketChat webSocketChat(url, user);
+        WebSocketChat webSocketChat(user);
         webSocketChat.start();
 
         while (true)
@@ -193,7 +181,18 @@ namespace ix
 
         std::cout << std::endl;
         webSocketChat.stop();
-
-        return 0;
     }
 }
+
+int main(int argc, char** argv)
+{
+    std::string user("user");
+    if (argc == 2)
+    {
+        user = argv[1];
+    }
+
+    Socket::init();
+    interactiveMain(user);
+    return 0;
+}

examples/chat/package.json

@@ -0,0 +1,6 @@
+{
+  "dependencies": {
+    "msgpack-js": "^0.3.0",
+    "ws": "^3.1.0"
+  }
+}

examples/ping_pong/.gitignore

@@ -0,0 +1 @@
+venv

examples/ping_pong/CMakeLists.txt

@@ -0,0 +1,27 @@
+#
+# Author: Benjamin Sergeant
+# Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
+#
+
+cmake_minimum_required (VERSION 3.4.1)
+project (ping_pong)
+
+set (CMAKE_CXX_STANDARD 11)
+
+option(USE_TLS "Add TLS support" ON)
+
+add_subdirectory(${PROJECT_SOURCE_DIR}/../.. ixwebsocket)
+
+add_executable(ping_pong ping_pong.cpp)
+
+if (APPLE AND USE_TLS)
+    target_link_libraries(ping_pong "-framework foundation" "-framework security")
+endif()
+
+if (WIN32)
+    target_link_libraries(ping_pong wsock32 ws2_32)
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+endif()
+
+target_link_libraries(ping_pong ixwebsocket)
+install(TARGETS ping_pong DESTINATION bin)

examples/ping_pong/client.py

@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+
+import asyncio
+import websockets
+
+async def hello(uri):
+    async with websockets.connect(uri) as websocket:
+        await websocket.send("Hello world!")
+        response = await websocket.recv()
+        print(response)
+
+        pong_waiter = await websocket.ping('coucou')
+        ret = await pong_waiter   # only if you want to wait for the pong
+        print(ret)
+
+asyncio.get_event_loop().run_until_complete(
+    hello('ws://localhost:5678'))

examples/ping_pong/ping_pong.cpp

@@ -0,0 +1,145 @@
+/*
+ *  ws_connect.cpp
+ *  Author: Benjamin Sergeant
+ *  Copyright (c) 2017-2018 Machine Zone, Inc. All rights reserved.
+ */
+
+#include <iostream>
+#include <sstream>
+#include <ixwebsocket/IXWebSocket.h>
+#include <ixwebsocket/IXSocket.h>
+
+using namespace ix;
+
+namespace
+{
+    void log(const std::string& msg)
+    {
+        std::cout << msg << std::endl;
+    }
+
+    class WebSocketPingPong
+    {
+        public:
+            WebSocketPingPong(const std::string& _url);
+
+            void subscribe(const std::string& channel);
+            void start();
+            void stop();
+
+            void ping(const std::string& text);
+
+        private:
+            std::string _url;
+            ix::WebSocket _webSocket;
+    };
+
+    WebSocketPingPong::WebSocketPingPong(const std::string& url) :
+        _url(url)
+    {
+        ;
+    }
+
+    void WebSocketPingPong::stop()
+    {
+        _webSocket.stop();
+    }
+
+    void WebSocketPingPong::start()
+    {
+        _webSocket.configure(_url);
+
+        std::stringstream ss;
+        log(std::string("Connecting to url: ") + _url);
+
+        _webSocket.setOnMessageCallback(
+            [this](ix::WebSocketMessageType messageType, const std::string& str, ix::WebSocketErrorInfo error)
+            {
+                std::stringstream ss;
+                if (messageType == ix::WebSocket_MessageType_Open)
+                {
+                    log("ws_connect: connected");
+                }
+                else if (messageType == ix::WebSocket_MessageType_Close)
+                {
+                    log("ws_connect: disconnected");
+                }
+                else if (messageType == ix::WebSocket_MessageType_Message)
+                {
+                    ss << "ws_connect: received message: "
+                       << str;
+                    log(ss.str());
+                }
+                else if (messageType == ix::WebSocket_MessageType_Ping)
+                {
+                    ss << "ws_connect: received ping message: "
+                       << str;
+                    log(ss.str());
+                }
+                else if (messageType == ix::WebSocket_MessageType_Pong)
+                {
+                    ss << "ws_connect: received pong message: "
+                       << str;
+                    log(ss.str());
+                }
+                else if (messageType == ix::WebSocket_MessageType_Error)
+                {
+                    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
+                {
+                    ss << "Invalid ix::WebSocketMessageType";
+                    log(ss.str());
+                }
+            });
+
+        _webSocket.start();
+    }
+
+    void WebSocketPingPong::ping(const std::string& text)
+    {
+        _webSocket.ping(text);
+    }
+
+    void interactiveMain(const std::string& url)
+    {
+        std::cout << "Type Ctrl-D to exit prompt..." << std::endl;
+        WebSocketPingPong webSocketPingPong(url);
+        webSocketPingPong.start();
+
+        while (true)
+        {
+            std::string text;
+            std::cout << "> " << std::flush;
+            std::getline(std::cin, text);
+
+            if (!std::cin)
+            {
+                break;
+            }
+
+            webSocketPingPong.ping(text);
+        }
+
+        std::cout << std::endl;
+        webSocketPingPong.stop();
+    }
+}
+
+int main(int argc, char** argv)
+{
+    if (argc != 2)
+    {
+        std::cerr << "Usage: ping_pong <url>" << std::endl;
+        return 1;
+    }
+    std::string url = argv[1];
+
+    Socket::init();
+    interactiveMain(url);
+    return 0;
+}

examples/ping_pong/server.py

@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+
+import asyncio
+import websockets
+
+async def echo(websocket, path):
+    async for message in websocket:
+        print(message)
+        await websocket.send(message)
+
+asyncio.get_event_loop().run_until_complete(
+    websockets.serve(echo, 'localhost', 5678))
+asyncio.get_event_loop().run_forever()

examples/ping_pong/test.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+test -d build || {
+    mkdir -p build
+    cd build
+    cmake ..
+}
+(cd build ; make)
+./build/ping_pong ws://localhost:5678

examples/ws_connect/CMakeLists.txt

@@ -0,0 +1,27 @@
+#
+# Author: Benjamin Sergeant
+# Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
+#
+
+cmake_minimum_required (VERSION 3.4.1)
+project (ws_connect)
+
+set (CMAKE_CXX_STANDARD 11)
+
+option(USE_TLS "Add TLS support" ON)
+
+add_subdirectory(${PROJECT_SOURCE_DIR}/../.. ixwebsocket)
+
+add_executable(ws_connect ws_connect.cpp)
+
+if (APPLE AND USE_TLS)
+    target_link_libraries(ws_connect "-framework foundation" "-framework security")
+endif()
+
+if (WIN32)
+    target_link_libraries(ws_connect wsock32 ws2_32)
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+endif()
+
+target_link_libraries(ws_connect ixwebsocket)
+install(TARGETS ws_connect DESTINATION bin)

examples/ws_connect/README.md

@@ -0,0 +1,11 @@
+# Building
+
+1. mkdir build
+2. cd build
+3. cmake ..
+4. make
+
+## Disable TLS
+
+* Enable: `cmake -DUSE_TLS=OFF ..`
+* Disable: `cmake -DUSE_TLS=ON ..`

examples/ws_connect/ws_connect.cpp

@@ -0,0 +1,133 @@
+/*
+ *  ws_connect.cpp
+ *  Author: Benjamin Sergeant
+ *  Copyright (c) 2017-2018 Machine Zone, Inc. All rights reserved.
+ */
+
+#include <iostream>
+#include <sstream>
+#include <ixwebsocket/IXWebSocket.h>
+#include <ixwebsocket/IXSocket.h>
+
+using namespace ix;
+
+namespace
+{
+    void log(const std::string& msg)
+    {
+        std::cout << msg << std::endl;
+    }
+
+    class WebSocketConnect
+    {
+        public:
+            WebSocketConnect(const std::string& _url);
+
+            void subscribe(const std::string& channel);
+            void start();
+            void stop();
+
+            void sendMessage(const std::string& text);
+
+        private:
+            std::string _url;
+            ix::WebSocket _webSocket;
+    };
+
+    WebSocketConnect::WebSocketConnect(const std::string& url) :
+        _url(url)
+    {
+        ;
+    }
+
+    void WebSocketConnect::stop()
+    {
+        _webSocket.stop();
+    }
+
+    void WebSocketConnect::start()
+    {
+        _webSocket.configure(_url);
+
+        std::stringstream ss;
+        log(std::string("Connecting to url: ") + _url);
+
+        _webSocket.setOnMessageCallback(
+            [this](ix::WebSocketMessageType messageType, const std::string& str, ix::WebSocketErrorInfo error)
+            {
+                std::stringstream ss;
+                if (messageType == ix::WebSocket_MessageType_Open)
+                {
+                    log("ws_connect: connected");
+                }
+                else if (messageType == ix::WebSocket_MessageType_Close)
+                {
+                    log("ws_connect: disconnected");
+                }
+                else if (messageType == ix::WebSocket_MessageType_Message)
+                {
+                    ss << "ws_connect: received message: "
+                       << str;
+                    log(ss.str());
+                }
+                else if (messageType == ix::WebSocket_MessageType_Error)
+                {
+                    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
+                {
+                    ss << "Invalid ix::WebSocketMessageType";
+                    log(ss.str());
+                }
+            });
+
+        _webSocket.start();
+    }
+
+    void WebSocketConnect::sendMessage(const std::string& text)
+    {
+        _webSocket.send(text);
+    }
+
+    void interactiveMain(const std::string& url)
+    {
+        std::cout << "Type Ctrl-D to exit prompt..." << std::endl;
+        WebSocketConnect webSocketChat(url);
+        webSocketChat.start();
+
+        while (true)
+        {
+            std::string text;
+            std::cout << "> " << std::flush;
+            std::getline(std::cin, text);
+
+            if (!std::cin)
+            {
+                break;
+            }
+
+            webSocketChat.sendMessage(text);
+        }
+
+        std::cout << std::endl;
+        webSocketChat.stop();
+    }
+}
+
+int main(int argc, char** argv)
+{
+    if (argc != 2)
+    {
+        std::cerr << "Usage: ws_connect <url>" << std::endl;
+        return 1;
+    }
+    std::string url = argv[1];
+
+    Socket::init();
+    interactiveMain(url);
+    return 0;
+}

ixwebsocket/IXCancellationRequest.cpp

@@ -1,33 +0,0 @@
-/*
- *  IXCancellationRequest.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXCancellationRequest.h"
-
-#include <chrono>
-
-namespace ix
-{
-    CancellationRequest makeCancellationRequestWithTimeout(int secs,
-                                                           std::atomic<bool>& requestInitCancellation)
-    {
-        auto start = std::chrono::system_clock::now();
-        auto timeout = std::chrono::seconds(secs);
-
-        auto isCancellationRequested = [&requestInitCancellation, start, timeout]() -> bool
-        {
-            // Was an explicit cancellation requested ?
-            if (requestInitCancellation) return true;
-
-            auto now = std::chrono::system_clock::now();
-            if ((now - start) > timeout) return true;
-
-            // No cancellation request
-            return false;
-        };
-
-        return isCancellationRequested;
-    }
-}

ixwebsocket/IXCancellationRequest.h

@@ -1,18 +0,0 @@
-/*
- *  IXCancellationRequest.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include <atomic>
-#include <functional>
-
-namespace ix
-{
-    using CancellationRequest = std::function<bool()>;
-
-    CancellationRequest makeCancellationRequestWithTimeout(
-        int seconds, std::atomic<bool>& requestInitCancellation);
-} // namespace ix

ixwebsocket/IXConnectionState.cpp

@@ -1,43 +0,0 @@
-/*
- *  IXConnectionState.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXConnectionState.h"
-
-namespace ix
-{
-    std::atomic<uint64_t> ConnectionState::_globalId(0);
-
-    ConnectionState::ConnectionState() : _terminated(false)
-    {
-        computeId();
-    }
-
-    void ConnectionState::computeId()
-    {
-        _id = std::to_string(_globalId++);
-    }
-
-    const std::string& ConnectionState::getId() const
-    {
-        return _id;
-    }
-
-    std::shared_ptr<ConnectionState> ConnectionState::createConnectionState()
-    {
-        return std::make_shared<ConnectionState>();
-    }
-
-    bool ConnectionState::isTerminated() const
-    {
-        return _terminated;
-    }
-
-    void ConnectionState::setTerminated()
-    {
-        _terminated = true;
-    }
-}
-

ixwebsocket/IXConnectionState.h

@@ -1,36 +0,0 @@
-/*
- *  IXConnectionState.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include <atomic>
-#include <memory>
-#include <stdint.h>
-#include <string>
-
-namespace ix
-{
-    class ConnectionState
-    {
-    public:
-        ConnectionState();
-        virtual ~ConnectionState() = default;
-
-        virtual void computeId();
-        virtual const std::string& getId() const;
-
-        void setTerminated();
-        bool isTerminated() const;
-
-        static std::shared_ptr<ConnectionState> createConnectionState();
-
-    protected:
-        std::atomic<bool> _terminated;
-        std::string _id;
-
-        static std::atomic<uint64_t> _globalId;
-    };
-} // namespace ix

ixwebsocket/IXDNSLookup.cpp

@@ -1,201 +0,0 @@
-/*
- *  IXDNSLookup.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXDNSLookup.h"
-#include "IXNetSystem.h"
-
-#include <string.h>
-#include <chrono>
-
-namespace ix
-{
-    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) :
-        _port(port),
-        _wait(wait),
-        _res(nullptr),
-        _done(false),
-        _id(_nextId++)
-    {
-        setHostname(hostname);
-    }
-
-    DNSLookup::~DNSLookup()
-    {
-        // Remove this job from the active jobs list
-        std::lock_guard<std::mutex> lock(_activeJobsMutex);
-        _activeJobs.erase(_id);
-    }
-
-    struct addrinfo* DNSLookup::getAddrInfo(const std::string& hostname,
-                                            int port,
-                                            std::string& errMsg)
-    {
-        struct addrinfo hints;
-        memset(&hints, 0, sizeof(hints));
-        hints.ai_flags = AI_ADDRCONFIG | AI_NUMERICSERV;
-        hints.ai_family = AF_UNSPEC;
-        hints.ai_socktype = SOCK_STREAM;
-
-        std::string sport = std::to_string(port);
-
-        struct addrinfo* res;
-        int getaddrinfo_result = getaddrinfo(hostname.c_str(), sport.c_str(),
-                                             &hints, &res);
-        if (getaddrinfo_result)
-        {
-            errMsg = gai_strerror(getaddrinfo_result);
-            res = nullptr;
-        }
-        return res;
-    }
-
-    struct addrinfo* DNSLookup::resolve(std::string& errMsg,
-                                        const CancellationRequest& isCancellationRequested,
-                                        bool blocking)
-    {
-        return blocking ? resolveBlocking(errMsg, isCancellationRequested)
-                        : resolveAsync(errMsg, isCancellationRequested);
-    }
-
-    struct addrinfo* DNSLookup::resolveBlocking(std::string& errMsg,
-                                                const CancellationRequest& isCancellationRequested)
-    {
-        errMsg = "no error";
-
-        // Maybe a cancellation request got in before the background thread terminated ?
-        if (isCancellationRequested && isCancellationRequested())
-        {
-            errMsg = "cancellation requested";
-            return nullptr;
-        }
-
-        return getAddrInfo(getHostname(), _port, errMsg);
-    }
-
-    struct addrinfo* DNSLookup::resolveAsync(std::string& errMsg,
-                                             const CancellationRequest& isCancellationRequested)
-    {
-        errMsg = "no error";
-
-        // Can only be called once, otherwise we would have to manage a pool
-        // of background thread which is overkill for our usage.
-        if (_done)
-        {
-            return nullptr; // programming error, create a second DNSLookup instance
-                            // 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
-        //
-        _thread = std::thread(&DNSLookup::run, this, _id, getHostname(), _port);
-        _thread.detach();
-
-        std::unique_lock<std::mutex> lock(_conditionVariableMutex);
-
-        while (!_done)
-        {
-            // 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())
-            {
-                errMsg = "cancellation requested";
-                return nullptr;
-            }
-        }
-
-        // Maybe a cancellation request got in before the bg terminated ?
-        if (isCancellationRequested && isCancellationRequested())
-        {
-            errMsg = "cancellation requested";
-            return nullptr;
-        }
-
-        errMsg = getErrMsg();
-        return getRes();
-    }
-
-    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
-        // getAddrInfo needs to work.
-        std::string errMsg;
-        struct addrinfo* res = getAddrInfo(hostname, port, errMsg);
-
-        // if this isn't an active job, and the control thread is gone
-        // there is nothing to do, and we don't want to touch the defunct
-        // object data structure such as _errMsg or _condition
-        std::lock_guard<std::mutex> lock(_activeJobsMutex);
-        if (_activeJobs.count(id) == 0)
-        {
-            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)
-    {
-        std::lock_guard<std::mutex> lock(_errMsgMutex);
-        _errMsg = errMsg;
-    }
-
-    const std::string& DNSLookup::getErrMsg()
-    {
-        std::lock_guard<std::mutex> lock(_errMsgMutex);
-        return _errMsg;
-    }
-
-    void DNSLookup::setRes(struct addrinfo* addr)
-    {
-        std::lock_guard<std::mutex> lock(_resMutex);
-        _res = addr;
-    }
-
-    struct addrinfo* DNSLookup::getRes()
-    {
-        std::lock_guard<std::mutex> lock(_resMutex);
-        return _res;
-    }
-}

ixwebsocket/IXDNSLookup.h

@@ -1,79 +0,0 @@
-/*
- *  IXDNSLookup.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
- *
- *  Resolve a hostname+port to a struct addrinfo obtained with getaddrinfo
- *  Does this in a background thread so that it can be cancelled, since
- *  getaddrinfo is a blocking call, and we don't want to block the main thread on Mobile.
- */
-
-#pragma once
-
-#include "IXCancellationRequest.h"
-#include <atomic>
-#include <condition_variable>
-#include <set>
-#include <string>
-#include <thread>
-
-struct addrinfo;
-
-namespace ix
-{
-    class DNSLookup
-    {
-    public:
-        DNSLookup(const std::string& hostname, int port, int64_t wait = DNSLookup::kDefaultWait);
-        ~DNSLookup();
-
-        struct addrinfo* resolve(std::string& errMsg,
-                                 const CancellationRequest& isCancellationRequested,
-                                 bool blocking = false);
-
-    private:
-        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(uint64_t id, const std::string& hostname, int port); // thread runner
-
-        void setHostname(const std::string& hostname);
-        const std::string& getHostname();
-
-        void setErrMsg(const std::string& errMsg);
-        const std::string& getErrMsg();
-
-        void setRes(struct addrinfo* addr);
-        struct addrinfo* getRes();
-
-        std::string _hostname;
-        std::mutex _hostnameMutex;
-        int _port;
-
-        int64_t _wait;
-
-        struct addrinfo* _res;
-        std::mutex _resMutex;
-
-        std::string _errMsg;
-        std::mutex _errMsgMutex;
-
-        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/IXHttpClient.cpp

@@ -1,570 +0,0 @@
-/*
- *  IXHttpClient.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXHttpClient.h"
-#include "IXUrlParser.h"
-#include "IXWebSocketHttpHeaders.h"
-#include "IXSocketFactory.h"
-
-#include <sstream>
-#include <iomanip>
-#include <vector>
-#include <cstring>
-
-#include <zlib.h>
-
-namespace ix
-{
-    const std::string HttpClient::kPost = "POST";
-    const std::string HttpClient::kGet = "GET";
-    const std::string HttpClient::kHead = "HEAD";
-    const std::string HttpClient::kDel = "DEL";
-    const std::string HttpClient::kPut = "PUT";
-
-    HttpClient::HttpClient(bool async) : _async(async), _stop(false)
-    {
-        if (!_async) return;
-
-        _thread = std::thread(&HttpClient::run, this);
-    }
-
-    HttpClient::~HttpClient()
-    {
-        if (!_thread.joinable()) return;
-
-        _stop = true;
-        _condition.notify_one();
-        _thread.join();
-    }
-
-    HttpRequestArgsPtr HttpClient::createRequest(const std::string& url,
-                                                 const std::string& verb)
-    {
-        auto request = std::make_shared<HttpRequestArgs>();
-        request->url = url;
-        request->verb = verb;
-        return request;
-    }
-
-    bool HttpClient::performRequest(HttpRequestArgsPtr args,
-                                    const OnResponseCallback& onResponseCallback)
-    {
-        if (!_async) return false;
-
-        // Enqueue the task
-        {
-            // acquire lock
-            std::unique_lock<std::mutex> lock(_queueMutex);
-
-            // add the task
-            _queue.push(std::make_pair(args, onResponseCallback));
-        } // release lock
-
-        // wake up one thread
-        _condition.notify_one();
-
-        return true;
-    }
-
-    void HttpClient::run()
-    {
-        while (true)
-        {
-            HttpRequestArgsPtr args;
-            OnResponseCallback onResponseCallback;
-
-            {
-                std::unique_lock<std::mutex> lock(_queueMutex);
-
-                while (!_stop && _queue.empty())
-                {
-                    _condition.wait(lock);
-                }
-
-                if (_stop) return;
-
-                auto p = _queue.front();
-                _queue.pop();
-
-                args = p.first;
-                onResponseCallback = p.second;
-            }
-
-            if (_stop) return;
-
-            HttpResponsePtr response = request(args->url, args->verb, args->body, args);
-            onResponseCallback(response);
-
-            if (_stop) return;
-        }
-    }
-
-    HttpResponsePtr HttpClient::request(
-        const std::string& url,
-        const std::string& verb,
-        const std::string& body,
-        HttpRequestArgsPtr args,
-        int redirects)
-    {
-        // We only have one socket connection, so we cannot
-        // make multiple requests concurrently.
-        std::lock_guard<std::mutex> lock(_mutex);
-
-        uint64_t uploadSize = 0;
-        uint64_t downloadSize = 0;
-        int code = 0;
-        WebSocketHttpHeaders headers;
-        std::string payload;
-
-        std::string protocol, host, path, query;
-        int port;
-
-        if (!UrlParser::parse(url, protocol, host, path, query, port))
-        {
-            std::stringstream ss;
-            ss << "Cannot parse url: " << url;
-            return std::make_shared<HttpResponse>(code, HttpErrorCode::UrlMalformed,
-                                headers, payload, ss.str(),
-                                uploadSize, downloadSize);
-        }
-
-        bool tls = protocol == "https";
-        std::string errorMsg;
-        _socket = createSocket(tls, errorMsg);
-
-        if (!_socket)
-        {
-            return std::make_shared<HttpResponse>(code, HttpErrorCode::CannotCreateSocket,
-                                headers, payload, errorMsg,
-                                uploadSize, downloadSize);
-        }
-
-        // Build request string
-        std::stringstream ss;
-        ss << verb << " " << path << " HTTP/1.1\r\n";
-        ss << "Host: " << host << "\r\n";
-
-        if (args->compress)
-        {
-            ss << "Accept-Encoding: gzip" << "\r\n";
-        }
-
-        // Append extra headers
-        for (auto&& it : args->extraHeaders)
-        {
-            ss << it.first << ": " << it.second << "\r\n";
-        }
-
-        // Set a default Accept header if none is present
-        if (headers.find("Accept") == headers.end())
-        {
-            ss << "Accept: */*" << "\r\n";
-        }
-
-        // Set a default User agent if none is present
-        if (headers.find("User-Agent") == headers.end())
-        {
-            ss << "User-Agent: ixwebsocket" << "\r\n";
-        }
-
-        if (verb == kPost || verb == kPut)
-        {
-            ss << "Content-Length: " << body.size() << "\r\n";
-
-            // Set default Content-Type if unspecified
-            if (args->extraHeaders.find("Content-Type") == args->extraHeaders.end())
-            {
-                ss << "Content-Type: application/x-www-form-urlencoded" << "\r\n";
-            }
-            ss << "\r\n";
-            ss << body;
-        }
-        else
-        {
-            ss << "\r\n";
-        }
-
-        std::string req(ss.str());
-        std::string errMsg;
-        std::atomic<bool> requestInitCancellation(false);
-
-        // Make a cancellation object dealing with connection timeout
-        auto isCancellationRequested =
-            makeCancellationRequestWithTimeout(args->connectTimeout, requestInitCancellation);
-
-        bool success = _socket->connect(host, port, errMsg, isCancellationRequested);
-        if (!success)
-        {
-            std::stringstream ss;
-            ss << "Cannot connect to url: " << url << " / error : " << errMsg;
-            return std::make_shared<HttpResponse>(code, HttpErrorCode::CannotConnect,
-                                                  headers, payload, ss.str(),
-                                                  uploadSize, downloadSize);
-        }
-
-        // Make a new cancellation object dealing with transfer timeout
-        isCancellationRequested =
-            makeCancellationRequestWithTimeout(args->transferTimeout, requestInitCancellation);
-
-        if (args->verbose)
-        {
-            std::stringstream ss;
-            ss << "Sending " << verb << " request "
-               << "to " << host << ":" << port << std::endl
-               << "request size: " << req.size() << " bytes" << std::endl
-               << "=============" << std::endl
-               << req
-               << "=============" << std::endl
-               << std::endl;
-
-            log(ss.str(), args);
-        }
-
-        if (!_socket->writeBytes(req, isCancellationRequested))
-        {
-            std::string errorMsg("Cannot send request");
-            return std::make_shared<HttpResponse>(code, HttpErrorCode::SendError,
-                                                  headers, payload, errorMsg,
-                                                  uploadSize, downloadSize);
-        }
-
-        uploadSize = req.size();
-
-        auto lineResult = _socket->readLine(isCancellationRequested);
-        auto lineValid = lineResult.first;
-        auto line = lineResult.second;
-
-        if (!lineValid)
-        {
-            std::string errorMsg("Cannot retrieve status line");
-            return std::make_shared<HttpResponse>(code, HttpErrorCode::CannotReadStatusLine,
-                                                  headers, payload, errorMsg,
-                                                  uploadSize, downloadSize);
-        }
-
-        if (args->verbose)
-        {
-            std::stringstream ss;
-            ss << "Status line " << line;
-            log(ss.str(), args);
-        }
-
-        if (sscanf(line.c_str(), "HTTP/1.1 %d", &code) != 1)
-        {
-            std::string errorMsg("Cannot parse response code from status line");
-            return std::make_shared<HttpResponse>(code, HttpErrorCode::MissingStatus,
-                                                  headers, payload, errorMsg,
-                                                  uploadSize, downloadSize);
-        }
-
-        auto result = parseHttpHeaders(_socket, isCancellationRequested);
-        auto headersValid = result.first;
-        headers = result.second;
-
-        if (!headersValid)
-        {
-            std::string errorMsg("Cannot parse http headers");
-            return std::make_shared<HttpResponse>(code, HttpErrorCode::HeaderParsingError,
-                                                  headers, payload, errorMsg,
-                                                  uploadSize, downloadSize);
-        }
-
-        // Redirect ?
-        if ((code >= 301 && code <= 308) && args->followRedirects)
-        {
-            if (headers.find("Location") == headers.end())
-            {
-                std::string errorMsg("Missing location header for redirect");
-                return std::make_shared<HttpResponse>(code, HttpErrorCode::MissingLocation,
-                                                      headers, payload, errorMsg,
-                                                      uploadSize, downloadSize);
-            }
-
-            if (redirects >= args->maxRedirects)
-            {
-                std::stringstream ss;
-                ss << "Too many redirects: " << redirects;
-                return std::make_shared<HttpResponse>(code, HttpErrorCode::TooManyRedirects,
-                                                      headers, payload, ss.str(),
-                                                      uploadSize, downloadSize);
-            }
-
-            // Recurse
-            std::string location = headers["Location"];
-            return request(location, verb, body, args, redirects+1);
-        }
-
-        if (verb == "HEAD")
-        {
-            return std::make_shared<HttpResponse>(code, HttpErrorCode::Ok,
-                                                  headers, payload, std::string(),
-                                                  uploadSize, downloadSize);
-        }
-
-        // Parse response:
-        if (headers.find("Content-Length") != headers.end())
-        {
-            ssize_t contentLength = -1;
-            ss.str("");
-            ss << headers["Content-Length"];
-            ss >> contentLength;
-
-            payload.reserve(contentLength);
-
-            auto chunkResult = _socket->readBytes(contentLength,
-                                                  args->onProgressCallback,
-                                                  isCancellationRequested);
-            if (!chunkResult.first)
-            {
-                errorMsg = "Cannot read chunk";
-                return std::make_shared<HttpResponse>(code, HttpErrorCode::ChunkReadError,
-                                                      headers, payload, errorMsg,
-                                                      uploadSize, downloadSize);
-            }
-            payload += chunkResult.second;
-        }
-        else if (headers.find("Transfer-Encoding") != headers.end() &&
-                 headers["Transfer-Encoding"] == "chunked")
-        {
-            std::stringstream ss;
-
-            while (true)
-            {
-                lineResult = _socket->readLine(isCancellationRequested);
-                line = lineResult.second;
-
-                if (!lineResult.first)
-                {
-                    return std::make_shared<HttpResponse>(code, HttpErrorCode::ChunkReadError,
-                                                          headers, payload, errorMsg,
-                                                          uploadSize, downloadSize);
-                }
-
-                uint64_t chunkSize;
-                ss.str("");
-                ss << std::hex << line;
-                ss >> chunkSize;
-
-                if (args->verbose)
-                {
-                    std::stringstream oss;
-                    oss << "Reading " << chunkSize << " bytes"
-                        << std::endl;
-                    log(oss.str(), args);
-                }
-
-                payload.reserve(payload.size() + (size_t) chunkSize);
-
-                // Read a chunk
-                auto chunkResult = _socket->readBytes((size_t) chunkSize,
-                                                      args->onProgressCallback,
-                                                      isCancellationRequested);
-                if (!chunkResult.first)
-                {
-                    errorMsg = "Cannot read chunk";
-                    return std::make_shared<HttpResponse>(code, HttpErrorCode::ChunkReadError,
-                                                          headers, payload, errorMsg,
-                                                          uploadSize, downloadSize);
-                }
-                payload += chunkResult.second;
-
-                // Read the line that terminates the chunk (\r\n)
-                lineResult = _socket->readLine(isCancellationRequested);
-
-                if (!lineResult.first)
-                {
-                    return std::make_shared<HttpResponse>(code, HttpErrorCode::ChunkReadError,
-                                                          headers, payload, errorMsg,
-                                                          uploadSize, downloadSize);
-                }
-
-                if (chunkSize == 0) break;
-            }
-        }
-        else if (code == 204)
-        {
-            ; // 204 is NoContent response code
-        }
-        else
-        {
-            std::string errorMsg("Cannot read http body");
-            return std::make_shared<HttpResponse>(code, HttpErrorCode::CannotReadBody,
-                                                  headers, payload, errorMsg,
-                                                  uploadSize, downloadSize);
-        }
-
-        downloadSize = payload.size();
-
-        // If the content was compressed with gzip, decode it
-        if (headers["Content-Encoding"] == "gzip")
-        {
-            std::string decompressedPayload;
-            if (!gzipInflate(payload, decompressedPayload))
-            {
-                std::string errorMsg("Error decompressing payload");
-                return std::make_shared<HttpResponse>(code, HttpErrorCode::Gzip,
-                                                      headers, payload, errorMsg,
-                                                      uploadSize, downloadSize);
-            }
-            payload = decompressedPayload;
-        }
-
-        return std::make_shared<HttpResponse>(code, HttpErrorCode::Ok,
-                                              headers, payload, std::string(),
-                                              uploadSize, downloadSize);
-    }
-
-    HttpResponsePtr HttpClient::get(const std::string& url,
-                                    HttpRequestArgsPtr args)
-    {
-        return request(url, kGet, std::string(), args);
-    }
-
-    HttpResponsePtr HttpClient::head(const std::string& url,
-                                     HttpRequestArgsPtr args)
-    {
-        return request(url, kHead, std::string(), args);
-    }
-
-    HttpResponsePtr HttpClient::del(const std::string& url,
-                                    HttpRequestArgsPtr args)
-    {
-        return request(url, kDel, std::string(), args);
-    }
-
-    HttpResponsePtr HttpClient::post(const std::string& url,
-                                     const HttpParameters& httpParameters,
-                                     HttpRequestArgsPtr args)
-    {
-        return request(url, kPost, serializeHttpParameters(httpParameters), args);
-    }
-
-    HttpResponsePtr HttpClient::post(const std::string& url,
-                                     const std::string& body,
-                                     HttpRequestArgsPtr args)
-    {
-        return request(url, kPost, body, args);
-    }
-
-    HttpResponsePtr HttpClient::put(const std::string& url,
-                                    const HttpParameters& httpParameters,
-                                    HttpRequestArgsPtr args)
-    {
-        return request(url, kPut, serializeHttpParameters(httpParameters), args);
-    }
-
-    HttpResponsePtr HttpClient::put(const std::string& url,
-                                    const std::string& body,
-                                    const HttpRequestArgsPtr args)
-    {
-        return request(url, kPut, body, args);
-    }
-
-    std::string HttpClient::urlEncode(const std::string& value)
-    {
-        std::ostringstream escaped;
-        escaped.fill('0');
-        escaped << std::hex;
-
-        for (std::string::const_iterator i = value.begin(), n = value.end();
-             i != n; ++i)
-        {
-            std::string::value_type c = (*i);
-
-            // Keep alphanumeric and other accepted characters intact
-            if (isalnum(c) || c == '-' || c == '_' || c == '.' || c == '~')
-            {
-                escaped << c;
-                continue;
-            }
-
-            // Any other characters are percent-encoded
-            escaped << std::uppercase;
-            escaped << '%' << std::setw(2) << int((unsigned char) c);
-            escaped << std::nouppercase;
-        }
-
-        return escaped.str();
-    }
-
-    std::string HttpClient::serializeHttpParameters(const HttpParameters& httpParameters)
-    {
-        std::stringstream ss;
-        size_t count = httpParameters.size();
-        size_t i = 0;
-
-        for (auto&& it : httpParameters)
-        {
-            ss << urlEncode(it.first)
-               << "="
-               << urlEncode(it.second);
-
-            if (i++ < (count-1))
-            {
-               ss << "&";
-            }
-        }
-        return ss.str();
-    }
-
-    bool HttpClient::gzipInflate(
-        const std::string& in,
-        std::string& out)
-    {
-        z_stream inflateState;
-        std::memset(&inflateState, 0, sizeof(inflateState));
-
-        inflateState.zalloc = Z_NULL;
-        inflateState.zfree = Z_NULL;
-        inflateState.opaque = Z_NULL;
-        inflateState.avail_in = 0;
-        inflateState.next_in = Z_NULL;
-
-        if (inflateInit2(&inflateState, 16+MAX_WBITS) != Z_OK)
-        {
-            return false;
-        }
-
-        inflateState.avail_in = (uInt) in.size();
-        inflateState.next_in = (unsigned char *)(const_cast<char *>(in.data()));
-
-        const int kBufferSize = 1 << 14;
-
-        std::unique_ptr<unsigned char[]> compressBuffer =
-            std::make_unique<unsigned char[]>(kBufferSize);
-
-        do
-        {
-            inflateState.avail_out = (uInt) kBufferSize;
-            inflateState.next_out = compressBuffer.get();
-
-            int ret = inflate(&inflateState, Z_SYNC_FLUSH);
-
-            if (ret == Z_NEED_DICT || ret == Z_DATA_ERROR || ret == Z_MEM_ERROR)
-            {
-                inflateEnd(&inflateState);
-                return false;
-            }
-
-            out.append(
-                reinterpret_cast<char *>(compressBuffer.get()),
-                kBufferSize - inflateState.avail_out
-            );
-        } while (inflateState.avail_out == 0);
-
-        inflateEnd(&inflateState);
-        return true;
-    }
-
-    void HttpClient::log(const std::string& msg,
-                         HttpRequestArgsPtr args)
-    {
-        if (args->logger)
-        {
-            args->logger(msg);
-        }
-    }
-}

ixwebsocket/IXHttpClient.h

@@ -1,161 +0,0 @@
-/*
- *  IXHttpClient.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include "IXSocket.h"
-#include "IXWebSocketHttpHeaders.h"
-#include <algorithm>
-#include <atomic>
-#include <condition_variable>
-#include <functional>
-#include <map>
-#include <memory>
-#include <mutex>
-#include <queue>
-#include <thread>
-
-namespace ix
-{
-    enum class HttpErrorCode : int
-    {
-        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:
-        HttpClient(bool async = false);
-        ~HttpClient();
-
-        HttpResponsePtr get(const std::string& url, HttpRequestArgsPtr args);
-        HttpResponsePtr head(const std::string& url, HttpRequestArgsPtr args);
-        HttpResponsePtr del(const std::string& url, HttpRequestArgsPtr args);
-
-        HttpResponsePtr post(const std::string& url,
-                             const HttpParameters& httpParameters,
-                             HttpRequestArgsPtr args);
-        HttpResponsePtr post(const std::string& url,
-                             const std::string& body,
-                             HttpRequestArgsPtr args);
-
-        HttpResponsePtr put(const std::string& url,
-                            const HttpParameters& httpParameters,
-                            HttpRequestArgsPtr args);
-        HttpResponsePtr put(const std::string& url,
-                            const std::string& body,
-                            HttpRequestArgsPtr args);
-
-        HttpResponsePtr request(const std::string& url,
-                                const std::string& verb,
-                                const std::string& body,
-                                HttpRequestArgsPtr args,
-                                int redirects = 0);
-
-        // Async API
-        HttpRequestArgsPtr createRequest(const std::string& url = std::string(),
-                                         const std::string& verb = HttpClient::kGet);
-
-        bool performRequest(HttpRequestArgsPtr request,
-                            const OnResponseCallback& onResponseCallback);
-
-        std::string serializeHttpParameters(const HttpParameters& httpParameters);
-
-        std::string urlEncode(const std::string& value);
-
-        const static std::string kPost;
-        const static std::string kGet;
-        const static std::string kHead;
-        const static std::string kDel;
-        const static std::string kPut;
-
-    private:
-        void log(const std::string& msg, HttpRequestArgsPtr args);
-
-        bool gzipInflate(const std::string& in, std::string& out);
-
-        // Async API background thread runner
-        void run();
-
-        // Async API
-        bool _async;
-        std::queue<std::pair<HttpRequestArgsPtr, OnResponseCallback>> _queue;
-        mutable std::mutex _queueMutex;
-        std::condition_variable _condition;
-        std::atomic<bool> _stop;
-        std::thread _thread;
-
-        std::shared_ptr<Socket> _socket;
-        std::mutex _mutex; // to protect accessing the _socket (only one socket per client)
-    };
-} // namespace ix

ixwebsocket/IXNetSystem.cpp

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

ixwebsocket/IXNetSystem.h

@@ -1,31 +0,0 @@
-/*
- *  IXNetSystem.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone. All rights reserved.
- */
-
-#pragma once
-
-#ifdef _WIN32
-#include <WS2tcpip.h>
-#include <WinSock2.h>
-#include <basetsd.h>
-#include <io.h>
-#include <ws2def.h>
-#else
-#include <arpa/inet.h>
-#include <errno.h>
-#include <netdb.h>
-#include <netinet/tcp.h>
-#include <sys/select.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <unistd.h>
-#endif
-
-namespace ix
-{
-    bool initNetSystem();
-    bool uninitNetSystem();
-} // namespace ix

ixwebsocket/IXProgressCallback.h

@@ -1,14 +0,0 @@
-/*
- *  IXProgressCallback.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include <functional>
-
-namespace ix
-{
-    using OnProgressCallback = std::function<bool(int current, int total)>;
-}

ixwebsocket/IXSelectInterrupt.cpp

@@ -1,46 +0,0 @@
-/*
- *  IXSelectInterrupt.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXSelectInterrupt.h"
-
-namespace ix
-{
-    SelectInterrupt::SelectInterrupt()
-    {
-        ;
-    }
-
-    SelectInterrupt::~SelectInterrupt()
-    {
-        ;
-    }
-
-    bool SelectInterrupt::init(std::string& /*errorMsg*/)
-    {
-        return true;
-    }
-
-    bool SelectInterrupt::notify(uint64_t /*value*/)
-    {
-        return true;
-    }
-
-    uint64_t SelectInterrupt::read()
-    {
-        return 0;
-    }
-
-    bool SelectInterrupt::clear()
-    {
-        return true;
-    }
-
-    int SelectInterrupt::getFd() const
-    {
-        return -1;
-    }
-}
-

ixwebsocket/IXSelectInterrupt.h

@@ -1,27 +0,0 @@
-/*
- *  IXSelectInterrupt.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include <stdint.h>
-#include <string>
-
-namespace ix
-{
-    class SelectInterrupt
-    {
-    public:
-        SelectInterrupt();
-        virtual ~SelectInterrupt();
-
-        virtual bool init(std::string& errorMsg);
-
-        virtual bool notify(uint64_t value);
-        virtual bool clear();
-        virtual uint64_t read();
-        virtual int getFd() const;
-    };
-} // namespace ix

ixwebsocket/IXSelectInterruptEventFd.cpp

@@ -1,116 +0,0 @@
-/*
- *  IXSelectInterruptEventFd.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018-2019 Machine Zone, Inc. All rights reserved.
- */
-
-//
-// On Linux we use eventd to wake up select.
-//
-
-//
-// Linux/Android has a special type of virtual files. select(2) will react
-// when reading/writing to those files, unlike closing sockets.
-//
-// https://linux.die.net/man/2/eventfd
-// http://www.sourcexr.com/articles/2013/10/26/lightweight-inter-process-signaling-with-eventfd
-//
-// eventfd was added in Linux kernel 2.x, and our oldest Android (Kitkat 4.4)
-// is on Kernel 3.x
-//
-// cf Android/Kernel table here
-// https://android.stackexchange.com/questions/51651/which-android-runs-which-linux-kernel
-//
-// On macOS we use UNIX pipes to wake up select.
-//
-
-#include "IXSelectInterruptEventFd.h"
-
-#include <sys/eventfd.h>
-
-#include <unistd.h> // for write
-#include <string.h> // for strerror
-#include <fcntl.h>
-#include <errno.h>
-#include <assert.h>
-#include <sstream>
-
-namespace ix
-{
-    SelectInterruptEventFd::SelectInterruptEventFd()
-    {
-        _eventfd = -1;
-    }
-
-    SelectInterruptEventFd::~SelectInterruptEventFd()
-    {
-        ::close(_eventfd);
-    }
-
-    bool SelectInterruptEventFd::init(std::string& errorMsg)
-    {
-        // calling init twice is a programming error
-        assert(_eventfd == -1);
-
-        _eventfd = eventfd(0, 0);
-        if (_eventfd < 0)
-        {
-            std::stringstream ss;
-            ss << "SelectInterruptEventFd::init() failed in eventfd()"
-               << " : " << strerror(errno);
-            errorMsg = ss.str();
-
-            _eventfd = -1;
-            return false;
-        }
-
-        if (fcntl(_eventfd, F_SETFL, O_NONBLOCK) == -1)
-        {
-            std::stringstream ss;
-            ss << "SelectInterruptEventFd::init() failed in fcntl() call"
-               << " : " << strerror(errno);
-            errorMsg = ss.str();
-
-            _eventfd = -1;
-            return false;
-        }
-
-        return true;
-    }
-
-    bool SelectInterruptEventFd::notify(uint64_t value)
-    {
-        int fd = _eventfd;
-
-        if (fd == -1) return false;
-
-        // we should write 8 bytes for an uint64_t
-        return write(fd, &value, sizeof(value)) == 8;
-    }
-
-    // TODO: return max uint64_t for errors ?
-    uint64_t SelectInterruptEventFd::read()
-    {
-        int fd = _eventfd;
-
-        uint64_t value = 0;
-        ::read(fd, &value, sizeof(value));
-        return value;
-    }
-
-    bool SelectInterruptEventFd::clear()
-    {
-        if (_eventfd == -1) return false;
-
-        // 0 is a special value ; select will not wake up
-        uint64_t value = 0;
-
-        // we should write 8 bytes for an uint64_t
-        return write(_eventfd, &value, sizeof(value)) == 8;
-    }
-
-    int SelectInterruptEventFd::getFd() const
-    {
-        return _eventfd;
-    }
-}

ixwebsocket/IXSelectInterruptEventFd.h

@@ -1,31 +0,0 @@
-/*
- *  IXSelectInterruptEventFd.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018-2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include "IXSelectInterrupt.h"
-#include <stdint.h>
-#include <string>
-
-namespace ix
-{
-    class SelectInterruptEventFd final : public SelectInterrupt
-    {
-    public:
-        SelectInterruptEventFd();
-        virtual ~SelectInterruptEventFd();
-
-        bool init(std::string& errorMsg) final;
-
-        bool notify(uint64_t value) final;
-        bool clear() final;
-        uint64_t read() final;
-        int getFd() const final;
-
-    private:
-        int _eventfd;
-    };
-} // namespace ix

ixwebsocket/IXSelectInterruptFactory.cpp

@@ -1,25 +0,0 @@
-/*
- *  IXSelectInterruptFactory.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXSelectInterruptFactory.h"
-
-#if defined(__linux__) || defined(__APPLE__)
-# include <ixwebsocket/IXSelectInterruptPipe.h>
-#else
-# include <ixwebsocket/IXSelectInterrupt.h>
-#endif
-
-namespace ix
-{
-    std::shared_ptr<SelectInterrupt> createSelectInterrupt()
-    {
-#if defined(__linux__) || defined(__APPLE__)
-        return std::make_shared<SelectInterruptPipe>();
-#else
-        return std::make_shared<SelectInterrupt>();
-#endif
-    }
-}

ixwebsocket/IXSelectInterruptFactory.h

@@ -1,15 +0,0 @@
-/*
- *  IXSelectInterruptFactory.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include <memory>
-
-namespace ix
-{
-    class SelectInterrupt;
-    std::shared_ptr<SelectInterrupt> createSelectInterrupt();
-} // namespace ix

ixwebsocket/IXSelectInterruptPipe.cpp

@@ -1,146 +0,0 @@
-/*
- *  IXSelectInterruptPipe.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018-2019 Machine Zone, Inc. All rights reserved.
- */
-
-//
-// On macOS we use UNIX pipes to wake up select.
-//
-
-#include "IXSelectInterruptPipe.h"
-
-#include <unistd.h> // for write
-#include <string.h> // for strerror
-#include <fcntl.h>
-#include <errno.h>
-#include <assert.h>
-#include <sstream>
-
-namespace ix
-{
-    // File descriptor at index 0 in _fildes is the read end of the pipe
-    // File descriptor at index 1 in _fildes is the write end of the pipe
-    const int SelectInterruptPipe::kPipeReadIndex = 0;
-    const int SelectInterruptPipe::kPipeWriteIndex = 1;
-
-    SelectInterruptPipe::SelectInterruptPipe()
-    {
-        _fildes[kPipeReadIndex] = -1;
-        _fildes[kPipeWriteIndex] = -1;
-    }
-
-    SelectInterruptPipe::~SelectInterruptPipe()
-    {
-        ::close(_fildes[kPipeReadIndex]);
-        ::close(_fildes[kPipeWriteIndex]);
-        _fildes[kPipeReadIndex] = -1;
-        _fildes[kPipeWriteIndex] = -1;
-    }
-
-    bool SelectInterruptPipe::init(std::string& errorMsg)
-    {
-        std::lock_guard<std::mutex> lock(_fildesMutex);
-
-        // calling init twice is a programming error
-        assert(_fildes[kPipeReadIndex] == -1);
-        assert(_fildes[kPipeWriteIndex] == -1);
-
-        if (pipe(_fildes) < 0)
-        {
-            std::stringstream ss;
-            ss << "SelectInterruptPipe::init() failed in pipe() call"
-               << " : " << strerror(errno);
-            errorMsg = ss.str();
-            return false;
-        }
-
-        if (fcntl(_fildes[kPipeReadIndex], F_SETFL, O_NONBLOCK) == -1)
-        {
-            std::stringstream ss;
-            ss << "SelectInterruptPipe::init() failed in fcntl(..., O_NONBLOCK) call"
-               << " : " << strerror(errno);
-            errorMsg = ss.str();
-
-            _fildes[kPipeReadIndex] = -1;
-            _fildes[kPipeWriteIndex] = -1;
-            return false;
-        }
-
-        if (fcntl(_fildes[kPipeWriteIndex], F_SETFL, O_NONBLOCK) == -1)
-        {
-            std::stringstream ss;
-            ss << "SelectInterruptPipe::init() failed in fcntl(..., O_NONBLOCK) call"
-               << " : " << strerror(errno);
-            errorMsg = ss.str();
-
-            _fildes[kPipeReadIndex] = -1;
-            _fildes[kPipeWriteIndex] = -1;
-            return false;
-        }
-
-#ifdef F_SETNOSIGPIPE
-        if (fcntl(_fildes[kPipeWriteIndex], F_SETNOSIGPIPE, 1) == -1)
-        {
-            std::stringstream ss;
-            ss << "SelectInterruptPipe::init() failed in fcntl(.... F_SETNOSIGPIPE) call"
-               << " : " << strerror(errno);
-            errorMsg = ss.str();
-
-            _fildes[kPipeReadIndex] = -1;
-            _fildes[kPipeWriteIndex] = -1;
-            return false;
-        }
-
-        if (fcntl(_fildes[kPipeWriteIndex], F_SETNOSIGPIPE, 1) == -1)
-        {
-            std::stringstream ss;
-            ss << "SelectInterruptPipe::init() failed in fcntl(..., F_SETNOSIGPIPE) call"
-               << " : " << strerror(errno);
-            errorMsg = ss.str();
-
-            _fildes[kPipeReadIndex] = -1;
-            _fildes[kPipeWriteIndex] = -1;
-            return false;
-        }
-#endif
-
-        return true;
-    }
-
-    bool SelectInterruptPipe::notify(uint64_t value)
-    {
-        std::lock_guard<std::mutex> lock(_fildesMutex);
-
-        int fd = _fildes[kPipeWriteIndex];
-        if (fd == -1) return false;
-
-        // we should write 8 bytes for an uint64_t
-        return write(fd, &value, sizeof(value)) == 8;
-    }
-
-    // TODO: return max uint64_t for errors ?
-    uint64_t SelectInterruptPipe::read()
-    {
-        std::lock_guard<std::mutex> lock(_fildesMutex);
-
-        int fd = _fildes[kPipeReadIndex];
-
-        uint64_t value = 0;
-        ::read(fd, &value, sizeof(value));
-
-        return value;
-    }
-
-    bool SelectInterruptPipe::clear()
-    {
-        return true;
-    }
-
-    int SelectInterruptPipe::getFd() const
-    {
-        std::lock_guard<std::mutex> lock(_fildesMutex);
-
-        return _fildes[kPipeReadIndex];
-    }
-}

ixwebsocket/IXSelectInterruptPipe.h

@@ -1,40 +0,0 @@
-/*
- *  IXSelectInterruptPipe.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018-2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include "IXSelectInterrupt.h"
-#include <mutex>
-#include <stdint.h>
-#include <string>
-
-namespace ix
-{
-    class SelectInterruptPipe final : public SelectInterrupt
-    {
-    public:
-        SelectInterruptPipe();
-        virtual ~SelectInterruptPipe();
-
-        bool init(std::string& errorMsg) final;
-
-        bool notify(uint64_t value) final;
-        bool clear() final;
-        uint64_t read() final;
-        int getFd() const final;
-
-    private:
-        // Store file descriptors used by the communication pipe. Communication
-        // happens between a control thread and a background thread, which is
-        // blocked on select.
-        int _fildes[2];
-        mutable std::mutex _fildesMutex;
-
-        // Used to identify the read/write idx
-        static const int kPipeReadIndex;
-        static const int kPipeWriteIndex;
-    };
-} // namespace ix

ixwebsocket/IXSetThreadName.h

@@ -1,12 +0,0 @@
-/*
- *  IXSetThreadName.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
- */
-#pragma once
-#include <string>
-
-namespace ix
-{
-    void setThreadName(const std::string& name);
-}

ixwebsocket/IXSocket.cpp

@@ -5,10 +5,23 @@
  */
 
 #include "IXSocket.h"
-#include "IXSocketConnect.h"
-#include "IXNetSystem.h"
-#include "IXSelectInterrupt.h"
-#include "IXSelectInterruptFactory.h"
+
+#ifdef _WIN32
+# include <basetsd.h>
+# include <WinSock2.h>
+# include <ws2def.h>
+# include <WS2tcpip.h>
+# include <io.h>
+#else
+# include <unistd.h>
+# include <errno.h>
+# include <netdb.h>
+# include <netinet/tcp.h>
+# include <sys/socket.h>
+# include <sys/time.h>
+# include <sys/select.h>
+# include <sys/stat.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -20,138 +33,199 @@
 
 #include <algorithm>
 
-#ifdef min
-#undef min
+//
+// Linux/Android has a special type of virtual files. select(2) will react
+// when reading/writing to those files, unlike closing sockets.
+//
+// https://linux.die.net/man/2/eventfd
+//
+// eventfd was added in Linux kernel 2.x, and our oldest Android (Kitkat 4.4)
+// is on Kernel 3.x
+//
+// cf Android/Kernel table here 
+// https://android.stackexchange.com/questions/51651/which-android-runs-which-linux-kernel
+//
+#ifdef __linux__
+# include <sys/eventfd.h>
 #endif
 
-namespace ix
-{
-    const int Socket::kDefaultPollNoTimeout = -1; // No poll timeout by default
-    const int Socket::kDefaultPollTimeout = kDefaultPollNoTimeout;
-    const uint64_t Socket::kSendRequest = 1;
-    const uint64_t Socket::kCloseRequest = 2;
-    constexpr size_t Socket::kChunkSize;
+// Android needs extra headers for TCP_NODELAY and IPPROTO_TCP
+#ifdef ANDROID
+# include <linux/in.h>
+# include <linux/tcp.h>
+#endif
 
-    Socket::Socket(int fd) :
-        _sockfd(fd),
-        _selectInterrupt(createSelectInterrupt())
+namespace ix 
+{
+    Socket::Socket() : 
+        _sockfd(-1),
+        _eventfd(-1)
     {
-        ;
+#ifdef __linux__
+        _eventfd = eventfd(0, 0);
+        assert(_eventfd != -1 && "Panic - eventfd not functioning on this platform");
+#endif
     }
 
     Socket::~Socket()
     {
         close();
+
+#ifdef __linux__
+        ::close(_eventfd);
+#endif
     }
 
-    PollResultType Socket::poll(int timeoutMs)
+    bool Socket::connectToAddress(const struct addrinfo *address, 
+                                  int& sockfd,
+                                  std::string& errMsg)
     {
-        return isReadyToRead(timeoutMs);
+        sockfd = -1;
+
+        int fd = socket(address->ai_family,
+                        address->ai_socktype,
+                        address->ai_protocol);
+        if (fd < 0)
+        {
+            errMsg = "Cannot create a socket";
+            return false;
+        }
+
+        int maxRetries = 3;
+        for (int i = 0; i < maxRetries; ++i)
+        {
+            if (::connect(fd, address->ai_addr, address->ai_addrlen) != -1)
+            {
+                sockfd = fd;
+                return true;
+            }
+
+            // EINTR means we've been interrupted, in which case we try again.
+            if (errno != EINTR) break;
+        }
+
+        closeSocket(fd);
+        sockfd = -1;
+        errMsg = strerror(errno);
+        return false;
     }
 
-    PollResultType Socket::select(bool readyToRead, int timeoutMs)
+    int Socket::hostname_connect(const std::string& hostname,
+                                 int port,
+                                 std::string& errMsg)
     {
+        struct addrinfo hints;
+        memset(&hints, 0, sizeof(hints));
+        hints.ai_flags = AI_ADDRCONFIG | AI_NUMERICSERV;
+        hints.ai_family = AF_UNSPEC;
+        hints.ai_socktype = SOCK_STREAM;
+
+        std::string sport = std::to_string(port);
+
+        struct addrinfo *res = nullptr;
+        int getaddrinfo_result = getaddrinfo(hostname.c_str(), sport.c_str(), 
+                                             &hints, &res);
+        if (getaddrinfo_result)
+        {
+            errMsg = gai_strerror(getaddrinfo_result);
+            return -1;
+        }
+
+        int sockfd = -1;
+
+        // iterate through the records to find a working peer
+        struct addrinfo *address;
+        bool success = false;
+        for (address = res; address != nullptr; address = address->ai_next)
+        {
+            success = connectToAddress(address, sockfd, errMsg);
+            if (success)
+            {
+                break;
+            }
+        }
+        freeaddrinfo(res);
+        return sockfd;
+    }
+
+    void Socket::configure()
+    {
+        int flag = 1;
+        setsockopt(_sockfd, IPPROTO_TCP, TCP_NODELAY, (char*) &flag, sizeof(flag)); // Disable Nagle's algorithm
+
+#ifdef _WIN32
+        unsigned long nonblocking = 1;
+        ioctlsocket(_sockfd, FIONBIO, &nonblocking);
+#else
+        fcntl(_sockfd, F_SETFL, O_NONBLOCK); // make socket non blocking
+#endif
+
+#ifdef SO_NOSIGPIPE
+        int value = 1;
+        setsockopt(_sockfd, SOL_SOCKET, SO_NOSIGPIPE, 
+                   (void *)&value, sizeof(value));
+#endif
+    }
+
+    void Socket::poll(const OnPollCallback& onPollCallback)
+    {
+        if (_sockfd == -1)
+        {
+            onPollCallback();
+            return;
+        }
+
         fd_set rfds;
-        fd_set wfds;
         FD_ZERO(&rfds);
-        FD_ZERO(&wfds);
+        FD_SET(_sockfd, &rfds);
 
-        fd_set* fds = (readyToRead) ? &rfds : & wfds;
-        if (_sockfd != -1)
-        {
-            FD_SET(_sockfd, fds);
-        }
+#ifdef __linux__
+        FD_SET(_eventfd, &rfds);
+#endif
 
-        // 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 nfds = (std::max)(sockfd, _eventfd);
+        select(nfds + 1, &rfds, nullptr, nullptr, nullptr);
 
-        int ret = ::select(nfds + 1, &rfds, &wfds, nullptr,
-                           (timeoutMs < 0) ? nullptr : &timeout);
-
-        PollResultType pollResult = PollResultType::ReadyForRead;
-        if (ret < 0)
-        {
-            pollResult = PollResultType::Error;
-        }
-        else if (ret == 0)
-        {
-            pollResult = PollResultType::Timeout;
-        }
-        else if (interruptFd != -1 && FD_ISSET(interruptFd, &rfds))
-        {
-            uint64_t value = _selectInterrupt->read();
-
-            if (value == kSendRequest)
-            {
-                pollResult = PollResultType::SendRequest;
-            }
-            else if (value == kCloseRequest)
-            {
-                pollResult = PollResultType::CloseRequest;
-            }
-        }
-        else if (sockfd != -1 && readyToRead && FD_ISSET(sockfd, &rfds))
-        {
-            pollResult = PollResultType::ReadyForRead;
-        }
-        else if (sockfd != -1 && !readyToRead && FD_ISSET(sockfd, &wfds))
-        {
-            pollResult = PollResultType::ReadyForWrite;
-        }
-
-        return pollResult;
+        onPollCallback();
     }
 
-    PollResultType Socket::isReadyToRead(int timeoutMs)
+    void Socket::wakeUpFromPollApple()
     {
-        if (_sockfd == -1)
-        {
-            return PollResultType::Error;
-        }
-
-        bool readyToRead = true;
-        return select(readyToRead, timeoutMs);
+        close(); // All OS but Linux will wake up select
+                 // when closing the file descriptor watched by select
     }
 
-    PollResultType Socket::isReadyToWrite(int timeoutMs)
+    void Socket::wakeUpFromPollLinux()
     {
-        if (_sockfd == -1)
-        {
-            return PollResultType::Error;
-        }
-
-        bool readyToRead = false;
-        return select(readyToRead, timeoutMs);
+        std::string str("\n"); // this will wake up the thread blocked on select
+        const void* buf = reinterpret_cast<const void*>(str.c_str());
+        write(_eventfd, buf, str.size());
     }
 
-    // Wake up from poll/select by writing to the pipe which is watched by select
-    bool Socket::wakeUpFromPoll(uint64_t wakeUpCode)
+    void Socket::wakeUpFromPoll()
     {
-        return _selectInterrupt->notify(wakeUpCode);
+#ifdef __APPLE__
+        wakeUpFromPollApple();
+#elif defined(__linux__)
+        wakeUpFromPollLinux();
+#endif
     }
 
     bool Socket::connect(const std::string& host,
                          int port,
-                         std::string& errMsg,
-                         const CancellationRequest& isCancellationRequested)
+                         std::string& errMsg)
     {
         std::lock_guard<std::mutex> lock(_socketMutex);
 
-        if (!_selectInterrupt->clear()) return false;
+#ifdef __linux__
+        if (_eventfd == -1)
+        {
+            return false; // impossible to use this socket if eventfd is broken
+        }
+#endif
 
-        _sockfd = SocketConnect::connect(host, port, errMsg, isCancellationRequested);
+        _sockfd = Socket::hostname_connect(host, port, errMsg);
         return _sockfd != -1;
     }
 
@@ -165,54 +239,38 @@ namespace ix
         _sockfd = -1;
     }
 
-    ssize_t Socket::send(char* buffer, size_t length)
+    int Socket::send(char* buffer, size_t length)
     {
         int flags = 0;
 #ifdef MSG_NOSIGNAL
         flags = MSG_NOSIGNAL;
 #endif
 
-        return ::send(_sockfd, buffer, length, flags);
+        return (int) ::send(_sockfd, buffer, length, flags);
     }
 
-    ssize_t Socket::send(const std::string& buffer)
+    int Socket::send(const std::string& buffer)
     {
         return send((char*)&buffer[0], buffer.size());
     }
 
-    ssize_t Socket::recv(void* buffer, size_t length)
+    int Socket::recv(void* buffer, size_t length)
     {
         int flags = 0;
 #ifdef MSG_NOSIGNAL
         flags = MSG_NOSIGNAL;
 #endif
 
-        return ::recv(_sockfd, (char*) buffer, length, flags);
+        return (int) ::recv(_sockfd, (char*) buffer, length, flags);
     }
 
-    int Socket::getErrno()
+    int Socket::getErrno() const
     {
-        int err;
-
 #ifdef _WIN32
-        err = WSAGetLastError();
+        return WSAGetLastError();
 #else
-        err = errno;
+        return errno;
 #endif
-
-        return err;
-    }
-
-    bool Socket::isWaitNeeded()
-    {
-        int err = getErrno();
-
-        if (err == EWOULDBLOCK || err == EAGAIN || err == EINPROGRESS)
-        {
-            return true;
-        }
-
-        return false;
     }
 
     void Socket::closeSocket(int fd)
@@ -224,139 +282,28 @@ namespace ix
 #endif
     }
 
-    bool Socket::init(std::string& errorMsg)
+    bool Socket::init()
     {
-        return _selectInterrupt->init(errorMsg);
+#ifdef _WIN32
+        INT rc;
+        WSADATA wsaData;
+        
+        rc = WSAStartup(MAKEWORD(2, 2), &wsaData);
+        return rc != 0;
+#else
+        return true;
+#endif
     }
 
-    bool Socket::writeBytes(const std::string& str,
-                            const CancellationRequest& isCancellationRequested)
+    void Socket::cleanup()
     {
-        while (true)
-        {
-            if (isCancellationRequested && isCancellationRequested()) return false;
-
-            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)
-            {
-                return ret == len;
-            }
-            // There is possibly something to be writen, try again
-            else if (ret < 0 && Socket::isWaitNeeded())
-            {
-                continue;
-            }
-            // There was an error during the write, abort
-            else
-            {
-                return false;
-            }
-        }
+#ifdef _WIN32
+        WSACleanup();
+#endif
     }
 
-    bool Socket::readByte(void* buffer,
-                          const CancellationRequest& isCancellationRequested)
+    void Socket::secureSocket()
     {
-        while (true)
-        {
-            if (isCancellationRequested && isCancellationRequested()) return false;
-
-            ssize_t ret;
-            ret = recv(buffer, 1);
-
-            // We read one byte, as needed, all good.
-            if (ret == 1)
-            {
-                return true;
-            }
-            // There is possibly something to be read, try again
-            else if (ret < 0 && Socket::isWaitNeeded())
-            {
-                // Wait with a 1ms timeout until the socket is ready to read.
-                // This way we are not busy looping
-                if (isReadyToRead(1) == PollResultType::Error)
-                {
-                    return false;
-                }
-            }
-            // There was an error during the read, abort
-            else
-            {
-                return false;
-            }
-        }
-    }
-
-    std::pair<bool, std::string> Socket::readLine(
-        const CancellationRequest& isCancellationRequested)
-    {
-        char c;
-        std::string line;
-        line.reserve(64);
-
-        for (int i = 0; i < 2 || (line[i-2] != '\r' && line[i-1] != '\n'); ++i)
-        {
-            if (!readByte(&c, isCancellationRequested))
-            {
-                // Return what we were able to read
-                return std::make_pair(false, line);
-            }
-
-            line += c;
-        }
-
-        return std::make_pair(true, line);
-    }
-
-    std::pair<bool, std::string> Socket::readBytes(
-        size_t length,
-        const OnProgressCallback& onProgressCallback,
-        const CancellationRequest& isCancellationRequested)
-    {
-        if (_readBuffer.empty())
-        {
-            _readBuffer.resize(kChunkSize);
-        }
-
-        std::vector<uint8_t> output;
-        while (output.size() != length)
-        {
-            if (isCancellationRequested && isCancellationRequested())
-            {
-                return std::make_pair(false, std::string());
-            }
-
-            size_t size = std::min(kChunkSize, length - output.size());
-            ssize_t ret = recv((char*)&_readBuffer[0], size);
-
-            if (ret <= 0 && !Socket::isWaitNeeded())
-            {
-                // Error
-                return std::make_pair(false, std::string());
-            }
-            else
-            {
-                output.insert(output.end(),
-                              _readBuffer.begin(),
-                              _readBuffer.begin() + ret);
-            }
-
-            if (onProgressCallback) onProgressCallback((int) output.size(), (int) length);
-
-            // Wait with a 1ms timeout until the socket is ready to read.
-            // This way we are not busy looping
-            if (isReadyToRead(1) == PollResultType::Error)
-            {
-                return std::make_pair(false, std::string());
-            }
-        }
-
-        return std::make_pair(true, std::string(output.begin(),
-                                                output.end()));
+        ;
     }
 }

ixwebsocket/IXSocket.h

@@ -6,106 +6,60 @@
 
 #pragma once
 
-#include <atomic>
-#include <functional>
-#include <memory>
-#include <mutex>
 #include <string>
-#include <vector>
+#include <functional>
+#include <mutex>
+#include <atomic>
 
-#ifdef _WIN32
-#include <BaseTsd.h>
-typedef SSIZE_T ssize_t;
+struct addrinfo;
 
-#undef EWOULDBLOCK
-#undef EAGAIN
-#undef EINPROGRESS
-#undef EBADF
-#undef EINVAL
-
-// map to WSA error codes
-#define EWOULDBLOCK WSAEWOULDBLOCK
-#define EAGAIN WSATRY_AGAIN
-#define EINPROGRESS WSAEINPROGRESS
-#define EBADF WSAEBADF
-#define EINVAL WSAEINVAL
-
-#endif
-
-#include "IXCancellationRequest.h"
-#include "IXProgressCallback.h"
-
-namespace ix
+namespace ix 
 {
-    class SelectInterrupt;
-
-    enum class PollResultType
-    {
-        ReadyForRead = 0,
-        ReadyForWrite = 1,
-        Timeout = 2,
-        Error = 3,
-        SendRequest = 4,
-        CloseRequest = 5
-    };
-
-    class Socket
-    {
+    class Socket {
     public:
-        Socket(int fd = -1);
+        using OnPollCallback = std::function<void()>;
+
+        Socket();
         virtual ~Socket();
-        bool init(std::string& errorMsg);
 
-        // Functions to check whether there is activity on the socket
-        PollResultType poll(int timeoutMs = kDefaultPollTimeout);
-        bool wakeUpFromPoll(uint64_t wakeUpCode);
+        int hostname_connect(const std::string& hostname,
+                             int port,
+                             std::string& errMsg);
+        void configure();
 
-        PollResultType isReadyToWrite(int timeoutMs);
-        PollResultType isReadyToRead(int timeoutMs);
+        virtual void poll(const OnPollCallback& onPollCallback);
+        virtual void wakeUpFromPoll();
 
         // Virtual methods
-        virtual bool connect(const std::string& url,
+        virtual bool connect(const std::string& url, 
                              int port,
-                             std::string& errMsg,
-                             const CancellationRequest& isCancellationRequested);
+                             std::string& errMsg);
         virtual void close();
 
-        virtual ssize_t send(char* buffer, size_t length);
-        virtual ssize_t send(const std::string& buffer);
-        virtual ssize_t recv(void* buffer, size_t length);
+        virtual int send(char* buffer, size_t length);
+        virtual int send(const std::string& buffer);
+        virtual int recv(void* buffer, size_t length);
 
-        // Blocking and cancellable versions, working with socket that can be set
-        // to non blocking mode. Used during HTTP upgrade.
-        bool readByte(void* buffer, const CancellationRequest& isCancellationRequested);
-        bool writeBytes(const std::string& str, const CancellationRequest& isCancellationRequested);
+        virtual void secureSocket(); // Windows
 
-        std::pair<bool, std::string> readLine(const CancellationRequest& isCancellationRequested);
-        std::pair<bool, std::string> readBytes(size_t length,
-                                               const OnProgressCallback& onProgressCallback,
-                                               const CancellationRequest& isCancellationRequested);
-
-        static int getErrno();
-        static bool isWaitNeeded();
-        static void closeSocket(int fd);
-
-        // Used as special codes for pipe communication
-        static const uint64_t kSendRequest;
-        static const uint64_t kCloseRequest;
+        int getErrno() const;
+        static bool init(); // Required on Windows to initialize WinSocket
+        static void cleanup(); // Required on Windows to cleanup WinSocket
 
     protected:
+        void wakeUpFromPollApple();
+        void wakeUpFromPollLinux();
+
+        void closeSocket(int fd);
+
         std::atomic<int> _sockfd;
+        int _eventfd;
         std::mutex _socketMutex;
 
     private:
-        PollResultType select(bool readyToRead, int timeoutMs);
-
-        static const int kDefaultPollTimeout;
-        static const int kDefaultPollNoTimeout;
-
-        // Buffer for reading from our socket. That buffer is never resized.
-        std::vector<uint8_t> _readBuffer;
-        static constexpr size_t kChunkSize = 1 << 15;
-
-        std::shared_ptr<SelectInterrupt> _selectInterrupt;
+        bool connectToAddress(const struct addrinfo *address, 
+                              int& sockfd,
+                              std::string& errMsg);
     };
-} // namespace ix
+
+}

ixwebsocket/IXSocketAppleSSL.cpp

@@ -6,7 +6,6 @@
  *  Adapted from Satori SDK Apple SSL code.
  */
 #include "IXSocketAppleSSL.h"
-#include "IXSocketConnect.h"
 
 #include <fcntl.h>
 #include <netdb.h>
@@ -20,6 +19,8 @@
 #include <unistd.h>
 #include <stdint.h>
 
+#include <iostream>
+
 #include <errno.h>
 #define socketerrno errno
 
@@ -48,7 +49,7 @@ OSStatus read_from_socket(SSLConnectionRef connection, void *data, size_t *len)
         else
             return noErr;
     }
-    else if (0 == status)
+    else if (0 == status) 
     {
         *len = 0;
         return errSSLClosedGraceful;
@@ -100,7 +101,7 @@ OSStatus write_to_socket(SSLConnectionRef connection, const void *data, size_t *
     else
     {
         *len = 0;
-        if (EAGAIN == errno)
+        if (EAGAIN == errno) 
         {
             return errSSLWouldBlock;
         }
@@ -139,9 +140,9 @@ std::string getSSLErrorDescription(OSStatus status)
 
 } // anonymous namespace
 
-namespace ix
+namespace ix 
 {
-    SocketAppleSSL::SocketAppleSSL(int fd) : Socket(fd),
+    SocketAppleSSL::SocketAppleSSL() : 
         _sslContext(nullptr)
     {
         ;
@@ -155,14 +156,13 @@ namespace ix
     // No wait support
     bool SocketAppleSSL::connect(const std::string& host,
                                  int port,
-                                 std::string& errMsg,
-                                 const CancellationRequest& isCancellationRequested)
+                                 std::string& errMsg)
     {
         OSStatus status;
         {
             std::lock_guard<std::mutex> lock(_mutex);
 
-            _sockfd = SocketConnect::connect(host, port, errMsg, isCancellationRequested);
+            _sockfd = Socket::hostname_connect(host, port, errMsg);
             if (_sockfd == -1) return false;
 
             _sslContext = SSLCreateContext(kCFAllocatorDefault, kSSLClientSide, kSSLStreamType);
@@ -174,11 +174,11 @@ namespace ix
 
             do {
                 status = SSLHandshake(_sslContext);
-            } while (errSSLWouldBlock == status ||
+            } while (errSSLWouldBlock == status || 
                      errSSLServerAuthCompleted == status);
         }
 
-        if (noErr != status)
+        if (noErr != status) 
         {
             errMsg = getSSLErrorDescription(status);
             close();
@@ -201,7 +201,7 @@ namespace ix
         Socket::close();
     }
 
-    ssize_t SocketAppleSSL::send(char* buf, size_t nbyte)
+    int SocketAppleSSL::send(char* buf, size_t nbyte)
     {
         ssize_t ret = 0;
         OSStatus status;
@@ -216,28 +216,28 @@ namespace ix
 
         if (ret == 0 && errSSLClosedAbort != status)
             ret = -1;
-        return ret;
+        return (int) ret;
     }
 
-    ssize_t SocketAppleSSL::send(const std::string& buffer)
+    int SocketAppleSSL::send(const std::string& buffer)
     {
         return send((char*)&buffer[0], buffer.size());
     }
 
     // No wait support
-    ssize_t SocketAppleSSL::recv(void* buf, size_t nbyte)
+    int SocketAppleSSL::recv(void* buf, size_t nbyte)
     {
         OSStatus status = errSSLWouldBlock;
-        while (errSSLWouldBlock == status)
+        while (errSSLWouldBlock == status) 
         {
             size_t processed = 0;
             std::lock_guard<std::mutex> lock(_mutex);
             status = SSLRead(_sslContext, buf, nbyte, &processed);
 
             if (processed > 0)
-                return (ssize_t) processed;
+                return (int) processed;
 
-            // The connection was reset, inform the caller that this
+            // The connection was reset, inform the caller that this 
             // Socket should close
             if (status == errSSLClosedGraceful ||
                 status == errSSLClosedNoNotify ||

ixwebsocket/IXSocketAppleSSL.h

@@ -6,33 +6,33 @@
 
 #pragma once
 
-#include "IXCancellationRequest.h"
 #include "IXSocket.h"
-#include <Security/SecureTransport.h>
+
 #include <Security/Security.h>
+#include <Security/SecureTransport.h>
+
 #include <mutex>
 
-namespace ix
+namespace ix 
 {
-    class SocketAppleSSL final : public Socket
+    class SocketAppleSSL : public Socket 
     {
     public:
-        SocketAppleSSL(int fd = -1);
+        SocketAppleSSL();
         ~SocketAppleSSL();
 
-        virtual bool connect(const std::string& host,
+        virtual bool connect(const std::string& host, 
                              int port,
-                             std::string& errMsg,
-                             const CancellationRequest& isCancellationRequested) final;
+                             std::string& errMsg) final;
         virtual void close() final;
 
-        virtual ssize_t send(char* buffer, size_t length) final;
-        virtual ssize_t send(const std::string& buffer) final;
-        virtual ssize_t recv(void* buffer, size_t length) final;
+        virtual int send(char* buffer, size_t length) final;
+        virtual int send(const std::string& buffer) final;
+        virtual int recv(void* buffer, size_t length) final;
 
     private:
         SSLContextRef _sslContext;
-        mutable std::mutex _mutex; // AppleSSL routines are not thread-safe
+        mutable std::mutex _mutex;  // AppleSSL routines are not thread-safe
     };
 
-} // namespace ix
+}

ixwebsocket/IXSocketConnect.cpp

@@ -1,180 +0,0 @@
-/*
- *  IXSocketConnect.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXSocketConnect.h"
-#include "IXDNSLookup.h"
-#include "IXNetSystem.h"
-#include "IXSocket.h"
-
-#include <string.h>
-#include <fcntl.h>
-#include <sys/types.h>
-
-// Android needs extra headers for TCP_NODELAY and IPPROTO_TCP
-#ifdef ANDROID
-# include <linux/in.h>
-# include <linux/tcp.h>
-#endif
-
-namespace ix
-{
-    //
-    // This function can be cancelled every 50 ms
-    // This is important so that we don't block the main UI thread when shutting down a connection which is
-    // already trying to reconnect, and can be blocked waiting for ::connect to respond.
-    //
-    int SocketConnect::connectToAddress(const struct addrinfo *address,
-                                        std::string& errMsg,
-                                        const CancellationRequest& isCancellationRequested)
-    {
-        errMsg = "no error";
-
-        int fd = socket(address->ai_family,
-                        address->ai_socktype,
-                        address->ai_protocol);
-        if (fd < 0)
-        {
-            errMsg = "Cannot create a socket";
-            return -1;
-        }
-
-        // Set the socket to non blocking mode, so that slow responses cannot
-        // block us for too long
-        SocketConnect::configure(fd);
-
-        int res = ::connect(fd, address->ai_addr, address->ai_addrlen);
-
-        if (res == -1 && !Socket::isWaitNeeded())
-        {
-            errMsg = strerror(Socket::getErrno());
-            Socket::closeSocket(fd);
-            return -1;
-        }
-
-        for (;;)
-        {
-            if (isCancellationRequested && isCancellationRequested()) // Must handle timeout as well
-            {
-                Socket::closeSocket(fd);
-                errMsg = "Cancelled";
-                return -1;
-            }
-
-            // On Linux the timeout needs to be re-initialized everytime
-            // http://man7.org/linux/man-pages/man2/select.2.html
-            struct timeval timeout;
-            timeout.tv_sec = 0;
-            timeout.tv_usec = 10 * 1000; // 10ms timeout
-
-            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, select error: ") + strerror(Socket::getErrno());
-                return -1;
-            }
-
-            // 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
-            {
-                Socket::closeSocket(fd);
-                errMsg = strerror(optval);
-                return -1;
-            }
-            else
-            {
-                // Success !
-                return fd;
-            }
-        }
-
-        Socket::closeSocket(fd);
-        errMsg = "connect timed out after 60 seconds";
-        return -1;
-    }
-
-    int SocketConnect::connect(const std::string& hostname,
-                               int port,
-                               std::string& errMsg,
-                               const CancellationRequest& isCancellationRequested)
-    {
-        //
-        // First do DNS resolution
-        //
-        DNSLookup dnsLookup(hostname, port);
-        struct addrinfo *res = dnsLookup.resolve(errMsg, isCancellationRequested);
-        if (res == nullptr)
-        {
-            return -1;
-        }
-
-        int sockfd = -1;
-
-        // iterate through the records to find a working peer
-        struct addrinfo *address;
-        for (address = res; address != nullptr; address = address->ai_next)
-        {
-            //
-            // Second try to connect to the remote host
-            //
-            sockfd = connectToAddress(address, errMsg, isCancellationRequested);
-            if (sockfd != -1)
-            {
-                break;
-            }
-        }
-
-        freeaddrinfo(res);
-        return sockfd;
-    }
-
-    // FIXME: configure is a terrible name
-    void SocketConnect::configure(int sockfd)
-    {
-        // 1. disable Nagle's algorithm
-        int flag = 1;
-        setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, (char*) &flag, sizeof(flag));
-
-        // 2. make socket non blocking
-#ifdef _WIN32
-        unsigned long nonblocking = 1;
-        ioctlsocket(sockfd, FIONBIO, &nonblocking);
-#else
-        fcntl(sockfd, F_SETFL, O_NONBLOCK); // make socket non blocking
-#endif
-
-        // 3. (apple) prevent SIGPIPE from being emitted when the remote end disconnect
-#ifdef SO_NOSIGPIPE
-        int value = 1;
-        setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE,
-                   (void *)&value, sizeof(value));
-#endif
-    }
-}

ixwebsocket/IXSocketConnect.h

@@ -1,31 +0,0 @@
-/*
- *  IXSocketConnect.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include "IXCancellationRequest.h"
-#include <string>
-
-struct addrinfo;
-
-namespace ix
-{
-    class SocketConnect
-    {
-    public:
-        static int connect(const std::string& hostname,
-                           int port,
-                           std::string& errMsg,
-                           const CancellationRequest& isCancellationRequested);
-
-        static void configure(int sockfd);
-
-    private:
-        static int connectToAddress(const struct addrinfo* address,
-                                    std::string& errMsg,
-                                    const CancellationRequest& isCancellationRequested);
-    };
-} // namespace ix

ixwebsocket/IXSocketFactory.cpp

@@ -1,78 +0,0 @@
-/*
- *  IXSocketFactory.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXSocketFactory.h"
-
-#ifdef IXWEBSOCKET_USE_TLS
-
-# ifdef IXWEBSOCKET_USE_MBED_TLS
-#  include <ixwebsocket/IXSocketMbedTLS.h>
-# elif __APPLE__
-#  include <ixwebsocket/IXSocketAppleSSL.h>
-# elif defined(_WIN32)
-#  include <ixwebsocket/IXSocketSChannel.h>
-# elif defined(IXWEBSOCKET_USE_OPEN_SSL)
-#  include <ixwebsocket/IXSocketOpenSSL.h>
-# endif
-
-#else
-
-#include <ixwebsocket/IXSocket.h>
-
-#endif
-
-namespace ix
-{
-    std::shared_ptr<Socket> createSocket(bool tls,
-                                         std::string& errorMsg)
-    {
-        errorMsg.clear();
-        std::shared_ptr<Socket> socket;
-
-        if (!tls)
-        {
-            socket = std::make_shared<Socket>();
-        }
-        else
-        {
-#ifdef IXWEBSOCKET_USE_TLS
-# if defined(IXWEBSOCKET_USE_MBED_TLS)
-            socket = std::make_shared<SocketMbedTLS>();
-# elif defined(__APPLE__)
-            socket = std::make_shared<SocketAppleSSL>();
-# elif defined(_WIN32)
-            socket = std::make_shared<SocketSChannel>();
-# else
-            socket = std::make_shared<SocketOpenSSL>();
-# endif
-#else
-            errorMsg = "TLS support is not enabled on this platform.";
-            return nullptr;
-#endif
-        }
-
-        if (!socket->init(errorMsg))
-        {
-            socket.reset();
-        }
-
-        return socket;
-    }
-
-    std::shared_ptr<Socket> createSocket(int fd,
-                                         std::string& errorMsg)
-    {
-        errorMsg.clear();
-
-        std::shared_ptr<Socket> socket = std::make_shared<Socket>(fd);
-        if (!socket->init(errorMsg))
-        {
-            socket.reset();
-        }
-
-        return socket;
-    }
-}

ixwebsocket/IXSocketFactory.h

@@ -1,19 +0,0 @@
-
-/*
- *  IXSocketFactory.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include <memory>
-#include <string>
-
-namespace ix
-{
-    class Socket;
-    std::shared_ptr<Socket> createSocket(bool tls, std::string& errorMsg);
-
-    std::shared_ptr<Socket> createSocket(int fd, std::string& errorMsg);
-} // namespace ix

ixwebsocket/IXSocketMbedTLS.cpp

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

ixwebsocket/IXSocketMbedTLS.h

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

ixwebsocket/IXSocketOpenSSL.cpp

@@ -7,9 +7,8 @@
  */
 
 #include "IXSocketOpenSSL.h"
-#include "IXSocketConnect.h"
-
 #include <cassert>
+#include <iostream>
 
 #include <openssl/x509v3.h>
 
@@ -17,16 +16,67 @@
 #include <errno.h>
 #define socketerrno errno
 
-namespace ix
-{
-    std::atomic<bool> SocketOpenSSL::_openSSLInitializationSuccessful(false);
-    std::once_flag SocketOpenSSL::_openSSLInitFlag;
+namespace {
 
-    SocketOpenSSL::SocketOpenSSL(int fd) : Socket(fd),
-        _ssl_connection(nullptr),
+std::mutex initMutex;
+bool openSSLInitialized = false;
+bool openSSLInitializationSuccessful = false;
+
+bool openSSLInitialize(std::string& errMsg)
+{
+    std::lock_guard<std::mutex> lock(initMutex);
+
+    if (openSSLInitialized)
+    {
+        return openSSLInitializationSuccessful;
+    }
+
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+    if (!OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, nullptr))
+    {
+        errMsg = "OPENSSL_init_ssl failure";
+
+        openSSLInitializationSuccessful = false;
+        openSSLInitialized = true;
+        return false;
+    }
+#else
+    (void) OPENSSL_config(nullptr);
+#endif
+
+    (void) OpenSSL_add_ssl_algorithms();
+    (void) SSL_load_error_strings();
+
+    openSSLInitializationSuccessful = true;
+    return true;
+}
+
+int openssl_verify_callback(int preverify, X509_STORE_CTX *x509_ctx)
+{
+    return preverify;
+}
+
+/* create new SSL connection state object */
+SSL *openssl_create_connection(SSL_CTX *ctx, int socket)
+{
+    assert(ctx != nullptr);
+    assert(socket > 0);
+
+    SSL *ssl = SSL_new(ctx);
+    if (ssl)
+        SSL_set_fd(ssl, socket);
+    return ssl;
+}
+
+} // anonymous namespace
+
+namespace ix 
+{
+    SocketOpenSSL::SocketOpenSSL() :
+        _ssl_connection(nullptr), 
         _ssl_context(nullptr)
     {
-        std::call_once(_openSSLInitFlag, &SocketOpenSSL::openSSLInitialize, this);
+        ;
     }
 
     SocketOpenSSL::~SocketOpenSSL()
@@ -34,20 +84,6 @@ namespace ix
         SocketOpenSSL::close();
     }
 
-    void SocketOpenSSL::openSSLInitialize()
-    {
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-        if (!OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, nullptr)) return;
-#else
-        (void) OPENSSL_config(nullptr);
-#endif
-
-        (void) OpenSSL_add_ssl_algorithms();
-        (void) SSL_load_error_strings();
-
-        _openSSLInitializationSuccessful = true;
-    }
-
     std::string SocketOpenSSL::getSSLError(int ret)
     {
         unsigned long e;
@@ -80,7 +116,7 @@ namespace ix
                 return "OpenSSL failed - underlying BIO reported an I/O error";
             }
         }
-        else if (err == SSL_ERROR_SSL)
+        else if (err == SSL_ERROR_SSL) 
         {
             e = ERR_get_error();
             std::string errMsg("OpenSSL failed - ");
@@ -114,13 +150,7 @@ namespace ix
         SSL_CTX* ctx = SSL_CTX_new(_ssl_method);
         if (ctx)
         {
-            // To skip verification, pass in SSL_VERIFY_NONE
-            SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER,
-                               [](int preverify, X509_STORE_CTX*) -> int
-                               {
-                                   return preverify;
-                               });
-
+            SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, openssl_verify_callback);
             SSL_CTX_set_verify_depth(ctx, 4);
             SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
         }
@@ -149,7 +179,7 @@ namespace ix
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
         // Check server name
         bool hostname_verifies_ok = false;
-        STACK_OF(GENERAL_NAME) *san_names =
+        STACK_OF(GENERAL_NAME) *san_names = 
             (STACK_OF(GENERAL_NAME)*) X509_get_ext_d2i((X509 *)server_cert,
                                                        NID_subject_alt_name, NULL, NULL);
         if (san_names)
@@ -160,8 +190,8 @@ namespace ix
                 if (sk_name->type == GEN_DNS)
                 {
                     char *name = (char *)ASN1_STRING_data(sk_name->d.dNSName);
-                    if ((size_t)ASN1_STRING_length(sk_name->d.dNSName) == strlen(name) &&
-                        checkHost(hostname, name))
+                    if ((size_t)ASN1_STRING_length(sk_name->d.dNSName) == strlen(name) && 
+                        checkHost(hostname, name)) 
                     {
                         hostname_verifies_ok = true;
                         break;
@@ -185,8 +215,8 @@ namespace ix
                     ASN1_STRING *cn_asn1 = X509_NAME_ENTRY_get_data(cn_entry);
                     char *cn = (char *)ASN1_STRING_data(cn_asn1);
 
-                    if ((size_t)ASN1_STRING_length(cn_asn1) == strlen(cn) &&
-                       checkHost(hostname, cn))
+                    if ((size_t)ASN1_STRING_length(cn_asn1) == strlen(cn) && 
+                       checkHost(hostname, cn)) 
                     {
                         hostname_verifies_ok = true;
                     }
@@ -205,7 +235,7 @@ namespace ix
         return true;
     }
 
-    bool SocketOpenSSL::openSSLHandshake(const std::string& host, std::string& errMsg)
+    bool SocketOpenSSL::openSSLHandshake(const std::string& host, std::string& errMsg) 
     {
         while (true)
         {
@@ -240,22 +270,21 @@ namespace ix
         }
     }
 
+    // No wait support
     bool SocketOpenSSL::connect(const std::string& host,
                                 int port,
-                                std::string& errMsg,
-                                const CancellationRequest& isCancellationRequested)
+                                std::string& errMsg)
     {
         bool handshakeSuccessful = false;
         {
             std::lock_guard<std::mutex> lock(_mutex);
 
-            if (!_openSSLInitializationSuccessful)
+            if (!openSSLInitialize(errMsg))
             {
-                errMsg = "OPENSSL_init_ssl failure";
                 return false;
             }
 
-            _sockfd = SocketConnect::connect(host, port, errMsg, isCancellationRequested);
+            _sockfd = Socket::hostname_connect(host, port, errMsg);
             if (_sockfd == -1) return false;
 
             _ssl_context = openSSLCreateContext(errMsg);
@@ -273,15 +302,14 @@ namespace ix
                 errMsg += ERR_error_string(ssl_err, nullptr);
             }
 
-            _ssl_connection = SSL_new(_ssl_context);
-            if (_ssl_connection == nullptr)
+            _ssl_connection = openssl_create_connection(_ssl_context, _sockfd);
+            if (nullptr == _ssl_connection)
             {
                 errMsg = "OpenSSL failed to connect";
                 SSL_CTX_free(_ssl_context);
                 _ssl_context = nullptr;
                 return false;
             }
-            SSL_set_fd(_ssl_connection, _sockfd);
 
             // SNI support
             SSL_set_tlsext_host_name(_ssl_connection, host.c_str());
@@ -325,7 +353,7 @@ namespace ix
         Socket::close();
     }
 
-    ssize_t SocketOpenSSL::send(char* buf, size_t nbyte)
+    int SocketOpenSSL::send(char* buf, size_t nbyte)
     {
         ssize_t sent = 0;
 
@@ -339,8 +367,8 @@ namespace ix
             }
 
             ERR_clear_error();
-            ssize_t write_result = SSL_write(_ssl_connection, buf + sent, (int) nbyte);
-            int reason = SSL_get_error(_ssl_connection, (int) write_result);
+            int write_result = SSL_write(_ssl_connection, buf + sent, (int) nbyte);
+            int reason = SSL_get_error(_ssl_connection, write_result);
 
             if (reason == SSL_ERROR_NONE) {
                 nbyte -= write_result;
@@ -352,15 +380,16 @@ namespace ix
                 return -1;
             }
         }
-        return sent;
+        return (int) sent;
     }
 
-    ssize_t SocketOpenSSL::send(const std::string& buffer)
+    int SocketOpenSSL::send(const std::string& buffer)
     {
         return send((char*)&buffer[0], buffer.size());
     }
 
-    ssize_t SocketOpenSSL::recv(void* buf, size_t nbyte)
+    // No wait support
+    int SocketOpenSSL::recv(void* buf, size_t nbyte)
     {
         while (true)
         {
@@ -372,20 +401,22 @@ namespace ix
             }
 
             ERR_clear_error();
-            ssize_t read_result = SSL_read(_ssl_connection, buf, (int) nbyte);
+            int read_result = SSL_read(_ssl_connection, buf, (int) nbyte);
 
             if (read_result > 0)
             {
                 return read_result;
             }
 
-            int reason = SSL_get_error(_ssl_connection, (int) read_result);
+            int reason = SSL_get_error(_ssl_connection, read_result);
 
             if (reason == SSL_ERROR_WANT_READ || reason == SSL_ERROR_WANT_WRITE)
             {
                 errno = EWOULDBLOCK;
+                return -1;
+            } else {
+                return -1;
             }
-            return -1;
         }
     }
 

ixwebsocket/IXSocketOpenSSL.h

@@ -6,48 +6,46 @@
 
 #pragma once
 
-#include "IXCancellationRequest.h"
 #include "IXSocket.h"
-#include <mutex>
+
 #include <openssl/bio.h>
+#include <openssl/hmac.h>
 #include <openssl/conf.h>
 #include <openssl/err.h>
-#include <openssl/hmac.h>
 #include <openssl/ssl.h>
 
-namespace ix
+#include <mutex>
+
+namespace ix 
 {
-    class SocketOpenSSL final : public Socket
+    class SocketOpenSSL : public Socket 
     {
     public:
-        SocketOpenSSL(int fd = -1);
+        SocketOpenSSL();
         ~SocketOpenSSL();
 
-        virtual bool connect(const std::string& host,
+        virtual bool connect(const std::string& host, 
                              int port,
-                             std::string& errMsg,
-                             const CancellationRequest& isCancellationRequested) final;
+                             std::string& errMsg) final;
         virtual void close() final;
 
-        virtual ssize_t send(char* buffer, size_t length) final;
-        virtual ssize_t send(const std::string& buffer) final;
-        virtual ssize_t recv(void* buffer, size_t length) final;
+        virtual int send(char* buffer, size_t length) final;
+        virtual int send(const std::string& buffer) final;
+        virtual int recv(void* buffer, size_t length) final;
 
     private:
-        void openSSLInitialize();
         std::string getSSLError(int ret);
         SSL_CTX* openSSLCreateContext(std::string& errMsg);
         bool openSSLHandshake(const std::string& hostname, std::string& errMsg);
-        bool openSSLCheckServerCert(SSL* ssl, const std::string& hostname, std::string& errMsg);
-        bool checkHost(const std::string& host, const char* pattern);
+        bool openSSLCheckServerCert(SSL *ssl,
+                                    const std::string& hostname,
+                                    std::string& errMsg);
+        bool checkHost(const std::string& host, const char *pattern);
 
-        SSL* _ssl_connection;
         SSL_CTX* _ssl_context;
+        SSL* _ssl_connection;
         const SSL_METHOD* _ssl_method;
-        mutable std::mutex _mutex; // OpenSSL routines are not thread-safe
-
-        static std::once_flag _openSSLInitFlag;
-        static std::atomic<bool> _openSSLInitializationSuccessful;
+        mutable std::mutex _mutex;  // OpenSSL routines are not thread-safe
     };
 
-} // namespace ix
+}

ixwebsocket/IXSocketSChannel.cpp

@@ -18,6 +18,7 @@
 # include <ws2def.h>
 # include <WS2tcpip.h>
 # include <schannel.h>
+# include <sslsock.h>
 # include <io.h>
 
 #define WIN32_LEAN_AND_MEAN
@@ -46,7 +47,7 @@
 // link with ntdsapi.lib for DsMakeSpn function
 #pragma comment(lib, "ntdsapi.lib")
 
-// The following function assumes that Winsock
+// The following function assumes that Winsock 
 // has already been initialized
 
 
@@ -58,7 +59,7 @@
 # error("This file should only be built on Windows")
 #endif
 
-namespace ix
+namespace ix 
 {
     SocketSChannel::SocketSChannel()
     {
@@ -67,20 +68,21 @@ namespace ix
 
     SocketSChannel::~SocketSChannel()
     {
-
+        
     }
 
     bool SocketSChannel::connect(const std::string& host,
                                  int port,
                                  std::string& errMsg)
     {
-        return Socket::connect(host, port, errMsg, nullptr);
+        return Socket::connect(host, port, errMsg);
     }
 
-
+    
     void SocketSChannel::secureSocket()
     {
         // there will be a lot to do here ...
+        // FIXME do something with sockerror
     }
 
     void SocketSChannel::close()
@@ -88,17 +90,17 @@ namespace ix
         Socket::close();
     }
 
-    ssize_t SocketSChannel::send(char* buf, size_t nbyte)
+    int SocketSChannel::send(char* buf, size_t nbyte)
     {
         return Socket::send(buf, nbyte);
     }
 
-    ssize_t SocketSChannel::send(const std::string& buffer)
+    int SocketSChannel::send(const std::string& buffer)
     {
         return Socket::send(buffer);
     }
 
-    ssize_t SocketSChannel::recv(void* buf, size_t nbyte)
+    int SocketSChannel::recv(void* buf, size_t nbyte)
     {
         return Socket::recv(buf, nbyte);
     }

ixwebsocket/IXSocketSChannel.h

@@ -8,25 +8,27 @@
 
 #include "IXSocket.h"
 
-namespace ix
+namespace ix 
 {
-    class SocketSChannel final : public Socket
+    class SocketSChannel : public Socket 
     {
     public:
         SocketSChannel();
         ~SocketSChannel();
 
-        virtual bool connect(const std::string& host, int port, std::string& errMsg) final;
+        virtual bool connect(const std::string& host, 
+                             int port,
+                             std::string& errMsg) final;
         virtual void close() final;
 
         // The important override
         virtual void secureSocket() final;
 
-        virtual ssize_t send(char* buffer, size_t length) final;
-        virtual ssize_t send(const std::string& buffer) final;
-        virtual ssize_t recv(void* buffer, size_t length) final;
+        virtual int send(char* buffer, size_t length) final;
+        virtual int send(const std::string& buffer) final;
+        virtual int recv(void* buffer, size_t length) final;
 
     private:
     };
 
-} // namespace ix
+}

ixwebsocket/IXSocketServer.cpp

@@ -1,319 +0,0 @@
-/*
- *  IXSocketServer.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXSocketServer.h"
-#include "IXSocket.h"
-#include "IXSocketConnect.h"
-#include "IXNetSystem.h"
-
-#include <iostream>
-#include <sstream>
-#include <future>
-#include <string.h>
-#include <assert.h>
-
-namespace ix
-{
-    const int SocketServer::kDefaultPort(8080);
-    const std::string SocketServer::kDefaultHost("127.0.0.1");
-    const int SocketServer::kDefaultTcpBacklog(5);
-    const size_t SocketServer::kDefaultMaxConnections(32);
-
-    SocketServer::SocketServer(int port,
-                               const std::string& host,
-                               int backlog,
-                               size_t maxConnections) :
-        _port(port),
-        _host(host),
-        _backlog(backlog),
-        _maxConnections(maxConnections),
-        _serverFd(-1),
-        _stop(false),
-        _stopGc(false),
-        _connectionStateFactory(&ConnectionState::createConnectionState)
-    {
-
-    }
-
-    SocketServer::~SocketServer()
-    {
-        stop();
-    }
-
-    void SocketServer::logError(const std::string& str)
-    {
-        std::lock_guard<std::mutex> lock(_logMutex);
-        std::cerr << str << std::endl;
-    }
-
-    void SocketServer::logInfo(const std::string& str)
-    {
-        std::lock_guard<std::mutex> lock(_logMutex);
-        std::cout << str << std::endl;
-    }
-
-    std::pair<bool, std::string> SocketServer::listen()
-    {
-        struct sockaddr_in server; // server address information
-
-        // Get a socket for accepting connections.
-        if ((_serverFd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-        {
-            std::stringstream ss;
-            ss << "SocketServer::listen() error creating socket): "
-               << strerror(Socket::getErrno());
-
-            return std::make_pair(false, ss.str());
-        }
-
-        // Make that socket reusable. (allow restarting this server at will)
-        int enable = 1;
-        if (setsockopt(_serverFd, SOL_SOCKET, SO_REUSEADDR,
-                       (char*) &enable, sizeof(enable)) < 0)
-        {
-            std::stringstream ss;
-            ss << "SocketServer::listen() error calling setsockopt(SO_REUSEADDR) "
-               << "at address " << _host << ":" << _port
-               << " : " << strerror(Socket::getErrno());
-
-            Socket::closeSocket(_serverFd);
-            return std::make_pair(false, ss.str());
-        }
-
-        // Bind the socket to the server address.
-        server.sin_family = AF_INET;
-        server.sin_port   = htons(_port);
-
-        // Using INADDR_ANY trigger a pop-up box as binding to any address is detected
-        // by the osx firewall. We need to codesign the binary with a self-signed cert
-        // to allow that, but this is a bit of a pain. (this is what node or python would do).
-        //
-        // Using INADDR_LOOPBACK also does not work ... while it should.
-        // We default to 127.0.0.1 (localhost)
-        //
-        server.sin_addr.s_addr = inet_addr(_host.c_str());
-
-        if (bind(_serverFd, (struct sockaddr *)&server, sizeof(server)) < 0)
-        {
-            std::stringstream ss;
-            ss << "SocketServer::listen() error calling bind "
-               << "at address " << _host << ":" << _port
-               << " : " << strerror(Socket::getErrno());
-
-            Socket::closeSocket(_serverFd);
-            return std::make_pair(false, ss.str());
-        }
-
-        //
-        // Listen for connections. Specify the tcp backlog.
-        //
-        if (::listen(_serverFd, _backlog) < 0)
-        {
-            std::stringstream ss;
-            ss << "SocketServer::listen() error calling listen "
-               << "at address " << _host << ":" << _port
-               << " : " << strerror(Socket::getErrno());
-
-            Socket::closeSocket(_serverFd);
-            return std::make_pair(false, ss.str());
-        }
-
-        return std::make_pair(true, "");
-    }
-
-    void SocketServer::start()
-    {
-        if (!_thread.joinable())
-        {
-            _thread = std::thread(&SocketServer::run, this);
-        }
-
-        if (!_gcThread.joinable())
-        {
-            _gcThread = std::thread(&SocketServer::runGC, this);
-        }
-    }
-
-    void SocketServer::wait()
-    {
-        std::unique_lock<std::mutex> lock(_conditionVariableMutex);
-        _conditionVariable.wait(lock);
-    }
-
-    void SocketServer::stopAcceptingConnections()
-    {
-        _stop = true;
-    }
-
-    void SocketServer::stop()
-    {
-        // Stop accepting connections, and close the 'accept' thread
-        if (_thread.joinable())
-        {
-            _stop = true;
-            _thread.join();
-            _stop = false;
-        }
-
-        // Join all threads and make sure that all connections are terminated
-        if (_gcThread.joinable())
-        {
-            _stopGc = true;
-            _gcThread.join();
-            _stopGc = false;
-        }
-
-        _conditionVariable.notify_one();
-        Socket::closeSocket(_serverFd);
-    }
-
-    void SocketServer::setConnectionStateFactory(
-        const ConnectionStateFactory& connectionStateFactory)
-    {
-        _connectionStateFactory = connectionStateFactory;
-    }
-
-    //
-    // join the threads for connections that have been closed
-    //
-    // When a connection is closed by a client, the connection state terminated
-    // field becomes true, and we can use that to know that we can join that thread
-    // and remove it from our _connectionsThreads data structure (a list).
-    //
-    void SocketServer::closeTerminatedThreads()
-    {
-        std::lock_guard<std::mutex> lock(_connectionsThreadsMutex);
-        auto it = _connectionsThreads.begin();
-        auto itEnd  = _connectionsThreads.end();
-
-        while (it != itEnd)
-        {
-            auto& connectionState = it->first;
-            auto& thread = it->second;
-
-            if (!connectionState->isTerminated())
-            {
-                ++it;
-                continue;
-            }
-
-            if (thread.joinable()) thread.join();
-            it = _connectionsThreads.erase(it);
-        }
-    }
-
-    void SocketServer::run()
-    {
-        // Set the socket to non blocking mode, so that accept calls are not blocking
-        SocketConnect::configure(_serverFd);
-
-        for (;;)
-        {
-            if (_stop) return;
-
-            // 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
-
-            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: "
-                   << strerror(Socket::getErrno());
-                logError(ss.str());
-                continue;
-            }
-
-            if (!FD_ISSET(_serverFd, &rfds))
-            {
-                // We reached the select timeout, and no new connections are pending
-                continue;
-            }
-
-            // Accept a connection.
-            struct sockaddr_in client; // client address information
-            int clientFd;              // socket connected to client
-            socklen_t addressLen = sizeof(client);
-            memset(&client, 0, sizeof(client));
-
-            if ((clientFd = accept(_serverFd, (struct sockaddr *)&client, &addressLen)) < 0)
-            {
-                if (!Socket::isWaitNeeded())
-                {
-                    // FIXME: that error should be propagated
-                    int err = Socket::getErrno();
-                    std::stringstream ss;
-                    ss << "SocketServer::run() error accepting connection: "
-                       << err << ", " << strerror(err);
-                    logError(ss.str());
-                }
-                continue;
-            }
-
-            if (getConnectedClientsCount() >= _maxConnections)
-            {
-                std::stringstream ss;
-                ss << "SocketServer::run() reached max connections = "
-                   << _maxConnections << ". "
-                   << "Not accepting connection";
-                logError(ss.str());
-
-                Socket::closeSocket(clientFd);
-
-                continue;
-            }
-
-            std::shared_ptr<ConnectionState> connectionState;
-            if (_connectionStateFactory)
-            {
-                connectionState = _connectionStateFactory();
-            }
-
-            if (_stop) return;
-
-            // Launch the handleConnection work asynchronously in its own thread.
-            std::lock_guard<std::mutex> lock(_connectionsThreadsMutex);
-            _connectionsThreads.push_back(std::make_pair(
-                    connectionState,
-                    std::thread(&SocketServer::handleConnection,
-                                this,
-                                clientFd,
-                                connectionState)));
-        }
-    }
-
-    size_t SocketServer::getConnectionsThreadsCount()
-    {
-        std::lock_guard<std::mutex> lock(_connectionsThreadsMutex);
-        return _connectionsThreads.size();
-    }
-
-    void SocketServer::runGC()
-    {
-        for (;;)
-        {
-            // Garbage collection to shutdown/join threads for closed connections.
-            closeTerminatedThreads();
-
-            // We quit this thread if all connections are closed and we received
-            // a stop request by setting _stopGc to true.
-            if (_stopGc && getConnectionsThreadsCount() == 0)
-            {
-                break;
-            }
-
-            // Sleep a little bit then keep cleaning up
-            std::this_thread::sleep_for(std::chrono::milliseconds(10));
-        }
-    }
-}
-

ixwebsocket/IXSocketServer.h

@@ -1,102 +0,0 @@
-/*
- *  IXSocketServer.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include "IXConnectionState.h"
-#include <atomic>
-#include <condition_variable>
-#include <functional>
-#include <list>
-#include <memory>
-#include <mutex>
-#include <set>
-#include <string>
-#include <thread>
-#include <utility> // pair
-
-namespace ix
-{
-    class SocketServer
-    {
-    public:
-        using ConnectionStateFactory = std::function<std::shared_ptr<ConnectionState>()>;
-
-        // Each connection is handled by its own worker thread.
-        // We use a list as we only care about remove and append operations.
-        using ConnectionThreads =
-            std::list<std::pair<std::shared_ptr<ConnectionState>, std::thread>>;
-
-        SocketServer(int port = SocketServer::kDefaultPort,
-                     const std::string& host = SocketServer::kDefaultHost,
-                     int backlog = SocketServer::kDefaultTcpBacklog,
-                     size_t maxConnections = SocketServer::kDefaultMaxConnections);
-        virtual ~SocketServer();
-        virtual void stop();
-
-        // It is possible to override ConnectionState through inheritance
-        // this method allows user to change the factory by returning an object
-        // that inherits from ConnectionState but has its own methods.
-        void setConnectionStateFactory(const ConnectionStateFactory& connectionStateFactory);
-
-        const static int kDefaultPort;
-        const static std::string kDefaultHost;
-        const static int kDefaultTcpBacklog;
-        const static size_t kDefaultMaxConnections;
-
-        void start();
-        std::pair<bool, std::string> listen();
-        void wait();
-
-    protected:
-        // Logging
-        void logError(const std::string& str);
-        void logInfo(const std::string& str);
-
-        void stopAcceptingConnections();
-
-    private:
-        // Member variables
-        int _port;
-        std::string _host;
-        int _backlog;
-        size_t _maxConnections;
-
-        // socket for accepting connections
-        int _serverFd;
-
-        std::mutex _logMutex;
-
-        // background thread to wait for incoming connections
-        std::atomic<bool> _stop;
-        std::thread _thread;
-        void run();
-
-        // background thread to cleanup (join) terminated threads
-        std::atomic<bool> _stopGc;
-        std::thread _gcThread;
-        void runGC();
-
-        // the list of (connectionState, threads) for each connections
-        ConnectionThreads _connectionsThreads;
-        std::mutex _connectionsThreadsMutex;
-
-        // used to have the main control thread for a server
-        // wait for a 'terminate' notification without busy polling
-        std::condition_variable _conditionVariable;
-        std::mutex _conditionVariableMutex;
-
-        // the factory to create ConnectionState objects
-        ConnectionStateFactory _connectionStateFactory;
-
-        virtual void handleConnection(int fd, std::shared_ptr<ConnectionState> connectionState) = 0;
-        virtual size_t getConnectedClientsCount() = 0;
-
-        // Returns true if all connection threads are joined
-        void closeTerminatedThreads();
-        size_t getConnectionsThreadsCount();
-    };
-} // namespace ix

ixwebsocket/IXUrlParser.cpp

@@ -1,67 +0,0 @@
-/*
- *  IXUrlParser.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXUrlParser.h"
-#include "LUrlParser.h"
-
-namespace ix
-{
-    bool UrlParser::parse(const std::string& url,
-                          std::string& protocol,
-                          std::string& host,
-                          std::string& path,
-                          std::string& query,
-                          int& port)
-    {
-        LUrlParser::clParseURL res = LUrlParser::clParseURL::ParseURL(url);
-
-        if (!res.IsValid())
-        {
-            return false;
-        }
-
-        protocol = res.m_Scheme;
-        host     = res.m_Host;
-        path     = res.m_Path;
-        query    = res.m_Query;
-
-        if (!res.GetPort(&port))
-        {
-            if (protocol == "ws" || protocol == "http")
-            {
-                port = 80;
-            }
-            else if (protocol == "wss" || protocol == "https")
-            {
-                port = 443;
-            }
-            else
-            {
-                // Invalid protocol. Should be caught by regex check
-                // but this missing branch trigger cpplint linter.
-                return false;
-            }
-        }
-
-        if (path.empty())
-        {
-            path = "/";
-        }
-        else if (path[0] != '/')
-        {
-            path = '/' + path;
-        }
-
-        if (!query.empty())
-        {
-            path += "?";
-            path += query;
-        }
-
-        return true;
-    }
-
-}

ixwebsocket/IXUrlParser.h

@@ -1,23 +0,0 @@
-/*
- *  IXUrlParser.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include <string>
-
-namespace ix
-{
-    class UrlParser
-    {
-    public:
-        static bool parse(const std::string& url,
-                          std::string& protocol,
-                          std::string& host,
-                          std::string& path,
-                          std::string& query,
-                          int& port);
-    };
-} // namespace ix

ixwebsocket/IXWebSocket.cpp

@@ -5,145 +5,51 @@
  */
 
 #include "IXWebSocket.h"
-#include "IXSetThreadName.h"
-#include "IXWebSocketHandshake.h"
 
+#include <iostream>
 #include <cmath>
 #include <cassert>
 
-namespace
-{
-    uint64_t calculateRetryWaitMilliseconds(uint32_t retry_count)
+namespace {
+
+    // FIXME: put this in a shared location, and use it in 
+    uint64_t calculateRetryWaitMilliseconds(uint64_t retry_count)
     {
-        uint64_t wait_time;
+        // This will overflow quite fast for large value of retry_count
+        // and will become 0, in which case the wait time will be none
+        // and we'll be constantly retrying to connect.
+        uint64_t wait_time = ((uint64_t) std::pow(2, retry_count) * 100L);
 
-        if (retry_count <= 6)
-        {
-            // max wait_time is 6400 ms (2 ^ 6 = 64)
-            wait_time = ((uint64_t)std::pow(2, retry_count) * 100L);
-        }
-        else
-        {
-            wait_time = 10 * 1000; // 10 sec
-        }
-
-        return wait_time;
+        // cap the wait time to 10s, or to retry_count == 10 for which wait_time > 10s
+        uint64_t tenSeconds = 10 * 1000;
+        return (wait_time > tenSeconds || retry_count > 10) ? tenSeconds : wait_time;
     }
+
 }
 
-namespace ix
-{
+namespace ix {
+
     OnTrafficTrackerCallback WebSocket::_onTrafficTrackerCallback = nullptr;
-    const int WebSocket::kDefaultHandShakeTimeoutSecs(60);
-    const int WebSocket::kDefaultPingIntervalSecs(-1);
-    const int WebSocket::kDefaultPingTimeoutSecs(-1);
-    const bool WebSocket::kDefaultEnablePong(true);
 
     WebSocket::WebSocket() :
+        _verbose(false),
         _onMessageCallback(OnMessageCallback()),
         _stop(false),
-        _automaticReconnection(true),
-        _handshakeTimeoutSecs(kDefaultHandShakeTimeoutSecs),
-        _enablePong(kDefaultEnablePong),
-        _pingIntervalSecs(kDefaultPingIntervalSecs),
-        _pingTimeoutSecs(kDefaultPingTimeoutSecs)
+        _automaticReconnection(true)
     {
-        _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)));
-            }
-        );
     }
 
-    WebSocket::~WebSocket()
+    WebSocket::~WebSocket() 
     {
         stop();
     }
 
-    void WebSocket::setUrl(const std::string& url)
+    void WebSocket::configure(const std::string& url)
     {
-        std::lock_guard<std::mutex> lock(_configMutex);
+        std::lock_guard<std::mutex> lock(_urlMutex);
         _url = url;
     }
 
-    const std::string& WebSocket::getUrl() const
-    {
-        std::lock_guard<std::mutex> lock(_configMutex);
-        return _url;
-    }
-
-    void WebSocket::setPerMessageDeflateOptions(const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions)
-    {
-        std::lock_guard<std::mutex> lock(_configMutex);
-        _perMessageDeflateOptions = perMessageDeflateOptions;
-    }
-
-    const WebSocketPerMessageDeflateOptions& WebSocket::getPerMessageDeflateOptions() const
-    {
-        std::lock_guard<std::mutex> lock(_configMutex);
-        return _perMessageDeflateOptions;
-    }
-
-    void WebSocket::setHeartBeatPeriod(int heartBeatPeriodSecs)
-    {
-        std::lock_guard<std::mutex> lock(_configMutex);
-        _pingIntervalSecs = heartBeatPeriodSecs;
-    }
-
-    int WebSocket::getHeartBeatPeriod() const
-    {
-        std::lock_guard<std::mutex> lock(_configMutex);
-        return _pingIntervalSecs;
-    }
-
-    void WebSocket::setPingInterval(int pingIntervalSecs)
-    {
-        std::lock_guard<std::mutex> lock(_configMutex);
-        _pingIntervalSecs = pingIntervalSecs;
-    }
-
-    int WebSocket::getPingInterval() const
-    {
-        std::lock_guard<std::mutex> lock(_configMutex);
-        return _pingIntervalSecs;
-    }
-
-    void WebSocket::setPingTimeout(int pingTimeoutSecs)
-    {
-        std::lock_guard<std::mutex> lock(_configMutex);
-        _pingTimeoutSecs = pingTimeoutSecs;
-    }
-
-    int WebSocket::getPingTimeout() const
-    {
-        std::lock_guard<std::mutex> lock(_configMutex);
-        return _pingTimeoutSecs;
-    }
-
-    void WebSocket::enablePong()
-    {
-        std::lock_guard<std::mutex> lock(_configMutex);
-        _enablePong = true;
-    }
-
-    void WebSocket::disablePong()
-    {
-        std::lock_guard<std::mutex> lock(_configMutex);
-        _enablePong = false;
-    }
-
-    void WebSocket::disablePerMessageDeflate()
-    {
-        std::lock_guard<std::mutex> lock(_configMutex);
-        WebSocketPerMessageDeflateOptions perMessageDeflateOptions(false);
-        _perMessageDeflateOptions = perMessageDeflateOptions;
-    }
-
     void WebSocket::start()
     {
         if (_thread.joinable()) return; // we've already been started
@@ -151,212 +57,149 @@ namespace ix
         _thread = std::thread(&WebSocket::run, this);
     }
 
-    void WebSocket::stop(uint16_t code,
-                         const std::string& reason)
+    void WebSocket::stop()
     {
-        close(code, reason);
+        _automaticReconnection = false;
 
-        if (_thread.joinable())
+        close();
+
+        if (!_thread.joinable())
         {
-            // wait until working thread will exit
-            // it will exit after close operation is finished
-            _stop = true;
-            _thread.join();
-            _stop = false;
+            _automaticReconnection = true;
+            return;
         }
+
+        _stop = true;
+        _thread.join();
+        _stop = false;
+
+        _automaticReconnection = true;
     }
 
-    WebSocketInitResult WebSocket::connect(int timeoutSecs)
+    WebSocketInitResult WebSocket::connect()
     {
         {
-            std::lock_guard<std::mutex> lock(_configMutex);
-            _ws.configure(_perMessageDeflateOptions,
-                          _enablePong,
-                          _pingIntervalSecs,
-                          _pingTimeoutSecs);
+            std::lock_guard<std::mutex> lock(_urlMutex);
+            _ws.configure(_url);
         }
 
-        WebSocketInitResult status = _ws.connectToUrl(_url, timeoutSecs);
+        _ws.setOnStateChangeCallback(
+            [this](WebSocketTransport::ReadyStateValues readyStateValue)
+            {
+                if (readyStateValue == WebSocketTransport::CLOSED)
+                {
+                    _onMessageCallback(WebSocket_MessageType_Close, "", WebSocketErrorInfo());
+                }
+
+                if (_verbose)
+                {
+                    std::cout << "connection state changed -> " 
+                              << readyStateToString(getReadyState()) 
+                              << std::endl;
+                }
+            }
+        );
+
+        WebSocketInitResult status = _ws.init();
         if (!status.success)
         {
             return status;
         }
 
-        _onMessageCallback(
-            std::make_shared<WebSocketMessage>(
-                WebSocketMessageType::Open, "", 0,
-                WebSocketErrorInfo(),
-                WebSocketOpenInfo(status.uri, status.headers),
-                WebSocketCloseInfo()));
-        return status;
-    }
-
-    WebSocketInitResult WebSocket::connectToSocket(int fd, int timeoutSecs)
-    {
-        {
-            std::lock_guard<std::mutex> lock(_configMutex);
-            _ws.configure(_perMessageDeflateOptions,
-                          _enablePong,
-                          _pingIntervalSecs,
-                          _pingTimeoutSecs);
-        }
-
-        WebSocketInitResult status = _ws.connectToSocket(fd, timeoutSecs);
-        if (!status.success)
-        {
-            return status;
-        }
-
-        _onMessageCallback(
-                std::make_shared<WebSocketMessage>(
-                    WebSocketMessageType::Open, "", 0,
-                    WebSocketErrorInfo(),
-                    WebSocketOpenInfo(status.uri, status.headers),
-                    WebSocketCloseInfo()));
+        _onMessageCallback(WebSocket_MessageType_Open, "", WebSocketErrorInfo());
         return status;
     }
 
     bool WebSocket::isConnected() const
     {
-        return getReadyState() == ReadyState::Open;
+        return getReadyState() == WebSocket_ReadyState_Open;
     }
 
     bool WebSocket::isClosing() const
     {
-        return getReadyState() == ReadyState::Closing;
+        return getReadyState() == WebSocket_ReadyState_Closing;
     }
 
-    void WebSocket::close(uint16_t code,
-                          const std::string& reason)
+    void WebSocket::close()
     {
-        _ws.close(code, reason);
+        _ws.close();
     }
 
-    void WebSocket::checkConnection(bool firstConnectionAttempt)
+    void WebSocket::reconnectPerpetuallyIfDisconnected()
     {
+        uint64_t retries = 0;
+        WebSocketErrorInfo connectErr;
+        ix::WebSocketInitResult status;
         using millis = std::chrono::duration<double, std::milli>;
+        millis duration;
 
-        uint32_t retries = 0;
-        millis duration(0);
-
-        // Try to connect perpertually
-        while (true)
+        while (true) 
         {
-            if (isConnected() || isClosing() || _stop)
+            if (isConnected() || isClosing() || _stop || !_automaticReconnection)
             {
                 break;
             }
 
-            if (!firstConnectionAttempt && !_automaticReconnection)
+            status = connect();
+
+            if (!status.success && !_stop)
             {
-                // Do not attempt to reconnect
-                break;
-            }
+                duration = millis(calculateRetryWaitMilliseconds(retries++));
 
-            firstConnectionAttempt = false;
-
-            // Only sleep if we are retrying
-            if (duration.count() > 0)
-            {
-                // to do: make sleeping conditional
-                std::this_thread::sleep_for(duration);
-            }
-
-            // Try to connect synchronously
-            ix::WebSocketInitResult status = connect(_handshakeTimeoutSecs);
-
-            if (!status.success)
-            {
-                WebSocketErrorInfo connectErr;
-
-                if (_automaticReconnection)
-                {
-                    duration = millis(calculateRetryWaitMilliseconds(retries++));
-
-                    connectErr.wait_time = duration.count();
-                    connectErr.retries = retries;
-                }
-
-                connectErr.reason      = status.errorStr;
+                connectErr.retries = retries;
+                connectErr.wait_time = duration.count();
+                connectErr.reason = status.errorStr;
                 connectErr.http_status = status.http_status;
+                _onMessageCallback(WebSocket_MessageType_Error, "", connectErr);
 
-                _onMessageCallback(
-                     std::make_shared<WebSocketMessage>(
-                        WebSocketMessageType::Error, "", 0,
-                        connectErr, WebSocketOpenInfo(),
-                        WebSocketCloseInfo()));
+                if (_verbose) std::cout << "Sleeping for " << duration.count() << "ms" << std::endl;
+
+                std::this_thread::sleep_for(duration);
             }
         }
     }
 
     void WebSocket::run()
     {
-        setThreadName(getUrl());
-
-        bool firstConnectionAttempt = true;
-
-        while (true)
+        while (true) 
         {
+            if (_stop) return;
+
             // 1. Make sure we are always connected
-            checkConnection(firstConnectionAttempt);
+            reconnectPerpetuallyIfDisconnected();
 
-            firstConnectionAttempt = false;
+            if (_stop) return;
 
-            // if here we are closed then checkConnection was not able to connect
-            if (getReadyState() == ReadyState::Closed)
-            {
-                break;
-            }
+            // 2. Poll to see if there's any new data available 
+            _ws.poll();
 
-            // We can avoid to poll if we want to stop and are not closing
-            if (_stop && !isClosing()) break;
-
-            // 2. Poll to see if there's any new data available
-            WebSocketTransport::PollResult pollResult = _ws.poll();
+            if (_stop) return;
 
             // 3. Dispatch the incoming messages
             _ws.dispatch(
-                pollResult,
                 [this](const std::string& msg,
-                       size_t wireSize,
-                       bool decompressionError,
                        WebSocketTransport::MessageKind messageKind)
                 {
                     WebSocketMessageType webSocketMessageType;
                     switch (messageKind)
                     {
-                        case WebSocketTransport::MessageKind::MSG_TEXT:
-                        case WebSocketTransport::MessageKind::MSG_BINARY:
+                        case WebSocketTransport::MSG:
                         {
-                            webSocketMessageType = WebSocketMessageType::Message;
+                            webSocketMessageType = WebSocket_MessageType_Message;
                         } break;
 
-                        case WebSocketTransport::MessageKind::PING:
+                        case WebSocketTransport::PING:
                         {
-                            webSocketMessageType = WebSocketMessageType::Ping;
+                            webSocketMessageType = WebSocket_MessageType_Ping;
                         } break;
 
-                        case WebSocketTransport::MessageKind::PONG:
+                        case WebSocketTransport::PONG:
                         {
-                            webSocketMessageType = WebSocketMessageType::Pong;
-                        } break;
-
-                        case WebSocketTransport::MessageKind::FRAGMENT:
-                        {
-                            webSocketMessageType = WebSocketMessageType::Fragment;
+                            webSocketMessageType = WebSocket_MessageType_Pong;
                         } break;
                     }
 
-                    WebSocketErrorInfo webSocketErrorInfo;
-                    webSocketErrorInfo.decompressionError = decompressionError;
-
-                    bool binary = messageKind == WebSocketTransport::MessageKind::MSG_BINARY;
-
-                    _onMessageCallback(
-                         std::make_shared<WebSocketMessage>(
-                            webSocketMessageType, msg, wireSize,
-                            webSocketErrorInfo, WebSocketOpenInfo(),
-                            WebSocketCloseInfo(), binary));
+                    _onMessageCallback(webSocketMessageType, msg, WebSocketErrorInfo());
 
                     WebSocket::invokeTrafficTrackerCallback(msg.size(), true);
                 });
@@ -365,7 +208,7 @@ namespace ix
 
     void WebSocket::setOnMessageCallback(const OnMessageCallback& callback)
     {
-        _onMessageCallback = callback;
+        _onMessageCallback = callback; 
     }
 
     void WebSocket::setTrafficTrackerCallback(const OnTrafficTrackerCallback& callback)
@@ -386,41 +229,23 @@ namespace ix
         }
     }
 
-    WebSocketSendInfo WebSocket::send(const std::string& data,
-                                      bool binary,
-                                      const OnProgressCallback& onProgressCallback)
+    bool WebSocket::send(const std::string& text)
     {
-        return sendMessage(data,
-                           (binary) ? SendMessageKind::Binary: SendMessageKind::Text,
-                           onProgressCallback);
+        return sendMessage(text, false);
     }
 
-    WebSocketSendInfo WebSocket::sendBinary(const std::string& text,
-                                            const OnProgressCallback& onProgressCallback)
-    {
-        return sendMessage(text, SendMessageKind::Binary, onProgressCallback);
-    }
-
-    WebSocketSendInfo WebSocket::sendText(const std::string& text,
-                                          const OnProgressCallback& onProgressCallback)
-    {
-        return sendMessage(text, SendMessageKind::Text, onProgressCallback);
-    }
-
-    WebSocketSendInfo WebSocket::ping(const std::string& text)
+    bool WebSocket::ping(const std::string& text)
     {
         // Standard limit ping message size
         constexpr size_t pingMaxPayloadSize = 125;
-        if (text.size() > pingMaxPayloadSize) return WebSocketSendInfo(false);
+        if (text.size() > pingMaxPayloadSize) return false;
 
-        return sendMessage(text, SendMessageKind::Ping);
+        return sendMessage(text, true);
     }
 
-    WebSocketSendInfo WebSocket::sendMessage(const std::string& text,
-                                             SendMessageKind sendMessageKind,
-                                             const OnProgressCallback& onProgressCallback)
+    bool WebSocket::sendMessage(const std::string& text, bool ping)
     {
-        if (!isConnected()) return WebSocketSendInfo(false);
+        if (!isConnected()) return false;
 
         //
         // It is OK to read and write on the same socket in 2 different threads.
@@ -432,40 +257,29 @@ namespace ix
         // incoming messages are arriving / there's data to be received.
         //
         std::lock_guard<std::mutex> lock(_writeMutex);
-        WebSocketSendInfo webSocketSendInfo;
 
-        switch (sendMessageKind)
+        if (ping)
         {
-            case SendMessageKind::Text:
-            {
-                webSocketSendInfo = _ws.sendText(text, onProgressCallback);
-            } break;
-
-            case SendMessageKind::Binary:
-            {
-                webSocketSendInfo = _ws.sendBinary(text, onProgressCallback);
-            } break;
-
-            case SendMessageKind::Ping:
-            {
-                webSocketSendInfo = _ws.sendPing(text);
-            } break;
+            _ws.sendPing(text);
+        }
+        else
+        {
+            _ws.sendBinary(text);
         }
 
-        WebSocket::invokeTrafficTrackerCallback(webSocketSendInfo.wireSize, false);
+        WebSocket::invokeTrafficTrackerCallback(text.size(), false);
 
-        return webSocketSendInfo;
+        return true;
     }
 
     ReadyState WebSocket::getReadyState() const
     {
-        switch (_ws.getReadyState())
+        switch (_ws.getReadyState()) 
         {
-            case ix::WebSocketTransport::ReadyState::OPEN      : return ReadyState::Open;
-            case ix::WebSocketTransport::ReadyState::CONNECTING: return ReadyState::Connecting;
-            case ix::WebSocketTransport::ReadyState::CLOSING   : return ReadyState::Closing;
-            case ix::WebSocketTransport::ReadyState::CLOSED    : return ReadyState::Closed;
-            default: return ReadyState::Closed;
+            case ix::WebSocketTransport::OPEN: return WebSocket_ReadyState_Open;
+            case ix::WebSocketTransport::CONNECTING: return WebSocket_ReadyState_Connecting;
+            case ix::WebSocketTransport::CLOSING: return WebSocket_ReadyState_Closing;
+            case ix::WebSocketTransport::CLOSED: return WebSocket_ReadyState_Closed;
         }
     }
 
@@ -473,31 +287,16 @@ namespace ix
     {
         switch (readyState)
         {
-            case ReadyState::Open      : return "OPEN";
-            case ReadyState::Connecting: return "CONNECTING";
-            case ReadyState::Closing   : return "CLOSING";
-            case ReadyState::Closed    : return "CLOSED";
-            default: return "UNKNOWN";
+            case WebSocket_ReadyState_Open: return "OPEN";
+            case WebSocket_ReadyState_Connecting: return "CONNECTING";
+            case WebSocket_ReadyState_Closing: return "CLOSING";
+            case WebSocket_ReadyState_Closed: return "CLOSED";
         }
     }
 
-    void WebSocket::enableAutomaticReconnection()
+    const std::string& WebSocket::getUrl() const
     {
-        _automaticReconnection = true;
-    }
-
-    void WebSocket::disableAutomaticReconnection()
-    {
-        _automaticReconnection = false;
-    }
-
-    bool WebSocket::isAutomaticReconnectionEnabled() const
-    {
-        return _automaticReconnection;
-    }
-
-    size_t WebSocket::bufferedAmount() const
-    {
-        return _ws.bufferedAmount();
+        std::lock_guard<std::mutex> lock(_urlMutex);
+        return _url;
     }
 }

ixwebsocket/IXWebSocket.h

@@ -9,110 +9,84 @@
 
 #pragma once
 
-#include "IXProgressCallback.h"
-#include "IXWebSocketCloseConstants.h"
-#include "IXWebSocketErrorInfo.h"
-#include "IXWebSocketHttpHeaders.h"
-#include "IXWebSocketMessage.h"
-#include "IXWebSocketPerMessageDeflateOptions.h"
-#include "IXWebSocketSendInfo.h"
-#include "IXWebSocketTransport.h"
-#include <atomic>
-#include <mutex>
 #include <string>
 #include <thread>
+#include <mutex>
+#include <atomic>
 
-namespace ix
+#include "IXWebSocketTransport.h"
+
+namespace ix 
 {
     // https://developer.mozilla.org/en-US/docs/Web/API/WebSocket#Ready_state_constants
-    enum class ReadyState
+    enum ReadyState 
     {
-        Connecting = 0,
-        Open = 1,
-        Closing = 2,
-        Closed = 3
+        WebSocket_ReadyState_Connecting = 0,
+        WebSocket_ReadyState_Open = 1,
+        WebSocket_ReadyState_Closing = 2,
+        WebSocket_ReadyState_Closed = 3
     };
 
-    using OnMessageCallback = std::function<void(const WebSocketMessagePtr&)>;
+    enum WebSocketMessageType
+    {
+        WebSocket_MessageType_Message = 0,
+        WebSocket_MessageType_Open = 1,
+        WebSocket_MessageType_Close = 2,
+        WebSocket_MessageType_Error = 3,
+        WebSocket_MessageType_Ping = 4,
+        WebSocket_MessageType_Pong = 5
+    };
 
+    struct WebSocketErrorInfo
+    {
+        uint64_t retries;
+        double wait_time;
+        int http_status;
+        std::string reason;
+    };
+
+    using OnMessageCallback = std::function<void(WebSocketMessageType, const std::string&, const WebSocketErrorInfo)>;
     using OnTrafficTrackerCallback = std::function<void(size_t size, bool incoming)>;
 
-    class WebSocket
+    class WebSocket 
     {
     public:
         WebSocket();
         ~WebSocket();
 
-        void setUrl(const std::string& url);
-        void setPerMessageDeflateOptions(
-            const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions);
-        void setHeartBeatPeriod(int heartBeatPeriodSecs);
-        void setPingInterval(int pingIntervalSecs); // alias of setHeartBeatPeriod
-        void setPingTimeout(int pingTimeoutSecs);
-        void enablePong();
-        void disablePong();
-        void disablePerMessageDeflate();
-
-        // Run asynchronously, by calling start and stop.
+        void configure(const std::string& url);
         void start();
-
-        // stop is synchronous
-        void stop(uint16_t code = WebSocketCloseConstants::kNormalClosureCode,
-                  const std::string& reason = WebSocketCloseConstants::kNormalClosureMessage);
-
-        // Run in blocking mode, by connecting first manually, and then calling run.
-        WebSocketInitResult connect(int timeoutSecs);
-        void run();
-
-        // send is in binary mode by default
-        WebSocketSendInfo send(const std::string& data,
-                               bool binary = false,
-                               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 stop();
+        bool send(const std::string& text);
+        bool ping(const std::string& text);
+        void close();
 
         void setOnMessageCallback(const OnMessageCallback& callback);
         static void setTrafficTrackerCallback(const OnTrafficTrackerCallback& callback);
         static void resetTrafficTrackerCallback();
 
-        ReadyState getReadyState() const;
-        static std::string readyStateToString(ReadyState readyState);
+        void setVerbose(bool verbose) { _verbose = verbose; }
 
         const std::string& getUrl() const;
-        const WebSocketPerMessageDeflateOptions& getPerMessageDeflateOptions() const;
-        int getHeartBeatPeriod() const;
-        int getPingInterval() const;
-        int getPingTimeout() const;
-        size_t bufferedAmount() const;
-
-        void enableAutomaticReconnection();
-        void disableAutomaticReconnection();
-        bool isAutomaticReconnectionEnabled() const;
+        ReadyState getReadyState() const;
 
     private:
-        WebSocketSendInfo sendMessage(const std::string& text,
-                                      SendMessageKind sendMessageKind,
-                                      const OnProgressCallback& callback = nullptr);
+        void run();
 
+        bool sendMessage(const std::string& text, bool ping);
+
+        WebSocketInitResult connect();
         bool isConnected() const;
         bool isClosing() const;
-        void checkConnection(bool firstConnectionAttempt);
+        void reconnectPerpetuallyIfDisconnected();
+        std::string readyStateToString(ReadyState readyState);
         static void invokeTrafficTrackerCallback(size_t size, bool incoming);
 
-        // Server
-        WebSocketInitResult connectToSocket(int fd, int timeoutSecs);
-
         WebSocketTransport _ws;
 
         std::string _url;
-        WebSocketPerMessageDeflateOptions _perMessageDeflateOptions;
-        mutable std::mutex _configMutex; // protect all config variables access
+        mutable std::mutex _urlMutex;
+        bool _verbose;
 
         OnMessageCallback _onMessageCallback;
         static OnTrafficTrackerCallback _onTrafficTrackerCallback;
@@ -121,20 +95,5 @@ namespace ix
         std::atomic<bool> _automaticReconnection;
         std::thread _thread;
         std::mutex _writeMutex;
-
-        std::atomic<int> _handshakeTimeoutSecs;
-        static const int kDefaultHandShakeTimeoutSecs;
-
-        // enable or disable PONG frame response to received PING frame
-        bool _enablePong;
-        static const bool kDefaultEnablePong;
-
-        // Optional ping and pong timeout
-        int _pingIntervalSecs;
-        int _pingTimeoutSecs;
-        static const int kDefaultPingIntervalSecs;
-        static const int kDefaultPingTimeoutSecs;
-
-        friend class WebSocketServer;
     };
-} // namespace ix
+}

ixwebsocket/IXWebSocketCloseConstants.cpp

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

ixwebsocket/IXWebSocketCloseConstants.h

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

ixwebsocket/IXWebSocketCloseInfo.h

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

ixwebsocket/IXWebSocketErrorInfo.h

@@ -1,21 +0,0 @@
-/*
- *  IXWebSocketErrorInfo.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2017-2018 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include <string>
-
-namespace ix
-{
-    struct WebSocketErrorInfo
-    {
-        uint32_t retries = 0;
-        double wait_time = 0;
-        int http_status = 0;
-        std::string reason;
-        bool decompressionError = false;
-    };
-} // namespace ix

ixwebsocket/IXWebSocketHandshake.cpp

@@ -1,385 +0,0 @@
-/*
- *  IXWebSocketHandshake.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXWebSocketHandshake.h"
-#include "IXSocketConnect.h"
-#include "IXUrlParser.h"
-
-#include "libwshandshake.hpp"
-
-#include <sstream>
-#include <random>
-#include <algorithm>
-
-
-namespace ix
-{
-    WebSocketHandshake::WebSocketHandshake(std::atomic<bool>& requestInitCancellation,
-                                           std::shared_ptr<Socket> socket,
-                                           WebSocketPerMessageDeflate& perMessageDeflate,
-                                           WebSocketPerMessageDeflateOptions& perMessageDeflateOptions,
-                                           std::atomic<bool>& enablePerMessageDeflate) :
-        _requestInitCancellation(requestInitCancellation),
-        _socket(socket),
-        _perMessageDeflate(perMessageDeflate),
-        _perMessageDeflateOptions(perMessageDeflateOptions),
-        _enablePerMessageDeflate(enablePerMessageDeflate)
-    {
-
-    }
-
-    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(),
-                          b.begin(), b.end(),
-                          [](char a, char b)
-                          {
-                              return tolower(a) == tolower(b);
-                          });
-    }
-
-    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 =
-            "0123456789"
-            "ABCDEFGH"
-            "abcdefgh";
-
-        std::random_device r;
-        std::default_random_engine e1(r());
-        std::uniform_int_distribution<int> dist(0, (int) alphanum.size() - 1);
-
-        std::string s;
-        s.resize(len);
-
-        for (int i = 0; i < len; ++i)
-        {
-            int x = dist(e1);
-            s[i] = alphanum[x];
-        }
-
-        return s;
-    }
-
-    WebSocketInitResult WebSocketHandshake::sendErrorResponse(int code, const std::string& reason)
-    {
-        std::stringstream ss;
-        ss << "HTTP/1.1 ";
-        ss << code;
-        ss << " ";
-        ss << reason;
-        ss << "\r\n";
-
-        // Socket write can only be cancelled through a timeout here, not manually.
-        static std::atomic<bool> requestInitCancellation(false);
-        auto isCancellationRequested =
-            makeCancellationRequestWithTimeout(1, requestInitCancellation);
-
-        if (!_socket->writeBytes(ss.str(), isCancellationRequested))
-        {
-            return WebSocketInitResult(false, 500, "Timed out while sending error response");
-        }
-
-        return WebSocketInitResult(false, code, reason);
-    }
-
-    WebSocketInitResult WebSocketHandshake::clientHandshake(const std::string& url,
-                                                            const std::string& host,
-                                                            const std::string& path,
-                                                            int port,
-                                                            int timeoutSecs)
-    {
-        _requestInitCancellation = false;
-
-        auto isCancellationRequested =
-            makeCancellationRequestWithTimeout(timeoutSecs, _requestInitCancellation);
-
-        std::string errMsg;
-        bool success = _socket->connect(host, port, errMsg, isCancellationRequested);
-        if (!success)
-        {
-            std::stringstream ss;
-            ss << "Unable to connect to " << host
-               << " on port " << port
-               << ", error: " << errMsg;
-            return WebSocketInitResult(false, 0, ss.str());
-        }
-
-        //
-        // Generate a random 24 bytes string which looks like it is base64 encoded
-        // y3JJHMbDL1EzLkh9GBhXDw==
-        // 0cb3Vd9HkbpVVumoS3Noka==
-        //
-        // See https://stackoverflow.com/questions/18265128/what-is-sec-websocket-key-for
-        //
-        std::string secWebSocketKey = genRandomString(22);
-        secWebSocketKey += "==";
-
-        std::stringstream ss;
-        ss << "GET " << path << " HTTP/1.1\r\n";
-        ss << "Host: "<< host << ":" << port << "\r\n";
-        ss << "Upgrade: websocket\r\n";
-        ss << "Connection: Upgrade\r\n";
-        ss << "Sec-WebSocket-Version: 13\r\n";
-        ss << "Sec-WebSocket-Key: " << secWebSocketKey << "\r\n";
-
-        if (_enablePerMessageDeflate)
-        {
-            ss << _perMessageDeflateOptions.generateHeader();
-        }
-
-        ss << "\r\n";
-
-        if (!_socket->writeBytes(ss.str(), isCancellationRequested))
-        {
-            return WebSocketInitResult(false, 0, std::string("Failed sending GET request to ") + url);
-        }
-
-        // Read HTTP status line
-        auto lineResult = _socket->readLine(isCancellationRequested);
-        auto lineValid = lineResult.first;
-        auto line = lineResult.second;
-
-        if (!lineValid)
-        {
-            return WebSocketInitResult(false, 0,
-                                       std::string("Failed reading HTTP status line from ") + url);
-        }
-
-        // Validate status
-        int status;
-
-        // HTTP/1.0 is too old.
-        if (sscanf(line.c_str(), "HTTP/1.0 %d", &status) == 1)
-        {
-            std::stringstream ss;
-            ss << "Server version is HTTP/1.0. Rejecting connection to " << host
-               << ", status: " << status
-               << ", HTTP Status line: " << line;
-            return WebSocketInitResult(false, status, ss.str());
-        }
-
-        // We want an 101 HTTP status
-        if (sscanf(line.c_str(), "HTTP/1.1 %d", &status) != 1 || status != 101)
-        {
-            std::stringstream ss;
-            ss << "Got bad status connecting to " << host
-               << ", status: " << status
-               << ", HTTP Status line: " << line;
-            return WebSocketInitResult(false, status, ss.str());
-        }
-
-        auto result = parseHttpHeaders(_socket, isCancellationRequested);
-        auto headersValid = result.first;
-        auto headers = result.second;
-
-        if (!headersValid)
-        {
-            return WebSocketInitResult(false, status, "Error parsing HTTP headers");
-        }
-
-        // Check the presence of the connection field
-        if (headers.find("connection") == headers.end())
-        {
-            std::string errorMsg("Missing connection value");
-            return WebSocketInitResult(false, status, errorMsg);
-        }
-
-        // Check the value of the connection field
-        // Some websocket servers (Go/Gorilla?) send lowercase values for the
-        // connection header, so do a case insensitive comparison
-        if (!insensitiveStringCompare(headers["connection"], "Upgrade"))
-        {
-            std::stringstream ss;
-            ss << "Invalid connection value: " << headers["connection"];
-            return WebSocketInitResult(false, status, ss.str());
-        }
-
-        char output[29] = {};
-        WebSocketHandshakeKeyGen::generate(secWebSocketKey, output);
-        if (std::string(output) != headers["sec-websocket-accept"])
-        {
-            std::string errorMsg("Invalid Sec-WebSocket-Accept value");
-            return WebSocketInitResult(false, status, errorMsg);
-        }
-
-        if (_enablePerMessageDeflate)
-        {
-            // Parse the server response. Does it support deflate ?
-            std::string header = headers["sec-websocket-extensions"];
-            WebSocketPerMessageDeflateOptions webSocketPerMessageDeflateOptions(header);
-
-            // If the server does not support that extension, disable it.
-            if (!webSocketPerMessageDeflateOptions.enabled())
-            {
-                _enablePerMessageDeflate = false;
-            }
-            // Otherwise try to initialize the deflate engine (zlib)
-            else if (!_perMessageDeflate.init(webSocketPerMessageDeflateOptions))
-            {
-                return WebSocketInitResult(
-                    false, 0,"Failed to initialize per message deflate engine");
-            }
-        }
-
-        return WebSocketInitResult(true, status, "", headers, path);
-    }
-
-    WebSocketInitResult WebSocketHandshake::serverHandshake(int fd, int timeoutSecs)
-    {
-        _requestInitCancellation = false;
-
-        // Set the socket to non blocking mode + other tweaks
-        SocketConnect::configure(fd);
-
-        auto isCancellationRequested =
-            makeCancellationRequestWithTimeout(timeoutSecs, _requestInitCancellation);
-
-        std::string remote = std::string("remote fd ") + std::to_string(fd);
-
-        // Read first line
-        auto lineResult = _socket->readLine(isCancellationRequested);
-        auto lineValid = lineResult.first;
-        auto line = lineResult.second;
-
-        if (!lineValid)
-        {
-            return sendErrorResponse(400, "Error reading HTTP request line");
-        }
-
-        // Validate request line (GET /foo HTTP/1.1\r\n)
-        auto requestLine = parseRequestLine(line);
-        auto method      = std::get<0>(requestLine);
-        auto uri         = std::get<1>(requestLine);
-        auto httpVersion = std::get<2>(requestLine);
-
-        if (method != "GET")
-        {
-            return sendErrorResponse(400, "Invalid HTTP method, need GET, got " + method);
-        }
-
-        if (httpVersion != "HTTP/1.1")
-        {
-            return sendErrorResponse(400, "Invalid HTTP version, need HTTP/1.1, got: " + httpVersion);
-        }
-
-        // Retrieve and validate HTTP headers
-        auto result = parseHttpHeaders(_socket, isCancellationRequested);
-        auto headersValid = result.first;
-        auto headers = result.second;
-
-        if (!headersValid)
-        {
-            return sendErrorResponse(400, "Error parsing HTTP headers");
-        }
-
-        if (headers.find("sec-websocket-key") == headers.end())
-        {
-            return sendErrorResponse(400, "Missing Sec-WebSocket-Key value");
-        }
-
-        if (headers["upgrade"] != "websocket")
-        {
-            return sendErrorResponse(400, "Invalid or missing Upgrade header");
-        }
-
-        if (headers.find("sec-websocket-version") == headers.end())
-        {
-            return sendErrorResponse(400, "Missing Sec-WebSocket-Version value");
-        }
-
-        {
-            std::stringstream ss;
-            ss << headers["sec-websocket-version"];
-            int version;
-            ss >> version;
-
-            if (version != 13)
-            {
-                return sendErrorResponse(400, "Invalid Sec-WebSocket-Version, "
-                                              "need 13, got" + ss.str());
-            }
-        }
-
-        char output[29] = {};
-        WebSocketHandshakeKeyGen::generate(headers["sec-websocket-key"], output);
-
-        std::stringstream ss;
-        ss << "HTTP/1.1 101 Switching Protocols\r\n";
-        ss << "Sec-WebSocket-Accept: " << std::string(output) << "\r\n";
-        ss << "Upgrade: websocket\r\n";
-        ss << "Connection: Upgrade\r\n";
-
-        // Parse the client headers. Does it support deflate ?
-        std::string header = headers["sec-websocket-extensions"];
-        WebSocketPerMessageDeflateOptions webSocketPerMessageDeflateOptions(header);
-
-        // If the client has requested that extension, enable it.
-        if (webSocketPerMessageDeflateOptions.enabled())
-        {
-            _enablePerMessageDeflate = true;
-
-            if (!_perMessageDeflate.init(webSocketPerMessageDeflateOptions))
-            {
-                return WebSocketInitResult(
-                    false, 0,"Failed to initialize per message deflate engine");
-            }
-            ss << webSocketPerMessageDeflateOptions.generateHeader();
-        }
-
-        ss << "\r\n";
-
-        if (!_socket->writeBytes(ss.str(), isCancellationRequested))
-        {
-            return WebSocketInitResult(false, 0, std::string("Failed sending response to ") + remote);
-        }
-
-        return WebSocketInitResult(true, 200, "", headers, uri);
-    }
-}

ixwebsocket/IXWebSocketHandshake.h

@@ -1,77 +0,0 @@
-/*
- *  IXWebSocketHandshake.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include "IXCancellationRequest.h"
-#include "IXSocket.h"
-#include "IXWebSocketHttpHeaders.h"
-#include "IXWebSocketPerMessageDeflate.h"
-#include "IXWebSocketPerMessageDeflateOptions.h"
-#include <atomic>
-#include <chrono>
-#include <memory>
-#include <string>
-#include <tuple>
-
-namespace ix
-{
-    struct WebSocketInitResult
-    {
-        bool success;
-        int http_status;
-        std::string errorStr;
-        WebSocketHttpHeaders headers;
-        std::string uri;
-
-        WebSocketInitResult(bool s = false,
-                            int status = 0,
-                            const std::string& e = std::string(),
-                            WebSocketHttpHeaders h = WebSocketHttpHeaders(),
-                            const std::string& u = std::string())
-        {
-            success = s;
-            http_status = status;
-            errorStr = e;
-            headers = h;
-            uri = u;
-        }
-    };
-
-    class WebSocketHandshake
-    {
-    public:
-        WebSocketHandshake(std::atomic<bool>& requestInitCancellation,
-                           std::shared_ptr<Socket> _socket,
-                           WebSocketPerMessageDeflate& perMessageDeflate,
-                           WebSocketPerMessageDeflateOptions& perMessageDeflateOptions,
-                           std::atomic<bool>& enablePerMessageDeflate);
-
-        WebSocketInitResult clientHandshake(const std::string& url,
-                                            const std::string& host,
-                                            const std::string& path,
-                                            int port,
-                                            int timeoutSecs);
-
-        WebSocketInitResult serverHandshake(int fd, int timeoutSecs);
-
-    private:
-        std::string genRandomString(const int len);
-
-        // 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;
-        std::shared_ptr<Socket> _socket;
-        WebSocketPerMessageDeflate& _perMessageDeflate;
-        WebSocketPerMessageDeflateOptions& _perMessageDeflateOptions;
-        std::atomic<bool>& _enablePerMessageDeflate;
-    };
-} // namespace ix

ixwebsocket/IXWebSocketHttpHeaders.cpp

@@ -1,82 +0,0 @@
-/*
- *  IXWebSocketHttpHeaders.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXWebSocketHttpHeaders.h"
-#include "IXSocket.h"
-#include <algorithm>
-#include <locale>
-
-namespace ix
-{
-    bool CaseInsensitiveLess::NocaseCompare::operator()(const unsigned char & c1, const unsigned char & c2) const
-    {
-#ifdef _WIN32
-        return std::tolower(c1, std::locale()) < std::tolower(c2, std::locale());
-#else
-        return std::tolower(c1) < std::tolower(c2);
-#endif
-    }
-
-    bool CaseInsensitiveLess::operator()(const std::string & s1, const std::string & s2) const
-    {
-        return std::lexicographical_compare
-                (s1.begin(), s1.end(),   // source range
-                 s2.begin(), s2.end(),   // dest range
-                 NocaseCompare());       // comparison
-    }
-
-    std::pair<bool, WebSocketHttpHeaders> parseHttpHeaders(
-        std::shared_ptr<Socket> socket,
-        const CancellationRequest& isCancellationRequested)
-    {
-        WebSocketHttpHeaders headers;
-
-        char line[1024];
-        int i;
-
-        while (true)
-        {
-            int colon = 0;
-
-            for (i = 0;
-                 i < 2 || (i < 1023 && line[i-2] != '\r' && line[i-1] != '\n');
-                 ++i)
-            {
-                if (!socket->readByte(line+i, isCancellationRequested))
-                {
-                    return std::make_pair(false, headers);
-                }
-
-                if (line[i] == ':' && colon == 0)
-                {
-                    colon = i;
-                }
-            }
-            if (line[0] == '\r' && line[1] == '\n')
-            {
-                break;
-            }
-
-            // line is a single header entry. split by ':', and add it to our
-            // header map. ignore lines with no colon.
-            if (colon > 0)
-            {
-                line[i] = '\0';
-                std::string lineStr(line);
-                // colon is ':', colon+1 is ' ', colon+2 is the start of the value.
-                // i is end of string (\0), i-colon is length of string minus key;
-                // subtract 1 for '\0', 1 for '\n', 1 for '\r',
-                // 1 for the ' ' after the ':', and total is -4
-                std::string name(lineStr.substr(0, colon));
-                std::string value(lineStr.substr(colon + 2, i - colon - 4));
-
-                headers[name] = value;
-            }
-        }
-
-        return std::make_pair(true, headers);
-    }
-}

ixwebsocket/IXWebSocketHttpHeaders.h

@@ -1,33 +0,0 @@
-/*
- *  IXWebSocketHttpHeaders.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include "IXCancellationRequest.h"
-#include <map>
-#include <memory>
-#include <string>
-
-namespace ix
-{
-    class Socket;
-
-    struct CaseInsensitiveLess
-    {
-        // Case Insensitive compare_less binary function
-        struct NocaseCompare
-        {
-            bool operator()(const unsigned char& c1, const unsigned char& c2) const;
-        };
-
-        bool operator()(const std::string& s1, const std::string& s2) const;
-    };
-
-    using WebSocketHttpHeaders = std::map<std::string, std::string, CaseInsensitiveLess>;
-
-    std::pair<bool, WebSocketHttpHeaders> parseHttpHeaders(
-        std::shared_ptr<Socket> socket, const CancellationRequest& isCancellationRequested);
-} // namespace ix

ixwebsocket/IXWebSocketMessage.h

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

ixwebsocket/IXWebSocketMessageQueue.cpp

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

ixwebsocket/IXWebSocketMessageQueue.h

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

ixwebsocket/IXWebSocketMessageType.h

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

ixwebsocket/IXWebSocketOpenInfo.h

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

ixwebsocket/IXWebSocketPerMessageDeflate.cpp

@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * 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 PETER THORSON 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.
- */
-
-/*
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
- *
- *  Adapted from websocketpp/extensions/permessage_deflate/enabled.hpp
- *  (same license as MZ: https://opensource.org/licenses/BSD-3-Clause)
- *
- *  - Reused zlib compression + decompression bits.
- *  - Refactored to have 2 class for compression and decompression, to allow multi-threading
- *    and make sure that _compressBuffer is not shared between threads.
- *  - Original code wasn't working for some reason, I had to add checks
- *    for the presence of the kEmptyUncompressedBlock at the end of buffer so that servers
- *    would start accepting receiving/decoding compressed messages. Original code was probably
- *    modifying the passed in buffers before processing in enabled.hpp ?
- *  - Added more documentation.
- *
- *  Per message Deflate RFC: https://tools.ietf.org/html/rfc7692
- *  Chrome websocket -> https://github.com/chromium/chromium/tree/2ca8c5037021c9d2ecc00b787d58a31ed8fc8bcb/net/websockets
- *
- */
-
-#include "IXWebSocketPerMessageDeflate.h"
-#include "IXWebSocketPerMessageDeflateOptions.h"
-#include "IXWebSocketPerMessageDeflateCodec.h"
-
-namespace ix
-{
-    WebSocketPerMessageDeflate::WebSocketPerMessageDeflate() :
-        _compressor(std::make_unique<WebSocketPerMessageDeflateCompressor>()),
-        _decompressor(std::make_unique<WebSocketPerMessageDeflateDecompressor>())
-    {
-        ;
-    }
-
-    WebSocketPerMessageDeflate::~WebSocketPerMessageDeflate()
-    {
-        ;
-    }
-
-    bool WebSocketPerMessageDeflate::init(const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions)
-    {
-        bool clientNoContextTakeover =
-            perMessageDeflateOptions.getClientNoContextTakeover();
-
-        uint8_t deflateBits = perMessageDeflateOptions.getClientMaxWindowBits();
-        uint8_t inflateBits = perMessageDeflateOptions.getServerMaxWindowBits();
-
-        return _compressor->init(deflateBits, clientNoContextTakeover) &&
-               _decompressor->init(inflateBits, clientNoContextTakeover);
-    }
-
-    bool WebSocketPerMessageDeflate::compress(const std::string& in,
-                                              std::string& out)
-    {
-        return _compressor->compress(in, out);
-    }
-
-    bool WebSocketPerMessageDeflate::decompress(const std::string& in,
-                                                std::string &out)
-    {
-        return _decompressor->decompress(in, out);
-    }
-
-}

ixwebsocket/IXWebSocketPerMessageDeflate.h

@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * 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 PETER THORSON 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.
- */
-
-/*
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
- *
- *  Adapted from websocketpp/extensions/permessage_deflate/enabled.hpp
- *  (same license as MZ: https://opensource.org/licenses/BSD-3-Clause)
- */
-
-#pragma once
-
-#include <memory>
-#include <string>
-
-namespace ix
-{
-    class WebSocketPerMessageDeflateOptions;
-    class WebSocketPerMessageDeflateCompressor;
-    class WebSocketPerMessageDeflateDecompressor;
-
-    class WebSocketPerMessageDeflate
-    {
-    public:
-        WebSocketPerMessageDeflate();
-        ~WebSocketPerMessageDeflate();
-
-        bool init(const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions);
-        bool compress(const std::string& in, std::string& out);
-        bool decompress(const std::string& in, std::string& out);
-
-    private:
-        std::unique_ptr<WebSocketPerMessageDeflateCompressor> _compressor;
-        std::unique_ptr<WebSocketPerMessageDeflateDecompressor> _decompressor;
-    };
-} // namespace ix

ixwebsocket/IXWebSocketPerMessageDeflateCodec.cpp

@@ -1,205 +0,0 @@
-/*
- *  IXWebSocketPerMessageDeflateCodec.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018-2019 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXWebSocketPerMessageDeflateCodec.h"
-#include "IXWebSocketPerMessageDeflateOptions.h"
-
-#include <cassert>
-#include <string.h>
-
-namespace
-{
-    // The passed in size (4) is important, without it the string litteral
-    // is treated as a char* and the null termination (\x00) makes it
-    // look like an empty string.
-    const std::string kEmptyUncompressedBlock = std::string("\x00\x00\xff\xff", 4);
-
-    const int kBufferSize = 1 << 14;
-}
-
-namespace ix
-{
-    //
-    // Compressor
-    //
-    WebSocketPerMessageDeflateCompressor::WebSocketPerMessageDeflateCompressor()
-      : _compressBufferSize(kBufferSize)
-    {
-        memset(&_deflateState, 0, sizeof(_deflateState));
-
-        _deflateState.zalloc = Z_NULL;
-        _deflateState.zfree = Z_NULL;
-        _deflateState.opaque = Z_NULL;
-    }
-
-    WebSocketPerMessageDeflateCompressor::~WebSocketPerMessageDeflateCompressor()
-    {
-        deflateEnd(&_deflateState);
-    }
-
-    bool WebSocketPerMessageDeflateCompressor::init(uint8_t deflateBits,
-                                                    bool clientNoContextTakeOver)
-    {
-        int ret = deflateInit2(
-            &_deflateState,
-            Z_DEFAULT_COMPRESSION,
-            Z_DEFLATED,
-            -1*deflateBits,
-            4, // memory level 1-9
-            Z_DEFAULT_STRATEGY
-        );
-
-        if (ret != Z_OK) return false;
-
-        _compressBuffer = std::make_unique<unsigned char[]>(_compressBufferSize);
-
-        _flush = (clientNoContextTakeOver)
-                 ? Z_FULL_FLUSH
-                 : Z_SYNC_FLUSH;
-
-        return true;
-    }
-
-    bool WebSocketPerMessageDeflateCompressor::endsWith(const std::string& value,
-                                                        const std::string& ending)
-    {
-        if (ending.size() > value.size()) return false;
-        return std::equal(ending.rbegin(), ending.rend(), value.rbegin());
-    }
-
-    bool WebSocketPerMessageDeflateCompressor::compress(const std::string& in,
-                                                        std::string& out)
-    {
-        //
-        // 7.2.1.  Compression
-        //
-        //    An endpoint uses the following algorithm to compress a message.
-        //
-        //    1.  Compress all the octets of the payload of the message using
-        //        DEFLATE.
-        //
-        //    2.  If the resulting data does not end with an empty DEFLATE block
-        //        with no compression (the "BTYPE" bits are set to 00), append an
-        //        empty DEFLATE block with no compression to the tail end.
-        //
-        //    3.  Remove 4 octets (that are 0x00 0x00 0xff 0xff) from the tail end.
-        //        After this step, the last octet of the compressed data contains
-        //        (possibly part of) the DEFLATE header bits with the "BTYPE" bits
-        //        set to 00.
-        //
-        size_t output;
-
-        if (in.empty())
-        {
-            uint8_t buf[6] = {0x02, 0x00, 0x00, 0x00, 0xff, 0xff};
-            out.append((char *)(buf), 6);
-            return true;
-        }
-
-        _deflateState.avail_in = (uInt) in.size();
-        _deflateState.next_in = (Bytef*) in.data();
-
-        do
-        {
-            // Output to local buffer
-            _deflateState.avail_out = (uInt) _compressBufferSize;
-            _deflateState.next_out = _compressBuffer.get();
-
-            deflate(&_deflateState, _flush);
-
-            output = _compressBufferSize - _deflateState.avail_out;
-
-            out.append((char *)(_compressBuffer.get()),output);
-        } while (_deflateState.avail_out == 0);
-
-        if (endsWith(out, kEmptyUncompressedBlock))
-        {
-            out.resize(out.size() - 4);
-        }
-
-        return true;
-    }
-
-    //
-    // Decompressor
-    //
-    WebSocketPerMessageDeflateDecompressor::WebSocketPerMessageDeflateDecompressor()
-      : _compressBufferSize(kBufferSize)
-    {
-        memset(&_inflateState, 0, sizeof(_inflateState));
-
-        _inflateState.zalloc = Z_NULL;
-        _inflateState.zfree = Z_NULL;
-        _inflateState.opaque = Z_NULL;
-        _inflateState.avail_in = 0;
-        _inflateState.next_in = Z_NULL;
-    }
-
-    WebSocketPerMessageDeflateDecompressor::~WebSocketPerMessageDeflateDecompressor()
-    {
-        inflateEnd(&_inflateState);
-    }
-
-    bool WebSocketPerMessageDeflateDecompressor::init(uint8_t inflateBits,
-                                                      bool clientNoContextTakeOver)
-    {
-        int ret = inflateInit2(
-            &_inflateState,
-            -1*inflateBits
-        );
-
-        if (ret != Z_OK) return false;
-
-        _compressBuffer = std::make_unique<unsigned char[]>(_compressBufferSize);
-
-        _flush = (clientNoContextTakeOver)
-                 ? Z_FULL_FLUSH
-                 : Z_SYNC_FLUSH;
-
-        return true;
-    }
-
-    bool WebSocketPerMessageDeflateDecompressor::decompress(const std::string& in,
-                                                            std::string& out)
-    {
-        //
-        // 7.2.2.  Decompression
-        //
-        //    An endpoint uses the following algorithm to decompress a message.
-        //
-        //    1.  Append 4 octets of 0x00 0x00 0xff 0xff to the tail end of the
-        //        payload of the message.
-        //
-        //    2.  Decompress the resulting data using DEFLATE.
-        //
-        std::string inFixed(in);
-        inFixed += kEmptyUncompressedBlock;
-
-        _inflateState.avail_in = (uInt) inFixed.size();
-        _inflateState.next_in = (unsigned char *)(const_cast<char *>(inFixed.data()));
-
-        do
-        {
-            _inflateState.avail_out = (uInt) _compressBufferSize;
-            _inflateState.next_out = _compressBuffer.get();
-
-            int ret = inflate(&_inflateState, Z_SYNC_FLUSH);
-
-            if (ret == Z_NEED_DICT || ret == Z_DATA_ERROR || ret == Z_MEM_ERROR)
-            {
-                return false; // zlib error
-            }
-
-            out.append(
-                reinterpret_cast<char *>(_compressBuffer.get()),
-                _compressBufferSize - _inflateState.avail_out
-            );
-        } while (_inflateState.avail_out == 0);
-
-        return true;
-    }
-}
-

ixwebsocket/IXWebSocketPerMessageDeflateCodec.h

@@ -1,49 +0,0 @@
-/*
- *  IXWebSocketPerMessageDeflateCodec.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018-2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include "zlib.h"
-#include <memory>
-#include <string>
-
-namespace ix
-{
-    class WebSocketPerMessageDeflateCompressor
-    {
-    public:
-        WebSocketPerMessageDeflateCompressor();
-        ~WebSocketPerMessageDeflateCompressor();
-
-        bool init(uint8_t deflateBits, bool clientNoContextTakeOver);
-        bool compress(const std::string& in, std::string& out);
-
-    private:
-        static bool endsWith(const std::string& value, const std::string& ending);
-
-        int _flush;
-        size_t _compressBufferSize;
-        std::unique_ptr<unsigned char[]> _compressBuffer;
-        z_stream _deflateState;
-    };
-
-    class WebSocketPerMessageDeflateDecompressor
-    {
-    public:
-        WebSocketPerMessageDeflateDecompressor();
-        ~WebSocketPerMessageDeflateDecompressor();
-
-        bool init(uint8_t inflateBits, bool clientNoContextTakeOver);
-        bool decompress(const std::string& in, std::string& out);
-
-    private:
-        int _flush;
-        size_t _compressBufferSize;
-        std::unique_ptr<unsigned char[]> _compressBuffer;
-        z_stream _inflateState;
-    };
-
-} // namespace ix

ixwebsocket/IXWebSocketPerMessageDeflateOptions.cpp

@@ -1,171 +0,0 @@
-/*
- *  IXWebSocketPerMessageDeflateOptions.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXWebSocketPerMessageDeflateOptions.h"
-
-#include <sstream>
-#include <algorithm>
-#include <cctype>
-
-namespace ix
-{
-    /// Default values as defined in the RFC
-    const uint8_t WebSocketPerMessageDeflateOptions::kDefaultServerMaxWindowBits = 15;
-    static const int minServerMaxWindowBits = 8;
-    static const int maxServerMaxWindowBits = 15;
-
-    const uint8_t WebSocketPerMessageDeflateOptions::kDefaultClientMaxWindowBits = 15;
-    static const int minClientMaxWindowBits = 8;
-    static const int maxClientMaxWindowBits = 15;
-
-    WebSocketPerMessageDeflateOptions::WebSocketPerMessageDeflateOptions(
-        bool enabled,
-        bool clientNoContextTakeover,
-        bool serverNoContextTakeover,
-        uint8_t clientMaxWindowBits,
-        uint8_t serverMaxWindowBits)
-    {
-        _enabled = enabled;
-        _clientNoContextTakeover = clientNoContextTakeover;
-        _serverNoContextTakeover = serverNoContextTakeover;
-        _clientMaxWindowBits = clientMaxWindowBits;
-        _serverMaxWindowBits = serverMaxWindowBits;
-    }
-
-    //
-    // Four extension parameters are defined for "permessage-deflate" to
-    // help endpoints manage per-connection resource usage.
-    //
-    // - "server_no_context_takeover"
-    // - "client_no_context_takeover"
-    // - "server_max_window_bits"
-    // - "client_max_window_bits"
-    //
-    // Server response could look like that:
-    //
-    // Sec-WebSocket-Extensions: permessage-deflate; client_no_context_takeover; server_no_context_takeover
-    //
-    WebSocketPerMessageDeflateOptions::WebSocketPerMessageDeflateOptions(std::string extension)
-    {
-        extension = removeSpaces(extension);
-
-        _enabled = false;
-        _clientNoContextTakeover = false;
-        _serverNoContextTakeover = false;
-        _clientMaxWindowBits = kDefaultClientMaxWindowBits;
-        _serverMaxWindowBits = kDefaultServerMaxWindowBits;
-
-        // Split by ;
-        std::string token;
-        std::stringstream tokenStream(extension);
-
-        while (std::getline(tokenStream, token, ';'))
-        {
-            if (token == "permessage-deflate")
-            {
-                _enabled = true;
-            }
-
-            if (token == "server_no_context_takeover")
-            {
-                _serverNoContextTakeover = true;
-            }
-
-            if (token == "client_no_context_takeover")
-            {
-                _clientNoContextTakeover = true;
-            }
-
-            if (startsWith(token, "server_max_window_bits="))
-            {
-                std::string val = token.substr(token.find_last_of("=") + 1);
-                std::stringstream ss;
-                ss << val;
-                int x;
-                ss >> x;
-
-                // Sanitize values to be in the proper range [8, 15] in
-                // case a server would give us bogus values
-                _serverMaxWindowBits =
-                    std::min(maxServerMaxWindowBits,
-                        std::max(x, minServerMaxWindowBits));
-            }
-
-            if (startsWith(token, "client_max_window_bits="))
-            {
-                std::string val = token.substr(token.find_last_of("=") + 1);
-                std::stringstream ss;
-                ss << val;
-                int x;
-                ss >> x;
-
-                // Sanitize values to be in the proper range [8, 15] in
-                // case a server would give us bogus values
-                _clientMaxWindowBits =
-                    std::min(maxClientMaxWindowBits,
-                        std::max(x, minClientMaxWindowBits));
-            }
-        }
-    }
-
-    std::string WebSocketPerMessageDeflateOptions::generateHeader()
-    {
-        std::stringstream ss;
-        ss << "Sec-WebSocket-Extensions: permessage-deflate";
-
-        if (_clientNoContextTakeover) ss << "; client_no_context_takeover";
-        if (_serverNoContextTakeover) ss << "; server_no_context_takeover";
-
-        ss << "; server_max_window_bits=" << _serverMaxWindowBits;
-        ss << "; client_max_window_bits=" << _clientMaxWindowBits;
-
-        ss << "\r\n";
-
-        return ss.str();
-    }
-
-    bool WebSocketPerMessageDeflateOptions::enabled() const
-    {
-        return _enabled;
-    }
-
-    bool WebSocketPerMessageDeflateOptions::getClientNoContextTakeover() const
-    {
-        return _clientNoContextTakeover;
-    }
-
-    bool WebSocketPerMessageDeflateOptions::getServerNoContextTakeover() const
-    {
-        return _serverNoContextTakeover;
-    }
-
-    uint8_t WebSocketPerMessageDeflateOptions::getClientMaxWindowBits() const
-    {
-        return _clientMaxWindowBits;
-    }
-
-    uint8_t WebSocketPerMessageDeflateOptions::getServerMaxWindowBits() const
-    {
-        return _serverMaxWindowBits;
-    }
-
-    bool WebSocketPerMessageDeflateOptions::startsWith(const std::string& str,
-                                                       const std::string& start)
-    {
-        return str.compare(0, start.length(), start) == 0;
-    }
-
-    std::string WebSocketPerMessageDeflateOptions::removeSpaces(const std::string& str)
-    {
-        std::string out(str);
-        out.erase(std::remove_if(out.begin(),
-                                 out.end(),
-                                 [](unsigned char x){ return std::isspace(x); }),
-                  out.end());
-
-        return out;
-    }
-}

ixwebsocket/IXWebSocketPerMessageDeflateOptions.h

@@ -1,45 +0,0 @@
-/*
- *  IXWebSocketPerMessageDeflateOptions.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include <string>
-
-namespace ix
-{
-    class WebSocketPerMessageDeflateOptions
-    {
-    public:
-        WebSocketPerMessageDeflateOptions(
-            bool enabled = false,
-            bool clientNoContextTakeover = false,
-            bool serverNoContextTakeover = false,
-            uint8_t clientMaxWindowBits = kDefaultClientMaxWindowBits,
-            uint8_t serverMaxWindowBits = kDefaultServerMaxWindowBits);
-
-        WebSocketPerMessageDeflateOptions(std::string extension);
-
-        std::string generateHeader();
-        bool enabled() const;
-        bool getClientNoContextTakeover() const;
-        bool getServerNoContextTakeover() const;
-        uint8_t getServerMaxWindowBits() const;
-        uint8_t getClientMaxWindowBits() const;
-
-        static bool startsWith(const std::string& str, const std::string& start);
-        static std::string removeSpaces(const std::string& str);
-
-        static uint8_t const kDefaultClientMaxWindowBits;
-        static uint8_t const kDefaultServerMaxWindowBits;
-
-    private:
-        bool _enabled;
-        bool _clientNoContextTakeover;
-        bool _serverNoContextTakeover;
-        int _clientMaxWindowBits;
-        int _serverMaxWindowBits;
-    };
-} // namespace ix

ixwebsocket/IXWebSocketSendInfo.h

@@ -1,27 +0,0 @@
-/*
- *  IXWebSocketSendInfo.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-namespace ix
-{
-    struct WebSocketSendInfo
-    {
-        bool success;
-        bool compressionError;
-        size_t payloadSize;
-        size_t wireSize;
-
-        WebSocketSendInfo(bool s = false, bool c = false, size_t p = 0, size_t w = 0)
-            : success(s)
-            , compressionError(c)
-            , payloadSize(p)
-            , wireSize(w)
-        {
-            ;
-        }
-    };
-} // namespace ix

ixwebsocket/IXWebSocketServer.cpp

@@ -1,127 +0,0 @@
-/*
- *  IXWebSocketServer.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXWebSocketServer.h"
-#include "IXWebSocketTransport.h"
-#include "IXWebSocket.h"
-#include "IXSocketConnect.h"
-#include "IXNetSystem.h"
-
-#include <sstream>
-#include <future>
-#include <string.h>
-
-namespace ix
-{
-    const int WebSocketServer::kDefaultHandShakeTimeoutSecs(3); // 3 seconds
-    const bool WebSocketServer::kDefaultEnablePong(true);
-
-    WebSocketServer::WebSocketServer(int port,
-                                     const std::string& host,
-                                     int backlog,
-                                     size_t maxConnections,
-                                     int handshakeTimeoutSecs) : SocketServer(port, host, backlog, maxConnections),
-        _handshakeTimeoutSecs(handshakeTimeoutSecs),
-        _enablePong(kDefaultEnablePong)
-    {
-
-    }
-
-    WebSocketServer::~WebSocketServer()
-    {
-        stop();
-    }
-
-    void WebSocketServer::stop()
-    {
-        stopAcceptingConnections();
-
-        auto clients = getClients();
-        for (auto client : clients)
-        {
-            client->close();
-        }
-
-        SocketServer::stop();
-    }
-
-    void WebSocketServer::enablePong()
-    {
-        _enablePong = true;
-    }
-
-    void WebSocketServer::disablePong()
-    {
-        _enablePong = false;
-    }
-
-    void WebSocketServer::setOnConnectionCallback(const OnConnectionCallback& callback)
-    {
-        _onConnectionCallback = callback;
-    }
-
-    void WebSocketServer::handleConnection(
-        int fd,
-        std::shared_ptr<ConnectionState> connectionState)
-    {
-        auto webSocket = std::make_shared<WebSocket>();
-        _onConnectionCallback(webSocket, connectionState);
-
-        webSocket->disableAutomaticReconnection();
-
-        if (_enablePong)
-            webSocket->enablePong();
-        else
-            webSocket->disablePong();
-
-        // Add this client to our client set
-        {
-            std::lock_guard<std::mutex> lock(_clientsMutex);
-            _clients.insert(webSocket);
-        }
-
-        auto status = webSocket->connectToSocket(fd, _handshakeTimeoutSecs);
-        if (status.success)
-        {
-            // Process incoming messages and execute callbacks
-            // until the connection is closed
-            webSocket->run();
-        }
-        else
-        {
-            std::stringstream ss;
-            ss << "WebSocketServer::handleConnection() error: "
-               << status.http_status
-               << " error: "
-               << status.errorStr;
-            logError(ss.str());
-        }
-
-        // Remove this client from our client set
-        {
-            std::lock_guard<std::mutex> lock(_clientsMutex);
-            if (_clients.erase(webSocket) != 1)
-            {
-                logError("Cannot delete client");
-            }
-        }
-
-        logInfo("WebSocketServer::handleConnection() done");
-        connectionState->setTerminated();
-    }
-
-    std::set<std::shared_ptr<WebSocket>> WebSocketServer::getClients()
-    {
-        std::lock_guard<std::mutex> lock(_clientsMutex);
-        return _clients;
-    }
-
-    size_t WebSocketServer::getConnectedClientsCount()
-    {
-        std::lock_guard<std::mutex> lock(_clientsMutex);
-        return _clients.size();
-    }
-}

ixwebsocket/IXWebSocketServer.h

@@ -1,62 +0,0 @@
-/*
- *  IXWebSocketServer.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include "IXSocketServer.h"
-#include "IXWebSocket.h"
-#include <condition_variable>
-#include <functional>
-#include <memory>
-#include <mutex>
-#include <set>
-#include <string>
-#include <thread>
-#include <utility> // pair
-
-namespace ix
-{
-    using OnConnectionCallback =
-        std::function<void(std::shared_ptr<WebSocket>, std::shared_ptr<ConnectionState>)>;
-
-    class WebSocketServer final : public SocketServer
-    {
-    public:
-        WebSocketServer(int port = SocketServer::kDefaultPort,
-                        const std::string& host = SocketServer::kDefaultHost,
-                        int backlog = SocketServer::kDefaultTcpBacklog,
-                        size_t maxConnections = SocketServer::kDefaultMaxConnections,
-                        int handshakeTimeoutSecs = WebSocketServer::kDefaultHandShakeTimeoutSecs);
-        virtual ~WebSocketServer();
-        virtual void stop() final;
-
-        void enablePong();
-        void disablePong();
-
-        void setOnConnectionCallback(const OnConnectionCallback& callback);
-
-        // Get all the connected clients
-        std::set<std::shared_ptr<WebSocket>> getClients();
-
-    private:
-        // Member variables
-        int _handshakeTimeoutSecs;
-        bool _enablePong;
-
-        OnConnectionCallback _onConnectionCallback;
-
-        std::mutex _clientsMutex;
-        std::set<std::shared_ptr<WebSocket>> _clients;
-
-        const static int kDefaultHandShakeTimeoutSecs;
-        const static bool kDefaultEnablePong;
-
-        // Methods
-        virtual void handleConnection(int fd,
-                                      std::shared_ptr<ConnectionState> connectionState) final;
-        virtual size_t getConnectedClientsCount() final;
-    };
-} // namespace ix

ixwebsocket/IXWebSocketTransport.h

@@ -10,37 +10,43 @@
 // Adapted from https://github.com/dhbaird/easywsclient
 //
 
-#include "IXCancellationRequest.h"
-#include "IXProgressCallback.h"
-#include "IXWebSocketCloseConstants.h"
-#include "IXWebSocketHandshake.h"
-#include "IXWebSocketHttpHeaders.h"
-#include "IXWebSocketPerMessageDeflate.h"
-#include "IXWebSocketPerMessageDeflateOptions.h"
-#include "IXWebSocketSendInfo.h"
-#include <atomic>
-#include <functional>
-#include <list>
-#include <memory>
-#include <mutex>
 #include <string>
 #include <vector>
+#include <functional>
+#include <memory>
+#include <mutex>
+#include <atomic>
 
-namespace ix
+namespace ix 
 {
     class Socket;
 
-    enum class SendMessageKind
+    struct WebSocketInitResult
     {
-        Text,
-        Binary,
-        Ping
+        bool success;
+        int http_status;
+        std::string errorStr;
+
+        WebSocketInitResult(bool s, int h, std::string e)
+        {
+            success = s;
+            http_status = h;
+            errorStr = e;
+        }
+
+        // need to define a default
+        WebSocketInitResult()
+        {
+            success = false;
+            http_status = 0;
+            errorStr = "";
+        }
     };
 
     class WebSocketTransport
     {
     public:
-        enum class ReadyState
+        enum ReadyStateValues
         {
             CLOSING,
             CLOSED,
@@ -48,70 +54,51 @@ namespace ix
             OPEN
         };
 
-        enum class MessageKind
+        enum MessageKind
         {
-            MSG_TEXT,
-            MSG_BINARY,
+            MSG,
             PING,
-            PONG,
-            FRAGMENT
+            PONG
         };
 
-        enum class PollResult
-        {
-            Succeeded,
-            AbnormalClose
-        };
-
-        using OnMessageCallback =
-            std::function<void(const std::string&, size_t, bool, MessageKind)>;
-        using OnCloseCallback = std::function<void(uint16_t, const std::string&, size_t, bool)>;
+        using OnMessageCallback = std::function<void(const std::string&,
+                                                     MessageKind)>;
+        using OnStateChangeCallback = std::function<void(ReadyStateValues)>;
 
         WebSocketTransport();
         ~WebSocketTransport();
 
-        void configure(const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions,
-                       bool enablePong,
-                       int pingIntervalSecs,
-                       int pingTimeoutSecs);
+        void configure(const std::string& url);
+        WebSocketInitResult init();
 
-        WebSocketInitResult connectToUrl(const std::string& url, // Client
-                                         int timeoutSecs);
-        WebSocketInitResult connectToSocket(int fd, // Server
-                                            int timeoutSecs);
+        void poll();
+        void send(const std::string& message);
+        void sendBinary(const std::string& message);
+        void sendBinary(const std::vector<uint8_t>& message);
+        void sendPing(const std::string& message);
+        void close();
+        ReadyStateValues getReadyState() const;
+        void setReadyState(ReadyStateValues readyStateValue);
+        void setOnStateChangeCallback(const OnStateChangeCallback& onStateChangeCallback);
+        void dispatch(const OnMessageCallback& onMessageCallback);
 
-        PollResult poll();
-        WebSocketSendInfo sendBinary(const std::string& message,
-                                     const OnProgressCallback& onProgressCallback);
-        WebSocketSendInfo sendText(const std::string& message,
-                                   const OnProgressCallback& onProgressCallback);
-        WebSocketSendInfo sendPing(const std::string& message);
-
-        void close(uint16_t code = WebSocketCloseConstants::kNormalClosureCode,
-                   const std::string& reason = WebSocketCloseConstants::kNormalClosureMessage,
-                   size_t closeWireSize = 0,
-                   bool remote = false);
-
-        void closeSocket();
-        ssize_t send();
-
-        ReadyState getReadyState() const;
-        void setReadyState(ReadyState readyState);
-        void setOnCloseCallback(const OnCloseCallback& onCloseCallback);
-        void dispatch(PollResult pollResult, const OnMessageCallback& onMessageCallback);
-        size_t bufferedAmount() const;
+        static void printUrl(const std::string& url);
+        static bool parseUrl(const std::string& url,
+                             std::string& protocol,
+                             std::string& host,
+                             std::string& path,
+                             std::string& query,
+                             int& port);
 
     private:
         std::string _url;
+        std::string _origin;
 
-        struct wsheader_type
-        {
+        struct wsheader_type {
             unsigned header_size;
             bool fin;
-            bool rsv1;
             bool mask;
-            enum opcode_type
-            {
+            enum opcode_type {
                 CONTINUATION = 0x0,
                 TEXT_FRAME = 0x1,
                 BINARY_FRAME = 0x2,
@@ -124,118 +111,22 @@ namespace ix
             uint8_t masking_key[4];
         };
 
-        // Tells whether we should mask the data we send.
-        // client should mask but server should not
-        std::atomic<bool> _useMask;
-
-        // Buffer for reading from our socket. That buffer is never resized.
-        std::vector<uint8_t> _readbuf;
-
-        // Contains all messages that were fetched in the last socket read.
-        // This could be a mix of control messages (Close, Ping, etc...) and
-        // data messages. That buffer
         std::vector<uint8_t> _rxbuf;
-
-        // Contains all messages that are waiting to be sent
         std::vector<uint8_t> _txbuf;
         mutable std::mutex _txbufMutex;
+        std::vector<uint8_t> _receivedData;
 
-        // Hold fragments for multi-fragments messages in a list. We support receiving very large
-        // messages (tested messages up to 700M) and we cannot put them in a single
-        // buffer that is resized, as this operation can be slow when a buffer has its
-        // size increased 2 fold, while appending to a list has a fixed cost.
-        std::list<std::vector<uint8_t>> _chunks;
-
-        // Fragments are 32K long
-        static constexpr size_t kChunkSize = 1 << 15;
-
-        // Underlying TCP socket
         std::shared_ptr<Socket> _socket;
-        std::mutex _socketMutex;
 
-        // Hold the state of the connection (OPEN, CLOSED, etc...)
-        std::atomic<ReadyState> _readyState;
+        std::atomic<ReadyStateValues> _readyState;
 
-        OnCloseCallback _onCloseCallback;
-        uint16_t _closeCode;
-        std::string _closeReason;
-        size_t _closeWireSize;
-        bool _closeRemote;
-        mutable std::mutex _closeDataMutex;
-
-        // Data used for Per Message Deflate compression (with zlib)
-        WebSocketPerMessageDeflate _perMessageDeflate;
-        WebSocketPerMessageDeflateOptions _perMessageDeflateOptions;
-        std::atomic<bool> _enablePerMessageDeflate;
-
-        // Used to cancel dns lookup + socket connect + http upgrade
-        std::atomic<bool> _requestInitCancellation;
-
-        mutable std::mutex _closingTimePointMutex;
-        std::chrono::time_point<std::chrono::steady_clock> _closingTimePoint;
-        static const int kClosingMaximumWaitingDelayInMs;
-
-        // enable auto response to ping
-        std::atomic<bool> _enablePong;
-        static const bool kDefaultEnablePong;
-
-        // Optional ping and pong timeout
-        // if both ping interval and timeout are set (> 0),
-        // then use GCD of these value to wait for the lowest time
-        int _pingIntervalSecs;
-        int _pingTimeoutSecs;
-        int _pingIntervalOrTimeoutGCDSecs;
-
-        static const int kDefaultPingIntervalSecs;
-        static const int kDefaultPingTimeoutSecs;
-        static const std::string kPingMessage;
-
-        // Record time step for ping/ ping timeout to ensure we wait for the right left duration
-        std::chrono::time_point<std::chrono::steady_clock> _nextGCDTimePoint;
-
-        // We record when ping are being sent so that we can know when to send the next one
-        // We also record when pong are being sent as a reply to pings, to close the connections
-        // if no pong were received sufficiently fast.
-        mutable std::mutex _lastSendPingTimePointMutex;
-        mutable std::mutex _lastReceivePongTimePointMutex;
-        std::chrono::time_point<std::chrono::steady_clock> _lastSendPingTimePoint;
-        std::chrono::time_point<std::chrono::steady_clock> _lastReceivePongTimePoint;
-
-        // If this function returns true, it is time to send a new ping
-        bool pingIntervalExceeded();
-
-        // No PONG data was received through the socket for longer than ping timeout delay
-        bool pingTimeoutExceeded();
-
-        // after calling close(), if no CLOSE frame answer is received back from the remote, we
-        // should close the connexion
-        bool closingDelayExceeded();
-
-        void initTimePointsAndGCDAfterConnect();
-
-        void sendCloseFrame(uint16_t code, const std::string& reason);
-
-        void closeSocketAndSwitchToClosedState(uint16_t code,
-                                               const std::string& reason,
-                                               size_t closeWireSize,
-                                               bool remote);
+        OnStateChangeCallback _onStateChangeCallback;
 
         void sendOnSocket();
-        WebSocketSendInfo sendData(wsheader_type::opcode_type type,
-                                   const std::string& message,
-                                   bool compress,
-                                   const OnProgressCallback& onProgressCallback = nullptr);
-
-        void sendFragment(wsheader_type::opcode_type type,
-                          bool fin,
-                          std::string::const_iterator begin,
-                          std::string::const_iterator end,
-                          bool compress);
-
-        void emitMessage(MessageKind messageKind,
-                         const std::string& message,
-                         const wsheader_type& ws,
-                         const OnMessageCallback& onMessageCallback);
+        void sendData(wsheader_type::opcode_type type, 
+                      uint64_t message_size, 
+                      std::string::const_iterator message_begin, 
+                      std::string::const_iterator message_end);
 
         bool isSendBufferEmpty() const;
         void appendToSendBuffer(const std::vector<uint8_t>& header,
@@ -243,10 +134,8 @@ namespace ix
                                 std::string::const_iterator end,
                                 uint64_t message_size,
                                 uint8_t masking_key[4]);
+        void appendToSendBuffer(const std::vector<uint8_t>& buffer);
 
         unsigned getRandomUnsigned();
-        void unmaskReceiveBuffer(const wsheader_type& ws);
-
-        std::string getMergedChunks() const;
     };
-} // namespace ix
+}

ixwebsocket/LUrlParser.cpp

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

ixwebsocket/LUrlParser.h

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

ixwebsocket/apple/IXSetThreadName_apple.cpp

@@ -1,20 +0,0 @@
-/*
- *  IXSetThreadName_apple.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
- */
-#include "../IXSetThreadName.h"
-#include <pthread.h>
-
-namespace ix
-{
-    void setThreadName(const std::string& name)
-    {
-        //
-        // Apple reserves 16 bytes for its thread names
-        // Notice that the Apple version of pthread_setname_np
-        // does not take a pthread_t argument
-        //
-        pthread_setname_np(name.substr(0, 63).c_str());
-    }
-}