add sentry native project

2020-03-06 11:53:36 -08:00
168 changed files with 6397 additions and 6190 deletions
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@ -1,92 +1,51 @@
 name: unittest
-on:
-  push:
-    paths-ignore:
-    - 'docs/**'

+on: [push]
+
+# fake comment to trigger an action 1
 jobs:
  linux:
    runs-on: ubuntu-latest
+    
    steps:
    - uses: actions/checkout@v1
    - name: make test
      run: make test

-  mac_tsan_sectransport:
+  mac:
    runs-on: macOS-latest
-    steps:
-    - uses: actions/checkout@v1
-    - name: make test_tsan
-      run: make test_tsan

-  mac_tsan_openssl:
-    runs-on: macOS-latest
    steps:
    - uses: actions/checkout@v1
-    - name: install openssl
-      run: brew install openssl
    - name: make test
-      run: make test_tsan_openssl
+      run: make test

-  mac_tsan_mbedtls:
-    runs-on: macOS-latest
-    steps:
-    - uses: actions/checkout@v1
-    - name: install mbedtls
-      run: brew install mbedtls
-    - name: make test
-      run: make test_tsan_mbedtls
-
-  windows_no_tls:
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v1
-    - uses: seanmiddleditch/gha-setup-vsdevenv@master
-    - run: |
-        mkdir build
-        cd build
-        cmake -DCMAKE_CXX_COMPILER=cl.exe -DUSE_TEST=1 ..
-    - run: cmake --build build
-    - run: |
-        cd test
-        ..\build\test\ixwebsocket_unittest.exe
-
-      # windows_mbedtls:
-      #   runs-on: windows-latest
-      #   steps:
-      #   - uses: actions/checkout@v1
-      #   - uses: seanmiddleditch/gha-setup-vsdevenv@master
-      #   - run: |
-      #       vcpkg install zlib:x64-windows
-      #       vcpkg install mbedtls:x64-windows
-      #   - run: |
-      #       mkdir build
-      #       cd build
-      #       cmake -DCMAKE_TOOLCHAIN_FILE=c:/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_CXX_COMPILER=cl.exe -DUSE_MBED_TLS=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
-
-#
-#   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
+      #     We don't need to have redis running anymore, as we have our fake limited one
+      #     - name: install redis
+      #       run: brew install redis
+      # 
+      #     - name: start redis server
+      #       run: brew services start redis

