add echo and broadcast server as ws sub-commands

* New command line tool for transfering files / still very beta.

* add readme

* use cli11 for argument parsing

* json -> msgpack

* stop using base64 and use binary which can be stored in message pack

.clang-format

@@ -1,47 +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: false
-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
-SpaceAfterCStyleCast: true
-Standard: Cpp11
-UseTab: Never

.dockerignore

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

.github/workflows/docker.yml

@@ -1,66 +0,0 @@
-name: docker
-
-# When its time to do a release do a build for amd64
-# and push all of them to Docker Hub.
-# Only trigger on semver shaped tags.
-on:
-  push:
-    tags:
-      - "v*.*.*"
-
-jobs:
-  login:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Prepare
-        id: prep
-        run: |
-          DOCKER_IMAGE=machinezone/ws
-          VERSION=edge
-          if [[ $GITHUB_REF == refs/tags/* ]]; then
-            VERSION=${GITHUB_REF#refs/tags/v}
-          fi
-          if [ "${{ github.event_name }}" = "schedule" ]; then
-            VERSION=nightly
-          fi
-          TAGS="${DOCKER_IMAGE}:${VERSION}"
-          if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
-            TAGS="$TAGS,${DOCKER_IMAGE}:latest"
-          fi
-          echo ::set-output name=tags::${TAGS}
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@master
-
-      - name: Cache Docker layers
-        uses: actions/cache@v2
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-
-      - name: Login to GitHub Package Registry
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GHCR_TOKEN }}
-
-      - name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2-build-push
-        with:
-          builder: ${{ steps.buildx.outputs.name }}
-          context: .
-          file: ./Dockerfile
-          target: prod
-          platforms: linux/amd64
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.prep.outputs.tags }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache

.github/workflows/mkdocs.yml

@@ -1,30 +0,0 @@
-name: mkdocs
-on:
-  push:
-    branches:
-    - master
-    paths:
-    - 'docs/**'
-
-jobs:
-  linux:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.8
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install mkdocs
-        pip install mkdocs-material
-        pip install pygments
-    - name: Build doc
-      run: |
-        git checkout master
-        git clean -dfx .
-        git fetch
-        git pull
-        mkdocs gh-deploy

.github/workflows/unittest_linux.yml

@@ -1,15 +0,0 @@
-name: linux
-on:
-  push:
-    paths-ignore:
-    - 'docs/**'
-  pull_request:
-
-jobs:
-  linux:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - uses: seanmiddleditch/gha-setup-ninja@master
-    - name: make test
-      run: make -f makefile.dev test

.github/workflows/unittest_linux_asan.yml

@@ -1,15 +0,0 @@
-name: linux_asan
-on:
-  push:
-    paths-ignore:
-    - 'docs/**'
-  pull_request:
-
-jobs:
-  linux:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - uses: seanmiddleditch/gha-setup-ninja@master
-    - name: make test_asan
-      run: make -f makefile.dev test_asan

.github/workflows/unittest_mac_tsan_mbedtls.yml

@@ -1,17 +0,0 @@
-name: mac_tsan_mbedtls
-on:
-  push:
-    paths-ignore:
-    - 'docs/**'
-  pull_request:
-
-jobs:
-  mac_tsan_mbedtls:
-    runs-on: macOS-latest
-    steps:
-    - uses: actions/checkout@v1
-    - uses: seanmiddleditch/gha-setup-ninja@master
-    - name: install mbedtls
-      run: brew install mbedtls
-    - name: make test
-      run: make -f makefile.dev test_tsan_mbedtls

.github/workflows/unittest_mac_tsan_openssl.yml

@@ -1,17 +0,0 @@
-name: mac_tsan_openssl
-on:
-  push:
-    paths-ignore:
-    - 'docs/**'
-  pull_request:
-
-jobs:
-  mac_tsan_openssl:
-    runs-on: macOS-latest
-    steps:
-    - uses: actions/checkout@v1
-    - uses: seanmiddleditch/gha-setup-ninja@master
-    - name: install openssl
-      run: brew install openssl@1.1
-    - name: make test
-      run: make -f makefile.dev test_tsan_openssl

.github/workflows/unittest_mac_tsan_sectransport.yml

@@ -1,15 +0,0 @@
-name: mac_tsan_sectransport
-on:
-  push:
-    paths-ignore:
-    - 'docs/**'
-  pull_request:
-
-jobs:
-  mac_tsan_sectransport:
-    runs-on: macOS-latest
-    steps:
-    - uses: actions/checkout@v1
-    - uses: seanmiddleditch/gha-setup-ninja@master
-    - name: make test_tsan_sectransport
-      run: make -f makefile.dev test_tsan_sectransport

.github/workflows/unittest_uwp.yml

@@ -1,45 +0,0 @@
-name: uwp
-on:
-  push:
-    paths-ignore:
-    - 'docs/**'
-  pull_request:
-
-jobs:
-  uwp:
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v1
-    - uses: seanmiddleditch/gha-setup-vsdevenv@master
-    - uses: seanmiddleditch/gha-setup-ninja@master
-    - run: |
-        mkdir build
-        cd build
-        cmake -GNinja -DCMAKE_TOOLCHAIN_FILE=c:/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0" -DCMAKE_CXX_COMPILER=cl.exe -DCMAKE_C_COMPILER=cl.exe -DUSE_TEST=1 -DUSE_ZLIB=0 ..
-    - run: |
-        cd build
-        ninja
-    - run: |
-        cd build
-        ninja test
-
-#
-#   Windows with OpenSSL is working but disabled as it takes 13 minutes (10 for openssl) to build with vcpkg
-#
-#   windows_openssl:
-#     runs-on: windows-latest
-#     steps:
-#     - uses: actions/checkout@v1
-#     - uses: seanmiddleditch/gha-setup-vsdevenv@master
-#     - run: |
-#         vcpkg install zlib:x64-windows
-#         vcpkg install openssl:x64-windows
-#     - run: |
-#         mkdir build
-#         cd build
-#         cmake -DCMAKE_TOOLCHAIN_FILE=c:/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_CXX_COMPILER=cl.exe -DUSE_OPEN_SSL=1 -DUSE_TLS=1 -DUSE_WS=1 -DUSE_TEST=1 ..
-#     - run: cmake --build build
-# 
-#     # Running the unittest does not work, the binary cannot be found
-#     #- run: ../build/test/ixwebsocket_unittest.exe
-#     # working-directory: test

.github/workflows/unittest_windows_gcc.yml

@@ -1,28 +0,0 @@
-name: windows_gcc
-on:
-  push:
-    paths-ignore:
-    - 'docs/**'
-  pull_request:
-
-jobs:
-  windows:
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v1
-    - uses: seanmiddleditch/gha-setup-ninja@master
-    - uses: bsergean/setup-mingw@d79ce405bac9edef3a1726ef00554a56f0bafe66
-    - run: |
-        mkdir build
-        cd build
-        cmake -GNinja -DCMAKE_CXX_COMPILER=c++ -DCMAKE_C_COMPILER=cc -DUSE_WS=1 -DUSE_TEST=1 -DUSE_ZLIB=0 -DCMAKE_UNITY_BUILD=ON ..
-    - run: |
-        cd build
-        ninja
-    - run: |
-        cd build
-        ctest -V
-        # ninja test
-
-#- run: ../build/test/ixwebsocket_unittest.exe
-# working-directory: test

.gitignore

@@ -1,12 +0,0 @@
-build
-*.pyc
-venv
-ixsnake/ixsnake/.certs/
-site/
-ws/.certs/
-ws/.srl
-ixhttpd
-makefile
-a.out
-.idea/
-cmake-build-debug/

.pre-commit-config.yaml

@@ -1,12 +0,0 @@
-repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.5.0
-    hooks:
-    -   id: check-yaml
-    -   id: end-of-file-fixer
-    -   id: trailing-whitespace
--   repo: https://github.com/pocc/pre-commit-hooks
-    rev: v1.1.1
-    hooks:
-    -    id: clang-format
-         args: [-i, -style=file]

.travis.yml

@@ -0,0 +1,17 @@
+language: cpp
+dist: xenial
+
+compiler:
+  - gcc
+  - clang
+os:
+  - linux
+  - osx
+
+matrix:
+  exclude:
+    # GCC fails on recent Travis OSX images.
+    - compiler: gcc
+      os: osx
+
+script: python test/run.py

CMake/FindDeflate.cmake

@@ -1,19 +0,0 @@
-# Find package structure taken from libcurl
-
-include(FindPackageHandleStandardArgs)
-
-find_path(DEFLATE_INCLUDE_DIRS libdeflate.h)
-find_library(DEFLATE_LIBRARY deflate)
-
-find_package_handle_standard_args(Deflate
-    FOUND_VAR
-      DEFLATE_FOUND
-    REQUIRED_VARS
-      DEFLATE_LIBRARY
-      DEFLATE_INCLUDE_DIRS
-    FAIL_MESSAGE
-      "Could NOT find deflate"
-)
-
-set(DEFLATE_INCLUDE_DIRS ${DEFLATE_INCLUDE_DIRS})
-set(DEFLATE_LIBRARIES ${DEFLATE_LIBRARY})

CMake/FindMbedTLS.cmake

@@ -1,16 +0,0 @@
-find_path(MBEDTLS_INCLUDE_DIRS mbedtls/ssl.h)
-
-# mbedtls-3.0 changed headers files, and we need to ifdef'out a few things
-find_path(MBEDTLS_VERSION_GREATER_THAN_3 mbedtls/build_info.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)

CMake/FindSpdLog.cmake

@@ -1,19 +0,0 @@
-# Find package structure taken from libcurl
-
-include(FindPackageHandleStandardArgs)
-
-find_path(SPDLOG_INCLUDE_DIRS spdlog/spdlog.h)
-find_library(JSONCPP_LIBRARY spdlog)
-
-find_package_handle_standard_args(SPDLOG
-    FOUND_VAR
-    SPDLOG_FOUND
-    REQUIRED_VARS
-      SPDLOG_LIBRARY
-      SPDLOG_INCLUDE_DIRS
-    FAIL_MESSAGE
-      "Could NOT find spdlog"
-)
-
-set(SPDLOG_INCLUDE_DIRS ${SPDLOG_INCLUDE_DIRS})
-set(SPDLOG_LIBRARIES ${SPDLOG_LIBRARY})

CMakeLists.txt

@@ -3,323 +3,115 @@
 # Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
 #
 
-cmake_minimum_required(VERSION 3.4.1...3.17.2)
+cmake_minimum_required(VERSION 3.4.1)
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake;${CMAKE_MODULE_PATH}")
+project(ixwebsocket C CXX)
 
-project(ixwebsocket LANGUAGES C CXX VERSION 11.4.6)
+set (CMAKE_CXX_STANDARD 14)
-
-set (CMAKE_CXX_STANDARD 11)
 set (CXX_STANDARD_REQUIRED ON)
 set (CMAKE_CXX_EXTENSIONS OFF)
-set (CMAKE_EXPORT_COMPILE_COMMANDS yes)
 
-option (BUILD_DEMO OFF)
+if (NOT WIN32)
-
-if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-  set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-endif()
-
-if (UNIX)
   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/IXBench.cpp
+    ixwebsocket/IXEventFd.cpp
-    ixwebsocket/IXCancellationRequest.cpp
-    ixwebsocket/IXConnectionState.cpp
-    ixwebsocket/IXDNSLookup.cpp
-    ixwebsocket/IXExponentialBackoff.cpp
-    ixwebsocket/IXGetFreePort.cpp
-    ixwebsocket/IXGzipCodec.cpp
-    ixwebsocket/IXHttp.cpp
-    ixwebsocket/IXHttpClient.cpp
-    ixwebsocket/IXHttpServer.cpp
-    ixwebsocket/IXNetSystem.cpp
-    ixwebsocket/IXSelectInterrupt.cpp
-    ixwebsocket/IXSelectInterruptFactory.cpp
-    ixwebsocket/IXSelectInterruptPipe.cpp
-    ixwebsocket/IXSelectInterruptEvent.cpp
-    ixwebsocket/IXSetThreadName.cpp
     ixwebsocket/IXSocket.cpp
-    ixwebsocket/IXSocketConnect.cpp
-    ixwebsocket/IXSocketFactory.cpp
     ixwebsocket/IXSocketServer.cpp
-    ixwebsocket/IXSocketTLSOptions.cpp
+    ixwebsocket/IXSocketConnect.cpp
-    ixwebsocket/IXStrCaseCompare.cpp
+    ixwebsocket/IXDNSLookup.cpp
-    ixwebsocket/IXUdpSocket.cpp
+    ixwebsocket/IXCancellationRequest.cpp
-    ixwebsocket/IXUrlParser.cpp
-    ixwebsocket/IXUuid.cpp
-    ixwebsocket/IXUserAgent.cpp
     ixwebsocket/IXWebSocket.cpp
-    ixwebsocket/IXWebSocketCloseConstants.cpp
+    ixwebsocket/IXWebSocketServer.cpp
+    ixwebsocket/IXWebSocketTransport.cpp
     ixwebsocket/IXWebSocketHandshake.cpp
-    ixwebsocket/IXWebSocketHttpHeaders.cpp
     ixwebsocket/IXWebSocketPerMessageDeflate.cpp
     ixwebsocket/IXWebSocketPerMessageDeflateCodec.cpp
     ixwebsocket/IXWebSocketPerMessageDeflateOptions.cpp
-    ixwebsocket/IXWebSocketProxyServer.cpp
-    ixwebsocket/IXWebSocketServer.cpp
-    ixwebsocket/IXWebSocketTransport.cpp
 )
 
 set( IXWEBSOCKET_HEADERS
-    ixwebsocket/IXBase64.h
+    ixwebsocket/IXEventFd.h
-    ixwebsocket/IXBench.h
-    ixwebsocket/IXCancellationRequest.h
-    ixwebsocket/IXConnectionState.h
-    ixwebsocket/IXDNSLookup.h
-    ixwebsocket/IXExponentialBackoff.h
-    ixwebsocket/IXGetFreePort.h
-    ixwebsocket/IXGzipCodec.h
-    ixwebsocket/IXHttp.h
-    ixwebsocket/IXHttpClient.h
-    ixwebsocket/IXHttpServer.h
-    ixwebsocket/IXNetSystem.h
-    ixwebsocket/IXProgressCallback.h
-    ixwebsocket/IXSelectInterrupt.h
-    ixwebsocket/IXSelectInterruptFactory.h
-    ixwebsocket/IXSelectInterruptPipe.h
-    ixwebsocket/IXSelectInterruptEvent.h
-    ixwebsocket/IXSetThreadName.h
     ixwebsocket/IXSocket.h
-    ixwebsocket/IXSocketConnect.h
-    ixwebsocket/IXSocketFactory.h
     ixwebsocket/IXSocketServer.h
-    ixwebsocket/IXSocketTLSOptions.h
+    ixwebsocket/IXSocketConnect.h
-    ixwebsocket/IXStrCaseCompare.h
+    ixwebsocket/IXSetThreadName.h
-    ixwebsocket/IXUdpSocket.h
+    ixwebsocket/IXDNSLookup.h
-    ixwebsocket/IXUniquePtr.h
+    ixwebsocket/IXCancellationRequest.h
-    ixwebsocket/IXUrlParser.h
+    ixwebsocket/IXProgressCallback.h
-    ixwebsocket/IXUuid.h
-    ixwebsocket/IXUtf8Validator.h
-    ixwebsocket/IXUserAgent.h
     ixwebsocket/IXWebSocket.h
-    ixwebsocket/IXWebSocketCloseConstants.h
+    ixwebsocket/IXWebSocketServer.h
-    ixwebsocket/IXWebSocketCloseInfo.h
+    ixwebsocket/IXWebSocketTransport.h
-    ixwebsocket/IXWebSocketErrorInfo.h
     ixwebsocket/IXWebSocketHandshake.h
-    ixwebsocket/IXWebSocketHandshakeKeyGen.h
+    ixwebsocket/IXWebSocketSendInfo.h
-    ixwebsocket/IXWebSocketHttpHeaders.h
+    ixwebsocket/IXWebSocketErrorInfo.h
-    ixwebsocket/IXWebSocketInitResult.h
-    ixwebsocket/IXWebSocketMessage.h
-    ixwebsocket/IXWebSocketMessageType.h
-    ixwebsocket/IXWebSocketOpenInfo.h
     ixwebsocket/IXWebSocketPerMessageDeflate.h
     ixwebsocket/IXWebSocketPerMessageDeflateCodec.h
     ixwebsocket/IXWebSocketPerMessageDeflateOptions.h
-    ixwebsocket/IXWebSocketProxyServer.h
+    ixwebsocket/IXWebSocketHttpHeaders.h
-    ixwebsocket/IXWebSocketSendData.h
+    ixwebsocket/libwshandshake.hpp
-    ixwebsocket/IXWebSocketSendInfo.h
-    ixwebsocket/IXWebSocketServer.h
-    ixwebsocket/IXWebSocketTransport.h
-    ixwebsocket/IXWebSocketVersion.h
 )
 
-option(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" OFF)
+# Platform specific code
-option(USE_TLS "Enable TLS support" FALSE)
+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)
+endif()
 
 if (USE_TLS)
-    # default to securetranport on Apple if nothing is configured
+    add_definitions(-DIXWEBSOCKET_USE_TLS)
-    if (APPLE)
-      if (NOT USE_MBED_TLS AND NOT USE_OPEN_SSL) # unless we want something else
-        set(USE_SECURE_TRANSPORT ON)
-      endif()
-    # default to mbedtls on windows if nothing is configured
-    elseif (WIN32)
-      if (NOT USE_OPEN_SSL) # unless we want something else
-        set(USE_MBED_TLS ON)
-      endif()
-    else() # default to OpenSSL on all other platforms
-      if (NOT USE_MBED_TLS) # Unless mbedtls is requested
-        set(USE_OPEN_SSL ON)
-        set(requires "openssl")
-      endif()
-    endif()
 
-    if (USE_MBED_TLS)
+    if (APPLE)
-        list( APPEND IXWEBSOCKET_HEADERS ixwebsocket/IXSocketMbedTLS.h)
-        list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/IXSocketMbedTLS.cpp)
-    elseif (USE_SECURE_TRANSPORT)
         list( APPEND IXWEBSOCKET_HEADERS ixwebsocket/IXSocketAppleSSL.h)
         list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/IXSocketAppleSSL.cpp)
-    elseif (USE_OPEN_SSL)
+    elseif (WIN32)
+        list( APPEND IXWEBSOCKET_HEADERS ixwebsocket/IXSocketSChannel.h)
+        list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/IXSocketSChannel.cpp)
+    else()
         list( APPEND IXWEBSOCKET_HEADERS ixwebsocket/IXSocketOpenSSL.h)
         list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/IXSocketOpenSSL.cpp)
-    else()
-        message(FATAL_ERROR "TLS Configuration error: unknown backend")
     endif()
 endif()
 
-if(BUILD_SHARED_LIBS)
+add_library( ixwebsocket STATIC
-    # Building shared library
-    
-    if(MSVC)
-        # Workaround for some projects
-        set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-    endif()
-
-    add_library( ixwebsocket SHARED
     ${IXWEBSOCKET_SOURCES}
     ${IXWEBSOCKET_HEADERS}
-    )
+)
 
-    # Set library version
+# gcc/Linux needs -pthread
-    set_target_properties(ixwebsocket PROPERTIES VERSION ${PROJECT_VERSION})
+find_package(Threads)
-else()
-    # Static library
-    add_library( ixwebsocket
-        ${IXWEBSOCKET_SOURCES}
-        ${IXWEBSOCKET_HEADERS}
-    )
-endif()
 
-if (USE_TLS)
+if(UNIX AND NOT APPLE)
-    target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_TLS)
-    if (USE_MBED_TLS)
-        target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_MBED_TLS)
-    elseif (USE_OPEN_SSL)
-        target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_OPEN_SSL)
-    elseif (USE_SECURE_TRANSPORT)
-        target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_SECURE_TRANSPORT)
-    else()
-        message(FATAL_ERROR "TLS Configuration error: unknown backend")
-    endif()
-endif()
-
-if (USE_TLS)
-  if (USE_OPEN_SSL)
-    message(STATUS "TLS configured to use openssl")
-
-    # Help finding Homebrew's OpenSSL on macOS
-    if (APPLE)
-      set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /usr/local/opt/openssl/lib)
-      set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} /usr/local/opt/openssl/include)
-
-      # This is for MacPort OpenSSL 1.0
-      # set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /opt/local/lib/openssl-1.0)
-      # set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} /opt/local/include/openssl-1.0)
-    endif()
-
-    # This OPENSSL_FOUND check is to help find a cmake manually configured OpenSSL
-    if (NOT OPENSSL_FOUND)
   find_package(OpenSSL REQUIRED)
-    endif()
-    message(STATUS "OpenSSL: " ${OPENSSL_VERSION})
-
   add_definitions(${OPENSSL_DEFINITIONS})
-    target_include_directories(ixwebsocket PUBLIC $<BUILD_INTERFACE:${OPENSSL_INCLUDE_DIR}>)
+  message(STATUS "OpenSSL: " ${OPENSSL_VERSION})
-    target_link_libraries(ixwebsocket PRIVATE ${OPENSSL_LIBRARIES})
+  include_directories(${OPENSSL_INCLUDE_DIR})
-  elseif (USE_MBED_TLS)
-    message(STATUS "TLS configured to use mbedtls")
-
-    # This MBEDTLS_FOUND check is to help find a cmake manually configured MbedTLS
-    if (NOT MBEDTLS_FOUND)
-      find_package(MbedTLS REQUIRED)
-      
-      if (MBEDTLS_VERSION_GREATER_THAN_3)
-        target_compile_definitions(ixwebsocket PRIVATE IXWEBSOCKET_USE_MBED_TLS_MIN_VERSION_3)
-      endif()
-      
-    endif()
-    target_include_directories(ixwebsocket PUBLIC $<BUILD_INTERFACE:${MBEDTLS_INCLUDE_DIRS}>)
-    target_link_libraries(ixwebsocket PRIVATE ${MBEDTLS_LIBRARIES})
-  elseif (USE_SECURE_TRANSPORT)
-    message(STATUS "TLS configured to use secure transport")
-    target_link_libraries(ixwebsocket PRIVATE "-framework Foundation" "-framework Security")
-  endif()
-endif()
-
-option(USE_ZLIB "Enable zlib support" TRUE)
-
-if (USE_ZLIB)
-  find_package(ZLIB REQUIRED)
-  target_link_libraries(ixwebsocket PRIVATE ZLIB::ZLIB)
-
-  target_compile_definitions(ixwebsocket PUBLIC IXWEBSOCKET_USE_ZLIB)
 endif()
 
 if (WIN32)
-  target_link_libraries(ixwebsocket PRIVATE wsock32 ws2_32 shlwapi)
+  get_filename_component(libz_path
-  target_compile_definitions(ixwebsocket PRIVATE _CRT_SECURE_NO_WARNINGS)
+    ${PROJECT_SOURCE_DIR}/third_party/ZLIB-Windows/zlib-1.2.11_deploy_v140/release_dynamic/x64/lib/zlib.lib
+    ABSOLUTE)
+  add_library(libz STATIC IMPORTED)
+  set_target_properties(libz PROPERTIES IMPORTED_LOCATION
+    ${libz_path})
 
-  if (USE_TLS)
+  include_directories(${PROJECT_SOURCE_DIR}/third_party/ZLIB-Windows/zlib-1.2.11_deploy_v140/include)
-    target_link_libraries(ixwebsocket PRIVATE Crypt32)
+
-  endif()
+  target_link_libraries(ixwebsocket libz wsock32 ws2_32)
+  add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+  
+else()
+  target_link_libraries(ixwebsocket 
+    z ${OPENSSL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
 endif()
 
-if (UNIX AND NOT APPLE)
-  set(THREADS_PREFER_PTHREAD_FLAG TRUE)
-  find_package(Threads)
-  target_link_libraries(ixwebsocket PRIVATE Threads::Threads)
-endif()
-
-
 set( IXWEBSOCKET_INCLUDE_DIRS
-    ${CMAKE_CURRENT_SOURCE_DIR}
+    .
-)
+    ../../shared/OpenSSL/include)
+target_include_directories( ixwebsocket PUBLIC ${IXWEBSOCKET_INCLUDE_DIRS} )
 
-if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+add_subdirectory(ws)
-    # Build with Multiple Processes
-    target_compile_options(ixwebsocket PRIVATE /MP)
-endif()
-
-include(GNUInstallDirs)
-
-target_include_directories(ixwebsocket PUBLIC
-  $<BUILD_INTERFACE:${IXWEBSOCKET_INCLUDE_DIRS}/>
-  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ixwebsocket>
-)
-
-set_target_properties(ixwebsocket PROPERTIES PUBLIC_HEADER "${IXWEBSOCKET_HEADERS}")
-
-add_library(ixwebsocket::ixwebsocket ALIAS ixwebsocket)
-
-option(IXWEBSOCKET_INSTALL "Install IXWebSocket" TRUE)
-
-if (IXWEBSOCKET_INSTALL)
-  install(TARGETS ixwebsocket
-          EXPORT ixwebsocket
-          ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-          PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ixwebsocket/
-  )
-
-  configure_file("${CMAKE_CURRENT_LIST_DIR}/ixwebsocket-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/ixwebsocket-config.cmake" @ONLY)
-  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ixwebsocket-config.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/ixwebsocket")
-  
-  set(prefix ${CMAKE_INSTALL_PREFIX})
-  configure_file("${CMAKE_CURRENT_LIST_DIR}/ixwebsocket.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/ixwebsocket.pc" @ONLY)
-  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ixwebsocket.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-
-  install(EXPORT ixwebsocket
-          FILE ixwebsocket-targets.cmake
-          NAMESPACE ixwebsocket::
-          DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ixwebsocket
-  )
-endif()
-
-if (USE_WS OR USE_TEST)
-  include(FetchContent)
-  FetchContent_Declare(spdlog
-      GIT_REPOSITORY "https://github.com/gabime/spdlog"
-      GIT_TAG "v1.8.0"
-      GIT_SHALLOW 1) 
-
-  FetchContent_MakeAvailable(spdlog)
-
-  if (USE_WS)
-    add_subdirectory(ws)
-  endif()
-  if (USE_TEST)
-    enable_testing()
-    add_subdirectory(test)
-  endif()
-endif()
-
-if (BUILD_DEMO) 
-  add_executable(demo main.cpp)
-  target_link_libraries(demo ixwebsocket) 
-endif()

Dockerfile

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

README.md

@@ -1,152 +1,316 @@
-## Hello world
+# General
 
-(note from the main developer, sadly I don't have too much time to devote to this library anymore, maybe it's time to pass the maintenance to someone else more motivated ?)
+![Alt text](https://travis-ci.org/machinezone/IXWebSocket.svg?branch=master)
 
-IXWebSocket is a C++ library for WebSocket client and server development. It has minimal dependencies (no boost), is very simple to use and support everything you'll likely need for websocket dev (SSL, deflate compression, compiles on most platforms, etc...). HTTP client and server code is also available, but it hasn't received as much testing.
+## Introduction
 
-It is been used on big mobile video game titles sending and receiving tons of messages since 2017 (iOS and Android). It was tested on macOS, iOS, Linux, Android, Windows and FreeBSD. Two important design goals are simplicity and correctness.
+[*WebSocket*](https://en.wikipedia.org/wiki/WebSocket) is a computer communications protocol, providing full-duplex
+communication channels over a single TCP connection. *IXWebSocket* is a C++ library for client and server Websocket 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.
 
-```cpp
+* macOS
-/*
+* iOS
- *  main.cpp
+* Linux
- *  Author: Benjamin Sergeant
+* Android 
- *  Copyright (c) 2020 Machine Zone, Inc. All rights reserved.
+* Windows (no TLS support yet)
- *
- *  Super simple standalone example. See ws folder, unittest and doc/usage.md for more.
- *
- *  On macOS
- *  $ mkdir -p build ; (cd build ; cmake -DUSE_TLS=1 .. ; make -j ; make install)
- *  $ clang++ --std=c++11 --stdlib=libc++ main.cpp -lixwebsocket -lz -framework Security -framework Foundation
- *  $ ./a.out
- *
- *  Or use cmake -DBUILD_DEMO=ON option for other platforms
- */
 
-#include <ixwebsocket/IXNetSystem.h>
+## Examples
-#include <ixwebsocket/IXWebSocket.h>
-#include <ixwebsocket/IXUserAgent.h>
-#include <iostream>
 
-int main()
+The ws folder countains many interactive programs for chat and file transfers demonstrating client and server usage.
-{
-    // Required on Windows
-    ix::initNetSystem();
 
-    // Our websocket object
+Here is what the client API looks like.
-    ix::WebSocket webSocket;
 
-    // Connect to a server with encryption
+```
-    // See https://machinezone.github.io/IXWebSocket/usage/#tls-support-and-configuration
+ix::WebSocket webSocket;
-    //     https://github.com/machinezone/IXWebSocket/issues/386#issuecomment-1105235227 (self signed certificates)
-    std::string url("wss://echo.websocket.org");
-    webSocket.setUrl(url);
 
-    std::cout << "Connecting to " << url << "..." << std::endl;
+std::string url("ws://localhost:8080/");
+webSocket.setUrl(url);
 
-    // Setup a callback to be fired (in a background thread, watch out for race conditions !)
+// Optional heart beat, sent every 45 seconds when there isn't any traffic
-    // when a message or an event (open, close, error) is received
+// to make sure that load balancers do not kill an idle connection.
-    webSocket.setOnMessageCallback([](const ix::WebSocketMessagePtr& msg)
+webSocket.setHeartBeatPeriod(45);
+
+// Setup a callback to be fired when a message or an event (open, close, error) is received
+webSocket.setOnMessageCallback(
+    [](ix::WebSocketMessageType messageType,
+       const std::string& str,
+       size_t wireSize,
+       const ix::WebSocketErrorInfo& error,
+       const ix::WebSocketCloseInfo& closeInfo,
+       const ix::WebSocketHttpHeaders& headers)
     {
-            if (msg->type == ix::WebSocketMessageType::Message)
+        if (messageType == ix::WebSocket_MessageType_Message)
         {
-                std::cout << "received message: " << msg->str << std::endl;
+            std::cout << str << std::endl;
-                std::cout << "> " << std::flush;
         }
-            else if (msg->type == ix::WebSocketMessageType::Open)
+});
+
+// Now that our callback is setup, we can start our background thread and receive messages
+webSocket.start();
+
+// Send a message to the server
+webSocket.send("hello world");
+
+// ... 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<ix::WebSocket> webSocket)
     {
-                std::cout << "Connection established" << std::endl;
+        webSocket->setOnMessageCallback(
-                std::cout << "> " << std::flush;
+            [webSocket, &server](ix::WebSocketMessageType messageType,
+               const std::string& str,
+               size_t wireSize,
+               const ix::WebSocketErrorInfo& error,
+               const ix::WebSocketOpenInfo& openInfo,
+               const ix::WebSocketCloseInfo& closeInfo)
+            {
+                if (messageType == ix::WebSocket_MessageType_Open)
+                {
+                    std::cerr << "New connection" << std::endl;
+                    std::cerr << "Uri: " << openInfo.uri << std::endl;
+                    std::cerr << "Headers:" << std::endl;
+                    for (auto it : openInfo.headers)
+                    {
+                        std::cerr << it.first << ": " << it.second << std::endl;
                     }
-            else if (msg->type == ix::WebSocketMessageType::Error)
+                }
+                else if (messageType == ix::WebSocket_MessageType_Message)
                 {
-                // Maybe SSL is not configured properly
+                    // For an echo server, we just send back to the client whatever was received by the server
-                std::cout << "Connection error: " << msg->errorInfo.reason << std::endl;
+                    // All connected clients are available in an std::set. See the broadcast cpp example.
-                std::cout << "> " << std::flush;
+                    webSocket->send(str);
                 }
             }
         );
-
-    // 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)
-    webSocket.send("hello world");
-
-    // Display a prompt
-    std::cout << "> " << std::flush;
-
-    std::string text;
-    // Read text from the console and send messages in text mode.
-    // Exit with Ctrl-D on Unix or Ctrl-Z on Windows.
-    while (std::getline(std::cin, text))
-    {
-        webSocket.send(text);
-        std::cout << "> " << std::flush;
     }
+);
 
-    return 0;
+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();
+
 ```
 
-Interested? Go read the [docs](https://machinezone.github.io/IXWebSocket/)! If things don't work as expected, please create an issue on GitHub, or even better a pull request if you know how to fix your problem.
+## Build
 
-IXWebSocket is actively being developed, check out the [changelog](https://machinezone.github.io/IXWebSocket/CHANGELOG/) to know what's cooking. If you are looking for a real time messaging service (the chat-like 'server' your websocket code will talk to) with many features such as history, backed by Redis, look at [cobra](https://github.com/machinezone/cobra).
+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.
 
-IXWebSocket client code is autobahn compliant beginning with the 6.0.0 version. See the current [test results](https://bsergean.github.io/autobahn/reports/clients/index.html). Some tests are still failing in the server code.
+There is a Dockerfile for running some code on Linux, and a unittest which can be executed by typing `make test`.
 
-Starting with the 11.0.8 release, IXWebSocket should be fully C++11 compatible.
+## Implementation details
 
-## Users
+### Per Message Deflate compression.
 
-If your company or project is using this library, feel free to open an issue or PR to amend this list.
+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.
 
-- [Machine Zone](https://www.mz.com)
+### TLS/SSL
-- [Tokio](https://github.com/liz3/tokio), a discord library focused on audio playback with node bindings.
-- [libDiscordBot](https://github.com/tostc/libDiscordBot/tree/master), an easy to use Discord-bot framework.
-- [gwebsocket](https://github.com/norrbotten/gwebsocket), a websocket (lua) module for Garry's Mod
-- [DisCPP](https://github.com/DisCPP/DisCPP), a simple but feature rich Discord API wrapper (archived as of Oct 8, 2021)
-- [discord.cpp](https://github.com/luccanunes/discord.cpp), a discord library for making bots
-- [Teleport](http://teleportconnect.com/), Teleport is your own personal remote robot avatar
-- [Abaddon](https://github.com/uowuo/abaddon), An alternative Discord client made with C++/gtkmm 
-- [NovaCoin](https://github.com/novacoin-project/novacoin), a hybrid scrypt PoW + PoS based cryptocurrency.
-- [Candy](https://github.com/lanthora/candy), A WebSocket and TUN based VPN for Linux 
-- [ITGmania](https://github.com/itgmania/itgmania), a cross platform Dance Dance Revolution-like emulator.
 
-## Alternative libraries
+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.
 
-There are plenty of great websocket libraries out there, which might work for you. Here are a couple of serious ones.
+### Polling and background thread work
 
-* [websocketpp](https://github.com/zaphoyd/websocketpp) - C++
+No manual polling to fetch data is required. Data is sent and received instantly by using a background thread for receiving data and the select [system](http://man7.org/linux/man-pages/man2/select.2.html) call to be notified by the OS of incoming data. No timeout is used for select so that the background thread is only woken up when data is available, to optimize battery life. This is also the recommended way of using select according to the select tutorial, section [select law](https://linux.die.net/man/2/select_tut). Read and Writes to the socket are non blocking. Data is sent right away and not enqueued by writing directly to the socket, which is [possible](https://stackoverflow.com/questions/1981372/are-parallel-calls-to-send-recv-on-the-same-socket-valid) since system socket implementations allow concurrent read/writes. However concurrent writes need to be protected with mutex.
-* [beast](https://github.com/boostorg/beast) - C++
-* [µWebSockets](https://github.com/uNetworking/uWebSockets) - C++
-* [libwebsockets](https://libwebsockets.org/) - C
-* [wslay](https://github.com/tatsuhiro-t/wslay) - C
 
-[uvweb](https://github.com/bsergean/uvweb) is a library written by the IXWebSocket author which is built on top of [uvw](https://github.com/skypjack/uvw), which is a C++ wrapper for [libuv](https://libuv.org/). It has more dependencies and does not support SSL at this point, but it can be used to open multiple connections within a single OS thread thanks to libuv.
+### Automatic reconnection
 
-To check the performance of a websocket library, you can look at the [autoroute](https://github.com/bsergean/autoroute) project.
+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.
 
-## Continuous Integration
+### Large messages
 
-| OS                | TLS               | Sanitizer         | Status            |
+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 500M were sent and received succesfully.
-|-------------------|-------------------|-------------------|-------------------|
-| Linux             | OpenSSL           | None              | [![Build2][1]][0] |
-| macOS             | Secure Transport  | Thread Sanitizer  | [![Build2][2]][0] |
-| macOS             | OpenSSL           | Thread Sanitizer  | [![Build2][3]][0] |
-| macOS             | MbedTLS           | Thread Sanitizer  | [![Build2][4]][0] |
-| Windows           | Disabled          | None              | [![Build2][5]][0] |
-| UWP               | Disabled          | None              | [![Build2][6]][0] |
-| Linux             | OpenSSL           | Address Sanitizer | [![Build2][7]][0] |
 
-* Some tests are disabled on Windows/UWP because of a pathing problem
+## Limitations
-* TLS and ZLIB are disabled on Windows/UWP because enabling make the CI run takes a lot of time, for setting up vcpkg.
 
-[0]: https://github.com/machinezone/IXWebSocket
+* There is no text support for sending data, only the binary protocol is supported. Sending json or text over the binary protocol works well.
-[1]: https://github.com/machinezone/IXWebSocket/workflows/linux/badge.svg
+* 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.
-[2]: https://github.com/machinezone/IXWebSocket/workflows/mac_tsan_sectransport/badge.svg
+* The server code is using select to detect incoming data, and creates one OS thread per connection. This isn't as scalable as strategies using epoll or kqueue.
-[3]: https://github.com/machinezone/IXWebSocket/workflows/mac_tsan_openssl/badge.svg
-[4]: https://github.com/machinezone/IXWebSocket/workflows/mac_tsan_mbedtls/badge.svg
-[5]: https://github.com/machinezone/IXWebSocket/workflows/windows/badge.svg
-[6]: https://github.com/machinezone/IXWebSocket/workflows/uwp/badge.svg
-[7]: https://github.com/machinezone/IXWebSocket/workflows/linux_asan/badge.svg
 
+## C++ code organization
+
+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
+
+### Sending messages
+
+`websocket.send("foo")` will send a message.
+
+If the connection was closed and sending failed, the return value will be set to false.
+
+### ReadyState
+
+`getReadyState()` returns the state of the connection. There are 4 possible states.
+
+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
+
+The onMessage event will be fired when the connection is opened or closed. This is similar to the [Javascript browser API](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket), which has `open` and `close` events notification that can be registered with the browser `addEventListener`.
+
+```
+webSocket.setOnMessageCallback(
+    [](ix::WebSocketMessageType messageType,
+       const std::string& str,
+       size_t wireSize,
+       const ix::WebSocketErrorInfo& error,
+       const ix::WebSocketCloseInfo& closeInfo,
+       const ix::WebSocketHttpHeaders& headers)
+    {
+        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 : headers)
+            {
+                std::cout << it.first << ": " << it.second << std::endl;
+            }
+        }
+        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 << closeInfo.code << std::endl;
+            std::cout << closeInfo.reason << std::endl;
+        }
+    }
+);
+```
+
+### Error notification
+
+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(
+    [](ix::WebSocketMessageType messageType,
+       const std::string& str,
+       size_t wireSize,
+       const ix::WebSocketErrorInfo& error,
+       const ix::WebSocketCloseInfo& closeInfo,
+       const ix::WebSocketHttpHeaders& headers)
+    {
+        if (messageType == ix::WebSocket_MessageType_Error)
+        {
+            std::stringstream ss;
+            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;
+        }
+    }
+);
+```
+
+### start, stop
+
+1. `websocket.start()` connect to the remote server and starts the message receiving background thread.
+2. `websocket.stop()` disconnect from the remote server and closes the background thread.
+
+### Configuring the remote url
+
+The url can be set and queried after a websocket object has been created. You will have to call `stop` and `start` if you want to disconnect and connect to that new url.
+
+```
+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(
+    [](ix::WebSocketMessageType messageType,
+       const std::string& str,
+       size_t wireSize,
+       const ix::WebSocketErrorInfo& error,
+       const ix::WebSocketCloseInfo& closeInfo,
+       const ix::WebSocketHttpHeaders& headers)
+    {
+        if (messageType == ix::WebSocket_MessageType_Ping ||
+            messageType == ix::WebSocket_MessageType_Pong)
+        {
+            std::cout << "pong data: " << 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 isn't any traffic to make sure that load balancers do not kill an
+idle connection.
+
+```
+webSocket.setHeartBeatPeriod(45);
+```

SECURITY.md

@@ -1,11 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 7.x.x   | :white_check_mark: |
-
-## Reporting a Vulnerability
-
-Users should send an email to bsergean@gmail.com to report a vulnerability.

appveyor.yml

@@ -0,0 +1,10 @@
+image:
+- Visual Studio 2017
+- Ubuntu
+
+install:
+- ls -al
+- cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+- python test/run.py
+
+build: off

docker-compose.yml

@@ -1,11 +0,0 @@
-version: "3.3"
-services:
-  push:
-    entrypoint: ws push_server --host 0.0.0.0
-    image: ${DOCKER_REPO}/ws:build
-
-  autoroute:
-    entrypoint: ws autoroute ws://push:8008
-    image: ${DOCKER_REPO}/ws:build
-    depends_on:
-      - push

docker/Dockerfile

@@ -0,0 +1,16 @@
+FROM debian:stretch
+
+# RUN yum install -y gcc-c++ make cmake openssl-devel gdb
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update 
+RUN apt-get -y install g++ 
+RUN apt-get -y install libssl-dev
+RUN apt-get -y install gdb
+RUN apt-get -y install screen
+RUN apt-get -y install procps
+RUN apt-get -y install lsof
+
+COPY . .
+
+WORKDIR examples/ws_connect
+RUN ["sh", "build_linux.sh"]

docker/Dockerfile.alpine

@@ -1,39 +1,11 @@
-FROM alpine:3.12 as build
+FROM alpine:3.8
 
-RUN apk add --no-cache \
+RUN apk add --no-cache g++ musl-dev make cmake openssl-dev
-    gcc g++ musl-dev linux-headers \
-    cmake mbedtls-dev make zlib-dev python3-dev ninja git
 
-RUN addgroup -S app && \
+COPY . .
-    adduser -S -G app app && \
-    chown -R app:app /opt && \
-    chown -R app:app /usr/local
 
-# There is a bug in CMake where we cannot build from the root top folder
+WORKDIR examples/ws_connect
-# So we build from /opt
+RUN ["sh", "build_linux.sh"]
-COPY --chown=app:app . /opt
-WORKDIR /opt
 
-USER app
+EXPOSE 8765
-RUN make -f makefile.dev ws_mbedtls_install && \
+CMD ["ws_connect"]
-    sh tools/trim_repo_for_docker.sh
-
-FROM alpine:3.12 as runtime
-
-RUN apk add --no-cache libstdc++ mbedtls ca-certificates python3 strace && \
-    addgroup -S app && \
-    adduser -S -G app app
-
-COPY --chown=app:app --from=build /usr/local/bin/ws /usr/local/bin/ws
-
-# COPY --chown=app:app --from=build /opt /opt
-
-RUN chmod +x /usr/local/bin/ws && \
-    ldd /usr/local/bin/ws
-
-# Now run in usermode
-USER app
-WORKDIR /home/app
-
-ENTRYPOINT ["ws"]
-EXPOSE 8008

docker/Dockerfile.centos

@@ -1,41 +1,11 @@
-FROM centos:8 as build
+FROM alpine:3.8
 
-RUN yum install -y gcc-c++ make cmake zlib-devel openssl-devel redhat-rpm-config
+RUN apk add --no-cache g++ musl-dev make cmake openssl-dev
 
-RUN yum install -y epel-release
+COPY . .
-RUN yum install -y mbedtls-devel
 
-RUN groupadd app && useradd -g app app
+WORKDIR examples/ws_connect
-RUN chown -R app:app /opt
+RUN ["sh", "build_linux.sh"]
-RUN chown -R app:app /usr/local
 
-# There is a bug in CMake where we cannot build from the root top folder
+EXPOSE 8765
-# So we build from /opt
+CMD ["ws_connect"]
-COPY --chown=app:app . /opt
-WORKDIR /opt
-
-USER app
-RUN [ "make", "ws_mbedtls_install" ]
-RUN [ "rm", "-rf", "build" ]
-
-FROM centos:8 as runtime
-
-RUN yum install -y gdb strace
-
-RUN yum install -y epel-release
-RUN yum install -y mbedtls
-
-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
-
-# Copy source code for gcc
-COPY --chown=app:app --from=build /opt /opt
-
-# Now run in usermode
-USER app
-WORKDIR /home/app
-
-ENTRYPOINT ["ws"]
-EXPOSE 8008

docker/Dockerfile.centos7

@@ -1,26 +0,0 @@
-FROM centos:7 as build
-
-RUN yum install -y gcc-c++ make zlib-devel openssl-devel redhat-rpm-config
-
-RUN groupadd app && useradd -g app app
-RUN chown -R app:app /opt
-RUN chown -R app:app /usr/local
-
-WORKDIR /tmp
-RUN curl -O https://cmake.org/files/v3.14/cmake-3.14.0-Linux-x86_64.tar.gz
-RUN tar zxvf cmake-3.14.0-Linux-x86_64.tar.gz
-RUN cp -rf cmake-3.14.0-Linux-x86_64/* /usr/
-
-RUN yum install -y git
-
-# 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", "ws_no_python" ]
-RUN [ "rm", "-rf", "build" ]
-
-ENTRYPOINT ["ws"]
-CMD ["--help"]

docker/Dockerfile.debian

@@ -1,52 +1,22 @@
-# Build time
+FROM debian:stretch
-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 gdb
+RUN apt-get -y install screen
+RUN apt-get -y install procps
+RUN apt-get -y install lsof
 RUN apt-get -y install libz-dev
+RUN apt-get -y install vim
 RUN apt-get -y install make
+RUN apt-get -y install cmake
 
 COPY . .
 
-ARG CMAKE_BIN_PATH=/tmp/cmake/cmake-3.14.0-Linux-x86_64/bin
+WORKDIR ws
-ENV PATH="${CMAKE_BIN_PATH}:${PATH}"
+RUN ["sh", "docker_build.sh"]
 
-RUN ["make"]
+EXPOSE 8765
-
+CMD ["/ws/ws", "transfer", "8765"]
-# 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.gcc

@@ -0,0 +1,8 @@
+FROM gcc:8
+
+# RUN yum install -y gcc-c++ make cmake openssl-devel gdb
+
+COPY . .
+
+WORKDIR examples/ws_connect
+RUN ["sh", "build_linux.sh"]

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_disco

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

docker/Dockerfile.ubuntu_groovy

@@ -1,23 +0,0 @@
-# Build time
-FROM ubuntu:groovy as build
-
-ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update
-
-RUN apt-get -y install g++ libssl-dev libz-dev make python ninja-build
-RUN apt-get -y install cmake
-RUN apt-get -y install gdb
-
-COPY . /opt
-WORKDIR /opt
-
-#
-# To use the container interactively for debugging/building
-# 1. Build with
-#    CMD ["ls"]
-# 2. Run with
-#    docker run --entrypoint sh -it docker-game-eng-dev.addsrv.com/ws:9.10.6 
-#
-
-RUN ["make", "test"]
-# CMD ["ls"]

docker/Dockerfile.ubuntu_precise

@@ -1,27 +0,0 @@
-# Build time
-FROM ubuntu:precise 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 --no-check-certificate 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
-RUN apt-get -y install git
-
-COPY . .
-
-ARG CMAKE_BIN_PATH=/tmp/cmake/cmake-3.14.0-Linux-x86_64/bin
-ENV PATH="${CMAKE_BIN_PATH}:${PATH}"
-
-RUN ["make", "ws_no_python"]
-
-ENTRYPOINT ["ws"]
-CMD ["--help"]

docker/Dockerfile.ubuntu_trusty

@@ -1,22 +0,0 @@
-# Build time
-FROM ubuntu:trusty 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 --no-check-certificate 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++ libssl-dev libz-dev make python git
-
-COPY . .
-
-ARG CMAKE_BIN_PATH=/tmp/cmake/cmake-3.14.0-Linux-x86_64/bin
-ENV PATH="${CMAKE_BIN_PATH}:${PATH}"
-
-RUN ["make", "ws_no_python"]
-
-ENTRYPOINT ["ws"]
-CMD ["--help"]

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"]

docs/build.md

@@ -1,93 +0,0 @@
-## Build
-
-### CMake
-
-CMakefiles for the library and the examples are available. This library has few dependencies, so it is possible to just add the source files into your project. Otherwise the usual way will suffice.
-
-```
-mkdir build # make a build dir so that you can build out of tree.
-cd build
-cmake -DUSE_TLS=1 ..
-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.
-There is a unittest which can be executed by typing `make test`.
-
-Options for building:
-
-* `-DBUILD_SHARED_LIBS=ON` will build the unittest as a shared libary instead of a static library, which is the default
-* `-DUSE_ZLIB=1` will enable zlib support, required for http client + server + websocket per message deflate extension
-* `-DUSE_TLS=1` will enable TLS support
-* `-DUSE_OPEN_SSL=1` will use [openssl](https://www.openssl.org/) for the TLS support (default on Linux and Windows). When using a custom version of openssl (say a prebuilt version, odd runtime problems can happens, as in #319, and special cmake trickery will be required (see this [comment](https://github.com/machinezone/IXWebSocket/issues/175#issuecomment-620231032))
-* `-DUSE_MBED_TLS=1` will use [mbedlts](https://tls.mbed.org/) for the TLS support
-* `-DUSE_WS=1` will build the ws interactive command line tool
-* `-DUSE_TEST=1` will build the unittest
-
-If you are on Windows, look at the [appveyor](https://github.com/machinezone/IXWebSocket/blob/master/appveyor.yml) file (not maintained much though) or rather the [github actions](https://github.com/machinezone/IXWebSocket/blob/master/.github/workflows/unittest_windows.yml) which have instructions for building dependencies.
-
-It is also possible to externally include the project, so that everything is fetched over the wire when you build like so:
-
-```
-    ExternalProject_Add(
-        IXWebSocket
-        GIT_REPOSITORY https://github.com/machinezone/IXWebSocket.git
-        ...
-    )
-```
-
-### vcpkg
-
-It is possible to get IXWebSocket through Microsoft [vcpkg](https://github.com/microsoft/vcpkg).
-
-```
-vcpkg install ixwebsocket
-```
-To use the installed package within a cmake project, use the following:
-```cmake
- set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "") # this is super important in order for cmake to include the vcpkg search/lib paths!
-
- # find library and its headers
- find_path(IXWEBSOCKET_INCLUDE_DIR ixwebsocket/IXWebSocket.h)
- find_library(IXWEBSOCKET_LIBRARY ixwebsocket)
- # include headers
- include_directories(${IXWEBSOCKET_INCLUDE_DIR})
- # ...
- target_link_libraries(${PROJECT_NAME} ... ${IXWEBSOCKET_LIBRARY}) # Cmake will automatically fail the generation if the lib was not found, i.e is set to NOTFOUND
-
-```
-
-### Conan
-
-[ ![Download](https://api.bintray.com/packages/conan/conan-center/ixwebsocket%3A_/images/download.svg) ](https://bintray.com/conan/conan-center/ixwebsocket%3A_/_latestVersion)
-
-Conan is currently supported through a recipe in [Conan Center](https://github.com/conan-io/conan-center-index/tree/master/recipes/ixwebsocket) ([Bintray entry](https://bintray.com/conan/conan-center/ixwebsocket%3A_)).
-
-Package reference
-
-* Conan 1.21.0 and up: `ixwebsocket/7.9.2`
-* Earlier versions: `ixwebsocket/7.9.2@_/_`
-
-Note that the version listed here might not be the latest one. See Bintray or the recipe itself for the latest version. If you're migrating from the previous, custom Bintray remote, note that the package reference _has_ to be lower-case.
-
-### Docker
-
-There is a Dockerfile for running the unittest on Linux, and to run the `ws` tool. It is also available on the docker registry.
-
-```
-docker run docker.pkg.github.com/machinezone/ixwebsocket/ws:latest --help
-```
-
-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
-...
-```

docs/design.md

@@ -1,76 +0,0 @@
-## 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 and mbedTLS can be used on Android, Linux and Windows.
-
-If you are using OpenSSL, try to be on a version higher than 1.1.x as there there are thread safety problems with 1.0.x.
-
-### Polling and background thread work
-
-No manual polling to fetch data is required. Data is sent and received instantly by using a background thread for receiving data and the select [system](http://man7.org/linux/man-pages/man2/select.2.html) call to be notified by the OS of incoming data. No timeout is used for select so that the background thread is only woken up when data is available, to optimize battery life. This is also the recommended way of using select according to the select tutorial, section [select law](https://linux.die.net/man/2/select_tut). Read and Writes to the socket are non blocking. Data is sent right away and not enqueued by writing directly to the socket, which is [possible](https://stackoverflow.com/questions/1981372/are-parallel-calls-to-send-recv-on-the-same-socket-valid) since system socket implementations allow concurrent read/writes.
-
-### 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.
-
-### Testing
-
-The library has an interactive tool which is handy for testing compatibility ith other libraries. We have tested our client against Python, Erlang, Node.js, and C++ websocket server libraries.
-
-The unittest tries to be comprehensive, and has been running on multiple platforms, with different sanitizers such as a thread sanitizer to catch data races or the undefined behavior sanitizer.
-
-The regression test is running after each commit on github actions for multiple configurations.
-
-## Limitations
-
-* On some configuration (mostly Android) certificate validation needs to be setup so that SocketTLSOptions.caFile point to a pem file, such as the one distributed by Firefox. Unless that setup is done connecting to a wss endpoint will display an error. With mbedtls the message will contain `error in handshake : X509 - Certificate verification failed, e.g. CRL, CA or signature check failed`.
-* 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.
-
-## C++ code organization
-
-Here is 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.
-|                       |
-+-----------------------+
-```

docs/index.md

@@ -1,149 +0,0 @@
-## Hello world
-
-IXWebSocket is a C++ library for WebSocket client and server development. It has minimal dependencies (no boost), is very simple to use and support everything you'll likely need for websocket dev (SSL, deflate compression, compiles on most platforms, etc...). HTTP client and server code is also available, but it hasn't received as much testing.
-
-It is been used on big mobile video game titles sending and receiving tons of messages since 2017 (iOS and Android). It was tested on macOS, iOS, Linux, Android, Windows and FreeBSD. Note that the MinGW compiler is not supported at this point. Two important design goals are simplicity and correctness.
-
-A bad security bug affecting users compiling with SSL enabled and OpenSSL as the backend was just fixed in newly released version 11.0.0. Please upgrade ! (more details in the [https://github.com/machinezone/IXWebSocket/pull/250](PR).
-
-```cpp
-/*
- *  main.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2020 Machine Zone, Inc. All rights reserved.
- *
- *  Super simple standalone example. See ws folder, unittest and doc/usage.md for more.
- *
- *  On macOS
- *  $ mkdir -p build ; (cd build ; cmake -DUSE_TLS=1 .. ; make -j ; make install)
- *  $ clang++ --std=c++11 --stdlib=libc++ main.cpp -lixwebsocket -lz -framework Security -framework Foundation
- *  $ ./a.out
- *
- *  Or use cmake -DBUILD_DEMO=ON option for other platforms
- */
-
-#include <ixwebsocket/IXNetSystem.h>
-#include <ixwebsocket/IXWebSocket.h>
-#include <ixwebsocket/IXUserAgent.h>
-#include <iostream>
-
-int main()
-{
-    // Required on Windows
-    ix::initNetSystem();
-
-    // Our websocket object
-    ix::WebSocket webSocket;
-
-    // Connect to a server with encryption
-    // See https://machinezone.github.io/IXWebSocket/usage/#tls-support-and-configuration
-    std::string url("wss://echo.websocket.org");
-    webSocket.setUrl(url);
-
-    std::cout << "Connecting to " << url << "..." << std::endl;
-
-    // Setup a callback to be fired (in a background thread, watch out for race conditions !)
-    // when a message or an event (open, close, error) is received
-    webSocket.setOnMessageCallback([](const ix::WebSocketMessagePtr& msg)
-        {
-            if (msg->type == ix::WebSocketMessageType::Message)
-            {
-                std::cout << "received message: " << msg->str << std::endl;
-                std::cout << "> " << std::flush;
-            }
-            else if (msg->type == ix::WebSocketMessageType::Open)
-            {
-                std::cout << "Connection established" << std::endl;
-                std::cout << "> " << std::flush;
-            }
-            else if (msg->type == ix::WebSocketMessageType::Error)
-            {
-                // Maybe SSL is not configured properly
-                std::cout << "Connection error: " << msg->errorInfo.reason << std::endl;
-                std::cout << "> " << std::flush;
-            }
-        }
-    );
-
-    // 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)
-    webSocket.send("hello world");
-
-    // Display a prompt
-    std::cout << "> " << std::flush;
-
-    std::string text;
-    // Read text from the console and send messages in text mode.
-    // Exit with Ctrl-D on Unix or Ctrl-Z on Windows.
-    while (std::getline(std::cin, text))
-    {
-        webSocket.send(text);
-        std::cout << "> " << std::flush;
-    }
-
-    return 0;
-}
-```
-
-Interested? Go read the [docs](https://machinezone.github.io/IXWebSocket/)! If things don't work as expected, please create an issue on GitHub, or even better a pull request if you know how to fix your problem.
-
-IXWebSocket is actively being developed, check out the [changelog](https://machinezone.github.io/IXWebSocket/CHANGELOG/) to know what's cooking. If you are looking for a real time messaging service (the chat-like 'server' your websocket code will talk to) with many features such as history, backed by Redis, look at [cobra](https://github.com/machinezone/cobra).
-
-IXWebSocket client code is autobahn compliant beginning with the 6.0.0 version. See the current [test results](https://bsergean.github.io/autobahn/reports/clients/index.html). Some tests are still failing in the server code.
-
-Starting with the 11.0.8 release, IXWebSocket should be fully C++11 compatible.
-
-## Users
-
-If your company or project is using this library, feel free to open an issue or PR to amend this list.
-
-- [Machine Zone](https://www.mz.com)
-- [Tokio](https://gitlab.com/HCInk/tokio), a discord library focused on audio playback with node bindings.
-- [libDiscordBot](https://github.com/tostc/libDiscordBot/tree/master), an easy to use Discord-bot framework.
-- [gwebsocket](https://github.com/norrbotten/gwebsocket), a websocket (lua) module for Garry's Mod
-- [DisCPP](https://github.com/DisCPP/DisCPP), a simple but feature rich Discord API wrapper
-- [discord.cpp](https://github.com/luccanunes/discord.cpp), a discord library for making bots
-- [Teleport](http://teleportconnect.com/), Teleport is your own personal remote robot avatar
-
-## Alternative libraries
-
-There are plenty of great websocket libraries out there, which might work for you. Here are a couple of serious ones.
-
-* [websocketpp](https://github.com/zaphoyd/websocketpp) - C++
-* [beast](https://github.com/boostorg/beast) - C++
-* [libwebsockets](https://libwebsockets.org/) - C
-* [µWebSockets](https://github.com/uNetworking/uWebSockets) - C
-* [wslay](https://github.com/tatsuhiro-t/wslay) - C
-
-[uvweb](https://github.com/bsergean/uvweb) is a library written by the IXWebSocket author which is built on top of [uvw](https://github.com/skypjack/uvw), which is a C++ wrapper for [libuv](https://libuv.org/). It has more dependencies and does not support SSL at this point, but it can be used to open multiple connections within a single OS thread thanks to libuv.
-
-To check the performance of a websocket library, you can look at the [autoroute](https://github.com/bsergean/autoroute) project.
-
-## Continuous Integration
-
-| OS                | TLS               | Sanitizer         | Status            |
-|-------------------|-------------------|-------------------|-------------------|
-| Linux             | OpenSSL           | None              | [![Build2][1]][0] |
-| macOS             | Secure Transport  | Thread Sanitizer  | [![Build2][2]][0] |
-| macOS             | OpenSSL           | Thread Sanitizer  | [![Build2][3]][0] |
-| macOS             | MbedTLS           | Thread Sanitizer  | [![Build2][4]][0] |
-| Windows           | Disabled          | None              | [![Build2][5]][0] |
-| UWP               | Disabled          | None              | [![Build2][6]][0] |
-| Linux             | OpenSSL           | Address Sanitizer | [![Build2][7]][0] |
-| Mingw             | Disabled          | None              | [![Build2][8]][0] |
-
-* ASAN fails on Linux because of a known problem, we need a 
-* Some tests are disabled on Windows/UWP because of a pathing problem
-* TLS and ZLIB are disabled on Windows/UWP because enabling make the CI run takes a lot of time, for setting up vcpkg.
-
-[0]: https://github.com/machinezone/IXWebSocket
-[1]: https://github.com/machinezone/IXWebSocket/workflows/linux/badge.svg
-[2]: https://github.com/machinezone/IXWebSocket/workflows/mac_tsan_sectransport/badge.svg
-[3]: https://github.com/machinezone/IXWebSocket/workflows/mac_tsan_openssl/badge.svg
-[4]: https://github.com/machinezone/IXWebSocket/workflows/mac_tsan_mbedtls/badge.svg
-[5]: https://github.com/machinezone/IXWebSocket/workflows/windows/badge.svg
-[6]: https://github.com/machinezone/IXWebSocket/workflows/uwp/badge.svg
-[7]: https://github.com/machinezone/IXWebSocket/workflows/linux_asan/badge.svg
-[8]: https://github.com/machinezone/IXWebSocket/workflows/unittest_windows_gcc/badge.svg

docs/packages.md

@@ -1,94 +0,0 @@
-Notes on how we can update the different packages for ixwebsocket.
-
-## VCPKG
-
-Visit the [releases](https://github.com/machinezone/IXWebSocket/releases) page on Github. A tag must have been made first.
-
-Download the latest entry.
-
-```
-$ cd /tmp
-/tmp$ curl -s -O -L https://github.com/machinezone/IXWebSocket/archive/v9.1.9.tar.gz
-/tmp$
-/tmp$ openssl sha512 v9.1.9.tar.gz
-SHA512(v9.1.9.tar.gz)= f1fd731b5f6a9ce6d6d10bee22a5d9d9baaa8ea0564d6c4cd7eb91dcb88a45c49b2c7fdb75f8640a3589c1b30cee33ef5df8dcbb55920d013394d1e33ddd3c8e
-```
-
-Now go punch those values in the vcpkg ixwebsocket port config files. Here is what the diff look like.
-
-```
-vcpkg$ git diff
-diff --git a/ports/ixwebsocket/CONTROL b/ports/ixwebsocket/CONTROL
-index db9c2adc9..4acae5c3f 100644
---- a/ports/ixwebsocket/CONTROL
-+++ b/ports/ixwebsocket/CONTROL
-@@ -1,5 +1,5 @@
- Source: ixwebsocket
--Version: 8.0.5
-+Version: 9.1.9
- Build-Depends: zlib
- Homepage: https://github.com/machinezone/IXWebSocket
- Description: Lightweight WebSocket Client and Server + HTTP Client and Server
-diff --git a/ports/ixwebsocket/portfile.cmake b/ports/ixwebsocket/portfile.cmake
-index de082aece..68e523a05 100644
---- a/ports/ixwebsocket/portfile.cmake
-+++ b/ports/ixwebsocket/portfile.cmake
-@@ -1,8 +1,8 @@
- vcpkg_from_github(
-     OUT_SOURCE_PATH SOURCE_PATH
-     REPO machinezone/IXWebSocket
--    REF v8.0.5
--    SHA512 9dcc20d9a0629b92c62a68a8bd7c8206f18dbd9e93289b0b687ec13c478ce9ad1f3563b38c399c8277b0d3812cc78ca725786ba1dedbc3445b9bdb9b689e8add
-+    REF v9.1.9
-+    SHA512 f1fd731b5f6a9ce6d6d10bee22a5d9d9baaa8ea0564d6c4cd7eb91dcb88a45c49b2c7fdb75f8640a3589c1b30cee33ef5df8dcbb55920d013394d1e33ddd3c8e
- )
-```
-
-You will need a fork of the vcpkg repo to make a pull request.
-
-```
-git fetch upstream
-git co master
-git reset --hard upstream/master
-git push origin master --force
-```
-
-Make the pull request (I use a new branch to do that).
-
-```
-vcpkg$ git co -b feature/ixwebsocket_9.1.9
-M	ports/ixwebsocket/CONTROL
-M	ports/ixwebsocket/portfile.cmake
-Switched to a new branch 'feature/ixwebsocket_9.1.9'
-vcpkg$
-vcpkg$
-vcpkg$ git commit -am 'ixwebsocket: update to 9.1.9'
-[feature/ixwebsocket_9.1.9 8587a4881] ixwebsocket: update to 9.1.9
- 2 files changed, 3 insertions(+), 3 deletions(-)
-vcpkg$
-vcpkg$ git push
-fatal: The current branch feature/ixwebsocket_9.1.9 has no upstream branch.
-To push the current branch and set the remote as upstream, use
-
-    git push --set-upstream origin feature/ixwebsocket_9.1.9
-
-vcpkg$ git push --set-upstream origin feature/ixwebsocket_9.1.9
-
-Enumerating objects: 11, done.
-Counting objects: 100% (11/11), done.
-Delta compression using up to 8 threads
-Compressing objects: 100% (6/6), done.
-Writing objects: 100% (6/6), 621 bytes | 621.00 KiB/s, done.
-Total 6 (delta 4), reused 0 (delta 0)
-remote: Resolving deltas: 100% (4/4), completed with 4 local objects.
-remote:
-remote: Create a pull request for 'feature/ixwebsocket_9.1.9' on GitHub by visiting:
-remote:      https://github.com/bsergean/vcpkg/pull/new/feature/ixwebsocket_9.1.9
-remote:
-To https://github.com/bsergean/vcpkg.git
- * [new branch]          feature/ixwebsocket_9.1.9 -> feature/ixwebsocket_9.1.9
-Branch 'feature/ixwebsocket_9.1.9' set up to track remote branch 'feature/ixwebsocket_9.1.9' from 'origin' by rebasing.
-vcpkg$
-```
-
-Just visit this url, https://github.com/bsergean/vcpkg/pull/new/feature/ixwebsocket_9.1.9, printed on the console, to make the pull request.

docs/performance.md

@@ -1,37 +0,0 @@
-
-## WebSocket Client performance
-
-We will run a client and a server on the same machine, connecting to localhost. This bench is run on a MacBook Pro from 2015. We can receive over 200,000 (small) messages per second, another way to put it is that it takes 5 micro-second to receive and process one message. This is an indication about the minimal latency to receive messages.
-
-### Receiving messages
-
-By using the push_server ws sub-command, the server will send the same message in a loop to any connected client.
-
-```
-ws push_server -q --send_msg 'yo'
-```
-
-By using the echo_client ws sub-command, with the -m (mute or no_send), we will display statistics on how many messages we can receive per second.
-
-```
-$ ws echo_client -m ws://localhost:8008
-[2020-08-02 12:31:17.284] [info] ws_echo_client: connected
-[2020-08-02 12:31:17.284] [info] Uri: /
-[2020-08-02 12:31:17.284] [info] Headers:
-[2020-08-02 12:31:17.284] [info] Connection: Upgrade
-[2020-08-02 12:31:17.284] [info] Sec-WebSocket-Accept: byy/pMK2d0PtRwExaaiOnXJTQHo=
-[2020-08-02 12:31:17.284] [info] Server: ixwebsocket/10.1.4 macos ssl/SecureTransport zlib 1.2.11
-[2020-08-02 12:31:17.284] [info] Upgrade: websocket
-[2020-08-02 12:31:17.663] [info] messages received: 0 per second 2595307 total
-[2020-08-02 12:31:18.668] [info] messages received: 79679 per second 2674986 total
-[2020-08-02 12:31:19.668] [info] messages received: 207438 per second 2882424 total
-[2020-08-02 12:31:20.673] [info] messages received: 209207 per second 3091631 total
-[2020-08-02 12:31:21.676] [info] messages received: 216056 per second 3307687 total
-[2020-08-02 12:31:22.680] [info] messages received: 214927 per second 3522614 total
-[2020-08-02 12:31:23.684] [info] messages received: 216960 per second 3739574 total
-[2020-08-02 12:31:24.688] [info] messages received: 215232 per second 3954806 total
-[2020-08-02 12:31:25.691] [info] messages received: 212300 per second 4167106 total
-[2020-08-02 12:31:26.694] [info] messages received: 212501 per second 4379607 total
-[2020-08-02 12:31:27.699] [info] messages received: 212330 per second 4591937 total
-[2020-08-02 12:31:28.702] [info] messages received: 216511 per second 4808448 total
-```

docs/usage.md

@@ -1,643 +0,0 @@
-# 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.
-
-## Windows note
-
-To use the network system on Windows, you need to initialize it once with *WSAStartup()* and clean it up with *WSACleanup()*. We have helpers for that which you can use, see below. This init would typically take place in your main function.
-
-```cpp
-#include <ixwebsocket/IXNetSystem.h>
-
-int main()
-{
-    ix::initNetSystem();
-
-    ...
-
-    ix::uninitNetSystem();
-    return 0;
-}
-```
-
-## WebSocket client API
-
-```cpp
-#include <ixwebsocket/IXWebSocket.h>
-
-...
-
-// Our websocket object
-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.setPingInterval(45);
-
-// Per message deflate connection is enabled by default. You can tweak its parameters or disable it
-webSocket.disablePerMessageDeflate();
-
-// Setup a callback to be fired when a message or an event (open, close, error) is received
-webSocket.setOnMessageCallback([](const ix::WebSocketMessagePtr& msg)
-    {
-        if (msg->type == ix::WebSocketMessageType::Message)
-        {
-            std::cout << msg->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)
-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()
-```
-
-### Sending messages
-
-`WebSocketSendInfo result = websocket.send("foo")` will send a message.
-
-If the connection was closed, sending will fail, and the success field of the result object  will be set to false. There could also be a compression error in which case the compressError field will be set to true. The payloadSize field and wireSize fields will tell you respectively how much bytes the message weight, and how many bytes were sent on the wire (potentially compressed + counting the message header (a few bytes).
-
-There is an optional progress callback that can be passed in as the second argument. If a message is large it will be fragmented into chunks which will be sent independantly. Everytime the we can write a fragment into the OS network cache, the callback will be invoked. If a user wants to cancel a slow send, false should be returned from within the callback.
-
-Here is an example code snippet copied from the ws send sub-command. Each fragment weights 32K, so the total integer is the wireSize divided by 32K. As an example if you are sending 32M of data, uncompressed, total will be 1000. current will be set to 0 for the first fragment, then 1, 2 etc...
-
-```
-auto result =
-    _webSocket.sendBinary(serializedMsg, [this, throttle](int current, int total) -> bool {
-        spdlog::info("ws_send: Step {} out of {}", current + 1, total);
-
-        if (throttle)
-        {
-            std::chrono::duration<double, std::milli> duration(10);
-            std::this_thread::sleep_for(duration);
-        }
-
-        return _connected;
-    });
-```
-
-The `send()` and `sendText()` methods check that the string contains only valid UTF-8 characters. If you know that the string is a valid UTF-8 string you can skip that step and use the `sendUtf8Text` method instead.
-
-With the IXWebSocketSendData overloads of `sendUtf8Text` and `sendBinary` it is possible to not only send std::string but also `std::vector<char>`, `std::vector<uint8_t>` and `char*`.
-
-```
-std::vector<uint8_t> data({1, 2, 3, 4});
-auto result = webSocket.sendBinary(data);
-
-const char* text = "Hello World!";
-result = webSocket.sendUtf8Text(IXWebSocketSendData(text, strlen(text)));
-```
-
-### ReadyState
-
-`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.
-
-### Open and Close notifications
-
-The onMessage event will be fired when the connection is opened or closed. This is similar to the [JavaScript browser API](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket), which has `open` and `close` events notification that can be registered with the browser `addEventListener`.
-
-```cpp
-webSocket.setOnMessageCallback([](const ix::WebSocketMessagePtr& msg)
-    {
-        if (msg->type == ix::WebSocketMessageType::Open)
-        {
-            std::cout << "send greetings" << std::endl;
-
-            // Headers can be inspected (pairs of string/string)
-            std::cout << "Handshake Headers:" << std::endl;
-            for (auto it : msg->headers)
-            {
-                std::cout << it.first << ": " << it.second << std::endl;
-            }
-        }
-        else if (msg->type == ix::WebSocketMessageType::Close)
-        {
-            std::cout << "disconnected" << std::endl;
-
-            // The server can send an explicit code and reason for closing.
-            // This data can be accessed through the closeInfo object.
-            std::cout << msg->closeInfo.code << std::endl;
-            std::cout << msg->closeInfo.reason << std::endl;
-        }
-    }
-);
-```
-
-### 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.
-
-```cpp
-webSocket.setOnMessageCallback([](const ix::WebSocketMessagePtr& msg)
-    {
-        if (msg->type == ix::WebSocketMessageType::Error)
-        {
-            std::stringstream ss;
-            ss << "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;
-            std::cout << ss.str() << std::endl;
-        }
-    }
-);
-```
-
-### start, stop
-
-1. `websocket.start()` connect to the remote server and starts the message receiving background thread.
-2. `websocket.stop()` disconnect from the remote server and closes the background thread.
-
-### Configuring the remote url
-
-The url can be set and queried after a websocket object has been created. You will have to call `stop` and `start` if you want to disconnect and connect to that new url.
-
-```cpp
-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.
-
-```cpp
-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.
-
-```cpp
-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.
-
-```cpp
-webSocket.setPingInterval(45);
-```
-
-### Supply extra HTTP headers.
-
-You can set extra HTTP headers to be sent during the WebSocket handshake.
-
-```cpp
-WebSocketHttpHeaders headers;
-headers["foo"] = "bar";
-webSocket.setExtraHeaders(headers);
-```
-
-### Subprotocols
-
-You can specify subprotocols to be set during the WebSocket handshake. For more info you can refer to [this doc](https://hpbn.co/websocket/#subprotocol-negotiation).
-
-```cpp
-webSocket.addSubprotocol("appProtocol-v1");
-webSocket.addSubprotocol("appProtocol-v2");
-```
-
-The protocol that the server did accept is available in the open info `protocol` field.
-
-```cpp
-std::cout << "protocol: " << msg->openInfo.protocol << std::endl;
-```
-
-### Automatic reconnection
-
-Automatic reconnection kicks in when the connection is disconnected without the user consent. This feature is on by default and can be turned off.
-
-```cpp
-webSocket.enableAutomaticReconnection();  // turn on
-webSocket.disableAutomaticReconnection(); // turn off
-bool enabled = webSocket.isAutomaticReconnectionEnabled(); // query state
-```
-
-The technique to calculate wait time is called [exponential
-backoff](https://docs.aws.amazon.com/general/latest/gr/api-retries.html). Here
-are the default waiting times between attempts (from connecting with `ws connect ws://foo.com`)
-
-```
-> Connection error: Got bad status connecting to foo.com, status: 301, HTTP Status line: HTTP/1.1 301 Moved Permanently
-
-#retries: 1
-Wait time(ms): 100
-#retries: 2
-Wait time(ms): 200
-#retries: 3
-Wait time(ms): 400
-#retries: 4
-Wait time(ms): 800
-#retries: 5
-Wait time(ms): 1600
-#retries: 6
-Wait time(ms): 3200
-#retries: 7
-Wait time(ms): 6400
-#retries: 8
-Wait time(ms): 10000
-```
-
-The waiting time is capped by default at 10s between 2 attempts, but that value
-can be changed and queried. The minimum waiting time can also be set.
-
-```cpp
-webSocket.setMaxWaitBetweenReconnectionRetries(5 * 1000); // 5000ms = 5s
-uint32_t m = webSocket.getMaxWaitBetweenReconnectionRetries();
-
-webSocket.setMinWaitBetweenReconnectionRetries(1000); // 1000ms = 1s
-uint32_t m = webSocket.getMinWaitBetweenReconnectionRetries();
-```
-
-## Handshake timeout
-
-You can control how long to wait until timing out while waiting for the websocket handshake to be performed.
-
-```
-int handshakeTimeoutSecs = 1;
-setHandshakeTimeout(handshakeTimeoutSecs);
-```
-
-## WebSocket server API
-
-### Legacy api
-
-This api was actually changed to take a weak_ptr<WebSocket> as the first argument to setOnConnectionCallback ; previously it would take a shared_ptr<WebSocket> which was creating cycles and then memory leaks problems.
-
-```cpp
-#include <ixwebsocket/IXWebSocketServer.h>
-
-...
-
-// Run a server on localhost at a given port.
-// Bound host name, max connections and listen backlog can also be passed in as parameters.
-int port = 8008;
-std::string host("127.0.0.1"); // If you need this server to be accessible on a different machine, use "0.0.0.0"
-ix::WebSocketServer server(port, host);
-
-server.setOnConnectionCallback(
-    [&server](std::weak_ptr<WebSocket> webSocket,
-              std::shared_ptr<ConnectionState> connectionState)
-    {
-        std::cout << "Remote ip: " << connectionState->remoteIp << std::endl;
-
-        auto ws = webSocket.lock();
-        if (ws)
-        {
-            ws->setOnMessageCallback(
-                [webSocket, connectionState, &server](const ix::WebSocketMessagePtr msg)
-                {
-                    if (msg->type == ix::WebSocketMessageType::Open)
-                    {
-                        std::cout << "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::cout << "id: " << connectionState->getId() << std::endl;
-
-                        // The uri the client did connect to.
-                        std::cout << "Uri: " << msg->openInfo.uri << std::endl;
-
-                        std::cout << "Headers:" << std::endl;
-                        for (auto it : msg->openInfo.headers)
-                        {
-                            std::cout << 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.
-                        auto ws = webSocket.lock();
-                        if (ws)
-                        {
-                            ws->send(msg->str, msg->binary);
-                        }
-                    }
-                }
-            }
-        );
-    }
-);
-
-auto res = server.listen();
-if (!res.first)
-{
-    // Error handling
-    return 1;
-}
-
-// Per message deflate connection is enabled by default. It can be disabled
-// which might be helpful when running on low power devices such as a Rasbery Pi
-server.disablePerMessageDeflate();
-
-// Run the server in the background. Server can be stoped by calling server.stop()
-server.start();
-
-// Block until server.stop() is called.
-server.wait();
-
-```
-
-### New api
-
-The new API does not require to use 2 nested callbacks, which is a bit annoying. The real fix is that there was a memory leak due to a shared_ptr cycle, due to passing down a shared_ptr<WebSocket> down to the callbacks.
-
-The webSocket reference is guaranteed to be always valid ; by design the callback will never be invoked with a null webSocket object.
-
-```cpp
-#include <ixwebsocket/IXWebSocketServer.h>
-
-...
-
-// Run a server on localhost at a given port.
-// Bound host name, max connections and listen backlog can also be passed in as parameters.
-int port = 8008;
-std::string host("127.0.0.1"); // If you need this server to be accessible on a different machine, use "0.0.0.0"
-ix::WebSocketServer server(port, host);
-
-server.setOnClientMessageCallback([](std::shared_ptr<ix::ConnectionState> connectionState, ix::WebSocket & webSocket, const ix::WebSocketMessagePtr & msg) {
-    // The ConnectionState object contains information about the connection,
-    // at this point only the client ip address and the port.
-    std::cout << "Remote ip: " << connectionState->getRemoteIp() << std::endl;
-
-    if (msg->type == ix::WebSocketMessageType::Open)
-    {
-        std::cout << "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::cout << "id: " << connectionState->getId() << std::endl;
-
-        // The uri the client did connect to.
-        std::cout << "Uri: " << msg->openInfo.uri << std::endl;
-
-        std::cout << "Headers:" << std::endl;
-        for (auto it : msg->openInfo.headers)
-        {
-            std::cout << "\t" << 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.
-        std::cout << "Received: " << msg->str << std::endl;
-
-        webSocket.send(msg->str, msg->binary);
-    }
-});
-
-auto res = server.listen();
-if (!res.first)
-{
-    // Error handling
-    return 1;
-}
-
-// Per message deflate connection is enabled by default. It can be disabled
-// which might be helpful when running on low power devices such as a Rasbery Pi
-server.disablePerMessageDeflate();
-
-// Run the server in the background. Server can be stoped by calling server.stop()
-server.start();
-
-// Block until server.stop() is called.
-server.wait();
-
-```
-
-### Heartbeat
-
-You can configure an optional heartbeat / keep-alive for the WebSocket server. The heartbeat interval can be adjusted or disabled when constructing the `WebSocketServer`. Setting the interval to `-1` disables the heartbeat feature; this is the default setting. The parameter you set will be applied to every `WebSocket` object that the server creates.
-
-To enable a 45 second heartbeat on a `WebSocketServer`:
-
-```cpp
-int pingIntervalSeconds = 45;
-ix::WebSocketServer server(port, host, backlog, maxConnections, handshakeTimeoutSecs, addressFamily, pingIntervalSeconds);
-```
-
-## HTTP client API
-
-```cpp
-#include <ixwebsocket/IXHttpClient.h>
-
-...
-
-//
-// 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";
-
-// HTTP form data can be passed in as well, for multi-part upload of files
-HttpFormDataParameters httpFormDataParameters;
-httpParameters["baz"] = "booz";
-
-out = httpClient.post(url, httpParameters, httpFormDataParameters, args);
-
-// POST request with a body
-out = httpClient.post(url, std::string("foo=bar"), args);
-
-// PUT and PATCH are available too.
-
-//
-// Result
-//
-auto statusCode = response->statusCode; // 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 body = response->body; // 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);
-
-// If you define a chunk callback it will be called repeteadly with the
-// incoming data. This allows to process data on the go or write it to disk
-// instead of accumulating the data in memory.
-args.onChunkCallback = [](const std::string& data)
-{
-    // process data
-};
-
-// 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
-
-        // response->body is empty if onChunkCallback was used
-    }
-);
-
-// ok will be false if your httpClient is not async
-
-// A request in progress can be cancelled by setting the cancel flag. It does nothing if the request already completed.
-args->cancel = true;
-```
-
-See this [issue](https://github.com/machinezone/IXWebSocket/issues/209) for links about uploading files with HTTP multipart.
-
-## HTTP server API
-
-```cpp
-#include <ixwebsocket/IXHttpServer.h>
-
-ix::HttpServer server(port, hostname);
-
-auto res = server.listen();
-if (!res.first)
-{
-    std::cerr << res.second << std::endl;
-    return 1;
-}
-
-server.start();
-server.wait();
-```
-
-If you want to handle how requests are processed, implement the setOnConnectionCallback callback, which takes an HttpRequestPtr as input, and returns an HttpResponsePtr. You can look at HttpServer::setDefaultConnectionCallback for a slightly more advanced callback example.
-
-```cpp
-setOnConnectionCallback(
-    [this](HttpRequestPtr request,
-           std::shared_ptr<ConnectionState> connectionState) -> HttpResponsePtr
-    {
-        // Build a string for the response
-        std::stringstream ss;
-        ss << connectionState->getRemoteIp();
-           << " "
-           << request->method
-           << " "
-           << request->uri;
-
-        std::string content = ss.str();
-
-        return std::make_shared<HttpResponse>(200, "OK",
-                                              HttpErrorCode::Ok,
-                                              WebSocketHttpHeaders(),
-                                              content);
-}
-```
-
-## TLS support and configuration
-
-To leverage TLS features, the library must be compiled with the option `USE_TLS=1`.
-
-If you are using OpenSSL, try to be on a version higher than 1.1.x as there there are thread safety problems with 1.0.x.
-
-Then, secure sockets are automatically used when connecting to a `wss://*` url.
-
-Additional TLS options can be configured by passing a `ix::SocketTLSOptions` instance to the
-`setTLSOptions` on `ix::WebSocket` (or `ix::WebSocketServer` or `ix::HttpServer`)
-
-```cpp
-webSocket.setTLSOptions({
-    .certFile = "path/to/cert/file.pem",
-    .keyFile = "path/to/key/file.pem",
-    .caFile = "path/to/trust/bundle/file.pem", // as a file, or in memory buffer in PEM format
-    .tls = true // required in server mode
-});
-```
-
-Specifying `certFile` and `keyFile` configures the certificate that will be used to communicate with TLS peers.
-
-On a client, this is only necessary for connecting to servers that require a client certificate.
-
-On a server, this is necessary for TLS support.
-
-Specifying `caFile` configures the trusted roots bundle file (in PEM format) that will be used to verify peer certificates.
- - The special value of `SYSTEM` (the default) indicates that the system-configured trust bundle should be used; this is generally what you want when connecting to any publicly exposed API/server.
- - The special value of `NONE` can be used to disable peer verification; this is only recommended to rule out certificate verification when testing connectivity.
- - If the value contain the special value `-----BEGIN CERTIFICATE-----`, the value will be read from memory, and not from a file. This is convenient on platforms like Android where reading / writing to the file system can be challenging without proper permissions, or without knowing the location of a temp directory.
-
-For a client, specifying `caFile` can be used if connecting to a server that uses a self-signed cert, or when using a custom CA in an internal environment.
-
-For a server, specifying `caFile` implies that:
-1. You require clients to present a certificate
-1. It must be signed by one of the trusted roots in the file
-
-By default, a destination's hostname is always validated against the certificate that it presents. To accept certificates with any hostname, set `ix::SocketTLSOptions::disable_hostname_validation` to `true`.

docs/ws.md

@@ -1,308 +0,0 @@
-## General
-
-ws is a command line tool that should exercise most of the IXWebSocket code, and provide example code.
-
-```
-ws is a websocket tool
-Usage: ws [OPTIONS] SUBCOMMAND
-
-Options:
-  -h,--help                   Print this help message and exit
-
-Subcommands:
-  send                        Send a file
-  receive                     Receive a file
-  transfer                    Broadcasting server
-  connect                     Connect to a remote server
-  chat                        Group chat
-  echo_server                 Echo server
-  broadcast_server            Broadcasting server
-  ping                        Ping pong
-  curl                        HTTP Client
-  httpd                       HTTP server
-```
-
-## curl
-
-The curl subcommand try to be compatible with the curl syntax, to fetch http pages.
-
-Making a HEAD request with the -I parameter.
-
-```
-$ ws curl -I https://www.google.com/
-
-Accept-Ranges: none
-Alt-Svc: quic=":443"; ma=2592000; v="46,43",h3-Q048=":443"; ma=2592000,h3-Q046=":443"; ma=2592000,h3-Q043=":443"; ma=2592000
-Cache-Control: private, max-age=0
-Content-Type: text/html; charset=ISO-8859-1
-Date: Tue, 08 Oct 2019 21:36:57 GMT
-Expires: -1
-P3P: CP="This is not a P3P policy! See g.co/p3phelp for more info."
-Server: gws
-Set-Cookie: NID=188=ASwfz8GrXQrHCLqAz-AndLOMLcz0rC9yecnf3h0yXZxRL3rTufTU_GDDwERp7qQL7LZ_EB8gCRyPXGERyOSAgaqgnrkoTmvWrwFemRLMaOZ896GrHobi5fV7VLklnSG2w48Gj8xMlwxfP7Z-bX-xR9UZxep1tHM6UmFQdD_GkBE; expires=Wed, 08-Apr-2020 21:36:57 GMT; path=/; domain=.google.com; HttpOnly
-Transfer-Encoding: chunked
-Vary: Accept-Encoding
-X-Frame-Options: SAMEORIGIN
-X-XSS-Protection: 0
-Upload size: 143
-Download size: 0
-Status: 200
-```
-
-Making a POST request with the -F parameter.
-
-```
-$ ws curl -F foo=bar https://httpbin.org/post
-foo: bar
-Downloaded 438 bytes out of 438
-Access-Control-Allow-Credentials: true
-Access-Control-Allow-Origin: *
-Connection: keep-alive
-Content-Encoding:
-Content-Length: 438
-Content-Type: application/json
-Date: Tue, 08 Oct 2019 21:47:54 GMT
-Referrer-Policy: no-referrer-when-downgrade
-Server: nginx
-X-Content-Type-Options: nosniff
-X-Frame-Options: DENY
-X-XSS-Protection: 1; mode=block
-Upload size: 219
-Download size: 438
-Status: 200
-payload: {
-  "args": {},
-  "data": "",
-  "files": {},
-  "form": {
-    "foo": "bar"
-  },
-  "headers": {
-    "Accept": "*/*",
-    "Content-Length": "7",
-    "Content-Type": "application/x-www-form-urlencoded",
-    "Host": "httpbin.org",
-    "User-Agent": "ixwebsocket/7.0.0 macos ssl/OpenSSL OpenSSL 1.0.2q  20 Nov 2018 zlib 1.2.11"
-  },
-  "json": null,
-  "origin": "155.94.127.118, 155.94.127.118",
-  "url": "https://httpbin.org/post"
-}
-```
-
-Passing in a custom header with -H.
-
-```
-$ ws curl -F foo=bar -H 'my_custom_header: baz' https://httpbin.org/post
-my_custom_header:  baz
-foo: bar
-Downloaded 470 bytes out of 470
-Access-Control-Allow-Credentials: true
-Access-Control-Allow-Origin: *
-Connection: keep-alive
-Content-Encoding:
-Content-Length: 470
-Content-Type: application/json
-Date: Tue, 08 Oct 2019 21:50:25 GMT
-Referrer-Policy: no-referrer-when-downgrade
-Server: nginx
-X-Content-Type-Options: nosniff
-X-Frame-Options: DENY
-X-XSS-Protection: 1; mode=block
-Upload size: 243
-Download size: 470
-Status: 200
-payload: {
-  "args": {},
-  "data": "",
-  "files": {},
-  "form": {
-    "foo": "bar"
-  },
-  "headers": {
-    "Accept": "*/*",
-    "Content-Length": "7",
-    "Content-Type": "application/x-www-form-urlencoded",
-    "Host": "httpbin.org",
-    "My-Custom-Header": "baz",
-    "User-Agent": "ixwebsocket/7.0.0 macos ssl/OpenSSL OpenSSL 1.0.2q  20 Nov 2018 zlib 1.2.11"
-  },
-  "json": null,
-  "origin": "155.94.127.118, 155.94.127.118",
-  "url": "https://httpbin.org/post"
-}
-```
-
-## connect
-
-The connect command connects to a websocket endpoint, and starts an interactive prompt. Line editing, such as using the direction keys to fetch the last thing you tried to type) is provided. That command is pretty useful to try to send random data to an endpoint and verify that the service handles it with grace (such as sending invalid json).
-
-```
-ws connect wss://echo.websocket.org
-Type Ctrl-D to exit prompt...
-Connecting to url: wss://echo.websocket.org
-> ws_connect: connected
-Uri: /
-Handshake Headers:
-Connection: Upgrade
-Date: Tue, 08 Oct 2019 21:38:44 GMT
-Sec-WebSocket-Accept: 2j6LBScZveqrMx1W/GJkCWvZo3M=
-sec-websocket-extensions:
-Server: Kaazing Gateway
-Upgrade: websocket
-Received ping
-Received ping
-Received ping
-Hello world !
-> Received 13 bytes
-ws_connect: received message: Hello world !
-> Hello world !
-> Received 13 bytes
-ws_connect: received message: Hello world !
-```
-
-```
-ws connect 'ws://jeanserge.com/v2?appkey=_pubsub'
-Type Ctrl-D to exit prompt...
-Connecting to url: ws://jeanserge.com/v2?appkey=_pubsub
-> ws_connect: connected
-Uri: /v2?appkey=_pubsub
-Handshake Headers:
-Connection: Upgrade
-Date: Tue, 08 Oct 2019 21:45:28 GMT
-Sec-WebSocket-Accept: LYHmjh9Gsu/Yw7aumQqyPObOEV4=
-Sec-WebSocket-Extensions: permessage-deflate; server_max_window_bits=15; client_max_window_bits=15
-Server: Python/3.7 websockets/8.0.2
-Upgrade: websocket
-bababababababab
-> ws_connect: connection closed: code 1000 reason
-
-ws_connect: connected
-Uri: /v2?appkey=_pubsub
-Handshake Headers:
-Connection: Upgrade
-Date: Tue, 08 Oct 2019 21:45:44 GMT
-Sec-WebSocket-Accept: I1rqxdLgTU+opPi5/zKPBTuXdLw=
-Sec-WebSocket-Extensions: permessage-deflate; server_max_window_bits=15; client_max_window_bits=15
-Server: Python/3.7 websockets/8.0.2
-Upgrade: websocket
-```
-
-It is possible to pass custom HTTP header when doing the connection handshake,
-the remote server might process them to implement a simple authorization
-scheme.
-
-```
-src$ ws connect -H Authorization:supersecret ws://localhost:8008
-Type Ctrl-D to exit prompt...
-[2020-12-17 22:35:08.732] [info] Authorization: supersecret
-Connecting to url: ws://localhost:8008
-> [2020-12-17 22:35:08.736] [info] ws_connect: connected
-[2020-12-17 22:35:08.736] [info] Uri: /
-[2020-12-17 22:35:08.736] [info] Headers:
-[2020-12-17 22:35:08.736] [info] Connection: Upgrade
-[2020-12-17 22:35:08.736] [info] Sec-WebSocket-Accept: 2yaTFcdwn8KL6IzSMj2u6Le7KTg=
-[2020-12-17 22:35:08.736] [info] Sec-WebSocket-Extensions: permessage-deflate; server_max_window_bits=15; client_max_window_bits=15
-[2020-12-17 22:35:08.736] [info] Server: ixwebsocket/11.0.4 macos ssl/SecureTransport zlib 1.2.11
-[2020-12-17 22:35:08.736] [info] Upgrade: websocket
-[2020-12-17 22:35:08.736] [info] Received 25 bytes
-ws_connect: received message: Authorization suceeded!
-[2020-12-17 22:35:08.736] [info] Received pong ixwebsocket::heartbeat::30s::0
-hello
-> [2020-12-17 22:35:25.157] [info] Received 7 bytes
-ws_connect: received message: hello
-```
-
-If the wrong header is passed in, the server would close the connection with a custom close code (>4000, and <4999).
-
-```
-[2020-12-17 22:39:37.044] [info] Upgrade: websocket
-ws_connect: connection closed: code 4001 reason Permission denied
-```
-
-## echo server
-
-The ws echo server will respond what the client just sent him. If we use the
-simple --http_authorization_header we can enforce that client need to pass a
-special value in the Authorization header to connect.
-
-```
-$ ws echo_server --http_authorization_header supersecret
-[2020-12-17 22:35:06.192] [info] Listening on 127.0.0.1:8008
-[2020-12-17 22:35:08.735] [info] New connection
-[2020-12-17 22:35:08.735] [info] remote ip: 127.0.0.1
-[2020-12-17 22:35:08.735] [info] id: 0
-[2020-12-17 22:35:08.735] [info] Uri: /
-[2020-12-17 22:35:08.735] [info] Headers:
-[2020-12-17 22:35:08.735] [info] Authorization: supersecret
-[2020-12-17 22:35:08.735] [info] Connection: Upgrade
-[2020-12-17 22:35:08.735] [info] Host: localhost:8008
-[2020-12-17 22:35:08.735] [info] Sec-WebSocket-Extensions: permessage-deflate; server_max_window_bits=15; client_max_window_bits=15
-[2020-12-17 22:35:08.735] [info] Sec-WebSocket-Key: eFF2Gf25dC7eC15Ab1135G==
-[2020-12-17 22:35:08.735] [info] Sec-WebSocket-Version: 13
-[2020-12-17 22:35:08.735] [info] Upgrade: websocket
-[2020-12-17 22:35:08.735] [info] User-Agent: ixwebsocket/11.0.4 macos ssl/SecureTransport zlib 1.2.11
-[2020-12-17 22:35:25.157] [info] Received 7 bytes
-```
-
-## Websocket proxy
-
-```
-ws proxy_server --remote_host ws://127.0.0.1:9000 -v
-Listening on 127.0.0.1:8008
-```
-
-If you connect to ws://127.0.0.1:8008, the proxy will connect to ws://127.0.0.1:9000 and pass all traffic to this server.
-
-You can also use a more complex setup if you want to redirect to different websocket servers based on the hostname your client is trying to connect to. If you have multiple CNAME aliases that point to the same server.
-
-A JSON config file is used to express that mapping ; here connecting to echo.jeanserge.com will proxy the client to ws://localhost:8008 on the local machine (which actually runs ws echo_server), while connecting to bavarde.jeanserge.com will proxy the client to ws://localhost:5678 where a cobra python server is running. As a side note you will need a wildcard SSL certificate if you want to have SSL enabled on that machine.
-
-```
-echo.jeanserge.com=ws://localhost:8008
-bavarde.jeanserge.com=ws://localhost:5678
-```
-The --config_path option is required to instruct ws proxy_server to read that file.
-
-```
-ws proxy_server --config_path proxyConfig.json --port 8765
-```
-
-## File transfer
-
-```
-# Start transfer server, which is just a broadcast server at this point
-ws transfer # running on port 8080.
-
-# Start receiver first
-ws receive ws://localhost:8080
-
-# Then send a file. File will be received and written to disk by the receiver process
-ws send ws://localhost:8080 /file/to/path
-```
-
-## HTTP Client
-
-```
-$ ws curl --help
-HTTP Client
-Usage: ws curl [OPTIONS] url
-
-Positionals:
-  url TEXT REQUIRED           Connection url
-
-Options:
-  -h,--help                   Print this help message and exit
-  -d TEXT                     Form data
-  -F TEXT                     Form data
-  -H TEXT                     Header
-  --output TEXT               Output file
-  -I                          Send a HEAD request
-  -L                          Follow redirects
-  --max-redirects INT         Max Redirects
-  -v                          Verbose
-  -O                          Save output to disk
-  --compress                  Enable gzip compression
-  --connect-timeout INT       Connection timeout
-  --transfer-timeout INT      Transfer timeout
-```

examples/CMakeLists.txt

@@ -0,0 +1,7 @@
+add_subdirectory(broadcast_server)
+add_subdirectory(ping_pong)
+add_subdirectory(chat)
+add_subdirectory(echo_server)
+add_subdirectory(ws_connect)
+
+# add_subdirectory(cobra_publisher)

examples/cobra_publisher/.gitignore

@@ -0,0 +1,3 @@
+venv
+build
+node_modules

examples/cobra_publisher/CMakeLists.txt

@@ -0,0 +1,38 @@
+#
+# Author: Benjamin Sergeant
+# Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
+#
+
+cmake_minimum_required (VERSION 3.4.1)
+project (cobra_publisher)
+
+# There's -Weverything too for clang
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wshorten-64-to-32")
+
+set (OPENSSL_PREFIX /usr/local/opt/openssl) # Homebrew openssl
+
+set (CMAKE_CXX_STANDARD 14)
+
+option(USE_TLS "Add TLS support" ON)
+
+include_directories(cobra_publisher ${OPENSSL_PREFIX}/include)
+include_directories(cobra_publisher .)
+
+add_executable(cobra_publisher 
+  jsoncpp/jsoncpp.cpp
+  ixcrypto/IXHMac.cpp
+  ixcrypto/IXBase64.cpp
+  IXCobraConnection.cpp
+  cobra_publisher.cpp)
+
+if (APPLE AND USE_TLS)
+    target_link_libraries(cobra_publisher "-framework foundation" "-framework security")
+endif()
+
+get_filename_component(crypto_lib_path ${OPENSSL_PREFIX}/lib/libcrypto.a ABSOLUTE)
+add_library(lib_crypto STATIC IMPORTED)
+set_target_properties(lib_crypto PROPERTIES IMPORTED_LOCATION ${crypto_lib_path})
+
+link_directories(/usr/local/opt/openssl/lib)
+target_link_libraries(cobra_publisher ixwebsocket lib_crypto)
+install(TARGETS cobra_publisher DESTINATION bin)

examples/cobra_publisher/IXCobraConnection.cpp

@@ -0,0 +1,475 @@
+/*
+ *  IXCobraConnection.cpp
+ *  Author: Benjamin Sergeant
+ *  Copyright (c) 2017-2018 Machine Zone. All rights reserved.
+ */
+
+#include "IXCobraConnection.h"
+#include <ixcrypto/IXHMac.h>
+
+#include <algorithm>
+#include <stdexcept>
+#include <cmath>
+#include <cassert>
+#include <cstring>
+
+
+namespace ix
+{
+    TrafficTrackerCallback CobraConnection::_trafficTrackerCallback = nullptr;
+    constexpr size_t CobraConnection::kQueueMaxSize;
+
+    CobraConnection::CobraConnection() :
+        _authenticated(false),
+        _eventCallback(nullptr),
+        _publishMode(CobraConnection_PublishMode_Immediate)
+    {
+        _pdu["action"] = "rtm/publish";
+
+        initWebSocketOnMessageCallback();
+    }
+
+    CobraConnection::~CobraConnection()
+    {
+        disconnect();
+    }
+
+    void CobraConnection::setTrafficTrackerCallback(const TrafficTrackerCallback& callback)
+    {
+        _trafficTrackerCallback = callback;
+    }
+
+    void CobraConnection::resetTrafficTrackerCallback()
+    {
+        setTrafficTrackerCallback(nullptr);
+    }
+
+    void CobraConnection::invokeTrafficTrackerCallback(size_t size, bool incoming)
+    {
+        if (_trafficTrackerCallback)
+        {
+            _trafficTrackerCallback(size, incoming);
+        }
+    }
+
+    void CobraConnection::setEventCallback(const EventCallback& eventCallback)
+    {
+        std::lock_guard<std::mutex> lock(_eventCallbackMutex);
+        _eventCallback = eventCallback;
+    }
+
+    void CobraConnection::invokeEventCallback(ix::CobraConnectionEventType eventType,
+                                              const std::string& errorMsg,
+                                              const WebSocketHttpHeaders& headers)
+    {
+        std::lock_guard<std::mutex> lock(_eventCallbackMutex);
+        if (_eventCallback)
+        {
+            _eventCallback(eventType, errorMsg, headers);
+        }
+    }
+
+    void CobraConnection::invokeErrorCallback(const std::string& errorMsg)
+    {
+        invokeEventCallback(ix::CobraConnection_EventType_Error, errorMsg);
+    }
+
+    void CobraConnection::disconnect()
+    {
+        _authenticated = false;
+        _webSocket.stop();
+    }
+
+    void CobraConnection::initWebSocketOnMessageCallback()
+    {
+        _webSocket.setOnMessageCallback(
+            [this](ix::WebSocketMessageType messageType,
+                   const std::string& str,
+                   size_t wireSize,
+                   const ix::WebSocketErrorInfo& error,
+                   const ix::WebSocketCloseInfo& closeInfo,
+                   const ix::WebSocketHttpHeaders& headers)
+            {
+                CobraConnection::invokeTrafficTrackerCallback(wireSize, true);
+
+                std::stringstream ss;
+                if (messageType == ix::WebSocket_MessageType_Open)
+                {
+                    invokeEventCallback(ix::CobraConnection_EventType_Open,
+                                        std::string(),
+                                        headers);
+                    sendHandshakeMessage();
+                }
+                else if (messageType == ix::WebSocket_MessageType_Close)
+                {
+                    _authenticated = false;
+
+                    std::stringstream ss;
+                    ss << "Close code " << closeInfo.code;
+                    ss << " reason " << closeInfo.reason;
+                    invokeEventCallback(ix::CobraConnection_EventType_Closed,
+                                        ss.str());
+                }
+                else if (messageType == ix::WebSocket_MessageType_Message)
+                {
+                    Json::Value data;
+                    Json::Reader reader;
+                    if (!reader.parse(str, data))
+                    {
+                        invokeErrorCallback(std::string("Invalid json: ") + str);
+                        return;
+                    }
+
+                    if (!data.isMember("action"))
+                    {
+                        invokeErrorCallback("Missing action");
+                        return;
+                    }
+
+                    auto action = data["action"].asString();
+
+                    if (action == "auth/handshake/ok")
+                    {
+                        if (!handleHandshakeResponse(data))
+                        {
+                            invokeErrorCallback("Error extracting nonce from handshake response");
+                        }
+                    }
+                    else if (action == "auth/handshake/error")
+                    {
+                        invokeErrorCallback("Handshake error."); // print full message ?
+                    }
+                    else if (action == "auth/authenticate/ok")
+                    {
+                        _authenticated = true;
+                        invokeEventCallback(ix::CobraConnection_EventType_Authenticated);
+                        flushQueue();
+                    }
+                    else if (action == "auth/authenticate/error")
+                    {
+                        invokeErrorCallback("Authentication error."); // print full message ?
+                    }
+                    else if (action == "rtm/subscription/data")
+                    {
+                        handleSubscriptionData(data);
+                    }
+                    else
+                    {
+                        invokeErrorCallback(std::string("Un-handled message type: ") + action);
+                    }
+                }
+                else if (messageType == ix::WebSocket_MessageType_Error)
+                {
+                    std::stringstream ss;
+                    ss << "Connection error: " << error.reason      << std::endl;
+                    ss << "#retries: "         << error.retries     << std::endl;
+                    ss << "Wait time(ms): "    << error.wait_time   << std::endl;
+                    ss << "HTTP Status: "      << error.http_status << std::endl;
+                    invokeErrorCallback(ss.str());
+                }
+        });
+    }
+
+    void CobraConnection::setPublishMode(CobraConnectionPublishMode publishMode)
+    {
+        _publishMode = publishMode;
+    }
+
+    void CobraConnection::configure(const std::string& appkey,
+                                    const std::string& endpoint,
+                                    const std::string& rolename,
+                                    const std::string& rolesecret,
+                                    WebSocketPerMessageDeflateOptions webSocketPerMessageDeflateOptions)
+    {
+        _appkey = appkey;
+        _endpoint = endpoint;
+        _role_name = rolename;
+        _role_secret = rolesecret;
+
+        std::stringstream ss;
+        ss << _endpoint;
+        ss << "/v2?appkey=";
+        ss << _appkey;
+
+        std::string url = ss.str();
+        _webSocket.setUrl(url);
+        _webSocket.setPerMessageDeflateOptions(webSocketPerMessageDeflateOptions);
+    }
+
+    //
+    // Handshake message schema.
+    //
+    // handshake = {
+    //     "action": "auth/handshake",
+    //     "body": {
+    //         "data": {
+    //             "role": role
+    //         },
+    //         "method": "role_secret"
+    //     },
+    // }
+    //
+    //
+    bool CobraConnection::sendHandshakeMessage()
+    {
+        Json::Value data;
+        data["role"] = _role_name;
+
+        Json::Value body;
+        body["data"] = data;
+        body["method"] = "role_secret";
+
+        Json::Value pdu;
+        pdu["action"] = "auth/handshake";
+        pdu["body"] = body;
+
+        std::string serializedJson = serializeJson(pdu);
+        CobraConnection::invokeTrafficTrackerCallback(serializedJson.size(), false);
+
+        return _webSocket.send(serializedJson).success;
+    }
+
+    //
+    // Extract the nonce from the handshake response
+    // use it to compute a hash during authentication
+    //
+    // {
+    //     "action": "auth/handshake/ok",
+    //     "body": {
+    //         "data": {
+    //             "nonce": "MTI0Njg4NTAyMjYxMzgxMzgzMg==",
+    //             "version": "0.0.24"
+    //         }
+    //     }
+    // }
+    //
+    bool CobraConnection::handleHandshakeResponse(const Json::Value& pdu)
+    {
+        if (!pdu.isMember("body")) return false;
+        Json::Value body = pdu["body"];
+
+        if (!body.isMember("data")) return false;
+        Json::Value data = body["data"];
+
+        if (!data.isMember("nonce")) return false;
+        Json::Value nonce = data["nonce"];
+
+        if (!nonce.isString()) return false;
+
+        return sendAuthMessage(nonce.asString());
+    }
+
+    //
+    // Authenticate message schema.
+    //
+    // challenge = {
+    //     "action": "auth/authenticate",
+    //     "body": {
+    //         "method": "role_secret",
+    //         "credentials": {
+    //             "hash": computeHash(secret, nonce)
+    //         }
+    //     },
+    // }
+    //
+    bool CobraConnection::sendAuthMessage(const std::string& nonce)
+    {
+        Json::Value credentials;
+        credentials["hash"] = hmac(nonce, _role_secret);
+
+        Json::Value body;
+        body["credentials"] = credentials;
+        body["method"] = "role_secret";
+
+        Json::Value pdu;
+        pdu["action"] = "auth/authenticate";
+        pdu["body"] = body;
+
+        std::string serializedJson = serializeJson(pdu);
+        CobraConnection::invokeTrafficTrackerCallback(serializedJson.size(), false);
+
+        return _webSocket.send(serializedJson).success;
+    }
+
+
+    bool CobraConnection::handleSubscriptionData(const Json::Value& pdu)
+    {
+        if (!pdu.isMember("body")) return false;
+        Json::Value body = pdu["body"];
+
+        // Identify subscription_id, so that we can find
+        // which callback to execute
+        if (!body.isMember("subscription_id")) return false;
+        Json::Value subscriptionId = body["subscription_id"];
+
+        std::lock_guard<std::mutex> lock(_cbsMutex);
+        auto cb = _cbs.find(subscriptionId.asString());
+        if (cb == _cbs.end()) return false; // cannot find callback
+
+        // Extract messages now
+        if (!body.isMember("messages")) return false;
+        Json::Value messages = body["messages"];
+
+        for (auto&& msg : messages)
+        {
+            cb->second(msg);
+        }
+
+        return true;
+    }
+
+    bool CobraConnection::connect()
+    {
+        _webSocket.start();
+        return true;
+    }
+
+    bool CobraConnection::isConnected() const
+    {
+        return _webSocket.getReadyState() == ix::WebSocket_ReadyState_Open;
+    }
+
+    std::string CobraConnection::serializeJson(const Json::Value& value)
+    {
+        std::lock_guard<std::mutex> lock(_jsonWriterMutex);
+        return _jsonWriter.write(value);
+    }
+
+    //
+    // publish is not thread safe as we are trying to reuse some Json objects.
+    //
+    bool CobraConnection::publish(const Json::Value& channels,
+                                  const Json::Value& msg)
+    {
+        _body["channels"] = channels;
+        _body["message"] = msg;
+        _pdu["body"] = _body;
+
+        std::string serializedJson = serializeJson(_pdu);
+
+        if (_publishMode == CobraConnection_PublishMode_Batch)
+        {
+            enqueue(serializedJson);
+            return true;
+        }
+
+        //
+        // Fast path. We are authenticated and the publishing succeed
+        //            This should happen for 99% of the cases.
+        //
+        if (_authenticated && publishMessage(serializedJson))
+        {
+            return true;
+        }
+        else // Or else we enqueue
+             // Slow code path is when we haven't connected yet (startup),
+             // or when the connection drops for some reason.
+        {
+            enqueue(serializedJson);
+            return false;
+        }
+    }
+
+    void CobraConnection::subscribe(const std::string& channel,
+                                    SubscriptionCallback cb)
+    {
+        // Create and send a subscribe pdu
+        Json::Value body;
+        body["channel"] = channel;
+
+        Json::Value pdu;
+        pdu["action"] = "rtm/subscribe";
+        pdu["body"] = body;
+
+        _webSocket.send(pdu.toStyledString());
+
+        // Set the callback
+        std::lock_guard<std::mutex> lock(_cbsMutex);
+        _cbs[channel] = cb;
+    }
+
+    void CobraConnection::unsubscribe(const std::string& channel)
+    {
+        {
+            std::lock_guard<std::mutex> lock(_cbsMutex);
+            auto cb = _cbs.find(channel);
+            if (cb == _cbs.end()) return;
+
+            _cbs.erase(cb);
+        }
+
+        // Create and send an unsubscribe pdu
+        Json::Value body;
+        body["channel"] = channel;
+
+        Json::Value pdu;
+        pdu["action"] = "rtm/unsubscribe";
+        pdu["body"] = body;
+
+        _webSocket.send(pdu.toStyledString());
+    }
+
+    //
+    // Enqueue strategy drops old messages when we are at full capacity
+    //
+    // If we want to keep only 3 items max in the queue:
+    //
+    // enqueue(A) -> [A]
+    // enqueue(B) -> [B, A]
+    // enqueue(C) -> [C, B, A]
+    // enqueue(D) -> [D, C, B] -- now we drop A, the oldest message,
+    //                         -- and keep the 'fresh ones'
+    //
+    void CobraConnection::enqueue(const std::string& msg)
+    {
+        std::lock_guard<std::mutex> lock(_queueMutex);
+
+        if (_messageQueue.size() == CobraConnection::kQueueMaxSize)
+        {
+            _messageQueue.pop_back();
+        }
+        _messageQueue.push_front(msg);
+    }
+
+    //
+    // We process messages back (oldest) to front (newest) to respect ordering
+    // when sending them. If we fail to send something, we put it back in the queue
+    // at the end we picked it up originally (at the end).
+    //
+    bool CobraConnection::flushQueue()
+    {
+        std::lock_guard<std::mutex> lock(_queueMutex);
+
+        while (!_messageQueue.empty())
+        {
+            auto&& msg = _messageQueue.back();
+            if (!publishMessage(msg))
+            {
+                _messageQueue.push_back(msg);
+                return false;
+            }
+            _messageQueue.pop_back();
+        }
+
+        return true;
+    }
+
+    bool CobraConnection::publishMessage(const std::string& serializedJson)
+    {
+        auto webSocketSendInfo = _webSocket.send(serializedJson);
+        CobraConnection::invokeTrafficTrackerCallback(webSocketSendInfo.wireSize,
+                                                       false);
+        return webSocketSendInfo.success;
+    }
+
+    void CobraConnection::suspend()
+    {
+        disconnect();
+    }
+
+    void CobraConnection::resume()
+    {
+        connect();
+    }
+
+} // namespace ix

examples/cobra_publisher/IXCobraConnection.h

@@ -0,0 +1,163 @@
+/*
+ *  IXCobraConnection.h
+ *  Author: Benjamin Sergeant
+ *  Copyright (c) 2017-2018 Machine Zone. All rights reserved.
+ */
+
+#pragma once
+
+#include <mutex>
+#include <queue>
+#include <string>
+#include <thread>
+#include <unordered_map>
+
+#include <jsoncpp/json/json.h>
+#include <ixwebsocket/IXWebSocket.h>
+#include <ixwebsocket/IXWebSocketPerMessageDeflateOptions.h>
+
+namespace ix
+{
+    enum CobraConnectionEventType
+    {
+        CobraConnection_EventType_Authenticated = 0,
+        CobraConnection_EventType_Error = 1,
+        CobraConnection_EventType_Open = 2,
+        CobraConnection_EventType_Closed = 3
+    };
+
+    enum CobraConnectionPublishMode
+    {
+        CobraConnection_PublishMode_Immediate = 0,
+        CobraConnection_PublishMode_Batch = 1
+    };
+
+    using SubscriptionCallback = std::function<void(const Json::Value&)>;
+    using EventCallback = std::function<void(CobraConnectionEventType,
+                                             const std::string&,
+                                             const WebSocketHttpHeaders&)>;
+    using TrafficTrackerCallback = std::function<void(size_t size, bool incoming)>;
+
+    class CobraConnection
+    {
+    public:
+        CobraConnection();
+        ~CobraConnection();
+
+        /// Configuration / set keys, etc...
+        /// All input data but the channel name is encrypted with rc4
+        void configure(const std::string& appkey,
+                       const std::string& endpoint,
+                       const std::string& rolename,
+                       const std::string& rolesecret,
+                       WebSocketPerMessageDeflateOptions webSocketPerMessageDeflateOptions);
+
+        static void setTrafficTrackerCallback(const TrafficTrackerCallback& callback);
+
+        /// Reset the traffic tracker callback to an no-op one.
+        static void resetTrafficTrackerCallback();
+
+        /// Set the closed callback
+        void setEventCallback(const EventCallback& eventCallback);
+
+        /// Start the worker thread, used for background publishing
+        void start();
+
+        /// Publish a message to a channel
+        ///
+        /// No-op if the connection is not established
+        bool publish(const Json::Value& channels,
+                     const Json::Value& msg);
+
+        // Subscribe to a channel, and execute a callback when an incoming
+        // message arrives.
+        void subscribe(const std::string& channel, SubscriptionCallback cb);
+
+        /// Unsubscribe from a channel
+        void unsubscribe(const std::string& channel);
+
+        /// Close the connection
+        void disconnect();
+
+        /// Connect to Cobra and authenticate the connection
+        bool connect();
+
+        /// Returns true only if we're connected
+        bool isConnected() const;
+
+        /// Flush the publish queue
+        bool flushQueue();
+
+        /// Set the publish mode
+        void setPublishMode(CobraConnectionPublishMode publishMode);
+
+        /// Lifecycle management. Free resources when backgrounding
+        void suspend();
+        void resume();
+
+    private:
+        bool sendHandshakeMessage();
+        bool handleHandshakeResponse(const Json::Value& data);
+        bool sendAuthMessage(const std::string& nonce);
+        bool handleSubscriptionData(const Json::Value& pdu);
+
+        void initWebSocketOnMessageCallback();
+
+        bool publishMessage(const std::string& serializedJson);
+        void enqueue(const std::string& msg);
+        std::string serializeJson(const Json::Value& pdu);
+
+        /// Invoke the traffic tracker callback
+        static void invokeTrafficTrackerCallback(size_t size, bool incoming);
+
+        /// Invoke event callbacks
+        void invokeEventCallback(CobraConnectionEventType eventType,
+                                 const std::string& errorMsg = std::string(),
+                                 const WebSocketHttpHeaders& headers = WebSocketHttpHeaders());
+        void invokeErrorCallback(const std::string& errorMsg);
+
+        ///
+        /// Member variables
+        ///
+        WebSocket _webSocket;
+
+        /// Configuration data
+        std::string _appkey;
+        std::string _endpoint;
+        std::string _role_name;
+        std::string _role_secret;
+        std::atomic<CobraConnectionPublishMode> _publishMode;
+
+        // Can be set on control+background thread, protecting with an atomic
+        std::atomic<bool> _authenticated;
+
+        // Keep some objects around
+        Json::Value _body;
+        Json::Value _pdu;
+        Json::FastWriter _jsonWriter;
+        mutable std::mutex _jsonWriterMutex;
+
+        /// Traffic tracker callback
+        static TrafficTrackerCallback _trafficTrackerCallback;
+
+        /// Cobra events callbacks
+        EventCallback _eventCallback;
+        mutable std::mutex _eventCallbackMutex;
+
+        /// Subscription callbacks, only one per channel
+        std::unordered_map<std::string, SubscriptionCallback> _cbs;
+        mutable std::mutex _cbsMutex;
+
+        // Message Queue can be touched on control+background thread,
+        // protecting with a mutex.
+        //
+        // Message queue is used when there are problems sending messages so
+        // that sending can be retried later.
+        std::deque<std::string> _messageQueue;
+        mutable std::mutex _queueMutex;
+
+        // Cap the queue size (100 elems so far -> ~100k)
+        static constexpr size_t kQueueMaxSize = 256;
+    };
+
+} // namespace ix

examples/cobra_publisher/README.md

@@ -0,0 +1,6 @@
+```
+mkdir build
+cd build
+cmake ..
+make && (cd .. ; sh cobra_publisher.sh)
+```

examples/cobra_publisher/cobra_publisher.cpp

@@ -0,0 +1,123 @@
+/*
+ *  cobra_publisher.cpp
+ *  Author: Benjamin Sergeant
+ *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
+ */
+
+#include <iostream>
+#include <sstream>
+#include <fstream>
+#include <atomic>
+#include <ixwebsocket/IXWebSocket.h>
+#include "IXCobraConnection.h"
+#include "jsoncpp/json/json.h"
+
+void msleep(int ms)
+{
+    std::chrono::duration<double, std::milli> duration(ms);
+    std::this_thread::sleep_for(duration);
+}
+
+int main(int argc, char* argv[])
+{
+    if (argc != 7)
+    {
+        std::cerr << "Usage error: need 6 arguments." << std::endl;
+    }
+
+    std::string endpoint = argv[1];
+    std::string appkey = argv[2];
+    std::string channel = argv[3];
+    std::string rolename = argv[4];
+    std::string rolesecret = argv[5];
+    std::string path = argv[6];
+
+    std::atomic<size_t> incomingBytes(0);
+    std::atomic<size_t> outgoingBytes(0);
+    ix::CobraConnection::setTrafficTrackerCallback(
+        [&incomingBytes, &outgoingBytes](size_t size, bool incoming)
+        {
+            if (incoming)
+            {
+                incomingBytes += size;
+            }
+            else
+            {
+                outgoingBytes += size;
+            }
+        }
+    );
+
+    bool done = false;
+    ix::CobraConnection cobraConnection;
+    ix::WebSocketPerMessageDeflateOptions webSocketPerMessageDeflateOptions(
+        true, false, false, 15, 15);
+    cobraConnection.configure(appkey, endpoint, rolename, rolesecret,
+                               webSocketPerMessageDeflateOptions);
+    cobraConnection.connect();
+    cobraConnection.setEventCallback(
+        [&cobraConnection, channel, path, &done]
+        (ix::CobraConnectionEventType eventType,
+         const std::string& errMsg,
+         const ix::WebSocketHttpHeaders& headers)
+        {
+            if (eventType == ix::CobraConnection_EventType_Open)
+            {
+                std::cout << "Handshake Headers:" << std::endl;
+                for (auto it : headers)
+                {
+                    std::cout << it.first << ": " << it.second << std::endl;
+                }
+            }
+            else if (eventType == ix::CobraConnection_EventType_Authenticated)
+            {
+                std::cout << "Authenticated" << std::endl;
+
+                std::string line;
+                std::ifstream f(path);
+                if (!f.is_open())
+                {
+                    std::cerr << "Error while opening file: " << path << std::endl;
+                }
+
+                int n = 0;
+                while (getline(f, line))
+                {
+                    Json::Value value;
+                    Json::Reader reader;
+                    reader.parse(line, value);
+
+                    cobraConnection.publish(channel, value);
+                    n++;
+                }
+                std::cerr << "#published messages: " << n << std::endl;
+
+                if (f.bad())
+                {
+                    std::cerr << "Error while opening file: " << path << std::endl;
+                }
+
+                done = true;
+            }
+            else if (eventType == ix::CobraConnection_EventType_Error)
+            {
+                std::cerr << "Cobra Error received: " << errMsg << std::endl;
+                done = true;
+            }
+            else if (eventType == ix::CobraConnection_EventType_Closed)
+            {
+                std::cerr << "Cobra connection closed" << std::endl;
+            }
+        }
+    );
+
+    while (!done)
+    {
+        msleep(1);
+    }
+
+    std::cout << "Incoming bytes: " << incomingBytes << std::endl;
+    std::cout << "Outgoing bytes: " << outgoingBytes << std::endl;
+
+    return 0;
+}

examples/cobra_publisher/cobra_publisher.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+endpoint="ws://127.0.0.1:8765"
+endpoint="ws://127.0.0.1:5678"
+appkey="appkey"
+channel="foo"
+rolename="a_role"
+rolesecret="a_secret"
+filename=${FILENAME:=events.jsonl}
+
+build/cobra_publisher $endpoint $appkey $channel $rolename $rolesecret $filename

examples/cobra_publisher/devnull_server.js

@@ -0,0 +1,45 @@
+/*
+ *  devnull_server.js
+ *  Author: Benjamin Sergeant
+ *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
+ */
+const WebSocket = require('ws');
+
+let wss = new WebSocket.Server({ port: 5678, perMessageDeflate: true })
+
+wss.on('connection', (ws) => {
+
+  let handshake = false
+  let authenticated = false
+
+  ws.on('message', (data) => {
+
+    console.log(data.toString('utf-8'))
+
+    if (!handshake) {
+      let response = {
+          "action": "auth/handshake/ok",
+          "body": {
+              "data": {
+                  "nonce": "MTI0Njg4NTAyMjYxMzgxMzgzMg==",
+                  "version": "0.0.24"
+              }
+          },
+          "id": 1
+      }
+      ws.send(JSON.stringify(response))
+      handshake = true
+    } else if (!authenticated) {
+      let response = {
+        "action": "auth/authenticate/ok",
+        "body": {},
+        "id": 2
+      }
+      
+      ws.send(JSON.stringify(response))
+      authenticated = true
+    } else {
+      console.log(data)
+    }
+  });
+})

examples/cobra_publisher/devnull_server.py

@@ -0,0 +1,43 @@
+#!/usr/bin/env python
+
+import os
+import json
+import asyncio
+import websockets
+
+
+async def echo(websocket, path):
+    handshake = False
+    authenticated = False
+
+    async for message in websocket:
+        print(message)
+
+        if not handshake:
+            response = {
+                "action": "auth/handshake/ok",
+                "body": {
+                    "data": {
+                        "nonce": "MTI0Njg4NTAyMjYxMzgxMzgzMg==",
+                        "version": "0.0.24"
+                    }
+                },
+                "id": 1
+            }
+            await websocket.send(json.dumps(response))
+            handshake = True
+
+        elif not authenticated:
+            response = {
+                "action": "auth/authenticate/ok",
+                "body": {},
+                "id": 2
+            }
+          
+            await websocket.send(json.dumps(response))
+            authenticated = True
+
+
+asyncio.get_event_loop().run_until_complete(
+    websockets.serve(echo, 'localhost', 5678))
+asyncio.get_event_loop().run_forever()

examples/cobra_publisher/events.jsonl

@@ -0,0 +1,3 @@
+{"array":[1,2,3],"boolean":true,"color":"#82b92c","null":null,"number":123,"object":{"a":"b","c":"d","e":"f"},"string":"Foo"}
+{"array":[1,2,3],"boolean":true,"color":"#82b92c","null":null,"number":123,"object":{"a":"b","c":"d","e":"f"},"string":"Bar"}
+{"array":[1,2,3],"boolean":true,"color":"#82b92c","null":null,"number":123,"object":{"a":"b","c":"d","e":"f"},"string":"Baz"}

examples/cobra_publisher/jsoncpp/json/json-forwards.h

@@ -0,0 +1,333 @@
+/// Json-cpp amalgated forward header (http://jsoncpp.sourceforge.net/).
+/// It is intended to be used with #include "json/json-forwards.h"
+/// This header provides forward declaration for all JsonCpp types.
+
+// //////////////////////////////////////////////////////////////////////
+// Beginning of content of file: LICENSE
+// //////////////////////////////////////////////////////////////////////
+
+/*
+The JsonCpp library's source code, including accompanying documentation,
+tests and demonstration applications, are licensed under the following
+conditions...
+
+Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all
+jurisdictions which recognize such a disclaimer. In such jurisdictions,
+this software is released into the Public Domain.
+
+In jurisdictions which do not recognize Public Domain property (e.g. Germany as of
+2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur and
+The JsonCpp Authors, and is released under the terms of the MIT License (see below).
+
+In jurisdictions which recognize Public Domain property, the user of this
+software may choose to accept it either as 1) Public Domain, 2) under the
+conditions of the MIT License (see below), or 3) under the terms of dual
+Public Domain/MIT License conditions described here, as they choose.
+
+The MIT License is about as close to Public Domain as a license can get, and is
+described in clear, concise terms at:
+
+   http://en.wikipedia.org/wiki/MIT_License
+
+The full text of the MIT License follows:
+
+========================================================================
+Copyright (c) 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
+
+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.
+========================================================================
+(END LICENSE TEXT)
+
+The MIT license is compatible with both the GPL and commercial
+software, affording one all of the rights of Public Domain with the
+minor nuisance of being required to keep the above copyright notice
+and license text in the source code. Note also that by accepting the
+Public Domain "license" you can re-license your copy using whatever
+license you like.
+
+*/
+
+// //////////////////////////////////////////////////////////////////////
+// End of content of file: LICENSE
+// //////////////////////////////////////////////////////////////////////
+
+
+
+
+
+#ifndef JSON_FORWARD_AMALGATED_H_INCLUDED
+# define JSON_FORWARD_AMALGATED_H_INCLUDED
+/// If defined, indicates that the source file is amalgated
+/// to prevent private header inclusion.
+#define JSON_IS_AMALGAMATION
+
+// //////////////////////////////////////////////////////////////////////
+// Beginning of content of file: include/json/config.h
+// //////////////////////////////////////////////////////////////////////
+
+// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
+// Distributed under MIT license, or public domain if desired and
+// recognized in your jurisdiction.
+// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
+
+#ifndef JSON_CONFIG_H_INCLUDED
+#define JSON_CONFIG_H_INCLUDED
+#include <stddef.h>
+#include <string> //typedef String
+#include <stdint.h> //typedef int64_t, uint64_t
+
+/// If defined, indicates that json library is embedded in CppTL library.
+//# define JSON_IN_CPPTL 1
+
+/// If defined, indicates that json may leverage CppTL library
+//#  define JSON_USE_CPPTL 1
+/// If defined, indicates that cpptl vector based map should be used instead of
+/// std::map
+/// as Value container.
+//#  define JSON_USE_CPPTL_SMALLMAP 1
+
+// If non-zero, the library uses exceptions to report bad input instead of C
+// assertion macros. The default is to use exceptions.
+#ifndef JSON_USE_EXCEPTION
+#define JSON_USE_EXCEPTION 1
+#endif
+
+/// If defined, indicates that the source file is amalgated
+/// to prevent private header inclusion.
+/// Remarks: it is automatically defined in the generated amalgated header.
+// #define JSON_IS_AMALGAMATION
+
+#ifdef JSON_IN_CPPTL
+#include <cpptl/config.h>
+#ifndef JSON_USE_CPPTL
+#define JSON_USE_CPPTL 1
+#endif
+#endif
+
+#ifdef JSON_IN_CPPTL
+#define JSON_API CPPTL_API
+#elif defined(JSON_DLL_BUILD)
+#if defined(_MSC_VER) || defined(__MINGW32__)
+#define JSON_API __declspec(dllexport)
+#define JSONCPP_DISABLE_DLL_INTERFACE_WARNING
+#endif // if defined(_MSC_VER)
+#elif defined(JSON_DLL)
+#if defined(_MSC_VER) || defined(__MINGW32__)
+#define JSON_API __declspec(dllimport)
+#define JSONCPP_DISABLE_DLL_INTERFACE_WARNING
+#endif // if defined(_MSC_VER)
+#endif // ifdef JSON_IN_CPPTL
+#if !defined(JSON_API)
+#define JSON_API
+#endif
+
+// If JSON_NO_INT64 is defined, then Json only support C++ "int" type for
+// integer
+// Storages, and 64 bits integer support is disabled.
+// #define JSON_NO_INT64 1
+
+#if defined(_MSC_VER) // MSVC
+#  if _MSC_VER <= 1200 // MSVC 6
+    // Microsoft Visual Studio 6 only support conversion from __int64 to double
+    // (no conversion from unsigned __int64).
+#    define JSON_USE_INT64_DOUBLE_CONVERSION 1
+    // Disable warning 4786 for VS6 caused by STL (identifier was truncated to '255'
+    // characters in the debug information)
+    // All projects I've ever seen with VS6 were using this globally (not bothering
+    // with pragma push/pop).
+#    pragma warning(disable : 4786)
+#  endif // MSVC 6
+
+#  if _MSC_VER >= 1500 // MSVC 2008
+    /// Indicates that the following function is deprecated.
+#    define JSONCPP_DEPRECATED(message) __declspec(deprecated(message))
+#  endif
+
+#endif // defined(_MSC_VER)
+
+// In c++11 the override keyword allows you to explicity define that a function
+// is intended to override the base-class version.  This makes the code more
+// managable and fixes a set of common hard-to-find bugs.
+#if __cplusplus >= 201103L
+# define JSONCPP_OVERRIDE override
+# define JSONCPP_NOEXCEPT noexcept
+#elif defined(_MSC_VER) && _MSC_VER > 1600 && _MSC_VER < 1900
+# define JSONCPP_OVERRIDE override
+# define JSONCPP_NOEXCEPT throw()
+#elif defined(_MSC_VER) && _MSC_VER >= 1900
+# define JSONCPP_OVERRIDE override
+# define JSONCPP_NOEXCEPT noexcept
+#else
+# define JSONCPP_OVERRIDE
+# define JSONCPP_NOEXCEPT throw()
+#endif
+
+#ifndef JSON_HAS_RVALUE_REFERENCES
+
+#if defined(_MSC_VER) && _MSC_VER >= 1600 // MSVC >= 2010
+#define JSON_HAS_RVALUE_REFERENCES 1
+#endif // MSVC >= 2010
+
+#ifdef __clang__
+#if __has_feature(cxx_rvalue_references)
+#define JSON_HAS_RVALUE_REFERENCES 1
+#endif  // has_feature
+
+#elif defined __GNUC__ // not clang (gcc comes later since clang emulates gcc)
+#if defined(__GXX_EXPERIMENTAL_CXX0X__) || (__cplusplus >= 201103L)
+#define JSON_HAS_RVALUE_REFERENCES 1
+#endif  // GXX_EXPERIMENTAL
+
+#endif // __clang__ || __GNUC__
+
+#endif // not defined JSON_HAS_RVALUE_REFERENCES
+
+#ifndef JSON_HAS_RVALUE_REFERENCES
+#define JSON_HAS_RVALUE_REFERENCES 0
+#endif
+
+#ifdef __clang__
+#  if __has_extension(attribute_deprecated_with_message)
+#    define JSONCPP_DEPRECATED(message)  __attribute__ ((deprecated(message)))
+#  endif
+#elif defined __GNUC__ // not clang (gcc comes later since clang emulates gcc)
+#  if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))
+#    define JSONCPP_DEPRECATED(message)  __attribute__ ((deprecated(message)))
+#  elif (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
+#    define JSONCPP_DEPRECATED(message)  __attribute__((__deprecated__))
+#  endif  // GNUC version
+#endif // __clang__ || __GNUC__
+
+#if !defined(JSONCPP_DEPRECATED)
+#define JSONCPP_DEPRECATED(message)
+#endif // if !defined(JSONCPP_DEPRECATED)
+
+#if __GNUC__ >= 6
+#  define JSON_USE_INT64_DOUBLE_CONVERSION 1
+#endif
+
+#if !defined(JSON_IS_AMALGAMATION)
+
+# include "version.h"
+
+# if JSONCPP_USING_SECURE_MEMORY
+#  include "allocator.h" //typedef Allocator
+# endif
+
+#endif // if !defined(JSON_IS_AMALGAMATION)
+
+namespace Json {
+typedef int Int;
+typedef unsigned int UInt;
+#if defined(JSON_NO_INT64)
+typedef int LargestInt;
+typedef unsigned int LargestUInt;
+#undef JSON_HAS_INT64
+#else                 // if defined(JSON_NO_INT64)
+// For Microsoft Visual use specific types as long long is not supported
+#if defined(_MSC_VER) // Microsoft Visual Studio
+typedef __int64 Int64;
+typedef unsigned __int64 UInt64;
+#else                 // if defined(_MSC_VER) // Other platforms, use long long
+typedef int64_t Int64;
+typedef uint64_t UInt64;
+#endif // if defined(_MSC_VER)
+typedef Int64 LargestInt;
+typedef UInt64 LargestUInt;
+#define JSON_HAS_INT64
+#endif // if defined(JSON_NO_INT64)
+#if JSONCPP_USING_SECURE_MEMORY
+#define JSONCPP_STRING        std::basic_string<char, std::char_traits<char>, Json::SecureAllocator<char> >
+#define JSONCPP_OSTRINGSTREAM std::basic_ostringstream<char, std::char_traits<char>, Json::SecureAllocator<char> >
+#define JSONCPP_OSTREAM       std::basic_ostream<char, std::char_traits<char>>
+#define JSONCPP_ISTRINGSTREAM std::basic_istringstream<char, std::char_traits<char>, Json::SecureAllocator<char> >
+#define JSONCPP_ISTREAM       std::istream
+#else
+#define JSONCPP_STRING        std::string
+#define JSONCPP_OSTRINGSTREAM std::ostringstream
+#define JSONCPP_OSTREAM       std::ostream
+#define JSONCPP_ISTRINGSTREAM std::istringstream
+#define JSONCPP_ISTREAM       std::istream
+#endif // if JSONCPP_USING_SECURE_MEMORY
+} // end namespace Json
+
+#endif // JSON_CONFIG_H_INCLUDED
+
+// //////////////////////////////////////////////////////////////////////
+// End of content of file: include/json/config.h
+// //////////////////////////////////////////////////////////////////////
+
+
+
+
+
+
+// //////////////////////////////////////////////////////////////////////
+// Beginning of content of file: include/json/forwards.h
+// //////////////////////////////////////////////////////////////////////
+
+// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
+// Distributed under MIT license, or public domain if desired and
+// recognized in your jurisdiction.
+// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
+
+#ifndef JSON_FORWARDS_H_INCLUDED
+#define JSON_FORWARDS_H_INCLUDED
+
+#if !defined(JSON_IS_AMALGAMATION)
+#include "config.h"
+#endif // if !defined(JSON_IS_AMALGAMATION)
+
+namespace Json {
+
+// writer.h
+class FastWriter;
+class StyledWriter;
+
+// reader.h
+class Reader;
+
+// features.h
+class Features;
+
+// value.h
+typedef unsigned int ArrayIndex;
+class StaticString;
+class Path;
+class PathArgument;
+class Value;
+class ValueIteratorBase;
+class ValueIterator;
+class ValueConstIterator;
+
+} // namespace Json
+
+#endif // JSON_FORWARDS_H_INCLUDED
+
+// //////////////////////////////////////////////////////////////////////
+// End of content of file: include/json/forwards.h
+// //////////////////////////////////////////////////////////////////////
+
+
+
+
+
+#endif //ifndef JSON_FORWARD_AMALGATED_H_INCLUDED

examples/cobra_publisher/package-lock.json

@@ -8,9 +8,9 @@
       "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
     },
     "ws": {
-      "version": ">=6.2.2",
+      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.0.tgz",
-      "integrity": "sha512-deZYUNlt2O4buFCa3t5bKLf8A7FPP/TVjwOeVNpw818Ma5nk4MLXls2eoEGS39o8119QIYxTrTDoPQ5B/gTD6w==",
+      "integrity": "sha512-H3dGVdGvW2H8bnYpIDc3u3LH8Wue3Qh+Zto6aXXFzvESkTVT6rAfKR6tR/+coaUvxs8yHtmNV0uioBF62ZGSTg==",
       "requires": {
         "async-limiter": "1.0.0"
       }

examples/ping_pong/.gitignore

@@ -0,0 +1,2 @@
+venv
+build

examples/ping_pong/CMakeLists.txt

@@ -0,0 +1,25 @@
+#
+# 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 14)
+
+option(USE_TLS "Add TLS support" ON)
+
+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/build_linux.sh

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

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,171 @@
+/*
+ *  ping_pong.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);
+            void send(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.setUrl(_url);
+
+        std::stringstream ss;
+        log(std::string("Connecting to url: ") + _url);
+
+        _webSocket.setOnMessageCallback(
+            [this](ix::WebSocketMessageType messageType,
+               const std::string& str,
+               size_t wireSize,
+               const ix::WebSocketErrorInfo& error,
+               const ix::WebSocketOpenInfo& openInfo,
+               const ix::WebSocketCloseInfo& closeInfo)
+            {
+                std::stringstream ss;
+                if (messageType == ix::WebSocket_MessageType_Open)
+                {
+                    log("ping_pong: connected");
+                }
+                else if (messageType == ix::WebSocket_MessageType_Close)
+                {
+                    ss << "ping_pong: disconnected:"
+                       << " code " << closeInfo.code
+                       << " reason " << closeInfo.reason
+                       << str;
+                    log(ss.str());
+                }
+                else if (messageType == ix::WebSocket_MessageType_Message)
+                {
+                    ss << "ping_pong: received message: "
+                       << str;
+                    log(ss.str());
+                }
+                else if (messageType == ix::WebSocket_MessageType_Ping)
+                {
+                    ss << "ping_pong: received ping message: "
+                       << str;
+                    log(ss.str());
+                }
+                else if (messageType == ix::WebSocket_MessageType_Pong)
+                {
+                    ss << "ping_pong: 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)
+    {
+        if (!_webSocket.ping(text).success)
+        {
+            std::cerr << "Failed to send ping message. Message too long (> 125 bytes) or endpoint is disconnected"
+                      << std::endl;
+        }
+    }
+
+    void WebSocketPingPong::send(const std::string& text)
+    {
+        _webSocket.send(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;
+            }
+
+            if (text == "/close")
+            {
+                webSocketPingPong.send(text);
+            }
+            else
+            {
+                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,21 @@
+#!/usr/bin/env python
+
+import os
+import asyncio
+import websockets
+
+async def echo(websocket, path):
+    async for message in websocket:
+        print(message)
+        await websocket.send(message)
+
+        if os.getenv('TEST_CLOSE'):
+            print('Closing')
+            # breakpoint()
+            await websocket.close(1001, 'close message')
+            # await websocket.close()
+            break
+
+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

httpd.cpp

@@ -1,46 +0,0 @@
-/*
- *  httpd.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2020 Machine Zone, Inc. All rights reserved.
- *
- *  Buid with make httpd
- */
-
-#include <ixwebsocket/IXHttpServer.h>
-#include <sstream>
-#include <iostream>
-
-int main(int argc, char** argv)
-{
-    if (argc != 3)
-    {
-        std::cerr << "Usage: " << argv[0]
-                  << " <port> <host>" << std::endl;
-        std::cerr << " " << argv[0] << " 9090 127.0.0.1" << std::endl;
-        std::cerr << " " << argv[0] << " 9090 0.0.0.0" << std::endl;
-        return 1;
-    }
-
-    int port;
-    std::stringstream ss;
-    ss << argv[1];
-    ss >> port;
-    std::string hostname(argv[2]);
-
-    std::cout << "Listening on " << hostname
-              << ":" << port << std::endl;
-
-    ix::HttpServer server(port, hostname);
-
-    auto res = server.listen();
-    if (!res.first)
-    {
-        std::cout << res.second << std::endl;
-        return 1;
-    }
-
-    server.start();
-    server.wait();
-
-    return 0;
-}

ixwebsocket-config.cmake.in

@@ -1,9 +0,0 @@
-@PACKAGE_INIT@
-
-include(CMakeFindDependencyMacro)
-
-if (@USE_ZLIB@)
-  find_dependency(ZLIB)
-endif()
-
-include("${CMAKE_CURRENT_LIST_DIR}/ixwebsocket-targets.cmake")

ixwebsocket.pc.in

@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: ixwebsocket
-Description: websocket and http client and server library, with TLS support and very few dependencies
-Version: @CMAKE_PROJECT_VERSION@
-Libs: -L${libdir} -lixwebsocket
-Cflags: -I${includedir}
-Requires: @requires@

ixwebsocket/IXBase64.h

@@ -1,125 +0,0 @@
-#ifndef _MACARON_BASE64_H_
-#define _MACARON_BASE64_H_
-
-/**
- * The MIT License (MIT)
- * Copyright (c) 2016 tomykaira
- *
- * 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 <cstdint>
-#include <string>
-
-namespace macaron {
-
-class Base64 {
- public:
-
-  static std::string Encode(const std::string data) {
-    static constexpr char sEncodingTable[] = {
-      'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
-      'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
-      'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
-      'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
-      'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
-      'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
-      'w', 'x', 'y', 'z', '0', '1', '2', '3',
-      '4', '5', '6', '7', '8', '9', '+', '/'
-    };
-
-    size_t in_len = data.size();
-    size_t out_len = 4 * ((in_len + 2) / 3);
-    std::string ret(out_len, '\0');
-    size_t i;
-    char *p = const_cast<char*>(ret.c_str());
-
-    for (i = 0; i < in_len - 2; i += 3) {
-      *p++ = sEncodingTable[(data[i] >> 2) & 0x3F];
-      *p++ = sEncodingTable[((data[i] & 0x3) << 4) | ((int) (data[i + 1] & 0xF0) >> 4)];
-      *p++ = sEncodingTable[((data[i + 1] & 0xF) << 2) | ((int) (data[i + 2] & 0xC0) >> 6)];
-      *p++ = sEncodingTable[data[i + 2] & 0x3F];
-    }
-    if (i < in_len) {
-      *p++ = sEncodingTable[(data[i] >> 2) & 0x3F];
-      if (i == (in_len - 1)) {
-        *p++ = sEncodingTable[((data[i] & 0x3) << 4)];
-        *p++ = '=';
-      }
-      else {
-        *p++ = sEncodingTable[((data[i] & 0x3) << 4) | ((int) (data[i + 1] & 0xF0) >> 4)];
-        *p++ = sEncodingTable[((data[i + 1] & 0xF) << 2)];
-      }
-      *p++ = '=';
-    }
-
-    return ret;
-  }
-
-  static std::string Decode(const std::string& input, std::string& out) {
-    static constexpr unsigned char kDecodingTable[] = {
-      64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-      64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-      64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 62, 64, 64, 64, 63,
-      52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 64, 64, 64, 64, 64, 64,
-      64,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
-      15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 64, 64, 64, 64, 64,
-      64, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
-      41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 64, 64, 64, 64, 64,
-      64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-      64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-      64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-      64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-      64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-      64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-      64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
-      64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64
-    };
-
-    size_t in_len = input.size();
-    if (in_len % 4 != 0) return "Input data size is not a multiple of 4";
-
-    size_t out_len = in_len / 4 * 3;
-    if (input[in_len - 1] == '=') out_len--;
-    if (input[in_len - 2] == '=') out_len--;
-
-    out.resize(out_len);
-
-    for (size_t i = 0, j = 0; i < in_len;) {
-      uint32_t a = input[i] == '=' ? 0 & i++ : kDecodingTable[static_cast<int>(input[i++])];
-      uint32_t b = input[i] == '=' ? 0 & i++ : kDecodingTable[static_cast<int>(input[i++])];
-      uint32_t c = input[i] == '=' ? 0 & i++ : kDecodingTable[static_cast<int>(input[i++])];
-      uint32_t d = input[i] == '=' ? 0 & i++ : kDecodingTable[static_cast<int>(input[i++])];
-
-      uint32_t triple = (a << 3 * 6) + (b << 2 * 6) + (c << 1 * 6) + (d << 0 * 6);
-
-      if (j < out_len) out[j++] = (triple >> 2 * 8) & 0xFF;
-      if (j < out_len) out[j++] = (triple >> 1 * 8) & 0xFF;
-      if (j < out_len) out[j++] = (triple >> 0 * 8) & 0xFF;
-    }
-
-    return "";
-  }
-
-};
-
-}
-
-#endif /* _MACARON_BASE64_H_ */

ixwebsocket/IXBench.cpp

@@ -1,61 +0,0 @@
-/*
- *  IXBench.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2017-2020 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXBench.h"
-
-#include <iostream>
-
-namespace ix
-{
-    Bench::Bench(const std::string& description)
-        : _description(description)
-    {
-        reset();
-    }
-
-    Bench::~Bench()
-    {
-        if (!_reported)
-        {
-            report();
-        }
-    }
-
-    void Bench::reset()
-    {
-        _start = std::chrono::high_resolution_clock::now();
-        _reported = false;
-    }
-
-    void Bench::report()
-    {
-        auto now = std::chrono::high_resolution_clock::now();
-        auto microseconds = std::chrono::duration_cast<std::chrono::microseconds>(now - _start);
-
-        _duration = microseconds.count();
-        std::cerr << _description << " completed in " << _duration << " us" << std::endl;
-
-        setReported();
-    }
-
-    void Bench::record()
-    {
-        auto now = std::chrono::high_resolution_clock::now();
-        auto microseconds = std::chrono::duration_cast<std::chrono::microseconds>(now - _start);
-
-        _duration = microseconds.count();
-    }
-
-    void Bench::setReported()
-    {
-        _reported = true;
-    }
-
-    uint64_t Bench::getDuration() const
-    {
-        return _duration;
-    }
-} // namespace ix

ixwebsocket/IXBench.h

@@ -1,32 +0,0 @@
-/*
- *  IXBench.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2017-2020 Machine Zone, Inc. All rights reserved.
- */
-#pragma once
-
-#include <chrono>
-#include <cstdint>
-#include <string>
-
-namespace ix
-{
-    class Bench
-    {
-    public:
-        Bench(const std::string& description);
-        ~Bench();
-
-        void reset();
-        void record();
-        void report();
-        void setReported();
-        uint64_t getDuration() const;
-
-    private:
-        std::string _description;
-        std::chrono::time_point<std::chrono::high_resolution_clock> _start;
-        uint64_t _duration;
-        bool _reported;
-    };
-} // namespace ix

ixwebsocket/IXCancellationRequest.cpp

@@ -6,20 +6,18 @@
 
 #include "IXCancellationRequest.h"
 
-#include <cassert>
 #include <chrono>
 
 namespace ix
 {
-    CancellationRequest makeCancellationRequestWithTimeout(
+    CancellationRequest makeCancellationRequestWithTimeout(int secs,
-        int secs, std::atomic<bool>& requestInitCancellation)
+                                                           std::atomic<bool>& requestInitCancellation)
     {
-        assert(secs > 0);
-
         auto start = std::chrono::system_clock::now();
         auto timeout = std::chrono::seconds(secs);
 
-        auto isCancellationRequested = [&requestInitCancellation, start, timeout]() -> bool {
+        auto isCancellationRequested = [&requestInitCancellation, start, timeout]() -> bool
+        {
             // Was an explicit cancellation requested ?
             if (requestInitCancellation) return true;
 
@@ -32,4 +30,4 @@ namespace ix
 
         return isCancellationRequested;
     }
-} // namespace ix
+}

ixwebsocket/IXCancellationRequest.h

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

ixwebsocket/IXConnectionState.cpp

@@ -1,73 +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>();
-    }
-
-    void ConnectionState::setOnSetTerminatedCallback(const OnSetTerminatedCallback& callback)
-    {
-        _onSetTerminatedCallback = callback;
-    }
-
-    bool ConnectionState::isTerminated() const
-    {
-        return _terminated;
-    }
-
-    void ConnectionState::setTerminated()
-    {
-        _terminated = true;
-
-        if (_onSetTerminatedCallback)
-        {
-            _onSetTerminatedCallback();
-        }
-    }
-
-    const std::string& ConnectionState::getRemoteIp()
-    {
-        return _remoteIp;
-    }
-
-    int ConnectionState::getRemotePort()
-    {
-        return _remotePort;
-    }
-
-    void ConnectionState::setRemoteIp(const std::string& remoteIp)
-    {
-        _remoteIp = remoteIp;
-    }
-
-    void ConnectionState::setRemotePort(int remotePort)
-    {
-        _remotePort = remotePort;
-    }
-} // namespace ix

ixwebsocket/IXConnectionState.h

@@ -1,54 +0,0 @@
-/*
- *  IXConnectionState.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include <atomic>
-#include <cstdint>
-#include <functional>
-#include <memory>
-#include <string>
-
-namespace ix
-{
-    using OnSetTerminatedCallback = std::function<void()>;
-
-    class ConnectionState
-    {
-    public:
-        ConnectionState();
-        virtual ~ConnectionState() = default;
-
-        virtual void computeId();
-        virtual const std::string& getId() const;
-
-        void setTerminated();
-        bool isTerminated() const;
-
-        const std::string& getRemoteIp();
-        int getRemotePort();
-
-        static std::shared_ptr<ConnectionState> createConnectionState();
-
-    private:
-        void setOnSetTerminatedCallback(const OnSetTerminatedCallback& callback);
-
-        void setRemoteIp(const std::string& remoteIp);
-        void setRemotePort(int remotePort);
-
-    protected:
-        std::atomic<bool> _terminated;
-        std::string _id;
-        OnSetTerminatedCallback _onSetTerminatedCallback;
-
-        static std::atomic<uint64_t> _globalId;
-
-        std::string _remoteIp;
-        int _remotePort;
-
-        friend class SocketServer;
-    };
-} // namespace ix

ixwebsocket/IXDNSLookup.cpp

@@ -4,58 +4,39 @@
  *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
  */
 
-//
-// On Windows Universal Platform (uwp), gai_strerror defaults behavior is to returns wchar_t
-// which is different from all other platforms. We want the non unicode version.
-// See https://github.com/microsoft/vcpkg/pull/11030
-// We could do this in IXNetSystem.cpp but so far we are only using gai_strerror in here.
-//
-#ifdef _UNICODE
-#undef _UNICODE
-#endif
-#ifdef UNICODE
-#undef UNICODE
-#endif
-
 #include "IXDNSLookup.h"
-
 #include "IXNetSystem.h"
-#include <chrono>
+
 #include <string.h>
-#include <thread>
+#include <chrono>
-#include <utility>
-
-// mingw build quirks
-#if defined(_WIN32) && defined(__GNUC__)
-#ifndef AI_NUMERICSERV
-#define AI_NUMERICSERV NI_NUMERICSERV
-#endif
-#ifndef AI_ADDRCONFIG
-#define AI_ADDRCONFIG LUP_ADDRCONFIG
-#endif
-#endif
-
-#ifdef __APPLE__
-#ifndef AI_NUMERICSERV
-#define AI_NUMERICSERV 0
-#endif
-#endif
 
 namespace ix
 {
-    const int64_t DNSLookup::kDefaultWait = 1; // ms
+    const int64_t DNSLookup::kDefaultWait = 10; // ms
 
-    DNSLookup::DNSLookup(const std::string& hostname, int port, int64_t wait)
+    std::atomic<uint64_t> DNSLookup::_nextId(0);
-        : _hostname(hostname)
+    std::set<uint64_t> DNSLookup::_activeJobs;
-        , _port(port)
+    std::mutex DNSLookup::_activeJobsMutex;
-        , _wait(wait)
+
-        , _res(nullptr)
+    DNSLookup::DNSLookup(const std::string& hostname, int port, int64_t wait) :
-        , _done(false)
+        _hostname(hostname),
+        _port(port),
+        _wait(wait),
+        _res(nullptr),
+        _done(false),
+        _id(_nextId++)
     {
-        ;
+
     }
 
-    DNSLookup::AddrInfoPtr DNSLookup::getAddrInfo(const std::string& hostname,
+    DNSLookup::~DNSLookup()
+    {
+        // Remove this job from the active jobs list
+        std::unique_lock<std::mutex> lock(_activeJobsMutex);
+        _activeJobs.erase(_id);
+    }
+
+    struct addrinfo* DNSLookup::getAddrInfo(const std::string& hostname,
                                             int port,
                                             std::string& errMsg)
     {
@@ -68,25 +49,26 @@ namespace ix
         std::string sport = std::to_string(port);
 
         struct addrinfo* res;
-        int getaddrinfo_result = getaddrinfo(hostname.c_str(), sport.c_str(), &hints, &res);
+        int getaddrinfo_result = getaddrinfo(hostname.c_str(), sport.c_str(),
+                                             &hints, &res);
         if (getaddrinfo_result)
         {
             errMsg = gai_strerror(getaddrinfo_result);
             res = nullptr;
         }
-        return AddrInfoPtr{ res, freeaddrinfo };
+        return res;
     }
 
-    DNSLookup::AddrInfoPtr DNSLookup::resolve(std::string& errMsg,
+    struct addrinfo* DNSLookup::resolve(std::string& errMsg,
                                         const CancellationRequest& isCancellationRequested,
-                                        bool cancellable)
+                                        bool blocking)
     {
-        return cancellable ? resolveCancellable(errMsg, isCancellationRequested)
+        return blocking ? resolveBlocking(errMsg, isCancellationRequested)
-                           : resolveUnCancellable(errMsg, isCancellationRequested);
+                        : resolveAsync(errMsg, isCancellationRequested);
     }
 
-    DNSLookup::AddrInfoPtr DNSLookup::resolveUnCancellable(
+    struct addrinfo* DNSLookup::resolveBlocking(std::string& errMsg,
-        std::string& errMsg, const CancellationRequest& isCancellationRequested)
+                                                const CancellationRequest& isCancellationRequested)
     {
         errMsg = "no error";
 
@@ -100,8 +82,8 @@ namespace ix
         return getAddrInfo(_hostname, _port, errMsg);
     }
 
-    DNSLookup::AddrInfoPtr DNSLookup::resolveCancellable(
+    struct addrinfo* DNSLookup::resolveAsync(std::string& errMsg,
-        std::string& errMsg, const CancellationRequest& isCancellationRequested)
+                                             const CancellationRequest& isCancellationRequested)
     {
         errMsg = "no error";
 
@@ -113,28 +95,30 @@ namespace ix
                             // if you need a second lookup.
         }
 
+        // Record job in the active Job set
+        {
+            std::unique_lock<std::mutex> lock(_activeJobsMutex);
+            _activeJobs.insert(_id);
+        }
+
         //
         // Good resource on thread forced termination
         // https://www.bo-yang.net/2017/11/19/cpp-kill-detached-thread
         //
-        auto ptr = shared_from_this();
+        _thread = std::thread(&DNSLookup::run, this, _id, _hostname, _port);
-        std::weak_ptr<DNSLookup> self(ptr);
+        _thread.detach();
 
-        int port = _port;
+        std::unique_lock<std::mutex> lock(_conditionVariableMutex);
-        std::string hostname(_hostname);
-
-        // We make the background thread doing the work a shared pointer
-        // instead of a member variable, because it can keep running when
-        // this object goes out of scope, in case of cancellation
-        auto t = std::make_shared<std::thread>(&DNSLookup::run, this, self, hostname, port);
-        t->detach();
 
         while (!_done)
         {
-            // Wait for 1 milliseconds, to see if the bg thread has terminated.
+            // Wait for 10 milliseconds on the condition variable, to see
-            // We do not use a condition variable to wait, as destroying this one
+            // if the bg thread has terminated.
-            // if the bg thread is alive can cause undefined behavior.
+            if (_condition.wait_for(lock, std::chrono::milliseconds(_wait)) == std::cv_status::no_timeout)
-            std::this_thread::sleep_for(std::chrono::milliseconds(_wait));
+            {
+                // Background thread has terminated, so we can break of this loop
+                break;
+            }
 
             // Were we cancelled ?
             if (isCancellationRequested())
@@ -151,51 +135,30 @@ namespace ix
             return nullptr;
         }
 
-        errMsg = getErrMsg();
+        return _res;
-        return getRes();
     }
 
-    void DNSLookup::run(std::weak_ptr<DNSLookup> self,
+    void DNSLookup::run(uint64_t id, const std::string& hostname, int port) // thread runner
-                        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;
-        auto res = getAddrInfo(hostname, port, errMsg);
+        struct addrinfo* res = getAddrInfo(hostname, port, errMsg);
 
-        if (auto lock = self.lock())
+        // if this isn't an active job, and the control thread is gone
+        // there is not thing to do, and we don't want to touch the defunct
+        // object data structure such as _errMsg or _condition
+        std::unique_lock<std::mutex> lock(_activeJobsMutex);
+        if (_activeJobs.count(id) == 0)
         {
-            // Copy result into the member variables
+            return;
-            setRes(res);
+        }
-            setErrMsg(errMsg);
 
+        // Copy result into the member variables
+        _res = res;
+        _errMsg = errMsg;
+        _condition.notify_one();
         _done = true;
     }
-    }
+}
-
-    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(DNSLookup::AddrInfoPtr addr)
-    {
-        std::lock_guard<std::mutex> lock(_resMutex);
-        _res = std::move(addr);
-    }
-
-    DNSLookup::AddrInfoPtr DNSLookup::getRes()
-    {
-        std::lock_guard<std::mutex> lock(_resMutex);
-        return _res;
-    }
-} // namespace ix

ixwebsocket/IXDNSLookup.h

@@ -11,57 +11,56 @@
 #pragma once
 
 #include "IXCancellationRequest.h"
-#include <atomic>
+
-#include <cstdint>
-#include <memory>
-#include <mutex>
-#include <set>
 #include <string>
+#include <thread>
+#include <atomic>
+#include <condition_variable>
+#include <set>
 
 struct addrinfo;
 
 namespace ix
 {
-    class DNSLookup : public std::enable_shared_from_this<DNSLookup>
+    class DNSLookup {
-    {
     public:
-        using AddrInfoPtr = std::shared_ptr<addrinfo>;
+        DNSLookup(const std::string& hostname,
-        DNSLookup(const std::string& hostname, int port, int64_t wait = DNSLookup::kDefaultWait);
+                  int port,
-        ~DNSLookup() = default;
+                  int64_t wait = DNSLookup::kDefaultWait);
+        ~DNSLookup();
 
-        AddrInfoPtr resolve(std::string& errMsg,
+        struct addrinfo* resolve(std::string& errMsg,
                                  const CancellationRequest& isCancellationRequested,
-                                 bool cancellable = true);
+                                 bool blocking = false);
 
     private:
-        AddrInfoPtr resolveCancellable(std::string& errMsg,
+        struct addrinfo* resolveAsync(std::string& errMsg,
                                       const CancellationRequest& isCancellationRequested);
-        AddrInfoPtr resolveUnCancellable(std::string& errMsg,
+        struct addrinfo* resolveBlocking(std::string& errMsg,
                                          const CancellationRequest& isCancellationRequested);
 
-        AddrInfoPtr getAddrInfo(const std::string& hostname,
+        static struct addrinfo* getAddrInfo(const std::string& hostname,
                                             int port,
                                             std::string& errMsg);
 
-        void run(std::weak_ptr<DNSLookup> self, std::string hostname, int port); // thread runner
+        void run(uint64_t id, const std::string& hostname, int port); // thread runner
-
-        void setErrMsg(const std::string& errMsg);
-        const std::string& getErrMsg();
-
-        void setRes(AddrInfoPtr addr);
-        AddrInfoPtr getRes();
 
         std::string _hostname;
         int _port;
         int64_t _wait;
-        const static int64_t kDefaultWait;
-
-        AddrInfoPtr _res;
-        std::mutex _resMutex;
-
         std::string _errMsg;
-        std::mutex _errMsgMutex;
+        struct addrinfo* _res;
 
         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/IXEventFd.cpp

@@ -0,0 +1,82 @@
+/*
+ *  IXEventFd.cpp
+ *  Author: Benjamin Sergeant
+ *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
+ */
+
+//
+// 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
+//
+
+#include "IXEventFd.h"
+
+#ifdef __linux__
+# include <sys/eventfd.h>
+#endif
+
+#ifndef _WIN32
+#include <unistd.h> // for write
+#endif
+
+namespace ix
+{
+    EventFd::EventFd() :
+        _eventfd(-1)
+    {
+#ifdef __linux__
+        _eventfd = eventfd(0, 0);
+#endif
+    }
+
+    EventFd::~EventFd()
+    {
+#ifdef __linux__
+        ::close(_eventfd);
+#endif
+    }
+
+    bool EventFd::notify()
+    {
+#if defined(__linux__)
+        if (_eventfd == -1) return false;
+
+        // select will wake up when a non-zero value is written to our eventfd
+        uint64_t value = 1;
+
+        // we should write 8 bytes for an uint64_t
+        return write(_eventfd, &value, sizeof(value)) == 8;
+#else
+        return true;
+#endif
+    }
+
+    bool EventFd::clear()
+    {
+#if defined(__linux__)
+        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;
+#else
+        return true;
+#endif
+    }
+
+    int EventFd::getFd()
+    {
+        return _eventfd;
+    }
+}

ixwebsocket/IXEventFd.h

@@ -0,0 +1,23 @@
+/*
+ *  IXEventFd.h
+ *  Author: Benjamin Sergeant
+ *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
+ */
+
+#pragma once
+
+namespace ix
+{
+    class EventFd {
+    public:
+        EventFd();
+        virtual ~EventFd();
+
+        bool notify();
+        bool clear();
+        int getFd();
+
+    private:
+        int _eventfd;
+    };
+}

ixwebsocket/IXExponentialBackoff.cpp

@@ -1,44 +0,0 @@
-/*
- *  IXExponentialBackoff.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2017-2019 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXExponentialBackoff.h"
-
-#include <cmath>
-
-namespace ix
-{
-    uint32_t calculateRetryWaitMilliseconds(uint32_t retryCount,
-                                            uint32_t maxWaitBetweenReconnectionRetries,
-                                            uint32_t minWaitBetweenReconnectionRetries)
-    {
-        // It's easy with a power function to go beyond 2^32, and then 
-        // have unexpected results, so prepare for that
-        const uint32_t maxRetryCountWithoutOverflow = 26;
-
-        uint32_t waitTime = 0;
-        if (retryCount < maxRetryCountWithoutOverflow)
-        {
-            waitTime = std::pow(2, retryCount) * 100;
-        }
-
-        if (waitTime < minWaitBetweenReconnectionRetries)
-        {
-            waitTime = minWaitBetweenReconnectionRetries;
-        }
-
-        if (waitTime > maxWaitBetweenReconnectionRetries)
-        {
-            waitTime = maxWaitBetweenReconnectionRetries;
-        }
-
-        if (retryCount >= maxRetryCountWithoutOverflow)
-        {
-            waitTime = maxWaitBetweenReconnectionRetries;
-        }
-
-        return waitTime;
-    }
-} // namespace ix

ixwebsocket/IXExponentialBackoff.h

@@ -1,16 +0,0 @@
-/*
- *  IXExponentialBackoff.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2017-2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include <cstdint>
-
-namespace ix
-{
-    uint32_t calculateRetryWaitMilliseconds(uint32_t retryCount,
-                                            uint32_t maxWaitBetweenReconnectionRetries,
-                                            uint32_t minWaitBetweenReconnectionRetries);
-} // namespace ix

ixwebsocket/IXGetFreePort.cpp

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

ixwebsocket/IXGetFreePort.h

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

ixwebsocket/IXGzipCodec.cpp

@@ -1,120 +0,0 @@
-/*
- *  IXGzipCodec.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2020 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXGzipCodec.h"
-
-#include "IXBench.h"
-#include <array>
-#include <string.h>
-
-#ifdef IXWEBSOCKET_USE_ZLIB
-#include <zlib.h>
-#endif
-
-namespace ix
-{
-    std::string gzipCompress(const std::string& str)
-    {
-#ifndef IXWEBSOCKET_USE_ZLIB
-        return std::string();
-#else
-        z_stream zs; // z_stream is zlib's control structure
-        memset(&zs, 0, sizeof(zs));
-
-        // deflateInit2 configure the file format: request gzip instead of deflate
-        const int windowBits = 15;
-        const int GZIP_ENCODING = 16;
-
-        deflateInit2(&zs,
-                     Z_DEFAULT_COMPRESSION,
-                     Z_DEFLATED,
-                     windowBits | GZIP_ENCODING,
-                     8,
-                     Z_DEFAULT_STRATEGY);
-
-        zs.next_in = (Bytef*) str.data();
-        zs.avail_in = (uInt) str.size(); // set the z_stream's input
-
-        int ret;
-        char outbuffer[32768];
-        std::string outstring;
-
-        // retrieve the compressed bytes blockwise
-        do
-        {
-            zs.next_out = reinterpret_cast<Bytef*>(outbuffer);
-            zs.avail_out = sizeof(outbuffer);
-
-            ret = deflate(&zs, Z_FINISH);
-
-            if (outstring.size() < zs.total_out)
-            {
-                // append the block to the output string
-                outstring.append(outbuffer, zs.total_out - outstring.size());
-            }
-        } while (ret == Z_OK);
-
-        deflateEnd(&zs);
-
-        return outstring;
-#endif // IXWEBSOCKET_USE_ZLIB
-    }
-
-#ifdef IXWEBSOCKET_USE_DEFLATE
-    static uint32_t loadDecompressedGzipSize(const uint8_t* p)
-    {
-        return ((uint32_t) p[0] << 0) | ((uint32_t) p[1] << 8) | ((uint32_t) p[2] << 16) |
-               ((uint32_t) p[3] << 24);
-    }
-#endif
-
-    bool gzipDecompress(const std::string& in, std::string& out)
-    {
-#ifndef IXWEBSOCKET_USE_ZLIB
-        return false;
-#else
-        z_stream inflateState;
-        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::array<unsigned char, kBufferSize> compressBuffer;
-
-        do
-        {
-            inflateState.avail_out = (uInt) kBufferSize;
-            inflateState.next_out = &compressBuffer.front();
-
-            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.front()),
-                       kBufferSize - inflateState.avail_out);
-        } while (inflateState.avail_out == 0);
-
-        inflateEnd(&inflateState);
-        return true;
-#endif // IXWEBSOCKET_USE_ZLIB
-    }
-} // namespace ix

ixwebsocket/IXGzipCodec.h

@@ -1,15 +0,0 @@
-/*
- *  IXGzipCodec.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2020 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include <string>
-
-namespace ix
-{
-    std::string gzipCompress(const std::string& str);
-    bool gzipDecompress(const std::string& in, std::string& out);
-} // namespace ix

ixwebsocket/IXHttp.cpp

@@ -1,217 +0,0 @@
-/*
- *  IXHttp.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXHttp.h"
-
-#include "IXCancellationRequest.h"
-#include "IXGzipCodec.h"
-#include "IXSocket.h"
-#include <sstream>
-#include <vector>
-
-namespace ix
-{
-    std::string Http::trim(const std::string& str)
-    {
-        std::string out;
-        for (auto c : str)
-        {
-            if (c != ' ' && c != '\n' && c != '\r')
-            {
-                out += c;
-            }
-        }
-
-        return out;
-    }
-
-    std::pair<std::string, int> Http::parseStatusLine(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 httpVersion;
-        if (tokens.size() >= 1)
-        {
-            httpVersion = trim(tokens[0]);
-        }
-
-        int statusCode = -1;
-        if (tokens.size() >= 2)
-        {
-            std::stringstream ss;
-            ss << trim(tokens[1]);
-            ss >> statusCode;
-        }
-
-        return std::make_pair(httpVersion, statusCode);
-    }
-
-    std::tuple<std::string, std::string, std::string> Http::parseRequestLine(
-        const std::string& line)
-    {
-        // Request-Line   = Method SP Request-URI SP HTTP-Version CRLF
-        std::string token;
-        std::stringstream tokenStream(line);
-        std::vector<std::string> tokens;
-
-        // Split by ' '
-        while (std::getline(tokenStream, token, ' '))
-        {
-            tokens.push_back(token);
-        }
-
-        std::string method;
-        if (tokens.size() >= 1)
-        {
-            method = trim(tokens[0]);
-        }
-
-        std::string requestUri;
-        if (tokens.size() >= 2)
-        {
-            requestUri = trim(tokens[1]);
-        }
-
-        std::string httpVersion;
-        if (tokens.size() >= 3)
-        {
-            httpVersion = trim(tokens[2]);
-        }
-
-        return std::make_tuple(method, requestUri, httpVersion);
-    }
-
-    std::tuple<bool, std::string, HttpRequestPtr> Http::parseRequest(
-        std::unique_ptr<Socket>& socket, int timeoutSecs)
-    {
-        HttpRequestPtr httpRequest;
-
-        std::atomic<bool> requestInitCancellation(false);
-
-        auto isCancellationRequested =
-            makeCancellationRequestWithTimeout(timeoutSecs, requestInitCancellation);
-
-        // Read first line
-        auto lineResult = socket->readLine(isCancellationRequested);
-        auto lineValid = lineResult.first;
-        auto line = lineResult.second;
-
-        if (!lineValid)
-        {
-            return std::make_tuple(false, "Error reading HTTP request line", httpRequest);
-        }
-
-        // Parse request line (GET /foo HTTP/1.1\r\n)
-        auto requestLine = Http::parseRequestLine(line);
-        auto method = std::get<0>(requestLine);
-        auto uri = std::get<1>(requestLine);
-        auto httpVersion = std::get<2>(requestLine);
-
-        // Retrieve and validate HTTP headers
-        auto result = parseHttpHeaders(socket, isCancellationRequested);
-        auto headersValid = result.first;
-        auto headers = result.second;
-
-        if (!headersValid)
-        {
-            return std::make_tuple(false, "Error parsing HTTP headers", httpRequest);
-        }
-
-        std::string body;
-        if (headers.find("Content-Length") != headers.end())
-        {
-            int contentLength = 0;
-            {
-                const char* p = headers["Content-Length"].c_str();
-                char* p_end{};
-                errno = 0;
-                long val = std::strtol(p, &p_end, 10);
-                if (p_end == p            // invalid argument
-                    || errno == ERANGE    // out of range
-                    || val < std::numeric_limits<int>::min()
-                    || val > std::numeric_limits<int>::max()) {
-                    return std::make_tuple(
-                        false, "Error parsing HTTP Header 'Content-Length'", httpRequest);
-                }
-                contentLength = val;
-            }
-            if (contentLength < 0)
-            {
-                return std::make_tuple(
-                    false, "Error: 'Content-Length' should be a positive integer", httpRequest);
-            }
-
-            auto res = socket->readBytes(contentLength, nullptr, nullptr, isCancellationRequested);
-            if (!res.first)
-            {
-                return std::make_tuple(
-                    false, std::string("Error reading request: ") + res.second, httpRequest);
-            }
-            body = res.second;
-        }
-
-        // If the content was compressed with gzip, decode it
-        if (headers["Content-Encoding"] == "gzip")
-        {
-#ifdef IXWEBSOCKET_USE_ZLIB
-            std::string decompressedPayload;
-            if (!gzipDecompress(body, decompressedPayload))
-            {
-                return std::make_tuple(
-                    false, std::string("Error during gzip decompression of the body"), httpRequest);
-            }
-            body = decompressedPayload;
-#else
-            std::string errorMsg("ixwebsocket was not compiled with gzip support on");
-            return std::make_tuple(false, errorMsg, httpRequest);
-#endif
-        }
-
-        httpRequest = std::make_shared<HttpRequest>(uri, method, httpVersion, body, headers);
-        return std::make_tuple(true, "", httpRequest);
-    }
-
-    bool Http::sendResponse(HttpResponsePtr response, std::unique_ptr<Socket>& socket)
-    {
-        // Write the response to the socket
-        std::stringstream ss;
-        ss << "HTTP/1.1 ";
-        ss << response->statusCode;
-        ss << " ";
-        ss << response->description;
-        ss << "\r\n";
-
-        if (!socket->writeBytes(ss.str(), nullptr))
-        {
-            return false;
-        }
-
-        // Write headers
-        ss.str("");
-        ss << "Content-Length: " << response->body.size() << "\r\n";
-        for (auto&& it : response->headers)
-        {
-            ss << it.first << ": " << it.second << "\r\n";
-        }
-        ss << "\r\n";
-
-        if (!socket->writeBytes(ss.str(), nullptr))
-        {
-            return false;
-        }
-
-        return response->body.empty() ? true : socket->writeBytes(response->body, nullptr);
-    }
-} // namespace ix

ixwebsocket/IXHttp.h

@@ -1,135 +0,0 @@
-/*
- *  IXHttp.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include "IXProgressCallback.h"
-#include "IXWebSocketHttpHeaders.h"
-#include <atomic>
-#include <cstdint>
-#include <tuple>
-#include <unordered_map>
-
-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,
-        Cancelled = 15,
-        Invalid = 100
-    };
-
-    struct HttpResponse
-    {
-        int statusCode;
-        std::string description;
-        HttpErrorCode errorCode;
-        WebSocketHttpHeaders headers;
-        std::string body;
-        std::string errorMsg;
-        uint64_t uploadSize;
-        uint64_t downloadSize;
-
-        HttpResponse(int s = 0,
-                     const std::string& des = std::string(),
-                     const HttpErrorCode& c = HttpErrorCode::Ok,
-                     const WebSocketHttpHeaders& h = WebSocketHttpHeaders(),
-                     const std::string& b = std::string(),
-                     const std::string& e = std::string(),
-                     uint64_t u = 0,
-                     uint64_t d = 0)
-            : statusCode(s)
-            , description(des)
-            , errorCode(c)
-            , headers(h)
-            , body(b)
-            , errorMsg(e)
-            , uploadSize(u)
-            , downloadSize(d)
-        {
-            ;
-        }
-    };
-
-    using HttpResponsePtr = std::shared_ptr<HttpResponse>;
-    using HttpParameters = std::unordered_map<std::string, std::string>;
-    using HttpFormDataParameters = std::unordered_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;
-        std::string multipartBoundary;
-        int connectTimeout = 60;
-        int transferTimeout = 1800;
-        bool followRedirects = true;
-        int maxRedirects = 5;
-        bool verbose = false;
-        bool compress = true;
-        bool compressRequest = false;
-        Logger logger;
-        OnProgressCallback onProgressCallback;
-        OnChunkCallback onChunkCallback;
-        std::atomic<bool> cancel;
-    };
-
-    using HttpRequestArgsPtr = std::shared_ptr<HttpRequestArgs>;
-
-    struct HttpRequest
-    {
-        std::string uri;
-        std::string method;
-        std::string version;
-        std::string body;
-        WebSocketHttpHeaders headers;
-
-        HttpRequest(const std::string& u,
-                    const std::string& m,
-                    const std::string& v,
-                    const std::string& b,
-                    const WebSocketHttpHeaders& h = WebSocketHttpHeaders())
-            : uri(u)
-            , method(m)
-            , version(v)
-            , body(b)
-            , headers(h)
-        {
-        }
-    };
-
-    using HttpRequestPtr = std::shared_ptr<HttpRequest>;
-
-    class Http
-    {
-    public:
-        static std::tuple<bool, std::string, HttpRequestPtr> parseRequest(
-            std::unique_ptr<Socket>& socket, int timeoutSecs);
-        static bool sendResponse(HttpResponsePtr response, std::unique_ptr<Socket>& socket);
-
-        static std::pair<std::string, int> parseStatusLine(const std::string& line);
-        static std::tuple<std::string, std::string, std::string> parseRequestLine(
-            const std::string& line);
-        static std::string trim(const std::string& str);
-    };
-} // namespace ix

ixwebsocket/IXHttpClient.cpp

@@ -1,785 +0,0 @@
-/*
- *  IXHttpClient.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXHttpClient.h"
-
-#include "IXGzipCodec.h"
-#include "IXSocketFactory.h"
-#include "IXUrlParser.h"
-#include "IXUserAgent.h"
-#include "IXWebSocketHttpHeaders.h"
-#include <assert.h>
-#include <cstdint>
-#include <cstring>
-#include <iomanip>
-#include <random>
-#include <sstream>
-#include <vector>
-
-namespace ix
-{
-    // https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods
-    const std::string HttpClient::kPost = "POST";
-    const std::string HttpClient::kGet = "GET";
-    const std::string HttpClient::kHead = "HEAD";
-    const std::string HttpClient::kDelete = "DELETE";
-    const std::string HttpClient::kPut = "PUT";
-    const std::string HttpClient::kPatch = "PATCH";
-
-    HttpClient::HttpClient(bool async)
-        : _async(async)
-        , _stop(false)
-        , _forceBody(false)
-    {
-        if (!_async) return;
-
-        _thread = std::thread(&HttpClient::run, this);
-    }
-
-    HttpClient::~HttpClient()
-    {
-        if (!_thread.joinable()) return;
-
-        _stop = true;
-        _condition.notify_one();
-        _thread.join();
-    }
-
-    void HttpClient::setTLSOptions(const SocketTLSOptions& tlsOptions)
-    {
-        _tlsOptions = tlsOptions;
-    }
-
-    void HttpClient::setForceBody(bool value)
-    {
-        _forceBody = value;
-    }
-
-    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)
-    {
-        assert(_async && "HttpClient needs its async parameter set to true "
-                         "in order to call performRequest");
-        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::recursive_mutex> lock(_mutex);
-
-        uint64_t uploadSize = 0;
-        uint64_t downloadSize = 0;
-        int code = 0;
-        WebSocketHttpHeaders headers;
-        std::string payload;
-        std::string description;
-
-        std::string protocol, host, path, query;
-        int port;
-        bool isProtocolDefaultPort;
-
-        if (!UrlParser::parse(url, protocol, host, path, query, port, isProtocolDefaultPort))
-        {
-            std::stringstream ss;
-            ss << "Cannot parse url: " << url;
-            return std::make_shared<HttpResponse>(code,
-                                                  description,
-                                                  HttpErrorCode::UrlMalformed,
-                                                  headers,
-                                                  payload,
-                                                  ss.str(),
-                                                  uploadSize,
-                                                  downloadSize);
-        }
-
-        bool tls = protocol == "https";
-        std::string errorMsg;
-        _socket = createSocket(tls, -1, errorMsg, _tlsOptions);
-
-        if (!_socket)
-        {
-            return std::make_shared<HttpResponse>(code,
-                                                  description,
-                                                  HttpErrorCode::CannotCreateSocket,
-                                                  headers,
-                                                  payload,
-                                                  errorMsg,
-                                                  uploadSize,
-                                                  downloadSize);
-        }
-
-        // Build request string
-        std::stringstream ss;
-        ss << verb << " " << path << " HTTP/1.1\r\n";
-        ss << "Host: " << host;
-        if (!isProtocolDefaultPort)
-        {
-            ss << ":" << port;
-        }
-        ss << "\r\n";
-
-#ifdef IXWEBSOCKET_USE_ZLIB
-        if (args->compress && !args->onChunkCallback)
-        {
-            ss << "Accept-Encoding: gzip"
-               << "\r\n";
-        }
-#endif
-
-        // 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 (args->extraHeaders.find("Accept") == args->extraHeaders.end())
-        {
-            ss << "Accept: */*"
-               << "\r\n";
-        }
-
-        // Set a default User agent if none is present
-        if (args->extraHeaders.find("User-Agent") == args->extraHeaders.end())
-        {
-            ss << "User-Agent: " << userAgent() << "\r\n";
-        }
-
-        // Set an origin header if missing
-        if (args->extraHeaders.find("Origin") == args->extraHeaders.end())
-        {
-            ss << "Origin: " << protocol << "://" << host << ":" << port << "\r\n";
-        }
-
-        if (verb == kPost || verb == kPut || verb == kPatch || _forceBody)
-        {
-            // Set request compression header
-#ifdef IXWEBSOCKET_USE_ZLIB
-            if (args->compressRequest)
-            {
-                ss << "Content-Encoding: gzip"
-                   << "\r\n";
-            }
-#endif
-
-            ss << "Content-Length: " << body.size() << "\r\n";
-
-            // Set default Content-Type if unspecified
-            if (args->extraHeaders.find("Content-Type") == args->extraHeaders.end())
-            {
-                if (args->multipartBoundary.empty())
-                {
-                    ss << "Content-Type: application/x-www-form-urlencoded"
-                       << "\r\n";
-                }
-                else
-                {
-                    ss << "Content-Type: multipart/form-data; boundary=" << args->multipartBoundary
-                       << "\r\n";
-                }
-            }
-            ss << "\r\n";
-            ss << body;
-        }
-        else
-        {
-            ss << "\r\n";
-        }
-
-        std::string req(ss.str());
-        std::string errMsg;
-
-        // Make a cancellation object dealing with connection timeout
-        auto cancelled = makeCancellationRequestWithTimeout(args->connectTimeout, args->cancel);
-
-        auto isCancellationRequested = [&]() {
-            return cancelled() || _stop;
-        };
-
-        bool success = _socket->connect(host, port, errMsg, isCancellationRequested);
-        if (!success)
-        {
-            auto errorCode = args->cancel ? HttpErrorCode::Cancelled : HttpErrorCode::CannotConnect;
-            std::stringstream ss;
-            ss << "Cannot connect to url: " << url << " / error : " << errMsg;
-            return std::make_shared<HttpResponse>(code,
-                                                  description,
-                                                  errorCode,
-                                                  headers,
-                                                  payload,
-                                                  ss.str(),
-                                                  uploadSize,
-                                                  downloadSize);
-        }
-
-        // Make a new cancellation object dealing with transfer timeout
-        cancelled = makeCancellationRequestWithTimeout(args->transferTimeout, args->cancel);
-
-        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))
-        {
-            auto errorCode = args->cancel ? HttpErrorCode::Cancelled : HttpErrorCode::SendError;
-            std::string errorMsg("Cannot send request");
-            return std::make_shared<HttpResponse>(code,
-                                                  description,
-                                                  errorCode,
-                                                  headers,
-                                                  payload,
-                                                  errorMsg,
-                                                  uploadSize,
-                                                  downloadSize);
-        }
-
-        uploadSize = req.size();
-
-        auto lineResult = _socket->readLine(isCancellationRequested);
-        auto lineValid = lineResult.first;
-        auto line = lineResult.second;
-
-        if (!lineValid)
-        {
-            auto errorCode = args->cancel ? HttpErrorCode::Cancelled : HttpErrorCode::CannotReadStatusLine;
-            std::string errorMsg("Cannot retrieve status line");
-            return std::make_shared<HttpResponse>(code,
-                                                  description,
-                                                  errorCode,
-                                                  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,
-                                                  description,
-                                                  HttpErrorCode::MissingStatus,
-                                                  headers,
-                                                  payload,
-                                                  errorMsg,
-                                                  uploadSize,
-                                                  downloadSize);
-        }
-
-        auto result = parseHttpHeaders(_socket, isCancellationRequested);
-        auto headersValid = result.first;
-        headers = result.second;
-
-        if (!headersValid)
-        {
-            auto errorCode = args->cancel ? HttpErrorCode::Cancelled : HttpErrorCode::HeaderParsingError;
-            std::string errorMsg("Cannot parse http headers");
-            return std::make_shared<HttpResponse>(code,
-                                                  description,
-                                                  errorCode,
-                                                  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,
-                                                      description,
-                                                      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,
-                                                      description,
-                                                      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,
-                                                  description,
-                                                  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;
-
-            auto chunkResult = _socket->readBytes(contentLength,
-                                                  args->onProgressCallback,
-                                                  args->onChunkCallback,
-                                                  isCancellationRequested);
-            if (!chunkResult.first)
-            {
-                auto errorCode = args->cancel ? HttpErrorCode::Cancelled : HttpErrorCode::ChunkReadError;
-                errorMsg = "Cannot read chunk";
-                return std::make_shared<HttpResponse>(code,
-                                                      description,
-                                                      errorCode,
-                                                      headers,
-                                                      payload,
-                                                      errorMsg,
-                                                      uploadSize,
-                                                      downloadSize);
-            }
-
-            if (!args->onChunkCallback)
-            {
-                payload.reserve(contentLength);
-                payload += chunkResult.second;
-            }
-        }
-        else if (headers.find("Transfer-Encoding") != headers.end() &&
-                 headers["Transfer-Encoding"] == "chunked")
-        {
-            std::stringstream ss;
-
-            while (true)
-            {
-                auto errorCode = args->cancel ? HttpErrorCode::Cancelled : HttpErrorCode::ChunkReadError;
-                lineResult = _socket->readLine(isCancellationRequested);
-                line = lineResult.second;
-
-                if (!lineResult.first)
-                {
-                    return std::make_shared<HttpResponse>(code,
-                                                          description,
-                                                          errorCode,
-                                                          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);
-                }
-
-                // Read a chunk
-                auto chunkResult = _socket->readBytes((size_t) chunkSize,
-                                                      args->onProgressCallback,
-                                                      args->onChunkCallback,
-                                                      isCancellationRequested);
-                if (!chunkResult.first)
-                {
-                    auto errorCode = args->cancel ? HttpErrorCode::Cancelled : HttpErrorCode::ChunkReadError;
-                    errorMsg = "Cannot read chunk";
-                    return std::make_shared<HttpResponse>(code,
-                                                          description,
-                                                          errorCode,
-                                                          headers,
-                                                          payload,
-                                                          errorMsg,
-                                                          uploadSize,
-                                                          downloadSize);
-                }
-
-                if (!args->onChunkCallback)
-                {
-                    payload.reserve(payload.size() + (size_t) chunkSize);
-                    payload += chunkResult.second;
-                }
-
-                // Read the line that terminates the chunk (\r\n)
-                lineResult = _socket->readLine(isCancellationRequested);
-
-                if (!lineResult.first)
-                {
-                    auto errorCode = args->cancel ? HttpErrorCode::Cancelled : HttpErrorCode::ChunkReadError;
-                    return std::make_shared<HttpResponse>(code,
-                                                          description,
-                                                          errorCode,
-                                                          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,
-                                                  description,
-                                                  HttpErrorCode::CannotReadBody,
-                                                  headers,
-                                                  payload,
-                                                  errorMsg,
-                                                  uploadSize,
-                                                  downloadSize);
-        }
-
-        downloadSize = payload.size();
-
-        // If the content was compressed with gzip, decode it
-        if (headers["Content-Encoding"] == "gzip")
-        {
-#ifdef IXWEBSOCKET_USE_ZLIB
-            std::string decompressedPayload;
-            if (!gzipDecompress(payload, decompressedPayload))
-            {
-                std::string errorMsg("Error decompressing payload");
-                return std::make_shared<HttpResponse>(code,
-                                                      description,
-                                                      HttpErrorCode::Gzip,
-                                                      headers,
-                                                      payload,
-                                                      errorMsg,
-                                                      uploadSize,
-                                                      downloadSize);
-            }
-            payload = decompressedPayload;
-#else
-            std::string errorMsg("ixwebsocket was not compiled with gzip support on");
-            return std::make_shared<HttpResponse>(code,
-                                                  description,
-                                                  HttpErrorCode::Gzip,
-                                                  headers,
-                                                  payload,
-                                                  errorMsg,
-                                                  uploadSize,
-                                                  downloadSize);
-#endif
-        }
-
-        return std::make_shared<HttpResponse>(code,
-                                              description,
-                                              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::Delete(const std::string& url, HttpRequestArgsPtr args)
-    {
-        return request(url, kDelete, std::string(), args);
-    }
-
-    HttpResponsePtr HttpClient::request(const std::string& url,
-                                        const std::string& verb,
-                                        const HttpParameters& httpParameters,
-                                        const HttpFormDataParameters& httpFormDataParameters,
-                                        HttpRequestArgsPtr args)
-    {
-        std::string body;
-
-        if (httpFormDataParameters.empty())
-        {
-            body = serializeHttpParameters(httpParameters);
-        }
-        else
-        {
-            std::string multipartBoundary = generateMultipartBoundary();
-            args->multipartBoundary = multipartBoundary;
-            body = serializeHttpFormDataParameters(
-                multipartBoundary, httpFormDataParameters, httpParameters);
-        }
-
-#ifdef IXWEBSOCKET_USE_ZLIB
-        if (args->compressRequest)
-        {
-            body = gzipCompress(body);
-        }
-#endif
-
-        return request(url, verb, body, args);
-    }
-
-    HttpResponsePtr HttpClient::post(const std::string& url,
-                                     const HttpParameters& httpParameters,
-                                     const HttpFormDataParameters& httpFormDataParameters,
-                                     HttpRequestArgsPtr args)
-    {
-        return request(url, kPost, httpParameters, httpFormDataParameters, 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,
-                                    const HttpFormDataParameters& httpFormDataParameters,
-                                    HttpRequestArgsPtr args)
-    {
-        return request(url, kPut, httpParameters, httpFormDataParameters, args);
-    }
-
-    HttpResponsePtr HttpClient::put(const std::string& url,
-                                    const std::string& body,
-                                    const HttpRequestArgsPtr args)
-    {
-        return request(url, kPut, body, args);
-    }
-
-    HttpResponsePtr HttpClient::patch(const std::string& url,
-                                      const HttpParameters& httpParameters,
-                                      const HttpFormDataParameters& httpFormDataParameters,
-                                      HttpRequestArgsPtr args)
-    {
-        return request(url, kPatch, httpParameters, httpFormDataParameters, args);
-    }
-
-    HttpResponsePtr HttpClient::patch(const std::string& url,
-                                      const std::string& body,
-                                      const HttpRequestArgsPtr args)
-    {
-        return request(url, kPatch, 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();
-    }
-
-    std::string HttpClient::serializeHttpFormDataParameters(
-        const std::string& multipartBoundary,
-        const HttpFormDataParameters& httpFormDataParameters,
-        const HttpParameters& httpParameters)
-    {
-        //
-        // --AaB03x
-        // Content-Disposition: form-data; name="submit-name"
-
-        // Larry
-        // --AaB03x
-        // Content-Disposition: form-data; name="foo.txt"; filename="file1.txt"
-        // Content-Type: text/plain
-
-        // ... contents of file1.txt ...
-        // --AaB03x--
-        //
-        std::stringstream ss;
-
-        for (auto&& it : httpFormDataParameters)
-        {
-            ss << "--" << multipartBoundary << "\r\n"
-               << "Content-Disposition:"
-               << " form-data; name=\"" << it.first << "\";"
-               << " filename=\"" << it.first << "\""
-               << "\r\n"
-               << "Content-Type: application/octet-stream"
-               << "\r\n"
-               << "\r\n"
-               << it.second << "\r\n";
-        }
-
-        for (auto&& it : httpParameters)
-        {
-            ss << "--" << multipartBoundary << "\r\n"
-               << "Content-Disposition:"
-               << " form-data; name=\"" << it.first << "\";"
-               << "\r\n"
-               << "\r\n"
-               << it.second << "\r\n";
-        }
-
-        ss << "--" << multipartBoundary << "--\r\n";
-
-        return ss.str();
-    }
-
-    void HttpClient::log(const std::string& msg, HttpRequestArgsPtr args)
-    {
-        if (args->logger)
-        {
-            args->logger(msg);
-        }
-    }
-
-    std::string HttpClient::generateMultipartBoundary()
-    {
-        std::string str("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz");
-
-        static std::random_device rd;
-        static std::mt19937 generator(rd());
-
-        std::shuffle(str.begin(), str.end(), generator);
-
-        return str;
-    }
-} // namespace ix

ixwebsocket/IXHttpClient.h

@@ -1,123 +0,0 @@
-/*
- *  IXHttpClient.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include "IXHttp.h"
-#include "IXSocket.h"
-#include "IXSocketTLSOptions.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
-{
-    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 Delete(const std::string& url, HttpRequestArgsPtr args);
-
-        HttpResponsePtr post(const std::string& url,
-                             const HttpParameters& httpParameters,
-                             const HttpFormDataParameters& httpFormDataParameters,
-                             HttpRequestArgsPtr args);
-        HttpResponsePtr post(const std::string& url,
-                             const std::string& body,
-                             HttpRequestArgsPtr args);
-
-        HttpResponsePtr put(const std::string& url,
-                            const HttpParameters& httpParameters,
-                            const HttpFormDataParameters& httpFormDataParameters,
-                            HttpRequestArgsPtr args);
-        HttpResponsePtr put(const std::string& url,
-                            const std::string& body,
-                            HttpRequestArgsPtr args);
-
-        HttpResponsePtr patch(const std::string& url,
-                              const HttpParameters& httpParameters,
-                              const HttpFormDataParameters& httpFormDataParameters,
-                              HttpRequestArgsPtr args);
-        HttpResponsePtr patch(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);
-
-        HttpResponsePtr request(const std::string& url,
-                                const std::string& verb,
-                                const HttpParameters& httpParameters,
-                                const HttpFormDataParameters& httpFormDataParameters,
-                                HttpRequestArgsPtr args);
-
-        void setForceBody(bool value);
-
-        // Async API
-        HttpRequestArgsPtr createRequest(const std::string& url = std::string(),
-                                         const std::string& verb = HttpClient::kGet);
-
-        bool performRequest(HttpRequestArgsPtr request,
-                            const OnResponseCallback& onResponseCallback);
-
-        // TLS
-        void setTLSOptions(const SocketTLSOptions& tlsOptions);
-
-        std::string serializeHttpParameters(const HttpParameters& httpParameters);
-
-        std::string serializeHttpFormDataParameters(
-            const std::string& multipartBoundary,
-            const HttpFormDataParameters& httpFormDataParameters,
-            const HttpParameters& httpParameters = HttpParameters());
-
-        std::string generateMultipartBoundary();
-
-        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 kDelete;
-        const static std::string kPut;
-        const static std::string kPatch;
-
-    private:
-        void log(const std::string& msg, HttpRequestArgsPtr args);
-
-        // 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::unique_ptr<Socket> _socket;
-        std::recursive_mutex _mutex; // to protect accessing the _socket (only one socket per
-                                     // client) the mutex needs to be recursive as this function
-                                     // might be called recursively to follow HTTP redirections
-
-        SocketTLSOptions _tlsOptions;
-
-        bool _forceBody;
-    };
-} // namespace ix

ixwebsocket/IXHttpServer.cpp

@@ -1,244 +0,0 @@
-/*
- *  IXHttpServer.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXHttpServer.h"
-
-#include "IXGzipCodec.h"
-#include "IXNetSystem.h"
-#include "IXSocketConnect.h"
-#include "IXUserAgent.h"
-#include <cstdint>
-#include <cstring>
-#include <fstream>
-#include <sstream>
-#include <vector>
-
-namespace
-{
-    std::pair<bool, std::vector<uint8_t>> load(const std::string& path)
-    {
-        std::vector<uint8_t> memblock;
-
-        std::ifstream file(path);
-        if (!file.is_open()) return std::make_pair(false, memblock);
-
-        file.seekg(0, file.end);
-        std::streamoff size = file.tellg();
-        file.seekg(0, file.beg);
-
-        memblock.resize((size_t) size);
-        file.read((char*) &memblock.front(), static_cast<std::streamsize>(size));
-
-        return std::make_pair(true, memblock);
-    }
-
-    std::pair<bool, std::string> readAsString(const std::string& path)
-    {
-        auto res = load(path);
-        auto vec = res.second;
-        return std::make_pair(res.first, std::string(vec.begin(), vec.end()));
-    }
-
-    std::string response_head_file(const std::string& file_name){
-
-        if (std::string::npos != file_name.find(".html") || std::string::npos != file_name.find(".htm"))
-            return "text/html";
-        else if (std::string::npos != file_name.find(".css"))
-            return "text/css";
-        else if (std::string::npos != file_name.find(".js") || std::string::npos != file_name.find(".mjs"))
-            return "application/x-javascript";
-        else if (std::string::npos != file_name.find(".ico"))
-            return "image/x-icon";
-        else if (std::string::npos != file_name.find(".png"))
-            return "image/png";
-        else if (std::string::npos != file_name.find(".jpg") || std::string::npos != file_name.find(".jpeg"))
-            return "image/jpeg";
-        else if (std::string::npos != file_name.find(".gif"))
-            return "image/gif";
-        else if (std::string::npos != file_name.find(".svg"))
-            return "image/svg+xml";
-        else
-            return "application/octet-stream";
-    }
-
-} // namespace
-
-namespace ix
-{
-    const int HttpServer::kDefaultTimeoutSecs(30);
-
-    HttpServer::HttpServer(int port,
-                           const std::string& host,
-                           int backlog,
-                           size_t maxConnections,
-                           int addressFamily,
-                           int timeoutSecs,
-                           int handshakeTimeoutSecs)
-        : WebSocketServer(port, host, backlog, maxConnections, handshakeTimeoutSecs, addressFamily)
-        , _timeoutSecs(timeoutSecs)
-    {
-        setDefaultConnectionCallback();
-    }
-
-    void HttpServer::setOnConnectionCallback(const OnConnectionCallback& callback)
-    {
-        _onConnectionCallback = callback;
-    }
-
-    void HttpServer::handleConnection(std::unique_ptr<Socket> socket,
-                                      std::shared_ptr<ConnectionState> connectionState)
-    {
-        auto ret = Http::parseRequest(socket, _timeoutSecs);
-        // FIXME: handle errors in parseRequest
-
-        if (std::get<0>(ret))
-        {
-            auto request = std::get<2>(ret);
-            std::shared_ptr<ix::HttpResponse> response;
-            if (request->headers["Upgrade"] == "websocket")
-            {
-                WebSocketServer::handleUpgrade(std::move(socket), connectionState, request);
-            }
-            else
-            {
-                auto response = _onConnectionCallback(request, connectionState);
-                if (!Http::sendResponse(response, socket))
-                {
-                    logError("Cannot send response");
-                }
-            }
-        }
-        connectionState->setTerminated();
-    }
-
-    void HttpServer::setDefaultConnectionCallback()
-    {
-        setOnConnectionCallback(
-            [this](HttpRequestPtr request,
-                   std::shared_ptr<ConnectionState> connectionState) -> HttpResponsePtr
-            {
-                std::string uri(request->uri);
-                if (uri.empty() || uri == "/")
-                {
-                    uri = "/index.html";
-                }
-
-                WebSocketHttpHeaders headers;
-                headers["Server"] = userAgent();
-                headers["Content-Type"] = response_head_file(uri);
-
-                std::string path("." + uri);
-                auto res = readAsString(path);
-                bool found = res.first;
-                if (!found)
-                {
-                    return std::make_shared<HttpResponse>(
-                        404, "Not Found", HttpErrorCode::Ok, WebSocketHttpHeaders(), std::string());
-                }
-
-                std::string content = res.second;
-
-#ifdef IXWEBSOCKET_USE_ZLIB
-                std::string acceptEncoding = request->headers["Accept-encoding"];
-                if (acceptEncoding == "*" || acceptEncoding.find("gzip") != std::string::npos)
-                {
-                    content = gzipCompress(content);
-                    headers["Content-Encoding"] = "gzip";
-                }
-                headers["Accept-Encoding"] = "gzip";
-#endif
-
-                // Log request
-                std::stringstream ss;
-                ss << connectionState->getRemoteIp() << ":" << connectionState->getRemotePort()
-                   << " " << request->method << " " << request->headers["User-Agent"] << " "
-                   << request->uri << " " << content.size();
-                logInfo(ss.str());
-
-                // FIXME: check extensions to set the content type
-                // headers["Content-Type"] = "application/octet-stream";
-                headers["Accept-Ranges"] = "none";
-
-                return std::make_shared<HttpResponse>(
-                    200, "OK", HttpErrorCode::Ok, headers, content);
-            });
-    }
-
-    void HttpServer::makeRedirectServer(const std::string& redirectUrl)
-    {
-        //
-        // See https://developer.mozilla.org/en-US/docs/Web/HTTP/Redirections
-        //
-        setOnConnectionCallback(
-            [this, redirectUrl](HttpRequestPtr request,
-                                std::shared_ptr<ConnectionState> connectionState) -> HttpResponsePtr
-            {
-                WebSocketHttpHeaders headers;
-                headers["Server"] = userAgent();
-
-                // Log request
-                std::stringstream ss;
-                ss << connectionState->getRemoteIp() << ":" << connectionState->getRemotePort()
-                   << " " << request->method << " " << request->headers["User-Agent"] << " "
-                   << request->uri;
-                logInfo(ss.str());
-
-                if (request->method == "POST")
-                {
-                    return std::make_shared<HttpResponse>(
-                        200, "OK", HttpErrorCode::Ok, headers, std::string());
-                }
-
-                headers["Location"] = redirectUrl;
-
-                return std::make_shared<HttpResponse>(
-                    301, "OK", HttpErrorCode::Ok, headers, std::string());
-            });
-    }
-
-    //
-    // Display the client parameter and body on the console
-    //
-    void HttpServer::makeDebugServer()
-    {
-        setOnConnectionCallback(
-            [this](HttpRequestPtr request,
-                   std::shared_ptr<ConnectionState> connectionState) -> HttpResponsePtr
-            {
-                WebSocketHttpHeaders headers;
-                headers["Server"] = userAgent();
-
-                // Log request
-                std::stringstream ss;
-                ss << connectionState->getRemoteIp() << ":" << connectionState->getRemotePort()
-                   << " " << request->method << " " << request->headers["User-Agent"] << " "
-                   << request->uri;
-                logInfo(ss.str());
-
-                logInfo("== Headers == ");
-                for (auto&& it : request->headers)
-                {
-                    std::ostringstream oss;
-                    oss << it.first << ": " << it.second;
-                    logInfo(oss.str());
-                }
-                logInfo("");
-
-                logInfo("== Body == ");
-                logInfo(request->body);
-                logInfo("");
-
-                return std::make_shared<HttpResponse>(
-                    200, "OK", HttpErrorCode::Ok, headers, std::string("OK"));
-            });
-    }
-
-    int HttpServer::getTimeoutSecs()
-    {
-        return _timeoutSecs;
-    }
-
-} // namespace ix

ixwebsocket/IXHttpServer.h

@@ -1,57 +0,0 @@
-/*
- *  IXHttpServer.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2018 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include "IXHttp.h"
-#include "IXWebSocket.h"
-#include "IXWebSocketServer.h"
-#include <functional>
-#include <memory>
-#include <mutex>
-#include <set>
-#include <string>
-#include <thread>
-#include <utility> // pair
-
-namespace ix
-{
-    class HttpServer final : public WebSocketServer
-    {
-    public:
-        using OnConnectionCallback =
-            std::function<HttpResponsePtr(HttpRequestPtr, std::shared_ptr<ConnectionState>)>;
-
-        HttpServer(int port = SocketServer::kDefaultPort,
-                   const std::string& host = SocketServer::kDefaultHost,
-                   int backlog = SocketServer::kDefaultTcpBacklog,
-                   size_t maxConnections = SocketServer::kDefaultMaxConnections,
-                   int addressFamily = SocketServer::kDefaultAddressFamily,
-                   int timeoutSecs = HttpServer::kDefaultTimeoutSecs,
-                   int handshakeTimeoutSecs = WebSocketServer::kDefaultHandShakeTimeoutSecs);
-
-        void setOnConnectionCallback(const OnConnectionCallback& callback);
-
-        void makeRedirectServer(const std::string& redirectUrl);
-
-        void makeDebugServer();
-
-        int getTimeoutSecs();
-
-    private:
-        // Member variables
-        OnConnectionCallback _onConnectionCallback;
-
-        const static int kDefaultTimeoutSecs;
-        int _timeoutSecs;
-
-        // Methods
-        virtual void handleConnection(std::unique_ptr<Socket>,
-                                      std::shared_ptr<ConnectionState> connectionState) final;
-
-        void setDefaultConnectionCallback();
-    };
-} // namespace ix

ixwebsocket/IXNetSystem.cpp

@@ -1,461 +0,0 @@
-/*
- *  IXNetSystem.cpp
- *  Author: Korchynskyi Dmytro
- *  Copyright (c) 2019 Machine Zone. All rights reserved.
- */
-
-#include "IXNetSystem.h"
-#include <cstdint>
-#include <cstdio>
-#ifdef _WIN32
-#ifndef EAFNOSUPPORT
-  #define EAFNOSUPPORT 102
-#endif
-#ifndef ENOSPC
-  #define ENOSPC 28
-#endif
-#include <vector>
-#endif
-
-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
-    }
-
-#ifdef _WIN32
-    struct WSAEvent
-    {
-    public:
-        WSAEvent(struct pollfd* fd)
-            : _fd(fd)
-        {
-            _event = WSACreateEvent();
-        }
-
-        WSAEvent(WSAEvent&& source) noexcept
-        {
-            _event = source._event;
-            source._event = WSA_INVALID_EVENT; // invalidate the event in the source
-            _fd = source._fd;
-        }
-
-        ~WSAEvent()
-        {
-            if (_event != WSA_INVALID_EVENT)
-            {
-                // We must deselect the networkevents from the socket event. Otherwise the
-                // socket will report states that aren't there.
-                if (_fd != nullptr && (int)_fd->fd != -1)
-                    WSAEventSelect(_fd->fd, _event, 0);
-                WSACloseEvent(_event);
-            }
-        }
-
-        operator HANDLE()
-        {
-            return _event;
-        }
-
-        operator struct pollfd*()
-        {
-            return _fd;
-        }
-
-    private:
-        HANDLE _event;
-        struct pollfd* _fd;
-    };
-#endif
-
-    //
-    // That function could 'return WSAPoll(pfd, nfds, timeout);'
-    // but WSAPoll is said to have weird behaviors on the internet
-    // (the curl folks have had problems with it).
-    //
-    // So we make it a select wrapper
-    //
-    // UPDATE: WSAPoll was fixed in Windows 10 Version 2004
-    //
-    // The optional "event" is set to nullptr if it wasn't signaled.
-    int poll(struct pollfd* fds, nfds_t nfds, int timeout, void** event)
-    {
-#ifdef _WIN32
-
-        if (event && *event)
-        {
-            HANDLE interruptEvent = reinterpret_cast<HANDLE>(*event);
-            *event = nullptr; // the event wasn't signaled yet
-
-            if (nfds < 0 || nfds >= MAXIMUM_WAIT_OBJECTS - 1)
-            {
-                WSASetLastError(WSAEINVAL);
-                return SOCKET_ERROR;
-            }
-
-            std::vector<WSAEvent> socketEvents;
-            std::vector<HANDLE> handles;
-            // put the interrupt event as first element, making it highest priority
-            handles.push_back(interruptEvent);
-
-            // create the WSAEvents for the sockets
-            for (nfds_t i = 0; i < nfds; ++i)
-            {
-                struct pollfd* fd = &fds[i];
-                fd->revents = 0;
-                if (fd->fd >= 0)
-                {
-                    // create WSAEvent and add it to the vectors
-                    socketEvents.push_back(std::move(WSAEvent(fd)));
-                    HANDLE handle = socketEvents.back();
-                    if (handle == WSA_INVALID_EVENT)
-                    {
-                        WSASetLastError(WSAENOBUFS);
-                        return SOCKET_ERROR;
-                    }
-                    handles.push_back(handle);
-
-                    // mapping
-                    long networkEvents = 0;
-                    if (fd->events & (POLLIN                               )) networkEvents |= FD_READ  | FD_ACCEPT;
-                    if (fd->events & (POLLOUT /*| POLLWRNORM | POLLWRBAND*/)) networkEvents |= FD_WRITE | FD_CONNECT;
-                    //if (fd->events & (POLLPRI | POLLRDBAND               )) networkEvents |= FD_OOB;
-
-                    if (WSAEventSelect(fd->fd, handle, networkEvents) != 0)
-                    {
-                        fd->revents = POLLNVAL;
-                        socketEvents.pop_back();
-                        handles.pop_back();
-                    }
-                }
-            }
-
-            DWORD n = WSAWaitForMultipleEvents(handles.size(), handles.data(), FALSE, timeout != -1 ? static_cast<DWORD>(timeout) : WSA_INFINITE, FALSE);
-
-            if (n == WSA_WAIT_FAILED) return SOCKET_ERROR;
-            if (n == WSA_WAIT_TIMEOUT) return 0;
-            if (n == WSA_WAIT_EVENT_0)
-            {
-                // the interrupt event was signaled
-                *event = reinterpret_cast<void*>(interruptEvent);
-                return 1;
-            }
-
-            int handleIndex = n - WSA_WAIT_EVENT_0;
-            int socketIndex = handleIndex - 1;
-
-            WSANETWORKEVENTS netEvents;
-            int count = 0;
-            // WSAWaitForMultipleEvents returns the index of the first signaled event. And to emulate WSAPoll()
-            // all the signaled events must be processed.
-            while (socketIndex < (int)socketEvents.size())
-            {
-                struct pollfd* fd = socketEvents[socketIndex];
-
-                memset(&netEvents, 0, sizeof(netEvents));
-                if (WSAEnumNetworkEvents(fd->fd, socketEvents[socketIndex], &netEvents) != 0)
-                {
-                    fd->revents = POLLERR;
-                }
-                else if (netEvents.lNetworkEvents != 0)
-                {
-                    // mapping
-                    if (netEvents.lNetworkEvents & (FD_READ  | FD_ACCEPT | FD_OOB)) fd->revents |= POLLIN;
-                    if (netEvents.lNetworkEvents & (FD_WRITE | FD_CONNECT        )) fd->revents |= POLLOUT;
-
-                    for (int i = 0; i < FD_MAX_EVENTS; ++i)
-                    {
-                        if (netEvents.iErrorCode[i] != 0)
-                        {
-                            fd->revents |= POLLERR;
-                            break;
-                        }
-                    }
-
-                    if (fd->revents != 0)
-                    {
-                        // only signaled sockets count
-                        count++;
-                    }
-                }
-                socketIndex++;
-            }
-
-            return count;
-        }
-        else
-        {
-            if (event && *event) *event = nullptr;
-
-            socket_t maxfd = 0;
-            fd_set readfds, writefds, errorfds;
-            FD_ZERO(&readfds);
-            FD_ZERO(&writefds);
-            FD_ZERO(&errorfds);
-
-            for (nfds_t i = 0; i < nfds; ++i)
-            {
-                struct pollfd* fd = &fds[i];
-
-                if (fd->fd > maxfd)
-                {
-                    maxfd = fd->fd;
-                }
-                if ((fd->events & POLLIN))
-                {
-                    FD_SET(fd->fd, &readfds);
-                }
-                if ((fd->events & POLLOUT))
-                {
-                    FD_SET(fd->fd, &writefds);
-                }
-                if ((fd->events & POLLERR))
-                {
-                    FD_SET(fd->fd, &errorfds);
-                }
-            }
-
-            struct timeval tv;
-            tv.tv_sec = timeout / 1000;
-            tv.tv_usec = (timeout % 1000) * 1000;
-
-            int ret = select(maxfd + 1, &readfds, &writefds, &errorfds, timeout != -1 ? &tv : NULL);
-
-            if (ret < 0)
-            {
-                return ret;
-            }
-
-            for (nfds_t i = 0; i < nfds; ++i)
-            {
-                struct pollfd* fd = &fds[i];
-                fd->revents = 0;
-
-                if (FD_ISSET(fd->fd, &readfds))
-                {
-                    fd->revents |= POLLIN;
-                }
-                if (FD_ISSET(fd->fd, &writefds))
-                {
-                    fd->revents |= POLLOUT;
-                }
-                if (FD_ISSET(fd->fd, &errorfds))
-                {
-                    fd->revents |= POLLERR;
-                }
-            }
-            return ret;
-        }
-#else
-        if (event && *event) *event = nullptr;
-
-        //
-        // It was reported that on Android poll can fail and return -1 with
-        // errno == EINTR, which should be a temp error and should typically
-        // be handled by retrying in a loop.
-        // Maybe we need to put all syscall / C functions in
-        // a new IXSysCalls.cpp and wrap them all.
-        //
-        // The style from libuv is as such.
-        //
-        int ret = -1;
-        do
-        {
-            ret = ::poll(fds, nfds, timeout);
-        } while (ret == -1 && errno == EINTR);
-
-        return ret;
-#endif
-    }
-
-    //
-    // mingw does not have inet_ntop, which were taken as is from the musl C library.
-    //
-    const char* inet_ntop(int af, const void* a0, char* s, socklen_t l)
-    {
-#if defined(_WIN32) && defined(__GNUC__)
-        const unsigned char* a = (const unsigned char*) a0;
-        int i, j, max, best;
-        char buf[100];
-
-        switch (af)
-        {
-            case AF_INET:
-                if (snprintf(s, l, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]) < l) return s;
-                break;
-            case AF_INET6:
-                if (memcmp(a, "\0\0\0\0\0\0\0\0\0\0\377\377", 12))
-                    snprintf(buf,
-                             sizeof buf,
-                             "%x:%x:%x:%x:%x:%x:%x:%x",
-                             256 * a[0] + a[1],
-                             256 * a[2] + a[3],
-                             256 * a[4] + a[5],
-                             256 * a[6] + a[7],
-                             256 * a[8] + a[9],
-                             256 * a[10] + a[11],
-                             256 * a[12] + a[13],
-                             256 * a[14] + a[15]);
-                else
-                    snprintf(buf,
-                             sizeof buf,
-                             "%x:%x:%x:%x:%x:%x:%d.%d.%d.%d",
-                             256 * a[0] + a[1],
-                             256 * a[2] + a[3],
-                             256 * a[4] + a[5],
-                             256 * a[6] + a[7],
-                             256 * a[8] + a[9],
-                             256 * a[10] + a[11],
-                             a[12],
-                             a[13],
-                             a[14],
-                             a[15]);
-                /* Replace longest /(^0|:)[:0]{2,}/ with "::" */
-                for (i = best = 0, max = 2; buf[i]; i++)
-                {
-                    if (i && buf[i] != ':') continue;
-                    j = strspn(buf + i, ":0");
-                    if (j > max) best = i, max = j;
-                }
-                if (max > 3)
-                {
-                    buf[best] = buf[best + 1] = ':';
-                    memmove(buf + best + 2, buf + best + max, i - best - max + 1);
-                }
-                if (strlen(buf) < (size_t)l)
-                {
-                    strcpy(s, buf);
-                    return s;
-                }
-                break;
-            default: errno = EAFNOSUPPORT; return 0;
-        }
-        errno = ENOSPC;
-        return 0;
-#else
-        return ::inet_ntop(af, a0, s, l);
-#endif
-    }
-
-#if defined(_WIN32) && defined(__GNUC__)
-    static int hexval(unsigned c)
-    {
-        if (c - '0' < 10) return c - '0';
-        c |= 32;
-        if (c - 'a' < 6) return c - 'a' + 10;
-        return -1;
-    }
-#endif
-
-    //
-    // mingw does not have inet_pton, which were taken as is from the musl C library.
-    //
-    int inet_pton(int af, const char* s, void* a0)
-    {
-#if defined(_WIN32) && defined(__GNUC__)
-        uint16_t ip[8];
-        unsigned char* a = (unsigned char*) a0;
-        int i, j, v, d, brk = -1, need_v4 = 0;
-
-        if (af == AF_INET)
-        {
-            for (i = 0; i < 4; i++)
-            {
-                for (v = j = 0; j < 3 && isdigit(s[j]); j++)
-                    v = 10 * v + s[j] - '0';
-                if (j == 0 || (j > 1 && s[0] == '0') || v > 255) return 0;
-                a[i] = v;
-                if (s[j] == 0 && i == 3) return 1;
-                if (s[j] != '.') return 0;
-                s += j + 1;
-            }
-            return 0;
-        }
-        else if (af != AF_INET6)
-        {
-            errno = EAFNOSUPPORT;
-            return -1;
-        }
-
-        if (*s == ':' && *++s != ':') return 0;
-
-        for (i = 0;; i++)
-        {
-            if (s[0] == ':' && brk < 0)
-            {
-                brk = i;
-                ip[i & 7] = 0;
-                if (!*++s) break;
-                if (i == 7) return 0;
-                continue;
-            }
-            for (v = j = 0; j < 4 && (d = hexval(s[j])) >= 0; j++)
-                v = 16 * v + d;
-            if (j == 0) return 0;
-            ip[i & 7] = v;
-            if (!s[j] && (brk >= 0 || i == 7)) break;
-            if (i == 7) return 0;
-            if (s[j] != ':')
-            {
-                if (s[j] != '.' || (i < 6 && brk < 0)) return 0;
-                need_v4 = 1;
-                i++;
-                break;
-            }
-            s += j + 1;
-        }
-        if (brk >= 0)
-        {
-            memmove(ip + brk + 7 - i, ip + brk, 2 * (i + 1 - brk));
-            for (j = 0; j < 7 - i; j++)
-                ip[brk + j] = 0;
-        }
-        for (j = 0; j < 8; j++)
-        {
-            *a++ = ip[j] >> 8;
-            *a++ = ip[j];
-        }
-        if (need_v4 && inet_pton(AF_INET, (const char*) s, a - 4) <= 0) return 0;
-        return 1;
-#else
-        return ::inet_pton(af, s, a0);
-#endif
-    }
-
-    // Convert network bytes to host bytes. Copied from the ASIO library
-    unsigned short network_to_host_short(unsigned short value)
-    {
-        #if defined(_WIN32)
-          unsigned char* value_p = reinterpret_cast<unsigned char*>(&value);
-          unsigned short result = (static_cast<unsigned short>(value_p[0]) << 8)
-            | static_cast<unsigned short>(value_p[1]);
-          return result;
-        #else // defined(_WIN32)
-          return ntohs(value);
-        #endif // defined(_WIN32)
-    }
-
-} // namespace ix

ixwebsocket/IXNetSystem.h

@@ -6,88 +6,20 @@
 
 #pragma once
 
-#include <cstdint>
-
-#ifdef __FreeBSD__
-#include <sys/types.h>
-#endif
-
 #ifdef _WIN32
-
+# include <WS2tcpip.h>
-#ifndef WIN32_LEAN_AND_MEAN
+# include <WinSock2.h>
-#define WIN32_LEAN_AND_MEAN
+# include <basetsd.h>
-#endif
+# include <io.h>
-
+# include <ws2def.h>
-#include <ws2tcpip.h>
-#include <winsock2.h>
-#include <basetsd.h>
-#include <io.h>
-#include <ws2def.h>
-#include <cerrno>
-
-#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
-
-// Define our own poll on Windows, as a wrapper on top of select
-typedef unsigned long int nfds_t;
-
-// pollfd is not defined by some versions of mingw64 since _WIN32_WINNT is too low
-#if _WIN32_WINNT < 0x0600
-struct pollfd
-{
-    int fd;        /* file descriptor */
-    short events;  /* requested events */
-    short revents; /* returned events */
-};
-
-#define POLLIN 0x001   /* There is data to read.  */
-#define POLLOUT 0x004  /* Writing now will not block.  */
-#define POLLERR 0x008  /* Error condition.  */
-#define POLLHUP 0x010  /* Hung up.  */
-#define POLLNVAL 0x020 /* Invalid polling request.  */
-#endif
-
 #else
-#include <arpa/inet.h>
+# include <arpa/inet.h>
-#include <errno.h>
+# include <errno.h>
-#include <fcntl.h>
+# include <netdb.h>
-#include <netdb.h>
+# include <netinet/tcp.h>
-#include <netinet/in.h>
+# include <sys/select.h>
-#include <netinet/ip.h>
+# include <sys/socket.h>
-#include <netinet/tcp.h>
+# include <sys/stat.h>
-#include <poll.h>
+# include <sys/time.h>
-#include <sys/select.h>
+# include <unistd.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <unistd.h>
 #endif
-
-namespace ix
-{
-#ifdef _WIN32
-    typedef SOCKET socket_t;
-#else
-    typedef int socket_t;
-#endif
-
-    bool initNetSystem();
-    bool uninitNetSystem();
-
-    int poll(struct pollfd* fds, nfds_t nfds, int timeout, void** event);
-
-    const char* inet_ntop(int af, const void* src, char* dst, socklen_t size);
-    int inet_pton(int af, const char* src, void* dst);
-
-    unsigned short network_to_host_short(unsigned short value);
-} // namespace ix

ixwebsocket/IXProgressCallback.h

@@ -7,10 +7,8 @@
 #pragma once
 
 #include <functional>
-#include <string>
 
 namespace ix
 {
     using OnProgressCallback = std::function<bool(int current, int total)>;
-    using OnChunkCallback = std::function<void(const std::string&)>;
 }

ixwebsocket/IXSelectInterrupt.cpp

@@ -1,53 +0,0 @@
-/*
- *  IXSelectInterrupt.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXSelectInterrupt.h"
-
-namespace ix
-{
-    const uint64_t SelectInterrupt::kSendRequest = 1;
-    const uint64_t SelectInterrupt::kCloseRequest = 2;
-
-    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;
-    }
-
-    void* SelectInterrupt::getEvent() const
-    {
-        return nullptr;
-    }
-} // namespace ix

ixwebsocket/IXSelectInterrupt.h

@@ -1,35 +0,0 @@
-/*
- *  IXSelectInterrupt.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include <cstdint>
-#include <memory>
-#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;
-        virtual void* getEvent() const;
-
-        // Used as special codes for pipe communication
-        static const uint64_t kSendRequest;
-        static const uint64_t kCloseRequest;
-    };
-
-    using SelectInterruptPtr = std::unique_ptr<SelectInterrupt>;
-} // namespace ix

ixwebsocket/IXSelectInterruptEvent.cpp

@@ -1,85 +0,0 @@
-/*
- *  IXSelectInterruptEvent.cpp
- */
-
-//
-// On Windows we use a Windows Event to wake up ix::poll() (WSAWaitForMultipleEvents).
-// And on any other platform that doesn't support pipe file descriptors we
-// emulate the interrupt event by using a short timeout with ix::poll() and
-// read from the SelectInterrupt. (see Socket::poll() "Emulation mode")
-//
-#include <algorithm>
-#include "IXSelectInterruptEvent.h"
-
-namespace ix
-{
-    SelectInterruptEvent::SelectInterruptEvent()
-    {
-#ifdef _WIN32
-        _event = CreateEvent(NULL, TRUE, FALSE, NULL);
-#endif
-    }
-
-    SelectInterruptEvent::~SelectInterruptEvent()
-    {
-#ifdef _WIN32
-        CloseHandle(_event);
-#endif
-    }
-
-    bool SelectInterruptEvent::init(std::string& /*errorMsg*/)
-    {
-        return true;
-    }
-
-    bool SelectInterruptEvent::notify(uint64_t value)
-    {
-        std::lock_guard<std::mutex> lock(_valuesMutex);
-
-        // WebSocket implementation detail: We only need one of the values in the queue
-        if (std::find(_values.begin(), _values.end(), value) == _values.end())
-            _values.push_back(value);
-#ifdef _WIN32
-        SetEvent(_event); // wake up
-#endif
-        return true;
-    }
-
-    uint64_t SelectInterruptEvent::read()
-    {
-        std::lock_guard<std::mutex> lock(_valuesMutex);
-
-        if (_values.size() > 0)
-        {
-            uint64_t value = _values.front();
-            _values.pop_front();
-#ifdef _WIN32
-            // signal the event if there is still data in the queue
-            if (_values.size() == 0)
-                ResetEvent(_event);
-#endif
-            return value;
-        }
-        return 0;
-    }
-
-    bool SelectInterruptEvent::clear()
-    {
-        std::lock_guard<std::mutex> lock(_valuesMutex);
-        _values.clear();
-#ifdef _WIN32
-        ResetEvent(_event);
-#endif
-        return true;
-    }
-
-    void* SelectInterruptEvent::getEvent() const
-    {
-#ifdef _WIN32
-        return reinterpret_cast<void*>(_event);
-#else
-        return nullptr;
-#endif
-    }
-
-} // namespace ix

ixwebsocket/IXSelectInterruptEvent.h

@@ -1,39 +0,0 @@
-/*
- *  IXSelectInterruptEvent.h
- */
-
-#pragma once
-
-#include "IXSelectInterrupt.h"
-#include <cstdint>
-#include <mutex>
-#include <string>
-#include <deque>
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-namespace ix
-{
-    class SelectInterruptEvent final : public SelectInterrupt
-    {
-    public:
-        SelectInterruptEvent();
-        virtual ~SelectInterruptEvent();
-
-        bool init(std::string& /*errorMsg*/) final;
-
-        bool notify(uint64_t value) final;
-        bool clear() final;
-        uint64_t read() final;
-        void* getEvent() const final;
-    private:
-        // contains every value only once, new values are inserted at the begin, nu
-        std::deque<uint64_t> _values;
-        std::mutex _valuesMutex;
-#ifdef _WIN32
-        // Windows Event to wake up the socket poll
-        HANDLE _event;
-#endif
-    };
-} // namespace ix