+      #  # Windows does not work yet, I'm stuck at getting CMake to run + finding vcpkg
+      #  win:
+      #    runs-on: windows-2016
+      #
+      #    steps:
+      #    - uses: actions/checkout@v1
+      #
+      #    - name: run cmake
+      #      run: |
+      #        "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+      #        mkdir build
+      #        cd build
+      #        cmake -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALLATION_ROOT%\scripts\buildsystems\vcpkg.cmake -DUSE_WS=1 -DUSE_TEST=1 -DUSE_TLS=1 -G"NMake Makefiles" ..
+      #    - name: build
+      #      run: |
+      #        "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+      #        cd build
+      #        nmake
+      #    - name: run tests
+      #      run: 
+      #        cd test
+      #        ..\build\test\ixwebsocket_unittest.exe
--- a/.github/workflows/mkdocs.yml
+++ b/.github/workflows/mkdocs.yml
@ -1,25 +0,0 @@
-name: mkdocs
-on:
-  push:
-    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 pull
-        mkdocs gh-deploy
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,59 @@
+language: bash
+
+# See https://github.com/amaiorano/vectrexy/blob/master/.travis.yml
+# for ideas on installing vcpkg
+
+matrix:
+  include:
+    # macOS
+    # - os: osx
+    #   env:
+    #     - HOMEBREW_NO_AUTO_UPDATE=1
+    #   compiler: clang
+    #   script:
+    #     - brew install redis
+    #     - brew services start redis
+    #     - brew install mbedtls
+    #     - python test/run.py
+    #     - make ws
+
+    Linux
+    - os: linux
+      dist: bionic
+      before_install:
+        - sudo apt-get install -y libmbedtls-dev
+        - sudo apt-get install -y redis-server
+      script: 
+      - python test/run.py
+      #  - make ws
+      env:
+        - CC=gcc
+        - CXX=g++
+
+    # Clang + Linux disabled for now
+    # - os: linux
+    #   dist: xenial
+    #   script: python test/run.py
+    #   env:
+    #     - CC=clang 
+    #     - CXX=clang++
+
+    # Windows
+    # - os: windows
+    #   env:
+    #     - CMAKE_PATH="/c/Program Files/CMake/bin"
+    #   script: 
+    #     - cd third_party/zlib
+    #     - cmake .
+    #     - cmake --build . --target install
+    #     - cd ../..
+    #     # - cd third_party/mbedtls
+    #     # - cmake .
+    #     # - cmake --build . --target install
+    #     # - cd ../..
+    #     - export PATH=$CMAKE_PATH:$PATH
+    #     - cd test
+    #     - cmake .
+    #     - cmake --build --parallel .
+    #     - ixwebsocket_unittest.exe
+    #     # - python test/run.py
--- a/CMake/FindSpdLog.cmake
+++ b/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})
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -21,7 +21,6 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
 endif()

 set( IXWEBSOCKET_SOURCES
-    ixwebsocket/IXBench.cpp
    ixwebsocket/IXCancellationRequest.cpp
    ixwebsocket/IXConnectionState.cpp
    ixwebsocket/IXDNSLookup.cpp
@ -37,7 +36,6 @@ set( IXWEBSOCKET_SOURCES
    ixwebsocket/IXSocketFactory.cpp
    ixwebsocket/IXSocketServer.cpp
    ixwebsocket/IXSocketTLSOptions.cpp
-    ixwebsocket/IXUdpSocket.cpp
    ixwebsocket/IXUrlParser.cpp
    ixwebsocket/IXUserAgent.cpp
    ixwebsocket/IXWebSocket.cpp
@ -54,7 +52,6 @@ set( IXWEBSOCKET_SOURCES
 )

 set( IXWEBSOCKET_HEADERS
-    ixwebsocket/IXBench.h
    ixwebsocket/IXCancellationRequest.h
    ixwebsocket/IXConnectionState.h
    ixwebsocket/IXDNSLookup.h
@ -72,7 +69,6 @@ set( IXWEBSOCKET_HEADERS
    ixwebsocket/IXSocketFactory.h
    ixwebsocket/IXSocketServer.h
    ixwebsocket/IXSocketTLSOptions.h
-    ixwebsocket/IXUdpSocket.h
    ixwebsocket/IXUrlParser.h
    ixwebsocket/IXUtf8Validator.h
    ixwebsocket/IXUserAgent.h
@ -120,14 +116,13 @@ endif()
 option(USE_TLS "Enable TLS support" FALSE)

 if (USE_TLS)
-    option(USE_MBED_TLS "Use Mbed TLS" OFF)
-    option(USE_OPEN_SSL "Use OpenSSL" OFF)
-
-    # default to mbedtls on windows if nothing is configured
-    if (WIN32 AND NOT USE_OPEN_SSL AND NOT USE_MBED_TLS)
-      option(USE_MBED_TLS "Use Mbed TLS" ON)
+    if (WIN32)
+        option(USE_MBED_TLS "Use Mbed TLS" ON)
+    else()
+        option(USE_MBED_TLS "Use Mbed TLS" OFF)
    endif()
-
+    option(USE_OPEN_SSL "Use OpenSSL" OFF)
+    
    if (USE_MBED_TLS)
        list( APPEND IXWEBSOCKET_HEADERS ixwebsocket/IXSocketMbedTLS.h)
        list( APPEND IXWEBSOCKET_SOURCES ixwebsocket/IXSocketMbedTLS.cpp)
@ -201,9 +196,7 @@ if (USE_TLS AND USE_MBED_TLS)
  endif()
 endif()

-if (NOT ZLIB_FOUND)
-  find_package(ZLIB)
-endif()
+find_package(ZLIB)
 if (ZLIB_FOUND)
  include_directories(${ZLIB_INCLUDE_DIRS})
  target_link_libraries(ixwebsocket ${ZLIB_LIBRARIES})
@ -237,9 +230,9 @@ if (USE_WS OR USE_TEST)
  add_subdirectory(ixcobra)
  add_subdirectory(ixsnake)
  add_subdirectory(ixsentry)
-  add_subdirectory(ixbots)

  add_subdirectory(third_party/spdlog spdlog)
+  add_subdirectory(third_party/sentry-native sentry-native)

  if (USE_WS)
      add_subdirectory(ws)
--- a/2
+++ b/2
@ -1 +1 @@
-docker/Dockerfile.alpine
+docker/Dockerfile.centos
--- a/docker/Dockerfile.alpine
+++ b/docker/Dockerfile.alpine
@ -1,13 +1,12 @@
 FROM alpine:3.11 as build

-RUN apk add --no-cache \
-    gcc g++ musl-dev linux-headers \
-    cmake mbedtls-dev make zlib-dev
+RUN apk add --no-cache gcc g++ musl-dev linux-headers cmake openssl-dev 
+RUN apk add --no-cache make
+RUN apk add --no-cache zlib-dev

-RUN addgroup -S app && \
-    adduser -S -G app app && \
-    chown -R app:app /opt && \
-    chown -R app:app /usr/local
+RUN addgroup -S app && adduser -S -G app app 
+RUN chown -R app:app /opt
+RUN chown -R app:app /usr/local

 # There is a bug in CMake where we cannot build from the root top folder
 # So we build from /opt
@ -15,21 +14,22 @@ COPY --chown=app:app . /opt
 WORKDIR /opt

 USER app
-RUN make ws_mbedtls_install && \
-    sh tools/trim_repo_for_docker.sh
+RUN [ "make", "ws_install" ]
+RUN [ "rm", "-rf", "build" ]

 FROM alpine:3.11 as runtime

-RUN apk add --no-cache libstdc++ mbedtls ca-certificates && \
-    addgroup -S app && \
-    adduser -S -G app app
+RUN apk add --no-cache libstdc++
+RUN apk add --no-cache strace
+RUN apk add --no-cache gdb

+RUN addgroup -S app && adduser -S -G app app 
 COPY --chown=app:app --from=build /usr/local/bin/ws /usr/local/bin/ws
+RUN chmod +x /usr/local/bin/ws
+RUN ldd /usr/local/bin/ws

-# COPY --chown=app:app --from=build /opt /opt
-
-RUN chmod +x /usr/local/bin/ws && \
-    ldd /usr/local/bin/ws
+# Copy source code for gcc
+COPY --chown=app:app --from=build /opt /opt

 # Now run in usermode
 USER app
--- a/docker/Dockerfile.centos
+++ b/docker/Dockerfile.centos
@ -1,9 +1,6 @@
 FROM centos:8 as build

-RUN yum install -y gcc-c++ make cmake zlib-devel openssl-devel redhat-rpm-config
-
-RUN yum install -y epel-release
-RUN yum install -y mbedtls-devel
+RUN yum install -y gcc-c++ make cmake zlib-devel openssl-devel redhat-rpm-config 

 RUN groupadd app && useradd -g app app
 RUN chown -R app:app /opt
@ -15,16 +12,13 @@ COPY --chown=app:app . /opt
 WORKDIR /opt

 USER app
-RUN [ "make", "ws_mbedtls_install" ]
+RUN [ "make", "ws_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
--- a/docker/Dockerfile.debian
+++ b/docker/Dockerfile.debian
@ -2,14 +2,14 @@
 FROM debian:buster as build

 ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update
-RUN apt-get -y install wget
+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 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 g++ 
 RUN apt-get -y install libssl-dev
 RUN apt-get -y install libz-dev
 RUN apt-get -y install make
@ -25,9 +25,9 @@ RUN ["make"]
 FROM debian:buster as runtime

 ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update
-# Runtime
-RUN apt-get install -y libssl1.1
+RUN apt-get update 
+# Runtime 
+RUN apt-get install -y libssl1.1 
 RUN apt-get install -y ca-certificates
 RUN ["update-ca-certificates"]

--- a/docker/Dockerfile.fedora
+++ b/docker/Dockerfile.fedora
@ -8,7 +8,7 @@ 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 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
@ -27,7 +27,7 @@ FROM fedora:30 as runtime

 RUN yum install -y libtsan

-RUN groupadd app && useradd -g app app
+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
--- a/docker/Dockerfile.ubuntu_bionic
+++ b/docker/Dockerfile.ubuntu_bionic
@ -2,14 +2,14 @@
 FROM ubuntu:bionic as build

 ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update
-RUN apt-get -y install wget
+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 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 g++ 
 RUN apt-get -y install libssl-dev
 RUN apt-get -y install libz-dev
 RUN apt-get -y install make
--- a/docker/Dockerfile.ubuntu_disco
+++ b/docker/Dockerfile.ubuntu_disco
@ -2,14 +2,14 @@
 FROM ubuntu:disco as build

 ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update
-RUN apt-get -y install wget
+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 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 g++ 
 RUN apt-get -y install libssl-dev
 RUN apt-get -y install libz-dev
 RUN apt-get -y install make
--- a/docker/Dockerfile.ubuntu_xenial
+++ b/docker/Dockerfile.ubuntu_xenial
@ -2,14 +2,14 @@
 FROM ubuntu:xenial as build

 ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update
-RUN apt-get -y install wget
+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 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 g++ 
 RUN apt-get -y install libssl-dev
 RUN apt-get -y install libz-dev
 RUN apt-get -y install make
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@ -1,156 +1,6 @@
 # Changelog
 All changes to this project will be documented in this file.

-## [9.2.1] - 2020-04-04
-
-(windows) when using OpenSSL, the system store is used to populate the cacert. No need to ship a cacert.pem file with your app.
-
-## [9.2.0] - 2020-04-04
-
-(windows) ci: windows build with TLS (mbedtls) + verify that we can be build with OpenSSL
-
-## [9.1.9] - 2020-03-30
-
-(cobra to statsd bot) add ability to extract a numerical value and send a timer event to statsd, with the --timer option
-
-## [9.1.8] - 2020-03-29
-
-(cobra to statsd bot) bot init was missing + capture socket error
-
-## [9.1.7] - 2020-03-29
-
-(cobra to statsd bot) add ability to extract a numerical value and send a gauge event to statsd, with the --gauge option
-
-## [9.1.6] - 2020-03-29
-
-(ws cobra subscriber) use a Json::StreamWriter to write to std::cout, and save one std::string allocation for each message printed
-
-## [9.1.5] - 2020-03-29
-
-(docker) trim down docker image (300M -> 12M) / binary built without symbol and size optimization, and source code not copied over
-
-## [9.1.4] - 2020-03-28
-
-(jsoncpp) update bundled copy to version 1.9.3 (at sha 3beb37ea14aec1bdce1a6d542dc464d00f4a6cec)
-
-## [9.1.3] - 2020-03-27
-
-(docker) alpine docker build with release with debug info, and bundle ca-certificates
-
-## [9.1.2] - 2020-03-26
-
-(mac ssl) rename DarwinSSL -> SecureTransport (see this too -> https://github.com/curl/curl/issues/3733)
-
-## [9.1.1] - 2020-03-26
-
-(websocket) fix data race accessing _socket object without mutex protection when calling wakeUpFromPoll in WebSocketTransport.cpp
-
-## [9.1.0] - 2020-03-26
-
-(ixcobra) add explicit event types for handshake, authentication and subscription failure, and handle those by exiting in ws_cobra_subcribe and friends
-
-## [9.0.3] - 2020-03-24
-
-(ws connect) display statistics about how much time it takes to stop the connection
-
-## [9.0.2] - 2020-03-24
-
-(socket) works with unique_ptr<Socket> instead of shared_ptr<Socket> in many places
-
-## [9.0.1] - 2020-03-24
-
-(socket) selectInterrupt member is an unique_ptr instead of being a shared_ptr
-
-## [9.0.0] - 2020-03-23
-
-(websocket) reset per-message deflate codec everytime we connect to a server/client
-
-## [8.3.4] - 2020-03-23
-
-(websocket) fix #167, a long standing issue with sending empty messages with per-message deflate extension (and hopefully other zlib bug)
-
-## [8.3.3] - 2020-03-22
-
-(cobra to statsd) port to windows and add a unittest
-
-## [8.3.2] - 2020-03-20
-
-(websocket+tls) fix hang in tls handshake which could lead to ANR, discovered through unittesting.
-
-## [8.3.1] - 2020-03-20
-
-(cobra) CobraMetricsPublisher can be configure with an ix::CobraConfig + more unittest use SSL in server + client
-
-## [8.3.0] - 2020-03-18
-
-(websocket) Simplify ping/pong based heartbeat implementation
-
-## [8.2.7] - 2020-03-17
-
-(ws) ws connect gains a new option to set the interval at which to send pings
-(ws) ws echo_server gains a new option (-p) to disable responding to pings with pongs
-
-```
-IXWebSocket$ ws connect --ping_interval 2 wss://echo.websocket.org
-Type Ctrl-D to exit prompt...
-Connecting to url: wss://echo.websocket.org
-> ws_connect: connected
-[2020-03-17 23:53:02.726] [info] Uri: /
-[2020-03-17 23:53:02.726] [info] Headers:
-[2020-03-17 23:53:02.727] [info] Connection: Upgrade
-[2020-03-17 23:53:02.727] [info] Date: Wed, 18 Mar 2020 06:45:05 GMT
-[2020-03-17 23:53:02.727] [info] Sec-WebSocket-Accept: 0gtqbxW0aVL/QI/ICpLFnRaiKgA=
-[2020-03-17 23:53:02.727] [info] sec-websocket-extensions:
-[2020-03-17 23:53:02.727] [info] Server: Kaazing Gateway
-[2020-03-17 23:53:02.727] [info] Upgrade: websocket
-[2020-03-17 23:53:04.894] [info] Received pong
-[2020-03-17 23:53:06.859] [info] Received pong
-[2020-03-17 23:53:08.881] [info] Received pong
-[2020-03-17 23:53:10.848] [info] Received pong
-[2020-03-17 23:53:12.898] [info] Received pong
-[2020-03-17 23:53:14.865] [info] Received pong
-[2020-03-17 23:53:16.890] [info] Received pong
-[2020-03-17 23:53:18.853] [info] Received pong
-
-[2020-03-17 23:53:19.388] [info]
-ws_connect: connection closed: code 1000 reason Normal closure
-
-[2020-03-17 23:53:19.502] [info] Received 208 bytes
-[2020-03-17 23:53:19.502] [info] Sent 0 bytes
-```
-
-## [8.2.6] - 2020-03-16
-
-(cobra to sentry bot + docker) default docker file uses mbedtls + ws cobra_to_sentry pass tls options to sentryClient.
-
-## [8.2.5] - 2020-03-13
-
-(cobra client) ws cobra subscribe resubscribe at latest position after being disconnected
-
-## [8.2.4] - 2020-03-13
-
-(cobra client) can subscribe with a position
-
-## [8.2.3] - 2020-03-13
-
-(cobra client) pass the message position to the subscription data callback
-
-## [8.2.2] - 2020-03-12
-
-(openssl tls backend) Fix a hand in OpenSSL when using TLS v1.3 ... by disabling TLS v1.3
-
-## [8.2.1] - 2020-03-11
-
-(cobra) IXCobraConfig struct has tlsOptions and per message deflate options
-
-## [8.2.0] - 2020-03-11
-
-(cobra) add IXCobraConfig struct to pass cobra config around
-
-## [8.1.9] - 2020-03-09
-
-(ws cobra_subscribe) add a --fluentd option to wrap a message in an enveloppe so that fluentd can recognize it
-
 ## [8.1.8] - 2020-03-02

 (websocket server) fix regression with disabling zlib extension on the server side. If a client does not support this extension the server will handle it fine. We still need to figure out how to disable the option.
@ -193,7 +43,7 @@ ws_connect: connection closed: code 1000 reason Normal closure

 ## [8.0.6] - 2020-01-31

-(snake) add an option to disable answering pongs as response to pings, to test cobra client behavior with hanged connections
+(snake) add an option to disable answering pongs as response to pings, to test cobra client behavior with hanged connections 

 ## [8.0.5] - 2020-01-31

--- a/docs/build.md
+++ b/docs/build.md
@ -47,12 +47,12 @@ vcpkg install ixwebsocket

 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
+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.
+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

--- a/docs/design.md
+++ b/docs/design.md
@ -6,9 +6,7 @@ The per message deflate compression option is supported. It can lead to very nic

 ### TLS/SSL

-Connections can be optionally secured and encrypted with TLS/SSL when using a wss:// endpoint, or using normal un-encrypted socket with ws:// endpoints. AppleSSL is used on iOS and macOS, OpenSSL 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.
+Connections can be optionally secured and encrypted with TLS/SSL when using a wss:// endpoint, or using normal un-encrypted socket with ws:// endpoints. AppleSSL is used on iOS and macOS, OpenSSL is used on Android and Linux, mbedTLS is used on Windows.

 ### Polling and background thread work

@ -28,13 +26,7 @@ The library has an interactive tool which is handy for testing compatibility ith

 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.
-
-* Linux
-* macOS with thread sanitizer
-* macOS, with OpenSSL, with thread sanitizer
-* macOS, with MbedTLS, with thread sanitizer
-* Windows, with MbedTLS (the unittest is not run yet)
+The regression test is running after each commit on travis.

 ## Limitations

@ -81,3 +73,5 @@ Here is a simplistic diagram which explains how the code is structured in term o
 |                       |
 +-----------------------+
 ```
+
+
--- a/docs/index.md
+++ b/docs/index.md
@ -1,4 +1,4 @@
-![Build status](https://github.com/machinezone/IXWebSocket/workflows/unittest/badge.svg)
+![Alt text](https://travis-ci.org/machinezone/IXWebSocket.svg?branch=master)

 ## Introduction

@ -13,7 +13,7 @@

 ## Example code

-```c++
+```cpp
 // Required on Windows
 ix::initNetSystem();

@ -44,22 +44,7 @@ webSocket.send("hello world");

 There are 2 main reasons that explain why IXWebSocket got written. First, we needed a C++ cross-platform client library, which should have few dependencies. What looked like the most solid one, [websocketpp](https://github.com/zaphoyd/websocketpp) did depend on boost and this was not an option for us. Secondly, there were other available libraries with fewer dependencies (C ones), but they required calling an explicit poll routine periodically to know if a client had received data from a server, which was not elegant.

-We started by solving those 2 problems, then we added server websocket code, then an HTTP client, and finally a very simple HTTP server. IXWebSocket comes with a command line utility named ws which is quite handy, and is now packaged with alpine linux. You can install it with `apk add ws`.
-
-* Few dependencies (only zlib)
-* Simple to use ; uses std::string and std::function callbacks.
-* Complete support of the websocket protocol, and basic http support.
-* Client and Server
-* TLS support
-
-## 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
+We started by solving those 2 problems, then we added server websocket code, then an HTTP client, and finally a very simple HTTP server.

 ## Contributing

--- a/docs/packages.md
+++ b/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.
--- a/docs/usage.md
+++ b/docs/usage.md
@ -35,7 +35,7 @@ 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);
+webSocket.setHeartBeatPeriod(45);

 // Per message deflate connection is enabled by default. You can tweak its parameters or disable it
 webSocket.disablePerMessageDeflate();
@ -174,7 +174,7 @@ when there is no any traffic to make sure that load balancers do not kill an
 idle connection.

 ```cpp
-webSocket.setPingInterval(45);
+webSocket.setHeartBeatPeriod(45);
 ```

 ### Supply extra HTTP headers.
@ -244,6 +244,39 @@ webSocket.setMaxWaitBetweenReconnectionRetries(5 * 1000); // 5000ms = 5s
 uint32_t m = webSocket.getMaxWaitBetweenReconnectionRetries();
 ```

+### TLS support and configuration
+
+To leverage TLS features, the library must be compiled with the option `USE_TLS=1`.
+
+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"
+});
+```
+
+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.
+
+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
+
 ## WebSocket server API

 ```cpp
@ -431,39 +464,3 @@ setOnConnectionCallback(
                                              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",
-    .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.
-
-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
--- a/ixbots/CMakeLists.txt
+++ b/ixbots/CMakeLists.txt
@ -1,45 +0,0 @@
-#
-# Author: Benjamin Sergeant
-# Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
-#
-
-set (IXBOTS_SOURCES
-    ixbots/IXCobraToSentryBot.cpp
-    ixbots/IXCobraToStatsdBot.cpp
-    ixbots/IXQueueManager.cpp
-    ixbots/IXStatsdClient.cpp
-)
-
-set (IXBOTS_HEADERS
-    ixbots/IXCobraToSentryBot.h
-    ixbots/IXCobraToStatsdBot.h
-    ixbots/IXQueueManager.h
-    ixbots/IXStatsdClient.h
-)
-
-add_library(ixbots STATIC
-    ${IXBOTS_SOURCES}
-    ${IXBOTS_HEADERS}
-)
-
-find_package(JsonCpp)
-if (NOT JSONCPP_FOUND)
-  set(JSONCPP_INCLUDE_DIRS ../third_party/jsoncpp)
-endif()
-
-find_package(SpdLog)
-if (NOT SPDLOG_FOUND)
-  set(SPDLOG_INCLUDE_DIRS ../third_party/spdlog/include)
-endif()
-
-set(IXBOTS_INCLUDE_DIRS
-    .
-    ..
-    ../ixcore
-    ../ixwebsocket
-    ../ixcobra
-    ../ixsentry
-    ${JSONCPP_INCLUDE_DIRS}
-    ${SPDLOG_INCLUDE_DIRS})
-
-target_include_directories( ixbots PUBLIC ${IXBOTS_INCLUDE_DIRS} )
--- a/ixbots/ixbots/IXCobraToSentryBot.h
+++ b/ixbots/ixbots/IXCobraToSentryBot.h
@ -1,24 +0,0 @@
-/*
- *  IXCobraToSentryBot.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019-2020 Machine Zone, Inc. All rights reserved.
- */
-#pragma once
-
-#include <ixcobra/IXCobraConfig.h>
-#include <ixsentry/IXSentryClient.h>
-#include <string>
-
-namespace ix
-{
-    int cobra_to_sentry_bot(const CobraConfig& config,
-                            const std::string& channel,
-                            const std::string& filter,
-                            const std::string& position,
-                            SentryClient& sentryClient,
-                            bool verbose,
-                            bool strict,
-                            size_t maxQueueSize,
-                            bool enableHeartbeat,
-                            int runtime);
-} // namespace ix
--- a/ixbots/ixbots/IXCobraToStatsdBot.h
+++ b/ixbots/ixbots/IXCobraToStatsdBot.h
@ -1,27 +0,0 @@
-/*
- *  IXCobraToStatsdBot.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019-2020 Machine Zone, Inc. All rights reserved.
- */
-#pragma once
-
-#include <ixcobra/IXCobraConfig.h>
-#include <ixbots/IXStatsdClient.h>
-#include <string>
-#include <stddef.h>
-
-namespace ix
-{
-    int cobra_to_statsd_bot(const ix::CobraConfig& config,
-                            const std::string& channel,
-                            const std::string& filter,
-                            const std::string& position,
-                            StatsdClient& statsdClient,
-                            const std::string& fields,
-                            const std::string& gauge,
-                            const std::string& timer,
-                            bool verbose,
-                            size_t maxQueueSize,
-                            bool enableHeartbeat,
-                            int runtime);
-} // namespace ix
--- a/ixbots/ixbots/IXQueueManager.cpp
+++ b/ixbots/ixbots/IXQueueManager.cpp
@ -1,66 +0,0 @@
-/*
- *  IXQueueManager.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXQueueManager.h"
-#include <vector>
-#include <algorithm>
-
-namespace ix
-{
-    Json::Value QueueManager::pop()
-    {
-        std::unique_lock<std::mutex> lock(_mutex);
-
-        if (_queues.empty())
-        {
-            Json::Value val;
-            return val;
-        }
-
-        std::vector<std::string> games;
-        for (auto it : _queues)
-        {
-            games.push_back(it.first);
-        }
-
-        std::random_shuffle(games.begin(), games.end());
-        std::string game = games[0];
-
-        auto duration = std::chrono::seconds(1);
-        _condition.wait_for(lock, duration);
-
-        if (_queues[game].empty())
-        {
-            Json::Value val;
-            return val;
-        }
-
-        auto msg = _queues[game].front();
-        _queues[game].pop();
-        return msg;
-    }
-
-    void QueueManager::add(Json::Value msg)
-    {
-        std::unique_lock<std::mutex> lock(_mutex);
-
-        std::string game;
-        if (msg.isMember("device") && msg["device"].isMember("game"))
-        {
-            game = msg["device"]["game"].asString();
-        }
-
-        if (game.empty()) return;
-
-        // if the sending is not fast enough there is no point
-        // in queuing too many events.
-        if (_queues[game].size() < _maxQueueSize)
-        {
-            _queues[game].push(msg);
-            _condition.notify_one();
-        }
-    }
-}
--- a/ixbots/ixbots/IXQueueManager.h
+++ b/ixbots/ixbots/IXQueueManager.h
@ -1,35 +0,0 @@
-/*
- *  IXQueueManager.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2019 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include <stddef.h>
-#include <json/json.h>
-#include <mutex>
-#include <condition_variable>
-#include <queue>
-#include <map>
-
-namespace ix
-{
-    class QueueManager
-    {
-    public:
-        QueueManager(size_t maxQueueSize)
-            : _maxQueueSize(maxQueueSize)
-        {
-        }
-
-        Json::Value pop();
-        void add(Json::Value msg);
-
-    private:
-        std::map<std::string, std::queue<Json::Value>> _queues;
-        std::mutex _mutex;
-        std::condition_variable _condition;
-        size_t _maxQueueSize;
-    };
-}
--- a/ixbots/ixbots/IXStatsdClient.cpp
+++ b/ixbots/ixbots/IXStatsdClient.cpp
@ -1,152 +0,0 @@
-/*
- * Copyright (c) 2014, Rex
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- * * Neither the name of the {organization} nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- *  IXStatsdClient.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2020 Machine Zone, Inc. All rights reserved.
- */
-
-// Adapted from statsd-client-cpp
-// test with netcat as a server: `nc -ul 8125`
-
-#include "IXStatsdClient.h"
-
-#include <ixwebsocket/IXNetSystem.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <iostream>
-
-namespace ix
-{
-    StatsdClient::StatsdClient(const std::string& host,
-                               int port,
-                               const std::string& prefix)
-    : _host(host)
-      , _port(port)
-      , _prefix(prefix)
-      , _stop(false)
-    {
-        _thread = std::thread([this]
-        {
-            while (!_stop)
-            {
-                flushQueue();
-                std::this_thread::sleep_for(std::chrono::seconds(1));
-            }
-        });
-    }
-
-    StatsdClient::~StatsdClient()
-    {
-        _stop = true;
-        if (_thread.joinable()) _thread.join();
-
-        _socket.close();
-    }
-
-    bool StatsdClient::init(std::string& errMsg)
-    {
-        return _socket.init(_host, _port, errMsg);
-    }
-
-    /* will change the original string */
-    void StatsdClient::cleanup(std::string& key)
-    {
-        size_t pos = key.find_first_of(":|@");
-        while (pos != std::string::npos)
-        {
-            key[pos] = '_';
-            pos = key.find_first_of(":|@");
-        }
-    }
-
-    int StatsdClient::dec(const std::string& key)
-    {
-        return count(key, -1);
-    }
-
-    int StatsdClient::inc(const std::string& key)
-    {
-        return count(key, 1);
-    }
-
-    int StatsdClient::count(const std::string& key, size_t value)
-    {
-        return send(key, value, "c");
-    }
-
-    int StatsdClient::gauge(const std::string& key, size_t value)
-    {
-        return send(key, value, "g");
-    }
-
-    int StatsdClient::timing(const std::string& key, size_t ms)
-    {
-        return send(key, ms, "ms");
-    }
-
-    int StatsdClient::send(std::string key, size_t value, const std::string& type)
-    {
-        cleanup(key);
-
-        char buf[256];
-        snprintf(buf, sizeof(buf), "%s%s:%zd|%s\n",
-                 _prefix.c_str(), key.c_str(), value, type.c_str());
-
-        enqueue(buf);
-        return 0;
-    }
-
-    void StatsdClient::enqueue(const std::string& message)
-    {
-        std::lock_guard<std::mutex> lock(_mutex);
-        _queue.push_back(message);
-    }
-
-    void StatsdClient::flushQueue()
-    {
-        std::lock_guard<std::mutex> lock(_mutex);
-
-        while (!_queue.empty())
-        {
-            auto message = _queue.front();
-            auto ret = _socket.sendto(message);
-            if (ret != 0)
-            {
-                std::cerr << "error: "
-                          << strerror(UdpSocket::getErrno())
-                          << std::endl;
-            }
-            _queue.pop_front();
-        }
-    }
-} // end namespace ix
--- a/ixbots/ixbots/IXStatsdClient.h
+++ b/ixbots/ixbots/IXStatsdClient.h
@ -1,58 +0,0 @@
-/*
- *  IXStatsdClient.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2020 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include <ixwebsocket/IXUdpSocket.h>
-
-#include <string>
-#include <thread>
-#include <deque>
-#include <mutex>
-#include <atomic>
-
-namespace ix
-{
-    class StatsdClient
-    {
-    public:
-        StatsdClient(const std::string& host="127.0.0.1",
-                     int port=8125,
-                     const std::string& prefix = "");
-        ~StatsdClient();
-
-        bool init(std::string& errMsg);
-        int inc(const std::string& key);
-        int dec(const std::string& key);
-        int count(const std::string& key, size_t value);
-        int gauge(const std::string& key, size_t value);
-        int timing(const std::string& key, size_t ms);
-
-    private:
-        void enqueue(const std::string& message);
-
-        /* (Low Level Api) manually send a message
-         * type = "c", "g" or "ms"
-         */
-        int send(std::string key, size_t value, const std::string& type);
-
-        void cleanup(std::string& key);
-        void flushQueue();
-
-        UdpSocket _socket;
-
-        std::string _host;
-        int _port;
-        std::string _prefix;
-
-        std::atomic<bool> _stop;
-        std::thread _thread;
-        std::mutex _mutex; // for the queue
-
-        std::deque<std::string> _queue;
-    };
-
-} // end namespace ix
--- a/ixcobra/CMakeLists.txt
+++ b/ixcobra/CMakeLists.txt
@ -13,7 +13,6 @@ set (IXCOBRA_HEADERS
    ixcobra/IXCobraConnection.h
    ixcobra/IXCobraMetricsThreadedPublisher.h
    ixcobra/IXCobraMetricsPublisher.h
-    ixcobra/IXCobraConfig.h
 )

 add_library(ixcobra STATIC
--- a/ixcobra/ixcobra/IXCobraConfig.h
+++ b/ixcobra/ixcobra/IXCobraConfig.h
@ -1,35 +0,0 @@
-/*
- *  IXCobraConfig.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2020 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include <ixwebsocket/IXWebSocketPerMessageDeflateOptions.h>
-#include <ixwebsocket/IXSocketTLSOptions.h>
-
-namespace ix
-{
-    struct CobraConfig
-    {
-        std::string appkey;
-        std::string endpoint;
-        std::string rolename;
-        std::string rolesecret;
-        WebSocketPerMessageDeflateOptions webSocketPerMessageDeflateOptions;
-        SocketTLSOptions socketTLSOptions;
-
-        CobraConfig(const std::string& a = std::string(),
-                    const std::string& e = std::string(),
-                    const std::string& r = std::string(),
-                    const std::string& s = std::string())
-            : appkey(a)
-            , endpoint(e)
-            , rolename(r)
-            , rolesecret(s)
-        {
-            ;
-        }
-    };
-} // namespace ix
--- a/ixcobra/ixcobra/IXCobraConnection.cpp
+++ b/ixcobra/ixcobra/IXCobraConnection.cpp
@ -166,8 +166,7 @@ namespace ix
                    }
                    else if (action == "auth/handshake/error")
                    {
-                        invokeEventCallback(ix::CobraConnection_EventType_Handshake_Error,
-                                            msg->str);
+                        invokeErrorCallback("Handshake error", msg->str);
                    }
                    else if (action == "auth/authenticate/ok")
                    {
@ -177,8 +176,7 @@ namespace ix
                    }
                    else if (action == "auth/authenticate/error")
                    {
-                        invokeEventCallback(ix::CobraConnection_EventType_Authentication_Error,
-                                            msg->str);
+                        invokeErrorCallback("Authentication error", msg->str);
                    }
                    else if (action == "rtm/subscription/data")
                    {
@ -193,8 +191,7 @@ namespace ix
                    }
                    else if (action == "rtm/subscribe/error")
                    {
-                        invokeEventCallback(ix::CobraConnection_EventType_Subscription_Error,
-                                            msg->str);
+                        invokeErrorCallback("Subscription error", msg->str);
                    }
                    else if (action == "rtm/unsubscribe/ok")
                    {
@ -273,16 +270,10 @@ namespace ix
        // This should keep the connection open and prevent some load balancers such as
        // the Amazon one from shutting it down
        _webSocket->setPingInterval(kPingIntervalSecs);
-    }

-    void CobraConnection::configure(const ix::CobraConfig& config)
-    {
-        configure(config.appkey,
-                  config.endpoint,
-                  config.rolename,
-                  config.rolesecret,
-                  config.webSocketPerMessageDeflateOptions,
-                  config.socketTLSOptions);
+        // If we don't receive a pong back, declare loss after 3 * N seconds
+        // (will be 90s now), and close and restart the connection
+        _webSocket->setPingTimeout(3 * kPingIntervalSecs);
    }

    //
@ -440,12 +431,9 @@ namespace ix
        if (!body.isMember("messages")) return false;
        Json::Value messages = body["messages"];

-        if (!body.isMember("position")) return false;
-        std::string position = body["position"].asString();
-
        for (auto&& msg : messages)
        {
-            cb->second(msg, position);
+            cb->second(msg);
        }

        return true;
@ -564,7 +552,6 @@ namespace ix

    void CobraConnection::subscribe(const std::string& channel,
                                    const std::string& filter,
-                                    const std::string& position,
                                    SubscriptionCallback cb)
    {
        // Create and send a subscribe pdu
@ -576,11 +563,6 @@ namespace ix
            body["filter"] = filter;
        }

-        if (!position.empty())
-        {
-            body["position"] = position;
-        }
-
        Json::Value pdu;
        pdu["action"] = "rtm/subscribe";
        pdu["body"] = body;
--- a/ixcobra/ixcobra/IXCobraConnection.h
+++ b/ixcobra/ixcobra/IXCobraConnection.h
@ -17,12 +17,6 @@
 #include <unordered_map>
 #include <limits>

-#include "IXCobraConfig.h"
-
-#ifdef max
-#undef max
-#endif
-
 namespace ix
 {
    class WebSocket;
@ -37,10 +31,7 @@ namespace ix
        CobraConnection_EventType_Subscribed = 4,
        CobraConnection_EventType_UnSubscribed = 5,
        CobraConnection_EventType_Published = 6,
-        CobraConnection_EventType_Pong = 7,
-        CobraConnection_EventType_Handshake_Error = 8,
-        CobraConnection_EventType_Authentication_Error = 9,
-        CobraConnection_EventType_Subscription_Error = 10
+        CobraConnection_EventType_Pong = 7
    };

    enum CobraConnectionPublishMode
@ -49,7 +40,7 @@ namespace ix
        CobraConnection_PublishMode_Batch = 1
    };

-    using SubscriptionCallback = std::function<void(const Json::Value&, const std::string&)>;
+    using SubscriptionCallback = std::function<void(const Json::Value&)>;
    using EventCallback = std::function<void(CobraConnectionEventType,
                                             const std::string&,
                                             const WebSocketHttpHeaders&,
@ -76,8 +67,6 @@ namespace ix
                       const WebSocketPerMessageDeflateOptions& webSocketPerMessageDeflateOptions,
                       const SocketTLSOptions& socketTLSOptions);

-        void configure(const ix::CobraConfig& config);
-
        /// Set the traffic tracker callback
        static void setTrafficTrackerCallback(const TrafficTrackerCallback& callback);

@ -105,7 +94,6 @@ namespace ix
        // message arrives.
        void subscribe(const std::string& channel,
                       const std::string& filter = std::string(),
-                       const std::string& position = std::string(),
                       SubscriptionCallback cb = nullptr);

        /// Unsubscribe from a channel
--- a/ixcobra/ixcobra/IXCobraMetricsPublisher.cpp
+++ b/ixcobra/ixcobra/IXCobraMetricsPublisher.cpp
@ -27,12 +27,20 @@ namespace ix
        ;
    }

-    void CobraMetricsPublisher::configure(const CobraConfig& config,
-                                          const std::string& channel)
+    void CobraMetricsPublisher::configure(const std::string& appkey,
+                                          const std::string& endpoint,
+                                          const std::string& channel,
+                                          const std::string& rolename,
+                                          const std::string& rolesecret,
+                                          bool enablePerMessageDeflate,
+                                          const SocketTLSOptions& socketTLSOptions)
    {
        // Configure the satori connection and start its publish background thread
-        _cobra_metrics_theaded_publisher.configure(config, channel);
        _cobra_metrics_theaded_publisher.start();
+
+        _cobra_metrics_theaded_publisher.configure(appkey, endpoint, channel,
+                                                   rolename, rolesecret,
+                                                   enablePerMessageDeflate, socketTLSOptions);
    }

    Json::Value& CobraMetricsPublisher::getGenericAttributes()
--- a/ixcobra/ixcobra/IXCobraMetricsPublisher.h
+++ b/ixcobra/ixcobra/IXCobraMetricsPublisher.h
@ -40,8 +40,13 @@ namespace ix

        /// Configuration / set keys, etc...
        /// All input data but the channel name is encrypted with rc4
-        void configure(const CobraConfig& config,
-                       const std::string& channel);
+        void configure(const std::string& appkey,
+                       const std::string& endpoint,
+                       const std::string& channel,
+                       const std::string& rolename,
+                       const std::string& rolesecret,
+                       bool enablePerMessageDeflate,
+                       const SocketTLSOptions& socketTLSOptions);

        /// Setter for the list of blacklisted metrics ids.
        /// That list is sorted internally for fast lookups
--- a/ixcobra/ixcobra/IXCobraMetricsThreadedPublisher.cpp
+++ b/ixcobra/ixcobra/IXCobraMetricsThreadedPublisher.cpp
@ -92,14 +92,22 @@ namespace ix
        _thread = std::thread(&CobraMetricsThreadedPublisher::run, this);
    }

-    void CobraMetricsThreadedPublisher::configure(const CobraConfig& config,
-                                                  const std::string& channel)
+    void CobraMetricsThreadedPublisher::configure(const std::string& appkey,
+                                                  const std::string& endpoint,
+                                                  const std::string& channel,
+                                                  const std::string& rolename,
+                                                  const std::string& rolesecret,
+                                                  bool enablePerMessageDeflate,
+                                                  const SocketTLSOptions& socketTLSOptions)
    {
-        ix::IXCoreLogger::Log(config.socketTLSOptions.getDescription().c_str());
-
        _channel = channel;
-        _cobra_connection.configure(config);

+        ix::IXCoreLogger::Log(socketTLSOptions.getDescription().c_str());
+
+        ix::WebSocketPerMessageDeflateOptions webSocketPerMessageDeflateOptions(enablePerMessageDeflate);
+        _cobra_connection.configure(appkey, endpoint,
+                                    rolename, rolesecret,
+                                    webSocketPerMessageDeflateOptions, socketTLSOptions);
    }

    void CobraMetricsThreadedPublisher::pushMessage(MessageKind messageKind)
--- a/ixcobra/ixcobra/IXCobraMetricsThreadedPublisher.h
+++ b/ixcobra/ixcobra/IXCobraMetricsThreadedPublisher.h
@ -27,8 +27,13 @@ namespace ix
        ~CobraMetricsThreadedPublisher();

        /// Configuration / set keys, etc...
-        void configure(const CobraConfig& config,
-                       const std::string& channel);
+        void configure(const std::string& appkey,
+                       const std::string& endpoint,
+                       const std::string& channel,
+                       const std::string& rolename,
+                       const std::string& rolesecret,
+                       bool enablePerMessageDeflate,
+                       const SocketTLSOptions& socketTLSOptions);

        /// Start the worker thread, used for background publishing
        void start();
--- a/ixcrypto/CMakeLists.txt
+++ b/ixcrypto/CMakeLists.txt
@ -23,7 +23,7 @@ add_library(ixcrypto STATIC
    ${IXCRYPTO_HEADERS}
 )

-set(IXCRYPTO_INCLUDE_DIRS
+set(IXCRYPTO_INCLUDE_DIRS 
    .
    ../ixcore)

@ -31,6 +31,10 @@ target_include_directories( ixcrypto PUBLIC ${IXCRYPTO_INCLUDE_DIRS} )

 # hmac computation needs a crypto library

+if (WIN32)
+  set(USE_MBED_TLS TRUE)
+endif()
+
 target_compile_definitions(ixcrypto PUBLIC IXCRYPTO_USE_TLS)
 if (USE_MBED_TLS)
    find_package(MbedTLS REQUIRED)
@ -47,3 +51,4 @@ else()
    target_link_libraries(ixcrypto ${OPENSSL_LIBRARIES})
    target_compile_definitions(ixcrypto PUBLIC IXCRYPTO_USE_OPEN_SSL)
 endif()
+
--- a/ixcrypto/ixcrypto/IXHMac.cpp
+++ b/ixcrypto/ixcrypto/IXHMac.cpp
@ -14,7 +14,7 @@
 #elif defined(IXCRYPTO_USE_OPEN_SSL)
 # include <openssl/hmac.h>
 #else
-# include <assert.h>
+# error "Unsupported configuration"
 #endif

 namespace ix
@ -40,7 +40,7 @@ namespace ix
             (unsigned char *) data.c_str(), (int) data.size(),
             (unsigned char *) hash, nullptr);
 #else
-        assert(false && "hmac not implemented on this platform");
+#       error "Unsupported configuration"
 #endif

        std::string hashString(reinterpret_cast<char*>(hash), hashSize);
--- a/ixsentry/ixsentry/IXSentryClient.cpp
+++ b/ixsentry/ixsentry/IXSentryClient.cpp
@ -40,11 +40,6 @@ namespace ix
        }
    }

-    void SentryClient::setTLSOptions(const SocketTLSOptions& tlsOptions)
-    {
-        _httpClient->setTLSOptions(tlsOptions);
-    }
-
    int64_t SentryClient::getTimestamp()
    {
        const auto tp = std::chrono::system_clock::now();
--- a/ixsentry/ixsentry/IXSentryClient.h
+++ b/ixsentry/ixsentry/IXSentryClient.h
@ -8,7 +8,6 @@

 #include <algorithm>
 #include <ixwebsocket/IXHttpClient.h>
-#include <ixwebsocket/IXSocketTLSOptions.h>
 #include <json/json.h>
 #include <regex>
 #include <memory>
@ -25,9 +24,6 @@ namespace ix

        Json::Value parseLuaStackTrace(const std::string& stack);

-        // Mostly for testing
-        void setTLSOptions(const SocketTLSOptions& tlsOptions);
-
        void uploadMinidump(
            const std::string& sentryMetadata,
            const std::string& minidumpBytes,
--- a/ixsnake/ixsnake/IXRedisClient.cpp
+++ b/ixsnake/ixsnake/IXRedisClient.cpp
@ -9,6 +9,7 @@
 #include <cstring>
 #include <iomanip>
 #include <iostream>
+#include <ixwebsocket/IXSocket.h>
 #include <ixwebsocket/IXSocketFactory.h>
 #include <ixwebsocket/IXSocketTLSOptions.h>
 #include <sstream>
--- a/ixsnake/ixsnake/IXRedisClient.h
+++ b/ixsnake/ixsnake/IXRedisClient.h
@ -9,12 +9,11 @@
 #include <atomic>
 #include <functional>
 #include <memory>
-#include <string>
-
-#include <ixwebsocket/IXSocket.h>

 namespace ix
 {
+    class Socket;
+
    class RedisClient
    {
    public:
@ -57,7 +56,7 @@ namespace ix
    private:
        std::string writeString(const std::string& str);

-        std::unique_ptr<Socket> _socket;
+        std::shared_ptr<Socket> _socket;
        std::atomic<bool> _stop;
    };
 } // namespace ix
--- a/ixsnake/ixsnake/IXRedisServer.cpp
+++ b/ixsnake/ixsnake/IXRedisServer.cpp
@ -11,6 +11,7 @@
 #include <ixwebsocket/IXSocket.h>
 #include <ixwebsocket/IXCancellationRequest.h>
 #include <fstream>
+#include <iostream>
 #include <sstream>
 #include <vector>

@ -43,7 +44,7 @@ namespace ix
        SocketServer::stop();
    }

-    void RedisServer::handleConnection(std::unique_ptr<Socket> socket,
+    void RedisServer::handleConnection(std::shared_ptr<Socket> socket,
                                       std::shared_ptr<ConnectionState> connectionState)
    {
        _connectedClientsCount++;
@ -102,13 +103,13 @@ namespace ix
        _connectedClientsCount--;
    }

-    void RedisServer::cleanupSubscribers(std::unique_ptr<Socket>& socket)
+    void RedisServer::cleanupSubscribers(std::shared_ptr<Socket> socket)
    {
        std::lock_guard<std::mutex> lock(_mutex);

        for (auto&& it : _subscribers)
        {
-            it.second.erase(socket.get());
+            it.second.erase(socket);
        }

        for (auto it : _subscribers)
@ -145,7 +146,7 @@ namespace ix
    }

    bool RedisServer::parseRequest(
-        std::unique_ptr<Socket>& socket,
+        std::shared_ptr<Socket> socket,
        std::vector<std::string>& tokens)
    {
        // Parse first line
@ -187,11 +188,17 @@ namespace ix
            tokens.push_back(readResult.second);
        }

+        for (auto&& token : tokens)
+        {
+            std::cerr << token << " ";
+        }
+        std::cerr << std::endl;
+
        return true;
    }

    bool RedisServer::handleCommand(
-        std::unique_ptr<Socket>& socket,
+        std::shared_ptr<Socket> socket,
        const std::vector<std::string>& tokens)
    {
        if (tokens.size() != 1) return false;
@ -230,7 +237,7 @@ namespace ix
    }

    bool RedisServer::handleSubscribe(
-        std::unique_ptr<Socket>& socket,
+        std::shared_ptr<Socket> socket,
        const std::vector<std::string>& tokens)
    {
        if (tokens.size() != 2) return false;
@ -245,13 +252,13 @@ namespace ix
        socket->writeBytes(":1\r\n", cb);

        std::lock_guard<std::mutex> lock(_mutex);
-        _subscribers[channel].insert(socket.get());
+        _subscribers[channel].insert(socket);

        return true;
    }

    bool RedisServer::handlePublish(
-        std::unique_ptr<Socket>& socket,
+        std::shared_ptr<Socket> socket,
        const std::vector<std::string>& tokens)
    {
        if (tokens.size() != 3) return false;
--- a/ixsnake/ixsnake/IXRedisServer.h
+++ b/ixsnake/ixsnake/IXRedisServer.h
@ -37,13 +37,13 @@ namespace ix
        // Subscribers
        // We could store connection states in there, to add better debugging
        // since a connection state has a readable ID
-        std::map<std::string, std::set<Socket*>> _subscribers;
+        std::map<std::string, std::set<std::shared_ptr<Socket>>> _subscribers;
        std::mutex _mutex;

        std::atomic<bool> _stopHandlingConnections;

        // Methods
-        virtual void handleConnection(std::unique_ptr<Socket>,
+        virtual void handleConnection(std::shared_ptr<Socket>,
                                      std::shared_ptr<ConnectionState> connectionState) final;
        virtual size_t getConnectedClientsCount() final;

@ -51,18 +51,18 @@ namespace ix
        std::string writeString(const std::string& str);

        bool parseRequest(
-            std::unique_ptr<Socket>& socket,
+            std::shared_ptr<Socket> socket,
            std::vector<std::string>& tokens);

-        bool handlePublish(std::unique_ptr<Socket>& socket,
+        bool handlePublish(std::shared_ptr<Socket> socket,
                           const std::vector<std::string>& tokens);

-        bool handleSubscribe(std::unique_ptr<Socket>& socket,
+        bool handleSubscribe(std::shared_ptr<Socket> socket,
                             const std::vector<std::string>& tokens);

-        bool handleCommand(std::unique_ptr<Socket>& socket,
+        bool handleCommand(std::shared_ptr<Socket> socket,
                           const std::vector<std::string>& tokens);

-        void cleanupSubscribers(std::unique_ptr<Socket>& socket);
+        void cleanupSubscribers(std::shared_ptr<Socket> socket);
    };
 } // namespace ix
--- a/ixsnake/ixsnake/IXSnakeProtocol.cpp
+++ b/ixsnake/ixsnake/IXSnakeProtocol.cpp
@ -189,7 +189,7 @@ namespace snake
            nlohmann::json response = {
                {"action", "rtm/subscription/data"},
                {"id", id++},
-                {"body", {{"subscription_id", subscriptionId}, {"position", "0-0"}, {"messages", {msg}}}}};
+                {"body", {{"subscription_id", subscriptionId}, {"messages", {msg}}}}};

            ws->sendText(response.dump());
        };
--- a/ixwebsocket/IXBench.cpp
+++ b/ixwebsocket/IXBench.cpp
@ -1,44 +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)
-        , _start(std::chrono::high_resolution_clock::now())
-        , _reported(false)
-    {
-        ;
-    }
-
-    Bench::~Bench()
-    {
-        if (!_reported)
-        {
-            report();
-        }
-    }
-
-    void Bench::report()
-    {
-        auto now = std::chrono::high_resolution_clock::now();
-        auto milliseconds = std::chrono::duration_cast<std::chrono::milliseconds>(now - _start);
-
-        _ms = milliseconds.count();
-        std::cerr << _description << " completed in " << _ms << "ms" << std::endl;
-
-        _reported = true;
-    }
-
-    uint64_t Bench::getDuration() const
-    {
-        return _ms;
-    }
-} // namespace ix
--- a/ixwebsocket/IXBench.h
+++ b/ixwebsocket/IXBench.h
@ -1,28 +0,0 @@
-/*
- *  IXBench.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2017-2020 Machine Zone, Inc. All rights reserved.
- */
-
-#include <chrono>
-#include <stdint.h>
-#include <string>
-
-namespace ix
-{
-    class Bench
-    {
-    public:
-        Bench(const std::string& description);
-        ~Bench();
-
-        void report();
-        uint64_t getDuration() const;
-
-    private:
-        std::string _description;
-        std::chrono::time_point<std::chrono::high_resolution_clock> _start;
-        uint64_t _ms;
-        bool _reported;
-    };
-} // namespace ix
--- a/ixwebsocket/IXHttp.cpp
+++ b/ixwebsocket/IXHttp.cpp
@ -92,8 +92,7 @@ namespace ix
        return std::make_tuple(method, requestUri, httpVersion);
    }

-    std::tuple<bool, std::string, HttpRequestPtr> Http::parseRequest(
-        std::unique_ptr<Socket>& socket)
+    std::tuple<bool, std::string, HttpRequestPtr> Http::parseRequest(std::shared_ptr<Socket> socket)
    {
        HttpRequestPtr httpRequest;

@ -134,7 +133,7 @@ namespace ix
        return std::make_tuple(true, "", httpRequest);
    }

-    bool Http::sendResponse(HttpResponsePtr response, std::unique_ptr<Socket>& socket)
+    bool Http::sendResponse(HttpResponsePtr response, std::shared_ptr<Socket> socket)
    {
        // Write the response to the socket
        std::stringstream ss;
--- a/ixwebsocket/IXHttp.h
+++ b/ixwebsocket/IXHttp.h
@ -115,8 +115,8 @@ namespace ix
    {
    public:
        static std::tuple<bool, std::string, HttpRequestPtr> parseRequest(
-            std::unique_ptr<Socket>& socket);
-        static bool sendResponse(HttpResponsePtr response, std::unique_ptr<Socket>& socket);
+            std::shared_ptr<Socket> socket);
+        static bool sendResponse(HttpResponsePtr response, std::shared_ptr<Socket> socket);

        static std::pair<std::string, int> parseStatusLine(const std::string& line);
        static std::tuple<std::string, std::string, std::string> parseRequestLine(
--- a/ixwebsocket/IXHttpClient.h
+++ b/ixwebsocket/IXHttpClient.h
@ -95,7 +95,7 @@ namespace ix
        std::atomic<bool> _stop;
        std::thread _thread;

-        std::unique_ptr<Socket> _socket;
+        std::shared_ptr<Socket> _socket;
        std::mutex _mutex; // to protect accessing the _socket (only one socket per client)

        SocketTLSOptions _tlsOptions;
--- a/ixwebsocket/IXHttpServer.cpp
+++ b/ixwebsocket/IXHttpServer.cpp
@ -69,7 +69,7 @@ namespace ix
        _onConnectionCallback = callback;
    }

-    void HttpServer::handleConnection(std::unique_ptr<Socket> socket,
+    void HttpServer::handleConnection(std::shared_ptr<Socket> socket,
                                      std::shared_ptr<ConnectionState> connectionState)
    {
        _connectedClientsCount++;
--- a/ixwebsocket/IXHttpServer.h
+++ b/ixwebsocket/IXHttpServer.h
@ -43,7 +43,7 @@ namespace ix
        std::atomic<int> _connectedClientsCount;

        // Methods
-        virtual void handleConnection(std::unique_ptr<Socket>,
+        virtual void handleConnection(std::shared_ptr<Socket>,
                                      std::shared_ptr<ConnectionState> connectionState) final;
        virtual size_t getConnectedClientsCount() final;

--- a/ixwebsocket/IXSelectInterruptFactory.cpp
+++ b/ixwebsocket/IXSelectInterruptFactory.cpp
@ -14,12 +14,12 @@

 namespace ix
 {
-    SelectInterruptPtr createSelectInterrupt()
+    std::shared_ptr<SelectInterrupt> createSelectInterrupt()
    {
 #if defined(__linux__) || defined(__APPLE__)
-        return std::make_unique<SelectInterruptPipe>();
+        return std::make_shared<SelectInterruptPipe>();
 #else
-        return std::make_unique<SelectInterrupt>();
+        return std::make_shared<SelectInterrupt>();
 #endif
    }
 } // namespace ix
--- a/ixwebsocket/IXSelectInterruptFactory.h
+++ b/ixwebsocket/IXSelectInterruptFactory.h
@ -11,6 +11,5 @@
 namespace ix
 {
    class SelectInterrupt;
-    using SelectInterruptPtr = std::unique_ptr<SelectInterrupt>;
-    SelectInterruptPtr createSelectInterrupt();
+    std::shared_ptr<SelectInterrupt> createSelectInterrupt();
 } // namespace ix
--- a/ixwebsocket/IXSocket.cpp
+++ b/ixwebsocket/IXSocket.cpp
@ -46,7 +46,7 @@ namespace ix
    PollResultType Socket::poll(bool readyToRead,
                                int timeoutMs,
                                int sockfd,
-                                const SelectInterruptPtr& selectInterrupt)
+                                std::shared_ptr<SelectInterrupt> selectInterrupt)
    {
        //
        // We used to use ::select to poll but on Android 9 we get large fds out of
--- a/ixwebsocket/IXSocket.h
+++ b/ixwebsocket/IXSocket.h
@ -38,7 +38,6 @@ typedef SSIZE_T ssize_t;
 namespace ix
 {
    class SelectInterrupt;
-    using SelectInterruptPtr = std::unique_ptr<SelectInterrupt>;

    enum class PollResultType
    {
@ -67,7 +66,7 @@ namespace ix
        // Virtual methods
        virtual bool accept(std::string& errMsg);

-        virtual bool connect(const std::string& host,
+        virtual bool connect(const std::string& url,
                             int port,
                             std::string& errMsg,
                             const CancellationRequest& isCancellationRequested);
@ -94,7 +93,7 @@ namespace ix
        static PollResultType poll(bool readyToRead,
                                   int timeoutMs,
                                   int sockfd,
-                                   const SelectInterruptPtr& selectInterrupt);
+                                   std::shared_ptr<SelectInterrupt> selectInterrupt = nullptr);


        // Used as special codes for pipe communication
@ -113,6 +112,6 @@ namespace ix
        std::vector<uint8_t> _readBuffer;
        static constexpr size_t kChunkSize = 1 << 15;

-        SelectInterruptPtr _selectInterrupt;
+        std::shared_ptr<SelectInterrupt> _selectInterrupt;
    };
 } // namespace ix
--- a/ixwebsocket/IXSocketAppleSSL.cpp
+++ b/ixwebsocket/IXSocketAppleSSL.cpp
@ -164,26 +164,6 @@ namespace ix
        return false;
    }

-    OSStatus SocketAppleSSL::tlsHandShake(std::string& errMsg,
-                                          const CancellationRequest& isCancellationRequested)
-    {
-        OSStatus status;
-
-        do
-        {
-            status = SSLHandshake(_sslContext);
-
-            // Interrupt the handshake
-            if (isCancellationRequested())
-            {
-                errMsg = "Cancellation requested";
-                return errSSLInternal;
-            }
-        } while (status == errSSLWouldBlock || status == errSSLServerAuthCompleted);
-
-        return status;
-    }
-
    // No wait support
    bool SocketAppleSSL::connect(const std::string& host,
                                 int port,
@ -210,17 +190,26 @@ namespace ix
                Boolean option(1);
                SSLSetSessionOption(_sslContext, kSSLSessionOptionBreakOnServerAuth, option);

-                status = tlsHandShake(errMsg, isCancellationRequested);
+                do
+                {
+                    status = SSLHandshake(_sslContext);
+                } while (status == errSSLWouldBlock || status == errSSLServerAuthCompleted);

                if (status == errSSLServerAuthCompleted)
                {
                    // proceed with the handshake
-                    status = tlsHandShake(errMsg, isCancellationRequested);
+                    do
+                    {
+                        status = SSLHandshake(_sslContext);
+                    } while (status == errSSLWouldBlock || status == errSSLServerAuthCompleted);
                }
            }
            else
            {
-                status = tlsHandShake(errMsg, isCancellationRequested);
+                do
+                {
+                    status = SSLHandshake(_sslContext);
+                } while (status == errSSLWouldBlock || status == errSSLServerAuthCompleted);
            }
        }

--- a/ixwebsocket/IXSocketAppleSSL.h
+++ b/ixwebsocket/IXSocketAppleSSL.h
@ -37,9 +37,6 @@ namespace ix
        static OSStatus writeToSocket(SSLConnectionRef connection, const void* data, size_t* len);
        static OSStatus readFromSocket(SSLConnectionRef connection, void* data, size_t* len);

-        OSStatus tlsHandShake(std::string& errMsg,
-                              const CancellationRequest& isCancellationRequested);
-
        SSLContextRef _sslContext;
        mutable std::mutex _mutex; // AppleSSL routines are not thread-safe

--- a/ixwebsocket/IXSocketConnect.cpp
+++ b/ixwebsocket/IXSocketConnect.cpp
@ -8,7 +8,6 @@

 #include "IXDNSLookup.h"
 #include "IXNetSystem.h"
-#include "IXSelectInterrupt.h"
 #include "IXSocket.h"
 #include <fcntl.h>
 #include <string.h>
@ -65,8 +64,7 @@ namespace ix

            int timeoutMs = 10;
            bool readyToRead = false;
-            auto selectInterrupt = std::make_unique<SelectInterrupt>();
-            PollResultType pollResult = Socket::poll(readyToRead, timeoutMs, fd, selectInterrupt);
+            PollResultType pollResult = Socket::poll(readyToRead, timeoutMs, fd);

            if (pollResult == PollResultType::Timeout)
            {
--- a/ixwebsocket/IXSocketFactory.cpp
+++ b/ixwebsocket/IXSocketFactory.cpp
@ -24,28 +24,28 @@

 namespace ix
 {
-    std::unique_ptr<Socket> createSocket(bool tls,
+    std::shared_ptr<Socket> createSocket(bool tls,
                                         int fd,
                                         std::string& errorMsg,
                                         const SocketTLSOptions& tlsOptions)
    {
        (void) tlsOptions;
        errorMsg.clear();
-        std::unique_ptr<Socket> socket;
+        std::shared_ptr<Socket> socket;

        if (!tls)
        {
-            socket = std::make_unique<Socket>(fd);
+            socket = std::make_shared<Socket>(fd);
        }
        else
        {
 #ifdef IXWEBSOCKET_USE_TLS
 #if defined(IXWEBSOCKET_USE_MBED_TLS)
-            socket = std::make_unique<SocketMbedTLS>(tlsOptions, fd);
+            socket = std::make_shared<SocketMbedTLS>(tlsOptions, fd);
 #elif defined(IXWEBSOCKET_USE_OPEN_SSL)
-            socket = std::make_unique<SocketOpenSSL>(tlsOptions, fd);
+            socket = std::make_shared<SocketOpenSSL>(tlsOptions, fd);
 #elif defined(__APPLE__)
-            socket = std::make_unique<SocketAppleSSL>(tlsOptions, fd);
+            socket = std::make_shared<SocketAppleSSL>(tlsOptions, fd);
 #endif
 #else
            errorMsg = "TLS support is not enabled on this platform.";
--- a/ixwebsocket/IXSocketFactory.h
+++ b/ixwebsocket/IXSocketFactory.h
@ -14,7 +14,7 @@
 namespace ix
 {
    class Socket;
-    std::unique_ptr<Socket> createSocket(bool tls,
+    std::shared_ptr<Socket> createSocket(bool tls,
                                         int fd,
                                         std::string& errorMsg,
                                         const SocketTLSOptions& tlsOptions);
--- a/ixwebsocket/IXSocketMbedTLS.cpp
+++ b/ixwebsocket/IXSocketMbedTLS.cpp
@ -195,17 +195,8 @@ namespace ix
        int res;
        do
        {
-            {
-                std::lock_guard<std::mutex> lock(_mutex);
-                res = mbedtls_ssl_handshake(&_ssl);
-            }
-
-            if (isCancellationRequested())
-            {
-                errMsg = "Cancellation requested";
-                close();
-                return false;
-            }
+            std::lock_guard<std::mutex> lock(_mutex);
+            res = mbedtls_ssl_handshake(&_ssl);
        } while (res == MBEDTLS_ERR_SSL_WANT_READ || res == MBEDTLS_ERR_SSL_WANT_WRITE);

        if (res != 0)
--- a/ixwebsocket/IXSocketOpenSSL.cpp
+++ b/ixwebsocket/IXSocketOpenSSL.cpp
@ -21,57 +21,6 @@
 #endif
 #define socketerrno errno

-#ifdef _WIN32
-namespace
-{
-    bool loadWindowsSystemCertificates(SSL_CTX* ssl, std::string& errorMsg)
-    {
-        DWORD flags = CERT_STORE_READONLY_FLAG | CERT_STORE_OPEN_EXISTING_FLAG |
-                      CERT_SYSTEM_STORE_CURRENT_USER;
-        HCERTSTORE systemStore = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, flags, L"Root");
-
-        if (!systemStore)
-        {
-            errorMsg = "CertOpenStore failed with ";
-            errorMsg += std::to_string(GetLastError());
-            return false;
-        }
-
-        PCCERT_CONTEXT certificateIterator = NULL;
-        X509_STORE* opensslStore = SSL_CTX_get_cert_store(ssl);
-
-        int certificateCount = 0;
-        while (certificateIterator = CertEnumCertificatesInStore(systemStore, certificateIterator))
-        {
-            X509* x509 = d2i_X509(NULL,
-                                  (const unsigned char**) &certificateIterator->pbCertEncoded,
-                                  certificateIterator->cbCertEncoded);
-
-            if (x509)
-            {
-                if (X509_STORE_add_cert(opensslStore, x509) == 1)
-                {
-                    ++certificateCount;
-                }
-
-                X509_free(x509);
-            }
-        }
-
-        CertFreeCertificateContext(certificateIterator);
-        CertCloseStore(systemStore, 0);
-
-        if (certificateCount == 0)
-        {
-            errorMsg = "No certificates found";
-            return false;
-        }
-
-        return true;
-    }
-} // namespace
-#endif
-
 namespace ix
 {
    const std::string kDefaultCiphers =
@ -182,14 +131,8 @@ namespace ix
            SSL_CTX_set_mode(ctx,
                             SSL_MODE_ENABLE_PARTIAL_WRITE | SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);

-            int options = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_CIPHER_SERVER_PREFERENCE;
-
-#ifdef SSL_OP_NO_TLSv1_3
-            // (partially?) work around hang in openssl 1.1.1b, by disabling TLS V1.3
-            // https://github.com/openssl/openssl/issues/7967
-            options |= SSL_OP_NO_TLSv1_3;
-#endif
-            SSL_CTX_set_options(ctx, options);
+            SSL_CTX_set_options(
+                ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_CIPHER_SERVER_PREFERENCE);
        }
        return ctx;
    }
@ -275,9 +218,7 @@ namespace ix
        return true;
    }

-    bool SocketOpenSSL::openSSLClientHandshake(const std::string& host,
-                                               std::string& errMsg,
-                                               const CancellationRequest& isCancellationRequested)
+    bool SocketOpenSSL::openSSLClientHandshake(const std::string& host, std::string& errMsg)
    {
        while (true)
        {
@ -286,12 +227,6 @@ namespace ix
                return false;
            }

-            if (isCancellationRequested())
-            {
-                errMsg = "Cancellation requested";
-                return false;
-            }
-
            ERR_clear_error();
            int connect_result = SSL_connect(_ssl_connection);
            if (connect_result == 1)
@ -387,12 +322,6 @@ namespace ix
        {
            if (_tlsOptions.isUsingSystemDefaults())
            {
-#ifdef _WIN32
-                if (!loadWindowsSystemCertificates(_ssl_context, errMsg))
-                {
-                    return false;
-                }
-#else
                if (SSL_CTX_set_default_verify_paths(_ssl_context) == 0)
                {
                    auto sslErr = ERR_get_error();
@ -400,7 +329,6 @@ namespace ix
                    errMsg += ERR_error_string(sslErr, nullptr);
                    return false;
                }
-#endif
            }
            else if (SSL_CTX_load_verify_locations(
                         _ssl_context, _tlsOptions.caFile.c_str(), NULL) != 1)
@ -643,7 +571,7 @@ namespace ix
            X509_VERIFY_PARAM* param = SSL_get0_param(_ssl_connection);
            X509_VERIFY_PARAM_set1_host(param, host.c_str(), 0);
 #endif
-            handshakeSuccessful = openSSLClientHandshake(host, errMsg, isCancellationRequested);
+            handshakeSuccessful = openSSLClientHandshake(host, errMsg);
        }

        if (!handshakeSuccessful)
--- a/ixwebsocket/IXSocketOpenSSL.h
+++ b/ixwebsocket/IXSocketOpenSSL.h
@ -39,9 +39,7 @@ namespace ix
        void openSSLInitialize();
        std::string getSSLError(int ret);
        SSL_CTX* openSSLCreateContext(std::string& errMsg);
-        bool openSSLClientHandshake(const std::string& hostname,
-                                    std::string& errMsg,
-                                    const CancellationRequest& isCancellationRequested);
+        bool openSSLClientHandshake(const std::string& hostname, std::string& errMsg);
        bool openSSLCheckServerCert(SSL* ssl, const std::string& hostname, std::string& errMsg);
        bool checkHost(const std::string& host, const char* pattern);
        bool handleTLSOptions(std::string& errMsg);
--- a/ixwebsocket/IXSocketServer.cpp
+++ b/ixwebsocket/IXSocketServer.cpp
@ -7,7 +7,6 @@
 #include "IXSocketServer.h"

 #include "IXNetSystem.h"
-#include "IXSelectInterrupt.h"
 #include "IXSetThreadName.h"
 #include "IXSocket.h"
 #include "IXSocketConnect.h"
@ -258,9 +257,7 @@ namespace ix
            // Use poll to check whether a new connection is in progress
            int timeoutMs = 10;
            bool readyToRead = true;
-            auto selectInterrupt = std::make_unique<SelectInterrupt>();
-            PollResultType pollResult =
-                Socket::poll(readyToRead, timeoutMs, _serverFd, selectInterrupt);
+            PollResultType pollResult = Socket::poll(readyToRead, timeoutMs, _serverFd);

            if (pollResult == PollResultType::Error)
            {
@ -341,8 +338,7 @@ namespace ix
            std::lock_guard<std::mutex> lock(_connectionsThreadsMutex);
            _connectionsThreads.push_back(std::make_pair(
                connectionState,
-                std::thread(
-                    &SocketServer::handleConnection, this, std::move(socket), connectionState)));
+                std::thread(&SocketServer::handleConnection, this, socket, connectionState)));
        }
    }

--- a/ixwebsocket/IXSocketServer.h
+++ b/ixwebsocket/IXSocketServer.h
@ -101,7 +101,7 @@ namespace ix
        // the factory to create ConnectionState objects
        ConnectionStateFactory _connectionStateFactory;

-        virtual void handleConnection(std::unique_ptr<Socket>,
+        virtual void handleConnection(std::shared_ptr<Socket>,
                                      std::shared_ptr<ConnectionState> connectionState) = 0;
        virtual size_t getConnectedClientsCount() = 0;

--- a/ixwebsocket/IXUdpSocket.cpp
+++ b/ixwebsocket/IXUdpSocket.cpp
@ -1,96 +0,0 @@
-/*
- *  IXUdpSocket.cpp
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2020 Machine Zone, Inc. All rights reserved.
- */
-
-#include "IXUdpSocket.h"
-
-#include "IXNetSystem.h"
-#include <cstring>
-#include <sstream>
-
-namespace ix
-{
-    UdpSocket::UdpSocket(int fd)
-        : _sockfd(fd)
-    {
-        ;
-    }
-
-    UdpSocket::~UdpSocket()
-    {
-        close();
-    }
-
-    void UdpSocket::close()
-    {
-        if (_sockfd == -1) return;
-
-        closeSocket(_sockfd);
-        _sockfd = -1;
-    }
-
-    int UdpSocket::getErrno()
-    {
-        int err;
-
-#ifdef _WIN32
-        err = WSAGetLastError();
-#else
-        err = errno;
-#endif
-
-        return err;
-    }
-
-    void UdpSocket::closeSocket(int fd)
-    {
-#ifdef _WIN32
-        closesocket(fd);
-#else
-        ::close(fd);
-#endif
-    }
-
-    bool UdpSocket::init(const std::string& host, int port, std::string& errMsg)
-    {
-        _sockfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-        if (_sockfd < 0)
-        {
-            errMsg = "Could not create socket";
-            return false;
-        }
-
-        memset(&_server, 0, sizeof(_server));
-        _server.sin_family = AF_INET;
-        _server.sin_port = htons(port);
-
-        // DNS resolution.
-        struct addrinfo hints, *result = nullptr;
-        memset(&hints, 0, sizeof(hints));
-        hints.ai_family = AF_INET;
-        hints.ai_socktype = SOCK_DGRAM;
-
-        int ret = getaddrinfo(host.c_str(), nullptr, &hints, &result);
-        if (ret != 0)
-        {
-            errMsg = strerror(UdpSocket::getErrno());
-            freeaddrinfo(result);
-            close();
-            return false;
-        }
-
-        struct sockaddr_in* host_addr = (struct sockaddr_in*) result->ai_addr;
-        memcpy(&_server.sin_addr, &host_addr->sin_addr, sizeof(struct in_addr));
-        freeaddrinfo(result);
-
-        return true;
-    }
-
-    ssize_t UdpSocket::sendto(const std::string& buffer)
-    {
-        return (ssize_t)::sendto(
-            _sockfd, buffer.data(), buffer.size(), 0, (struct sockaddr*) &_server, sizeof(_server));
-    }
-} // namespace ix
--- a/ixwebsocket/IXUdpSocket.h
+++ b/ixwebsocket/IXUdpSocket.h
@ -1,40 +0,0 @@
-/*
- *  IXUdpSocket.h
- *  Author: Benjamin Sergeant
- *  Copyright (c) 2020 Machine Zone, Inc. All rights reserved.
- */
-
-#pragma once
-
-#include <atomic>
-#include <memory>
-#include <string>
-
-#ifdef _WIN32
-#include <BaseTsd.h>
-typedef SSIZE_T ssize_t;
-#endif
-
-#include "IXNetSystem.h"
-
-namespace ix
-{
-    class UdpSocket
-    {
-    public:
-        UdpSocket(int fd = -1);
-        ~UdpSocket();
-
-        // Virtual methods
-        bool init(const std::string& host, int port, std::string& errMsg);
-        ssize_t sendto(const std::string& buffer);
-        void close();
-
-        static int getErrno();
-        static void closeSocket(int fd);
-
-    private:
-        std::atomic<int> _sockfd;
-        struct sockaddr_in _server;
-    };
-} // namespace ix
--- a/ixwebsocket/IXUserAgent.cpp
+++ b/ixwebsocket/IXUserAgent.cpp
@ -71,7 +71,7 @@ namespace ix
 #elif defined(IXWEBSOCKET_USE_OPEN_SSL)
        ss << " ssl/OpenSSL " << OPENSSL_VERSION_TEXT;
 #elif __APPLE__
-        ss << " ssl/SecureTransport";
+        ss << " ssl/DarwinSSL";
 #endif
 #else
        ss << " nossl";
--- a/ixwebsocket/IXWebSocket.cpp
+++ b/ixwebsocket/IXWebSocket.cpp
@ -19,6 +19,7 @@ namespace ix
    OnTrafficTrackerCallback WebSocket::_onTrafficTrackerCallback = nullptr;
    const int WebSocket::kDefaultHandShakeTimeoutSecs(60);
    const int WebSocket::kDefaultPingIntervalSecs(-1);
+    const int WebSocket::kDefaultPingTimeoutSecs(-1);
    const bool WebSocket::kDefaultEnablePong(true);
    const uint32_t WebSocket::kDefaultMaxWaitBetweenReconnectionRetries(10 * 1000); // 10s

@ -30,6 +31,7 @@ namespace ix
        , _handshakeTimeoutSecs(kDefaultHandShakeTimeoutSecs)
        , _enablePong(kDefaultEnablePong)
        , _pingIntervalSecs(kDefaultPingIntervalSecs)
+        , _pingTimeoutSecs(kDefaultPingTimeoutSecs)
    {
        _ws.setOnCloseCallback(
            [this](uint16_t code, const std::string& reason, size_t wireSize, bool remote) {
@ -84,6 +86,18 @@ namespace ix
        return _perMessageDeflateOptions;
    }

+    void WebSocket::setHeartBeatPeriod(int heartBeatPeriodSecs)
+    {
+        std::lock_guard<std::mutex> lock(_configMutex);
+        _pingIntervalSecs = heartBeatPeriodSecs;
+    }
+
+    int WebSocket::getHeartBeatPeriod() const
+    {
+        std::lock_guard<std::mutex> lock(_configMutex);
+        return _pingIntervalSecs;
+    }
+
    void WebSocket::setPingInterval(int pingIntervalSecs)
    {
        std::lock_guard<std::mutex> lock(_configMutex);
@ -96,6 +110,18 @@ namespace ix
        return _pingIntervalSecs;
    }

+    void WebSocket::setPingTimeout(int pingTimeoutSecs)
+    {
+        std::lock_guard<std::mutex> lock(_configMutex);
+        _pingTimeoutSecs = pingTimeoutSecs;
+    }
+
+    int WebSocket::getPingTimeout() const
+    {
+        std::lock_guard<std::mutex> lock(_configMutex);
+        return _pingTimeoutSecs;
+    }
+
    void WebSocket::enablePong()
    {
        std::lock_guard<std::mutex> lock(_configMutex);
@ -160,8 +186,11 @@ namespace ix
    {
        {
            std::lock_guard<std::mutex> lock(_configMutex);
-            _ws.configure(
-                _perMessageDeflateOptions, _socketTLSOptions, _enablePong, _pingIntervalSecs);
+            _ws.configure(_perMessageDeflateOptions,
+                          _socketTLSOptions,
+                          _enablePong,
+                          _pingIntervalSecs,
+                          _pingTimeoutSecs);
        }

        WebSocketHttpHeaders headers(_extraHeaders);
@ -200,25 +229,21 @@ namespace ix
            WebSocketErrorInfo(),
            WebSocketOpenInfo(status.uri, status.headers, status.protocol),
            WebSocketCloseInfo()));
-
-        if (_pingIntervalSecs > 0)
-        {
-            // Send a heart beat right away
-            _ws.sendHeartBeat();
-        }
-
        return status;
    }

-    WebSocketInitResult WebSocket::connectToSocket(std::unique_ptr<Socket> socket, int timeoutSecs)
+    WebSocketInitResult WebSocket::connectToSocket(std::shared_ptr<Socket> socket, int timeoutSecs)
    {
        {
            std::lock_guard<std::mutex> lock(_configMutex);
-            _ws.configure(
-                _perMessageDeflateOptions, _socketTLSOptions, _enablePong, _pingIntervalSecs);
+            _ws.configure(_perMessageDeflateOptions,
+                          _socketTLSOptions,
+                          _enablePong,
+                          _pingIntervalSecs,
+                          _pingTimeoutSecs);
        }

-        WebSocketInitResult status = _ws.connectToSocket(std::move(socket), timeoutSecs);
+        WebSocketInitResult status = _ws.connectToSocket(socket, timeoutSecs);
        if (!status.success)
        {
            return status;
@ -231,13 +256,6 @@ namespace ix
                                               WebSocketErrorInfo(),
                                               WebSocketOpenInfo(status.uri, status.headers),
                                               WebSocketCloseInfo()));
-
-        if (_pingIntervalSecs > 0)
-        {
-            // Send a heart beat right away
-            _ws.sendHeartBeat();
-        }
-
        return status;
    }

--- a/ixwebsocket/IXWebSocket.h
+++ b/ixwebsocket/IXWebSocket.h
@ -52,7 +52,9 @@ namespace ix
        void setPerMessageDeflateOptions(
            const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions);
        void setTLSOptions(const SocketTLSOptions& socketTLSOptions);
-        void setPingInterval(int pingIntervalSecs);
+        void setHeartBeatPeriod(int heartBeatPeriodSecs);
+        void setPingInterval(int pingIntervalSecs); // alias of setHeartBeatPeriod
+        void setPingTimeout(int pingTimeoutSecs);
        void enablePong();
        void disablePong();
        void enablePerMessageDeflate();
@ -92,7 +94,9 @@ namespace ix

        const std::string& getUrl() const;
        const WebSocketPerMessageDeflateOptions& getPerMessageDeflateOptions() const;
+        int getHeartBeatPeriod() const;
        int getPingInterval() const;
+        int getPingTimeout() const;
        size_t bufferedAmount() const;

        void enableAutomaticReconnection();
@ -113,7 +117,7 @@ namespace ix
        static void invokeTrafficTrackerCallback(size_t size, bool incoming);

        // Server
-        WebSocketInitResult connectToSocket(std::unique_ptr<Socket>, int timeoutSecs);
+        WebSocketInitResult connectToSocket(std::shared_ptr<Socket>, int timeoutSecs);

        WebSocketTransport _ws;

--- a/ixwebsocket/IXWebSocketHandshake.cpp
+++ b/ixwebsocket/IXWebSocketHandshake.cpp
@ -21,8 +21,8 @@ namespace ix
 {
    WebSocketHandshake::WebSocketHandshake(
        std::atomic<bool>& requestInitCancellation,
-        std::unique_ptr<Socket>& socket,
-        WebSocketPerMessageDeflatePtr& perMessageDeflate,
+        std::shared_ptr<Socket> socket,
+        WebSocketPerMessageDeflate& perMessageDeflate,
        WebSocketPerMessageDeflateOptions& perMessageDeflateOptions,
        std::atomic<bool>& enablePerMessageDeflate)
        : _requestInitCancellation(requestInitCancellation)
@ -230,7 +230,7 @@ namespace ix
                _enablePerMessageDeflate = false;
            }
            // Otherwise try to initialize the deflate engine (zlib)
-            else if (!_perMessageDeflate->init(webSocketPerMessageDeflateOptions))
+            else if (!_perMessageDeflate.init(webSocketPerMessageDeflateOptions))
            {
                return WebSocketInitResult(
                    false, 0, "Failed to initialize per message deflate engine");
@ -341,7 +341,7 @@ namespace ix
        {
            _enablePerMessageDeflate = true;

-            if (!_perMessageDeflate->init(webSocketPerMessageDeflateOptions))
+            if (!_perMessageDeflate.init(webSocketPerMessageDeflateOptions))
            {
                return WebSocketInitResult(
                    false, 0, "Failed to initialize per message deflate engine");
--- a/ixwebsocket/IXWebSocketHandshake.h
+++ b/ixwebsocket/IXWebSocketHandshake.h
@ -23,8 +23,8 @@ namespace ix
    {
    public:
        WebSocketHandshake(std::atomic<bool>& requestInitCancellation,
-                           std::unique_ptr<Socket>& _socket,
-                           WebSocketPerMessageDeflatePtr& perMessageDeflate,
+                           std::shared_ptr<Socket> _socket,
+                           WebSocketPerMessageDeflate& perMessageDeflate,
                           WebSocketPerMessageDeflateOptions& perMessageDeflateOptions,
                           std::atomic<bool>& enablePerMessageDeflate);

@ -46,8 +46,8 @@ namespace ix
        bool insensitiveStringCompare(const std::string& a, const std::string& b);

        std::atomic<bool>& _requestInitCancellation;
-        std::unique_ptr<Socket>& _socket;
-        WebSocketPerMessageDeflatePtr& _perMessageDeflate;
+        std::shared_ptr<Socket> _socket;
+        WebSocketPerMessageDeflate& _perMessageDeflate;
        WebSocketPerMessageDeflateOptions& _perMessageDeflateOptions;
        std::atomic<bool>& _enablePerMessageDeflate;
    };
--- a/ixwebsocket/IXWebSocketHttpHeaders.cpp
+++ b/ixwebsocket/IXWebSocketHttpHeaders.cpp
@ -32,7 +32,7 @@ namespace ix
    }

    std::pair<bool, WebSocketHttpHeaders> parseHttpHeaders(
-        std::unique_ptr<Socket>& socket, const CancellationRequest& isCancellationRequested)
+        std::shared_ptr<Socket> socket, const CancellationRequest& isCancellationRequested)
    {
        WebSocketHttpHeaders headers;

--- a/ixwebsocket/IXWebSocketHttpHeaders.h
+++ b/ixwebsocket/IXWebSocketHttpHeaders.h
@ -29,5 +29,5 @@ namespace ix
    using WebSocketHttpHeaders = std::map<std::string, std::string, CaseInsensitiveLess>;

    std::pair<bool, WebSocketHttpHeaders> parseHttpHeaders(
-        std::unique_ptr<Socket>& socket, const CancellationRequest& isCancellationRequested);
+        std::shared_ptr<Socket> socket, const CancellationRequest& isCancellationRequested);
 } // namespace ix
--- a/ixwebsocket/IXWebSocketPerMessageDeflate.h
+++ b/ixwebsocket/IXWebSocketPerMessageDeflate.h
@ -57,6 +57,4 @@ namespace ix
        std::unique_ptr<WebSocketPerMessageDeflateCompressor> _compressor;
        std::unique_ptr<WebSocketPerMessageDeflateDecompressor> _decompressor;
    };
-
-    using WebSocketPerMessageDeflatePtr = std::unique_ptr<WebSocketPerMessageDeflate>;
 } // namespace ix
--- a/ixwebsocket/IXWebSocketPerMessageDeflateCodec.cpp
+++ b/ixwebsocket/IXWebSocketPerMessageDeflateCodec.cpp
@ -89,12 +89,8 @@ namespace ix

        if (in.empty())
        {
-            // See issue #167
-            // The normal buffer size should be 6 but
-            // we remove the 4 octets from the tail (#4)
-            uint8_t buf[2] = {0x02, 0x00};
-            out.append((char*) (buf), 2);
-
+            uint8_t buf[6] = {0x02, 0x00, 0x00, 0x00, 0xff, 0xff};
+            out.append((char*) (buf), 6);
            return true;
        }

--- a/ixwebsocket/IXWebSocketServer.cpp
+++ b/ixwebsocket/IXWebSocketServer.cpp
@ -71,7 +71,7 @@ namespace ix
        _onConnectionCallback = callback;
    }

-    void WebSocketServer::handleConnection(std::unique_ptr<Socket> socket,
+    void WebSocketServer::handleConnection(std::shared_ptr<Socket> socket,
                                           std::shared_ptr<ConnectionState> connectionState)
    {
        setThreadName("WebSocketServer::" + connectionState->getId());
@ -96,7 +96,7 @@ namespace ix
            _clients.insert(webSocket);
        }

-        auto status = webSocket->connectToSocket(std::move(socket), _handshakeTimeoutSecs);
+        auto status = webSocket->connectToSocket(socket, _handshakeTimeoutSecs);
        if (status.success)
        {
            // Process incoming messages and execute callbacks
--- a/ixwebsocket/IXWebSocketServer.h
+++ b/ixwebsocket/IXWebSocketServer.h
@ -59,7 +59,7 @@ namespace ix
        const static bool kDefaultEnablePong;

        // Methods
-        virtual void handleConnection(std::unique_ptr<Socket> socket,
+        virtual void handleConnection(std::shared_ptr<Socket> socket,
                                      std::shared_ptr<ConnectionState> connectionState) final;
        virtual size_t getConnectedClientsCount() final;
    };
--- a/ixwebsocket/IXWebSocketTransport.cpp
+++ b/ixwebsocket/IXWebSocketTransport.cpp
@ -51,10 +51,26 @@
 #include <vector>


+namespace
+{
+    int greatestCommonDivisor(int a, int b)
+    {
+        while (b != 0)
+        {
+            int t = b;
+            b = a % b;
+            a = t;
+        }
+
+        return a;
+    }
+} // namespace
+
 namespace ix
 {
    const std::string WebSocketTransport::kPingMessage("ixwebsocket::heartbeat");
    const int WebSocketTransport::kDefaultPingIntervalSecs(-1);
+    const int WebSocketTransport::kDefaultPingTimeoutSecs(-1);
    const bool WebSocketTransport::kDefaultEnablePong(true);
    const int WebSocketTransport::kClosingMaximumWaitingDelayInMs(300);
    constexpr size_t WebSocketTransport::kChunkSize;
@ -73,8 +89,11 @@ namespace ix
        , _closingTimePoint(std::chrono::steady_clock::now())
        , _enablePong(kDefaultEnablePong)
        , _pingIntervalSecs(kDefaultPingIntervalSecs)
-        , _pongReceived(false)
+        , _pingTimeoutSecs(kDefaultPingTimeoutSecs)
+        , _pingIntervalOrTimeoutGCDSecs(-1)
+        , _nextGCDTimePoint(std::chrono::steady_clock::now())
        , _lastSendPingTimePoint(std::chrono::steady_clock::now())
+        , _lastReceivePongTimePoint(std::chrono::steady_clock::now())
    {
        _readbuf.resize(kChunkSize);
    }
@ -88,13 +107,29 @@ namespace ix
        const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions,
        const SocketTLSOptions& socketTLSOptions,
        bool enablePong,
-        int pingIntervalSecs)
+        int pingIntervalSecs,
+        int pingTimeoutSecs)
    {
        _perMessageDeflateOptions = perMessageDeflateOptions;
        _enablePerMessageDeflate = _perMessageDeflateOptions.enabled();
        _socketTLSOptions = socketTLSOptions;
        _enablePong = enablePong;
        _pingIntervalSecs = pingIntervalSecs;
+        _pingTimeoutSecs = pingTimeoutSecs;
+
+        if (pingIntervalSecs > 0 && pingTimeoutSecs > 0)
+        {
+            _pingIntervalOrTimeoutGCDSecs =
+                greatestCommonDivisor(pingIntervalSecs, pingTimeoutSecs);
+        }
+        else if (_pingTimeoutSecs > 0)
+        {
+            _pingIntervalOrTimeoutGCDSecs = pingTimeoutSecs;
+        }
+        else
+        {
+            _pingIntervalOrTimeoutGCDSecs = pingIntervalSecs;
+        }
    }

    // Client
@ -117,7 +152,6 @@ namespace ix
        std::string errorMsg;
        bool tls = protocol == "wss";
        _socket = createSocket(tls, -1, errorMsg, _socketTLSOptions);
-        _perMessageDeflate = std::make_unique<WebSocketPerMessageDeflate>();

        if (!_socket)
        {
@ -140,7 +174,7 @@ namespace ix
    }

    // Server
-    WebSocketInitResult WebSocketTransport::connectToSocket(std::unique_ptr<Socket> socket,
+    WebSocketInitResult WebSocketTransport::connectToSocket(std::shared_ptr<Socket> socket,
                                                            int timeoutSecs)
    {
        std::lock_guard<std::mutex> lock(_socketMutex);
@ -149,8 +183,7 @@ namespace ix
        _useMask = false;
        _blockingSend = true;

-        _socket = std::move(socket);
-        _perMessageDeflate = std::make_unique<WebSocketPerMessageDeflate>();
+        _socket = socket;

        WebSocketHandshake webSocketHandshake(_requestInitCancellation,
                                              _socket,
@ -187,8 +220,7 @@ namespace ix
        }
        else if (readyState == ReadyState::OPEN)
        {
-            initTimePointsAfterConnect();
-            _pongReceived = false;
+            initTimePointsAndGCDAfterConnect();
        }

        _readyState = readyState;
@ -199,12 +231,22 @@ namespace ix
        _onCloseCallback = onCloseCallback;
    }

-    void WebSocketTransport::initTimePointsAfterConnect()
+    void WebSocketTransport::initTimePointsAndGCDAfterConnect()
    {
        {
            std::lock_guard<std::mutex> lock(_lastSendPingTimePointMutex);
            _lastSendPingTimePoint = std::chrono::steady_clock::now();
        }
+        {
+            std::lock_guard<std::mutex> lock(_lastReceivePongTimePointMutex);
+            _lastReceivePongTimePoint = std::chrono::steady_clock::now();
+        }
+
+        if (_pingIntervalOrTimeoutGCDSecs > 0)
+        {
+            _nextGCDTimePoint = std::chrono::steady_clock::now() +
+                                std::chrono::seconds(_pingIntervalOrTimeoutGCDSecs);
+        }
    }

    // Only consider send PING time points for that computation.
@ -217,12 +259,13 @@ namespace ix
        return now - _lastSendPingTimePoint > std::chrono::seconds(_pingIntervalSecs);
    }

-    WebSocketSendInfo WebSocketTransport::sendHeartBeat()
+    bool WebSocketTransport::pingTimeoutExceeded()
    {
-        _pongReceived = false;
-        std::stringstream ss;
-        ss << kPingMessage << "::" << _pingIntervalSecs << "s";
-        return sendPing(ss.str());
+        if (_pingTimeoutSecs <= 0) return false;
+
+        std::lock_guard<std::mutex> lock(_lastReceivePongTimePointMutex);
+        auto now = std::chrono::steady_clock::now();
+        return now - _lastReceivePongTimePoint > std::chrono::seconds(_pingTimeoutSecs);
    }

    bool WebSocketTransport::closingDelayExceeded()
@ -236,32 +279,46 @@ namespace ix
    {
        if (_readyState == ReadyState::OPEN)
        {
-            if (pingIntervalExceeded())
+            // if (1) ping timeout is enabled and (2) duration since last received
+            // ping response (PONG) exceeds the maximum delay, then close the connection
+            if (pingTimeoutExceeded())
            {
-                if (!_pongReceived)
-                {
-                    // ping response (PONG) exceeds the maximum delay, close the connection
-                    close(WebSocketCloseConstants::kInternalErrorCode,
-                          WebSocketCloseConstants::kPingTimeoutMessage);
-                }
-                else
-                {
-                    sendHeartBeat();
-                }
+                close(WebSocketCloseConstants::kInternalErrorCode,
+                      WebSocketCloseConstants::kPingTimeoutMessage);
+            }
+            // If ping is enabled and no ping has been sent for a duration
+            // exceeding our ping interval, send a ping to the server.
+            else if (pingIntervalExceeded())
+            {
+                std::stringstream ss;
+                ss << kPingMessage << "::" << _pingIntervalSecs << "s";
+                sendPing(ss.str());
            }
        }

        // No timeout if state is not OPEN, otherwise computed
        // pingIntervalOrTimeoutGCD (equals to -1 if no ping and no ping timeout are set)
-        int lastingTimeoutDelayInMs = (_readyState != ReadyState::OPEN) ? 0 : _pingIntervalSecs;
+        int lastingTimeoutDelayInMs =
+            (_readyState != ReadyState::OPEN) ? 0 : _pingIntervalOrTimeoutGCDSecs;

-        if (_pingIntervalSecs > 0)
+        if (_pingIntervalOrTimeoutGCDSecs > 0)
        {
            // compute lasting delay to wait for next ping / timeout, if at least one set
            auto now = std::chrono::steady_clock::now();
-            lastingTimeoutDelayInMs = (int) std::chrono::duration_cast<std::chrono::milliseconds>(
-                                          now - _lastSendPingTimePoint)
-                                          .count();
+
+            if (now >= _nextGCDTimePoint)
+            {
+                _nextGCDTimePoint = now + std::chrono::seconds(_pingIntervalOrTimeoutGCDSecs);
+
+                lastingTimeoutDelayInMs = _pingIntervalOrTimeoutGCDSecs * 1000;
+            }
+            else
+            {
+                lastingTimeoutDelayInMs =
+                    (int) std::chrono::duration_cast<std::chrono::milliseconds>(_nextGCDTimePoint -
+                                                                                now)
+                        .count();
+            }
        }

 #ifdef _WIN32
@ -569,7 +626,9 @@ namespace ix
            }
            else if (ws.opcode == wsheader_type::PONG)
            {
-                _pongReceived = true;
+                std::lock_guard<std::mutex> lck(_lastReceivePongTimePointMutex);
+                _lastReceivePongTimePoint = std::chrono::steady_clock::now();
+
                emitMessage(MessageKind::PONG, frameData, false, onMessageCallback);
            }
            else if (ws.opcode == wsheader_type::CLOSE)
@ -625,7 +684,7 @@ namespace ix
                    // send back the CLOSE frame
                    sendCloseFrame(code, reason);

-                    wakeUpFromPoll(Socket::kCloseRequest);
+                    _socket->wakeUpFromPoll(Socket::kCloseRequest);

                    bool remote = true;
                    closeSocketAndSwitchToClosedState(code, reason, _rxbuf.size(), remote);
@ -713,7 +772,7 @@ namespace ix
        if (compressedMessage && messageKind != MessageKind::FRAGMENT)
        {
            std::string decompressedMessage;
-            bool success = _perMessageDeflate->decompress(message, decompressedMessage);
+            bool success = _perMessageDeflate.decompress(message, decompressedMessage);

            if (messageKind == MessageKind::MSG_TEXT && !validateUtf8(decompressedMessage))
            {
@ -767,7 +826,7 @@ namespace ix

        if (compress)
        {
-            if (!_perMessageDeflate->compress(message, compressedMessage))
+            if (!_perMessageDeflate.compress(message, compressedMessage))
            {
                bool success = false;
                compressionError = true;
@ -845,7 +904,7 @@ namespace ix
        // Request to flush the send buffer on the background thread if it isn't empty
        if (!isSendBufferEmpty())
        {
-            wakeUpFromPoll(Socket::kSendRequest);
+            _socket->wakeUpFromPoll(Socket::kSendRequest);

            // FIXME: we should have a timeout when sending large messages: see #131
            if (_blockingSend && !flushSendBuffer())
@ -1063,12 +1122,6 @@ namespace ix
        _socket->close();
    }

-    bool WebSocketTransport::wakeUpFromPoll(uint64_t wakeUpCode)
-    {
-        std::lock_guard<std::mutex> lock(_socketMutex);
-        return _socket->wakeUpFromPoll(wakeUpCode);
-    }
-
    void WebSocketTransport::closeSocketAndSwitchToClosedState(uint16_t code,
                                                               const std::string& reason,
                                                               size_t closeWireSize,
@ -1116,9 +1169,8 @@ namespace ix
        setReadyState(ReadyState::CLOSING);

        sendCloseFrame(code, reason);
-
        // wake up the poll, but do not close yet
-        wakeUpFromPoll(Socket::kSendRequest);
+        _socket->wakeUpFromPoll(Socket::kSendRequest);
    }

    size_t WebSocketTransport::bufferedAmount() const
--- a/ixwebsocket/IXWebSocketTransport.h
+++ b/ixwebsocket/IXWebSocketTransport.h
@ -75,7 +75,8 @@ namespace ix
        void configure(const WebSocketPerMessageDeflateOptions& perMessageDeflateOptions,
                       const SocketTLSOptions& socketTLSOptions,
                       bool enablePong,
-                       int pingIntervalSecs);
+                       int pingIntervalSecs,
+                       int pingTimeoutSecs);

        // Client
        WebSocketInitResult connectToUrl(const std::string& url,
@ -83,7 +84,7 @@ namespace ix
                                         int timeoutSecs);

        // Server
-        WebSocketInitResult connectToSocket(std::unique_ptr<Socket> socket, int timeoutSecs);
+        WebSocketInitResult connectToSocket(std::shared_ptr<Socket> socket, int timeoutSecs);

        PollResult poll();
        WebSocketSendInfo sendBinary(const std::string& message,
@ -105,9 +106,6 @@ namespace ix
        void dispatch(PollResult pollResult, const OnMessageCallback& onMessageCallback);
        size_t bufferedAmount() const;

-        // internal
-        WebSocketSendInfo sendHeartBeat();
-
    private:
        std::string _url;

@ -171,7 +169,7 @@ namespace ix
        static constexpr size_t kChunkSize = 1 << 15;

        // Underlying TCP socket
-        std::unique_ptr<Socket> _socket;
+        std::shared_ptr<Socket> _socket;
        std::mutex _socketMutex;

        // Hold the state of the connection (OPEN, CLOSED, etc...)
@ -185,7 +183,7 @@ namespace ix
        mutable std::mutex _closeDataMutex;

        // Data used for Per Message Deflate compression (with zlib)
-        WebSocketPerMessageDeflatePtr _perMessageDeflate;
+        WebSocketPerMessageDeflate _perMessageDeflate;
        WebSocketPerMessageDeflateOptions _perMessageDeflateOptions;
        std::atomic<bool> _enablePerMessageDeflate;

@ -204,24 +202,39 @@ namespace ix
        static const bool kDefaultEnablePong;

        // Optional ping and pong timeout
+        // if both ping interval and timeout are set (> 0),
+        // then use GCD of these value to wait for the lowest time
        int _pingIntervalSecs;
-        std::atomic<bool> _pongReceived;
+        int _pingTimeoutSecs;
+        int _pingIntervalOrTimeoutGCDSecs;

        static const int kDefaultPingIntervalSecs;
+        static const int kDefaultPingTimeoutSecs;
        static const std::string kPingMessage;

+        // Record time step for ping/ ping timeout to ensure we wait for the right left duration
+        std::chrono::time_point<std::chrono::steady_clock> _nextGCDTimePoint;
+
        // We record when ping are being sent so that we can know when to send the next one
+        // We also record when pong are being sent as a reply to pings, to close the connections
+        // if no pong were received sufficiently fast.
        mutable std::mutex _lastSendPingTimePointMutex;
+        mutable std::mutex _lastReceivePongTimePointMutex;
        std::chrono::time_point<std::chrono::steady_clock> _lastSendPingTimePoint;
+        std::chrono::time_point<std::chrono::steady_clock> _lastReceivePongTimePoint;

        // If this function returns true, it is time to send a new ping
        bool pingIntervalExceeded();
-        void initTimePointsAfterConnect();
+
+        // No PONG data was received through the socket for longer than ping timeout delay
+        bool pingTimeoutExceeded();

        // after calling close(), if no CLOSE frame answer is received back from the remote, we
        // should close the connexion
        bool closingDelayExceeded();

+        void initTimePointsAndGCDAfterConnect();
+
        void sendCloseFrame(uint16_t code, const std::string& reason);

        void closeSocketAndSwitchToClosedState(uint16_t code,
@ -229,8 +242,6 @@ namespace ix
                                               size_t closeWireSize,
                                               bool remote);

-        bool wakeUpFromPoll(uint64_t wakeUpCode);
-
        bool flushSendBuffer();
        bool sendOnSocket();
        bool receiveFromSocket();
--- a/ixwebsocket/IXWebSocketVersion.h
+++ b/ixwebsocket/IXWebSocketVersion.h
@ -6,4 +6,4 @@

 #pragma once

-#define IX_WEBSOCKET_VERSION "9.2.1"
+#define IX_WEBSOCKET_VERSION "8.1.7"
--- a/66
+++ b/66
@ -1,13 +1,5 @@
 #
-# This makefile is used for convenience, and wrap simple cmake commands
-# You don't need to use it as an end user, it is more for developer.
-#
-# * work with docker (linux build)
-# * execute the unittest
-#
-# The default target will install ws, the command line tool coming with
-# IXWebSocket into /usr/local/bin
-#
+# This makefile is just used to easily work with docker (linux build)
 #
 all: brew

@ -16,23 +8,14 @@ install: brew
 # Use -DCMAKE_INSTALL_PREFIX= to install into another location
 # on osx it is good practice to make /usr/local user writable
 # sudo chown -R `whoami`/staff /usr/local
-#
-# Release, Debug, MinSizeRel, RelWithDebInfo are the build types
-#
 brew:
 	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 -DUSE_TEST=1 .. ; make -j 4 install)

-# Docker default target. We've add problem with OpenSSL and TLS 1.3 (on the
-# server side ?) and I can't work-around it easily, so we're using mbedtls on
-# Linux for the SSL backend, which works great.
-ws_mbedtls_install:
-	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DUSE_TLS=1 -DUSE_WS=1 -DUSE_MBED_TLS=1 .. ; make -j 4 install)
-
 ws:
 	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 .. ; make -j 4)

 ws_install:
-	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DUSE_TLS=1 -DUSE_WS=1 .. ; make -j 4 install)
+	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 .. ; make -j 4 install)

 ws_openssl:
 	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 -DUSE_OPEN_SSL=1 .. ; make -j 4)
@ -82,8 +65,6 @@ docker_push:
 	docker push ${LATEST}
 	docker push ${IMG}

-deploy: docker docker_push
-
 run:
 	docker run --cap-add sys_ptrace --entrypoint=sh -it bsergean/ws:build

@ -106,51 +87,12 @@ test:
 	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 -DUSE_TEST=1 .. ; make -j 4)
 	(cd test ; python2.7 run.py -r)

-test_tsan:
-	mkdir -p build && (cd build && cmake -GXcode -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_TEST=1 .. && xcodebuild -project ixwebsocket.xcodeproj -target ixwebsocket_unittest -enableThreadSanitizer YES)
-	(cd build/test ; ln -sf Debug/ixwebsocket_unittest)
-	(cd test ; python2.7 run.py -r)
-
-test_ubsan:
-	mkdir -p build && (cd build && cmake -GXcode -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_TEST=1 .. && xcodebuild -project ixwebsocket.xcodeproj -target ixwebsocket_unittest -enableUndefinedBehaviorSanitizer YES)
-	(cd build/test ; ln -sf Debug/ixwebsocket_unittest)
-	(cd test ; python2.7 run.py -r)
-
-test_asan:
-	mkdir -p build && (cd build && cmake -GXcode -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_TEST=1 .. && xcodebuild -project ixwebsocket.xcodeproj -target ixwebsocket_unittest -enableAddressSanitizer YES)
-	(cd build/test ; ln -sf Debug/ixwebsocket_unittest)
-	(cd test ; python2.7 run.py -r)
-
-test_tsan_openssl:
-	mkdir -p build && (cd build && cmake -GXcode -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_TEST=1 -DUSE_OPEN_SSL=1 .. && xcodebuild -project ixwebsocket.xcodeproj -target ixwebsocket_unittest -enableThreadSanitizer YES)
-	(cd build/test ; ln -sf Debug/ixwebsocket_unittest)
-	(cd test ; python2.7 run.py -r)
-
-test_ubsan_openssl:
-	mkdir -p build && (cd build && cmake -GXcode -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_TEST=1 -DUSE_OPEN_SSL=1 .. && xcodebuild -project ixwebsocket.xcodeproj -target ixwebsocket_unittest -enableUndefinedBehaviorSanitizer YES)
-	(cd build/test ; ln -sf Debug/ixwebsocket_unittest)
-	(cd test ; python2.7 run.py -r)
-
-test_tsan_openssl_release:
-	mkdir -p build && (cd build && cmake -GXcode -DCMAKE_BUILD_TYPE=Release -DUSE_TLS=1 -DUSE_TEST=1 -DUSE_OPEN_SSL=1 .. && xcodebuild -project ixwebsocket.xcodeproj -configuration Release -target ixwebsocket_unittest -enableThreadSanitizer YES)
-	(cd build/test ; ln -sf Release/ixwebsocket_unittest)
-	(cd test ; python2.7 run.py -r)
-
-test_tsan_mbedtls:
-	mkdir -p build && (cd build && cmake -GXcode -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_TEST=1 -DUSE_MBED_TLS=1 .. && xcodebuild -project ixwebsocket.xcodeproj -target ixwebsocket_unittest -enableThreadSanitizer YES)
-	(cd build/test ; ln -sf Debug/ixwebsocket_unittest)
-	(cd test ; python2.7 run.py -r)
-
-build_test_openssl:
+test_openssl:
 	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_OPEN_SSL=1 -DUSE_TEST=1 .. ; make -j 4)
-
-test_openssl: build_test_openssl
 	(cd test ; python2.7 run.py -r)

-build_test_mbedtls:
+test_mbedtls:
 	mkdir -p build && (cd build ; cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_MBED_TLS=1 -DUSE_TEST=1 .. ; make -j 4)
-
-test_mbedtls: build_test_mbedtls
 	(cd test ; python2.7 run.py -r)

 test_no_ssl:
--- a/sentry-native/CMakeScripts/ALL_BUILD_cmakeRulesBuildPhase.makeDebug
+++ b/sentry-native/CMakeScripts/ALL_BUILD_cmakeRulesBuildPhase.makeDebug
@ -0,0 +1,10 @@
+# Generated by CMake, DO NOT EDIT
+# Custom rules for ALL_BUILD
+.SUFFIXES: 
+all: \
+	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeFiles/ALL_BUILD
+
+
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeFiles/ALL_BUILD: 
+	echo ""
+	echo Build\ all\ projects
--- a/sentry-native/CMakeScripts/ALL_BUILD_cmakeRulesBuildPhase.makeMinSizeRel
+++ b/sentry-native/CMakeScripts/ALL_BUILD_cmakeRulesBuildPhase.makeMinSizeRel
@ -0,0 +1,10 @@
+# Generated by CMake, DO NOT EDIT
+# Custom rules for ALL_BUILD
+.SUFFIXES: 
+all: \
+	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeFiles/ALL_BUILD
+
+
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeFiles/ALL_BUILD: 
+	echo ""
+	echo Build\ all\ projects
--- a/sentry-native/CMakeScripts/ALL_BUILD_cmakeRulesBuildPhase.makeRelWithDebInfo
+++ b/sentry-native/CMakeScripts/ALL_BUILD_cmakeRulesBuildPhase.makeRelWithDebInfo
@ -0,0 +1,10 @@
+# Generated by CMake, DO NOT EDIT
+# Custom rules for ALL_BUILD
+.SUFFIXES: 
+all: \
+	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeFiles/ALL_BUILD
+
+
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeFiles/ALL_BUILD: 
+	echo ""
+	echo Build\ all\ projects
--- a/sentry-native/CMakeScripts/ALL_BUILD_cmakeRulesBuildPhase.makeRelease
+++ b/sentry-native/CMakeScripts/ALL_BUILD_cmakeRulesBuildPhase.makeRelease
@ -0,0 +1,10 @@
+# Generated by CMake, DO NOT EDIT
+# Custom rules for ALL_BUILD
+.SUFFIXES: 
+all: \
+	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeFiles/ALL_BUILD
+
+
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeFiles/ALL_BUILD: 
+	echo ""
+	echo Build\ all\ projects
--- a/sentry-native/CMakeScripts/ReRunCMake.make
+++ b/sentry-native/CMakeScripts/ReRunCMake.make
@ -0,0 +1,18 @@
+# Generated by CMake, DO NOT EDIT
+
+TARGETS:= 
+empty:= 
+space:= $(empty) $(empty)
+spaceplus:= $(empty)\ $(empty)
+
+TARGETS += $(subst $(space),$(spaceplus),$(wildcard /Applications/CMake.app/Contents/share/cmake-3.12/Modules/CMakeASMInformation.cmake))
+TARGETS += $(subst $(space),$(spaceplus),$(wildcard /Applications/CMake.app/Contents/share/cmake-3.12/Modules/Compiler/AppleClang-ASM.cmake))
+TARGETS += $(subst $(space),$(spaceplus),$(wildcard /Applications/CMake.app/Contents/share/cmake-3.12/Modules/Compiler/Clang-ASM.cmake))
+TARGETS += $(subst $(space),$(spaceplus),$(wildcard /Applications/CMake.app/Contents/share/cmake-3.12/Modules/Compiler/Clang.cmake))
+TARGETS += $(subst $(space),$(spaceplus),$(wildcard /Applications/CMake.app/Contents/share/cmake-3.12/Modules/Platform/Apple-clang.cmake))
+TARGETS += $(subst $(space),$(spaceplus),$(wildcard /Users/bsergeant/src/foss/IXWebSocket/CMakeFiles/3.12.3/CMakeASMCompiler.cmake))
+TARGETS += $(subst $(space),$(spaceplus),$(wildcard /Users/bsergeant/src/foss/IXWebSocket/third_party/sentry-native/CMakeLists.txt))
+TARGETS += $(subst $(space),$(spaceplus),$(wildcard /Users/bsergeant/src/foss/IXWebSocket/third_party/sentry-native/src/CMakeLists.txt))
+
+/Users/bsergeant/src/foss/IXWebSocket/CMakeFiles/cmake.check_cache: $(TARGETS)
+	/Applications/CMake.app/Contents/bin/cmake -H/Users/bsergeant/src/foss/IXWebSocket -B/Users/bsergeant/src/foss/IXWebSocket
--- a/sentry-native/CMakeScripts/XCODE_DEPEND_HELPER.make
+++ b/sentry-native/CMakeScripts/XCODE_DEPEND_HELPER.make
@ -0,0 +1,139 @@
+# DO NOT EDIT
+# This makefile makes sure all linkable targets are
+# up-to-date with anything they link to
+default:
+	echo "Do not invoke directly"
+
+# Rules to remove targets that are older than anything to which they
+# link.  This forces Xcode to relink the targets from scratch.  It
+# does not seem to check these dependencies itself.
+PostBuild.example.Debug:
+PostBuild.sentry.Debug: /Users/bsergeant/src/foss/IXWebSocket/sentry-native/example
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/example:\
+	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.a
+	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/example
+
+
+PostBuild.example_crashpad.Debug:
+PostBuild.sentry.Debug: /Users/bsergeant/src/foss/IXWebSocket/sentry-native/example_crashpad
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/example_crashpad:\
+	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.a
+	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/example_crashpad
+
+
+PostBuild.sentry.Debug:
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.a:
+	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.a
+
+
+PostBuild.sentry_test_integration.Debug:
+PostBuild.sentry.Debug: /Users/bsergeant/src/foss/IXWebSocket/sentry-native/sentry_test_integration
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/sentry_test_integration:\
+	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.a
+	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/sentry_test_integration
+
+
+PostBuild.sentry_test_unit.Debug:
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/sentry_test_unit:
+	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/sentry_test_unit
+
+
+PostBuild.example.Release:
+PostBuild.sentry.Release: /Users/bsergeant/src/foss/IXWebSocket/sentry-native/example
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/example:\
+	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.a
+	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/example
+
+
+PostBuild.example_crashpad.Release:
+PostBuild.sentry.Release: /Users/bsergeant/src/foss/IXWebSocket/sentry-native/example_crashpad
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/example_crashpad:\
+	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.a
+	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/example_crashpad
+
+
+PostBuild.sentry.Release:
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.a:
+	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.a
+
+
+PostBuild.sentry_test_integration.Release:
+PostBuild.sentry.Release: /Users/bsergeant/src/foss/IXWebSocket/sentry-native/sentry_test_integration
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/sentry_test_integration:\
+	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.a
+	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/sentry_test_integration
+
+
+PostBuild.sentry_test_unit.Release:
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/sentry_test_unit:
+	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/sentry_test_unit
+
+
+PostBuild.example.MinSizeRel:
+PostBuild.sentry.MinSizeRel: /Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/example
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/example:\
+	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/libsentry.a
+	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/example
+
+
+PostBuild.example_crashpad.MinSizeRel:
+PostBuild.sentry.MinSizeRel: /Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/example_crashpad
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/example_crashpad:\
+	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/libsentry.a
+	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/example_crashpad
+
+
+PostBuild.sentry.MinSizeRel:
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/libsentry.a:
+	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/libsentry.a
+
+
+PostBuild.sentry_test_integration.MinSizeRel:
+PostBuild.sentry.MinSizeRel: /Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/sentry_test_integration
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/sentry_test_integration:\
+	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/libsentry.a
+	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/sentry_test_integration
+
+
+PostBuild.sentry_test_unit.MinSizeRel:
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/sentry_test_unit:
+	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/sentry_test_unit
+
+
+PostBuild.example.RelWithDebInfo:
+PostBuild.sentry.RelWithDebInfo: /Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/example
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/example:\
+	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/libsentry.a
+	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/example
+
+
+PostBuild.example_crashpad.RelWithDebInfo:
+PostBuild.sentry.RelWithDebInfo: /Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/example_crashpad
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/example_crashpad:\
+	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/libsentry.a
+	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/example_crashpad
+
+
+PostBuild.sentry.RelWithDebInfo:
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/libsentry.a:
+	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/libsentry.a
+
+
+PostBuild.sentry_test_integration.RelWithDebInfo:
+PostBuild.sentry.RelWithDebInfo: /Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/sentry_test_integration
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/sentry_test_integration:\
+	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/libsentry.a
+	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/sentry_test_integration
+
+
+PostBuild.sentry_test_unit.RelWithDebInfo:
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/sentry_test_unit:
+	/bin/rm -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/sentry_test_unit
+
+
+
+
+# For each target create a dummy ruleso the target does not have to exist
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/libsentry.a:
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/libsentry.a:
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.a:
--- a/sentry-native/CMakeScripts/ZERO_CHECK_cmakeRulesBuildPhase.makeDebug
+++ b/sentry-native/CMakeScripts/ZERO_CHECK_cmakeRulesBuildPhase.makeDebug
@ -0,0 +1,10 @@
+# Generated by CMake, DO NOT EDIT
+# Custom rules for ZERO_CHECK
+.SUFFIXES: 
+all: \
+	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeFiles/ZERO_CHECK
+
+
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeFiles/ZERO_CHECK: 
+	echo ""
+	make -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeScripts/ReRunCMake.make
--- a/sentry-native/CMakeScripts/ZERO_CHECK_cmakeRulesBuildPhase.makeMinSizeRel
+++ b/sentry-native/CMakeScripts/ZERO_CHECK_cmakeRulesBuildPhase.makeMinSizeRel
@ -0,0 +1,10 @@
+# Generated by CMake, DO NOT EDIT
+# Custom rules for ZERO_CHECK
+.SUFFIXES: 
+all: \
+	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeFiles/ZERO_CHECK
+
+
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeFiles/ZERO_CHECK: 
+	echo ""
+	make -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeScripts/ReRunCMake.make
--- a/sentry-native/CMakeScripts/ZERO_CHECK_cmakeRulesBuildPhase.makeRelWithDebInfo
+++ b/sentry-native/CMakeScripts/ZERO_CHECK_cmakeRulesBuildPhase.makeRelWithDebInfo
@ -0,0 +1,10 @@
+# Generated by CMake, DO NOT EDIT
+# Custom rules for ZERO_CHECK
+.SUFFIXES: 
+all: \
+	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeFiles/ZERO_CHECK
+
+
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeFiles/ZERO_CHECK: 
+	echo ""
+	make -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeScripts/ReRunCMake.make
--- a/sentry-native/CMakeScripts/ZERO_CHECK_cmakeRulesBuildPhase.makeRelease
+++ b/sentry-native/CMakeScripts/ZERO_CHECK_cmakeRulesBuildPhase.makeRelease
@ -0,0 +1,10 @@
+# Generated by CMake, DO NOT EDIT
+# Custom rules for ZERO_CHECK
+.SUFFIXES: 
+all: \
+	/Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeFiles/ZERO_CHECK
+
+
+/Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeFiles/ZERO_CHECK: 
+	echo ""
+	make -f /Users/bsergeant/src/foss/IXWebSocket/sentry-native/CMakeScripts/ReRunCMake.make
--- a/sentry-native/CMakeScripts/install_postBuildPhase.makeDebug
+++ b/sentry-native/CMakeScripts/install_postBuildPhase.makeDebug
@ -0,0 +1,9 @@
+# Generated by CMake, DO NOT EDIT
+# Custom rules for install
+.SUFFIXES: 
+all: \
+	install_buildpart_0
+
+
+install_buildpart_0: 
+	/Applications/CMake.app/Contents/bin/cmake -DBUILD_TYPE=$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) -P cmake_install.cmake
--- a/sentry-native/CMakeScripts/install_postBuildPhase.makeMinSizeRel
+++ b/sentry-native/CMakeScripts/install_postBuildPhase.makeMinSizeRel
@ -0,0 +1,9 @@
+# Generated by CMake, DO NOT EDIT
+# Custom rules for install
+.SUFFIXES: 
+all: \
+	install_buildpart_0
+
+
+install_buildpart_0: 
+	/Applications/CMake.app/Contents/bin/cmake -DBUILD_TYPE=$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) -P cmake_install.cmake
--- a/sentry-native/CMakeScripts/install_postBuildPhase.makeRelWithDebInfo
+++ b/sentry-native/CMakeScripts/install_postBuildPhase.makeRelWithDebInfo
@ -0,0 +1,9 @@
+# Generated by CMake, DO NOT EDIT
+# Custom rules for install
+.SUFFIXES: 
+all: \
+	install_buildpart_0
+
+
+install_buildpart_0: 
+	/Applications/CMake.app/Contents/bin/cmake -DBUILD_TYPE=$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) -P cmake_install.cmake
--- a/sentry-native/CMakeScripts/install_postBuildPhase.makeRelease
+++ b/sentry-native/CMakeScripts/install_postBuildPhase.makeRelease
@ -0,0 +1,9 @@
+# Generated by CMake, DO NOT EDIT
+# Custom rules for install
+.SUFFIXES: 
+all: \
+	install_buildpart_0
+
+
+install_buildpart_0: 
+	/Applications/CMake.app/Contents/bin/cmake -DBUILD_TYPE=$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) -P cmake_install.cmake
--- a/sentry-native/CMakeScripts/sentry_postBuildPhase.makeDebug
+++ b/sentry-native/CMakeScripts/sentry_postBuildPhase.makeDebug
@ -0,0 +1,10 @@
+# Generated by CMake, DO NOT EDIT
+# Custom rules for sentry
+.SUFFIXES: 
+all: \
+	sentry_buildpart_0
+
+
+sentry_buildpart_0: 
+	echo "Creating symlinks"
+	/Applications/CMake.app/Contents/bin/cmake -E cmake_symlink_library /Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.dylib /Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.dylib /Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.dylib
--- a/sentry-native/CMakeScripts/sentry_postBuildPhase.makeMinSizeRel
+++ b/sentry-native/CMakeScripts/sentry_postBuildPhase.makeMinSizeRel
@ -0,0 +1,10 @@
+# Generated by CMake, DO NOT EDIT
+# Custom rules for sentry
+.SUFFIXES: 
+all: \
+	sentry_buildpart_0
+
+
+sentry_buildpart_0: 
+	echo "Creating symlinks"
+	/Applications/CMake.app/Contents/bin/cmake -E cmake_symlink_library /Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/libsentry.dylib /Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/libsentry.dylib /Users/bsergeant/src/foss/IXWebSocket/sentry-native/MinSizeRel/libsentry.dylib
--- a/sentry-native/CMakeScripts/sentry_postBuildPhase.makeRelWithDebInfo
+++ b/sentry-native/CMakeScripts/sentry_postBuildPhase.makeRelWithDebInfo
@ -0,0 +1,10 @@
+# Generated by CMake, DO NOT EDIT
+# Custom rules for sentry
+.SUFFIXES: 
+all: \
+	sentry_buildpart_0
+
+
+sentry_buildpart_0: 
+	echo "Creating symlinks"
+	/Applications/CMake.app/Contents/bin/cmake -E cmake_symlink_library /Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/libsentry.dylib /Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/libsentry.dylib /Users/bsergeant/src/foss/IXWebSocket/sentry-native/RelWithDebInfo/libsentry.dylib
--- a/sentry-native/CMakeScripts/sentry_postBuildPhase.makeRelease
+++ b/sentry-native/CMakeScripts/sentry_postBuildPhase.makeRelease
@ -0,0 +1,10 @@
+# Generated by CMake, DO NOT EDIT
+# Custom rules for sentry
+.SUFFIXES: 
+all: \
+	sentry_buildpart_0
+
+
+sentry_buildpart_0: 
+	echo "Creating symlinks"
+	/Applications/CMake.app/Contents/bin/cmake -E cmake_symlink_library /Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.dylib /Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.dylib /Users/bsergeant/src/foss/IXWebSocket/sentry-native/libsentry.dylib
--- a/sentry-native/Sentry-Native.xcodeproj/project.pbxproj
+++ b/sentry-native/Sentry-Native.xcodeproj/project.pbxproj
--- a/Show More
+++ b/Show More